- Major cosmetic cleanup, include code style change.
- Fix a few minor bugs