diff --git a/src/device/usbd.h b/src/device/usbd.h
index f39ef2839..7575ef42c 100644
--- a/src/device/usbd.h
+++ b/src/device/usbd.h
@@ -809,7 +809,9 @@ TU_ATTR_WEAK bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb
   TUD_BTH_PRI_ITF(_itfnum, _stridx, _ep_evt, _ep_evt_size, _ep_evt_interval, _ep_in, _ep_out, _ep_size) \
   TUD_BTH_ISO_ITFS(_itfnum + 1, _ep_in + 1, _ep_out + 1, __VA_ARGS__)
 
-//------------- CDC-NCM -------------//
+//--------------------------------------------------------------------+
+// CDC-NCM Descriptor Templates
+//--------------------------------------------------------------------+
 
 // Length of template descriptor
 #define TUD_CDC_NCM_DESC_LEN  (8+9+5+5+13+6+7+9+9+7+7)
diff --git a/src/tusb.h b/src/tusb.h
index 2e1b7a43d..bdfcb5be6 100644
--- a/src/tusb.h
+++ b/src/tusb.h
@@ -76,9 +76,9 @@
     #include "class/msc/msc_device.h"
   #endif
 
-#if CFG_TUD_AUDIO
-  #include "class/audio/audio_device.h"
-#endif
+  #if CFG_TUD_AUDIO
+    #include "class/audio/audio_device.h"
+  #endif
 
   #if CFG_TUD_MIDI
     #include "class/midi/midi_device.h"
diff --git a/src/tusb_option.h b/src/tusb_option.h
index 369c35e2d..057bc61c2 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -284,10 +284,10 @@
   #ifndef CFG_TUH_ENUMERATION_BUFSIZE
     #define CFG_TUH_ENUMERATION_BUFSIZE 256
   #endif
-
-  //------------- CLASS -------------//
 #endif // TUSB_OPT_HOST_ENABLED
 
+//------------- CLASS -------------//
+
 #ifndef CFG_TUH_HUB
 #define CFG_TUH_HUB    0
 #endif