refactor TransportOption code