diff --git a/slsDetectorServers/eigerDetectorServer/Beb.h b/slsDetectorServers/eigerDetectorServer/Beb.h
index ea376facf..9c7187bf0 100644
--- a/slsDetectorServers/eigerDetectorServer/Beb.h
+++ b/slsDetectorServers/eigerDetectorServer/Beb.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <stdlib.h>
 #include "LocalLinkInterface.h"
 #include "slsDetectorServer_defs.h"
+#include <stdlib.h>
 
 struct BebInfo {
     unsigned int beb_number;
diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c
index 1233ec55e..f5481fd7b 100644
--- a/slsDetectorServers/eigerDetectorServer/FebControl.c
+++ b/slsDetectorServers/eigerDetectorServer/FebControl.c
@@ -1841,10 +1841,10 @@ int Feb_Control_PrepareForAcquisition() { // return 1;
     reg_nums[5] = DAQ_REG_SUBFRAME_EXPOSURES;
     reg_vals[5] =
         Feb_Control_subframe_exposure_time_in_10nsec; //(1 means 10ns, 100 means
-                                                      //1000ns)
+                                                      // 1000ns)
     reg_nums[6] = DAQ_REG_SUBFRAME_PERIOD;
     reg_vals[6] = Feb_Control_subframe_period_in_10nsec; //(1 means 10ns, 100
-                                                         //means 1000ns)
+                                                         // means 1000ns)
     // if
     // (!Feb_Interface_WriteRegisters((Module_GetTopLeftAddress(&modules[1])|Module_GetTopRightAddress(&modules[1])),20,reg_nums,reg_vals,0,0))
     // {
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
index 544e8e7ad..704dac051 100644
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
@@ -1940,7 +1940,7 @@ void *start_timer(void *arg) {
                     sls_detector_header *header =
                         (sls_detector_header *)(packetData);
                     header->detType = 3; //(uint16_t)myDetectorType; updated
-                                         //when firmware updates
+                                         // when firmware updates
                     header->version = SLS_DETECTOR_HEADER_VERSION - 1;
                     header->frameNumber = frameNr + iframes;
                     header->packetNumber = i;
@@ -1951,7 +1951,7 @@ void *start_timer(void *arg) {
                     memset(packetData2, 0, packetsize);
                     header = (sls_detector_header *)(packetData2);
                     header->detType = 3; //(uint16_t)myDetectorType; updated
-                                         //when firmware updates
+                                         // when firmware updates
                     header->version = SLS_DETECTOR_HEADER_VERSION - 1;
                     header->frameNumber = frameNr + iframes;
                     header->packetNumber = i;
@@ -2090,7 +2090,8 @@ int startReadOut() {
             break;
         //		for(i=0;i<nimages_per_request;i++)
         //			if  ((ret_val =
-        //(!Beb_RequestNImages(beb_num,send_to_ten_gig,on_dst,1,0)))) 				break;
+        //(!Beb_RequestNImages(beb_num,send_to_ten_gig,on_dst,1,0))))
+        //break;
 
         dst_requested[on_dst++] = 0;
         on_dst %= ndsts_in_use;
diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
index c03ace696..ec905848c 100644
--- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
@@ -880,10 +880,11 @@ int setDelayAfterTrigger(int64_t val) {
         val += masterdefaultdelay;
         LOG(logINFO, ("\tActual Delay (master): %lld\n", (long long int)val));
     }
-    val = (val * 1E-9 * CLK_FREQ) +
-          0.5; // because of the master delay of 62 ns (not really double of
-               // clkfreq), losing precision and 0 delay becomes -31ns, so adding
-               // +0.5. Also adding +0.5 for more tolerance for gotthard1.
+    val =
+        (val * 1E-9 * CLK_FREQ) +
+        0.5; // because of the master delay of 62 ns (not really double of
+             // clkfreq), losing precision and 0 delay becomes -31ns, so adding
+             // +0.5. Also adding +0.5 for more tolerance for gotthard1.
     set64BitReg(val, SET_DELAY_LSB_REG, SET_DELAY_MSB_REG);
 
     // validate for tolerance
diff --git a/slsDetectorServers/slsDetectorServer/src/I2C.c b/slsDetectorServers/slsDetectorServer/src/I2C.c
index f2f5f3929..c136078d3 100644
--- a/slsDetectorServers/slsDetectorServer/src/I2C.c
+++ b/slsDetectorServers/slsDetectorServer/src/I2C.c
@@ -106,7 +106,7 @@
 /** Receive Data Fifo Level register */
 //#define I2C_RX_DATA_FIFO_LVL_OFST           (0)
 //#define I2C_RX_DATA_FIFO_LVL_MSK            (0x000000FF <<
-//I2C_RX_DATA_FIFO_LVL_OFST)
+// I2C_RX_DATA_FIFO_LVL_OFST)
 
 // defines in the fpga
 uint32_t I2C_Control_Reg = 0x0;
diff --git a/slsDetectorServers/slsDetectorServer/src/LTC2620.c b/slsDetectorServers/slsDetectorServer/src/LTC2620.c
index 1704648bd..4999bcd17 100644
--- a/slsDetectorServers/slsDetectorServer/src/LTC2620.c
+++ b/slsDetectorServers/slsDetectorServer/src/LTC2620.c
@@ -247,7 +247,7 @@ int LTC2620_SetDACValue(int dacnum, int val, int mV, int *dacval) {
     } else if (val >= 0 && dacnum <= ndacsonly) {
         // do not convert power down dac val
         //(if not ndacsonly (pwr/vchip): dont need to print mV value as it will
-        //be wrong (wrong limits))
+        // be wrong (wrong limits))
         ret = LTC2620_DacToVoltage(val, &dacmV);
     }
 
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index 32125bbf3..ba4ab44f3 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -1,13 +1,13 @@
 /** API versions */
-#define GITBRANCH    "setrxhostname"
-#define APILIB       0x200409
-#define APIRECEIVER  0x200409
-#define APIGUI       0x200409
+#define GITBRANCH   "setrxhostname"
+#define APILIB      0x200409
+#define APIRECEIVER 0x200409
+#define APIGUI      0x200409
 
-#define APICTB 0x200508
-#define APIGOTTHARD 0x200508
+#define APICTB       0x200508
+#define APIGOTTHARD  0x200508
 #define APIGOTTHARD2 0x200508
-#define APIJUNGFRAU 0x200508
-#define APIMYTHEN3 0x200508
-#define APIMOENCH 0x200508
-#define APIEIGER 0x200508
+#define APIJUNGFRAU  0x200508
+#define APIMYTHEN3   0x200508
+#define APIMOENCH    0x200508
+#define APIEIGER     0x200508