PEP8 cleanup.
More PEP8 cleanup.