Cleaning up and adding more docstrings