aggressive refactoring