Refactoring step 5.
Refactoring step 6.