Refactoring, pt.3