Refactor contact