chore(Calculator): Refactor and start using calculator