Calculator refactor done, with some remaining TODO