Refactoring raté
Revert "Refactoring raté"

This reverts commit a2eb843ba8f88c9954038ddb0fe7add82bd1f00d.