Refactored Simple Calculator