More cleanup for consistency and ease of editing. Consolidated sections to put all definitions into one declaration.
Minor wordsmithing.