diff --git a/powerwall.sh b/powerwall.sh
index d72b7d95..9278e7e8 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -23,9 +23,9 @@ CHECKTEMP(){
 	if [ "${1}" != "noavg" ]; then
 		[ "${1}" != "" ] && [[ "${1}" =~ ^[0-9]+$ ]] && avgdays=${1} || avgdays=3
 		[ ${avgdays} -lt 10 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays}
-		echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current / ${avgdays_disp}DayAVG   ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
+		echo -e "${idsCL[Cyan]}Sensor Temperature(s)               Current / ${avgdays_disp}DayAVG   ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
 	else
-		echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current    ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
+		echo -e "${idsCL[Cyan]}Sensor Temperature(s)               Current    ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
 	fi
 	DIVIDER . yellow 90
 		
@@ -157,11 +157,11 @@ CHECKTEMPSENSOR(){
 		fi
 		
 		if [ $(bc -l <<< "${temp_f} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${temp_f} < ${temp_crit}") -eq 1 ]; then
-			[ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING  (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Yellow]})${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING  (${spct}${temp_f}'F${idsCL[Yellow]})${idsCL[Default]}"
+			[ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING  (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING  (${spct}${temp_f}'F${idsCL[Default]}"
 		elif [ $(bc -l <<< "${temp_f} >= ${temp_crit}") -eq 1 ]; then
-			[ "${average}" != "" ] && echo -en "${idsCL[Red]}CRITICAL (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Red]})${idsCL[Default]}" || echo -en "${idsCL[Red]}CRITICAL (${spct}${temp_f}'F)${idsCL[Default]}"
+			[ "${average}" != "" ] && echo -en "${idsCL[Red]}CRITICAL${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Default]}" || echo -en "${idsCL[Red]}CRITICAL (${spct}${temp_f}'F${idsCL[Default]}"
 		else
-			[ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal   (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Green]})${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal   (${spct}${temp_f}'F)${idsCL[Default]}"
+			[ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal  ${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal   (${spct}${temp_f}'F${idsCL[Default]}"
 		fi
 		tmp="${spct}${temp_f}"
 		c=0; spc=''; spc1=`expr 9 - ${#tmp}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done