Various PEP8 fixes