refactoring of contact district