OCD formatting fixes

Enforce a maximum line length for comments of 72 characters and tidy up
some whitespace. I know: I have issues.

Change-Id: I371c625fe368a2e2438e78806427f19508b19558