Formatting cleanup.

Wrap to 80 lines, remove C++ style comments, etc.