Extreme refactoring, goodbye big class