diff --git a/PS3USB.cpp b/PS3USB.cpp
index c91e8074..1f6226eb 100644
--- a/PS3USB.cpp
+++ b/PS3USB.cpp
@@ -221,14 +221,15 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
         bPollEnable = true;
         Notify(PSTR("\r\n"), 0x80);
         timer = millis();
-        return 0; // successful configuration
+        return 0; // Successful configuration
 
-        /* diagnostic messages */
+        /* Diagnostic messages */
 FailGetDevDescr:
 #ifdef DEBUG_USB_HOST
         NotifyFailGetDevDescr();
         goto Fail;
 #endif
+
 FailSetDevTblEntry:
 #ifdef DEBUG_USB_HOST
         NotifyFailSetDevTblEntry();
@@ -238,8 +239,8 @@ FailSetDevTblEntry:
 FailSetConfDescr:
 #ifdef DEBUG_USB_HOST
         NotifyFailSetConfDescr();
-        goto Fail;
 #endif
+        goto Fail;
 
 FailUnknownDevice:
 #ifdef DEBUG_USB_HOST
@@ -247,8 +248,8 @@ FailUnknownDevice:
 #endif
         rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
 
-#ifdef DEBUG_USB_HOST
 Fail:
+#ifdef DEBUG_USB_HOST
         Notify(PSTR("\r\nPS3 Init Failed, error code: "), 0x80);
         NotifyFail(rcode);
 #endif
diff --git a/XBOXOLD.cpp b/XBOXOLD.cpp
index f82efc0c..e60330c8 100644
--- a/XBOXOLD.cpp
+++ b/XBOXOLD.cpp
@@ -214,16 +214,17 @@ FailSetDevTblEntry:
 FailSetConfDescr:
 #ifdef DEBUG_USB_HOST
         NotifyFailSetConfDescr();
-        goto Fail;
 #endif
+        goto Fail;
+
 FailUnknownDevice:
 #ifdef DEBUG_USB_HOST
         NotifyFailUnknownDevice(VID, PID);
 #endif
         rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
 
-#ifdef DEBUG_USB_HOST
 Fail:
+#ifdef DEBUG_USB_HOST
         Notify(PSTR("\r\nXbox Init Failed, error code: "), 0x80);
         NotifyFail(rcode);
 #endif
diff --git a/XBOXUSB.cpp b/XBOXUSB.cpp
index 2228af7e..a7900811 100644
--- a/XBOXUSB.cpp
+++ b/XBOXUSB.cpp
@@ -201,16 +201,17 @@ FailSetDevTblEntry:
 FailSetConfDescr:
 #ifdef DEBUG_USB_HOST
         NotifyFailSetConfDescr();
-        goto Fail;
 #endif
+        goto Fail;
+
 FailUnknownDevice:
 #ifdef DEBUG_USB_HOST
         NotifyFailUnknownDevice(VID, PID);
 #endif
         rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
 
-#ifdef DEBUG_USB_HOST
 Fail:
+#ifdef DEBUG_USB_HOST
         Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
         NotifyFail(rcode);
 #endif