STY: pep8 and related fixes

@fabianp here we go ;-)