Fix whitespace.

Try to group variable declarations in a sensible way.  The constructor
lines are just formatted to break at a certain text width, this may be
subject to change.

While there, remove the Captain Obvious like comments.