Refactoring the Calculator class.
Refactoring issues.