Address ARP code review comments