some better comments in Calculator.java