diff --git a/resources/autocommit.sh b/resources/autocommit.sh
index edf490c..b870a22 100755
--- a/resources/autocommit.sh
+++ b/resources/autocommit.sh
@@ -4,7 +4,7 @@
 ### Please set the paths accordingly. In case you don't have all  ###
 ### the listed folders, just keep that line commented out.        ###
 #####################################################################
-### Path to your config folder you want to backup
+### Path to your config folder you want to back up
 #config_folder=~/klipper_config
 
 ### Path to your Klipper folder, by default that is '~/klipper'
@@ -27,34 +27,37 @@
 ################ !!! DO NOT EDIT BELOW THIS LINE !!! ################
 #####################################################################
 grab_version() {
-  if [ ! -z "$klipper_folder" ]; then
-    cd "$klipper_folder"
+  local klipper_commit moonraker_commit
+  local mainsail_ver fluidd_ver
+
+  if [[ -n ${klipper_folder} ]]; then
+    cd "${klipper_folder}"
     klipper_commit=$(git rev-parse --short=7 HEAD)
-    m1="Klipper on commit: $klipper_commit"
-    cd ..
+    m1="Klipper on commit: ${klipper_commit}"
   fi
-  if [ ! -z "$moonraker_folder" ]; then
-    cd "$moonraker_folder"
+  if [[ -n ${moonraker_folder} ]]; then
+    cd "${moonraker_folder}"
     moonraker_commit=$(git rev-parse --short=7 HEAD)
-    m2="Moonraker on commit: $moonraker_commit"
-    cd ..
+    m2="Moonraker on commit: ${moonraker_commit}"
   fi
-  if [ ! -z "$mainsail_folder" ]; then
-    mainsail_ver=$(head -n 1 $mainsail_folder/.version)
-    m3="Mainsail version: $mainsail_ver"
+  if [[ -n ${mainsail_folder} ]]; then
+    mainsail_ver=$(head -n 1 "${mainsail_folder}/.version")
+    m3="Mainsail version: ${mainsail_ver}"
   fi
-  if [ ! -z "$fluidd_folder" ]; then
-    fluidd_ver=$(head -n 1 $fluidd_folder/.version)
-    m4="Fluidd version: $fluidd_ver"
+  if [[ -n ${fluidd_folder} ]]; then
+    fluidd_ver=$(head -n 1 "${fluidd_folder}/.version")
+    m4="Fluidd version: ${fluidd_ver}"
   fi
 }
 
 push_config() {
-  cd $config_folder
+  local current_date
+  
+  cd "${config_folder}" || exit 1
   git pull
   git add .
   current_date=$(date +"%Y-%m-%d %T")
-  git commit -m "Autocommit from $current_date" -m "$m1" -m "$m2" -m "$m3" -m "$m4"
+  git commit -m "Autocommit from ${current_date}" -m "${m1}" -m "${m2}" -m "${m3}" -m "${m4}"
   git push
 }