diff --git a/default.inc b/default.inc
index 1054dda..6a2d3e5 100755
--- a/default.inc
+++ b/default.inc
@@ -148,32 +148,32 @@ ROUND_NUMBER(){
 SHOW_TIME() {
 	num=$(ROUND_NUMBER ${1})
 	min=0; hour=0; day=0
-    if((num>59));then ((sec=num%60)); ((num=num/60))
-    if((num>59));then ((min=num%60)); ((num=num/60))
-	if((num>23));then ((hour=num%24)); ((day=num/24))
+    if ((num>59));then ((sec=num%60)); ((num=num/60))
+    if ((num>59));then ((min=num%60)); ((num=num/60))
+	if ((num>23));then ((hour=num%24)); ((day=num/24))
 	else ((hour=num)); fi; else ((min=num)); fi; else ((sec=num)); fi
 	
 	t=''
 	if [ $day != 0 ]; then
-		if((min>29)); then
+		if ((min>29)); then
 			((hour=hour+1))
-			if((hour>23)); then
+			if ((hour>23)); then
 				((hour=0))
 				((day=day+1))
 			fi
 		fi
 		t+="${day} days";
-		if [ $hour != 0 ]; then t+=", "; fi
+		[ $hour != 0 ] && t+=", "
 	fi
 	if [ $hour != 0 ]; then
 		t+="${hour} hours"
 	fi
 	if [ $min != 0 ] && [ $day = 0 ]; then
-		if [ $hour != 0 ]; then t+=", "; fi
+		[ $hour != 0 ] && t+=", "
 		t+="${min} mins"
 	fi
-	if [ "${2}" == "s" ] || ([ $day = 0 ] && [ $hour = 0 ] && [ $min = 0 ]); then
-		if [ $hour != 0 ] || [ $min != 0 ]; then t+=", "; fi
+	if [ ${sec} -ne 0 ] && ([ "${2}" == "s" ] || ([ $day -eq 0 ] && [ $hour -eq 0 ] && [ $min -eq 0 ])); then
+		([ $hour -ne 0 ] || [ $min -ne 0 ]) && t+=", "
 		t+="${sec} secs"
 	fi
     echo ${t}