Refactoring pt. 5.