Nettoyage/Refactor/Commentaires