Better string cleaning