Update MBTA lab for easier refactoring