Minor changes in the transport codes

These modifications do not change the way code was working. They only
simplify the code behind the scene, So everybody can easily change the
transport codes.