Updated calculator class so compiles