Simplify code now that promise return values are handled in resolve()