Refactored calculators into one class