cleanup pep structure