Calculator Class Extensively Updated