Simplified calculator code, removed variables for now