Refactor - Step 1