Clean up routes and add comments