Tidied up routes a bit