Refactoring fetch data -> Plus propre :-)