Rewrite of routing and transport classes
Minor cleanup