formatting cleanup, docs, etc.