Refactoring pt. 1.