Improve comments
Refactor to make the API more RESTful