Comment, docs, and code clean up