diff --git a/SamcoEnhanced/SamcoEnhanced.ino b/SamcoEnhanced/SamcoEnhanced.ino
index 486427f..28b0051 100644
--- a/SamcoEnhanced/SamcoEnhanced.ino
+++ b/SamcoEnhanced/SamcoEnhanced.ino
@@ -3788,18 +3788,12 @@ void TriggerNotFireSimple()
 {
     if(buttonPressed) {                              // Just to make sure we aren't spamming mouse button events.
         if(offscreenBShot) {                         // if it was marked as an offscreen button shot,
-            if(buttons.analogOutput) {		     //Check if gamepad mode is enabled
-                Gamepad16.release(LightgunButtons::ButtonDesc[BtnIdx_A].reportCode3); //If gamepad mode is enabled release A Button
-                } else {
-            	AbsMouse5.release(MOUSE_RIGHT);      // Release the right mouse,
-	    	}
+            if(buttons.analogOutput) { Gamepad16.release(LightgunButtons::ButtonDesc[BtnIdx_A].reportCode3); }
+	    else { AbsMouse5.release(MOUSE_RIGHT); }
             offscreenBShot = false;                  // And set it off.
         } else {                                     // Else,
-            if(buttons.analogOutput) {		     //Check if gamepad mode is enabled
-                Gamepad16.release(LightgunButtons::ButtonDesc[BtnIdx_Trigger].reportCode3); // If gamepad mode is enabled release the Trigger button
-            	} else {
-            	AbsMouse5.release(MOUSE_LEFT);       // It was a normal shot, so just release the left mouse button.
-	    	}
+            if(buttons.analogOutput) { Gamepad16.release(LightgunButtons::ButtonDesc[BtnIdx_Trigger].reportCode3); }
+	    else { AbsMouse5.release(MOUSE_LEFT); }
         }
         buttonPressed = false;                       // Unset the button pressed bit.
     }