Modifications diverses, refactoring