More PEP8 format changes