diff --git a/common/include/villas/kernel/devices/device.hpp b/common/include/villas/kernel/devices/device.hpp
index 896cab042..6e9977bd0 100644
--- a/common/include/villas/kernel/devices/device.hpp
+++ b/common/include/villas/kernel/devices/device.hpp
@@ -18,7 +18,7 @@ namespace devices {
 
 class Device {
 public:
-  virtual ~Device(){};
+  virtual ~Device() {};
 
   virtual std::optional<std::unique_ptr<Driver>> driver() const = 0;
   virtual std::optional<int> iommu_group() const = 0;
diff --git a/common/include/villas/kernel/devices/ip_device.hpp b/common/include/villas/kernel/devices/ip_device.hpp
index 6851b6845..2323fe12c 100644
--- a/common/include/villas/kernel/devices/ip_device.hpp
+++ b/common/include/villas/kernel/devices/ip_device.hpp
@@ -24,7 +24,7 @@ private:
   IpDevice() = delete;
   IpDevice(
       const std::filesystem::path valid_path) //! Dont allow unvalidated paths
-      : PlatformDevice(valid_path){};
+      : PlatformDevice(valid_path) {};
 
 public:
   size_t addr() const;
diff --git a/common/include/villas/kernel/devices/linux_driver.hpp b/common/include/villas/kernel/devices/linux_driver.hpp
index 71dbce8d7..46cbb1d6d 100644
--- a/common/include/villas/kernel/devices/linux_driver.hpp
+++ b/common/include/villas/kernel/devices/linux_driver.hpp
@@ -32,12 +32,12 @@ private:
 public:
   LinuxDriver(const std::filesystem::path path)
       : LinuxDriver(path, path / std::filesystem::path(BIND_DEFAULT),
-                    path / std::filesystem::path(UNBIND_DEFAULT)){};
+                    path / std::filesystem::path(UNBIND_DEFAULT)) {};
 
   LinuxDriver(const std::filesystem::path path,
               const std::filesystem::path bind_path,
               const std::filesystem::path unbind_path)
-      : path(path), bind_path(bind_path), unbind_path(unbind_path){};
+      : path(path), bind_path(bind_path), unbind_path(unbind_path) {};
 
 public:
   void attach(const Device &device) const override;
diff --git a/common/include/villas/kernel/devices/pci_device.hpp b/common/include/villas/kernel/devices/pci_device.hpp
index 49d9ea31d..65794644b 100644
--- a/common/include/villas/kernel/devices/pci_device.hpp
+++ b/common/include/villas/kernel/devices/pci_device.hpp
@@ -20,7 +20,7 @@ namespace kernel {
 namespace devices {
 
 #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f)
-#define PCI_FUNC(devfn) ((devfn)&0x07)
+#define PCI_FUNC(devfn) ((devfn) & 0x07)
 
 class Id {
 public:
diff --git a/common/include/villas/kernel/devices/platform_device.hpp b/common/include/villas/kernel/devices/platform_device.hpp
index 57c3ec915..673694387 100644
--- a/common/include/villas/kernel/devices/platform_device.hpp
+++ b/common/include/villas/kernel/devices/platform_device.hpp
@@ -29,13 +29,13 @@ private:
 public:
   PlatformDevice(const std::filesystem::path path)
       : PlatformDevice(path, std::filesystem::path(PROBE_DEFAULT),
-                       path / std::filesystem::path(OVERRIDE_DEFAULT)){};
+                       path / std::filesystem::path(OVERRIDE_DEFAULT)) {};
 
   PlatformDevice(const std::filesystem::path path,
                  const std::filesystem::path probe_path,
                  const std::filesystem::path override_path)
       : m_path(path), m_probe_path(probe_path),
-        m_override_path(override_path){};
+        m_override_path(override_path) {};
 
   // Implement device interface
   std::optional<std::unique_ptr<Driver>> driver() const override;
diff --git a/common/include/villas/task.hpp b/common/include/villas/task.hpp
index 8bd030ba7..922c8b599 100644
--- a/common/include/villas/task.hpp
+++ b/common/include/villas/task.hpp
@@ -45,7 +45,7 @@ struct Task {
 #if PERIODIC_TASK_IMPL == TIMERFD
   int fd; // The timerfd_create(2) file descriptior.
 #elif PERIODIC_TASK_IMPL == RDTSC
-  struct Tsc tsc;         // Initialized by tsc_init().
+  struct Tsc tsc; // Initialized by tsc_init().
 #endif
 
   // Create a new task with the given rate.
diff --git a/common/include/villas/utils.hpp b/common/include/villas/utils.hpp
index ed6d9d3f6..5318d2efe 100644
--- a/common/include/villas/utils.hpp
+++ b/common/include/villas/utils.hpp
@@ -53,7 +53,7 @@
 #ifdef ALIGN
 #undef ALIGN
 #endif
-#define ALIGN(x, a) ALIGN_MASK(x, (uintptr_t)(a)-1)
+#define ALIGN(x, a) ALIGN_MASK(x, (uintptr_t)(a) - 1)
 #define ALIGN_MASK(x, m) (((uintptr_t)(x) + (m)) & ~(m))
 #define IS_ALIGNED(x, a) (ALIGN(x, a) == (uintptr_t)x)
 
@@ -65,13 +65,13 @@
   } while (0)
 
 // Round-up integer division
-#define CEIL(x, y) (((x) + (y)-1) / (y))
+#define CEIL(x, y) (((x) + (y) - 1) / (y))
 
 // Get nearest up-rounded power of 2
-#define LOG2_CEIL(x) (1 << (villas::utils::log2i((x)-1) + 1))
+#define LOG2_CEIL(x) (1 << (villas::utils::log2i((x) - 1) + 1))
 
 // Check if the number is a power of 2
-#define IS_POW2(x) (((x) != 0) && !((x) & ((x)-1)))
+#define IS_POW2(x) (((x) != 0) && !((x) & ((x) - 1)))
 
 // Calculate the number of elements in an array.
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a)[0])
diff --git a/common/lib/base64.cpp b/common/lib/base64.cpp
index bcd3e58ec..ac3c8536f 100644
--- a/common/lib/base64.cpp
+++ b/common/lib/base64.cpp
@@ -110,7 +110,7 @@ std::vector<byte> decode(const std::string &input) {
 
     decoded.push_back((temp >> 16) & 0x000000FF);
     decoded.push_back((temp >> 8) & 0x000000FF);
-    decoded.push_back((temp)&0x000000FF);
+    decoded.push_back((temp) & 0x000000FF);
   }
 
   return decoded;
diff --git a/fpga/include/villas/fpga/ips/i2c.hpp b/fpga/include/villas/fpga/ips/i2c.hpp
index 072a72157..3c3ce2cff 100644
--- a/fpga/include/villas/fpga/ips/i2c.hpp
+++ b/fpga/include/villas/fpga/ips/i2c.hpp
@@ -19,8 +19,7 @@ namespace fpga {
 namespace ip {
 
 #define I2C_SWTICH_ADDR 0x70
-#define I2C_SWITCH_CHANNEL_MAP                                                 \
-  { 0x20, 0x80, 0x02, 0x08, 0x10, 0x40, 0x01, 0x04 }
+#define I2C_SWITCH_CHANNEL_MAP {0x20, 0x80, 0x02, 0x08, 0x10, 0x40, 0x01, 0x04}
 #define I2C_IOEXT_ADDR 0x20
 #define I2C_IOEXT_REG_DIR 0x03
 #define I2C_IOEXT_REG_OUT 0x01
@@ -47,7 +46,7 @@ public:
   public:
     Switch(I2c *i2c, uint8_t address, Logger logger = villas::Log::get("i2c"))
         : i2c(i2c), address(address), channel(0), readOnce(false), switchLock(),
-          logger(logger){};
+          logger(logger) {};
     Switch(const Switch &other) = delete;
     Switch &operator=(const Switch &other) = delete;
     void setChannel(uint8_t channel);
diff --git a/fpga/include/villas/fpga/utils.hpp b/fpga/include/villas/fpga/utils.hpp
index 42f3afbb5..b078936fb 100644
--- a/fpga/include/villas/fpga/utils.hpp
+++ b/fpga/include/villas/fpga/utils.hpp
@@ -89,7 +89,7 @@ protected:
   BufferedSampleFormatter(const size_t bufSamples, const size_t bufSampleSize)
       : buf(bufSamples * bufSampleSize + 1), // Leave room for a final `\0'
         bufSamples(bufSamples), bufSampleSize(bufSampleSize),
-        currentBufLoc(0){};
+        currentBufLoc(0) {};
   BufferedSampleFormatter() = delete;
   BufferedSampleFormatter(const BufferedSampleFormatter &) = delete;
   virtual char *nextBufPos() { return &buf[(currentBufLoc++) * bufSampleSize]; }
@@ -98,7 +98,7 @@ protected:
 class BufferedSampleFormatterShort : public BufferedSampleFormatter {
 public:
   BufferedSampleFormatterShort(size_t bufSizeInSamples)
-      : BufferedSampleFormatter(bufSizeInSamples, formatStringSize){};
+      : BufferedSampleFormatter(bufSizeInSamples, formatStringSize) {};
 
   virtual void format(float value) override {
     size_t chars;
@@ -119,7 +119,7 @@ class BufferedSampleFormatterLong : public BufferedSampleFormatter {
 public:
   BufferedSampleFormatterLong(size_t bufSizeInSamples)
       : BufferedSampleFormatter(bufSizeInSamples, formatStringSize),
-        sampleCnt(0){};
+        sampleCnt(0) {};
 
   virtual void format(float value) override {
     if (std::snprintf(nextBufPos(), formatStringSize + 1, formatString,
diff --git a/fpga/lib/pcie_card.cpp b/fpga/lib/pcie_card.cpp
index 9ecd8b392..133bf8fc9 100644
--- a/fpga/lib/pcie_card.cpp
+++ b/fpga/lib/pcie_card.cpp
@@ -48,8 +48,9 @@ PCIeCardFactory::make(json_t *json_card, std::string card_name,
 
   json_error_t err;
   int ret = json_unpack_ex(
-      json_card, &err, 0, "{ s: o, s?: i, s?: b, s?: s, s?: s, s?: b, s?: o, s?: o}",
-      "ips", &json_ips, "affinity", &affinity, "do_reset", &do_reset, "slot",
+      json_card, &err, 0,
+      "{ s: o, s?: i, s?: b, s?: s, s?: s, s?: b, s?: o, s?: o}", "ips",
+      &json_ips, "affinity", &affinity, "do_reset", &do_reset, "slot",
       &pci_slot, "id", &pci_id, "polling", &polling, "paths", &json_paths,
       "ignore_ips", &ignored_ips_array);
 
diff --git a/include/villas/nodes/iec61850.hpp b/include/villas/nodes/iec61850.hpp
index bbb1afc0f..85c008c2f 100644
--- a/include/villas/nodes/iec61850.hpp
+++ b/include/villas/nodes/iec61850.hpp
@@ -20,8 +20,7 @@
 #include <villas/signal_list.hpp>
 
 #ifndef CONFIG_GOOSE_DEFAULT_DST_ADDRESS
-#define CONFIG_GOOSE_DEFAULT_DST_ADDRESS                                       \
-  { 0x01, 0x0c, 0xcd, 0x01, 0x00, 0x01 }
+#define CONFIG_GOOSE_DEFAULT_DST_ADDRESS {0x01, 0x0c, 0xcd, 0x01, 0x00, 0x01}
 #endif
 
 namespace villas {
diff --git a/include/villas/nodes/test_rtt.hpp b/include/villas/nodes/test_rtt.hpp
index cb0dfe2d1..4aaeea9a2 100644
--- a/include/villas/nodes/test_rtt.hpp
+++ b/include/villas/nodes/test_rtt.hpp
@@ -58,7 +58,7 @@ protected:
         : node(n), id(id), rate(rate), warmup(warmup), cooldown(cooldown),
           values(values), count(count), sent(0), received(0), missed(0),
           count_warmup(count_warmup), sent_warmup(0), received_warmup(0),
-          missed_warmup(0), filename(filename){};
+          missed_warmup(0), filename(filename) {};
 
     int start();
     int stop();
@@ -96,7 +96,7 @@ public:
       : Node(id, name), task(), formatter(nullptr), stream(nullptr),
         shutdown(false) {}
 
-  virtual ~TestRTT(){};
+  virtual ~TestRTT() {};
 
   virtual int prepare();
 
diff --git a/lib/hook_list.cpp b/lib/hook_list.cpp
index 2eadc93c9..c0f31bb1c 100644
--- a/lib/hook_list.cpp
+++ b/lib/hook_list.cpp
@@ -134,7 +134,7 @@ int HookList::process(struct Sample *smps[], unsigned cnt) {
   stop:
     SWAP(smps[processed], smps[current]);
     processed++;
-  skip : {}
+  skip: {}
   }
 
   return processed;
diff --git a/lib/nodes/file.cpp b/lib/nodes/file.cpp
index 4bf64c90a..725d27a1c 100644
--- a/lib/nodes/file.cpp
+++ b/lib/nodes/file.cpp
@@ -415,9 +415,9 @@ int villas::node::file_poll_fds(NodeCompat *n, int fds[]) {
 int villas::node::file_init(NodeCompat *n) {
   auto *f = n->getData<struct file>();
 
-	// We require a real-time clock here as we can sync against the
-	// timestamps in the file.
-	new (&f->task) Task(CLOCK_REALTIME);
+  // We require a real-time clock here as we can sync against the
+  // timestamps in the file.
+  new (&f->task) Task(CLOCK_REALTIME);
 
   // Default values
   f->rate = 0;
diff --git a/lib/nodes/ngsi.cpp b/lib/nodes/ngsi.cpp
index 7fd9665cb..833f9e12c 100644
--- a/lib/nodes/ngsi.cpp
+++ b/lib/nodes/ngsi.cpp
@@ -752,7 +752,7 @@ int villas::node::ngsi_init(NodeCompat *n) {
   int ret;
   auto *i = n->getData<struct ngsi>();
 
-	new (&i->task) Task();
+  new (&i->task) Task();
 
   ret = list_init(&i->in.signals);
   if (ret)
diff --git a/lib/nodes/redis.cpp b/lib/nodes/redis.cpp
index 447ba8472..ee9f3eb60 100644
--- a/lib/nodes/redis.cpp
+++ b/lib/nodes/redis.cpp
@@ -256,9 +256,9 @@ int villas::node::redis_init(NodeCompat *n) {
   r->notify = true;
   r->rate = 1.0;
 
-	new (&r->options) sw::redis::ConnectionOptions;
-	new (&r->task) Task();
-	new (&r->key) std::string();
+  new (&r->options) sw::redis::ConnectionOptions;
+  new (&r->task) Task();
+  new (&r->key) std::string();
 
   /* We need a timeout in order for RedisConnection::loop() to properly
    * terminate after the node is stopped */
diff --git a/lib/nodes/signal.cpp b/lib/nodes/signal.cpp
index 09c6ae6a8..d5ce3fb24 100644
--- a/lib/nodes/signal.cpp
+++ b/lib/nodes/signal.cpp
@@ -175,8 +175,8 @@ Signal::Ptr SignalNodeSignal::toSignal(Signal::Ptr tpl) const {
 }
 
 SignalNode::SignalNode(const uuid_t &id, const std::string &name)
-    : Node(id, name), task(), rt(1), rate(10),
-      monitor_missed(true), limit(-1), missed_steps(0) {}
+    : Node(id, name), task(), rt(1), rate(10), monitor_missed(true), limit(-1),
+      missed_steps(0) {}
 
 int SignalNode::prepare() {
   assert(state == State::CHECKED);
diff --git a/lib/nodes/signal_v1.cpp b/lib/nodes/signal_v1.cpp
index ba758572d..728f80ce4 100644
--- a/lib/nodes/signal_v1.cpp
+++ b/lib/nodes/signal_v1.cpp
@@ -78,7 +78,7 @@ static const char *signal_node_type_str(enum signal_node::SignalType type) {
 int villas::node::signal_node_init(NodeCompat *n) {
   auto *s = n->getData<struct signal_node>();
 
-	new (&s->task) Task();
+  new (&s->task) Task();
 
   s->rt = 1;
   s->limit = -1;
diff --git a/lib/nodes/stats.cpp b/lib/nodes/stats.cpp
index 34ebc3e1b..2aa01983a 100644
--- a/lib/nodes/stats.cpp
+++ b/lib/nodes/stats.cpp
@@ -137,7 +137,7 @@ int villas::node::stats_node_init(NodeCompat *n) {
   int ret;
   auto *s = n->getData<struct stats_node>();
 
-	new (&s->task) Task();
+  new (&s->task) Task();
 
   ret = list_init(&s->signals);
   if (ret)
diff --git a/tests/unit/queue_signalled.cpp b/tests/unit/queue_signalled.cpp
index 3f440e523..ca831eb63 100644
--- a/tests/unit/queue_signalled.cpp
+++ b/tests/unit/queue_signalled.cpp
@@ -93,15 +93,15 @@ void *polled_consumer(void *ctx) {
 
 ParameterizedTestParameters(queue_signalled, simple) {
   static struct param params[] = {
-    {QueueSignalledMode::AUTO, 0, false},
-    {QueueSignalledMode::PTHREAD, 0, false},
-    {QueueSignalledMode::PTHREAD, 0, false},
-    {QueueSignalledMode::PTHREAD, (int)QueueSignalledFlags::PROCESS_SHARED,
-     false},
-    {QueueSignalledMode::POLLING, 0, false},
+      {QueueSignalledMode::AUTO, 0, false},
+      {QueueSignalledMode::PTHREAD, 0, false},
+      {QueueSignalledMode::PTHREAD, 0, false},
+      {QueueSignalledMode::PTHREAD, (int)QueueSignalledFlags::PROCESS_SHARED,
+       false},
+      {QueueSignalledMode::POLLING, 0, false},
 #if defined(__linux__) && defined(HAS_EVENTFD)
-    {QueueSignalledMode::EVENTFD, 0, false},
-    {QueueSignalledMode::EVENTFD, 0, true}
+      {QueueSignalledMode::EVENTFD, 0, false},
+      {QueueSignalledMode::EVENTFD, 0, true}
 #endif
   };