Random PEP8 fixes