A few PEP8 fixes