fixed pep8, reverted setup.py