clean up
Calculator