Légers refactoring