diff --git a/DataFormats/Headers/include/Headers/DataHeader.h b/DataFormats/Headers/include/Headers/DataHeader.h
index e4ddaded20aba..2dbfbd67d8d6c 100644
--- a/DataFormats/Headers/include/Headers/DataHeader.h
+++ b/DataFormats/Headers/include/Headers/DataHeader.h
@@ -372,9 +372,9 @@ struct BaseHeader {
   union {
     uint32_t flags;
     struct {
-      uint32_t flagsNextHeader : 1,        // do we have a next header after this one?
-               flagsReserved : 15,         // reserved for future use
-               flagsDerivedHeader : 16;    // reserved for usage by the derived header
+      uint32_t flagsNextHeader : 1, // do we have a next header after this one?
+        flagsReserved : 15,         // reserved for future use
+        flagsDerivedHeader : 16;    // reserved for usage by the derived header
     };
   };
 
diff --git a/Framework/Core/include/Framework/DeviceContext.h b/Framework/Core/include/Framework/DeviceContext.h
index 04cf663d5e276..f0c3021d86dc8 100644
--- a/Framework/Core/include/Framework/DeviceContext.h
+++ b/Framework/Core/include/Framework/DeviceContext.h
@@ -33,12 +33,12 @@ struct DeviceContext {
   int expectedRegionCallbacks = 0;
   // The timeout for the data processing to stop on this device.
   // After this is reached, incoming data not marked to be kept will
-  // be dropped and the data processing will be stopped. However the 
+  // be dropped and the data processing will be stopped. However the
   // calibrations will still be done and objects resulting from calibrations
   // will be marked to be kept.
   int dataProcessingTimeout = 0;
   // The timeout for the whole processing to stop on this device.
-  // This includes the grace period for processing and the time 
+  // This includes the grace period for processing and the time
   // for the calibrations to be done.
   int exitTransitionTimeout = 0;
 };
diff --git a/Framework/Core/src/DataProcessingDevice.cxx b/Framework/Core/src/DataProcessingDevice.cxx
index 0710a6e4232fe..f07d51ab15d96 100644
--- a/Framework/Core/src/DataProcessingDevice.cxx
+++ b/Framework/Core/src/DataProcessingDevice.cxx
@@ -120,7 +120,7 @@ void on_idle_timer(uv_timer_t* handle)
 void on_transition_requested_expired(uv_timer_t* handle)
 {
   ZoneScopedN("Transition expired");
-  auto *state = (DeviceState*)handle->data;
+  auto* state = (DeviceState*)handle->data;
   state->loopReason |= DeviceState::TIMER_EXPIRED;
   LOGP(info, "Grace period for Data Processing & calibration expired.");
   state->transitionHandling = TransitionHandlingState::Expired;
@@ -129,7 +129,7 @@ void on_transition_requested_expired(uv_timer_t* handle)
 void on_data_processing_grace_expired(uv_timer_t* handle)
 {
   ZoneScopedN("Transition expired");
-  auto *state = (DeviceState*)handle->data;
+  auto* state = (DeviceState*)handle->data;
   state->loopReason |= DeviceState::TIMER_EXPIRED;
   LOGP(info, "Grace period for Data Processing Expired. Waiting for calibration.");
   state->transitionHandling = TransitionHandlingState::DataProcessingExpired;
@@ -1292,7 +1292,7 @@ void DataProcessingDevice::Run()
         if (onlyTimers) {
           state.streaming = StreamingState::EndOfStreaming;
         }
-        
+
         if (deviceContext.exitTransitionTimeout != 0 && state.streaming != StreamingState::Idle) {
           state.transitionHandling = TransitionHandlingState::Requested;
           ref.get<CallbackService>().call<CallbackService::Id::ExitRequested>(ServiceRegistryRef{ref});
@@ -1323,8 +1323,7 @@ void DataProcessingDevice::Run()
         }
       }
       // If we are Idle, we can then consider the transition to be expired when it was requested or when the data processing timeout expired.
-      if ((state.transitionHandling == TransitionHandlingState::Requested || state.transitionHandling == TransitionHandlingState::DataProcessingExpired) 
-          && state.streaming == StreamingState::Idle) {
+      if ((state.transitionHandling == TransitionHandlingState::Requested || state.transitionHandling == TransitionHandlingState::DataProcessingExpired) && state.streaming == StreamingState::Idle) {
         O2_SIGNPOST_EVENT_EMIT(device, lid, "run_loop", "State transition requested and we are now in Idle. We can consider it to be completed.");
         state.transitionHandling = TransitionHandlingState::Expired;
       }
@@ -1523,7 +1522,7 @@ void DataProcessingDevice::doPrepare(ServiceRegistryRef ref)
   auto currentNewest = state.inputChannelInfos[pollOrder.back()].oldestForChannel;
   auto delta = currentNewest.value - currentOldest.value;
   O2_SIGNPOST_EVENT_EMIT(device, dpid, "do_prepare", "Oldest possible timeframe range %" PRIu64 " => %" PRIu64 " delta %" PRIu64,
-                        (int64_t)currentOldest.value, (int64_t)currentNewest.value, (int64_t)delta);
+                         (int64_t)currentOldest.value, (int64_t)currentNewest.value, (int64_t)delta);
   auto& infos = state.inputChannelInfos;
 
   if (context.balancingInputs) {
@@ -1695,7 +1694,7 @@ void DataProcessingDevice::doRun(ServiceRegistryRef ref)
       relayer.processDanglingInputs(context.expirationHandlers, *context.registry, false);
     }
 
-    auto &timingInfo = ref.get<TimingInfo>();
+    auto& timingInfo = ref.get<TimingInfo>();
     // We should keep the data generated at end of stream only for those
     // which are not sources.
     timingInfo.keepAtEndOfStream = (hasOnlyGenerated == false);