diff --git a/bin/initDesktop b/bin/initDesktop
index 159464f..67e90dc 100755
--- a/bin/initDesktop
+++ b/bin/initDesktop
@@ -8,12 +8,17 @@
 DOTFILES_REPO="$HOME/.dotfiles"
 DOTFILES_REMOTE="https://git.rre.nu:443/jonas/dotfiles.git"
 
+DOTFILES_RENAME_EXISTING_FILES=(
+    .bashrc
+)
+
 ### NO Changes below this line
 
 set -aeo pipefail
 
 function asktobreak(){
     if [[ "$INITDESKTOP_YES" == 1 ]];then
+        printf "\n"
         return 1
     fi
     printf "Do you want to run this step (y/n)"
@@ -21,6 +26,7 @@ function asktobreak(){
         if [[ $answer == [YyNn] ]];then
             [[ $answer == [Yy] ]] && return_value=1
             [[ $answer == [Nn] ]] && return_value=0
+            printf "\n"
             break;
         fi
     done
@@ -28,11 +34,11 @@ function asktobreak(){
 }
 function new_log(){
     # script output
-    printf "\n****  [$*]  ***\n"
+    printf "\n****  [%s]  ***\n" "$*"
 }
 
 function log(){
-    printf "$*\n"
+    printf "%s\n" "$*"
 }
 
 function gnome_key_bindings(){
@@ -45,13 +51,13 @@ function gnome_key_bindings(){
     gsettings set org.gnome.settings-daemon.plugins.media-keys custom-keybindings "['$KEY_PATH/custom0/']"
 
     # Open Terminator
-    $CMD/custom0/ name "Open Terminator"
-    $CMD/custom0/ command "terminator"
-    $CMD/custom0/ binding "<Primary><Alt>Return"
+    "$CMD"/custom0/ name "Open Terminator"
+    "$CMD"/custom0/ command "terminator"
+    "$CMD"/custom0/ binding "<Primary><Alt>Return"
 }
 
 function setup_dotfiles(){
-    local dotf="/usr/bin/git --git-dir="$DOTFILES_REPO" --work-tree=$HOME"
+    local dotf="/usr/bin/git --git-dir=$DOTFILES_REPO --work-tree=$HOME"
     new_log "Setting up dotf (dotfiles)"
     if asktobreak;then
         return
@@ -59,19 +65,23 @@ function setup_dotfiles(){
     log "creating git repo in $DOTFILES_REPO"
     mkdir "$HOME/.dotfiles"
     git init --bare "$DOTFILES_REPO"
-    $dotf config --local status.showUntrackedFiles no
+    "$dotf" config --local status.showUntrackedFiles no
 
     log "adding remote repo ($DOTFILES_REMOTE)"
-    $dotf remote add origin "$DOTFILES_REMOTE"
+    "$dotf" remote add origin "$DOTFILES_REMOTE"
 
-    if [[ -f "$HOME/.bashrc" ]];then
-        log "renaming local .bashrc to .bashrc.bak"
-        mv "$HOME/.bashrc" "$HOME/.bashrc.bak"
-    fi
+
+    for file in "${DOTFILES_RENAME_EXISTING_FILES[@]}"; do
+
+       if [[ -f "$HOME/.bashrc" ]];then
+           log "renaming local $file to ${file}.bak"
+           mv "$HOME/$file" "$HOME/${file}.bak"
+       fi
+    done
 
     log "fetching dotfiles"
-    $dotf fetch origin
-    $dotf checkout master
+    "$dotf" fetch origin
+    "$dotf" checkout master
 }
 
 function do_salt_call(){
@@ -80,7 +90,7 @@ function do_salt_call(){
     if asktobreak;then
         return
     fi
-    $salt state.apply pillar="{username: $USER}"
+    "$salt" state.apply pillar="{username: $USER}"
 }
 
 setup_dotfiles