Critical update of Calculator class | Removed excessive switches | More refactoring necessary!