General refactoring of CalculatorRecipe