Punctuation/whitespace cleanup