A couple of PEP8 fixes