Update for Arp code review - general comments