Formatting cleanup and minor edits.