Merge pull request #424 from jonohart/master

Code cleanup of SDNIP and ARP code