Reduce complexity of arp module (minor changes)