Minor routes tidy-up