Made some of Hadley's suggested edits.