Revert "Quelques refactor"

This reverts commit 12628b7d19722540f78dcb6fd76918c4405df532.
Quelques refactor