Added punctuation handling