Fixed cleaning of punctuation and sorting