Code cleanups and simplifications, documentation updates.

1 file changed