fixup! Misc. Docstring/comment fixes and code formatting.