diff --git a/common/BUILD.gn b/common/BUILD.gn
index 206ca34..9843f64 100644
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@@ -17,34 +17,32 @@ import(
     "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 ohos_shared_library("distributed_screen_utils") {
-    include_dirs = [
-        "//utils/native/base/include",
-        "include",
-        "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter",
-    ]
+  include_dirs = [
+    "//utils/native/base/include",
+    "include",
+    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter",
+  ]
 
-    sources = [
-        "src/dscreen_util.cpp",
-        "src/dscreen_log.cpp",
-    ]
+  sources = [
+    "src/dscreen_log.cpp",
+    "src/dscreen_util.cpp",
+  ]
 
-    deps = [
-        "//utils/native/base:utils",
-    ]
+  deps = [ "//utils/native/base:utils" ]
 
-    external_deps = [
-        "dsoftbus_standard:softbus_client",
-        "hiviewdfx_hilog_native:libhilog",
-        "hitrace_native:hitrace_meter",
-    ]
+  external_deps = [
+    "dsoftbus_standard:softbus_client",
+    "hitrace_native:hitrace_meter",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
 
-    defines = [
-        "HI_LOG_ENABLE",
-        "DH_LOG_TAG=\"dscreenutil\"",
-        "LOG_DOMAIN=0xD004100",
-    ]
+  defines = [
+    "HI_LOG_ENABLE",
+    "DH_LOG_TAG=\"dscreenutil\"",
+    "LOG_DOMAIN=0xD004100",
+  ]
 
-    subsystem_name = "distributedhardware"
+  subsystem_name = "distributedhardware"
 
-    part_name = "distributed_screen"
-}
\ No newline at end of file
+  part_name = "distributed_screen"
+}
diff --git a/common/include/dscreen_hitrace.h b/common/include/dscreen_hitrace.h
index 9bff45b..5809117 100644
--- a/common/include/dscreen_hitrace.h
+++ b/common/include/dscreen_hitrace.h
@@ -18,42 +18,36 @@
 
 #include <string>
 
-// #include "bytrace.h"
 #include "hitrace_meter.h"
 
 namespace OHOS {
 namespace DistributedHardware {
-//SourceHandler_samgr
 constexpr uint64_t DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START";
-//SinkHandler_samgr
 constexpr uint64_t DSCREEN_SINK_LOAD_SYSTEM_ABILITY_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START";
-//SourceTrans_opensession/CloseSession/ReleaseSession
 constexpr uint64_t DSCREEN_SOURCE_OPEN_SESSION_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_SOURCE_OPEN_SESSION_START = "DSCREEN_SOURCE_OPEN_SESSION_START";
 constexpr uint64_t DSCREEN_SOURCE_CLOSE_SESSION_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_SOURCE_CLOSE_SESSION_START = "DSCREEN_SOURCE_CLOSE_SESSION_START";
 constexpr uint64_t DSCREEN_SOURCE_RELEASE_SESSION_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_SOURCE_RELEASE_SESSION_START = "DSCREEN_SOURCE_RELEASE_SESSION_START";
-//SinkTrans_CloseSession/ReleaseSession
 constexpr uint64_t DSCREEN_SINK_CLOSE_SESSION_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_SINK_CLOSE_SESSION_START = "DSCREEN_SINK_CLOSE_SESSION_START";
 constexpr uint64_t DSCREEN_SINK_RELEASE_SESSION_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_SINK_RELEASE_SESSION_START = "DSCREEN_SINK_RELEASE_SESSION_START";
-//StartEncoder/StopEncoder/ReleaseEncoder
 constexpr uint64_t DSCREEN_START_ENCODER_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_START_ENCODER_START = "DSCREEN_START_ENCODER_START";
 constexpr uint64_t DSCREEN_STOP_ENCODER_LABEL  = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_STOP_ENCODER_START =  "DSCREEN_STOP_ENCODER_START";
 constexpr uint64_t DSCREEN_RELESSE_ENCODER_LABEL  = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_RELESSE_ENCODER_START =  "DSCREEN_RELESSE_ENCODER_START";
-//StartDecoder/StopDecoder/ReleaseDecoder
 constexpr uint64_t DSCREEN_START_DECODER_LABEL = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_START_DECODER_START = "DSCREEN_START_DECODER_START";
 constexpr uint64_t DSCREEN_STOP_DECODER_LABEL  = BYTRACE_TAG_SCREEN;
-const std::string DSCREEN_STOP_DECODER_START =  "DSCREEN_STOP_DECODER_START";
 constexpr uint64_t DSCREEN_RELEASE_DECODER_LABEL  = BYTRACE_TAG_SCREEN;
+
+const std::string DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START";
+const std::string DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START";
+const std::string DSCREEN_SOURCE_OPEN_SESSION_START = "DSCREEN_SOURCE_OPEN_SESSION_START";
+const std::string DSCREEN_SOURCE_CLOSE_SESSION_START = "DSCREEN_SOURCE_CLOSE_SESSION_START";
+const std::string DSCREEN_SOURCE_RELEASE_SESSION_START = "DSCREEN_SOURCE_RELEASE_SESSION_START";
+const std::string DSCREEN_SINK_CLOSE_SESSION_START = "DSCREEN_SINK_CLOSE_SESSION_START";
+const std::string DSCREEN_SINK_RELEASE_SESSION_START = "DSCREEN_SINK_RELEASE_SESSION_START";
+const std::string DSCREEN_START_ENCODER_START = "DSCREEN_START_ENCODER_START";
+const std::string DSCREEN_STOP_ENCODER_START =  "DSCREEN_STOP_ENCODER_START";
+const std::string DSCREEN_RELESSE_ENCODER_START =  "DSCREEN_RELESSE_ENCODER_START";
+const std::string DSCREEN_START_DECODER_START = "DSCREEN_START_DECODER_START";
+const std::string DSCREEN_STOP_DECODER_START =  "DSCREEN_STOP_DECODER_START";
 const std::string DSCREEN_RELEASE_DECODER_START =  "DSCREEN_RELEASE_DECODER_START";
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn
index 192e8f4..4d1380c 100644
--- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn
@@ -48,11 +48,11 @@ ohos_shared_library("distributed_screen_sink_sdk") {
 
   external_deps = [
     "hisysevent_native:libhisysevent",
+    "hitrace_native:hitrace_meter",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr_standard:samgr_proxy",
-    "hitrace_native:hitrace_meter",
   ]
 
   subsystem_name = "distributedhardware"
diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn
index 9a64213..5b4a08e 100644
--- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn
@@ -50,11 +50,11 @@ ohos_shared_library("distributed_screen_source_sdk") {
 
   external_deps = [
     "hisysevent_native:libhisysevent",
+    "hitrace_native:hitrace_meter",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr_standard:samgr_proxy",
-    "hitrace_native:hitrace_meter",
   ]
 
   subsystem_name = "distributedhardware"
diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn
index 04d564e..c5d4c46 100644
--- a/services/screentransport/screensinktrans/BUILD.gn
+++ b/services/screentransport/screensinktrans/BUILD.gn
@@ -63,9 +63,9 @@ ohos_shared_library("distributed_screen_sinktrans") {
   external_deps = [
     "dsoftbus_standard:softbus_client",
     "hisysevent_native:libhisysevent",
+    "hitrace_native:hitrace_meter",
     "hiviewdfx_hilog_native:libhilog",
     "multimedia_media_standard:media_client",
-    "hitrace_native:hitrace_meter",
   ]
 
   subsystem_name = "distributedhardware"
diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn
index 09469d8..e4a78d3 100644
--- a/services/screentransport/screensourcetrans/BUILD.gn
+++ b/services/screentransport/screensourcetrans/BUILD.gn
@@ -62,9 +62,9 @@ ohos_shared_library("distributed_screen_sourcetrans") {
   external_deps = [
     "dsoftbus_standard:softbus_client",
     "hisysevent_native:libhisysevent",
+    "hitrace_native:hitrace_meter",
     "hiviewdfx_hilog_native:libhilog",
     "multimedia_media_standard:media_client",
-    "hitrace_native:hitrace_meter",
   ]
 
   subsystem_name = "distributedhardware"