small refactoring of contacts