tidied it up by putting more things in calculator class

 there's still some pointless residual methods to fix.