pep8 fixes in setup.py, clean up in persitence method