Fix and clean translation