refactorisation du goal