diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile
index 94df3fa..923ace1 100644
--- a/zsh/.config/zsh/.zprofile
+++ b/zsh/.config/zsh/.zprofile
@@ -1,3 +1,3 @@
 # Set PATH, MANPATH, etc., for Homebrew.
-#eval "$(/opt/homebrew/bin/brew shellenv)"
-eval "$(fnm env --use-on-cd)"
+[ -f /opt/homebrew/bin/brew ] && eval "$(/opt/homebrew/bin/brew shellenv)"
+command -v fnm > /dev/null 2>&1 && eval "$(fnm env --use-on-cd)"
diff --git a/zsh/.config/zsh/zsh-aliases b/zsh/.config/zsh/zsh-aliases
index f4085ae..a78098d 100644
--- a/zsh/.config/zsh/zsh-aliases
+++ b/zsh/.config/zsh/zsh-aliases
@@ -1,5 +1,4 @@
 #!/bin/sh
 
-alias zsh-update-plugins="find "$ZDOTDIR/plugins" -type d -exec test -e '{}/.git' ';' -print0 | xargs -I {} -0 git -C {} pull -q"
-[ -x `command -v lsd` ] && alias ls="lsd"
-[ -x `command -v bat` ] && alias cat="bat"
+[ -x "$(command -v lsd)" ] && alias ls="lsd"
+[ -x "$(command -v bat)" ] && alias cat="bat"
diff --git a/zsh/.config/zsh/zsh-functions b/zsh/.config/zsh/zsh-functions
index 9f72227..fd0b95c 100644
--- a/zsh/.config/zsh/zsh-functions
+++ b/zsh/.config/zsh/zsh-functions
@@ -27,7 +27,7 @@ function zsh_add_completion() {
     [ -f $ZDOTDIR/.zccompdump ] && $ZDOTDIR/.zccompdump
   fi
 	completion_file="$(basename "${completion_file_path}")"
-	if [ "$2" = true ] && compinit "${completion_file:1}"
+	[ "$2" = true ] && compinit "${completion_file:1}"
 }
 
 # https://github.com/mattmc3/zsh_unplugged