Neatened up Diversion Transporter code