More Minor PEP changes