Refactoring is the best kind of factoring