Address whitespace, consistency, style.

All small changes.