sorting out code for vehicle class