Tidy up routes (a bit)