Refactoring. step 4