Added code to CalcListener and Calculator