Feature/refactor arp