arp.c cleaned-up