Removing redundant Calculator class