Misc PEP8 fixes

+1 with @jni