Belle refactorisation (tous les tests passent)