Salary Calculator - Refactoring Assignment