docstrings; cleanups