Improve the calculator to handle more operations