Deal with punctuation