cosmetic changes and docstrings