Minor promise refactor