Refactoring reform