clenaups & docstrings