diff --git a/friendica-clean-database.sh b/friendica-clean-database.sh
index c363f46..716cb34 100755
--- a/friendica-clean-database.sh
+++ b/friendica-clean-database.sh
@@ -2,14 +2,14 @@
 interval=14
 sudo mariadb friendica --verbose -v -v --show-warnings --execute=\
 "DELETE FROM \`post-origin\` WHERE (\`parent-uri-id\`, \`uid\`) IN (SELECT \`uri-id\`, \`uid\` FROM \`post-user\` WHERE \`gravity\` = 0 AND \
-  \`deleted\` AND \`edited\` < (CURDATE() - INTERVAL $interval DAY));\
+  \`deleted\` AND \`edited\` < (CURDATE() - INTERVAL ${interval} DAY));\
 DELETE FROM \`post-user\` WHERE \`gravity\` = 0 AND \
-  \`deleted\` AND \`edited\` < (CURDATE() - INTERVAL $interval DAY);\
+  \`deleted\` AND \`edited\` < (CURDATE() - INTERVAL ${interval} DAY);\
 DELETE FROM \`post\` WHERE \`uri-id\` NOT IN (SELECT \`uri-id\` FROM \`post-user\`);\
 DELETE FROM \`post-content\` WHERE \`uri-id\` NOT IN (SELECT \`uri-id\` FROM \`post-user\`);\
 DELETE FROM \`post-thread\` WHERE \`uri-id\` NOT IN (SELECT \`uri-id\` FROM \`post-user\`);\
 DELETE FROM \`post-user\` WHERE \`uri-id\` NOT IN (SELECT \`uri-id\` FROM \`post\`);\
-DELETE FROM \`item-uri\` WHERE \`id\` IN (SELECT \`uri-id\` FROM \`post-thread\` WHERE \`received\` < (CURDATE() - INTERVAL $interval DAY) \
+DELETE FROM \`item-uri\` WHERE \`id\` IN (SELECT \`uri-id\` FROM \`post-thread\` WHERE \`received\` < (CURDATE() - INTERVAL ${interval} DAY) \
   AND NOT \`uri-id\` IN (SELECT \`uri-id\` FROM \`post-thread-user\` \
     WHERE (\`mention\` OR \`starred\` OR \`wall\`) AND \`uri-id\` = \`post-thread\`.\`uri-id\`) \
   AND NOT \`uri-id\` IN (SELECT \`uri-id\` FROM \`post-category\` \
@@ -24,11 +24,11 @@ DELETE FROM \`item-uri\` WHERE \`id\` IN (SELECT \`uri-id\` FROM \`post-thread\`
     WHERE (\`origin\` OR \`event-id\` != 0 OR \`post-type\` = 128) AND \`parent-uri-id\` = \`post-thread\`.\`uri-id\`) \
   AND NOT \`uri-id\` IN (SELECT \`uri-id\` FROM \`post-content\` \
     WHERE \`resource-id\` != 0 AND \`uri-id\` = \`post-thread\`.\`uri-id\`));\
-DELETE FROM \`item-uri\` WHERE \`id\` IN (SELECT \`uri-id\` FROM \`post-user\` WHERE \`gravity\` = 0 AND \`uid\` = 0 AND \`received\` < (CURDATE() - INTERVAL $interval DAY) \
+DELETE FROM \`item-uri\` WHERE \`id\` IN (SELECT \`uri-id\` FROM \`post-user\` WHERE \`gravity\` = 0 AND \`uid\` = 0 AND \`received\` < (CURDATE() - INTERVAL ${interval} DAY) \
   AND NOT \`uri-id\` IN (\
     SELECT \`parent-uri-id\` FROM \`post-user\` AS \`i\` WHERE \`i\`.\`uid\` != 0 AND \`i\`.\`parent-uri-id\` = \`post-user\`.\`uri-id\`\
   ) AND NOT \`uri-id\` IN (\
-    SELECT \`parent-uri-id\` FROM \`post-user\` AS \`i\` WHERE \`i\`.\`uid\` = 0 AND \`i\`.\`parent-uri-id\` = \`post-user\`.\`uri-id\` AND \`i\`.\`received\` > (CURDATE() - INTERVAL $interval DAY)\
+    SELECT \`parent-uri-id\` FROM \`post-user\` AS \`i\` WHERE \`i\`.\`uid\` = 0 AND \`i\`.\`parent-uri-id\` = \`post-user\`.\`uri-id\` AND \`i\`.\`received\` > (CURDATE() - INTERVAL ${interval} DAY)\
   )\
 );\
 DELETE FROM \`attach\` WHERE \`id\` NOT IN (SELECT \`attach-id\` FROM \`post-media\`);\
diff --git a/friendica-find-missing-servers.sh b/friendica-find-missing-servers.sh
index a43edb9..362fb40 100755
--- a/friendica-find-missing-servers.sh
+++ b/friendica-find-missing-servers.sh
@@ -3,43 +3,43 @@ db="friendica"
 tmpfile="/tmp/sitesdown.txt"
 idsdownfile="/tmp/idsdown.txt"
 loop_1() {
-	sitereq=$(curl -s -L --head -m 10 --request GET "$a")
-	status=$(echo "$sitereq" | grep -e "200" -e "cloudflare")
-	if [[ -z $status ]]
+	sitereq=$(curl -s -L --head -m 10 --request GET "${a}")
+	status=$(echo "${sitereq}" | grep -e "200" -e "cloudflare")
+	if [[ -z ${status} ]]
 	then
-		echo "$a" >> "$tmpfile"
-		echo "Added $a"
+		echo "${a}" >> "${tmpfile}"
+		echo "Added ${a}"
 	fi
 }
 loop_2() {
-	echo "Finding users for $b"
-	mariadb "$db" -N -B -q -e "select \`id\` from contact c where \"$b\" not in (select \`contact-id\` from group_member) and (c.baseurl = \"$b\" or c.url = \"$b\")" | sudo tee -a "$idsdownfile" &> /dev/null
+	echo "Finding users for ${b}"
+	mariadb "${db}" -N -B -q -e "select \`id\` from contact c where \"${b}\" not in (select \`contact-id\` from group_member) and (c.baseurl = \"${b}\" or c.url = \"${b}\")" | sudo tee -a "${idsdownfile}" &> /dev/null
 }
 
 loop_3() {
-	echo "Deleting user $lineb"
-	mariadb "$db" -N -B -q -e "delete from \`contact\` where \`id\` = $lineb"
-	mariadb "$db" -N -B -q -e "delete from \`post-thread\` where \`author-id\` = $lineb or \`causer-id\` = $lineb or \`owner-id\` = $lineb"
-	mariadb "$db" -N -B -q -e "delete from \`post-thread-user\` where \`author-id\` = $lineb or \`causer-id\` = $lineb  or \`owner-id\` = $lineb"
-	mariadb "$db" -N -B -q -e "delete from \`post-user\` where \`author-id\` = $lineb  or \`causer-id\` = $lineb or \`owner-id\` = $lineb"
-	mariadb "$db" -N -B -q -e "delete from \`post-tag\` where cid = $lineb"
-	mariadb "$db" -N -B -q -e "delete from \`post\` where \`owner-id\` = $lineb or \`author-id\` = $lineb or \`causer-id\` = $lineb"
-	mariadb "$db" -N -B -q -e "delete from \`photo\` where \`contact-id\` = $lineb"
-	mariadb "$db" -N -B -q -e "delete from \`contact\` where \`id\` = $lineb"
+	echo "Deleting user ${lineb}"
+	mariadb "${db}" -N -B -q -e "delete from \`contact\` where \`id\` = ${lineb}"
+	mariadb "${db}" -N -B -q -e "delete from \`post-thread\` where \`author-id\` = ${lineb} or \`causer-id\` = ${lineb} or \`owner-id\` = ${lineb}"
+	mariadb "${db}" -N -B -q -e "delete from \`post-thread-user\` where \`author-id\` = ${lineb} or \`causer-id\` = ${lineb}  or \`owner-id\` = ${lineb}"
+	mariadb "${db}" -N -B -q -e "delete from \`post-user\` where \`author-id\` = ${lineb}  or \`causer-id\` = ${lineb} or \`owner-id\` = ${lineb}"
+	mariadb "${db}" -N -B -q -e "delete from \`post-tag\` where cid = ${lineb}"
+	mariadb "${db}" -N -B -q -e "delete from \`post\` where \`owner-id\` = ${lineb} or \`author-id\` = ${lineb} or \`causer-id\` = ${lineb}"
+	mariadb "${db}" -N -B -q -e "delete from \`photo\` where \`contact-id\` = ${lineb}"
+	mariadb "${db}" -N -B -q -e "delete from \`contact\` where \`id\` = ${lineb}"
 }
 
 #Check if our dependencies are installed
-if [[ $(type curl) && $(type mariadb) && $(type date) ]]
+if [[ -n $(type curl) && -n $(type mariadb) && -n $(type date) ]]
 then
 	date
-	if [[ ! -f "$tmpfile" ]]
+	if [[ ! -f "${tmpfile}" ]]
 	then
 		echo "Listing sites"
-		sites=($(mariadb "$db" -N -B -q -e "select distinct baseurl from contact" | sort -n | uniq ))
+		sites=($(mariadb "${db}" -N -B -q -e "select distinct baseurl from contact" | sort -n | uniq ))
 		echo "Amount of unique sites: ${#sites[@]}"
 		for a in "${sites[@]}"
 		do
-			loop_1 "$a" &
+			loop_1 "${a}" &
 			if [[ $(jobs -r -p | wc -l) -ge $(expr $(getconf _NPROCESSORS_ONLN)*2) ]]
 			then
 				wait -n
@@ -49,14 +49,14 @@ then
 	fi
 	sitesdown=()
 	while read -r line; do
-		sitesdown+=($line)
-	done < "$tmpfile"
+		sitesdown+=(${line})
+	done < "${tmpfile}"
 	echo "Amount of sites down: ${#sitesdown[@]} / ${#sites[@]}"
-	if [[ ! -f "$idsdownfile" ]]
+	if [[ ! -f "${idsdownfile}" ]]
 	then
 		for b in "${sitesdown[@]}"
 		do
-			loop_2 "$b" &
+			loop_2 "${b}" &
 			if [[ $(jobs -r -p | wc -l) -ge $(expr $(getconf _NPROCESSORS_ONLN)/2) ]]
 			then
 				wait -n
@@ -67,14 +67,14 @@ then
 	fi
 	while read -r lineb; do
 		#The community no longer exists, delete
-		loop_3 "$lineb" &
+		loop_3 "${lineb}" &
 		if [[ $(jobs -r -p | wc -l) -ge $(expr $(getconf _NPROCESSORS_ONLN)/2) ]]
 		then
 			wait -n
 		fi
 		wait
-	done < "$idsdownfile"
-	rm "$tmpfile" 2> /dev/null
-	rm "$idsdownfile" 2> /dev/null
+	done < "${idsdownfile}"
+	rm "${tmpfile}" 2> /dev/null
+	rm "${idsdownfile}" 2> /dev/null
 	date
 fi
diff --git a/friendica-fix-avatar-permissions.sh b/friendica-fix-avatar-permissions.sh
index 77ffc37..58bfa48 100755
--- a/friendica-fix-avatar-permissions.sh
+++ b/friendica-fix-avatar-permissions.sh
@@ -11,15 +11,15 @@ folder=/var/www/friendica
 folderescaped=${folder////\\/}
 tmpfile=/tmp/friendica-fix-avatar-permissions.txt
 avatarfolder=avatar
-cd "$folder" || exit
-if [ ! -f "$tmpfile" ]
+cd "${folder}" || exit
+if [[ ! -f "${tmpfile}" ]]
 then
-	sudo -u "$user" bin/console movetoavatarcache | sudo tee "$tmpfile" #&> /dev/null
+	sudo -u "${user}" bin/console movetoavatarcache | sudo tee "${tmpfile}" #&> /dev/null
 fi
-grep -e "https://$site/$avatarfolder/" "$tmpfile" | sed -e "s/.*$site/$folderescaped/g" -e "s/-.*/\*/g" | (
+grep -e "https://${site}/${avatarfolder}/" "${tmpfile}" | sed -e "s/.*${site}/${folderescaped}/g" -e "s/-.*/\*/g" | (
 	while read n
 	do
-		find "$folder/$avatarfolder" -path "$n" -type f | (
+		find "${folder}/${avatarfolder}" -path "${n}" -type f | (
 			while read p
 			do
 				if [[ "${p}" =~ ".jpeg" || "${p}" =~ ".jpg" ]]
@@ -58,11 +58,11 @@ grep -e "https://$site/$avatarfolder/" "$tmpfile" | sed -e "s/.*$site/$folderesc
 				if [[ "${p}" =~ ".webp" ]]
 				then
 					cwebp -mt -af -quiet "${p}" -o /tmp/temp.webp #&> /dev/null
-					if [ -f /tmp/temp.webp ]
+					if [[ -f /tmp/temp.webp ]]
 					then
 						size_new=$(stat -c%s "/tmp/temp.webp")
 						size_original=$(stat -c%s "${p}")
-						if [ "$size_original" -gt "$size_new" ]
+						if [[ "${size_original}" -gt "${size_new}" ]]
 						then
 							mv /tmp/temp.webp "${p}"
 						else
@@ -75,10 +75,10 @@ grep -e "https://$site/$avatarfolder/" "$tmpfile" | sed -e "s/.*$site/$folderesc
 	done
 )
 wait
-rm "$tmpfile"
-/usr/bin/find $folder/avatar -type d -empty -delete
-/usr/bin/chmod $folderperm $folder/avatar
-/usr/bin/chown -R $user:$group $folder/avatar
-/usr/bin/find $folder/avatar -depth -not -user $user -or -not -group $group -print0 | xargs -0 -r sudo chown -v $user:$group #&> /dev/null
-/usr/bin/find $folder/avatar -depth -type d -and -not -type f -and -not -perm $folderperm -print0 | xargs -0 -r sudo chmod -v $folderperm #&> /dev/null
-/usr/bin/find $folder/avatar -depth -type f -and -not -type d -and -not -perm $fileperm -print0 | xargs -0 -r sudo chmod -v $fileperm #&> /dev/null
+rm "${tmpfile}"
+/usr/bin/find "${folder}"/avatar -type d -empty -delete
+/usr/bin/chmod "${folderperm}" "${folder}"/avatar
+/usr/bin/chown -R "${user}":"${group}" "${folder}"/avatar
+/usr/bin/find "${folder}"/avatar -depth -not -user "${user}" -or -not -group "${group}" -print0 | xargs -0 -r sudo chown -v "${user}":"${group}" #&> /dev/null
+/usr/bin/find "${folder}"/avatar -depth -type d -and -not -type f -and -not -perm "${folderperm}" -print0 | xargs -0 -r sudo chmod -v "${folderperm}" #&> /dev/null
+/usr/bin/find "${folder}"/avatar -depth -type f -and -not -type d -and -not -perm "${fileperm}" -print0 | xargs -0 -r sudo chmod -v "${fileperm}" #&> /dev/null
diff --git a/friendica-non-follower-featured-posts.sh b/friendica-non-follower-featured-posts.sh
index ff7e94a..feb3221 100755
--- a/friendica-non-follower-featured-posts.sh
+++ b/friendica-non-follower-featured-posts.sh
@@ -1,57 +1,57 @@
 #!/bin/bash
 ca=100
 camax=0
-while [[ $ca -gt 0 ]]
+while [[ ${ca} -gt 0 ]]
 do
-	ca=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(regexp_replace(\`parameter\`, '\\\[', ''), '\\\]', '') not in (select \`id\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`)) and \`command\` = \"UpdateContact\" limit $ca; select row_count();")
+	ca=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(regexp_replace(\`parameter\`, '\\\[', ''), '\\\]', '') not in (select \`id\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`)) and \`command\` = \"UpdateContact\" limit ${ca}; select row_count();")
 	camax=$(( camax + ca ))
-	printf "\rUpdateContact\t\t%s\r" "$camax"
+	printf "\rUpdateContact\t\t%s\r" "${camax}"
 done
-printf "\rUpdateContact\t\t%s\n\r" "$camax"
+printf "\rUpdateContact\t\t%s\n\r" "${camax}"
 #echo "UpdateContact      $camax"
 
 cb=100
 cbmax=0
-while [[ $cb -gt 0 ]]
+while [[ ${cb} -gt 0 ]]
 do
-	cb=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(regexp_replace(\`parameter\`, '\\\[', ''), '\\\]', '') not in (select \`id\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`)) and \`command\` = \"ContactDiscovery\" limit $cb; select row_count();")
+	cb=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(regexp_replace(\`parameter\`, '\\\[', ''), '\\\]', '') not in (select \`id\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`)) and \`command\` = \"ContactDiscovery\" limit ${cb}; select row_count();")
 	cbmax=$(( cbmax + cb ))
-	printf "\rContactDiscovery\t%s\r" "$cbmax"
+	printf "\rContactDiscovery\t%s\r" "${cbmax}"
 done
-printf "\rContactDiscovery\t%s\n\r" "$cbmax"
+printf "\rContactDiscovery\t%s\n\r" "${cbmax}"
 #echo "ContactDiscovery   $cbmax"
 
 cc=100
 ccmax=0
-while [[ $cc -gt 0 ]]
+while [[ ${cc} -gt 0 ]]
 do
-	cc=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(substring_index(substring_index(\`parameter\`, '\\\"', -2), '\\\"', 1), '\\\\\\\\', '') not in (select \`url\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`)) and \`command\` = \"FetchFeaturedPosts\" limit $cc; select row_count();")
+	cc=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(substring_index(substring_index(\`parameter\`, '\\\"', -2), '\\\"', 1), '\\\\\\\\', '') not in (select \`url\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`)) and \`command\` = \"FetchFeaturedPosts\" limit ${cc}; select row_count();")
 	ccmax=$(( ccmax + cc ))
-	printf "\rFetchFeaturedPosts\t%s\r" "$ccmax"
+	printf "\rFetchFeaturedPosts\t%s\r" "${ccmax}"
 
 done
-printf "\rFetchFeaturedPosts\t%s\n\r" "$ccmax"
+printf "\rFetchFeaturedPosts\t%s\n\r" "${ccmax}"
 #echo "FetchFeaturedPosts $ccmax"
 
 cd=100
 cdmax=0
-while [[ $cd -gt 0 ]]
+while [[ ${cd} -gt 0 ]]
 do
-	cd=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(substring_index(substring_index(\`parameter\`, '\\\"', -2), '\\\"', 1), '\\\\\\\\', '') not in (select \`url\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`)) and \`command\` = \"UpdateGServer\" limit $cd; select row_count();")
+	cd=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(substring_index(substring_index(\`parameter\`, '\\\"', -2), '\\\"', 1), '\\\\\\\\', '') not in (select \`url\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`)) and \`command\` = \"UpdateGServer\" limit ${cd}; select row_count();")
 	cdmax=$(( cdmax + cd ))
-	printf "\rUpdateGServer\t\t%s\r" "$cdmax"
+	printf "\rUpdateGServer\t\t%s\r" "${cdmax}"
 done
-printf "\rUpdateGServer\t\t%s\n\r" "$cdmax"
+printf "\rUpdateGServer\t\t%s\n\r" "${cdmax}"
 #echo "UpdateGServer      $cdmax"
 
 ce=100
 cemax=0
-while [[ $ce -gt 0 ]]
+while [[ ${ce} -gt 0 ]]
 do
-	ce=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where command=\"ProcessQueue\" and pid=0 and done=0 limit $ce; select row_count();")
+	ce=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where command=\"ProcessQueue\" and pid=0 and done=0 limit ${ce}; select row_count();")
 	cemax=$(( cemax + ce ))
-	printf "\rProcessQueue\t\t%s\r" "$cemax"
+	printf "\rProcessQueue\t\t%s\r" "${cemax}"
 done
-printf "\rProcessQueue\t\t%s\n\r" "$cemax"
+printf "\rProcessQueue\t\t%s\n\r" "${cemax}"
 #echo "ProcessQueue       $cemax"
 
diff --git a/friendica-remove-old-photos-parallel.sh b/friendica-remove-old-photos-parallel.sh
index 7d68406..5d2504c 100755
--- a/friendica-remove-old-photos-parallel.sh
+++ b/friendica-remove-old-photos-parallel.sh
@@ -8,49 +8,49 @@ folder=/var/www/friendica
 folderavatar=/var/www/friendica/avatar
 loop() {
 	#Parse each file in folder
-	ky=$(echo "$y" | sed -e "s/$folderescaped/https:\/\/$url/g" -e "s/-[0-9]*\..*\$//g")
-	f=$(sudo mariadb $db -N -B -q -e "select photo from contact where photo like '$ky%' limit 1")
-	if [[ $? -eq 0 && -z $f && -f $y ]]
+	ky=$(echo "${y}" | sed -e "s/${folderescaped}/https:\/\/${url}/g" -e "s/-[0-9]*\..*\$//g")
+	f=$(sudo mariadb "${db}" -N -B -q -e "select photo from contact where photo like '${ky}%' limit 1")
+	if [[ $? -eq 0 && -z ${f} && -f ${y} ]]
 	then
-		ls -lh "$y"
-		sudo rm -rf "$y"
+		ls -lh "${y}"
+		sudo rm -rf "${y}"
 		d=$(( d + 1 ))
 	fi
 	#printf "\rPhotos: %s\tFolder %s\tEntry %s   " "$d" "$n" "$m"
-	printf "\rFolder %s\tEntry %s  " "$n" "$m"
-	return $d
+	printf "\rFolder %s\tEntry %s  " "${n}" "${m}"
+	return "${d}"
 }
 
 date
 #Go to the Friendica installation
-cd "$folderavatar" || exit
+cd "${folderavatar}" || exit
 let "indexlength=37+${#url}"
 (( indexlength=49+${#url} ))
-sudo mariadb $db -e "alter table contact add index if not exists photo_index (photo($indexlength))"
+sudo mariadb "${db}" -e "alter table contact add index if not exists photo_index (photo(${indexlength}))"
 n=0
 d=0
-sudo find "$folderavatar" -depth -mindepth 1 -maxdepth 1 -type d | while read -r x
+sudo find "${folderavatar}" -depth -mindepth 1 -maxdepth 1 -type d | while read -r x
 do
 	n=$(( n + 1 ))
 	#If the directory still exists
-        if [[ -d "$x" ]]
+        if [[ -d "${x}" ]]
         then
                 folderescaped=${folder////\\/}
-                kx=$(echo "$x" | sed -e "s/$folderescaped/https:\/\/$url/g" -e "s/-[0-9]*\..*\$//g")
-                if [[ -d $x ]]
+                kx=$(echo "${x}" | sed -e "s/${folderescaped}/https:\/\/${url}/g" -e "s/-[0-9]*\..*\$//g")
+                if [[ -d ${x} ]]
                 then
 			m=0
 			while read -r y
 			do
 				m=$(( m + 1 ))
-				loop "$x" "$m" "$n" "$d" &
+				loop "${x}" "${m}" "${n}" "${d}" &
 			        if [[ $(jobs -r -p | wc -l) -ge $(( $(getconf _NPROCESSORS_ONLN) / 1 )) ]]
 			        then
                 			wait -n
 			        fi
-			done < <(sudo find "$x" -type f -mtime -8)
+			done < <(sudo find "${x}" -type f -mtime -8)
                 fi
         fi
 done
-sudo mariadb $db -e "alter table contact drop index photo_index"
+sudo mariadb "${db}" -e "alter table contact drop index photo_index"
 date
diff --git a/media-optimize-local.sh b/media-optimize-local.sh
index 28585bf..abbc6f0 100755
--- a/media-optimize-local.sh
+++ b/media-optimize-local.sh
@@ -40,13 +40,13 @@ IFS="
         while read s
 	do
             nice -n 15 cwebp -mt -af -quiet "${s}" -o /tmp/"${s##.*\/}"_temp.webp
-            if [ -f /tmp/"${s##.*\/}"_temp.webp ]
+            if [[ -f /tmp/"${s##.*\/}"_temp.webp ]]
             then
                 size_new=$(stat -c%s /tmp/"${s##.*\/}"_temp.webp)
                 size_original=$(stat -c%s "${s}")
-                if [ "$size_original" -gt "$size_new" ]
+                if [[ "${size_original}" -gt "${size_new}" ]]
                 then
-                    mv /tmp/"${s##.*\/}"_temp.webp "$s"
+                    mv /tmp/"${s##.*\/}"_temp.webp "${s}"
                 else
                     rm /tmp/"${s##.*\/}"_temp.webp
                 fi