Refacto

Refacto globale