setup.py fix, and PEP8.