Refactoring the model REST calls

this comment is a duplicate of the above, no?