Refactoring step 9.