Changes requested

Friendlier interface
Creating Calculator class so static functions do not have to be used