slight clean up in routes