more PEP cleanups