setup: aggressive refactoring