Cleaned up routes file, comments, and more intuitive naming