Minor cleanups to code/docstrings