fixed calculator.h and .cpp