cleanups & docstrings