Finished polishing the Calculator class.