cleaning up comments and docstrings