diff --git a/.clang-format b/.clang-format
index 0adc3b90f..892d60add 100644
--- a/.clang-format
+++ b/.clang-format
@@ -116,7 +116,7 @@ PointerAlignment: Left
 QualifierAlignment: Leave
 ReferenceAlignment: Pointer
 RemoveBracesLLVM: false
-RemoveSemicolon: true
+# RemoveSemicolon: true
 ReflowComments: true
 RequiresClausePosition: OwnLine
 SeparateDefinitionBlocks: Leave
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fc3f0e611..c9e1f36b0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 - repo: https://github.com/sirosen/check-jsonschema
-  rev: 0.28.0
+  rev: 0.28.1
   hooks:
     - id: check-github-actions
     - id: check-github-workflows
@@ -17,7 +17,7 @@ repos:
     -   id: check-added-large-files
 
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 'v17.0.6'
+    rev: 'v18.1.2'
     hooks:
     -   id: clang-format
         args: ["-style=file", "-i"]
diff --git a/src/rpp/rpp/observables/connectable_observable.hpp b/src/rpp/rpp/observables/connectable_observable.hpp
index 479790949..a108abee1 100644
--- a/src/rpp/rpp/observables/connectable_observable.hpp
+++ b/src/rpp/rpp/observables/connectable_observable.hpp
@@ -83,7 +83,7 @@ namespace rpp
         {
         }
 
-        connectable_observable(OriginalObservable&& original_observable, const Subject& subject = Subject{})
+        connectable_observable(OriginalObservable && original_observable, const Subject& subject = Subject{})
             : base{subject.get_observable()}
             , m_original_observable{std::move(original_observable)}
             , m_subject{subject}
@@ -137,7 +137,7 @@ namespace rpp
         }
 
         template<rpp::constraint::operator_observable_transform<connectable_observable&&> Op>
-        auto operator|(Op&& op) &&
+        auto operator|(Op&& op)&&
         {
             return std::forward<Op>(op)(std::move(*this));
         }
@@ -149,7 +149,7 @@ namespace rpp
         }
 
         template<typename Op>
-        decltype(std::declval<base>() | std::declval<Op>()) operator|(Op&& op) &&
+        decltype(std::declval<base>() | std::declval<Op>()) operator|(Op&& op)&&
         {
             return static_cast<base&&>(*this) | std::forward<Op>(op);
         }
diff --git a/src/rpp/rpp/operators/subscribe.hpp b/src/rpp/rpp/operators/subscribe.hpp
index 955f3923c..e597aced9 100644
--- a/src/rpp/rpp/operators/subscribe.hpp
+++ b/src/rpp/rpp/operators/subscribe.hpp
@@ -209,7 +209,7 @@ namespace rpp::operators::details
     subscribe_t(const Args&...) -> subscribe_t<Args...>;
 
     template<typename OnNext>
-    concept on_next_like = (!rpp::utils::is_not_template_callable<OnNext> || std::invocable<OnNext, rpp::utils::convertible_to_any>)&&(!rpp::constraint::decayed_same_as<OnNext, rpp::composite_disposable_wrapper> && !rpp::constraint::observer_strategy_base<OnNext> && !rpp::constraint::observer<OnNext>);
+    concept on_next_like = (!rpp::utils::is_not_template_callable<OnNext> || std::invocable<OnNext, rpp::utils::convertible_to_any>) && (!rpp::constraint::decayed_same_as<OnNext, rpp::composite_disposable_wrapper> && !rpp::constraint::observer_strategy_base<OnNext> && !rpp::constraint::observer<OnNext>);
 } // namespace rpp::operators::details
 
 namespace rpp::operators
diff --git a/src/rpp/rpp/schedulers/fwd.hpp b/src/rpp/rpp/schedulers/fwd.hpp
index 3e8bd5a9a..9e13b4814 100644
--- a/src/rpp/rpp/schedulers/fwd.hpp
+++ b/src/rpp/rpp/schedulers/fwd.hpp
@@ -148,7 +148,7 @@ namespace rpp::schedulers::constraint
     };
 
     template<typename S>
-    concept strategy = (defer_for_strategy<S> || defer_to_strategy<S>)&&requires(const S& s, const details::fake_schedulable_handler& handler) {
+    concept strategy = (defer_for_strategy<S> || defer_to_strategy<S>) && requires(const S& s, const details::fake_schedulable_handler& handler) {
         {
             s.get_disposable()
         } -> rpp::constraint::any_of<rpp::disposable_wrapper, details::none_disposable>;
diff --git a/src/tests/rpp/test_subscribe.cpp b/src/tests/rpp/test_subscribe.cpp
index 80b55512b..aecbb55c7 100644
--- a/src/tests/rpp/test_subscribe.cpp
+++ b/src/tests/rpp/test_subscribe.cpp
@@ -101,11 +101,7 @@ TEMPLATE_TEST_CASE("subscribe as operator", "", rpp::memory_model::use_stack, rp
     SECTION("subscribe lambdas with disposable")
     {
         static_assert(std::is_same_v<decltype(observable | rpp::operators::subscribe(rpp::composite_disposable_wrapper::make(), rpp::utils::empty_function_t<int>{}, rpp::utils::empty_function_t<std::exception_ptr>{}, rpp::utils::empty_function_t<>{})), rpp::composite_disposable_wrapper>);
-        auto d = observable | rpp::operators::subscribe(
-                     rpp::composite_disposable_wrapper::make(),
-                     [&mock](const auto& v) { mock.on_next(v); },
-                     rpp::utils::empty_function_t<std::exception_ptr>{},
-                     rpp::utils::empty_function_t<>{});
+        auto d = observable | rpp::operators::subscribe(rpp::composite_disposable_wrapper::make(), [&mock](const auto& v) { mock.on_next(v); }, rpp::utils::empty_function_t<std::exception_ptr>{}, rpp::utils::empty_function_t<>{});
         CHECK(d.is_disposed());
         CHECK(mock.get_received_values() == std::vector{1});
     }
@@ -113,11 +109,7 @@ TEMPLATE_TEST_CASE("subscribe as operator", "", rpp::memory_model::use_stack, rp
     SECTION("subscribe lambdas with disposed disposable")
     {
         static_assert(std::is_same_v<decltype(observable | rpp::operators::subscribe(rpp::composite_disposable_wrapper::empty(), rpp::utils::empty_function_t<int>{}, rpp::utils::empty_function_t<std::exception_ptr>{}, rpp::utils::empty_function_t<>{})), rpp::composite_disposable_wrapper>);
-        auto d = observable | rpp::operators::subscribe(
-                     rpp::composite_disposable_wrapper::empty(),
-                     [&mock](const auto& v) { mock.on_next(v); },
-                     rpp::utils::empty_function_t<std::exception_ptr>{},
-                     rpp::utils::empty_function_t<>{});
+        auto d = observable | rpp::operators::subscribe(rpp::composite_disposable_wrapper::empty(), [&mock](const auto& v) { mock.on_next(v); }, rpp::utils::empty_function_t<std::exception_ptr>{}, rpp::utils::empty_function_t<>{});
         CHECK(d.is_disposed());
         CHECK(mock.get_received_values().empty());
     }