Start of trip identifier refactor