minor changes.
minor changes.
Some cleanup.
Code formatting, documentation, cleanup.