diff --git a/fish/theme-t31m/t31m_prompt.fish b/fish/theme-t31m/t31m_prompt.fish
index c815450..3f0f027 100644
--- a/fish/theme-t31m/t31m_prompt.fish
+++ b/fish/theme-t31m/t31m_prompt.fish
@@ -18,12 +18,9 @@ function prompt::pyenv
         set python_version ""
     end
 
-    #if test -n "$python_version"
-    #    echo -n -s (yellow)(printf '%s' \U1F40D)"["(off)"$python_version"(yellow)"]"(off)
-    # else if test (command -v pyenv)
     if set -q VIRTUAL_ENV
-        set venv $VIRTUALENV | grep -Eo '[^/]+/?$' | cut -d / -f1
-        echo -n -s (yellow)(printf '%s' \U1F40D)"[($venv"(cyan)(pyenv version-name | sed 's/:.*$//')(yellow)")"(off)"@$python_version"(yellow)"]"(off)
+        set venv (echo "$VIRTUAL_ENV" | grep -Eo '[^/]+/?$' | cut -d / -f1)
+        echo -n -s (printf '%s' \U1F40D)(yellow)"["(cyan)"$venv"(off)"@$python_version"(yellow)"]"(off)
     else if test -n "$PYENV_VERSION"; and [ "$PYENV_VERSION" != "$python_version" ]
         # echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)(pyenv version-name | sed 's/:.*$//' )(off)"@$python_version"(yellow)"]"(off)
         echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)(pyenv version-name )(off)"@$python_version"(yellow)"]"(off)