Pep cleanup