diff --git a/src/accelerator/ogl/image/image_kernel.cpp b/src/accelerator/ogl/image/image_kernel.cpp
index 27c022908b..e22196e34e 100644
--- a/src/accelerator/ogl/image/image_kernel.cpp
+++ b/src/accelerator/ogl/image/image_kernel.cpp
@@ -220,13 +220,14 @@ struct image_kernel::impl
             coord.vertex_y += f_p[1];
         };
 
-		auto const first_plane = params.pix_desc.planes.at(0);
-		if (params.geometry.mode() != core::frame_geometry::scale_mode::stretch && first_plane.width > 0 && first_plane.height > 0) {
-			auto width_scale = static_cast<double>(params.target_width) / static_cast<double>(first_plane.width);
-			auto height_scale = static_cast<double>(params.target_height) / static_cast<double>(first_plane.height);
+        auto const first_plane = params.pix_desc.planes.at(0);
+        if (params.geometry.mode() != core::frame_geometry::scale_mode::stretch && first_plane.width > 0 &&
+            first_plane.height > 0) {
+            auto width_scale  = static_cast<double>(params.target_width) / static_cast<double>(first_plane.width);
+            auto height_scale = static_cast<double>(params.target_height) / static_cast<double>(first_plane.height);
 
             double target_scale;
-			switch (params.geometry.mode()) {
+            switch (params.geometry.mode()) {
                 case core::frame_geometry::scale_mode::fit:
                     target_scale = std::min(width_scale, height_scale);
                     f_s[0] *= target_scale / width_scale;
@@ -253,8 +254,8 @@ struct image_kernel::impl
                     break;
 
                 default:;
-			}
-		}
+            }
+        }
 
         int corner = 0;
         for (auto& coord : coords) {
diff --git a/src/accelerator/ogl/image/image_mixer.cpp b/src/accelerator/ogl/image/image_mixer.cpp
index 9dc2e6356b..1d46417138 100644
--- a/src/accelerator/ogl/image/image_mixer.cpp
+++ b/src/accelerator/ogl/image/image_mixer.cpp
@@ -96,8 +96,8 @@ class image_renderer
         //            return make_ready_future(array<const std::uint8_t>(buffer.data(), format_desc.size, true));
         //        }
 
-        return flatten(ogl_->dispatch_async(
-            [=, layers = std::move(layers)]() mutable -> std::shared_future<core::mixed_image> {
+        return flatten(
+            ogl_->dispatch_async([=, layers = std::move(layers)]() mutable -> std::shared_future<core::mixed_image> {
                 auto target_texture = ogl_->create_texture(format_desc.width, format_desc.height, 4, depth_);
 
                 draw(target_texture, std::move(layers), format_desc);
diff --git a/src/accelerator/ogl/image/image_mixer.h b/src/accelerator/ogl/image/image_mixer.h
index 93ccd3dabb..1fb4fb5437 100644
--- a/src/accelerator/ogl/image/image_mixer.h
+++ b/src/accelerator/ogl/image/image_mixer.h
@@ -49,7 +49,7 @@ class image_mixer final : public core::image_mixer
     image_mixer& operator=(const image_mixer&) = delete;
 
     std::future<core::mixed_image> operator()(const core::video_format_desc& format_desc) override;
-    core::mutable_frame                    create_frame(const void* tag, const core::pixel_format_desc& desc) override;
+    core::mutable_frame            create_frame(const void* tag, const core::pixel_format_desc& desc) override;
     core::mutable_frame
     create_frame(const void* video_stream_tag, const core::pixel_format_desc& desc, common::bit_depth depth) override;
 
diff --git a/src/common/assert.h b/src/common/assert.h
index b4ed822f8e..be8cd390c7 100644
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -35,9 +35,8 @@
 #define CASPAR_VERIFY(expr)                                                                                            \
     do {                                                                                                               \
         if (!(expr)) {                                                                                                 \
-            CASPAR_LOG(warning) << "Assertion Failed: " << CASPAR_VERIFY_EXPR_STR(expr) << " "                         \
-                                << "file:" << __FILE__ << " "                                                          \
-                                << "line:" << __LINE__ << " ";                                                         \
+            CASPAR_LOG(warning) << "Assertion Failed: " << CASPAR_VERIFY_EXPR_STR(expr) << " " << "file:" << __FILE__  \
+                                << " " << "line:" << __LINE__ << " ";                                                  \
             _CASPAR_DBG_BREAK;                                                                                         \
         }                                                                                                              \
     } while (0);
diff --git a/src/common/ptree.h b/src/common/ptree.h
index 1f69eaab3e..99be2246c4 100644
--- a/src/common/ptree.h
+++ b/src/common/ptree.h
@@ -25,8 +25,8 @@
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/iterator/iterator_facade.hpp>
-#include <boost/property_tree/ptree_fwd.hpp>
 #include <boost/property_tree/exceptions.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 
 #include <map>
diff --git a/src/core/consumer/output.h b/src/core/consumer/output.h
index de5d5c1ab8..00979634e3 100644
--- a/src/core/consumer/output.h
+++ b/src/core/consumer/output.h
@@ -29,7 +29,9 @@
 
 #include <memory>
 
-namespace caspar::diagnostics { class graph; }
+namespace caspar::diagnostics {
+class graph;
+}
 
 namespace caspar { namespace core {
 
diff --git a/src/core/diagnostics/osd_graph.cpp b/src/core/diagnostics/osd_graph.cpp
index 758dfcce71..1dedf084d6 100644
--- a/src/core/diagnostics/osd_graph.cpp
+++ b/src/core/diagnostics/osd_graph.cpp
@@ -75,7 +75,8 @@ auto& get_default_font()
             if (auto pipe = popen(cmd.data(), "r")) {
                 char buf[128];
                 path.clear();
-                while (fgets(buf, sizeof(buf), pipe)) path += buf;
+                while (fgets(buf, sizeof(buf), pipe))
+                    path += buf;
             }
         }
 #endif
diff --git a/src/core/frame/draw_frame.cpp b/src/core/frame/draw_frame.cpp
index 86abd670b7..9f1803244f 100644
--- a/src/core/frame/draw_frame.cpp
+++ b/src/core/frame/draw_frame.cpp
@@ -99,8 +99,9 @@ draw_frame::draw_frame(mutable_frame&& frame)
 draw_frame::draw_frame(std::vector<draw_frame> frames)
 {
     auto frame_size = frames.size();
-    impl_ = std::make_unique<impl>(std::move(frames));
-    if (frame_size > 1) impl_->transform_.image_transform.layer_depth = 1;
+    impl_           = std::make_unique<impl>(std::move(frames));
+    if (frame_size > 1)
+        impl_->transform_.image_transform.layer_depth = 1;
 }
 draw_frame::~draw_frame() {}
 draw_frame& draw_frame::operator=(draw_frame other)
diff --git a/src/core/frame/frame.cpp b/src/core/frame/frame.cpp
index 7df79b6ade..86c9c281da 100644
--- a/src/core/frame/frame.cpp
+++ b/src/core/frame/frame.cpp
@@ -98,7 +98,7 @@ struct const_frame::impl
     impl(std::vector<array<const std::uint8_t>> image_data,
          array<const std::int32_t>              audio_data,
          const core::pixel_format_desc&         desc,
-         std::any                             opaque)
+         std::any                               opaque)
         : image_data_(std::move(image_data))
         , audio_data_(std::move(audio_data))
         , desc_(desc)
@@ -155,7 +155,7 @@ const_frame::const_frame(std::vector<array<const std::uint8_t>> image_data,
 const_frame::const_frame(std::vector<array<const std::uint8_t>> image_data,
                          array<const std::int32_t>              audio_data,
                          const struct pixel_format_desc&        desc,
-                         std::any                             opaque)
+                         std::any                               opaque)
     : impl_(new impl(std::move(image_data), std::move(audio_data), desc, opaque))
 {
 }
diff --git a/src/core/frame/frame.h b/src/core/frame/frame.h
index 208719dd06..f3c42e46e8 100644
--- a/src/core/frame/frame.h
+++ b/src/core/frame/frame.h
@@ -63,7 +63,7 @@ class const_frame final
     explicit const_frame(std::vector<array<const std::uint8_t>> image_data,
                          array<const std::int32_t>              audio_data,
                          const struct pixel_format_desc&        desc,
-                         std::any                             opaque);
+                         std::any                               opaque);
     const_frame(const const_frame& other);
     const_frame(mutable_frame&& other);
 
diff --git a/src/core/frame/geometry.cpp b/src/core/frame/geometry.cpp
index 016abdd3da..03571d5176 100644
--- a/src/core/frame/geometry.cpp
+++ b/src/core/frame/geometry.cpp
@@ -40,8 +40,9 @@ bool frame_geometry::coord::operator==(const frame_geometry::coord& other) const
 
 struct frame_geometry::impl
 {
-    impl(frame_geometry::geometry_type type, frame_geometry::scale_mode mode, std::vector<coord> data) :
-        type_{type}, mode_{mode}
+    impl(frame_geometry::geometry_type type, frame_geometry::scale_mode mode, std::vector<coord> data)
+        : type_{type}
+        , mode_{mode}
     {
         if (type == geometry_type::quad && data.size() != 4)
             CASPAR_THROW_EXCEPTION(invalid_argument() << msg_info("The number of coordinates needs to be 4"));
@@ -54,9 +55,10 @@ struct frame_geometry::impl
     std::vector<coord>            data_;
 };
 
-frame_geometry::frame_geometry(geometry_type type, scale_mode mode, std::vector<coord> data) :
-    impl_{new impl{type, mode, std::move(data)}}
-{ }
+frame_geometry::frame_geometry(geometry_type type, scale_mode mode, std::vector<coord> data)
+    : impl_{new impl{type, mode, std::move(data)}}
+{
+}
 
 frame_geometry::geometry_type             frame_geometry::type() const { return impl_->type_; }
 frame_geometry::scale_mode                frame_geometry::mode() const { return impl_->mode_; }
@@ -71,7 +73,7 @@ const frame_geometry frame_geometry::get_default(scale_mode mode)
         {1.0, 1.0, 1.0, 1.0}, // lower right
         {0.0, 1.0, 0.0, 1.0}  // lower left
     };
-    return frame_geometry{ frame_geometry::geometry_type::quad, mode, std::move(data) };
+    return frame_geometry{frame_geometry::geometry_type::quad, mode, std::move(data)};
 }
 const frame_geometry frame_geometry::get_default_vflip(scale_mode mode)
 {
@@ -82,46 +84,43 @@ const frame_geometry frame_geometry::get_default_vflip(scale_mode mode)
         {1.0, 1.0, 1.0, 0.0}, // lower right
         {0.0, 1.0, 0.0, 0.0}  // lower left
     };
-    return frame_geometry{ frame_geometry::geometry_type::quad, mode, std::move(data) };
+    return frame_geometry{frame_geometry::geometry_type::quad, mode, std::move(data)};
 }
 
-frame_geometry::scale_mode scale_mode_from_string(const std::wstring& str) {
-	auto str2 = boost::to_lower_copy(str);
-	if (str2 == L"fit") {
-		return frame_geometry::scale_mode::fit;
-	}
-	else if (str2 == L"fill") {
-		return frame_geometry::scale_mode::fill;
-	}
-	else if (str2 == L"original") {
-		return frame_geometry::scale_mode::original;
-	}
-	else if (str2 == L"hfill") {
-		return frame_geometry::scale_mode::hfill;
-	}
-	else if (str2 == L"vfill") {
-		return frame_geometry::scale_mode::vfill;
-	}
-	else {
-		return frame_geometry::scale_mode::stretch;
-	}
+frame_geometry::scale_mode scale_mode_from_string(const std::wstring& str)
+{
+    auto str2 = boost::to_lower_copy(str);
+    if (str2 == L"fit") {
+        return frame_geometry::scale_mode::fit;
+    } else if (str2 == L"fill") {
+        return frame_geometry::scale_mode::fill;
+    } else if (str2 == L"original") {
+        return frame_geometry::scale_mode::original;
+    } else if (str2 == L"hfill") {
+        return frame_geometry::scale_mode::hfill;
+    } else if (str2 == L"vfill") {
+        return frame_geometry::scale_mode::vfill;
+    } else {
+        return frame_geometry::scale_mode::stretch;
+    }
 }
 
-std::wstring scale_mode_to_string(frame_geometry::scale_mode mode) {
-	switch (mode) {
-	case frame_geometry::scale_mode::fit:
-		return L"FIT";
-	case frame_geometry::scale_mode::fill:
-		return L"FILL";
-	case frame_geometry::scale_mode::original:
-		return L"ORIGINAL";
-	case frame_geometry::scale_mode::hfill:
-		return L"HFILL";
-	case frame_geometry::scale_mode::vfill:
-		return L"VFILL";
-	default:
-		return L"STRETCH";
-	}
+std::wstring scale_mode_to_string(frame_geometry::scale_mode mode)
+{
+    switch (mode) {
+        case frame_geometry::scale_mode::fit:
+            return L"FIT";
+        case frame_geometry::scale_mode::fill:
+            return L"FILL";
+        case frame_geometry::scale_mode::original:
+            return L"ORIGINAL";
+        case frame_geometry::scale_mode::hfill:
+            return L"HFILL";
+        case frame_geometry::scale_mode::vfill:
+            return L"VFILL";
+        default:
+            return L"STRETCH";
+    }
 }
 
 }} // namespace caspar::core
diff --git a/src/core/frame/geometry.h b/src/core/frame/geometry.h
index 48ae95a82f..56a853e652 100644
--- a/src/core/frame/geometry.h
+++ b/src/core/frame/geometry.h
@@ -75,6 +75,6 @@ class frame_geometry
 };
 
 frame_geometry::scale_mode scale_mode_from_string(const std::wstring&);
-std::wstring scale_mode_to_string(frame_geometry::scale_mode);
+std::wstring               scale_mode_to_string(frame_geometry::scale_mode);
 
 }} // namespace caspar::core
diff --git a/src/core/mixer/audio/audio_mixer.h b/src/core/mixer/audio/audio_mixer.h
index 785139fe61..4a7bbe81bf 100644
--- a/src/core/mixer/audio/audio_mixer.h
+++ b/src/core/mixer/audio/audio_mixer.h
@@ -30,7 +30,9 @@
 
 #include <cstdint>
 
-namespace caspar::diagnostics { class graph; }
+namespace caspar::diagnostics {
+class graph;
+}
 
 namespace caspar { namespace core {
 
diff --git a/src/core/mixer/image/image_mixer.h b/src/core/mixer/image/image_mixer.h
index 4956ef530a..61a6e88dab 100644
--- a/src/core/mixer/image/image_mixer.h
+++ b/src/core/mixer/image/image_mixer.h
@@ -34,7 +34,7 @@ namespace caspar { namespace core {
 struct mixed_image
 {
     array<const uint8_t> rgba8;
-    std::any           texture;
+    std::any             texture;
 
     mixed_image(array<const uint8_t> rgba8, std::any texture)
         : rgba8(rgba8)
diff --git a/src/core/mixer/mixer.h b/src/core/mixer/mixer.h
index 252d80c2fd..75e49ef45a 100644
--- a/src/core/mixer/mixer.h
+++ b/src/core/mixer/mixer.h
@@ -27,7 +27,9 @@
 #include <core/fwd.h>
 #include <core/monitor/monitor.h>
 
-namespace caspar::diagnostics { class graph; }
+namespace caspar::diagnostics {
+class graph;
+}
 
 namespace caspar { namespace core {
 
diff --git a/src/core/producer/route/route_producer.cpp b/src/core/producer/route/route_producer.cpp
index 1cd4e40b66..e96c3174ed 100644
--- a/src/core/producer/route/route_producer.cpp
+++ b/src/core/producer/route/route_producer.cpp
@@ -41,7 +41,7 @@ namespace caspar { namespace core {
 class route_producer
     : public frame_producer
     , public route_control
-	, public std::enable_shared_from_this<route_producer>
+    , public std::enable_shared_from_this<route_producer>
 {
     spl::shared_ptr<diagnostics::graph> graph_;
 
@@ -50,7 +50,7 @@ class route_producer
     caspar::timer produce_timer_;
     caspar::timer consume_timer_;
 
-    std::shared_ptr<route>             route_;
+    std::shared_ptr<route> route_;
 
     std::optional<std::pair<core::draw_frame, core::draw_frame>> frame_;
     int                                                          source_channel_;
@@ -91,29 +91,30 @@ class route_producer
 
     void connect_slot()
     {
-		auto weak_self = weak_from_this();
-		connection_ = route_->signal.connect([weak_self](const core::draw_frame& frame1, const core::draw_frame& frame2) {
-					if (auto self = weak_self.lock()) {
-						auto frame1b = frame1;
-						if (!frame1b) {
-							// We got a frame, so ensure it is a real frame (otherwise the layer gets confused)
-							frame1b = core::draw_frame::push(frame1);
-						}
-						auto frame2b = frame2;
-						if (!frame2b) {
-                            // Ensure that any interlaced channel will repeat frames instead of showing black.
-                            // Note: doing 50p -> 50i will result in dropping to 25p and frame doubling.
-                            frame2b = frame1b;
-                        }
-
-						if (!self->buffer_.try_push(std::make_pair(frame1b, frame2b))) {
-							self->graph_->set_tag(diagnostics::tag_severity::WARNING, "dropped-frame");
-						}
-						self->graph_->set_value("produce-time", self->produce_timer_.elapsed() * self->route_->format_desc.fps * 0.5);
-						self->produce_timer_.restart();
-					}
-				}
-		);
+        auto weak_self = weak_from_this();
+        connection_ =
+            route_->signal.connect([weak_self](const core::draw_frame& frame1, const core::draw_frame& frame2) {
+                if (auto self = weak_self.lock()) {
+                    auto frame1b = frame1;
+                    if (!frame1b) {
+                        // We got a frame, so ensure it is a real frame (otherwise the layer gets confused)
+                        frame1b = core::draw_frame::push(frame1);
+                    }
+                    auto frame2b = frame2;
+                    if (!frame2b) {
+                        // Ensure that any interlaced channel will repeat frames instead of showing black.
+                        // Note: doing 50p -> 50i will result in dropping to 25p and frame doubling.
+                        frame2b = frame1b;
+                    }
+
+                    if (!self->buffer_.try_push(std::make_pair(frame1b, frame2b))) {
+                        self->graph_->set_tag(diagnostics::tag_severity::WARNING, "dropped-frame");
+                    }
+                    self->graph_->set_value("produce-time",
+                                            self->produce_timer_.elapsed() * self->route_->format_desc.fps * 0.5);
+                    self->produce_timer_.restart();
+                }
+            });
     }
 
     draw_frame last_frame(const core::video_field field) override
@@ -211,7 +212,7 @@ spl::shared_ptr<core::frame_producer> create_route_producer(const core::frame_pr
     }
 
     auto buffer = get_param(L"BUFFER", params, 0);
-    auto rp = spl::make_shared<route_producer>((*channel_it)->route(layer, mode), buffer, channel, layer);
+    auto rp     = spl::make_shared<route_producer>((*channel_it)->route(layer, mode), buffer, channel, layer);
     rp->connect_slot();
     return rp;
 }
diff --git a/src/core/producer/stage.h b/src/core/producer/stage.h
index 1081a8e104..2edfcff6b2 100644
--- a/src/core/producer/stage.h
+++ b/src/core/producer/stage.h
@@ -38,7 +38,9 @@
 #include <tuple>
 #include <vector>
 
-namespace caspar::diagnostics { class graph; }
+namespace caspar::diagnostics {
+class graph;
+}
 
 namespace caspar { namespace core {
 
diff --git a/src/modules/bluefish/producer/bluefish_producer.cpp b/src/modules/bluefish/producer/bluefish_producer.cpp
index d0f56c912e..3b4b3d9eb2 100644
--- a/src/modules/bluefish/producer/bluefish_producer.cpp
+++ b/src/modules/bluefish/producer/bluefish_producer.cpp
@@ -445,14 +445,14 @@ struct bluefish_producer
                 auto src_audio = alloc_frame();
 
                 // video
-                src_video->format                 = AV_PIX_FMT_RGB24;
-                src_video->width                  = width;
-                src_video->height                 = height;
-                src_video->interlaced_frame       = !is_progressive;
-                src_video->top_field_first        = height != 486;
-                src_video->key_frame              = 1;
-                //src_video->display_picture_number = frames_captured;
-                src_video->pts                    = capture_ts;
+                src_video->format           = AV_PIX_FMT_RGB24;
+                src_video->width            = width;
+                src_video->height           = height;
+                src_video->interlaced_frame = !is_progressive;
+                src_video->top_field_first  = height != 486;
+                src_video->key_frame        = 1;
+                // src_video->display_picture_number = frames_captured;
+                src_video->pts = capture_ts;
 
                 void* video_bytes = reserved_frames_.front()->image_data();
                 if (reserved_frames_.front() && video_bytes) {
diff --git a/src/modules/decklink/consumer/decklink_consumer.cpp b/src/modules/decklink/consumer/decklink_consumer.cpp
index f1278a83fa..958877ee26 100644
--- a/src/modules/decklink/consumer/decklink_consumer.cpp
+++ b/src/modules/decklink/consumer/decklink_consumer.cpp
@@ -990,8 +990,10 @@ struct decklink_consumer final : public IDeckLinkVideoOutputCallback
                     //                                                           mode_->GetFieldDominance(),
                     //                                                           config_.hdr);
 
-                    schedule_next_video(
-                        image_data, nb_samples, video_display_time, frame1.value().raw_frame.pixel_format_desc().color_space);
+                    schedule_next_video(image_data,
+                                        nb_samples,
+                                        video_display_time,
+                                        frame1.value().raw_frame.pixel_format_desc().color_space);
 
                     if (config_.embedded_audio) {
                         schedule_next_audio(std::move(audio_data), nb_samples);
diff --git a/src/modules/ffmpeg/producer/av_input.cpp b/src/modules/ffmpeg/producer/av_input.cpp
index ef67cc0b01..32d5181bab 100644
--- a/src/modules/ffmpeg/producer/av_input.cpp
+++ b/src/modules/ffmpeg/producer/av_input.cpp
@@ -163,8 +163,7 @@ void Input::internal_reset()
     auto ic2 = std::shared_ptr<AVFormatContext>(ic, [](AVFormatContext* ctx) { avformat_close_input(&ctx); });
 
     for (auto& p : to_map(&options)) {
-        CASPAR_LOG(warning) << "av_input[" + filename_ + "]"
-                            << " Unused option " << p.first << "=" << p.second;
+        CASPAR_LOG(warning) << "av_input[" + filename_ + "]" << " Unused option " << p.first << "=" << p.second;
     }
 
     FF(avformat_find_stream_info(ic2.get(), nullptr));
diff --git a/src/modules/ffmpeg/producer/av_producer.cpp b/src/modules/ffmpeg/producer/av_producer.cpp
index e2d60ff523..d4de3cdbb0 100644
--- a/src/modules/ffmpeg/producer/av_producer.cpp
+++ b/src/modules/ffmpeg/producer/av_producer.cpp
@@ -684,13 +684,13 @@ struct AVProducer::Impl
     std::string afilter_;
     std::string vfilter_;
 
-    int              seekable_       = 2;
+    int                              seekable_ = 2;
     core::frame_geometry::scale_mode scale_mode_;
-    int64_t          frame_count_    = 0;
-    bool             frame_flush_    = true;
-    int64_t          frame_time_     = AV_NOPTS_VALUE;
-    int64_t          frame_duration_ = AV_NOPTS_VALUE;
-    core::draw_frame frame_;
+    int64_t                          frame_count_    = 0;
+    bool                             frame_flush_    = true;
+    int64_t                          frame_time_     = AV_NOPTS_VALUE;
+    int64_t                          frame_duration_ = AV_NOPTS_VALUE;
+    core::draw_frame                 frame_;
 
     std::deque<Frame>         buffer_;
     mutable boost::mutex      buffer_mutex_;
@@ -805,7 +805,7 @@ struct AVProducer::Impl
         }
 
         {
-            const auto start =  start_.load();
+            const auto start = start_.load();
             if (duration_ == AV_NOPTS_VALUE && input_->duration > 0) {
                 if (start != AV_NOPTS_VALUE) {
                     duration_ = input_->duration - start;
@@ -936,8 +936,7 @@ struct AVProducer::Impl
             }
 
             frame.frame = core::draw_frame(
-                make_frame(this, *frame_factory_, frame.video, frame.audio, get_color_space(frame.video), scale_mode_)
-            );
+                make_frame(this, *frame_factory_, frame.video, frame.audio, get_color_space(frame.video), scale_mode_));
             frame.frame_count = frame_count_++;
 
             graph_->set_value("decode-time", decode_timer.elapsed() * format_desc_.fps * 0.5);
diff --git a/src/modules/ffmpeg/producer/ffmpeg_producer.cpp b/src/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 7c43bdf58b..da7bdf3e48 100644
--- a/src/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/src/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -91,7 +91,8 @@ struct ffmpeg_producer : public core::frame_producer
                                    loop,
                                    seekable,
                                    scale_mode))
-    { }
+    {
+    }
 
     ~ffmpeg_producer()
     {
@@ -222,10 +223,7 @@ boost::tribool has_valid_extension(const boost::filesystem::path& filename)
     return boost::tribool(boost::indeterminate);
 }
 
-bool has_invalid_protocol(const std::wstring& filename)
-{
-    return boost::algorithm::istarts_with(filename, L"ndi://");
-}
+bool has_invalid_protocol(const std::wstring& filename) { return boost::algorithm::istarts_with(filename, L"ndi://"); }
 
 bool is_readable(const boost::filesystem::path& filename)
 {
diff --git a/src/modules/ffmpeg/util/av_util.h b/src/modules/ffmpeg/util/av_util.h
index ec96eb8bab..809e5b55db 100644
--- a/src/modules/ffmpeg/util/av_util.h
+++ b/src/modules/ffmpeg/util/av_util.h
@@ -33,7 +33,7 @@ core::mutable_frame     make_frame(void*                    tag,
                                    std::shared_ptr<AVFrame> video,
                                    std::shared_ptr<AVFrame> audio,
                                    core::color_space        color_space = core::color_space::bt709,
-                                   core::frame_geometry::scale_mode = core::frame_geometry::scale_mode::stretch);
+                                   core::frame_geometry::scale_mode     = core::frame_geometry::scale_mode::stretch);
 
 core::mutable_frame make_frame2(void*                                         tag,
                                 const std::shared_ptr<core::frame_converter>& frame_factory,
diff --git a/src/modules/html/html.cpp b/src/modules/html/html.cpp
index 74714a2f4a..04f380ef1f 100644
--- a/src/modules/html/html.cpp
+++ b/src/modules/html/html.cpp
@@ -116,9 +116,8 @@ class renderer_application
         if (!frame->IsMain())
             return;
 
-        caspar_log(browser,
-                   boost::log::trivial::trace,
-                   "context for frame " + frame->GetIdentifier().ToString() + " created");
+        caspar_log(
+            browser, boost::log::trivial::trace, "context for frame " + frame->GetIdentifier().ToString() + " created");
         contexts_.push_back(context);
 
         auto window = context->GetGlobal();
diff --git a/src/modules/image/util/image_loader.cpp b/src/modules/image/util/image_loader.cpp
index 7ce653506e..9fb6913fb0 100644
--- a/src/modules/image/util/image_loader.cpp
+++ b/src/modules/image/util/image_loader.cpp
@@ -127,7 +127,8 @@ loaded_image load_image(const std::wstring& filename, bool allow_all_formats)
 #ifdef WIN32
     auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_LoadU(fif, filename.c_str(), JPEG_EXIFROTATE), FreeImage_Unload);
 #else
-    auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_Load(fif, u8(filename).c_str(), JPEG_EXIFROTATE), FreeImage_Unload);
+    auto bitmap =
+        std::shared_ptr<FIBITMAP>(FreeImage_Load(fif, u8(filename).c_str(), JPEG_EXIFROTATE), FreeImage_Unload);
 #endif
 
     return prepare_loaded_image(fif, std::move(bitmap), allow_all_formats);
@@ -140,7 +141,8 @@ loaded_image load_png_from_memory(const void* memory_location, size_t size, bool
     auto memory = std::unique_ptr<FIMEMORY, decltype(&FreeImage_CloseMemory)>(
         FreeImage_OpenMemory(static_cast<BYTE*>(const_cast<void*>(memory_location)), static_cast<DWORD>(size)),
         FreeImage_CloseMemory);
-    auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_LoadFromMemory(fif, memory.get(), JPEG_EXIFROTATE), FreeImage_Unload);
+    auto bitmap =
+        std::shared_ptr<FIBITMAP>(FreeImage_LoadFromMemory(fif, memory.get(), JPEG_EXIFROTATE), FreeImage_Unload);
 
     return prepare_loaded_image(fif, std::move(bitmap), allow_all_formats);
 }
diff --git a/src/modules/newtek/util/ndi.cpp b/src/modules/newtek/util/ndi.cpp
index 404e58ca64..203dc2e450 100644
--- a/src/modules/newtek/util/ndi.cpp
+++ b/src/modules/newtek/util/ndi.cpp
@@ -109,7 +109,7 @@ NDIlib_v5* load_library()
     }
 
     NDIlib_find_create_t find_instance_options = {};
-    find_instance_options.show_local_sources = true;
+    find_instance_options.show_local_sources   = true;
 
     find_instance.reset(new NDIlib_find_instance_t(ndi_lib->NDIlib_find_create_v2(&find_instance_options)),
                         [](NDIlib_find_instance_t* p) { ndi_lib->NDIlib_find_destroy(*p); });
diff --git a/src/protocol/amcp/amcp_command_context.h b/src/protocol/amcp/amcp_command_context.h
index 7f357af013..54206010a7 100644
--- a/src/protocol/amcp/amcp_command_context.h
+++ b/src/protocol/amcp/amcp_command_context.h
@@ -29,7 +29,9 @@
 #include <future>
 #include <utility>
 
-namespace caspar::protocol::osc { class client; }
+namespace caspar::protocol::osc {
+class client;
+}
 
 namespace caspar { namespace protocol { namespace amcp {
 
diff --git a/src/shell/windows_specific.cpp b/src/shell/windows_specific.cpp
index b0bf62fd2d..b1a33a31c8 100644
--- a/src/shell/windows_specific.cpp
+++ b/src/shell/windows_specific.cpp
@@ -36,7 +36,7 @@
 #include <io.h>
 
 // NOTE: This is needed in order to make CComObject work since this is not a real ATL project.
-CComModule _AtlModule;
+CComModule                               _AtlModule;
 extern __declspec(selectany) CAtlModule* _pAtlModule = &_AtlModule;
 
 extern "C" {