some pep cleanup