Calculator refactor in progress