Did some code cleaning.

PENDING: Add more comments
TODO: manage the remaining edge case = "questions retrouver sons des mots"