Added stop name so that will be easier to understand data for blocks and
trips.
Refactored code to make it easier to manage, especially for the vehicle
markers.