refactoring, pt.1