Refactor Arp classes.