diff --git a/.env b/.env
index 04a44ed4..660a1d7d 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,5 @@
 # Public environment settings
 #
-# Example: Can be shell compatible stuff like export, alias etc. or just
-# define variables like FOO=BAR
-#
 # You should put private stuff to .penv. It is handled the same way as this
 # file but will be ignored by .gitignore. In .penv stored vars are overwriting
 # vars from here.
diff --git a/.zsh/functions.d/aliases.sh b/.zsh/functions.d/aliases.sh
index 62fe943a..57ca94b2 100644
--- a/.zsh/functions.d/aliases.sh
+++ b/.zsh/functions.d/aliases.sh
@@ -27,6 +27,7 @@ alias n='nnn -diUxe'
 alias ssh='s'
 alias su='us'
 
+alias v=vim
 alias vi=vim
 
 alias xterm=$TERMINAL
diff --git a/.zshrc b/.zshrc
index f900791c..c6b0d863 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,10 +1,6 @@
 # Source some global/public stuff.
 source ~/.env
 
-# Source some private stuff or custom things that are different on my systems.
-# This file is not in the Git repository!
-source ~/.penv
-
 # Load Oh-my-Zsh.
 source ~/.zsh/oh-my-zsh.sh
 
@@ -24,18 +20,6 @@ case $TERM in
         ;;
 esac
 
-# Obsolete?
-#if [ -f /usr/bin/shellpic ]; then
-#    if [ -f ~/images/tux.png ]; then
-#        /usr/bin/shellpic --shell24 --scale-x 50 ~/images/tux.png
-#    fi
-#fi
-
-# Obsolete?
-#source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-#[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-
 # Source some functions
 for function in ~/.zsh/functions.d/*.sh; do
     source $function
@@ -52,3 +36,8 @@ if [ -n "$TMUX" ]; then
   }
 fi
 
+# Source some private stuff or custom things that are different on my systems.
+# This file is not in the Git repository!
+# Everything in this file overrides configuration settings already loaded.
+source ~/.penv
+