Fin du refactoring
refactor 2