More refactoring !