Refactor the contact section.