Refactoring Pt. 1