Calculator with cleaned up code

Believe it or not