Refactor transport