tidied up routes