Still trying to clean up my calculator code