Addressed review comments: Return result of addCallback s instead of assigning variables to return