Refactorage + commentage