refactor calls to completers