Refacto the contacts