[FIX] clean with Seb recommandations