Refactoring en cour ...