Some cleanup.

Mostly just a reformat -- untested changes.