More PEP8, minor cleanup