Refactor vm-nic further