split promise helpers out, unify method names