Tidy up some routing