pep8 fixes

sorry, forgot to make a separate branch for this.

no functional changes, just cosmetics.

the only thing left to do which pycharm's pep8 checker still complains about: multiple imports on 1 line - do you want to have them fixed, too? (to 1 import per line)