refactoring pep
Change from contact to ureport contact