clean up and calculator
Rejected commit: Default
clean up and calculator