Refactoring raté
Revert "Refactoring raté"

This reverts commit 65c26ba5347147b10f0e6a8485ba5bf1fc1e942f.