First cleanup

First - of a series  - cleanup, just to make it more readable.
Christ, so much to do!