PEP8 fixes

Zero complaints by ./lint.sh now.