Rearrange Promise then/catch calls