Nettoyage du code + simplification

Nettoyage du code + simplification
Nettoyage + Simplification (2)

Nettoyage + Simplification (2)