Aggressive refactoring