Reformat with Jindent tool

Reformat with Jindent tool
100 char line length, clean-up whitespace.
Brackets and alignment added.
Note: 2 files still have a few lines longer than 100 characters. I will leave it to someone else to tidy those up later.