Minor cleanup, curl -f and -o work well together