Restoring authorship annotation for <[email protected]>. Commit 2 of 2.

164 files changed, 718 insertions, 718 deletions

diff --git a/library/cpp/cache/cache.h b/library/cpp/cache/cache.h
index c5231e42d39..6dc997076d9 100644
--- a/library/cpp/cache/cache.h
+++ b/library/cpp/cache/cache.h
@@ -101,20 +101,20 @@ public:
         return ItemsAmount;
     }
 
-    size_t GetTotalSize() const { 
-        return TotalSize; 
-    } 
- 
-    size_t GetMaxSize() const { 
-        return MaxSize; 
-    } 
- 
-    // It does not remove current items if newSize is less than TotalSize. 
-    // Caller should use RemoveIfOverflown to clean up list in this case 
-    void SetMaxSize(size_t newSize) { 
-        MaxSize = newSize; 
-    } 
- 
+    size_t GetTotalSize() const {
+        return TotalSize;
+    }
+
+    size_t GetMaxSize() const {
+        return MaxSize;
+    }
+
+    // It does not remove current items if newSize is less than TotalSize.
+    // Caller should use RemoveIfOverflown to clean up list in this case
+    void SetMaxSize(size_t newSize) {
+        MaxSize = newSize;
+    }
+
 private:
     typedef TIntrusiveList<TItem> TListType;
     TListType List;
@@ -212,16 +212,16 @@ public:
         return ListSize;
     }
 
-    size_t GetMaxSize() const { 
-        return MaxSize; 
-    } 
- 
-    // It does not remove current items if newSize is less than TotalSize. 
-    // Caller should use RemoveIfOverflown to clean up list in this case 
-    void SetMaxSize(size_t newSize) { 
-        MaxSize = newSize; 
-    } 
- 
+    size_t GetMaxSize() const {
+        return MaxSize;
+    }
+
+    // It does not remove current items if newSize is less than TotalSize.
+    // Caller should use RemoveIfOverflown to clean up list in this case
+    void SetMaxSize(size_t newSize) {
+        MaxSize = newSize;
+    }
+
 private:
     typedef TIntrusiveList<TItem> TListType;
     TListType List;
@@ -333,16 +333,16 @@ public:
         return Size;
     }
 
-    size_t GetMaxSize() const { 
-        return MaxSize; 
-    } 
- 
-    // It does not remove current items if newSize is less than TotalSize. 
-    // Caller should use RemoveIfOverflown to clean up list in this case 
-    void SetMaxSize(size_t newSize) { 
-        MaxSize = newSize; 
-    } 
- 
+    size_t GetMaxSize() const {
+        return MaxSize;
+    }
+
+    // It does not remove current items if newSize is less than TotalSize.
+    // Caller should use RemoveIfOverflown to clean up list in this case
+    void SetMaxSize(size_t newSize) {
+        MaxSize = newSize;
+    }
+
     void Clear() {
         Heap.clear();
         Removed.clear();
@@ -531,20 +531,20 @@ public:
         Index.clear();
     }
 
-    void SetMaxSize(size_t newSize) { 
-        List.SetMaxSize(newSize); 
- 
-        TItem* removedItem = nullptr; 
-        while ((removedItem = List.RemoveIfOverflown())) { 
-            EraseFromIndex(removedItem); 
-        } 
-        Y_ASSERT(Index.size() == List.GetSize()); 
-    } 
- 
-    size_t GetMaxSize() const { 
-        return List.GetMaxSize(); 
-    } 
- 
+    void SetMaxSize(size_t newSize) {
+        List.SetMaxSize(newSize);
+
+        TItem* removedItem = nullptr;
+        while ((removedItem = List.RemoveIfOverflown())) {
+            EraseFromIndex(removedItem);
+        }
+        Y_ASSERT(Index.size() == List.GetSize());
+    }
+
+    size_t GetMaxSize() const {
+        return List.GetMaxSize();
+    }
+
 protected:
     TIndex Index;
     TListType List;
@@ -595,10 +595,10 @@ public:
     TIterator FindOldest() {
         return TBase::Empty() ? TBase::End() : this->FindByItem(TBase::List.GetOldest());
     }
- 
+
     size_t TotalSize() const {
-        return TBase::List.GetTotalSize(); 
-    } 
+        return TBase::List.GetTotalSize();
+    }
 };
 
 template <typename TKey, typename TValue, typename TDeleter = TNoopDelete>
diff --git a/library/cpp/cache/ut/cache_ut.cpp b/library/cpp/cache/ut/cache_ut.cpp
index 87601ae3d67..329872cfdee 100644
--- a/library/cpp/cache/ut/cache_ut.cpp
+++ b/library/cpp/cache/ut/cache_ut.cpp
@@ -172,145 +172,145 @@ Y_UNIT_TEST_SUITE(TCacheTest) {
         UNIT_ASSERT(s.Find(3) == s.End());
     }
 
-    Y_UNIT_TEST(LRUSetMaxSizeTest) { 
-        typedef TLRUCache<int, TString> TCache; 
-        TCache s(2); // size 2 
-        s.Insert(1, "abcd"); 
-        s.Insert(2, "efgh"); 
-        s.Insert(3, "ijkl"); 
-        UNIT_ASSERT(s.GetOldest() == "efgh"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) != s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
- 
-        // Increasing size should not change anything 
-        s.SetMaxSize(3); 
-        UNIT_ASSERT(s.GetOldest() == "efgh"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) != s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
- 
-        // And we should be able to add fit more entries 
-        s.Insert(4, "mnop"); 
-        s.Insert(5, "qrst"); 
-        UNIT_ASSERT(s.GetOldest() == "ijkl"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
-        UNIT_ASSERT(s.Find(4) != s.End()); 
-        UNIT_ASSERT(s.Find(5) != s.End()); 
- 
-        // Decreasing size should remove oldest entries 
-        s.SetMaxSize(2); 
-        UNIT_ASSERT(s.GetOldest() == "mnop"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) == s.End()); 
-        UNIT_ASSERT(s.Find(4) != s.End()); 
-        UNIT_ASSERT(s.Find(5) != s.End()); 
- 
-        // Ano no more entries will fit 
-        s.Insert(6, "uvwx"); 
-        UNIT_ASSERT(s.GetOldest() == "qrst"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) == s.End()); 
-        UNIT_ASSERT(s.Find(4) == s.End()); 
-        UNIT_ASSERT(s.Find(5) != s.End()); 
-        UNIT_ASSERT(s.Find(6) != s.End()); 
-    } 
- 
-    Y_UNIT_TEST(LWSetMaxSizeTest) { 
-        typedef TLWCache<int, TString, size_t, TStrokaWeighter> TCache; 
-        TCache s(2); // size 2 
-        s.Insert(1, "a"); 
-        s.Insert(2, "aa"); 
-        s.Insert(3, "aaa"); 
-        UNIT_ASSERT(s.GetLightest() == "aa"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) != s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
- 
-        // Increasing size should not change anything 
-        s.SetMaxSize(3); 
-        UNIT_ASSERT(s.GetLightest() == "aa"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) != s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
- 
-        // And we should be able to add fit more entries 
-        s.Insert(4, "aaaa"); 
-        s.Insert(5, "aaaaa"); 
-        UNIT_ASSERT(s.GetLightest() == "aaa"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
-        UNIT_ASSERT(s.Find(4) != s.End()); 
-        UNIT_ASSERT(s.Find(5) != s.End()); 
- 
-        // Decreasing size should remove oldest entries 
-        s.SetMaxSize(2); 
-        UNIT_ASSERT(s.GetLightest() == "aaaa"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) == s.End()); 
-        UNIT_ASSERT(s.Find(4) != s.End()); 
-        UNIT_ASSERT(s.Find(5) != s.End()); 
- 
-        // Ano no more entries will fit 
-        s.Insert(6, "aaaaaa"); 
-        UNIT_ASSERT(s.GetLightest() == "aaaaa"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) == s.End()); 
-        UNIT_ASSERT(s.Find(4) == s.End()); 
-        UNIT_ASSERT(s.Find(5) != s.End()); 
-        UNIT_ASSERT(s.Find(6) != s.End()); 
-    } 
- 
-    Y_UNIT_TEST(LFUSetMaxSizeTest) { 
-        typedef TLFUCache<int, TString> TCache; 
-        TCache s(2); // size 2 
-        s.Insert(1, "abcd"); 
-        s.Insert(2, "efgh"); 
-        s.Insert(3, "ijkl"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) != s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
- 
-        // Increasing size should not change anything 
-        s.SetMaxSize(3); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) != s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
- 
-        // And we should be able to add fit more entries 
-        s.Insert(4, "mnop"); 
-        s.Insert(5, "qrst"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
-        UNIT_ASSERT(s.Find(4) != s.End()); 
-        UNIT_ASSERT(s.Find(5) != s.End()); 
- 
-        // Decreasing size should remove oldest entries 
-        s.SetMaxSize(2); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
-        UNIT_ASSERT(s.Find(4) == s.End()); 
-        UNIT_ASSERT(s.Find(5) != s.End()); 
- 
-        // Ano no more entries will fit 
-        s.Insert(6, "uvwx"); 
-        UNIT_ASSERT(s.Find(1) == s.End()); 
-        UNIT_ASSERT(s.Find(2) == s.End()); 
-        UNIT_ASSERT(s.Find(3) != s.End()); 
-        UNIT_ASSERT(s.Find(4) == s.End()); 
-        UNIT_ASSERT(s.Find(5) == s.End()); 
-        UNIT_ASSERT(s.Find(6) != s.End()); 
-    } 
- 
+    Y_UNIT_TEST(LRUSetMaxSizeTest) {
+        typedef TLRUCache<int, TString> TCache;
+        TCache s(2); // size 2
+        s.Insert(1, "abcd");
+        s.Insert(2, "efgh");
+        s.Insert(3, "ijkl");
+        UNIT_ASSERT(s.GetOldest() == "efgh");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) != s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+
+        // Increasing size should not change anything
+        s.SetMaxSize(3);
+        UNIT_ASSERT(s.GetOldest() == "efgh");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) != s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+
+        // And we should be able to add fit more entries
+        s.Insert(4, "mnop");
+        s.Insert(5, "qrst");
+        UNIT_ASSERT(s.GetOldest() == "ijkl");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+        UNIT_ASSERT(s.Find(4) != s.End());
+        UNIT_ASSERT(s.Find(5) != s.End());
+
+        // Decreasing size should remove oldest entries
+        s.SetMaxSize(2);
+        UNIT_ASSERT(s.GetOldest() == "mnop");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) == s.End());
+        UNIT_ASSERT(s.Find(4) != s.End());
+        UNIT_ASSERT(s.Find(5) != s.End());
+
+        // Ano no more entries will fit
+        s.Insert(6, "uvwx");
+        UNIT_ASSERT(s.GetOldest() == "qrst");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) == s.End());
+        UNIT_ASSERT(s.Find(4) == s.End());
+        UNIT_ASSERT(s.Find(5) != s.End());
+        UNIT_ASSERT(s.Find(6) != s.End());
+    }
+
+    Y_UNIT_TEST(LWSetMaxSizeTest) {
+        typedef TLWCache<int, TString, size_t, TStrokaWeighter> TCache;
+        TCache s(2); // size 2
+        s.Insert(1, "a");
+        s.Insert(2, "aa");
+        s.Insert(3, "aaa");
+        UNIT_ASSERT(s.GetLightest() == "aa");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) != s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+
+        // Increasing size should not change anything
+        s.SetMaxSize(3);
+        UNIT_ASSERT(s.GetLightest() == "aa");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) != s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+
+        // And we should be able to add fit more entries
+        s.Insert(4, "aaaa");
+        s.Insert(5, "aaaaa");
+        UNIT_ASSERT(s.GetLightest() == "aaa");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+        UNIT_ASSERT(s.Find(4) != s.End());
+        UNIT_ASSERT(s.Find(5) != s.End());
+
+        // Decreasing size should remove oldest entries
+        s.SetMaxSize(2);
+        UNIT_ASSERT(s.GetLightest() == "aaaa");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) == s.End());
+        UNIT_ASSERT(s.Find(4) != s.End());
+        UNIT_ASSERT(s.Find(5) != s.End());
+
+        // Ano no more entries will fit
+        s.Insert(6, "aaaaaa");
+        UNIT_ASSERT(s.GetLightest() == "aaaaa");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) == s.End());
+        UNIT_ASSERT(s.Find(4) == s.End());
+        UNIT_ASSERT(s.Find(5) != s.End());
+        UNIT_ASSERT(s.Find(6) != s.End());
+    }
+
+    Y_UNIT_TEST(LFUSetMaxSizeTest) {
+        typedef TLFUCache<int, TString> TCache;
+        TCache s(2); // size 2
+        s.Insert(1, "abcd");
+        s.Insert(2, "efgh");
+        s.Insert(3, "ijkl");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) != s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+
+        // Increasing size should not change anything
+        s.SetMaxSize(3);
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) != s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+
+        // And we should be able to add fit more entries
+        s.Insert(4, "mnop");
+        s.Insert(5, "qrst");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+        UNIT_ASSERT(s.Find(4) != s.End());
+        UNIT_ASSERT(s.Find(5) != s.End());
+
+        // Decreasing size should remove oldest entries
+        s.SetMaxSize(2);
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+        UNIT_ASSERT(s.Find(4) == s.End());
+        UNIT_ASSERT(s.Find(5) != s.End());
+
+        // Ano no more entries will fit
+        s.Insert(6, "uvwx");
+        UNIT_ASSERT(s.Find(1) == s.End());
+        UNIT_ASSERT(s.Find(2) == s.End());
+        UNIT_ASSERT(s.Find(3) != s.End());
+        UNIT_ASSERT(s.Find(4) == s.End());
+        UNIT_ASSERT(s.Find(5) == s.End());
+        UNIT_ASSERT(s.Find(6) != s.End());
+    }
+
     Y_UNIT_TEST(MultiCacheTest) {
         typedef TLRUCache<int, TString> TCache;
         TCache s(3, true);
diff --git a/library/cpp/coroutine/engine/impl.cpp b/library/cpp/coroutine/engine/impl.cpp
index f8793e0b614..7ae6f74051e 100644
--- a/library/cpp/coroutine/engine/impl.cpp
+++ b/library/cpp/coroutine/engine/impl.cpp
@@ -277,12 +277,12 @@ void TContExecutor::ScheduleExecutionNow(TCont* cont) noexcept {
 }
 
 namespace {
-    inline TContExecutor*& ThisThreadExecutor() { 
-        struct TThisThreadExecutorHolder { 
+    inline TContExecutor*& ThisThreadExecutor() {
+        struct TThisThreadExecutorHolder {
             TContExecutor* Executor = nullptr;
-        }; 
-        return FastTlsSingletonWithPriority<TThisThreadExecutorHolder, 0>()->Executor; 
-    } 
+        };
+        return FastTlsSingletonWithPriority<TThisThreadExecutorHolder, 0>()->Executor;
+    }
 }
 
 void TContExecutor::DeleteScheduled() noexcept {
@@ -292,14 +292,14 @@ void TContExecutor::DeleteScheduled() noexcept {
 }
 
 TCont* RunningCont() {
-    TContExecutor* thisThreadExecutor = ThisThreadExecutor(); 
+    TContExecutor* thisThreadExecutor = ThisThreadExecutor();
     return thisThreadExecutor ? thisThreadExecutor->Running() : nullptr;
 }
 
 void TContExecutor::RunScheduler() noexcept {
     try {
         TContExecutor* const prev = ThisThreadExecutor();
-        ThisThreadExecutor() = this; 
+        ThisThreadExecutor() = this;
         TCont* caller = Current_;
         TExceptionSafeContext* context = caller ? caller->Trampoline_.Context() : &SchedContext_;
         Y_DEFER {
diff --git a/library/cpp/coroutine/engine/poller.cpp b/library/cpp/coroutine/engine/poller.cpp
index 0c1258e3b11..61164fa56bf 100644
--- a/library/cpp/coroutine/engine/poller.cpp
+++ b/library/cpp/coroutine/engine/poller.cpp
@@ -356,7 +356,7 @@ namespace {
 }
 
 THolder<IPollerFace> IPollerFace::Default() {
-    return Construct(*SingletonWithPriority<TUserPoller, 0>()); 
+    return Construct(*SingletonWithPriority<TUserPoller, 0>());
 }
 
 THolder<IPollerFace> IPollerFace::Construct(TStringBuf name) {
diff --git a/library/cpp/messagebus/acceptor.cpp b/library/cpp/messagebus/acceptor.cpp
index 6669512b5bd..64a38619c22 100644
--- a/library/cpp/messagebus/acceptor.cpp
+++ b/library/cpp/messagebus/acceptor.cpp
@@ -1,13 +1,13 @@
-#include "acceptor.h" 
+#include "acceptor.h"
 
 #include "key_value_printer.h"
 #include "mb_lwtrace.h"
-#include "network.h" 
+#include "network.h"
 
-#include <util/network/init.h> 
-#include <util/system/defaults.h> 
-#include <util/system/error.h> 
-#include <util/system/yassert.h> 
+#include <util/network/init.h>
+#include <util/system/defaults.h>
+#include <util/system/error.h>
+#include <util/system/yassert.h>
 
 LWTRACE_USING(LWTRACE_MESSAGEBUS_PROVIDER)
 
diff --git a/library/cpp/messagebus/acceptor.h b/library/cpp/messagebus/acceptor.h
index 0eeb162aea0..57cb010bf22 100644
--- a/library/cpp/messagebus/acceptor.h
+++ b/library/cpp/messagebus/acceptor.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "acceptor_status.h" 
-#include "defs.h" 
+#include "acceptor_status.h"
+#include "defs.h"
 #include "event_loop.h"
 #include "netaddr.h"
 #include "session_impl.h"
 #include "shutdown_state.h"
 
 #include <library/cpp/messagebus/actor/actor.h>
- 
-#include <util/system/event.h> 
- 
+
+#include <util/system/event.h>
+
 namespace NBus {
     namespace NPrivate {
         class TAcceptor
diff --git a/library/cpp/messagebus/acceptor_status.cpp b/library/cpp/messagebus/acceptor_status.cpp
index 6c481bfb6fe..5006ff68aee 100644
--- a/library/cpp/messagebus/acceptor_status.cpp
+++ b/library/cpp/messagebus/acceptor_status.cpp
@@ -1,9 +1,9 @@
-#include "acceptor_status.h" 
+#include "acceptor_status.h"
 
 #include "key_value_printer.h"
 
-#include <util/stream/format.h> 
-#include <util/stream/output.h> 
+#include <util/stream/format.h>
+#include <util/stream/output.h>
 
 using namespace NBus;
 using namespace NBus::NPrivate;
diff --git a/library/cpp/messagebus/acceptor_status.h b/library/cpp/messagebus/acceptor_status.h
index c799eee6a7d..6aa1404f4db 100644
--- a/library/cpp/messagebus/acceptor_status.h
+++ b/library/cpp/messagebus/acceptor_status.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "netaddr.h" 
- 
+#include "netaddr.h"
+
 #include <util/network/init.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/actor/actor.h b/library/cpp/messagebus/actor/actor.h
index 6d6b394a519..9b8f20298a2 100644
--- a/library/cpp/messagebus/actor/actor.h
+++ b/library/cpp/messagebus/actor/actor.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "executor.h" 
+#include "executor.h"
 #include "tasks.h"
 #include "what_thread_does.h"
 
-#include <util/system/yassert.h> 
- 
+#include <util/system/yassert.h>
+
 namespace NActor {
     class IActor: protected  IWorkItem {
     public:
diff --git a/library/cpp/messagebus/actor/actor_ut.cpp b/library/cpp/messagebus/actor/actor_ut.cpp
index 4329aabd775..b76ab55bfa2 100644
--- a/library/cpp/messagebus/actor/actor_ut.cpp
+++ b/library/cpp/messagebus/actor/actor_ut.cpp
@@ -4,10 +4,10 @@
 #include "queue_in_actor.h"
 
 #include <library/cpp/messagebus/misc/test_sync.h>
- 
-#include <util/generic/object_counter.h> 
-#include <util/system/event.h> 
- 
+
+#include <util/generic/object_counter.h>
+#include <util/system/event.h>
+
 using namespace NActor;
 
 template <typename TThis>
diff --git a/library/cpp/messagebus/actor/executor.cpp b/library/cpp/messagebus/actor/executor.cpp
index b6d33c7c0ef..7a2227a4589 100644
--- a/library/cpp/messagebus/actor/executor.cpp
+++ b/library/cpp/messagebus/actor/executor.cpp
@@ -1,14 +1,14 @@
-#include "executor.h" 
+#include "executor.h"
 
 #include "thread_extra.h"
 #include "what_thread_does.h"
 #include "what_thread_does_guard.h"
 
-#include <util/generic/utility.h> 
-#include <util/random/random.h> 
-#include <util/stream/str.h> 
-#include <util/system/tls.h> 
-#include <util/system/yassert.h> 
+#include <util/generic/utility.h>
+#include <util/random/random.h>
+#include <util/stream/str.h>
+#include <util/system/tls.h>
+#include <util/system/yassert.h>
 
 #include <array>
 
diff --git a/library/cpp/messagebus/actor/executor.h b/library/cpp/messagebus/actor/executor.h
index 538b2196f04..7292d8be53d 100644
--- a/library/cpp/messagebus/actor/executor.h
+++ b/library/cpp/messagebus/actor/executor.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "ring_buffer_with_spin_lock.h" 
- 
+#include "ring_buffer_with_spin_lock.h"
+
 #include <util/generic/array_ref.h>
 #include <util/generic/vector.h>
 #include <util/system/condvar.h>
 #include <util/system/event.h>
-#include <util/system/mutex.h> 
-#include <util/system/thread.h> 
+#include <util/system/mutex.h>
+#include <util/system/thread.h>
 #include <util/thread/lfqueue.h>
 
 namespace NActor {
diff --git a/library/cpp/messagebus/actor/queue_in_actor.h b/library/cpp/messagebus/actor/queue_in_actor.h
index df6b53557dd..9865996532c 100644
--- a/library/cpp/messagebus/actor/queue_in_actor.h
+++ b/library/cpp/messagebus/actor/queue_in_actor.h
@@ -3,8 +3,8 @@
 #include "actor.h"
 #include "queue_for_actor.h"
 
-#include <functional> 
- 
+#include <functional>
+
 namespace NActor {
     template <typename TItem>
     class IQueueInActor {
diff --git a/library/cpp/messagebus/actor/ring_buffer.h b/library/cpp/messagebus/actor/ring_buffer.h
index 6346756d855..ec5706f7c76 100644
--- a/library/cpp/messagebus/actor/ring_buffer.h
+++ b/library/cpp/messagebus/actor/ring_buffer.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <util/generic/array_ref.h> 
-#include <util/generic/maybe.h> 
-#include <util/generic/utility.h> 
-#include <util/generic/vector.h> 
+#include <util/generic/array_ref.h>
+#include <util/generic/maybe.h>
+#include <util/generic/utility.h>
+#include <util/generic/vector.h>
 #include <util/system/yassert.h>
 
 template <typename T>
diff --git a/library/cpp/messagebus/actor/ring_buffer_ut.cpp b/library/cpp/messagebus/actor/ring_buffer_ut.cpp
index b0dd1bb9335..bdb379b3a92 100644
--- a/library/cpp/messagebus/actor/ring_buffer_ut.cpp
+++ b/library/cpp/messagebus/actor/ring_buffer_ut.cpp
@@ -2,8 +2,8 @@
 
 #include "ring_buffer.h"
 
-#include <util/random/random.h> 
- 
+#include <util/random/random.h>
+
 Y_UNIT_TEST_SUITE(RingBuffer) {
     struct TRingBufferTester {
         TRingBuffer<unsigned> RingBuffer;
diff --git a/library/cpp/messagebus/actor/ring_buffer_with_spin_lock.h b/library/cpp/messagebus/actor/ring_buffer_with_spin_lock.h
index 325d8bb3973..f0b7cd90e40 100644
--- a/library/cpp/messagebus/actor/ring_buffer_with_spin_lock.h
+++ b/library/cpp/messagebus/actor/ring_buffer_with_spin_lock.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ring_buffer.h" 
- 
+#include "ring_buffer.h"
+
 #include <util/system/spinlock.h>
 
 template <typename T>
diff --git a/library/cpp/messagebus/actor/tasks.h b/library/cpp/messagebus/actor/tasks.h
index 9df04539312..31d35931d27 100644
--- a/library/cpp/messagebus/actor/tasks.h
+++ b/library/cpp/messagebus/actor/tasks.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h> 
+#include <util/system/atomic.h>
 #include <util/system/yassert.h>
 
 namespace NActor {
diff --git a/library/cpp/messagebus/actor/temp_tls_vector.h b/library/cpp/messagebus/actor/temp_tls_vector.h
index 1860f544ff1..675d92f5b0b 100644
--- a/library/cpp/messagebus/actor/temp_tls_vector.h
+++ b/library/cpp/messagebus/actor/temp_tls_vector.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "thread_extra.h" 
- 
-#include <util/generic/vector.h> 
+#include "thread_extra.h"
+
+#include <util/generic/vector.h>
 #include <util/system/yassert.h>
 
 template <typename T, typename TTag = void, template <typename, class> class TVectorType = TVector>
diff --git a/library/cpp/messagebus/actor/thread_extra.cpp b/library/cpp/messagebus/actor/thread_extra.cpp
index bce931ff1dc..048480f2553 100644
--- a/library/cpp/messagebus/actor/thread_extra.cpp
+++ b/library/cpp/messagebus/actor/thread_extra.cpp
@@ -1,7 +1,7 @@
-#include "thread_extra.h" 
- 
-#include <util/stream/str.h> 
-#include <util/system/execpath.h> 
+#include "thread_extra.h"
+
+#include <util/stream/str.h>
+#include <util/system/execpath.h>
 #include <util/system/platform.h>
 #include <util/system/thread.h>
 
diff --git a/library/cpp/messagebus/actor/what_thread_does.cpp b/library/cpp/messagebus/actor/what_thread_does.cpp
index bda58de407b..bebb6a888c2 100644
--- a/library/cpp/messagebus/actor/what_thread_does.cpp
+++ b/library/cpp/messagebus/actor/what_thread_does.cpp
@@ -1,9 +1,9 @@
-#include "what_thread_does.h" 
+#include "what_thread_does.h"
 
 #include "thread_extra.h"
 
-#include <util/system/tls.h> 
- 
+#include <util/system/tls.h>
+
 Y_POD_STATIC_THREAD(const char*)
 WhatThreadDoes;
 
diff --git a/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp b/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp
index 12efbfc89e7..e4b218a7ca3 100644
--- a/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp
+++ b/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp
@@ -2,8 +2,8 @@
 
 #include "what_thread_does_guard.h"
 
-#include <util/system/mutex.h> 
- 
+#include <util/system/mutex.h>
+
 Y_UNIT_TEST_SUITE(WhatThreadDoesGuard) {
     Y_UNIT_TEST(Simple) {
         TMutex mutex;
diff --git a/library/cpp/messagebus/async_result.h b/library/cpp/messagebus/async_result.h
index dc7281e02fb..d24dde284a3 100644
--- a/library/cpp/messagebus/async_result.h
+++ b/library/cpp/messagebus/async_result.h
@@ -2,9 +2,9 @@
 
 #include <util/generic/maybe.h>
 #include <util/generic/noncopyable.h>
-#include <util/system/condvar.h> 
-#include <util/system/mutex.h> 
-#include <util/system/yassert.h> 
+#include <util/system/condvar.h>
+#include <util/system/mutex.h>
+#include <util/system/yassert.h>
 
 #include <functional>
 
diff --git a/library/cpp/messagebus/cc_semaphore_ut.cpp b/library/cpp/messagebus/cc_semaphore_ut.cpp
index b534dbde7bb..206bb7c96a7 100644
--- a/library/cpp/messagebus/cc_semaphore_ut.cpp
+++ b/library/cpp/messagebus/cc_semaphore_ut.cpp
@@ -2,8 +2,8 @@
 
 #include "cc_semaphore.h"
 
-#include <util/system/atomic.h> 
- 
+#include <util/system/atomic.h>
+
 namespace {
     struct TTestSemaphore: public TComplexConditionSemaphore<TTestSemaphore> {
         TAtomic Current;
diff --git a/library/cpp/messagebus/config/defs.h b/library/cpp/messagebus/config/defs.h
index c27ea26b776..92b1df99698 100644
--- a/library/cpp/messagebus/config/defs.h
+++ b/library/cpp/messagebus/config/defs.h
@@ -2,13 +2,13 @@
 
 // unique tag to fix pragma once gcc glueing: ./library/cpp/messagebus/defs.h
 
-#include "codegen.h" 
-#include "netaddr.h" 
- 
+#include "codegen.h"
+#include "netaddr.h"
+
 #include <library/cpp/deprecated/enum_codegen/enum_codegen.h>
- 
+
 #include <util/generic/list.h>
- 
+
 #include <utility>
 
 // For historical reasons TCrawlerModule need to access
diff --git a/library/cpp/messagebus/config/netaddr.cpp b/library/cpp/messagebus/config/netaddr.cpp
index 4e189ccfde0..962ac538e27 100644
--- a/library/cpp/messagebus/config/netaddr.cpp
+++ b/library/cpp/messagebus/config/netaddr.cpp
@@ -1,5 +1,5 @@
-#include "netaddr.h" 
- 
+#include "netaddr.h"
+
 #include <util/network/address.h>
 
 #include <cstdlib>
diff --git a/library/cpp/messagebus/config/netaddr.h b/library/cpp/messagebus/config/netaddr.h
index 2d43cc014b7..b79c0cc3551 100644
--- a/library/cpp/messagebus/config/netaddr.h
+++ b/library/cpp/messagebus/config/netaddr.h
@@ -3,7 +3,7 @@
 #include <util/digest/numeric.h>
 #include <util/generic/hash.h>
 #include <util/generic/ptr.h>
-#include <util/generic/strbuf.h> 
+#include <util/generic/strbuf.h>
 #include <util/generic/vector.h>
 #include <util/network/address.h>
 
diff --git a/library/cpp/messagebus/connection.cpp b/library/cpp/messagebus/connection.cpp
index 9b6796d36b0..07580ce18ab 100644
--- a/library/cpp/messagebus/connection.cpp
+++ b/library/cpp/messagebus/connection.cpp
@@ -1,8 +1,8 @@
-#include "connection.h" 
+#include "connection.h"
 
 #include "remote_client_connection.h"
 
-#include <util/generic/cast.h> 
+#include <util/generic/cast.h>
 
 using namespace NBus;
 using namespace NBus::NPrivate;
diff --git a/library/cpp/messagebus/connection.h b/library/cpp/messagebus/connection.h
index ae2107b251a..b1df64ddc1e 100644
--- a/library/cpp/messagebus/connection.h
+++ b/library/cpp/messagebus/connection.h
@@ -3,8 +3,8 @@
 #include "defs.h"
 #include "message.h"
 
-#include <util/generic/ptr.h> 
- 
+#include <util/generic/ptr.h>
+
 namespace NBus {
     struct TBusClientConnection {
         /// if you want to open connection early
diff --git a/library/cpp/messagebus/coreconn.cpp b/library/cpp/messagebus/coreconn.cpp
index 470b8fa1026..d9411bb5db3 100644
--- a/library/cpp/messagebus/coreconn.cpp
+++ b/library/cpp/messagebus/coreconn.cpp
@@ -1,5 +1,5 @@
 #include "coreconn.h"
- 
+
 #include "remote_connection.h"
 
 #include <util/datetime/base.h>
diff --git a/library/cpp/messagebus/coreconn.h b/library/cpp/messagebus/coreconn.h
index ddc783aa9d1..fca228d82e8 100644
--- a/library/cpp/messagebus/coreconn.h
+++ b/library/cpp/messagebus/coreconn.h
@@ -25,7 +25,7 @@
 #include <util/thread/lfqueue.h>
 
 #include <deque>
-#include <utility> 
+#include <utility>
 
 #ifdef NO_ERROR
 #undef NO_ERROR
diff --git a/library/cpp/messagebus/coreconn_ut.cpp b/library/cpp/messagebus/coreconn_ut.cpp
index 87ef125bd8a..beb6850f26f 100644
--- a/library/cpp/messagebus/coreconn_ut.cpp
+++ b/library/cpp/messagebus/coreconn_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/testing/unittest/registar.h>
- 
+
 #include "coreconn.h"
 
 #include <util/generic/yexception.h>
diff --git a/library/cpp/messagebus/debug_receiver/debug_receiver_handler.cpp b/library/cpp/messagebus/debug_receiver/debug_receiver_handler.cpp
index 131476182c1..05f99e94caf 100644
--- a/library/cpp/messagebus/debug_receiver/debug_receiver_handler.cpp
+++ b/library/cpp/messagebus/debug_receiver/debug_receiver_handler.cpp
@@ -1,9 +1,9 @@
-#include "debug_receiver_handler.h" 
+#include "debug_receiver_handler.h"
 
 #include "debug_receiver_proto.h"
 
-#include <util/generic/cast.h> 
-#include <util/string/printf.h> 
+#include <util/generic/cast.h>
+#include <util/string/printf.h>
 
 void TDebugReceiverHandler::OnError(TAutoPtr<NBus::TBusMessage>, NBus::EMessageStatus status) {
     Cerr << "error " << status << "\n";
diff --git a/library/cpp/messagebus/duration_histogram.cpp b/library/cpp/messagebus/duration_histogram.cpp
index ebefee79189..32a0001d414 100644
--- a/library/cpp/messagebus/duration_histogram.cpp
+++ b/library/cpp/messagebus/duration_histogram.cpp
@@ -1,6 +1,6 @@
-#include "duration_histogram.h" 
- 
-#include <util/generic/singleton.h> 
+#include "duration_histogram.h"
+
+#include <util/generic/singleton.h>
 #include <util/stream/str.h>
 
 namespace {
diff --git a/library/cpp/messagebus/duration_histogram.h b/library/cpp/messagebus/duration_histogram.h
index 93a5c5d9928..ed060b0101a 100644
--- a/library/cpp/messagebus/duration_histogram.h
+++ b/library/cpp/messagebus/duration_histogram.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <util/datetime/base.h>
-#include <util/generic/bitops.h> 
+#include <util/generic/bitops.h>
 #include <util/generic/string.h>
 
 #include <array>
diff --git a/library/cpp/messagebus/event_loop.cpp b/library/cpp/messagebus/event_loop.cpp
index f8462cc8d47..f685135bedd 100644
--- a/library/cpp/messagebus/event_loop.cpp
+++ b/library/cpp/messagebus/event_loop.cpp
@@ -1,18 +1,18 @@
-#include "event_loop.h" 
+#include "event_loop.h"
 
-#include "network.h" 
+#include "network.h"
 #include "thread_extra.h"
 
 #include <util/generic/hash.h>
 #include <util/network/pair.h>
 #include <util/network/poller.h>
-#include <util/system/event.h> 
-#include <util/system/mutex.h> 
+#include <util/system/event.h>
+#include <util/system/mutex.h>
 #include <util/system/thread.h>
 #include <util/system/yassert.h>
 #include <util/thread/lfqueue.h>
 
-#include <errno.h> 
+#include <errno.h>
 
 using namespace NEventLoop;
 
diff --git a/library/cpp/messagebus/event_loop.h b/library/cpp/messagebus/event_loop.h
index 6fc2c1837b7..d5b0a53b0c9 100644
--- a/library/cpp/messagebus/event_loop.h
+++ b/library/cpp/messagebus/event_loop.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/generic/object_counter.h> 
+#include <util/generic/object_counter.h>
 #include <util/generic/ptr.h>
 #include <util/network/init.h>
 #include <util/network/socket.h>
diff --git a/library/cpp/messagebus/futex_like.h b/library/cpp/messagebus/futex_like.h
index 5171806e740..31d60c60f10 100644
--- a/library/cpp/messagebus/futex_like.h
+++ b/library/cpp/messagebus/futex_like.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <util/system/condvar.h> 
-#include <util/system/mutex.h> 
+#include <util/system/condvar.h>
+#include <util/system/mutex.h>
 #include <util/system/platform.h>
 
 class TFutexLike {
diff --git a/library/cpp/messagebus/handler.cpp b/library/cpp/messagebus/handler.cpp
index 1cef09d63df..333bd529347 100644
--- a/library/cpp/messagebus/handler.cpp
+++ b/library/cpp/messagebus/handler.cpp
@@ -1,6 +1,6 @@
 #include "handler.h"
- 
-#include "remote_server_connection.h" 
+
+#include "remote_server_connection.h"
 #include "ybus.h"
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/handler.h b/library/cpp/messagebus/handler.h
index 3c8496d6a36..60002c68a69 100644
--- a/library/cpp/messagebus/handler.h
+++ b/library/cpp/messagebus/handler.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include "defs.h"
-#include "message.h" 
+#include "message.h"
 #include "message_status.h"
 #include "use_after_free_checker.h"
 #include "use_count_checker.h"
 
-#include <util/generic/noncopyable.h> 
- 
+#include <util/generic/noncopyable.h>
+
 namespace NBus {
     /////////////////////////////////////////////////////////////////
     /// \brief Interface to message bus handler
diff --git a/library/cpp/messagebus/handler_impl.h b/library/cpp/messagebus/handler_impl.h
index 70fb02e5759..6593f04cc37 100644
--- a/library/cpp/messagebus/handler_impl.h
+++ b/library/cpp/messagebus/handler_impl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "handler.h" 
-#include "local_flags.h" 
+#include "handler.h"
+#include "local_flags.h"
 #include "session.h"
 
 namespace NBus {
diff --git a/library/cpp/messagebus/key_value_printer.cpp b/library/cpp/messagebus/key_value_printer.cpp
index 5c2567e4950..c8592145c73 100644
--- a/library/cpp/messagebus/key_value_printer.cpp
+++ b/library/cpp/messagebus/key_value_printer.cpp
@@ -1,5 +1,5 @@
-#include "key_value_printer.h" 
- 
+#include "key_value_printer.h"
+
 #include <util/stream/format.h>
 
 TKeyValuePrinter::TKeyValuePrinter(const TString& sep)
diff --git a/library/cpp/messagebus/key_value_printer.h b/library/cpp/messagebus/key_value_printer.h
index 6ee63a30faa..bca1fde50e8 100644
--- a/library/cpp/messagebus/key_value_printer.h
+++ b/library/cpp/messagebus/key_value_printer.h
@@ -2,8 +2,8 @@
 
 #include <util/generic/string.h>
 #include <util/generic/typetraits.h>
-#include <util/generic/vector.h> 
-#include <util/string/cast.h> 
+#include <util/generic/vector.h>
+#include <util/string/cast.h>
 
 class TKeyValuePrinter {
 private:
diff --git a/library/cpp/messagebus/latch.h b/library/cpp/messagebus/latch.h
index 7e01f2d0353..373f4c0e13b 100644
--- a/library/cpp/messagebus/latch.h
+++ b/library/cpp/messagebus/latch.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/condvar.h> 
+#include <util/system/condvar.h>
 #include <util/system/mutex.h>
 
 class TLatch {
diff --git a/library/cpp/messagebus/left_right_buffer.h b/library/cpp/messagebus/left_right_buffer.h
index fc92d6917cd..f937cefad0c 100644
--- a/library/cpp/messagebus/left_right_buffer.h
+++ b/library/cpp/messagebus/left_right_buffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <util/generic/buffer.h> 
-#include <util/generic/noncopyable.h> 
+#include <util/generic/buffer.h>
+#include <util/generic/noncopyable.h>
 #include <util/system/yassert.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/lfqueue_batch.h b/library/cpp/messagebus/lfqueue_batch.h
index aa67b6ae40e..8128d3154d0 100644
--- a/library/cpp/messagebus/lfqueue_batch.h
+++ b/library/cpp/messagebus/lfqueue_batch.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/messagebus/actor/temp_tls_vector.h>
- 
+
 #include <util/generic/vector.h>
 #include <util/thread/lfstack.h>
 
diff --git a/library/cpp/messagebus/local_flags.cpp b/library/cpp/messagebus/local_flags.cpp
index ad0a30e232f..877e533f763 100644
--- a/library/cpp/messagebus/local_flags.cpp
+++ b/library/cpp/messagebus/local_flags.cpp
@@ -1,6 +1,6 @@
-#include "local_flags.h" 
- 
-#include <util/stream/str.h> 
+#include "local_flags.h"
+
+#include <util/stream/str.h>
 #include <util/string/printf.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/local_flags.h b/library/cpp/messagebus/local_flags.h
index fc3f1264438..f589283188f 100644
--- a/library/cpp/messagebus/local_flags.h
+++ b/library/cpp/messagebus/local_flags.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/deprecated/enum_codegen/enum_codegen.h>
- 
+
 #include <util/generic/string.h>
 #include <util/stream/output.h>
 
diff --git a/library/cpp/messagebus/locator.cpp b/library/cpp/messagebus/locator.cpp
index 7ca49fda3f9..e38a35c426f 100644
--- a/library/cpp/messagebus/locator.cpp
+++ b/library/cpp/messagebus/locator.cpp
@@ -4,8 +4,8 @@
 
 #include "locator.h"
 
-#include "ybus.h" 
- 
+#include "ybus.h"
+
 #include <util/generic/hash_set.h>
 #include <util/system/hostname.h>
 
diff --git a/library/cpp/messagebus/locator.h b/library/cpp/messagebus/locator.h
index 39ca346748e..f8556a3fcef 100644
--- a/library/cpp/messagebus/locator.h
+++ b/library/cpp/messagebus/locator.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "defs.h" 
- 
+#include "defs.h"
+
 #include <util/generic/hash.h>
-#include <util/generic/map.h> 
-#include <util/generic/set.h> 
-#include <util/generic/string.h> 
+#include <util/generic/map.h>
+#include <util/generic/set.h>
+#include <util/generic/string.h>
 #include <util/network/interface.h>
-#include <util/system/mutex.h> 
+#include <util/system/mutex.h>
 
 namespace NBus {
     ///////////////////////////////////////////////
diff --git a/library/cpp/messagebus/mb_lwtrace.cpp b/library/cpp/messagebus/mb_lwtrace.cpp
index 1bd00966548..c54cd5ab71c 100644
--- a/library/cpp/messagebus/mb_lwtrace.cpp
+++ b/library/cpp/messagebus/mb_lwtrace.cpp
@@ -1,8 +1,8 @@
-#include "mb_lwtrace.h" 
+#include "mb_lwtrace.h"
 
 #include <library/cpp/lwtrace/all.h>
 
-#include <util/generic/singleton.h> 
+#include <util/generic/singleton.h>
 
 LWTRACE_DEFINE_PROVIDER(LWTRACE_MESSAGEBUS_PROVIDER)
 
diff --git a/library/cpp/messagebus/mb_lwtrace.h b/library/cpp/messagebus/mb_lwtrace.h
index 465e630c4bc..e62728b265c 100644
--- a/library/cpp/messagebus/mb_lwtrace.h
+++ b/library/cpp/messagebus/mb_lwtrace.h
@@ -2,8 +2,8 @@
 
 #include <library/cpp/lwtrace/all.h>
 
-#include <util/generic/string.h> 
- 
+#include <util/generic/string.h>
+
 #define LWTRACE_MESSAGEBUS_PROVIDER(PROBE, EVENT, GROUPS, TYPES, NAMES)                                          \
     PROBE(Error, GROUPS("MessagebusRare"), TYPES(TString, TString, TString), NAMES("status", "address", "misc")) \
     PROBE(ServerUnknownVersion, GROUPS("MessagebusRare"), TYPES(TString, ui32), NAMES("address", "version"))     \
diff --git a/library/cpp/messagebus/message.cpp b/library/cpp/messagebus/message.cpp
index 01e3b5440b7..bfa7ed8e9ba 100644
--- a/library/cpp/messagebus/message.cpp
+++ b/library/cpp/messagebus/message.cpp
@@ -1,11 +1,11 @@
-#include "remote_server_connection.h" 
-#include "ybus.h" 
+#include "remote_server_connection.h"
+#include "ybus.h"
 
-#include <util/random/random.h> 
-#include <util/string/printf.h> 
+#include <util/random/random.h>
+#include <util/string/printf.h>
 #include <util/system/atomic.h>
 
-#include <string.h> 
+#include <string.h>
 
 using namespace NBus;
 
diff --git a/library/cpp/messagebus/message.h b/library/cpp/messagebus/message.h
index 783cbeeb94e..005ca10c652 100644
--- a/library/cpp/messagebus/message.h
+++ b/library/cpp/messagebus/message.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "base.h" 
-#include "local_flags.h" 
-#include "message_status.h" 
-#include "netaddr.h" 
-#include "socket_addr.h" 
- 
-#include <util/generic/array_ref.h> 
-#include <util/generic/noncopyable.h> 
+#include "base.h"
+#include "local_flags.h"
+#include "message_status.h"
+#include "netaddr.h"
+#include "socket_addr.h"
+
+#include <util/generic/array_ref.h>
+#include <util/generic/noncopyable.h>
 #include <util/generic/ptr.h>
 #include <util/generic/string.h>
-#include <util/system/defaults.h> 
+#include <util/system/defaults.h>
 #include <util/system/type_name.h>
 #include <util/system/yassert.h>
 
diff --git a/library/cpp/messagebus/message_counter.cpp b/library/cpp/messagebus/message_counter.cpp
index 29f567b355f..04d9343f6a2 100644
--- a/library/cpp/messagebus/message_counter.cpp
+++ b/library/cpp/messagebus/message_counter.cpp
@@ -1,5 +1,5 @@
-#include "message_counter.h" 
- 
+#include "message_counter.h"
+
 #include <util/stream/str.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/message_counter.h b/library/cpp/messagebus/message_counter.h
index 0a1e094824b..e4be1180b0a 100644
--- a/library/cpp/messagebus/message_counter.h
+++ b/library/cpp/messagebus/message_counter.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <util/generic/string.h> 
- 
-#include <cstddef> 
- 
+#include <util/generic/string.h>
+
+#include <cstddef>
+
 namespace NBus {
     namespace NPrivate {
         struct TMessageCounter {
diff --git a/library/cpp/messagebus/message_ptr_and_header.h b/library/cpp/messagebus/message_ptr_and_header.h
index dea9af70a57..9b4e2fd2707 100644
--- a/library/cpp/messagebus/message_ptr_and_header.h
+++ b/library/cpp/messagebus/message_ptr_and_header.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "message.h" 
+#include "message.h"
 #include "nondestroying_holder.h"
 
-#include <util/generic/noncopyable.h> 
-#include <util/generic/utility.h> 
+#include <util/generic/noncopyable.h>
+#include <util/generic/utility.h>
 
 namespace NBus {
     namespace NPrivate {
diff --git a/library/cpp/messagebus/message_status.h b/library/cpp/messagebus/message_status.h
index cf9816be1ae..e1878960b34 100644
--- a/library/cpp/messagebus/message_status.h
+++ b/library/cpp/messagebus/message_status.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "codegen.h" 
-#include "defs.h" 
- 
+#include "codegen.h"
+#include "defs.h"
+
 #include <library/cpp/deprecated/enum_codegen/enum_codegen.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/message_status_counter.cpp b/library/cpp/messagebus/message_status_counter.cpp
index d69ba3fdcb5..891c8f5bb2b 100644
--- a/library/cpp/messagebus/message_status_counter.cpp
+++ b/library/cpp/messagebus/message_status_counter.cpp
@@ -1,5 +1,5 @@
-#include "message_status_counter.h" 
- 
+#include "message_status_counter.h"
+
 #include "key_value_printer.h"
 #include "text_utils.h"
 
diff --git a/library/cpp/messagebus/message_status_counter.h b/library/cpp/messagebus/message_status_counter.h
index b3be955ab5b..e8ba2fdd31d 100644
--- a/library/cpp/messagebus/message_status_counter.h
+++ b/library/cpp/messagebus/message_status_counter.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "message_status.h" 
- 
+#include "message_status.h"
+
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
 
 #include <util/generic/string.h>
diff --git a/library/cpp/messagebus/message_status_counter_ut.cpp b/library/cpp/messagebus/message_status_counter_ut.cpp
index eb6923f1bb9..95986513296 100644
--- a/library/cpp/messagebus/message_status_counter_ut.cpp
+++ b/library/cpp/messagebus/message_status_counter_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "message_status_counter.h" 
- 
+#include "message_status_counter.h"
+
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/messqueue.cpp b/library/cpp/messagebus/messqueue.cpp
index 5f9bae04e88..3474d62705f 100644
--- a/library/cpp/messagebus/messqueue.cpp
+++ b/library/cpp/messagebus/messqueue.cpp
@@ -1,11 +1,11 @@
-#include "key_value_printer.h" 
-#include "mb_lwtrace.h" 
+#include "key_value_printer.h"
+#include "mb_lwtrace.h"
 #include "remote_client_session.h"
 #include "remote_server_session.h"
-#include "ybus.h" 
+#include "ybus.h"
+
+#include <util/generic/singleton.h>
 
-#include <util/generic/singleton.h> 
- 
 using namespace NBus;
 using namespace NBus::NPrivate;
 using namespace NActor;
diff --git a/library/cpp/messagebus/misc/atomic_box.h b/library/cpp/messagebus/misc/atomic_box.h
index ac4a602cc19..401621f9335 100644
--- a/library/cpp/messagebus/misc/atomic_box.h
+++ b/library/cpp/messagebus/misc/atomic_box.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <util/system/atomic.h> 
- 
+#include <util/system/atomic.h>
+
 // TAtomic with human interface
 template <typename T>
 class TAtomicBox {
diff --git a/library/cpp/messagebus/misc/granup.h b/library/cpp/messagebus/misc/granup.h
index ec8648711f9..36ecfebc93a 100644
--- a/library/cpp/messagebus/misc/granup.h
+++ b/library/cpp/messagebus/misc/granup.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <util/datetime/base.h> 
-#include <util/system/guard.h> 
+#include <util/datetime/base.h>
+#include <util/system/guard.h>
 #include <util/system/mutex.h>
 #include <util/system/spinlock.h>
 
diff --git a/library/cpp/messagebus/misc/test_sync.h b/library/cpp/messagebus/misc/test_sync.h
index 2752f79ac95..be3f4f20b85 100644
--- a/library/cpp/messagebus/misc/test_sync.h
+++ b/library/cpp/messagebus/misc/test_sync.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/condvar.h> 
+#include <util/system/condvar.h>
 #include <util/system/mutex.h>
 
 class TTestSync {
diff --git a/library/cpp/messagebus/network.cpp b/library/cpp/messagebus/network.cpp
index 6554d160d78..304bedae5ac 100644
--- a/library/cpp/messagebus/network.cpp
+++ b/library/cpp/messagebus/network.cpp
@@ -1,10 +1,10 @@
 #include "network.h"
 
-#include <util/generic/maybe.h> 
-#include <util/generic/ptr.h> 
+#include <util/generic/maybe.h>
+#include <util/generic/ptr.h>
 #include <util/network/init.h>
 #include <util/network/socket.h>
-#include <util/system/platform.h> 
+#include <util/system/platform.h>
 
 using namespace NBus;
 using namespace NBus::NPrivate;
diff --git a/library/cpp/messagebus/network.h b/library/cpp/messagebus/network.h
index a3a8b6e7e6f..cc4bd76ea31 100644
--- a/library/cpp/messagebus/network.h
+++ b/library/cpp/messagebus/network.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "netaddr.h" 
+#include "netaddr.h"
 
 #include <util/generic/array_ref.h>
-#include <util/generic/ptr.h> 
+#include <util/generic/ptr.h>
 #include <util/network/socket.h>
 
-#include <utility> 
+#include <utility>
 
 namespace NBus {
     namespace NPrivate {
diff --git a/library/cpp/messagebus/network_ut.cpp b/library/cpp/messagebus/network_ut.cpp
index 9fe8dc7620f..f1798419db2 100644
--- a/library/cpp/messagebus/network_ut.cpp
+++ b/library/cpp/messagebus/network_ut.cpp
@@ -3,7 +3,7 @@
 #include "network.h"
 
 #include <library/cpp/messagebus/test/helper/fixed_port.h>
- 
+
 using namespace NBus;
 using namespace NBus::NPrivate;
 using namespace NBus::NTest;
diff --git a/library/cpp/messagebus/oldmodule/module.cpp b/library/cpp/messagebus/oldmodule/module.cpp
index 6b8ec2b2a69..24bd778799f 100644
--- a/library/cpp/messagebus/oldmodule/module.cpp
+++ b/library/cpp/messagebus/oldmodule/module.cpp
@@ -6,9 +6,9 @@
 #include <library/cpp/messagebus/actor/queue_in_actor.h>
 #include <library/cpp/messagebus/actor/what_thread_does.h>
 #include <library/cpp/messagebus/actor/what_thread_does_guard.h>
- 
-#include <util/generic/singleton.h> 
-#include <util/string/printf.h> 
+
+#include <util/generic/singleton.h>
+#include <util/string/printf.h>
 #include <util/system/event.h>
 
 using namespace NActor;
diff --git a/library/cpp/messagebus/oldmodule/module.h b/library/cpp/messagebus/oldmodule/module.h
index df79bfcbd94..8d1c4a5d52b 100644
--- a/library/cpp/messagebus/oldmodule/module.h
+++ b/library/cpp/messagebus/oldmodule/module.h
@@ -39,13 +39,13 @@
 /// for a later time. This should be done in case NBus::TBusJob::Send() returns
 /// error (not MESSAGE_OK)
 
-#include "startsession.h" 
+#include "startsession.h"
 
 #include <library/cpp/messagebus/ybus.h>
 
-#include <util/generic/noncopyable.h> 
-#include <util/generic/object_counter.h> 
- 
+#include <util/generic/noncopyable.h>
+#include <util/generic/object_counter.h>
+
 namespace NBus {
     class TBusJob;
     class TBusModule;
diff --git a/library/cpp/messagebus/oldmodule/startsession.cpp b/library/cpp/messagebus/oldmodule/startsession.cpp
index 787952affe3..7c38801d626 100644
--- a/library/cpp/messagebus/oldmodule/startsession.cpp
+++ b/library/cpp/messagebus/oldmodule/startsession.cpp
@@ -14,10 +14,10 @@
 
 #include "startsession.h"
 
-#include "module.h" 
- 
+#include "module.h"
+
 #include <library/cpp/messagebus/ybus.h>
- 
+
 namespace NBus {
     void* TBusStarter::_starter(void* data) {
         TBusStarter* pThis = static_cast<TBusStarter*>(data);
diff --git a/library/cpp/messagebus/oldmodule/startsession.h b/library/cpp/messagebus/oldmodule/startsession.h
index 87c2f479825..5e26e7e1e56 100644
--- a/library/cpp/messagebus/oldmodule/startsession.h
+++ b/library/cpp/messagebus/oldmodule/startsession.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/messagebus/ybus.h>
- 
+
 #include <util/system/thread.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/protobuf/ybusbuf.cpp b/library/cpp/messagebus/protobuf/ybusbuf.cpp
index 4d1433164e0..63415b3737f 100644
--- a/library/cpp/messagebus/protobuf/ybusbuf.cpp
+++ b/library/cpp/messagebus/protobuf/ybusbuf.cpp
@@ -1,7 +1,7 @@
-#include "ybusbuf.h" 
+#include "ybusbuf.h"
 
 #include <library/cpp/messagebus/actor/what_thread_does.h>
- 
+
 #include <google/protobuf/io/coded_stream.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/protobuf/ybusbuf.h b/library/cpp/messagebus/protobuf/ybusbuf.h
index 48f2f0ebc9c..57b4267ea50 100644
--- a/library/cpp/messagebus/protobuf/ybusbuf.h
+++ b/library/cpp/messagebus/protobuf/ybusbuf.h
@@ -5,9 +5,9 @@
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
 
-#include <util/generic/cast.h> 
-#include <util/generic/vector.h> 
-#include <util/stream/mem.h> 
+#include <util/generic/cast.h>
+#include <util/generic/vector.h>
+#include <util/stream/mem.h>
 
 #include <array>
 
diff --git a/library/cpp/messagebus/rain_check/core/coro.cpp b/library/cpp/messagebus/rain_check/core/coro.cpp
index a133fe8a9f0..500841dd5b8 100644
--- a/library/cpp/messagebus/rain_check/core/coro.cpp
+++ b/library/cpp/messagebus/rain_check/core/coro.cpp
@@ -1,9 +1,9 @@
-#include "coro.h" 
+#include "coro.h"
 
 #include "coro_stack.h"
 
-#include <util/system/tls.h> 
-#include <util/system/yassert.h> 
+#include <util/system/tls.h>
+#include <util/system/yassert.h>
 
 using namespace NRainCheck;
 
diff --git a/library/cpp/messagebus/rain_check/core/coro_stack.cpp b/library/cpp/messagebus/rain_check/core/coro_stack.cpp
index 31e820b030b..83b984ca6e9 100644
--- a/library/cpp/messagebus/rain_check/core/coro_stack.cpp
+++ b/library/cpp/messagebus/rain_check/core/coro_stack.cpp
@@ -1,10 +1,10 @@
-#include "coro_stack.h" 
+#include "coro_stack.h"
 
 #include <util/generic/singleton.h>
 #include <util/system/valgrind.h>
 
 #include <cstdlib>
-#include <stdio.h> 
+#include <stdio.h>
 
 using namespace NRainCheck;
 using namespace NRainCheck::NPrivate;
diff --git a/library/cpp/messagebus/rain_check/core/coro_ut.cpp b/library/cpp/messagebus/rain_check/core/coro_ut.cpp
index 26e2d007247..61a33584a5f 100644
--- a/library/cpp/messagebus/rain_check/core/coro_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/coro_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "coro.h" 
+#include "coro.h"
 #include "spawn.h"
 
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
diff --git a/library/cpp/messagebus/rain_check/core/env.h b/library/cpp/messagebus/rain_check/core/env.h
index a8bcecd18cb..f6dd7fceb62 100644
--- a/library/cpp/messagebus/rain_check/core/env.h
+++ b/library/cpp/messagebus/rain_check/core/env.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "sleep.h" 
-#include "spawn.h" 
+#include "sleep.h"
+#include "spawn.h"
 
 #include <library/cpp/messagebus/actor/executor.h>
 
-#include <util/generic/ptr.h> 
+#include <util/generic/ptr.h>
 
 namespace NRainCheck {
     struct IEnv {
diff --git a/library/cpp/messagebus/rain_check/core/rain_check.h b/library/cpp/messagebus/rain_check/core/rain_check.h
index cd651a390f5..0f289717a2f 100644
--- a/library/cpp/messagebus/rain_check/core/rain_check.h
+++ b/library/cpp/messagebus/rain_check/core/rain_check.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "coro.h"
-#include "env.h" 
+#include "env.h"
 #include "simple.h"
 #include "sleep.h"
 #include "spawn.h"
-#include "task.h" 
+#include "task.h"
diff --git a/library/cpp/messagebus/rain_check/core/simple_ut.cpp b/library/cpp/messagebus/rain_check/core/simple_ut.cpp
index df0fa143791..d4545e05aa1 100644
--- a/library/cpp/messagebus/rain_check/core/simple_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/simple_ut.cpp
@@ -1,10 +1,10 @@
 #include <library/cpp/testing/unittest/registar.h>
 
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
- 
+
 #include <library/cpp/messagebus/latch.h>
 
-#include <util/system/event.h> 
+#include <util/system/event.h>
 
 using namespace NRainCheck;
 
diff --git a/library/cpp/messagebus/rain_check/core/sleep.cpp b/library/cpp/messagebus/rain_check/core/sleep.cpp
index 012586f4b1c..f5d0b4cac9c 100644
--- a/library/cpp/messagebus/rain_check/core/sleep.cpp
+++ b/library/cpp/messagebus/rain_check/core/sleep.cpp
@@ -1,5 +1,5 @@
-#include "rain_check.h" 
- 
+#include "rain_check.h"
+
 #include <util/system/yassert.h>
 
 using namespace NRainCheck;
diff --git a/library/cpp/messagebus/rain_check/core/sleep.h b/library/cpp/messagebus/rain_check/core/sleep.h
index 71d3ba2cee2..1a7a1f86741 100644
--- a/library/cpp/messagebus/rain_check/core/sleep.h
+++ b/library/cpp/messagebus/rain_check/core/sleep.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "fwd.h" 
+#include "fwd.h"
 
 #include <library/cpp/messagebus/scheduler/scheduler.h>
 
-#include <util/datetime/base.h> 
+#include <util/datetime/base.h>
 
 namespace NRainCheck {
     class TSleepService {
diff --git a/library/cpp/messagebus/rain_check/core/sleep_ut.cpp b/library/cpp/messagebus/rain_check/core/sleep_ut.cpp
index 5c7d0bb85b4..2ae85a87b18 100644
--- a/library/cpp/messagebus/rain_check/core/sleep_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/sleep_ut.cpp
@@ -2,8 +2,8 @@
 
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
 
-#include <util/system/event.h> 
- 
+#include <util/system/event.h>
+
 using namespace NRainCheck;
 using namespace NActor;
 
diff --git a/library/cpp/messagebus/rain_check/core/spawn.h b/library/cpp/messagebus/rain_check/core/spawn.h
index cb15157a0d1..f2b146bf292 100644
--- a/library/cpp/messagebus/rain_check/core/spawn.h
+++ b/library/cpp/messagebus/rain_check/core/spawn.h
@@ -2,7 +2,7 @@
 
 #include "coro.h"
 #include "simple.h"
-#include "task.h" 
+#include "task.h"
 
 namespace NRainCheck {
     namespace NPrivate {
diff --git a/library/cpp/messagebus/rain_check/core/spawn_ut.cpp b/library/cpp/messagebus/rain_check/core/spawn_ut.cpp
index f4d538d1010..ba5a5e41cf6 100644
--- a/library/cpp/messagebus/rain_check/core/spawn_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/spawn_ut.cpp
@@ -2,10 +2,10 @@
 
 #include <library/cpp/messagebus/rain_check/test/helper/misc.h>
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
- 
+
 #include <library/cpp/messagebus/latch.h>
 
-#include <util/system/event.h> 
+#include <util/system/event.h>
 
 #include <array>
 
diff --git a/library/cpp/messagebus/rain_check/core/task.cpp b/library/cpp/messagebus/rain_check/core/task.cpp
index f89a69e9ff4..a098437d534 100644
--- a/library/cpp/messagebus/rain_check/core/task.cpp
+++ b/library/cpp/messagebus/rain_check/core/task.cpp
@@ -1,9 +1,9 @@
-#include "rain_check.h" 
+#include "rain_check.h"
 
 #include <library/cpp/messagebus/actor/temp_tls_vector.h>
 
 #include <util/system/type_name.h>
-#include <util/system/tls.h> 
+#include <util/system/tls.h>
 
 using namespace NRainCheck;
 using namespace NRainCheck::NPrivate;
diff --git a/library/cpp/messagebus/rain_check/core/task.h b/library/cpp/messagebus/rain_check/core/task.h
index bf669a11f5b..7d8778bcda5 100644
--- a/library/cpp/messagebus/rain_check/core/task.h
+++ b/library/cpp/messagebus/rain_check/core/task.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "fwd.h" 
- 
+#include "fwd.h"
+
 #include <library/cpp/messagebus/actor/actor.h>
 #include <library/cpp/messagebus/misc/atomic_box.h>
- 
+
 #include <library/cpp/deprecated/enum_codegen/enum_codegen.h>
- 
+
 #include <util/generic/noncopyable.h>
 #include <util/generic/ptr.h>
 #include <util/thread/lfstack.h>
diff --git a/library/cpp/messagebus/rain_check/core/track.h b/library/cpp/messagebus/rain_check/core/track.h
index 6277c807bc7..d387de75742 100644
--- a/library/cpp/messagebus/rain_check/core/track.h
+++ b/library/cpp/messagebus/rain_check/core/track.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "spawn.h" 
-#include "task.h" 
+#include "spawn.h"
+#include "task.h"
 
 #include <library/cpp/messagebus/async_result.h>
 #include <library/cpp/messagebus/actor/queue_in_actor.h>
 #include <library/cpp/messagebus/misc/atomic_box.h>
 
-#include <util/generic/intrlist.h> 
-#include <util/system/event.h> 
- 
+#include <util/generic/intrlist.h>
+#include <util/system/event.h>
+
 namespace NRainCheck {
     class TTaskTracker;
 
diff --git a/library/cpp/messagebus/rain_check/core/track_ut.cpp b/library/cpp/messagebus/rain_check/core/track_ut.cpp
index 3caee731dd2..05f7de13195 100644
--- a/library/cpp/messagebus/rain_check/core/track_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/track_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "track.h" 
- 
+#include "track.h"
+
 #include <library/cpp/messagebus/rain_check/test/helper/misc.h>
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
 
diff --git a/library/cpp/messagebus/rain_check/http/client.cpp b/library/cpp/messagebus/rain_check/http/client.cpp
index d2e36093dc1..5ef5ceeece2 100644
--- a/library/cpp/messagebus/rain_check/http/client.cpp
+++ b/library/cpp/messagebus/rain_check/http/client.cpp
@@ -8,7 +8,7 @@
 #include <library/cpp/neh/location.h>
 #include <library/cpp/neh/neh.h>
 
-#include <util/generic/ptr.h> 
+#include <util/generic/ptr.h>
 #include <util/generic/strbuf.h>
 #include <util/network/socket.h>
 #include <util/stream/str.h>
diff --git a/library/cpp/messagebus/rain_check/http/client.h b/library/cpp/messagebus/rain_check/http/client.h
index 689718b65e6..d4199c4c98d 100644
--- a/library/cpp/messagebus/rain_check/http/client.h
+++ b/library/cpp/messagebus/rain_check/http/client.h
@@ -3,7 +3,7 @@
 #include <library/cpp/messagebus/rain_check/core/task.h>
 
 #include <library/cpp/http/misc/httpcodes.h>
- 
+
 #include <util/generic/maybe.h>
 #include <util/generic/ptr.h>
 #include <util/generic/string.h>
diff --git a/library/cpp/messagebus/rain_check/http/client_ut.cpp b/library/cpp/messagebus/rain_check/http/client_ut.cpp
index 0a39c6b1b1b..16281143911 100644
--- a/library/cpp/messagebus/rain_check/http/client_ut.cpp
+++ b/library/cpp/messagebus/rain_check/http/client_ut.cpp
@@ -1,10 +1,10 @@
 #include <library/cpp/testing/unittest/registar.h>
- 
+
 #include "client.h"
 #include "http_code_extractor.h"
- 
+
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
- 
+
 #include <library/cpp/messagebus/test/helper/fixed_port.h>
 
 #include <library/cpp/http/io/stream.h>
@@ -16,13 +16,13 @@
 #include <util/generic/string.h>
 #include <util/generic/vector.h>
 #include <util/network/ip.h>
-#include <util/stream/str.h> 
-#include <util/string/printf.h> 
+#include <util/stream/str.h>
+#include <util/string/printf.h>
 #include <util/system/defaults.h>
 #include <util/system/yassert.h>
 
 #include <cstdlib>
-#include <utility> 
+#include <utility>
 
 using namespace NRainCheck;
 using namespace NBus::NTest;
diff --git a/library/cpp/messagebus/rain_check/http/http_code_extractor.cpp b/library/cpp/messagebus/rain_check/http/http_code_extractor.cpp
index 2b02c174359..51d75762f68 100644
--- a/library/cpp/messagebus/rain_check/http/http_code_extractor.cpp
+++ b/library/cpp/messagebus/rain_check/http/http_code_extractor.cpp
@@ -2,8 +2,8 @@
 
 #include <library/cpp/http/io/stream.h>
 #include <library/cpp/http/misc/httpcodes.h>
- 
-#include <util/generic/maybe.h> 
+
+#include <util/generic/maybe.h>
 #include <util/generic/strbuf.h>
 #include <util/string/cast.h>
 
diff --git a/library/cpp/messagebus/rain_check/http/http_code_extractor.h b/library/cpp/messagebus/rain_check/http/http_code_extractor.h
index 43f860b7319..33b565fa1c1 100644
--- a/library/cpp/messagebus/rain_check/http/http_code_extractor.h
+++ b/library/cpp/messagebus/rain_check/http/http_code_extractor.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/http/misc/httpcodes.h>
- 
+
 #include <util/generic/maybe.h>
 #include <util/generic/strbuf.h>
 
diff --git a/library/cpp/messagebus/rain_check/messagebus/messagebus_client.h b/library/cpp/messagebus/rain_check/messagebus/messagebus_client.h
index 6d9144cf3e9..0a291cdea69 100644
--- a/library/cpp/messagebus/rain_check/messagebus/messagebus_client.h
+++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_client.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/messagebus/rain_check/core/task.h>
- 
+
 #include <library/cpp/messagebus/ybus.h>
 
 namespace NRainCheck {
diff --git a/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp b/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp
index 05d2d6e02fc..1b3618558b8 100644
--- a/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp
+++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp
@@ -1,13 +1,13 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "messagebus_client.h" 
- 
+#include "messagebus_client.h"
+
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
- 
+
 #include <library/cpp/messagebus/test/helper/example.h>
 #include <library/cpp/messagebus/test/helper/object_count_check.h>
 
-#include <util/generic/cast.h> 
+#include <util/generic/cast.h>
 
 using namespace NBus;
 using namespace NBus::NTest;
diff --git a/library/cpp/messagebus/rain_check/messagebus/messagebus_server.cpp b/library/cpp/messagebus/rain_check/messagebus/messagebus_server.cpp
index 88995e36f88..5d4b13d6647 100644
--- a/library/cpp/messagebus/rain_check/messagebus/messagebus_server.cpp
+++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_server.cpp
@@ -1,5 +1,5 @@
-#include "messagebus_server.h" 
- 
+#include "messagebus_server.h"
+
 #include <library/cpp/messagebus/rain_check/core/spawn.h>
 
 using namespace NRainCheck;
diff --git a/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp b/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp
index 68060e62e7b..7c11399f1be 100644
--- a/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp
+++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "messagebus_server.h" 
+#include "messagebus_server.h"
 
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
 
diff --git a/library/cpp/messagebus/rain_check/test/helper/misc.cpp b/library/cpp/messagebus/rain_check/test/helper/misc.cpp
index 0fe3700b96f..c0fcb272523 100644
--- a/library/cpp/messagebus/rain_check/test/helper/misc.cpp
+++ b/library/cpp/messagebus/rain_check/test/helper/misc.cpp
@@ -1,5 +1,5 @@
-#include "misc.h" 
- 
+#include "misc.h"
+
 #include <util/system/yassert.h>
 
 using namespace NRainCheck;
diff --git a/library/cpp/messagebus/rain_check/test/perftest/perftest.cpp b/library/cpp/messagebus/rain_check/test/perftest/perftest.cpp
index 980b6b2abf8..22edbd8c6ba 100644
--- a/library/cpp/messagebus/rain_check/test/perftest/perftest.cpp
+++ b/library/cpp/messagebus/rain_check/test/perftest/perftest.cpp
@@ -2,8 +2,8 @@
 
 #include <library/cpp/messagebus/rain_check/core/rain_check.h>
 
-#include <util/datetime/base.h> 
- 
+#include <util/datetime/base.h>
+
 #include <array>
 
 using namespace NRainCheck;
diff --git a/library/cpp/messagebus/rain_check/test/ut/test.h b/library/cpp/messagebus/rain_check/test/ut/test.h
index e91470d3a3c..724f6b7530f 100644
--- a/library/cpp/messagebus/rain_check/test/ut/test.h
+++ b/library/cpp/messagebus/rain_check/test/ut/test.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/messagebus/rain_check/core/rain_check.h>
- 
+
 #include <library/cpp/messagebus/misc/test_sync.h>
 
 template <typename TSelf>
diff --git a/library/cpp/messagebus/remote_client_connection.cpp b/library/cpp/messagebus/remote_client_connection.cpp
index 051618afe08..8c7a6db3a8c 100644
--- a/library/cpp/messagebus/remote_client_connection.cpp
+++ b/library/cpp/messagebus/remote_client_connection.cpp
@@ -1,14 +1,14 @@
 #include "remote_client_connection.h"
 
-#include "mb_lwtrace.h" 
-#include "network.h" 
+#include "mb_lwtrace.h"
+#include "network.h"
 #include "remote_client_session.h"
 
 #include <library/cpp/messagebus/actor/executor.h>
 #include <library/cpp/messagebus/actor/temp_tls_vector.h>
 
-#include <util/generic/cast.h> 
-#include <util/thread/singleton.h> 
+#include <util/generic/cast.h>
+#include <util/thread/singleton.h>
 
 LWTRACE_USING(LWTRACE_MESSAGEBUS_PROVIDER)
 
diff --git a/library/cpp/messagebus/remote_client_connection.h b/library/cpp/messagebus/remote_client_connection.h
index 557cc2e03de..fe80b7d2f97 100644
--- a/library/cpp/messagebus/remote_client_connection.h
+++ b/library/cpp/messagebus/remote_client_connection.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "connection.h" 
+#include "connection.h"
 #include "local_tasks.h"
-#include "remote_client_session.h" 
+#include "remote_client_session.h"
 #include "remote_connection.h"
 
-#include <util/generic/object_counter.h> 
- 
+#include <util/generic/object_counter.h>
+
 namespace NBus {
     namespace NPrivate {
         class TRemoteClientConnection: public TRemoteConnection, public TBusClientConnection {
diff --git a/library/cpp/messagebus/remote_client_session.cpp b/library/cpp/messagebus/remote_client_session.cpp
index b2f98a19f22..3bc421944f9 100644
--- a/library/cpp/messagebus/remote_client_session.cpp
+++ b/library/cpp/messagebus/remote_client_session.cpp
@@ -1,12 +1,12 @@
 #include "remote_client_session.h"
 
-#include "mb_lwtrace.h" 
+#include "mb_lwtrace.h"
 #include "remote_client_connection.h"
 
 #include <library/cpp/messagebus/scheduler/scheduler.h>
 
-#include <util/generic/cast.h> 
-#include <util/system/defaults.h> 
+#include <util/generic/cast.h>
+#include <util/system/defaults.h>
 
 LWTRACE_USING(LWTRACE_MESSAGEBUS_PROVIDER)
 
diff --git a/library/cpp/messagebus/remote_client_session.h b/library/cpp/messagebus/remote_client_session.h
index 97582351956..7160d0dae95 100644
--- a/library/cpp/messagebus/remote_client_session.h
+++ b/library/cpp/messagebus/remote_client_session.h
@@ -3,9 +3,9 @@
 #include "remote_client_session_semaphore.h"
 #include "session_impl.h"
 
-#include <util/generic/array_ref.h> 
-#include <util/generic/object_counter.h> 
- 
+#include <util/generic/array_ref.h>
+#include <util/generic/object_counter.h>
+
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4250) //  'NBus::NPrivate::TRemoteClientSession' : inherits 'NBus::NPrivate::TBusSessionImpl::NBus::NPrivate::TBusSessionImpl::GetConfig' via dominance
diff --git a/library/cpp/messagebus/remote_client_session_semaphore.cpp b/library/cpp/messagebus/remote_client_session_semaphore.cpp
index c5601e5511d..f877ed42570 100644
--- a/library/cpp/messagebus/remote_client_session_semaphore.cpp
+++ b/library/cpp/messagebus/remote_client_session_semaphore.cpp
@@ -1,6 +1,6 @@
-#include "remote_client_session_semaphore.h" 
- 
-#include <util/stream/output.h> 
+#include "remote_client_session_semaphore.h"
+
+#include <util/stream/output.h>
 #include <util/system/yassert.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/remote_client_session_semaphore.h b/library/cpp/messagebus/remote_client_session_semaphore.h
index c3850d7d90a..286ca3c86ff 100644
--- a/library/cpp/messagebus/remote_client_session_semaphore.h
+++ b/library/cpp/messagebus/remote_client_session_semaphore.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "cc_semaphore.h" 
- 
+#include "cc_semaphore.h"
+
 #include <util/generic/noncopyable.h>
-#include <util/system/atomic.h> 
-#include <util/system/condvar.h> 
+#include <util/system/atomic.h>
+#include <util/system/condvar.h>
 #include <util/system/mutex.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/remote_connection.cpp b/library/cpp/messagebus/remote_connection.cpp
index 18cb3ebd39a..22932569dbd 100644
--- a/library/cpp/messagebus/remote_connection.cpp
+++ b/library/cpp/messagebus/remote_connection.cpp
@@ -1,19 +1,19 @@
-#include "remote_connection.h" 
+#include "remote_connection.h"
 
 #include "key_value_printer.h"
-#include "mb_lwtrace.h" 
-#include "network.h" 
+#include "mb_lwtrace.h"
+#include "network.h"
 #include "remote_client_connection.h"
 #include "remote_client_session.h"
 #include "remote_server_session.h"
-#include "session_impl.h" 
+#include "session_impl.h"
 
 #include <library/cpp/messagebus/actor/what_thread_does.h>
 
-#include <util/generic/cast.h> 
-#include <util/network/init.h> 
-#include <util/system/atomic.h> 
- 
+#include <util/generic/cast.h>
+#include <util/network/init.h>
+#include <util/system/atomic.h>
+
 LWTRACE_USING(LWTRACE_MESSAGEBUS_PROVIDER)
 
 using namespace NActor;
diff --git a/library/cpp/messagebus/remote_connection.h b/library/cpp/messagebus/remote_connection.h
index 91e343e171b..45389473685 100644
--- a/library/cpp/messagebus/remote_connection.h
+++ b/library/cpp/messagebus/remote_connection.h
@@ -1,18 +1,18 @@
 #pragma once
 
 #include "async_result.h"
-#include "defs.h" 
+#include "defs.h"
 #include "event_loop.h"
-#include "left_right_buffer.h" 
-#include "lfqueue_batch.h" 
-#include "message_ptr_and_header.h" 
+#include "left_right_buffer.h"
+#include "lfqueue_batch.h"
+#include "message_ptr_and_header.h"
 #include "nondestroying_holder.h"
 #include "remote_connection_status.h"
 #include "scheduler_actor.h"
 #include "socket_addr.h"
-#include "storage.h" 
+#include "storage.h"
 #include "vector_swaps.h"
-#include "ybus.h" 
+#include "ybus.h"
 #include "misc/granup.h"
 #include "misc/tokenquota.h"
 
@@ -21,11 +21,11 @@
 #include <library/cpp/messagebus/actor/queue_for_actor.h>
 #include <library/cpp/messagebus/actor/queue_in_actor.h>
 #include <library/cpp/messagebus/scheduler/scheduler.h>
- 
-#include <util/system/atomic.h> 
-#include <util/system/event.h> 
-#include <util/thread/lfstack.h> 
- 
+
+#include <util/system/atomic.h>
+#include <util/system/event.h>
+#include <util/thread/lfstack.h>
+
 namespace NBus {
     namespace NPrivate {
         class TRemoteConnection;
diff --git a/library/cpp/messagebus/remote_connection_status.cpp b/library/cpp/messagebus/remote_connection_status.cpp
index a79fc015879..2c48b2a287c 100644
--- a/library/cpp/messagebus/remote_connection_status.cpp
+++ b/library/cpp/messagebus/remote_connection_status.cpp
@@ -1,13 +1,13 @@
-#include "remote_connection_status.h" 
+#include "remote_connection_status.h"
 
 #include "key_value_printer.h"
 
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
 
-#include <util/stream/format.h> 
-#include <util/stream/output.h> 
-#include <util/system/yassert.h> 
- 
+#include <util/stream/format.h>
+#include <util/stream/output.h>
+#include <util/system/yassert.h>
+
 using namespace NBus;
 using namespace NBus::NPrivate;
 
diff --git a/library/cpp/messagebus/remote_connection_status.h b/library/cpp/messagebus/remote_connection_status.h
index e3c725df5fd..5db10e51eae 100644
--- a/library/cpp/messagebus/remote_connection_status.h
+++ b/library/cpp/messagebus/remote_connection_status.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include "codegen.h"
-#include "duration_histogram.h" 
-#include "message_counter.h" 
+#include "duration_histogram.h"
+#include "message_counter.h"
 #include "message_status_counter.h"
 #include "queue_config.h"
 #include "session_config.h"
 
 #include <library/cpp/messagebus/actor/executor.h>
- 
+
 #include <library/cpp/deprecated/enum_codegen/enum_codegen.h>
- 
+
 namespace NBus {
     class TConnectionStatusMonRecord;
 }
diff --git a/library/cpp/messagebus/remote_server_connection.cpp b/library/cpp/messagebus/remote_server_connection.cpp
index a87ca51e429..74be34ded98 100644
--- a/library/cpp/messagebus/remote_server_connection.cpp
+++ b/library/cpp/messagebus/remote_server_connection.cpp
@@ -1,9 +1,9 @@
 #include "remote_server_connection.h"
 
-#include "mb_lwtrace.h" 
+#include "mb_lwtrace.h"
 #include "remote_server_session.h"
 
-#include <util/generic/cast.h> 
+#include <util/generic/cast.h>
 
 LWTRACE_USING(LWTRACE_MESSAGEBUS_PROVIDER)
 
diff --git a/library/cpp/messagebus/remote_server_connection.h b/library/cpp/messagebus/remote_server_connection.h
index c4f6dbf33d3..63d7f206460 100644
--- a/library/cpp/messagebus/remote_server_connection.h
+++ b/library/cpp/messagebus/remote_server_connection.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "session_impl.h" 
- 
+#include "session_impl.h"
+
 #include <util/generic/object_counter.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/remote_server_session.cpp b/library/cpp/messagebus/remote_server_session.cpp
index 638e3b6f7b8..6abbf88a606 100644
--- a/library/cpp/messagebus/remote_server_session.cpp
+++ b/library/cpp/messagebus/remote_server_session.cpp
@@ -1,15 +1,15 @@
-#include "remote_server_session.h" 
+#include "remote_server_session.h"
+
+#include "remote_connection.h"
+#include "remote_server_connection.h"
 
-#include "remote_connection.h" 
-#include "remote_server_connection.h" 
- 
 #include <library/cpp/messagebus/actor/temp_tls_vector.h>
- 
-#include <util/generic/cast.h> 
+
+#include <util/generic/cast.h>
 #include <util/stream/output.h>
 #include <util/system/yassert.h>
 
-#include <typeinfo> 
+#include <typeinfo>
 
 using namespace NActor;
 using namespace NBus;
diff --git a/library/cpp/messagebus/remote_server_session_semaphore.cpp b/library/cpp/messagebus/remote_server_session_semaphore.cpp
index 99f1db1715d..6094a3586e6 100644
--- a/library/cpp/messagebus/remote_server_session_semaphore.cpp
+++ b/library/cpp/messagebus/remote_server_session_semaphore.cpp
@@ -1,6 +1,6 @@
-#include "remote_server_session_semaphore.h" 
- 
-#include <util/stream/output.h> 
+#include "remote_server_session_semaphore.h"
+
+#include <util/stream/output.h>
 #include <util/system/yassert.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/remote_server_session_semaphore.h b/library/cpp/messagebus/remote_server_session_semaphore.h
index 8673c10ef59..de714fd3429 100644
--- a/library/cpp/messagebus/remote_server_session_semaphore.h
+++ b/library/cpp/messagebus/remote_server_session_semaphore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "cc_semaphore.h" 
- 
+#include "cc_semaphore.h"
+
 #include <util/generic/noncopyable.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/scheduler/scheduler.h b/library/cpp/messagebus/scheduler/scheduler.h
index c01d8f0b331..afcc0de55d5 100644
--- a/library/cpp/messagebus/scheduler/scheduler.h
+++ b/library/cpp/messagebus/scheduler/scheduler.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <library/cpp/threading/future/legacy_future.h>
- 
-#include <util/datetime/base.h> 
-#include <util/generic/object_counter.h> 
+
+#include <util/datetime/base.h>
+#include <util/generic/object_counter.h>
 #include <util/generic/ptr.h>
 #include <util/generic/vector.h>
 #include <util/system/atomic.h>
-#include <util/system/condvar.h> 
+#include <util/system/condvar.h>
 #include <util/system/mutex.h>
 #include <util/system/thread.h>
 
diff --git a/library/cpp/messagebus/scheduler_actor.h b/library/cpp/messagebus/scheduler_actor.h
index 0fe005c82e4..d0c23c94c4e 100644
--- a/library/cpp/messagebus/scheduler_actor.h
+++ b/library/cpp/messagebus/scheduler_actor.h
@@ -6,7 +6,7 @@
 #include <library/cpp/messagebus/actor/what_thread_does_guard.h>
 #include <library/cpp/messagebus/scheduler/scheduler.h>
 
-#include <util/system/mutex.h> 
+#include <util/system/mutex.h>
 
 namespace NBus {
     namespace NPrivate {
diff --git a/library/cpp/messagebus/scheduler_actor_ut.cpp b/library/cpp/messagebus/scheduler_actor_ut.cpp
index 3136011e9cb..e81ffd31869 100644
--- a/library/cpp/messagebus/scheduler_actor_ut.cpp
+++ b/library/cpp/messagebus/scheduler_actor_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "scheduler_actor.h" 
+#include "scheduler_actor.h"
 #include "misc/test_sync.h"
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/session.cpp b/library/cpp/messagebus/session.cpp
index ff963204352..46a7ece6a8f 100644
--- a/library/cpp/messagebus/session.cpp
+++ b/library/cpp/messagebus/session.cpp
@@ -1,5 +1,5 @@
-#include "ybus.h" 
- 
+#include "ybus.h"
+
 #include <util/generic/cast.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/session.h b/library/cpp/messagebus/session.h
index f5a75615c16..fb12ab7c229 100644
--- a/library/cpp/messagebus/session.h
+++ b/library/cpp/messagebus/session.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#include "connection.h" 
+#include "connection.h"
 #include "defs.h"
-#include "handler.h" 
+#include "handler.h"
 #include "message.h"
 #include "netaddr.h"
-#include "network.h" 
+#include "network.h"
 #include "session_config.h"
-#include "misc/weak_ptr.h" 
+#include "misc/weak_ptr.h"
 
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
 
-#include <util/generic/array_ref.h> 
-#include <util/generic/ptr.h> 
- 
+#include <util/generic/array_ref.h>
+#include <util/generic/ptr.h>
+
 namespace NBus {
     template <typename TBusSessionSubclass>
     class TBusSessionPtr;
diff --git a/library/cpp/messagebus/session_impl.cpp b/library/cpp/messagebus/session_impl.cpp
index 29fa5546301..ddf9f360c43 100644
--- a/library/cpp/messagebus/session_impl.cpp
+++ b/library/cpp/messagebus/session_impl.cpp
@@ -1,15 +1,15 @@
-#include "session_impl.h" 
+#include "session_impl.h"
 
-#include "acceptor.h" 
+#include "acceptor.h"
 #include "network.h"
-#include "remote_client_connection.h" 
+#include "remote_client_connection.h"
 #include "remote_client_session.h"
 #include "remote_server_connection.h"
-#include "remote_server_session.h" 
-#include "misc/weak_ptr.h" 
+#include "remote_server_session.h"
+#include "misc/weak_ptr.h"
+
+#include <util/generic/cast.h>
 
-#include <util/generic/cast.h> 
- 
 using namespace NActor;
 using namespace NBus;
 using namespace NBus::NPrivate;
diff --git a/library/cpp/messagebus/session_impl.h b/library/cpp/messagebus/session_impl.h
index 3dcfedace6e..90ef246ff81 100644
--- a/library/cpp/messagebus/session_impl.h
+++ b/library/cpp/messagebus/session_impl.h
@@ -1,24 +1,24 @@
 #pragma once
 
-#include "acceptor_status.h" 
-#include "async_result.h" 
-#include "event_loop.h" 
+#include "acceptor_status.h"
+#include "async_result.h"
+#include "event_loop.h"
 #include "netaddr.h"
-#include "remote_connection.h" 
+#include "remote_connection.h"
 #include "remote_connection_status.h"
 #include "session_job_count.h"
 #include "shutdown_state.h"
-#include "ybus.h" 
+#include "ybus.h"
 
 #include <library/cpp/messagebus/actor/actor.h>
 #include <library/cpp/messagebus/actor/queue_in_actor.h>
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
 
 #include <library/cpp/threading/future/legacy_future.h>
- 
-#include <util/generic/array_ref.h> 
-#include <util/generic/string.h> 
- 
+
+#include <util/generic/array_ref.h>
+#include <util/generic/string.h>
+
 namespace NBus {
     namespace NPrivate {
         typedef TIntrusivePtr<TRemoteClientConnection> TRemoteClientConnectionPtr;
diff --git a/library/cpp/messagebus/session_job_count.cpp b/library/cpp/messagebus/session_job_count.cpp
index 1068dd7a155..33322b19102 100644
--- a/library/cpp/messagebus/session_job_count.cpp
+++ b/library/cpp/messagebus/session_job_count.cpp
@@ -1,5 +1,5 @@
-#include "session_job_count.h" 
- 
+#include "session_job_count.h"
+
 #include <util/system/yassert.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/session_job_count.h b/library/cpp/messagebus/session_job_count.h
index ef28c30cef3..23aca618b1c 100644
--- a/library/cpp/messagebus/session_job_count.h
+++ b/library/cpp/messagebus/session_job_count.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <util/system/atomic.h>
-#include <util/system/condvar.h> 
+#include <util/system/condvar.h>
 #include <util/system/mutex.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/shutdown_state.cpp b/library/cpp/messagebus/shutdown_state.cpp
index b4b2a19dce6..a4e2bfa8b26 100644
--- a/library/cpp/messagebus/shutdown_state.cpp
+++ b/library/cpp/messagebus/shutdown_state.cpp
@@ -1,5 +1,5 @@
-#include "shutdown_state.h" 
- 
+#include "shutdown_state.h"
+
 #include <util/system/yassert.h>
 
 void TAtomicShutdownState::ShutdownCommand() {
diff --git a/library/cpp/messagebus/shutdown_state.h b/library/cpp/messagebus/shutdown_state.h
index 10104c1d9aa..86bd7110ae5 100644
--- a/library/cpp/messagebus/shutdown_state.h
+++ b/library/cpp/messagebus/shutdown_state.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "misc/atomic_box.h" 
- 
+#include "misc/atomic_box.h"
+
 #include <util/system/event.h>
 
 enum EShutdownState {
diff --git a/library/cpp/messagebus/socket_addr.cpp b/library/cpp/messagebus/socket_addr.cpp
index b82fa24ae34..c1b3a28fbee 100644
--- a/library/cpp/messagebus/socket_addr.cpp
+++ b/library/cpp/messagebus/socket_addr.cpp
@@ -1,10 +1,10 @@
-#include "socket_addr.h" 
+#include "socket_addr.h"
 
 #include "netaddr.h"
 
-#include <util/network/address.h> 
-#include <util/network/init.h> 
-#include <util/system/yassert.h> 
+#include <util/network/address.h>
+#include <util/network/init.h>
+#include <util/system/yassert.h>
 
 using namespace NAddr;
 
diff --git a/library/cpp/messagebus/socket_addr.h b/library/cpp/messagebus/socket_addr.h
index 98b157c3d1f..959eafe6895 100644
--- a/library/cpp/messagebus/socket_addr.h
+++ b/library/cpp/messagebus/socket_addr.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "hash.h" 
+#include "hash.h"
 
 #include <util/generic/hash.h>
-#include <util/generic/utility.h> 
+#include <util/generic/utility.h>
 #include <util/network/address.h>
-#include <util/network/init.h> 
+#include <util/network/init.h>
 
-#include <string.h> 
+#include <string.h>
 
 namespace NBus {
     class TNetAddr;
diff --git a/library/cpp/messagebus/socket_addr_ut.cpp b/library/cpp/messagebus/socket_addr_ut.cpp
index 606b33fa2b9..783bb62a861 100644
--- a/library/cpp/messagebus/socket_addr_ut.cpp
+++ b/library/cpp/messagebus/socket_addr_ut.cpp
@@ -1,10 +1,10 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "netaddr.h" 
+#include "netaddr.h"
 #include "socket_addr.h"
 
-#include <util/string/cast.h> 
- 
+#include <util/string/cast.h>
+
 using namespace NBus;
 using namespace NBus::NPrivate;
 
diff --git a/library/cpp/messagebus/storage.cpp b/library/cpp/messagebus/storage.cpp
index 1b856c7d615..efefc87340c 100644
--- a/library/cpp/messagebus/storage.cpp
+++ b/library/cpp/messagebus/storage.cpp
@@ -1,5 +1,5 @@
-#include "storage.h" 
- 
+#include "storage.h"
+
 #include <typeinfo>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/storage.h b/library/cpp/messagebus/storage.h
index 8fc2362ee69..7d168844ed3 100644
--- a/library/cpp/messagebus/storage.h
+++ b/library/cpp/messagebus/storage.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "message_ptr_and_header.h" 
-#include "moved.h" 
-#include "ybus.h" 
- 
-#include <contrib/libs/sparsehash/src/sparsehash/dense_hash_map> 
- 
-#include <util/generic/deque.h> 
+#include "message_ptr_and_header.h"
+#include "moved.h"
+#include "ybus.h"
+
+#include <contrib/libs/sparsehash/src/sparsehash/dense_hash_map>
+
+#include <util/generic/deque.h>
 #include <util/generic/noncopyable.h>
 #include <util/generic/utility.h>
 
diff --git a/library/cpp/messagebus/synchandler.cpp b/library/cpp/messagebus/synchandler.cpp
index c965259740f..8e891d66b30 100644
--- a/library/cpp/messagebus/synchandler.cpp
+++ b/library/cpp/messagebus/synchandler.cpp
@@ -1,6 +1,6 @@
 #include "remote_client_session.h"
 #include "remote_connection.h"
-#include "ybus.h" 
+#include "ybus.h"
 
 using namespace NBus;
 using namespace NBus::NPrivate;
diff --git a/library/cpp/messagebus/test/example/client/client.cpp b/library/cpp/messagebus/test/example/client/client.cpp
index 05bafa9a82c..89b5f2c9beb 100644
--- a/library/cpp/messagebus/test/example/client/client.cpp
+++ b/library/cpp/messagebus/test/example/client/client.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/messagebus/test/example/common/proto.h>
- 
+
 #include <util/random/random.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/test/example/common/proto.h b/library/cpp/messagebus/test/example/common/proto.h
index 9a9a7303127..a151aac4689 100644
--- a/library/cpp/messagebus/test/example/common/proto.h
+++ b/library/cpp/messagebus/test/example/common/proto.h
@@ -4,7 +4,7 @@
 
 #include <library/cpp/messagebus/ybus.h>
 #include <library/cpp/messagebus/protobuf/ybusbuf.h>
- 
+
 namespace NCalculator {
     typedef ::NBus::TBusBufferMessage<TRequestSumRecord, 1> TRequestSum;
     typedef ::NBus::TBusBufferMessage<TRequestMulRecord, 2> TRequestMul;
diff --git a/library/cpp/messagebus/test/helper/example.cpp b/library/cpp/messagebus/test/helper/example.cpp
index f3c956bf838..7c6d704042c 100644
--- a/library/cpp/messagebus/test/helper/example.cpp
+++ b/library/cpp/messagebus/test/helper/example.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "example.h" 
- 
+#include "example.h"
+
 #include <util/generic/cast.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/test/helper/example.h b/library/cpp/messagebus/test/helper/example.h
index 1566b3c5394..26b74753088 100644
--- a/library/cpp/messagebus/test/helper/example.h
+++ b/library/cpp/messagebus/test/helper/example.h
@@ -7,9 +7,9 @@
 
 #include <library/cpp/messagebus/ybus.h>
 #include <library/cpp/messagebus/misc/test_sync.h>
- 
-#include <util/system/event.h> 
- 
+
+#include <util/system/event.h>
+
 namespace NBus {
     namespace NTest {
         class TExampleRequest: public TBusMessage {
diff --git a/library/cpp/messagebus/test/helper/example_module.h b/library/cpp/messagebus/test/helper/example_module.h
index 03d2f92cb47..a0b295f6139 100644
--- a/library/cpp/messagebus/test/helper/example_module.h
+++ b/library/cpp/messagebus/test/helper/example_module.h
@@ -3,7 +3,7 @@
 #include "example.h"
 
 #include <library/cpp/messagebus/oldmodule/module.h>
- 
+
 namespace NBus {
     namespace NTest {
         struct TExampleModule: public TBusModule {
diff --git a/library/cpp/messagebus/test/helper/fixed_port.cpp b/library/cpp/messagebus/test/helper/fixed_port.cpp
index 95d8039bbde..258da0d1a58 100644
--- a/library/cpp/messagebus/test/helper/fixed_port.cpp
+++ b/library/cpp/messagebus/test/helper/fixed_port.cpp
@@ -1,8 +1,8 @@
-#include "fixed_port.h" 
- 
+#include "fixed_port.h"
+
 #include <util/system/env.h>
 
-#include <stdlib.h> 
+#include <stdlib.h>
 
 bool NBus::NTest::IsFixedPortTestAllowed() {
     // TODO: report skipped tests to test
diff --git a/library/cpp/messagebus/test/helper/hanging_server.cpp b/library/cpp/messagebus/test/helper/hanging_server.cpp
index 673489bf61c..a35514b00d4 100644
--- a/library/cpp/messagebus/test/helper/hanging_server.cpp
+++ b/library/cpp/messagebus/test/helper/hanging_server.cpp
@@ -1,5 +1,5 @@
-#include "hanging_server.h" 
- 
+#include "hanging_server.h"
+
 #include <util/system/yassert.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/test/helper/hanging_server.h b/library/cpp/messagebus/test/helper/hanging_server.h
index 59f5753f5ae..cc9fb274d8a 100644
--- a/library/cpp/messagebus/test/helper/hanging_server.h
+++ b/library/cpp/messagebus/test/helper/hanging_server.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/messagebus/network.h>
- 
+
 #include <util/network/sock.h>
 
 class THangingServer {
diff --git a/library/cpp/messagebus/test/helper/message_handler_error.cpp b/library/cpp/messagebus/test/helper/message_handler_error.cpp
index ce0c0c5c74f..c09811ec67b 100644
--- a/library/cpp/messagebus/test/helper/message_handler_error.cpp
+++ b/library/cpp/messagebus/test/helper/message_handler_error.cpp
@@ -1,5 +1,5 @@
-#include "message_handler_error.h" 
- 
+#include "message_handler_error.h"
+
 #include <util/system/yassert.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/test/helper/object_count_check.h b/library/cpp/messagebus/test/helper/object_count_check.h
index cd54d9547b6..1c4756e58c1 100644
--- a/library/cpp/messagebus/test/helper/object_count_check.h
+++ b/library/cpp/messagebus/test/helper/object_count_check.h
@@ -12,10 +12,10 @@
 
 #include <util/generic/object_counter.h>
 #include <util/system/type_name.h>
-#include <util/stream/output.h> 
+#include <util/stream/output.h>
+
+#include <typeinfo>
 
-#include <typeinfo> 
- 
 struct TObjectCountCheck {
     bool Enabled;
 
diff --git a/library/cpp/messagebus/test/perftest/perftest.cpp b/library/cpp/messagebus/test/perftest/perftest.cpp
index b66725049a7..84893192789 100644
--- a/library/cpp/messagebus/test/perftest/perftest.cpp
+++ b/library/cpp/messagebus/test/perftest/perftest.cpp
@@ -8,7 +8,7 @@
 #include <library/cpp/messagebus/oldmodule/module.h>
 #include <library/cpp/messagebus/protobuf/ybusbuf.h>
 #include <library/cpp/messagebus/www/www.h>
- 
+
 #include <library/cpp/deprecated/threadable/threadable.h>
 #include <library/cpp/execprofile/profile.h>
 #include <library/cpp/getopt/opt.h>
diff --git a/library/cpp/messagebus/test/perftest/simple_proto.cpp b/library/cpp/messagebus/test/perftest/simple_proto.cpp
index 601aa50a79c..19d6c15b9d9 100644
--- a/library/cpp/messagebus/test/perftest/simple_proto.cpp
+++ b/library/cpp/messagebus/test/perftest/simple_proto.cpp
@@ -1,8 +1,8 @@
-#include "simple_proto.h" 
+#include "simple_proto.h"
 
 #include <util/generic/cast.h>
 
-#include <typeinfo> 
+#include <typeinfo>
 
 using namespace NBus;
 
diff --git a/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp b/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
index 058e1645596..3fdd175d736 100644
--- a/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
+++ b/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <library/cpp/messagebus/test_utils.h>
 #include <library/cpp/messagebus/ybus.h>
- 
+
 class TLocatorRegisterUniqTest: public TTestBase {
     UNIT_TEST_SUITE(TLocatorRegisterUniqTest);
     UNIT_TEST(TestRegister);
diff --git a/library/cpp/messagebus/test/ut/module_client_one_way_ut.cpp b/library/cpp/messagebus/test/ut/module_client_one_way_ut.cpp
index 848bc332f8d..4083cf3b7b7 100644
--- a/library/cpp/messagebus/test/ut/module_client_one_way_ut.cpp
+++ b/library/cpp/messagebus/test/ut/module_client_one_way_ut.cpp
@@ -5,7 +5,7 @@
 
 #include <library/cpp/messagebus/misc/test_sync.h>
 #include <library/cpp/messagebus/oldmodule/module.h>
- 
+
 using namespace NBus;
 using namespace NBus::NTest;
 
diff --git a/library/cpp/messagebus/test/ut/module_client_ut.cpp b/library/cpp/messagebus/test/ut/module_client_ut.cpp
index cf3c7befc72..ebfe185cc6d 100644
--- a/library/cpp/messagebus/test/ut/module_client_ut.cpp
+++ b/library/cpp/messagebus/test/ut/module_client_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "count_down_latch.h" 
+#include "count_down_latch.h"
 #include "moduletest.h"
 
 #include <library/cpp/messagebus/test/helper/example.h>
@@ -10,10 +10,10 @@
 
 #include <library/cpp/messagebus/misc/test_sync.h>
 #include <library/cpp/messagebus/oldmodule/module.h>
- 
-#include <util/generic/cast.h> 
-#include <util/system/event.h> 
- 
+
+#include <util/generic/cast.h>
+#include <util/system/event.h>
+
 using namespace NBus;
 using namespace NBus::NTest;
 
diff --git a/library/cpp/messagebus/test/ut/module_server_ut.cpp b/library/cpp/messagebus/test/ut/module_server_ut.cpp
index 009bd7d4895..88fe1dd9b6d 100644
--- a/library/cpp/messagebus/test/ut/module_server_ut.cpp
+++ b/library/cpp/messagebus/test/ut/module_server_ut.cpp
@@ -1,17 +1,17 @@
 #include <library/cpp/testing/unittest/registar.h>
 
-#include "count_down_latch.h" 
+#include "count_down_latch.h"
 #include "moduletest.h"
 
 #include <library/cpp/messagebus/test/helper/example.h>
 #include <library/cpp/messagebus/test/helper/example_module.h>
 #include <library/cpp/messagebus/test/helper/object_count_check.h>
 #include <library/cpp/messagebus/test/helper/wait_for.h>
- 
+
 #include <library/cpp/messagebus/oldmodule/module.h>
- 
-#include <util/generic/cast.h> 
- 
+
+#include <util/generic/cast.h>
+
 using namespace NBus;
 using namespace NBus::NTest;
 
diff --git a/library/cpp/messagebus/use_after_free_checker.cpp b/library/cpp/messagebus/use_after_free_checker.cpp
index aecf1ac447d..4904e7c614a 100644
--- a/library/cpp/messagebus/use_after_free_checker.cpp
+++ b/library/cpp/messagebus/use_after_free_checker.cpp
@@ -1,5 +1,5 @@
-#include "use_after_free_checker.h" 
- 
+#include "use_after_free_checker.h"
+
 #include <util/system/yassert.h>
 
 namespace {
diff --git a/library/cpp/messagebus/use_after_free_checker.h b/library/cpp/messagebus/use_after_free_checker.h
index 92856e00f80..590b0761568 100644
--- a/library/cpp/messagebus/use_after_free_checker.h
+++ b/library/cpp/messagebus/use_after_free_checker.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <util/system/platform.h>
-#include <util/system/types.h> 
+#include <util/system/types.h>
 
 class TUseAfterFreeChecker {
 private:
diff --git a/library/cpp/messagebus/use_count_checker.cpp b/library/cpp/messagebus/use_count_checker.cpp
index acc35a5a024..c6243ea21fb 100644
--- a/library/cpp/messagebus/use_count_checker.cpp
+++ b/library/cpp/messagebus/use_count_checker.cpp
@@ -1,6 +1,6 @@
-#include "use_count_checker.h" 
- 
-#include <util/generic/utility.h> 
+#include "use_count_checker.h"
+
+#include <util/generic/utility.h>
 #include <util/system/yassert.h>
 
 TUseCountChecker::TUseCountChecker() {
diff --git a/library/cpp/messagebus/vector_swaps.h b/library/cpp/messagebus/vector_swaps.h
index f6eb6b78010..b920bcf03ea 100644
--- a/library/cpp/messagebus/vector_swaps.h
+++ b/library/cpp/messagebus/vector_swaps.h
@@ -2,11 +2,11 @@
 
 #include <util/generic/array_ref.h>
 #include <util/generic/noncopyable.h>
-#include <util/generic/utility.h> 
+#include <util/generic/utility.h>
 #include <util/system/yassert.h>
 
-#include <stdlib.h> 
- 
+#include <stdlib.h>
+
 template <typename T, class A = std::allocator<T>>
 class TVectorSwaps : TNonCopyable {
 private:
diff --git a/library/cpp/messagebus/www/html_output.h b/library/cpp/messagebus/www/html_output.h
index 6dbd24687fc..27e77adefa7 100644
--- a/library/cpp/messagebus/www/html_output.h
+++ b/library/cpp/messagebus/www/html_output.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "concat_strings.h" 
- 
-#include <util/generic/string.h> 
+#include "concat_strings.h"
+
+#include <util/generic/string.h>
 #include <util/stream/output.h>
 #include <library/cpp/html/pcdata/pcdata.h>
 #include <util/system/tls.h>
diff --git a/library/cpp/messagebus/www/www.cpp b/library/cpp/messagebus/www/www.cpp
index 85d5e13cd8b..62ec241d852 100644
--- a/library/cpp/messagebus/www/www.cpp
+++ b/library/cpp/messagebus/www/www.cpp
@@ -1,11 +1,11 @@
-#include "www.h" 
+#include "www.h"
 
-#include "concat_strings.h" 
-#include "html_output.h" 
+#include "concat_strings.h"
+#include "html_output.h"
 
 #include <library/cpp/messagebus/remote_connection_status.h>
 #include <library/cpp/monlib/deprecated/json/writer.h>
- 
+
 #include <library/cpp/archive/yarchive.h>
 #include <library/cpp/http/fetch/httpfsm.h>
 #include <library/cpp/http/fetch/httpheader.h>
@@ -13,11 +13,11 @@
 #include <library/cpp/json/writer/json.h>
 #include <library/cpp/uri/http_url.h>
 
-#include <util/string/cast.h> 
-#include <util/string/printf.h> 
-#include <util/system/mutex.h> 
+#include <util/string/cast.h>
+#include <util/string/printf.h>
+#include <util/system/mutex.h>
 
-#include <utility> 
+#include <utility>
 
 using namespace NBus;
 using namespace NBus::NPrivate;
diff --git a/library/cpp/messagebus/www/www.h b/library/cpp/messagebus/www/www.h
index ee1f6294475..6cd652b4774 100644
--- a/library/cpp/messagebus/www/www.h
+++ b/library/cpp/messagebus/www/www.h
@@ -2,8 +2,8 @@
 
 #include <library/cpp/messagebus/ybus.h>
 #include <library/cpp/messagebus/oldmodule/module.h>
- 
-#include <util/generic/ptr.h> 
+
+#include <util/generic/ptr.h>
 #include <util/generic/string.h>
 #include <library/cpp/cgiparam/cgiparam.h>
 
diff --git a/library/cpp/messagebus/ybus.h b/library/cpp/messagebus/ybus.h
index c2fe735f265..de21ad85216 100644
--- a/library/cpp/messagebus/ybus.h
+++ b/library/cpp/messagebus/ybus.h
@@ -8,30 +8,30 @@
 #include "handler.h"
 #include "handler_impl.h"
 #include "local_flags.h"
-#include "locator.h" 
+#include "locator.h"
 #include "message.h"
-#include "message_status.h" 
-#include "network.h" 
-#include "queue_config.h" 
-#include "remote_connection_status.h" 
+#include "message_status.h"
+#include "network.h"
+#include "queue_config.h"
+#include "remote_connection_status.h"
 #include "session.h"
-#include "session_config.h" 
-#include "socket_addr.h" 
+#include "session_config.h"
+#include "socket_addr.h"
 
 #include <library/cpp/messagebus/actor/executor.h>
 #include <library/cpp/messagebus/scheduler/scheduler.h>
- 
+
 #include <library/cpp/codecs/codecs.h>
- 
-#include <util/generic/array_ref.h> 
+
+#include <util/generic/array_ref.h>
 #include <util/generic/buffer.h>
 #include <util/generic/noncopyable.h>
-#include <util/generic/ptr.h> 
+#include <util/generic/ptr.h>
 #include <util/stream/input.h>
 #include <util/system/atomic.h>
 #include <util/system/condvar.h>
 #include <util/system/type_name.h>
-#include <util/system/event.h> 
+#include <util/system/event.h>
 #include <util/system/mutex.h>
 
 namespace NBus {
diff --git a/library/cpp/threading/future/core/future-inl.h b/library/cpp/threading/future/core/future-inl.h
index 7f44059a011..5fd4296a93c 100644
--- a/library/cpp/threading/future/core/future-inl.h
+++ b/library/cpp/threading/future/core/future-inl.h
@@ -167,20 +167,20 @@ namespace NThreading {
             }
 
             void SetException(std::exception_ptr e) {
-                bool success = TrySetException(std::move(e)); 
-                if (Y_UNLIKELY(!success)) { 
-                    ythrow TFutureException() << "value already set"; 
-                } 
-            } 
- 
-            bool TrySetException(std::exception_ptr e) { 
+                bool success = TrySetException(std::move(e));
+                if (Y_UNLIKELY(!success)) {
+                    ythrow TFutureException() << "value already set";
+                }
+            }
+
+            bool TrySetException(std::exception_ptr e) {
                 TSystemEvent* readyEvent;
                 TCallbackList<T> callbacks;
 
                 with_lock (StateLock) {
                     int state = AtomicGet(State);
                     if (Y_UNLIKELY(state != NotReady)) {
-                        return false; 
+                        return false;
                     }
 
                     Exception = std::move(e);
@@ -201,8 +201,8 @@ namespace NThreading {
                         callback(temp);
                     }
                 }
- 
-                return true; 
+
+                return true;
             }
 
             template <typename F>
@@ -353,20 +353,20 @@ namespace NThreading {
             }
 
             void SetException(std::exception_ptr e) {
-                bool success = TrySetException(std::move(e)); 
-                if (Y_UNLIKELY(!success)) { 
-                    ythrow TFutureException() << "value already set"; 
-                } 
-            } 
- 
-            bool TrySetException(std::exception_ptr e) { 
+                bool success = TrySetException(std::move(e));
+                if (Y_UNLIKELY(!success)) {
+                    ythrow TFutureException() << "value already set";
+                }
+            }
+
+            bool TrySetException(std::exception_ptr e) {
                 TSystemEvent* readyEvent = nullptr;
                 TCallbackList<void> callbacks;
 
                 with_lock (StateLock) {
                     int state = AtomicGet(State);
                     if (Y_UNLIKELY(state != NotReady)) {
-                        return false; 
+                        return false;
                     }
 
                     Exception = std::move(e);
@@ -387,8 +387,8 @@ namespace NThreading {
                         callback(temp);
                     }
                 }
- 
-                return true; 
+
+                return true;
             }
 
             template <typename F>
@@ -834,12 +834,12 @@ namespace NThreading {
     }
 
     template <typename T>
-    inline bool TPromise<T>::TrySetException(std::exception_ptr e) { 
-        EnsureInitialized(); 
-        return State->TrySetException(std::move(e)); 
-    } 
- 
-    template <typename T> 
+    inline bool TPromise<T>::TrySetException(std::exception_ptr e) {
+        EnsureInitialized();
+        return State->TrySetException(std::move(e));
+    }
+
+    template <typename T>
     inline TFuture<T> TPromise<T>::GetFuture() const {
         EnsureInitialized();
         return TFuture<T>(State);
@@ -912,11 +912,11 @@ namespace NThreading {
         State->SetException(std::move(e));
     }
 
-    inline bool TPromise<void>::TrySetException(std::exception_ptr e) { 
-        EnsureInitialized(); 
-        return State->TrySetException(std::move(e)); 
-    } 
- 
+    inline bool TPromise<void>::TrySetException(std::exception_ptr e) {
+        EnsureInitialized();
+        return State->TrySetException(std::move(e));
+    }
+
     inline TFuture<void> TPromise<void>::GetFuture() const {
         EnsureInitialized();
         return TFuture<void>(State);
diff --git a/library/cpp/threading/future/core/future.h b/library/cpp/threading/future/core/future.h
index a4a10123521..2e82bb953eb 100644
--- a/library/cpp/threading/future/core/future.h
+++ b/library/cpp/threading/future/core/future.h
@@ -216,7 +216,7 @@ namespace NThreading {
         bool HasException() const;
         void SetException(const TString& e);
         void SetException(std::exception_ptr e);
-        bool TrySetException(std::exception_ptr e); 
+        bool TrySetException(std::exception_ptr e);
 
         TFuture<T> GetFuture() const;
         operator TFuture<T>() const;
@@ -256,7 +256,7 @@ namespace NThreading {
         bool HasException() const;
         void SetException(const TString& e);
         void SetException(std::exception_ptr e);
-        bool TrySetException(std::exception_ptr e); 
+        bool TrySetException(std::exception_ptr e);
 
         TFuture<void> GetFuture() const;
         operator TFuture<void>() const;
diff --git a/library/cpp/threading/future/future_ut.cpp b/library/cpp/threading/future/future_ut.cpp
index 63fb4604be3..05950a568d4 100644
--- a/library/cpp/threading/future/future_ut.cpp
+++ b/library/cpp/threading/future/future_ut.cpp
@@ -507,18 +507,18 @@ namespace {
             UNIT_ASSERT(!promise.TrySetValue(42));
         }
 
-        Y_UNIT_TEST(HandlingRepetitiveSetException) { 
-            TPromise<int> promise = NewPromise<int>(); 
-            promise.SetException("test"); 
-            UNIT_CHECK_GENERATED_EXCEPTION(promise.SetException("test"), TFutureException); 
-        } 
- 
-        Y_UNIT_TEST(HandlingRepetitiveTrySetException) { 
-            TPromise<int> promise = NewPromise<int>(); 
-            UNIT_ASSERT(promise.TrySetException(std::make_exception_ptr("test"))); 
-            UNIT_ASSERT(!promise.TrySetException(std::make_exception_ptr("test"))); 
-        } 
- 
+        Y_UNIT_TEST(HandlingRepetitiveSetException) {
+            TPromise<int> promise = NewPromise<int>();
+            promise.SetException("test");
+            UNIT_CHECK_GENERATED_EXCEPTION(promise.SetException("test"), TFutureException);
+        }
+
+        Y_UNIT_TEST(HandlingRepetitiveTrySetException) {
+            TPromise<int> promise = NewPromise<int>();
+            UNIT_ASSERT(promise.TrySetException(std::make_exception_ptr("test")));
+            UNIT_ASSERT(!promise.TrySetException(std::make_exception_ptr("test")));
+        }
+
         Y_UNIT_TEST(ShouldAllowToMakeFutureWithException)
         {
             auto future1 = MakeErrorFuture<void>(std::make_exception_ptr(TFutureException()));
diff --git a/library/cpp/ya.make b/library/cpp/ya.make
index 6a7bd206bd9..8c1193b0077 100644
--- a/library/cpp/ya.make
+++ b/library/cpp/ya.make
@@ -1,6 +1,6 @@
-OWNER(g:cpp-contrib) 
- 
-RECURSE( 
+OWNER(g:cpp-contrib)
+
+RECURSE(
     accurate_accumulate
     accurate_accumulate/benchmark
     accurate_accumulate/benchmark/metrics
@@ -417,8 +417,8 @@ RECURSE(
     yson_pull
     yson_pull/ut
     yt
-    zipatch 
-) 
+    zipatch
+)
 
 IF (OS_LINUX)
     RECURSE(
@@ -437,7 +437,7 @@ IF (OS_WINDOWS)
     )
 ELSE()
     RECURSE(
-        fuse 
+        fuse
         sse/ut
         tf
         xdelta3
diff --git a/library/python/runtime_py3/main/get_py_main.cpp b/library/python/runtime_py3/main/get_py_main.cpp
index 38e0b3a32df..67c400d4f42 100644
--- a/library/python/runtime_py3/main/get_py_main.cpp
+++ b/library/python/runtime_py3/main/get_py_main.cpp
@@ -1,8 +1,8 @@
-#include <library/cpp/resource/resource.h> 
- 
-#include <stdlib.h> 
- 
-extern "C" char* GetPyMain() { 
-    TString res = NResource::Find("PY_MAIN"); 
-    return strdup(res.c_str()); 
-} 
+#include <library/cpp/resource/resource.h>
+
+#include <stdlib.h>
+
+extern "C" char* GetPyMain() {
+    TString res = NResource::Find("PY_MAIN");
+    return strdup(res.c_str());
+}
diff --git a/library/python/runtime_py3/main/main.c b/library/python/runtime_py3/main/main.c
index 70983343c99..31598006155 100644
--- a/library/python/runtime_py3/main/main.c
+++ b/library/python/runtime_py3/main/main.c
@@ -6,7 +6,7 @@
 #include <locale.h>
 
 void Py_InitArgcArgv(int argc, wchar_t **argv);
-char* GetPyMain(); 
+char* GetPyMain();
 
 static const char* env_entry_point = "Y_PYTHON_ENTRY_POINT";
 static const char* env_bytes_warning = "Y_PYTHON_BYTES_WARNING";
@@ -135,26 +135,26 @@ static int pymain(int argc, char** argv) {
     }
 
     const char* entry_point = getenv(env_entry_point);
-    if (entry_point) { 
-        entry_point_copy = strdup(entry_point); 
-        if (!entry_point_copy) { 
-            fprintf(stderr, "out of memory\n"); 
-            goto error; 
-        } 
-    } else { 
-        entry_point_copy = GetPyMain(); 
-    } 
- 
-    if (entry_point_copy == NULL) { 
-        fprintf(stderr, "No entry point, did you forget PY_MAIN?\n"); 
-        goto error; 
-    } 
- 
-    if (entry_point_copy && !strcmp(entry_point_copy, ":main")) { 
+    if (entry_point) {
+        entry_point_copy = strdup(entry_point);
+        if (!entry_point_copy) {
+            fprintf(stderr, "out of memory\n");
+            goto error;
+        }
+    } else {
+        entry_point_copy = GetPyMain();
+    }
+
+    if (entry_point_copy == NULL) {
+        fprintf(stderr, "No entry point, did you forget PY_MAIN?\n");
+        goto error;
+    }
+
+    if (entry_point_copy && !strcmp(entry_point_copy, ":main")) {
         unsetenv(env_entry_point);
-        sts = Py_Main(argc, argv_copy); 
-        free(entry_point_copy); 
-        return sts; 
+        sts = Py_Main(argc, argv_copy);
+        free(entry_point_copy);
+        return sts;
     }
 
     Py_InitArgcArgv(argc, argv_copy);
diff --git a/library/python/runtime_py3/main/ya.make b/library/python/runtime_py3/main/ya.make
index ff0dd1d27f0..f308a93b28e 100644
--- a/library/python/runtime_py3/main/ya.make
+++ b/library/python/runtime_py3/main/ya.make
@@ -7,7 +7,7 @@ OWNER(
 
 PEERDIR(
     contrib/tools/python3/src
-    library/cpp/resource 
+    library/cpp/resource
 )
 
 ADDINCL(
@@ -20,7 +20,7 @@ CFLAGS(
 
 SRCS(
     main.c
-    get_py_main.cpp 
+    get_py_main.cpp
 )
 
 END()
diff --git a/library/python/symbols/ya.make b/library/python/symbols/ya.make
index 83fb11be9d8..340a710c487 100644
--- a/library/python/symbols/ya.make
+++ b/library/python/symbols/ya.make
@@ -5,7 +5,7 @@ RECURSE(
 
     crypto
     libc
-    libmagic 
+    libmagic
     python
     uuid
     win_unicode_console