Clean up accordions

Refacto de l'accordion