attempting to refactor calculator class....