diff --git a/install.sh b/install.sh
index 13bd2a0..fd552ad 100755
--- a/install.sh
+++ b/install.sh
@@ -12,61 +12,62 @@ source lib/download.sh
 source conf/init.sh
 
 #Variables override
-for i in $(ls conf/*.conf)
+for i in conf/*
 do
-    source $i
+    source "$i"
 done
 
 erase_display_char () {
-    let "i=0"
-    while [  $i -lt $1 ]; do
+    local i
+    i=0
+    while [  "$i" -lt "$1" ]; do
         message "\b \b"
-        let "i=$i + 1"
+        (( i=i + 1 ))
     done
 }
 
 install () {
     nchar=0
     message "\nInstall $1 : "
-    LC_ALL=C apt-get install --no-install-recommends -y $1 2>/dev/null | while read x; do
+    LC_ALL=C apt-get install --no-install-recommends -y "$1" 2>/dev/null | while read -r x; do
 	display=""
 	pkg_name=""
         case $x in
             Get*)
-                pkg_name=$(echo $x | awk '{ printf $5 }')
+                pkg_name=$(echo "$x" | awk '{ printf $5 }')
                 display="downloading"
             ;;
             Unpack*)
-                pkg_name=$(echo $x | awk '{ printf $2 }')
+                pkg_name=$(echo "$x" |  awk '{ printf $2 }')
                 display="Unpacking"
             ;;
             *already*newest*)
-                pkg_name=$(echo $x | awk '{ printf $1 }')
-                display="Already Installed"
+                pkg_name=$(echo "$x" | awk '{ printf $1 }')
+                display="Already Ins talled"
             ;;
         esac
-	if [ ! -z "$display" ]
+	if [ -n "$display" ]
         then
             display="$display $pkg_name"
             erase_display_char $nchar
             message "$display" "info"
             nchar=${#display}
-        fi 
+        fi  
     done
     message " done" "ok"
 
 }
 
 process_package_file (){
-    for p in `cat $1 | grep  '^[^#].*'`
+    for p in $(cat "$1" | grep  '^[^#].*')
     do
-        install $p
+        install "$p"
     done
 }
 
 create_fusioninv_conf () {
     # Process Config file
-    message "\nProcess Fusion inventory configuration file : "
+    message "\nP rocess Fusion inventory configuration file : "
     #remove comments
     sed -i '/^#/ d' ${FI_CONF_FILE}
     sed -i '/^$/ d' ${FI_CONF_FILE}
@@ -82,15 +83,15 @@ create_fusioninv_conf () {
 }
 
 configure_drm(){
-    if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] 
+    if grep -o drm "$INITRAMFS_CONF_FILE"
     then
-        cat "drm" >> $INITRAMFS_CONF_FILE
+        cat "drm" >> "$INITRAMFS_CONF_FILE"
     else
         message "DRM already done " "warn"
     fi
-    if [ -z "$(grep -o $1 $INITRAMFS_CONF_FILE)" ]
+    if grep -q "$1" "$INITRAMFS_CONF_FILE"
     then
-        cat "$1 modeset=1" >> $INITRAMFS_CONF_FILE
+        cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE"
     else
         message "$1 already done " "warn"
     fi
@@ -102,15 +103,19 @@ configure_grub (){
 }
 
 configure_plymouth (){
-    local module=$(lsmod | grep -o "i915\|radeon" | head -1) 
+    local module
+    module=$(lsmod | grep -o "i915\|radeon" | head -1) 
     if [ ! "$module" == "" ]
     then
         message "\nConfigure drm modules for $module : "
-        configure_drm $module
+        configure_drm "$module"
         message "done" "ok"
         message "\nConfigure grub command line : "
-        local splash_enable=$(sed -rn 's/GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/\1/p' ${GRUB_DEFAULT_CONF_FILE} | grep -o "splash" )
-        [[ -z $splash_enable ]] && configure_grub || message "Grub splash kernel option exist " "warn"
+
+        local splash_enable
+        splash_enable=$(sed -rn 's/GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/\1/p' ${GRUB_DEFAULT_CONF_FILE} | grep -o "splash" )
+        
+        if [ -z "$splash_enable" ]; then configure_grub; else message "Grub splash kernel option exist " "warn"; fi
         message "done" "ok"
         message "\nSelect plymouth theme : "
         plymouth-set-default-theme -R spinner &>/dev/null
@@ -157,11 +162,4 @@ message "OK" "ok"
 #remove interface file until NM use network
 rm -rf /etc/network/interfaces
 
-#add elementary theme
-#mkdir -p /tmp/themes/
-#cd /tmp/themes/
-
-#download master.zip https://github.com/shimmerproject/elementary-xfce/archive/
-#unzip master.zip > /dev/null
-#mv elementary-xfce-master/* /usr/share/icons/
-#rm -rf *
+exit 0