A couple more PEP8 fixes