trivial pep8 cleanups

i know you're not too happy about pep8 pull requests, but instead of just throwing away the work i already had invested, i decided to break it into easy-to-digest pieces, these are the first ones.

the first is very easy, should not cost you more than a few minutes to review.

the second is hard to review when using a normal diff view. but i re-checked with "-b" option of git diff that it really is just changing whitespace. 99% is when the source had wrong indentation + a few places where empty lines where too few or too much.