diff --git a/c6021light/lib/freertossupport/OsQueue.h b/c6021light/lib/freertossupport/OsQueue.h
index a294e21..f4b26ea 100644
--- a/c6021light/lib/freertossupport/OsQueue.h
+++ b/c6021light/lib/freertossupport/OsQueue.h
@@ -32,7 +32,7 @@ class OsQueue {
     BaseType_t higherPriorityTaskWoken;
   };
 
-  OsQueue() : handle_(NULL){};
+  OsQueue() : handle_(NULL) {};
 
   OsQueue(QueueHandle_t handle) : handle_(handle) { configASSERT(handle_ != NULL); }
 
diff --git a/c6021light/lib/freertossupport/OsTask.h b/c6021light/lib/freertossupport/OsTask.h
index 5cdef23..772f95c 100644
--- a/c6021light/lib/freertossupport/OsTask.h
+++ b/c6021light/lib/freertossupport/OsTask.h
@@ -43,7 +43,7 @@ class StaticOsTask : public TaskClass {
                 "TaskClass must extend freertossupport::OsTask.");
 
   void Create(const char* taskName, UBaseType_t priority) {
-    this->handle_ = xTaskCreateStatic((void (*)(void*)) & TaskClass::TaskMain, taskName, StackSize,
+    this->handle_ = xTaskCreateStatic((void (*)(void*))&TaskClass::TaskMain, taskName, StackSize,
                                       this, priority, stack_, &tcb_);
     configASSERT(this->handle_ != NULL);
   }
diff --git a/c6021light/src/MarklinI2C/Messages/AccessoryMsg.h b/c6021light/src/MarklinI2C/Messages/AccessoryMsg.h
index 17632dd..754b086 100644
--- a/c6021light/src/MarklinI2C/Messages/AccessoryMsg.h
+++ b/c6021light/src/MarklinI2C/Messages/AccessoryMsg.h
@@ -20,7 +20,7 @@ class AccessoryMsg {
  public:
   constexpr static const uint8_t kAccesoryMessageBytes = 3;
 
-  constexpr AccessoryMsg(){};
+  constexpr AccessoryMsg() {};
 
   constexpr AccessoryMsg(const AccessoryMsg&) = default;
   constexpr AccessoryMsg& operator=(const AccessoryMsg&) = default;
@@ -29,7 +29,7 @@ class AccessoryMsg {
   constexpr AccessoryMsg& operator=(AccessoryMsg&&) = default;
 
   constexpr AccessoryMsg(uint8_t destination, uint8_t source, uint8_t data)
-      : destination_(destination), source_(source), data_(data){};
+      : destination_(destination), source_(source), data_(data) {};
 
   constexpr bool operator==(const AccessoryMsg& other) const {
     return this->destination_ == other.destination_ && this->source_ == other.source_ &&
diff --git a/c6021light/src/hal/stm32eepromEmulation.cpp b/c6021light/src/hal/stm32eepromEmulation.cpp
index e44e1d1..7856843 100644
--- a/c6021light/src/hal/stm32eepromEmulation.cpp
+++ b/c6021light/src/hal/stm32eepromEmulation.cpp
@@ -56,7 +56,7 @@ class DataModelStoreVisitor {
 
   class iterator {
    public:
-    iterator(const DataModel& model, size_type index) : model_(model), index_(index){};
+    iterator(const DataModel& model, size_type index) : model_(model), index_(index) {};
 
     bool operator!=(const iterator& other) const {
       return this->index_ != other.index_ || &(this->model_) != &(other.model_);
diff --git a/c6021light/src/tasks/RoutingTask/I2CForwarder.cpp b/c6021light/src/tasks/RoutingTask/I2CForwarder.cpp
index 0d33b5f..5449e91 100644
--- a/c6021light/src/tasks/RoutingTask/I2CForwarder.cpp
+++ b/c6021light/src/tasks/RoutingTask/I2CForwarder.cpp
@@ -23,7 +23,8 @@ bool sameDecoder(const RR32Can::MachineTurnoutAddress left,
   return (left.value() & mask) == (right.value() & mask);
 }
 
-bool isMatchingTurnoutRailProtocol(const RR32Can::RailProtocol left, const RR32Can::RailProtocol right) {
+bool isMatchingTurnoutRailProtocol(const RR32Can::RailProtocol left,
+                                   const RR32Can::RailProtocol right) {
   if (left == right) {
     return true;
   } else if (left == RR32Can::RailProtocol::MM1 || left == RR32Can::RailProtocol::MM2) {
@@ -41,7 +42,8 @@ void I2CForwarder::forward(const RR32Can::CanFrame& frame) {
         // Responses are forwarded to I2C
         printf(" Got an Accessory packet!\n");
 
-        if (!isMatchingTurnoutRailProtocol(turnoutPacket.getRailProtocol(), dataModel_->accessoryRailProtocol)) {
+        if (!isMatchingTurnoutRailProtocol(turnoutPacket.getRailProtocol(),
+                                           dataModel_->accessoryRailProtocol)) {
           // Not a packet of the expected accessory protocol
           return;
         }