minor cleanup & docstrings