diff --git a/misc/clean.sh b/misc/clean.sh
index 8d80649e..00856aa2 100644
--- a/misc/clean.sh
+++ b/misc/clean.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-function header_info {
+
+function header_info() {
   cat <<"EOF"
    ________                    __   _  ________
   / ____/ /__  ____ _____     / /  | |/ / ____/
@@ -9,49 +10,57 @@ function header_info {
                                                
 EOF
 }
+
 BL=$(echo "\033[36m")
 GN=$(echo "\033[1;92m")
 CL=$(echo "\033[m")
 name=$(hostname)
+
 clear
 header_info
 echo -e "${BL}[Info]${GN} Cleaning $name${CL} \n"
+
+# Clean cache
 cache=$(find /var/cache/ -type f)
-    if [[ -z "$cache" ]]; then
-    echo -e "It appears there are no cached files on your system. \n"
+if [[ -z "$cache" ]]; then
+  echo -e "It appears there are no cached files on your system. \n"
+  sleep 2
+else
+  echo -e "$cache \n"
+  echo -e "${GN}Cache in $name${CL}"
+  read -p "Would you like to remove the selected cache listed above? [y/n] " -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    echo "Removing cache"
+    find /var/cache -type f -delete
+    echo "Successfully Removed cache"
     sleep 2
-    else
-    echo -e "$cache \n"
-    echo -e "${GN}Cache in $name${CL}"
-    read -p "Would you like to remove the selected cache listed above? [y/n] " -n 1 -r
-    echo
-      if [[ $REPLY =~ ^[Yy]$ ]]; then
-        echo "Removing cache"
-        find /var/cache -type f -delete
-        echo "Successfully Removed cache"
-        sleep 2
-      fi
-    fi
+  fi
+fi
+
+# Clean logs
 clear
 header_info
 echo -e "${BL}[Info]${GN} Cleaning $name${CL} \n"
 logs=$(find /var/log/ -type f)
-    if [[ -z "$logs" ]]; then
-    echo -e "It appears there are no logs on your system. \n"
+if [[ -z "$logs" ]]; then
+  echo -e "It appears there are no logs on your system. \n"
+  sleep 2
+else
+  echo -e "$logs \n"
+  echo -e "${GN}Logs in $name${CL}"
+  read -p "Would you like to remove the selected logs listed above? [y/n]" -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    echo "Removing logs"
+    find /var/log -type f -delete
+    echo "Successfully Removed logs"
     sleep 2
-    else
-    echo -e "$logs \n"
-    echo -e "${GN}Logs in $name${CL}"
-    read -p "Would you like to remove the selected logs listed above? [y/n]" -n 1 -r
-    echo
-      if [[ $REPLY =~ ^[Yy]$ ]]; then
-      echo "Removing logs"
-      find /var/log -type f -delete
-      echo "Successfully Removed logs"
-      sleep 2
-      fi
-    fi
-    clear
-    header_info
-    echo -e "${BL}[Info]${GN} Cleaning $name${CL} \n"
-    echo -e "${GN}Populating apt lists${CL} \n"
+  fi
+fi
+
+# Populate apt lists
+clear
+header_info
+echo -e "${BL}[Info]${GN} Cleaning $name${CL} \n"
+echo -e "${GN}Populating apt lists${CL} \n"