Calculator class updated