diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
index 1d14ee5b..346e2b1f 100644
--- a/makespec/BUILDVERSION
+++ b/makespec/BUILDVERSION
@@ -1 +1 @@
-6024
+6025
diff --git a/src/base/models/QvConfigIdentifier.hpp b/src/base/models/QvConfigIdentifier.hpp
index 85978d2c..119584ae 100644
--- a/src/base/models/QvConfigIdentifier.hpp
+++ b/src/base/models/QvConfigIdentifier.hpp
@@ -157,8 +157,6 @@ namespace Qv2ray::base
         API_OUTBOUND_BLACKHOLE = 3,
     };
 
-#define CurrentStatAPIType (GlobalConfig.uiConfig.graphConfig.useOutboundStats ? API_OUTBOUND_PROXY : API_INBOUND)
-
     typedef long qvspeed;
     typedef quint64 qvdata;
     typedef QPair<qvspeed, qvspeed> QvStatsSpeed;
@@ -192,9 +190,7 @@ namespace Qv2ray::base
         ConnectionStatsEntryObject &operator[](StatisticsType i)
         {
             while (entries.count() <= i)
-            {
                 entries.append(ConnectionStatsEntryObject{});
-            }
             return entries[i];
         }
         QJsonValue toJson() const
@@ -203,7 +199,6 @@ namespace Qv2ray::base
         }
         void loadJson(const QJsonValue &d)
         {
-            entries.clear();
             JsonStructHelper::Deserialize(entries, d);
         }
         void Clear()
@@ -239,7 +234,6 @@ namespace Qv2ray::base
               {};
         JSONSTRUCT_REGISTER(ProtocolSettingsInfoObject, F(protocol, address, port))
     };
-    //
 
     template<typename T>
     inline uint qHash(IDType<T> key)
diff --git a/src/core/CoreUtils.hpp b/src/core/CoreUtils.hpp
index a6524d0a..27f4a7fd 100644
--- a/src/core/CoreUtils.hpp
+++ b/src/core/CoreUtils.hpp
@@ -3,6 +3,8 @@
 #include "base/models/QvConfigIdentifier.hpp"
 #include "base/models/QvSafeType.hpp"
 
+#define CurrentStatAPIType (GlobalConfig.uiConfig.graphConfig.useOutboundStats ? API_OUTBOUND_PROXY : API_INBOUND)
+
 namespace Qv2ray::core
 {
     const inline GroupId DefaultGroupId{ "000000000000" };
diff --git a/src/core/handler/ConfigHandler.cpp b/src/core/handler/ConfigHandler.cpp
index 7c55bf7d..058f4cbb 100644
--- a/src/core/handler/ConfigHandler.cpp
+++ b/src/core/handler/ConfigHandler.cpp
@@ -68,14 +68,14 @@ namespace Qv2ray::core::handler
         }
         //
         kernelHandler = new KernelInstanceHandler(this);
-        connect(kernelHandler, &KernelInstanceHandler::OnCrashed, this, &QvConfigHandler::OnKernelCrashed_p);
-        connect(kernelHandler, &KernelInstanceHandler::OnStatsDataAvailable, this, &QvConfigHandler::OnStatsDataArrived_p);
+        connect(kernelHandler, &KernelInstanceHandler::OnCrashed, this, &QvConfigHandler::p_OnKernelCrashed);
+        connect(kernelHandler, &KernelInstanceHandler::OnStatsDataAvailable, this, &QvConfigHandler::p_OnStatsDataArrived);
         connect(kernelHandler, &KernelInstanceHandler::OnKernelLogAvailable, this, &QvConfigHandler::OnKernelLogAvailable);
         connect(kernelHandler, &KernelInstanceHandler::OnConnected, this, &QvConfigHandler::OnConnected);
         connect(kernelHandler, &KernelInstanceHandler::OnDisconnected, this, &QvConfigHandler::OnDisconnected);
         //
         pingHelper = new LatencyTestHost(5, this);
-        connect(pingHelper, &LatencyTestHost::OnLatencyTestCompleted, this, &QvConfigHandler::OnLatencyDataArrived_p);
+        connect(pingHelper, &LatencyTestHost::OnLatencyTestCompleted, this, &QvConfigHandler::p_OnLatencyDataArrived);
         //
         // Save per 1 hour.
         saveTimerId = startTimer(1 * 60 * 60 * 1000);
@@ -345,7 +345,7 @@ namespace Qv2ray::core::handler
         SaveConnectionConfig();
     }
 
-    void QvConfigHandler::OnKernelCrashed_p(const ConnectionGroupPair &id, const QString &errMessage)
+    void QvConfigHandler::p_OnKernelCrashed(const ConnectionGroupPair &id, const QString &errMessage)
     {
         LOG("Kernel crashed: " + errMessage);
         emit OnDisconnected(id);
@@ -366,7 +366,7 @@ namespace Qv2ray::core::handler
         return connectionRootCache.value(id);
     }
 
-    void QvConfigHandler::OnLatencyDataArrived_p(const ConnectionId &id, const LatencyTestResult &result)
+    void QvConfigHandler::p_OnLatencyDataArrived(const ConnectionId &id, const LatencyTestResult &result)
     {
         CheckValidId(id, nothing);
         connections[id].latency = result.avg;
@@ -495,7 +495,7 @@ namespace Qv2ray::core::handler
         if (!groups[id].isSubscription)
             return;
         asyncRequestHelper->AsyncHttpGet(groups[id].subscriptionOption.address, [=](const QByteArray &d) {
-            CHUpdateSubscription_p(id, d);
+            p_CHUpdateSubscription(id, d);
             emit OnSubscriptionAsyncUpdateFinished(id);
         });
     }
@@ -505,10 +505,10 @@ namespace Qv2ray::core::handler
         if (!groups[id].isSubscription)
             return false;
         const auto data = NetworkRequestHelper::HttpGet(groups[id].subscriptionOption.address);
-        return CHUpdateSubscription_p(id, data);
+        return p_CHUpdateSubscription(id, data);
     }
 
-    bool QvConfigHandler::CHUpdateSubscription_p(const GroupId &id, const QByteArray &data)
+    bool QvConfigHandler::p_CHUpdateSubscription(const GroupId &id, const QByteArray &data)
     {
         CheckValidId(id, false);
         //
@@ -721,7 +721,7 @@ namespace Qv2ray::core::handler
         return hasErrorOccured;
     }
 
-    void QvConfigHandler::OnStatsDataArrived_p(const ConnectionGroupPair &id, const QMap<StatisticsType, QvStatsSpeed> &data)
+    void QvConfigHandler::p_OnStatsDataArrived(const ConnectionGroupPair &id, const QMap<StatisticsType, QvStatsSpeed> &data)
     {
         if (id.isEmpty())
             return;
diff --git a/src/core/handler/ConfigHandler.hpp b/src/core/handler/ConfigHandler.hpp
index f9198312..0bdef53e 100644
--- a/src/core/handler/ConfigHandler.hpp
+++ b/src/core/handler/ConfigHandler.hpp
@@ -161,15 +161,15 @@ namespace Qv2ray::core::handler
         void OnKernelCrashed(const ConnectionGroupPair &id, const QString &errMessage);
         //
       private slots:
-        void OnKernelCrashed_p(const ConnectionGroupPair &id, const QString &errMessage);
-        void OnLatencyDataArrived_p(const ConnectionId &id, const LatencyTestResult &data);
-        void OnStatsDataArrived_p(const ConnectionGroupPair &id, const QMap<StatisticsType, QvStatsSpeed> &data);
+        void p_OnKernelCrashed(const ConnectionGroupPair &id, const QString &errMessage);
+        void p_OnLatencyDataArrived(const ConnectionId &id, const LatencyTestResult &data);
+        void p_OnStatsDataArrived(const ConnectionGroupPair &id, const QMap<StatisticsType, QvStatsSpeed> &data);
 
       protected:
         void timerEvent(QTimerEvent *event) override;
 
       private:
-        bool CHUpdateSubscription_p(const GroupId &id, const QByteArray &data);
+        bool p_CHUpdateSubscription(const GroupId &id, const QByteArray &data);
 
       private:
         int saveTimerId;