nettoyage / refactoring (Ju)