- some refactoring to make the BusTime situation easier before the api overhaul