Petit refactoring