Calculator refactor started