re-re-refactoring