Refactoring (Task 1)