Minor documentation fixes.
Code cleanup.