More cleanup, mostly in docstrings