Refactoring. step 3