Refactoring step 4.