Refactoring, pt.2