tidied up routes a bit