refactoring pt.2