diff --git a/bashprofile/.bashrc b/bashprofile/.bashrc
index 5c2cbee..fe4d32b 100644
--- a/bashprofile/.bashrc
+++ b/bashprofile/.bashrc
@@ -120,22 +120,22 @@ if [ -f ~/.bash_aliases-local ]; then
     . ~/.bash_aliases-local
 fi
 
-eval "$($HOME/.dotfiles/starship-`uname -m` init bash)"
+eval "$("$HOME/.dotfiles/starship-$(uname -m)" init bash)"
 
-if [ -r "$HOME/.dotfiles/nvim-linux-`uname -m`/bin/nvim" ]
+if [ -r "$HOME/.dotfiles/nvim-linux-$(uname -m)/bin/nvim" ]
 then
   (
-    cd $HOME/.dotfiles/nvim-linux-`uname -m`/bin
+    cd "$HOME/.dotfiles/nvim-linux-$(uname -m)/bin"
     test -x vi || ln -s nvim vi
   )
-  PATH="$HOME/.dotfiles/nvim-linux-`uname -m`/bin:$PATH"
+  PATH="$HOME/.dotfiles/nvim-linux-$(uname -m)/bin:$PATH"
 fi
 
 export MANPAGER='nvim +Man!'
 
-test -r $HOME/.bashrc-local && . $HOME/.bashrc-local
+[ -r "$HOME/.bashrc-local" ] && . "$HOME/.bashrc-local"
 
-if [ -z "$SUDO_USER" -a -z "$TMUX" ]
+if [ "$SUDO_USER" == "" ] && [ "$TMUX" == "" ]
 then
   tmux attach-session -t default || tmux new-session -s default
 fi