french trad + improve en trad + cleanup