mega-refactoring