Extreme refactoring (no new features)