Cleaning up a PEP thing