Cleaned up setup.py
Cleaned up setup.py