Fix comments and docstrings