Formatting and white space changes.

To be continued.. still a lot of whitespace and formatting
to be changed.
Various simplifications.