Refactored BusStop and BusStopList