- a few cleanups
- mostly spacing changes