diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h
index 018790c46..375d62d6c 100644
--- a/slsDetectorGui/include/qDefs.h
+++ b/slsDetectorGui/include/qDefs.h
@@ -39,7 +39,7 @@ class qDefs : public QWidget {
     /**
      * Empty Constructor
      */
-    qDefs() {};
+    qDefs(){};
 
     static QFont GetDefaultFont() {
         return QFont("Cantarell", 10, QFont::Normal);
diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
index 103502f1f..683338861 100644
--- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
@@ -7,9 +7,11 @@
 #define MIN_REQRD_VRSN_T_RD_API 0x181130
 #define REQRD_FRMWR_VRSN        0x230705
 
-#define NUM_HARDWARE_VERSIONS    (1)
-#define HARDWARE_VERSION_NUMBERS {0x3f}
-#define HARDWARE_VERSION_NAMES   {"5.1"}
+#define NUM_HARDWARE_VERSIONS (1)
+#define HARDWARE_VERSION_NUMBERS                                               \
+    { 0x3f }
+#define HARDWARE_VERSION_NAMES                                                 \
+    { "5.1" }
 
 #define LINKED_SERVER_NAME "ctbDetectorServer"
 
diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c
index d3750259a..f0b96d487 100644
--- a/slsDetectorServers/eigerDetectorServer/FebControl.c
+++ b/slsDetectorServers/eigerDetectorServer/FebControl.c
@@ -634,8 +634,8 @@ int Feb_Control_SetTrimbits(unsigned int *trimbits, int top) {
                                 << ((7 - i) * 4); // upper
                         }
                     } // end column loop i
-                } // end supercolumn loop sc
-            } // end row loop
+                }     // end supercolumn loop sc
+            }         // end row loop
 
             if (Feb_Control_activated) {
                 if (!Feb_Interface_WriteMemoryInLoops(Feb_Control_leftAddress,
@@ -652,7 +652,7 @@ int Feb_Control_SetTrimbits(unsigned int *trimbits, int top) {
             }
 
         } // end row_set loop (groups of 16 rows)
-    } // end l_r loop
+    }     // end l_r loop
 
     memcpy(Feb_Control_last_downloaded_trimbits, trimbits,
            Feb_Control_trimbit_size * sizeof(unsigned int));
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
index aa87505b3..5e4a62f1b 100644
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
@@ -7,7 +7,8 @@
 
 #define NUM_HARDWARE_VERSIONS    (2)
 #define HARDWARE_VERSION_NUMBERS {0x0, 0x1};
-#define HARDWARE_VERSION_NAMES   {"FX70T", "FX30T"}
+#define HARDWARE_VERSION_NAMES                                                 \
+    { "FX70T", "FX30T" }
 
 #define REQUIRED_FIRMWARE_VERSION (32)
 // virtual ones renamed for consistency
diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
index a696221c9..d275cb400 100644
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
@@ -9,7 +9,8 @@
 
 #define NUM_HARDWARE_VERSIONS    (2)
 #define HARDWARE_VERSION_NUMBERS {0x0, 0x2};
-#define HARDWARE_VERSION_NAMES   {"1.0", "1.2"}
+#define HARDWARE_VERSION_NAMES                                                 \
+    { "1.0", "1.2" }
 
 #define LINKED_SERVER_NAME "gotthard2DetectorServer"
 
diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
index 88e30f1c4..cc2b0928b 100644
--- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
@@ -8,9 +8,11 @@
 #define REQRD_FRMWRE_VRSN_BOARD2 0x250209 // 1.0 pcb (version = 010)
 #define REQRD_FRMWRE_VRSN        0x250208 // 2.0 pcb (version = 011)
 
-#define NUM_HARDWARE_VERSIONS    (2)
-#define HARDWARE_VERSION_NUMBERS {0x2, 0x3}
-#define HARDWARE_VERSION_NAMES   {"1.0", "2.0"}
+#define NUM_HARDWARE_VERSIONS (2)
+#define HARDWARE_VERSION_NUMBERS                                               \
+    { 0x2, 0x3 }
+#define HARDWARE_VERSION_NAMES                                                 \
+    { "1.0", "2.0" }
 
 #define ID_FILE            "detid_jungfrau.txt"
 #define LINKED_SERVER_NAME "jungfrauDetectorServer"
@@ -212,11 +214,13 @@ enum DACINDEX {
 enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE };
 #define MASTER_NAMES "hardware", "master", "slave"
 
-#define NUMSETTINGS                          (2)
-#define NSPECIALDACS                         (3)
-#define SPECIALDACINDEX                      {J_VREF_PRECH, J_VREF_DS, J_VREF_COMP};
-#define SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS    {1450, 480, 420}
-#define SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS {1550, 450, 620}
+#define NUMSETTINGS     (2)
+#define NSPECIALDACS    (3)
+#define SPECIALDACINDEX {J_VREF_PRECH, J_VREF_DS, J_VREF_COMP};
+#define SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS                                      \
+    { 1450, 480, 420 }
+#define SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS                                   \
+    { 1550, 450, 620 }
 
 enum NETWORKINDEX { TXN_FRAME, FLOWCTRL_10G };
 enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
index 22d8e68ba..aa4133d7a 100644
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
@@ -7,9 +7,11 @@
 #define REQRD_FRMWRE_VRSN_BOARD2 0x444445 // 1.0 pcb (version = 010)
 #define REQRD_FRMWRE_VRSN        0x231026 // 2.0 pcb (version = 011)
 
-#define NUM_HARDWARE_VERSIONS    (2)
-#define HARDWARE_VERSION_NUMBERS {0x2, 0x3}
-#define HARDWARE_VERSION_NAMES   {"1.0", "2.0"}
+#define NUM_HARDWARE_VERSIONS (2)
+#define HARDWARE_VERSION_NUMBERS                                               \
+    { 0x2, 0x3 }
+#define HARDWARE_VERSION_NAMES                                                 \
+    { "1.0", "2.0" }
 
 #define ID_FILE            ("detid_moench.txt")
 #define LINKED_SERVER_NAME "moenchDetectorServer"
diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
index 80abbd126..b0d8c1ea5 100644
--- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
@@ -9,7 +9,8 @@
 
 #define NUM_HARDWARE_VERSIONS    (2)
 #define HARDWARE_VERSION_NUMBERS {0x0, 0x2};
-#define HARDWARE_VERSION_NAMES   {"1.0", "1.2"}
+#define HARDWARE_VERSION_NAMES                                                 \
+    { "1.0", "1.2" }
 
 #define LINKED_SERVER_NAME "mythen3DetectorServer"
 
@@ -129,12 +130,15 @@ enum DACINDEX {
 
 enum ADCINDEX { TEMP_FPGA };
 
-#define NUMSETTINGS                       (3)
-#define NSPECIALDACS                      (2)
-#define SPECIALDACINDEX                   {M_VRPREAMP, M_VRSHAPER};
-#define SPECIAL_DEFAULT_STANDARD_DAC_VALS {1100, 1280}
-#define SPECIAL_DEFAULT_FAST_DAC_VALS     {300, 1500}
-#define SPECIAL_DEFAULT_HIGHGAIN_DAC_VALS {1300, 1100}
+#define NUMSETTINGS     (3)
+#define NSPECIALDACS    (2)
+#define SPECIALDACINDEX {M_VRPREAMP, M_VRSHAPER};
+#define SPECIAL_DEFAULT_STANDARD_DAC_VALS                                      \
+    { 1100, 1280 }
+#define SPECIAL_DEFAULT_FAST_DAC_VALS                                          \
+    { 300, 1500 }
+#define SPECIAL_DEFAULT_HIGHGAIN_DAC_VALS                                      \
+    { 1300, 1100 }
 
 enum CLKINDEX { SYSTEM_C0, SYSTEM_C1, SYSTEM_C2, NUM_CLOCKS };
 #define NUM_CLOCKS_TO_SET (1)
diff --git a/slsDetectorSoftware/include/sls/Result.h b/slsDetectorSoftware/include/sls/Result.h
index 479eae047..0cb937408 100644
--- a/slsDetectorSoftware/include/sls/Result.h
+++ b/slsDetectorSoftware/include/sls/Result.h
@@ -32,7 +32,7 @@ template <class T, class Allocator = std::allocator<T>> class Result {
 
   public:
     Result() = default;
-    Result(std::initializer_list<T> list) : vec(list) {};
+    Result(std::initializer_list<T> list) : vec(list){};
 
     /** Custom constructor from integer type to Result<ns> or Result<bool> */
     template <typename V, typename = typename std::enable_if<
diff --git a/slsDetectorSoftware/include/sls/detectorData.h b/slsDetectorSoftware/include/sls/detectorData.h
index f9b9eb1a9..33f983a66 100644
--- a/slsDetectorSoftware/include/sls/detectorData.h
+++ b/slsDetectorSoftware/include/sls/detectorData.h
@@ -17,7 +17,7 @@ class detectorData {
         : progressIndex(progressIndex), fileName(fileName),
           fileIndex(fileIndex), nx(nx), ny(ny), data(data),
           databytes(databytes), dynamicRange(dynamicRange),
-          completeImage(completeImage) {};
+          completeImage(completeImage){};
 
     detectorData(double progressIndex, std::string fileName, int nx, int ny,
                  char *data, int databytes, int dynamicRange,
@@ -26,11 +26,11 @@ class detectorData {
         : progressIndex(progressIndex), fileName(fileName),
           fileIndex(fileIndex), nx(nx), ny(ny), data(data),
           databytes(databytes), dynamicRange(dynamicRange),
-          completeImage(completeImage), rxRoi(rxRoi) {};
+          completeImage(completeImage), rxRoi(rxRoi){};
     /**
      * data has to be deleted by caller
      */
-    ~detectorData() {};
+    ~detectorData(){};
 
     int64_t getChannel(int i) {
         int off = dynamicRange / 8;
diff --git a/slsReceiverSoftware/src/File.h b/slsReceiverSoftware/src/File.h
index 70a3de224..c30a86238 100644
--- a/slsReceiverSoftware/src/File.h
+++ b/slsReceiverSoftware/src/File.h
@@ -16,8 +16,8 @@ namespace sls {
 class File : private virtual slsDetectorDefs {
 
   public:
-    File() {};
-    virtual ~File() {};
+    File(){};
+    virtual ~File(){};
 
     virtual fileFormat GetFileFormat() const = 0;
     virtual void CloseFile() = 0;
diff --git a/slsReceiverSoftware/src/GeneralData.h b/slsReceiverSoftware/src/GeneralData.h
index 6d9a5d626..9f3b43429 100644
--- a/slsReceiverSoftware/src/GeneralData.h
+++ b/slsReceiverSoftware/src/GeneralData.h
@@ -60,8 +60,8 @@ class GeneralData {
     slsDetectorDefs::frameDiscardPolicy frameDiscardMode{
         slsDetectorDefs::NO_DISCARD};
 
-    GeneralData() {};
-    virtual ~GeneralData() {};
+    GeneralData(){};
+    virtual ~GeneralData(){};
 
     // Returns the pixel depth in byte, 4 bits being 0.5 byte
     float GetPixelDepth() { return float(dynamicRange) / 8; }
diff --git a/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp b/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp
index 0b5ef3bd0..f65ff3e80 100644
--- a/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp
+++ b/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp
@@ -41,8 +41,8 @@ class GeneralDataTest : public GeneralData {
 // dummy DataProcessor class for testing
 class DataProcessorTest : public DataProcessor {
   public:
-    DataProcessorTest() : DataProcessor(0) {};
-    ~DataProcessorTest() {};
+    DataProcessorTest() : DataProcessor(0){};
+    ~DataProcessorTest(){};
     void ArrangeDbitData(size_t &size, char *data) {
         DataProcessor::ArrangeDbitData(size, data);
     }
diff --git a/slsSupportLib/include/sls/ClientSocket.h b/slsSupportLib/include/sls/ClientSocket.h
index 607f1f507..dcfc02b25 100644
--- a/slsSupportLib/include/sls/ClientSocket.h
+++ b/slsSupportLib/include/sls/ClientSocket.h
@@ -28,22 +28,22 @@ class ClientSocket : public DataSocket {
 class ReceiverSocket : public ClientSocket {
   public:
     ReceiverSocket(const std::string &hostname, uint16_t port_number)
-        : ClientSocket("Receiver", hostname, port_number) {};
-    ReceiverSocket(struct sockaddr_in addr) : ClientSocket("Receiver", addr) {};
+        : ClientSocket("Receiver", hostname, port_number){};
+    ReceiverSocket(struct sockaddr_in addr) : ClientSocket("Receiver", addr){};
 };
 
 class DetectorSocket : public ClientSocket {
   public:
     DetectorSocket(const std::string &hostname, uint16_t port_number)
-        : ClientSocket("Detector", hostname, port_number) {};
-    DetectorSocket(struct sockaddr_in addr) : ClientSocket("Detector", addr) {};
+        : ClientSocket("Detector", hostname, port_number){};
+    DetectorSocket(struct sockaddr_in addr) : ClientSocket("Detector", addr){};
 };
 
 class GuiSocket : public ClientSocket {
   public:
     GuiSocket(const std::string &hostname, uint16_t port_number)
-        : ClientSocket("Gui", hostname, port_number) {};
-    GuiSocket(struct sockaddr_in addr) : ClientSocket("Gui", addr) {};
+        : ClientSocket("Gui", hostname, port_number){};
+    GuiSocket(struct sockaddr_in addr) : ClientSocket("Gui", addr){};
 };
 
 }; // namespace sls
diff --git a/slsSupportLib/include/sls/Timer.h b/slsSupportLib/include/sls/Timer.h
index 7409bb8fe..b22909b33 100644
--- a/slsSupportLib/include/sls/Timer.h
+++ b/slsSupportLib/include/sls/Timer.h
@@ -33,5 +33,5 @@ class Timer {
     std::string name_;
 };
 
-}; // namespace sls
+};     // namespace sls
 #endif // TIMER_H
diff --git a/slsSupportLib/include/sls/logger.h b/slsSupportLib/include/sls/logger.h
index 2f94c28dc..9b949d802 100644
--- a/slsSupportLib/include/sls/logger.h
+++ b/slsSupportLib/include/sls/logger.h
@@ -47,7 +47,7 @@ class Logger {
 
   public:
     Logger() = default;
-    explicit Logger(TLogLevel level) : level(level) {};
+    explicit Logger(TLogLevel level) : level(level){};
     ~Logger() {
         // output in the destructor to allow for << syntax
         os << RESET << '\n';
diff --git a/slsSupportLib/include/sls/sls_detector_defs.h b/slsSupportLib/include/sls/sls_detector_defs.h
index 1fe0d9617..9a010ba4c 100644
--- a/slsSupportLib/include/sls/sls_detector_defs.h
+++ b/slsSupportLib/include/sls/sls_detector_defs.h
@@ -125,7 +125,7 @@ class slsDetectorDefs {
         int x{0};
         int y{0};
         xy() = default;
-        xy(int x, int y) : x(x), y(y) {};
+        xy(int x, int y) : x(x), y(y){};
     } __attribute__((packed));
 #endif
 
@@ -227,9 +227,9 @@ class slsDetectorDefs {
         int ymin{-1};
         int ymax{-1};
         ROI() = default;
-        ROI(int xmin, int xmax) : xmin(xmin), xmax(xmax) {};
+        ROI(int xmin, int xmax) : xmin(xmin), xmax(xmax){};
         ROI(int xmin, int xmax, int ymin, int ymax)
-            : xmin(xmin), xmax(xmax), ymin(ymin), ymax(ymax) {};
+            : xmin(xmin), xmax(xmax), ymin(ymin), ymax(ymax){};
         constexpr std::array<int, 4> getIntArray() const {
             return std::array<int, 4>({xmin, xmax, ymin, ymax});
         }
diff --git a/slsSupportLib/src/ZmqSocket.cpp b/slsSupportLib/src/ZmqSocket.cpp
index eed0c7221..2fafe4799 100644
--- a/slsSupportLib/src/ZmqSocket.cpp
+++ b/slsSupportLib/src/ZmqSocket.cpp
@@ -531,7 +531,7 @@ void ZmqSocket::PrintError() {
 
 // Nested class to do RAII handling of socket descriptors
 ZmqSocket::mySocketDescriptors::mySocketDescriptors(bool server)
-    : server(server), contextDescriptor(nullptr), socketDescriptor(nullptr) {};
+    : server(server), contextDescriptor(nullptr), socketDescriptor(nullptr){};
 ZmqSocket::mySocketDescriptors::~mySocketDescriptors() {
     Disconnect();
     Close();