diff --git a/plugins/goenv/goenv.plugin.sh b/plugins/goenv/goenv.plugin.sh
index 2c2da89c7..42ded0261 100644
--- a/plugins/goenv/goenv.plugin.sh
+++ b/plugins/goenv/goenv.plugin.sh
@@ -1,14 +1,14 @@
 # @chopnico 2021
 
-if [ -d "$HOME/.goenv" ]; then
+if [ -d ~/.goenv ]; then
 	# goenv exported variables
-	export GOENV_ROOT="$HOME/.goenv"
-	export PATH="$GOENV_ROOT/bin:$PATH"
+	export GOENV_ROOT=~/.goenv
+	export PATH=$GOENV_ROOT/bin${PATH:+:$PATH}
 
 	# Enables goenv shims
-	eval "$(goenv init -)"
+	eval -- "$(goenv init -)"
 
 	# Allows goenv to manage GOPATH and GOROOT
-	export PATH="$GOROOT/bin:$PATH"
-	export PATH="$PATH:$GOPATH/bin"
+	export PATH=$GOROOT/bin:$PATH
+	export PATH=$PATH:$GOPATH/bin
 fi
diff --git a/plugins/pyenv/pyenv.plugin.sh b/plugins/pyenv/pyenv.plugin.sh
index ee4e01547..8e19f7405 100644
--- a/plugins/pyenv/pyenv.plugin.sh
+++ b/plugins/pyenv/pyenv.plugin.sh
@@ -1,8 +1,8 @@
 # @chopnico 2021
 
-if [ -d "$HOME/.pyenv" ]; then 
-	export PYENV_ROOT="$HOME/.pyenv"
-	export PATH="$PYENV_ROOT/bin:$PATH"
-	eval "$(pyenv init --path)"
-	eval "$(pyenv init -)"
+if [ -d ~/.pyenv ]; then 
+	export PYENV_ROOT=~/.pyenv
+	export PATH=$PYENV_ROOT/bin${PATH:+:$PATH}
+	eval -- "$(pyenv init --path)"
+	eval -- "$(pyenv init -)"
 fi