pep8 cleanup
Still cleaning up
Finished pep8 edits for now

Merge branch 'pep8' into testing