fixup whitespace and remove cut-n-paste dup of ret=0;goto out