issue-4: cleaning up some of the calls to the backend