Reformat with Jindent tool.

Reformat with Jindent tool.
100 char line length, clean-up whitespace.
Brackets and alignment added.