Refactor 4.Calculator