Cleaned up docstrings and comments