cleaning up and adding docstrings