Refactor call to callback