Various PEP8 fixes ('cause I'm anal...)