tidying up routes