Refactoring Pt 1