diff --git a/yab-IDE/Templates/Basic Template b/yab-IDE/Templates/Basic Template
index 39fdf8b..f223284 100644
--- a/yab-IDE/Templates/Basic Template	
+++ b/yab-IDE/Templates/Basic Template	
@@ -19,12 +19,12 @@ while(not leavingLoop)
 		if(DEBUG and msg$(everyCommand)<>"") print msg$(everyCommand)
 
 		switch(msg$(everyCommand))
-			case "_QuitRequested":
-			case "MainWindow:_QuitRequested":
+			case "_QuitRequested"
+			case "MainWindow:_QuitRequested"
 				leavingLoop = true
 				break
-			default:
-				break
+			default
+				
 		end switch
 
 	next everyCommand
diff --git a/yab-IDE/Templates/Menu Template b/yab-IDE/Templates/Menu Template
index 84a4e17..8096440 100644
--- a/yab-IDE/Templates/Menu Template	
+++ b/yab-IDE/Templates/Menu Template	
@@ -19,16 +19,16 @@ while(not leavingLoop)
 		if(DEBUG and msg$(everyCommand)<>"") print msg$(everyCommand)
 
 		switch(msg$(everyCommand))
-			case "_QuitRequested":
+			case "_QuitRequested"
 			case "MainView:_QuitRequested":
-			case translate$("MainView:File:Quit"):
+			case translate$("MainView:File:Quit")
 				leavingLoop = true
 				break
-			case translate$("MainView:Help:Help"):
+			case translate$("MainView:Help:Help")
 				alert "The Help button was pressed", "Cool !", "idea" 
 				break
-			default:
-				break
+			default
+				
 		end switch
 
 	next everyCommand
diff --git a/yab-IDE/Templates/Toolbar Template b/yab-IDE/Templates/Toolbar Template
index 96c8795..bc4145e 100644
--- a/yab-IDE/Templates/Toolbar Template	
+++ b/yab-IDE/Templates/Toolbar Template	
@@ -24,17 +24,16 @@ while(not leavingLoop)
 		if(DEBUG and msg$(everyCommand)<>"") print msg$(everyCommand)
 
 		switch(msg$(everyCommand))
-			case "MainView:_QuitRequested":
-			case "_QuitRequested":
-			case translate$("MainView:File:Quit"):
+			case "MainView:_QuitRequested"
+			case "_QuitRequested"
+			case translate$("MainView:File:Quit")
 				leavingLoop = true
 				break
-			case "Help":
-			case translate$("MainView:Help:Help"):
+			case "Help"
+			case translate$("MainView:Help:Help")
 			alert "The Help button was pressed", "Cool !", "idea" 
 				break
-			default:
-				break
+			default
 		end switch
 
 	next everyCommand