Assorted documentation and formatting cleanups

Ah, okay. Just wasn't sure what imagine with that comment :)