Refactoring Step 4