No syntax changes, all style changes. Moved some things around but will ...

...NOT affect code