Refactor routes

Just some minor tidying up of the routes