Refactor routes to be more restful