Refactoring pt. 3.5.