more merging of contact sections, code cleanup