Refactoring. step 2