2nd Step - Refactoring