Fixed lang/fr typo + code cleaning