docstrings, comments, cosmetic changes