Made more PEP compliant.