Sneak in a few PEP8 fixes