Completed the calculator assignment