first pep8 run

Some long line lengths still exist, but I want
to avoid too heavily refactoring/moving bits
around for accomodating those just yet.

Once we have better test coverage, I will get
it all < 80 char line lengths.