Refactoring pt. 2.