Improves setup.py

Improves setup.py