Cleanup, reaname, docstrings