Minor setup.py cleanup