Minor REST API cleanup with from the author refactoring