Refactored calculator package