Clean up and fix setup.py