Cleaning up and fixing setup.py