More PEP8 clean up.