- refactoring of VehicleTracker