Refactoring.
Bug-fixing: stopId can be also alphanumeric. Changed to String.