Misc PEP8 fixes

So, if people have a strong preference either way, I can change it back.