Punctuation improvements