diverses refactoring