diff --git a/backends/kiibohd.py b/backends/kiibohd.py
index 9604a1f..c9e43a1 100644
--- a/backends/kiibohd.py
+++ b/backends/kiibohd.py
@@ -219,7 +219,6 @@ class Backend( BackendBase ):
 		self.fill_dict['ResultMacroList'] += "};"
 		
 		results_count = len( macros.resultsIndexSorted );
-		print( "Results count: ", results_count )
 
 
 		## Result Macro Record ##
@@ -230,7 +229,7 @@ class Backend( BackendBase ):
 		self.fill_dict['TriggerMacros'] = ""
 
 		# Iterate through each of the trigger macros
-		triggers_count = 0;
+		triggers_count = len( macros.triggersIndexSorted );
 		for trigger in range( 0, len( macros.triggersIndexSorted ) ):
 			self.fill_dict['TriggerMacros'] += "Guide_TM( {0} ) = {{ ".format( trigger )
 
@@ -251,17 +250,16 @@ class Backend( BackendBase ):
 					# TODO Add support for Analog keys
 					# TODO Add support for LED states
 					self.fill_dict['TriggerMacros'] += "0x00, 0x01, 0x{0:02X}, ".format( triggerItem )
-					triggers_count += 1
 
 			# Add list ending 0 and end of list
 			self.fill_dict['TriggerMacros'] += "0 };\n"
 		self.fill_dict['TriggerMacros'] = self.fill_dict['TriggerMacros'][ :-1 ] # Remove last newline
 
-		print( "Triggers count:", triggers_count )
-
 		# check for too small stateWordSize
 		if stateWordSize == "8" and (triggers_count > 255 or results_count > 255):
-			print ("{0} Over 255 trigger or result macros, changing stateWordSize to 16.".format( WARNING ) )
+			print ("{0} Over 255 trigger or result macros, changing stateWordSize from {1} to 16.".format( WARNING, stateWordSize ) )
+			print( "Results count: ", results_count )
+			print( "Triggers count:", triggers_count )
 			stateWordSize == "16"
 			self.fill_dict['Defines'] = self.fill_dict['Defines'].replace("StateWordSize_define 8", "StateWordSize_define 16")
 			#print (self.fill_dict['Defines'])