Updated Calculator.java