Cleaning and update French and English version