Grammar and formatting cleanup