Savage refactoring