Restoring authorship annotation for Vlad Yaroslavlev <vladon@vladon.com>. Commit 1 of 2.

50 files changed, 150 insertions, 150 deletions

diff --git a/library/cpp/messagebus/acceptor_status.cpp b/library/cpp/messagebus/acceptor_status.cpp
index 5006ff68ae..e9818e03d3 100644
--- a/library/cpp/messagebus/acceptor_status.cpp
+++ b/library/cpp/messagebus/acceptor_status.cpp
@@ -40,7 +40,7 @@ TAcceptorStatus& TAcceptorStatus::operator+=(const TAcceptorStatus& that) {
     return *this;
 }
 
-TString TAcceptorStatus::PrintToString() const {
+TString TAcceptorStatus::PrintToString() const { 
     TStringStream ss;
 
     if (!Summary) {
diff --git a/library/cpp/messagebus/actor/executor.cpp b/library/cpp/messagebus/actor/executor.cpp
index 7a2227a458..eaf0751709 100644
--- a/library/cpp/messagebus/actor/executor.cpp
+++ b/library/cpp/messagebus/actor/executor.cpp
@@ -249,11 +249,11 @@ ui32 TExecutor::GetMaxQueueSizeAndClear() const {
     return max;
 }
 
-TString TExecutor::GetStatus() const {
+TString TExecutor::GetStatus() const { 
     return GetStatusRecordInternal().Status;
 }
 
-TString TExecutor::GetStatusSingleLine() const {
+TString TExecutor::GetStatusSingleLine() const { 
     TStringStream ss;
     ss << "work items: " << GetWorkQueueSize();
     return ss.Str();
diff --git a/library/cpp/messagebus/actor/ring_buffer.h b/library/cpp/messagebus/actor/ring_buffer.h
index ec5706f7c7..937d8d5a3d 100644
--- a/library/cpp/messagebus/actor/ring_buffer.h
+++ b/library/cpp/messagebus/actor/ring_buffer.h
@@ -14,7 +14,7 @@ private:
     ui32 Capacity;
     ui32 WritePos;
     ui32 ReadPos;
-    TVector<T> Data;
+    TVector<T> Data; 
 
     void StateCheck() const {
         Y_ASSERT(Capacity == Data.size());
@@ -39,7 +39,7 @@ private:
         }
         ui32 newCapacity = 1u << newCapacityPow;
         ui32 newCapacityMask = newCapacity - 1u;
-        TVector<T> newData(newCapacity);
+        TVector<T> newData(newCapacity); 
         ui32 oldSize = Size();
         // Copy old elements
         for (size_t i = 0; i < oldSize; ++i) {
diff --git a/library/cpp/messagebus/actor/temp_tls_vector.h b/library/cpp/messagebus/actor/temp_tls_vector.h
index 675d92f5b0..7d9fbce088 100644
--- a/library/cpp/messagebus/actor/temp_tls_vector.h
+++ b/library/cpp/messagebus/actor/temp_tls_vector.h
@@ -10,15 +10,15 @@ class TTempTlsVector {
 private:
     struct TTagForTls {};
 
-    TVectorType<T, std::allocator<T>>* Vector;
+    TVectorType<T, std::allocator<T>>* Vector; 
 
 public:
-    TVectorType<T, std::allocator<T>>* GetVector() {
+    TVectorType<T, std::allocator<T>>* GetVector() { 
         return Vector;
     }
 
     TTempTlsVector() {
-        Vector = FastTlsSingletonWithTag<TVectorType<T, std::allocator<T>>, TTagForTls>();
+        Vector = FastTlsSingletonWithTag<TVectorType<T, std::allocator<T>>, TTagForTls>(); 
         Y_ASSERT(Vector->empty());
     }
 
@@ -30,7 +30,7 @@ public:
         Vector->clear();
     }
 
-    size_t Capacity() const noexcept {
+    size_t Capacity() const noexcept { 
         return Vector->capacity();
     }
 
diff --git a/library/cpp/messagebus/actor/thread_extra.cpp b/library/cpp/messagebus/actor/thread_extra.cpp
index 048480f255..826ae45670 100644
--- a/library/cpp/messagebus/actor/thread_extra.cpp
+++ b/library/cpp/messagebus/actor/thread_extra.cpp
@@ -7,10 +7,10 @@
 
 namespace {
 #ifdef _linux_
-    TString GetExecName() {
-        TString execPath = GetExecPath();
+    TString GetExecName() { 
+        TString execPath = GetExecPath(); 
         size_t lastSlash = execPath.find_last_of('/');
-        if (lastSlash == TString::npos) {
+        if (lastSlash == TString::npos) { 
             return execPath;
         } else {
             return execPath.substr(lastSlash + 1);
diff --git a/library/cpp/messagebus/config/session_config.cpp b/library/cpp/messagebus/config/session_config.cpp
index fbbbb106c9..9b430033f3 100644
--- a/library/cpp/messagebus/config/session_config.cpp
+++ b/library/cpp/messagebus/config/session_config.cpp
@@ -16,7 +16,7 @@ TBusSessionConfig::TBusSessionConfig()
 {
 }
 
-TString TBusSessionConfig::PrintToString() const {
+TString TBusSessionConfig::PrintToString() const { 
     TStringStream ss;
     BUS_SESSION_CONFIG_MAP(STRUCT_FIELD_PRINT, )
     return ss.Str();
@@ -66,7 +66,7 @@ static i64 ParseWithKmgSuffixS(const char* option) {
 }
 
 void TBusSessionConfig::ConfigureLastGetopt(NLastGetopt::TOpts& opts,
-                                            const TString& prefix) {
+                                            const TString& prefix) { 
     opts.AddLongOption(prefix + "total-timeout")
         .RequiredArgument("MILLISECONDS")
         .DefaultValue(ToString(TotalTimeout))
diff --git a/library/cpp/messagebus/config/session_config.h b/library/cpp/messagebus/config/session_config.h
index 84753350a9..2763a125f2 100644
--- a/library/cpp/messagebus/config/session_config.h
+++ b/library/cpp/messagebus/config/session_config.h
@@ -5,7 +5,7 @@
 
 #include <library/cpp/getopt/last_getopt.h>
 
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 
 namespace NBus {
 #define BUS_SESSION_CONFIG_MAP(XX, comma)                                                  \
diff --git a/library/cpp/messagebus/coreconn.h b/library/cpp/messagebus/coreconn.h
index fca228d82e..26e1dab675 100644
--- a/library/cpp/messagebus/coreconn.h
+++ b/library/cpp/messagebus/coreconn.h
@@ -13,7 +13,7 @@
 #include <util/generic/list.h>
 #include <util/generic/map.h>
 #include <util/generic/set.h>
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 #include <util/generic/vector.h>
 #include <util/network/address.h>
 #include <util/network/ip.h>
diff --git a/library/cpp/messagebus/duration_histogram.h b/library/cpp/messagebus/duration_histogram.h
index ed060b0101..6b2f6a9bda 100644
--- a/library/cpp/messagebus/duration_histogram.h
+++ b/library/cpp/messagebus/duration_histogram.h
@@ -2,7 +2,7 @@
 
 #include <util/datetime/base.h>
 #include <util/generic/bitops.h>
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 
 #include <array>
 
@@ -39,7 +39,7 @@ struct TDurationHistogram {
         return *this;
     }
 
-    static TString LabelBefore(unsigned i);
+    static TString LabelBefore(unsigned i); 
 
-    TString PrintToString() const;
+    TString PrintToString() const; 
 };
diff --git a/library/cpp/messagebus/event_loop.cpp b/library/cpp/messagebus/event_loop.cpp
index f685135bed..009b5813a6 100644
--- a/library/cpp/messagebus/event_loop.cpp
+++ b/library/cpp/messagebus/event_loop.cpp
@@ -70,7 +70,7 @@ public:
     TChannelPtr Register(TSocket socket, TEventHandlerPtr eventHandler, void* cookie);
     void Unregister(SOCKET socket);
 
-    typedef THashMap<SOCKET, TChannelPtr> TData;
+    typedef THashMap<SOCKET, TChannelPtr> TData; 
 
     void AddToPoller(SOCKET socket, void* cookie, int flags);
 
diff --git a/library/cpp/messagebus/key_value_printer.cpp b/library/cpp/messagebus/key_value_printer.cpp
index c8592145c7..41c2a19f57 100644
--- a/library/cpp/messagebus/key_value_printer.cpp
+++ b/library/cpp/messagebus/key_value_printer.cpp
@@ -2,7 +2,7 @@
 
 #include <util/stream/format.h>
 
-TKeyValuePrinter::TKeyValuePrinter(const TString& sep)
+TKeyValuePrinter::TKeyValuePrinter(const TString& sep) 
     : Sep(sep)
 {
 }
@@ -10,15 +10,15 @@ TKeyValuePrinter::TKeyValuePrinter(const TString& sep)
 TKeyValuePrinter::~TKeyValuePrinter() {
 }
 
-void TKeyValuePrinter::AddRowImpl(const TString& key, const TString& value, bool alignLeft) {
+void TKeyValuePrinter::AddRowImpl(const TString& key, const TString& value, bool alignLeft) { 
     Keys.push_back(key);
     Values.push_back(value);
     AlignLefts.push_back(alignLeft);
 }
 
-TString TKeyValuePrinter::PrintToString() const {
+TString TKeyValuePrinter::PrintToString() const { 
     if (Keys.empty()) {
-        return TString();
+        return TString(); 
     }
 
     size_t keyWidth = 0;
diff --git a/library/cpp/messagebus/key_value_printer.h b/library/cpp/messagebus/key_value_printer.h
index bca1fde50e..82b63898ce 100644
--- a/library/cpp/messagebus/key_value_printer.h
+++ b/library/cpp/messagebus/key_value_printer.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 #include <util/generic/typetraits.h>
 #include <util/generic/vector.h>
 #include <util/string/cast.h>
 
 class TKeyValuePrinter {
 private:
-    TString Sep;
-    TVector<TString> Keys;
-    TVector<TString> Values;
-    TVector<bool> AlignLefts;
+    TString Sep; 
+    TVector<TString> Keys; 
+    TVector<TString> Values; 
+    TVector<bool> AlignLefts; 
 
 public:
-    TKeyValuePrinter(const TString& sep = TString(": "));
+    TKeyValuePrinter(const TString& sep = TString(": ")); 
     ~TKeyValuePrinter();
 
     template <typename TKey, typename TValue>
@@ -21,8 +21,8 @@ public:
         return AddRowImpl(ToString(key), ToString(value), leftAlign);
     }
 
-    TString PrintToString() const;
+    TString PrintToString() const; 
 
 private:
-    void AddRowImpl(const TString& key, const TString& value, bool leftAlign);
+    void AddRowImpl(const TString& key, const TString& value, bool leftAlign); 
 };
diff --git a/library/cpp/messagebus/lfqueue_batch.h b/library/cpp/messagebus/lfqueue_batch.h
index 8128d3154d..eeb921dc7c 100644
--- a/library/cpp/messagebus/lfqueue_batch.h
+++ b/library/cpp/messagebus/lfqueue_batch.h
@@ -8,7 +8,7 @@
 template <typename T, template <typename, class> class TVectorType = TVector>
 class TLockFreeQueueBatch {
 private:
-    TLockFreeStack<TVectorType<T, std::allocator<T>>*> Stack;
+    TLockFreeStack<TVectorType<T, std::allocator<T>>*> Stack; 
 
 public:
     bool IsEmpty() {
@@ -19,11 +19,11 @@ public:
         Stack.Enqueue(vec.Release());
     }
 
-    void DequeueAllSingleConsumer(TVectorType<T, std::allocator<T>>* r) {
-        TTempTlsVector<TVectorType<T, std::allocator<T>>*> vs;
+    void DequeueAllSingleConsumer(TVectorType<T, std::allocator<T>>* r) { 
+        TTempTlsVector<TVectorType<T, std::allocator<T>>*> vs; 
         Stack.DequeueAllSingleConsumer(vs.GetVector());
 
-        for (typename TVector<TVectorType<T, std::allocator<T>>*>::reverse_iterator i = vs.GetVector()->rbegin();
+        for (typename TVector<TVectorType<T, std::allocator<T>>*>::reverse_iterator i = vs.GetVector()->rbegin(); 
              i != vs.GetVector()->rend(); ++i) {
             if (i == vs.GetVector()->rend()) {
                 r->swap(**i);
diff --git a/library/cpp/messagebus/lfqueue_batch_ut.cpp b/library/cpp/messagebus/lfqueue_batch_ut.cpp
index f80434c0d4..dac7013343 100644
--- a/library/cpp/messagebus/lfqueue_batch_ut.cpp
+++ b/library/cpp/messagebus/lfqueue_batch_ut.cpp
@@ -12,7 +12,7 @@ Y_UNIT_TEST_SUITE(TLockFreeQueueBatch) {
             q.EnqueueAll(v);
         }
 
-        TVector<unsigned> r;
+        TVector<unsigned> r; 
         q.DequeueAllSingleConsumer(&r);
 
         UNIT_ASSERT_VALUES_EQUAL(2u, r.size());
@@ -41,7 +41,7 @@ Y_UNIT_TEST_SUITE(TLockFreeQueueBatch) {
             q.EnqueueAll(v);
         }
 
-        TVector<unsigned> r;
+        TVector<unsigned> r; 
         q.DequeueAllSingleConsumer(&r);
 
         UNIT_ASSERT_VALUES_EQUAL(5u, r.size());
diff --git a/library/cpp/messagebus/local_flags.cpp b/library/cpp/messagebus/local_flags.cpp
index 877e533f76..6725d9b0c0 100644
--- a/library/cpp/messagebus/local_flags.cpp
+++ b/library/cpp/messagebus/local_flags.cpp
@@ -6,7 +6,7 @@
 using namespace NBus;
 using namespace NBus::NPrivate;
 
-TString NBus::NPrivate::LocalFlagSetToString(ui32 flags0) {
+TString NBus::NPrivate::LocalFlagSetToString(ui32 flags0) { 
     if (flags0 == 0) {
         return "0";
     }
diff --git a/library/cpp/messagebus/local_flags.h b/library/cpp/messagebus/local_flags.h
index f589283188..65c113a63f 100644
--- a/library/cpp/messagebus/local_flags.h
+++ b/library/cpp/messagebus/local_flags.h
@@ -2,7 +2,7 @@
 
 #include <library/cpp/deprecated/enum_codegen/enum_codegen.h>
 
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 #include <util/stream/output.h>
 
 namespace NBus {
diff --git a/library/cpp/messagebus/mb_lwtrace.h b/library/cpp/messagebus/mb_lwtrace.h
index e62728b265..597a02e7a6 100644
--- a/library/cpp/messagebus/mb_lwtrace.h
+++ b/library/cpp/messagebus/mb_lwtrace.h
@@ -5,7 +5,7 @@
 #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(Error, GROUPS("MessagebusRare"), TYPES(TString, TString, TString), NAMES("status", "address", "misc")) \ 
     PROBE(ServerUnknownVersion, GROUPS("MessagebusRare"), TYPES(TString, ui32), NAMES("address", "version"))     \
     PROBE(Accepted, GROUPS("MessagebusRare"), TYPES(TString), NAMES("address"))                                  \
     PROBE(Disconnected, GROUPS("MessagebusRare"), TYPES(TString), NAMES("address"))                              \
diff --git a/library/cpp/messagebus/message.h b/library/cpp/messagebus/message.h
index 005ca10c65..dee829a617 100644
--- a/library/cpp/messagebus/message.h
+++ b/library/cpp/messagebus/message.h
@@ -9,7 +9,7 @@
 #include <util/generic/array_ref.h>
 #include <util/generic/noncopyable.h>
 #include <util/generic/ptr.h>
-#include <util/generic/string.h>
+#include <util/generic/string.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 04d9343f6a..c2e31b77ca 100644
--- a/library/cpp/messagebus/message_counter.cpp
+++ b/library/cpp/messagebus/message_counter.cpp
@@ -23,7 +23,7 @@ TMessageCounter& TMessageCounter::operator+=(const TMessageCounter& that) {
     return *this;
 }
 
-TString TMessageCounter::ToString(bool reader) const {
+TString TMessageCounter::ToString(bool reader) const { 
     if (reader) {
         Y_ASSERT(CountCompressionRequests == 0);
     }
diff --git a/library/cpp/messagebus/message_status_counter.cpp b/library/cpp/messagebus/message_status_counter.cpp
index 891c8f5bb2..d76732efca 100644
--- a/library/cpp/messagebus/message_status_counter.cpp
+++ b/library/cpp/messagebus/message_status_counter.cpp
@@ -21,7 +21,7 @@ TMessageStatusCounter& TMessageStatusCounter::operator+=(const TMessageStatusCou
     return *this;
 }
 
-TString TMessageStatusCounter::PrintToString() const {
+TString TMessageStatusCounter::PrintToString() const { 
     TStringStream ss;
     TKeyValuePrinter p;
     bool hasNonZeros = false;
diff --git a/library/cpp/messagebus/message_status_counter.h b/library/cpp/messagebus/message_status_counter.h
index e8ba2fdd31..7288d62455 100644
--- a/library/cpp/messagebus/message_status_counter.h
+++ b/library/cpp/messagebus/message_status_counter.h
@@ -4,7 +4,7 @@
 
 #include <library/cpp/messagebus/monitoring/mon_proto.pb.h>
 
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 
 #include <array>
 
diff --git a/library/cpp/messagebus/messqueue.cpp b/library/cpp/messagebus/messqueue.cpp
index 3474d62705..cc9b53391b 100644
--- a/library/cpp/messagebus/messqueue.cpp
+++ b/library/cpp/messagebus/messqueue.cpp
@@ -36,7 +36,7 @@ TBusMessageQueuePtr NBus::CreateMessageQueue(const char* name) {
 }
 
 namespace {
-    TBusQueueConfig QueueConfigFillDefaults(const TBusQueueConfig& orig, const TString& name) {
+    TBusQueueConfig QueueConfigFillDefaults(const TBusQueueConfig& orig, const TString& name) { 
         TBusQueueConfig patched = orig;
         if (!patched.Name) {
             patched.Name = name;
@@ -85,15 +85,15 @@ TBusMessageQueueStatus TBusMessageQueue::GetStatusRecordInternal() const {
     return r;
 }
 
-TString TBusMessageQueue::GetStatusSelf() const {
+TString TBusMessageQueue::GetStatusSelf() const { 
     return GetStatusRecordInternal().PrintToString();
 }
 
-TString TBusMessageQueue::GetStatusSingleLine() const {
+TString TBusMessageQueue::GetStatusSingleLine() const { 
     return WorkQueue->GetStatusSingleLine();
 }
 
-TString TBusMessageQueue::GetStatus(ui16 flags) const {
+TString TBusMessageQueue::GetStatus(ui16 flags) const { 
     TStringStream ss;
 
     ss << GetStatusSelf();
@@ -193,6 +193,6 @@ void TBusMessageQueue::Schedule(IScheduleItemAutoPtr i) {
     Scheduler.Schedule(i);
 }
 
-TString TBusMessageQueue::GetNameInternal() const {
+TString TBusMessageQueue::GetNameInternal() const { 
     return Config.Name;
 }
diff --git a/library/cpp/messagebus/misc/granup.h b/library/cpp/messagebus/misc/granup.h
index 36ecfebc93..d0bc621276 100644
--- a/library/cpp/messagebus/misc/granup.h
+++ b/library/cpp/messagebus/misc/granup.h
@@ -11,7 +11,7 @@ namespace NBus {
     public:
         TGranUp(TDuration gran)
             : Gran(gran)
-            , Next(TInstant::MicroSeconds(0))
+            , Next(TInstant::MicroSeconds(0)) 
         {
         }
 
diff --git a/library/cpp/messagebus/network.cpp b/library/cpp/messagebus/network.cpp
index 304bedae5a..eb034fc149 100644
--- a/library/cpp/messagebus/network.cpp
+++ b/library/cpp/messagebus/network.cpp
@@ -94,7 +94,7 @@ namespace {
 }
 
 std::pair<unsigned, TVector<TBindResult>> NBus::BindOnPort(int port, bool reusePort) {
-    std::pair<unsigned, TVector<TBindResult>> r;
+    std::pair<unsigned, TVector<TBindResult>> r; 
     r.second.reserve(2);
 
     if (port != 0) {
diff --git a/library/cpp/messagebus/network_ut.cpp b/library/cpp/messagebus/network_ut.cpp
index f1798419db..d7dc830ee0 100644
--- a/library/cpp/messagebus/network_ut.cpp
+++ b/library/cpp/messagebus/network_ut.cpp
@@ -40,7 +40,7 @@ Y_UNIT_TEST_SUITE(Network) {
         TVector<TBindResult> r = BindOnPort(FixedPort, false).second;
         UNIT_ASSERT_VALUES_EQUAL(size_t(2), r.size());
 
-        for (TVector<TBindResult>::iterator i = r.begin(); i != r.end(); ++i) {
+        for (TVector<TBindResult>::iterator i = r.begin(); i != r.end(); ++i) { 
             UNIT_ASSERT_VALUES_EQUAL(i->Addr.GetPort(), GetSockPort(i->Socket->operator SOCKET()));
         }
     }
@@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(Network) {
         TVector<TBindResult> r = BindOnPort(0, false).second;
         UNIT_ASSERT_VALUES_EQUAL(size_t(2), r.size());
 
-        for (TVector<TBindResult>::iterator i = r.begin(); i != r.end(); ++i) {
+        for (TVector<TBindResult>::iterator i = r.begin(); i != r.end(); ++i) { 
             UNIT_ASSERT_VALUES_EQUAL(i->Addr.GetPort(), GetSockPort(i->Socket->operator SOCKET()));
             UNIT_ASSERT(i->Addr.GetPort() > 0);
         }
diff --git a/library/cpp/messagebus/nondestroying_holder.h b/library/cpp/messagebus/nondestroying_holder.h
index f4725d696f..af8d2ac6a3 100644
--- a/library/cpp/messagebus/nondestroying_holder.h
+++ b/library/cpp/messagebus/nondestroying_holder.h
@@ -5,12 +5,12 @@
 template <typename T>
 class TNonDestroyingHolder: public THolder<T> {
 public:
-    TNonDestroyingHolder(T* t = nullptr) noexcept
+    TNonDestroyingHolder(T* t = nullptr) noexcept 
         : THolder<T>(t)
     {
     }
 
-    TNonDestroyingHolder(TAutoPtr<T> t) noexcept
+    TNonDestroyingHolder(TAutoPtr<T> t) noexcept 
         : THolder<T>(t)
     {
     }
@@ -23,17 +23,17 @@ public:
 template <class T>
 class TNonDestroyingAutoPtr: public TAutoPtr<T> {
 public:
-    inline TNonDestroyingAutoPtr(T* t = 0) noexcept
+    inline TNonDestroyingAutoPtr(T* t = 0) noexcept 
         : TAutoPtr<T>(t)
     {
     }
 
-    inline TNonDestroyingAutoPtr(const TAutoPtr<T>& t) noexcept
+    inline TNonDestroyingAutoPtr(const TAutoPtr<T>& t) noexcept 
         : TAutoPtr<T>(t.Release())
     {
     }
 
-    inline ~TNonDestroyingAutoPtr() {
+    inline ~TNonDestroyingAutoPtr() { 
         Y_VERIFY(!*this, "stored object must be explicitly released");
     }
 };
diff --git a/library/cpp/messagebus/oldmodule/module.cpp b/library/cpp/messagebus/oldmodule/module.cpp
index 24bd778799..d29fe9d4a0 100644
--- a/library/cpp/messagebus/oldmodule/module.cpp
+++ b/library/cpp/messagebus/oldmodule/module.cpp
@@ -769,7 +769,7 @@ void TBusModuleImpl::AddJob(TJobRunner* jobRunner) {
 }
 
 void TBusModuleImpl::DestroyJob(TJobRunner* job) {
-    Y_ASSERT(job->JobStorageIterator != TList<TJobRunner*>::iterator());
+    Y_ASSERT(job->JobStorageIterator != TList<TJobRunner*>::iterator()); 
 
     {
         TWhatThreadDoesAcquireGuard<TMutex> G(Lock, "modules: acquiring lock for DestroyJob");
@@ -784,7 +784,7 @@ void TBusModuleImpl::DestroyJob(TJobRunner* job) {
         }
     }
 
-    job->JobStorageIterator = TList<TJobRunner*>::iterator();
+    job->JobStorageIterator = TList<TJobRunner*>::iterator(); 
 }
 
 void TBusModuleImpl::OnMessageReceived(TAutoPtr<TBusMessage> msg0, TOnMessageContext& context) {
diff --git a/library/cpp/messagebus/queue_config.cpp b/library/cpp/messagebus/queue_config.cpp
index 78fb52ee49..d8f7b4eb22 100644
--- a/library/cpp/messagebus/queue_config.cpp
+++ b/library/cpp/messagebus/queue_config.cpp
@@ -15,7 +15,7 @@ void TBusQueueConfig::ConfigureLastGetopt(
         .StoreResult(&NumWorkers);
 }
 
-TString TBusQueueConfig::PrintToString() const {
+TString TBusQueueConfig::PrintToString() const { 
     TStringStream ss;
     ss << "NumWorkers=" << NumWorkers << "\n";
     return ss.Str();
diff --git a/library/cpp/messagebus/rain_check/core/task.cpp b/library/cpp/messagebus/rain_check/core/task.cpp
index a098437d53..eeed343dc9 100644
--- a/library/cpp/messagebus/rain_check/core/task.cpp
+++ b/library/cpp/messagebus/rain_check/core/task.cpp
@@ -207,7 +207,7 @@ ITaskBase* TTaskRunnerBase::CurrentTaskImpl() {
     return CurrentTask()->GetImplBase();
 }
 
-TString TTaskRunnerBase::GetStatusSingleLine() {
+TString TTaskRunnerBase::GetStatusSingleLine() { 
     return TypeName(*Impl);
 }
 
diff --git a/library/cpp/messagebus/rain_check/core/task.h b/library/cpp/messagebus/rain_check/core/task.h
index 7d8778bcda..4e8925966c 100644
--- a/library/cpp/messagebus/rain_check/core/task.h
+++ b/library/cpp/messagebus/rain_check/core/task.h
@@ -144,7 +144,7 @@ namespace NRainCheck {
         bool SetDoneCalled;
 
         // Subtasks currently executed.
-        TVector<TSubtaskCompletion*> Pending;
+        TVector<TSubtaskCompletion*> Pending; 
 
         void Act(NActor::TDefaultTag);
 
@@ -158,7 +158,7 @@ namespace NRainCheck {
         static TTaskRunnerBase* CurrentTask();
         static ITaskBase* CurrentTaskImpl();
 
-        TString GetStatusSingleLine();
+        TString GetStatusSingleLine(); 
 
     protected:
         //void RetainRef();
diff --git a/library/cpp/messagebus/rain_check/core/track.cpp b/library/cpp/messagebus/rain_check/core/track.cpp
index 092a51a214..b2efe796b0 100644
--- a/library/cpp/messagebus/rain_check/core/track.cpp
+++ b/library/cpp/messagebus/rain_check/core/track.cpp
@@ -7,7 +7,7 @@ void TTaskTrackerReceipt::SetDone() {
     TaskTracker->GetQueue<TTaskTrackerReceipt*>()->EnqueueAndSchedule(this);
 }
 
-TString TTaskTrackerReceipt::GetStatusSingleLine() {
+TString TTaskTrackerReceipt::GetStatusSingleLine() { 
     return Task->GetStatusSingleLine();
 }
 
diff --git a/library/cpp/messagebus/rain_check/core/track.h b/library/cpp/messagebus/rain_check/core/track.h
index d387de7574..77ca882679 100644
--- a/library/cpp/messagebus/rain_check/core/track.h
+++ b/library/cpp/messagebus/rain_check/core/track.h
@@ -31,7 +31,7 @@ namespace NRainCheck {
 
             void SetDone() override;
 
-            TString GetStatusSingleLine();
+            TString GetStatusSingleLine(); 
         };
 
         struct TTaskTrackerStatus {
diff --git a/library/cpp/messagebus/rain_check/http/client.h b/library/cpp/messagebus/rain_check/http/client.h
index d4199c4c98..5daa4aec63 100644
--- a/library/cpp/messagebus/rain_check/http/client.h
+++ b/library/cpp/messagebus/rain_check/http/client.h
@@ -6,7 +6,7 @@
 
 #include <util/generic/maybe.h>
 #include <util/generic/ptr.h>
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 #include <util/system/defaults.h>
 #include <util/system/yassert.h>
 
diff --git a/library/cpp/messagebus/rain_check/http/client_ut.cpp b/library/cpp/messagebus/rain_check/http/client_ut.cpp
index 1628114391..0dc01ef18a 100644
--- a/library/cpp/messagebus/rain_check/http/client_ut.cpp
+++ b/library/cpp/messagebus/rain_check/http/client_ut.cpp
@@ -13,7 +13,7 @@
 #include <util/generic/cast.h>
 #include <util/generic/ptr.h>
 #include <util/generic/strbuf.h>
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 #include <util/generic/vector.h>
 #include <util/network/ip.h>
 #include <util/stream/str.h>
diff --git a/library/cpp/messagebus/remote_client_session.cpp b/library/cpp/messagebus/remote_client_session.cpp
index 3bc421944f..da6a2b3b09 100644
--- a/library/cpp/messagebus/remote_client_session.cpp
+++ b/library/cpp/messagebus/remote_client_session.cpp
@@ -60,7 +60,7 @@ EMessageStatus TRemoteClientSession::SendMessageOneWay(TBusMessage* pMes, const
     return SendMessageImpl(pMes, addr, wait, true);
 }
 
-int TRemoteClientSession::GetInFlight() const noexcept {
+int TRemoteClientSession::GetInFlight() const noexcept { 
     return ClientRemoteInFlight.GetCurrent();
 }
 
diff --git a/library/cpp/messagebus/remote_connection_status.cpp b/library/cpp/messagebus/remote_connection_status.cpp
index 2c48b2a287..7fc4291573 100644
--- a/library/cpp/messagebus/remote_connection_status.cpp
+++ b/library/cpp/messagebus/remote_connection_status.cpp
@@ -47,7 +47,7 @@ TDurationCounter& TDurationCounter::operator+=(const TDurationCounter& that) {
     return *this;
 }
 
-TString TDurationCounter::ToString() const {
+TString TDurationCounter::ToString() const { 
     if (Count == 0) {
         return "0";
     } else {
@@ -154,7 +154,7 @@ TConnectionStatusMonRecord TRemoteConnectionStatus::GetStatusProtobuf() const {
     return status;
 }
 
-TString TRemoteConnectionStatus::PrintToString() const {
+TString TRemoteConnectionStatus::PrintToString() const { 
     TStringStream ss;
 
     TKeyValuePrinter p;
@@ -231,7 +231,7 @@ TRemoteConnectionStatus::TRemoteConnectionStatus()
 {
 }
 
-TString TSessionDumpStatus::PrintToString() const {
+TString TSessionDumpStatus::PrintToString() const { 
     if (Shutdown) {
         return "shutdown";
     }
diff --git a/library/cpp/messagebus/remote_server_session.cpp b/library/cpp/messagebus/remote_server_session.cpp
index 6abbf88a60..66deb7de31 100644
--- a/library/cpp/messagebus/remote_server_session.cpp
+++ b/library/cpp/messagebus/remote_server_session.cpp
@@ -130,7 +130,7 @@ EMessageStatus TRemoteServerSession::SendReply(const TBusIdentity& ident, TBusMe
     return MESSAGE_OK;
 }
 
-int TRemoteServerSession::GetInFlight() const noexcept {
+int TRemoteServerSession::GetInFlight() const noexcept { 
     return ServerOwnedMessages.GetCurrentCount();
 }
 
diff --git a/library/cpp/messagebus/session.h b/library/cpp/messagebus/session.h
index fb12ab7c22..f9340a380b 100644
--- a/library/cpp/messagebus/session.h
+++ b/library/cpp/messagebus/session.h
@@ -126,7 +126,7 @@ namespace NBus {
             IBusServerHandler* handler,
             const TBusServerSessionConfig& config,
             TBusMessageQueuePtr queue,
-            const TVector<TBindResult>& bindTo);
+            const TVector<TBindResult>& bindTo); 
 
         // TODO: make parameter non-const
         virtual EMessageStatus SendReply(const TBusIdentity& ident, TBusMessage* pRep) = 0;
diff --git a/library/cpp/messagebus/session_impl.cpp b/library/cpp/messagebus/session_impl.cpp
index ddf9f360c4..809e1c170f 100644
--- a/library/cpp/messagebus/session_impl.cpp
+++ b/library/cpp/messagebus/session_impl.cpp
@@ -52,7 +52,7 @@ struct TBusSessionImpl::TImpl {
 };
 
 namespace {
-    TBusSessionConfig SessionConfigFillDefaults(const TBusSessionConfig& config, const TString& name) {
+    TBusSessionConfig SessionConfigFillDefaults(const TBusSessionConfig& config, const TString& name) { 
         TBusSessionConfig copy = config;
         if (copy.TotalTimeout == 0 && copy.SendTimeout == 0) {
             copy.TotalTimeout = TDuration::Seconds(60).MilliSeconds();
@@ -154,7 +154,7 @@ void TBusSessionImpl::Shutdown() {
 
     // shutdown acceptors before connections
     // so they won't create more connections
-    TVector<TAcceptorPtr> acceptors;
+    TVector<TAcceptorPtr> acceptors; 
     GetAcceptors(&acceptors);
     {
         TGuard<TMutex> guard(ConnectionsLock);
@@ -166,7 +166,7 @@ void TBusSessionImpl::Shutdown() {
     }
 
     // shutdown connections
-    TVector<TRemoteConnectionPtr> cs;
+    TVector<TRemoteConnectionPtr> cs; 
     GetConnections(&cs);
 
     for (auto& c : cs) {
@@ -241,7 +241,7 @@ TSessionDumpStatus TBusSessionImpl::GetStatusRecordInternal() {
     return StatusData.StatusDumpCached;
 }
 
-TString TBusSessionImpl::GetStatus(ui16 flags) {
+TString TBusSessionImpl::GetStatus(ui16 flags) { 
     Y_UNUSED(flags);
 
     return GetStatusRecordInternal().PrintToString();
@@ -256,7 +256,7 @@ TConnectionStatusMonRecord TBusSessionImpl::GetStatusProtobuf() {
     return StatusData.StatusDumpCached.ConnectionStatusSummary.GetStatusProtobuf();
 }
 
-TString TBusSessionImpl::GetStatusSingleLine() {
+TString TBusSessionImpl::GetStatusSingleLine() { 
     TSessionDumpStatus status = GetStatusRecordInternal();
 
     TStringStream ss;
@@ -308,7 +308,7 @@ void TBusSessionImpl::ProcessItem(TConnectionTag, TRemoveTag, TRemoteConnectionP
         }
     }
 
-    THashMap<ui64, TRemoteConnectionPtr>::iterator it2 = ConnectionsById.find(c->ConnectionId);
+    THashMap<ui64, TRemoteConnectionPtr>::iterator it2 = ConnectionsById.find(c->ConnectionId); 
     if (it2 != ConnectionsById.end()) {
         ConnectionsById.erase(it2);
     }
@@ -317,12 +317,12 @@ void TBusSessionImpl::ProcessItem(TConnectionTag, TRemoveTag, TRemoteConnectionP
 }
 
 void TBusSessionImpl::ProcessConnectionsAcceptorsShapshotQueueItem(TAtomicSharedPtr<TConnectionsAcceptorsSnapshot> snapshot) {
-    for (TVector<TRemoteConnectionPtr>::const_iterator connection = snapshot->Connections.begin();
+    for (TVector<TRemoteConnectionPtr>::const_iterator connection = snapshot->Connections.begin(); 
          connection != snapshot->Connections.end(); ++connection) {
         Y_ASSERT((*connection)->ConnectionId <= snapshot->LastConnectionId);
     }
 
-    for (TVector<TAcceptorPtr>::const_iterator acceptor = snapshot->Acceptors.begin();
+    for (TVector<TAcceptorPtr>::const_iterator acceptor = snapshot->Acceptors.begin(); 
          acceptor != snapshot->Acceptors.end(); ++acceptor) {
         Y_ASSERT((*acceptor)->AcceptorId <= snapshot->LastAcceptorId);
     }
@@ -355,7 +355,7 @@ void TBusSessionImpl::StatusUpdateCachedDump() {
     {
         TStringStream ss;
 
-        TString name = Config.Name;
+        TString name = Config.Name; 
         if (!name) {
             name = "unnamed";
         }
@@ -373,8 +373,8 @@ void TBusSessionImpl::StatusUpdateCachedDump() {
         r.Head = ss.Str();
     }
 
-    TVector<TRemoteConnectionPtr>& connections = StatusData.ConnectionsAcceptorsSnapshot->Connections;
-    TVector<TAcceptorPtr>& acceptors = StatusData.ConnectionsAcceptorsSnapshot->Acceptors;
+    TVector<TRemoteConnectionPtr>& connections = StatusData.ConnectionsAcceptorsSnapshot->Connections; 
+    TVector<TAcceptorPtr>& acceptors = StatusData.ConnectionsAcceptorsSnapshot->Acceptors; 
 
     r.ConnectionStatusSummary = TRemoteConnectionStatus();
     r.ConnectionStatusSummary.Summary = true;
@@ -387,7 +387,7 @@ void TBusSessionImpl::StatusUpdateCachedDump() {
     {
         TStringStream ss;
 
-        for (TVector<TAcceptorPtr>::const_iterator acceptor = acceptors.begin();
+        for (TVector<TAcceptorPtr>::const_iterator acceptor = acceptors.begin(); 
              acceptor != acceptors.end(); ++acceptor) {
             const TAcceptorStatus status = (*acceptor)->GranStatus.Listen.Get();
 
@@ -405,7 +405,7 @@ void TBusSessionImpl::StatusUpdateCachedDump() {
     {
         TStringStream ss;
 
-        for (TVector<TRemoteConnectionPtr>::const_iterator connection = connections.begin();
+        for (TVector<TRemoteConnectionPtr>::const_iterator connection = connections.begin(); 
              connection != connections.end(); ++connection) {
             if (connection != connections.begin()) {
                 ss << "\n";
@@ -544,17 +544,17 @@ void TBusSessionImpl::InsertAcceptorLockAcquired(TAcceptor* acceptor) {
     SendSnapshotToStatusActor();
 }
 
-void TBusSessionImpl::GetConnections(TVector<TRemoteConnectionPtr>* r) {
+void TBusSessionImpl::GetConnections(TVector<TRemoteConnectionPtr>* r) { 
     TConnectionsGuard guard(ConnectionsLock);
     GetConnectionsLockAquired(r);
 }
 
-void TBusSessionImpl::GetAcceptors(TVector<TAcceptorPtr>* r) {
+void TBusSessionImpl::GetAcceptors(TVector<TAcceptorPtr>* r) { 
     TConnectionsGuard guard(ConnectionsLock);
     GetAcceptorsLockAquired(r);
 }
 
-void TBusSessionImpl::GetConnectionsLockAquired(TVector<TRemoteConnectionPtr>* r) {
+void TBusSessionImpl::GetConnectionsLockAquired(TVector<TRemoteConnectionPtr>* r) { 
     //Y_ASSERT(ConnectionsLock.IsLocked());
 
     r->reserve(Connections.size());
@@ -564,7 +564,7 @@ void TBusSessionImpl::GetConnectionsLockAquired(TVector<TRemoteConnectionPtr>* r
     }
 }
 
-void TBusSessionImpl::GetAcceptorsLockAquired(TVector<TAcceptorPtr>* r) {
+void TBusSessionImpl::GetAcceptorsLockAquired(TVector<TAcceptorPtr>* r) { 
     //Y_ASSERT(ConnectionsLock.IsLocked());
 
     r->reserve(Acceptors.size());
@@ -577,7 +577,7 @@ void TBusSessionImpl::GetAcceptorsLockAquired(TVector<TAcceptorPtr>* r) {
 TRemoteConnectionPtr TBusSessionImpl::GetConnectionById(ui64 id) {
     TConnectionsGuard guard(ConnectionsLock);
 
-    THashMap<ui64, TRemoteConnectionPtr>::const_iterator it = ConnectionsById.find(id);
+    THashMap<ui64, TRemoteConnectionPtr>::const_iterator it = ConnectionsById.find(id); 
     if (it == ConnectionsById.end()) {
         return nullptr;
     } else {
@@ -623,7 +623,7 @@ TRemoteConnectionPtr TBusSessionImpl::GetConnection(const TBusSocketAddr& addr,
 }
 
 void TBusSessionImpl::Cron() {
-    TVector<TRemoteConnectionPtr> connections;
+    TVector<TRemoteConnectionPtr> connections; 
     GetConnections(&connections);
 
     for (const auto& it : connections) {
@@ -642,7 +642,7 @@ void TBusSessionImpl::Cron() {
     Queue->Schedule(IScheduleItemAutoPtr(new TScheduleSession(this, TInstant::Now() + Config.Secret.TimeoutPeriod)));
 }
 
-TString TBusSessionImpl::GetNameInternal() {
+TString TBusSessionImpl::GetNameInternal() { 
     if (!!Config.Name) {
         return Config.Name;
     }
diff --git a/library/cpp/messagebus/socket_addr_ut.cpp b/library/cpp/messagebus/socket_addr_ut.cpp
index 783bb62a86..0b6a19efa1 100644
--- a/library/cpp/messagebus/socket_addr_ut.cpp
+++ b/library/cpp/messagebus/socket_addr_ut.cpp
@@ -10,6 +10,6 @@ using namespace NBus::NPrivate;
 
 Y_UNIT_TEST_SUITE(TBusSocketAddr) {
     Y_UNIT_TEST(Simple) {
-        UNIT_ASSERT_VALUES_EQUAL(TString("127.0.0.1:80"), ToString(TBusSocketAddr("127.0.0.1", 80)));
+        UNIT_ASSERT_VALUES_EQUAL(TString("127.0.0.1:80"), ToString(TBusSocketAddr("127.0.0.1", 80))); 
     }
 }
diff --git a/library/cpp/messagebus/synchandler.cpp b/library/cpp/messagebus/synchandler.cpp
index 8e891d66b3..ae69523ed9 100644
--- a/library/cpp/messagebus/synchandler.cpp
+++ b/library/cpp/messagebus/synchandler.cpp
@@ -186,7 +186,7 @@ const TBusClientSession* TBusSyncSourceSession::GetBusClientSessionWorkaroundDoN
     return Session.Get();
 }
 
-TBusSyncClientSessionPtr TBusMessageQueue::CreateSyncSource(TBusProtocol* proto, const TBusClientSessionConfig& config, bool needReply, const TString& name) {
+TBusSyncClientSessionPtr TBusMessageQueue::CreateSyncSource(TBusProtocol* proto, const TBusClientSessionConfig& config, bool needReply, const TString& name) { 
     TIntrusivePtr<TBusSyncSourceSessionImpl> session = new TBusSyncSourceSessionImpl(this, proto, config, needReply, name);
     Add(session.Get());
     return new TBusSyncSourceSession(session);
diff --git a/library/cpp/messagebus/test/helper/example.cpp b/library/cpp/messagebus/test/helper/example.cpp
index 7c6d704042..f5b21be799 100644
--- a/library/cpp/messagebus/test/helper/example.cpp
+++ b/library/cpp/messagebus/test/helper/example.cpp
@@ -19,12 +19,12 @@ static void FillWithJunk(TArrayRef<char> data) {
     }
 }
 
-static TString JunkString(size_t len) {
+static TString JunkString(size_t len) { 
     TTempBuf temp(len);
     TArrayRef<char> tempArrayRef(temp.Data(), len);
     FillWithJunk(tempArrayRef);
 
-    return TString(tempArrayRef.data(), tempArrayRef.size());
+    return TString(tempArrayRef.data(), tempArrayRef.size()); 
 }
 
 TExampleRequest::TExampleRequest(TAtomic* counterPtr, size_t payloadSize)
diff --git a/library/cpp/messagebus/test/helper/hanging_server.h b/library/cpp/messagebus/test/helper/hanging_server.h
index cc9fb274d8..f6b9af24e2 100644
--- a/library/cpp/messagebus/test/helper/hanging_server.h
+++ b/library/cpp/messagebus/test/helper/hanging_server.h
@@ -6,7 +6,7 @@
 
 class THangingServer {
 private:
-    std::pair<unsigned, TVector<NBus::TBindResult>> BindResult;
+    std::pair<unsigned, TVector<NBus::TBindResult>> BindResult; 
 
 public:
     // listen on given port, and nothing else
diff --git a/library/cpp/messagebus/test/perftest/perftest.cpp b/library/cpp/messagebus/test/perftest/perftest.cpp
index 8489319278..dd2dd69e4d 100644
--- a/library/cpp/messagebus/test/perftest/perftest.cpp
+++ b/library/cpp/messagebus/test/perftest/perftest.cpp
@@ -17,7 +17,7 @@
 #include <library/cpp/threading/future/legacy_future.h>
 
 #include <util/generic/ptr.h>
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 #include <util/generic/vector.h>
 #include <util/generic/yexception.h>
 #include <util/random/random.h>
@@ -76,7 +76,7 @@ struct TPerftestConfig {
 extern TPerftestConfig* TheConfig;
 extern bool TheExit;
 
-TVector<TNetAddr> ServerAddresses;
+TVector<TNetAddr> ServerAddresses; 
 
 struct TConfig {
     TBusQueueConfig ServerQueueConfig;
@@ -142,13 +142,13 @@ TAutoPtr<TBusMessage> NewRequest() {
         TAutoPtr<TPerftestRequest> r(new TPerftestRequest);
         r->SetCompressed(TheConfig->UseCompression);
         // TODO: use random content for better compression test
-        r->Record.SetData(TString(RequestSize(), '?'));
+        r->Record.SetData(TString(RequestSize(), '?')); 
         return r.Release();
     }
 }
 
 void CheckRequest(TPerftestRequest* request) {
-    const TString& data = request->Record.GetData();
+    const TString& data = request->Record.GetData(); 
     for (size_t i = 0; i != data.size(); ++i) {
         Y_VERIFY(data.at(i) == '?', "must be question mark");
     }
@@ -162,7 +162,7 @@ TAutoPtr<TPerftestResponse> NewResponse(TPerftestRequest* request) {
 }
 
 void CheckResponse(TPerftestResponse* response) {
-    const TString& data = response->Record.GetData();
+    const TString& data = response->Record.GetData(); 
     for (size_t i = 0; i != data.size(); ++i) {
         Y_VERIFY(data.at(i) == '.', "must be dot");
     }
@@ -237,7 +237,7 @@ public:
     TBusClientSessionPtr Session;
     THolder<TBusProtocol> Proto;
     TBusMessageQueuePtr Bus;
-    TVector<TBusClientConnectionPtr> Connections;
+    TVector<TBusClientConnectionPtr> Connections; 
 
 public:
     /// constructor creates instances of protocol and session
@@ -470,10 +470,10 @@ static TNetworkAddress ParseNetworkAddress(const char* string) {
     return TNetworkAddress(Name, Port);
 }
 
-TVector<TNetAddr> ParseNodes(const TString nodes) {
-    TVector<TNetAddr> r;
+TVector<TNetAddr> ParseNodes(const TString nodes) { 
+    TVector<TNetAddr> r; 
 
-    TVector<TString> hosts;
+    TVector<TString> hosts; 
 
     size_t numh = Split(nodes.data(), ",", hosts);
 
@@ -583,7 +583,7 @@ void TTestStats::PeriodicallyPrint() {
             stats << IndentText(client->Bus->GetStatus());
         }
 
-        TUnbufferedFileOutput("stats").Write(stats.Str());
+        TUnbufferedFileOutput("stats").Write(stats.Str()); 
     }
 }
 
diff --git a/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp b/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
index 3fdd175d73..a930e26dcd 100644
--- a/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
+++ b/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
@@ -31,7 +31,7 @@ void TLocatorRegisterUniqTest::TestRegister() {
     /// YBUS_KEYMIN YBUS_KEYMAX range
     UNIT_ASSERT(keys.size() == 1);
 
-    TVector<NBus::TNetAddr> hosts;
+    TVector<NBus::TNetAddr> hosts; 
     UNIT_ASSERT(locator.LocateAll(serviceName, NBus::YBUS_KEYMIN, hosts) == 1);
 
     locator.Register(serviceName, hostName, port);
diff --git a/library/cpp/messagebus/test/ut/messagebus_ut.cpp b/library/cpp/messagebus/test/ut/messagebus_ut.cpp
index 040f9b7702..5bae0e7bb9 100644
--- a/library/cpp/messagebus/test/ut/messagebus_ut.cpp
+++ b/library/cpp/messagebus/test/ut/messagebus_ut.cpp
@@ -311,7 +311,7 @@ Y_UNIT_TEST_SUITE(TMessageBusTests) {
         TSystemEvent MessageReceivedEvent; // 1 wait for 1 message
         TBusServerSessionPtr Session;
         TMutex Lock_;
-        TDeque<TAutoPtr<TOnMessageContext>> DelayedMessages;
+        TDeque<TAutoPtr<TOnMessageContext>> DelayedMessages; 
 
         TDelayReplyServer()
             : MessageReceivedEvent(TEventResetType::rAuto)
diff --git a/library/cpp/messagebus/www/concat_strings.h b/library/cpp/messagebus/www/concat_strings.h
index 7b730564eb..86f6609c1d 100644
--- a/library/cpp/messagebus/www/concat_strings.h
+++ b/library/cpp/messagebus/www/concat_strings.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 #include <util/stream/str.h>
 
-// ATTN: not equivalent to TString::Join - cat concat anything "outputable" to stream, not only TString convertable types.
+// ATTN: not equivalent to TString::Join - cat concat anything "outputable" to stream, not only TString convertable types. 
 
 inline void DoConcatStrings(TStringStream&) {
 }
@@ -15,7 +15,7 @@ inline void DoConcatStrings(TStringStream& ss, const T& t, const R&... r) {
 }
 
 template <class... R>
-inline TString ConcatStrings(const R&... r) {
+inline TString ConcatStrings(const R&... r) { 
     TStringStream ss;
     DoConcatStrings(ss, r...);
     return ss.Str();
diff --git a/library/cpp/messagebus/www/html_output.h b/library/cpp/messagebus/www/html_output.h
index 27e77adefa..551f0ba693 100644
--- a/library/cpp/messagebus/www/html_output.h
+++ b/library/cpp/messagebus/www/html_output.h
@@ -29,7 +29,7 @@ struct THtmlOutputStreamPushPop {
 };
 
 struct TChars {
-    TString Text;
+    TString Text; 
     bool NeedEscape;
 
     TChars(TStringBuf text)
@@ -53,7 +53,7 @@ struct TChars {
     {
     }
 
-    TString Escape() {
+    TString Escape() { 
         if (NeedEscape) {
             return EncodeHtmlPcdata(Text);
         } else {
@@ -63,8 +63,8 @@ struct TChars {
 };
 
 struct TAttr {
-    TString Name;
-    TString Value;
+    TString Name; 
+    TString Value; 
 
     TAttr(TStringBuf name, TStringBuf value)
         : Name(name)
@@ -157,7 +157,7 @@ static inline void Small(TStringBuf text) {
 }
 
 static inline void HnWithSmall(unsigned n, TStringBuf title, TStringBuf small) {
-    TString tagName = ConcatStrings("h", n);
+    TString tagName = ConcatStrings("h", n); 
     Open(tagName);
     HtmlOutputStream() << title;
     Sp();
@@ -268,7 +268,7 @@ static inline void Code(TStringBuf content) {
 }
 
 struct TTagGuard {
-    const TString TagName;
+    const TString TagName; 
 
     TTagGuard(TStringBuf tagName, TStringBuf cssClass, TStringBuf id = "")
         : TagName(tagName)
diff --git a/library/cpp/messagebus/www/www.cpp b/library/cpp/messagebus/www/www.cpp
index 62ec241d85..a285a6367a 100644
--- a/library/cpp/messagebus/www/www.cpp
+++ b/library/cpp/messagebus/www/www.cpp
@@ -48,7 +48,7 @@ namespace {
             return TValuePtr();
         }
 
-        TString FindNameByPtr(TValuePtr value) {
+        TString FindNameByPtr(TValuePtr value) { 
             Y_VERIFY(!!value);
 
             for (unsigned i = 0; i < Entries.size(); ++i) {
@@ -80,11 +80,11 @@ namespace {
             }
 
             for (unsigned i = 1;; ++i) {
-                TString prefix = p->GetNameInternal();
+                TString prefix = p->GetNameInternal(); 
                 if (!prefix) {
                     prefix = "unnamed";
                 }
-                TString name = ConcatStrings(prefix, "-", i);
+                TString name = ConcatStrings(prefix, "-", i); 
 
                 TValuePtr current = FindByName(name);
 
@@ -108,8 +108,8 @@ namespace {
     struct TSessionValues: public TNamedValues<TSessionPtr> {
         typedef TNamedValues<TSessionPtr> TBase;
 
-        TVector<TString> GetNamesForQueue(TBusMessageQueue* queue) {
-            TVector<TString> r;
+        TVector<TString> GetNamesForQueue(TBusMessageQueue* queue) { 
+            TVector<TString> r; 
             for (unsigned i = 0; i < TBase::size(); ++i) {
                 if (TBase::Entries[i].second->GetQueue() == queue) {
                     r.push_back(TBase::Entries[i].first);
@@ -211,14 +211,14 @@ struct TBusWww::TImpl {
         TGuard<TMutex> g(Mutex);
 
         {
-            TVector<TBusClientSessionPtr> clientSessions = module->GetInternal()->GetClientSessionsInternal();
+            TVector<TBusClientSessionPtr> clientSessions = module->GetInternal()->GetClientSessionsInternal(); 
             for (unsigned i = 0; i < clientSessions.size(); ++i) {
                 RegisterClientSession(clientSessions[i]);
             }
         }
 
         {
-            TVector<TBusServerSessionPtr> serverSessions = module->GetInternal()->GetServerSessionsInternal();
+            TVector<TBusServerSessionPtr> serverSessions = module->GetInternal()->GetServerSessionsInternal(); 
             for (unsigned i = 0; i < serverSessions.size(); ++i) {
                 RegisterServerSession(serverSessions[i]);
             }
@@ -228,7 +228,7 @@ struct TBusWww::TImpl {
         Modules.Add(module->GetInternal());
     }
 
-    TString FindQueueNameBySessionName(TStringBuf sessionName, bool client) {
+    TString FindQueueNameBySessionName(TStringBuf sessionName, bool client) { 
         TIntrusivePtr<TBusClientSession> clientSession;
         TIntrusivePtr<TBusServerSession> serverSession;
         TBusSession* session;
@@ -288,7 +288,7 @@ struct TBusWww::TImpl {
         }
 
         void BreadcrumbSession(TStringBuf sessionName, bool client) {
-            TString queueName = Outer->FindQueueNameBySessionName(sessionName, client);
+            TString queueName = Outer->FindQueueNameBySessionName(sessionName, client); 
             TStringBuf whatSession = client ? "client session" : "server session";
 
             TTagGuard ol("ol", "breadcrumb");
@@ -299,9 +299,9 @@ struct TBusWww::TImpl {
         }
 
         void ServeSessionsOfQueue(TBusMessageQueuePtr queue, bool includeQueue) {
-            TVector<TString> clientNames = Outer->ClientSessions.GetNamesForQueue(queue.Get());
-            TVector<TString> serverNames = Outer->ServerSessions.GetNamesForQueue(queue.Get());
-            TVector<TString> moduleNames = Outer->Modules.GetNamesForQueue(queue.Get());
+            TVector<TString> clientNames = Outer->ClientSessions.GetNamesForQueue(queue.Get()); 
+            TVector<TString> serverNames = Outer->ServerSessions.GetNamesForQueue(queue.Get()); 
+            TVector<TString> moduleNames = Outer->Modules.GetNamesForQueue(queue.Get()); 
 
             TTagGuard table("table", "table table-condensed table-bordered");
 
@@ -320,7 +320,7 @@ struct TBusWww::TImpl {
             }
 
             if (includeQueue) {
-                TTagGuard tr1("tr");
+                TTagGuard tr1("tr"); 
                 Td("queue");
 
                 {
@@ -329,7 +329,7 @@ struct TBusWww::TImpl {
                 }
 
                 {
-                    TTagGuard tr2("td");
+                    TTagGuard tr2("td"); 
                     Pre(queue->GetStatusSingleLine());
                 }
             }
@@ -385,7 +385,7 @@ struct TBusWww::TImpl {
             }
         }
 
-        void ServeQueue(const TString& name) {
+        void ServeQueue(const TString& name) { 
             TBusMessageQueuePtr queue = Outer->Queues.FindByName(name);
 
             if (!queue) {
@@ -518,7 +518,7 @@ struct TBusWww::TImpl {
             TSessionDumpStatus dumpStatus = session->GetStatusRecordInternal();
 
             TBusMessageQueuePtr queue = session->GetQueue();
-            TString queueName = Outer->Queues.FindNameByPtr(session->GetQueue());
+            TString queueName = Outer->Queues.FindNameByPtr(session->GetQueue()); 
 
             BreadcrumbSession(name, client);
 
@@ -585,7 +585,7 @@ struct TBusWww::TImpl {
                     NJsonWriter::TBuf buf(NJsonWriter::HEM_ESCAPE_HTML);
                     buf.BeginList();
                     for (unsigned i = 0; i < h.Times.size(); ++i) {
-                        TString label = TDurationHistogram::LabelBefore(i);
+                        TString label = TDurationHistogram::LabelBefore(i); 
                         buf.BeginList();
                         buf.WriteString(label);
                         buf.WriteLongLong(h.Times[i]);
@@ -612,7 +612,7 @@ struct TBusWww::TImpl {
             H1("MessageBus queues");
 
             for (unsigned i = 0; i < Outer->Queues.size(); ++i) {
-                TString queueName = Outer->Queues.Entries[i].first;
+                TString queueName = Outer->Queues.Entries[i].first; 
                 TBusMessageQueuePtr queue = Outer->Queues.Entries[i].second;
 
                 HnWithSmall(3, queueName, "(queue)");
@@ -680,7 +680,7 @@ struct TBusWww::TImpl {
                                        status.ConnectionStatusSummary.ReaderStatus.Incremental.MessageCounter);
         }
 
-        void ServeSolomonJson(const TString& q, const TString& cs, const TString& ss) {
+        void ServeSolomonJson(const TString& q, const TString& cs, const TString& ss) { 
             Y_UNUSED(q);
             Y_UNUSED(cs);
             Y_UNUSED(ss);
@@ -692,15 +692,15 @@ struct TBusWww::TImpl {
             sj.OpenMetrics();
 
             for (unsigned i = 0; i < Outer->Queues.size(); ++i) {
-                TString queueName = Outer->Queues.Entries[i].first;
+                TString queueName = Outer->Queues.Entries[i].first; 
                 TBusMessageQueuePtr queue = Outer->Queues.Entries[i].second;
                 if (all || q == queueName) {
                     WriteQueueSensors(sj, queueName, &*queue);
                 }
 
-                TVector<TString> clientNames = Outer->ClientSessions.GetNamesForQueue(queue.Get());
-                TVector<TString> serverNames = Outer->ServerSessions.GetNamesForQueue(queue.Get());
-                TVector<TString> moduleNames = Outer->Modules.GetNamesForQueue(queue.Get());
+                TVector<TString> clientNames = Outer->ClientSessions.GetNamesForQueue(queue.Get()); 
+                TVector<TString> serverNames = Outer->ServerSessions.GetNamesForQueue(queue.Get()); 
+                TVector<TString> moduleNames = Outer->Modules.GetNamesForQueue(queue.Get()); 
                 for (auto& sessionName : clientNames) {
                     if (all || cs == sessionName) {
                         auto session = Outer->ClientSessions.FindByName(sessionName);
@@ -728,7 +728,7 @@ struct TBusWww::TImpl {
             } else {
                 os << HTTP_OK_BIN;
             }
-            TBlob blob = Singleton<TWwwStaticLoader>()->ObjectBlobByKey(TString("/") + TString(path));
+            TBlob blob = Singleton<TWwwStaticLoader>()->ObjectBlobByKey(TString("/") + TString(path)); 
             os.Write(blob.Data(), blob.Size());
         }
 
@@ -766,9 +766,9 @@ struct TBusWww::TImpl {
             if (solomonJson) {
                 Os << HTTP_OK_JSON;
 
-                TString qp = q != CgiParams.end() ? q->first : "";
-                TString csp = cs != CgiParams.end() ? cs->first : "";
-                TString ssp = ss != CgiParams.end() ? ss->first : "";
+                TString qp = q != CgiParams.end() ? q->first : ""; 
+                TString csp = cs != CgiParams.end() ? cs->first : ""; 
+                TString ssp = ss != CgiParams.end() ? ss->first : ""; 
                 ServeSolomonJson(qp, csp, ssp);
             } else {
                 Os << HTTP_OK_HTML;
@@ -870,7 +870,7 @@ struct TBusWwwHttpServer::TImpl: public THttpServer::ICallBack {
         }
     };
 
-    TString MakeSimpleResponse(unsigned code, TString text, TString content = "") {
+    TString MakeSimpleResponse(unsigned code, TString text, TString content = "") { 
         if (!content) {
             TStringStream contentSs;
             contentSs << code << " " << text;
diff --git a/library/cpp/messagebus/www/www.h b/library/cpp/messagebus/www/www.h
index 6cd652b477..7180b5b692 100644
--- a/library/cpp/messagebus/www/www.h
+++ b/library/cpp/messagebus/www/www.h
@@ -4,7 +4,7 @@
 #include <library/cpp/messagebus/oldmodule/module.h>
 
 #include <util/generic/ptr.h>
-#include <util/generic/string.h>
+#include <util/generic/string.h> 
 #include <library/cpp/cgiparam/cgiparam.h>
 
 namespace NBus {