refactored CalculatorService
refactored CalculatorViewController