Various cleanup, mostly spacing and formatting.  See #1.