Slight formatting and syntax changes and a couple of small style edits