Suite petit refactoring