tidying and adding /map route