minor promise-like cleanup