pep8 updates
pep8-ified