Minor refactoring.

There is some refactoring here as well as white space updates.  All rather minor
and rather straight forward.