[arctic] - Refactor code for vehicle mgmt.