Refactoring pt. 5.5.