Step 8: REFACTOR