diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h
index 30f5f519..4e856d26 100644
--- a/module_usb_audio/endpoint0/descriptors.h
+++ b/module_usb_audio/endpoint0/descriptors.h
@@ -1087,17 +1087,17 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
         .Audio_Out_InputTerminal =
         {
             .bLength                   = sizeof(USB_Descriptor_Audio_InputTerminal_t),
-            .bDescriptorType           = UAC_CS_DESCTYPE_INTERFACE,                
-            .bDescriptorSubtype        = UAC_CS_AC_INTERFACE_SUBTYPE_INPUT_TERMINAL,  
-            .bTerminalID               = ID_IT_USB,                                
-            .wTerminalType             = USB_TERMTYPE_USB_STREAMING,               
-            .bAssocTerminal            = 0x00,                                     
-            .bCSourceID                = ID_CLKSEL,                                
-            .bNrChannels               = NUM_USB_CHAN_OUT,                         
+            .bDescriptorType           = UAC_CS_DESCTYPE_INTERFACE,
+            .bDescriptorSubtype        = UAC_CS_AC_INTERFACE_SUBTYPE_INPUT_TERMINAL,
+            .bTerminalID               = ID_IT_USB,
+            .wTerminalType             = USB_TERMTYPE_USB_STREAMING,
+            .bAssocTerminal            = 0x00,
+            .bCSourceID                = ID_CLKSEL,
+            .bNrChannels               = NUM_USB_CHAN_OUT,
             .bmChannelConfig           = 0x00000000,                               /* TODO. Set me! */
             .iChannelNames             = offsetof(StringDescTable_t, outputChanStr_1)/sizeof(char *),
-            .bmControls                =  0x0000,                                   
-            .iTerminal                 = offsetof(StringDescTable_t, usbInputTermStr_Audio2)/sizeof(char *) 
+            .bmControls                =  0x0000,
+            .iTerminal                 = offsetof(StringDescTable_t, usbInputTermStr_Audio2)/sizeof(char *)
         },
 
 #if(OUTPUT_VOLUME_CONTROL == 1)
@@ -1293,20 +1293,20 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
         .Audio_In_OutputTerminal =
         {
             /* Output Terminal Descriptor (USB Streaming) */
-            .bLength                   = 0x0C,                           
-            .bDescriptorType           = UAC_CS_DESCTYPE_INTERFACE,                   
+            .bLength                   = 0x0C,
+            .bDescriptorType           = UAC_CS_DESCTYPE_INTERFACE,
             .bDescriptorSubtype        =  UAC_CS_AC_INTERFACE_SUBTYPE_OUTPUT_TERMINAL,
-            .bTerminalID               = ID_OT_USB,                      
+            .bTerminalID               = ID_OT_USB,
             .wTerminalType             = USB_TERMTYPE_USB_STREAMING,
-            .bAssocTerminal            = 0x00,                           
+            .bAssocTerminal            = 0x00,
 #if (INPUT_VOLUME_CONTROL == 1)
             .bSourceID                 = FU_USBIN,                   /* 7  bSourceID Connect to analog input feature unit*/
 #else
 
             .bSourceID                 = ID_IT_USB,                  /* 7  bSourceID Connect to analog input term */
 #endif
-            .bCSourceID                = ID_CLKSEL,                     
-            .bmControls                = 0x0000,               
+            .bCSourceID                = ID_CLKSEL,
+            .bmControls                = 0x0000,
             .iTerminal                 = offsetof(StringDescTable_t, usbOutputTermStr_Audio2)/sizeof(char *)
         },
 #endif
diff --git a/module_usb_audio/mixer/mixer.xc b/module_usb_audio/mixer/mixer.xc
index e2e91d06..04723ddc 100644
--- a/module_usb_audio/mixer/mixer.xc
+++ b/module_usb_audio/mixer/mixer.xc
@@ -436,14 +436,14 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
                 case SET_SAMPLE_FREQ:
                     sampFreq = inuint(c_host);
                     mixer1_mix2_flag = sampFreq > 96000;
-                    
+
                     /* Inform mixer2 (or audio()) about freq change */
                     outct(c_mixer2, command);
                     outuint(c_mixer2, sampFreq);
                     break;
-           
-                case SET_STREAM_FORMAT_OUT: 
-                case SET_STREAM_FORMAT_IN: 
+
+                case SET_STREAM_FORMAT_OUT:
+                case SET_STREAM_FORMAT_IN:
                      /* Inform mixer2 (or audio()) about format change */
                     outct(c_mixer2, command);
                     outuint(c_mixer2, inuint(c_host));
diff --git a/module_usb_audio/ports/audioports.xc b/module_usb_audio/ports/audioports.xc
index 026d9f20..28e0a77a 100644
--- a/module_usb_audio/ports/audioports.xc
+++ b/module_usb_audio/ports/audioports.xc
@@ -65,7 +65,7 @@ unsigned int divide)
     if (divide == 1) /* e.g. 176.4KHz from 11.2896 */
     {
         configure_port_clock_output(p_bclk, clk_audio_mclk);
-        
+
         /* Generate bit clock block straight from mclk */
         configure_clock_src(clk_audio_bclk, p_mclk_in);
     }
@@ -73,11 +73,11 @@ unsigned int divide)
     {
         /* bit clock port from master clock clock-clock block */
         configure_out_port_no_ready(p_bclk, clk_audio_mclk, 0);
-    
+
         /* Generate bit clock block from pin */
         configure_clock_src(clk_audio_bclk, p_bclk);
     }
-   
+
     if(!isnull(p_lrclk))
     {
         /* Clock LR clock from bit clock-block */