clean up and refine route