Pep8

Not complete but covers most things outside of the tests. This is some progress forward, suggest merging quickly assuming tests pass (as I expect them to)