diff --git a/cpp/src/core/knowhere/knowhere/common/Buffer.h b/cpp/src/core/knowhere/knowhere/common/Buffer.h
index d95da18602..f9e15d95bd 100644
--- a/cpp/src/core/knowhere/knowhere/common/Buffer.h
+++ b/cpp/src/core/knowhere/knowhere/common/Buffer.h
@@ -36,7 +36,7 @@ struct BufferDeleter {
         free((void*)buffer->data());
     }
 };
-}
+}  // namespace internal
 
 inline BufferPtr
 MakeBufferSmart(uint8_t* data, const int64_t size) {
diff --git a/cpp/src/core/unittest/test_ivf.cpp b/cpp/src/core/unittest/test_ivf.cpp
index a0da0eca8e..17eb888ddc 100644
--- a/cpp/src/core/unittest/test_ivf.cpp
+++ b/cpp/src/core/unittest/test_ivf.cpp
@@ -43,9 +43,9 @@ namespace kn = knowhere;
 
 }  // namespace
 
+using ::testing::Combine;
 using ::testing::TestWithParam;
 using ::testing::Values;
-using ::testing::Combine;
 
 constexpr int device_id = 0;
 constexpr int64_t DIM = 128;
diff --git a/cpp/src/core/unittest/test_kdt.cpp b/cpp/src/core/unittest/test_kdt.cpp
index 6fa6ba33f3..f9e02bd9a4 100644
--- a/cpp/src/core/unittest/test_kdt.cpp
+++ b/cpp/src/core/unittest/test_kdt.cpp
@@ -34,9 +34,9 @@ namespace kn = knowhere;
 
 }  // namespace
 
+using ::testing::Combine;
 using ::testing::TestWithParam;
 using ::testing::Values;
-using ::testing::Combine;
 
 class KDTTest : public DataGen, public ::testing::Test {
  protected:
diff --git a/cpp/src/core/unittest/test_nsg/test_nsg.cpp b/cpp/src/core/unittest/test_nsg/test_nsg.cpp
index 70261a63dc..b59f0d4928 100644
--- a/cpp/src/core/unittest/test_nsg/test_nsg.cpp
+++ b/cpp/src/core/unittest/test_nsg/test_nsg.cpp
@@ -32,9 +32,9 @@ namespace kn = knowhere;
 
 }  // namespace
 
+using ::testing::Combine;
 using ::testing::TestWithParam;
 using ::testing::Values;
-using ::testing::Combine;
 
 constexpr int64_t DEVICE_ID = 1;
 
diff --git a/cpp/src/sdk/include/Status.h b/cpp/src/sdk/include/Status.h
index a81116b31d..008f9956d2 100644
--- a/cpp/src/sdk/include/Status.h
+++ b/cpp/src/sdk/include/Status.h
@@ -20,12 +20,12 @@
 #include <string>
 
 /** \brief Milvus SDK namespace
-*/
+ */
 namespace milvus {
 
 /**
-* @brief Status Code for SDK interface return
-*/
+ * @brief Status Code for SDK interface return
+ */
 enum class StatusCode {
     OK = 0,
 
@@ -41,8 +41,8 @@ enum class StatusCode {
 };
 
 /**
-* @brief Status for SDK interface return
-*/
+ * @brief Status for SDK interface return
+ */
 class Status {
  public:
     Status(StatusCode code, const std::string& msg);
diff --git a/cpp/src/server/grpc_impl/GrpcRequestHandler.h b/cpp/src/server/grpc_impl/GrpcRequestHandler.h
index 0decf61500..1a9b591154 100644
--- a/cpp/src/server/grpc_impl/GrpcRequestHandler.h
+++ b/cpp/src/server/grpc_impl/GrpcRequestHandler.h
@@ -148,25 +148,25 @@ class GrpcRequestHandler final : public ::milvus::grpc::MilvusService::Service {
            ::milvus::grpc::TopKQueryResultList* response) override;
 
     /**
-   * @brief Internal use query interface
-   *
-   * This method is used to query vector in specified files.
-   *
-   * @param context, add context for every RPC
-   * @param request:
-   *                file_id_array, specified files id array, queried.
-   *                query_record_array, all vector are going to be queried.
-   *                query_range_array, optional ranges for conditional search. If not specified, search whole table
-   *                topk, how many similarity vectors will be searched.
-   *
-   * @param writer, write query result array.
-   *
-   * @return status
-   *
-   * @param context
-   * @param request
-   * @param writer
-   */
+     * @brief Internal use query interface
+     *
+     * This method is used to query vector in specified files.
+     *
+     * @param context, add context for every RPC
+     * @param request:
+     *                file_id_array, specified files id array, queried.
+     *                query_record_array, all vector are going to be queried.
+     *                query_range_array, optional ranges for conditional search. If not specified, search whole table
+     *                topk, how many similarity vectors will be searched.
+     *
+     * @param writer, write query result array.
+     *
+     * @return status
+     *
+     * @param context
+     * @param request
+     * @param writer
+     */
     ::grpc::Status
     SearchInFiles(::grpc::ServerContext* context, const ::milvus::grpc::SearchInFilesParam* request,
                   ::milvus::grpc::TopKQueryResultList* response) override;
diff --git a/cpp/src/utils/LogUtil.cpp b/cpp/src/utils/LogUtil.cpp
index ed2e1a446b..4a962f466c 100644
--- a/cpp/src/utils/LogUtil.cpp
+++ b/cpp/src/utils/LogUtil.cpp
@@ -31,7 +31,7 @@ static int warning_idx = 0;
 static int trace_idx = 0;
 static int error_idx = 0;
 static int fatal_idx = 0;
-}
+}  // namespace
 
 // TODO(yzb) : change the easylogging library to get the log level from parameter rather than filename
 void