Refactor Retour