Some style, text, and comment cleanup.

Attempt no. 2.