refactor contacts