Punctuation and simplify slightly