Cleaning up comments, docstrings