--- vi.eselect
+++ vi.eselect
@@ -46,15 +46,15 @@
 			die "Couldn't set ${target} /usr/bin/vi symlink"
 		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/ex" || \
 			die "Couldn't set ${target} /usr/bin/ex symlink"
-		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/vi" || \
-			die "Couldn't set ${target} /usr/bin/vi symlink"
+		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/view" || \
+			die "Couldn't set ${target} /usr/bin/view symlink"
 		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz" \
 			"${ROOT}/usr/share/man/man1/vi.1.gz" || \
 			die "Couldn't set ${target} /usr/share/man/man1/vi.1.gz symlink"
-		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz"
+		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz" \
 			"${ROOT}/usr/share/man/man1/ex.1.gz" || \
 			die "Couldn't set ${target} /usr/share/man/man1/ex.1.gz symlink"
-		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz"
+		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz" \
 			"${ROOT}/usr/share/man/man1/view.1.gz" || \
 			die "Couldn't set ${target} /usr/share/man/man1/view.1.gz symlink"
 	else
@@ -126,9 +126,8 @@
 		die -q "Too many parameters"
 
 	elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing provider"
+		remove_symlinks
-		elif ! set_symlinks "${1}" ; then
+		if ! set_symlinks "${1}" ; then
 			die -q "Can't set new provider"
 		fi
 
@@ -156,7 +155,7 @@
 
 	if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
 		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing link"
+		remove_symlinks
 	fi
 	if [[ -e "${ROOT}/usr/bin/vi" ]] ; then
 		die -q "Can't set a new provider"