revise routes, clean up comments