Refactoring pt. 4.