Calculators refactored