FixNamespaceComments in /util

FixNamespaceComments in /util
bb9152570d7c258798644ead5a59f604de05ef3b

286 files changed, 363 insertions, 363 deletions

diff --git a/util/charset/unicode_table.h b/util/charset/unicode_table.h
index 9e171b2583..3876d7d1b7 100644
--- a/util/charset/unicode_table.h
+++ b/util/charset/unicode_table.h
@@ -120,4 +120,4 @@ namespace NUnicodeTable {
     };
 
     const size_t UNICODE_TABLE_SHIFT = 5;
-}
+} // namespace NUnicodeTable
diff --git a/util/charset/unidata.h b/util/charset/unidata.h
index 400d314186..68c084129b 100644
--- a/util/charset/unidata.h
+++ b/util/charset/unidata.h
@@ -126,7 +126,7 @@ namespace NUnicode {
         inline bool IsBidi(wchar32 ch, ui32 type) {
             return ((NUnicode::NPrivate::CharInfo(ch) >> BIDI_OFFSET) & 15) == type;
         }
-    }
+    } // namespace NPrivate
 
     inline size_t UnicodeInstancesLimit() {
         return NPrivate::UnidataTable().Size();
@@ -142,7 +142,7 @@ namespace NUnicode {
     inline bool CharHasType(wchar32 ch, ui64 type_bits) {
         return (SHIFT(NUnicode::CharType(ch)) & type_bits) != 0;
     }
-}
+} // namespace NUnicode
 
 // all usefull properties
 
diff --git a/util/charset/utf8_ut.cpp b/util/charset/utf8_ut.cpp
index 00981f8060..1c4cec3200 100644
--- a/util/charset/utf8_ut.cpp
+++ b/util/charset/utf8_ut.cpp
@@ -123,4 +123,4 @@ Y_UNIT_TEST_SUITE(TUtfUtilTest) {
         wtextScalar.remove(wtextSSE.size());
         UNIT_ASSERT(wtextScalar == wtextSSE);
     }
-}
+} // Y_UNIT_TEST_SUITE(TUtfUtilTest)
diff --git a/util/charset/wide.cpp b/util/charset/wide.cpp
index a287438ddd..81d59bf1a2 100644
--- a/util/charset/wide.cpp
+++ b/util/charset/wide.cpp
@@ -29,7 +29,7 @@ namespace {
                     return 1;
         }
     }
-}
+} // namespace
 
 void Collapse(TUtf16String& w) {
     CollapseImpl(w, w, 0, IsWhitespace);
diff --git a/util/charset/wide.h b/util/charset/wide.h
index 06f48d60da..c2a8d00372 100644
--- a/util/charset/wide.h
+++ b/util/charset/wide.h
@@ -61,7 +61,7 @@ namespace NDetail {
     template <class T>
     inline void WriteSurrogatePair(wchar32 s, T& dest) noexcept;
 
-}
+} // namespace NDetail
 
 inline wchar16* SkipSymbol(wchar16* begin, const wchar16* end) noexcept {
     return begin + W16SymbolSize(begin, end);
@@ -333,7 +333,7 @@ namespace NDetail {
     void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar16*& dest) noexcept;
 
     void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar32*& dest) noexcept;
-}
+} // namespace NDetail
 
 //! @return len if robust and position where encoding stopped if not
 template <bool robust, typename TCharType>
@@ -639,7 +639,7 @@ namespace NDetail {
     }
 #endif // _sse2_
 
-}
+} // namespace NDetail
 
 //! returns @c true if character sequence has no symbols with value greater than 0x7F
 template <typename TChar>
diff --git a/util/charset/wide_sse41.cpp b/util/charset/wide_sse41.cpp
index 0d86cb95f8..8aefadfddd 100644
--- a/util/charset/wide_sse41.cpp
+++ b/util/charset/wide_sse41.cpp
@@ -8,7 +8,7 @@ namespace NDetail {
     }
     void UTF8ToWideImplSSE41(const unsigned char*&, const unsigned char*, wchar32*&) noexcept {
     }
-}
+} // namespace NDetail
 
 #else
 
@@ -242,6 +242,6 @@ namespace NDetail {
         // The rest will be handled sequencially.
         // Possible improvement: go back to the vectorized processing after the error or the 4 byte sequence
     }
-}
+} // namespace NDetail
 
 #endif
diff --git a/util/charset/wide_ut.cpp b/util/charset/wide_ut.cpp
index dec843717e..e221ec4ad6 100644
--- a/util/charset/wide_ut.cpp
+++ b/util/charset/wide_ut.cpp
@@ -160,7 +160,7 @@ namespace {
         UNIT_ASSERT(n == len);
         UNIT_ASSERT(r == result);
     }
-}
+} // namespace
 
 class TConversionTest: public TTestBase {
 private:
diff --git a/util/datetime/base.cpp b/util/datetime/base.cpp
index 83a17660fd..9148badc82 100644
--- a/util/datetime/base.cpp
+++ b/util/datetime/base.cpp
@@ -130,7 +130,7 @@ namespace {
             os << Pad<2>(utcOffsetInMinutes % 60);
         }
     }
-}
+} // namespace
 
 template <>
 void Out<TDuration>(IOutputStream& os, TTypeTraits<TDuration>::TFuncParam duration) {
diff --git a/util/datetime/base.h b/util/datetime/base.h
index a0fc71bab4..d613012e86 100644
--- a/util/datetime/base.h
+++ b/util/datetime/base.h
@@ -190,7 +190,7 @@ namespace NDateTimeHelpers {
     struct TPrecisionHelper<double> {
         using THighPrecision = double;
     };
-}
+} // namespace NDateTimeHelpers
 
 class TDuration: public TTimeBase<TDuration> {
     using TBase = TTimeBase<TDuration>;
@@ -576,7 +576,7 @@ namespace NPrivate {
         {
         }
     };
-}
+} // namespace NPrivate
 
 /** @name Helpers for printing local times to `IOutputStream`s.
  *        The FormatLocal* functions create an opaque object that, when written to
@@ -645,7 +645,7 @@ namespace NDateTimeHelpers {
 
         return a < b ? 0 : a - b;
     }
-}
+} // namespace NDateTimeHelpers
 
 constexpr TDuration operator-(const TInstant& l, const TInstant& r) noexcept {
     return TDuration::FromValue(::NDateTimeHelpers::DiffWithSaturation(l.GetValue(), r.GetValue()));
diff --git a/util/datetime/base_ut.cpp b/util/datetime/base_ut.cpp
index 3c03626787..cc2e776e48 100644
--- a/util/datetime/base_ut.cpp
+++ b/util/datetime/base_ut.cpp
@@ -45,7 +45,7 @@ namespace {
             *buf = '\0';
         }
     }
-}
+} // namespace
 
 Y_UNIT_TEST_SUITE(TestSprintDate) {
     Y_UNIT_TEST(Year9999) {
@@ -148,7 +148,7 @@ Y_UNIT_TEST_SUITE(TestSprintDate) {
 
         UNIT_ASSERT_VALUES_EQUAL(expectedYear, YearToString(timestamp));
     }
-}
+} // Y_UNIT_TEST_SUITE(TestSprintDate)
 
 Y_UNIT_TEST_SUITE(TDateTimeTest) {
     Y_UNIT_TEST(Test8601) {
@@ -336,7 +336,7 @@ Y_UNIT_TEST_SUITE(TDateTimeTest) {
             UNIT_ASSERT(CompareTMFull(ptm0, ptm1));
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TDateTimeTest)
 
 Y_UNIT_TEST_SUITE(DateTimeTest) {
     Y_UNIT_TEST(TestDurationFromFloat) {
@@ -652,4 +652,4 @@ Y_UNIT_TEST_SUITE(DateTimeTest) {
         static_assert(TDuration::Zero() + 1s == 1s);
         static_assert(TInstant::Seconds(1) + 1s == TInstant::Seconds(2));
     }
-}
+} // Y_UNIT_TEST_SUITE(DateTimeTest)
diff --git a/util/datetime/cputimer_ut.cpp b/util/datetime/cputimer_ut.cpp
index 21a657d5c7..65f64123fb 100644
--- a/util/datetime/cputimer_ut.cpp
+++ b/util/datetime/cputimer_ut.cpp
@@ -7,4 +7,4 @@ Y_UNIT_TEST_SUITE(TestCpuTimerSuite) {
         ui64 cycles = DurationToCyclesSafe(TDuration::Hours(24));
         UNIT_ASSERT_VALUES_EQUAL(24, CyclesToDurationSafe(cycles).Hours());
     }
-}
+} // Y_UNIT_TEST_SUITE(TestCpuTimerSuite)
diff --git a/util/datetime/parser_deprecated_ut.cpp b/util/datetime/parser_deprecated_ut.cpp
index 6ad9f885b1..9a3600598d 100644
--- a/util/datetime/parser_deprecated_ut.cpp
+++ b/util/datetime/parser_deprecated_ut.cpp
@@ -518,7 +518,7 @@ Y_UNIT_TEST_SUITE(TDateTimeParseTestDeprecated) {
             UNIT_ASSERT(!TInstant::TryParseX509Deprecated(s, iTry));
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TDateTimeParseTestDeprecated)
 
 Y_UNIT_TEST_SUITE(TDurationParseTestDeprecated) {
     Y_UNIT_TEST(TestParseDeprecated) {
@@ -573,4 +573,4 @@ Y_UNIT_TEST_SUITE(TDurationParseTestDeprecated) {
 
         UNIT_ASSERT_EQUAL(TDuration(), TDuration::Parse("10ns")); // TDuration has 1us precision.
     }
-}
+} // Y_UNIT_TEST_SUITE(TDurationParseTestDeprecated)
diff --git a/util/datetime/parser_ut.cpp b/util/datetime/parser_ut.cpp
index 6f5c300228..713f566469 100644
--- a/util/datetime/parser_ut.cpp
+++ b/util/datetime/parser_ut.cpp
@@ -575,7 +575,7 @@ Y_UNIT_TEST_SUITE(TDateTimeParseTest) {
             UNIT_ASSERT(!TInstant::TryParseX509(s, iTry));
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TDateTimeParseTest)
 
 Y_UNIT_TEST_SUITE(TDurationParseTest) {
     Y_UNIT_TEST(TestParse) {
@@ -631,4 +631,4 @@ Y_UNIT_TEST_SUITE(TDurationParseTest) {
 
         UNIT_ASSERT_EQUAL(TDuration(), TDuration::Parse("10ns")); // TDuration has 1us precision.
     }
-}
+} // Y_UNIT_TEST_SUITE(TDurationParseTest)
diff --git a/util/datetime/process_uptime_ut.cpp b/util/datetime/process_uptime_ut.cpp
index 4ef95e4323..11c23ebe22 100644
--- a/util/datetime/process_uptime_ut.cpp
+++ b/util/datetime/process_uptime_ut.cpp
@@ -14,4 +14,4 @@ Y_UNIT_TEST_SUITE(TestProcessUptimeSuite) {
         auto t2 = ProcessUptime();
         UNIT_ASSERT(t2 >= t1);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestProcessUptimeSuite)
diff --git a/util/datetime/systime.cpp b/util/datetime/systime.cpp
index fe1d7b99d6..fd0c69dc7c 100644
--- a/util/datetime/systime.cpp
+++ b/util/datetime/systime.cpp
@@ -200,7 +200,7 @@ namespace {
     };
 
     constexpr TDayNoToYearLookupTable DAYS_TO_YEAR_LOOKUP;
-}
+} // namespace
 
 //! Inverse of gmtime: converts struct tm to time_t, assuming the data
 //! in tm is UTC rather than local timezone. This implementation
diff --git a/util/datetime/uptime.cpp b/util/datetime/uptime.cpp
index d2e1191c84..1d141665d4 100644
--- a/util/datetime/uptime.cpp
+++ b/util/datetime/uptime.cpp
@@ -36,7 +36,7 @@ namespace {
 
         return now - beforeNow;
     }
-}
+} // namespace
 #endif // _darwin_
 
 TDuration Uptime() {
diff --git a/util/datetime/uptime_ut.cpp b/util/datetime/uptime_ut.cpp
index 7f5ecc482c..8628a048a3 100644
--- a/util/datetime/uptime_ut.cpp
+++ b/util/datetime/uptime_ut.cpp
@@ -9,4 +9,4 @@ Y_UNIT_TEST_SUITE(TestUptimeSuite) {
         auto t2 = Uptime();
         UNIT_ASSERT(t2 > t1);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestUptimeSuite)
diff --git a/util/digest/city.h b/util/digest/city.h
index 675a798074..31d7dc73d3 100644
--- a/util/digest/city.h
+++ b/util/digest/city.h
@@ -50,7 +50,7 @@ namespace NPrivateCityHash {
         static_assert(std::is_integral<std::remove_reference_t<decltype(*str.data())>>::value, "invalid type passed to hash function");
         return TStringBuf(reinterpret_cast<const char*>(str.data()), (str.size()) * sizeof(*str.data()));
     }
-}
+} // namespace NPrivateCityHash
 
 template <class TStringType>
 inline ui64 CityHash64(const TStringType& str) {
diff --git a/util/digest/city_ut.cpp b/util/digest/city_ut.cpp
index 972091c2c3..a5e5644ea1 100644
--- a/util/digest/city_ut.cpp
+++ b/util/digest/city_ut.cpp
@@ -12,4 +12,4 @@ Y_UNIT_TEST_SUITE(TCityTest) {
         CityHash128WithSeed(s, uint128(1, 2));
         UNIT_ASSERT(s.empty());
     }
-}
+} // Y_UNIT_TEST_SUITE(TCityTest)
diff --git a/util/digest/fnv.h b/util/digest/fnv.h
index 87b41a3de7..186e6b4f45 100644
--- a/util/digest/fnv.h
+++ b/util/digest/fnv.h
@@ -43,7 +43,7 @@ namespace NFnvPrivate {
     DEF_FNV(64)
 
 #undef DEF_FNV
-}
+} // namespace NFnvPrivate
 
 template <class T, class It>
 static constexpr T FnvHash(It b, It e, T init) {
diff --git a/util/digest/fnv_ut.cpp b/util/digest/fnv_ut.cpp
index 039e110eaa..3c1588bbad 100644
--- a/util/digest/fnv_ut.cpp
+++ b/util/digest/fnv_ut.cpp
@@ -20,4 +20,4 @@ Y_UNIT_TEST_SUITE(TFnvTest) {
         UNIT_ASSERT_EQUAL(FnvHash<ui64>(nullptr, 0), FNV64INIT);
         UNIT_ASSERT_EQUAL(FnvHash<ui64>(TStringBuf()), FNV64INIT);
     }
-}
+} // Y_UNIT_TEST_SUITE(TFnvTest)
diff --git a/util/digest/murmur.cpp b/util/digest/murmur.cpp
index ebaad59220..ef9c8f8a43 100644
--- a/util/digest/murmur.cpp
+++ b/util/digest/murmur.cpp
@@ -124,6 +124,6 @@ namespace NMurmurPrivate {
 
         return h;
     }
-}
+} // namespace NMurmurPrivate
 
 template size_t MurmurHash<size_t>(const void* buf, size_t len) noexcept;
diff --git a/util/digest/murmur.h b/util/digest/murmur.h
index a54902006c..60b9f82dd6 100644
--- a/util/digest/murmur.h
+++ b/util/digest/murmur.h
@@ -27,7 +27,7 @@ namespace NMurmurPrivate {
     DEF_MUR(64)
 
 #undef DEF_MUR
-}
+} // namespace NMurmurPrivate
 
 template <class T>
 inline T MurmurHash(const void* buf, size_t len, T init) noexcept {
diff --git a/util/draft/date_ut.cpp b/util/draft/date_ut.cpp
index 8c33a6c1cf..3b7042cdee 100644
--- a/util/draft/date_ut.cpp
+++ b/util/draft/date_ut.cpp
@@ -33,4 +33,4 @@ Y_UNIT_TEST_SUITE(TDateTest) {
             UNIT_ASSERT_EQUAL(d.GetStartUTC(), 1297728000);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TDateTest)
diff --git a/util/draft/datetime.cpp b/util/draft/datetime.cpp
index 5d6c743dfe..43ce7c4b6d 100644
--- a/util/draft/datetime.cpp
+++ b/util/draft/datetime.cpp
@@ -211,7 +211,7 @@ namespace NDatetime {
 #endif
         return t;
     }
-}
+} // namespace NDatetime
 
 template <>
 void In<TMonth>(IInputStream& in, TMonth& t) {
diff --git a/util/draft/datetime.h b/util/draft/datetime.h
index c49b686277..677de685a4 100644
--- a/util/draft/datetime.h
+++ b/util/draft/datetime.h
@@ -131,7 +131,7 @@ namespace NDatetime {
             return s != t;
         }
     };
-}
+} // namespace NDatetime
 
 inline TString date2str(const time_t date) {
     struct tm dateTm;
diff --git a/util/draft/datetime_ut.cpp b/util/draft/datetime_ut.cpp
index b60c145335..840f69cab4 100644
--- a/util/draft/datetime_ut.cpp
+++ b/util/draft/datetime_ut.cpp
@@ -228,4 +228,4 @@ Y_UNIT_TEST_SUITE(TSimpleTMTest) {
                            tt, 1449828548, 2015, 12, 11, 10, 9, 8);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TSimpleTMTest)
diff --git a/util/draft/holder_vector_ut.cpp b/util/draft/holder_vector_ut.cpp
index f64393860a..54783970e7 100644
--- a/util/draft/holder_vector_ut.cpp
+++ b/util/draft/holder_vector_ut.cpp
@@ -66,4 +66,4 @@ Y_UNIT_TEST_SUITE(THolderVectorTest) {
         UNIT_ASSERT(v.Size() == 1);
         UNIT_ASSERT(str.get() == nullptr);
     }
-}
+} // Y_UNIT_TEST_SUITE(THolderVectorTest)
diff --git a/util/draft/memory_ut.cpp b/util/draft/memory_ut.cpp
index 76bee30549..f1aa4a03a2 100644
--- a/util/draft/memory_ut.cpp
+++ b/util/draft/memory_ut.cpp
@@ -66,4 +66,4 @@ Y_UNIT_TEST_SUITE(TUtilDraftMemoryTest) {
         ss3.A.C = -789;
         UNIT_ASSERT(!IsZero(ss3));
     }
-}
+} // Y_UNIT_TEST_SUITE(TUtilDraftMemoryTest)
diff --git a/util/folder/dirut_ut.cpp b/util/folder/dirut_ut.cpp
index dbfabdd059..58390af15b 100644
--- a/util/folder/dirut_ut.cpp
+++ b/util/folder/dirut_ut.cpp
@@ -129,4 +129,4 @@ Y_UNIT_TEST_SUITE(TDirutTest) {
 
         RemoveDirWithContents(tmpDir);
     }
-}
+} // Y_UNIT_TEST_SUITE(TDirutTest)
diff --git a/util/folder/path.h b/util/folder/path.h
index 9f6642d5cb..c1a262bed1 100644
--- a/util/folder/path.h
+++ b/util/folder/path.h
@@ -225,7 +225,7 @@ namespace NPrivate {
         fsPath /= TFsPath(arg);
         AppendToFsPath(fsPath, std::forward<Ts>(args)...);
     }
-}
+} // namespace NPrivate
 
 template <class... Ts>
 TString JoinFsPaths(Ts&&... args) {
diff --git a/util/folder/path_ut.cpp b/util/folder/path_ut.cpp
index 76dd692ec6..0fbcac8263 100644
--- a/util/folder/path_ut.cpp
+++ b/util/folder/path_ut.cpp
@@ -52,7 +52,7 @@ namespace {
     TTestDirectory::~TTestDirectory() {
         Path_.ForceDelete();
     }
-}
+} // namespace
 
 Y_UNIT_TEST_SUITE(TFsPathTests) {
     Y_UNIT_TEST(TestMkDirs) {
@@ -894,4 +894,4 @@ Y_UNIT_TEST_SUITE(TFsPathTests) {
             UNIT_ASSERT_VALUES_EQUAL(split2.at(1), DIR_B);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TFsPathTests)
diff --git a/util/generic/adaptor.h b/util/generic/adaptor.h
index b88a65fc81..80249a41e1 100644
--- a/util/generic/adaptor.h
+++ b/util/generic/adaptor.h
@@ -119,7 +119,7 @@ namespace NPrivate {
             return end(Base());
         }
     };
-}
+} // namespace NPrivate
 
 /**
  * Provides a reverse view into the provided container.
diff --git a/util/generic/adaptor_ut.cpp b/util/generic/adaptor_ut.cpp
index 721f849f93..3ccd1b84bc 100644
--- a/util/generic/adaptor_ut.cpp
+++ b/util/generic/adaptor_ut.cpp
@@ -121,4 +121,4 @@ Y_UNIT_TEST_SUITE(TReverseAdaptor) {
             UNIT_ASSERT_VALUES_EQUAL(etalon2[idx++], x);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TReverseAdaptor)
diff --git a/util/generic/algorithm.h b/util/generic/algorithm.h
index 8958dd225f..a770ab3033 100644
--- a/util/generic/algorithm.h
+++ b/util/generic/algorithm.h
@@ -31,7 +31,7 @@ namespace NPrivate {
 
         return bestPos;
     }
-}
+} // namespace NPrivate
 
 template <class T>
 constexpr void Sort(T f, T l) {
@@ -585,7 +585,7 @@ namespace NPrivate {
         ::ApplyToMany(std::forward<TOp>(op), std::get<Is>(std::forward<T>(t))...);
 #endif
     }
-}
+} // namespace NPrivate
 
 // check that TOp return true for all of element from tuple T
 template <class T, class TOp>
@@ -723,7 +723,7 @@ namespace NPrivate {
     constexpr TForwardIterator AdjacentFindBy(TForwardIterator begin, TForwardIterator end, const TGetKey& getKey) {
         return std::adjacent_find(begin, end, [&](auto&& left, auto&& right) { return getKey(left) == getKey(right); });
     }
-}
+} // namespace NPrivate
 
 template <class TContainer, class TGetKey>
 constexpr auto AdjacentFindBy(TContainer&& c, const TGetKey& getKey) {
diff --git a/util/generic/algorithm_ut.cpp b/util/generic/algorithm_ut.cpp
index efaa8ddd5d..51b6e12264 100644
--- a/util/generic/algorithm_ut.cpp
+++ b/util/generic/algorithm_ut.cpp
@@ -903,4 +903,4 @@ Y_UNIT_TEST_SUITE(TAlgorithm) {
         std::vector<int> v = {1, 2, 777};
         UNIT_ASSERT_VALUES_EQUAL(TString("begin;1;2;777"), Accumulate(v, TString("begin"), [](auto&& a, auto& b) { return a + ";" + ToString(b); }));
     }
-}
+} // Y_UNIT_TEST_SUITE(TAlgorithm)
diff --git a/util/generic/array_ref_ut.cpp b/util/generic/array_ref_ut.cpp
index c71fb61344..67b1cf423f 100644
--- a/util/generic/array_ref_ut.cpp
+++ b/util/generic/array_ref_ut.cpp
@@ -319,4 +319,4 @@ Y_UNIT_TEST_SUITE(TestArrayRef) {
         const TVector<int> constData;
         Foo(MakeConstArrayRef(constData));
     }
-}
+} // Y_UNIT_TEST_SUITE(TestArrayRef)
diff --git a/util/generic/array_size.h b/util/generic/array_size.h
index 4d5f18ce63..16ecc03646 100644
--- a/util/generic/array_size.h
+++ b/util/generic/array_size.h
@@ -19,6 +19,6 @@ namespace NArraySizePrivate {
             Result = N
         };
     };
-}
+} // namespace NArraySizePrivate
 
 #define Y_ARRAY_SIZE(arr) ((size_t)::NArraySizePrivate::TArraySize<decltype(arr)>::Result)
diff --git a/util/generic/array_size_ut.cpp b/util/generic/array_size_ut.cpp
index 13f45903c5..14283c1610 100644
--- a/util/generic/array_size_ut.cpp
+++ b/util/generic/array_size_ut.cpp
@@ -19,4 +19,4 @@ Y_UNIT_TEST_SUITE(ArraySizeTest) {
 
         UNIT_ASSERT_VALUES_EQUAL(Y_ARRAY_SIZE(x), 1);
     }
-}
+} // Y_UNIT_TEST_SUITE(ArraySizeTest)
diff --git a/util/generic/bitmap.h b/util/generic/bitmap.h
index 97eb9408c2..929f23a883 100644
--- a/util/generic/bitmap.h
+++ b/util/generic/bitmap.h
@@ -294,7 +294,7 @@ namespace NBitMapPrivate {
         static constexpr size_t Value = 0;
     };
 
-}
+} // namespace NBitMapPrivate
 
 template <size_t BitCount, typename TChunkType>
 struct TFixedBitMapTraits {
diff --git a/util/generic/bitmap_ut.cpp b/util/generic/bitmap_ut.cpp
index 087d34a8dc..e7b4ecba7b 100644
--- a/util/generic/bitmap_ut.cpp
+++ b/util/generic/bitmap_ut.cpp
@@ -594,4 +594,4 @@ Y_UNIT_TEST_SUITE(TBitMapTest) {
             UNIT_ASSERT_VALUES_EQUAL(bm.Get(k), k >= 1 && k < 2048 ? 0 : 1);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TBitMapTest)
diff --git a/util/generic/bitops.cpp b/util/generic/bitops.cpp
index db5667a21f..e719b16040 100644
--- a/util/generic/bitops.cpp
+++ b/util/generic/bitops.cpp
@@ -137,5 +137,5 @@ namespace NBitOps {
             ~0x7FFFFFFFFFFFFFFFULL,
             ~0xFFFFFFFFFFFFFFFFULL,
         };
-    }
-}
+    } // namespace NPrivate
+} // namespace NBitOps
diff --git a/util/generic/bitops.h b/util/generic/bitops.h
index 2db15fc59b..0a2396bfee 100644
--- a/util/generic/bitops.h
+++ b/util/generic/bitops.h
@@ -197,8 +197,8 @@ namespace NBitOps {
         }
     #endif
 #endif
-    }
-}
+    } // namespace NPrivate
+} // namespace NBitOps
 
 /**
  * Computes the next power of 2 higher or equal to the integer parameter `t`.
diff --git a/util/generic/buffer_ut.cpp b/util/generic/buffer_ut.cpp
index 437d7122ec..52cffb1a30 100644
--- a/util/generic/buffer_ut.cpp
+++ b/util/generic/buffer_ut.cpp
@@ -202,4 +202,4 @@ Y_UNIT_TEST(TestSpeed) {
         UNIT_ASSERT(buf2 == buf1);
     }
 
-}
+} // Y_UNIT_TEST_SUITE(TBufferTest)
diff --git a/util/generic/cast.h b/util/generic/cast.h
index f827bde5cb..882f2ca08f 100644
--- a/util/generic/cast.h
+++ b/util/generic/cast.h
@@ -32,7 +32,7 @@ namespace NPrivate {
     static T DynamicCast(F f) {
         return dynamic_cast<T>(f);
     }
-}
+} // namespace NPrivate
 
 /*
  * replacement for dynamic_cast(dynamic_cast in debug mode, else static_cast)
@@ -104,7 +104,7 @@ namespace NPrivate {
                                        ((std::is_signed<TSmallInt>::value == std::is_signed<TLargeInt>::value && sizeof(TSmallInt) >= sizeof(TLargeInt)) ||
                                         (std::is_signed<TSmallInt>::value && sizeof(TSmallInt) > sizeof(TLargeInt)));
     };
-}
+} // namespace NPrivate
 
 template <class TSmallInt, class TLargeInt>
 constexpr std::enable_if_t<::NPrivate::TSafelyConvertible<TSmallInt, TLargeInt>::Result, TSmallInt> SafeIntegerCast(TLargeInt largeInt) noexcept {
diff --git a/util/generic/explicit_type_ut.cpp b/util/generic/explicit_type_ut.cpp
index 0d443b3589..ace81be987 100644
--- a/util/generic/explicit_type_ut.cpp
+++ b/util/generic/explicit_type_ut.cpp
@@ -51,4 +51,4 @@ Y_UNIT_TEST_SUITE(TestExplicitType) {
         UNIT_ASSERT_VALUES_EQUAL(static_cast<bool>(TCallable<TExplicitlyCallable<IntConstructible>, IntConvertible>::Result), false);
         UNIT_ASSERT_VALUES_EQUAL(static_cast<bool>(TCallable<TExplicitlyCallable<IntConstructible>, int>::Result), false);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestExplicitType)
diff --git a/util/generic/flags.h b/util/generic/flags.h
index e11163a2f4..de56e8b599 100644
--- a/util/generic/flags.h
+++ b/util/generic/flags.h
@@ -9,7 +9,7 @@
 class IOutputStream;
 namespace NPrivate {
     void PrintFlags(IOutputStream& stream, ui64 value, size_t size);
-}
+} // namespace NPrivate
 
 /**
  * `TFlags` wrapper provides a type-safe mechanism for storing OR combinations
diff --git a/util/generic/flags_ut.cpp b/util/generic/flags_ut.cpp
index fc2f73db92..25f6f4eba9 100644
--- a/util/generic/flags_ut.cpp
+++ b/util/generic/flags_ut.cpp
@@ -29,7 +29,7 @@ namespace {
                             Three = 3 };
     Y_DECLARE_FLAGS(ETestFlags3, ETestFlag3);
     Y_DECLARE_OPERATORS_FOR_FLAGS(ETestFlags3);
-}
+} // namespace
 
 Y_UNIT_TEST_SUITE(TFlagsTest) {
     template <class Enum>
@@ -124,4 +124,4 @@ Y_UNIT_TEST_SUITE(TFlagsTest) {
         auto badFlags = ETest1::FromBaseType(badValue);
         UNIT_ASSERT_VALUES_EQUAL(badValue, badFlags.ToBaseType());
     }
-}
+} // Y_UNIT_TEST_SUITE(TFlagsTest)
diff --git a/util/generic/function.h b/util/generic/function.h
index 75f5422e68..654b0a4a33 100644
--- a/util/generic/function.h
+++ b/util/generic/function.h
@@ -65,7 +65,7 @@ namespace NPrivate {
     struct TFuncInfo<R(Args...)> {
         typedef R TSignature(Args...);
     };
-}
+} // namespace NPrivate
 
 template <class C>
 using TFunctionSignature = typename ::NPrivate::TFuncInfo<::NPrivate::TRemoveClass<std::remove_reference_t<std::remove_pointer_t<C>>>>::TSignature;
diff --git a/util/generic/function_ref_ut.cpp b/util/generic/function_ref_ut.cpp
index 59f9ae35cd..45506beeeb 100644
--- a/util/generic/function_ref_ut.cpp
+++ b/util/generic/function_ref_ut.cpp
@@ -147,4 +147,4 @@ Y_UNIT_TEST_SUITE(TestFunctionRef) {
         ref(std::make_unique<int>(5), x);
         UNIT_ASSERT_EQUAL(x, 'a');
     }
-}
+} // Y_UNIT_TEST_SUITE(TestFunctionRef)
diff --git a/util/generic/function_ut.cpp b/util/generic/function_ut.cpp
index f46188aa2a..d53cabe4fd 100644
--- a/util/generic/function_ut.cpp
+++ b/util/generic/function_ut.cpp
@@ -135,4 +135,4 @@ Y_UNIT_TEST_SUITE(TestFunctionSignature) {
         TestCT<decltype(fffn)>();
         TestCT<decltype(fffcn)>();
     }
-}
+} // Y_UNIT_TEST_SUITE(TestFunctionSignature)
diff --git a/util/generic/fwd.h b/util/generic/fwd.h
index 16e595fde3..9bed19bdaf 100644
--- a/util/generic/fwd.h
+++ b/util/generic/fwd.h
@@ -154,7 +154,7 @@ using TMallocPtr = TAutoPtr<T, TFree>;
 // maybe
 namespace NMaybe {
     struct TPolicyUndefinedExcept;
-}
+} // namespace NMaybe
 
 template <class T, class Policy = ::NMaybe::TPolicyUndefinedExcept>
 class TMaybe;
diff --git a/util/generic/guid.cpp b/util/generic/guid.cpp
index 8b907457bc..0d20c467cc 100644
--- a/util/generic/guid.cpp
+++ b/util/generic/guid.cpp
@@ -14,7 +14,7 @@ namespace {
             c = AsciiToLower(c);
         }
     }
-}
+} // namespace
 
 TString TGUID::AsGuidString() const {
     TStringBuilder s;
diff --git a/util/generic/guid_ut.cpp b/util/generic/guid_ut.cpp
index a48b749e4c..f6a155b89e 100644
--- a/util/generic/guid_ut.cpp
+++ b/util/generic/guid_ut.cpp
@@ -125,4 +125,4 @@ Y_UNIT_TEST_SUITE(TGuidTest) {
         UNIT_ASSERT(!guid.empty());
         UNIT_ASSERT_EQUAL(guid[14], '1');
     }
-}
+} // Y_UNIT_TEST_SUITE(TGuidTest)
diff --git a/util/generic/hash_primes.h b/util/generic/hash_primes.h
index 4dc2da0b8f..fe9b829acd 100644
--- a/util/generic/hash_primes.h
+++ b/util/generic/hash_primes.h
@@ -129,7 +129,7 @@ namespace NPrivate {
     using THashDivisor = ::NPrivate::TNaiveDivisor<ui32, ui64>;
     #endif
 #endif
-}
+} // namespace NPrivate
 
 Y_CONST_FUNCTION
 ::NPrivate::THashDivisor HashBucketCountExt(unsigned long elementCount);
diff --git a/util/generic/hash_primes_ut.cpp b/util/generic/hash_primes_ut.cpp
index 7b5bf8b5c9..f0117934c8 100644
--- a/util/generic/hash_primes_ut.cpp
+++ b/util/generic/hash_primes_ut.cpp
@@ -77,4 +77,4 @@ Y_UNIT_TEST_SUITE(TestHashPrimes) {
             }
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TestHashPrimes)
diff --git a/util/generic/hash_table.h b/util/generic/hash_table.h
index 0fbbef6789..5976881a71 100644
--- a/util/generic/hash_table.h
+++ b/util/generic/hash_table.h
@@ -1431,7 +1431,7 @@ namespace NPrivate {
     }
 
     [[noreturn]] void ThrowKeyNotFoundInHashTableException(const TStringBuf keyRepresentation);
-}
+} // namespace NPrivate
 
 // Cannot name it just 'Hash' because it clashes with too many class members in the code.
 template <class T>
diff --git a/util/generic/hash_ut.cpp b/util/generic/hash_ut.cpp
index 78fc5657ce..8611ca473d 100644
--- a/util/generic/hash_ut.cpp
+++ b/util/generic/hash_ut.cpp
@@ -683,7 +683,7 @@ namespace {
             return **it;
         }
     };
-}
+} // namespace
 
 void THashTest::TestResizeOnInsertSmartPtrBug() {
     TItemMap map;
@@ -1255,7 +1255,7 @@ namespace {
             return A == o.A && B == o.B;
         }
     };
-}
+} // namespace
 
 template <>
 struct THash<TFoo> {
diff --git a/util/generic/is_in.h b/util/generic/is_in.h
index 643edba596..d1b786c4f9 100644
--- a/util/generic/is_in.h
+++ b/util/generic/is_in.h
@@ -34,7 +34,7 @@ namespace NIsInHelper {
             return c.find(e) != c.end();
         }
     };
-}
+} // namespace NIsInHelper
 
 template <class I, class T>
 constexpr bool IsIn(I f, I l, const T& v) {
diff --git a/util/generic/is_in_ut.cpp b/util/generic/is_in_ut.cpp
index 763018a088..9bb2de2b12 100644
--- a/util/generic/is_in_ut.cpp
+++ b/util/generic/is_in_ut.cpp
@@ -114,4 +114,4 @@ Y_UNIT_TEST_SUITE(TIsIn) {
         UNIT_ASSERT(!IsIn(array, "c"));
         UNIT_ASSERT(IsIn(array, TStringBuf("d")));
     }
-}
+} // Y_UNIT_TEST_SUITE(TIsIn)
diff --git a/util/generic/iterator_range_ut.cpp b/util/generic/iterator_range_ut.cpp
index a7e3670ae1..277097ef2d 100644
--- a/util/generic/iterator_range_ut.cpp
+++ b/util/generic/iterator_range_ut.cpp
@@ -95,4 +95,4 @@ Y_UNIT_TEST_SUITE(IteratorRange) {
         // we should be able to use TIteratorRange as a container parameter for standard algorithms
         UNIT_ASSERT(AllOf(range, [](int x) { return x > 0; }));
     }
-}
+} // Y_UNIT_TEST_SUITE(IteratorRange)
diff --git a/util/generic/iterator_ut.cpp b/util/generic/iterator_ut.cpp
index 00be19e10e..87aec40afd 100644
--- a/util/generic/iterator_ut.cpp
+++ b/util/generic/iterator_ut.cpp
@@ -8,7 +8,7 @@ Y_UNIT_TEST_SUITE(TIterator) {
         UNIT_ASSERT_VALUES_EQUAL(*std::prev(x.end()), *ToForwardIterator(x.rbegin()));
         UNIT_ASSERT_VALUES_EQUAL(*ToForwardIterator(std::prev(x.rend())), *x.begin());
     }
-}
+} // Y_UNIT_TEST_SUITE(TIterator)
 
 Y_UNIT_TEST_SUITE(TInputRangeAdaptor) {
     class TSquaresGenerator: public TInputRangeAdaptor<TSquaresGenerator> {
@@ -60,4 +60,4 @@ Y_UNIT_TEST_SUITE(TInputRangeAdaptor) {
         }
         UNIT_ASSERT(expected_part == expected.end());
     }
-}
+} // Y_UNIT_TEST_SUITE(TInputRangeAdaptor)
diff --git a/util/generic/lazy_value_ut.cpp b/util/generic/lazy_value_ut.cpp
index ff5a0156c5..aafbcb4493 100644
--- a/util/generic/lazy_value_ut.cpp
+++ b/util/generic/lazy_value_ut.cpp
@@ -154,4 +154,4 @@ Y_UNIT_TEST_SUITE(TLazyValueTestSuite) {
         UNIT_ASSERT(lv.GetRef() == 100500);
         UNIT_ASSERT(lv.WasLazilyInitialized());
     }
-}
+} // Y_UNIT_TEST_SUITE(TLazyValueTestSuite)
diff --git a/util/generic/list_ut.cpp b/util/generic/list_ut.cpp
index 9e60ecf01b..f9e6a5cb6b 100644
--- a/util/generic/list_ut.cpp
+++ b/util/generic/list_ut.cpp
@@ -11,4 +11,4 @@ Y_UNIT_TEST_SUITE(TYListSuite) {
         expected.push_back(6);
         UNIT_ASSERT_VALUES_EQUAL(l, expected);
     }
-}
+} // Y_UNIT_TEST_SUITE(TYListSuite)
diff --git a/util/generic/map_ut.cpp b/util/generic/map_ut.cpp
index c5a4037006..4f698c9612 100644
--- a/util/generic/map_ut.cpp
+++ b/util/generic/map_ut.cpp
@@ -493,4 +493,4 @@ Y_UNIT_TEST_SUITE(TYMapTest) {
         UNIT_ASSERT(movedM.contains(0));
         UNIT_ASSERT_VALUES_EQUAL(1, movedM[0]);
     }
-}
+} // Y_UNIT_TEST_SUITE(TYMapTest)
diff --git a/util/generic/mapfindptr_ut.cpp b/util/generic/mapfindptr_ut.cpp
index e7ff3bb8e7..21dd007bf8 100644
--- a/util/generic/mapfindptr_ut.cpp
+++ b/util/generic/mapfindptr_ut.cpp
@@ -65,4 +65,4 @@ Y_UNIT_TEST_SUITE(TMapFindPtrTest) {
         UNIT_ASSERT_VALUES_EQUAL(a.ValueRef(2, str123), "123");
         UNIT_ASSERT_VALUES_EQUAL(a.ValueRef(3, str1234), "1234");
     }
-}
+} // Y_UNIT_TEST_SUITE(TMapFindPtrTest)
diff --git a/util/generic/maybe.h b/util/generic/maybe.h
index ba15c7d7e4..46468e5166 100644
--- a/util/generic/maybe.h
+++ b/util/generic/maybe.h
@@ -18,7 +18,7 @@ namespace NMaybe {
     struct TPolicyUndefinedFail {
         [[noreturn]] static void OnEmpty(const std::type_info& valueTypeInfo);
     };
-}
+} // namespace NMaybe
 
 struct TNothing {
     explicit constexpr TNothing(int) noexcept {
diff --git a/util/generic/maybe_traits.h b/util/generic/maybe_traits.h
index 702912c8fa..fc456a0a76 100644
--- a/util/generic/maybe_traits.h
+++ b/util/generic/maybe_traits.h
@@ -179,7 +179,7 @@ namespace NMaybe {
             return *this;
         }
     };
-}
+} // namespace NMaybe
 
 template <class T>
 using TMaybeBase = NMaybe::TMoveAssignBase<T>;
diff --git a/util/generic/maybe_ut.cpp b/util/generic/maybe_ut.cpp
index 84964b8e8b..0139208116 100644
--- a/util/generic/maybe_ut.cpp
+++ b/util/generic/maybe_ut.cpp
@@ -1123,4 +1123,4 @@ Y_UNIT_TEST_SUITE(TMaybeTest) {
         TMaybe<TStringBuf> v;
         UNIT_ASSERT_EXCEPTION_CONTAINS(v.GetRef(), yexception, "StringBuf");
     }
-}
+} // Y_UNIT_TEST_SUITE(TMaybeTest)
diff --git a/util/generic/mem_copy_ut.cpp b/util/generic/mem_copy_ut.cpp
index 8b55a11cf6..133d9deddc 100644
--- a/util/generic/mem_copy_ut.cpp
+++ b/util/generic/mem_copy_ut.cpp
@@ -16,7 +16,7 @@ namespace {
 
     struct TC: public TB {
     };
-}
+} // namespace
 
 Y_DECLARE_PODTYPE(TB);
 
@@ -110,4 +110,4 @@ Y_UNIT_TEST_SUITE(TestMemCopy) {
         UNIT_ASSERT(MemCopy(tmp, tmp, 0) == nullptr);
         UNIT_ASSERT(MemMove(tmp, tmp, 0) == nullptr);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestMemCopy)
diff --git a/util/generic/noncopyable.h b/util/generic/noncopyable.h
index c007934133..81e33b5682 100644
--- a/util/generic/noncopyable.h
+++ b/util/generic/noncopyable.h
@@ -32,7 +32,7 @@ namespace NNonCopyable { // protection from unintended ADL
         TMoveOnly() = default;
         ~TMoveOnly() = default;
     };
-}
+} // namespace NNonCopyable
 
 using TNonCopyable = NNonCopyable::TNonCopyable;
 using TMoveOnly = NNonCopyable::TMoveOnly;
diff --git a/util/generic/objects_counter_ut.cpp b/util/generic/objects_counter_ut.cpp
index 4d5da37a56..0fa50b8d7f 100644
--- a/util/generic/objects_counter_ut.cpp
+++ b/util/generic/objects_counter_ut.cpp
@@ -33,4 +33,4 @@ Y_UNIT_TEST_SUITE(ObjectsCounter) {
         }
         UNIT_ASSERT_EQUAL(TObjectCounter<TObject>::ObjectCount(), 1);
     }
-}
+} // Y_UNIT_TEST_SUITE(ObjectsCounter)
diff --git a/util/generic/overloaded_ut.cpp b/util/generic/overloaded_ut.cpp
index f3d73895ad..34bef66f90 100644
--- a/util/generic/overloaded_ut.cpp
+++ b/util/generic/overloaded_ut.cpp
@@ -11,7 +11,7 @@ namespace {
     struct TType1 {};
     struct TType2 {};
     struct TType3 {};
-}
+} // namespace
 
 Y_UNIT_TEST_SUITE(TOverloadedTest) {
     Y_UNIT_TEST(StaticTest) {
@@ -79,4 +79,4 @@ Y_UNIT_TEST_SUITE(TOverloadedTest) {
         UNIT_ASSERT_VALUES_EQUAL(matchAsDouble(TTestVariant{12345}), 12345.0);
         UNIT_ASSERT_VALUES_EQUAL(matchAsDouble(TTestVariant{'X'}), 88.0);
     }
-}
+} // Y_UNIT_TEST_SUITE(TOverloadedTest)
diff --git a/util/generic/ptr_ut.cpp b/util/generic/ptr_ut.cpp
index 1e84e4fadb..84e11886c9 100644
--- a/util/generic/ptr_ut.cpp
+++ b/util/generic/ptr_ut.cpp
@@ -385,7 +385,7 @@ namespace NTestIntrusiveConvertion {
 
     void Func(TIntrusiveConstPtr<TB>) {
     }
-}
+} // namespace NTestIntrusiveConvertion
 
 void TPointerTest::TestIntrusiveConvertion() {
     using namespace NTestIntrusiveConvertion;
@@ -559,7 +559,7 @@ namespace {
         }
     };
 
-}
+} // namespace
 
 void TPointerTest::TestOperatorBool() {
     using TVec = TVector<ui32>;
diff --git a/util/generic/queue_ut.cpp b/util/generic/queue_ut.cpp
index 43ba89559a..bc901ba8aa 100644
--- a/util/generic/queue_ut.cpp
+++ b/util/generic/queue_ut.cpp
@@ -243,4 +243,4 @@ Y_UNIT_TEST_SUITE(TYQueueTest) {
 
         UNIT_ASSERT(q.empty());
     }
-}
+} // Y_UNIT_TEST_SUITE(TYQueueTest)
diff --git a/util/generic/reserve.h b/util/generic/reserve.h
index 81ceed19dc..87fe4a325f 100644
--- a/util/generic/reserve.h
+++ b/util/generic/reserve.h
@@ -4,7 +4,7 @@ namespace NDetail {
     struct TReserveTag {
         size_t Capacity;
     };
-}
+} // namespace NDetail
 
 constexpr ::NDetail::TReserveTag Reserve(size_t capacity) {
     return ::NDetail::TReserveTag{capacity};
diff --git a/util/generic/scope.h b/util/generic/scope.h
index b2c33af61e..0761e2962f 100644
--- a/util/generic/scope.h
+++ b/util/generic/scope.h
@@ -36,7 +36,7 @@ namespace NPrivate {
             return std::forward<F>(function);
         }
     };
-}
+} // namespace NPrivate
 
 // \brief `Y_SCOPE_EXIT(captures) { body };`
 //
diff --git a/util/generic/scope_ut.cpp b/util/generic/scope_ut.cpp
index bdb434d487..2df66fda57 100644
--- a/util/generic/scope_ut.cpp
+++ b/util/generic/scope_ut.cpp
@@ -44,4 +44,4 @@ Y_UNIT_TEST_SUITE(ScopeToolsTest) {
 
         UNIT_ASSERT_VALUES_EQUAL(i, 20);
     }
-}
+} // Y_UNIT_TEST_SUITE(ScopeToolsTest)
diff --git a/util/generic/serialized_enum.h b/util/generic/serialized_enum.h
index 8188c43eed..352cd04dc8 100644
--- a/util/generic/serialized_enum.h
+++ b/util/generic/serialized_enum.h
@@ -41,7 +41,7 @@ namespace NEnumSerializationRuntime {
 
         template <typename TEnumType, typename TRepresentationType, typename TValueType, class TStorage = TMap<TRepresentationType, TValueType>>
         class TMappedDictView;
-    }
+    } // namespace NDetail
 
     /// Class with behaviour similar to TMap<EnumT, TValueType>
     template <typename EnumT, typename TValueType>
@@ -89,7 +89,7 @@ namespace NEnumSerializationRuntime {
      */
     template <typename EnumT>
     TStringBuf ToStringBuf(EnumT e);
-}
+} // namespace NEnumSerializationRuntime
 
 /**
  * Returns names for items in enum or enum class
@@ -403,5 +403,5 @@ namespace NEnumSerializationRuntime {
         private:
             const TStorage& Ref;
         };
-    }
-}
+    } // namespace NDetail
+} // namespace NEnumSerializationRuntime
diff --git a/util/generic/serialized_enum_ut.cpp b/util/generic/serialized_enum_ut.cpp
index 3a94e1d471..92ddff98b0 100644
--- a/util/generic/serialized_enum_ut.cpp
+++ b/util/generic/serialized_enum_ut.cpp
@@ -117,4 +117,4 @@ Y_UNIT_TEST_SUITE(TestSerializedEnum) {
         UNIT_ASSERT_VALUES_EQUAL(materialized.size(), map.size());
         UNIT_ASSERT_VALUES_EQUAL(materialized.at(ETestEnum::Four), 16);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestSerializedEnum)
diff --git a/util/generic/set_ut.cpp b/util/generic/set_ut.cpp
index 91ab2896d2..bbaeb6a5b4 100644
--- a/util/generic/set_ut.cpp
+++ b/util/generic/set_ut.cpp
@@ -405,4 +405,4 @@ Y_UNIT_TEST_SUITE(YSetTest) {
             UNIT_ASSERT(ckeySet.equal_range(2) != std::make_pair(ckeySet.begin(), ckeySet.end()));
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(YSetTest)
diff --git a/util/generic/singleton.cpp b/util/generic/singleton.cpp
index 51174616a7..43d626e7f0 100644
--- a/util/generic/singleton.cpp
+++ b/util/generic/singleton.cpp
@@ -26,7 +26,7 @@ namespace {
         // clash almost impossible, ONLY if we have threads with ids 0 and 1!
         return 1;
     }
-}
+} // namespace
 
 void NPrivate::FillWithTrash(void* ptr, size_t len) {
 #if defined(NDEBUG)
diff --git a/util/generic/singleton.h b/util/generic/singleton.h
index ed01efb213..5a7167107e 100644
--- a/util/generic/singleton.h
+++ b/util/generic/singleton.h
@@ -103,7 +103,7 @@ namespace NPrivate {
 
         T* D;
     };
-}
+} // namespace NPrivate
 
 #define Y_DECLARE_SINGLETON_FRIEND()                \
     template <class T, size_t P, class... TArgs>    \
diff --git a/util/generic/singleton_ut.cpp b/util/generic/singleton_ut.cpp
index 35ba90cd76..062dc6c2bd 100644
--- a/util/generic/singleton_ut.cpp
+++ b/util/generic/singleton_ut.cpp
@@ -43,4 +43,4 @@ Y_UNIT_TEST_SUITE(TestSingleton) {
         }
         UNIT_ASSERT_VALUES_EQUAL(Default<TWithParams>().Data1, 0);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestSingleton)
diff --git a/util/generic/size_literals.h b/util/generic/size_literals.h
index 273fffcce5..b21971727a 100644
--- a/util/generic/size_literals.h
+++ b/util/generic/size_literals.h
@@ -42,7 +42,7 @@ namespace NPrivate {
                    ? static_cast<i64>(value)
                    : ythrow yexception() << "The resulting value " << value << " does not fit into the i64 type";
     }
-}
+} // namespace NPrivate
 
 constexpr i64 operator"" _KBs(const unsigned long long value) noexcept {
     return ::NPrivate::SignedCast(value * 1024);
diff --git a/util/generic/stack_ut.cpp b/util/generic/stack_ut.cpp
index 248127d326..637fa65040 100644
--- a/util/generic/stack_ut.cpp
+++ b/util/generic/stack_ut.cpp
@@ -13,4 +13,4 @@ Y_UNIT_TEST_SUITE(TYStackTest) {
         UNIT_ASSERT(s);
         UNIT_ASSERT(!s.empty());
     }
-}
+} // Y_UNIT_TEST_SUITE(TYStackTest)
diff --git a/util/generic/store_policy_ut.cpp b/util/generic/store_policy_ut.cpp
index d361338dfa..3df7451744 100644
--- a/util/generic/store_policy_ut.cpp
+++ b/util/generic/store_policy_ut.cpp
@@ -114,4 +114,4 @@ Y_UNIT_TEST_SUITE(StorePolicy) {
         TestWrapperConstructors<TNoDefaultConstructible>();
         TestWrapperConstructors<TVector<short>>();
     }
-}
+} // Y_UNIT_TEST_SUITE(StorePolicy)
diff --git a/util/generic/strbase.h b/util/generic/strbase.h
index c451dd752f..60041ab107 100644
--- a/util/generic/strbase.h
+++ b/util/generic/strbase.h
@@ -32,7 +32,7 @@ namespace NStringPrivate {
         Y_ASSERT(s);
         return strnlen(s, maxlen);
     }
-}
+} // namespace NStringPrivate
 
 template <typename TDerived, typename TCharType, typename TTraitsType = std::char_traits<TCharType>>
 class TStringBase {
diff --git a/util/generic/strbuf_ut.cpp b/util/generic/strbuf_ut.cpp
index 092940d305..2e3fc6a3bc 100644
--- a/util/generic/strbuf_ut.cpp
+++ b/util/generic/strbuf_ut.cpp
@@ -362,7 +362,7 @@ Y_UNIT_TEST_SUITE(TStrBufTest) {
         static_assert(std::is_same_v<decltype(s), TStringBuf>);
         UNIT_ASSERT_VALUES_EQUAL(s, TStringBuf("123"));
     }
-}
+} // Y_UNIT_TEST_SUITE(TStrBufTest)
 
 Y_UNIT_TEST_SUITE(TWtrBufTest) {
     Y_UNIT_TEST(TestConstExpr) {
@@ -388,4 +388,4 @@ Y_UNIT_TEST_SUITE(TWtrBufTest) {
 
         static_assert(str1 == str2);
     }
-}
+} // Y_UNIT_TEST_SUITE(TWtrBufTest)
diff --git a/util/generic/string.h b/util/generic/string.h
index fe4be818cc..b71bb72304 100644
--- a/util/generic/string.h
+++ b/util/generic/string.h
@@ -1252,7 +1252,7 @@ namespace std {
             return NHashPrivate::ComputeStringHash(s.data(), s.size());
         }
     };
-}
+} // namespace std
 
 #undef Y_NOEXCEPT
 
diff --git a/util/generic/string_hash.h b/util/generic/string_hash.h
index 54eaaf942a..c467d864d5 100644
--- a/util/generic/string_hash.h
+++ b/util/generic/string_hash.h
@@ -19,4 +19,4 @@ namespace NHashPrivate {
         return MurmurHash<size_t>(ptr, size * sizeof(C));
 #endif
     }
-}
+} // namespace NHashPrivate
diff --git a/util/generic/string_transparent_hash_ut.cpp b/util/generic/string_transparent_hash_ut.cpp
index a03fc7e6d7..e94f550a7c 100644
--- a/util/generic/string_transparent_hash_ut.cpp
+++ b/util/generic/string_transparent_hash_ut.cpp
@@ -28,4 +28,4 @@ Y_UNIT_TEST_SUITE(StringHashFunctorTests) {
         UNIT_ASSERT_UNEQUAL(s.find(TStringBuf("foo")), s.end());
         UNIT_ASSERT_EQUAL(s.find(TStringBuf("bar")), s.end());
     }
-}
+} // Y_UNIT_TEST_SUITE(StringHashFunctorTests)
diff --git a/util/generic/string_ut.cpp b/util/generic/string_ut.cpp
index 60dbf82a8b..bfd86bb07e 100644
--- a/util/generic/string_ut.cpp
+++ b/util/generic/string_ut.cpp
@@ -1165,7 +1165,7 @@ Y_UNIT_TEST_SUITE(TStringConversionTest) {
         std::string_view stdAbra = abra;
         UNIT_ASSERT_VALUES_EQUAL(stdAbra, "cadabra");
     }
-}
+} // Y_UNIT_TEST_SUITE(TStringConversionTest)
 
 Y_UNIT_TEST_SUITE(HashFunctorTests) {
     Y_UNIT_TEST(TestTransparency) {
@@ -1178,7 +1178,7 @@ Y_UNIT_TEST_SUITE(HashFunctorTests) {
         UNIT_ASSERT_VALUES_EQUAL(h(ptr), h(str));
         UNIT_ASSERT_VALUES_EQUAL(h(ptr), h(stdStr));
     }
-}
+} // Y_UNIT_TEST_SUITE(HashFunctorTests)
 
 #if !defined(TSTRING_IS_STD_STRING)
 Y_UNIT_TEST_SUITE(StdNonConformant) {
@@ -1208,7 +1208,7 @@ Y_UNIT_TEST_SUITE(StdNonConformant) {
         UNIT_ASSERT_VALUES_EQUAL(s, "xabc");
         UNIT_ASSERT_VALUES_EQUAL(TString(s.c_str()), "xabc");
     }
-}
+} // Y_UNIT_TEST_SUITE(StdNonConformant)
 #endif
 
 Y_UNIT_TEST_SUITE(Interop) {
@@ -1243,4 +1243,4 @@ Y_UNIT_TEST_SUITE(Interop) {
     Y_UNIT_TEST(TestTemp) {
         UNIT_ASSERT_VALUES_EQUAL("x" + ConstRef(TString("y")), "xy");
     }
-}
+} // Y_UNIT_TEST_SUITE(Interop)
diff --git a/util/generic/typelist.h b/util/generic/typelist.h
index abac46904f..c6840cfbbb 100644
--- a/util/generic/typelist.h
+++ b/util/generic/typelist.h
@@ -19,7 +19,7 @@ namespace NTL {
     struct TGetImpl<0u, TL> {
         using type = typename TL::THead;
     };
-}
+} // namespace NTL
 
 template <>
 struct TTypeList<> {
@@ -93,7 +93,7 @@ namespace NTL {
 
     using T1 = TTypeSelector<char, TCommonSignedInts, TCommonUnsignedInts>;
     using T2 = TTypeSelector<wchar_t, T1::TSignedInts, T1::TUnsignedInts>;
-}
+} // namespace NTL
 
 using TSignedInts = NTL::T2::TSignedInts;
 using TUnsignedInts = NTL::T2::TUnsignedInts;
diff --git a/util/generic/typetraits.h b/util/generic/typetraits.h
index 09aebcbad7..55ab3d5ba6 100644
--- a/util/generic/typetraits.h
+++ b/util/generic/typetraits.h
@@ -46,7 +46,7 @@ namespace NPrivate {
         }
         return false;
     }
-}
+} // namespace NPrivate
 
 #if _LIBCPP_STD_VER >= 17 && !defined(_MSC_VER)
 // Disable std::conjunction for MSVC by analogy with std::disjunction.
@@ -93,7 +93,7 @@ public:
 namespace NPrivate {
     template <class T>
     struct TIsSmall: std::integral_constant<bool, (sizeof(T) <= sizeof(void*))> {};
-}
+} // namespace NPrivate
 
 template <class T>
 class TTypeTraits: public TTypeTraitsBase<T> {
@@ -273,7 +273,7 @@ namespace NPrivate {
 
         using TType = decltype(Check(std::declval<TDerived*>()));
     };
-}
+} // namespace NPrivate
 
 template <template <class...> class T, class U>
 struct TIsSpecializationOf: std::false_type {};
@@ -328,7 +328,7 @@ namespace NPrivate {
 
     template <typename T>
     std::false_type IsIterableImpl(...);
-}
+} // namespace NPrivate
 
 template <typename T>
 using TIsIterable = decltype(NPrivate::IsIterableImpl<T>(0));
diff --git a/util/generic/typetraits_ut.cpp b/util/generic/typetraits_ut.cpp
index 60da8d8086..69a34dd7e4 100644
--- a/util/generic/typetraits_ut.cpp
+++ b/util/generic/typetraits_ut.cpp
@@ -70,7 +70,7 @@ namespace {
     public:
         TEmptyClass Base;
     };
-}
+} // namespace
 
 #define ASSERT_SAME_TYPE(x, y)                     \
     {                                              \
@@ -257,7 +257,7 @@ Y_UNIT_TEST_SUITE(TTypeTraitsTest) {
         UNIT_ASSERT(!std::is_trivially_copyable<TNonTriviallyCopyConstructible>::value);
         UNIT_ASSERT(!std::is_trivially_copyable<TNonTriviallyDestructible>::value);
     }
-}
+} // Y_UNIT_TEST_SUITE(TTypeTraitsTest)
 
 namespace {
     template <typename T>
@@ -377,7 +377,7 @@ namespace {
         enum { IsArithmetic = false };
         enum { IsArray = true };
     };
-}
+} // namespace
 
 #define UNIT_ASSERT_EQUAL_ENUM(expected, actual) UNIT_ASSERT_VALUES_EQUAL((bool)(expected), (bool)(actual))
 
@@ -420,7 +420,7 @@ Y_UNIT_TEST_SUITE(TTypeTraitsTestNg) {
     TYPE_TEST(NonPodClass, TNonPodClass)
     TYPE_TEST(NonPodClassReference, TNonPodClass&)
     TYPE_TEST(NonPodClassConstReference, const TNonPodClass&)
-}
+} // Y_UNIT_TEST_SUITE(TTypeTraitsTestNg)
 
 enum E4 {
     X
diff --git a/util/generic/utility.h b/util/generic/utility.h
index 5362fd4e42..c82c8f489e 100644
--- a/util/generic/utility.h
+++ b/util/generic/utility.h
@@ -94,7 +94,7 @@ namespace NSwapCheck {
             l.swap(r);
         }
     };
-}
+} // namespace NSwapCheck
 
 /*
  * DoSwap better than ::Swap in member functions...
diff --git a/util/generic/va_args_ut.cpp b/util/generic/va_args_ut.cpp
index e3691d4c4a..3fa020504c 100644
--- a/util/generic/va_args_ut.cpp
+++ b/util/generic/va_args_ut.cpp
@@ -40,7 +40,7 @@ Y_UNIT_TEST_SUITE(TMacroVarargMapTest) {
 #undef ADD_ARG
 #undef ID_ARG
     }
-}
+} // Y_UNIT_TEST_SUITE(TMacroVarargMapTest)
 
 Y_UNIT_TEST_SUITE(TestVaArgs) {
     Y_UNIT_TEST(Count) {
@@ -103,4 +103,4 @@ Y_UNIT_TEST_SUITE(TestVaArgs) {
 #undef I2
 #undef I1
     }
-}
+} // Y_UNIT_TEST_SUITE(TestVaArgs)
diff --git a/util/generic/xrange.h b/util/generic/xrange.h
index 5fc8c82912..c28aa8aff2 100644
--- a/util/generic/xrange.h
+++ b/util/generic/xrange.h
@@ -243,7 +243,7 @@ namespace NPrivate {
         const T Finish_;
     };
 
-}
+} // namespace NPrivate
 
 /**
  * generate arithmetic progression that starts at start with certain step and stop at finish (not including)
diff --git a/util/generic/xrange_ut.cpp b/util/generic/xrange_ut.cpp
index 8106da03e7..bebbf25020 100644
--- a/util/generic/xrange_ut.cpp
+++ b/util/generic/xrange_ut.cpp
@@ -214,4 +214,4 @@ Y_UNIT_TEST_SUITE(XRange) {
             UNIT_ASSERT_VALUES_EQUAL(5, *it);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(XRange)
diff --git a/util/generic/yexception.h b/util/generic/yexception.h
index e6507e563f..3e7958126a 100644
--- a/util/generic/yexception.h
+++ b/util/generic/yexception.h
@@ -77,7 +77,7 @@ namespace NPrivateException {
     static inline T&& operator+(const TSourceLocation& sl, T&& t Y_LIFETIME_BOUND) {
         return std::forward<T>(t << sl << TStringBuf(": "));
     }
-}
+} // namespace NPrivateException
 
 class yexception: public NPrivateException::yexception {
 };
@@ -150,7 +150,7 @@ namespace NPrivate {
 
     [[noreturn]] void ThrowYException(const TSimpleExceptionMessage& sm);
     [[noreturn]] void ThrowYExceptionWithBacktrace(const TSimpleExceptionMessage& sm);
-}
+} // namespace NPrivate
 
 void fputs(const std::exception& e, FILE* f = stderr);
 
diff --git a/util/generic/yexception_ut.cpp b/util/generic/yexception_ut.cpp
index b3811ceb48..b2ca4b1fed 100644
--- a/util/generic/yexception_ut.cpp
+++ b/util/generic/yexception_ut.cpp
@@ -34,7 +34,7 @@ namespace NOuter::NInner {
     void Compare10And20() {
         Y_ENSURE(10 > 20);
     }
-}
+} // namespace NOuter::NInner
 
 class TExceptionTest: public TTestBase {
     UNIT_TEST_SUITE(TExceptionTest);
diff --git a/util/generic/ylimits.h b/util/generic/ylimits.h
index fe42b4dfc0..26956d7d56 100644
--- a/util/generic/ylimits.h
+++ b/util/generic/ylimits.h
@@ -30,7 +30,7 @@ namespace NPrivate {
             return Min<T>();
         }
     };
-}
+} // namespace NPrivate
 
 static constexpr ::NPrivate::TMax Max() noexcept {
     return {};
@@ -65,7 +65,7 @@ namespace NPrivate {
     constexpr double MaxCeilValue<0xFFFF'FFFF'FFFF'FFFFull>() {
         return 18446744073709551616.0; // 0x10000000000000000p0
     }
-}
+} // namespace NPrivate
 
 // MaxFloor<T> is the greatest double within the range of T.
 //
diff --git a/util/generic/ymath.h b/util/generic/ymath.h
index 6736c73d34..163e581b7a 100644
--- a/util/generic/ymath.h
+++ b/util/generic/ymath.h
@@ -193,7 +193,7 @@ namespace NUtilMathPrivate {
             return (x % y) ? (quot + 1) : quot;
         }
     };
-}
+} // namespace NUtilMathPrivate
 
 /**
  * @returns Equivalent to ceil((double) x / (double) y) but using only integer arithmetic operations
diff --git a/util/memory/addstorage.h b/util/memory/addstorage.h
index 597c73a988..bcec22e46e 100644
--- a/util/memory/addstorage.h
+++ b/util/memory/addstorage.h
@@ -20,7 +20,7 @@ namespace NPrivate {
     private:
         size_t Length_;
     };
-}
+} // namespace NPrivate
 
 template <class T>
 class alignas(::NPrivate::TAdditionalStorageInfo) TAdditionalStorage {
diff --git a/util/memory/blob_ut.cpp b/util/memory/blob_ut.cpp
index e048f8617a..a3cd84f6cf 100644
--- a/util/memory/blob_ut.cpp
+++ b/util/memory/blob_ut.cpp
@@ -76,4 +76,4 @@ Y_UNIT_TEST_SUITE(TBlobTest) {
         TFsPath(path).Touch();
         TBlob::LockedFromFile(path);
     }
-}
+} // Y_UNIT_TEST_SUITE(TBlobTest)
diff --git a/util/memory/mmapalloc.cpp b/util/memory/mmapalloc.cpp
index ec618cc808..03529160b4 100644
--- a/util/memory/mmapalloc.cpp
+++ b/util/memory/mmapalloc.cpp
@@ -26,7 +26,7 @@ namespace {
             real->~TMappedAllocation();
         }
     };
-}
+} // namespace
 
 IAllocator* MmapAllocator() {
     return SingletonWithPriority<TMmapAllocator, 0>();
diff --git a/util/memory/tempbuf.cpp b/util/memory/tempbuf.cpp
index 27b45dea48..6c21631f42 100644
--- a/util/memory/tempbuf.cpp
+++ b/util/memory/tempbuf.cpp
@@ -147,7 +147,7 @@ namespace {
     private:
         TIntrusiveSList<TPerThreadedBuf> Unused_;
     };
-}
+} // namespace
 
 static inline TTempBufManager* TempBufManager() {
     return FastTlsSingletonWithPriority<TTempBufManager, 2>();
diff --git a/util/network/address.h b/util/network/address.h
index 1e02d976b3..53939bb02c 100644
--- a/util/network/address.h
+++ b/util/network/address.h
@@ -146,4 +146,4 @@ namespace NAddr {
     private:
         TSockAddrLocal SockAddr_;
     };
-}
+} // namespace NAddr
diff --git a/util/network/address_ut.cpp b/util/network/address_ut.cpp
index 28f45172ff..b5c9f06456 100644
--- a/util/network/address_ut.cpp
+++ b/util/network/address_ut.cpp
@@ -36,4 +36,4 @@ Y_UNIT_TEST_SUITE(IRemoteAddr_ToString) {
         TNetworkAddress localAddress2("127.0.0.1", 22);
         UNIT_ASSERT_VALUES_EQUAL(NAddr::IsLoopback(TAddrInfo(&*localAddress2.Begin())), true);
     }
-}
+} // Y_UNIT_TEST_SUITE(IRemoteAddr_ToString)
diff --git a/util/network/endpoint_ut.cpp b/util/network/endpoint_ut.cpp
index d5e40dd6e1..4a7808929c 100644
--- a/util/network/endpoint_ut.cpp
+++ b/util/network/endpoint_ut.cpp
@@ -120,4 +120,4 @@ Y_UNIT_TEST_SUITE(TEndpointTest) {
         UNIT_ASSERT(!ep2.IsUnix());
         UNIT_ASSERT(ep2.SockAddr()->sa_family != AF_UNIX);
     }
-}
+} // Y_UNIT_TEST_SUITE(TEndpointTest)
diff --git a/util/network/hostip.h b/util/network/hostip.h
index cf63e4846a..45bddf5679 100644
--- a/util/network/hostip.h
+++ b/util/network/hostip.h
@@ -13,4 +13,4 @@ namespace NResolver {
 
         return GetHostIP(hostname, ip, &slots);
     }
-}
+} // namespace NResolver
diff --git a/util/network/init.cpp b/util/network/init.cpp
index 430b25c2fc..fa0f06c738 100644
--- a/util/network/init.cpp
+++ b/util/network/init.cpp
@@ -22,7 +22,7 @@ namespace {
 #endif
         }
     };
-}
+} // namespace
 
 void InitNetworkSubSystem() {
     (void)Singleton<TNetworkInit>();
diff --git a/util/network/interface.cpp b/util/network/interface.cpp
index 03c3ccd98d..99e6c3db66 100644
--- a/util/network/interface.cpp
+++ b/util/network/interface.cpp
@@ -78,4 +78,4 @@ namespace NAddr {
 
         return result;
     }
-}
+} // namespace NAddr
diff --git a/util/network/interface.h b/util/network/interface.h
index dda4555021..d37ee4bd01 100644
--- a/util/network/interface.h
+++ b/util/network/interface.h
@@ -14,4 +14,4 @@ namespace NAddr {
     using TNetworkInterfaceList = TVector<TNetworkInterface>;
 
     TNetworkInterfaceList GetNetworkInterfaces();
-}
+} // namespace NAddr
diff --git a/util/network/nonblock.cpp b/util/network/nonblock.cpp
index 2d061ef54c..4bc94bdc98 100644
--- a/util/network/nonblock.cpp
+++ b/util/network/nonblock.cpp
@@ -93,7 +93,7 @@ namespace {
         TAccept4 Accept4;
         bool HaveSockNonBlock;
     };
-}
+} // namespace
 
 SOCKET Accept4(SOCKET s, struct sockaddr* addr, socklen_t* addrlen) {
     return TFeatureCheck::Instance()->FastAccept(s, addr, addrlen);
diff --git a/util/network/poller.cpp b/util/network/poller.cpp
index 7954d0e8b5..1e5860b4af 100644
--- a/util/network/poller.cpp
+++ b/util/network/poller.cpp
@@ -7,7 +7,7 @@ namespace {
     struct TMutexLocking {
         using TMyMutex = TMutex;
     };
-}
+} // namespace
 
 class TSocketPoller::TImpl: public TPollerImpl<TMutexLocking> {
 public:
diff --git a/util/network/poller_ut.cpp b/util/network/poller_ut.cpp
index e5914b7df3..117fcc9802 100644
--- a/util/network/poller_ut.cpp
+++ b/util/network/poller_ut.cpp
@@ -240,4 +240,4 @@ Y_UNIT_TEST_SUITE(TSocketPollerTest) {
         UNIT_ASSERT_EXCEPTION_CONTAINS(poller.Set(nullptr, Max<int>(), CONT_POLL_READ | CONT_POLL_MODIFY), TSystemError, "epoll modify failed");
     }
 #endif
-}
+} // Y_UNIT_TEST_SUITE(TSocketPollerTest)
diff --git a/util/network/sock_ut.cpp b/util/network/sock_ut.cpp
index c702e1ba04..e4ba47d7e5 100644
--- a/util/network/sock_ut.cpp
+++ b/util/network/sock_ut.cpp
@@ -176,4 +176,4 @@ Y_UNIT_TEST_SUITE(TSocketTest) {
         sal.Set(sockPath);
         UNIT_ASSERT_STRINGS_EQUAL(sal.ToString(), "/var/run/some.sock");
     }
-}
+} // Y_UNIT_TEST_SUITE(TSocketTest)
diff --git a/util/network/socket.cpp b/util/network/socket.cpp
index b5d96e9157..0d86ceadfd 100644
--- a/util/network/socket.cpp
+++ b/util/network/socket.cpp
@@ -477,7 +477,7 @@ namespace {
         bool HasFastOpen_;
     };
 #endif
-}
+} // namespace
 
 void SetTcpFastOpen(SOCKET s, int qlen) {
 #if defined(TCP_FASTOPEN)
@@ -965,7 +965,7 @@ namespace {
             return contains(name);
         }
     };
-}
+} // namespace
 
 class TNetworkAddress::TImpl: public TAtomicRefCount<TImpl> {
 private:
diff --git a/util/network/socket.h b/util/network/socket.h
index f345bdaf54..eb637b0a4f 100644
--- a/util/network/socket.h
+++ b/util/network/socket.h
@@ -94,7 +94,7 @@ static inline void FixIPv6ListenSocket(SOCKET s) {
 
 namespace NAddr {
     class IRemoteAddr;
-}
+} // namespace NAddr
 
 void SetSocketTimeout(SOCKET s, long timeout);
 void SetSocketTimeout(SOCKET s, long sec, long msec);
diff --git a/util/random/common_ops.h b/util/random/common_ops.h
index bdfabce2ab..0bbb80f3d3 100644
--- a/util/random/common_ops.h
+++ b/util/random/common_ops.h
@@ -58,7 +58,7 @@ namespace NPrivate {
 
         return rand % max;
     }
-}
+} // namespace NPrivate
 
 template <class TRandType, class T>
 struct TCommonRNG {
diff --git a/util/random/common_ops_ut.cpp b/util/random/common_ops_ut.cpp
index 905912bd1e..b85c6de445 100644
--- a/util/random/common_ops_ut.cpp
+++ b/util/random/common_ops_ut.cpp
@@ -66,4 +66,4 @@ Y_UNIT_TEST_SUITE(TestCommonRNG) {
             UNIT_ASSERT_DOUBLES_EQUAL(nd(r), -0.430375088, 0.01);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TestCommonRNG)
diff --git a/util/random/easy.h b/util/random/easy.h
index fd5b826fbe..72e1db7a6b 100644
--- a/util/random/easy.h
+++ b/util/random/easy.h
@@ -40,7 +40,7 @@ namespace NPrivate {
             return RandomNumber<long double>();
         }
     };
-}
+} // namespace NPrivate
 
 static inline ::NPrivate::TRandom Random() noexcept {
     return {};
diff --git a/util/random/easy_ut.cpp b/util/random/easy_ut.cpp
index d1d024a91f..b3966a8b5a 100644
--- a/util/random/easy_ut.cpp
+++ b/util/random/easy_ut.cpp
@@ -32,4 +32,4 @@ Y_UNIT_TEST_SUITE(TEasyRndInterface) {
             UNIT_ASSERT(x != 0);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TEasyRndInterface)
diff --git a/util/random/entropy.cpp b/util/random/entropy.cpp
index 0fec636e75..4f91f57c63 100644
--- a/util/random/entropy.cpp
+++ b/util/random/entropy.cpp
@@ -206,7 +206,7 @@ namespace {
     };
 
     using TRandomTraits = TDefaultTraits;
-}
+} // namespace
 
 IInputStream& EntropyPool() {
     return TRandomTraits::Instance().EntropyPool();
diff --git a/util/random/entropy_ut.cpp b/util/random/entropy_ut.cpp
index 1ff27203f0..61009c4701 100644
--- a/util/random/entropy_ut.cpp
+++ b/util/random/entropy_ut.cpp
@@ -10,4 +10,4 @@ Y_UNIT_TEST_SUITE(TestEntropy) {
             Seed().LoadOrFail(buf, i);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TestEntropy)
diff --git a/util/random/fast.h b/util/random/fast.h
index ddc5711641..70359135a2 100644
--- a/util/random/fast.h
+++ b/util/random/fast.h
@@ -95,7 +95,7 @@ namespace NPrivate {
     struct TFastRngTraits<ui64> {
         using TResult = TFastRng64;
     };
-}
+} // namespace NPrivate
 
 template <typename T>
 using TFastRng = typename ::NPrivate::TFastRngTraits<T>::TResult;
diff --git a/util/random/fast_ut.cpp b/util/random/fast_ut.cpp
index 60994a98b0..9254d0bbe1 100644
--- a/util/random/fast_ut.cpp
+++ b/util/random/fast_ut.cpp
@@ -116,4 +116,4 @@ Y_UNIT_TEST_SUITE(TTestFastRng) {
 
         UNIT_ASSERT_VALUES_EQUAL(rng.GenRand(), ULL(6223876579076085114));
     }
-}
+} // Y_UNIT_TEST_SUITE(TTestFastRng)
diff --git a/util/random/init_atfork.cpp b/util/random/init_atfork.cpp
index 4c9a7778d2..ad5ccab06c 100644
--- a/util/random/init_atfork.cpp
+++ b/util/random/init_atfork.cpp
@@ -22,7 +22,7 @@ namespace {
             ResetRandomState();
         }
     };
-}
+} // namespace
 
 void RNGInitAtForkHandlers() {
     SingletonWithPriority<TInit, 0>();
diff --git a/util/random/lcg_engine.cpp b/util/random/lcg_engine.cpp
index e1469104fa..64be218a3f 100644
--- a/util/random/lcg_engine.cpp
+++ b/util/random/lcg_engine.cpp
@@ -27,4 +27,4 @@ namespace NPrivate {
 
     template ui32 LcgAdvance<ui32>(ui32, ui32, ui32, ui32) noexcept;
     template ui64 LcgAdvance<ui64>(ui64, ui64, ui64, ui64) noexcept;
-}
+} // namespace NPrivate
diff --git a/util/random/lcg_engine.h b/util/random/lcg_engine.h
index 4347b1a5ed..2427296d3a 100644
--- a/util/random/lcg_engine.h
+++ b/util/random/lcg_engine.h
@@ -9,7 +9,7 @@
 namespace NPrivate {
     template <typename T>
     T LcgAdvance(T seed, T lcgBase, T lcgAddend, T delta) noexcept;
-}
+} // namespace NPrivate
 
 template <typename T, T A, T C>
 struct TFastLcgIterator {
diff --git a/util/random/mersenne.h b/util/random/mersenne.h
index b2044604ac..291b0e5702 100644
--- a/util/random/mersenne.h
+++ b/util/random/mersenne.h
@@ -17,7 +17,7 @@ namespace NPrivate {
     struct TMersenneTraits<ui32> {
         using TImpl = TMersenne32;
     };
-}
+} // namespace NPrivate
 
 class IInputStream;
 
diff --git a/util/random/mersenne32.h b/util/random/mersenne32.h
index 861f3a3d38..08def52783 100644
--- a/util/random/mersenne32.h
+++ b/util/random/mersenne32.h
@@ -47,4 +47,4 @@ namespace NPrivate {
         ui32 mt[N];
         int mti;
     };
-}
+} // namespace NPrivate
diff --git a/util/random/mersenne64.h b/util/random/mersenne64.h
index 12ca43b6af..8549e270f7 100644
--- a/util/random/mersenne64.h
+++ b/util/random/mersenne64.h
@@ -47,4 +47,4 @@ namespace NPrivate {
         ui64 mt[NN];
         int mti;
     };
-}
+} // namespace NPrivate
diff --git a/util/random/mersenne_ut.cpp b/util/random/mersenne_ut.cpp
index a4b84efa3d..0a113acdf1 100644
--- a/util/random/mersenne_ut.cpp
+++ b/util/random/mersenne_ut.cpp
@@ -79,4 +79,4 @@ Y_UNIT_TEST_SUITE(TMersenneRndTest) {
 
         UNIT_ASSERT_VALUES_EQUAL(r1.GenRand(), r2.GenRand());
     }
-}
+} // Y_UNIT_TEST_SUITE(TMersenneRndTest)
diff --git a/util/random/normal.cpp b/util/random/normal.cpp
index 478b38fd25..4d8a878772 100644
--- a/util/random/normal.cpp
+++ b/util/random/normal.cpp
@@ -9,7 +9,7 @@ namespace {
             return RandomNumber<T>();
         }
     };
-}
+} // namespace
 
 template <>
 float StdNormalRandom<float>() noexcept {
diff --git a/util/random/normal_ut.cpp b/util/random/normal_ut.cpp
index 42b6cc4ba2..526cc2fe85 100644
--- a/util/random/normal_ut.cpp
+++ b/util/random/normal_ut.cpp
@@ -78,4 +78,4 @@ Y_UNIT_TEST_SUITE(TestNormalDistribution) {
         TestMD<double>(GenFunc2<double>(30, 40), 30, 40);
         TestMD<long double>(GenFunc2<long double>(40, 50), 40, 50);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestNormalDistribution)
diff --git a/util/random/random.cpp b/util/random/random.cpp
index 71f9323856..c2775ec3f0 100644
--- a/util/random/random.cpp
+++ b/util/random/random.cpp
@@ -66,7 +66,7 @@ namespace {
     struct TToRealType {
         using TResult = typename TToRealTypeBySize<sizeof(T)>::TResult;
     };
-}
+} // namespace
 
 #define DEF_RND(TY)                                               \
     template <>                                                   \
diff --git a/util/random/random_ut.cpp b/util/random/random_ut.cpp
index 30427676f3..e919ba5a5e 100644
--- a/util/random/random_ut.cpp
+++ b/util/random/random_ut.cpp
@@ -152,4 +152,4 @@ Y_UNIT_TEST_SUITE(TRandomNumberTest) {
             UNIT_ASSERT_EQUAL(RandomNumber<ui32>(1 << 8), el);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TRandomNumberTest)
diff --git a/util/random/shuffle_ut.cpp b/util/random/shuffle_ut.cpp
index 8cab95d8b2..79b210cd9f 100644
--- a/util/random/shuffle_ut.cpp
+++ b/util/random/shuffle_ut.cpp
@@ -111,4 +111,4 @@ Y_UNIT_TEST_SUITE(TRandUtilsTest) {
         TestIter(prng);
         TestIterPartial(prng);
     }
-}
+} // Y_UNIT_TEST_SUITE(TRandUtilsTest)
diff --git a/util/str_stl.h b/util/str_stl.h
index b9d16a53b9..f86d017af3 100644
--- a/util/str_stl.h
+++ b/util/str_stl.h
@@ -30,7 +30,7 @@ namespace std {
         }
         using is_transparent = void;
     };
-}
+} // namespace std
 
 #endif
 
@@ -61,7 +61,7 @@ namespace NHashPrivate {
             return NHashPrivate::ComputeStringHash(s.data(), s.size());
         }
     };
-}
+} // namespace NHashPrivate
 
 template <class T>
 struct hash: public NHashPrivate::THashHelper<T, std::is_scalar<T>::value && !std::is_integral<T>::value> {
@@ -146,7 +146,7 @@ namespace NHashPrivate {
         }
     };
 
-}
+} // namespace NHashPrivate
 
 template <typename... TArgs>
 struct THash<std::tuple<TArgs...>> {
@@ -188,7 +188,7 @@ namespace NHashPrivate {
             return CombineHashes(THash<TFirstClean>()(pair.first), THash<TSecondClean>()(pair.second));
         }
     };
-}
+} // namespace NHashPrivate
 
 template <class TFirst, class TSecond>
 struct hash<std::pair<TFirst, TSecond>>: public NHashPrivate::TPairHash<TFirst, TSecond> {
diff --git a/util/stream/aligned_ut.cpp b/util/stream/aligned_ut.cpp
index e980d05cf7..da4ef1c276 100644
--- a/util/stream/aligned_ut.cpp
+++ b/util/stream/aligned_ut.cpp
@@ -60,4 +60,4 @@ Y_UNIT_TEST_SUITE(TAlignedTest) {
         alignedInput.ReadChar(c);
         UNIT_ASSERT_VALUES_EQUAL(c, '\x80');
     }
-}
+} // Y_UNIT_TEST_SUITE(TAlignedTest)
diff --git a/util/stream/buffer.cpp b/util/stream/buffer.cpp
index ac4c85f288..85aaa2811d 100644
--- a/util/stream/buffer.cpp
+++ b/util/stream/buffer.cpp
@@ -53,7 +53,7 @@ namespace {
         {
         }
     };
-}
+} // namespace
 
 TBufferOutput::TBufferOutput(size_t buflen)
     : Impl_(new TOwnedImpl(buflen))
diff --git a/util/stream/buffer_ut.cpp b/util/stream/buffer_ut.cpp
index 3494696190..7772307708 100644
--- a/util/stream/buffer_ut.cpp
+++ b/util/stream/buffer_ut.cpp
@@ -82,4 +82,4 @@ Y_UNIT_TEST_SUITE(TBufferTest) {
 
         UNIT_ASSERT(0 == memcmp(buffer.data(), "1234567890", buffer.size()));
     }
-}
+} // Y_UNIT_TEST_SUITE(TBufferTest)
diff --git a/util/stream/buffered.cpp b/util/stream/buffered.cpp
index e206bcfe97..c7c677d06e 100644
--- a/util/stream/buffered.cpp
+++ b/util/stream/buffered.cpp
@@ -344,7 +344,7 @@ namespace {
         TBuffer B_;
         ui64 N_;
     };
-}
+} // namespace
 
 TBufferedOutputBase::TBufferedOutputBase(IOutputStream* slave)
     : Impl_(new TAdaptiveImpl(slave))
diff --git a/util/stream/buffered.h b/util/stream/buffered.h
index 0847186141..c7bd2c5a82 100644
--- a/util/stream/buffered.h
+++ b/util/stream/buffered.h
@@ -164,7 +164,7 @@ namespace NPrivate {
     struct TBufferedStreamFor {
         using TResult = std::conditional_t<std::is_base_of<IInputStream, T>::value, TBufferedInput, TMyBufferedOutput>;
     };
-}
+} // namespace NPrivate
 
 /**
  * A mixin class that turns unbuffered stream into a buffered one.
diff --git a/util/stream/buffered_ut.cpp b/util/stream/buffered_ut.cpp
index d101b9d550..aff7fde74e 100644
--- a/util/stream/buffered_ut.cpp
+++ b/util/stream/buffered_ut.cpp
@@ -139,4 +139,4 @@ Y_UNIT_TEST_SUITE(TestBufferedIO) {
         UNIT_ASSERT_VALUES_EQUAL(in.ReadTo(t, 'z'), 4);
         UNIT_ASSERT_VALUES_EQUAL(t, "9abc");
     }
-}
+} // Y_UNIT_TEST_SUITE(TestBufferedIO)
diff --git a/util/stream/debug.cpp b/util/stream/debug.cpp
index afd5b3e1c7..1c08e38df9 100644
--- a/util/stream/debug.cpp
+++ b/util/stream/debug.cpp
@@ -34,7 +34,7 @@ namespace {
         IOutputStream* Out;
         int Level;
     };
-}
+} // namespace
 
 template <>
 struct TSingletonTraits<TDbgSelector> {
diff --git a/util/stream/direct_io_ut.cpp b/util/stream/direct_io_ut.cpp
index 1fada06ecb..dd13ceefa9 100644
--- a/util/stream/direct_io_ut.cpp
+++ b/util/stream/direct_io_ut.cpp
@@ -67,4 +67,4 @@ Y_UNIT_TEST_SUITE(TDirectIOTests) {
     Y_UNIT_TEST(ReadWriteDirectSeqTest) {
         Test(Direct | Seq, 100 * 4);
     }
-}
+} // Y_UNIT_TEST_SUITE(TDirectIOTests)
diff --git a/util/stream/file_ut.cpp b/util/stream/file_ut.cpp
index ac0f09796e..91142a7dcd 100644
--- a/util/stream/file_ut.cpp
+++ b/util/stream/file_ut.cpp
@@ -71,4 +71,4 @@ Y_UNIT_TEST_SUITE(TFileTest) {
         close(fds[1]);
     }
 #endif
-}
+} // Y_UNIT_TEST_SUITE(TFileTest)
diff --git a/util/stream/format.cpp b/util/stream/format.cpp
index 3996130df5..fa03dfd434 100644
--- a/util/stream/format.cpp
+++ b/util/stream/format.cpp
@@ -34,7 +34,7 @@ namespace NFormatPrivate {
 
         return os << Prec(d, mode, ndigits);
     }
-}
+} // namespace NFormatPrivate
 
 template <>
 void Out<NFormatPrivate::THumanReadableSize>(IOutputStream& stream, const NFormatPrivate::THumanReadableSize& value) {
diff --git a/util/stream/format.h b/util/stream/format.h
index dc46684b39..56c3083bbc 100644
--- a/util/stream/format.h
+++ b/util/stream/format.h
@@ -210,7 +210,7 @@ namespace NFormatPrivate {
         double Value;
         ESizeFormat Format;
     };
-}
+} // namespace NFormatPrivate
 
 /**
  * Output manipulator basically equivalent to `std::setw` and `std::setfill`
diff --git a/util/stream/format_std_ut.cpp b/util/stream/format_std_ut.cpp
index b903000382..0cb943206b 100644
--- a/util/stream/format_std_ut.cpp
+++ b/util/stream/format_std_ut.cpp
@@ -26,4 +26,4 @@ Y_UNIT_TEST_SUITE(StdOstreamFormattingTest) {
         UNIT_ASSERT_VALUES_EQUAL(ToStringViaOstream(Bin(static_cast<ui8>(16))), "0b00010000");
         UNIT_ASSERT_VALUES_EQUAL(ToStringViaOstream(Bin(static_cast<ui64>(1234587912357ull))), "0b0000000000000000000000010001111101110011001011001000100010100101");
     }
-}
+} // Y_UNIT_TEST_SUITE(StdOstreamFormattingTest)
diff --git a/util/stream/format_ut.cpp b/util/stream/format_ut.cpp
index 43245aeb48..bcafd22a00 100644
--- a/util/stream/format_ut.cpp
+++ b/util/stream/format_ut.cpp
@@ -179,4 +179,4 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) {
         UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(3672))), "1h 1m 12s");
         UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(4220))), "1h 10m 20s");
     }
-}
+} // Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest)
diff --git a/util/stream/fwd.h b/util/stream/fwd.h
index 307676c6a7..6c13f6fbef 100644
--- a/util/stream/fwd.h
+++ b/util/stream/fwd.h
@@ -55,7 +55,7 @@ struct TZLibDecompressorError;
 
 namespace ZLib {
     enum StreamType: ui8;
-}
+} // namespace ZLib
 
 class TZLibDecompress;
 class TZLibCompress;
diff --git a/util/stream/hex_ut.cpp b/util/stream/hex_ut.cpp
index 5074a0b616..b2c8ea5eb1 100644
--- a/util/stream/hex_ut.cpp
+++ b/util/stream/hex_ut.cpp
@@ -26,4 +26,4 @@ Y_UNIT_TEST_SUITE(THexCodingTest) {
     Y_UNIT_TEST(TestEmpty) {
         TestImpl("");
     }
-}
+} // Y_UNIT_TEST_SUITE(THexCodingTest)
diff --git a/util/stream/holder.h b/util/stream/holder.h
index c60a4e510c..32752bb9f0 100644
--- a/util/stream/holder.h
+++ b/util/stream/holder.h
@@ -19,7 +19,7 @@ namespace NPrivate {
         using TType = IOutputStream;
     };
 
-}
+} // namespace NPrivate
 
 /**
  * An ownership-gaining wrapper for proxy streams.
diff --git a/util/stream/input.cpp b/util/stream/input.cpp
index 6e8170f2f9..a8969c7d85 100644
--- a/util/stream/input.cpp
+++ b/util/stream/input.cpp
@@ -248,7 +248,7 @@ namespace {
     };
     #endif
 #endif
-}
+} // namespace
 
 IInputStream& NPrivate::StdInStream() noexcept {
     return *SingletonWithPriority<TGetLine, 4>();
diff --git a/util/stream/input.h b/util/stream/input.h
index f0d5807ed2..b1facec254 100644
--- a/util/stream/input.h
+++ b/util/stream/input.h
@@ -263,7 +263,7 @@ inline IInputStream& operator>>(IInputStream& in, T& value) {
 
 namespace NPrivate {
     IInputStream& StdInStream() noexcept;
-}
+} // namespace NPrivate
 
 /**
  * Standard input stream.
diff --git a/util/stream/input_ut.cpp b/util/stream/input_ut.cpp
index 4a93f5458e..482ebc77d4 100644
--- a/util/stream/input_ut.cpp
+++ b/util/stream/input_ut.cpp
@@ -154,4 +154,4 @@ Y_UNIT_TEST_SUITE(TInputTest) {
                            });
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TInputTest)
diff --git a/util/stream/ios_ut.cpp b/util/stream/ios_ut.cpp
index 81d6bdf9b3..b60acec931 100644
--- a/util/stream/ios_ut.cpp
+++ b/util/stream/ios_ut.cpp
@@ -393,7 +393,7 @@ namespace {
         TStringListInput sli(lst);
         test(sli, "IWalkInput");
     }
-}
+} // namespace
 
 void TStreamsTest::TestReadTo() {
     TestStreamReadTo("111a222b333c444d555e666f", TestStreamReadTo1);
diff --git a/util/stream/labeled_ut.cpp b/util/stream/labeled_ut.cpp
index 12d0dc5004..f2993d90e6 100644
--- a/util/stream/labeled_ut.cpp
+++ b/util/stream/labeled_ut.cpp
@@ -9,4 +9,4 @@ Y_UNIT_TEST_SUITE(TLabeledOutputTest) {
         out << LabeledOutput(x, 1, 2, 3 + 4);
         UNIT_ASSERT_STRINGS_EQUAL(out.Str(), "x = 3, 1 = 1, 2 = 2, 3 + 4 = 7");
     }
-}
+} // Y_UNIT_TEST_SUITE(TLabeledOutputTest)
diff --git a/util/stream/length_ut.cpp b/util/stream/length_ut.cpp
index 8968448954..446c40095c 100644
--- a/util/stream/length_ut.cpp
+++ b/util/stream/length_ut.cpp
@@ -49,4 +49,4 @@ Y_UNIT_TEST_SUITE(TestLengthIO) {
         l1.Write(parts, 3);
         UNIT_ASSERT_VALUES_EQUAL(l1.Counter(), 14);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestLengthIO)
diff --git a/util/stream/mem_ut.cpp b/util/stream/mem_ut.cpp
index f388ae66ac..88ec97fc72 100644
--- a/util/stream/mem_ut.cpp
+++ b/util/stream/mem_ut.cpp
@@ -75,4 +75,4 @@ Y_UNIT_TEST_SUITE(TestMemIO) {
         const char* const result = "1234567890";
         UNIT_ASSERT(0 == memcmp(buffer, result, strlen(result)));
     }
-}
+} // Y_UNIT_TEST_SUITE(TestMemIO)
diff --git a/util/stream/multi_ut.cpp b/util/stream/multi_ut.cpp
index 61869cdf1c..7f57c937ae 100644
--- a/util/stream/multi_ut.cpp
+++ b/util/stream/multi_ut.cpp
@@ -47,4 +47,4 @@ Y_UNIT_TEST_SUITE(TestMultiInput) {
         case3.TestReadToResult('j', 5, "fghi");
         case3.TestReadToResult('k', 1, "", "TRASH");
     }
-}
+} // Y_UNIT_TEST_SUITE(TestMultiInput)
diff --git a/util/stream/null.h b/util/stream/null.h
index 8c335a9a78..6d95c04383 100644
--- a/util/stream/null.h
+++ b/util/stream/null.h
@@ -51,7 +51,7 @@ public:
 
 namespace NPrivate {
     TNullIO& StdNullStream() noexcept;
-}
+} // namespace NPrivate
 
 /**
  * Standard null stream.
diff --git a/util/stream/output.cpp b/util/stream/output.cpp
index 8b3f78527d..51a02300df 100644
--- a/util/stream/output.cpp
+++ b/util/stream/output.cpp
@@ -367,7 +367,7 @@ namespace {
     };
 
     bool TAndroidStdIOStreams::Enabled = false;
-}
+} // namespace
 #endif // _android_
 
 namespace {
@@ -431,7 +431,7 @@ namespace {
             return *SingletonWithPriority<TStdIOStreams, 4>();
         }
     };
-}
+} // namespace
 
 IOutputStream& NPrivate::StdErrStream() noexcept {
 #if defined(_android_)
diff --git a/util/stream/output.h b/util/stream/output.h
index 08e67c3c6f..1f903a655a 100644
--- a/util/stream/output.h
+++ b/util/stream/output.h
@@ -262,7 +262,7 @@ static inline IOutputStream& operator<<(IOutputStream& o, wchar32* t) {
 namespace NPrivate {
     IOutputStream& StdOutStream() noexcept;
     IOutputStream& StdErrStream() noexcept;
-}
+} // namespace NPrivate
 
 /**
  * Standard output stream.
diff --git a/util/stream/printf_ut.cpp b/util/stream/printf_ut.cpp
index 0eab167062..be82bd0f27 100644
--- a/util/stream/printf_ut.cpp
+++ b/util/stream/printf_ut.cpp
@@ -30,4 +30,4 @@ Y_UNIT_TEST_SUITE(TStreamPrintfTest) {
 
         UNIT_ASSERT_EQUAL(ss.Str(), s);
     }
-}
+} // Y_UNIT_TEST_SUITE(TStreamPrintfTest)
diff --git a/util/stream/str_ut.cpp b/util/stream/str_ut.cpp
index c5ab9ca5e9..ab3947ad20 100644
--- a/util/stream/str_ut.cpp
+++ b/util/stream/str_ut.cpp
@@ -222,4 +222,4 @@ Y_UNIT_TEST_SUITE(TStringInputOutputTest) {
         UNIT_ASSERT_STRINGS_EQUAL(str, "Быть или не быть? Вот в чём вопрос");
         str.clear();
     }
-}
+} // Y_UNIT_TEST_SUITE(TStringInputOutputTest)
diff --git a/util/stream/tempbuf.cpp b/util/stream/tempbuf.cpp
index 801a1fabb0..799e0b0a39 100644
--- a/util/stream/tempbuf.cpp
+++ b/util/stream/tempbuf.cpp
@@ -4,7 +4,7 @@ namespace {
     static inline size_t Next(size_t size) noexcept {
         return size * 2;
     }
-}
+} // namespace
 
 void TTempBufOutput::DoWrite(const void* data, size_t len) {
     if (Y_LIKELY(len <= Left())) {
diff --git a/util/stream/tokenizer_ut.cpp b/util/stream/tokenizer_ut.cpp
index afc566da86..181f95c78d 100644
--- a/util/stream/tokenizer_ut.cpp
+++ b/util/stream/tokenizer_ut.cpp
@@ -261,4 +261,4 @@ Y_UNIT_TEST_SUITE(TStreamTokenizerTests) {
         }
         UNIT_ASSERT_VALUES_EQUAL(tokensSize, tokensCount);
     }
-}
+} // Y_UNIT_TEST_SUITE(TStreamTokenizerTests)
diff --git a/util/stream/walk_ut.cpp b/util/stream/walk_ut.cpp
index e0a783799f..14a4487373 100644
--- a/util/stream/walk_ut.cpp
+++ b/util/stream/walk_ut.cpp
@@ -52,4 +52,4 @@ Y_UNIT_TEST_SUITE(TWalkTest) {
         TString tmp4 = input.ReadAll();
         UNIT_ASSERT_VALUES_EQUAL(tmp4, "66f");
     }
-}
+} // Y_UNIT_TEST_SUITE(TWalkTest)
diff --git a/util/stream/zerocopy_output_ut.cpp b/util/stream/zerocopy_output_ut.cpp
index e81f7fb056..df58d540f7 100644
--- a/util/stream/zerocopy_output_ut.cpp
+++ b/util/stream/zerocopy_output_ut.cpp
@@ -45,4 +45,4 @@ Y_UNIT_TEST_SUITE(TestZerocopyOutput) {
         output.Write(result.begin(), result.size());
         UNIT_ASSERT_STRINGS_EQUAL(str, result);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestZerocopyOutput)
diff --git a/util/stream/zlib.cpp b/util/stream/zlib.cpp
index 4ec9667443..dc14eca297 100644
--- a/util/stream/zlib.cpp
+++ b/util/stream/zlib.cpp
@@ -75,7 +75,7 @@ namespace {
         const char* Buf;
         size_t Len;
     };
-}
+} // namespace
 
 class TZLibDecompress::TImpl: private TZLibCommon, public TChunkedZeroCopyInput {
 public:
@@ -184,7 +184,7 @@ namespace {
     };
 
     using TZeroCopyDecompress = TZLibDecompress::TImpl;
-}
+} // namespace
 
 class TZLibCompress::TImpl: public TAdditionalStorage<TImpl>, private TZLibCommon {
     static inline ZLib::StreamType Type(ZLib::StreamType type) {
diff --git a/util/stream/zlib.h b/util/stream/zlib.h
index e7de7c81b7..648a5b9945 100644
--- a/util/stream/zlib.h
+++ b/util/stream/zlib.h
@@ -35,7 +35,7 @@ namespace ZLib {
     enum {
         ZLIB_BUF_LEN = 8 * 1024
     };
-}
+} // namespace ZLib
 
 /**
  * Non-buffered ZLib decompressing stream.
diff --git a/util/stream/zlib_ut.cpp b/util/stream/zlib_ut.cpp
index 2fef18cf0b..388b6d79ec 100644
--- a/util/stream/zlib_ut.cpp
+++ b/util/stream/zlib_ut.cpp
@@ -226,4 +226,4 @@ Y_UNIT_TEST_SUITE(TZLibTest) {
             }
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TZLibTest)
diff --git a/util/string/ascii.h b/util/string/ascii.h
index af74ff4382..2d19995866 100644
--- a/util/string/ascii.h
+++ b/util/string/ascii.h
@@ -58,7 +58,7 @@ namespace NPrivate {
         return RangeOk(static_cast<typename String::value_type>(c));
     }
 #endif
-}
+} // namespace NPrivate
 
 constexpr bool IsAscii(const int c) noexcept {
     return !(c & ~0x7f);
diff --git a/util/string/ascii_ut.cpp b/util/string/ascii_ut.cpp
index 89069fee50..b745faf87a 100644
--- a/util/string/ascii_ut.cpp
+++ b/util/string/ascii_ut.cpp
@@ -95,4 +95,4 @@ Y_UNIT_TEST_SUITE(TAsciiTest) {
         UNIT_ASSERT_EQUAL(AsciiHasSuffixIgnoreCase("qweasd", "asD"), true);
         UNIT_ASSERT_EQUAL(AsciiHasSuffixIgnoreCase("qweasd", "ast"), false);
     }
-}
+} // Y_UNIT_TEST_SUITE(TAsciiTest)
diff --git a/util/string/builder.h b/util/string/builder.h
index 9620fc8606..9da6482464 100644
--- a/util/string/builder.h
+++ b/util/string/builder.h
@@ -34,6 +34,6 @@ namespace NPrivateStringBuilder {
 
         return std::move(builder);
     }
-}
+} // namespace NPrivateStringBuilder
 
 using TStringBuilder = NPrivateStringBuilder::TStringBuilder;
diff --git a/util/string/builder_ut.cpp b/util/string/builder_ut.cpp
index 22def683ec..1a165a4268 100644
--- a/util/string/builder_ut.cpp
+++ b/util/string/builder_ut.cpp
@@ -60,4 +60,4 @@ Y_UNIT_TEST_SUITE(TStringBuilderTest) {
         UNIT_ASSERT(TRValueAcceptTester::IsRValue(TStringBuilder() << b2));
         UNIT_ASSERT_VALUES_EQUAL("a1a", TStringBuilder() << b2);
     }
-}
+} // Y_UNIT_TEST_SUITE(TStringBuilderTest)
diff --git a/util/string/cast.cpp b/util/string/cast.cpp
index 2922b986c2..c963addba7 100644
--- a/util/string/cast.cpp
+++ b/util/string/cast.cpp
@@ -347,7 +347,7 @@ namespace {
     constexpr TBounds<ui64> lUBounds = {static_cast<ui64>(ULONG_MAX), 0};
     constexpr TBounds<ui64> llSBounds = {static_cast<ui64>(LLONG_MAX), static_cast<ui64>(ULLONG_MAX - LLONG_MAX)};
     constexpr TBounds<ui64> llUBounds = {static_cast<ui64>(ULLONG_MAX), 0};
-}
+} // namespace
 
 #define DEF_INT_SPEC_II(TYPE, ITYPE, BASE)                              \
     template <>                                                         \
@@ -729,7 +729,7 @@ namespace {
 
         return FixEnd(buf, FixZeros(buf, sb.SB->position()));
     }
-}
+} // namespace
 
 template <>
 size_t ToStringImpl<double>(double d, char* buf, size_t len) {
diff --git a/util/string/cast.h b/util/string/cast.h
index 564baa93d5..da99a02f92 100644
--- a/util/string/cast.h
+++ b/util/string/cast.h
@@ -76,7 +76,7 @@ namespace NPrivate {
             return s;
         }
     };
-}
+} // namespace NPrivate
 
 /*
  * some clever implementations...
@@ -199,7 +199,7 @@ namespace NPrivate {
             return FromString<T, TChar>(Data, Len);
         }
     };
-}
+} // namespace NPrivate
 
 template <typename TChar>
 inline ::NPrivate::TFromString<TChar> FromString(const TChar* data, size_t len) {
diff --git a/util/string/cast_ut.cpp b/util/string/cast_ut.cpp
index 443f8a79f8..fbc22a22fd 100644
--- a/util/string/cast_ut.cpp
+++ b/util/string/cast_ut.cpp
@@ -616,4 +616,4 @@ Y_UNIT_TEST_SUITE(TCastTest) {
         UNIT_ASSERT_VALUES_EQUAL(ok, "foo");
         UNIT_ASSERT_VALUES_EQUAL(ToString(ToString(ok)), "foo");
     }
-}
+} // Y_UNIT_TEST_SUITE(TCastTest)
diff --git a/util/string/escape.cpp b/util/string/escape.cpp
index cd09a7dbd0..1ed8dfe6f7 100644
--- a/util/string/escape.cpp
+++ b/util/string/escape.cpp
@@ -146,7 +146,7 @@ namespace {
             }
         }
     };
-}
+} // namespace
 
 template <class TChar>
 TBasicString<TChar>& EscapeCImpl(const TChar* str, size_t len, TBasicString<TChar>& r) {
@@ -224,7 +224,7 @@ namespace {
 
         return maxsz;
     }
-}
+} // namespace
 
 template <class TChar, class TStr>
 static TStr& DoUnescapeC(const TChar* p, size_t sz, TStr& res) {
diff --git a/util/string/escape_ut.cpp b/util/string/escape_ut.cpp
index cd38ecffd3..01a95dc7ab 100644
--- a/util/string/escape_ut.cpp
+++ b/util/string/escape_ut.cpp
@@ -18,7 +18,7 @@ namespace {
         {
         }
     };
-}
+} // namespace
 
 static const TExample CommonTestData[] = {
     // Should be valid UTF-8.
@@ -145,4 +145,4 @@ Y_UNIT_TEST_SUITE(TEscapeCTest) {
         UNIT_ASSERT_VALUES_EQUAL(UnescapeC("\\U00000020"), " ");
         UNIT_ASSERT_VALUES_EQUAL(UnescapeC("\\Uxxx"), "Uxxx");
     }
-}
+} // Y_UNIT_TEST_SUITE(TEscapeCTest)
diff --git a/util/string/hex_ut.cpp b/util/string/hex_ut.cpp
index 39a83d5e62..497632a126 100644
--- a/util/string/hex_ut.cpp
+++ b/util/string/hex_ut.cpp
@@ -16,4 +16,4 @@ Y_UNIT_TEST_SUITE(THexCodingTest) {
         UNIT_ASSERT_EXCEPTION(HexDecode("Hello"), yexception); //< incorrect chars
         UNIT_ASSERT_EXCEPTION(HexDecode("123"), yexception);   //< odd length
     }
-}
+} // Y_UNIT_TEST_SUITE(THexCodingTest)
diff --git a/util/string/join.h b/util/string/join.h
index e3c08ef584..720951abc5 100644
--- a/util/string/join.h
+++ b/util/string/join.h
@@ -73,7 +73,7 @@ namespace NPrivate {
     size_t GetAppendLength(const TStringBuf delim, const TFirst& f, const TRest&... r) {
         return delim.length() + ::NPrivate::GetLength(f) + ::NPrivate::GetAppendLength(delim, r...);
     }
-}
+} // namespace NPrivate
 
 template <typename TCharType>
 inline void AppendJoinNoReserve(TBasicString<TCharType>&, TBasicStringBuf<TCharType>) {
diff --git a/util/string/join_ut.cpp b/util/string/join_ut.cpp
index 3ed2b2459c..88ac0cae0b 100644
--- a/util/string/join_ut.cpp
+++ b/util/string/join_ut.cpp
@@ -160,4 +160,4 @@ Y_UNIT_TEST_SUITE(JoinStringTest) {
         UNIT_ASSERT_EQUAL(Join('a', 'a', 'a'), "97a97");
         UNIT_ASSERT_EQUAL(Join("a", "a", "a"), "aaa");
     }
-}
+} // Y_UNIT_TEST_SUITE(JoinStringTest)
diff --git a/util/string/printf_ut.cpp b/util/string/printf_ut.cpp
index 2b2f980b70..6f59ef08dc 100644
--- a/util/string/printf_ut.cpp
+++ b/util/string/printf_ut.cpp
@@ -27,4 +27,4 @@ Y_UNIT_TEST_SUITE(TStringPrintf) {
     Y_UNIT_TEST(TestExplicitPositions) {
         UNIT_ASSERT_EQUAL("abc xyz abc", Sprintf("%1$s %2$s %1$s", "abc", "xyz"));
     }
-}
+} // Y_UNIT_TEST_SUITE(TStringPrintf)
diff --git a/util/string/split.h b/util/string/split.h
index 27fdf9793d..aa53da0475 100644
--- a/util/string/split.h
+++ b/util/string/split.h
@@ -47,7 +47,7 @@ namespace NStringSplitPrivate {
         return nullptr;
     }
 
-}
+} // namespace NStringSplitPrivate
 
 template <class I, class TDelim, class TConsumer>
 std::enable_if_t<::NStringSplitPrivate::TIsConsumerV<TConsumer, I>>
@@ -262,7 +262,7 @@ struct TSetDelimiter: private TFindFirstOf<const Char> {
 
 namespace NSplitTargetHasPushBack {
     Y_HAS_MEMBER(push_back, PushBack);
-}
+} // namespace NSplitTargetHasPushBack
 
 template <class T, class = void>
 struct TConsumerBackInserter;
@@ -1038,7 +1038,7 @@ namespace NStringSplitPrivate {
     auto MakeStringSplitter(String&& s) {
         return TStringSplitter<std::remove_reference_t<String>>(std::forward<String>(s));
     }
-}
+} // namespace NStringSplitPrivate
 
 template <class Iterator>
 auto StringSplitter(Iterator begin, Iterator end) {
diff --git a/util/string/split_ut.cpp b/util/string/split_ut.cpp
index b3dbdc33b8..d1dac92d2d 100644
--- a/util/string/split_ut.cpp
+++ b/util/string/split_ut.cpp
@@ -301,7 +301,7 @@ Y_UNIT_TEST_SUITE(SplitStringTest) {
         UNIT_ASSERT_NO_EXCEPTION(Split(data, ' ', s1, s2, m1, m2, m1, m1, m1, m1));
         UNIT_ASSERT_EXCEPTION(Split(data, ' ', s1, s2, m1, m2, m1, m1, m1, m1, s1), yexception);
     }
-}
+} // Y_UNIT_TEST_SUITE(SplitStringTest)
 
 template <typename I, typename C>
 void TestStringSplitterCount(I* str, C delim, size_t good) {
@@ -831,4 +831,4 @@ Y_UNIT_TEST_SUITE(StringSplitter) {
         }
         UNIT_ASSERT_VALUES_EQUAL(i, expected.size());
     }
-}
+} // Y_UNIT_TEST_SUITE(StringSplitter)
diff --git a/util/string/strip_ut.cpp b/util/string/strip_ut.cpp
index 032bbe9b4f..d5598ce866 100644
--- a/util/string/strip_ut.cpp
+++ b/util/string/strip_ut.cpp
@@ -191,4 +191,4 @@ Y_UNIT_TEST_SUITE(TStripStringTest) {
         UNIT_ASSERT_EQUAL(abs2 == "Very long description string written in unknown ...", true);
         UNIT_ASSERT_EQUAL(abs3 == "Very long description string written in ...", true);
     }
-}
+} // Y_UNIT_TEST_SUITE(TStripStringTest)
diff --git a/util/string/strspn_ut.cpp b/util/string/strspn_ut.cpp
index 975374cba4..ac0afa92d8 100644
--- a/util/string/strspn_ut.cpp
+++ b/util/string/strspn_ut.cpp
@@ -70,4 +70,4 @@ Y_UNIT_TEST_SUITE(TStrSpnTest) {
         TStringBuf empty;
         UNIT_ASSERT_EQUAL(TCompactStrSpn("abc").FindFirstNotOf(empty.rbegin(), empty.rend()), empty.rend());
     }
-}
+} // Y_UNIT_TEST_SUITE(TStrSpnTest)
diff --git a/util/string/subst_ut.cpp b/util/string/subst_ut.cpp
index 21eccef779..d977543fa6 100644
--- a/util/string/subst_ut.cpp
+++ b/util/string/subst_ut.cpp
@@ -250,4 +250,4 @@ Y_UNIT_TEST_SUITE(TStringSubst) {
             UNIT_ASSERT_VALUES_EQUAL(st, ss);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TStringSubst)
diff --git a/util/string/type_ut.cpp b/util/string/type_ut.cpp
index 03e7af62bd..74ba51b05c 100644
--- a/util/string/type_ut.cpp
+++ b/util/string/type_ut.cpp
@@ -73,4 +73,4 @@ Y_UNIT_TEST_SUITE(TStringClassify) {
         UNIT_ASSERT(!IsHexNumber(u"foobar"));
         UNIT_ASSERT(!IsHexNumber(TUtf16String()));
     }
-}
+} // Y_UNIT_TEST_SUITE(TStringClassify)
diff --git a/util/string/vector.h b/util/string/vector.h
index e36c348bbe..f3cc46b35f 100644
--- a/util/string/vector.h
+++ b/util/string/vector.h
@@ -39,7 +39,7 @@ namespace NPrivate {
     struct TStringDeducer<wchar16> {
         using type = TUtf16String;
     };
-}
+} // namespace NPrivate
 
 template <typename C>
 TVector<typename ::NPrivate::TStringDeducer<C>::type>
diff --git a/util/string/vector_ut.cpp b/util/string/vector_ut.cpp
index 628f5e2eed..f2b628923c 100644
--- a/util/string/vector_ut.cpp
+++ b/util/string/vector_ut.cpp
@@ -34,4 +34,4 @@ Y_UNIT_TEST_SUITE(TStringJoinTest) {
 
         UNIT_ASSERT_EQUAL(JoinStrings(v, TUtf16String()), str);
     }
-}
+} // Y_UNIT_TEST_SUITE(TStringJoinTest)
diff --git a/util/system/atexit.cpp b/util/system/atexit.cpp
index 09fa7d8381..9d81ce2373 100644
--- a/util/system/atexit.cpp
+++ b/util/system/atexit.cpp
@@ -110,7 +110,7 @@ namespace {
             return atExit;
         }
     }
-}
+} // namespace
 
 void ManualRunAtExitFinalizers() {
     OnExit();
diff --git a/util/system/atexit_ut.cpp b/util/system/atexit_ut.cpp
index 190f6dd0c3..2d340bd364 100644
--- a/util/system/atexit_ut.cpp
+++ b/util/system/atexit_ut.cpp
@@ -99,4 +99,4 @@ Y_UNIT_TEST_SUITE(TestAtExit) {
 
         Singleton<T2>();
     }
-}
+} // Y_UNIT_TEST_SUITE(TestAtExit)
diff --git a/util/system/backtrace.cpp b/util/system/backtrace.cpp
index 8cc93cd3ce..7e3ca7ffcd 100644
--- a/util/system/backtrace.cpp
+++ b/util/system/backtrace.cpp
@@ -95,8 +95,8 @@ namespace {
 
             return 0;
         }
-    }
-}
+    } // namespace NGCCBacktrace
+} // namespace
 
 size_t BackTrace(void** p, size_t len) {
     return NGCCBacktrace::BackTrace(p, len);
@@ -216,7 +216,7 @@ namespace {
         TSymFromAddrFunc SymFromAddrFunc;
         BOOL InitOk;
     };
-}
+} // namespace
 
 TResolvedSymbol ResolveSymbol(void* sym, char* buf, size_t len) {
     return Singleton<TWinSymbolResolverImpl>()->Resolve(sym, buf, len);
diff --git a/util/system/byteorder.h b/util/system/byteorder.h
index d408b2a1a4..4f1b105118 100644
--- a/util/system/byteorder.h
+++ b/util/system/byteorder.h
@@ -91,7 +91,7 @@ namespace NSwapBytes {
     DEF_SB(64)
 
 #undef DEF_SB
-}
+} // namespace NSwapBytes
 
 template <class T>
 inline T SwapBytes(T val) noexcept {
diff --git a/util/system/compat_ut.cpp b/util/system/compat_ut.cpp
index dbd9289c17..55932e388a 100644
--- a/util/system/compat_ut.cpp
+++ b/util/system/compat_ut.cpp
@@ -9,4 +9,4 @@ Y_UNIT_TEST_SUITE(TCompatTest) {
     Y_UNIT_TEST(TestGetprogname) {
         getprogname(); // just check it links
     }
-}
+} // Y_UNIT_TEST_SUITE(TCompatTest)
diff --git a/util/system/compiler_ut.cpp b/util/system/compiler_ut.cpp
index f93b1c0850..3ee0f251d4 100644
--- a/util/system/compiler_ut.cpp
+++ b/util/system/compiler_ut.cpp
@@ -69,4 +69,4 @@ Y_UNIT_TEST_SUITE(TCompilerTest) {
 
         Y_PRAGMA_DIAGNOSTIC_POP
     }
-}
+} // Y_UNIT_TEST_SUITE(TCompilerTest)
diff --git a/util/system/condvar.cpp b/util/system/condvar.cpp
index 9bc8fdd060..67df8a585b 100644
--- a/util/system/condvar.cpp
+++ b/util/system/condvar.cpp
@@ -70,7 +70,7 @@ namespace {
         TWaitEvents Events_;
         TLock Lock_;
     };
-}
+} // namespace
 
 #if defined(_win_)
 class TCondVar::TImpl: public TCondVarImpl {
diff --git a/util/system/context.cpp b/util/system/context.cpp
index 3a67593813..8285aa48de 100644
--- a/util/system/context.cpp
+++ b/util/system/context.cpp
@@ -20,7 +20,7 @@ namespace __cxxabiv1 {
     };
 
     extern "C" __cxa_eh_globals* __cxa_get_globals();
-}
+} // namespace __cxxabiv1
     #endif
 #endif
 
@@ -132,7 +132,7 @@ namespace {
         Run(*(argPtr - 1));
     }
     #endif
-}
+} // namespace
 
     #if defined(USE_SANITIZER_CONTEXT)
 
diff --git a/util/system/context_ut.cpp b/util/system/context_ut.cpp
index 45cb0249f7..461bef2cca 100644
--- a/util/system/context_ut.cpp
+++ b/util/system/context_ut.cpp
@@ -68,4 +68,4 @@ Y_UNIT_TEST_SUITE(TestContext) {
         UNIT_ASSERT(throwed);
         UNIT_ASSERT(!hasUncaught);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestContext)
diff --git a/util/system/cpu_id.cpp b/util/system/cpu_id.cpp
index ad7299ddbc..e115ced360 100644
--- a/util/system/cpu_id.cpp
+++ b/util/system/cpu_id.cpp
@@ -83,7 +83,7 @@ namespace {
     };
 
     static_assert(sizeof(TX86CpuInfo) == 16, "please, fix me");
-}
+} // namespace
 
 // https://en.wikipedia.org/wiki/CPUID
 bool NX86::HaveRDTSCP() noexcept {
diff --git a/util/system/cpu_id.h b/util/system/cpu_id.h
index 3c49e728a7..a9d8dea69e 100644
--- a/util/system/cpu_id.h
+++ b/util/system/cpu_id.h
@@ -152,6 +152,6 @@ namespace NX86 {
 
 #undef Y_LOOKUP_CPU_ID_IMPL
 
-}
+} // namespace NX86
 
 const char* CpuBrand(ui32 store[12]) noexcept;
diff --git a/util/system/cpu_id_ut.cpp b/util/system/cpu_id_ut.cpp
index 6faed95aba..fd15bad635 100644
--- a/util/system/cpu_id_ut.cpp
+++ b/util/system/cpu_id_ut.cpp
@@ -88,7 +88,7 @@ Y_UNIT_TEST_SUITE(TestCpuId) {
         Y_CPU_ID_ENUMERATE(Y_DEF_NAME)
 #undef Y_DEF_NAME
     }
-}
+} // Y_UNIT_TEST_SUITE(TestCpuId)
 
 #if defined(_x86_64_)
     #if defined(__GNUC__)
diff --git a/util/system/daemon.h b/util/system/daemon.h
index b00793b9c9..19c52e5433 100644
--- a/util/system/daemon.h
+++ b/util/system/daemon.h
@@ -24,4 +24,4 @@ namespace NDaemonMaker {
 
     bool MakeMeDaemon(ECloseDescriptors cd = closeAll, EStdIoDescriptors iod = openDevNull, EChDir chd = chdirRoot, EParent parent = callExitFromParent);
     void CloseFrom(int fd);
-}
+} // namespace NDaemonMaker
diff --git a/util/system/daemon_ut.cpp b/util/system/daemon_ut.cpp
index f93b9a9645..862d8f55b4 100644
--- a/util/system/daemon_ut.cpp
+++ b/util/system/daemon_ut.cpp
@@ -91,4 +91,4 @@ Y_UNIT_TEST_SUITE(TDaemonTest) {
         delete[] pages;
     }
 #endif
-}
+} // Y_UNIT_TEST_SUITE(TDaemonTest)
diff --git a/util/system/datetime.cpp b/util/system/datetime.cpp
index 449d850baf..10cf0a5a84 100644
--- a/util/system/datetime.cpp
+++ b/util/system/datetime.cpp
@@ -99,7 +99,7 @@ namespace NPrivate {
     bool HaveRdtscpImpl() {
         return NX86::HaveRDTSCP();
     }
-}
+} // namespace NPrivate
 #endif
 
 #ifdef Y_HAS_CLOCK_GETTIME
diff --git a/util/system/datetime.h b/util/system/datetime.h
index 724ffff394..35c77570b6 100644
--- a/util/system/datetime.h
+++ b/util/system/datetime.h
@@ -37,7 +37,7 @@ void NanoSleep(ui64 ns) noexcept;
 #if defined(_x86_)
 namespace NPrivate {
     bool HaveRdtscpImpl();
-}
+} // namespace NPrivate
 #endif
 
 // GetCycleCount guarantees to return synchronous values on different cores
diff --git a/util/system/direct_io.cpp b/util/system/direct_io.cpp
index 1b6c39f42c..e3b825193f 100644
--- a/util/system/direct_io.cpp
+++ b/util/system/direct_io.cpp
@@ -44,7 +44,7 @@ namespace {
 
         size_t Alignment;
     };
-}
+} // namespace
 
 TDirectIOBufferedFile::TDirectIOBufferedFile(const TString& path, EOpenMode oMode, size_t buflen /*= 1 << 17*/)
     : File(path, oMode)
diff --git a/util/system/direct_io_ut.cpp b/util/system/direct_io_ut.cpp
index 839c3de7ca..43377b6f02 100644
--- a/util/system/direct_io_ut.cpp
+++ b/util/system/direct_io_ut.cpp
@@ -86,7 +86,7 @@ Y_UNIT_TEST_SUITE(TDirectIoTestSuite) {
             TestHugeFile(5 * 1024 * 1024 * 1024ULL + 1111);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TDirectIoTestSuite)
 
 Y_UNIT_TEST_SUITE(TDirectIoErrorHandling) {
     Y_UNIT_TEST(Constructor) {
@@ -112,4 +112,4 @@ Y_UNIT_TEST_SUITE(TDirectIoErrorHandling) {
         UNIT_ASSERT_EXCEPTION(file.Finish(), TFileError);
         NFs::Remove(FileName_);
     }
-}
+} // Y_UNIT_TEST_SUITE(TDirectIoErrorHandling)
diff --git a/util/system/env_ut.cpp b/util/system/env_ut.cpp
index 6023ce2afd..acc799d556 100644
--- a/util/system/env_ut.cpp
+++ b/util/system/env_ut.cpp
@@ -56,4 +56,4 @@ Y_UNIT_TEST_SUITE(EnvTest) {
         UNIT_ASSERT_EXCEPTION(SetEnv("", "value"), yexception);
         UNIT_ASSERT_EXCEPTION(SetEnv("A=B", "C=D"), yexception);
     }
-}
+} // Y_UNIT_TEST_SUITE(EnvTest)
diff --git a/util/system/error.cpp b/util/system/error.cpp
index c7f22acd32..164921af9e 100644
--- a/util/system/error.cpp
+++ b/util/system/error.cpp
@@ -49,7 +49,7 @@ namespace {
 
         char data[1024];
     };
-}
+} // namespace
 #endif
 
 const char* LastSystemErrorText(int code) {
diff --git a/util/system/event_ut.cpp b/util/system/event_ut.cpp
index 448f1e1350..4a4f33a137 100644
--- a/util/system/event_ut.cpp
+++ b/util/system/event_ut.cpp
@@ -75,7 +75,7 @@ namespace {
         }
     };
 
-}
+} // namespace
 
 Y_UNIT_TEST_SUITE(EventTest) {
     Y_UNIT_TEST(WaitAndSignalTest) {
@@ -124,4 +124,4 @@ Y_UNIT_TEST_SUITE(EventTest) {
         }
         queue.Stop();
     }
-}
+} // Y_UNIT_TEST_SUITE(EventTest)
diff --git a/util/system/execpath.cpp b/util/system/execpath.cpp
index 9e1b5cec93..f53eb1eba5 100644
--- a/util/system/execpath.cpp
+++ b/util/system/execpath.cpp
@@ -178,7 +178,7 @@ namespace {
         TString ExecPath;
         TString PersistentExecPath;
     };
-}
+} // namespace
 
 const TString& GetExecPath() {
     return TExecPathsHolder::Instance()->ExecPath;
diff --git a/util/system/execpath_ut.cpp b/util/system/execpath_ut.cpp
index f8ca86d9cf..6c90cbfe1b 100644
--- a/util/system/execpath_ut.cpp
+++ b/util/system/execpath_ut.cpp
@@ -18,4 +18,4 @@ Y_UNIT_TEST_SUITE(TExecPathTest) {
             throw;
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TExecPathTest)
diff --git a/util/system/fasttime.cpp b/util/system/fasttime.cpp
index 22b9e9f466..9bb70be5f3 100644
--- a/util/system/fasttime.cpp
+++ b/util/system/fasttime.cpp
@@ -231,7 +231,7 @@ namespace {
         TLinePredictor<16, TTime, TTime> P_;
         TTime Next_;
     };
-}
+} // namespace
 
 ui64 InterpolatedMicroSeconds() {
     return FastTlsSingleton<TTimePredictor>()->Get();
diff --git a/util/system/file_lock.cpp b/util/system/file_lock.cpp
index 45d91282c5..0d9b296453 100644
--- a/util/system/file_lock.cpp
+++ b/util/system/file_lock.cpp
@@ -17,7 +17,7 @@ namespace {
         }
         Y_UNREACHABLE();
     }
-}
+} // namespace
 
 TFileLock::TFileLock(const TString& filename, const EFileLockType type)
     : TFile(filename, OpenAlways | RdOnly)
diff --git a/util/system/file_ut.cpp b/util/system/file_ut.cpp
index 2ee455411c..959633f579 100644
--- a/util/system/file_ut.cpp
+++ b/util/system/file_ut.cpp
@@ -427,7 +427,7 @@ Y_UNIT_TEST_SUITE(TTestFileHandle) {
             Y_ENSURE(TStringBuf(buf, 2) == "12");
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TTestFileHandle)
 
 Y_UNIT_TEST_SUITE(TTestDecodeOpenMode) {
     Y_UNIT_TEST(It) {
@@ -437,4 +437,4 @@ Y_UNIT_TEST_SUITE(TTestDecodeOpenMode) {
         UNIT_ASSERT_VALUES_EQUAL("WrOnly|ForAppend", DecodeOpenMode(WrOnly | ForAppend));
         UNIT_ASSERT_VALUES_EQUAL("RdWr|CreateAlways|CreateNew|ForAppend|Transient|CloseOnExec|Temp|Sync|Direct|DirectAligned|Seq|NoReuse|NoReadAhead|AX|AR|AW|AWOther|0xF8888000", DecodeOpenMode(0xFFFFFFFF));
     }
-}
+} // Y_UNIT_TEST_SUITE(TTestDecodeOpenMode)
diff --git a/util/system/filemap.cpp b/util/system/filemap.cpp
index 92b6e9902a..948572e81b 100644
--- a/util/system/filemap.cpp
+++ b/util/system/filemap.cpp
@@ -65,7 +65,7 @@ namespace {
         const size_t GRANULARITY_;
         const size_t PAGE_SIZE_;
     };
-}
+} // namespace
 
 #define GRANULARITY (TSysInfo::Instance().GRANULARITY_)
 #define PAGE_SIZE (TSysInfo::Instance().PAGE_SIZE_)
diff --git a/util/system/filemap.h b/util/system/filemap.h
index 933d169adb..25a7911715 100644
--- a/util/system/filemap.h
+++ b/util/system/filemap.h
@@ -17,7 +17,7 @@
 namespace NPrivate {
     // NB: use TFileMap::Precharge() and TFileMappedArray::Prechage()
     void Precharge(const void* data, size_t dataSize, size_t offset, size_t size);
-}
+} // namespace NPrivate
 
 struct TMemoryMapCommon {
     struct TMapResult {
diff --git a/util/system/filemap_ut.cpp b/util/system/filemap_ut.cpp
index cfa13b8b4f..58a37ecbf9 100644
--- a/util/system/filemap_ut.cpp
+++ b/util/system/filemap_ut.cpp
@@ -356,4 +356,4 @@ Y_UNIT_TEST_SUITE(TFileMapTest) {
         }
         NFs::Remove(FileName_);
     }
-}
+} // Y_UNIT_TEST_SUITE(TFileMapTest)
diff --git a/util/system/flock_ut.cpp b/util/system/flock_ut.cpp
index b5f6cb5328..21737e35be 100644
--- a/util/system/flock_ut.cpp
+++ b/util/system/flock_ut.cpp
@@ -54,4 +54,4 @@ Y_UNIT_TEST_SUITE(TFileLockTest) {
             UNIT_ASSERT(guard3.WasAcquired());
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TFileLockTest)
diff --git a/util/system/fs.h b/util/system/fs.h
index f4ab746aa3..71078af78e 100644
--- a/util/system/fs.h
+++ b/util/system/fs.h
@@ -159,6 +159,6 @@ namespace NFs {
         Y_ENSURE_EX(Exists(path), TFileError{} << "Path " << path << " does not exists (checked from cwd:" << NFs::CurrentWorkingDirectory() << ")");
         return path;
     }
-}
+} // namespace NFs
 
 Y_DECLARE_OPERATORS_FOR_FLAGS(NFs::EFilePermissions);
diff --git a/util/system/fs_win.cpp b/util/system/fs_win.cpp
index 7f75d1e8b2..ff8a254782 100644
--- a/util/system/fs_win.cpp
+++ b/util/system/fs_win.cpp
@@ -255,4 +255,4 @@ bool GetObjectId(const char* path, GUID* id) {
 }
 */
 
-}
+} // namespace NFsPrivate
diff --git a/util/system/fs_win.h b/util/system/fs_win.h
index b91f869106..e46f7a2fda 100644
--- a/util/system/fs_win.h
+++ b/util/system/fs_win.h
@@ -28,4 +28,4 @@ namespace NFsPrivate {
     bool WinSetCurrentWorkingDirectory(const TString& path);
 
     bool WinMakeDirectory(const TString& path);
-}
+} // namespace NFsPrivate
diff --git a/util/system/fs_win_ut.cpp b/util/system/fs_win_ut.cpp
index 46a8c5f2b0..5317344cef 100644
--- a/util/system/fs_win_ut.cpp
+++ b/util/system/fs_win_ut.cpp
@@ -68,4 +68,4 @@ Y_UNIT_TEST_SUITE(TFsWinTest) {
         NFsPrivate::WinRemove(dir1);
         UNIT_ASSERT(!NFsPrivate::WinExists(dir1));
     }
-}
+} // Y_UNIT_TEST_SUITE(TFsWinTest)
diff --git a/util/system/fstat_ut.cpp b/util/system/fstat_ut.cpp
index 0438063179..8cdd8d169a 100644
--- a/util/system/fstat_ut.cpp
+++ b/util/system/fstat_ut.cpp
@@ -225,4 +225,4 @@ Y_UNIT_TEST_SUITE(TestFileStat) {
         UNIT_ASSERT(!stat.IsNull());
     }
 #endif
-}
+} // Y_UNIT_TEST_SUITE(TestFileStat)
diff --git a/util/system/hi_lo.h b/util/system/hi_lo.h
index f86870534f..07bcd4c57b 100644
--- a/util/system/hi_lo.h
+++ b/util/system/hi_lo.h
@@ -106,7 +106,7 @@ namespace NHiLoPrivate {
 
         return MakeIntRef<TRepr>(CharPtrOf(std::forward<T>(value)) + offset);
     }
-}
+} // namespace NHiLoPrivate
 
 /**
  * Return manipulator object that allows to get and set lower or higher bits of the value.
diff --git a/util/system/hi_lo_ut.cpp b/util/system/hi_lo_ut.cpp
index 850c12327d..d36b17e69a 100644
--- a/util/system/hi_lo_ut.cpp
+++ b/util/system/hi_lo_ut.cpp
@@ -66,4 +66,4 @@ Y_UNIT_TEST_SUITE(HiLo) {
         UNIT_ASSERT_VALUES_EQUAL(Lo32(x).Get(), 0x55667788);
         UNIT_ASSERT_VALUES_EQUAL(Hi32(x).Get(), 0x11223344);
     }
-}
+} // Y_UNIT_TEST_SUITE(HiLo)
diff --git a/util/system/hostname.cpp b/util/system/hostname.cpp
index e377910d5c..cf9343f3eb 100644
--- a/util/system/hostname.cpp
+++ b/util/system/hostname.cpp
@@ -81,7 +81,7 @@ namespace {
 
         TString FQDNHostName;
     };
-}
+} // namespace
 
 const TString& HostName() {
     return (Singleton<THostNameHolder>())->HostName;
diff --git a/util/system/hostname_ut.cpp b/util/system/hostname_ut.cpp
index 7e0da106b6..6f043e964f 100644
--- a/util/system/hostname_ut.cpp
+++ b/util/system/hostname_ut.cpp
@@ -22,4 +22,4 @@ Y_UNIT_TEST_SUITE(THostNameTest) {
             throw;
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(THostNameTest)
diff --git a/util/system/hp_timer.cpp b/util/system/hp_timer.cpp
index e4c3f21e6b..e80eb13f35 100644
--- a/util/system/hp_timer.cpp
+++ b/util/system/hp_timer.cpp
@@ -91,7 +91,7 @@ namespace {
         const double Rate;
         const ui64 CyclesPerSecond;
     };
-}
+} // namespace
 
 double NHPTimer::GetSeconds(const STime& a) noexcept {
     return TFreq::Instance().GetSeconds(a);
diff --git a/util/system/hp_timer.h b/util/system/hp_timer.h
index 0a4c252ec2..0a1aee48fb 100644
--- a/util/system/hp_timer.h
+++ b/util/system/hp_timer.h
@@ -14,7 +14,7 @@ namespace NHPTimer {
     double GetClockRate() noexcept;
     // same as GetClockRate, but in integer
     ui64 GetCyclesPerSecond() noexcept;
-}
+} // namespace NHPTimer
 
 struct THPTimer {
     THPTimer() noexcept {
diff --git a/util/system/info.h b/util/system/info.h
index 9e6fa2fb3d..f30d71a188 100644
--- a/util/system/info.h
+++ b/util/system/info.h
@@ -11,4 +11,4 @@ namespace NSystemInfo {
     size_t GetPageSize() noexcept;
     size_t TotalMemorySize();
     size_t MaxOpenFiles();
-}
+} // namespace NSystemInfo
diff --git a/util/system/interrupt_signals_ut.cpp b/util/system/interrupt_signals_ut.cpp
index 2a7f0bddd7..d5f0279413 100644
--- a/util/system/interrupt_signals_ut.cpp
+++ b/util/system/interrupt_signals_ut.cpp
@@ -43,4 +43,4 @@ Y_UNIT_TEST_SUITE(TTestInterruptSignals) {
             UNIT_ASSERT_VALUES_EQUAL(HandledSigNum.load(), signum);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TTestInterruptSignals)
diff --git a/util/system/madvise.cpp b/util/system/madvise.cpp
index ad24ac0f1d..3f045f24cf 100644
--- a/util/system/madvise.cpp
+++ b/util/system/madvise.cpp
@@ -40,7 +40,7 @@ namespace {
         }
 #endif
     }
-}
+} // namespace
 
 void MadviseSequentialAccess(const void* begin, size_t size) {
 #if !defined(_win_)
diff --git a/util/system/mem_info.cpp b/util/system/mem_info.cpp
index 75f2c1c493..4357d12f11 100644
--- a/util/system/mem_info.cpp
+++ b/util/system/mem_info.cpp
@@ -212,4 +212,4 @@ namespace NMemInfo {
 #endif
         return result;
     }
-}
+} // namespace NMemInfo
diff --git a/util/system/mem_info.h b/util/system/mem_info.h
index f303d49197..c44b86e208 100644
--- a/util/system/mem_info.h
+++ b/util/system/mem_info.h
@@ -15,4 +15,4 @@ namespace NMemInfo {
     };
 
     TMemInfo GetMemInfo(pid_t = 0);
-}
+} // namespace NMemInfo
diff --git a/util/system/mincore_ut.cpp b/util/system/mincore_ut.cpp
index ae4a10c517..27c342d57f 100644
--- a/util/system/mincore_ut.cpp
+++ b/util/system/mincore_ut.cpp
@@ -36,4 +36,4 @@ Y_UNIT_TEST_SUITE(MincoreSuite) {
         }
 #endif
     }
-}
+} // Y_UNIT_TEST_SUITE(MincoreSuite)
diff --git a/util/system/mktemp_ut.cpp b/util/system/mktemp_ut.cpp
index 19bcf70852..38eab941c7 100644
--- a/util/system/mktemp_ut.cpp
+++ b/util/system/mktemp_ut.cpp
@@ -38,4 +38,4 @@ Y_UNIT_TEST_SUITE(MakeTempFileSuite) {
             UNIT_ASSERT(TFsPath{tempFilePath}.Exists());
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(MakeTempFileSuite)
diff --git a/util/system/nice_ut.cpp b/util/system/nice_ut.cpp
index ae0051f285..ae0d9c04ae 100644
--- a/util/system/nice_ut.cpp
+++ b/util/system/nice_ut.cpp
@@ -39,4 +39,4 @@ Y_UNIT_TEST_SUITE(NiceTest) {
         UNIT_ASSERT_VALUES_EQUAL(GetPriority(), prio + 3);
     }
 #endif
-}
+} // Y_UNIT_TEST_SUITE(NiceTest)
diff --git a/util/system/pipe_ut.cpp b/util/system/pipe_ut.cpp
index 6d53432de8..d6b61e10ce 100644
--- a/util/system/pipe_ut.cpp
+++ b/util/system/pipe_ut.cpp
@@ -12,4 +12,4 @@ Y_UNIT_TEST_SUITE(TPipeTest) {
         UNIT_ASSERT(1 == r.Read(&c, 1));
         UNIT_ASSERT_VALUES_EQUAL('a', c);
     }
-}
+} // Y_UNIT_TEST_SUITE(TPipeTest)
diff --git a/util/system/progname.cpp b/util/system/progname.cpp
index 2c29119320..a7eaa82b4b 100644
--- a/util/system/progname.cpp
+++ b/util/system/progname.cpp
@@ -15,7 +15,7 @@ namespace {
 
         TString ProgName;
     };
-}
+} // namespace
 
 const TString& GetProgramName() {
     return Singleton<TProgramNameHolder>()->ProgName;
diff --git a/util/system/progname_ut.cpp b/util/system/progname_ut.cpp
index 11f3d9308b..e644108157 100644
--- a/util/system/progname_ut.cpp
+++ b/util/system/progname_ut.cpp
@@ -15,4 +15,4 @@ Y_UNIT_TEST_SUITE(TProgramNameTest) {
             throw;
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TProgramNameTest)
diff --git a/util/system/rusage_ut.cpp b/util/system/rusage_ut.cpp
index 0d4e0fe54b..1dc4c5b687 100644
--- a/util/system/rusage_ut.cpp
+++ b/util/system/rusage_ut.cpp
@@ -8,4 +8,4 @@ Y_UNIT_TEST_SUITE(TRusageTest) {
         // just check it returns something
         r.Fill();
     }
-}
+} // Y_UNIT_TEST_SUITE(TRusageTest)
diff --git a/util/system/sanitizers.cpp b/util/system/sanitizers.cpp
index 3e710b39c7..5796c59151 100644
--- a/util/system/sanitizers.cpp
+++ b/util/system/sanitizers.cpp
@@ -20,7 +20,7 @@ namespace {
     }
     void __tsan_set_fiber_name(void*, const char*) {
     }
-}
+} // namespace
     #endif
 #endif
 
diff --git a/util/system/sanitizers.h b/util/system/sanitizers.h
index 47d3e8627c..e7f4450d38 100644
--- a/util/system/sanitizers.h
+++ b/util/system/sanitizers.h
@@ -196,4 +196,4 @@ namespace NSan {
         Y_UNUSED(a);
 #endif
     }
-}
+} // namespace NSan
diff --git a/util/system/sem.cpp b/util/system/sem.cpp
index 96affec792..984e9d14c0 100644
--- a/util/system/sem.cpp
+++ b/util/system/sem.cpp
@@ -210,7 +210,7 @@ namespace {
     Y_PRAGMA_DIAGNOSTIC_POP
     #endif
 #endif
-}
+} // namespace
 
 class TSemaphore::TImpl: public TSemaphoreImpl {
 public:
diff --git a/util/system/shellcommand.cpp b/util/system/shellcommand.cpp
index 6742f46c64..e4bfb165bc 100644
--- a/util/system/shellcommand.cpp
+++ b/util/system/shellcommand.cpp
@@ -104,7 +104,7 @@ namespace {
         return std::string(str.begin(), str.end());
     }
 #endif
-}
+} // namespace
 
 // temporary measure to avoid rewriting all poll calls on win TPipeHandle
 #if defined(_win_)
diff --git a/util/system/shellcommand_ut.cpp b/util/system/shellcommand_ut.cpp
index 13a5fad75f..416ae22c10 100644
--- a/util/system/shellcommand_ut.cpp
+++ b/util/system/shellcommand_ut.cpp
@@ -67,7 +67,7 @@ Y_UNIT_TEST_SUITE(TShellQuoteTest) {
         ShellQuoteArgSp(cmd, "-DVal=Blah");
         UNIT_ASSERT_STRINGS_EQUAL(cmd, "\"/pr f/krev/prev.exe\" \"-DVal=\\\"W Quotes\\\"\" \"-DVal=W Space\" \"-DVal=Blah\"");
     }
-}
+} // Y_UNIT_TEST_SUITE(TShellQuoteTest)
 
 Y_UNIT_TEST_SUITE(TShellCommandTest) {
     Y_UNIT_TEST(TestNoQuotes) {
@@ -489,4 +489,4 @@ Y_UNIT_TEST_SUITE(TShellCommandTest) {
 
         UNIT_ASSERT_VALUES_EQUAL(firstLine, text);
     }
-}
+} // Y_UNIT_TEST_SUITE(TShellCommandTest)
diff --git a/util/system/shmat.cpp b/util/system/shmat.cpp
index 13fd4c236c..3ae199d429 100644
--- a/util/system/shmat.cpp
+++ b/util/system/shmat.cpp
@@ -86,7 +86,7 @@ namespace {
         return syscall(__NR_ipc, IPCOP_shmdt, 0, 0, 0, addr);
     }
     #endif
-}
+} // namespace
 #endif
 
 TSharedMemory::TSharedMemory()
diff --git a/util/system/shmat_ut.cpp b/util/system/shmat_ut.cpp
index 9d92243ae7..c38c2b8873 100644
--- a/util/system/shmat_ut.cpp
+++ b/util/system/shmat_ut.cpp
@@ -14,4 +14,4 @@ Y_UNIT_TEST_SUITE(TTestSharedMemory) {
 
         UNIT_ASSERT_VALUES_EQUAL(*(ui32*)m2.GetPtr(), 123);
     }
-}
+} // Y_UNIT_TEST_SUITE(TTestSharedMemory)
diff --git a/util/system/spin_wait.cpp b/util/system/spin_wait.cpp
index fed173f307..bb13e3fd98 100644
--- a/util/system/spin_wait.cpp
+++ b/util/system/spin_wait.cpp
@@ -19,7 +19,7 @@ namespace {
     // arbitrary values
     constexpr unsigned MIN_SLEEP_TIME = 500;
     constexpr unsigned MAX_SPIN_COUNT = 0x7FF;
-}
+} // namespace
 
 TSpinWait::TSpinWait() noexcept
     : T(MIN_SLEEP_TIME)
diff --git a/util/system/spinlock_ut.cpp b/util/system/spinlock_ut.cpp
index e8639a6404..5b482cbcf1 100644
--- a/util/system/spinlock_ut.cpp
+++ b/util/system/spinlock_ut.cpp
@@ -34,4 +34,4 @@ Y_UNIT_TEST_SUITE(TSpinLock) {
     Y_UNIT_TEST(TAdaptiveLock_IsLocked) {
         TestLock<TAdaptiveLock>();
     }
-}
+} // Y_UNIT_TEST_SUITE(TSpinLock)
diff --git a/util/system/src_location_ut.cpp b/util/system/src_location_ut.cpp
index 5b86cb86ef..955a6e15d2 100644
--- a/util/system/src_location_ut.cpp
+++ b/util/system/src_location_ut.cpp
@@ -15,4 +15,4 @@ Y_UNIT_TEST_SUITE(TestLocation) {
         static constexpr TSourceLocation location = __LOCATION__;
         static_assert(location.Line >= 0, "__LOCATION__ can be used at compile time expressions");
     }
-}
+} // Y_UNIT_TEST_SUITE(TestLocation)
diff --git a/util/system/src_root.h b/util/system/src_root.h
index d595de7d8f..f0bf9185e6 100644
--- a/util/system/src_root.h
+++ b/util/system/src_root.h
@@ -70,6 +70,6 @@ namespace NPrivate {
     constexpr Y_FORCE_INLINE TStaticBuf StripRoot(const TStaticBuf& f) noexcept {
         return StripRoot(f, RootPrefixLength(f));
     }
-}
+} // namespace NPrivate
 
 #define __SOURCE_FILE_IMPL__ ::NPrivate::StripRoot(STATIC_BUF(__FILE__), std::integral_constant<unsigned, ::NPrivate::RootPrefixLength(STATIC_BUF(__FILE__))>::value)
diff --git a/util/system/src_root_ut.cpp b/util/system/src_root_ut.cpp
index e9a675eb9a..3d4a33c350 100644
--- a/util/system/src_root_ut.cpp
+++ b/util/system/src_root_ut.cpp
@@ -24,4 +24,4 @@ Y_UNIT_TEST_SUITE(TestSourceRoot) {
         static_assert(!::NPrivate::IsProperPrefix(STATIC_BUF(""), STATIC_BUF("")), R"(IsProperPrefix("", "") failed)");
         static_assert(::NPrivate::IsProperPrefix(STATIC_BUF("dir"), STATIC_BUF("dir/file")), R"(IsProperPrefix("dir", "dir/file") failed)");
     }
-}
+} // Y_UNIT_TEST_SUITE(TestSourceRoot)
diff --git a/util/system/tempfile_ut.cpp b/util/system/tempfile_ut.cpp
index e4a0923d0b..a749b05469 100644
--- a/util/system/tempfile_ut.cpp
+++ b/util/system/tempfile_ut.cpp
@@ -115,7 +115,7 @@ Y_UNIT_TEST_SUITE(TTempFileHandle) {
     Y_UNIT_TEST(NonExistingDirectory) {
         UNIT_ASSERT_EXCEPTION(TTempFileHandle::InDir("nonexsistingdirname"), TSystemError);
     }
-}
+} // Y_UNIT_TEST_SUITE(TTempFileHandle)
 
 Y_UNIT_TEST_SUITE(MakeTempName) {
     Y_UNIT_TEST(Default) {
@@ -148,4 +148,4 @@ Y_UNIT_TEST_SUITE(MakeTempName) {
         }
         UNIT_ASSERT(!NFs::Exists(path));
     }
-}
+} // Y_UNIT_TEST_SUITE(MakeTempName)
diff --git a/util/system/thread.cpp b/util/system/thread.cpp
index a845fd4236..cdde02fa3e 100644
--- a/util/system/thread.cpp
+++ b/util/system/thread.cpp
@@ -268,7 +268,7 @@ namespace {
 
         return t.Get();
     }
-}
+} // namespace
 
 class TThread::TImpl: public TThreadBase {
 public:
@@ -382,7 +382,7 @@ namespace {
     static void* ThreadProcWrapper(void* param) {
         return reinterpret_cast<T*>(param)->ThreadProc();
     }
-}
+} // namespace
 
 ISimpleThread::ISimpleThread(size_t stackSize)
     : TThread(TParams(ThreadProcWrapper<ISimpleThread>, reinterpret_cast<void*>(this), stackSize))
@@ -463,7 +463,7 @@ namespace {
         TSetThreadDescription SetThreadDescription;
         TGetThreadDescription GetThreadDescription;
     };
-}
+} // namespace
 #endif // _win_
 
 void TThread::SetCurrentThreadName(const char* name) {
diff --git a/util/system/thread_ut.cpp b/util/system/thread_ut.cpp
index 24eeee5016..e1b88c1d73 100644
--- a/util/system/thread_ut.cpp
+++ b/util/system/thread_ut.cpp
@@ -226,4 +226,4 @@ Y_UNIT_TEST_SUITE(TSysThreadTest) {
         UNIT_ASSERT_VALUES_EQUAL(thread.Join(), nullptr);
         UNIT_ASSERT(flag);
     }
-}
+} // Y_UNIT_TEST_SUITE(TSysThreadTest)
diff --git a/util/system/tls.cpp b/util/system/tls.cpp
index 5979576a4a..74cd4b6fc7 100644
--- a/util/system/tls.cpp
+++ b/util/system/tls.cpp
@@ -115,7 +115,7 @@ namespace {
 
         virtual ~TGenericTlsBase() = default;
     };
-}
+} // namespace
 
 #if defined(_unix_)
 namespace {
@@ -158,7 +158,7 @@ namespace {
     };
 
     using TKeyDescriptor = TMasterTls::TPerThreadStorage::TKey;
-}
+} // namespace
 
 class TKey::TImpl: public TKeyDescriptor {
 public:
@@ -211,7 +211,7 @@ namespace {
         TMutex Lock_;
         THashMap<TThread::TId, TPTSRef> Datas_;
     };
-}
+} // namespace
 
 class TKey::TImpl {
 public:
diff --git a/util/system/tls.h b/util/system/tls.h
index 1771663e88..ede9fef511 100644
--- a/util/system/tls.h
+++ b/util/system/tls.h
@@ -149,7 +149,7 @@
 
 namespace NPrivate {
     void FillWithTrash(void* ptr, size_t len);
-}
+} // namespace NPrivate
 
 namespace NTls {
     using TDtor = void (*)(void*);
@@ -289,7 +289,7 @@ namespace NTls {
         THolder<TConstructor> Constructor_;
         TKey Key_;
     };
-}
+} // namespace NTls
 
 template <class T>
 static inline T& TlsRef(NTls::TValue<T>& v) noexcept {
diff --git a/util/system/tls_ut.cpp b/util/system/tls_ut.cpp
index e84d34b42a..5022d5ef1a 100644
--- a/util/system/tls_ut.cpp
+++ b/util/system/tls_ut.cpp
@@ -55,4 +55,4 @@ Y_UNIT_TEST_SUITE(TTestTLS) {
             UNIT_ASSERT_VALUES_EQUAL(x.Get()[i].Get(), 0);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TTestTLS)
diff --git a/util/system/type_name_ut.cpp b/util/system/type_name_ut.cpp
index c9b2a1e775..269668c5b7 100644
--- a/util/system/type_name_ut.cpp
+++ b/util/system/type_name_ut.cpp
@@ -15,7 +15,7 @@ Y_UNIT_TEST_SUITE(TDemangleTest) {
         CppDemangle("");
         CppDemangle("Sfsdf$dfsdfTTSFSDF23234::SDFS:FSDFSDF#$%");
     }
-}
+} // Y_UNIT_TEST_SUITE(TDemangleTest)
 
 namespace NUtil::NTypeNameTest {
 
@@ -51,7 +51,7 @@ namespace NUtil::NTypeNameTest {
             return TypeName(*this);
         }
     };
-}
+} // namespace NUtil::NTypeNameTest
 
 using namespace NUtil::NTypeNameTest;
 
@@ -181,4 +181,4 @@ Y_UNIT_TEST_SUITE(TypeName) {
         UNIT_ASSERT_VALUES_EQUAL(TypeName(cvPtr), "char const volatile*");
 #endif
     }
-}
+} // Y_UNIT_TEST_SUITE(TypeName)
diff --git a/util/system/types_ut.cpp b/util/system/types_ut.cpp
index 19e40cef46..f3289fc80d 100644
--- a/util/system/types_ut.cpp
+++ b/util/system/types_ut.cpp
@@ -20,4 +20,4 @@ Y_UNIT_TEST_SUITE(TestTypes) {
         sscanf("159", "%" SCNx64, &val64);
         UNIT_ASSERT(val64 == 345);
     }
-}
+} // Y_UNIT_TEST_SUITE(TestTypes)
diff --git a/util/system/unaligned_mem_ut.cpp b/util/system/unaligned_mem_ut.cpp
index 9de3f3e931..52f734a779 100644
--- a/util/system/unaligned_mem_ut.cpp
+++ b/util/system/unaligned_mem_ut.cpp
@@ -26,7 +26,7 @@ namespace {
 
         __uint128_t x;
     };
-}
+} // namespace
 #endif
 
 Y_UNIT_TEST_SUITE(UnalignedMem) {
@@ -93,4 +93,4 @@ Y_UNIT_TEST_SUITE(UnalignedMem) {
         UNIT_ASSERT(val == TUInt128::Max());
     }
 #endif
-}
+} // Y_UNIT_TEST_SUITE(UnalignedMem)
diff --git a/util/system/user_ut.cpp b/util/system/user_ut.cpp
index 4f8a5ce2ef..0a42167fe3 100644
--- a/util/system/user_ut.cpp
+++ b/util/system/user_ut.cpp
@@ -6,4 +6,4 @@ Y_UNIT_TEST_SUITE(TestUser) {
     Y_UNIT_TEST(TestNotEmpty) {
         UNIT_ASSERT(GetUsername());
     }
-}
+} // Y_UNIT_TEST_SUITE(TestUser)
diff --git a/util/system/valgrind.h b/util/system/valgrind.h
index 2ec4ed927c..a8c87ef380 100644
--- a/util/system/valgrind.h
+++ b/util/system/valgrind.h
@@ -45,4 +45,4 @@ namespace NValgrind {
         return plain;
 #endif
     }
-}
+} // namespace NValgrind
diff --git a/util/system/yassert.cpp b/util/system/yassert.cpp
index 0f586648b7..73ab2980d3 100644
--- a/util/system/yassert.cpp
+++ b/util/system/yassert.cpp
@@ -33,10 +33,10 @@ extern "C" {
 namespace {
     struct TPanicLockHolder: public TAdaptiveLock {
     };
-}
+} // namespace
 namespace NPrivate {
     [[noreturn]] Y_NO_INLINE void InternalPanicImpl(int line, const char* function, const char* expr, int, int, int, const TStringBuf file, const char* errorMessage, size_t errorMessageSize) noexcept;
-}
+} // namespace NPrivate
 
 void ::NPrivate::Panic(const TStaticBuf& file, int line, const char* function, const char* expr, const char* format, ...) noexcept {
     try {
@@ -91,4 +91,4 @@ namespace NPrivate {
     } catch (...) {
         abort();
     }
-}
+} // namespace NPrivate
diff --git a/util/system/yassert.h b/util/system/yassert.h
index 4e2e72e22f..201f9605c2 100644
--- a/util/system/yassert.h
+++ b/util/system/yassert.h
@@ -74,7 +74,7 @@ inline void YaDebugBreak() {
 namespace NPrivate {
     /// method should not be used directly
     [[noreturn]] void Panic(const TStaticBuf& file, int line, const char* function, const char* expr, const char* format, ...) noexcept Y_PRINTF_FORMAT(5, 6);
-}
+} // namespace NPrivate
 
 /// Assert that does not depend on NDEBUG macro and outputs message like printf
 #define Y_ABORT_UNLESS(expr, ...)                                                                    \
@@ -90,7 +90,7 @@ namespace NPrivate {
 #define Y_ABORT(...) Y_ABORT_UNLESS(false, __VA_ARGS__)
 
 #ifndef NDEBUG
-    /// Assert that depend on NDEBUG macro and outputs message like printf
+  /// Assert that depend on NDEBUG macro and outputs message like printf
     #define Y_DEBUG_ABORT_UNLESS Y_ABORT_UNLESS
 #else
     #define Y_DEBUG_ABORT_UNLESS(expr, ...)           \
diff --git a/util/system/yassert_ut.cpp b/util/system/yassert_ut.cpp
index 701da9bf6c..106eda691b 100644
--- a/util/system/yassert_ut.cpp
+++ b/util/system/yassert_ut.cpp
@@ -38,4 +38,4 @@ Y_UNIT_TEST_SUITE(YassertTest) {
             []() { Y_ABORT_UNLESS([]() {throw yexception{} << "check"; return false; }(), "hi %s", "there"); }(),
             yexception);
     }
-}
+} // Y_UNIT_TEST_SUITE(YassertTest)
diff --git a/util/thread/factory.cpp b/util/thread/factory.cpp
index b71d9972bb..c7c42f59e3 100644
--- a/util/thread/factory.cpp
+++ b/util/thread/factory.cpp
@@ -64,7 +64,7 @@ namespace {
     private:
         std::function<void()> Func;
     };
-}
+} // namespace
 
 THolder<IThread> IThreadFactory::Run(const std::function<void()>& func) {
     THolder<IThread> ret(DoCreate());
diff --git a/util/thread/lfqueue_ut.cpp b/util/thread/lfqueue_ut.cpp
index 626f7d4091..bb98d0d747 100644
--- a/util/thread/lfqueue_ut.cpp
+++ b/util/thread/lfqueue_ut.cpp
@@ -328,4 +328,4 @@ Y_UNIT_TEST_SUITE(TLockFreeQueueTests) {
         queue.Dequeue(&o);
         o.Check(0, 0, 2, 1, 0);
     }
-}
+} // Y_UNIT_TEST_SUITE(TLockFreeQueueTests)
diff --git a/util/thread/lfstack_ut.cpp b/util/thread/lfstack_ut.cpp
index e0527aa501..9202b21eff 100644
--- a/util/thread/lfstack_ut.cpp
+++ b/util/thread/lfstack_ut.cpp
@@ -344,4 +344,4 @@ Y_UNIT_TEST_SUITE(TLockFreeStackTests) {
     Y_UNIT_TEST(TesMultiThreadMove) {
         TMultiThreadTester<TMoveTest>().Run();
     }
-}
+} // Y_UNIT_TEST_SUITE(TLockFreeStackTests)
diff --git a/util/thread/pool.cpp b/util/thread/pool.cpp
index 77bb7b72cb..14feec7eda 100644
--- a/util/thread/pool.cpp
+++ b/util/thread/pool.cpp
@@ -57,7 +57,7 @@ namespace {
         bool EnumerateThreads = false;
         std::atomic<ui64> Index{0};
     };
-}
+} // namespace
 
 TThreadFactoryHolder::TThreadFactoryHolder() noexcept
     : Pool_(SystemThreadFactory())
@@ -660,7 +660,7 @@ namespace {
             Owned->Process(data);
         }
     };
-}
+} // namespace
 
 void IThreadPool::SafeAdd(IObjectInQueue* obj) {
     Y_ENSURE_EX(Add(obj), TThreadPoolException() << TStringBuf("can not add object to queue"));
@@ -757,7 +757,7 @@ namespace {
         IThreadPool* Parent_;
         TThreadImplRef Impl_;
     };
-}
+} // namespace
 
 IThread* IThreadPool::DoCreate() {
     return new TPoolThread(this);
diff --git a/util/thread/pool_ut.cpp b/util/thread/pool_ut.cpp
index 85cbcdf6c9..e351245812 100644
--- a/util/thread/pool_ut.cpp
+++ b/util/thread/pool_ut.cpp
@@ -253,4 +253,4 @@ Y_UNIT_TEST_SUITE(TThreadPoolTest) {
             TestEnumeratedThreadName(pool, expectedNames);
         }
     }
-}
+} // Y_UNIT_TEST_SUITE(TThreadPoolTest)
diff --git a/util/thread/singleton.h b/util/thread/singleton.h
index dc9ee5a4eb..fac938d2c5 100644
--- a/util/thread/singleton.h
+++ b/util/thread/singleton.h
@@ -25,7 +25,7 @@ namespace NPrivate {
 #endif
         }
     };
-}
+} // namespace NPrivate
 
 template <class T, size_t Priority>
 Y_RETURNS_NONNULL static inline T* FastTlsSingletonWithPriority() {
diff --git a/util/thread/singleton_ut.cpp b/util/thread/singleton_ut.cpp
index 164b1cc184..1f5c96f0fd 100644
--- a/util/thread/singleton_ut.cpp
+++ b/util/thread/singleton_ut.cpp
@@ -10,7 +10,7 @@ namespace {
         {
         }
     };
-}
+} // namespace
 
 Y_UNIT_TEST_SUITE(Tls) {
     Y_UNIT_TEST(FastThread) {
@@ -18,4 +18,4 @@ Y_UNIT_TEST_SUITE(Tls) {
         FastTlsSingleton<TFoo>()->i += 3;
         UNIT_ASSERT_VALUES_EQUAL(3, FastTlsSingleton<TFoo>()->i);
     }
-}
+} // Y_UNIT_TEST_SUITE(Tls)
diff --git a/util/ysaveload.h b/util/ysaveload.h
index 6035390346..ab6efa767a 100644
--- a/util/ysaveload.h
+++ b/util/ysaveload.h
@@ -59,7 +59,7 @@ static inline void SavePodType(IOutputStream* rh, const T& t) {
 namespace NPrivate {
     [[noreturn]] void ThrowLoadEOFException(size_t typeSize, size_t realSize, TStringBuf structName);
     [[noreturn]] void ThrowUnexpectedVariantTagException(ui8 tagIndex);
-}
+} // namespace NPrivate
 
 template <class T>
 static inline void LoadPodType(IInputStream* rh, T& t) {
@@ -132,7 +132,7 @@ struct TSerializerTakingIntoAccountThePodType {
 
 namespace NHasSaveLoad {
     Y_HAS_MEMBER(SaveLoad);
-}
+} // namespace NHasSaveLoad
 
 template <class T, class = void>
 struct TSerializerMethodSelector;
@@ -671,7 +671,7 @@ namespace NPrivate {
         ::Load(is, loaded);
         v.template emplace<I>(std::move(loaded));
     }
-}
+} // namespace NPrivate
 
 template <typename... Args>
 struct TSerializer<std::variant<Args...>> {