Refactoring step 2