Spacing and punctuation upgraded