diff --git a/powerwall.sh b/powerwall.sh
index baf26a9e..590582dc 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -501,7 +501,6 @@ HOSTMGMT(){
 			echo -e "Invalid host\n"
 			exit 1
 		fi
-		echo "HERE: ${ESXI_HOST}"
 		
 		if [ ${MN} -eq 1 ]; then
 			[ "${ESXI_HOST}" == "ALL" ] && hostname="All Host Servers" || hostname="All ${ESXI_HOST} Host Servers"
@@ -519,11 +518,11 @@ HOSTMGMT(){
 	else
 		cHOST='-help'
 	fi
-	while [ "${cHOST}" != "" ]; do
-		case "${cHOST}" in
+	while [ $# -gt 0 ]; do
+		case "$1" in
 			-p|-power) POWER=${2}; MODE="power";;
 			-e|-esxi) ESXI=${2}; MODE="esxi";;
-			-h|-help)
+			*)
 				echo -e "Usage: ${idsCL[Yellow]}pw host {host} {flags}${idsCL[Default]} {"
 				width=35
 				printf "%-${width}s- %s\n" "    {host}" "(*required, can either be esxiIP,idracIP or Host#)"