Continue isolating responsibilities in the calculator