PEP cleanup