Fix non-doc file comments
More minor code cleanup
Documentation improvements