Format and cleanup

Moved things around so it flows right in my mind - LOL.  Should work through a full sync at this point.