refactoring calculator
units wip
Refactoring complete.
Merge pull request #1 from andrewGarson/refactor

Refactor