Some tidy up for MacAddrAtoN