Aggressive enhancing refactoring