don't need set -f / +f + minor cleanup