Edits to clean up REST API