diff --git a/zsh/.zshrc b/zsh/.zshrc
index 6ae46d6..fd570c1 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,5 +1,8 @@
+# prepare directories
 [ ! -L ~/.cache ] && { rm -rf ~/.cache; mkdir -p $XDG_CACHE_HOME; ln -sf $XDG_CACHE_HOME ~/.cache ; }
-[ $(command -v vivid) ] && export LS_COLORS=$(vivid generate molokai) || unset LS_COLORS
+mkdir -p $XDG_DATA_HOME/zsh
+mkdir -p $XDG_CACHE_HOME/zsh
+
 # global exports and options
 export HISTSIZE=10000
 export SAVEHIST=$HISTSIZE
@@ -11,30 +14,39 @@ setopt SHARE_HISTORY
 setopt INC_APPEND_HISTORY
 
 [ -z $DISPLAY ] && export PATH=~/.local/bin:$PATH
-tabs 2
-
-mkdir -p $XDG_DATA_HOME/zsh
-mkdir -p $XDG_CACHE_HOME/zsh
-zstyle ':completion:*' menu select
-zstyle ':completion:*' list-colors ''
 
+# source configuration
 source $ZDOTDIR/aliases.zsh
-source $ZDOTDIR/keys.zsh
-source $ZDOTDIR/fzf.zsh
-source $ZDOTDIR/ssh.zsh
 source $ZDOTDIR/cleanhome.zsh
+source $ZDOTDIR/fzf.zsh
+source $ZDOTDIR/keys.zsh
+source $ZDOTDIR/ssh.zsh
 
-# modules
+# source modules
 source $XDG_DATA_HOME/repos/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
 source $XDG_DATA_HOME/repos/zsh_modules/wd/wd.plugin.zsh
 export WD_CONFIG=$XDG_CONFIG_HOME/wd_list
 fpath=($XDG_DATA_HOME/repos/zsh_modules/wd $fpath)
 
-# theme
+# theme and colors
 source $ZDOTDIR/p10k.zsh
 source $XDG_DATA_HOME/repos/zsh_modules/powerlevel10k/powerlevel10k.zsh-theme
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+if [[ -r "$XDG_CACHE_HOME/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "$XDG_CACHE_HOME/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+[ $(command -v vivid) ] && export LS_COLORS=$(vivid generate molokai) || unset LS_COLORS
+tabs 2
+
+# completion
+zstyle ':completion:*' menu select
+zstyle ':completion:*' list-colors ''
+
+autoload -Uz compinit
+[ ! -e $XDG_DATA_HOME/zsh/zcompdump.zwc ] && autoload -Uz zrecompile && zrecompile -p -R $XDG_DATA_HOME/zsh/zcompdump
+if [[ -n $XDG_DATA_HOME/zsh/zcompdump(#qN.mh+24) ]]; then
+	compinit -d $XDG_DATA_HOME/zsh/zcompdump
+else
+	compinit -C -d $XDG_DATA_HOME/zsh/zcompdump
 fi
 
 # quick note functionality
@@ -46,12 +58,3 @@ fi
 
 # local settings
 [ -f ~/.local/config/zsh ] && source ~/.local/config/zsh
-
-# compinit at the very end to avoid duplicates
-[ ! -e $XDG_DATA_HOME/zsh/zcompdump.zwc ] && autoload -Uz zrecompile && zrecompile -p -R $XDG_DATA_HOME/zsh/zcompdump
-autoload -Uz compinit
-if [[ -n $XDG_DATA_HOME/zsh/zcompdump(#qN.mh+24) ]]; then
-	compinit -d $XDG_DATA_HOME/zsh/zcompdump
-else
-	compinit -C -d $XDG_DATA_HOME/zsh/zcompdump
-fi