Cleaned up setup.py