refactor toutes