made some possibly-unecessary changes to the way the calculators are set up