Better punctuation removal