Minor clean-up in router and vhost!