Refactored BusLine and BusLine list