Refactoring step 8.