Refactoring, automatic activation, some clean