Early massive refactoring