pep8 cleanup and better setup.py