diff --git a/linupx-scripts.sh b/linupx-scripts.sh
index 8703cd1..789b6db 100755
--- a/linupx-scripts.sh
+++ b/linupx-scripts.sh
@@ -55,7 +55,7 @@ UPDATE1() {
 	if type yum &>/dev/null; then
 		$APTFUNC -y update
 	else
-		if [ "$useAutoremove" -ne 0 ]; then AUTOREMOVE; fi
+		[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
 			
 		$APTFUNC update
 		$APTFUNC upgrade -y
@@ -67,7 +67,7 @@ UPDATE1() {
 			[Yy]) $APTFUNC dist-upgrade;;
 		esac
 		
-		if [ "$useAutoremove" -ne 0 ]; then AUTOREMOVE; fi
+		[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
 	fi
 	if [ "$opennms" = true ]; then
 		sudo apt-mark hold libopennms-java libopennmsdeps-java opennms-common opennms-db
@@ -94,7 +94,7 @@ UPDATE2() {
 		[Yy]) $APTFUNC dist-upgrade;;
 	esac
 	
-	if [ "$useAutoremove" -ne 0 ]; then AUTOREMOVE; fi
+	[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
 		
 	if [ "$opennms" = true ]; then
 		sudo apt-mark hold libopennms-java libopennmsdeps-java opennms-common opennms-db
@@ -162,7 +162,7 @@ UPDATE4() {
     if type yum &>/dev/null; then
 		yum -y update
 	else
-		if [ "$useAutoremove" -ne 0 ]; then 
+		if [[ "$useAutoremove" -ne 0 ]]; then
 			apt-get -y autoremove
 			apt-get update
 			apt-get upgrade -y
@@ -218,7 +218,7 @@ DNSUPDATE() {
 	read -n 1 -s -p "Press any key to continue"
 }
 AUTOREMOVE() {
-	if [ "$useAutoremove" -ne 0 ]; then 
+	if 	[[ "$useAutoremove" -ne 0 ]]; then 
 		if [ "$EUID" -ne 0 ]; then
 			sudo apt-get autoremove
 		else