Refactoring of calculators.