updated Calculator.cpp, .h