small internal refactor on vehicle class