Refactoring pt 2