Refactoring pt. 3.