Restoring authorship annotation for Ilnur Khuziev <ilnur.khuziev@yandex.ru>. Commit 1 of 2.

author: Ilnur Khuziev <ilnur.khuziev@yandex.ru> 2022-02-10 16:46:13 +0300
committer: Daniil Cherednik <dcherednik@yandex-team.ru> 2022-02-10 16:46:13 +0300
commit: 736dcd8ca259457a136f2f9f9168c44643914323 (patch)
tree: ddd46a036d68bfa83aa11b892f31243ea6b068a1 /library/cpp
parent: 9bf2fa2b060c9881d3135c2208c624a1dd546ecc (diff)
download: ydb-736dcd8ca259457a136f2f9f9168c44643914323.tar.gz
568 files changed, 1633 insertions, 1633 deletions
diff --git a/library/cpp/accurate_accumulate/benchmark/main.cpp b/library/cpp/accurate_accumulate/benchmark/main.cpp
index 3c5e6e775d..7dce980e0c 100644
--- a/library/cpp/accurate_accumulate/benchmark/main.cpp
+++ b/library/cpp/accurate_accumulate/benchmark/main.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/accurate_accumulate/accurate_accumulate.h>
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 
 #include <util/generic/algorithm.h>
 #include <util/generic/singleton.h>
diff --git a/library/cpp/actors/core/actor_coroutine_ut.cpp b/library/cpp/actors/core/actor_coroutine_ut.cpp
index 951512b877..5008c63643 100644
--- a/library/cpp/actors/core/actor_coroutine_ut.cpp
+++ b/library/cpp/actors/core/actor_coroutine_ut.cpp
@@ -5,7 +5,7 @@
 #include "events.h"
 #include "event_local.h"
 #include "hfunc.h"
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/sanitizers.h>
 
diff --git a/library/cpp/actors/core/actorsystem.h b/library/cpp/actors/core/actorsystem.h
index 40499d7586..b98c344709 100644
--- a/library/cpp/actors/core/actorsystem.h
+++ b/library/cpp/actors/core/actorsystem.h
@@ -10,7 +10,7 @@
 #include "scheduler_cookie.h"
 #include "mon_stats.h"
 
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/future/future.h> 
 #include <library/cpp/actors/util/ticket_lock.h>
 
 #include <util/generic/vector.h>
diff --git a/library/cpp/actors/core/ask.h b/library/cpp/actors/core/ask.h
index 036f1833a4..d5b5178813 100644
--- a/library/cpp/actors/core/ask.h
+++ b/library/cpp/actors/core/ask.h
@@ -3,7 +3,7 @@
 #include "actor.h"
 #include "event.h"
 
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/future/future.h> 
 
 namespace NActors {
     /**
diff --git a/library/cpp/actors/core/ask_ut.cpp b/library/cpp/actors/core/ask_ut.cpp
index e72ebdba9b..309af4e038 100644
--- a/library/cpp/actors/core/ask_ut.cpp
+++ b/library/cpp/actors/core/ask_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "actorsystem.h"
 
diff --git a/library/cpp/actors/core/event.h b/library/cpp/actors/core/event.h
index 6ff02aaf94..ac0407bb46 100644
--- a/library/cpp/actors/core/event.h
+++ b/library/cpp/actors/core/event.h
@@ -83,7 +83,7 @@ namespace NActors {
         template <typename T>
         TAutoPtr<T> Release() {
             TAutoPtr<T> x = Get<T>();
-            Y_UNUSED(Event.Release());
+            Y_UNUSED(Event.Release()); 
             Buffer.Reset();
             return x;
         }
@@ -271,7 +271,7 @@ namespace NActors {
 
         TAutoPtr<IEventBase> ReleaseBase() {
             TAutoPtr<IEventBase> x = GetBase();
-            Y_UNUSED(Event.Release());
+            Y_UNUSED(Event.Release()); 
             Buffer.Reset();
             return x;
         }
diff --git a/library/cpp/actors/core/event_pb.h b/library/cpp/actors/core/event_pb.h
index d7546b901a..efba90c24e 100644
--- a/library/cpp/actors/core/event_pb.h
+++ b/library/cpp/actors/core/event_pb.h
@@ -233,7 +233,7 @@ namespace NActors {
         static IEventBase* Load(TIntrusivePtr<TEventSerializedData> input) {
             THolder<TEventPBBase> ev(new TEv());
             if (!input->GetSize()) {
-                Y_PROTOBUF_SUPPRESS_NODISCARD ev->Record.ParseFromString(TString());
+                Y_PROTOBUF_SUPPRESS_NODISCARD ev->Record.ParseFromString(TString()); 
             } else {
                 TRope::TConstIterator iter = input->GetBeginIter();
                 ui64 size = input->GetSize();
@@ -450,7 +450,7 @@ namespace NActors {
             TRecord& base(TBase::Record);
             if (!PreSerializedData.empty()) {
                 TRecord copy;
-                Y_PROTOBUF_SUPPRESS_NODISCARD copy.ParseFromString(PreSerializedData);
+                Y_PROTOBUF_SUPPRESS_NODISCARD copy.ParseFromString(PreSerializedData); 
                 copy.MergeFrom(base);
                 base.Swap(&copy);
                 PreSerializedData.clear();
diff --git a/library/cpp/actors/core/event_pb_payload_ut.cpp b/library/cpp/actors/core/event_pb_payload_ut.cpp
index eab007bc15..1063f85a28 100644
--- a/library/cpp/actors/core/event_pb_payload_ut.cpp
+++ b/library/cpp/actors/core/event_pb_payload_ut.cpp
@@ -1,7 +1,7 @@
 #include "event_pb.h"
 #include "events.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/actors/protos/unittests.pb.h>
 
 using namespace NActors;
@@ -124,7 +124,7 @@ Y_UNIT_TEST_SUITE(TEventProtoWithPayload) {
         msg.AddSomeData("xyzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz");
 
         TEvMessageWithPayloadPreSerialized e1;
-        Y_PROTOBUF_SUPPRESS_NODISCARD msg.SerializeToString(&e1.PreSerializedData);
+        Y_PROTOBUF_SUPPRESS_NODISCARD msg.SerializeToString(&e1.PreSerializedData); 
 
         auto serializer1 = MakeHolder<TAllocChunkSerializer>();
         e1.SerializeToArcadiaStream(serializer1.Get());
diff --git a/library/cpp/actors/core/event_pb_ut.cpp b/library/cpp/actors/core/event_pb_ut.cpp
index a16c3092b3..1e2b2c9401 100644
--- a/library/cpp/actors/core/event_pb_ut.cpp
+++ b/library/cpp/actors/core/event_pb_ut.cpp
@@ -1,6 +1,6 @@
 #include "event_pb.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/actors/protos/unittests.pb.h>
 
 Y_UNIT_TEST_SUITE(TEventSerialization) {
@@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(TEventSerialization) {
         bm.SetYANumber(394143);
 
         TString bmSerialized;
-        Y_PROTOBUF_SUPPRESS_NODISCARD bm.SerializeToString(&bmSerialized);
+        Y_PROTOBUF_SUPPRESS_NODISCARD bm.SerializeToString(&bmSerialized); 
         UNIT_ASSERT_UNEQUAL(bmSerialized.size(), 0);
 
         NActors::TCoroutineChunkSerializer chunker;
diff --git a/library/cpp/actors/core/executor_pool_basic_ut.cpp b/library/cpp/actors/core/executor_pool_basic_ut.cpp
index 76dff693af..ef1b73a124 100644
--- a/library/cpp/actors/core/executor_pool_basic_ut.cpp
+++ b/library/cpp/actors/core/executor_pool_basic_ut.cpp
@@ -5,7 +5,7 @@
 
 #include <library/cpp/actors/util/should_continue.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/actors/protos/unittests.pb.h>
 
 using namespace NActors;
diff --git a/library/cpp/actors/core/executor_pool_united_ut.cpp b/library/cpp/actors/core/executor_pool_united_ut.cpp
index d4df17f1b8..98a89571bb 100644
--- a/library/cpp/actors/core/executor_pool_united_ut.cpp
+++ b/library/cpp/actors/core/executor_pool_united_ut.cpp
@@ -5,7 +5,7 @@
 
 #include <library/cpp/actors/util/should_continue.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/actors/protos/unittests.pb.h>
 
 using namespace NActors;
diff --git a/library/cpp/actors/core/log_ut.cpp b/library/cpp/actors/core/log_ut.cpp
index 09b5f88ea2..b550c0d77e 100644
--- a/library/cpp/actors/core/log_ut.cpp
+++ b/library/cpp/actors/core/log_ut.cpp
@@ -1,6 +1,6 @@
 #include "log.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/actors/testlib/test_runtime.h>
 
diff --git a/library/cpp/actors/core/mailbox.h b/library/cpp/actors/core/mailbox.h
index 0bd9c4d314..2d3d8e0f6b 100644
--- a/library/cpp/actors/core/mailbox.h
+++ b/library/cpp/actors/core/mailbox.h
@@ -6,8 +6,8 @@
 #include "mailbox_queue_simple.h"
 #include "mailbox_queue_revolving.h"
 #include <library/cpp/actors/util/unordered_cache.h>
-#include <library/cpp/threading/queue/mpsc_htswap.h>
-#include <library/cpp/threading/queue/mpsc_read_as_filled.h>
+#include <library/cpp/threading/queue/mpsc_htswap.h> 
+#include <library/cpp/threading/queue/mpsc_read_as_filled.h> 
 #include <util/generic/hash.h>
 #include <util/system/hp_timer.h>
 #include <util/generic/ptr.h>
diff --git a/library/cpp/actors/core/scheduler_actor_ut.cpp b/library/cpp/actors/core/scheduler_actor_ut.cpp
index 09b7369d36..95ad1a8aa4 100644
--- a/library/cpp/actors/core/scheduler_actor_ut.cpp
+++ b/library/cpp/actors/core/scheduler_actor_ut.cpp
@@ -7,7 +7,7 @@
 #include "event_local.h"
 #include "hfunc.h"
 #include <library/cpp/actors/interconnect/poller_actor.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/sanitizers.h>
 
diff --git a/library/cpp/actors/core/scheduler_basic.h b/library/cpp/actors/core/scheduler_basic.h
index 2ccde39235..6921bd07e2 100644
--- a/library/cpp/actors/core/scheduler_basic.h
+++ b/library/cpp/actors/core/scheduler_basic.h
@@ -4,7 +4,7 @@
 #include "monotonic.h"
 #include "scheduler_queue.h"
 #include <library/cpp/actors/util/queue_chunk.h>
-#include <library/cpp/threading/future/legacy_future.h>
+#include <library/cpp/threading/future/legacy_future.h> 
 #include <util/generic/hash.h>
 #include <util/generic/map.h>
 
diff --git a/library/cpp/actors/core/ya.make b/library/cpp/actors/core/ya.make
index 880a9d00db..d036ac752c 100644
--- a/library/cpp/actors/core/ya.make
+++ b/library/cpp/actors/core/ya.make
@@ -113,7 +113,7 @@ PEERDIR(
     library/cpp/lwtrace
     library/cpp/monlib/dynamic_counters
     library/cpp/svnversion
-    library/cpp/threading/future
+    library/cpp/threading/future 
 )
 
 END()
diff --git a/library/cpp/actors/dnscachelib/timekeeper.h b/library/cpp/actors/dnscachelib/timekeeper.h
index 0528d8549c..aeac6afc10 100644
--- a/library/cpp/actors/dnscachelib/timekeeper.h
+++ b/library/cpp/actors/dnscachelib/timekeeper.h
@@ -5,7 +5,7 @@
 #include <util/string/cast.h>
 #include <util/system/thread.h>
 #include <util/system/event.h>
-#include <util/system/env.h>
+#include <util/system/env.h> 
 
 #include <cstdlib>
 
@@ -28,7 +28,7 @@ public:
     TTimeKeeper()
         : Thread(&TTimeKeeper::Worker, this)
     {
-        ConstTime = !!GetEnv("TEST_TIME");
+        ConstTime = !!GetEnv("TEST_TIME"); 
         if (ConstTime) {
             try {
                 CurrentTime.tv_sec = FromString<ui32>(GetEnv("TEST_TIME"));
diff --git a/library/cpp/actors/helpers/selfping_actor.cpp b/library/cpp/actors/helpers/selfping_actor.cpp
index f9bfaf8dc0..0e1881eaef 100644
--- a/library/cpp/actors/helpers/selfping_actor.cpp
+++ b/library/cpp/actors/helpers/selfping_actor.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
 
-#include <library/cpp/containers/stack_vector/stack_vec.h>
+#include <library/cpp/containers/stack_vector/stack_vec.h> 
 #include <library/cpp/sliding_window/sliding_window.h>
 
 namespace NActors {
diff --git a/library/cpp/actors/helpers/selfping_actor_ut.cpp b/library/cpp/actors/helpers/selfping_actor_ut.cpp
index 459635fa24..75b90ea576 100644
--- a/library/cpp/actors/helpers/selfping_actor_ut.cpp
+++ b/library/cpp/actors/helpers/selfping_actor_ut.cpp
@@ -1,6 +1,6 @@
 #include "selfping_actor.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/actors/testlib/test_runtime.h>
 
 namespace NActors {
diff --git a/library/cpp/actors/http/http.cpp b/library/cpp/actors/http/http.cpp
index 7125f9d8b0..0bdc6417d3 100644
--- a/library/cpp/actors/http/http.cpp
+++ b/library/cpp/actors/http/http.cpp
@@ -1,5 +1,5 @@
 #include "http.h"
-#include <library/cpp/string_utils/quote/quote.h>
+#include <library/cpp/string_utils/quote/quote.h> 
 
 inline TStringBuf operator +(TStringBuf l, TStringBuf r) {
     if (l.empty()) {
diff --git a/library/cpp/actors/http/http_ut.cpp b/library/cpp/actors/http/http_ut.cpp
index 4c922f8d0f..a2e2ecaaad 100644
--- a/library/cpp/actors/http/http_ut.cpp
+++ b/library/cpp/actors/http/http_ut.cpp
@@ -1,5 +1,5 @@
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 #include <library/cpp/actors/core/executor_pool_basic.h>
 #include <library/cpp/actors/core/scheduler_basic.h>
 #include <library/cpp/actors/testlib/test_runtime.h>
diff --git a/library/cpp/actors/http/ya.make b/library/cpp/actors/http/ya.make
index 7ce68b7a75..8d0ac30be7 100644
--- a/library/cpp/actors/http/ya.make
+++ b/library/cpp/actors/http/ya.make
@@ -27,7 +27,7 @@ PEERDIR(
     library/cpp/actors/interconnect
     library/cpp/dns
     library/cpp/monlib/metrics
-    library/cpp/string_utils/quote
+    library/cpp/string_utils/quote 
 )
 
 END()
diff --git a/library/cpp/actors/interconnect/event_holder_pool.h b/library/cpp/actors/interconnect/event_holder_pool.h
index b6090a3bc8..f23734a0d4 100644
--- a/library/cpp/actors/interconnect/event_holder_pool.h
+++ b/library/cpp/actors/interconnect/event_holder_pool.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/containers/stack_vector/stack_vec.h>
+#include <library/cpp/containers/stack_vector/stack_vec.h> 
 
 #include "packet.h"
 
diff --git a/library/cpp/actors/interconnect/interconnect_handshake.cpp b/library/cpp/actors/interconnect/interconnect_handshake.cpp
index 9ede998d8e..3226f135c9 100644
--- a/library/cpp/actors/interconnect/interconnect_handshake.cpp
+++ b/library/cpp/actors/interconnect/interconnect_handshake.cpp
@@ -724,7 +724,7 @@ namespace NActors {
         template <typename T>
         void SendExBlock(const T& proto, const char* what) {
             TString data;
-            Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&data);
+            Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&data); 
             Y_VERIFY(data.size() <= TExHeader::MaxSize);
 
             ReportProto(proto, Sprintf("SendExBlock %s", what).data());
diff --git a/library/cpp/actors/interconnect/packet.h b/library/cpp/actors/interconnect/packet.h
index 4ba50a2b5f..bd59c3ab85 100644
--- a/library/cpp/actors/interconnect/packet.h
+++ b/library/cpp/actors/interconnect/packet.h
@@ -4,7 +4,7 @@
 #include <library/cpp/actors/core/event_load.h>
 #include <library/cpp/actors/core/events.h>
 #include <library/cpp/actors/core/actor.h>
-#include <library/cpp/containers/stack_vector/stack_vec.h>
+#include <library/cpp/containers/stack_vector/stack_vec.h> 
 #include <library/cpp/actors/util/rope.h>
 #include <library/cpp/actors/prof/tag.h>
 #include <library/cpp/digest/crc32c/crc32c.h>
diff --git a/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp b/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp
index 565a511859..6841f68017 100644
--- a/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp
+++ b/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/actors/interconnect/channel_scheduler.h>
 #include <library/cpp/actors/interconnect/events_local.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NActors;
 
diff --git a/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp b/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp
index e6b2bd4e4c..c5e85d41a5 100644
--- a/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp
+++ b/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/actors/core/events.h>
 #include <library/cpp/actors/core/event_local.h>
 #include <library/cpp/actors/interconnect/interconnect_common.h>
diff --git a/library/cpp/actors/interconnect/ut/large.cpp b/library/cpp/actors/interconnect/ut/large.cpp
index ba2a50c6f6..785033aac8 100644
--- a/library/cpp/actors/interconnect/ut/large.cpp
+++ b/library/cpp/actors/interconnect/ut/large.cpp
@@ -4,8 +4,8 @@
 
 #include <library/cpp/actors/interconnect/interconnect_tcp_proxy.h>
 
-#include <library/cpp/testing/unittest/tests_data.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/tests_data.h> 
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/event.h>
 #include <util/system/sanitizers.h>
diff --git a/library/cpp/actors/interconnect/ut/lib/ic_test_cluster.h b/library/cpp/actors/interconnect/ut/lib/ic_test_cluster.h
index 2b6d27cd3f..db147d649e 100644
--- a/library/cpp/actors/interconnect/ut/lib/ic_test_cluster.h
+++ b/library/cpp/actors/interconnect/ut/lib/ic_test_cluster.h
@@ -5,7 +5,7 @@
 
 #include <library/cpp/actors/interconnect/interconnect_tcp_proxy.h>
 #include <library/cpp/actors/core/events.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/generic/noncopyable.h>
 
diff --git a/library/cpp/actors/interconnect/ut/lib/interrupter.h b/library/cpp/actors/interconnect/ut/lib/interrupter.h
index 48851de2c5..2a92378a8f 100644
--- a/library/cpp/actors/interconnect/ut/lib/interrupter.h
+++ b/library/cpp/actors/interconnect/ut/lib/interrupter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/network/sock.h>
 #include <util/network/poller.h>
diff --git a/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp b/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp
index 23d846a2fd..bc9152c3f8 100644
--- a/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp
+++ b/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/actors/interconnect/poller_actor.h>
 #include <library/cpp/actors/testlib/test_runtime.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/network/pair.h>
 #include <util/network/socket.h>
diff --git a/library/cpp/actors/interconnect/ut/ya.make b/library/cpp/actors/interconnect/ut/ya.make
index 2f5b13352e..5ebbf538b0 100644
--- a/library/cpp/actors/interconnect/ut/ya.make
+++ b/library/cpp/actors/interconnect/ut/ya.make
@@ -30,7 +30,7 @@ PEERDIR(
     library/cpp/actors/interconnect/ut/protos
     library/cpp/actors/testlib
     library/cpp/digest/md5
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
 )
 
 END()
diff --git a/library/cpp/actors/interconnect/ut_fat/main.cpp b/library/cpp/actors/interconnect/ut_fat/main.cpp
index 5d19bc3003..626083c3a3 100644
--- a/library/cpp/actors/interconnect/ut_fat/main.cpp
+++ b/library/cpp/actors/interconnect/ut_fat/main.cpp
@@ -7,8 +7,8 @@
 #include <library/cpp/actors/interconnect/ut/lib/test_actors.h>
 #include <library/cpp/actors/interconnect/ut/lib/node.h>
 
-#include <library/cpp/testing/unittest/tests_data.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/tests_data.h> 
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/network/sock.h>
 #include <util/network/poller.h>
diff --git a/library/cpp/actors/interconnect/ut_fat/ya.make b/library/cpp/actors/interconnect/ut_fat/ya.make
index 6e58d08154..a26080b7f5 100644
--- a/library/cpp/actors/interconnect/ut_fat/ya.make
+++ b/library/cpp/actors/interconnect/ut_fat/ya.make
@@ -19,7 +19,7 @@ PEERDIR(
     library/cpp/actors/interconnect/mock
     library/cpp/actors/interconnect/ut/lib
     library/cpp/actors/interconnect/ut/protos
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
 )
 
 END()
diff --git a/library/cpp/actors/memory_log/memlog.h b/library/cpp/actors/memory_log/memlog.h
index 2aa27272a6..c248742acf 100644
--- a/library/cpp/actors/memory_log/memlog.h
+++ b/library/cpp/actors/memory_log/memlog.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/threading/queue/mpmc_unordered_ring.h>
+#include <library/cpp/threading/queue/mpmc_unordered_ring.h> 
 #include <util/generic/string.h>
 #include <util/string/printf.h>
 #include <util/system/datetime.h>
diff --git a/library/cpp/actors/memory_log/ya.make b/library/cpp/actors/memory_log/ya.make
index d89d5db4d7..da26cdd561 100644
--- a/library/cpp/actors/memory_log/ya.make
+++ b/library/cpp/actors/memory_log/ya.make
@@ -12,7 +12,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/threading/queue
+    library/cpp/threading/queue 
     contrib/libs/linuxvdso
 )
 
diff --git a/library/cpp/actors/prof/tag.cpp b/library/cpp/actors/prof/tag.cpp
index 9ccf03e1a9..fc93d883ee 100644
--- a/library/cpp/actors/prof/tag.cpp
+++ b/library/cpp/actors/prof/tag.cpp
@@ -6,7 +6,7 @@
 #include <library/cpp/malloc/api/malloc.h>
 
 #if defined(PROFILE_MEMORY_ALLOCATIONS)
-#include <library/cpp/lfalloc/dbg_info/dbg_info.h>
+#include <library/cpp/lfalloc/dbg_info/dbg_info.h> 
 #include <library/cpp/ytalloc/api/ytalloc.h>
 #endif
 
diff --git a/library/cpp/actors/prof/ut/tag_ut.cpp b/library/cpp/actors/prof/ut/tag_ut.cpp
index accf3921ab..47950afe76 100644
--- a/library/cpp/actors/prof/ut/tag_ut.cpp
+++ b/library/cpp/actors/prof/ut/tag_ut.cpp
@@ -1,6 +1,6 @@
 #include "tag.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NProfiling;
 
diff --git a/library/cpp/actors/prof/ya.make b/library/cpp/actors/prof/ya.make
index b5e2497563..ebab0d1092 100644
--- a/library/cpp/actors/prof/ya.make
+++ b/library/cpp/actors/prof/ya.make
@@ -18,7 +18,7 @@ IF (PROFILE_MEMORY_ALLOCATIONS)
     CFLAGS(-DPROFILE_MEMORY_ALLOCATIONS)
     PEERDIR(
         library/cpp/malloc/api
-        library/cpp/lfalloc/dbg_info
+        library/cpp/lfalloc/dbg_info 
         library/cpp/ytalloc/api
     )
 ENDIF()
diff --git a/library/cpp/actors/testlib/test_runtime.h b/library/cpp/actors/testlib/test_runtime.h
index 26e3b45c98..cbd11903b1 100644
--- a/library/cpp/actors/testlib/test_runtime.h
+++ b/library/cpp/actors/testlib/test_runtime.h
@@ -11,7 +11,7 @@
 #include <library/cpp/actors/interconnect/mock/ic_mock.h>
 #include <library/cpp/random_provider/random_provider.h>
 #include <library/cpp/time_provider/time_provider.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/datetime/base.h>
 #include <util/folder/tempdir.h>
diff --git a/library/cpp/actors/util/intrinsics.h b/library/cpp/actors/util/intrinsics.h
index df07e36896..cff5765c2c 100644
--- a/library/cpp/actors/util/intrinsics.h
+++ b/library/cpp/actors/util/intrinsics.h
@@ -4,7 +4,7 @@
 #include <util/system/atomic.h>
 #include <util/system/spinlock.h>
 
-#include <library/cpp/sse/sse.h> // The header chooses appropriate SSE support
+#include <library/cpp/sse/sse.h> // The header chooses appropriate SSE support 
 
 static_assert(sizeof(TAtomic) == 8, "expect sizeof(TAtomic) == 8");
 
diff --git a/library/cpp/actors/util/rope_ut.cpp b/library/cpp/actors/util/rope_ut.cpp
index cabeed9230..8606730924 100644
--- a/library/cpp/actors/util/rope_ut.cpp
+++ b/library/cpp/actors/util/rope_ut.cpp
@@ -1,5 +1,5 @@
 #include "rope.h"
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/random/random.h>
 
 class TRopeStringBackend : public IRopeChunkBackend {
diff --git a/library/cpp/actors/wilson/wilson_event.h b/library/cpp/actors/wilson/wilson_event.h
index 7d89c33b51..db39188ec3 100644
--- a/library/cpp/actors/wilson/wilson_event.h
+++ b/library/cpp/actors/wilson/wilson_event.h
@@ -2,7 +2,7 @@
 
 #include "wilson_trace.h"
 
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 #include <library/cpp/actors/core/log.h>
 
diff --git a/library/cpp/actors/wilson/wilson_trace.h b/library/cpp/actors/wilson/wilson_trace.h
index 3d1ca50562..2e2b2b7728 100644
--- a/library/cpp/actors/wilson/wilson_trace.h
+++ b/library/cpp/actors/wilson/wilson_trace.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 #include <util/stream/output.h>
 #include <util/random/random.h>
diff --git a/library/cpp/actors/wilson/ya.make b/library/cpp/actors/wilson/ya.make
index e371f5061d..061e6b6eab 100644
--- a/library/cpp/actors/wilson/ya.make
+++ b/library/cpp/actors/wilson/ya.make
@@ -1,7 +1,7 @@
 LIBRARY()
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
 )
 
 OWNER(alexvru)
diff --git a/library/cpp/archive/directory_models_archive_reader.cpp b/library/cpp/archive/directory_models_archive_reader.cpp
index 6de9424c7c..392c99b511 100644
--- a/library/cpp/archive/directory_models_archive_reader.cpp
+++ b/library/cpp/archive/directory_models_archive_reader.cpp
@@ -9,12 +9,12 @@
 #include <util/stream/input.h>
 #include <util/stream/mem.h>
 
-TDirectoryModelsArchiveReader::TDirectoryModelsArchiveReader(const TString& path, bool lockMemory, bool ownBlobs)
+TDirectoryModelsArchiveReader::TDirectoryModelsArchiveReader(const TString& path, bool lockMemory, bool ownBlobs) 
     : Path_(path)
 {
     Y_ENSURE(IsDir(path), "directory not found on this path");
 
-    LoadFilesAndSubdirs("", lockMemory, ownBlobs);
+    LoadFilesAndSubdirs("", lockMemory, ownBlobs); 
 }
 
 TDirectoryModelsArchiveReader::~TDirectoryModelsArchiveReader() {}
@@ -29,21 +29,21 @@ TString TDirectoryModelsArchiveReader::KeyByIndex(size_t n) const {
 }
 
 bool TDirectoryModelsArchiveReader::Has(const TStringBuf key) const {
-    return BlobByKey_.contains(key) || PathByKey_.contains(key);
-}
-
-namespace {
-    struct TBlobOwningStream : public TMemoryInput {
-        TBlob Blob;
-        TBlobOwningStream(TBlob blob)
-        : TMemoryInput(blob.Data(), blob.Length())
-        , Blob(blob)
-        {}
-    };
+    return BlobByKey_.contains(key) || PathByKey_.contains(key); 
 }
 
+namespace { 
+    struct TBlobOwningStream : public TMemoryInput { 
+        TBlob Blob; 
+        TBlobOwningStream(TBlob blob) 
+        : TMemoryInput(blob.Data(), blob.Length()) 
+        , Blob(blob) 
+        {} 
+    }; 
+} 
+ 
 TAutoPtr<IInputStream> TDirectoryModelsArchiveReader::ObjectByKey(const TStringBuf key) const {
-    return new TBlobOwningStream(BlobByKey(key));
+    return new TBlobOwningStream(BlobByKey(key)); 
 }
 
 TBlob TDirectoryModelsArchiveReader::ObjectBlobByKey(const TStringBuf key) const {
@@ -51,14 +51,14 @@ TBlob TDirectoryModelsArchiveReader::ObjectBlobByKey(const TStringBuf key) const
 }
 
 TBlob TDirectoryModelsArchiveReader::BlobByKey(const TStringBuf key) const {
-    Y_ENSURE(Has(key), "key " << key << " not found");
-    if (auto ptr = BlobByKey_.FindPtr(key); ptr) {
-        return *ptr;
-    }
-    if (auto ptr = PathByKey_.FindPtr(key); ptr) {
-        return TBlob::FromFile(*ptr);
-    }
-    Y_UNREACHABLE();
+    Y_ENSURE(Has(key), "key " << key << " not found"); 
+    if (auto ptr = BlobByKey_.FindPtr(key); ptr) { 
+        return *ptr; 
+    } 
+    if (auto ptr = PathByKey_.FindPtr(key); ptr) { 
+        return TBlob::FromFile(*ptr); 
+    } 
+    Y_UNREACHABLE(); 
 }
 
 bool TDirectoryModelsArchiveReader::Compressed() const {
@@ -74,18 +74,18 @@ TString TDirectoryModelsArchiveReader::NormalizePath(TString path) const {
     return path;
 }
 
-void TDirectoryModelsArchiveReader::LoadFilesAndSubdirs(const TString& subPath, bool lockMemory, bool ownBlobs) {
+void TDirectoryModelsArchiveReader::LoadFilesAndSubdirs(const TString& subPath, bool lockMemory, bool ownBlobs) { 
     TFileList fileList;
     fileList.Fill(JoinFsPaths(Path_, subPath));
     const char* file;
     while ((file = fileList.Next()) != nullptr) {
         TString key = JoinFsPaths(subPath, TString(file));
-        TString fullPath = JoinFsPaths(Path_, key);
+        TString fullPath = JoinFsPaths(Path_, key); 
         TBlob fileBlob;
         if (lockMemory) {
-            fileBlob = TBlob::LockedFromFile(fullPath);
+            fileBlob = TBlob::LockedFromFile(fullPath); 
         } else {
-            fileBlob = TBlob::FromFile(fullPath);
+            fileBlob = TBlob::FromFile(fullPath); 
         }
         if (key.EndsWith(".archive")) {
             TArchiveReader reader(fileBlob);
@@ -97,11 +97,11 @@ void TDirectoryModelsArchiveReader::LoadFilesAndSubdirs(const TString& subPath,
             }
         } else {
             const TString normalizedPath = NormalizePath(key);
-            if (lockMemory || ownBlobs) {
-                BlobByKey_.emplace(normalizedPath, fileBlob);
-            } else {
-                PathByKey_.emplace(normalizedPath, RealPath(fullPath));
-            }
+            if (lockMemory || ownBlobs) { 
+                BlobByKey_.emplace(normalizedPath, fileBlob); 
+            } else { 
+                PathByKey_.emplace(normalizedPath, RealPath(fullPath)); 
+            } 
             Recs_.push_back(normalizedPath);
         }
     }
@@ -110,6 +110,6 @@ void TDirectoryModelsArchiveReader::LoadFilesAndSubdirs(const TString& subPath,
     dirsList.Fill(JoinFsPaths(Path_, subPath));
     const char* dir;
     while ((dir = dirsList.Next()) != nullptr) {
-        LoadFilesAndSubdirs(JoinFsPaths(subPath, TString(dir)), lockMemory, ownBlobs);
+        LoadFilesAndSubdirs(JoinFsPaths(subPath, TString(dir)), lockMemory, ownBlobs); 
     }
 }
diff --git a/library/cpp/archive/directory_models_archive_reader.h b/library/cpp/archive/directory_models_archive_reader.h
index d16d6d728d..5d65e76197 100644
--- a/library/cpp/archive/directory_models_archive_reader.h
+++ b/library/cpp/archive/directory_models_archive_reader.h
@@ -15,7 +15,7 @@ class TBlob;
 
 class TDirectoryModelsArchiveReader : public IModelsArchiveReader {
 public:
-    TDirectoryModelsArchiveReader(const TString& path, bool lockMemory = false, bool ownBlobs = false);
+    TDirectoryModelsArchiveReader(const TString& path, bool lockMemory = false, bool ownBlobs = false); 
     virtual ~TDirectoryModelsArchiveReader() override;
 
     virtual size_t Count() const noexcept override;
@@ -28,11 +28,11 @@ public:
 
 private:
     TString NormalizePath(TString path) const; // in archive path works unix-like path delimiter and leading slash is neccesery
-    void LoadFilesAndSubdirs(const TString& subPath, bool lockMemory, bool ownBlobs);
+    void LoadFilesAndSubdirs(const TString& subPath, bool lockMemory, bool ownBlobs); 
 
 private:
     TString Path_;
-    THashMap<TString, TString> PathByKey_;
+    THashMap<TString, TString> PathByKey_; 
     THashMap<TString, TBlob> BlobByKey_;
     TVector<TString> Recs_;
 };
diff --git a/library/cpp/archive/directory_models_archive_reader_ut.cpp b/library/cpp/archive/directory_models_archive_reader_ut.cpp
index 09994de9b4..d7d24fce5a 100644
--- a/library/cpp/archive/directory_models_archive_reader_ut.cpp
+++ b/library/cpp/archive/directory_models_archive_reader_ut.cpp
@@ -1,6 +1,6 @@
 #include "directory_models_archive_reader.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/folder/tempdir.h>
 #include <util/string/cast.h>
diff --git a/library/cpp/archive/yarchive.cpp b/library/cpp/archive/yarchive.cpp
index 1becc3e5da..e4ac611ca9 100644
--- a/library/cpp/archive/yarchive.cpp
+++ b/library/cpp/archive/yarchive.cpp
@@ -153,15 +153,15 @@ public:
             TransferData(src, &compress);
             compress.Finish();
         } else {
-            size_t skip_size = ArchiveWriterDefaultDataAlignment - Off_ % ArchiveWriterDefaultDataAlignment;
-            if (skip_size == ArchiveWriterDefaultDataAlignment) {
-                skip_size = 0;
-            }
-            while(skip_size > 0) {
-                Out_->Write(char(0));
-                Off_ += 1;
-                skip_size -= 1;
-            }
+            size_t skip_size = ArchiveWriterDefaultDataAlignment - Off_ % ArchiveWriterDefaultDataAlignment; 
+            if (skip_size == ArchiveWriterDefaultDataAlignment) { 
+                skip_size = 0; 
+            } 
+            while(skip_size > 0) { 
+                Out_->Write(char(0)); 
+                Off_ += 1; 
+                skip_size -= 1; 
+            } 
             TransferData(src, &out);
             out.Finish();
         }
diff --git a/library/cpp/archive/yarchive.h b/library/cpp/archive/yarchive.h
index 8120bcb940..bbd84ab071 100644
--- a/library/cpp/archive/yarchive.h
+++ b/library/cpp/archive/yarchive.h
@@ -11,9 +11,9 @@ class IOutputStream;
 
 class TBlob;
 
-//noncompressed data will be stored with default alignment DEVTOOLS-4384
-static constexpr size_t ArchiveWriterDefaultDataAlignment = 16;
-
+//noncompressed data will be stored with default alignment DEVTOOLS-4384 
+static constexpr size_t ArchiveWriterDefaultDataAlignment = 16; 
+ 
 class TArchiveWriter {
 public:
     explicit TArchiveWriter(IOutputStream* out, bool compress = true);
diff --git a/library/cpp/archive/yarchive_ut.cpp b/library/cpp/archive/yarchive_ut.cpp
index 602a1cdbbd..5736504aac 100644
--- a/library/cpp/archive/yarchive_ut.cpp
+++ b/library/cpp/archive/yarchive_ut.cpp
@@ -1,6 +1,6 @@
 #include "yarchive.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/string/cast.h>
 #include <util/stream/file.h>
diff --git a/library/cpp/balloc/ya.make b/library/cpp/balloc/ya.make
index d4457fbba9..77b78f7e67 100644
--- a/library/cpp/balloc/ya.make
+++ b/library/cpp/balloc/ya.make
@@ -10,7 +10,7 @@ NO_COMPILER_WARNINGS()
 
 IF (OS_WINDOWS)
     PEERDIR(
-        library/cpp/lfalloc
+        library/cpp/lfalloc 
     )
 ELSE()
     SRCS(
diff --git a/library/cpp/binsaver/bin_saver.h b/library/cpp/binsaver/bin_saver.h
index 412424889f..371cdaf5a5 100644
--- a/library/cpp/binsaver/bin_saver.h
+++ b/library/cpp/binsaver/bin_saver.h
@@ -3,7 +3,7 @@
 #include "buffered_io.h"
 #include "class_factory.h"
 
-#include <library/cpp/containers/2d_array/2d_array.h>
+#include <library/cpp/containers/2d_array/2d_array.h> 
 
 #include <util/generic/hash_set.h>
 #include <util/generic/buffer.h>
@@ -630,7 +630,7 @@ struct TRegisterSaveLoadType {
         f.AddMulti(__VA_ARGS__);            \
         return 0;                           \
     }
-
+ 
 #define SAVELOAD_OVERRIDE(base, ...)       \
     int operator&(IBinSaver& f) override { \
         base::operator&(f);                \
@@ -643,4 +643,4 @@ struct TRegisterSaveLoadType {
         TBase::operator&(f);      \
         f.AddMulti(__VA_ARGS__);  \
         return 0;                 \
-    }
+    } 
diff --git a/library/cpp/binsaver/ut/binsaver_ut.cpp b/library/cpp/binsaver/ut/binsaver_ut.cpp
index 37eba5406f..e7a5626188 100644
--- a/library/cpp/binsaver/ut/binsaver_ut.cpp
+++ b/library/cpp/binsaver/ut/binsaver_ut.cpp
@@ -2,7 +2,7 @@
 #include <library/cpp/binsaver/mem_io.h>
 #include <library/cpp/binsaver/bin_saver.h>
 #include <library/cpp/binsaver/ut_util/ut_util.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/buffer.h>
 #include <util/generic/map.h>
diff --git a/library/cpp/binsaver/ut_util/ut_util.h b/library/cpp/binsaver/ut_util/ut_util.h
index 52e7bcf8e1..ec896541dc 100644
--- a/library/cpp/binsaver/ut_util/ut_util.h
+++ b/library/cpp/binsaver/ut_util/ut_util.h
@@ -4,7 +4,7 @@
 #include <library/cpp/binsaver/mem_io.h>
 #include <library/cpp/binsaver/util_stream_io.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/vector.h>
 #include <util/stream/buffer.h>
diff --git a/library/cpp/binsaver/ut_util/ya.make b/library/cpp/binsaver/ut_util/ya.make
index 7e60f13ef3..507273a3d3 100644
--- a/library/cpp/binsaver/ut_util/ya.make
+++ b/library/cpp/binsaver/ut_util/ya.make
@@ -8,7 +8,7 @@ SRCS(
 
 PEERDIR(
     library/cpp/binsaver
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
 )
 
 END()
diff --git a/library/cpp/binsaver/ya.make b/library/cpp/binsaver/ya.make
index 9693c54639..6a7cfa5c7b 100644
--- a/library/cpp/binsaver/ya.make
+++ b/library/cpp/binsaver/ya.make
@@ -12,7 +12,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/containers/2d_array
+    library/cpp/containers/2d_array 
 )
 
 END()
diff --git a/library/cpp/bit_io/bitinout_ut.cpp b/library/cpp/bit_io/bitinout_ut.cpp
index 23a1ddf344..e1f1f6afce 100644
--- a/library/cpp/bit_io/bitinout_ut.cpp
+++ b/library/cpp/bit_io/bitinout_ut.cpp
@@ -1,7 +1,7 @@
 #include "bitinput.h"
 #include "bitoutput.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/buffer.h>
 #include <util/generic/buffer.h>
diff --git a/library/cpp/blockcodecs/codecs_ut.cpp b/library/cpp/blockcodecs/codecs_ut.cpp
index bfe5a23690..fc2fa7f6b0 100644
--- a/library/cpp/blockcodecs/codecs_ut.cpp
+++ b/library/cpp/blockcodecs/codecs_ut.cpp
@@ -1,7 +1,7 @@
 #include "codecs.h"
 #include "stream.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/str.h>
 #include <util/string/join.h>
diff --git a/library/cpp/build_info/sandbox.cpp.in b/library/cpp/build_info/sandbox.cpp.in
index ac3b2d9004..7638da6686 100644
--- a/library/cpp/build_info/sandbox.cpp.in
+++ b/library/cpp/build_info/sandbox.cpp.in
@@ -1,5 +1,5 @@
 #include <library/cpp/build_info/sandbox.h>
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 #include <util/generic/string.h>
 #include <util/string/subst.h>
 
diff --git a/library/cpp/build_info/ya.make b/library/cpp/build_info/ya.make
index 99886a8893..25409c47d9 100644
--- a/library/cpp/build_info/ya.make
+++ b/library/cpp/build_info/ya.make
@@ -12,7 +12,7 @@ DEFAULT(KOSHER_SVN_VERSION "")
 CREATE_BUILDINFO_FOR(buildinfo_data.h)
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
 )
 
 SRCS(
diff --git a/library/cpp/cache/ut/cache_ut.cpp b/library/cpp/cache/ut/cache_ut.cpp
index 329872cfde..3c12ce7b0a 100644
--- a/library/cpp/cache/ut/cache_ut.cpp
+++ b/library/cpp/cache/ut/cache_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/cache/cache.h>
 #include <library/cpp/cache/thread_safe_cache.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 struct TStrokaWeighter {
     static size_t Weight(const TString& s) {
diff --git a/library/cpp/cgiparam/cgiparam.cpp b/library/cpp/cgiparam/cgiparam.cpp
index f3277b8e4b..90d4ef4034 100644
--- a/library/cpp/cgiparam/cgiparam.cpp
+++ b/library/cpp/cgiparam/cgiparam.cpp
@@ -1,7 +1,7 @@
 #include "cgiparam.h"
 
-#include <library/cpp/string_utils/scan/scan.h>
-#include <library/cpp/string_utils/quote/quote.h>
+#include <library/cpp/string_utils/scan/scan.h> 
+#include <library/cpp/string_utils/quote/quote.h> 
 
 #include <util/generic/singleton.h>
 
@@ -11,7 +11,7 @@ TCgiParameters::TCgiParameters(std::initializer_list<std::pair<TString, TString>
     }
 }
 
-const TString& TCgiParameters::Get(const TStringBuf name, size_t numOfValue) const noexcept {
+const TString& TCgiParameters::Get(const TStringBuf name, size_t numOfValue) const noexcept { 
     const auto it = Find(name, numOfValue);
 
     return end() == it ? Default<TString>() : it->second;
@@ -204,7 +204,7 @@ TString TCgiParameters::QuotedPrint(const char* safe) const {
     return res;
 }
 
-TCgiParameters::const_iterator TCgiParameters::Find(const TStringBuf name, size_t pos) const noexcept {
+TCgiParameters::const_iterator TCgiParameters::Find(const TStringBuf name, size_t pos) const noexcept { 
     const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it, --pos) {
@@ -216,7 +216,7 @@ TCgiParameters::const_iterator TCgiParameters::Find(const TStringBuf name, size_
     return end();
 }
 
-bool TCgiParameters::Has(const TStringBuf name, const TStringBuf value) const noexcept {
+bool TCgiParameters::Has(const TStringBuf name, const TStringBuf value) const noexcept { 
     const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it) {
@@ -248,7 +248,7 @@ TQuickCgiParam::TQuickCgiParam(const TStringBuf cgiParamStr) {
     }
 }
 
-const TStringBuf& TQuickCgiParam::Get(const TStringBuf name, size_t pos) const noexcept {
+const TStringBuf& TQuickCgiParam::Get(const TStringBuf name, size_t pos) const noexcept { 
     const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it, --pos) {
@@ -260,7 +260,7 @@ const TStringBuf& TQuickCgiParam::Get(const TStringBuf name, size_t pos) const n
     return Default<TStringBuf>();
 }
 
-bool TQuickCgiParam::Has(const TStringBuf name, const TStringBuf value) const noexcept {
+bool TQuickCgiParam::Has(const TStringBuf name, const TStringBuf value) const noexcept { 
     const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it) {
diff --git a/library/cpp/cgiparam/cgiparam.h b/library/cpp/cgiparam/cgiparam.h
index 87d1ab0ad4..bdf3caf99a 100644
--- a/library/cpp/cgiparam/cgiparam.h
+++ b/library/cpp/cgiparam/cgiparam.h
@@ -32,7 +32,7 @@ public:
 
     size_t EraseAll(const TStringBuf name);
 
-    size_t NumOfValues(const TStringBuf name) const noexcept {
+    size_t NumOfValues(const TStringBuf name) const noexcept { 
         return count(name);
     }
 
@@ -53,8 +53,8 @@ public:
      */
     TString Print() const;
     char* Print(char* res) const;
-
-    Y_PURE_FUNCTION
+ 
+    Y_PURE_FUNCTION 
     size_t PrintSize() const noexcept;
 
     /** The same as Print* except that RFC-3986 reserved characters are escaped.
@@ -62,19 +62,19 @@ public:
      */
     TString QuotedPrint(const char* safe = "/") const;
 
-    Y_PURE_FUNCTION
+    Y_PURE_FUNCTION 
     auto Range(const TStringBuf name) const noexcept {
         return IterateValues(MakeIteratorRange(equal_range(name)));
     }
-
-    Y_PURE_FUNCTION
-    const_iterator Find(const TStringBuf name, size_t numOfValue = 0) const noexcept;
-
-    Y_PURE_FUNCTION
-    bool Has(const TStringBuf name, const TStringBuf value) const noexcept;
-
-    Y_PURE_FUNCTION
-    bool Has(const TStringBuf name) const noexcept {
+ 
+    Y_PURE_FUNCTION 
+    const_iterator Find(const TStringBuf name, size_t numOfValue = 0) const noexcept; 
+ 
+    Y_PURE_FUNCTION 
+    bool Has(const TStringBuf name, const TStringBuf value) const noexcept; 
+ 
+    Y_PURE_FUNCTION 
+    bool Has(const TStringBuf name) const noexcept { 
         const auto pair = equal_range(name);
         return pair.first != pair.second;
     }
@@ -82,8 +82,8 @@ public:
     /**
      * @note The returned value is CGI-unescaped.
      */
-    Y_PURE_FUNCTION
-    const TString& Get(const TStringBuf name, size_t numOfValue = 0) const noexcept;
+    Y_PURE_FUNCTION 
+    const TString& Get(const TStringBuf name, size_t numOfValue = 0) const noexcept; 
 
     void InsertEscaped(const TStringBuf name, const TStringBuf value);
 
@@ -167,17 +167,17 @@ public:
 
     explicit TQuickCgiParam(const TStringBuf cgiParamStr);
 
-    Y_PURE_FUNCTION
-    bool Has(const TStringBuf name, const TStringBuf value) const noexcept;
-
-    Y_PURE_FUNCTION
-    bool Has(const TStringBuf name) const noexcept {
+    Y_PURE_FUNCTION 
+    bool Has(const TStringBuf name, const TStringBuf value) const noexcept; 
+ 
+    Y_PURE_FUNCTION 
+    bool Has(const TStringBuf name) const noexcept { 
         const auto pair = equal_range(name);
         return pair.first != pair.second;
     }
 
-    Y_PURE_FUNCTION
-    const TStringBuf& Get(const TStringBuf name, size_t numOfValue = 0) const noexcept;
+    Y_PURE_FUNCTION 
+    const TStringBuf& Get(const TStringBuf name, size_t numOfValue = 0) const noexcept; 
 
 private:
     TString UnescapeBuf;
diff --git a/library/cpp/cgiparam/cgiparam_ut.cpp b/library/cpp/cgiparam/cgiparam_ut.cpp
index a562342084..2aad99292e 100644
--- a/library/cpp/cgiparam/cgiparam_ut.cpp
+++ b/library/cpp/cgiparam/cgiparam_ut.cpp
@@ -1,6 +1,6 @@
 #include "cgiparam.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TCgiParametersTest) {
     Y_UNIT_TEST(TestScan1) {
diff --git a/library/cpp/cgiparam/fuzz/main.cpp b/library/cpp/cgiparam/fuzz/main.cpp
index 69d82b5f32..2981d851b0 100644
--- a/library/cpp/cgiparam/fuzz/main.cpp
+++ b/library/cpp/cgiparam/fuzz/main.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/cgiparam/cgiparam.h>
+#include <library/cpp/cgiparam/cgiparam.h> 
 
 extern "C" int LLVMFuzzerTestOneInput(const ui8* data, size_t size) {
     try {
diff --git a/library/cpp/cgiparam/fuzz/ya.make b/library/cpp/cgiparam/fuzz/ya.make
index 8fb9d50d3b..22ca30879a 100644
--- a/library/cpp/cgiparam/fuzz/ya.make
+++ b/library/cpp/cgiparam/fuzz/ya.make
@@ -10,7 +10,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/cgiparam
+    library/cpp/cgiparam 
 )
 
 END()
diff --git a/library/cpp/cgiparam/ut/ya.make b/library/cpp/cgiparam/ut/ya.make
index 1eee403951..8eb9edf1f1 100644
--- a/library/cpp/cgiparam/ut/ya.make
+++ b/library/cpp/cgiparam/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/cgiparam)
+UNITTEST_FOR(library/cpp/cgiparam) 
 
 OWNER(g:util)
 
diff --git a/library/cpp/cgiparam/ya.make b/library/cpp/cgiparam/ya.make
index fa1a6a13c0..81f40d85dc 100644
--- a/library/cpp/cgiparam/ya.make
+++ b/library/cpp/cgiparam/ya.make
@@ -9,8 +9,8 @@ SRCS(
 
 PEERDIR(
     library/cpp/iterator
-    library/cpp/string_utils/quote
-    library/cpp/string_utils/scan
+    library/cpp/string_utils/quote 
+    library/cpp/string_utils/scan 
 )
 
 END()
diff --git a/library/cpp/charset/codepage_ut.cpp b/library/cpp/charset/codepage_ut.cpp
index c3ac3ac478..d9f6228044 100644
--- a/library/cpp/charset/codepage_ut.cpp
+++ b/library/cpp/charset/codepage_ut.cpp
@@ -2,7 +2,7 @@
 #include "recyr.hh"
 #include "wide.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/charset/utf8.h>
 #include <util/system/yassert.h>
diff --git a/library/cpp/charset/iconv_ut.cpp b/library/cpp/charset/iconv_ut.cpp
index e8c56f6d49..b0c3b3f12f 100644
--- a/library/cpp/charset/iconv_ut.cpp
+++ b/library/cpp/charset/iconv_ut.cpp
@@ -2,7 +2,7 @@
 #include "recyr.hh"
 #include "codepage.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 static void TestIconv(const TString& utf8, const TString& other, ECharset enc) {
     TUtf16String wide0 = CharToWide(utf8, CODES_UTF8);
diff --git a/library/cpp/charset/wide_ut.cpp b/library/cpp/charset/wide_ut.cpp
index 78947d51ba..119dff918d 100644
--- a/library/cpp/charset/wide_ut.cpp
+++ b/library/cpp/charset/wide_ut.cpp
@@ -2,7 +2,7 @@
 #include "codepage.h"
 #include "recyr.hh"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/charset/utf8.h>
 #include <util/digest/numeric.h>
diff --git a/library/cpp/codecs/greedy_dict/gd_builder.cpp b/library/cpp/codecs/greedy_dict/gd_builder.cpp
index 561bfbca01..9dfaab121d 100644
--- a/library/cpp/codecs/greedy_dict/gd_builder.cpp
+++ b/library/cpp/codecs/greedy_dict/gd_builder.cpp
@@ -1,6 +1,6 @@
 #include "gd_builder.h"
 
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 #include <util/generic/algorithm.h>
 
 #include <util/random/shuffle.h>
diff --git a/library/cpp/codecs/greedy_dict/gd_entry.h b/library/cpp/codecs/greedy_dict/gd_entry.h
index 18b5be0e15..42482552a3 100644
--- a/library/cpp/codecs/greedy_dict/gd_entry.h
+++ b/library/cpp/codecs/greedy_dict/gd_entry.h
@@ -2,7 +2,7 @@
 
 #include "gd_stats.h"
 
-#include <library/cpp/containers/comptrie/comptrie.h>
+#include <library/cpp/containers/comptrie/comptrie.h> 
 
 #include <util/generic/ptr.h>
 #include <util/generic/strbuf.h>
diff --git a/library/cpp/codecs/greedy_dict/ut/greedy_dict_ut.cpp b/library/cpp/codecs/greedy_dict/ut/greedy_dict_ut.cpp
index 679089a11b..a0df45201c 100644
--- a/library/cpp/codecs/greedy_dict/ut/greedy_dict_ut.cpp
+++ b/library/cpp/codecs/greedy_dict/ut/greedy_dict_ut.cpp
@@ -1,7 +1,7 @@
 #include "gd_builder.h"
 
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 #include <util/string/printf.h>
 #include <util/generic/ymath.h>
 
diff --git a/library/cpp/codecs/greedy_dict/ya.make b/library/cpp/codecs/greedy_dict/ya.make
index 2a57224f7e..dc02820e71 100644
--- a/library/cpp/codecs/greedy_dict/ya.make
+++ b/library/cpp/codecs/greedy_dict/ya.make
@@ -8,8 +8,8 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/containers/comptrie
-    library/cpp/string_utils/relaxed_escaper
+    library/cpp/containers/comptrie 
+    library/cpp/string_utils/relaxed_escaper 
 )
 
 END()
diff --git a/library/cpp/codecs/solar_codec.cpp b/library/cpp/codecs/solar_codec.cpp
index d0692fe2a4..b5be13281c 100644
--- a/library/cpp/codecs/solar_codec.cpp
+++ b/library/cpp/codecs/solar_codec.cpp
@@ -2,8 +2,8 @@
 
 #include <library/cpp/codecs/greedy_dict/gd_builder.h>
 
-#include <library/cpp/containers/comptrie/comptrie_builder.h>
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/containers/comptrie/comptrie_builder.h> 
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 #include <util/stream/length.h>
 #include <util/string/printf.h>
 #include <util/ysaveload.h>
diff --git a/library/cpp/codecs/solar_codec.h b/library/cpp/codecs/solar_codec.h
index 7158ae7926..c9477e643f 100644
--- a/library/cpp/codecs/solar_codec.h
+++ b/library/cpp/codecs/solar_codec.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "codecs.h"
-#include <library/cpp/containers/comptrie/comptrie_trie.h>
+#include <library/cpp/containers/comptrie/comptrie_trie.h> 
 #include <library/cpp/codecs/greedy_dict/gd_builder.h>
 
 #include <util/string/cast.h>
diff --git a/library/cpp/codecs/static/tools/common/ct_common.cpp b/library/cpp/codecs/static/tools/common/ct_common.cpp
index fe77691280..ae5b30924c 100644
--- a/library/cpp/codecs/static/tools/common/ct_common.cpp
+++ b/library/cpp/codecs/static/tools/common/ct_common.cpp
@@ -2,7 +2,7 @@
 
 #include <library/cpp/codecs/codecs.h>
 #include <library/cpp/codecs/static/static_codec_info.pb.h>
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 #include <util/stream/output.h>
 #include <util/string/builder.h>
diff --git a/library/cpp/codecs/static/tools/common/ya.make b/library/cpp/codecs/static/tools/common/ya.make
index d624222dad..59943b7b8b 100644
--- a/library/cpp/codecs/static/tools/common/ya.make
+++ b/library/cpp/codecs/static/tools/common/ya.make
@@ -9,8 +9,8 @@ SRCS(
 PEERDIR(
     library/cpp/codecs
     library/cpp/codecs/static
-    library/cpp/getopt/small
-    library/cpp/string_utils/base64
+    library/cpp/getopt/small 
+    library/cpp/string_utils/base64 
     util/draft
 )
 
diff --git a/library/cpp/codecs/static/tools/static_codec_checker/static_codec_checker.cpp b/library/cpp/codecs/static/tools/static_codec_checker/static_codec_checker.cpp
index 9c8d568d82..984583f234 100644
--- a/library/cpp/codecs/static/tools/static_codec_checker/static_codec_checker.cpp
+++ b/library/cpp/codecs/static/tools/static_codec_checker/static_codec_checker.cpp
@@ -2,7 +2,7 @@
 #include <library/cpp/codecs/static/static.h>
 #include <library/cpp/codecs/static/static_codec_info.pb.h>
 #include <library/cpp/codecs/codecs.h>
-#include <library/cpp/getopt/small/last_getopt.h>
+#include <library/cpp/getopt/small/last_getopt.h> 
 
 #include <util/digest/city.h>
 #include <util/generic/yexception.h>
diff --git a/library/cpp/codecs/static/tools/static_codec_checker/ya.make b/library/cpp/codecs/static/tools/static_codec_checker/ya.make
index 90e06ca448..271bce239c 100644
--- a/library/cpp/codecs/static/tools/static_codec_checker/ya.make
+++ b/library/cpp/codecs/static/tools/static_codec_checker/ya.make
@@ -10,7 +10,7 @@ PEERDIR(
     library/cpp/codecs
     library/cpp/codecs/static
     library/cpp/codecs/static/tools/common
-    library/cpp/getopt/small
+    library/cpp/getopt/small 
 )
 
 END()
diff --git a/library/cpp/codecs/static/tools/static_codec_generator/static_codec_generator.cpp b/library/cpp/codecs/static/tools/static_codec_generator/static_codec_generator.cpp
index 45fdb5c5fe..193c964cee 100644
--- a/library/cpp/codecs/static/tools/static_codec_generator/static_codec_generator.cpp
+++ b/library/cpp/codecs/static/tools/static_codec_generator/static_codec_generator.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/codecs/static/builder.h>
 #include <library/cpp/codecs/codecs.h>
 
-#include <library/cpp/getopt/small/last_getopt.h>
+#include <library/cpp/getopt/small/last_getopt.h> 
 
 #include <util/generic/yexception.h>
 #include <util/stream/file.h>
diff --git a/library/cpp/codecs/static/tools/static_codec_generator/ya.make b/library/cpp/codecs/static/tools/static_codec_generator/ya.make
index efbc440dd1..d41dab9f89 100644
--- a/library/cpp/codecs/static/tools/static_codec_generator/ya.make
+++ b/library/cpp/codecs/static/tools/static_codec_generator/ya.make
@@ -11,7 +11,7 @@ PEERDIR(
     library/cpp/codecs/static
     library/cpp/codecs/static/tools/common
     library/cpp/digest/md5
-    library/cpp/getopt/small
+    library/cpp/getopt/small 
 )
 
 END()
diff --git a/library/cpp/codecs/static/ut/builder_ut.cpp b/library/cpp/codecs/static/ut/builder_ut.cpp
index b47c279ed1..ae746b8c98 100644
--- a/library/cpp/codecs/static/ut/builder_ut.cpp
+++ b/library/cpp/codecs/static/ut/builder_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/codecs/static/builder.h>
 #include <library/cpp/codecs/static/static_codec_info.pb.h>
 #include <util/string/vector.h>
diff --git a/library/cpp/codecs/static/ut/static_ut.cpp b/library/cpp/codecs/static/ut/static_ut.cpp
index 57e1e62887..117d77c838 100644
--- a/library/cpp/codecs/static/ut/static_ut.cpp
+++ b/library/cpp/codecs/static/ut/static_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/codecs/static/example/example.h>
 
 class TStaticCodecUsageTest: public NUnitTest::TTestBase {
diff --git a/library/cpp/codecs/ut/codecs_ut.cpp b/library/cpp/codecs/ut/codecs_ut.cpp
index caf6089aef..827804eeb1 100644
--- a/library/cpp/codecs/ut/codecs_ut.cpp
+++ b/library/cpp/codecs/ut/codecs_ut.cpp
@@ -5,12 +5,12 @@
 #include <library/cpp/codecs/zstd_dict_codec.h>
 #include <library/cpp/codecs/comptable_codec.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/buffer.h>
 #include <util/string/util.h>
 #include <util/string/hex.h>
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 
 namespace {
     const char* TextValues[] = {
diff --git a/library/cpp/codecs/ut/float_huffman_ut.cpp b/library/cpp/codecs/ut/float_huffman_ut.cpp
index 3156fb1f46..9611100325 100644
--- a/library/cpp/codecs/ut/float_huffman_ut.cpp
+++ b/library/cpp/codecs/ut/float_huffman_ut.cpp
@@ -1,10 +1,10 @@
 #include <library/cpp/codecs/float_huffman.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/format.h>
 #include <util/stream/output.h>
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 namespace fh = NCodecs::NFloatHuff;
 
diff --git a/library/cpp/codecs/ut/tls_cache_ut.cpp b/library/cpp/codecs/ut/tls_cache_ut.cpp
index 8101af761f..14d7552b3b 100644
--- a/library/cpp/codecs/ut/tls_cache_ut.cpp
+++ b/library/cpp/codecs/ut/tls_cache_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/codecs/tls_cache.h>
 
 Y_UNIT_TEST_SUITE(CodecsBufferFactoryTest){
diff --git a/library/cpp/codecs/ut/ya.make b/library/cpp/codecs/ut/ya.make
index 90841b05ef..1c2af74509 100644
--- a/library/cpp/codecs/ut/ya.make
+++ b/library/cpp/codecs/ut/ya.make
@@ -6,9 +6,9 @@ OWNER(
 )
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
     library/cpp/codecs
-    library/cpp/string_utils/relaxed_escaper
+    library/cpp/string_utils/relaxed_escaper 
 )
 
 SRCS(
diff --git a/library/cpp/codecs/ya.make b/library/cpp/codecs/ya.make
index 7e76fb0c9a..d240a56d85 100644
--- a/library/cpp/codecs/ya.make
+++ b/library/cpp/codecs/ya.make
@@ -24,10 +24,10 @@ PEERDIR(
     library/cpp/blockcodecs
     library/cpp/codecs/greedy_dict
     library/cpp/comptable
-    library/cpp/containers/comptrie
+    library/cpp/containers/comptrie 
     library/cpp/deprecated/accessors
     library/cpp/packers
-    library/cpp/string_utils/relaxed_escaper
+    library/cpp/string_utils/relaxed_escaper 
 )
 
 END()
diff --git a/library/cpp/colorizer/ut/colorizer_ut.cpp b/library/cpp/colorizer/ut/colorizer_ut.cpp
index 20341440af..226607885e 100644
--- a/library/cpp/colorizer/ut/colorizer_ut.cpp
+++ b/library/cpp/colorizer/ut/colorizer_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/colorizer/colors.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/stream/str.h>
 
 #include <util/string/escape.h>
diff --git a/library/cpp/compproto/compproto_ut.cpp b/library/cpp/compproto/compproto_ut.cpp
index 9393be967a..63bb5b7103 100644
--- a/library/cpp/compproto/compproto_ut.cpp
+++ b/library/cpp/compproto/compproto_ut.cpp
@@ -6,7 +6,7 @@
 #include <util/generic/map.h>
 #include <util/system/protect.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 static ui64 gSeed = 42;
 
diff --git a/library/cpp/comptable/ut/comptable_ut.cpp b/library/cpp/comptable/ut/comptable_ut.cpp
index 5901d0246f..243b6e3fc1 100644
--- a/library/cpp/comptable/ut/comptable_ut.cpp
+++ b/library/cpp/comptable/ut/comptable_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/comptable/comptable.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/random/random.h>
 #include <util/random/fast.h>
diff --git a/library/cpp/containers/bitseq/bititerator_ut.cpp b/library/cpp/containers/bitseq/bititerator_ut.cpp
index ed0925866f..9857e31fc1 100644
--- a/library/cpp/containers/bitseq/bititerator_ut.cpp
+++ b/library/cpp/containers/bitseq/bititerator_ut.cpp
@@ -1,6 +1,6 @@
 #include "bititerator.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/generic/vector.h>
 
 Y_UNIT_TEST_SUITE(TBitIteratorTest) {
diff --git a/library/cpp/containers/bitseq/bitvector_ut.cpp b/library/cpp/containers/bitseq/bitvector_ut.cpp
index 6137adab1e..78fd155f87 100644
--- a/library/cpp/containers/bitseq/bitvector_ut.cpp
+++ b/library/cpp/containers/bitseq/bitvector_ut.cpp
@@ -1,7 +1,7 @@
 #include "bitvector.h"
 #include "readonly_bitvector.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/memory/blob.h>
 #include <util/stream/buffer.h>
diff --git a/library/cpp/containers/compact_vector/compact_vector_ut.cpp b/library/cpp/containers/compact_vector/compact_vector_ut.cpp
index 7d413d6575..cef0f81726 100644
--- a/library/cpp/containers/compact_vector/compact_vector_ut.cpp
+++ b/library/cpp/containers/compact_vector/compact_vector_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "compact_vector.h"
 
diff --git a/library/cpp/containers/comptrie/benchmark/main.cpp b/library/cpp/containers/comptrie/benchmark/main.cpp
index 6e42dad18a..8a353b6b5d 100644
--- a/library/cpp/containers/comptrie/benchmark/main.cpp
+++ b/library/cpp/containers/comptrie/benchmark/main.cpp
@@ -1,9 +1,9 @@
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 
-#include <library/cpp/containers/comptrie/comptrie_trie.h>
-#include <library/cpp/containers/comptrie/comptrie_builder.h>
-#include <library/cpp/containers/comptrie/search_iterator.h>
-#include <library/cpp/containers/comptrie/pattern_searcher.h>
+#include <library/cpp/containers/comptrie/comptrie_trie.h> 
+#include <library/cpp/containers/comptrie/comptrie_builder.h> 
+#include <library/cpp/containers/comptrie/search_iterator.h> 
+#include <library/cpp/containers/comptrie/pattern_searcher.h> 
 
 #include <library/cpp/on_disk/aho_corasick/writer.h>
 #include <library/cpp/on_disk/aho_corasick/reader.h>
diff --git a/library/cpp/containers/comptrie/benchmark/ya.make b/library/cpp/containers/comptrie/benchmark/ya.make
index 16fa19530d..fcd3d2851c 100644
--- a/library/cpp/containers/comptrie/benchmark/ya.make
+++ b/library/cpp/containers/comptrie/benchmark/ya.make
@@ -7,7 +7,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/containers/comptrie
+    library/cpp/containers/comptrie 
     util
 )
 
diff --git a/library/cpp/containers/comptrie/comptrie_builder.inl b/library/cpp/containers/comptrie/comptrie_builder.inl
index f273fa6571..fd8d30b13c 100644
--- a/library/cpp/containers/comptrie/comptrie_builder.inl
+++ b/library/cpp/containers/comptrie/comptrie_builder.inl
@@ -745,8 +745,8 @@ void TCompactTrieBuilder<T, D, S>::TCompactTrieBuilderImpl::Clear() {
     Pool.Clear();
     NodeAllocator.Reset(new TFixedSizeAllocator(sizeof(TNode) + PayloadSize, TDefaultAllocator::Instance()));
     Root = new (*NodeAllocator) TNode;
-    EntryCount = 0;
-    NodeCount = 1;
+    EntryCount = 0; 
+    NodeCount = 1; 
 }
 
 template <class T, class D, class S>
diff --git a/library/cpp/containers/comptrie/comptrie_ut.cpp b/library/cpp/containers/comptrie/comptrie_ut.cpp
index 74bee09b5d..f71b285e6a 100644
--- a/library/cpp/containers/comptrie/comptrie_ut.cpp
+++ b/library/cpp/containers/comptrie/comptrie_ut.cpp
@@ -1,5 +1,5 @@
 #include <util/random/shuffle.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/output.h>
 #include <utility>
@@ -206,7 +206,7 @@ public:
     void TestMergeFromBuffer();
     void TestUnique();
     void TestAddRetValue();
-    void TestClear();
+    void TestClear(); 
 
     void TestIterateEmptyKey();
 
@@ -983,27 +983,27 @@ void TCompactTrieTest::TestAddRetValue() {
 }
 
 void TCompactTrieTest::TestClear() {
-    TCompactTrieBuilder<char, ui32> builder;
-    const char* data[] = {
-        "Kazan",
-        "Moscow",
-        "Monino",
-        "Murmansk",
-        "Fryanovo",
-        "Fryazino",
-        "Fryazevo",
-        "Fry",
-        "Tumen",
-    };
+    TCompactTrieBuilder<char, ui32> builder; 
+    const char* data[] = { 
+        "Kazan", 
+        "Moscow", 
+        "Monino", 
+        "Murmansk", 
+        "Fryanovo", 
+        "Fryazino", 
+        "Fryazevo", 
+        "Fry", 
+        "Tumen", 
+    }; 
     for (size_t i = 0; i < Y_ARRAY_SIZE(data); ++i) {
-        builder.Add(data[i], strlen(data[i]), i + 1);
-    }
+        builder.Add(data[i], strlen(data[i]), i + 1); 
+    } 
     UNIT_ASSERT(builder.GetEntryCount() == Y_ARRAY_SIZE(data));
-    builder.Clear();
-    UNIT_ASSERT(builder.GetEntryCount() == 0);
-    UNIT_ASSERT(builder.GetNodeCount() == 1);
-}
-
+    builder.Clear(); 
+    UNIT_ASSERT(builder.GetEntryCount() == 0); 
+    UNIT_ASSERT(builder.GetNodeCount() == 1); 
+} 
+ 
 void TCompactTrieTest::TestFindTails() {
     TestFindTailsImpl("aa");
     TestFindTailsImpl("bb");
diff --git a/library/cpp/containers/comptrie/loader/loader_ut.cpp b/library/cpp/containers/comptrie/loader/loader_ut.cpp
index 345063a31e..1654f8d4d0 100644
--- a/library/cpp/containers/comptrie/loader/loader_ut.cpp
+++ b/library/cpp/containers/comptrie/loader/loader_ut.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/containers/comptrie/comptrie.h>
-#include <library/cpp/containers/comptrie/loader/loader.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/containers/comptrie/comptrie.h> 
+#include <library/cpp/containers/comptrie/loader/loader.h> 
 
 using TDummyTrie = TCompactTrie<char, i32>;
 
diff --git a/library/cpp/containers/comptrie/loader/ut/ya.make b/library/cpp/containers/comptrie/loader/ut/ya.make
index 6c0334d3ea..6f20e6d699 100644
--- a/library/cpp/containers/comptrie/loader/ut/ya.make
+++ b/library/cpp/containers/comptrie/loader/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/containers/comptrie/loader)
+UNITTEST_FOR(library/cpp/containers/comptrie/loader) 
 
 OWNER(my34)
 
@@ -12,7 +12,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/containers/comptrie/loader
+    library/cpp/containers/comptrie/loader 
 )
 
 END()
diff --git a/library/cpp/containers/comptrie/loader/ya.make b/library/cpp/containers/comptrie/loader/ya.make
index 1e23e442a0..8279dd86e5 100644
--- a/library/cpp/containers/comptrie/loader/ya.make
+++ b/library/cpp/containers/comptrie/loader/ya.make
@@ -9,7 +9,7 @@ SRCS(
 
 PEERDIR(
     library/cpp/archive
-    library/cpp/containers/comptrie
+    library/cpp/containers/comptrie 
 )
 
 END()
diff --git a/library/cpp/containers/comptrie/pattern_searcher.h b/library/cpp/containers/comptrie/pattern_searcher.h
index caab51dc1c..bce5f8615b 100644
--- a/library/cpp/containers/comptrie/pattern_searcher.h
+++ b/library/cpp/containers/comptrie/pattern_searcher.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "comptrie_builder.h"
-#include "comptrie_trie.h"
-#include "comptrie_impl.h"
+#include "comptrie_builder.h" 
+#include "comptrie_trie.h" 
+#include "comptrie_impl.h" 
 #include <library/cpp/packers/packers.h>
 
 #include <util/system/yassert.h>
diff --git a/library/cpp/containers/comptrie/ut/ya.make b/library/cpp/containers/comptrie/ut/ya.make
index c4f4666009..4ad483c0dc 100644
--- a/library/cpp/containers/comptrie/ut/ya.make
+++ b/library/cpp/containers/comptrie/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/containers/comptrie)
+UNITTEST_FOR(library/cpp/containers/comptrie) 
 
 OWNER(alzobnin)
 
diff --git a/library/cpp/containers/flat_hash/benchmark/flat_hash_benchmark.cpp b/library/cpp/containers/flat_hash/benchmark/flat_hash_benchmark.cpp
index 040cff3fff..c9f90a5bf1 100644
--- a/library/cpp/containers/flat_hash/benchmark/flat_hash_benchmark.cpp
+++ b/library/cpp/containers/flat_hash/benchmark/flat_hash_benchmark.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/containers/flat_hash/flat_hash.h>
 
 #include <library/cpp/containers/dense_hash/dense_hash.h>
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 
 #include <util/random/random.h>
 #include <util/generic/xrange.h>
diff --git a/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp
index b17b30fa80..8da76a0512 100644
--- a/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp
+++ b/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/containers/flat_hash/lib/containers.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/algorithm.h>
 #include <util/random/random.h>
diff --git a/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp
index 0b77bf043f..f0282c11b6 100644
--- a/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp
+++ b/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/containers/flat_hash/lib/iterator.h>
 #include <library/cpp/containers/flat_hash/lib/containers.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/random/random.h>
 #include <util/generic/algorithm.h>
diff --git a/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp
index 593f8cbb1b..33484a1459 100644
--- a/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp
+++ b/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/containers/flat_hash/lib/probings.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NFlatHash;
 
diff --git a/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp
index 4167947ece..299249c5e7 100644
--- a/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp
+++ b/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/containers/flat_hash/lib/size_fitters.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NFlatHash;
 
diff --git a/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp
index ea511e2c6a..1c34598ee0 100644
--- a/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp
+++ b/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/containers/flat_hash/lib/size_fitters.h>
 #include <library/cpp/containers/flat_hash/lib/table.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/algorithm.h>
 #include <util/random/random.h>
diff --git a/library/cpp/containers/flat_hash/ut/flat_hash_ut.cpp b/library/cpp/containers/flat_hash/ut/flat_hash_ut.cpp
index 2b9d6a1dc2..77c6d5ff95 100644
--- a/library/cpp/containers/flat_hash/ut/flat_hash_ut.cpp
+++ b/library/cpp/containers/flat_hash/ut/flat_hash_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/containers/flat_hash/flat_hash.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NFH;
 
diff --git a/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp b/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp
index cab2365cce..07ca1176fd 100644
--- a/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp
+++ b/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/containers/intrusive_avl_tree/avltree.h>
 
diff --git a/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp b/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp
index c34ed1fd9b..5a75bdd8f5 100644
--- a/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp
+++ b/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp
@@ -1,6 +1,6 @@
 #include "rb_tree.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/random/fast.h>
 #include <util/random/easy.h>
diff --git a/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp b/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp
index e867808ee4..7d3e544aa7 100644
--- a/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp
+++ b/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/containers/paged_vector/paged_vector.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <stdexcept>
 
diff --git a/library/cpp/containers/sorted_vector/sorted_vector_ut.cpp b/library/cpp/containers/sorted_vector/sorted_vector_ut.cpp
index 893862f098..47a718e729 100644
--- a/library/cpp/containers/sorted_vector/sorted_vector_ut.cpp
+++ b/library/cpp/containers/sorted_vector/sorted_vector_ut.cpp
@@ -1,6 +1,6 @@
 #include "sorted_vector.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/string.h>
 #include <util/generic/strbuf.h>
diff --git a/library/cpp/containers/stack_array/ut/tests_ut.cpp b/library/cpp/containers/stack_array/ut/tests_ut.cpp
index 3e96384f0e..b99334ba1e 100644
--- a/library/cpp/containers/stack_array/ut/tests_ut.cpp
+++ b/library/cpp/containers/stack_array/ut/tests_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/containers/stack_array/stack_array.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TestStackArray) {
     using namespace NStackArray;
diff --git a/library/cpp/containers/stack_vector/stack_vec_ut.cpp b/library/cpp/containers/stack_vector/stack_vec_ut.cpp
index 19f9677781..003ec955e6 100644
--- a/library/cpp/containers/stack_vector/stack_vec_ut.cpp
+++ b/library/cpp/containers/stack_vector/stack_vec_ut.cpp
@@ -1,6 +1,6 @@
 #include "stack_vec.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace {
     struct TNotCopyAssignable {
diff --git a/library/cpp/containers/stack_vector/ut/ya.make b/library/cpp/containers/stack_vector/ut/ya.make
index 1d70496954..86327485b0 100644
--- a/library/cpp/containers/stack_vector/ut/ya.make
+++ b/library/cpp/containers/stack_vector/ut/ya.make
@@ -1,8 +1,8 @@
 UNITTEST()
 
-OWNER(ilnurkh)
+OWNER(ilnurkh) 
 
-SRCDIR(library/cpp/containers/stack_vector)
+SRCDIR(library/cpp/containers/stack_vector) 
 
 SRCS(
     stack_vec_ut.cpp
diff --git a/library/cpp/containers/stack_vector/ya.make b/library/cpp/containers/stack_vector/ya.make
index cfb63295ec..938bf2945b 100644
--- a/library/cpp/containers/stack_vector/ya.make
+++ b/library/cpp/containers/stack_vector/ya.make
@@ -1,11 +1,11 @@
 LIBRARY()
 
-OWNER(ilnurkh)
+OWNER(ilnurkh) 
 
 SRCS(
     stack_vec.cpp
 )
 
 END()
-
-RECURSE_FOR_TESTS(ut)
+ 
+RECURSE_FOR_TESTS(ut) 
diff --git a/library/cpp/containers/top_keeper/README.md b/library/cpp/containers/top_keeper/README.md
index f160fb1c01..e7a1adb9af 100644
--- a/library/cpp/containers/top_keeper/README.md
+++ b/library/cpp/containers/top_keeper/README.md
@@ -23,4 +23,4 @@ TopKeeper - структура данных для поддержания "top M
 В ситуации когда нужны чередующиеся добавления / извлечения - используйте LimitedHeap
 
 Примеры использования:
-library/cpp/containers/top_keeper/ut
+library/cpp/containers/top_keeper/ut 
diff --git a/library/cpp/containers/top_keeper/top_keeper/ut/top_keeper_ut.cpp b/library/cpp/containers/top_keeper/top_keeper/ut/top_keeper_ut.cpp
index a938279025..761478481d 100644
--- a/library/cpp/containers/top_keeper/top_keeper/ut/top_keeper_ut.cpp
+++ b/library/cpp/containers/top_keeper/top_keeper/ut/top_keeper_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/containers/limited_heap/limited_heap.h>
 #include <library/cpp/containers/top_keeper/top_keeper.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/random/random.h>
 
 static ui32 seed = 3;
diff --git a/library/cpp/containers/top_keeper/ut/top_keeper_ut.cpp b/library/cpp/containers/top_keeper/ut/top_keeper_ut.cpp
index a938279025..ecb624143d 100644
--- a/library/cpp/containers/top_keeper/ut/top_keeper_ut.cpp
+++ b/library/cpp/containers/top_keeper/ut/top_keeper_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/containers/limited_heap/limited_heap.h>
-#include <library/cpp/containers/top_keeper/top_keeper.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/containers/top_keeper/top_keeper.h> 
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/random/random.h>
 
 static ui32 seed = 3;
diff --git a/library/cpp/containers/top_keeper/ut/ya.make b/library/cpp/containers/top_keeper/ut/ya.make
index 42cfdd6f13..49093c470c 100644
--- a/library/cpp/containers/top_keeper/ut/ya.make
+++ b/library/cpp/containers/top_keeper/ut/ya.make
@@ -1,7 +1,7 @@
-UNITTEST_FOR(library/cpp/containers/top_keeper)
+UNITTEST_FOR(library/cpp/containers/top_keeper) 
 
 OWNER(
-    ilnurkh
+    ilnurkh 
     rmplstiltskin
 )
 
diff --git a/library/cpp/containers/top_keeper/ya.make b/library/cpp/containers/top_keeper/ya.make
index ed206a1df9..7f0779e051 100644
--- a/library/cpp/containers/top_keeper/ya.make
+++ b/library/cpp/containers/top_keeper/ya.make
@@ -1,13 +1,13 @@
 LIBRARY()
 
-OWNER(ilnurkh)
+OWNER(ilnurkh) 
 
 SRCS(
     top_keeper.cpp
 )
 
 END()
-
-RECURSE_FOR_TESTS(ut)
-
-
+ 
+RECURSE_FOR_TESTS(ut) 
+ 
+ 
diff --git a/library/cpp/containers/ya.make b/library/cpp/containers/ya.make
index 4b1b315e6a..a65dee29b3 100644
--- a/library/cpp/containers/ya.make
+++ b/library/cpp/containers/ya.make
@@ -1,5 +1,5 @@
 RECURSE(
-    2d_array
+    2d_array 
     absl_flat_hash
     absl_tstring_flat_hash
     atomizer
@@ -7,11 +7,11 @@ RECURSE(
     bitseq/ut
     compact_vector
     compact_vector/ut
-    comptrie
-    comptrie/loader
-    comptrie/loader/ut
-    comptrie/ut
-    comptrie/benchmark
+    comptrie 
+    comptrie/loader 
+    comptrie/loader/ut 
+    comptrie/ut 
+    comptrie/benchmark 
     concurrent_hash
     concurrent_hash_set
     concurrent_hash_set/ut
@@ -22,8 +22,8 @@ RECURSE(
     dictionary/ut
     disjoint_interval_tree
     disjoint_interval_tree/ut
-    ext_priority_queue
-    ext_priority_queue/ut
+    ext_priority_queue 
+    ext_priority_queue/ut 
     fast_trie
     fast_trie/ut
     flat_hash
@@ -59,11 +59,11 @@ RECURSE(
     spars_ar
     stack_array
     stack_array/ut
-    stack_vector
+    stack_vector 
     str_hash
     str_map
-    top_keeper
-    top_keeper/ut
+    top_keeper 
+    top_keeper/ut 
     two_level_hash
     two_level_hash/ut
     vp_tree
diff --git a/library/cpp/coroutine/engine/coroutine_ut.cpp b/library/cpp/coroutine/engine/coroutine_ut.cpp
index 8b372496a2..38554cfaaf 100644
--- a/library/cpp/coroutine/engine/coroutine_ut.cpp
+++ b/library/cpp/coroutine/engine/coroutine_ut.cpp
@@ -2,7 +2,7 @@
 #include "condvar.h"
 #include "network.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/string/cast.h>
 #include <util/system/pipe.h>
diff --git a/library/cpp/coroutine/engine/poller.cpp b/library/cpp/coroutine/engine/poller.cpp
index 61164fa56b..02aabed4f5 100644
--- a/library/cpp/coroutine/engine/poller.cpp
+++ b/library/cpp/coroutine/engine/poller.cpp
@@ -4,7 +4,7 @@
 #include <util/memory/smallobj.h>
 #include <util/generic/intrlist.h>
 #include <util/generic/singleton.h>
-#include <util/system/env.h>
+#include <util/system/env.h> 
 #include <util/string/cast.h>
 
 namespace {
diff --git a/library/cpp/dbg_output/ut/dbg_output_ut.cpp b/library/cpp/dbg_output/ut/dbg_output_ut.cpp
index 7b285c84cb..825ff8662a 100644
--- a/library/cpp/dbg_output/ut/dbg_output_ut.cpp
+++ b/library/cpp/dbg_output/ut/dbg_output_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/dbg_output/dump.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/str.h>
 #include <util/string/builder.h>
diff --git a/library/cpp/deprecated/accessors/accessors_ut.cpp b/library/cpp/deprecated/accessors/accessors_ut.cpp
index a9bdc9fcc4..8e57abd493 100644
--- a/library/cpp/deprecated/accessors/accessors_ut.cpp
+++ b/library/cpp/deprecated/accessors/accessors_ut.cpp
@@ -1,6 +1,6 @@
 #include "accessors.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/buffer.h>
 #include <util/generic/vector.h>
diff --git a/library/cpp/deprecated/enum_codegen/enum_codegen_ut.cpp b/library/cpp/deprecated/enum_codegen/enum_codegen_ut.cpp
index f8f1c9b6df..8b317a3276 100644
--- a/library/cpp/deprecated/enum_codegen/enum_codegen_ut.cpp
+++ b/library/cpp/deprecated/enum_codegen/enum_codegen_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "enum_codegen.h"
 
diff --git a/library/cpp/deprecated/kmp/kmp_ut.cpp b/library/cpp/deprecated/kmp/kmp_ut.cpp
index c2eda83c57..fa2a0bba6e 100644
--- a/library/cpp/deprecated/kmp/kmp_ut.cpp
+++ b/library/cpp/deprecated/kmp/kmp_ut.cpp
@@ -1,6 +1,6 @@
 #include "kmp.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/output.h>
 
diff --git a/library/cpp/deprecated/mapped_file/mapped_file.cpp b/library/cpp/deprecated/mapped_file/mapped_file.cpp
index b0e4511299..9cee7da7c0 100644
--- a/library/cpp/deprecated/mapped_file/mapped_file.cpp
+++ b/library/cpp/deprecated/mapped_file/mapped_file.cpp
@@ -30,7 +30,7 @@ void TMappedFile::precharge(size_t off, size_t size) const {
 void TMappedFile::init(const TString& name) {
     THolder<TFileMap> map(new TFileMap(name));
     TMappedFile newFile(map.Get(), name.data());
-    Y_UNUSED(map.Release());
+    Y_UNUSED(map.Release()); 
     newFile.swap(*this);
     newFile.term();
 }
@@ -38,7 +38,7 @@ void TMappedFile::init(const TString& name) {
 void TMappedFile::init(const TString& name, size_t length, TFileMap::EOpenMode om) {
     THolder<TFileMap> map(new TFileMap(name, length, om));
     TMappedFile newFile(map.Get(), name.data());
-    Y_UNUSED(map.Release());
+    Y_UNUSED(map.Release()); 
     newFile.swap(*this);
     newFile.term();
 }
@@ -46,7 +46,7 @@ void TMappedFile::init(const TString& name, size_t length, TFileMap::EOpenMode o
 void TMappedFile::init(const TFile& file, TFileMap::EOpenMode om, const char* dbgName) {
     THolder<TFileMap> map(new TFileMap(file, om));
     TMappedFile newFile(map.Get(), dbgName);
-    Y_UNUSED(map.Release());
+    Y_UNUSED(map.Release()); 
     newFile.swap(*this);
     newFile.term();
 }
@@ -54,7 +54,7 @@ void TMappedFile::init(const TFile& file, TFileMap::EOpenMode om, const char* db
 void TMappedFile::init(const TString& name, TFileMap::EOpenMode om) {
     THolder<TFileMap> map(new TFileMap(name, om));
     TMappedFile newFile(map.Get(), name.data());
-    Y_UNUSED(map.Release());
+    Y_UNUSED(map.Release()); 
     newFile.swap(*this);
     newFile.term();
 }
diff --git a/library/cpp/deprecated/mapped_file/ut/mapped_file_ut.cpp b/library/cpp/deprecated/mapped_file/ut/mapped_file_ut.cpp
index afbd5b3358..726af9a7e6 100644
--- a/library/cpp/deprecated/mapped_file/ut/mapped_file_ut.cpp
+++ b/library/cpp/deprecated/mapped_file/ut/mapped_file_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/deprecated/mapped_file/mapped_file.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/fs.h>
 
diff --git a/library/cpp/deprecated/split/delim_string_iter_ut.cpp b/library/cpp/deprecated/split/delim_string_iter_ut.cpp
index 18a8b2a160..c596c6d438 100644
--- a/library/cpp/deprecated/split/delim_string_iter_ut.cpp
+++ b/library/cpp/deprecated/split/delim_string_iter_ut.cpp
@@ -1,6 +1,6 @@
 #include "delim_string_iter.h"
 #include <util/generic/vector.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 /// Test that TDelimStringIter build on top of given string and delimeter will produce expected sequence
 static void AssertStringSplit(const TString& str, const TString& delim, const TVector<TString>& expected) {
diff --git a/library/cpp/deprecated/split/split_iterator_ut.cpp b/library/cpp/deprecated/split/split_iterator_ut.cpp
index be5069c4be..b30d071986 100644
--- a/library/cpp/deprecated/split/split_iterator_ut.cpp
+++ b/library/cpp/deprecated/split/split_iterator_ut.cpp
@@ -1,6 +1,6 @@
 #include "split_iterator.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 class TSplitIteratorTest: public TTestBase {
     UNIT_TEST_SUITE(TSplitIteratorTest);
diff --git a/library/cpp/diff/diff_ut.cpp b/library/cpp/diff/diff_ut.cpp
index b82a7b000e..06273ded20 100644
--- a/library/cpp/diff/diff_ut.cpp
+++ b/library/cpp/diff/diff_ut.cpp
@@ -1,6 +1,6 @@
 #include "diff.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NDiff;
 
diff --git a/library/cpp/diff/ut/ya.make b/library/cpp/diff/ut/ya.make
index 360134d186..40ab4698e5 100644
--- a/library/cpp/diff/ut/ya.make
+++ b/library/cpp/diff/ut/ya.make
@@ -2,10 +2,10 @@ UNITTEST()
 
 OWNER(antonovvk)
 
-SRCDIR(library/cpp/diff)
+SRCDIR(library/cpp/diff) 
 
 PEERDIR(
-    library/cpp/diff
+    library/cpp/diff 
 )
 
 SRCS(
diff --git a/library/cpp/digest/argonish/benchmark/mbench.cpp b/library/cpp/digest/argonish/benchmark/mbench.cpp
index 178c1169c9..ff846c5d4a 100644
--- a/library/cpp/digest/argonish/benchmark/mbench.cpp
+++ b/library/cpp/digest/argonish/benchmark/mbench.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 #include <library/cpp/digest/argonish/argon2.h>
 
 Y_CPU_BENCHMARK(Argon2d_2048_REF, iface) {
diff --git a/library/cpp/digest/argonish/internal/argon2/argon2_base.h b/library/cpp/digest/argonish/internal/argon2/argon2_base.h
index 2385cc947c..359c4d91b6 100644
--- a/library/cpp/digest/argonish/internal/argon2/argon2_base.h
+++ b/library/cpp/digest/argonish/internal/argon2/argon2_base.h
@@ -3,7 +3,7 @@
 #include <util/generic/yexception.h>
 #include <library/cpp/digest/argonish/argon2.h>
 #include <library/cpp/digest/argonish/internal/blake2b/blake2b.h>
-#include <library/cpp/threading/poor_man_openmp/thread_helper.h>
+#include <library/cpp/threading/poor_man_openmp/thread_helper.h> 
 
 namespace NArgonish {
     const ui32 ARGON2_PREHASH_DIGEST_LENGTH = 64;
diff --git a/library/cpp/digest/argonish/ut/ut.cpp b/library/cpp/digest/argonish/ut/ut.cpp
index 12ef530a18..6d36eb9d0d 100644
--- a/library/cpp/digest/argonish/ut/ut.cpp
+++ b/library/cpp/digest/argonish/ut/ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/digest/argonish/argon2.h>
 #include <library/cpp/digest/argonish/blake2b.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(ArgonishTest) {
     const ui8 GenKatPassword[32] = {
diff --git a/library/cpp/digest/argonish/ut_fat/ut.cpp b/library/cpp/digest/argonish/ut_fat/ut.cpp
index 41fa001685..cd17876cba 100644
--- a/library/cpp/digest/argonish/ut_fat/ut.cpp
+++ b/library/cpp/digest/argonish/ut_fat/ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/digest/argonish/argon2.h>
 #include <library/cpp/digest/argonish/blake2b.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(ArgonishTest) {
     const ui8 GenKatPassword[32] = {
diff --git a/library/cpp/digest/crc32c/crc32c_ut.cpp b/library/cpp/digest/crc32c/crc32c_ut.cpp
index aa31b83422..e829467afc 100644
--- a/library/cpp/digest/crc32c/crc32c_ut.cpp
+++ b/library/cpp/digest/crc32c/crc32c_ut.cpp
@@ -1,6 +1,6 @@
 #include "crc32c.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TestCrc32c) {
     Y_UNIT_TEST(TestCalc) {
diff --git a/library/cpp/digest/lower_case/hash_ops_ut.cpp b/library/cpp/digest/lower_case/hash_ops_ut.cpp
index a7ab0b86ea..4c9af596f3 100644
--- a/library/cpp/digest/lower_case/hash_ops_ut.cpp
+++ b/library/cpp/digest/lower_case/hash_ops_ut.cpp
@@ -1,6 +1,6 @@
 #include "hash_ops.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TestCIHash) {
     Y_UNIT_TEST(TestYHash1) {
diff --git a/library/cpp/digest/lower_case/lchash_ut.cpp b/library/cpp/digest/lower_case/lchash_ut.cpp
index 5711fe7cd7..4df3b80e17 100644
--- a/library/cpp/digest/lower_case/lchash_ut.cpp
+++ b/library/cpp/digest/lower_case/lchash_ut.cpp
@@ -1,6 +1,6 @@
 #include "lchash.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TWebDaemonHash) {
     Y_UNIT_TEST(Stability) {
diff --git a/library/cpp/digest/md5/md5_medium_ut.cpp b/library/cpp/digest/md5/md5_medium_ut.cpp
index a940c5cb66..524e0b1e44 100644
--- a/library/cpp/digest/md5/md5_medium_ut.cpp
+++ b/library/cpp/digest/md5/md5_medium_ut.cpp
@@ -1,6 +1,6 @@
 #include "md5.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TMD5MediumTest) {
     Y_UNIT_TEST(TestOverflow) {
diff --git a/library/cpp/digest/md5/md5_ut.cpp b/library/cpp/digest/md5/md5_ut.cpp
index 1c3e4ad0a9..51afd8bc55 100644
--- a/library/cpp/digest/md5/md5_ut.cpp
+++ b/library/cpp/digest/md5/md5_ut.cpp
@@ -1,6 +1,6 @@
 #include "md5.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/fs.h>
 #include <util/stream/file.h>
diff --git a/library/cpp/digest/md5/ya.make b/library/cpp/digest/md5/ya.make
index c09ec1c326..9420c4e00e 100644
--- a/library/cpp/digest/md5/ya.make
+++ b/library/cpp/digest/md5/ya.make
@@ -11,7 +11,7 @@ SRCS(
 
 PEERDIR(
     contrib/libs/nayuki_md5
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
 )
 
 END()
diff --git a/library/cpp/digest/old_crc/crc_ut.cpp b/library/cpp/digest/old_crc/crc_ut.cpp
index 46e1d5d29b..03e486b3d7 100644
--- a/library/cpp/digest/old_crc/crc_ut.cpp
+++ b/library/cpp/digest/old_crc/crc_ut.cpp
@@ -1,6 +1,6 @@
 #include "crc.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/output.h>
 
diff --git a/library/cpp/digest/sfh/sfh_ut.cpp b/library/cpp/digest/sfh/sfh_ut.cpp
index 912999bae7..82107d0896 100644
--- a/library/cpp/digest/sfh/sfh_ut.cpp
+++ b/library/cpp/digest/sfh/sfh_ut.cpp
@@ -1,6 +1,6 @@
 #include "sfh.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/output.h>
 
diff --git a/library/cpp/dns/ut/dns_ut.cpp b/library/cpp/dns/ut/dns_ut.cpp
index aae05a742c..9c2acf72a0 100644
--- a/library/cpp/dns/ut/dns_ut.cpp
+++ b/library/cpp/dns/ut/dns_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/dns/cache.h>
 #include <util/network/address.h>
 
diff --git a/library/cpp/enumbitset/enumbitset_ut.cpp b/library/cpp/enumbitset/enumbitset_ut.cpp
index e55b3251c3..fdc68bf28c 100644
--- a/library/cpp/enumbitset/enumbitset_ut.cpp
+++ b/library/cpp/enumbitset/enumbitset_ut.cpp
@@ -1,6 +1,6 @@
 #include "enumbitset.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/str.h>
 #include <util/stream/file.h>
diff --git a/library/cpp/getopt/last_getopt.h b/library/cpp/getopt/last_getopt.h
index d14f05cc5b..3a50270b44 100644
--- a/library/cpp/getopt/last_getopt.h
+++ b/library/cpp/getopt/last_getopt.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <library/cpp/getopt/small/last_getopt.h>
+#include <library/cpp/getopt/small/last_getopt.h> 
diff --git a/library/cpp/getopt/last_getopt_demo/demo.cpp b/library/cpp/getopt/last_getopt_demo/demo.cpp
index 79426a9cc9..dfa98829a6 100644
--- a/library/cpp/getopt/last_getopt_demo/demo.cpp
+++ b/library/cpp/getopt/last_getopt_demo/demo.cpp
@@ -1,5 +1,5 @@
-#include <library/cpp/getopt/last_getopt.h>
-#include <library/cpp/getopt/modchooser.h>
+#include <library/cpp/getopt/last_getopt.h> 
+#include <library/cpp/getopt/modchooser.h> 
 #include <library/cpp/colorizer/colors.h>
 
 // For the sake of this example, let's implement Wget
@@ -158,7 +158,7 @@ protected:
         opts.AddSection(
             "Description",
 
-            "LastGetoptDemo is a showcase of library/cpp/getopt capabilities. It mimics interface of Wget "
+            "LastGetoptDemo is a showcase of library/cpp/getopt capabilities. It mimics interface of Wget " 
             "but doesn't actually do anything."
             "\n\n"
             "GNU Wget, on the other hand, is a free utility for non-interactive download of files from the Web."
diff --git a/library/cpp/getopt/last_getopt_demo/ya.make b/library/cpp/getopt/last_getopt_demo/ya.make
index 53f1cfc122..a0a6bb7f3e 100644
--- a/library/cpp/getopt/last_getopt_demo/ya.make
+++ b/library/cpp/getopt/last_getopt_demo/ya.make
@@ -3,7 +3,7 @@ PROGRAM(last_getopt_demo)
 OWNER(amatanhead)
 
 PEERDIR(
-    library/cpp/getopt
+    library/cpp/getopt 
 )
 
 SRCS(
diff --git a/library/cpp/getopt/last_getopt_support.h b/library/cpp/getopt/last_getopt_support.h
index b71c7045b1..6a2fd0ba86 100644
--- a/library/cpp/getopt/last_getopt_support.h
+++ b/library/cpp/getopt/last_getopt_support.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <library/cpp/getopt/small/last_getopt_support.h>
+#include <library/cpp/getopt/small/last_getopt_support.h> 
diff --git a/library/cpp/getopt/modchooser.h b/library/cpp/getopt/modchooser.h
index 9bf73daf13..956d4c7fd9 100644
--- a/library/cpp/getopt/modchooser.h
+++ b/library/cpp/getopt/modchooser.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <library/cpp/getopt/small/modchooser.h>
+#include <library/cpp/getopt/small/modchooser.h> 
diff --git a/library/cpp/getopt/opt.h b/library/cpp/getopt/opt.h
index d2a85075bd..a0c6fdee64 100644
--- a/library/cpp/getopt/opt.h
+++ b/library/cpp/getopt/opt.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <library/cpp/getopt/small/opt.h>
+#include <library/cpp/getopt/small/opt.h> 
diff --git a/library/cpp/getopt/opt2.h b/library/cpp/getopt/opt2.h
index 2d35bc7b29..17373ce273 100644
--- a/library/cpp/getopt/opt2.h
+++ b/library/cpp/getopt/opt2.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <library/cpp/getopt/small/opt2.h>
+#include <library/cpp/getopt/small/opt2.h> 
diff --git a/library/cpp/getopt/posix_getopt.h b/library/cpp/getopt/posix_getopt.h
index 8cb7ece624..38e1650c89 100644
--- a/library/cpp/getopt/posix_getopt.h
+++ b/library/cpp/getopt/posix_getopt.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <library/cpp/getopt/small/posix_getopt.h>
+#include <library/cpp/getopt/small/posix_getopt.h> 
diff --git a/library/cpp/getopt/print.cpp b/library/cpp/getopt/print.cpp
index 8cf1c62e4d..0aadd22eba 100644
--- a/library/cpp/getopt/print.cpp
+++ b/library/cpp/getopt/print.cpp
@@ -9,7 +9,7 @@
 #include <library/cpp/svnversion/svnversion.h>
 #include <library/cpp/build_info/build_info.h>
 
-namespace NLastGetoptPrivate {
+namespace NLastGetoptPrivate { 
     TString InitVersionString() {
         TString ts = GetProgramSvnVersion();
         ts += "\n";
@@ -21,7 +21,7 @@ namespace NLastGetoptPrivate {
         }
         return ts;
     }
-
+ 
     TString InitShortVersionString() {
         TString ts = GetProgramShortVersionData();
         return ts;
@@ -29,12 +29,12 @@ namespace NLastGetoptPrivate {
 
     TString& VersionString();
     TString& ShortVersionString();
-
-    struct TInit {
+ 
+    struct TInit { 
         TInit() {
-            VersionString() = InitVersionString();
+            VersionString() = InitVersionString(); 
             ShortVersionString() = InitShortVersionString();
-        }
-    } Init;
-
+        } 
+    } Init; 
+ 
 }
diff --git a/library/cpp/getopt/small/last_getopt.h b/library/cpp/getopt/small/last_getopt.h
index 07687bc914..e0479cc433 100644
--- a/library/cpp/getopt/small/last_getopt.h
+++ b/library/cpp/getopt/small/last_getopt.h
@@ -1,38 +1,38 @@
 #pragma once
 
-#include "last_getopt_opts.h"
-#include "last_getopt_easy_setup.h"
-#include "last_getopt_parse_result.h"
-
+#include "last_getopt_opts.h" 
+#include "last_getopt_easy_setup.h" 
+#include "last_getopt_parse_result.h" 
+ 
 #include <util/generic/function.h>
 #include <util/string/split.h>
 
-/// see some documentation in
-/// https://wiki.yandex-team.ru/development/poisk/arcadia/util/lastgetopt/
+/// see some documentation in 
+/// https://wiki.yandex-team.ru/development/poisk/arcadia/util/lastgetopt/ 
 /// https://wiki.yandex-team.ru/development/poisk/arcadia/library/getopt/
-/// see examples in library/cpp/getopt/last_getopt_demo
-
-//TODO: in most cases this include is unnecessary, but needed THandlerFunctor1<TpFunc, TpArg>::HandleOpt
-#include "last_getopt_parser.h"
+/// see examples in library/cpp/getopt/last_getopt_demo 
 
+//TODO: in most cases this include is unnecessary, but needed THandlerFunctor1<TpFunc, TpArg>::HandleOpt 
+#include "last_getopt_parser.h" 
+ 
 namespace NLastGetopt {
-    /// Handler to split option value by delimiter into a target container and allow ranges.
+    /// Handler to split option value by delimiter into a target container and allow ranges. 
     template <class Container>
     struct TOptRangeSplitHandler: public IOptHandler {
-    public:
-        using TContainer = Container;
-        using TValue = typename TContainer::value_type;
+    public: 
+        using TContainer = Container; 
+        using TValue = typename TContainer::value_type; 
 
-        explicit TOptRangeSplitHandler(TContainer* target, const char elementsDelim, const char rangesDelim)
-            : Target(target)
-            , ElementsDelim(elementsDelim)
+        explicit TOptRangeSplitHandler(TContainer* target, const char elementsDelim, const char rangesDelim) 
+            : Target(target) 
+            , ElementsDelim(elementsDelim) 
             , RangesDelim(rangesDelim)
         {
         }
 
         void HandleOpt(const TOptsParser* parser) override {
-            const TStringBuf curval(parser->CurValOrDef());
-            if (curval.IsInited()) {
+            const TStringBuf curval(parser->CurValOrDef()); 
+            if (curval.IsInited()) { 
                 StringSplitter(curval).Split(ElementsDelim).Consume([&](const TStringBuf& val) {
                     TStringBuf mutableValue = val;
 
@@ -47,39 +47,39 @@ namespace NLastGetopt {
                         Target->insert(Target->end(), first);
                     }
                 });
-            }
+            } 
         }
 
     private:
         TContainer* Target;
-        char ElementsDelim;
-        char RangesDelim;
+        char ElementsDelim; 
+        char RangesDelim; 
     };
 
     template <class Container>
     struct TOptSplitHandler: public IOptHandler {
-    public:
-        using TContainer = Container;
-        using TValue = typename TContainer::value_type;
+    public: 
+        using TContainer = Container; 
+        using TValue = typename TContainer::value_type; 
 
-        explicit TOptSplitHandler(TContainer* target, const char delim)
-            : Target(target)
+        explicit TOptSplitHandler(TContainer* target, const char delim) 
+            : Target(target) 
             , Delim(delim)
         {
         }
 
         void HandleOpt(const TOptsParser* parser) override {
-            const TStringBuf curval(parser->CurValOrDef());
-            if (curval.IsInited()) {
+            const TStringBuf curval(parser->CurValOrDef()); 
+            if (curval.IsInited()) { 
                 StringSplitter(curval).Split(Delim).Consume([&](const TStringBuf& val) {
                     Target->insert(Target->end(), NPrivate::OptFromString<TValue>(val, parser->CurOpt()));
                 });
-            }
+            } 
         }
 
-    private:
-        TContainer* Target;
-        char Delim;
+    private: 
+        TContainer* Target; 
+        char Delim; 
     };
 
     template <class TpFunc>
@@ -129,4 +129,4 @@ namespace NLastGetopt {
 
     }
 
-}
+} 
diff --git a/library/cpp/getopt/small/last_getopt_easy_setup.cpp b/library/cpp/getopt/small/last_getopt_easy_setup.cpp
index c87dedf95e..dea45dbb83 100644
--- a/library/cpp/getopt/small/last_getopt_easy_setup.cpp
+++ b/library/cpp/getopt/small/last_getopt_easy_setup.cpp
@@ -1,12 +1,12 @@
-#include "last_getopt_easy_setup.h"
-
-namespace NLastGetopt {
+#include "last_getopt_easy_setup.h" 
+ 
+namespace NLastGetopt { 
     TEasySetup::TEasySetup(const TStringBuf& optstring)
         : TOpts(optstring)
     {
         AddHelpOption();
     }
-
+ 
     TOpt& TEasySetup::AdjustParam(const char* longName, const char* help, const char* argName, bool required) {
         Y_ASSERT(longName);
         TOpt& o = AddLongOption(longName);
@@ -23,25 +23,25 @@ namespace NLastGetopt {
         }
         return o;
     }
-
+ 
     TEasySetup& TEasySetup::operator()(char shortName, const char* longName, const char* help, bool required) {
         AdjustParam(longName, help, nullptr, required).AddShortName(shortName);
         return *this;
-    }
+    } 
 
     TEasySetup& TEasySetup::operator()(char shortName, const char* longName, const char* argName, const char* help, bool required) {
         AdjustParam(longName, help, argName, required).AddShortName(shortName);
         return *this;
-    }
+    } 
 
     TEasySetup& TEasySetup::operator()(const char* longName, const char* help, bool required) {
         AdjustParam(longName, help, nullptr, required);
         return *this;
-    }
-
+    } 
+ 
     TEasySetup& TEasySetup::operator()(const char* longName, const char* argName, const char* help, bool required) {
         AdjustParam(longName, help, argName, required);
         return *this;
     }
-
-}
+ 
+} 
diff --git a/library/cpp/getopt/small/last_getopt_easy_setup.h b/library/cpp/getopt/small/last_getopt_easy_setup.h
index 60dddda225..8baa889a87 100644
--- a/library/cpp/getopt/small/last_getopt_easy_setup.h
+++ b/library/cpp/getopt/small/last_getopt_easy_setup.h
@@ -1,8 +1,8 @@
-#pragma once
-
-#include "last_getopt_opts.h"
-
-namespace NLastGetopt {
+#pragma once 
+ 
+#include "last_getopt_opts.h" 
+ 
+namespace NLastGetopt { 
     /**
      * Wrapper for TOpts class to make the life a bit easier.
      * Usual usage:
@@ -21,25 +21,25 @@ namespace NLastGetopt {
         TEasySetup(const TStringBuf& optstring = TStringBuf());
         TEasySetup& operator()(char shortName, const char* longName, const char* help, bool required = false);
         TEasySetup& operator()(char shortName, const char* longName, const char* argName, const char* help, bool required = false);
-
+ 
         template <class TpFunc>
         TEasySetup& operator()(char shortName, const char* longName, TpFunc handler, const char* help, bool required = false) {
             AdjustParam(longName, help, nullptr, handler, required).AddShortName(shortName);
             return *this;
         }
-
+ 
         TEasySetup& operator()(const char* longName, const char* help, bool required = false);
         TEasySetup& operator()(const char* longName, const char* argName, const char* help, bool required = false);
-
+ 
         template <class TpFunc>
         TEasySetup& operator()(const char* longName, TpFunc handler, const char* help, bool required = false) {
             AdjustParam(longName, help, nullptr, handler, required);
             return *this;
         }
-
+ 
     private:
         TOpt& AdjustParam(const char* longName, const char* help, const char* argName, bool required);
-
+ 
         template <class TpFunc>
         TOpt& AdjustParam(const char* longName, const char* help, const char* argName, TpFunc handler, bool required) {
             TOpt& o = AdjustParam(longName, help, argName, required);
@@ -47,5 +47,5 @@ namespace NLastGetopt {
             return o;
         }
     };
-
-}
+ 
+} 
diff --git a/library/cpp/getopt/small/last_getopt_handlers.h b/library/cpp/getopt/small/last_getopt_handlers.h
index d35456ef34..db6e21ded3 100644
--- a/library/cpp/getopt/small/last_getopt_handlers.h
+++ b/library/cpp/getopt/small/last_getopt_handlers.h
@@ -1,19 +1,19 @@
-#pragma once
-
-#include "last_getopt_support.h"
-
-#include <util/string/split.h>
+#pragma once 
+ 
+#include "last_getopt_support.h" 
+ 
+#include <util/string/split.h> 
 #include <util/system/compiler.h>
-
-namespace NLastGetopt {
-    /// Handler to split option value by delimiter into a target container.
+ 
+namespace NLastGetopt { 
+    /// Handler to split option value by delimiter into a target container. 
     template <class Container>
-    struct TOptSplitHandler;
-
-    /// Handler to split option value by delimiter into a target container and allow ranges.
+    struct TOptSplitHandler; 
+ 
+    /// Handler to split option value by delimiter into a target container and allow ranges. 
     template <class Container>
-    struct TOptRangeSplitHandler;
-
+    struct TOptRangeSplitHandler; 
+ 
     /// Handler to parse key-value pairs (default delimiter is '=') and apply user-supplied handler to each pair
     template <class TpFunc>
     struct TOptKVHandler;
@@ -21,4 +21,4 @@ namespace NLastGetopt {
     [[noreturn]] void PrintUsageAndExit(const TOptsParser* parser);
     [[noreturn]] void PrintVersionAndExit(const TOptsParser* parser);
     [[noreturn]] void PrintShortVersionAndExit(const TString& appName);
-}
+} 
diff --git a/library/cpp/getopt/small/last_getopt_opt.cpp b/library/cpp/getopt/small/last_getopt_opt.cpp
index 9a99437f4b..7f63053afe 100644
--- a/library/cpp/getopt/small/last_getopt_opt.cpp
+++ b/library/cpp/getopt/small/last_getopt_opt.cpp
@@ -1,16 +1,16 @@
-#include "last_getopt_opt.h"
-
-#include <util/stream/format.h>
-#include <util/string/escape.h>
-#include <util/generic/ylimits.h>
-#include <util/generic/utility.h>
-#include <util/generic/algorithm.h>
-#include <ctype.h>
-
-namespace NLastGetopt {
+#include "last_getopt_opt.h" 
+ 
+#include <util/stream/format.h> 
+#include <util/string/escape.h> 
+#include <util/generic/ylimits.h> 
+#include <util/generic/utility.h> 
+#include <util/generic/algorithm.h> 
+#include <ctype.h> 
+ 
+namespace NLastGetopt { 
     static const TStringBuf ExcludedShortNameChars = "= -\t\n";
     static const TStringBuf ExcludedLongNameChars = "= \t\n";
-
+ 
     bool TOpt::NameIs(const TString& name) const {
         for (const auto& next : LongNames_) {
             if (next == name)
@@ -18,7 +18,7 @@ namespace NLastGetopt {
         }
         return false;
     }
-
+ 
     bool TOpt::CharIs(char c) const {
         for (auto next : Chars_) {
             if (next == c)
@@ -26,31 +26,31 @@ namespace NLastGetopt {
         }
         return false;
     }
-
+ 
     char TOpt::GetChar() const {
         ;
         if (Chars_.empty())
             ythrow TConfException() << "no char for option " << this->ToShortString();
         return Chars_.at(0);
-    }
-
+    } 
+ 
     char TOpt::GetCharOr0() const {
         if (Chars_.empty())
             return 0;
         return GetChar();
-    }
-
+    } 
+ 
     TString TOpt::GetName() const {
         ;
         if (LongNames_.empty())
             ythrow TConfException() << "no name for option " << this->ToShortString();
         return LongNames_.at(0);
     }
-
+ 
     bool TOpt::IsAllowedShortName(unsigned char c) {
         return isprint(c) && TStringBuf::npos == ExcludedShortNameChars.find(c);
     }
-
+ 
     TOpt& TOpt::AddShortName(unsigned char c) {
         ;
         if (!IsAllowedShortName(c))
@@ -58,7 +58,7 @@ namespace NLastGetopt {
         Chars_.push_back(c);
         return *this;
     }
-
+ 
     bool TOpt::IsAllowedLongName(const TString& name, unsigned char* out) {
         for (size_t i = 0; i != name.size(); ++i) {
             const unsigned char c = name[i];
@@ -67,10 +67,10 @@ namespace NLastGetopt {
                     *out = c;
                 return false;
             }
-        }
+        } 
         return true;
-    }
-
+    } 
+ 
     TOpt& TOpt::AddLongName(const TString& name) {
         ;
         unsigned char c = 0;
@@ -80,13 +80,13 @@ namespace NLastGetopt {
         LongNames_.push_back(name);
         return *this;
     }
-
+ 
     namespace NPrivate {
         TString OptToString(char c);
-
+ 
         TString OptToString(const TString& longOption);
     }
-
+ 
     TString TOpt::ToShortString() const {
         ;
         if (!LongNames_.empty())
@@ -95,13 +95,13 @@ namespace NLastGetopt {
             return NPrivate::OptToString(Chars_.front());
         return "?";
     }
-
+ 
     void TOpt::FireHandlers(const TOptsParser* parser) const {
         for (const auto& handler : Handlers_) {
             handler->HandleOpt(parser);
         }
-    }
-
+    } 
+ 
     TOpt& TOpt::IfPresentDisableCompletionFor(const TOpt& opt) {
         if (opt.GetLongNames()) {
             IfPresentDisableCompletionFor(opt.GetName());
@@ -110,4 +110,4 @@ namespace NLastGetopt {
         }
         return *this;
     }
-}
+} 
diff --git a/library/cpp/getopt/small/last_getopt_opt.h b/library/cpp/getopt/small/last_getopt_opt.h
index a8dd5adca9..3a39357365 100644
--- a/library/cpp/getopt/small/last_getopt_opt.h
+++ b/library/cpp/getopt/small/last_getopt_opt.h
@@ -1,25 +1,25 @@
-#pragma once
-
+#pragma once 
+ 
 #include "completer.h"
-#include "last_getopt_handlers.h"
-
-#include <util/string/split.h>
-#include <util/generic/ptr.h>
+#include "last_getopt_handlers.h" 
+ 
+#include <util/string/split.h> 
+#include <util/generic/ptr.h> 
 #include <util/generic/string.h>
-#include <util/generic/maybe.h>
-#include <util/generic/vector.h>
+#include <util/generic/maybe.h> 
+#include <util/generic/vector.h> 
 #include <util/string/cast.h>
-
-#include <stdarg.h>
-
-namespace NLastGetopt {
+ 
+#include <stdarg.h> 
+ 
+namespace NLastGetopt { 
     enum EHasArg {
         NO_ARGUMENT,
         REQUIRED_ARGUMENT,
         OPTIONAL_ARGUMENT,
         DEFAULT_HAS_ARG = REQUIRED_ARGUMENT
     };
-
+ 
     /**
      * NLastGetopt::TOpt is a storage of data about exactly one program option.
      * The data is: parse politics and help information.
@@ -44,25 +44,25 @@ namespace NLastGetopt {
     public:
         typedef TVector<char> TShortNames;
         typedef TVector<TString> TLongNames;
-
+ 
     protected:
         TShortNames Chars_;
         TLongNames LongNames_;
-
+ 
     private:
         typedef TMaybe<TString> TdOptVal;
         typedef TVector<TSimpleSharedPtr<IOptHandler>> TOptHandlers;
-
+ 
     public:
         bool Hidden_ = false;       // is visible in help
         TString ArgTitle_;          // the name of argument in help output
         TString Help_;              // the help string
         TString CompletionHelp_;    // the help string that's used in completion script, a shorter version of Help_
         TString CompletionArgHelp_; // the description of argument in completion script
-
+ 
         EHasArg HasArg_ = DEFAULT_HAS_ARG; // the argument parsing politics
         bool Required_ = false;            // option existence politics
-
+ 
         bool AllowMultipleCompletion_ = false; // let the completer know that this option can occur more than once
 
         bool DisableCompletionForOptions_ = false;
@@ -78,48 +78,48 @@ namespace NLastGetopt {
         TdOptVal OptionalValue_;
         TdOptVal DefaultValue_;
         TOptHandlers Handlers_;
-
+ 
     public:
         /**
          *  Checks if given char can be a short name
          *  @param c               char to check
          */
         static bool IsAllowedShortName(unsigned char c);
-
+ 
         /**
          *  Checks if given string can be a long name
          *  @param name            string to check
          *  @param c               if given, the first bad charecter will be saved in c
          */
         static bool IsAllowedLongName(const TString& name, unsigned char* c = nullptr);
-
+ 
         /**
          *  @return one of the expected representations of the option.
          *  If the option has short names, will return "-<char>"
          *  Otherwise will return "--<long name>"
          */
         TString ToShortString() const;
-
+ 
         /**
          *  check if given string is one of the long names
          *
          *  @param name               string to check
          */
         bool NameIs(const TString& name) const;
-
+ 
         /**
          *  check if given char is one of the short names
          *
          *  @param c               char to check
          */
         bool CharIs(char c) const;
-
+ 
         /**
          *  If string has long names - will return one of them
          *  Otherwise will throw
          */
         TString GetName() const;
-
+ 
         /**
          *  adds short alias for the option
          *
@@ -128,14 +128,14 @@ namespace NLastGetopt {
          *  @return self
          */
         TOpt& AddShortName(unsigned char c);
-
+ 
         /**
          *  return all short names of the option
          */
         const TShortNames& GetShortNames() const {
             return Chars_;
         }
-
+ 
         /**
          *  adds long alias for the option
          *
@@ -144,31 +144,31 @@ namespace NLastGetopt {
          *  @return self
          */
         TOpt& AddLongName(const TString& name);
-
+ 
         /**
          *  return all long names of the option
          */
         const TLongNames& GetLongNames() const {
             return LongNames_;
         }
-
+ 
         /**
          *  @return one of short names of the opt. If there is no short names exception is raised.
          */
         char GetChar() const;
-
+ 
         /**
          *  @return one of short names of the opt. If there is no short names '\0' returned.
          */
         char GetCharOr0() const;
-
+ 
         /**
          *  @returns argument parsing politics
          */
         const EHasArg& GetHasArg() const {
             return HasArg_;
         }
-
+ 
         /**
          *  sets argument parsing politics
          *
@@ -181,14 +181,14 @@ namespace NLastGetopt {
             HasArg_ = hasArg;
             return *this;
         }
-
+ 
         /**
          *  @returns argument title
          */
         TString GetArgTitle() const {
             return ArgTitle_;
         }
-
+ 
         /**
          *  sets argument parsing politics into REQUIRED_ARGUMENT
          *
@@ -199,7 +199,7 @@ namespace NLastGetopt {
             ArgTitle_ = title;
             return HasArg(REQUIRED_ARGUMENT);
         }
-
+ 
         /**
          *  sets argument parsing politics into NO_ARGUMENT
          *
@@ -208,7 +208,7 @@ namespace NLastGetopt {
         TOpt& NoArgument() {
             return HasArg(NO_ARGUMENT);
         }
-
+ 
         /**
          *  sets argument parsing politics into OPTIONAL_ARGUMENT
          *  for details see NLastGetopt::TOpt
@@ -220,7 +220,7 @@ namespace NLastGetopt {
             ArgTitle_ = title;
             return HasArg(OPTIONAL_ARGUMENT);
         }
-
+ 
         /**
          *  sets argument parsing politics into OPTIONAL_ARGUMENT
          *  sets the <optional value> into given
@@ -235,14 +235,14 @@ namespace NLastGetopt {
             OptionalValue_ = val;
             return OptionalArgument(title);
         }
-
+ 
         /**
          *  checks if "argument parsing politics" is OPTIONAL_ARGUMENT and the <optional value> is set.
          */
         bool HasOptionalValue() const {
             return OPTIONAL_ARGUMENT == HasArg_ && OptionalValue_;
         }
-
+ 
         /**
          *  @return optional value
          *  throws exception if optional value wasn't set
@@ -250,7 +250,7 @@ namespace NLastGetopt {
         const TString& GetOptionalValue() const {
             return *OptionalValue_;
         }
-
+ 
         /**
          *  sets <default value>
          *  @return self
@@ -260,14 +260,14 @@ namespace NLastGetopt {
             DefaultValue_ = ToString(val);
             return *this;
         }
-
+ 
         /**
          *  checks if default value is set.
          */
         bool HasDefaultValue() const {
             return DefaultValue_.Defined();
         }
-
+ 
         /**
          *  @return default value
          *  throws exception if <default value> wasn't set
@@ -275,7 +275,7 @@ namespace NLastGetopt {
         const TString& GetDefaultValue() const {
             return *DefaultValue_;
         }
-
+ 
         /**
          *  sets the option to be required
          *  @return self
@@ -284,7 +284,7 @@ namespace NLastGetopt {
             Required_ = true;
             return *this;
         }
-
+ 
         /**
          *  sets the option to be optional
          *  @return self
@@ -293,14 +293,14 @@ namespace NLastGetopt {
             Required_ = false;
             return *this;
         }
-
+ 
         /**
          *  @return true if the option is required
          */
         bool IsRequired() const {
             return Required_;
         }
-
+ 
         /**
          *  sets the option to be hidden (invisible in help)
          *  @return self
@@ -309,14 +309,14 @@ namespace NLastGetopt {
             Hidden_ = true;
             return *this;
         }
-
+ 
         /**
          *  @return true if the option is hidden
          */
         bool IsHidden() const {
             return Hidden_;
         }
-
+ 
         /**
          *  sets the <user value>
          *  @return self
@@ -326,14 +326,14 @@ namespace NLastGetopt {
             UserValue_ = userval;
             return *this;
         }
-
+ 
         /**
          *  @return user value
          */
         const void* UserValue() const {
             return UserValue_;
         }
-
+ 
         /**
          * Set help string that appears with `--help`. Unless `CompletionHelp` is given, this message will also be used
          * in completion script. In this case, don't make it too long, don't start it with a capital letter and don't
@@ -371,14 +371,14 @@ namespace NLastGetopt {
             Help_ = help;
             return *this;
         }
-
+ 
         /**
          * Get help string.
          */
         const TString& GetHelp() const {
             return Help_;
         }
-
+ 
         /**
          * Set help string that appears when argument completer lists available options.
          *
@@ -546,19 +546,19 @@ namespace NLastGetopt {
          * Run handlers for this option.
          */
         void FireHandlers(const TOptsParser* parser) const;
-
+ 
     private:
         TOpt& HandlerImpl(IOptHandler* handler) {
             Handlers_.push_back(handler);
             return *this;
         }
-
+ 
     public:
         template <typename TpFunc>
         TOpt& Handler0(TpFunc func) { // functor taking no parameters
             return HandlerImpl(new NPrivate::THandlerFunctor0<TpFunc>(func));
         }
-
+ 
         template <typename TpFunc>
         TOpt& Handler1(TpFunc func) { // functor taking one parameter
             return HandlerImpl(new NPrivate::THandlerFunctor1<TpFunc>(func));
@@ -575,35 +575,35 @@ namespace NLastGetopt {
         TOpt& Handler1T2(const TpArg2& def, TpFunc func) {
             return HandlerImpl(new NPrivate::THandlerFunctor1<TpFunc, TpArg>(func, def));
         }
-
+ 
         TOpt& Handler(void (*f)()) {
             return Handler0(f);
         }
         TOpt& Handler(void (*f)(const TOptsParser*)) {
             return Handler1(f);
         }
-
+ 
         TOpt& Handler(TAutoPtr<IOptHandler> handler) {
             return HandlerImpl(handler.Release());
         }
-
+ 
         template <typename T> // T extends IOptHandler
         TOpt& Handler(TAutoPtr<T> handler) {
             return HandlerImpl(handler.Release());
         }
-
+ 
         // Stores FromString<T>(arg) in *target
         // T maybe anything with FromString<T>(const TStringBuf&) defined
         template <typename TpVal, typename T>
         TOpt& StoreResultT(T* target) {
             return Handler1T<TpVal>(NPrivate::TStoreResultFunctor<T, TpVal>(target));
         }
-
+ 
         template <typename T>
         TOpt& StoreResult(T* target) {
             return StoreResultT<T>(target);
         }
-
+ 
         // Uses TMaybe<T> to store FromString<T>(arg)
         template <typename T>
         TOpt& StoreResult(TMaybe<T>* target) {
@@ -614,12 +614,12 @@ namespace NLastGetopt {
         TOpt& StoreResultT(T* target, const TpDef& def) {
             return Handler1T<TpVal>(def, NPrivate::TStoreResultFunctor<T, TpVal>(target));
         }
-
+ 
         template <typename T, typename TpDef>
         TOpt& StoreResult(T* target, const TpDef& def) {
             return StoreResultT<T>(target, def);
         }
-
+ 
         template <typename T>
         TOpt& StoreResultDef(T* target) {
             DefaultValue_ = ToString(*target);
@@ -636,7 +636,7 @@ namespace NLastGetopt {
         TOpt& SetFlag(bool* target) {
             return DefaultValue("0").StoreResult(target, true);
         }
-
+ 
         // Similar to store_true in Python's argparse
         TOpt& StoreTrue(bool* target) {
             return NoArgument().SetFlag(target);
@@ -646,12 +646,12 @@ namespace NLastGetopt {
         TOpt& StoreMappedResultT(T* target, const TpFunc& func) {
             return Handler1T<TpVal>(NPrivate::TStoreMappedResultFunctor<T, TpFunc, TpVal>(target, func));
         }
-
+ 
         template <typename T, typename TpFunc>
         TOpt& StoreMappedResult(T* target, const TpFunc& func) {
             return StoreMappedResultT<T>(target, func);
         }
-
+ 
         // Stores given value in *target if the option is present.
         // TValue must be a copyable type, constructible from TParam.
         // T must be a copyable type, assignable from TValue.
@@ -659,25 +659,25 @@ namespace NLastGetopt {
         TOpt& StoreValueT(T* target, const TParam& value) {
             return Handler1(NPrivate::TStoreValueFunctor<T, TValue>(target, value));
         }
-
+ 
         // save value as target type
         template <typename T, typename TParam>
         TOpt& StoreValue(T* target, const TParam& value) {
             return StoreValueT<T>(target, value);
         }
-
+ 
         // save value as its original type (2nd template parameter)
         template <typename T, typename TValue>
         TOpt& StoreValue2(T* target, const TValue& value) {
             return StoreValueT<TValue>(target, value);
         }
-
+ 
         // Appends FromString<T>(arg) to *target for each argument
         template <typename T>
         TOpt& AppendTo(TVector<T>* target) {
             return Handler1T<T>([target](auto&& value) { target->push_back(std::move(value)); });
         }
-
+ 
         // Appends FromString<T>(arg) to *target for each argument
         template <typename T>
         TOpt& InsertTo(THashSet<T>* target) {
@@ -694,7 +694,7 @@ namespace NLastGetopt {
         TOpt& SplitHandler(Container* target, const char delim) {
             return Handler(new NLastGetopt::TOptSplitHandler<Container>(target, delim));
         }
-
+ 
         template <class Container>
         TOpt& RangeSplitHandler(Container* target, const char elementsDelim, const char rangesDelim) {
             return Handler(new NLastGetopt::TOptRangeSplitHandler<Container>(target, elementsDelim, rangesDelim));
@@ -705,7 +705,7 @@ namespace NLastGetopt {
             return Handler(new NLastGetopt::TOptKVHandler<TpFunc>(func, kvdelim));
         }
     };
-
+ 
     /**
      * NLastGetopt::TFreeArgSpec is a storage of data about free argument.
      * The data is help information and (maybe) linked named argument.
@@ -722,7 +722,7 @@ namespace NLastGetopt {
             , Optional_(optional)
         {
         }
-
+ 
         TString Title_;
         TString Help_;
         TString CompletionArgHelp_;
diff --git a/library/cpp/getopt/small/last_getopt_opts.cpp b/library/cpp/getopt/small/last_getopt_opts.cpp
index 03c432849f..7122bba10a 100644
--- a/library/cpp/getopt/small/last_getopt_opts.cpp
+++ b/library/cpp/getopt/small/last_getopt_opts.cpp
@@ -1,36 +1,36 @@
 #include "completer_command.h"
-#include "last_getopt_opts.h"
+#include "last_getopt_opts.h" 
 #include "wrap.h"
 #include "last_getopt_parser.h"
-
+ 
 #include <library/cpp/colorizer/colors.h>
 
-#include <util/stream/format.h>
+#include <util/stream/format.h> 
 #include <util/charset/utf8.h>
 
-#include <stdlib.h>
-
-namespace NLastGetoptPrivate {
+#include <stdlib.h> 
+ 
+namespace NLastGetoptPrivate { 
     TString& VersionString() {
         static TString data;
-        return data;
-    }
+        return data; 
+    } 
     TString& ShortVersionString() {
         static TString data;
         return data;
     }
 }
-
+ 
 namespace NLastGetopt {
     static const TStringBuf SPad = "  ";
-
+ 
     void PrintVersionAndExit(const TOptsParser*) {
-        Cout << (NLastGetoptPrivate::VersionString() ? NLastGetoptPrivate::VersionString() : "program version: not linked with library/cpp/getopt") << Endl;
+        Cout << (NLastGetoptPrivate::VersionString() ? NLastGetoptPrivate::VersionString() : "program version: not linked with library/cpp/getopt") << Endl; 
         exit(NLastGetoptPrivate::VersionString().empty());
     }
-
+ 
     void PrintShortVersionAndExit(const TString& appName) {
-        Cout << appName << " version " << (NLastGetoptPrivate::ShortVersionString() ? NLastGetoptPrivate::ShortVersionString() : "not linked with library/cpp/getopt") << Endl;
+        Cout << appName << " version " << (NLastGetoptPrivate::ShortVersionString() ? NLastGetoptPrivate::ShortVersionString() : "not linked with library/cpp/getopt") << Endl; 
         exit(NLastGetoptPrivate::ShortVersionString().empty());
     }
 
@@ -44,24 +44,24 @@ namespace NLastGetopt {
         }
         return str;
     }
-
+ 
     namespace NPrivate {
         TString OptToString(char c) {
             TStringStream ss;
             ss << "-" << c;
             return ss.Str();
         }
-
+ 
         TString OptToString(const TString& longOption) {
             TStringStream ss;
             ss << "--" << longOption;
             return ss.Str();
         }
-
+ 
         TString OptToString(const TOpt* opt) {
             return opt->ToShortString();
         }
-    }
+    } 
 
     TOpts::TOpts(const TStringBuf& optstring)
         : ArgPermutation_(DEFAULT_ARG_PERMUTATION)
@@ -76,8 +76,8 @@ namespace NLastGetopt {
             AddCharOptions(optstring);
         }
         AddVersionOption(0);
-    }
-
+    } 
+ 
     void TOpts::AddCharOptions(const TStringBuf& optstring) {
         size_t p = 0;
         if (optstring[p] == '+') {
@@ -102,8 +102,8 @@ namespace NLastGetopt {
             }
             AddCharOption(c, ha);
         }
-    }
-
+    } 
+ 
     const TOpt* TOpts::FindLongOption(const TStringBuf& name) const {
         for (const auto& Opt : Opts_) {
             const TOpt* opt = Opt.Get();
@@ -111,8 +111,8 @@ namespace NLastGetopt {
                 return opt;
         }
         return nullptr;
-    }
-
+    } 
+ 
     TOpt* TOpts::FindLongOption(const TStringBuf& name) {
         for (auto& Opt : Opts_) {
             TOpt* opt = Opt.Get();
@@ -120,8 +120,8 @@ namespace NLastGetopt {
                 return opt;
         }
         return nullptr;
-    }
-
+    } 
+ 
     const TOpt* TOpts::FindCharOption(char c) const {
         for (const auto& Opt : Opts_) {
             const TOpt* opt = Opt.Get();
@@ -129,45 +129,45 @@ namespace NLastGetopt {
                 return opt;
         }
         return nullptr;
-    }
-
+    } 
+ 
     TOpt* TOpts::FindCharOption(char c) {
         for (auto& Opt : Opts_) {
             TOpt* opt = Opt.Get();
             if (IsIn(opt->GetShortNames(), c))
                 return opt;
-        }
+        } 
         return nullptr;
-    }
-
+    } 
+ 
     const TOpt& TOpts::GetCharOption(char c) const {
         const TOpt* option = FindCharOption(c);
         if (!option)
             ythrow TException() << "unknown char option '" << c << "'";
         return *option;
-    }
-
+    } 
+ 
     TOpt& TOpts::GetCharOption(char c) {
         TOpt* option = FindCharOption(c);
         if (!option)
             ythrow TException() << "unknown char option '" << c << "'";
         return *option;
-    }
-
+    } 
+ 
     const TOpt& TOpts::GetLongOption(const TStringBuf& name) const {
         const TOpt* option = FindLongOption(name);
         if (!option)
             ythrow TException() << "unknown option " << name;
         return *option;
-    }
-
+    } 
+ 
     TOpt& TOpts::GetLongOption(const TStringBuf& name) {
         TOpt* option = FindLongOption(name);
         if (!option)
             ythrow TException() << "unknown option " << name;
         return *option;
-    }
-
+    } 
+ 
     bool TOpts::HasAnyShortOption() const {
         for (const auto& Opt : Opts_) {
             const TOpt* opt = Opt.Get();
@@ -175,8 +175,8 @@ namespace NLastGetopt {
                 return true;
         }
         return false;
-    }
-
+    } 
+ 
     bool TOpts::HasAnyLongOption() const {
         for (const auto& Opt : Opts_) {
             TOpt* opt = Opt.Get();
@@ -184,8 +184,8 @@ namespace NLastGetopt {
                 return true;
         }
         return false;
-    }
-
+    } 
+ 
     void TOpts::Validate() const {
         for (TOptsVector::const_iterator i = Opts_.begin(); i != Opts_.end(); ++i) {
             TOpt* opt = i->Get();
@@ -198,7 +198,7 @@ namespace NLastGetopt {
                                                 << NPrivate::OptToString(c)
                                                 << " is defined more than once";
                 }
-            }
+            } 
             const TOpt::TLongNames& longNames = opt->GetLongNames();
             for (const auto& longName : longNames) {
                 for (TOptsVector::const_iterator j = i + 1; j != Opts_.end(); ++j) {
@@ -208,22 +208,22 @@ namespace NLastGetopt {
                                                 << NPrivate::OptToString(longName)
                                                 << " is defined more than once";
                 }
-            }
-        }
+            } 
+        } 
         if (FreeArgsMax_ < FreeArgsMin_) {
             ythrow TConfException() << "FreeArgsMax must be >= FreeArgsMin";
         }
         if (!FreeArgSpecs_.empty() && FreeArgSpecs_.rbegin()->first >= FreeArgsMax_) {
             ythrow TConfException() << "Described args count is greater than FreeArgsMax. Either increase FreeArgsMax or remove unreachable descriptions";
         }
-    }
+    } 
 
     TOpt& TOpts::AddOption(const TOpt& option) {
         if (option.GetShortNames().empty() && option.GetLongNames().empty())
             ythrow TConfException() << "bad option: no chars, no long names";
         Opts_.push_back(new TOpt(option));
         return *Opts_.back();
-    }
+    } 
 
     TOpt& TOpts::AddCompletionOption(TString command, TString longName) {
         if (TOpt* o = FindLongOption(longName)) {
@@ -257,28 +257,28 @@ namespace NLastGetopt {
         if (it == Opts_.end())
             ythrow TException() << "unknown option";
         return it - Opts_.begin();
-    }
-
+    } 
+ 
     TStringBuf TOpts::GetFreeArgTitle(size_t pos) const {
         if (FreeArgSpecs_.contains(pos)) {
             return FreeArgSpecs_.at(pos).GetTitle(DefaultFreeArgTitle_);
         }
         return DefaultFreeArgTitle_;
     }
-
+ 
     void TOpts::SetFreeArgTitle(size_t pos, const TString& title, const TString& help, bool optional) {
         FreeArgSpecs_[pos] = TFreeArgSpec(title, help, optional);
-    }
-
+    } 
+ 
     TFreeArgSpec& TOpts::GetFreeArgSpec(size_t pos) {
         return FreeArgSpecs_[pos];
-    }
-
+    } 
+ 
     static TString FormatOption(const TOpt* option, const NColorizer::TColors& colors) {
         TStringStream result;
         const TOpt::TShortNames& shorts = option->GetShortNames();
         const TOpt::TLongNames& longs = option->GetLongNames();
-
+ 
         const size_t nopts = shorts.size() + longs.size();
         const bool multiple = 1 < nopts;
         if (multiple)
@@ -286,7 +286,7 @@ namespace NLastGetopt {
         for (size_t i = 0; i < nopts; ++i) {
             if (multiple && 0 != i)
                 result << '|';
-
+ 
             if (i < shorts.size()) // short
                 result << colors.GreenColor() << '-' << shorts[i] << colors.OldColor();
             else
@@ -294,11 +294,11 @@ namespace NLastGetopt {
         }
         if (multiple)
             result << '}';
-
+ 
         static const TString metavarDef("VAL");
         const TString& title = option->GetArgTitle();
         const TString& metavar = title.empty() ? metavarDef : title;
-
+ 
         if (option->GetHasArg() == OPTIONAL_ARGUMENT) {
             result << " [" << metavar;
             if (option->HasOptionalValue())
@@ -306,12 +306,12 @@ namespace NLastGetopt {
             result << ']';
         } else if (option->GetHasArg() == REQUIRED_ARGUMENT)
             result << ' ' << metavar;
-        else
+        else 
             Y_ASSERT(option->GetHasArg() == NO_ARGUMENT);
-
+ 
         return result.Str();
-    }
-
+    } 
+ 
     void TOpts::PrintCmdLine(const TStringBuf& program, IOutputStream& os, const NColorizer::TColors& colors) const {
         os << colors.BoldColor() << "Usage" << colors.OldColor() << ": ";
         if (CustomUsage) {
@@ -322,12 +322,12 @@ namespace NLastGetopt {
         if (CustomCmdLineDescr) {
             os << CustomCmdLineDescr << Endl;
             return;
-        }
+        } 
         os << "[OPTIONS]";
-
+ 
         ui32 numDescribedFlags = FreeArgSpecs_.empty() ? 0 : FreeArgSpecs_.rbegin()->first + 1;
         ui32 numArgsToShow = Max(FreeArgsMin_, FreeArgsMax_ == UNLIMITED_ARGS ? numDescribedFlags : FreeArgsMax_);
-
+ 
         for (ui32 i = 0, nonOptionalFlagsPrinted = 0; i < numArgsToShow; ++i) {
             bool isOptional = nonOptionalFlagsPrinted >= FreeArgsMin_ || FreeArgSpecs_.Value(i, TFreeArgSpec()).Optional_;
 
@@ -350,26 +350,26 @@ namespace NLastGetopt {
 
         os << Endl;
     }
-
+ 
     void TOpts::PrintUsage(const TStringBuf& program, IOutputStream& osIn, const NColorizer::TColors& colors) const {
         TStringStream os;
-
+ 
         if (!Title.empty())
             os << Title << "\n\n";
-
+ 
         PrintCmdLine(program, os, colors);
-
+ 
         TVector<TString> leftColumn(Opts_.size());
         TVector<size_t> leftColumnSizes(leftColumn.size());
         const size_t kMaxLeftWidth = 25;
         size_t leftWidth = 0;
         size_t requiredOptionsCount = 0;
         NColorizer::TColors disabledColors(false);
-
-        for (size_t i = 0; i < Opts_.size(); i++) {
-            const TOpt* opt = Opts_[i].Get();
-            if (opt->IsHidden())
-                continue;
+ 
+        for (size_t i = 0; i < Opts_.size(); i++) { 
+            const TOpt* opt = Opts_[i].Get(); 
+            if (opt->IsHidden()) 
+                continue; 
             leftColumn[i] = FormatOption(opt, colors);
             size_t leftColumnSize = leftColumn[i].size();
             if (colors.IsTTY()) {
@@ -382,7 +382,7 @@ namespace NLastGetopt {
             if (opt->IsRequired())
                 requiredOptionsCount++;
         }
-
+ 
         const TString leftPadding(leftWidth, ' ');
 
         for (size_t sectionId = 0; sectionId <= 1; sectionId++) {
@@ -400,7 +400,7 @@ namespace NLastGetopt {
                 else
                     os << Endl << colors.BoldColor() << "Optional parameters" << colors.OldColor() << ":" << Endl; // optional options would be a tautology
             }
-
+ 
             for (size_t i = 0; i < Opts_.size(); i++) {
                 const TOpt* opt = Opts_[i].Get();
 
@@ -415,8 +415,8 @@ namespace NLastGetopt {
                     os << SPad << leftColumn[i] << ' ';
                     if (leftColumnSizes[i] < leftWidth)
                         os << TStringBuf(leftPadding.data(), leftWidth - leftColumnSizes[i]);
-                }
-
+                } 
+ 
                 TStringBuf help = opt->GetHelp();
                 while (help && isspace(help.back())) {
                     help.Chop(1);
@@ -452,8 +452,8 @@ namespace NLastGetopt {
                 if (helpHasParagraphs) {
                     os << Endl;
                 }
-            }
-        }
+            } 
+        } 
 
         PrintFreeArgsDesc(os, colors);
 
@@ -464,8 +464,8 @@ namespace NLastGetopt {
         }
 
         osIn << os.Str();
-    }
-
+    } 
+ 
     void TOpts::PrintUsage(const TStringBuf& program, IOutputStream& os) const {
         PrintUsage(program, os, NColorizer::AutoColors(os));
     }
@@ -473,19 +473,19 @@ namespace NLastGetopt {
     void TOpts::PrintFreeArgsDesc(IOutputStream& os, const NColorizer::TColors& colors) const {
         if (0 == FreeArgsMax_)
             return;
-
+ 
         size_t leftFreeWidth = 0;
         for (size_t i = 0; i < FreeArgSpecs_.size(); ++i) {
             leftFreeWidth = Max(leftFreeWidth, GetFreeArgTitle(i).size());
         }
-
+ 
         if (!TrailingArgSpec_.IsDefault()) {
             leftFreeWidth = Max(leftFreeWidth, TrailingArgSpec_.GetTitle(DefaultFreeArgTitle_).size());
         }
-
+ 
         leftFreeWidth = Min(leftFreeWidth, size_t(30));
         os << Endl << colors.BoldColor() << "Free args" << colors.OldColor() << ":";
-
+ 
         os << " min: " << colors.GreenColor() << FreeArgsMin_ << colors.OldColor() << ",";
         os << " max: " << colors.GreenColor();
         if (FreeArgsMax_ != UNLIMITED_ARGS) {
@@ -494,20 +494,20 @@ namespace NLastGetopt {
             os << "unlimited";
         }
         os << colors.OldColor() << Endl;
-
+ 
         const size_t limit = FreeArgSpecs_.empty() ? 0 : FreeArgSpecs_.rbegin()->first;
         for (size_t i = 0; i <= limit; ++i) {
             if (!FreeArgSpecs_.contains(i)) {
                 continue;
             }
-
+ 
             if (auto help = FreeArgSpecs_.at(i).GetHelp()) {
                 auto title = GetFreeArgTitle(i);
                 os << SPad << colors.GreenColor() << RightPad(title, leftFreeWidth, ' ') << colors.OldColor()
                    << SPad << help << Endl;
             }
         }
-
+ 
         if (FreeArgsMax_ == UNLIMITED_ARGS) {
             auto title = TrailingArgSpec_.GetTitle(DefaultFreeArgTitle_);
             if (auto help = TrailingArgSpec_.GetHelp()) {
@@ -515,5 +515,5 @@ namespace NLastGetopt {
                    << SPad << help << Endl;
             }
         }
-    }
-}
+    } 
+} 
diff --git a/library/cpp/getopt/small/last_getopt_opts.h b/library/cpp/getopt/small/last_getopt_opts.h
index 825b99c871..be6978ed4d 100644
--- a/library/cpp/getopt/small/last_getopt_opts.h
+++ b/library/cpp/getopt/small/last_getopt_opts.h
@@ -1,19 +1,19 @@
-#pragma once
-
-#include "last_getopt_opt.h"
-
+#pragma once 
+ 
+#include "last_getopt_opt.h" 
+ 
 #include <library/cpp/colorizer/fwd.h>
 
-#include <util/generic/map.h>
-
-namespace NLastGetopt {
+#include <util/generic/map.h> 
+ 
+namespace NLastGetopt { 
     enum EArgPermutation {
         REQUIRE_ORDER,
         PERMUTE,
         RETURN_IN_ORDER,
         DEFAULT_ARG_PERMUTATION = PERMUTE
     };
-
+ 
     /**
      * NLastGetopt::TOpts is a storage of program options' parse rules.
      * It contains information about all options, free args, some parsing options
@@ -37,36 +37,36 @@ namespace NLastGetopt {
     class TOpts {
         friend class TOptsParseResult;
         friend class TOptsParser;
-
+ 
     public:
         static constexpr const ui32 UNLIMITED_ARGS = Max<ui32>();
 
         typedef TVector<TSimpleSharedPtr<TOpt>> TOptsVector;
         TOptsVector Opts_; // infomation about named (short and long) options
         TVector<std::function<void(TStringBuf)>> ArgBindings_;
-
+ 
         EArgPermutation ArgPermutation_ = DEFAULT_ARG_PERMUTATION; // determines how to parse positions of named and free options. See information below.
         bool AllowSingleDashForLong_ = false;                      //
         bool AllowPlusForLong_ = false;                            // using '+' instead '--' for long options
-
+ 
         //Allows unknwon options:
         bool AllowUnknownCharOptions_ = false;
         bool AllowUnknownLongOptions_ = false;
-
+ 
         ui32 Wrap_ = 80;
 
     private:
         ui32 FreeArgsMin_; // minimal number of free args
         ui32 FreeArgsMax_; // maximal number of free args
-
+ 
         TMap<ui32, TFreeArgSpec> FreeArgSpecs_; // mapping [free arg position] -> [free arg specification]
         TFreeArgSpec TrailingArgSpec_;          // spec for the trailing argument (when arguments are unlimited)
         TString DefaultFreeArgTitle_ = "ARG"; // title that's used for free args without a title
-
+ 
         TString Title;              // title of the help string
         TString CustomCmdLineDescr; // user defined help string
         TString CustomUsage;        // user defined usage string
-
+ 
         TVector<std::pair<TString, TString>> Sections;  // additional help entries to print after usage
 
     public:
@@ -74,7 +74,7 @@ namespace NLastGetopt {
          * Constructs TOpts from string as in getopt(3)
          */
         TOpts(const TStringBuf& optstring = TStringBuf());
-
+ 
         /**
          * Constructs TOpts from string as in getopt(3) and
          * additionally adds help option (for '?') and svn-verstion option (for 'V')
@@ -85,7 +85,7 @@ namespace NLastGetopt {
             opts.AddVersionOption();
             return opts;
         }
-
+ 
         /**
          * Checks correctness of options' descriptions.
          * Throws TConfException if validation failed.
@@ -94,35 +94,35 @@ namespace NLastGetopt {
          *    -compability of settings, that responsable for freeArgs parsing
          */
         void Validate() const;
-
+ 
         /**
          * Search for the option with given long name
          * @param name     long name for search
          * @return         ptr on result (nullptr if not found)
          */
         const TOpt* FindLongOption(const TStringBuf& name) const;
-
+ 
         /**
          * Search for the option with given short name
          * @param c        short name for search
          * @return         ptr on result (nullptr if not found)
          */
         const TOpt* FindCharOption(char c) const;
-
+ 
         /**
          * Search for the option with given long name
          * @param name     long name for search
          * @return         ptr on result (nullptr if not found)
          */
         TOpt* FindLongOption(const TStringBuf& name);
-
+ 
         /**
          * Search for the option with given short name
          * @param c        short name for search
          * @return         ptr on result (nullptr if not found)
          */
         TOpt* FindCharOption(char c);
-
+ 
         /**
          * Search for the option with given name
          * @param name     name for search
@@ -155,7 +155,7 @@ namespace NLastGetopt {
         void SetTitle(const TString& title) {
             Title = title;
         }
-
+ 
         /**
          * @return true if there is an option with given long name
          *
@@ -164,7 +164,7 @@ namespace NLastGetopt {
         bool HasLongOption(const TString& name) const {
             return FindLongOption(name) != nullptr;
         }
-
+ 
         /**
          * @return true if there is an option with given short name
          *
@@ -173,35 +173,35 @@ namespace NLastGetopt {
         bool HasCharOption(char c) const {
             return FindCharOption(c) != nullptr;
         }
-
+ 
         /**
          * Search for the option with given long name
          * @param name     long name for search
          * @return         ref on result (throw exception if not found)
          */
         const TOpt& GetLongOption(const TStringBuf& name) const;
-
+ 
         /**
          * Search for the option with given long name
          * @param name     long name for search
          * @return         ref on result (throw exception if not found)
          */
         TOpt& GetLongOption(const TStringBuf& name);
-
+ 
         /**
          * Search for the option with given short name
          * @param c        short name for search
          * @return         ref on result (throw exception if not found)
          */
         const TOpt& GetCharOption(char c) const;
-
+ 
         /**
          * Search for the option with given short name
          * @param c        short name for search
          * @return         ref on result (throw exception if not found)
          */
         TOpt& GetCharOption(char c);
-
+ 
         /**
          * Search for the option with given name
          * @param name     name for search
@@ -231,19 +231,19 @@ namespace NLastGetopt {
          * @return true if short options exist
          */
         bool HasAnyShortOption() const;
-
+ 
         /**
          * @return true if long options exist
          */
         bool HasAnyLongOption() const;
-
+ 
         /**
          * Creates new [option description (TOpt)] as a copy of given one
          * @param option   source
          * @return         reference for created option
          */
         TOpt& AddOption(const TOpt& option);
-
+ 
         /**
          * Creates new free argument handling
          * @param name   name of free arg to show in help
@@ -266,7 +266,7 @@ namespace NLastGetopt {
          * @param optstring   source
          */
         void AddCharOptions(const TStringBuf& optstring);
-
+ 
         /**
          * Creates new [option description (TOpt)] with given short name and given help string
          *
@@ -277,7 +277,7 @@ namespace NLastGetopt {
         TOpt& AddCharOption(char c, const TString& help = "") {
             return AddCharOption(c, DEFAULT_HAS_ARG, help);
         }
-
+ 
         /**
          * Creates new [option description (TOpt)] with given short name and given help string
          *
@@ -292,7 +292,7 @@ namespace NLastGetopt {
             option.HasArg(hasArg);
             return AddOption(option);
         }
-
+ 
         /**
          * Creates new [option description (TOpt)] with given long name and given help string
          *
@@ -303,7 +303,7 @@ namespace NLastGetopt {
         TOpt& AddLongOption(const TString& name, const TString& help = "") {
             return AddLongOption(0, name, help);
         }
-
+ 
         /**
          * Creates new [option description (TOpt)] with given long and short names and given help string
          *
@@ -320,7 +320,7 @@ namespace NLastGetopt {
             option.Help(help);
             return AddOption(option);
         }
-
+ 
         /**
          * Creates new [option description (TOpt)] for help printing,
          *   adds appropriate handler for it
@@ -338,8 +338,8 @@ namespace NLastGetopt {
                 .HasArg(NO_ARGUMENT)
                 .IfPresentDisableCompletion()
                 .Handler(&PrintUsageAndExit);
-        }
-
+        } 
+ 
         /**
          * Creates new [option description (TOpt)] for svn-revision printing,
          *   adds appropriate handler for it.
@@ -357,8 +357,8 @@ namespace NLastGetopt {
                 .HasArg(NO_ARGUMENT)
                 .IfPresentDisableCompletion()
                 .Handler(&PrintVersionAndExit);
-        }
-
+        } 
+ 
         /**
          * Creates new option for generating completion shell scripts.
          *
@@ -379,8 +379,8 @@ namespace NLastGetopt {
                 AddCharOption(c);
                 return const_cast<TOpt&>(GetCharOption(c));
             }
-        }
-
+        } 
+ 
         /**
          * Indicate that some options can't appear together.
          *
@@ -405,7 +405,7 @@ namespace NLastGetopt {
          * @param opt        pointer of option to search
          */
         size_t IndexOf(const TOpt* opt) const;
-
+ 
         /**
          * Replace help string with given
          *
@@ -414,7 +414,7 @@ namespace NLastGetopt {
         void SetCmdLineDescr(const TString& descr) {
             CustomCmdLineDescr = descr;
         }
-
+ 
         /**
          * Replace usage string with given
          *
@@ -448,7 +448,7 @@ namespace NLastGetopt {
         void SetFreeArgsMin(size_t min) {
             FreeArgsMin_ = ui32(min);
         }
-
+ 
 
         /**
          * Get current minimal number of free args
@@ -466,7 +466,7 @@ namespace NLastGetopt {
             FreeArgsMax_ = ui32(max);
             FreeArgsMax_ = Max<ui32>(FreeArgsMax_, ArgBindings_.size());
         }
-
+ 
         /**
          * Get current maximal number of free args
          */
@@ -490,7 +490,7 @@ namespace NLastGetopt {
             FreeArgsMin_ = ui32(count);
             FreeArgsMax_ = ui32(count);
         }
-
+ 
         /**
          * Set minimal and maximal number of free args
          *
@@ -501,7 +501,7 @@ namespace NLastGetopt {
             FreeArgsMin_ = ui32(min);
             FreeArgsMax_ = ui32(max);
         }
-
+ 
         /**
          * Set title and help string of free argument
          *
@@ -512,7 +512,7 @@ namespace NLastGetopt {
          *                     does not affect actual flags parsing
          */
         void SetFreeArgTitle(size_t pos, const TString& title, const TString& help = TString(), bool optional = false);
-
+ 
         /**
          * Get free argument's spec for further modification.
          */
@@ -555,7 +555,7 @@ namespace NLastGetopt {
             TrailingArgSpec_.Help(std::move(help));
         }
         /// @}
-
+ 
         /**
          * Get spec for the trailing argument.
          *
@@ -578,7 +578,7 @@ namespace NLastGetopt {
         void SetAllowSingleDashForLong(bool value) {
             AllowSingleDashForLong_ = value;
         }
-
+ 
         /**
          * Wrap help text at this number of characters. 0 to disable wrapping.
          */
@@ -613,7 +613,7 @@ namespace NLastGetopt {
             }
             return ret;
         }
-
+ 
     private:
         /**
          * @return argument title of a free argument
@@ -621,7 +621,7 @@ namespace NLastGetopt {
          * @param pos     position of the argument
          */
         TStringBuf GetFreeArgTitle(size_t pos) const;
-
+ 
         /**
          * Print usage helper
          *
@@ -630,7 +630,7 @@ namespace NLastGetopt {
          * @param colors     colorizer
          */
         void PrintCmdLine(const TStringBuf& program, IOutputStream& os, const NColorizer::TColors& colors) const;
-
+ 
         /**
          * Print usage helper
          *
@@ -639,5 +639,5 @@ namespace NLastGetopt {
          */
         void PrintFreeArgsDesc(IOutputStream& os, const NColorizer::TColors& colors) const;
     };
-
+ 
 }
diff --git a/library/cpp/getopt/small/last_getopt_parse_result.cpp b/library/cpp/getopt/small/last_getopt_parse_result.cpp
index f4b5607a90..423e035bc5 100644
--- a/library/cpp/getopt/small/last_getopt_parse_result.cpp
+++ b/library/cpp/getopt/small/last_getopt_parse_result.cpp
@@ -1,6 +1,6 @@
-#include "last_getopt_parse_result.h"
-
-namespace NLastGetopt {
+#include "last_getopt_parse_result.h" 
+ 
+namespace NLastGetopt { 
     const TOptParseResult* TOptsParseResult::FindParseResult(const TdVec& vec, const TOpt* opt) {
         for (const auto& r : vec) {
             if (r.OptPtr() == opt)
@@ -8,35 +8,35 @@ namespace NLastGetopt {
         }
         return nullptr;
     }
-
+ 
     const TOptParseResult* TOptsParseResult::FindOptParseResult(const TOpt* opt, bool includeDefault) const {
         const TOptParseResult* r = FindParseResult(Opts_, opt);
         if (nullptr == r && includeDefault)
             r = FindParseResult(OptsDef_, opt);
         return r;
-    }
-
+    } 
+ 
     const TOptParseResult* TOptsParseResult::FindLongOptParseResult(const TString& name, bool includeDefault) const {
         return FindOptParseResult(&Parser_->Opts_->GetLongOption(name), includeDefault);
     }
-
+ 
     const TOptParseResult* TOptsParseResult::FindCharOptParseResult(char c, bool includeDefault) const {
         return FindOptParseResult(&Parser_->Opts_->GetCharOption(c), includeDefault);
     }
-
+ 
     bool TOptsParseResult::Has(const TOpt* opt, bool includeDefault) const {
         Y_ASSERT(opt);
         return FindOptParseResult(opt, includeDefault) != nullptr;
     }
-
+ 
     bool TOptsParseResult::Has(const TString& name, bool includeDefault) const {
         return FindLongOptParseResult(name, includeDefault) != nullptr;
     }
-
+ 
     bool TOptsParseResult::Has(char c, bool includeDefault) const {
         return FindCharOptParseResult(c, includeDefault) != nullptr;
     }
-
+ 
     const char* TOptsParseResult::Get(const TOpt* opt, bool includeDefault) const {
         Y_ASSERT(opt);
         const TOptParseResult* r = FindOptParseResult(opt, includeDefault);
@@ -52,7 +52,7 @@ namespace NLastGetopt {
             return r->Back();
         }
     }
-
+ 
     const char* TOptsParseResult::GetOrElse(const TOpt* opt, const char* defaultValue) const {
         Y_ASSERT(opt);
         const TOptParseResult* r = FindOptParseResult(opt);
@@ -60,29 +60,29 @@ namespace NLastGetopt {
             return defaultValue;
         } else {
             return r->Back();
-        }
-    }
-
+        } 
+    } 
+ 
     const char* TOptsParseResult::Get(const TString& name, bool includeDefault) const {
         return Get(&Parser_->Opts_->GetLongOption(name), includeDefault);
-    }
-
+    } 
+ 
     const char* TOptsParseResult::Get(char c, bool includeDefault) const {
         return Get(&Parser_->Opts_->GetCharOption(c), includeDefault);
     }
-
+ 
     const char* TOptsParseResult::GetOrElse(const TString& name, const char* defaultValue) const {
         if (!Has(name))
             return defaultValue;
         return Get(name);
     }
-
+ 
     const char* TOptsParseResult::GetOrElse(char c, const char* defaultValue) const {
         if (!Has(c))
             return defaultValue;
         return Get(c);
     }
-
+ 
     TOptParseResult& TOptsParseResult::OptParseResult() {
         const TOpt* opt = Parser_->CurOpt();
         Y_ASSERT(opt);
@@ -94,11 +94,11 @@ namespace NLastGetopt {
         opts.push_back(TOptParseResult(opt));
         return opts.back();
     }
-
+ 
     TString TOptsParseResult::GetProgramName() const {
         return Parser_->ProgramName_;
     }
-
+ 
     void TOptsParseResult::PrintUsage(IOutputStream& os) const {
         Parser_->Opts_->PrintUsage(Parser_->ProgramName_, os);
     }
@@ -106,7 +106,7 @@ namespace NLastGetopt {
     size_t TOptsParseResult::GetFreeArgsPos() const {
         return Parser_->Pos_;
     }
-
+ 
     TVector<TString> TOptsParseResult::GetFreeArgs() const {
         TVector<TString> v;
         for (size_t i = GetFreeArgsPos(); i < Parser_->Argc_; ++i) {
@@ -114,11 +114,11 @@ namespace NLastGetopt {
         }
         return v;
     }
-
+ 
     size_t TOptsParseResult::GetFreeArgCount() const {
         return Parser_->Argc_ - GetFreeArgsPos();
-    }
-
+    } 
+ 
     void TOptsParseResult::Init(const TOpts* options, int argc, const char** argv) {
         try {
             Parser_.Reset(new TOptsParser(options, argc, argv));
@@ -138,9 +138,9 @@ namespace NLastGetopt {
             }
         } catch (...) {
             HandleError();
-        }
-    }
-
+        } 
+    } 
+ 
     void TOptsParseResult::HandleError() const {
         Cerr << CurrentExceptionMessage() << Endl;
         if (Parser_.Get()) { // parser initializing can fail (and we get here, see Init)
@@ -149,12 +149,12 @@ namespace NLastGetopt {
             } else {
                 PrintUsage();
             }
-        }
+        } 
         exit(1);
-    }
-
+    } 
+ 
     void TOptsParseResultException::HandleError() const {
         throw;
     }
-
-}
+ 
+} 
diff --git a/library/cpp/getopt/small/last_getopt_parse_result.h b/library/cpp/getopt/small/last_getopt_parse_result.h
index 1ab6f598c9..e55a1a1eec 100644
--- a/library/cpp/getopt/small/last_getopt_parse_result.h
+++ b/library/cpp/getopt/small/last_getopt_parse_result.h
@@ -1,9 +1,9 @@
-#pragma once
-
-#include "last_getopt_opts.h"
+#pragma once 
+ 
+#include "last_getopt_opts.h" 
 #include "last_getopt_parser.h"
-
-namespace NLastGetopt {
+ 
+namespace NLastGetopt { 
     /**
      * NLastGetopt::TOptParseResult contains all arguments for exactly one TOpt,
      * that have been fetched during parsing
@@ -13,13 +13,13 @@ namespace NLastGetopt {
     class TOptParseResult {
     public:
         typedef TVector<const char*> TValues;
-
+ 
     public:
         TOptParseResult(const TOpt* opt = nullptr)
             : Opt_(opt)
         {
         }
-
+ 
     public:
         const TOpt& Opt() const {
             return *Opt_;
@@ -49,7 +49,7 @@ namespace NLastGetopt {
         const char* Back(const char* def = nullptr) const {
             return Empty() ? DefVal(def) : Values().back();
         }
-
+ 
     private:
         const TOpt* Opt_;
         TValues Values_;
@@ -67,16 +67,16 @@ namespace NLastGetopt {
     class TOptsParseResult {
     private:
         THolder<TOptsParser> Parser_; //The instance of parser.
-
+ 
         // XXX: make argc, argv
         typedef TVector<TOptParseResult> TdVec;
-
+ 
         TdVec Opts_;    //Parsing result for all options, that have been explicitly defined in argc/argv
         TdVec OptsDef_; //Parsing result for options, that have been defined by default values only
-
+ 
     private:
         TOptParseResult& OptParseResult();
-
+ 
         /**
          * Searchs for object in given container
          *
@@ -86,15 +86,15 @@ namespace NLastGetopt {
          * @retunr        ptr on corresponding TOptParseResult
          */
         static const TOptParseResult* FindParseResult(const TdVec& vec, const TOpt* opt);
-
+ 
     protected:
         /**
          * Performs parsing of comand line arguments.
          */
         void Init(const TOpts* options, int argc, const char** argv);
-
+ 
         TOptsParseResult() = default;
-
+ 
     public:
         /**
          * The action in case of parser failure.
@@ -102,7 +102,7 @@ namespace NLastGetopt {
          * By default prints error string and aborts the program
          */
         virtual void HandleError() const;
-
+ 
         /**
          * Constructs object by parsing arguments with given rules
          *
@@ -113,7 +113,7 @@ namespace NLastGetopt {
         TOptsParseResult(const TOpts* options, int argc, const char* argv[]) {
             Init(options, argc, argv);
         }
-
+ 
         /**
          * Constructs object by parsing arguments with given rules
          *
@@ -124,9 +124,9 @@ namespace NLastGetopt {
         TOptsParseResult(const TOpts* options, int argc, char* argv[]) {
             Init(options, argc, const_cast<const char**>(argv));
         }
-
+ 
         virtual ~TOptsParseResult() = default;
-
+ 
         /**
          * Search for TOptParseResult that corresponds to given option (TOpt)
          *
@@ -136,7 +136,7 @@ namespace NLastGetopt {
          * @return                   ptr on result
          */
         const TOptParseResult* FindOptParseResult(const TOpt* opt, bool includeDefault = false) const;
-
+ 
         /**
          * Search for TOptParseResult that corresponds to given long name
          *
@@ -146,7 +146,7 @@ namespace NLastGetopt {
          * @return                   ptr on result
          */
         const TOptParseResult* FindLongOptParseResult(const TString& name, bool includeDefault = false) const;
-
+ 
         /**
          * Search for TOptParseResult that corresponds to given short name
          *
@@ -156,12 +156,12 @@ namespace NLastGetopt {
          * @return                   ptr on result
          */
         const TOptParseResult* FindCharOptParseResult(char c, bool includeDefault = false) const;
-
+ 
         /**
          * @return argv[0]
          */
         TString GetProgramName() const;
-
+ 
         /**
          * Print usage string.
          */
@@ -171,17 +171,17 @@ namespace NLastGetopt {
          * @return position in [premuted argv] of the first free argument
          */
         size_t GetFreeArgsPos() const;
-
+ 
         /**
          * @return number of fetched free arguments
          */
         size_t GetFreeArgCount() const;
-
+ 
         /**
          * @return all fetched free arguments
          */
         TVector<TString> GetFreeArgs() const;
-
+ 
         /**
          * @return true if given option exist in results of parsing
          *
@@ -190,7 +190,7 @@ namespace NLastGetopt {
          *
          */
         bool Has(const TOpt* opt, bool includeDefault = false) const;
-
+ 
         /**
          * @return nil terminated string on the last fetched argument of givne option
          *
@@ -198,7 +198,7 @@ namespace NLastGetopt {
          * @param includeDefault     search in results obtained from default values
          */
         const char* Get(const TOpt* opt, bool includeDefault = true) const;
-
+ 
         /**
          * @return nil terminated string on the last fetched argument of givne option
          *    if option haven't been fetched, given defaultValue will be returned
@@ -207,7 +207,7 @@ namespace NLastGetopt {
          * @param defaultValue
          */
         const char* GetOrElse(const TOpt* opt, const char* defaultValue) const;
-
+ 
         /**
          * @return true if given option exist in results of parsing
          *
@@ -216,7 +216,7 @@ namespace NLastGetopt {
          *
          */
         bool Has(const TString& name, bool includeDefault = false) const;
-
+ 
         /**
          * @return nil terminated string on the last fetched argument of givne option
          *
@@ -224,7 +224,7 @@ namespace NLastGetopt {
          * @param includeDefault     search in results obtained from default values
          */
         const char* Get(const TString& name, bool includeDefault = true) const;
-
+ 
         /**
          * @return nil terminated string on the last fetched argument of givne option
          *    if option haven't been fetched, given defaultValue will be returned
@@ -233,7 +233,7 @@ namespace NLastGetopt {
          * @param defaultValue
          */
         const char* GetOrElse(const TString& name, const char* defaultValue) const;
-
+ 
         /**
          * @return true if given option exist in results of parsing
          *
@@ -242,7 +242,7 @@ namespace NLastGetopt {
          *
          */
         bool Has(char name, bool includeDefault = false) const;
-
+ 
         /**
          * @return nil terminated string on the last fetched argument of givne option
          *
@@ -250,7 +250,7 @@ namespace NLastGetopt {
          * @param includeDefault     search in results obtained from default values
          */
         const char* Get(char name, bool includeDefault = true) const;
-
+ 
         /**
          * @return nil terminated string on the last fetched argument of givne option
          *    if option haven't been fetched, given defaultValue will be returned
@@ -259,7 +259,7 @@ namespace NLastGetopt {
          * @param defaultValue
          */
         const char* GetOrElse(char name, const char* defaultValue) const;
-
+ 
         /**
          * for givne option return parsed value of the last fetched argument
          * if option haven't been fetched, HandleError action is called
@@ -277,8 +277,8 @@ namespace NLastGetopt {
                 HandleError();
                 throw;
             }
-        }
-
+        } 
+ 
         /**
          * for givne option return parsed value of the last fetched argument
          * if option haven't been fetched, given defaultValue will be returned
@@ -296,7 +296,7 @@ namespace NLastGetopt {
                 return defaultValue;
         }
     };
-
+ 
     /**
      * NLastGetopt::TOptsParseResultException contains result of parsing argc,argv be parser.
      *
@@ -317,5 +317,5 @@ namespace NLastGetopt {
     protected:
         TOptsParseResultException() = default;
     };
-
-}
+ 
+} 
diff --git a/library/cpp/getopt/small/last_getopt_parser.cpp b/library/cpp/getopt/small/last_getopt_parser.cpp
index 7668b12a03..7c474809ce 100644
--- a/library/cpp/getopt/small/last_getopt_parser.cpp
+++ b/library/cpp/getopt/small/last_getopt_parser.cpp
@@ -1,23 +1,23 @@
-#include "last_getopt_parser.h"
-
+#include "last_getopt_parser.h" 
+ 
 #include <library/cpp/colorizer/colors.h>
 
-#include <util/string/escape.h>
-
-namespace NLastGetopt {
+#include <util/string/escape.h> 
+ 
+namespace NLastGetopt { 
     void TOptsParser::Init(const TOpts* opts, int argc, const char* argv[]) {
         opts->Validate();
-
+ 
         Opts_ = opts;
-
+ 
         if (argc < 1)
             throw TUsageException() << "argv must have at least one argument";
-
+ 
         Argc_ = argc;
         Argv_ = argv;
-
+ 
         ProgramName_ = argv[0];
-
+ 
         Pos_ = 1;
         Sop_ = 0;
         CurrentOpt_ = nullptr;
@@ -27,11 +27,11 @@ namespace NLastGetopt {
         OptsSeen_.clear();
         OptsDefault_.clear();
     }
-
+ 
     void TOptsParser::Init(const TOpts* opts, int argc, char* argv[]) {
         Init(opts, argc, const_cast<const char**>(argv));
     }
-
+ 
     void TOptsParser::Swap(TOptsParser& that) {
         DoSwap(Opts_, that.Opts_);
         DoSwap(Argc_, that.Argc_);
@@ -46,7 +46,7 @@ namespace NLastGetopt {
         DoSwap(GotMinusMinus_, that.GotMinusMinus_);
         DoSwap(OptsSeen_, that.OptsSeen_);
     }
-
+ 
     bool TOptsParser::Commit(const TOpt* currentOpt, const TStringBuf& currentValue, size_t pos, size_t sop) {
         Pos_ = pos;
         Sop_ = sop;
@@ -56,62 +56,62 @@ namespace NLastGetopt {
             OptsSeen_.insert(currentOpt);
         return true;
     }
-
+ 
     bool TOptsParser::CommitEndOfOptions(size_t pos) {
         Pos_ = pos;
         Sop_ = 0;
         Y_ASSERT(!CurOpt());
         Y_ASSERT(!CurVal());
-
+ 
         Y_ASSERT(!Stopped_);
-
+ 
         if (Opts_->FreeArgsMin_ == Opts_->FreeArgsMax_ && Argc_ - Pos_ != Opts_->FreeArgsMin_)
             throw TUsageException() << "required exactly " << Opts_->FreeArgsMin_ << " free args";
         else if (Argc_ - Pos_ < Opts_->FreeArgsMin_)
             throw TUsageException() << "required at least " << Opts_->FreeArgsMin_ << " free args";
         else if (Argc_ - Pos_ > Opts_->FreeArgsMax_)
             throw TUsageException() << "required at most " << Opts_->FreeArgsMax_ << " free args";
-
+ 
         return false;
     }
-
+ 
     bool TOptsParser::ParseUnknownShortOptWithinArg(size_t pos, size_t sop) {
         Y_ASSERT(pos < Argc_);
         const TStringBuf arg(Argv_[pos]);
         Y_ASSERT(sop > 0);
         Y_ASSERT(sop < arg.length());
         Y_ASSERT(EIO_NONE != IsOpt(arg));
-
+ 
         if (!Opts_->AllowUnknownCharOptions_)
             throw TUsageException() << "unknown option '" << EscapeC(arg[sop])
                                      << "' in '" << arg << "'";
-
+ 
         TempCurrentOpt_.Reset(new TOpt);
         TempCurrentOpt_->AddShortName(arg[sop]);
-
+ 
         sop += 1;
-
+ 
         // mimic behavior of Opt: unknown option has arg only if char is last within arg
         if (sop < arg.length()) {
             return Commit(TempCurrentOpt_.Get(), nullptr, pos, sop);
         }
-
+ 
         pos += 1;
         sop = 0;
         if (pos == Argc_ || EIO_NONE != IsOpt(Argv_[pos])) {
             return Commit(TempCurrentOpt_.Get(), nullptr, pos, 0);
         }
-
+ 
         return Commit(TempCurrentOpt_.Get(), Argv_[pos], pos + 1, 0);
-    }
-
+    } 
+ 
     bool TOptsParser::ParseShortOptWithinArg(size_t pos, size_t sop) {
         Y_ASSERT(pos < Argc_);
         const TStringBuf arg(Argv_[pos]);
         Y_ASSERT(sop > 0);
         Y_ASSERT(sop < arg.length());
         Y_ASSERT(EIO_NONE != IsOpt(arg));
-
+ 
         size_t p = sop;
         char c = arg[p];
         const TOpt* opt = Opts_->FindCharOption(c);
@@ -126,15 +126,15 @@ namespace NLastGetopt {
         }
         return Commit(opt, arg.SubStr(p), pos + 1, 0);
     }
-
+ 
     bool TOptsParser::ParseShortOptArg(size_t pos) {
         Y_ASSERT(pos < Argc_);
         const TStringBuf arg(Argv_[pos]);
         Y_ASSERT(EIO_NONE != IsOpt(arg));
         Y_ASSERT(!arg.StartsWith("--"));
         return ParseShortOptWithinArg(pos, 1);
-    }
-
+    } 
+ 
     bool TOptsParser::ParseOptArg(size_t pos) {
         Y_ASSERT(pos < Argc_);
         TStringBuf arg(Argv_[pos]);
@@ -155,7 +155,7 @@ namespace NLastGetopt {
                     throw TUsageException() << "unknown option '" << optionName
                                              << "' in '" << Argv_[pos] << "'";
                 }
-            }
+            } 
             if (arg.IsInited()) {
                 if (option->GetHasArg() == NO_ARGUMENT)
                     throw TUsageException() << "option " << optionName << " must have no arg";
@@ -165,9 +165,9 @@ namespace NLastGetopt {
             return ParseOptParam(option, pos);
         } else {
             return ParseShortOptArg(pos);
-        }
-    }
-
+        } 
+    } 
+ 
     bool TOptsParser::ParseOptParam(const TOpt* opt, size_t pos) {
         Y_ASSERT(opt);
         if (opt->GetHasArg() == NO_ARGUMENT) {
@@ -183,8 +183,8 @@ namespace NLastGetopt {
             return Commit(opt, arg, pos + 1, 0);
         }
         return Commit(opt, nullptr, pos, 0);
-    }
-
+    } 
+ 
     TOptsParser::EIsOpt TOptsParser::IsOpt(const TStringBuf& arg) const {
         EIsOpt eio = EIO_NONE;
         if (1 < arg.length()) {
@@ -202,35 +202,35 @@ namespace NLastGetopt {
                         eio = EIO_PLUS;
                     break;
             }
-        }
+        } 
         return eio;
-    }
-
+    } 
+ 
     static void memrotate(void* ptr, size_t size, size_t shift) {
         TTempBuf buf(shift);
         memcpy(buf.Data(), (char*)ptr + size - shift, shift);
         memmove((char*)ptr + shift, ptr, size - shift);
         memcpy(ptr, buf.Data(), shift);
     }
-
+ 
     bool TOptsParser::ParseWithPermutation() {
         Y_ASSERT(Sop_ == 0);
         Y_ASSERT(Opts_->ArgPermutation_ == PERMUTE);
-
+ 
         const size_t p0 = Pos_;
-
+ 
         size_t pc = Pos_;
-
+ 
         for (; pc < Argc_ && EIO_NONE == IsOpt(Argv_[pc]); ++pc) {
             // count non-args
         }
-
+ 
         if (pc == Argc_) {
             return CommitEndOfOptions(Pos_);
         }
-
+ 
         Pos_ = pc;
-
+ 
         bool r = ParseOptArg(Pos_);
         Y_ASSERT(r);
         while (Pos_ == pc) {
@@ -238,33 +238,33 @@ namespace NLastGetopt {
             r = ParseShortOptWithinArg(Pos_, Sop_);
             Y_ASSERT(r);
         }
-
+ 
         size_t p2 = Pos_;
-
+ 
         Y_ASSERT(p2 - pc >= 1);
         Y_ASSERT(p2 - pc <= 2);
-
+ 
         memrotate(Argv_ + p0, (p2 - p0) * sizeof(void*), (p2 - pc) * sizeof(void*));
-
+ 
         bool r2 = ParseOptArg(p0);
         Y_ASSERT(r2);
         return r2;
     }
-
+ 
     bool TOptsParser::DoNext() {
         Y_ASSERT(Pos_ <= Argc_);
-
+ 
         if (Pos_ == Argc_)
             return CommitEndOfOptions(Pos_);
-
+ 
         if (GotMinusMinus_ && Opts_->ArgPermutation_ == RETURN_IN_ORDER) {
             Y_ASSERT(Sop_ == 0);
             return Commit(nullptr, Argv_[Pos_], Pos_ + 1, 0);
         }
-
+ 
         if (Sop_ > 0)
             return ParseShortOptWithinArg(Pos_, Sop_);
-
+ 
         size_t pos = Pos_;
         const TStringBuf arg(Argv_[pos]);
         if (EIO_NONE != IsOpt(arg)) {
@@ -283,59 +283,59 @@ namespace NLastGetopt {
             return Commit(nullptr, arg, pos + 1, 0);
         } else if (Opts_->ArgPermutation_ == REQUIRE_ORDER) {
             return CommitEndOfOptions(Pos_);
-        } else {
+        } else { 
             return ParseWithPermutation();
-        }
-    }
-
+        } 
+    } 
+ 
     bool TOptsParser::Next() {
         bool r = false;
-
+ 
         if (OptsDefault_.empty()) {
             CurrentOpt_ = nullptr;
             TempCurrentOpt_.Destroy();
-
+ 
             CurrentValue_ = nullptr;
-
+ 
             if (Stopped_)
                 return false;
-
+ 
             TOptsParser copy = *this;
-
+ 
             r = copy.DoNext();
-
+ 
             Swap(copy);
-
+ 
             if (!r) {
                 Stopped_ = true;
                 // we are done; check for missing options
                 Finish();
             }
-        }
-
+        } 
+ 
         if (!r && !OptsDefault_.empty()) {
             CurrentOpt_ = OptsDefault_.front();
             CurrentValue_ = CurrentOpt_->GetDefaultValue();
             OptsDefault_.pop_front();
             r = true;
         }
-
+ 
         if (r) {
             if (CurOpt())
                 CurOpt()->FireHandlers(this);
         }
 
         return r;
-    }
-
+    } 
+ 
     void TOptsParser::Finish() {
         const TOpts::TOptsVector& optvec = Opts_->Opts_;
         if (optvec.size() == OptsSeen_.size())
             return;
-
+ 
         TVector<TString> missingLong;
         TVector<char> missingShort;
-
+ 
         TOpts::TOptsVector::const_iterator it;
         for (it = optvec.begin(); it != optvec.end(); ++it) {
             const TOpt* opt = (*it).Get();
@@ -343,7 +343,7 @@ namespace NLastGetopt {
                 continue;
             if (OptsSeen_.contains(opt))
                 continue;
-
+ 
             if (opt->IsRequired()) {
                 const TOpt::TLongNames& optnames = opt->GetLongNames();
                 if (!optnames.empty())
@@ -355,18 +355,18 @@ namespace NLastGetopt {
                 }
                 continue;
             }
-
+ 
             if (opt->HasDefaultValue())
                 OptsDefault_.push_back(opt);
-        }
-
+        } 
+ 
         // also indicates subsequent options, if any, haven't been seen actually
         OptsSeen_.clear();
-
+ 
         const size_t nmissing = missingLong.size() + missingShort.size();
         if (0 == nmissing)
             return;
-
+ 
         TUsageException usage;
         usage << "The following option";
         usage << ((1 == nmissing) ? " is" : "s are");
@@ -377,11 +377,11 @@ namespace NLastGetopt {
             usage << " -" << missingShort[i];
         throw usage; // don't need lineinfo, just the message
     }
-
+ 
     void TOptsParser::PrintUsage(IOutputStream& os, const NColorizer::TColors& colors) const {
         Opts_->PrintUsage(ProgramName(), os, colors);
     }
-
+ 
     void TOptsParser::PrintUsage(IOutputStream& os) const {
         PrintUsage(os, NColorizer::AutoColors(os));
     }
diff --git a/library/cpp/getopt/small/last_getopt_parser.h b/library/cpp/getopt/small/last_getopt_parser.h
index 2cf8a6c308..292fb49d11 100644
--- a/library/cpp/getopt/small/last_getopt_parser.h
+++ b/library/cpp/getopt/small/last_getopt_parser.h
@@ -1,20 +1,20 @@
-#pragma once
-
-#include "last_getopt_opts.h"
-
+#pragma once 
+ 
+#include "last_getopt_opts.h" 
+ 
 #include <library/cpp/colorizer/fwd.h>
 
-#include <util/generic/hash_set.h>
-#include <util/generic/list.h>
-
-namespace NLastGetopt {
+#include <util/generic/hash_set.h> 
+#include <util/generic/list.h> 
+ 
+namespace NLastGetopt { 
     /**
-* NLastGetopt::TOptsParser is an implementation of parsing
-* argv/argv into TOptsParseResult by rules of TOpts.
-*
-* The class allows to make complicated handlers.
-* Note, that if PERMUTE mode is on, then data, pointed by argv can be changed.
-*/
+* NLastGetopt::TOptsParser is an implementation of parsing 
+* argv/argv into TOptsParseResult by rules of TOpts. 
+* 
+* The class allows to make complicated handlers. 
+* Note, that if PERMUTE mode is on, then data, pointed by argv can be changed. 
+*/ 
     class TOptsParser {
         enum EIsOpt {
             EIO_NONE,  //is not an option name
@@ -22,72 +22,72 @@ namespace NLastGetopt {
             EIO_DDASH, //double-dashed ("--opt") option name
             EIO_PLUS,  //plus prefix ("+opt") option name
         };
-
+ 
     public:                 // TODO: make private
         const TOpts* Opts_; //rules of parsing
-
+ 
         // argc/argv pair
         size_t Argc_;
         const char** Argv_;
-
+ 
     private:
         //the storage of last unkown options. TODO: can be moved to local-method scope
         TCopyPtr<TOpt> TempCurrentOpt_;
-
+ 
     public:
         //storage of argv[0]
         TString ProgramName_;
-
+ 
         //state of parsing:
-
+ 
         size_t Pos_; // current element withing argv
         size_t Sop_; // current char within arg
         bool Stopped_;
         bool GotMinusMinus_; //true if "--" have been seen in argv
-
+ 
     protected:
         const TOpt* CurrentOpt_;  // ptr on the last meeted option
         TStringBuf CurrentValue_; // the value of the last met argument (corresponding to CurrentOpt_)
-
+ 
     private:
         typedef THashSet<const TOpt*> TdOptSet;
         TdOptSet OptsSeen_; //the set of options that have been met during parsing
-
+ 
         TList<const TOpt*> OptsDefault_;
-
+ 
     private:
         void Init(const TOpts* options, int argc, const char* argv[]);
         void Init(const TOpts* options, int argc, char* argv[]);
-
+ 
         bool CommitEndOfOptions(size_t pos);
         bool Commit(const TOpt* currentOption, const TStringBuf& currentValue, size_t pos, size_t sop);
-
+ 
         bool ParseShortOptArg(size_t pos);
         bool ParseOptArg(size_t pos);
         bool ParseOptParam(const TOpt* opt, size_t pos);
         bool ParseUnknownShortOptWithinArg(size_t pos, size_t sop);
         bool ParseShortOptWithinArg(size_t pos, size_t sop);
         bool ParseWithPermutation();
-
+ 
         bool DoNext();
         void Finish();
-
+ 
         EIsOpt IsOpt(const TStringBuf& arg) const;
-
+ 
         void Swap(TOptsParser& that);
-
+ 
     public:
         TOptsParser(const TOpts* options, int argc, const char* argv[]) {
             Init(options, argc, argv);
         }
-
+ 
         TOptsParser(const TOpts* options, int argc, char* argv[]) {
             Init(options, argc, argv);
         }
-
+ 
         /// fetch next argument, false if no more arguments left
         bool Next();
-
+ 
         bool Seen(const TOpt* opt) const {
             return OptsSeen_.contains(opt);
         }
@@ -111,38 +111,38 @@ namespace NLastGetopt {
         const TOpt* CurOpt() const {
             return CurrentOpt_;
         }
-
+ 
         const char* CurVal() const {
             return CurrentValue_.data();
         }
-
+ 
         const TStringBuf& CurValStr() const {
             return CurrentValue_;
         }
-
+ 
         TStringBuf CurValOrOpt() const {
             TStringBuf val(CurValStr());
             if (!val.IsInited() && CurOpt()->HasOptionalValue())
                 val = CurOpt()->GetOptionalValue();
             return val;
         }
-
+ 
         TStringBuf CurValOrDef(bool useDef = true) const {
             TStringBuf val(CurValOrOpt());
             if (!val.IsInited() && useDef && CurOpt()->HasDefaultValue())
                 val = CurOpt()->GetDefaultValue();
             return val;
         }
-
+ 
         // true if this option was actually specified by the user
         bool IsExplicit() const {
             return nullptr == CurrentOpt_ || !OptsSeen_.empty();
         }
-
+ 
         bool CurrentIs(const TString& name) const {
             return CurOpt()->NameIs(name);
         }
-
+ 
         const TString& ProgramName() const {
             return ProgramName_;
         }
diff --git a/library/cpp/getopt/small/last_getopt_support.h b/library/cpp/getopt/small/last_getopt_support.h
index 17bed3e614..352a8616fb 100644
--- a/library/cpp/getopt/small/last_getopt_support.h
+++ b/library/cpp/getopt/small/last_getopt_support.h
@@ -136,21 +136,21 @@ namespace NLastGetopt {
                 , Value(value)
             {
             }
-
+ 
             void operator()(const TOptsParser*) {
                 *Target = Value;
             }
         };
-
+ 
         TString OptToString(char c);
         TString OptToString(const TString& longOption);
         TString OptToString(const TOpt* opt);
-
+ 
         template <typename T>
         inline T OptFromStringImpl(const TStringBuf& value) {
             return FromString<T>(value);
-        }
-
+        } 
+ 
         template <>
         inline TStringBuf OptFromStringImpl<TStringBuf>(const TStringBuf& value) {
             return value;
diff --git a/library/cpp/getopt/small/opt.h b/library/cpp/getopt/small/opt.h
index ecb57439bc..2a04caab29 100644
--- a/library/cpp/getopt/small/opt.h
+++ b/library/cpp/getopt/small/opt.h
@@ -25,7 +25,7 @@
     == non-option forces getopt to return 1 and to place non-option into optarg
 
  2. shortopts begins with '+'   :=> REQUIRE_ORDER
-    GetEnv(_POSIX_OPTION_ORDER) :=> REQUIRE_ORDER
+    GetEnv(_POSIX_OPTION_ORDER) :=> REQUIRE_ORDER 
     == 1st non-option forces getopt to return EOF
 
  3. default            :=> PERMUTE
diff --git a/library/cpp/getopt/small/ya.make b/library/cpp/getopt/small/ya.make
index 96de0f04b1..a11fc36ab3 100644
--- a/library/cpp/getopt/small/ya.make
+++ b/library/cpp/getopt/small/ya.make
@@ -12,11 +12,11 @@ SRCS(
     completion_generator.cpp
     formatted_output.cpp
     last_getopt.cpp
-    last_getopt_easy_setup.cpp
-    last_getopt_opt.cpp
-    last_getopt_opts.cpp
-    last_getopt_parser.cpp
-    last_getopt_parse_result.cpp
+    last_getopt_easy_setup.cpp 
+    last_getopt_opt.cpp 
+    last_getopt_opts.cpp 
+    last_getopt_parser.cpp 
+    last_getopt_parse_result.cpp 
     modchooser.cpp
     opt.cpp
     opt2.cpp
diff --git a/library/cpp/getopt/ut/last_getopt_ut.cpp b/library/cpp/getopt/ut/last_getopt_ut.cpp
index c99a1d053d..1d5f19d25f 100644
--- a/library/cpp/getopt/ut/last_getopt_ut.cpp
+++ b/library/cpp/getopt/ut/last_getopt_ut.cpp
@@ -1,7 +1,7 @@
-#include <library/cpp/getopt/last_getopt.h>
+#include <library/cpp/getopt/last_getopt.h> 
 
 #include <library/cpp/colorizer/colors.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/array_size.h>
 #include <util/string/subst.h>
diff --git a/library/cpp/getopt/ut/modchooser_ut.cpp b/library/cpp/getopt/ut/modchooser_ut.cpp
index a14c8a5853..4e308c7ed3 100644
--- a/library/cpp/getopt/ut/modchooser_ut.cpp
+++ b/library/cpp/getopt/ut/modchooser_ut.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/getopt/modchooser.h>
+#include <library/cpp/getopt/modchooser.h> 
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/str.h>
 
diff --git a/library/cpp/getopt/ut/opt2_ut.cpp b/library/cpp/getopt/ut/opt2_ut.cpp
index 0e7464747c..aedb2c24ea 100644
--- a/library/cpp/getopt/ut/opt2_ut.cpp
+++ b/library/cpp/getopt/ut/opt2_ut.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/getopt/opt2.h>
+#include <library/cpp/getopt/opt2.h> 
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 //using namespace NLastGetopt;
 
diff --git a/library/cpp/getopt/ut/opt_ut.cpp b/library/cpp/getopt/ut/opt_ut.cpp
index 441aa493a0..c3d1ed3709 100644
--- a/library/cpp/getopt/ut/opt_ut.cpp
+++ b/library/cpp/getopt/ut/opt_ut.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/getopt/opt.h>
+#include <library/cpp/getopt/opt.h> 
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/string/vector.h>
 
 Y_UNIT_TEST_SUITE(OptTest) {
diff --git a/library/cpp/getopt/ut/posix_getopt_ut.cpp b/library/cpp/getopt/ut/posix_getopt_ut.cpp
index b6d374bf28..b9edd9350f 100644
--- a/library/cpp/getopt/ut/posix_getopt_ut.cpp
+++ b/library/cpp/getopt/ut/posix_getopt_ut.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/getopt/posix_getopt.h>
+#include <library/cpp/getopt/posix_getopt.h> 
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NLastGetopt;
 
diff --git a/library/cpp/getopt/ut/wrap.cpp b/library/cpp/getopt/ut/wrap.cpp
index 3444eea102..2d8bdf72b3 100644
--- a/library/cpp/getopt/ut/wrap.cpp
+++ b/library/cpp/getopt/ut/wrap.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
-#include <library/cpp/getopt/small/wrap.h>
+#include <library/cpp/getopt/small/wrap.h> 
 
 Y_UNIT_TEST_SUITE(Wrap) {
     Y_UNIT_TEST(TestWrapping) {
diff --git a/library/cpp/getopt/ut/ya.make b/library/cpp/getopt/ut/ya.make
index 8d00669efb..c8e0b5377e 100644
--- a/library/cpp/getopt/ut/ya.make
+++ b/library/cpp/getopt/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/getopt)
+UNITTEST_FOR(library/cpp/getopt) 
 
 OWNER(pg)
 
diff --git a/library/cpp/getopt/ut/ygetopt_ut.cpp b/library/cpp/getopt/ut/ygetopt_ut.cpp
index a76f117216..dfa4dfbfac 100644
--- a/library/cpp/getopt/ut/ygetopt_ut.cpp
+++ b/library/cpp/getopt/ut/ygetopt_ut.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/getopt/ygetopt.h>
+#include <library/cpp/getopt/ygetopt.h> 
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 class TGetOptTest: public TTestBase {
     UNIT_TEST_SUITE(TGetOptTest);
diff --git a/library/cpp/getopt/ya.make b/library/cpp/getopt/ya.make
index 6df23b22b2..c8fc111c19 100644
--- a/library/cpp/getopt/ya.make
+++ b/library/cpp/getopt/ya.make
@@ -3,13 +3,13 @@ LIBRARY()
 OWNER(pg)
 
 PEERDIR(
-    library/cpp/getopt/small
+    library/cpp/getopt/small 
     library/cpp/svnversion
     library/cpp/build_info
 )
 
 SRCS(
-    GLOBAL print.cpp
+    GLOBAL print.cpp 
 )
 
 END()
diff --git a/library/cpp/getopt/ygetopt.h b/library/cpp/getopt/ygetopt.h
index fd018b3128..9e716e768d 100644
--- a/library/cpp/getopt/ygetopt.h
+++ b/library/cpp/getopt/ygetopt.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <library/cpp/getopt/small/ygetopt.h>
+#include <library/cpp/getopt/small/ygetopt.h> 
diff --git a/library/cpp/grpc/server/grpc_request_base.h b/library/cpp/grpc/server/grpc_request_base.h
index fcfce1c181..a9eec8bce4 100644
--- a/library/cpp/grpc/server/grpc_request_base.h
+++ b/library/cpp/grpc/server/grpc_request_base.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <google/protobuf/message.h>
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/future/future.h> 
 
 #include <grpc++/server_context.h>
 
diff --git a/library/cpp/grpc/server/grpc_server.h b/library/cpp/grpc/server/grpc_server.h
index d6814a90a0..9ebad4b321 100644
--- a/library/cpp/grpc/server/grpc_server.h
+++ b/library/cpp/grpc/server/grpc_server.h
@@ -3,7 +3,7 @@
 #include "grpc_request_base.h"
 #include "logger.h"
 
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/future/future.h> 
 
 #include <util/generic/ptr.h>
 #include <util/generic/string.h>
diff --git a/library/cpp/grpc/server/ut/stream_adaptor_ut.cpp b/library/cpp/grpc/server/ut/stream_adaptor_ut.cpp
index c34d3b8c2b..445ecf8f9d 100644
--- a/library/cpp/grpc/server/ut/stream_adaptor_ut.cpp
+++ b/library/cpp/grpc/server/ut/stream_adaptor_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/grpc/server/grpc_request.h>
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/system/thread.h>
 #include <util/thread/pool.h>
diff --git a/library/cpp/histogram/hdr/histogram_iter_ut.cpp b/library/cpp/histogram/hdr/histogram_iter_ut.cpp
index 9c291a2547..a5a5dac057 100644
--- a/library/cpp/histogram/hdr/histogram_iter_ut.cpp
+++ b/library/cpp/histogram/hdr/histogram_iter_ut.cpp
@@ -1,6 +1,6 @@
 #include "histogram_iter.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NHdr;
 
diff --git a/library/cpp/histogram/hdr/histogram_ut.cpp b/library/cpp/histogram/hdr/histogram_ut.cpp
index 4841b76e71..bfa65b496e 100644
--- a/library/cpp/histogram/hdr/histogram_ut.cpp
+++ b/library/cpp/histogram/hdr/histogram_ut.cpp
@@ -1,6 +1,6 @@
 #include "histogram.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/cast.h>
 
diff --git a/library/cpp/html/escape/ut/escape_ut.cpp b/library/cpp/html/escape/ut/escape_ut.cpp
index cd7b955138..fba81e16a5 100644
--- a/library/cpp/html/escape/ut/escape_ut.cpp
+++ b/library/cpp/html/escape/ut/escape_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/html/escape/escape.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NHtml;
 
diff --git a/library/cpp/html/pcdata/pcdata_ut.cpp b/library/cpp/html/pcdata/pcdata_ut.cpp
index 5833f8bc59..fcbe4ab0be 100644
--- a/library/cpp/html/pcdata/pcdata_ut.cpp
+++ b/library/cpp/html/pcdata/pcdata_ut.cpp
@@ -1,6 +1,6 @@
 #include "pcdata.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TPcdata) {
     Y_UNIT_TEST(TestStress) {
diff --git a/library/cpp/http/fetch/httpfsm_ut.cpp b/library/cpp/http/fetch/httpfsm_ut.cpp
index b018e80101..7e6a7410b9 100644
--- a/library/cpp/http/fetch/httpfsm_ut.cpp
+++ b/library/cpp/http/fetch/httpfsm_ut.cpp
@@ -4,7 +4,7 @@
 
 #include <util/generic/ptr.h>
 #include <library/cpp/charset/doccodes.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 class THttpHeaderParserTestSuite: public TTestBase {
     UNIT_TEST_SUITE(THttpHeaderParserTestSuite);
diff --git a/library/cpp/http/fetch/httpparser_ut.cpp b/library/cpp/http/fetch/httpparser_ut.cpp
index 3b3b938e7a..3384e6d3ef 100644
--- a/library/cpp/http/fetch/httpparser_ut.cpp
+++ b/library/cpp/http/fetch/httpparser_ut.cpp
@@ -1,6 +1,6 @@
 #include "httpparser.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #define ENUM_OUT(arg)  \
     case type ::arg: { \
diff --git a/library/cpp/http/io/chunk_ut.cpp b/library/cpp/http/io/chunk_ut.cpp
index da283f8568..d47ca70a19 100644
--- a/library/cpp/http/io/chunk_ut.cpp
+++ b/library/cpp/http/io/chunk_ut.cpp
@@ -1,6 +1,6 @@
 #include "chunk.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/file.h>
 #include <util/system/tempfile.h>
diff --git a/library/cpp/http/io/compression_ut.cpp b/library/cpp/http/io/compression_ut.cpp
index 2f3d131f8c..b6cf762ddc 100644
--- a/library/cpp/http/io/compression_ut.cpp
+++ b/library/cpp/http/io/compression_ut.cpp
@@ -1,8 +1,8 @@
 #include "stream.h"
 #include "compression.h"
 
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/stream/zlib.h>
 #include <util/generic/hash_set.h>
diff --git a/library/cpp/http/io/headers_ut.cpp b/library/cpp/http/io/headers_ut.cpp
index 1d23ef8fdc..2fac93ebe1 100644
--- a/library/cpp/http/io/headers_ut.cpp
+++ b/library/cpp/http/io/headers_ut.cpp
@@ -4,7 +4,7 @@
 #include <utility>
 
 #include <library/cpp/http/io/headers.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace {
     class THeadersExistence {
diff --git a/library/cpp/http/io/stream_ut.cpp b/library/cpp/http/io/stream_ut.cpp
index 1ea35df675..c1a486d236 100644
--- a/library/cpp/http/io/stream_ut.cpp
+++ b/library/cpp/http/io/stream_ut.cpp
@@ -3,8 +3,8 @@
 
 #include <library/cpp/http/server/http_ex.h>
 
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/string/printf.h>
 #include <util/network/socket.h>
diff --git a/library/cpp/http/io/stream_ut_medium.cpp b/library/cpp/http/io/stream_ut_medium.cpp
index 2c125eb21e..4ac4fffb9b 100644
--- a/library/cpp/http/io/stream_ut_medium.cpp
+++ b/library/cpp/http/io/stream_ut_medium.cpp
@@ -1,5 +1,5 @@
 #include "stream.h"
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/stream/zlib.h>
 
 Y_UNIT_TEST_SUITE(THttpTestMedium) {
diff --git a/library/cpp/http/misc/httpdate_ut.cpp b/library/cpp/http/misc/httpdate_ut.cpp
index c1a0103501..340a3a5774 100644
--- a/library/cpp/http/misc/httpdate_ut.cpp
+++ b/library/cpp/http/misc/httpdate_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "httpdate.h"
 
diff --git a/library/cpp/http/misc/httpreqdata.h b/library/cpp/http/misc/httpreqdata.h
index 16e59c4d78..0384f62302 100644
--- a/library/cpp/http/misc/httpreqdata.h
+++ b/library/cpp/http/misc/httpreqdata.h
@@ -6,7 +6,7 @@
 
 #include <util/system/defaults.h>
 #include <util/string/cast.h>
-#include <library/cpp/cgiparam/cgiparam.h>
+#include <library/cpp/cgiparam/cgiparam.h> 
 #include <util/network/address.h>
 #include <util/network/socket.h>
 #include <util/generic/hash.h>
diff --git a/library/cpp/http/misc/httpreqdata_ut.cpp b/library/cpp/http/misc/httpreqdata_ut.cpp
index e7f16ef27c..66525cba9c 100644
--- a/library/cpp/http/misc/httpreqdata_ut.cpp
+++ b/library/cpp/http/misc/httpreqdata_ut.cpp
@@ -1,6 +1,6 @@
 #include "httpreqdata.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TRequestServerDataTest) {
     Y_UNIT_TEST(Headers) {
diff --git a/library/cpp/http/misc/parsed_request_ut.cpp b/library/cpp/http/misc/parsed_request_ut.cpp
index da6d95c6ab..a4f66c3b8d 100644
--- a/library/cpp/http/misc/parsed_request_ut.cpp
+++ b/library/cpp/http/misc/parsed_request_ut.cpp
@@ -1,6 +1,6 @@
 #include "parsed_request.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(THttpParse) {
     Y_UNIT_TEST(TestParse) {
diff --git a/library/cpp/http/misc/ya.make b/library/cpp/http/misc/ya.make
index fceb3cf79c..94ab0b7d63 100644
--- a/library/cpp/http/misc/ya.make
+++ b/library/cpp/http/misc/ya.make
@@ -15,7 +15,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/cgiparam
+    library/cpp/cgiparam 
     library/cpp/digest/lower_case
 )
 
diff --git a/library/cpp/http/server/http.cpp b/library/cpp/http/server/http.cpp
index 128583bdd7..2132d0148f 100644
--- a/library/cpp/http/server/http.cpp
+++ b/library/cpp/http/server/http.cpp
@@ -1,7 +1,7 @@
 #include "http.h"
 #include "http_ex.h"
 
-#include <library/cpp/threading/equeue/equeue.h>
+#include <library/cpp/threading/equeue/equeue.h> 
 
 #include <util/generic/buffer.h>
 #include <util/generic/cast.h>
@@ -260,12 +260,12 @@ public:
         };
 
         if (!fail && Requests->Add(req.Get())) {
-            Y_UNUSED(req.Release());
+            Y_UNUSED(req.Release()); 
         } else {
             req = new TFailRequest(req);
 
             if (FailRequests->Add(req.Get())) {
-                Y_UNUSED(req.Release());
+                Y_UNUSED(req.Release()); 
             } else {
                 Cb_->OnFailRequest(-1);
             }
@@ -664,7 +664,7 @@ void TClientRequest::ReleaseConnection() {
     if (Conn_ && HttpConn_ && HttpServ()->Options().KeepAliveEnabled && HttpConn_->CanBeKeepAlive() && (!HttpServ()->Options().RejectExcessConnections || !HttpServ()->MaxRequestsReached())) {
         Output().Finish();
         Conn_->DeActivate();
-        Y_UNUSED(Conn_.Release());
+        Y_UNUSED(Conn_.Release()); 
     }
 }
 
@@ -720,7 +720,7 @@ void TClientRequest::Process(void* ThreadSpecificResource) {
         throw;
     }
 
-    Y_UNUSED(this_.Release());
+    Y_UNUSED(this_.Release()); 
 }
 
 void TClientRequest::ProcessFailRequest(int failstate) {
diff --git a/library/cpp/http/server/http_ut.cpp b/library/cpp/http/server/http_ut.cpp
index cc62bb988e..8e46a6cb2e 100644
--- a/library/cpp/http/server/http_ut.cpp
+++ b/library/cpp/http/server/http_ut.cpp
@@ -1,8 +1,8 @@
 #include "http.h"
 #include "http_ex.h"
 
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/generic/cast.h>
 #include <util/stream/output.h>
diff --git a/library/cpp/http/server/response_ut.cpp b/library/cpp/http/server/response_ut.cpp
index 73e2112ad3..26389b6a0b 100644
--- a/library/cpp/http/server/response_ut.cpp
+++ b/library/cpp/http/server/response_ut.cpp
@@ -1,6 +1,6 @@
 #include "response.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/string/cast.h>
 
diff --git a/library/cpp/http/server/ya.make b/library/cpp/http/server/ya.make
index bae6f33306..36968edb73 100644
--- a/library/cpp/http/server/ya.make
+++ b/library/cpp/http/server/ya.make
@@ -19,7 +19,7 @@ SRCS(
 PEERDIR(
     library/cpp/http/misc
     library/cpp/http/io
-    library/cpp/threading/equeue
+    library/cpp/threading/equeue 
 )
 
 END()
diff --git a/library/cpp/hyperloglog/hyperloglog_ut.cpp b/library/cpp/hyperloglog/hyperloglog_ut.cpp
index b987aa0fa4..42fee13c43 100644
--- a/library/cpp/hyperloglog/hyperloglog_ut.cpp
+++ b/library/cpp/hyperloglog/hyperloglog_ut.cpp
@@ -4,7 +4,7 @@
 #include <util/random/mersenne.h>
 #include <util/stream/buffer.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <cmath>
 
diff --git a/library/cpp/int128/bench/main.cpp b/library/cpp/int128/bench/main.cpp
index be4f8d1500..c5549df69c 100644
--- a/library/cpp/int128/bench/main.cpp
+++ b/library/cpp/int128/bench/main.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/int128/int128.h>
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 
 #include <util/generic/xrange.h>
 #include <util/system/compiler.h>
diff --git a/library/cpp/int128/ut/i128_and_intrinsic_identity_ut.cpp b/library/cpp/int128/ut/i128_and_intrinsic_identity_ut.cpp
index dbb7507a73..50b93359bf 100644
--- a/library/cpp/int128/ut/i128_and_intrinsic_identity_ut.cpp
+++ b/library/cpp/int128/ut/i128_and_intrinsic_identity_ut.cpp
@@ -1,6 +1,6 @@
 #include "int128_ut_helpers.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/int128/int128.h>
 
diff --git a/library/cpp/int128/ut/i128_comparison_ut.cpp b/library/cpp/int128/ut/i128_comparison_ut.cpp
index 7b8d508815..d17036444c 100644
--- a/library/cpp/int128/ut/i128_comparison_ut.cpp
+++ b/library/cpp/int128/ut/i128_comparison_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/int128/int128.h>
 
diff --git a/library/cpp/int128/ut/i128_division_ut.cpp b/library/cpp/int128/ut/i128_division_ut.cpp
index 46b0ca27f5..b93661e637 100644
--- a/library/cpp/int128/ut/i128_division_ut.cpp
+++ b/library/cpp/int128/ut/i128_division_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/int128/int128.h>
 
diff --git a/library/cpp/int128/ut/i128_type_traits_ut.cpp b/library/cpp/int128/ut/i128_type_traits_ut.cpp
index 4ed87bf229..69b57d9436 100644
--- a/library/cpp/int128/ut/i128_type_traits_ut.cpp
+++ b/library/cpp/int128/ut/i128_type_traits_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/int128/int128.h>
 
diff --git a/library/cpp/int128/ut/i128_ut.cpp b/library/cpp/int128/ut/i128_ut.cpp
index c196d132a2..8eaf327867 100644
--- a/library/cpp/int128/ut/i128_ut.cpp
+++ b/library/cpp/int128/ut/i128_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/int128/int128.h>
 
diff --git a/library/cpp/int128/ut/int128_old_ut.cpp b/library/cpp/int128/ut/int128_old_ut.cpp
index 2c5b9e9610..5abb1492d3 100644
--- a/library/cpp/int128/ut/int128_old_ut.cpp
+++ b/library/cpp/int128/ut/int128_old_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/int128/int128.h>
 
 #include "int128_ut_helpers.h"
diff --git a/library/cpp/int128/ut/int128_typetraits_ut.cpp b/library/cpp/int128/ut/int128_typetraits_ut.cpp
index fd5f19d7b8..d9746af8cc 100644
--- a/library/cpp/int128/ut/int128_typetraits_ut.cpp
+++ b/library/cpp/int128/ut/int128_typetraits_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/int128/int128.h>
 
diff --git a/library/cpp/int128/ut/int128_ut.cpp b/library/cpp/int128/ut/int128_ut.cpp
index 7339264017..0a11a9cfda 100644
--- a/library/cpp/int128/ut/int128_ut.cpp
+++ b/library/cpp/int128/ut/int128_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/int128/int128.h>
 
diff --git a/library/cpp/int128/ut/int128_via_intrinsic_ut.cpp b/library/cpp/int128/ut/int128_via_intrinsic_ut.cpp
index 9decc2fd48..9ecc8036f5 100644
--- a/library/cpp/int128/ut/int128_via_intrinsic_ut.cpp
+++ b/library/cpp/int128/ut/int128_via_intrinsic_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/int128/int128.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 // from https://a.yandex-team.ru/arc/trunk/arcadia/library/ticket_parser/c/src/ut/utils_ut.cpp?rev=4221861
 
diff --git a/library/cpp/int128/ut/ui128_division_ut.cpp b/library/cpp/int128/ut/ui128_division_ut.cpp
index 4826a531e0..bbfcc79d34 100644
--- a/library/cpp/int128/ut/ui128_division_ut.cpp
+++ b/library/cpp/int128/ut/ui128_division_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/int128/int128.h>
 
diff --git a/library/cpp/ipmath/ipmath_ut.cpp b/library/cpp/ipmath/ipmath_ut.cpp
index 5fe459ecc8..fb4d7ac8da 100644
--- a/library/cpp/ipmath/ipmath_ut.cpp
+++ b/library/cpp/ipmath/ipmath_ut.cpp
@@ -1,7 +1,7 @@
 #include "ipmath.h"
 #include "range_set.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/testing/gmock_in_unittest/gmock.h>
 
 #include <library/cpp/ipv6_address/ipv6_address.h>
diff --git a/library/cpp/ipv6_address/ut/ipv6_address_ut.cpp b/library/cpp/ipv6_address/ut/ipv6_address_ut.cpp
index 73bb7cffdd..9f791f7148 100644
--- a/library/cpp/ipv6_address/ut/ipv6_address_ut.cpp
+++ b/library/cpp/ipv6_address/ut/ipv6_address_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/ipv6_address/ipv6_address.h>
 #include <unordered_set>
 
diff --git a/library/cpp/json/flex_buffers/ut/cvt_ut.cpp b/library/cpp/json/flex_buffers/ut/cvt_ut.cpp
index 9fffef4d38..0fc0a94517 100644
--- a/library/cpp/json/flex_buffers/ut/cvt_ut.cpp
+++ b/library/cpp/json/flex_buffers/ut/cvt_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/json/flex_buffers/cvt.h>
 
 using namespace NJson;
diff --git a/library/cpp/json/json_prettifier.cpp b/library/cpp/json/json_prettifier.cpp
index bb16aab44e..4135a0899c 100644
--- a/library/cpp/json/json_prettifier.cpp
+++ b/library/cpp/json/json_prettifier.cpp
@@ -5,7 +5,7 @@
 #include <util/memory/pool.h>
 #include <util/string/util.h>
 
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 
 namespace NJson {
     struct TRewritableOut {
diff --git a/library/cpp/json/ut/json_prettifier_ut.cpp b/library/cpp/json/ut/json_prettifier_ut.cpp
index ae5f8dd81a..d0f5aab8cb 100644
--- a/library/cpp/json/ut/json_prettifier_ut.cpp
+++ b/library/cpp/json/ut/json_prettifier_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/json/json_prettifier.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(JsonPrettifier) {
     Y_UNIT_TEST(PrettifyJsonShort) {
diff --git a/library/cpp/json/ut/json_reader_fast_ut.cpp b/library/cpp/json/ut/json_reader_fast_ut.cpp
index 60dffc91c7..02ac7c50d9 100644
--- a/library/cpp/json/ut/json_reader_fast_ut.cpp
+++ b/library/cpp/json/ut/json_reader_fast_ut.cpp
@@ -1,8 +1,8 @@
 #include <library/cpp/json/json_reader.h>
 #include <library/cpp/json/json_prettifier.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 #include <util/string/cast.h>
 #include <util/string/printf.h>
 
diff --git a/library/cpp/json/ut/json_reader_ut.cpp b/library/cpp/json/ut/json_reader_ut.cpp
index cd31afa0b8..fc1dd0a192 100644
--- a/library/cpp/json/ut/json_reader_ut.cpp
+++ b/library/cpp/json/ut/json_reader_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/json/json_reader.h>
 #include <library/cpp/json/json_writer.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/stream/str.h>
 
 using namespace NJson;
diff --git a/library/cpp/json/ut/json_saveload_ut.cpp b/library/cpp/json/ut/json_saveload_ut.cpp
index b480a80fe4..2a8ba23104 100644
--- a/library/cpp/json/ut/json_saveload_ut.cpp
+++ b/library/cpp/json/ut/json_saveload_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/json/json_value.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/stream/buffer.h>
 #include <util/generic/buffer.h>
 #include <util/ysaveload.h>
diff --git a/library/cpp/json/ut/json_writer_ut.cpp b/library/cpp/json/ut/json_writer_ut.cpp
index ca11d34dad..13ff58bceb 100644
--- a/library/cpp/json/ut/json_writer_ut.cpp
+++ b/library/cpp/json/ut/json_writer_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/json/json_writer.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/str.h>
 
diff --git a/library/cpp/json/ut/ya.make b/library/cpp/json/ut/ya.make
index 8e0362d84b..4bb3fd66e5 100644
--- a/library/cpp/json/ut/ya.make
+++ b/library/cpp/json/ut/ya.make
@@ -3,7 +3,7 @@ OWNER(velavokr)
 UNITTEST_FOR(library/cpp/json)
 
 PEERDIR(
-    library/cpp/string_utils/relaxed_escaper
+    library/cpp/string_utils/relaxed_escaper 
 )
 
 SRCS(
diff --git a/library/cpp/json/writer/json_ut.cpp b/library/cpp/json/writer/json_ut.cpp
index 9980555683..cfe125ab52 100644
--- a/library/cpp/json/writer/json_ut.cpp
+++ b/library/cpp/json/writer/json_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/system/sanitizers.h>
 
 #include "json.h"
diff --git a/library/cpp/json/writer/json_value_ut.cpp b/library/cpp/json/writer/json_value_ut.cpp
index dc7f6affdf..0fb37e1ffd 100644
--- a/library/cpp/json/writer/json_value_ut.cpp
+++ b/library/cpp/json/writer/json_value_ut.cpp
@@ -1,6 +1,6 @@
 #include "json_value.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/input.h>
 
diff --git a/library/cpp/json/ya.make b/library/cpp/json/ya.make
index d58eead8ec..34b927654b 100644
--- a/library/cpp/json/ya.make
+++ b/library/cpp/json/ya.make
@@ -17,7 +17,7 @@ PEERDIR(
     library/cpp/json/common
     library/cpp/json/fast_sax
     library/cpp/json/writer
-    library/cpp/string_utils/relaxed_escaper
+    library/cpp/string_utils/relaxed_escaper 
 )
 
 END()
diff --git a/library/cpp/json/yson/json2yson_ut.cpp b/library/cpp/json/yson/json2yson_ut.cpp
index 9eb23354cf..bfd8c3b439 100644
--- a/library/cpp/json/yson/json2yson_ut.cpp
+++ b/library/cpp/json/yson/json2yson_ut.cpp
@@ -2,8 +2,8 @@
 
 #include <library/cpp/blockcodecs/codecs.h>
 #include <library/cpp/histogram/simple/histogram.h>
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/datetime/cputimer.h>
 #include <util/stream/file.h>
diff --git a/library/cpp/json/yson/ut/ya.make b/library/cpp/json/yson/ut/ya.make
index 4ceb65b279..e207c2d2de 100644
--- a/library/cpp/json/yson/ut/ya.make
+++ b/library/cpp/json/yson/ut/ya.make
@@ -12,7 +12,7 @@ DATA(sbr://363537653)
 PEERDIR(
     library/cpp/blockcodecs
     library/cpp/histogram/simple
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
 )
 
 SIZE(LARGE)
diff --git a/library/cpp/lcs/lcs_via_lis_ut.cpp b/library/cpp/lcs/lcs_via_lis_ut.cpp
index f6ad5152b6..b3f32994dc 100644
--- a/library/cpp/lcs/lcs_via_lis_ut.cpp
+++ b/library/cpp/lcs/lcs_via_lis_ut.cpp
@@ -1,6 +1,6 @@
 #include <util/generic/utility.h>
 #include <util/string/util.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include "lcs_via_lis.h"
 
 class TLCSTest: public TTestBase {
diff --git a/library/cpp/lfalloc/alloc_profiler/profiler.h b/library/cpp/lfalloc/alloc_profiler/profiler.h
index 4ea49b9dcc..c07a6c0be6 100644
--- a/library/cpp/lfalloc/alloc_profiler/profiler.h
+++ b/library/cpp/lfalloc/alloc_profiler/profiler.h
@@ -2,7 +2,7 @@
 
 #include "stackcollect.h"
 
-#include <library/cpp/lfalloc/dbg_info/dbg_info.h>
+#include <library/cpp/lfalloc/dbg_info/dbg_info.h> 
 
 #include <util/generic/noncopyable.h>
 #include <util/stream/output.h>
diff --git a/library/cpp/lfalloc/alloc_profiler/profiler_ut.cpp b/library/cpp/lfalloc/alloc_profiler/profiler_ut.cpp
index 4341dda6ed..54acf18e71 100644
--- a/library/cpp/lfalloc/alloc_profiler/profiler_ut.cpp
+++ b/library/cpp/lfalloc/alloc_profiler/profiler_ut.cpp
@@ -1,6 +1,6 @@
 #include "profiler.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace NAllocProfiler {
 
diff --git a/library/cpp/lfalloc/alloc_profiler/stackcollect.h b/library/cpp/lfalloc/alloc_profiler/stackcollect.h
index 80715ed7cb..f90687d3cd 100644
--- a/library/cpp/lfalloc/alloc_profiler/stackcollect.h
+++ b/library/cpp/lfalloc/alloc_profiler/stackcollect.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <library/cpp/containers/stack_vector/stack_vec.h>
-#include <library/cpp/cache/cache.h>
+#include <library/cpp/containers/stack_vector/stack_vec.h> 
+#include <library/cpp/cache/cache.h> 
 
 #include <util/generic/noncopyable.h>
 #include <util/generic/ptr.h>
diff --git a/library/cpp/lfalloc/alloc_profiler/ut/ya.make b/library/cpp/lfalloc/alloc_profiler/ut/ya.make
index 8a7daa74af..64906384c1 100644
--- a/library/cpp/lfalloc/alloc_profiler/ut/ya.make
+++ b/library/cpp/lfalloc/alloc_profiler/ut/ya.make
@@ -1,9 +1,9 @@
-UNITTEST_FOR(library/cpp/lfalloc/alloc_profiler)
+UNITTEST_FOR(library/cpp/lfalloc/alloc_profiler) 
 
 OWNER(g:rtmr g:kikimr)
 
 PEERDIR(
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
 )
 
 IF (ARCH_AARCH64)
diff --git a/library/cpp/lfalloc/alloc_profiler/ya.make b/library/cpp/lfalloc/alloc_profiler/ya.make
index 0f58d91767..dd6d6fe13e 100644
--- a/library/cpp/lfalloc/alloc_profiler/ya.make
+++ b/library/cpp/lfalloc/alloc_profiler/ya.make
@@ -8,8 +8,8 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/lfalloc/dbg_info
-    library/cpp/cache
+    library/cpp/lfalloc/dbg_info 
+    library/cpp/cache 
 )
 
 END()
diff --git a/library/cpp/lfalloc/lf_allocX64.h b/library/cpp/lfalloc/lf_allocX64.h
index fd2a906d6f..b9dcc3d46f 100644
--- a/library/cpp/lfalloc/lf_allocX64.h
+++ b/library/cpp/lfalloc/lf_allocX64.h
@@ -53,7 +53,7 @@ static inline long AtomicSub(TAtomic& a, long b) {
             assert(x);             \
     }
 #else
-#define Y_ASSERT_NOBT(x) ((void)0)
+#define Y_ASSERT_NOBT(x) ((void)0) 
 #endif
 
 #else
@@ -62,35 +62,35 @@ static inline long AtomicSub(TAtomic& a, long b) {
 #include <util/system/atomic.h>
 #include <util/system/yassert.h>
 
-#if !defined(NDEBUG) && !defined(__GCCXML__)
-#define Y_ASSERT_NOBT(a)                                    \
-    do {                                                    \
-        try {                                               \
-            if (Y_UNLIKELY(!(a))) {                         \
-                if (YaIsDebuggerPresent())                  \
-                    __debugbreak();                         \
-                else {                                      \
-                    assert(false && (a));                   \
-                }                                           \
-            }                                               \
-        } catch (...) {                                     \
-            if (YaIsDebuggerPresent())                      \
-                __debugbreak();                             \
-            else {                                          \
-                assert(false && "Exception during assert"); \
-            }                                               \
-        }                                                   \
-    } while (0)
-#else
-#define Y_ASSERT_NOBT(a)                       \
-    do {                                       \
-        if (false) {                           \
-            bool __xxx = static_cast<bool>(a); \
-            Y_UNUSED(__xxx);                   \
-        }                                      \
-    } while (0)
-#endif
-
+#if !defined(NDEBUG) && !defined(__GCCXML__) 
+#define Y_ASSERT_NOBT(a)                                    \ 
+    do {                                                    \ 
+        try {                                               \ 
+            if (Y_UNLIKELY(!(a))) {                         \ 
+                if (YaIsDebuggerPresent())                  \ 
+                    __debugbreak();                         \ 
+                else {                                      \ 
+                    assert(false && (a));                   \ 
+                }                                           \ 
+            }                                               \ 
+        } catch (...) {                                     \ 
+            if (YaIsDebuggerPresent())                      \ 
+                __debugbreak();                             \ 
+            else {                                          \ 
+                assert(false && "Exception during assert"); \ 
+            }                                               \ 
+        }                                                   \ 
+    } while (0) 
+#else 
+#define Y_ASSERT_NOBT(a)                       \ 
+    do {                                       \ 
+        if (false) {                           \ 
+            bool __xxx = static_cast<bool>(a); \ 
+            Y_UNUSED(__xxx);                   \ 
+        }                                      \ 
+    } while (0) 
+#endif 
+ 
 #include <pthread.h>
 #include <sys/mman.h>
 #include <stdlib.h>
@@ -433,7 +433,7 @@ static void LargeBlockUnmap(void* p, size_t pages) {
     IncrementCounter(CT_MUNMAP, bytes);
     IncrementCounter(CT_MUNMAP_CNT, 1);
 #ifdef _MSC_VER
-    Y_ASSERT_NOBT(0);
+    Y_ASSERT_NOBT(0); 
 #else
     TLargeBlk::As(p)->Mark(ELarge::Gone);
     munmap((char*)p - 4096ll, bytes);
@@ -796,7 +796,7 @@ static bool DefragmentMem() {
                 if (pData) {
                     uintptr_t nChunk = (pData - ALLOC_START) / N_CHUNK_SIZE;
                     ++nFreeCount[nChunk];
-                    Y_ASSERT_NOBT(chunkSizeIdx[nChunk] == nSizeIdx);
+                    Y_ASSERT_NOBT(chunkSizeIdx[nChunk] == nSizeIdx); 
                 }
             }
         }
@@ -809,7 +809,7 @@ static bool DefragmentMem() {
         if (chunkSizeIdx[nChunk] <= 0)
             continue;
         int nEntries = N_CHUNK_SIZE / nSizeIdxToSize[static_cast<int>(chunkSizeIdx[nChunk])];
-        Y_ASSERT_NOBT(fc <= nEntries); // can not have more free blocks then total count
+        Y_ASSERT_NOBT(fc <= nEntries); // can not have more free blocks then total count 
         if (fc == nEntries) {
             bRes = true;
             nFreeCount[nChunk] = 1;
@@ -905,7 +905,7 @@ static void* SlowLFAlloc(int nSizeIdx, int blockSize, EDefrag defrag) {
             char* newPlace = ALLOC_START + nChunk * N_CHUNK_SIZE;
 #ifdef _MSC_VER
             void* pTest = VirtualAlloc(newPlace, N_CHUNK_SIZE, MEM_COMMIT, PAGE_READWRITE);
-            Y_ASSERT_NOBT(pTest == newPlace);
+            Y_ASSERT_NOBT(pTest == newPlace); 
 #endif
             chunkSizeIdx[nChunk] = (char)nSizeIdx;
             globalCurrentPtr[nSizeIdx] = newPlace + blockSize;
@@ -922,8 +922,8 @@ static void* SlowLFAlloc(int nSizeIdx, int blockSize, EDefrag defrag) {
         uintptr_t endAddr = ((largeBlock - ALLOC_START) + N_LARGE_ALLOC_SIZE) & (~(N_CHUNK_SIZE - 1));
         for (uintptr_t p = addr; p < endAddr; p += N_CHUNK_SIZE) {
             uintptr_t chunk = p / N_CHUNK_SIZE;
-            Y_ASSERT_NOBT(chunk * N_CHUNK_SIZE == p);
-            Y_ASSERT_NOBT(chunkSizeIdx[chunk] == 0);
+            Y_ASSERT_NOBT(chunk * N_CHUNK_SIZE == p); 
+            Y_ASSERT_NOBT(chunkSizeIdx[chunk] == 0); 
             AddFreeChunk(chunk);
         }
     }
@@ -980,7 +980,7 @@ static Y_FORCE_INLINE int TakeBlocksFromGlobalFreeList(int nSizeIdx, char** buf)
 static Y_FORCE_INLINE void PutBlocksToGlobalFreeList(ptrdiff_t nSizeIdx, char** buf, int count) {
     for (int startIdx = 0; startIdx < count;) {
         TFreeListGroup* g = (TFreeListGroup*)blockFreeList.Alloc();
-        Y_ASSERT_NOBT(sizeof(TFreeListGroup) == nSizeIdxToSize[FREE_LIST_GROUP_SIZEIDX]);
+        Y_ASSERT_NOBT(sizeof(TFreeListGroup) == nSizeIdxToSize[FREE_LIST_GROUP_SIZEIDX]); 
         if (!g) {
             g = (TFreeListGroup*)LFAllocNoCache(FREE_LIST_GROUP_SIZEIDX, NO_MEM_DEFRAG);
         }
@@ -1123,7 +1123,7 @@ struct TThreadAllocInfo {
             GetCurrentProcess(), GetCurrentThread(),
             GetCurrentProcess(), &hThread,
             0, FALSE, DUPLICATE_SAME_ACCESS);
-        Y_ASSERT_NOBT(b);
+        Y_ASSERT_NOBT(b); 
 #endif
         pNextInfo = *pHead;
         *pHead = this;
@@ -1147,7 +1147,7 @@ struct TThreadAllocInfo {
     }
     void Done() {
         for (auto sizeIdx : FreePtrIndex) {
-            Y_ASSERT_NOBT(sizeIdx == THREAD_BUF);
+            Y_ASSERT_NOBT(sizeIdx == THREAD_BUF); 
         }
         for (auto& localCounter : LocalCounters) {
             localCounter.Flush();
@@ -1418,7 +1418,7 @@ static inline void SampleDeallocation(TAllocHeader* p, int sizeIdx) {
 
 static inline void TrackPerTagAllocation(TAllocHeader* p, int sizeIdx) {
     if (p->Tag < DBG_ALLOC_MAX_TAG && p->Tag >= 0) {
-        Y_ASSERT_NOBT(sizeIdx < DBG_ALLOC_NUM_SIZES);
+        Y_ASSERT_NOBT(sizeIdx < DBG_ALLOC_NUM_SIZES); 
         auto& global = GlobalPerTagAllocCounters[p->Tag][sizeIdx];
 
         TThreadAllocInfo* thr = pThreadInfo;
@@ -1433,7 +1433,7 @@ static inline void TrackPerTagAllocation(TAllocHeader* p, int sizeIdx) {
 
 static inline void TrackPerTagDeallocation(TAllocHeader* p, int sizeIdx) {
     if (p->Tag < DBG_ALLOC_MAX_TAG && p->Tag >= 0) {
-        Y_ASSERT_NOBT(sizeIdx < DBG_ALLOC_NUM_SIZES);
+        Y_ASSERT_NOBT(sizeIdx < DBG_ALLOC_NUM_SIZES); 
         auto& global = GlobalPerTagAllocCounters[p->Tag][sizeIdx];
 
         TThreadAllocInfo* thr = pThreadInfo;
diff --git a/library/cpp/linear_regression/linear_regression_ut.cpp b/library/cpp/linear_regression/linear_regression_ut.cpp
index e71a16b67a..4a52387a3b 100644
--- a/library/cpp/linear_regression/linear_regression_ut.cpp
+++ b/library/cpp/linear_regression/linear_regression_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/linear_regression/linear_regression.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/vector.h>
 #include <util/generic/ymath.h>
diff --git a/library/cpp/logger/element_ut.cpp b/library/cpp/logger/element_ut.cpp
index 32edc52dfb..91fe57126e 100644
--- a/library/cpp/logger/element_ut.cpp
+++ b/library/cpp/logger/element_ut.cpp
@@ -7,7 +7,7 @@
 #include <util/generic/ptr.h>
 #include <utility>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 class TLogElementTest: public TTestBase {
     UNIT_TEST_SUITE(TLogElementTest);
diff --git a/library/cpp/logger/global/rty_formater_ut.cpp b/library/cpp/logger/global/rty_formater_ut.cpp
index 551a97c5bf..a661f884ca 100644
--- a/library/cpp/logger/global/rty_formater_ut.cpp
+++ b/library/cpp/logger/global/rty_formater_ut.cpp
@@ -1,6 +1,6 @@
 #include "rty_formater.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace {
     const TStringBuf SampleISO8601("2017-07-25T19:26:09.894000+03:00");
diff --git a/library/cpp/logger/log_ut.cpp b/library/cpp/logger/log_ut.cpp
index 8de46f17f5..6f29d247af 100644
--- a/library/cpp/logger/log_ut.cpp
+++ b/library/cpp/logger/log_ut.cpp
@@ -1,6 +1,6 @@
 #include "all.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/fs.h>
 #include <util/system/rwlock.h>
diff --git a/library/cpp/logger/rotating_file_ut.cpp b/library/cpp/logger/rotating_file_ut.cpp
index 84966933d9..bd12213629 100644
--- a/library/cpp/logger/rotating_file_ut.cpp
+++ b/library/cpp/logger/rotating_file_ut.cpp
@@ -5,8 +5,8 @@
 #include <util/system/fstat.h>
 #include <util/system/fs.h>
 
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 Y_UNIT_TEST_SUITE(NewRotatingFileSuite) {
     const TString PATH = GetWorkPath() + "/my.log";
diff --git a/library/cpp/lwtrace/example2/lwtrace_example2.cpp b/library/cpp/lwtrace/example2/lwtrace_example2.cpp
index 7a4f7a1daf..0f66fdbb91 100644
--- a/library/cpp/lwtrace/example2/lwtrace_example2.cpp
+++ b/library/cpp/lwtrace/example2/lwtrace_example2.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/lwtrace/control.h>
 #include <library/cpp/lwtrace/all.h>
 
-#include <library/cpp/getopt/last_getopt.h>
+#include <library/cpp/getopt/last_getopt.h> 
 #include <google/protobuf/text_format.h>
 #include <util/stream/file.h>
 
diff --git a/library/cpp/lwtrace/example2/ya.make b/library/cpp/lwtrace/example2/ya.make
index 22e34239c8..448054ba39 100644
--- a/library/cpp/lwtrace/example2/ya.make
+++ b/library/cpp/lwtrace/example2/ya.make
@@ -8,7 +8,7 @@ SRCS(
 
 PEERDIR(
     library/cpp/lwtrace
-    library/cpp/getopt
+    library/cpp/getopt 
 )
 
 END()
diff --git a/library/cpp/lwtrace/mon/mon_lwtrace.cpp b/library/cpp/lwtrace/mon/mon_lwtrace.cpp
index a61ee9ce22..45296327b4 100644
--- a/library/cpp/lwtrace/mon/mon_lwtrace.cpp
+++ b/library/cpp/lwtrace/mon/mon_lwtrace.cpp
@@ -10,7 +10,7 @@
 #include <library/cpp/monlib/service/pages/resource_mon_page.h>
 #include <library/cpp/monlib/service/pages/templates.h>
 #include <library/cpp/resource/resource.h>
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 #include <library/cpp/html/pcdata/pcdata.h>
 #include <util/string/escape.h>
 #include <util/system/condvar.h>
diff --git a/library/cpp/lwtrace/shuttle.h b/library/cpp/lwtrace/shuttle.h
index 85c6e4da61..0e6b57e937 100644
--- a/library/cpp/lwtrace/shuttle.h
+++ b/library/cpp/lwtrace/shuttle.h
@@ -2,7 +2,7 @@
 
 #include "event.h"
 
-#include <library/cpp/containers/stack_vector/stack_vec.h>
+#include <library/cpp/containers/stack_vector/stack_vec.h> 
 
 #include <util/generic/ptr.h>
 #include <util/system/spinlock.h>
diff --git a/library/cpp/lwtrace/start.cpp b/library/cpp/lwtrace/start.cpp
index 121d5472b6..cb9413ef8e 100644
--- a/library/cpp/lwtrace/start.cpp
+++ b/library/cpp/lwtrace/start.cpp
@@ -7,7 +7,7 @@
 #include <util/generic/singleton.h>
 #include <util/stream/file.h>
 #include <util/stream/output.h>
-#include <util/system/env.h>
+#include <util/system/env.h> 
 
 #include <stdlib.h>
 
@@ -40,8 +40,8 @@ void NLWTrace::StartLwtraceFromEnv() {
         started = true;
     }
 
-    TString path = GetEnv("LWTRACE");
-    if (!path) {
+    TString path = GetEnv("LWTRACE"); 
+    if (!path) { 
         return;
     }
 
@@ -54,8 +54,8 @@ void NLWTrace::StartLwtraceFromEnv() {
 }
 
 void NLWTrace::StartLwtraceFromEnv(std::function<void(TManager&)> prepare) {
-    TString path = GetEnv("LWTRACE");
-    if (Y_LIKELY(!path)) {
+    TString path = GetEnv("LWTRACE"); 
+    if (Y_LIKELY(!path)) { 
         return;
     }
 
diff --git a/library/cpp/lwtrace/tests/trace_tests.cpp b/library/cpp/lwtrace/tests/trace_tests.cpp
index 6762e344a7..f602628bb5 100644
--- a/library/cpp/lwtrace/tests/trace_tests.cpp
+++ b/library/cpp/lwtrace/tests/trace_tests.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/lwtrace/all.h>
 
-#include <library/cpp/getopt/last_getopt.h>
+#include <library/cpp/getopt/last_getopt.h> 
 
 #include <google/protobuf/text_format.h>
 
diff --git a/library/cpp/lwtrace/tests/ya.make b/library/cpp/lwtrace/tests/ya.make
index 6225ab1fa0..571ef36220 100644
--- a/library/cpp/lwtrace/tests/ya.make
+++ b/library/cpp/lwtrace/tests/ya.make
@@ -8,7 +8,7 @@ SRCS(
 
 PEERDIR(
     contrib/libs/protobuf
-    library/cpp/getopt
+    library/cpp/getopt 
     library/cpp/lwtrace
 )
 
diff --git a/library/cpp/lwtrace/trace_ut.cpp b/library/cpp/lwtrace/trace_ut.cpp
index cb03e4fbde..042f236e4f 100644
--- a/library/cpp/lwtrace/trace_ut.cpp
+++ b/library/cpp/lwtrace/trace_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <library/cpp/lwtrace/protos/lwtrace.pb.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <google/protobuf/text_format.h>
 
diff --git a/library/cpp/malloc/api/ut/ut.cpp b/library/cpp/malloc/api/ut/ut.cpp
index 7eccd0bf8d..510bc9f226 100644
--- a/library/cpp/malloc/api/ut/ut.cpp
+++ b/library/cpp/malloc/api/ut/ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/malloc/api/malloc.h>
 
diff --git a/library/cpp/messagebus/actor/actor_ut.cpp b/library/cpp/messagebus/actor/actor_ut.cpp
index b76ab55bfa..b74c8d4fcb 100644
--- a/library/cpp/messagebus/actor/actor_ut.cpp
+++ b/library/cpp/messagebus/actor/actor_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "actor.h"
 #include "queue_in_actor.h"
diff --git a/library/cpp/messagebus/actor/ring_buffer_ut.cpp b/library/cpp/messagebus/actor/ring_buffer_ut.cpp
index bdb379b3a9..068023e8ab 100644
--- a/library/cpp/messagebus/actor/ring_buffer_ut.cpp
+++ b/library/cpp/messagebus/actor/ring_buffer_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "ring_buffer.h"
 
diff --git a/library/cpp/messagebus/actor/tasks_ut.cpp b/library/cpp/messagebus/actor/tasks_ut.cpp
index d80e8451a5..ddc97ee5ec 100644
--- a/library/cpp/messagebus/actor/tasks_ut.cpp
+++ b/library/cpp/messagebus/actor/tasks_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "tasks.h"
 
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 e4b218a7ca..82f1cf840e 100644
--- a/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp
+++ b/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "what_thread_does_guard.h"
 
diff --git a/library/cpp/messagebus/async_result_ut.cpp b/library/cpp/messagebus/async_result_ut.cpp
index 2e96492afd..919501915c 100644
--- a/library/cpp/messagebus/async_result_ut.cpp
+++ b/library/cpp/messagebus/async_result_ut.cpp
@@ -1,5 +1,5 @@
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "async_result.h"
 
diff --git a/library/cpp/messagebus/cc_semaphore_ut.cpp b/library/cpp/messagebus/cc_semaphore_ut.cpp
index 206bb7c96a..9f2594b26a 100644
--- a/library/cpp/messagebus/cc_semaphore_ut.cpp
+++ b/library/cpp/messagebus/cc_semaphore_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "cc_semaphore.h"
 
diff --git a/library/cpp/messagebus/config/session_config.h b/library/cpp/messagebus/config/session_config.h
index 84753350a9..312d776e26 100644
--- a/library/cpp/messagebus/config/session_config.h
+++ b/library/cpp/messagebus/config/session_config.h
@@ -3,7 +3,7 @@
 #include "codegen.h"
 #include "defs.h"
 
-#include <library/cpp/getopt/last_getopt.h>
+#include <library/cpp/getopt/last_getopt.h> 
 
 #include <util/generic/string.h>
 
diff --git a/library/cpp/messagebus/config/ya.make b/library/cpp/messagebus/config/ya.make
index 20c7dfed19..0d3f599f02 100644
--- a/library/cpp/messagebus/config/ya.make
+++ b/library/cpp/messagebus/config/ya.make
@@ -3,7 +3,7 @@ LIBRARY()
 OWNER(g:messagebus)
 
 PEERDIR(
-    library/cpp/getopt
+    library/cpp/getopt 
     library/cpp/deprecated/enum_codegen
 )
 
diff --git a/library/cpp/messagebus/connection.h b/library/cpp/messagebus/connection.h
index b1df64ddc1..03436335fd 100644
--- a/library/cpp/messagebus/connection.h
+++ b/library/cpp/messagebus/connection.h
@@ -22,7 +22,7 @@ namespace NBus {
         EMessageStatus SendMessageAutoPtr(const TAutoPtr<T>& mes, bool wait = false) {
             EMessageStatus status = SendMessage(mes.Get(), wait);
             if (status == MESSAGE_OK)
-                Y_UNUSED(mes.Release());
+                Y_UNUSED(mes.Release()); 
             return status;
         }
 
@@ -31,7 +31,7 @@ namespace NBus {
         EMessageStatus SendMessageOneWayAutoPtr(const TAutoPtr<T>& mes, bool wait = false) {
             EMessageStatus status = SendMessageOneWay(mes.Get(), wait);
             if (status == MESSAGE_OK)
-                Y_UNUSED(mes.Release());
+                Y_UNUSED(mes.Release()); 
             return status;
         }
 
diff --git a/library/cpp/messagebus/coreconn_ut.cpp b/library/cpp/messagebus/coreconn_ut.cpp
index beb6850f26..d097c762fc 100644
--- a/library/cpp/messagebus/coreconn_ut.cpp
+++ b/library/cpp/messagebus/coreconn_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "coreconn.h"
 
diff --git a/library/cpp/messagebus/debug_receiver/debug_receiver.cpp b/library/cpp/messagebus/debug_receiver/debug_receiver.cpp
index 23b02d1003..4e2322fc5b 100644
--- a/library/cpp/messagebus/debug_receiver/debug_receiver.cpp
+++ b/library/cpp/messagebus/debug_receiver/debug_receiver.cpp
@@ -3,7 +3,7 @@
 
 #include <library/cpp/messagebus/ybus.h>
 
-#include <library/cpp/getopt/last_getopt.h>
+#include <library/cpp/getopt/last_getopt.h> 
 #include <library/cpp/lwtrace/all.h>
 
 using namespace NBus;
diff --git a/library/cpp/messagebus/debug_receiver/ya.make b/library/cpp/messagebus/debug_receiver/ya.make
index f1b14d35bb..8e84fdfc14 100644
--- a/library/cpp/messagebus/debug_receiver/ya.make
+++ b/library/cpp/messagebus/debug_receiver/ya.make
@@ -9,7 +9,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/getopt
+    library/cpp/getopt 
     library/cpp/lwtrace
     library/cpp/messagebus
 )
diff --git a/library/cpp/messagebus/duration_histogram_ut.cpp b/library/cpp/messagebus/duration_histogram_ut.cpp
index 01bcc095e9..7151dd1a91 100644
--- a/library/cpp/messagebus/duration_histogram_ut.cpp
+++ b/library/cpp/messagebus/duration_histogram_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "duration_histogram.h"
 
diff --git a/library/cpp/messagebus/latch_ut.cpp b/library/cpp/messagebus/latch_ut.cpp
index bfab04f527..350e56a245 100644
--- a/library/cpp/messagebus/latch_ut.cpp
+++ b/library/cpp/messagebus/latch_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "latch.h"
 
diff --git a/library/cpp/messagebus/lfqueue_batch_ut.cpp b/library/cpp/messagebus/lfqueue_batch_ut.cpp
index f80434c0d4..7fd7562216 100644
--- a/library/cpp/messagebus/lfqueue_batch_ut.cpp
+++ b/library/cpp/messagebus/lfqueue_batch_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "lfqueue_batch.h"
 
diff --git a/library/cpp/messagebus/local_flags_ut.cpp b/library/cpp/messagebus/local_flags_ut.cpp
index 189d73eb0f..e2d3d3a9c7 100644
--- a/library/cpp/messagebus/local_flags_ut.cpp
+++ b/library/cpp/messagebus/local_flags_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "local_flags.h"
 
diff --git a/library/cpp/messagebus/memory_ut.cpp b/library/cpp/messagebus/memory_ut.cpp
index 00654f28a1..34bf272379 100644
--- a/library/cpp/messagebus/memory_ut.cpp
+++ b/library/cpp/messagebus/memory_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "memory.h"
 
diff --git a/library/cpp/messagebus/message_status_counter_ut.cpp b/library/cpp/messagebus/message_status_counter_ut.cpp
index 9598651329..ff56972073 100644
--- a/library/cpp/messagebus/message_status_counter_ut.cpp
+++ b/library/cpp/messagebus/message_status_counter_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "message_status_counter.h"
 
diff --git a/library/cpp/messagebus/misc/weak_ptr_ut.cpp b/library/cpp/messagebus/misc/weak_ptr_ut.cpp
index 5a325278db..5b918eb086 100644
--- a/library/cpp/messagebus/misc/weak_ptr_ut.cpp
+++ b/library/cpp/messagebus/misc/weak_ptr_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "weak_ptr.h"
 
diff --git a/library/cpp/messagebus/moved_ut.cpp b/library/cpp/messagebus/moved_ut.cpp
index c1a07cce7e..63a67a7c77 100644
--- a/library/cpp/messagebus/moved_ut.cpp
+++ b/library/cpp/messagebus/moved_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "moved.h"
 
diff --git a/library/cpp/messagebus/netaddr_ut.cpp b/library/cpp/messagebus/netaddr_ut.cpp
index e5c68bf402..bfe5467ddb 100644
--- a/library/cpp/messagebus/netaddr_ut.cpp
+++ b/library/cpp/messagebus/netaddr_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "netaddr.h"
 #include "test_utils.h"
diff --git a/library/cpp/messagebus/network_ut.cpp b/library/cpp/messagebus/network_ut.cpp
index f1798419db..3172fdf655 100644
--- a/library/cpp/messagebus/network_ut.cpp
+++ b/library/cpp/messagebus/network_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "network.h"
 
diff --git a/library/cpp/messagebus/nondestroying_holder_ut.cpp b/library/cpp/messagebus/nondestroying_holder_ut.cpp
index 208042a2ba..f165781fb8 100644
--- a/library/cpp/messagebus/nondestroying_holder_ut.cpp
+++ b/library/cpp/messagebus/nondestroying_holder_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "nondestroying_holder.h"
 
diff --git a/library/cpp/messagebus/queue_config.h b/library/cpp/messagebus/queue_config.h
index a9955f0c70..e442df1447 100644
--- a/library/cpp/messagebus/queue_config.h
+++ b/library/cpp/messagebus/queue_config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/getopt/last_getopt.h>
+#include <library/cpp/getopt/last_getopt.h> 
 
 namespace NBus {
     //////////////////////////////////////////////////////////////////
diff --git a/library/cpp/messagebus/rain_check/core/coro_ut.cpp b/library/cpp/messagebus/rain_check/core/coro_ut.cpp
index 61a33584a5..e39b197cbc 100644
--- a/library/cpp/messagebus/rain_check/core/coro_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/coro_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "coro.h"
 #include "spawn.h"
diff --git a/library/cpp/messagebus/rain_check/core/simple_ut.cpp b/library/cpp/messagebus/rain_check/core/simple_ut.cpp
index d4545e05aa..1baede3396 100644
--- a/library/cpp/messagebus/rain_check/core/simple_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/simple_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
 
diff --git a/library/cpp/messagebus/rain_check/core/sleep_ut.cpp b/library/cpp/messagebus/rain_check/core/sleep_ut.cpp
index 2ae85a87b1..5703511bfa 100644
--- a/library/cpp/messagebus/rain_check/core/sleep_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/sleep_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/messagebus/rain_check/test/ut/test.h>
 
diff --git a/library/cpp/messagebus/rain_check/core/spawn_ut.cpp b/library/cpp/messagebus/rain_check/core/spawn_ut.cpp
index ba5a5e41cf..8559d56d91 100644
--- a/library/cpp/messagebus/rain_check/core/spawn_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/spawn_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.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/core/track_ut.cpp b/library/cpp/messagebus/rain_check/core/track_ut.cpp
index 05f7de1319..e73cc5ebc1 100644
--- a/library/cpp/messagebus/rain_check/core/track_ut.cpp
+++ b/library/cpp/messagebus/rain_check/core/track_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "track.h"
 
diff --git a/library/cpp/messagebus/rain_check/http/client.cpp b/library/cpp/messagebus/rain_check/http/client.cpp
index 5ef5ceeece..a8fbc8b820 100644
--- a/library/cpp/messagebus/rain_check/http/client.cpp
+++ b/library/cpp/messagebus/rain_check/http/client.cpp
@@ -79,7 +79,7 @@ namespace NRainCheck {
             headers.OutTo(&headersText);
             NNeh::NHttp::MakeFullRequest(msg, headersText.Str(), TString());
             FullProtocol->ScheduleRequest(msg, callback.Get(), stat);
-            Y_UNUSED(callback.Release());
+            Y_UNUSED(callback.Release()); 
         } catch (const TNetworkResolutionError& err) {
             future->SetFail(THttpFuture::CantResolveNameError, err.AsStrBuf());
         } catch (const yexception& err) {
@@ -100,7 +100,7 @@ namespace NRainCheck {
             GetProtocol->ScheduleRequest(NNeh::TMessage::FromString(request),
                                          callback.Get(),
                                          stat);
-            Y_UNUSED(callback.Release());
+            Y_UNUSED(callback.Release()); 
         } catch (const TNetworkResolutionError& err) {
             future->SetFail(THttpFuture::CantResolveNameError, err.AsStrBuf());
         } catch (const yexception& err) {
diff --git a/library/cpp/messagebus/rain_check/http/client_ut.cpp b/library/cpp/messagebus/rain_check/http/client_ut.cpp
index 1628114391..96fc8e213e 100644
--- a/library/cpp/messagebus/rain_check/http/client_ut.cpp
+++ b/library/cpp/messagebus/rain_check/http/client_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "client.h"
 #include "http_code_extractor.h"
diff --git a/library/cpp/messagebus/rain_check/messagebus/messagebus_client.cpp b/library/cpp/messagebus/rain_check/messagebus/messagebus_client.cpp
index daac8d9a99..bad491bf7c 100644
--- a/library/cpp/messagebus/rain_check/messagebus/messagebus_client.cpp
+++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_client.cpp
@@ -31,7 +31,7 @@ void TBusClientService::SendCommon(NBus::TBusMessage* message, const NBus::TNetA
 void TBusClientService::ProcessResultCommon(NBus::TBusMessageAutoPtr message,
                                             const NBus::TNetAddr&, TBusFuture* future,
                                             NBus::EMessageStatus status) {
-    Y_UNUSED(message.Release());
+    Y_UNUSED(message.Release()); 
 
     if (status == NBus::MESSAGE_OK) {
         return;
@@ -67,7 +67,7 @@ void TBusClientService::OnReply(
     TAutoPtr<TBusMessage> response) {
     TBusFuture* future = (TBusFuture*)request->Data;
     Y_ASSERT(future->Request.Get() == request.Get());
-    Y_UNUSED(request.Release());
+    Y_UNUSED(request.Release()); 
     future->SetDoneAndSchedule(MESSAGE_OK, response);
 }
 
@@ -75,7 +75,7 @@ void NRainCheck::TBusClientService::OnMessageSentOneWay(
     TAutoPtr<NBus::TBusMessage> request) {
     TBusFuture* future = (TBusFuture*)request->Data;
     Y_ASSERT(future->Request.Get() == request.Get());
-    Y_UNUSED(request.Release());
+    Y_UNUSED(request.Release()); 
     future->SetDoneAndSchedule(MESSAGE_OK, nullptr);
 }
 
@@ -87,7 +87,7 @@ void TBusClientService::OnError(
 
     TBusFuture* future = (TBusFuture*)message->Data;
     Y_ASSERT(future->Request.Get() == message.Get());
-    Y_UNUSED(message.Release());
+    Y_UNUSED(message.Release()); 
     future->SetDoneAndSchedule(status, nullptr);
 }
 
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 1b3618558b..3dbe762745 100644
--- a/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp
+++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "messagebus_client.h"
 
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 7c11399f1b..0788571750 100644
--- a/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp
+++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "messagebus_server.h"
 
diff --git a/library/cpp/messagebus/rain_check/test/ut/ya.make b/library/cpp/messagebus/rain_check/test/ut/ya.make
index 9f7a93417a..ba9a286b59 100644
--- a/library/cpp/messagebus/rain_check/test/ut/ya.make
+++ b/library/cpp/messagebus/rain_check/test/ut/ya.make
@@ -3,7 +3,7 @@ PROGRAM(library-messagebus-rain_check-test-ut)
 OWNER(g:messagebus)
 
 PEERDIR(
-    library/cpp/testing/unittest_main
+    library/cpp/testing/unittest_main 
     library/cpp/messagebus/rain_check/core
     library/cpp/messagebus/rain_check/http
     library/cpp/messagebus/rain_check/messagebus
diff --git a/library/cpp/messagebus/scheduler/scheduler.h b/library/cpp/messagebus/scheduler/scheduler.h
index afcc0de55d..0c9ec71af8 100644
--- a/library/cpp/messagebus/scheduler/scheduler.h
+++ b/library/cpp/messagebus/scheduler/scheduler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/threading/future/legacy_future.h>
+#include <library/cpp/threading/future/legacy_future.h> 
 
 #include <util/datetime/base.h>
 #include <util/generic/object_counter.h>
diff --git a/library/cpp/messagebus/scheduler/scheduler_ut.cpp b/library/cpp/messagebus/scheduler/scheduler_ut.cpp
index a5ea641c10..f26e5b6280 100644
--- a/library/cpp/messagebus/scheduler/scheduler_ut.cpp
+++ b/library/cpp/messagebus/scheduler/scheduler_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "scheduler.h"
 
diff --git a/library/cpp/messagebus/scheduler/ya.make b/library/cpp/messagebus/scheduler/ya.make
index dcb7408a20..2f23896d13 100644
--- a/library/cpp/messagebus/scheduler/ya.make
+++ b/library/cpp/messagebus/scheduler/ya.make
@@ -3,7 +3,7 @@ LIBRARY()
 OWNER(g:messagebus)
 
 PEERDIR(
-    library/cpp/threading/future
+    library/cpp/threading/future 
 )
 
 SRCS(
diff --git a/library/cpp/messagebus/scheduler_actor_ut.cpp b/library/cpp/messagebus/scheduler_actor_ut.cpp
index e81ffd3186..c7ecd82967 100644
--- a/library/cpp/messagebus/scheduler_actor_ut.cpp
+++ b/library/cpp/messagebus/scheduler_actor_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "scheduler_actor.h"
 #include "misc/test_sync.h"
diff --git a/library/cpp/messagebus/session.h b/library/cpp/messagebus/session.h
index fb12ab7c22..0e47ea1351 100644
--- a/library/cpp/messagebus/session.h
+++ b/library/cpp/messagebus/session.h
@@ -88,7 +88,7 @@ namespace NBus {
         EMessageStatus SendMessageAutoPtr(const TAutoPtr<T>& mes, const TNetAddr* addr = nullptr, bool wait = false) {
             EMessageStatus status = SendMessage(mes.Get(), addr, wait);
             if (status == MESSAGE_OK)
-                Y_UNUSED(mes.Release());
+                Y_UNUSED(mes.Release()); 
             return status;
         }
 
@@ -97,7 +97,7 @@ namespace NBus {
         EMessageStatus SendMessageOneWayAutoPtr(const TAutoPtr<T>& mes, const TNetAddr* addr = nullptr, bool wait = false) {
             EMessageStatus status = SendMessageOneWay(mes.Get(), addr, wait);
             if (status == MESSAGE_OK)
-                Y_UNUSED(mes.Release());
+                Y_UNUSED(mes.Release()); 
             return status;
         }
 
@@ -138,7 +138,7 @@ namespace NBus {
         EMessageStatus SendReplyAutoPtr(TBusIdentity& ident, TAutoPtr<U>& resp) {
             EMessageStatus status = SendReply(const_cast<const TBusIdentity&>(ident), resp.Get());
             if (status == MESSAGE_OK) {
-                Y_UNUSED(resp.Release());
+                Y_UNUSED(resp.Release()); 
             }
             return status;
         }
diff --git a/library/cpp/messagebus/session_impl.h b/library/cpp/messagebus/session_impl.h
index 90ef246ff8..ba6a47cca8 100644
--- a/library/cpp/messagebus/session_impl.h
+++ b/library/cpp/messagebus/session_impl.h
@@ -14,7 +14,7 @@
 #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 <library/cpp/threading/future/legacy_future.h> 
 
 #include <util/generic/array_ref.h>
 #include <util/generic/string.h>
diff --git a/library/cpp/messagebus/socket_addr_ut.cpp b/library/cpp/messagebus/socket_addr_ut.cpp
index 783bb62a86..6f82f54ad3 100644
--- a/library/cpp/messagebus/socket_addr_ut.cpp
+++ b/library/cpp/messagebus/socket_addr_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "netaddr.h"
 #include "socket_addr.h"
diff --git a/library/cpp/messagebus/synchandler.cpp b/library/cpp/messagebus/synchandler.cpp
index 8e891d66b3..09613fca06 100644
--- a/library/cpp/messagebus/synchandler.cpp
+++ b/library/cpp/messagebus/synchandler.cpp
@@ -194,5 +194,5 @@ TBusSyncClientSessionPtr TBusMessageQueue::CreateSyncSource(TBusProtocol* proto,
 
 void TBusMessageQueue::Destroy(TBusSyncClientSessionPtr session) {
     Destroy(session->Session.Get());
-    Y_UNUSED(session->Session.Release());
+    Y_UNUSED(session->Session.Release()); 
 }
diff --git a/library/cpp/messagebus/test/helper/example.cpp b/library/cpp/messagebus/test/helper/example.cpp
index 7c6d704042..957887ed3d 100644
--- a/library/cpp/messagebus/test/helper/example.cpp
+++ b/library/cpp/messagebus/test/helper/example.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "example.h"
 
diff --git a/library/cpp/messagebus/test/helper/example.h b/library/cpp/messagebus/test/helper/example.h
index 26b7475308..acd5615ddc 100644
--- a/library/cpp/messagebus/test/helper/example.h
+++ b/library/cpp/messagebus/test/helper/example.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "alloc_counter.h"
 #include "message_handler_error.h"
diff --git a/library/cpp/messagebus/test/helper/fixed_port.cpp b/library/cpp/messagebus/test/helper/fixed_port.cpp
index 258da0d1a5..271fb1f868 100644
--- a/library/cpp/messagebus/test/helper/fixed_port.cpp
+++ b/library/cpp/messagebus/test/helper/fixed_port.cpp
@@ -1,10 +1,10 @@
 #include "fixed_port.h"
 
-#include <util/system/env.h>
+#include <util/system/env.h> 
 
 #include <stdlib.h>
 
 bool NBus::NTest::IsFixedPortTestAllowed() {
     // TODO: report skipped tests to test
-    return !GetEnv("MB_TESTS_SKIP_FIXED_PORT");
+    return !GetEnv("MB_TESTS_SKIP_FIXED_PORT"); 
 }
diff --git a/library/cpp/messagebus/test/helper/object_count_check.h b/library/cpp/messagebus/test/helper/object_count_check.h
index 1c4756e58c..304f7575ee 100644
--- a/library/cpp/messagebus/test/helper/object_count_check.h
+++ b/library/cpp/messagebus/test/helper/object_count_check.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/messagebus/remote_client_connection.h>
 #include <library/cpp/messagebus/remote_client_session.h>
diff --git a/library/cpp/messagebus/test/perftest/perftest.cpp b/library/cpp/messagebus/test/perftest/perftest.cpp
index 8489319278..befae8c2d0 100644
--- a/library/cpp/messagebus/test/perftest/perftest.cpp
+++ b/library/cpp/messagebus/test/perftest/perftest.cpp
@@ -11,10 +11,10 @@
 
 #include <library/cpp/deprecated/threadable/threadable.h>
 #include <library/cpp/execprofile/profile.h>
-#include <library/cpp/getopt/opt.h>
+#include <library/cpp/getopt/opt.h> 
 #include <library/cpp/lwtrace/start.h>
 #include <library/cpp/sighandler/async_signals_handler.h>
-#include <library/cpp/threading/future/legacy_future.h>
+#include <library/cpp/threading/future/legacy_future.h> 
 
 #include <util/generic/ptr.h>
 #include <util/generic/string.h>
diff --git a/library/cpp/messagebus/test/perftest/ya.make b/library/cpp/messagebus/test/perftest/ya.make
index 24c2848ed5..7cd3e59446 100644
--- a/library/cpp/messagebus/test/perftest/ya.make
+++ b/library/cpp/messagebus/test/perftest/ya.make
@@ -5,14 +5,14 @@ OWNER(g:messagebus)
 PEERDIR(
     library/cpp/deprecated/threadable
     library/cpp/execprofile
-    library/cpp/getopt
+    library/cpp/getopt 
     library/cpp/lwtrace
     library/cpp/messagebus
     library/cpp/messagebus/oldmodule
     library/cpp/messagebus/protobuf
     library/cpp/messagebus/www
     library/cpp/sighandler
-    library/cpp/threading/future
+    library/cpp/threading/future 
 )
 
 SRCS(
diff --git a/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp b/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
index 3fdd175d73..1e0cbe3432 100644
--- a/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
+++ b/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/messagebus/test_utils.h>
 #include <library/cpp/messagebus/ybus.h>
diff --git a/library/cpp/messagebus/test/ut/messagebus_ut.cpp b/library/cpp/messagebus/test/ut/messagebus_ut.cpp
index 040f9b7702..8de18eeccb 100644
--- a/library/cpp/messagebus/test/ut/messagebus_ut.cpp
+++ b/library/cpp/messagebus/test/ut/messagebus_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/messagebus/test/helper/example.h>
 #include <library/cpp/messagebus/test/helper/fixed_port.h>
@@ -733,7 +733,7 @@ Y_UNIT_TEST_SUITE(TMessageBusTests) {
 
             // intentionally don't destroy the message
             // we will try to resend it
-            Y_UNUSED(message.Release());
+            Y_UNUSED(message.Release()); 
 
             TestSync.CheckAndIncrement(1);
         }
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 4083cf3b7b..70981848ed 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
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/messagebus/test/helper/example.h>
 #include <library/cpp/messagebus/test/helper/message_handler_error.h>
diff --git a/library/cpp/messagebus/test/ut/module_client_ut.cpp b/library/cpp/messagebus/test/ut/module_client_ut.cpp
index ebfe185cc6..9b4157ef30 100644
--- a/library/cpp/messagebus/test/ut/module_client_ut.cpp
+++ b/library/cpp/messagebus/test/ut/module_client_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "count_down_latch.h"
 #include "moduletest.h"
diff --git a/library/cpp/messagebus/test/ut/module_server_ut.cpp b/library/cpp/messagebus/test/ut/module_server_ut.cpp
index 88fe1dd9b6..97ac28ee6f 100644
--- a/library/cpp/messagebus/test/ut/module_server_ut.cpp
+++ b/library/cpp/messagebus/test/ut/module_server_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "count_down_latch.h"
 #include "moduletest.h"
diff --git a/library/cpp/messagebus/test/ut/starter_ut.cpp b/library/cpp/messagebus/test/ut/starter_ut.cpp
index dd4d3aaa5e..ccb927ca5d 100644
--- a/library/cpp/messagebus/test/ut/starter_ut.cpp
+++ b/library/cpp/messagebus/test/ut/starter_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/messagebus/test/helper/example_module.h>
 #include <library/cpp/messagebus/test/helper/object_count_check.h>
diff --git a/library/cpp/messagebus/test/ut/ya.make b/library/cpp/messagebus/test/ut/ya.make
index fe1b4961d6..a4539687f9 100644
--- a/library/cpp/messagebus/test/ut/ya.make
+++ b/library/cpp/messagebus/test/ut/ya.make
@@ -14,7 +14,7 @@ TAG(
 FORK_SUBTESTS()
 
 PEERDIR(
-    library/cpp/testing/unittest_main
+    library/cpp/testing/unittest_main 
     library/cpp/messagebus
     library/cpp/messagebus/test/helper
     library/cpp/messagebus/www
diff --git a/library/cpp/messagebus/text_utils.h b/library/cpp/messagebus/text_utils.h
index c2dcad834c..5014e963fc 100644
--- a/library/cpp/messagebus/text_utils.h
+++ b/library/cpp/messagebus/text_utils.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <library/cpp/string_utils/indent_text/indent_text.h>
+#include <library/cpp/string_utils/indent_text/indent_text.h> 
diff --git a/library/cpp/messagebus/vector_swaps_ut.cpp b/library/cpp/messagebus/vector_swaps_ut.cpp
index 693cc6857b..3d76f67963 100644
--- a/library/cpp/messagebus/vector_swaps_ut.cpp
+++ b/library/cpp/messagebus/vector_swaps_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include "vector_swaps.h"
 
diff --git a/library/cpp/messagebus/www/www.h b/library/cpp/messagebus/www/www.h
index 6cd652b477..4168a617cf 100644
--- a/library/cpp/messagebus/www/www.h
+++ b/library/cpp/messagebus/www/www.h
@@ -5,7 +5,7 @@
 
 #include <util/generic/ptr.h>
 #include <util/generic/string.h>
-#include <library/cpp/cgiparam/cgiparam.h>
+#include <library/cpp/cgiparam/cgiparam.h> 
 
 namespace NBus {
     class TBusWww: public TAtomicRefCount<TBusWww> {
diff --git a/library/cpp/messagebus/www/ya.make b/library/cpp/messagebus/www/ya.make
index 972390cea3..9c9f7c9c03 100644
--- a/library/cpp/messagebus/www/ya.make
+++ b/library/cpp/messagebus/www/ya.make
@@ -15,7 +15,7 @@ ARCHIVE(
 
 PEERDIR(
     library/cpp/archive
-    library/cpp/cgiparam
+    library/cpp/cgiparam 
     library/cpp/html/pcdata
     library/cpp/http/fetch
     library/cpp/http/server
diff --git a/library/cpp/messagebus/ya.make b/library/cpp/messagebus/ya.make
index e13cf06dea..49d88353ea 100644
--- a/library/cpp/messagebus/ya.make
+++ b/library/cpp/messagebus/ya.make
@@ -55,14 +55,14 @@ PEERDIR(
     contrib/libs/sparsehash
     library/cpp/codecs
     library/cpp/deprecated/enum_codegen
-    library/cpp/getopt/small
+    library/cpp/getopt/small 
     library/cpp/lwtrace
     library/cpp/messagebus/actor
     library/cpp/messagebus/config
     library/cpp/messagebus/monitoring
     library/cpp/messagebus/scheduler
-    library/cpp/string_utils/indent_text
-    library/cpp/threading/future
+    library/cpp/string_utils/indent_text 
+    library/cpp/threading/future 
 )
 
 END()
diff --git a/library/cpp/monlib/counters/counters_ut.cpp b/library/cpp/monlib/counters/counters_ut.cpp
index 2845efb97b..c5bdd1aa00 100644
--- a/library/cpp/monlib/counters/counters_ut.cpp
+++ b/library/cpp/monlib/counters/counters_ut.cpp
@@ -1,6 +1,6 @@
 #include "counters.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/set.h>
 #include <util/thread/pool.h>
diff --git a/library/cpp/monlib/counters/histogram_ut.cpp b/library/cpp/monlib/counters/histogram_ut.cpp
index 5a0800505a..2645ba6b73 100644
--- a/library/cpp/monlib/counters/histogram_ut.cpp
+++ b/library/cpp/monlib/counters/histogram_ut.cpp
@@ -1,6 +1,6 @@
 #include "histogram.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/counters/meter_ut.cpp b/library/cpp/monlib/counters/meter_ut.cpp
index b507d16fbd..dd9d27625f 100644
--- a/library/cpp/monlib/counters/meter_ut.cpp
+++ b/library/cpp/monlib/counters/meter_ut.cpp
@@ -1,6 +1,6 @@
 #include "meter.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/counters/timer_ut.cpp b/library/cpp/monlib/counters/timer_ut.cpp
index c5cd07e89d..e29b8e22b4 100644
--- a/library/cpp/monlib/counters/timer_ut.cpp
+++ b/library/cpp/monlib/counters/timer_ut.cpp
@@ -1,6 +1,6 @@
 #include "timer.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 using namespace std::literals::chrono_literals;
diff --git a/library/cpp/monlib/deprecated/json/writer_ut.cpp b/library/cpp/monlib/deprecated/json/writer_ut.cpp
index 1f9fc8f393..d2d75e5aa7 100644
--- a/library/cpp/monlib/deprecated/json/writer_ut.cpp
+++ b/library/cpp/monlib/deprecated/json/writer_ut.cpp
@@ -1,6 +1,6 @@
 #include "writer.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/dynamic_counters/contention_ut.cpp b/library/cpp/monlib/dynamic_counters/contention_ut.cpp
index 8798044ee3..ffccc9b702 100644
--- a/library/cpp/monlib/dynamic_counters/contention_ut.cpp
+++ b/library/cpp/monlib/dynamic_counters/contention_ut.cpp
@@ -1,5 +1,5 @@
 #include "counters.h"
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/system/event.h>
 #include <util/system/thread.h>
 
diff --git a/library/cpp/monlib/dynamic_counters/counters.h b/library/cpp/monlib/dynamic_counters/counters.h
index dc178cfbe0..c7098659ad 100644
--- a/library/cpp/monlib/dynamic_counters/counters.h
+++ b/library/cpp/monlib/dynamic_counters/counters.h
@@ -3,8 +3,8 @@
 #include <library/cpp/monlib/counters/counters.h>
 #include <library/cpp/monlib/metrics/histogram_collector.h>
 
-#include <library/cpp/threading/light_rw_lock/lightrwlock.h>
-#include <library/cpp/containers/stack_vector/stack_vec.h>
+#include <library/cpp/threading/light_rw_lock/lightrwlock.h> 
+#include <library/cpp/containers/stack_vector/stack_vec.h> 
 
 #include <util/generic/cast.h>
 #include <util/generic/map.h>
diff --git a/library/cpp/monlib/dynamic_counters/counters_ut.cpp b/library/cpp/monlib/dynamic_counters/counters_ut.cpp
index 3591037e0a..727bc21840 100644
--- a/library/cpp/monlib/dynamic_counters/counters_ut.cpp
+++ b/library/cpp/monlib/dynamic_counters/counters_ut.cpp
@@ -1,6 +1,6 @@
 #include "counters.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/dynamic_counters/encode_ut.cpp b/library/cpp/monlib/dynamic_counters/encode_ut.cpp
index 52d77b6b41..9567fea3cf 100644
--- a/library/cpp/monlib/dynamic_counters/encode_ut.cpp
+++ b/library/cpp/monlib/dynamic_counters/encode_ut.cpp
@@ -5,7 +5,7 @@
 #include <library/cpp/monlib/encode/protobuf/protobuf.h>
 
 #include <library/cpp/monlib/encode/protobuf/protos/samples.pb.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/buffer.h>
 #include <util/stream/buffer.h>
diff --git a/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h b/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h
index 0042cd9a6a..8090c96192 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h
+++ b/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/containers/stack_vector/stack_vec.h>
+#include <library/cpp/containers/stack_vector/stack_vec.h> 
 
 #include <util/generic/bitops.h>
 
diff --git a/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp b/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp
index 6c8bb54ec9..d283f0179d 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp
+++ b/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp
@@ -1,5 +1,5 @@
 #include "percentile_lg.h"
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/dynamic_counters/percentile/ya.make b/library/cpp/monlib/dynamic_counters/percentile/ya.make
index cb52cdd9ad..9f7dd9d4e8 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/ya.make
+++ b/library/cpp/monlib/dynamic_counters/percentile/ya.make
@@ -8,7 +8,7 @@ LIBRARY()
     )
 
     PEERDIR(
-        library/cpp/containers/stack_vector
+        library/cpp/containers/stack_vector 
         library/cpp/monlib/dynamic_counters
     )
 
diff --git a/library/cpp/monlib/dynamic_counters/ya.make b/library/cpp/monlib/dynamic_counters/ya.make
index aafe1c34be..c98e4e4d3e 100644
--- a/library/cpp/monlib/dynamic_counters/ya.make
+++ b/library/cpp/monlib/dynamic_counters/ya.make
@@ -15,13 +15,13 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/containers/stack_vector
+    library/cpp/containers/stack_vector 
     library/cpp/monlib/encode/json
     library/cpp/monlib/encode/spack
     library/cpp/monlib/encode/prometheus
     library/cpp/monlib/service/pages
-    library/cpp/string_utils/quote
-    library/cpp/threading/light_rw_lock
+    library/cpp/string_utils/quote 
+    library/cpp/threading/light_rw_lock 
 )
 
 END()
diff --git a/library/cpp/monlib/encode/buffered/string_pool_ut.cpp b/library/cpp/monlib/encode/buffered/string_pool_ut.cpp
index 9fc3421d0b..41aaecad6d 100644
--- a/library/cpp/monlib/encode/buffered/string_pool_ut.cpp
+++ b/library/cpp/monlib/encode/buffered/string_pool_ut.cpp
@@ -1,6 +1,6 @@
 #include "string_pool.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/encode/format_ut.cpp b/library/cpp/monlib/encode/format_ut.cpp
index 22a0e30c03..89888257c8 100644
--- a/library/cpp/monlib/encode/format_ut.cpp
+++ b/library/cpp/monlib/encode/format_ut.cpp
@@ -1,6 +1,6 @@
 #include "format.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/string.h>
 #include <util/string/builder.h>
diff --git a/library/cpp/monlib/encode/json/json_ut.cpp b/library/cpp/monlib/encode/json/json_ut.cpp
index 09e7909289..096735573b 100644
--- a/library/cpp/monlib/encode/json/json_ut.cpp
+++ b/library/cpp/monlib/encode/json/json_ut.cpp
@@ -5,7 +5,7 @@
 
 #include <library/cpp/json/json_reader.h>
 #include <library/cpp/resource/resource.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/str.h>
 #include <util/string/builder.h>
diff --git a/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp b/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp
index 53683cb39c..794b94fac9 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp
+++ b/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp
@@ -1,6 +1,6 @@
 #include "legacy_protobuf.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.pb.h>
 #include <library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.pb.h>
diff --git a/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp b/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp
index 49c2244fb4..a084f1632e 100644
--- a/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp
+++ b/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <library/cpp/monlib/encode/protobuf/protobuf.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp b/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp
index fd9debb060..f10fe2282d 100644
--- a/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp
+++ b/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/monlib/metrics/metric_value.h>
 #include <library/cpp/monlib/metrics/histogram_snapshot.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/str.h>
 
diff --git a/library/cpp/monlib/encode/spack/spack_v1_ut.cpp b/library/cpp/monlib/encode/spack/spack_v1_ut.cpp
index fe778eb7e0..57c163abaa 100644
--- a/library/cpp/monlib/encode/spack/spack_v1_ut.cpp
+++ b/library/cpp/monlib/encode/spack/spack_v1_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/monlib/metrics/labels.h>
 #include <library/cpp/monlib/metrics/metric.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/buffer.h>
 #include <util/stream/buffer.h>
diff --git a/library/cpp/monlib/encode/text/text_encoder_ut.cpp b/library/cpp/monlib/encode/text/text_encoder_ut.cpp
index 554b6f5fa9..c387072a7c 100644
--- a/library/cpp/monlib/encode/text/text_encoder_ut.cpp
+++ b/library/cpp/monlib/encode/text/text_encoder_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <library/cpp/monlib/metrics/histogram_collector.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/encode/unistat/unistat_ut.cpp b/library/cpp/monlib/encode/unistat/unistat_ut.cpp
index dbbc238bf3..1185ce2a4e 100644
--- a/library/cpp/monlib/encode/unistat/unistat_ut.cpp
+++ b/library/cpp/monlib/encode/unistat/unistat_ut.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/monlib/encode/protobuf/protobuf.h>
 #include <library/cpp/monlib/metrics/labels.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/metrics/ewma_ut.cpp b/library/cpp/monlib/metrics/ewma_ut.cpp
index 01ef2478f7..d2d1adadb4 100644
--- a/library/cpp/monlib/metrics/ewma_ut.cpp
+++ b/library/cpp/monlib/metrics/ewma_ut.cpp
@@ -1,7 +1,7 @@
 #include "ewma.h"
 #include "metric.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 
 using namespace NMonitoring;
diff --git a/library/cpp/monlib/metrics/histogram_collector_ut.cpp b/library/cpp/monlib/metrics/histogram_collector_ut.cpp
index 1cf66507fa..b77317f614 100644
--- a/library/cpp/monlib/metrics/histogram_collector_ut.cpp
+++ b/library/cpp/monlib/metrics/histogram_collector_ut.cpp
@@ -1,6 +1,6 @@
 #include "histogram_collector.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/metrics/labels_ut.cpp b/library/cpp/monlib/metrics/labels_ut.cpp
index f0e4f532ab..f5270fe5f6 100644
--- a/library/cpp/monlib/metrics/labels_ut.cpp
+++ b/library/cpp/monlib/metrics/labels_ut.cpp
@@ -1,6 +1,6 @@
 #include "labels.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/metrics/metric_registry.h b/library/cpp/monlib/metrics/metric_registry.h
index 670cf8651e..3904302953 100644
--- a/library/cpp/monlib/metrics/metric_registry.h
+++ b/library/cpp/monlib/metrics/metric_registry.h
@@ -5,7 +5,7 @@
 
 #include <util/system/rwlock.h>
 
-#include <library/cpp/threading/light_rw_lock/lightrwlock.h>
+#include <library/cpp/threading/light_rw_lock/lightrwlock.h> 
 
 
 namespace NMonitoring {
diff --git a/library/cpp/monlib/metrics/metric_registry_ut.cpp b/library/cpp/monlib/metrics/metric_registry_ut.cpp
index 86d9a52ec0..6f826864c5 100644
--- a/library/cpp/monlib/metrics/metric_registry_ut.cpp
+++ b/library/cpp/monlib/metrics/metric_registry_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/monlib/encode/json/json.h>
 #include <library/cpp/resource/resource.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/str.h>
 
diff --git a/library/cpp/monlib/metrics/metric_value_ut.cpp b/library/cpp/monlib/metrics/metric_value_ut.cpp
index 49b47c4057..e3d99befdd 100644
--- a/library/cpp/monlib/metrics/metric_value_ut.cpp
+++ b/library/cpp/monlib/metrics/metric_value_ut.cpp
@@ -1,6 +1,6 @@
 #include "metric_value.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NMonitoring;
 
diff --git a/library/cpp/monlib/metrics/summary_collector_ut.cpp b/library/cpp/monlib/metrics/summary_collector_ut.cpp
index 191929550f..08dcb87d76 100644
--- a/library/cpp/monlib/metrics/summary_collector_ut.cpp
+++ b/library/cpp/monlib/metrics/summary_collector_ut.cpp
@@ -1,6 +1,6 @@
 #include "summary_collector.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/random/random.h>
 
diff --git a/library/cpp/monlib/metrics/timer_ut.cpp b/library/cpp/monlib/metrics/timer_ut.cpp
index c244a8c9e1..e1039b06d9 100644
--- a/library/cpp/monlib/metrics/timer_ut.cpp
+++ b/library/cpp/monlib/metrics/timer_ut.cpp
@@ -1,8 +1,8 @@
 #include "timer.h"
 
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/threading/future/async.h>
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/threading/future/async.h> 
+#include <library/cpp/threading/future/future.h> 
 
 using namespace NMonitoring;
 using namespace NThreading;
diff --git a/library/cpp/monlib/service/monservice.cpp b/library/cpp/monlib/service/monservice.cpp
index d1b9cda1d2..6f3a01a332 100644
--- a/library/cpp/monlib/service/monservice.cpp
+++ b/library/cpp/monlib/service/monservice.cpp
@@ -1,7 +1,7 @@
 #include "monservice.h"
 
 #include <library/cpp/malloc/api/malloc.h>
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 #include <library/cpp/svnversion/svnversion.h>
 
 #include <util/generic/map.h>
diff --git a/library/cpp/monlib/service/service.cpp b/library/cpp/monlib/service/service.cpp
index 929efbf816..8a9b3d2f4c 100644
--- a/library/cpp/monlib/service/service.cpp
+++ b/library/cpp/monlib/service/service.cpp
@@ -158,7 +158,7 @@ namespace NMonitoring {
     void TCoHttpServer::OnAcceptFull(const TAcceptFull& acc) {
         THolder<TConnection> conn(new TConnection(acc, *this));
         Executor.Create(*conn, "client");
-        Y_UNUSED(conn.Release());
+        Y_UNUSED(conn.Release()); 
     }
 
     void TCoHttpServer::OnError() {
diff --git a/library/cpp/monlib/service/service.h b/library/cpp/monlib/service/service.h
index 2f66dddaf8..99d23ff79c 100644
--- a/library/cpp/monlib/service/service.h
+++ b/library/cpp/monlib/service/service.h
@@ -7,7 +7,7 @@
 #include <library/cpp/logger/all.h>
 
 #include <util/network/ip.h>
-#include <library/cpp/cgiparam/cgiparam.h>
+#include <library/cpp/cgiparam/cgiparam.h> 
 
 #include <functional>
 
diff --git a/library/cpp/monlib/service/ya.make b/library/cpp/monlib/service/ya.make
index ad088fc2c6..2e37724945 100644
--- a/library/cpp/monlib/service/ya.make
+++ b/library/cpp/monlib/service/ya.make
@@ -11,7 +11,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
     contrib/libs/protobuf
     library/cpp/coroutine/engine
     library/cpp/coroutine/listener
@@ -22,7 +22,7 @@ PEERDIR(
     library/cpp/malloc/api
     library/cpp/svnversion
     library/cpp/uri
-    library/cpp/cgiparam
+    library/cpp/cgiparam 
 )
 
 END()
diff --git a/library/cpp/object_factory/object_factory_ut.cpp b/library/cpp/object_factory/object_factory_ut.cpp
index 06fb0739ff..6e9dcfbcc5 100644
--- a/library/cpp/object_factory/object_factory_ut.cpp
+++ b/library/cpp/object_factory/object_factory_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/object_factory/object_factory.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/noncopyable.h>
 #include <util/generic/string.h>
diff --git a/library/cpp/on_disk/chunks/chunks_ut.cpp b/library/cpp/on_disk/chunks/chunks_ut.cpp
index f727647f7f..f79a9c8cf4 100644
--- a/library/cpp/on_disk/chunks/chunks_ut.cpp
+++ b/library/cpp/on_disk/chunks/chunks_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/file.h>
 #include <util/system/filemap.h>
diff --git a/library/cpp/on_disk/ya.make b/library/cpp/on_disk/ya.make
index 42a79d37bd..0137c23c9f 100644
--- a/library/cpp/on_disk/ya.make
+++ b/library/cpp/on_disk/ya.make
@@ -1,4 +1,4 @@
-RECURSE(
+RECURSE( 
     2d_array
     2d_array/ut
     4d_array
@@ -14,8 +14,8 @@ RECURSE(
     coded_blob/common
     coded_blob/keys
     coded_blob/ut
-    file_with_header
-    file_with_header/ut
+    file_with_header 
+    file_with_header/ut 
     fried_trie
     head_ar
     head_ar/ut
@@ -28,4 +28,4 @@ RECURSE(
     tar_archive/ut
     st_hash
     st_hash/ut
-)
+) 
diff --git a/library/cpp/openssl/holders/ut/evp_ut.cpp b/library/cpp/openssl/holders/ut/evp_ut.cpp
index 0f8c0aed01..49463cd9c3 100644
--- a/library/cpp/openssl/holders/ut/evp_ut.cpp
+++ b/library/cpp/openssl/holders/ut/evp_ut.cpp
@@ -1,6 +1,6 @@
 #include "evp.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(Evp) {
     Y_UNIT_TEST(Cipher) {
diff --git a/library/cpp/openssl/holders/ut/hmac_ut.cpp b/library/cpp/openssl/holders/ut/hmac_ut.cpp
index 60f561c337..a452745263 100644
--- a/library/cpp/openssl/holders/ut/hmac_ut.cpp
+++ b/library/cpp/openssl/holders/ut/hmac_ut.cpp
@@ -1,6 +1,6 @@
 #include "hmac.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(Hmac) {
     Y_UNIT_TEST(Ctx) {
diff --git a/library/cpp/openssl/io/ut/builtin_ut.cpp b/library/cpp/openssl/io/ut/builtin_ut.cpp
index 987cd08492..54bea365ab 100644
--- a/library/cpp/openssl/io/ut/builtin_ut.cpp
+++ b/library/cpp/openssl/io/ut/builtin_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/openssl/io/stream.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(Builtin) {
     Y_UNIT_TEST(Init) {
diff --git a/library/cpp/openssl/method/ut/io_ut.cpp b/library/cpp/openssl/method/ut/io_ut.cpp
index bff2b23d31..d146e0667b 100644
--- a/library/cpp/openssl/method/ut/io_ut.cpp
+++ b/library/cpp/openssl/method/ut/io_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/openssl/method/io.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 class TTestIO : public NOpenSSL::TAbstractIO {
 public:
diff --git a/library/cpp/packedtypes/longs_ut.cpp b/library/cpp/packedtypes/longs_ut.cpp
index 8b06c934d2..0aecf461b7 100644
--- a/library/cpp/packedtypes/longs_ut.cpp
+++ b/library/cpp/packedtypes/longs_ut.cpp
@@ -1,6 +1,6 @@
 #include "longs.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/digest/old_crc/crc.h>
 #include <util/string/util.h>
diff --git a/library/cpp/packedtypes/packed_ut.cpp b/library/cpp/packedtypes/packed_ut.cpp
index 70a22cf9c3..ae0815986a 100644
--- a/library/cpp/packedtypes/packed_ut.cpp
+++ b/library/cpp/packedtypes/packed_ut.cpp
@@ -1,6 +1,6 @@
 #include "packed.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/defaults.h>
 #include <util/generic/ylimits.h>
diff --git a/library/cpp/packedtypes/packedfloat_ut.cpp b/library/cpp/packedtypes/packedfloat_ut.cpp
index f61e49014c..26f2155c83 100644
--- a/library/cpp/packedtypes/packedfloat_ut.cpp
+++ b/library/cpp/packedtypes/packedfloat_ut.cpp
@@ -1,6 +1,6 @@
 #include "packedfloat.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/ylimits.h>
 
diff --git a/library/cpp/packedtypes/zigzag_ut.cpp b/library/cpp/packedtypes/zigzag_ut.cpp
index 13b78b7481..e012a8c0d5 100644
--- a/library/cpp/packedtypes/zigzag_ut.cpp
+++ b/library/cpp/packedtypes/zigzag_ut.cpp
@@ -1,6 +1,6 @@
 #include "zigzag.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TZigZagTest) {
     template <typename T>
diff --git a/library/cpp/packers/README.md b/library/cpp/packers/README.md
index c635bf8c8a..58f22cd2db 100644
--- a/library/cpp/packers/README.md
+++ b/library/cpp/packers/README.md
@@ -1,2 +1,2 @@
-A library of packers used to serialize data in the library/cpp/containers/comptrie.
+A library of packers used to serialize data in the library/cpp/containers/comptrie. 
 It is specially excluded as separate library since many packers are of standalone interest.
diff --git a/library/cpp/packers/ut/packers_ut.cpp b/library/cpp/packers/ut/packers_ut.cpp
index 18ce2150d1..6d46c2917c 100644
--- a/library/cpp/packers/ut/packers_ut.cpp
+++ b/library/cpp/packers/ut/packers_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/output.h>
 #include <utility>
diff --git a/library/cpp/packers/ut/proto_packer_ut.cpp b/library/cpp/packers/ut/proto_packer_ut.cpp
index e4151ba68c..9b019a1c0c 100644
--- a/library/cpp/packers/ut/proto_packer_ut.cpp
+++ b/library/cpp/packers/ut/proto_packer_ut.cpp
@@ -1,7 +1,7 @@
 #include "proto_packer.h"
 
 #include <library/cpp/packers/ut/test.pb.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/string.h>
 
diff --git a/library/cpp/packers/ut/region_packer_ut.cpp b/library/cpp/packers/ut/region_packer_ut.cpp
index 0cb08ccf65..903ef6d393 100644
--- a/library/cpp/packers/ut/region_packer_ut.cpp
+++ b/library/cpp/packers/ut/region_packer_ut.cpp
@@ -1,5 +1,5 @@
 #include "region_packer.h"
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 template <typename TValue>
 void TestPacker() {
diff --git a/library/cpp/pop_count/benchmark/main.cpp b/library/cpp/pop_count/benchmark/main.cpp
index 41ea3c91cc..2266d29820 100644
--- a/library/cpp/pop_count/benchmark/main.cpp
+++ b/library/cpp/pop_count/benchmark/main.cpp
@@ -3,7 +3,7 @@
 #include <util/system/type_name.h>
 
 #include <library/cpp/pop_count/popcount.h>
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 
 template <class F, class I>
 inline void DoRun(F&& f, I&& i) {
diff --git a/library/cpp/pop_count/popcount_ut.cpp b/library/cpp/pop_count/popcount_ut.cpp
index 5cd6605411..6af800c91c 100644
--- a/library/cpp/pop_count/popcount_ut.cpp
+++ b/library/cpp/pop_count/popcount_ut.cpp
@@ -1,6 +1,6 @@
 #include "popcount.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/random/random.h>
 
diff --git a/library/cpp/protobuf/interop/ut/cast_ut.cpp b/library/cpp/protobuf/interop/ut/cast_ut.cpp
index 6ef055b651..89a2596d4e 100644
--- a/library/cpp/protobuf/interop/ut/cast_ut.cpp
+++ b/library/cpp/protobuf/interop/ut/cast_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/protobuf/interop/cast.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <google/protobuf/duration.pb.h>
 #include <google/protobuf/timestamp.pb.h>
diff --git a/library/cpp/protobuf/json/string_transform.cpp b/library/cpp/protobuf/json/string_transform.cpp
index 7c42daa677..43ebc25ee8 100644
--- a/library/cpp/protobuf/json/string_transform.cpp
+++ b/library/cpp/protobuf/json/string_transform.cpp
@@ -2,7 +2,7 @@
 
 #include <google/protobuf/stubs/strutil.h>
 
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 namespace NProtobufJson {
     void TCEscapeTransform::Transform(TString& str) const {
diff --git a/library/cpp/protobuf/json/string_transform.h b/library/cpp/protobuf/json/string_transform.h
index e4b296bc01..74c56e2d1a 100644
--- a/library/cpp/protobuf/json/string_transform.h
+++ b/library/cpp/protobuf/json/string_transform.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 #include <util/generic/ptr.h>
 #include <util/generic/refcount.h>
 
diff --git a/library/cpp/protobuf/json/ut/filter_ut.cpp b/library/cpp/protobuf/json/ut/filter_ut.cpp
index 95c227666f..7b576145da 100644
--- a/library/cpp/protobuf/json/ut/filter_ut.cpp
+++ b/library/cpp/protobuf/json/ut/filter_ut.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/protobuf/json/filter.h>
 #include <library/cpp/protobuf/json/field_option.h>
 #include <library/cpp/protobuf/json/proto2json.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NProtobufJson;
 
diff --git a/library/cpp/protobuf/json/ut/inline_ut.cpp b/library/cpp/protobuf/json/ut/inline_ut.cpp
index c29ad32e7d..695bfe2400 100644
--- a/library/cpp/protobuf/json/ut/inline_ut.cpp
+++ b/library/cpp/protobuf/json/ut/inline_ut.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/protobuf/json/inline.h>
 #include <library/cpp/protobuf/json/field_option.h>
 #include <library/cpp/protobuf/json/proto2json.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/string.h>
 
diff --git a/library/cpp/protobuf/json/ut/json2proto_ut.cpp b/library/cpp/protobuf/json/ut/json2proto_ut.cpp
index 0dfe57bc7a..f46439c051 100644
--- a/library/cpp/protobuf/json/ut/json2proto_ut.cpp
+++ b/library/cpp/protobuf/json/ut/json2proto_ut.cpp
@@ -10,7 +10,7 @@
 
 #include <library/cpp/protobuf/json/json2proto.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/hash_set.h>
 #include <util/generic/string.h>
diff --git a/library/cpp/protobuf/json/ut/proto2json_ut.cpp b/library/cpp/protobuf/json/ut/proto2json_ut.cpp
index 07e52d7f2f..3b879b9836 100644
--- a/library/cpp/protobuf/json/ut/proto2json_ut.cpp
+++ b/library/cpp/protobuf/json/ut/proto2json_ut.cpp
@@ -9,7 +9,7 @@
 
 #include <library/cpp/protobuf/json/proto2json.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/hash_set.h>
 #include <util/generic/string.h>
diff --git a/library/cpp/protobuf/json/ut/string_transform_ut.cpp b/library/cpp/protobuf/json/ut/string_transform_ut.cpp
index a31dabcb0f..4291e20217 100644
--- a/library/cpp/protobuf/json/ut/string_transform_ut.cpp
+++ b/library/cpp/protobuf/json/ut/string_transform_ut.cpp
@@ -1,6 +1,6 @@
 #include "json.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/protobuf/json/proto2json.h>
 
 Y_UNIT_TEST_SUITE(TDoubleEscapeTransform) {
diff --git a/library/cpp/protobuf/json/ya.make b/library/cpp/protobuf/json/ya.make
index 2f2c75cfdb..3afe3915e3 100644
--- a/library/cpp/protobuf/json/ya.make
+++ b/library/cpp/protobuf/json/ya.make
@@ -19,7 +19,7 @@ PEERDIR(
     contrib/libs/protobuf
     library/cpp/json
     library/cpp/protobuf/util
-    library/cpp/string_utils/relaxed_escaper
+    library/cpp/string_utils/relaxed_escaper 
 )
 
 END()
diff --git a/library/cpp/protobuf/util/is_equal_ut.cpp b/library/cpp/protobuf/util/is_equal_ut.cpp
index 3ca4c90dd5..26c5d30f55 100644
--- a/library/cpp/protobuf/util/is_equal_ut.cpp
+++ b/library/cpp/protobuf/util/is_equal_ut.cpp
@@ -1,7 +1,7 @@
 #include "is_equal.h"
 #include <library/cpp/protobuf/util/ut/sample_for_is_equal.pb.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <google/protobuf/descriptor.h>
 
diff --git a/library/cpp/protobuf/util/iterators_ut.cpp b/library/cpp/protobuf/util/iterators_ut.cpp
index 9ebcff2963..add040e863 100644
--- a/library/cpp/protobuf/util/iterators_ut.cpp
+++ b/library/cpp/protobuf/util/iterators_ut.cpp
@@ -2,7 +2,7 @@
 #include "simple_reflection.h"
 #include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/algorithm.h>
 
diff --git a/library/cpp/protobuf/util/merge_ut.cpp b/library/cpp/protobuf/util/merge_ut.cpp
index 22217db183..17a0f52ecf 100644
--- a/library/cpp/protobuf/util/merge_ut.cpp
+++ b/library/cpp/protobuf/util/merge_ut.cpp
@@ -1,7 +1,7 @@
 #include "merge.h"
 #include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NProtoBuf;
 
diff --git a/library/cpp/protobuf/util/pb_io.cpp b/library/cpp/protobuf/util/pb_io.cpp
index 6270ee0624..553939ef96 100644
--- a/library/cpp/protobuf/util/pb_io.cpp
+++ b/library/cpp/protobuf/util/pb_io.cpp
@@ -1,7 +1,7 @@
 #include "pb_io.h"
 
 #include <library/cpp/binsaver/bin_saver.h>
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 #include <google/protobuf/message.h>
 #include <google/protobuf/messagext.h>
diff --git a/library/cpp/protobuf/util/pb_io_ut.cpp b/library/cpp/protobuf/util/pb_io_ut.cpp
index 875d6dc602..b8454b8dda 100644
--- a/library/cpp/protobuf/util/pb_io_ut.cpp
+++ b/library/cpp/protobuf/util/pb_io_ut.cpp
@@ -4,7 +4,7 @@
 
 #include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/folder/path.h>
 #include <util/folder/tempdir.h>
diff --git a/library/cpp/protobuf/util/repeated_field_utils_ut.cpp b/library/cpp/protobuf/util/repeated_field_utils_ut.cpp
index 58aaaa9e12..69be94e44f 100644
--- a/library/cpp/protobuf/util/repeated_field_utils_ut.cpp
+++ b/library/cpp/protobuf/util/repeated_field_utils_ut.cpp
@@ -1,7 +1,7 @@
 #include "repeated_field_utils.h"
 #include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NProtoBuf;
 
diff --git a/library/cpp/protobuf/util/simple_reflection_ut.cpp b/library/cpp/protobuf/util/simple_reflection_ut.cpp
index 169d4703c9..2b38dbf9a9 100644
--- a/library/cpp/protobuf/util/simple_reflection_ut.cpp
+++ b/library/cpp/protobuf/util/simple_reflection_ut.cpp
@@ -2,7 +2,7 @@
 #include <library/cpp/protobuf/util/ut/sample_for_simple_reflection.pb.h>
 #include <library/cpp/protobuf/util/ut/extensions.pb.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NProtoBuf;
 
diff --git a/library/cpp/protobuf/util/walk_ut.cpp b/library/cpp/protobuf/util/walk_ut.cpp
index 2ea6071b17..324d04dbd7 100644
--- a/library/cpp/protobuf/util/walk_ut.cpp
+++ b/library/cpp/protobuf/util/walk_ut.cpp
@@ -2,7 +2,7 @@
 #include "simple_reflection.h"
 #include <library/cpp/protobuf/util/ut/common_ut.pb.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NProtoBuf;
 
diff --git a/library/cpp/protobuf/util/ya.make b/library/cpp/protobuf/util/ya.make
index b62028af58..4d04d4686e 100644
--- a/library/cpp/protobuf/util/ya.make
+++ b/library/cpp/protobuf/util/ya.make
@@ -6,7 +6,7 @@ PEERDIR(
     contrib/libs/protobuf
     library/cpp/binsaver
     library/cpp/protobuf/util/proto
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
 )
 
 SRCS(
diff --git a/library/cpp/regex/hyperscan/hyperscan.cpp b/library/cpp/regex/hyperscan/hyperscan.cpp
index ba321f9c29..57e989e96d 100644
--- a/library/cpp/regex/hyperscan/hyperscan.cpp
+++ b/library/cpp/regex/hyperscan/hyperscan.cpp
@@ -223,7 +223,7 @@ namespace NHyperscan {
         hs_scratch_t* rawScratch = scratch.Get();
         hs_error_t status = Singleton<NPrivate::TImpl>()->AllocScratch(db.Get(), &rawScratch);
         if (rawScratch != scratch.Get()) {
-            Y_UNUSED(scratch.Release()); // freed by hs_alloc_scratch
+            Y_UNUSED(scratch.Release()); // freed by hs_alloc_scratch 
             scratch.Reset(rawScratch);
         }
         if (status != HS_SUCCESS) {
diff --git a/library/cpp/regex/hyperscan/ut/hyperscan_ut.cpp b/library/cpp/regex/hyperscan/ut/hyperscan_ut.cpp
index 9caa53f2e7..f34f7a811f 100644
--- a/library/cpp/regex/hyperscan/ut/hyperscan_ut.cpp
+++ b/library/cpp/regex/hyperscan/ut/hyperscan_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/regex/hyperscan/hyperscan.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/set.h>
 
diff --git a/library/cpp/regex/pcre/regexp_ut.cpp b/library/cpp/regex/pcre/regexp_ut.cpp
index 5184e801cc..ea1b50d8a1 100644
--- a/library/cpp/regex/pcre/regexp_ut.cpp
+++ b/library/cpp/regex/pcre/regexp_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/string/strip.h>
 #include <library/cpp/regex/pcre/regexp.h>
diff --git a/library/cpp/regex/pire/ut/regexp_ut.cpp b/library/cpp/regex/pire/ut/regexp_ut.cpp
index e7206de9ad..590c15bb12 100644
--- a/library/cpp/regex/pire/ut/regexp_ut.cpp
+++ b/library/cpp/regex/pire/ut/regexp_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/regex/pire/regexp.h>
 #include <library/cpp/regex/pire/pcre2pire.h>
diff --git a/library/cpp/resource/registry.cpp b/library/cpp/resource/registry.cpp
index 66001c4769..80148601ce 100644
--- a/library/cpp/resource/registry.cpp
+++ b/library/cpp/resource/registry.cpp
@@ -6,7 +6,7 @@
 #include <util/generic/hash.h>
 #include <util/generic/deque.h>
 #include <util/generic/singleton.h>
-#include <util/system/env.h>
+#include <util/system/env.h> 
 
 using namespace NResource;
 using namespace NBlockCodecs;
@@ -56,7 +56,7 @@ namespace {
                 try {
                     *out = Decompress((*res)->second);
                 } catch (const yexception& e) {
-                    if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) {
+                    if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) { 
                         Cerr << "Can't decompress resource " << key << Endl << e.what() << Endl;
                     }
                     throw e;
@@ -78,7 +78,7 @@ namespace {
                             it.first, Decompress(it.second->second)};
                         cb.OnMatch(res);
                     } catch (const yexception& e) {
-                        if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) {
+                        if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) { 
                             Cerr << "Can't decompress resource " << it.first << Endl << e.what() << Endl;
                         }
                         throw e;
diff --git a/library/cpp/resource/resource.cpp b/library/cpp/resource/resource.cpp
index cc20f847a5..b4375ecb97 100644
--- a/library/cpp/resource/resource.cpp
+++ b/library/cpp/resource/resource.cpp
@@ -1,9 +1,9 @@
 #include "resource.h"
-#include "resource.h"
+#include "resource.h" 
 #include "registry.h"
 
 #include <util/generic/yexception.h>
-#include <util/generic/xrange.h>
+#include <util/generic/xrange.h> 
 
 using namespace NResource;
 
@@ -47,11 +47,11 @@ size_t NResource::Count() noexcept {
 TStringBuf NResource::KeyByIndex(size_t idx) {
     return CommonStore()->KeyByIndex(idx);
 }
-
+ 
 TVector<TStringBuf> NResource::ListAllKeys() {
     TVector<TStringBuf> res(Reserve(NResource::Count()));
-    for (auto i : xrange(NResource::Count())) {
-        res.push_back(NResource::KeyByIndex(i));
-    }
-    return res;
-}
+    for (auto i : xrange(NResource::Count())) { 
+        res.push_back(NResource::KeyByIndex(i)); 
+    } 
+    return res; 
+} 
diff --git a/library/cpp/resource/ut/resource_ut.cpp b/library/cpp/resource/ut/resource_ut.cpp
index b6fa8e4df3..d5abae7bd2 100644
--- a/library/cpp/resource/ut/resource_ut.cpp
+++ b/library/cpp/resource/ut/resource_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/resource/resource.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TestResource) {
     Y_UNIT_TEST(Test1) {
diff --git a/library/cpp/retry/retry_ut.cpp b/library/cpp/retry/retry_ut.cpp
index 92153e987e..5378a7a8b7 100644
--- a/library/cpp/retry/retry_ut.cpp
+++ b/library/cpp/retry/retry_ut.cpp
@@ -1,6 +1,6 @@
 #include "retry.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace {
     class TDoOnSecondOrThrow {
diff --git a/library/cpp/scheme/scimpl_json_write.cpp b/library/cpp/scheme/scimpl_json_write.cpp
index aadd7e6cd5..d785ab3107 100644
--- a/library/cpp/scheme/scimpl_json_write.cpp
+++ b/library/cpp/scheme/scimpl_json_write.cpp
@@ -2,7 +2,7 @@
 #include "scimpl_private.h"
 
 #include <library/cpp/json/json_prettifier.h>
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 
 #include <util/charset/utf8.h>
 #include <util/generic/algorithm.h>
diff --git a/library/cpp/scheme/scimpl_select.rl6 b/library/cpp/scheme/scimpl_select.rl6
index 11aa549b78..e06827a6d6 100644
--- a/library/cpp/scheme/scimpl_select.rl6
+++ b/library/cpp/scheme/scimpl_select.rl6
@@ -2,7 +2,7 @@
 
 #include <util/string/cast.h>
 #include <util/string/escape.h>
-#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h>
+#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> 
 #include <util/generic/is_in.h>
 #include <util/string/util.h>
 
diff --git a/library/cpp/scheme/tests/fuzz_ops/ut/vm_parse_ut.cpp b/library/cpp/scheme/tests/fuzz_ops/ut/vm_parse_ut.cpp
index ce3786a671..9bf83b9a7a 100644
--- a/library/cpp/scheme/tests/fuzz_ops/ut/vm_parse_ut.cpp
+++ b/library/cpp/scheme/tests/fuzz_ops/ut/vm_parse_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/scheme/tests/fuzz_ops/lib/vm_parse.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TestParseNextAction) {
     using namespace NSc::NUt;
diff --git a/library/cpp/scheme/tests/fuzz_ops/ut/ya.make b/library/cpp/scheme/tests/fuzz_ops/ut/ya.make
index 5c933518ea..e617f3f450 100644
--- a/library/cpp/scheme/tests/fuzz_ops/ut/ya.make
+++ b/library/cpp/scheme/tests/fuzz_ops/ut/ya.make
@@ -3,7 +3,7 @@ UNITTEST()
 OWNER(velavokr)
 
 PEERDIR(
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
     library/cpp/scheme
     library/cpp/scheme/tests/fuzz_ops/lib
 )
diff --git a/library/cpp/scheme/tests/ut/fuzz_ops_found_bugs_ut.cpp b/library/cpp/scheme/tests/ut/fuzz_ops_found_bugs_ut.cpp
index a445b0f87c..7f09052c71 100644
--- a/library/cpp/scheme/tests/ut/fuzz_ops_found_bugs_ut.cpp
+++ b/library/cpp/scheme/tests/ut/fuzz_ops_found_bugs_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/scheme/scheme.h>
 #include <library/cpp/scheme/tests/fuzz_ops/lib/fuzz_ops.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/string/hex.h>
 
 Y_UNIT_TEST_SUITE(TTestSchemeFuzzOpsFoundBugs) {
diff --git a/library/cpp/scheme/tests/ut/scheme_cast_ut.cpp b/library/cpp/scheme/tests/ut/scheme_cast_ut.cpp
index 4f907157e9..40862abcfd 100644
--- a/library/cpp/scheme/tests/ut/scheme_cast_ut.cpp
+++ b/library/cpp/scheme/tests/ut/scheme_cast_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/scheme/scheme.h>
 #include <library/cpp/scheme/scheme_cast.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/null.h>
 #include <util/string/subst.h>
diff --git a/library/cpp/scheme/tests/ut/scheme_json_ut.cpp b/library/cpp/scheme/tests/ut/scheme_json_ut.cpp
index daeb2654f9..70b4e641ed 100644
--- a/library/cpp/scheme/tests/ut/scheme_json_ut.cpp
+++ b/library/cpp/scheme/tests/ut/scheme_json_ut.cpp
@@ -1,13 +1,13 @@
 #include <library/cpp/scheme/scimpl_private.h>
 #include <library/cpp/scheme/ut_utils/scheme_ut_utils.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/null.h>
 #include <util/string/subst.h>
 #include <util/string/util.h>
 
 #include <type_traits>
-#include <library/cpp/string_utils/quote/quote.h>
+#include <library/cpp/string_utils/quote/quote.h> 
 
 using namespace std::string_view_literals;
 
diff --git a/library/cpp/scheme/tests/ut/scheme_merge_ut.cpp b/library/cpp/scheme/tests/ut/scheme_merge_ut.cpp
index 2a06cf110d..17ca045a4c 100644
--- a/library/cpp/scheme/tests/ut/scheme_merge_ut.cpp
+++ b/library/cpp/scheme/tests/ut/scheme_merge_ut.cpp
@@ -1,9 +1,9 @@
 #include <library/cpp/scheme/scimpl_private.h>
 #include <library/cpp/scheme/ut_utils/scheme_ut_utils.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/null.h>
-#include <library/cpp/string_utils/quote/quote.h>
+#include <library/cpp/string_utils/quote/quote.h> 
 #include <util/string/subst.h>
 #include <util/string/util.h>
 
diff --git a/library/cpp/scheme/tests/ut/scheme_path_ut.cpp b/library/cpp/scheme/tests/ut/scheme_path_ut.cpp
index 0d4d79d483..0a9add0749 100644
--- a/library/cpp/scheme/tests/ut/scheme_path_ut.cpp
+++ b/library/cpp/scheme/tests/ut/scheme_path_ut.cpp
@@ -1,13 +1,13 @@
 #include <library/cpp/scheme/scimpl_private.h>
 #include <library/cpp/scheme/ut_utils/scheme_ut_utils.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/null.h>
 #include <util/string/subst.h>
 #include <util/string/util.h>
 
 #include <type_traits>
-#include <library/cpp/string_utils/quote/quote.h>
+#include <library/cpp/string_utils/quote/quote.h> 
 
 Y_UNIT_TEST_SUITE(TSchemePathTest) {
     void DoTestSelect(TStringBuf path, TStringBuf expected, TStringBuf delexpected) {
diff --git a/library/cpp/scheme/tests/ut/scheme_proto_ut.cpp b/library/cpp/scheme/tests/ut/scheme_proto_ut.cpp
index e711a0d092..86b3c1b8ef 100644
--- a/library/cpp/scheme/tests/ut/scheme_proto_ut.cpp
+++ b/library/cpp/scheme/tests/ut/scheme_proto_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/protobuf/util/is_equal.h>
 #include <library/cpp/scheme/scheme.h>
 #include <library/cpp/scheme/tests/ut/scheme_ut.pb.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TSchemeProtoTest) {
     void DoTestProtobuf(bool fromProto, bool mapAsDict);
diff --git a/library/cpp/scheme/tests/ut/scheme_ut.cpp b/library/cpp/scheme/tests/ut/scheme_ut.cpp
index 1a5d07c31b..8793e34a03 100644
--- a/library/cpp/scheme/tests/ut/scheme_ut.cpp
+++ b/library/cpp/scheme/tests/ut/scheme_ut.cpp
@@ -1,9 +1,9 @@
 #include <library/cpp/scheme/scimpl_private.h>
 #include <library/cpp/scheme/ut_utils/scheme_ut_utils.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/null.h>
-#include <library/cpp/string_utils/quote/quote.h>
+#include <library/cpp/string_utils/quote/quote.h> 
 #include <util/string/subst.h>
 #include <util/string/util.h>
 
diff --git a/library/cpp/scheme/tests/ut/ya.make b/library/cpp/scheme/tests/ut/ya.make
index 9f54791414..58c363c36b 100644
--- a/library/cpp/scheme/tests/ut/ya.make
+++ b/library/cpp/scheme/tests/ut/ya.make
@@ -6,8 +6,8 @@ PEERDIR(
     library/cpp/protobuf/util
     library/cpp/scheme/tests/fuzz_ops/lib
     library/cpp/scheme/ut_utils
-    library/cpp/string_utils/quote
-    library/cpp/testing/unittest
+    library/cpp/string_utils/quote 
+    library/cpp/testing/unittest 
 )
 
 SRCS(
diff --git a/library/cpp/scheme/ut_utils/scheme_ut_utils.h b/library/cpp/scheme/ut_utils/scheme_ut_utils.h
index eb3ea15b2a..b72ea35c21 100644
--- a/library/cpp/scheme/ut_utils/scheme_ut_utils.h
+++ b/library/cpp/scheme/ut_utils/scheme_ut_utils.h
@@ -4,7 +4,7 @@
 #include <library/cpp/scheme/scheme.h>
 #include <library/cpp/json/json_value.h>
 #include <library/cpp/json/json_writer.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/string/cast.h>
 
 namespace NSc {
diff --git a/library/cpp/scheme/ut_utils/ya.make b/library/cpp/scheme/ut_utils/ya.make
index 7661262e1b..aaf4354703 100644
--- a/library/cpp/scheme/ut_utils/ya.make
+++ b/library/cpp/scheme/ut_utils/ya.make
@@ -10,7 +10,7 @@ PEERDIR(
     library/cpp/colorizer
     library/cpp/json
     library/cpp/scheme
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
 )
 
 END()
diff --git a/library/cpp/scheme/util/utils.cpp b/library/cpp/scheme/util/utils.cpp
index 40cceceacd..3e4e36fd3d 100644
--- a/library/cpp/scheme/util/utils.cpp
+++ b/library/cpp/scheme/util/utils.cpp
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 namespace NScUtils {
 
diff --git a/library/cpp/scheme/util/ya.make b/library/cpp/scheme/util/ya.make
index dffd1c8070..b7a95042f7 100644
--- a/library/cpp/scheme/util/ya.make
+++ b/library/cpp/scheme/util/ya.make
@@ -8,7 +8,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
 )
 
 END()
diff --git a/library/cpp/scheme/ya.make b/library/cpp/scheme/ya.make
index bac08ba5a4..1f65c15e77 100644
--- a/library/cpp/scheme/ya.make
+++ b/library/cpp/scheme/ya.make
@@ -17,7 +17,7 @@ SRCS(
 PEERDIR(
     contrib/libs/protobuf
     library/cpp/json
-    library/cpp/string_utils/relaxed_escaper
+    library/cpp/string_utils/relaxed_escaper 
 )
 
 GENERATE_ENUM_SERIALIZATION(scheme.h)
diff --git a/library/cpp/sliding_window/sliding_window_ut.cpp b/library/cpp/sliding_window/sliding_window_ut.cpp
index 1e7343a8d3..e15a113aa6 100644
--- a/library/cpp/sliding_window/sliding_window_ut.cpp
+++ b/library/cpp/sliding_window/sliding_window_ut.cpp
@@ -1,6 +1,6 @@
 #include "sliding_window.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NSlidingWindow;
 
diff --git a/library/cpp/sse/ut/test.cpp b/library/cpp/sse/ut/test.cpp
index 33c999d284..e6b273ca85 100644
--- a/library/cpp/sse/ut/test.cpp
+++ b/library/cpp/sse/ut/test.cpp
@@ -5,7 +5,7 @@
  */
 /* Author: Vitaliy Manushkin <agri@yandex-team.ru */
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/typetraits.h>
 #include <util/string/hex.h>
@@ -38,13 +38,13 @@ struct T_mm_CallWrapper {
 };
 
 #if defined(_arm64_)
-#include "library/cpp/sse/sse2neon.h"
+#include "library/cpp/sse/sse2neon.h" 
 #elif defined(_i386_) || defined(_x86_64_)
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #include <smmintrin.h>
 #elif defined(_ppc64_)
-#include "library/cpp/sse/powerpc.h"
+#include "library/cpp/sse/powerpc.h" 
 #else
 #error "Unsupported platform"
 #endif
diff --git a/library/cpp/sse/ut/ya.make b/library/cpp/sse/ut/ya.make
index 45e104971e..ccae8dd882 100644
--- a/library/cpp/sse/ut/ya.make
+++ b/library/cpp/sse/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/sse)
+UNITTEST_FOR(library/cpp/sse) 
 
 OWNER(danlark)
 
diff --git a/library/cpp/streams/brotli/brotli_ut.cpp b/library/cpp/streams/brotli/brotli_ut.cpp
index aeb2e284dc..a6d95ecf76 100644
--- a/library/cpp/streams/brotli/brotli_ut.cpp
+++ b/library/cpp/streams/brotli/brotli_ut.cpp
@@ -1,6 +1,6 @@
 #include "brotli.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/random/fast.h>
 
diff --git a/library/cpp/streams/bzip2/bzip2_ut.cpp b/library/cpp/streams/bzip2/bzip2_ut.cpp
index 69a98f296c..4c207ddef7 100644
--- a/library/cpp/streams/bzip2/bzip2_ut.cpp
+++ b/library/cpp/streams/bzip2/bzip2_ut.cpp
@@ -1,6 +1,6 @@
 #include "bzip2.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/file.h>
 #include <util/system/tempfile.h>
diff --git a/library/cpp/streams/lz/lz.cpp b/library/cpp/streams/lz/lz.cpp
index b65bb3ed96..3f005a50a9 100644
--- a/library/cpp/streams/lz/lz.cpp
+++ b/library/cpp/streams/lz/lz.cpp
@@ -102,7 +102,7 @@ private:
         ui8 compressed = false;
 
         if (len) {
-            const size_t out = this->Compress((const char*)ptr, len, (char*)Block(), this->AdditionalDataLength());
+            const size_t out = this->Compress((const char*)ptr, len, (char*)Block(), this->AdditionalDataLength()); 
             // catch compressor buffer overrun (e.g. SEARCH-2043)
             //Y_VERIFY(out <= this->Hint(this->BlockSize()));
 
@@ -402,7 +402,7 @@ protected:
 
 class TMiniLzoCompressor: public TMiniLzo, public TFixedArray<LZO1X_MEM_COMPRESS + 1> {
 public:
-    inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) {
+    inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { 
         lzo_uint out = 0;
         lzo1x_1_compress((const lzo_bytep)data, len, (lzo_bytep)ptr, &out, WorkMem_);
 
@@ -438,7 +438,7 @@ public:
         return Max<size_t>((size_t)(len * 1.06), 100);
     }
 
-    inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) {
+    inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { 
         return fastlz_compress(data, len, ptr);
     }
 
@@ -470,8 +470,8 @@ public:
         return Max<size_t>((size_t)(len * 1.06), 100);
     }
 
-    inline size_t Compress(const char* data, size_t len, char* ptr, size_t dstMaxSize) {
-        return LZ4_compress_default(data, ptr, len, dstMaxSize);
+    inline size_t Compress(const char* data, size_t len, char* ptr, size_t dstMaxSize) { 
+        return LZ4_compress_default(data, ptr, len, dstMaxSize); 
     }
 
     inline size_t Decompress(const char* data, size_t len, char* ptr, size_t max) {
@@ -505,7 +505,7 @@ public:
         return Max<size_t>(snappy::MaxCompressedLength(len), 100);
     }
 
-    inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) {
+    inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { 
         size_t reslen = 0;
         snappy::RawCompress(data, len, ptr, &reslen);
         return reslen;
@@ -575,7 +575,7 @@ const char TQuickLZBase::signature[] = "YLZQ";
 
 class TQuickLZCompress: public TQuickLZBase {
 public:
-    inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) {
+    inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { 
         return Table_->Compress(data, ptr, len, (char*)Mem_.Get());
     }
 };
diff --git a/library/cpp/streams/lz/lz_ut.cpp b/library/cpp/streams/lz/lz_ut.cpp
index 6876f070fc..ea8a920429 100644
--- a/library/cpp/streams/lz/lz_ut.cpp
+++ b/library/cpp/streams/lz/lz_ut.cpp
@@ -1,6 +1,6 @@
 #include "lz.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/resource/resource.h>
 
 #include <util/stream/file.h>
diff --git a/library/cpp/streams/lzma/lzma_ut.cpp b/library/cpp/streams/lzma/lzma_ut.cpp
index 847e98d1ca..bfa88b6a51 100644
--- a/library/cpp/streams/lzma/lzma_ut.cpp
+++ b/library/cpp/streams/lzma/lzma_ut.cpp
@@ -1,6 +1,6 @@
 #include "lzma.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/mem.h>
 #include <util/random/fast.h>
diff --git a/library/cpp/streams/zstd/zstd_ut.cpp b/library/cpp/streams/zstd/zstd_ut.cpp
index ef479fdd97..ce49b5e3af 100644
--- a/library/cpp/streams/zstd/zstd_ut.cpp
+++ b/library/cpp/streams/zstd/zstd_ut.cpp
@@ -1,6 +1,6 @@
 #include "zstd.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/random/fast.h>
 #include <util/stream/null.h>
diff --git a/library/cpp/string_utils/base64/base64.cpp b/library/cpp/string_utils/base64/base64.cpp
index 05c201f0de..8ff70a5b9b 100644
--- a/library/cpp/string_utils/base64/base64.cpp
+++ b/library/cpp/string_utils/base64/base64.cpp
@@ -31,14 +31,14 @@ namespace {
             const bool haveNEON64 = false;
 #endif
 
-# ifdef _windows_
-            // msvc does something wrong in release-build, so we temprorary  disable this branch on windows
-            // https://developercommunity.visualstudio.com/content/problem/334085/release-build-has-made-wrong-optimizaion-in-base64.html
-            const bool isWin = true;
-# else
-            const bool isWin = false;
-# endif
-            if (!isWin && NX86::HaveAVX() && NX86::HaveAVX2()) {
+# ifdef _windows_ 
+            // msvc does something wrong in release-build, so we temprorary  disable this branch on windows 
+            // https://developercommunity.visualstudio.com/content/problem/334085/release-build-has-made-wrong-optimizaion-in-base64.html 
+            const bool isWin = true; 
+# else 
+            const bool isWin = false; 
+# endif 
+            if (!isWin && NX86::HaveAVX() && NX86::HaveAVX2()) { 
                 Encode = avx2_base64_encode;
                 Decode = avx2_base64_decode;
             } else if (NX86::HaveSSSE3()) {
diff --git a/library/cpp/string_utils/base64/base64.h b/library/cpp/string_utils/base64/base64.h
index f778a6425a..7c9f0987e7 100644
--- a/library/cpp/string_utils/base64/base64.h
+++ b/library/cpp/string_utils/base64/base64.h
@@ -32,7 +32,7 @@ inline void Base64Decode(const TStringBuf src, TString& dst) {
     dst.resize(Base64Decode(src, dst.begin()).size());
 }
 
-//WARNING: can process not whole input silently, use Base64StrictDecode instead of this function
+//WARNING: can process not whole input silently, use Base64StrictDecode instead of this function 
 inline TString Base64Decode(const TStringBuf s) {
     TString ret;
     Base64Decode(s, ret);
diff --git a/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp b/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp
index c3ed068a37..de2d96c36c 100644
--- a/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp
+++ b/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 Y_UNIT_TEST_SUITE(TBase64DecodeUneven) {
     Y_UNIT_TEST(Base64DecodeUneven) {
diff --git a/library/cpp/string_utils/base64/base64_ut.cpp b/library/cpp/string_utils/base64/base64_ut.cpp
index bcc1e65879..bc2c7398be 100644
--- a/library/cpp/string_utils/base64/base64_ut.cpp
+++ b/library/cpp/string_utils/base64/base64_ut.cpp
@@ -7,7 +7,7 @@
 #include <contrib/libs/base64/plain64/libbase64.h>
 #include <contrib/libs/base64/ssse3/libbase64.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/vector.h>
 #include <util/random/fast.h>
diff --git a/library/cpp/string_utils/base64/bench/main.cpp b/library/cpp/string_utils/base64/bench/main.cpp
index 10e09bc1c7..5d0a4c40d9 100644
--- a/library/cpp/string_utils/base64/bench/main.cpp
+++ b/library/cpp/string_utils/base64/bench/main.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 
 #include <util/generic/buffer.h>
 #include <util/generic/singleton.h>
diff --git a/library/cpp/string_utils/base64/bench/metrics/main.py b/library/cpp/string_utils/base64/bench/metrics/main.py
index c35fd6d8cd..272b6bdcfa 100644
--- a/library/cpp/string_utils/base64/bench/metrics/main.py
+++ b/library/cpp/string_utils/base64/bench/metrics/main.py
@@ -2,4 +2,4 @@ import yatest.common as yc
 
 
 def test_export_metrics(metrics):
-    metrics.set_benchmark(yc.execute_benchmark('library/cpp/string_utils/base64/bench/bench'))
+    metrics.set_benchmark(yc.execute_benchmark('library/cpp/string_utils/base64/bench/bench')) 
diff --git a/library/cpp/string_utils/base64/bench/metrics/ya.make b/library/cpp/string_utils/base64/bench/metrics/ya.make
index b0406516c3..25f925840a 100644
--- a/library/cpp/string_utils/base64/bench/metrics/ya.make
+++ b/library/cpp/string_utils/base64/bench/metrics/ya.make
@@ -15,6 +15,6 @@ TAG(
 
 TEST_SRCS(main.py)
 
-DEPENDS(library/cpp/string_utils/base64/bench)
+DEPENDS(library/cpp/string_utils/base64/bench) 
 
 END()
diff --git a/library/cpp/string_utils/base64/bench/ya.make b/library/cpp/string_utils/base64/bench/ya.make
index 5ac5f3d6ce..61f0b6eb94 100644
--- a/library/cpp/string_utils/base64/bench/ya.make
+++ b/library/cpp/string_utils/base64/bench/ya.make
@@ -10,7 +10,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
 )
 
 END()
diff --git a/library/cpp/string_utils/base64/fuzz/generic/ya.make b/library/cpp/string_utils/base64/fuzz/generic/ya.make
index d155e2b0a0..fe3dba490e 100644
--- a/library/cpp/string_utils/base64/fuzz/generic/ya.make
+++ b/library/cpp/string_utils/base64/fuzz/generic/ya.make
@@ -6,7 +6,7 @@ OWNER(
 FUZZ()
 
 PEERDIR(
-    library/cpp/string_utils/base64/fuzz/lib
+    library/cpp/string_utils/base64/fuzz/lib 
 )
 
 END()
diff --git a/library/cpp/string_utils/base64/fuzz/lib/main.cpp b/library/cpp/string_utils/base64/fuzz/lib/main.cpp
index 28547ae7a5..e3dea7c437 100644
--- a/library/cpp/string_utils/base64/fuzz/lib/main.cpp
+++ b/library/cpp/string_utils/base64/fuzz/lib/main.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 #include <util/system/types.h>
 #include <util/system/yassert.h>
diff --git a/library/cpp/string_utils/base64/fuzz/lib/ya.make b/library/cpp/string_utils/base64/fuzz/lib/ya.make
index 7b981b86a3..8a716861c8 100644
--- a/library/cpp/string_utils/base64/fuzz/lib/ya.make
+++ b/library/cpp/string_utils/base64/fuzz/lib/ya.make
@@ -10,7 +10,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
 )
 
 END()
diff --git a/library/cpp/string_utils/base64/ut/ya.make b/library/cpp/string_utils/base64/ut/ya.make
index 9b61241f0e..6b23486662 100644
--- a/library/cpp/string_utils/base64/ut/ya.make
+++ b/library/cpp/string_utils/base64/ut/ya.make
@@ -3,7 +3,7 @@ OWNER(
     yazevnul
 )
 
-UNITTEST_FOR(library/cpp/string_utils/base64)
+UNITTEST_FOR(library/cpp/string_utils/base64) 
 
 SRCS(
     base64_ut.cpp
diff --git a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp
index cf0f78637f..d81c583b02 100644
--- a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp
+++ b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp
@@ -1,6 +1,6 @@
 #include "levenshtein_diff.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/string.h>
 
diff --git a/library/cpp/string_utils/parse_size/parse_size_ut.cpp b/library/cpp/string_utils/parse_size/parse_size_ut.cpp
index 8fff4f56b2..49f2636785 100644
--- a/library/cpp/string_utils/parse_size/parse_size_ut.cpp
+++ b/library/cpp/string_utils/parse_size/parse_size_ut.cpp
@@ -1,6 +1,6 @@
 #include "parse_size.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NSize;
 
diff --git a/library/cpp/string_utils/parse_size/ut/ya.make b/library/cpp/string_utils/parse_size/ut/ya.make
index da19cf025b..cb50b6f2da 100644
--- a/library/cpp/string_utils/parse_size/ut/ya.make
+++ b/library/cpp/string_utils/parse_size/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/string_utils/parse_size)
+UNITTEST_FOR(library/cpp/string_utils/parse_size) 
 
 OWNER(g:images-robot)
 
diff --git a/library/cpp/string_utils/quote/quote_ut.cpp b/library/cpp/string_utils/quote/quote_ut.cpp
index 6c552b279e..dc9c3c5dd6 100644
--- a/library/cpp/string_utils/quote/quote_ut.cpp
+++ b/library/cpp/string_utils/quote/quote_ut.cpp
@@ -1,6 +1,6 @@
 #include "quote.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TCGIEscapeTest) {
     Y_UNIT_TEST(ReturnsEndOfTo) {
diff --git a/library/cpp/string_utils/quote/ut/ya.make b/library/cpp/string_utils/quote/ut/ya.make
index eca955144f..c8f5bc63ec 100644
--- a/library/cpp/string_utils/quote/ut/ya.make
+++ b/library/cpp/string_utils/quote/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/string_utils/quote)
+UNITTEST_FOR(library/cpp/string_utils/quote) 
 
 OWNER(vladon)
 
diff --git a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp b/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp
index 768555ea3a..ec74798c30 100644
--- a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp
+++ b/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp
@@ -1,6 +1,6 @@
 #include "relaxed_escaper.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #define RESC_FIXED_STR(s) TStringBuf(s, sizeof(s) - 1)
 static const TStringBuf CommonTestData[] = {
diff --git a/library/cpp/string_utils/relaxed_escaper/ut/ya.make b/library/cpp/string_utils/relaxed_escaper/ut/ya.make
index 7ebd393c48..10011e33d1 100644
--- a/library/cpp/string_utils/relaxed_escaper/ut/ya.make
+++ b/library/cpp/string_utils/relaxed_escaper/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/string_utils/relaxed_escaper)
+UNITTEST_FOR(library/cpp/string_utils/relaxed_escaper) 
 
 OWNER(velavokr)
 
diff --git a/library/cpp/string_utils/url/url.cpp b/library/cpp/string_utils/url/url.cpp
index 85f4ac5d69..376a09a465 100644
--- a/library/cpp/string_utils/url/url.cpp
+++ b/library/cpp/string_utils/url/url.cpp
@@ -73,31 +73,31 @@ namespace NUrl {
 
 } // namespace NUrl
 
-size_t GetHttpPrefixSize(const char* url, bool ignorehttps) noexcept {
+size_t GetHttpPrefixSize(const char* url, bool ignorehttps) noexcept { 
     return GetHttpPrefixSizeImpl<char>(url, TUncheckedSize(), ignorehttps);
 }
 
-size_t GetHttpPrefixSize(const wchar16* url, bool ignorehttps) noexcept {
+size_t GetHttpPrefixSize(const wchar16* url, bool ignorehttps) noexcept { 
     return GetHttpPrefixSizeImpl<wchar16>(url, TUncheckedSize(), ignorehttps);
 }
 
-size_t GetHttpPrefixSize(const TStringBuf url, bool ignorehttps) noexcept {
+size_t GetHttpPrefixSize(const TStringBuf url, bool ignorehttps) noexcept { 
     return GetHttpPrefixSizeImpl<char>(url.data(), TKnownSize(url.size()), ignorehttps);
 }
 
-size_t GetHttpPrefixSize(const TWtringBuf url, bool ignorehttps) noexcept {
+size_t GetHttpPrefixSize(const TWtringBuf url, bool ignorehttps) noexcept { 
     return GetHttpPrefixSizeImpl<wchar16>(url.data(), TKnownSize(url.size()), ignorehttps);
 }
 
-TStringBuf CutHttpPrefix(const TStringBuf url, bool ignorehttps) noexcept {
+TStringBuf CutHttpPrefix(const TStringBuf url, bool ignorehttps) noexcept { 
     return CutHttpPrefixImpl(url, ignorehttps);
 }
 
-TWtringBuf CutHttpPrefix(const TWtringBuf url, bool ignorehttps) noexcept {
+TWtringBuf CutHttpPrefix(const TWtringBuf url, bool ignorehttps) noexcept { 
     return CutHttpPrefixImpl(url, ignorehttps);
 }
 
-size_t GetSchemePrefixSize(const TStringBuf url) noexcept {
+size_t GetSchemePrefixSize(const TStringBuf url) noexcept { 
     struct TDelim: public str_spn {
         inline TDelim()
             : str_spn("!-/:-@[-`{|}", true)
@@ -115,11 +115,11 @@ size_t GetSchemePrefixSize(const TStringBuf url) noexcept {
     return n + 3 - url.begin();
 }
 
-TStringBuf GetSchemePrefix(const TStringBuf url) noexcept {
+TStringBuf GetSchemePrefix(const TStringBuf url) noexcept { 
     return url.Head(GetSchemePrefixSize(url));
 }
 
-TStringBuf CutSchemePrefix(const TStringBuf url) noexcept {
+TStringBuf CutSchemePrefix(const TStringBuf url) noexcept { 
     return url.Tail(GetSchemePrefixSize(url));
 }
 
@@ -146,15 +146,15 @@ static inline TStringBuf GetHostAndPortImpl(const TStringBuf url) {
     return urlNoScheme;
 }
 
-TStringBuf GetHost(const TStringBuf url) noexcept {
+TStringBuf GetHost(const TStringBuf url) noexcept { 
     return GetHostAndPortImpl<false>(url);
 }
 
-TStringBuf GetHostAndPort(const TStringBuf url) noexcept {
+TStringBuf GetHostAndPort(const TStringBuf url) noexcept { 
     return GetHostAndPortImpl<true>(url);
 }
 
-TStringBuf GetSchemeHostAndPort(const TStringBuf url, bool trimHttp, bool trimDefaultPort) noexcept {
+TStringBuf GetSchemeHostAndPort(const TStringBuf url, bool trimHttp, bool trimDefaultPort) noexcept { 
     const size_t schemeSize = GetSchemePrefixSize(url);
     const TStringBuf scheme = url.Head(schemeSize);
 
@@ -235,11 +235,11 @@ void GetSchemeHostAndPort(const TStringBuf url, TStringBuf& scheme, TStringBuf&
     Y_ENSURE(isOk, "cannot parse port number from URL: " << url);
 }
 
-TStringBuf GetOnlyHost(const TStringBuf url) noexcept {
+TStringBuf GetOnlyHost(const TStringBuf url) noexcept { 
     return GetHost(CutSchemePrefix(url));
 }
 
-TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment) noexcept {
+TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment) noexcept { 
     const size_t off = url.find('/', GetHttpPrefixSize(url));
     TStringBuf hostUnused, path;
     if (!url.TrySplitAt(off, hostUnused, path))
@@ -249,7 +249,7 @@ TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment) noexcept {
 }
 
 // this strange creature returns 2nd level domain, possibly with port
-TStringBuf GetDomain(const TStringBuf host) noexcept {
+TStringBuf GetDomain(const TStringBuf host) noexcept { 
     const char* c = !host ? host.data() : host.end() - 1;
     for (bool wasPoint = false; c != host.data(); --c) {
         if (*c == '.') {
@@ -263,7 +263,7 @@ TStringBuf GetDomain(const TStringBuf host) noexcept {
     return TStringBuf(c, host.end());
 }
 
-TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept {
+TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept { 
     size_t pos = host.size();
     for (size_t i = 0; i < level; ++i) {
         pos = host.rfind('.', pos);
@@ -273,11 +273,11 @@ TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept {
     return host.SubStr(pos + 1);
 }
 
-TStringBuf GetZone(const TStringBuf host) noexcept {
+TStringBuf GetZone(const TStringBuf host) noexcept { 
     return GetParentDomain(host, 1);
 }
 
-TStringBuf CutWWWPrefix(const TStringBuf url) noexcept {
+TStringBuf CutWWWPrefix(const TStringBuf url) noexcept { 
     if (url.size() >= 4 && url[3] == '.' && !strnicmp(url.data(), "www", 3))
         return url.substr(4);
     return url;
@@ -388,7 +388,7 @@ size_t NormalizeHostName(char* dest, const TStringBuf source, size_t dest_size,
     return len;
 }
 
-TStringBuf RemoveFinalSlash(TStringBuf str) noexcept {
+TStringBuf RemoveFinalSlash(TStringBuf str) noexcept { 
     if (str.EndsWith('/')) {
         str.Chop(1);
     }
diff --git a/library/cpp/string_utils/url/url.h b/library/cpp/string_utils/url/url.h
index 84137ccc57..64e82485a1 100644
--- a/library/cpp/string_utils/url/url.h
+++ b/library/cpp/string_utils/url/url.h
@@ -23,39 +23,39 @@ namespace NUrl {
 
 } // namespace NUrl
 
-Y_PURE_FUNCTION
-size_t GetHttpPrefixSize(const char* url, bool ignorehttps = false) noexcept;
-Y_PURE_FUNCTION
-size_t GetHttpPrefixSize(const wchar16* url, bool ignorehttps = false) noexcept;
+Y_PURE_FUNCTION 
+size_t GetHttpPrefixSize(const char* url, bool ignorehttps = false) noexcept; 
+Y_PURE_FUNCTION 
+size_t GetHttpPrefixSize(const wchar16* url, bool ignorehttps = false) noexcept; 
 
-Y_PURE_FUNCTION
-size_t GetHttpPrefixSize(const TStringBuf url, bool ignorehttps = false) noexcept;
-
-Y_PURE_FUNCTION
-size_t GetHttpPrefixSize(const TWtringBuf url, bool ignorehttps = false) noexcept;
+Y_PURE_FUNCTION 
+size_t GetHttpPrefixSize(const TStringBuf url, bool ignorehttps = false) noexcept; 
 
+Y_PURE_FUNCTION 
+size_t GetHttpPrefixSize(const TWtringBuf url, bool ignorehttps = false) noexcept; 
+ 
 /** BEWARE of TStringBuf! You can not use operator ~ or c_str() like in TString
     !!!!!!!!!!!! */
-Y_PURE_FUNCTION
-size_t GetSchemePrefixSize(const TStringBuf url) noexcept;
+Y_PURE_FUNCTION 
+size_t GetSchemePrefixSize(const TStringBuf url) noexcept; 
 
-Y_PURE_FUNCTION
-TStringBuf GetSchemePrefix(const TStringBuf url) noexcept;
+Y_PURE_FUNCTION 
+TStringBuf GetSchemePrefix(const TStringBuf url) noexcept; 
 
 //! removes protocol prefixes 'http://' and 'https://' from given URL
 //! @note if URL has no prefix or some other prefix the function does nothing
 //! @param url    URL from which the prefix should be removed
 //! @param ignorehttps if true, leaves https://
 //! @return a new URL without protocol prefix
-Y_PURE_FUNCTION
-TStringBuf CutHttpPrefix(const TStringBuf url, bool ignorehttps = false) noexcept;
-
-Y_PURE_FUNCTION
-TWtringBuf CutHttpPrefix(const TWtringBuf url, bool ignorehttps = false) noexcept;
+Y_PURE_FUNCTION 
+TStringBuf CutHttpPrefix(const TStringBuf url, bool ignorehttps = false) noexcept; 
 
-Y_PURE_FUNCTION
-TStringBuf CutSchemePrefix(const TStringBuf url) noexcept;
+Y_PURE_FUNCTION 
+TWtringBuf CutHttpPrefix(const TWtringBuf url, bool ignorehttps = false) noexcept; 
 
+Y_PURE_FUNCTION 
+TStringBuf CutSchemePrefix(const TStringBuf url) noexcept; 
+ 
 //! adds specified scheme prefix if URL has no scheme
 //! @note if URL has scheme prefix already the function returns unchanged URL
 TString AddSchemePrefix(const TString& url, const TStringBuf scheme);
@@ -63,15 +63,15 @@ TString AddSchemePrefix(const TString& url, const TStringBuf scheme);
 //! Same as `AddSchemePrefix(url, "http")`.
 TString AddSchemePrefix(const TString& url);
 
-Y_PURE_FUNCTION
-TStringBuf GetHost(const TStringBuf url) noexcept;
-
-Y_PURE_FUNCTION
-TStringBuf GetHostAndPort(const TStringBuf url) noexcept;
-
-Y_PURE_FUNCTION
-TStringBuf GetSchemeHostAndPort(const TStringBuf url, bool trimHttp = true, bool trimDefaultPort = true) noexcept;
+Y_PURE_FUNCTION 
+TStringBuf GetHost(const TStringBuf url) noexcept; 
 
+Y_PURE_FUNCTION 
+TStringBuf GetHostAndPort(const TStringBuf url) noexcept; 
+ 
+Y_PURE_FUNCTION 
+TStringBuf GetSchemeHostAndPort(const TStringBuf url, bool trimHttp = true, bool trimDefaultPort = true) noexcept; 
+ 
 /**
  * Splits URL to host and path
  *
@@ -123,25 +123,25 @@ bool TryGetSchemeHostAndPort(const TStringBuf url, TStringBuf& scheme, TStringBu
  */
 void GetSchemeHostAndPort(const TStringBuf url, TStringBuf& scheme, TStringBuf& host, ui16& port);
 
-Y_PURE_FUNCTION
-TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment = true) noexcept;
+Y_PURE_FUNCTION 
+TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment = true) noexcept; 
 /**
  * Extracts host from url and cuts http(https) protocol prefix and port if any.
  * @param[in] url   any URL
  * @return          host without port and http(https) prefix.
  */
-Y_PURE_FUNCTION
-TStringBuf GetOnlyHost(const TStringBuf url) noexcept;
-
-Y_PURE_FUNCTION
-TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept; // ("www.ya.ru", 2) -> "ya.ru"
-
-Y_PURE_FUNCTION
-TStringBuf GetZone(const TStringBuf host) noexcept;
-
-Y_PURE_FUNCTION
-TStringBuf CutWWWPrefix(const TStringBuf url) noexcept;
-
+Y_PURE_FUNCTION 
+TStringBuf GetOnlyHost(const TStringBuf url) noexcept; 
+
+Y_PURE_FUNCTION 
+TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept; // ("www.ya.ru", 2) -> "ya.ru" 
+ 
+Y_PURE_FUNCTION 
+TStringBuf GetZone(const TStringBuf host) noexcept; 
+ 
+Y_PURE_FUNCTION 
+TStringBuf CutWWWPrefix(const TStringBuf url) noexcept; 
+ 
 Y_PURE_FUNCTION
 TStringBuf CutWWWNumberedPrefix(const TStringBuf url) noexcept;
 
@@ -153,17 +153,17 @@ TStringBuf CutWWWNumberedPrefix(const TStringBuf url) noexcept;
  * @param[in] url   any URL
  * @return          url without 'm.' or 'M.' prefix.
  */
-Y_PURE_FUNCTION
+Y_PURE_FUNCTION 
 TStringBuf CutMPrefix(const TStringBuf url) noexcept;
 
 Y_PURE_FUNCTION
-TStringBuf GetDomain(const TStringBuf host) noexcept; // should not be used
-
+TStringBuf GetDomain(const TStringBuf host) noexcept; // should not be used 
+ 
 size_t NormalizeUrlName(char* dest, const TStringBuf source, size_t dest_size);
 size_t NormalizeHostName(char* dest, const TStringBuf source, size_t dest_size, ui16 defport = 80);
 
-Y_PURE_FUNCTION
-TStringBuf RemoveFinalSlash(TStringBuf str) noexcept;
+Y_PURE_FUNCTION 
+TStringBuf RemoveFinalSlash(TStringBuf str) noexcept; 
 
 TStringBuf CutUrlPrefixes(TStringBuf url) noexcept;
 bool DoesUrlPathStartWithToken(TStringBuf url, const TStringBuf& token) noexcept;
diff --git a/library/cpp/string_utils/url/url_ut.cpp b/library/cpp/string_utils/url/url_ut.cpp
index 1588013893..4fbab25081 100644
--- a/library/cpp/string_utils/url/url_ut.cpp
+++ b/library/cpp/string_utils/url/url_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <util/string/cast.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TUtilUrlTest) {
     Y_UNIT_TEST(TestGetHostAndGetHostAndPort) {
diff --git a/library/cpp/string_utils/url/ut/ya.make b/library/cpp/string_utils/url/ut/ya.make
index 0efa30e4d2..ca75e04baf 100644
--- a/library/cpp/string_utils/url/ut/ya.make
+++ b/library/cpp/string_utils/url/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/string_utils/url)
+UNITTEST_FOR(library/cpp/string_utils/url) 
 
 OWNER(g:util)
 
diff --git a/library/cpp/string_utils/ya.make b/library/cpp/string_utils/ya.make
index cd731bda95..932fb805d7 100644
--- a/library/cpp/string_utils/ya.make
+++ b/library/cpp/string_utils/ya.make
@@ -1,37 +1,37 @@
 RECURSE(
-    ascii_encode
-    ascii_encode/ut
-    base64
-    base64/bench
-    base64/bench/metrics
-    base64/ut
-    base64/fuzz
-    csv
-    csv/bench
-    csv/ut
-    col_diff
-    col_diff/ut
-    indent_text
+    ascii_encode 
+    ascii_encode/ut 
+    base64 
+    base64/bench 
+    base64/bench/metrics 
+    base64/ut 
+    base64/fuzz 
+    csv 
+    csv/bench 
+    csv/ut 
+    col_diff 
+    col_diff/ut 
+    indent_text 
     levenshtein_diff
     levenshtein_diff/ut
-    old_url_normalize
-    old_url_normalize/ut
-    parse_size
-    parse_size/ut
-    parse_vector
-    parse_vector/ut
+    old_url_normalize 
+    old_url_normalize/ut 
+    parse_size 
+    parse_size/ut 
+    parse_vector 
+    parse_vector/ut 
     secret_string
-    quote
-    quote/ut
-    relaxed_escaper
-    relaxed_escaper/ut
-    scan
-    subst_buf
-    subst_buf/ut
-    tskv_format
-    tskv_format/ut
-    tskv_format/fuzz
-    url
-    url/ut
+    quote 
+    quote/ut 
+    relaxed_escaper 
+    relaxed_escaper/ut 
+    scan 
+    subst_buf 
+    subst_buf/ut 
+    tskv_format 
+    tskv_format/ut 
+    tskv_format/fuzz 
+    url 
+    url/ut 
     ztstrbuf
 )
diff --git a/library/cpp/terminate_handler/sample/exception/ya.make b/library/cpp/terminate_handler/sample/exception/ya.make
index 958c26f89a..f3471eae67 100644
--- a/library/cpp/terminate_handler/sample/exception/ya.make
+++ b/library/cpp/terminate_handler/sample/exception/ya.make
@@ -7,7 +7,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/terminate_handler
+    library/cpp/terminate_handler 
 )
 
 END()
diff --git a/library/cpp/terminate_handler/sample/pure-virtual/ya.make b/library/cpp/terminate_handler/sample/pure-virtual/ya.make
index 4100da630d..d3b439c646 100644
--- a/library/cpp/terminate_handler/sample/pure-virtual/ya.make
+++ b/library/cpp/terminate_handler/sample/pure-virtual/ya.make
@@ -7,7 +7,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/terminate_handler
+    library/cpp/terminate_handler 
 )
 
 END()
diff --git a/library/cpp/terminate_handler/sample/rethrow/ya.make b/library/cpp/terminate_handler/sample/rethrow/ya.make
index 4100da630d..d3b439c646 100644
--- a/library/cpp/terminate_handler/sample/rethrow/ya.make
+++ b/library/cpp/terminate_handler/sample/rethrow/ya.make
@@ -7,7 +7,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/terminate_handler
+    library/cpp/terminate_handler 
 )
 
 END()
diff --git a/library/cpp/terminate_handler/sample/segv/ya.make b/library/cpp/terminate_handler/sample/segv/ya.make
index 4100da630d..d3b439c646 100644
--- a/library/cpp/terminate_handler/sample/segv/ya.make
+++ b/library/cpp/terminate_handler/sample/segv/ya.make
@@ -7,7 +7,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/terminate_handler
+    library/cpp/terminate_handler 
 )
 
 END()
diff --git a/library/cpp/testing/README.md b/library/cpp/testing/README.md
index e8e0391be4..8980ccfd0a 100644
--- a/library/cpp/testing/README.md
+++ b/library/cpp/testing/README.md
@@ -12,5 +12,5 @@
 * `gtest_protobuf` — утилиты для работы с протобуфом в тестах.
 * `hook` — хуки для выполнения пользовательских функций в тестах и бенчмарках.
 * `mock_server` — реализация http-сервера для тестов.
-* `unittest` — реализация модуля UNITTEST — основного средства для тестирования тестов на С++ в Аркадии.
-* `unittest_main` — реализация `int main(argc, argv)` для модуля UNITTEST (она вынесена в отдельную библиотеку, чтобы оставить возможность для реализации `UNITTEST_WITH_CUSTOM_ENTRY_POINT` и `YT_UNITTEST`.
+* `unittest` — реализация модуля UNITTEST — основного средства для тестирования тестов на С++ в Аркадии. 
+* `unittest_main` — реализация `int main(argc, argv)` для модуля UNITTEST (она вынесена в отдельную библиотеку, чтобы оставить возможность для реализации `UNITTEST_WITH_CUSTOM_ENTRY_POINT` и `YT_UNITTEST`. 
diff --git a/library/cpp/testing/benchmark/bench.cpp b/library/cpp/testing/benchmark/bench.cpp
index 08d8708005..f8cb2c01f9 100644
--- a/library/cpp/testing/benchmark/bench.cpp
+++ b/library/cpp/testing/benchmark/bench.cpp
@@ -3,10 +3,10 @@
 #include <contrib/libs/re2/re2/re2.h>
 
 #include <library/cpp/colorizer/output.h>
-#include <library/cpp/getopt/small/last_getopt.h>
+#include <library/cpp/getopt/small/last_getopt.h> 
 #include <library/cpp/json/json_value.h>
 #include <library/cpp/linear_regression/linear_regression.h>
-#include <library/cpp/threading/poor_man_openmp/thread_helper.h>
+#include <library/cpp/threading/poor_man_openmp/thread_helper.h> 
 
 #include <util/system/hp_timer.h>
 #include <util/system/info.h>
@@ -22,7 +22,7 @@
 #include <util/generic/maybe.h>
 #include <util/generic/strbuf.h>
 #include <util/generic/intrlist.h>
-#include <util/stream/format.h>
+#include <util/stream/format.h> 
 #include <util/system/yield.h>
 
 using re2::RE2;
@@ -128,11 +128,11 @@ namespace {
             }
 
             TString hr;
-            if (t > 10 * 1000) {
-                hr = " (" + ToString(HumanReadableSize(t, ESizeFormat::SF_QUANTITY)) + ")";
-            }
-
-            return ToString(t) + hr + " cycles";
+            if (t > 10 * 1000) { 
+                hr = " (" + ToString(HumanReadableSize(t, ESizeFormat::SF_QUANTITY)) + ")"; 
+            } 
+ 
+            return ToString(t) + hr + " cycles"; 
         }
 
         const ui64 N = GetCycleCount();
@@ -312,7 +312,7 @@ namespace {
     class TCSVReporter: public IReporter {
     public:
         TCSVReporter() {
-            Cout << "Name\tSamples\tIterations\tRun_time\tPer_iteration_sec\tPer_iteration_cycles" << Endl;
+            Cout << "Name\tSamples\tIterations\tRun_time\tPer_iteration_sec\tPer_iteration_cycles" << Endl; 
         }
 
         ~TCSVReporter() override {
@@ -469,7 +469,7 @@ void Out<TResult>(IOutputStream& out, const TResult& r) {
     out << "----------- " << LightRed() << r.TestName << Old() << " ---------------" << Endl
         << " samples:       " << White() << r.Samples << Old() << Endl
         << " iterations:    " << White() << r.Iterations << Old() << Endl
-        << " iterations hr:    " << White() << HumanReadableSize(r.Iterations, SF_QUANTITY) << Old() << Endl
+        << " iterations hr:    " << White() << HumanReadableSize(r.Iterations, SF_QUANTITY) << Old() << Endl 
         << " run time:      " << White() << r.RunTime << Old() << Endl;
 
     if (r.CyclesPerIteration) {
diff --git a/library/cpp/testing/benchmark/examples/main.cpp b/library/cpp/testing/benchmark/examples/main.cpp
index ddd8b05ffc..03cb856b85 100644
--- a/library/cpp/testing/benchmark/examples/main.cpp
+++ b/library/cpp/testing/benchmark/examples/main.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 
 #include <util/generic/xrange.h>
 #include <util/generic/algorithm.h>
diff --git a/library/cpp/testing/benchmark/examples/metrics/main.py b/library/cpp/testing/benchmark/examples/metrics/main.py
index 8f9d9d06ae..11ab1c2cd1 100644
--- a/library/cpp/testing/benchmark/examples/metrics/main.py
+++ b/library/cpp/testing/benchmark/examples/metrics/main.py
@@ -3,5 +3,5 @@ import yatest.common as yc
 
 def test_export_metrics(metrics):
     metrics.set_benchmark(yc.execute_benchmark(
-        'library/cpp/testing/benchmark/examples/examples',
+        'library/cpp/testing/benchmark/examples/examples', 
         threads=8))
diff --git a/library/cpp/testing/benchmark/examples/metrics/ya.make b/library/cpp/testing/benchmark/examples/metrics/ya.make
index a9dbdca9fa..d6767e9c33 100644
--- a/library/cpp/testing/benchmark/examples/metrics/ya.make
+++ b/library/cpp/testing/benchmark/examples/metrics/ya.make
@@ -15,6 +15,6 @@ TAG(
 
 TEST_SRCS(main.py)
 
-DEPENDS(library/cpp/testing/benchmark/examples)
+DEPENDS(library/cpp/testing/benchmark/examples) 
 
 END()
diff --git a/library/cpp/testing/benchmark/main/main.cpp b/library/cpp/testing/benchmark/main/main.cpp
index aabcb89c43..264a1de8e5 100644
--- a/library/cpp/testing/benchmark/main/main.cpp
+++ b/library/cpp/testing/benchmark/main/main.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/benchmark/bench.h>
+#include <library/cpp/testing/benchmark/bench.h> 
 
 #include <util/generic/yexception.h>
 #include <util/stream/output.h>
diff --git a/library/cpp/testing/benchmark/main/ya.make b/library/cpp/testing/benchmark/main/ya.make
index d00cdcf9fc..8ae7e336bd 100644
--- a/library/cpp/testing/benchmark/main/ya.make
+++ b/library/cpp/testing/benchmark/main/ya.make
@@ -10,7 +10,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/testing/benchmark
+    library/cpp/testing/benchmark 
 )
 
 END()
diff --git a/library/cpp/testing/benchmark/ya.make b/library/cpp/testing/benchmark/ya.make
index f42be80698..1a2d32c4cd 100644
--- a/library/cpp/testing/benchmark/ya.make
+++ b/library/cpp/testing/benchmark/ya.make
@@ -13,10 +13,10 @@ SRCS(
 PEERDIR(
     contrib/libs/re2
     library/cpp/colorizer
-    library/cpp/getopt/small
+    library/cpp/getopt/small 
     library/cpp/json
     library/cpp/linear_regression
-    library/cpp/threading/poor_man_openmp
+    library/cpp/threading/poor_man_openmp 
 )
 
 END()
diff --git a/library/cpp/testing/gmock_in_unittest/events.cpp b/library/cpp/testing/gmock_in_unittest/events.cpp
index dbd65b727d..058d4c9087 100644
--- a/library/cpp/testing/gmock_in_unittest/events.cpp
+++ b/library/cpp/testing/gmock_in_unittest/events.cpp
@@ -1,6 +1,6 @@
 #include "events.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/strbuf.h>
 #include <util/generic/string.h>
diff --git a/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp b/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp
index 97f19050e4..9cdebaf928 100644
--- a/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp
+++ b/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/testing/gmock_in_unittest/gmock.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/string.h>
 
diff --git a/library/cpp/testing/gmock_in_unittest/registration.cpp b/library/cpp/testing/gmock_in_unittest/registration.cpp
index c2872a4c27..b2c9ee7812 100644
--- a/library/cpp/testing/gmock_in_unittest/registration.cpp
+++ b/library/cpp/testing/gmock_in_unittest/registration.cpp
@@ -2,7 +2,7 @@
 
 #include <gmock/gmock.h>
 
-#include <library/cpp/testing/unittest/plugin.h>
+#include <library/cpp/testing/unittest/plugin.h> 
 
 namespace {
     class TGMockUnittestPlugin: public NUnitTest::NPlugin::IPlugin {
diff --git a/library/cpp/testing/gmock_in_unittest/ya.make b/library/cpp/testing/gmock_in_unittest/ya.make
index 5de68ad98d..e7fb9fc7df 100644
--- a/library/cpp/testing/gmock_in_unittest/ya.make
+++ b/library/cpp/testing/gmock_in_unittest/ya.make
@@ -6,7 +6,7 @@ PEERDIR(
     contrib/restricted/googletest/googlemock
     contrib/restricted/googletest/googletest
     library/cpp/testing/gtest_extensions
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
 )
 
 SRCS(
diff --git a/library/cpp/testing/unittest/example_ut.cpp b/library/cpp/testing/unittest/example_ut.cpp
index bcc1ce33f0..7dd238e1a0 100644
--- a/library/cpp/testing/unittest/example_ut.cpp
+++ b/library/cpp/testing/unittest/example_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 /*
  * just copy-paste it for good start point
diff --git a/library/cpp/testing/unittest/fat/test_port_manager.cpp b/library/cpp/testing/unittest/fat/test_port_manager.cpp
index f77d2e3a25..b8fa5ab39d 100644
--- a/library/cpp/testing/unittest/fat/test_port_manager.cpp
+++ b/library/cpp/testing/unittest/fat/test_port_manager.cpp
@@ -1,5 +1,5 @@
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 bool IsFreePort(ui16 port) {
     TInet6StreamSocket sock;
diff --git a/library/cpp/testing/unittest/registar.cpp b/library/cpp/testing/unittest/registar.cpp
index 3679b768ed..3bd65ef2e1 100644
--- a/library/cpp/testing/unittest/registar.cpp
+++ b/library/cpp/testing/unittest/registar.cpp
@@ -1,6 +1,6 @@
 #include "registar.h"
 
-#include <library/cpp/diff/diff.h>
+#include <library/cpp/diff/diff.h> 
 #include <library/cpp/colorizer/colors.h>
 
 #include <util/generic/bt_exception.h>
diff --git a/library/cpp/testing/unittest/registar.h b/library/cpp/testing/unittest/registar.h
index 44517a0092..6bcaf3c909 100644
--- a/library/cpp/testing/unittest/registar.h
+++ b/library/cpp/testing/unittest/registar.h
@@ -46,7 +46,7 @@ namespace NUnitTest {
     TString GetResetTag();
 
     // Raise error handler
-    // Used for testing library/cpp/testing/unittest macroses
+    // Used for testing library/cpp/testing/unittest macroses 
     // and unittest helpers.
     // For all other unittests standard handler is used
     using TRaiseErrorHandler = std::function<void(const char*, const TString&, bool)>;
diff --git a/library/cpp/testing/unittest/registar_ut.cpp b/library/cpp/testing/unittest/registar_ut.cpp
index 1f36d53abb..7d42768383 100644
--- a/library/cpp/testing/unittest/registar_ut.cpp
+++ b/library/cpp/testing/unittest/registar_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TUnitTestMacroTest) {
     Y_UNIT_TEST(Assert) {
diff --git a/library/cpp/testing/unittest/ut/main.cpp b/library/cpp/testing/unittest/ut/main.cpp
index e303e21e30..02d979560d 100644
--- a/library/cpp/testing/unittest/ut/main.cpp
+++ b/library/cpp/testing/unittest/ut/main.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/testing/unittest/gtest.h>
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/gtest.h> 
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/generic/set.h>
 #include <util/network/sock.h>
diff --git a/library/cpp/testing/unittest/ut/ya.make b/library/cpp/testing/unittest/ut/ya.make
index 6d4c0959cc..318d3e5980 100644
--- a/library/cpp/testing/unittest/ut/ya.make
+++ b/library/cpp/testing/unittest/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/testing/unittest)
+UNITTEST_FOR(library/cpp/testing/unittest) 
 
 OWNER(snowball)
 
diff --git a/library/cpp/testing/unittest/utmain.cpp b/library/cpp/testing/unittest/utmain.cpp
index 305bc6b40f..fcc2bd2632 100644
--- a/library/cpp/testing/unittest/utmain.cpp
+++ b/library/cpp/testing/unittest/utmain.cpp
@@ -612,7 +612,7 @@ static int DoUsage(const char* progname) {
          << "Options:\n"
          << "  -h, --help            print this help message\n"
          << "  -l, --list            print a list of available tests\n"
-         << "  -A --list-verbose        print a list of available subtests\n"
+         << "  -A --list-verbose        print a list of available subtests\n" 
          << "  --print-before-test   print each test name before running it\n"
          << "  --print-before-suite  print each test suite name before running it\n"
          << "  --show-fails          print a list of all failed tests at the end\n"
@@ -683,7 +683,7 @@ int NUnitTest::RunMain(int argc, char** argv) {
                     return DoUsage(argv[0]);
                 } else if (strcmp(name, "--list") == 0 || strcmp(name, "-l") == 0) {
                     listTests = LIST;
-                } else if (strcmp(name, "--list-verbose") == 0 || strcmp(name, "-A") == 0) {
+                } else if (strcmp(name, "--list-verbose") == 0 || strcmp(name, "-A") == 0) { 
                     listTests = LIST_VERBOSE;
                 } else if (strcmp(name, "--print-before-suite=false") == 0) {
                     processor.SetPrintBeforeSuite(false);
diff --git a/library/cpp/testing/unittest/ya.make b/library/cpp/testing/unittest/ya.make
index aaa4f2ba85..d247605826 100644
--- a/library/cpp/testing/unittest/ya.make
+++ b/library/cpp/testing/unittest/ya.make
@@ -10,7 +10,7 @@ OWNER(
 PEERDIR(
     library/cpp/colorizer
     library/cpp/dbg_output
-    library/cpp/diff
+    library/cpp/diff 
     library/cpp/json/writer
     library/cpp/testing/common
     library/cpp/testing/hook
diff --git a/library/cpp/testing/unittest_main/main.cpp b/library/cpp/testing/unittest_main/main.cpp
index fc5d2d9418..984203e304 100644
--- a/library/cpp/testing/unittest_main/main.cpp
+++ b/library/cpp/testing/unittest_main/main.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/utmain.h>
+#include <library/cpp/testing/unittest/utmain.h> 
 
 int main(int argc, char** argv) {
     return NUnitTest::RunMain(argc, argv);
diff --git a/library/cpp/testing/unittest_main/ya.make b/library/cpp/testing/unittest_main/ya.make
index 80a6cc699b..eb6df9dbaa 100644
--- a/library/cpp/testing/unittest_main/ya.make
+++ b/library/cpp/testing/unittest_main/ya.make
@@ -3,8 +3,8 @@ LIBRARY()
 OWNER(pg)
 
 PEERDIR(
-    library/cpp/testing/unittest
-    library/cpp/terminate_handler
+    library/cpp/testing/unittest 
+    library/cpp/terminate_handler 
 )
 
 SRCS(
diff --git a/library/cpp/testing/ya.make b/library/cpp/testing/ya.make
index 6a57ac2ee6..96426b026a 100644
--- a/library/cpp/testing/ya.make
+++ b/library/cpp/testing/ya.make
@@ -1,9 +1,9 @@
 RECURSE(
     common
-    benchmark
-    benchmark/examples
-    benchmark/examples/metrics
-    benchmark/main
+    benchmark 
+    benchmark/examples 
+    benchmark/examples/metrics 
+    benchmark/main 
     boost_test
     boost_test_main
     dump_clang_coverage
@@ -18,7 +18,7 @@ RECURSE(
     gtest_protobuf
     hook
     mock_server
-    unittest
-    unittest_main
+    unittest 
+    unittest_main 
     urlnorm
 )
diff --git a/library/cpp/threading/atomic/bool_ut.cpp b/library/cpp/threading/atomic/bool_ut.cpp
index 9481f41d8d..08286d20a4 100644
--- a/library/cpp/threading/atomic/bool_ut.cpp
+++ b/library/cpp/threading/atomic/bool_ut.cpp
@@ -1,6 +1,6 @@
 #include "bool.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(AtomicBool) {
     Y_UNIT_TEST(ReadWrite) {
diff --git a/library/cpp/threading/atomic/ut/ya.make b/library/cpp/threading/atomic/ut/ya.make
index 3c555685df..65a9a3fb8c 100644
--- a/library/cpp/threading/atomic/ut/ya.make
+++ b/library/cpp/threading/atomic/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/threading/atomic)
+UNITTEST_FOR(library/cpp/threading/atomic) 
 
 OWNER(vmordovin)
 
diff --git a/library/cpp/threading/chunk_queue/queue.h b/library/cpp/threading/chunk_queue/queue.h
index 55859601a1..3e0a401b5f 100644
--- a/library/cpp/threading/chunk_queue/queue.h
+++ b/library/cpp/threading/chunk_queue/queue.h
@@ -534,7 +534,7 @@ namespace NThreading {
 
         void Enqueue(TAutoPtr<T> value) {
             Impl.Enqueue(value.Get());
-            Y_UNUSED(value.Release());
+            Y_UNUSED(value.Release()); 
         }
 
         bool Dequeue(TAutoPtr<T>& value) {
diff --git a/library/cpp/threading/chunk_queue/queue_ut.cpp b/library/cpp/threading/chunk_queue/queue_ut.cpp
index 8cb36d8dd1..a0ed159b89 100644
--- a/library/cpp/threading/chunk_queue/queue_ut.cpp
+++ b/library/cpp/threading/chunk_queue/queue_ut.cpp
@@ -1,6 +1,6 @@
 #include "queue.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/set.h>
 
diff --git a/library/cpp/threading/chunk_queue/ut/ya.make b/library/cpp/threading/chunk_queue/ut/ya.make
index a35ed6bc4b..7c6ffa5ef9 100644
--- a/library/cpp/threading/chunk_queue/ut/ya.make
+++ b/library/cpp/threading/chunk_queue/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/threading/chunk_queue)
+UNITTEST_FOR(library/cpp/threading/chunk_queue) 
 
 OWNER(g:rtmr)
 
diff --git a/library/cpp/threading/equeue/equeue.cpp b/library/cpp/threading/equeue/equeue.cpp
index 54a848e912..7bdc1d0dda 100644
--- a/library/cpp/threading/equeue/equeue.cpp
+++ b/library/cpp/threading/equeue/equeue.cpp
@@ -59,7 +59,7 @@ bool TElasticQueue::Add(IObjectInQueue* obj) {
     }
 
     if (SlaveQueue_->Add(wrapper.Get())) {
-        Y_UNUSED(wrapper.Release());
+        Y_UNUSED(wrapper.Release()); 
         return true;
     } else {
         return false;
diff --git a/library/cpp/threading/equeue/equeue_ut.cpp b/library/cpp/threading/equeue/equeue_ut.cpp
index 9cf2aced44..abedda6497 100644
--- a/library/cpp/threading/equeue/equeue_ut.cpp
+++ b/library/cpp/threading/equeue/equeue_ut.cpp
@@ -1,6 +1,6 @@
 #include "equeue.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/event.h>
 #include <util/datetime/base.h>
diff --git a/library/cpp/threading/equeue/ut/ya.make b/library/cpp/threading/equeue/ut/ya.make
index 2f6293d47d..d0cfaeae92 100644
--- a/library/cpp/threading/equeue/ut/ya.make
+++ b/library/cpp/threading/equeue/ut/ya.make
@@ -6,10 +6,10 @@ OWNER(
 )
 
 PEERDIR(
-    ADDINCL library/cpp/threading/equeue
+    ADDINCL library/cpp/threading/equeue 
 )
 
-SRCDIR(library/cpp/threading/equeue)
+SRCDIR(library/cpp/threading/equeue) 
 
 SRCS(
     equeue_ut.cpp
diff --git a/library/cpp/threading/future/async_ut.cpp b/library/cpp/threading/future/async_ut.cpp
index a3699744e4..855fab8d0f 100644
--- a/library/cpp/threading/future/async_ut.cpp
+++ b/library/cpp/threading/future/async_ut.cpp
@@ -1,6 +1,6 @@
 #include "async.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/ptr.h>
 #include <util/generic/vector.h>
diff --git a/library/cpp/threading/future/core/future-inl.h b/library/cpp/threading/future/core/future-inl.h
index 5fd4296a93..6703645ca9 100644
--- a/library/cpp/threading/future/core/future-inl.h
+++ b/library/cpp/threading/future/core/future-inl.h
@@ -691,7 +691,7 @@ namespace NThreading {
         EnsureInitialized();
         return State->Wait();
     }
-
+ 
     inline bool TFuture<void>::Wait(TDuration timeout) const {
         EnsureInitialized();
         return State->Wait(timeout);
diff --git a/library/cpp/threading/future/core/future.h b/library/cpp/threading/future/core/future.h
index 2e82bb953e..18f55aba69 100644
--- a/library/cpp/threading/future/core/future.h
+++ b/library/cpp/threading/future/core/future.h
@@ -74,8 +74,8 @@ namespace NThreading {
         TIntrusivePtr<TFutureState> State;
 
     public:
-        using value_type = T;
-
+        using value_type = T; 
+ 
         TFuture() noexcept = default;
         TFuture(const TFuture<T>& other) noexcept = default;
         TFuture(TFuture<T>&& other) noexcept = default;
@@ -131,8 +131,8 @@ namespace NThreading {
         TIntrusivePtr<TFutureState> State = nullptr;
 
     public:
-        using value_type = void;
-
+        using value_type = void; 
+ 
         TFuture() noexcept = default;
         TFuture(const TFuture<void>& other) noexcept = default;
         TFuture(TFuture<void>&& other) noexcept = default;
@@ -169,9 +169,9 @@ namespace NThreading {
         template <typename R>
         TFuture<R> Return(const R& value) const;
 
-        TFuture<void> IgnoreResult() const {
-            return *this;
-        }
+        TFuture<void> IgnoreResult() const { 
+            return *this; 
+        } 
 
         //! If the future is initialized returns the future state identifier. Otherwise returns an empty optional
         /** The state identifier is guaranteed to be unique during the future state lifetime and could be reused after its death
diff --git a/library/cpp/threading/future/future_ut.cpp b/library/cpp/threading/future/future_ut.cpp
index 05950a568d..2068337f4e 100644
--- a/library/cpp/threading/future/future_ut.cpp
+++ b/library/cpp/threading/future/future_ut.cpp
@@ -1,6 +1,6 @@
 #include "future.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <list>
 #include <type_traits>
@@ -293,23 +293,23 @@ namespace {
         }
 
         Y_UNIT_TEST(ShouldWaitExceptionOrAllVectorWithValueType) {
-            TPromise<int> promise1 = NewPromise<int>();
-            TPromise<int> promise2 = NewPromise<int>();
-
-            TVector<TFuture<int>> promises;
-            promises.push_back(promise1);
-            promises.push_back(promise2);
-
+            TPromise<int> promise1 = NewPromise<int>(); 
+            TPromise<int> promise2 = NewPromise<int>(); 
+ 
+            TVector<TFuture<int>> promises; 
+            promises.push_back(promise1); 
+            promises.push_back(promise2); 
+ 
             TFuture<void> future = WaitExceptionOrAll(promises);
-            UNIT_ASSERT(!future.HasValue());
-
-            promise1.SetValue(0);
-            UNIT_ASSERT(!future.HasValue());
-
-            promise2.SetValue(0);
-            UNIT_ASSERT(future.HasValue());
-        }
-
+            UNIT_ASSERT(!future.HasValue()); 
+ 
+            promise1.SetValue(0); 
+            UNIT_ASSERT(!future.HasValue()); 
+ 
+            promise2.SetValue(0); 
+            UNIT_ASSERT(future.HasValue()); 
+        } 
+ 
         Y_UNIT_TEST(ShouldWaitExceptionOrAllList) {
             TPromise<void> promise1 = NewPromise();
             TPromise<void> promise2 = NewPromise();
@@ -353,25 +353,25 @@ namespace {
             UNIT_ASSERT(future.HasValue());
         }
 
-
-        Y_UNIT_TEST(ShouldWaitAnyVectorWithValueType) {
-            TPromise<int> promise1 = NewPromise<int>();
-            TPromise<int> promise2 = NewPromise<int>();
-
-            TVector<TFuture<int>> promises;
-            promises.push_back(promise1);
-            promises.push_back(promise2);
-
-            TFuture<void> future = WaitAny(promises);
-            UNIT_ASSERT(!future.HasValue());
-
-            promise1.SetValue(0);
-            UNIT_ASSERT(future.HasValue());
-
-            promise2.SetValue(0);
-            UNIT_ASSERT(future.HasValue());
-        }
-
+ 
+        Y_UNIT_TEST(ShouldWaitAnyVectorWithValueType) { 
+            TPromise<int> promise1 = NewPromise<int>(); 
+            TPromise<int> promise2 = NewPromise<int>(); 
+ 
+            TVector<TFuture<int>> promises; 
+            promises.push_back(promise1); 
+            promises.push_back(promise2); 
+ 
+            TFuture<void> future = WaitAny(promises); 
+            UNIT_ASSERT(!future.HasValue()); 
+ 
+            promise1.SetValue(0); 
+            UNIT_ASSERT(future.HasValue()); 
+ 
+            promise2.SetValue(0); 
+            UNIT_ASSERT(future.HasValue()); 
+        } 
+ 
         Y_UNIT_TEST(ShouldWaitAnyList) {
             TPromise<void> promise1 = NewPromise();
             TPromise<void> promise2 = NewPromise();
diff --git a/library/cpp/threading/future/legacy_future_ut.cpp b/library/cpp/threading/future/legacy_future_ut.cpp
index ff63db1725..3bf8257387 100644
--- a/library/cpp/threading/future/legacy_future_ut.cpp
+++ b/library/cpp/threading/future/legacy_future_ut.cpp
@@ -1,6 +1,6 @@
 #include "legacy_future.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace NThreading {
     Y_UNIT_TEST_SUITE(TLegacyFutureTest) {
diff --git a/library/cpp/threading/future/perf/main.cpp b/library/cpp/threading/future/perf/main.cpp
index 5a0690af47..3d362cd322 100644
--- a/library/cpp/threading/future/perf/main.cpp
+++ b/library/cpp/threading/future/perf/main.cpp
@@ -1,5 +1,5 @@
-#include <library/cpp/testing/benchmark/bench.h>
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/testing/benchmark/bench.h> 
+#include <library/cpp/threading/future/future.h> 
 
 #include <util/generic/string.h>
 #include <util/generic/xrange.h>
diff --git a/library/cpp/threading/future/perf/ya.make b/library/cpp/threading/future/perf/ya.make
index 943d585d4b..286a8a97bb 100644
--- a/library/cpp/threading/future/perf/ya.make
+++ b/library/cpp/threading/future/perf/ya.make
@@ -10,7 +10,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/threading/future
+    library/cpp/threading/future 
 )
 
 END()
diff --git a/library/cpp/threading/future/subscription/subscription_ut.cpp b/library/cpp/threading/future/subscription/subscription_ut.cpp
index d018ea15cc..a33f54adf2 100644
--- a/library/cpp/threading/future/subscription/subscription_ut.cpp
+++ b/library/cpp/threading/future/subscription/subscription_ut.cpp
@@ -1,6 +1,6 @@
 #include "subscription.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NThreading;
 
diff --git a/library/cpp/threading/future/subscription/wait_all_or_exception_ut.cpp b/library/cpp/threading/future/subscription/wait_all_or_exception_ut.cpp
index 34ae9edb4e..5d4794cd3c 100644
--- a/library/cpp/threading/future/subscription/wait_all_or_exception_ut.cpp
+++ b/library/cpp/threading/future/subscription/wait_all_or_exception_ut.cpp
@@ -1,7 +1,7 @@
 #include "wait_all_or_exception.h"
 #include "wait_ut_common.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/generic/strbuf.h>
 
 #include <atomic>
diff --git a/library/cpp/threading/future/subscription/wait_all_ut.cpp b/library/cpp/threading/future/subscription/wait_all_ut.cpp
index 3bc9762671..aee11c315e 100644
--- a/library/cpp/threading/future/subscription/wait_all_ut.cpp
+++ b/library/cpp/threading/future/subscription/wait_all_ut.cpp
@@ -1,7 +1,7 @@
 #include "wait_all.h"
 #include "wait_ut_common.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/generic/strbuf.h>
 
 #include <atomic>
diff --git a/library/cpp/threading/future/subscription/wait_any_ut.cpp b/library/cpp/threading/future/subscription/wait_any_ut.cpp
index 262080e8d1..42902832ed 100644
--- a/library/cpp/threading/future/subscription/wait_any_ut.cpp
+++ b/library/cpp/threading/future/subscription/wait_any_ut.cpp
@@ -1,7 +1,7 @@
 #include "wait_any.h"
 #include "wait_ut_common.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/generic/strbuf.h>
 
 #include <exception>
diff --git a/library/cpp/threading/future/subscription/wait_ut_common.h b/library/cpp/threading/future/subscription/wait_ut_common.h
index 99530dd1f6..693a153924 100644
--- a/library/cpp/threading/future/subscription/wait_ut_common.h
+++ b/library/cpp/threading/future/subscription/wait_ut_common.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <library/cpp/threading/future/future.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/vector.h>
 
diff --git a/library/cpp/threading/future/ut/ya.make b/library/cpp/threading/future/ut/ya.make
index 566b622370..704c0c5eb1 100644
--- a/library/cpp/threading/future/ut/ya.make
+++ b/library/cpp/threading/future/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/threading/future)
+UNITTEST_FOR(library/cpp/threading/future) 
 
 OWNER(
     g:rtmr
diff --git a/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp b/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp
index c3027ea544..bec9b65d82 100644
--- a/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp
+++ b/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/threading/light_rw_lock/lightrwlock.h>
+#include <library/cpp/threading/light_rw_lock/lightrwlock.h> 
 #include <util/random/random.h>
 
 #ifdef _linux_
diff --git a/library/cpp/threading/light_rw_lock/bench/ya.make b/library/cpp/threading/light_rw_lock/bench/ya.make
index 7969b52a50..708d20e998 100644
--- a/library/cpp/threading/light_rw_lock/bench/ya.make
+++ b/library/cpp/threading/light_rw_lock/bench/ya.make
@@ -7,7 +7,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/threading/light_rw_lock
+    library/cpp/threading/light_rw_lock 
 )
 
 END()
diff --git a/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp b/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp
index e82063d959..87916f77e2 100644
--- a/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp
+++ b/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp
@@ -1,5 +1,5 @@
-#include <library/cpp/threading/light_rw_lock/lightrwlock.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/threading/light_rw_lock/lightrwlock.h> 
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/random/random.h>
 #include <util/system/atomic.h>
 #include <util/thread/pool.h>
diff --git a/library/cpp/threading/light_rw_lock/ut/ya.make b/library/cpp/threading/light_rw_lock/ut/ya.make
index 92928b837c..ce783f6616 100644
--- a/library/cpp/threading/light_rw_lock/ut/ya.make
+++ b/library/cpp/threading/light_rw_lock/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/threading/light_rw_lock)
+UNITTEST_FOR(library/cpp/threading/light_rw_lock) 
 
 OWNER(agri)
 
diff --git a/library/cpp/threading/local_executor/local_executor.cpp b/library/cpp/threading/local_executor/local_executor.cpp
index 1d3fbb4bf4..cda9aaaa4f 100644
--- a/library/cpp/threading/local_executor/local_executor.cpp
+++ b/library/cpp/threading/local_executor/local_executor.cpp
@@ -1,6 +1,6 @@
 #include "local_executor.h"
 
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/future/future.h> 
 
 #include <util/generic/utility.h>
 #include <util/system/atomic.h>
diff --git a/library/cpp/threading/local_executor/local_executor.h b/library/cpp/threading/local_executor/local_executor.h
index c1c824f67c..d0c622f4ef 100644
--- a/library/cpp/threading/local_executor/local_executor.h
+++ b/library/cpp/threading/local_executor/local_executor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/future/future.h> 
 
 #include <util/generic/cast.h>
 #include <util/generic/fwd.h>
diff --git a/library/cpp/threading/local_executor/ut/local_executor_ut.cpp b/library/cpp/threading/local_executor/ut/local_executor_ut.cpp
index ac5737717c..81f37d80ba 100644
--- a/library/cpp/threading/local_executor/ut/local_executor_ut.cpp
+++ b/library/cpp/threading/local_executor/ut/local_executor_ut.cpp
@@ -1,7 +1,7 @@
-#include <library/cpp/threading/local_executor/local_executor.h>
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/local_executor/local_executor.h> 
+#include <library/cpp/threading/future/future.h> 
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/system/mutex.h>
 #include <util/system/rwlock.h>
 #include <util/generic/algorithm.h>
diff --git a/library/cpp/threading/local_executor/ut/ya.make b/library/cpp/threading/local_executor/ut/ya.make
index be579a5ca0..8490246645 100644
--- a/library/cpp/threading/local_executor/ut/ya.make
+++ b/library/cpp/threading/local_executor/ut/ya.make
@@ -3,7 +3,7 @@ OWNER(
     gulin
 )
 
-UNITTEST_FOR(library/cpp/threading/local_executor)
+UNITTEST_FOR(library/cpp/threading/local_executor) 
 
 SRCS(
     local_executor_ut.cpp
diff --git a/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp b/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp
index 7417636864..8346c26894 100644
--- a/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp
+++ b/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp
@@ -1,6 +1,6 @@
 #include "thread_helper.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/string.h>
 #include <util/generic/yexception.h>
diff --git a/library/cpp/threading/poor_man_openmp/ut/ya.make b/library/cpp/threading/poor_man_openmp/ut/ya.make
index 6d7aa123ed..ef333ab91e 100644
--- a/library/cpp/threading/poor_man_openmp/ut/ya.make
+++ b/library/cpp/threading/poor_man_openmp/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/threading/poor_man_openmp)
+UNITTEST_FOR(library/cpp/threading/poor_man_openmp) 
 
 OWNER(
     pg
diff --git a/library/cpp/threading/queue/basic_ut.cpp b/library/cpp/threading/queue/basic_ut.cpp
index 5f56f8583e..e2a240920b 100644
--- a/library/cpp/threading/queue/basic_ut.cpp
+++ b/library/cpp/threading/queue/basic_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/generic/vector.h>
 #include <util/system/thread.h>
 
diff --git a/library/cpp/threading/queue/queue_ut.cpp b/library/cpp/threading/queue/queue_ut.cpp
index 80eca147da..1a48e1ca00 100644
--- a/library/cpp/threading/queue/queue_ut.cpp
+++ b/library/cpp/threading/queue/queue_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/system/thread.h>
 
 #include "ut_helpers.h"
diff --git a/library/cpp/threading/queue/tune_ut.cpp b/library/cpp/threading/queue/tune_ut.cpp
index 7e980d3e27..84e81006aa 100644
--- a/library/cpp/threading/queue/tune_ut.cpp
+++ b/library/cpp/threading/queue/tune_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include "tune.h"
 
 struct TDefaultStructA {
diff --git a/library/cpp/threading/queue/unordered_ut.cpp b/library/cpp/threading/queue/unordered_ut.cpp
index a43b7f520e..fd5108a01a 100644
--- a/library/cpp/threading/queue/unordered_ut.cpp
+++ b/library/cpp/threading/queue/unordered_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/system/thread.h>
 #include <algorithm>
 #include <util/generic/vector.h>
diff --git a/library/cpp/threading/queue/ut/ya.make b/library/cpp/threading/queue/ut/ya.make
index 8883d9bf69..647ebc0551 100644
--- a/library/cpp/threading/queue/ut/ya.make
+++ b/library/cpp/threading/queue/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/threading/queue)
+UNITTEST_FOR(library/cpp/threading/queue) 
 
 OWNER(agri)
 
diff --git a/library/cpp/threading/skip_list/perf/main.cpp b/library/cpp/threading/skip_list/perf/main.cpp
index 4ad52049e7..a74ffe2a04 100644
--- a/library/cpp/threading/skip_list/perf/main.cpp
+++ b/library/cpp/threading/skip_list/perf/main.cpp
@@ -1,6 +1,6 @@
-#include <library/cpp/threading/skip_list/skiplist.h>
+#include <library/cpp/threading/skip_list/skiplist.h> 
 
-#include <library/cpp/getopt/small/last_getopt.h>
+#include <library/cpp/getopt/small/last_getopt.h> 
 
 #include <library/cpp/charset/ci_string.h>
 #include <util/datetime/base.h>
diff --git a/library/cpp/threading/skip_list/perf/ya.make b/library/cpp/threading/skip_list/perf/ya.make
index 01bfafa404..b0df32d076 100644
--- a/library/cpp/threading/skip_list/perf/ya.make
+++ b/library/cpp/threading/skip_list/perf/ya.make
@@ -4,8 +4,8 @@ OWNER(g:rtmr)
 
 PEERDIR(
     library/cpp/charset
-    library/cpp/getopt/small
-    library/cpp/threading/skip_list
+    library/cpp/getopt/small 
+    library/cpp/threading/skip_list 
 )
 
 SRCS(
diff --git a/library/cpp/threading/skip_list/skiplist_ut.cpp b/library/cpp/threading/skip_list/skiplist_ut.cpp
index 52fcffda66..eff3d92663 100644
--- a/library/cpp/threading/skip_list/skiplist_ut.cpp
+++ b/library/cpp/threading/skip_list/skiplist_ut.cpp
@@ -1,6 +1,6 @@
 #include "skiplist.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace NThreading {
     namespace {
diff --git a/library/cpp/threading/skip_list/ut/ya.make b/library/cpp/threading/skip_list/ut/ya.make
index 704a31e9a2..afe88a54ca 100644
--- a/library/cpp/threading/skip_list/ut/ya.make
+++ b/library/cpp/threading/skip_list/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/threading/skip_list)
+UNITTEST_FOR(library/cpp/threading/skip_list) 
 
 OWNER(g:rtmr)
 
diff --git a/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp b/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp
index 3b5203194a..6a5d72aa8c 100644
--- a/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp
+++ b/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/output.h>
 #include <util/system/atomic.h>
diff --git a/library/cpp/threading/task_scheduler/ut/ya.make b/library/cpp/threading/task_scheduler/ut/ya.make
index 07ee8b0877..35e32d25cd 100644
--- a/library/cpp/threading/task_scheduler/ut/ya.make
+++ b/library/cpp/threading/task_scheduler/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/threading/task_scheduler)
+UNITTEST_FOR(library/cpp/threading/task_scheduler) 
 
 OWNER(g:middle)
 
diff --git a/library/cpp/threading/ya.make b/library/cpp/threading/ya.make
index f4d850ee17..77ac7e4273 100644
--- a/library/cpp/threading/ya.make
+++ b/library/cpp/threading/ya.make
@@ -1,64 +1,64 @@
 RECURSE(
-    algorithm
-    async_task_batch
-    async_task_batch/ut
-    atomic
-    atomic/ut
-    atomic_shared_ptr
-    atomic_shared_ptr/ut
-    blocking_counter
-    blocking_counter/ut
-    blocking_queue
+    algorithm 
+    async_task_batch 
+    async_task_batch/ut 
+    atomic 
+    atomic/ut 
+    atomic_shared_ptr 
+    atomic_shared_ptr/ut 
+    blocking_counter 
+    blocking_counter/ut 
+    blocking_queue 
     cancellation
-    chunk_queue
-    chunk_queue/ut
-    cron
-    cron/example
-    equeue
-    equeue/ut
-    fair_lock
-    fair_lock/ut
-    future
-    future/perf
+    chunk_queue 
+    chunk_queue/ut 
+    cron 
+    cron/example 
+    equeue 
+    equeue/ut 
+    fair_lock 
+    fair_lock/ut 
+    future 
+    future/perf 
     future/subscription
-    future/ut
-    hot_swap
-    hot_swap/ut
-    light_rw_lock
-    light_rw_lock/bench
-    light_rw_lock/ut
-    local_executor
-    local_executor/ut
-    mtp_tasks
-    mtp_tasks/ut
-    mux_event
-    mux_event/ut
-    named_lock
-    named_lock/ut
-    name_guard
-    name_guard/ut
-    periodically_updated
-    poor_man_openmp
-    poor_man_openmp/ut
-    queue
-    queue/ut
-    rcu
-    rcu/ut
-    serial_postprocess_queue
-    skip_list
-    skip_list/perf
-    skip_list/ut
-    synchronized
-    synchronized/ut
-    task_scheduler
-    task_scheduler/ut
-    thread_local
-    thread_local/benchmark
-    thread_local/ut
-    thread_namer
-    thread_namer/ut
-    ticket_lock
-    ticket_lock/ut
-    work_stealing
-    work_stealing/ut
+    future/ut 
+    hot_swap 
+    hot_swap/ut 
+    light_rw_lock 
+    light_rw_lock/bench 
+    light_rw_lock/ut 
+    local_executor 
+    local_executor/ut 
+    mtp_tasks 
+    mtp_tasks/ut 
+    mux_event 
+    mux_event/ut 
+    named_lock 
+    named_lock/ut 
+    name_guard 
+    name_guard/ut 
+    periodically_updated 
+    poor_man_openmp 
+    poor_man_openmp/ut 
+    queue 
+    queue/ut 
+    rcu 
+    rcu/ut 
+    serial_postprocess_queue 
+    skip_list 
+    skip_list/perf 
+    skip_list/ut 
+    synchronized 
+    synchronized/ut 
+    task_scheduler 
+    task_scheduler/ut 
+    thread_local 
+    thread_local/benchmark 
+    thread_local/ut 
+    thread_namer 
+    thread_namer/ut 
+    ticket_lock 
+    ticket_lock/ut 
+    work_stealing 
+    work_stealing/ut 
 )
diff --git a/library/cpp/timezone_conversion/ut/civil_ut.cpp b/library/cpp/timezone_conversion/ut/civil_ut.cpp
index a21bd4bd7d..7232606fef 100644
--- a/library/cpp/timezone_conversion/ut/civil_ut.cpp
+++ b/library/cpp/timezone_conversion/ut/civil_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/timezone_conversion/civil.h>
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/stream/str.h>
 
diff --git a/library/cpp/timezone_conversion/ut/convert_ut.cpp b/library/cpp/timezone_conversion/ut/convert_ut.cpp
index bbf9e9b826..5b0adad4bb 100644
--- a/library/cpp/timezone_conversion/ut/convert_ut.cpp
+++ b/library/cpp/timezone_conversion/ut/convert_ut.cpp
@@ -1,5 +1,5 @@
 #include <library/cpp/timezone_conversion/convert.h>
-#include <library/cpp/testing/unittest/gtest.h>
+#include <library/cpp/testing/unittest/gtest.h> 
 
 using namespace NDatetime;
 
diff --git a/library/cpp/timezone_conversion/ut/ya.make b/library/cpp/timezone_conversion/ut/ya.make
index 781a57da9f..782288043d 100644
--- a/library/cpp/timezone_conversion/ut/ya.make
+++ b/library/cpp/timezone_conversion/ut/ya.make
@@ -3,7 +3,7 @@ UNITTEST()
 OWNER(dfyz)
 
 PEERDIR(
-    library/cpp/testing/unittest
+    library/cpp/testing/unittest 
     library/cpp/timezone_conversion
 )
 
diff --git a/library/cpp/tld/tld.h b/library/cpp/tld/tld.h
index 9e241de090..3478c15673 100644
--- a/library/cpp/tld/tld.h
+++ b/library/cpp/tld/tld.h
@@ -6,7 +6,7 @@ namespace NTld {
     const char* const* GetTlds();
 
     // Note that FindTld() returns empty string when @host is single domain label (without '.').
-    // If you need whole @host for such case, you can use GetZone() from library/cpp/string_utils/url/url.h
+    // If you need whole @host for such case, you can use GetZone() from library/cpp/string_utils/url/url.h 
     inline TStringBuf FindTld(const TStringBuf& host) {
         size_t p = host.rfind('.');
         return p != TStringBuf::npos ? host.SubStr(p + 1) : TStringBuf();
diff --git a/library/cpp/tld/tld_ut.cpp b/library/cpp/tld/tld_ut.cpp
index 733200f2b5..7c571e516b 100644
--- a/library/cpp/tld/tld_ut.cpp
+++ b/library/cpp/tld/tld_ut.cpp
@@ -1,6 +1,6 @@
 #include "tld.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <library/cpp/charset/doccodes.h>
 
diff --git a/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/service.cpp b/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/service.cpp
index 075bf0bded..4abaf0495a 100644
--- a/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/service.cpp
+++ b/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/service.cpp
@@ -2,7 +2,7 @@
 
 #include <library/cpp/tvmauth/client/facade.h>
 
-#include <library/cpp/cgiparam/cgiparam.h>
+#include <library/cpp/cgiparam/cgiparam.h> 
 #include <library/cpp/http/server/response.h>
 #include <library/cpp/http/simple/http_client.h>
 #include <library/cpp/json/json_reader.h>
diff --git a/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/ya.make b/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/ya.make
index dde9e7a00d..c492175667 100644
--- a/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/ya.make
+++ b/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/ya.make
@@ -3,7 +3,7 @@ LIBRARY()
 OWNER(g:passport_infra)
 
 PEERDIR(
-    library/cpp/cgiparam
+    library/cpp/cgiparam 
     library/cpp/http/simple
     library/cpp/tvmauth/client
 )
diff --git a/library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h b/library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h
index 58ed953b63..0af3133a71 100644
--- a/library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h
+++ b/library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h
@@ -2,7 +2,7 @@
 
 #include <library/cpp/tvmauth/client/misc/api/threaded_updater.h>
 
-#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/future/future.h> 
 
 #include <util/generic/map.h>
 #include <util/thread/lfqueue.h>
diff --git a/library/cpp/tvmauth/client/misc/api/dynamic_dst/ut/tvm_client_ut.cpp b/library/cpp/tvmauth/client/misc/api/dynamic_dst/ut/tvm_client_ut.cpp
index 89403c15e4..83e65ebf15 100644
--- a/library/cpp/tvmauth/client/misc/api/dynamic_dst/ut/tvm_client_ut.cpp
+++ b/library/cpp/tvmauth/client/misc/api/dynamic_dst/ut/tvm_client_ut.cpp
@@ -4,7 +4,7 @@
 
 #include <library/cpp/tvmauth/unittest.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/stream/file.h>
 #include <util/system/fs.h>
diff --git a/library/cpp/tvmauth/client/misc/api/dynamic_dst/ya.make b/library/cpp/tvmauth/client/misc/api/dynamic_dst/ya.make
index f3858e602f..77426cb364 100644
--- a/library/cpp/tvmauth/client/misc/api/dynamic_dst/ya.make
+++ b/library/cpp/tvmauth/client/misc/api/dynamic_dst/ya.make
@@ -3,7 +3,7 @@ LIBRARY()
 OWNER(g:passport_infra)
 
 PEERDIR(
-    library/cpp/threading/future
+    library/cpp/threading/future 
     library/cpp/tvmauth/client
 )
 
diff --git a/library/cpp/tvmauth/client/ut/checker_ut.cpp b/library/cpp/tvmauth/client/ut/checker_ut.cpp
index 54a25974c1..b9e0833b03 100644
--- a/library/cpp/tvmauth/client/ut/checker_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/checker_ut.cpp
@@ -7,7 +7,7 @@
 
 #include <library/cpp/tvmauth/type.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NTvmAuth;
 
diff --git a/library/cpp/tvmauth/client/ut/common.h b/library/cpp/tvmauth/client/ut/common.h
index 5dddc182b5..173b433156 100644
--- a/library/cpp/tvmauth/client/ut/common.h
+++ b/library/cpp/tvmauth/client/ut/common.h
@@ -6,10 +6,10 @@
 
 #include <library/cpp/tvmauth/unittest.h>
 
-#include <library/cpp/cgiparam/cgiparam.h>
+#include <library/cpp/cgiparam/cgiparam.h> 
 #include <library/cpp/testing/mock_server/server.h>
-#include <library/cpp/testing/unittest/env.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/env.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/stream/str.h>
 #include <util/system/fs.h>
diff --git a/library/cpp/tvmauth/client/ut/disk_cache_ut.cpp b/library/cpp/tvmauth/client/ut/disk_cache_ut.cpp
index 7dd851c9b3..7380233c60 100644
--- a/library/cpp/tvmauth/client/ut/disk_cache_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/disk_cache_ut.cpp
@@ -5,8 +5,8 @@
 
 #include <library/cpp/tvmauth/src/utils.h>
 
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/stream/file.h>
 #include <util/system/fs.h>
diff --git a/library/cpp/tvmauth/client/ut/exponential_backoff_ut.cpp b/library/cpp/tvmauth/client/ut/exponential_backoff_ut.cpp
index 3dcbe6ad49..322e6d96dd 100644
--- a/library/cpp/tvmauth/client/ut/exponential_backoff_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/exponential_backoff_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/tvmauth/client/misc/exponential_backoff.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <thread>
 
diff --git a/library/cpp/tvmauth/client/ut/facade_ut.cpp b/library/cpp/tvmauth/client/ut/facade_ut.cpp
index 62e8e6c731..4fe134a945 100644
--- a/library/cpp/tvmauth/client/ut/facade_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/facade_ut.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/tvmauth/client/facade.h>
 #include <library/cpp/tvmauth/client/mocked_updater.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/vector.h>
 
diff --git a/library/cpp/tvmauth/client/ut/logger_ut.cpp b/library/cpp/tvmauth/client/ut/logger_ut.cpp
index 76236e8913..e9e2a330dc 100644
--- a/library/cpp/tvmauth/client/ut/logger_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/logger_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <library/cpp/tvmauth/client/logger.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NTvmAuth;
 
diff --git a/library/cpp/tvmauth/client/ut/settings_ut.cpp b/library/cpp/tvmauth/client/ut/settings_ut.cpp
index 76c9542442..e17a43368d 100644
--- a/library/cpp/tvmauth/client/ut/settings_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/settings_ut.cpp
@@ -2,7 +2,7 @@
 
 #include <library/cpp/tvmauth/client/misc/api/settings.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NTvmAuth;
 
diff --git a/library/cpp/tvmauth/client/ut/tvmapi_updater_ut.cpp b/library/cpp/tvmauth/client/ut/tvmapi_updater_ut.cpp
index 4cf449711b..43925dee94 100644
--- a/library/cpp/tvmauth/client/ut/tvmapi_updater_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/tvmapi_updater_ut.cpp
@@ -4,8 +4,8 @@
 #include <library/cpp/tvmauth/client/misc/disk_cache.h>
 #include <library/cpp/tvmauth/client/misc/api/threaded_updater.h>
 
-#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/testing/unittest/tests_data.h>
+#include <library/cpp/testing/unittest/registar.h> 
+#include <library/cpp/testing/unittest/tests_data.h> 
 
 #include <util/stream/file.h>
 #include <util/string/subst.h>
diff --git a/library/cpp/tvmauth/client/ut/tvmtool_updater_ut.cpp b/library/cpp/tvmauth/client/ut/tvmtool_updater_ut.cpp
index 1295ed750e..8dfa6d08cf 100644
--- a/library/cpp/tvmauth/client/ut/tvmtool_updater_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/tvmtool_updater_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/tvmauth/client/misc/tool/threaded_updater.h>
 
 #include <library/cpp/http/simple/http_client.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/system/env.h>
 
diff --git a/library/cpp/tvmauth/client/ut/utils_ut.cpp b/library/cpp/tvmauth/client/ut/utils_ut.cpp
index e780fb2779..dbe1982d1e 100644
--- a/library/cpp/tvmauth/client/ut/utils_ut.cpp
+++ b/library/cpp/tvmauth/client/ut/utils_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/tvmauth/client/misc/utils.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(UtilsTest) {
     using namespace NTvmAuth;
diff --git a/library/cpp/tvmauth/client/ut/ya.make b/library/cpp/tvmauth/client/ut/ya.make
index e2686cd8d7..427f815238 100644
--- a/library/cpp/tvmauth/client/ut/ya.make
+++ b/library/cpp/tvmauth/client/ut/ya.make
@@ -5,7 +5,7 @@ OWNER(g:passport_infra)
 DATA(arcadia/library/cpp/tvmauth/client/ut/files)
 
 PEERDIR(
-    library/cpp/cgiparam
+    library/cpp/cgiparam 
     library/cpp/testing/mock_server
 )
 
diff --git a/library/cpp/tvmauth/src/rw/ut/rw_ut.cpp b/library/cpp/tvmauth/src/rw/ut/rw_ut.cpp
index 73f1b1d769..341a9eee9b 100644
--- a/library/cpp/tvmauth/src/rw/ut/rw_ut.cpp
+++ b/library/cpp/tvmauth/src/rw/ut/rw_ut.cpp
@@ -1,8 +1,8 @@
 #include <library/cpp/tvmauth/src/rw/keys.h>
 #include <library/cpp/tvmauth/src/rw/rw.h>
 
-#include <library/cpp/string_utils/base64/base64.h>
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/string_utils/base64/base64.h> 
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <contrib/libs/openssl/include/openssl/bn.h>
 #include <contrib/libs/openssl/include/openssl/evp.h>
diff --git a/library/cpp/tvmauth/src/rw/ut/ya.make b/library/cpp/tvmauth/src/rw/ut/ya.make
index 81dda79641..7c62c6a620 100644
--- a/library/cpp/tvmauth/src/rw/ut/ya.make
+++ b/library/cpp/tvmauth/src/rw/ut/ya.make
@@ -11,7 +11,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
 )
 
 END()
diff --git a/library/cpp/tvmauth/src/rw/ut_large/gen/main.cpp b/library/cpp/tvmauth/src/rw/ut_large/gen/main.cpp
index 31a599c996..c93d5dde76 100644
--- a/library/cpp/tvmauth/src/rw/ut_large/gen/main.cpp
+++ b/library/cpp/tvmauth/src/rw/ut_large/gen/main.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/tvmauth/src/rw/keys.h>
 
-#include <library/cpp/string_utils/base64/base64.h>
+#include <library/cpp/string_utils/base64/base64.h> 
 
 #include <util/generic/yexception.h>
 
diff --git a/library/cpp/tvmauth/src/rw/ut_large/gen/ya.make b/library/cpp/tvmauth/src/rw/ut_large/gen/ya.make
index 7b62d5c726..a4919b1e69 100644
--- a/library/cpp/tvmauth/src/rw/ut_large/gen/ya.make
+++ b/library/cpp/tvmauth/src/rw/ut_large/gen/ya.make
@@ -7,7 +7,7 @@ SRCS(
 )
 
 PEERDIR(
-    library/cpp/string_utils/base64
+    library/cpp/string_utils/base64 
     library/cpp/tvmauth/src/rw
 )
 
diff --git a/library/cpp/tvmauth/src/ut/parser_ut.cpp b/library/cpp/tvmauth/src/ut/parser_ut.cpp
index 530f45331a..ebb4f6d770 100644
--- a/library/cpp/tvmauth/src/ut/parser_ut.cpp
+++ b/library/cpp/tvmauth/src/ut/parser_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/tvmauth/exception.h>
 #include <library/cpp/tvmauth/ticket_status.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(ParserTestSuite) {
     using namespace NTvmAuth;
diff --git a/library/cpp/tvmauth/src/ut/public_ut.cpp b/library/cpp/tvmauth/src/ut/public_ut.cpp
index 74a483d57b..d79b645a36 100644
--- a/library/cpp/tvmauth/src/ut/public_ut.cpp
+++ b/library/cpp/tvmauth/src/ut/public_ut.cpp
@@ -6,7 +6,7 @@
 #include <library/cpp/tvmauth/ticket_status.h>
 #include <library/cpp/tvmauth/unittest.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NTvmAuth;
 
diff --git a/library/cpp/tvmauth/src/ut/service_ut.cpp b/library/cpp/tvmauth/src/ut/service_ut.cpp
index 5b6b5143bd..c4db23e895 100644
--- a/library/cpp/tvmauth/src/ut/service_ut.cpp
+++ b/library/cpp/tvmauth/src/ut/service_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/tvmauth/exception.h>
 #include <library/cpp/tvmauth/unittest.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/string/cast.h>
 
diff --git a/library/cpp/tvmauth/src/ut/user_ut.cpp b/library/cpp/tvmauth/src/ut/user_ut.cpp
index c040e94974..7d67970dfd 100644
--- a/library/cpp/tvmauth/src/ut/user_ut.cpp
+++ b/library/cpp/tvmauth/src/ut/user_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/tvmauth/exception.h>
 #include <library/cpp/tvmauth/unittest.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NTvmAuth;
 
diff --git a/library/cpp/tvmauth/src/ut/utils_ut.cpp b/library/cpp/tvmauth/src/ut/utils_ut.cpp
index c9cb81c36f..baf97685d1 100644
--- a/library/cpp/tvmauth/src/ut/utils_ut.cpp
+++ b/library/cpp/tvmauth/src/ut/utils_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/tvmauth/src/utils.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/maybe.h>
 
diff --git a/library/cpp/tvmauth/type.h b/library/cpp/tvmauth/type.h
index 7f4ce2b700..77a2ac96ec 100644
--- a/library/cpp/tvmauth/type.h
+++ b/library/cpp/tvmauth/type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <library/cpp/containers/stack_vector/stack_vec.h>
+#include <library/cpp/containers/stack_vector/stack_vec.h> 
 
 namespace NTvmAuth {
     using TScopes = TSmallVec<TStringBuf>;
diff --git a/library/cpp/unicode/normalization/ut/normalization_ut.cpp b/library/cpp/unicode/normalization/ut/normalization_ut.cpp
index 54d4940a26..32e0963218 100644
--- a/library/cpp/unicode/normalization/ut/normalization_ut.cpp
+++ b/library/cpp/unicode/normalization/ut/normalization_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/charset/wide.h>
 
diff --git a/library/cpp/unicode/punycode/punycode_ut.cpp b/library/cpp/unicode/punycode/punycode_ut.cpp
index 97271cf0d8..69ea8638b4 100644
--- a/library/cpp/unicode/punycode/punycode_ut.cpp
+++ b/library/cpp/unicode/punycode/punycode_ut.cpp
@@ -1,6 +1,6 @@
 #include "punycode.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/charset/wide.h>
 
 namespace {
diff --git a/library/cpp/uri/location_ut.cpp b/library/cpp/uri/location_ut.cpp
index 26a0f64471..a0c3e0e4f7 100644
--- a/library/cpp/uri/location_ut.cpp
+++ b/library/cpp/uri/location_ut.cpp
@@ -1,6 +1,6 @@
 #include "location.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TResolveRedirectTests) {
     Y_UNIT_TEST(Absolute) {
diff --git a/library/cpp/uri/uri_ut.h b/library/cpp/uri/uri_ut.h
index f8ac6e4092..2bcfe6531d 100644
--- a/library/cpp/uri/uri_ut.h
+++ b/library/cpp/uri/uri_ut.h
@@ -2,7 +2,7 @@
 
 #include "uri.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace NUri {
     struct TTest {
diff --git a/library/cpp/xml/document/xml-document.cpp b/library/cpp/xml/document/xml-document.cpp
index 18a554d732..c159c04d58 100644
--- a/library/cpp/xml/document/xml-document.cpp
+++ b/library/cpp/xml/document/xml-document.cpp
@@ -35,7 +35,7 @@ namespace NXml {
                 if (!node)
                     THROW(XmlException, "Can't create root node.");
                 xmlDocSetRootElement(doc.Get(), node.Get());
-                Y_UNUSED(node.Release());
+                Y_UNUSED(node.Release()); 
                 Doc = std::move(doc);
             } break;
             default:
@@ -56,7 +56,7 @@ namespace NXml {
     }
 
     void TDocument::ParseFile(const TString& file) {
-        if (!NFs::Exists(file))
+        if (!NFs::Exists(file)) 
             THROW(XmlException, "File " << file << " doesn't exist");
 
         TParserCtxtPtr pctx(xmlNewParserCtxt());
diff --git a/library/cpp/xml/document/xml-document_ut.cpp b/library/cpp/xml/document/xml-document_ut.cpp
index 9f537b75c4..5af699e719 100644
--- a/library/cpp/xml/document/xml-document_ut.cpp
+++ b/library/cpp/xml/document/xml-document_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <util/generic/map.h>
 
 #include "xml-document.h"
diff --git a/library/cpp/xml/document/xml-options_ut.cpp b/library/cpp/xml/document/xml-options_ut.cpp
index 9be16baf3d..3458917bad 100644
--- a/library/cpp/xml/document/xml-options_ut.cpp
+++ b/library/cpp/xml/document/xml-options_ut.cpp
@@ -1,6 +1,6 @@
 #include "xml-options.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 Y_UNIT_TEST_SUITE(TestXmlOptions) {
     Y_UNIT_TEST(SetHuge) {
diff --git a/library/cpp/xml/document/xml-textreader_ut.cpp b/library/cpp/xml/document/xml-textreader_ut.cpp
index 6232dfe47e..960cd807db 100644
--- a/library/cpp/xml/document/xml-textreader_ut.cpp
+++ b/library/cpp/xml/document/xml-textreader_ut.cpp
@@ -1,6 +1,6 @@
 #include "xml-textreader.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/hash.h>
 #include <util/generic/vector.h>
diff --git a/library/cpp/ya.make b/library/cpp/ya.make
index 8c1193b007..977a8945ae 100644
--- a/library/cpp/ya.make
+++ b/library/cpp/ya.make
@@ -28,11 +28,11 @@ RECURSE(
     bloom_filter/ut
     bucket_quoter
     build_info
-    cache
+    cache 
     case_insensitive_string
-    cgiparam
-    cgiparam/fuzz
-    cgiparam/ut
+    cgiparam 
+    cgiparam/fuzz 
+    cgiparam/ut 
     charset
     charset/ut
     chromium_trace
@@ -72,8 +72,8 @@ RECURSE(
     dbg_output
     dbg_output/ut
     deprecated
-    diff
-    diff/ut
+    diff 
+    diff/ut 
     digest
     disjoint_sets
     disjoint_sets/ut
@@ -83,9 +83,9 @@ RECURSE(
     dolbilo/ut
     domtree
     domtree/tool
-    dot_product
-    dot_product/bench
-    dot_product/ut
+    dot_product 
+    dot_product/bench 
+    dot_product/ut 
     dwarf_backtrace
     dwarf_backtrace/registry
     edit_distance
@@ -122,8 +122,8 @@ RECURSE(
     file_checker/ut
     flatbuffers64_introspection
     flatbuffers64_introspection/example
-    float16
-    float16/ut
+    float16 
+    float16/ut 
     framing
     framing/ut
     fuid
@@ -138,10 +138,10 @@ RECURSE(
     geohash/ut
     geolocation
     geotarget
-    getopt
-    getopt/last_getopt_demo
-    getopt/small
-    getopt/ut
+    getopt 
+    getopt/last_getopt_demo 
+    getopt/small 
+    getopt/ut 
     getoptpb
     gettimeofday
     gradient_optimize
@@ -262,7 +262,7 @@ RECURSE(
     object_factory
     object_factory/ut
     offroad
-    on_disk
+    on_disk 
     online_hnsw
     online_hnsw/ut
     openssl
@@ -340,7 +340,7 @@ RECURSE(
     sorter/ut
     sqlite3
     sqlite3/ut
-    sse
+    sse 
     ssh
     ssh/ut
     ssh_sign
@@ -358,8 +358,8 @@ RECURSE(
     svnversion
     telfinder
     telfinder/ut
-    terminate_handler
-    terminate_handler/sample
+    terminate_handler 
+    terminate_handler/sample 
     testing
     text_processing
     threading
@@ -438,7 +438,7 @@ IF (OS_WINDOWS)
 ELSE()
     RECURSE(
         fuse
-        sse/ut
+        sse/ut 
         tf
         xdelta3
         zookeeper
diff --git a/library/cpp/yaml/as/ut/tstring_test.cpp b/library/cpp/yaml/as/ut/tstring_test.cpp
index 2ad4f6c572..4ea77b5a7a 100644
--- a/library/cpp/yaml/as/ut/tstring_test.cpp
+++ b/library/cpp/yaml/as/ut/tstring_test.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 #include <library/cpp/yaml/as/tstring.h>
 
 #include <contrib/libs/yaml-cpp/include/yaml-cpp/yaml.h>
diff --git a/library/cpp/yson/json/json_writer.cpp b/library/cpp/yson/json/json_writer.cpp
index 87481256ec..f062683ede 100644
--- a/library/cpp/yson/json/json_writer.cpp
+++ b/library/cpp/yson/json/json_writer.cpp
@@ -17,21 +17,21 @@ namespace NYT {
         EJsonFormat format,
         EJsonAttributesMode attributesMode,
         ESerializedBoolFormat booleanFormat)
-        : TJsonWriter(
-            output,
-            NJson::TJsonWriterConfig{}.SetFormatOutput(format == JF_PRETTY),
-            type,
-            attributesMode,
-            booleanFormat
-        )
-    {}
-
-    TJsonWriter::TJsonWriter(
-        IOutputStream* output,
-        NJson::TJsonWriterConfig config,
+        : TJsonWriter( 
+            output, 
+            NJson::TJsonWriterConfig{}.SetFormatOutput(format == JF_PRETTY), 
+            type, 
+            attributesMode, 
+            booleanFormat 
+        ) 
+    {} 
+ 
+    TJsonWriter::TJsonWriter( 
+        IOutputStream* output, 
+        NJson::TJsonWriterConfig config, 
         ::NYson::EYsonType type,
-        EJsonAttributesMode attributesMode,
-        ESerializedBoolFormat booleanFormat)
+        EJsonAttributesMode attributesMode, 
+        ESerializedBoolFormat booleanFormat) 
         : Output(output)
         , Type(type)
         , AttributesMode(attributesMode)
@@ -44,7 +44,7 @@ namespace NYT {
 
         UnderlyingJsonWriter.Reset(new NJson::TJsonWriter(
             output,
-            config));
+            config)); 
         JsonWriter = UnderlyingJsonWriter.Get();
         HasAttributes = false;
         InAttributesBalance = 0;
diff --git a/library/cpp/yson/json/json_writer.h b/library/cpp/yson/json/json_writer.h
index d84ac0de53..8cbb02c51c 100644
--- a/library/cpp/yson/json/json_writer.h
+++ b/library/cpp/yson/json/json_writer.h
@@ -36,13 +36,13 @@ namespace NYT {
             EJsonAttributesMode attributesMode = JAM_ON_DEMAND,
             ESerializedBoolFormat booleanFormat = SBF_STRING);
 
-        TJsonWriter(
-            IOutputStream* output,
-            NJson::TJsonWriterConfig config,
+        TJsonWriter( 
+            IOutputStream* output, 
+            NJson::TJsonWriterConfig config, 
             ::NYson::EYsonType type = ::NYson::EYsonType::Node,
-            EJsonAttributesMode attributesMode = JAM_ON_DEMAND,
-            ESerializedBoolFormat booleanFormat = SBF_STRING);
-
+            EJsonAttributesMode attributesMode = JAM_ON_DEMAND, 
+            ESerializedBoolFormat booleanFormat = SBF_STRING); 
+ 
         void Flush();
 
         void OnStringScalar(TStringBuf value) override;
diff --git a/library/cpp/yson/node/node.cpp b/library/cpp/yson/node/node.cpp
index b39e070718..5f0a956096 100644
--- a/library/cpp/yson/node/node.cpp
+++ b/library/cpp/yson/node/node.cpp
@@ -123,7 +123,7 @@ TNode::TNode(int i)
 TNode::TNode(unsigned int ui)
     : Value_(static_cast<ui64>(ui))
 { }
-
+ 
 TNode::TNode(long i)
     : Value_(static_cast<i64>(i))
 { }
@@ -849,7 +849,7 @@ void TNode::CreateAttributes()
     Attributes_ = MakeHolder<TNode>();
     Attributes_->Value_ = TMapType();
 }
-
+ 
 void TNode::Save(IOutputStream* out) const
 {
     NodeToYsonStream(*this, out, NYson::EYsonFormat::Binary);
diff --git a/library/cpp/yson/node/node.h b/library/cpp/yson/node/node.h
index 5f90f95df0..c06d8e6070 100644
--- a/library/cpp/yson/node/node.h
+++ b/library/cpp/yson/node/node.h
@@ -79,21 +79,21 @@ public:
     TNode(TString s);
     TNode(int i);
 
-    //this case made speccially for prevent mess cast of EType into TNode through TNode(int) constructor
+    //this case made speccially for prevent mess cast of EType into TNode through TNode(int) constructor 
     //usual case of error SomeNode == TNode::Undefined <-- SomeNode indeed will be compared with TNode(0) without this method
     //correct way is SomeNode.GetType() == TNode::Undefined
-    template<class T = EType>
-    Y_FORCE_INLINE TNode(EType)
-    {
-        static_assert(!std::is_same<T, EType>::value, "looks like a mistake, may be you forget .GetType()");
-    }
-
-    //this case made speccially for prevent mess cast of T* into TNode through implicit bool ctr
-    template<class T = int>
-    Y_FORCE_INLINE TNode(const T*) : TNode() {
-        static_assert(!std::is_same<T,T>::value, "looks like a mistake, and pointer have converted to bool");
-    }
-
+    template<class T = EType> 
+    Y_FORCE_INLINE TNode(EType) 
+    { 
+        static_assert(!std::is_same<T, EType>::value, "looks like a mistake, may be you forget .GetType()"); 
+    } 
+ 
+    //this case made speccially for prevent mess cast of T* into TNode through implicit bool ctr 
+    template<class T = int> 
+    Y_FORCE_INLINE TNode(const T*) : TNode() { 
+        static_assert(!std::is_same<T,T>::value, "looks like a mistake, and pointer have converted to bool"); 
+    } 
+ 
     TNode(unsigned int ui);
     TNode(long i);
     TNode(unsigned long ui);
diff --git a/library/cpp/yson/node/node_io.cpp b/library/cpp/yson/node/node_io.cpp
index 294a7f7217..443ba2cf1d 100644
--- a/library/cpp/yson/node/node_io.cpp
+++ b/library/cpp/yson/node/node_io.cpp
@@ -134,9 +134,9 @@ TNode NodeFromJsonString(const TStringBuf input)
 
     TNodeBuilder builder(&result);
     TYson2JsonCallbacksAdapter callbacks(&builder, /*throwException*/ true);
-    NJson::TJsonReaderConfig config;
-    config.DontValidateUtf8 = true;
-    NJson::ReadJson(&stream, &config, &callbacks);
+    NJson::TJsonReaderConfig config; 
+    config.DontValidateUtf8 = true; 
+    NJson::ReadJson(&stream, &config, &callbacks); 
     return result;
 }
 
diff --git a/library/cpp/yson/node/node_ut.cpp b/library/cpp/yson/node/node_ut.cpp
index 448e99f575..de9cf702ea 100644
--- a/library/cpp/yson/node/node_ut.cpp
+++ b/library/cpp/yson/node/node_ut.cpp
@@ -1,7 +1,7 @@
 #include "node.h"
 #include "node_io.h"
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/ysaveload.h>
 
diff --git a/library/cpp/yson_pull/ut/cescape_ut.cpp b/library/cpp/yson_pull/ut/cescape_ut.cpp
index 6628ba1d15..02ce795f90 100644
--- a/library/cpp/yson_pull/ut/cescape_ut.cpp
+++ b/library/cpp/yson_pull/ut/cescape_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/yson_pull/detail/cescape.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 using namespace NYsonPull::NDetail;
 
diff --git a/library/cpp/yson_pull/ut/loop_ut.cpp b/library/cpp/yson_pull/ut/loop_ut.cpp
index 8c7b11dd1c..930d320acf 100644
--- a/library/cpp/yson_pull/ut/loop_ut.cpp
+++ b/library/cpp/yson_pull/ut/loop_ut.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/yson_pull/reader.h>
 #include <library/cpp/yson_pull/writer.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <cerrno>
 #include <cmath>
diff --git a/library/cpp/yson_pull/ut/reader_ut.cpp b/library/cpp/yson_pull/ut/reader_ut.cpp
index 1184265ddb..e7ce4d66e7 100644
--- a/library/cpp/yson_pull/ut/reader_ut.cpp
+++ b/library/cpp/yson_pull/ut/reader_ut.cpp
@@ -4,7 +4,7 @@
 #include <library/cpp/yson_pull/detail/cescape.h>
 #include <library/cpp/yson_pull/detail/macros.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 namespace {
     NYsonPull::TReader memory_reader(TStringBuf data, NYsonPull::EStreamType mode) {
diff --git a/library/cpp/yson_pull/ut/writer_ut.cpp b/library/cpp/yson_pull/ut/writer_ut.cpp
index 5c304bad0f..5f2b7cefc7 100644
--- a/library/cpp/yson_pull/ut/writer_ut.cpp
+++ b/library/cpp/yson_pull/ut/writer_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/yson_pull/scalar.h>
 #include <library/cpp/yson_pull/detail/writer.h>
 
-#include <library/cpp/testing/unittest/registar.h>
+#include <library/cpp/testing/unittest/registar.h> 
 
 #include <util/generic/string.h>
author	Ilnur Khuziev <ilnur.khuziev@yandex.ru>	2022-02-10 16:46:13 +0300
committer	Daniil Cherednik <dcherednik@yandex-team.ru>	2022-02-10 16:46:13 +0300
commit	736dcd8ca259457a136f2f9f9168c44643914323 (patch)
tree	ddd46a036d68bfa83aa11b892f31243ea6b068a1 /library/cpp
parent	9bf2fa2b060c9881d3135c2208c624a1dd546ecc (diff)
download	ydb-736dcd8ca259457a136f2f9f9168c44643914323.tar.gz