Clean up setup.py a bit