Reorganized the routes and added a couple comments.