More PEP8 conforming changes.