diff --git a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/RemoveTheMaximumNumberOfNotificationIcons.kt b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/RemoveTheMaximumNumberOfNotificationIcons.kt
index fb8d8d09..33b2b39a 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/RemoveTheMaximumNumberOfNotificationIcons.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/RemoveTheMaximumNumberOfNotificationIcons.kt
@@ -1,46 +1,27 @@
 package com.lt2333.simplicitytools.hook.app.systemui
 
-import com.lt2333.simplicitytools.util.XSPUtils
+import com.lt2333.simplicitytools.util.callMethod
+import com.lt2333.simplicitytools.util.hasEnable
+import com.lt2333.simplicitytools.util.replaceMethod
+import com.lt2333.simplicitytools.util.setIntField
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodReplacement
-import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class RemoveTheMaximumNumberOfNotificationIcons : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        if (XSPUtils.getBoolean("remove_the_maximum_number_of_notification_icons", false)) {
-            val classIfExists = XposedHelpers.findClassIfExists(
-                "com.android.systemui.statusbar.phone.NotificationIconContainer",
-                lpparam.classLoader
-            )
-            XposedHelpers.findAndHookMethod(
-                classIfExists,
-                "miuiShowNotificationIcons",
-                Boolean::class.java,
-                object : XC_MethodReplacement() {
-                    override fun replaceHookedMethod(param: MethodHookParam) {
-
-                        if (param.args[0] as Boolean) {
-                            XposedHelpers.setIntField(param.thisObject, "MAX_DOTS", 30)
-                            XposedHelpers.setIntField(param.thisObject, "MAX_STATIC_ICONS", 30)
-                            XposedHelpers.setIntField(
-                                param.thisObject,
-                                "MAX_VISIBLE_ICONS_ON_LOCK",
-                                30
-                            )
-                        } else {
-                            XposedHelpers.setIntField(param.thisObject, "MAX_DOTS", 0)
-                            XposedHelpers.setIntField(param.thisObject, "MAX_STATIC_ICONS", 0)
-                            XposedHelpers.setIntField(
-                                param.thisObject,
-                                "MAX_VISIBLE_ICONS_ON_LOCK",
-                                0
-                            )
-                        }
-
-                        XposedHelpers.callMethod(param.thisObject, "updateState")
-                    }
-                })
+        hasEnable("remove_the_maximum_number_of_notification_icons") {
+            "com.android.systemui.statusbar.phone.NotificationIconContainer".replaceMethod(lpparam.classLoader, "miuiShowNotificationIcons", Boolean::class.java) {
+                if (it.args[0] as Boolean) {
+                    it.thisObject.setIntField("MAX_DOTS", 30)
+                    it.thisObject.setIntField("MAX_STATIC_ICONS", 30)
+                    it.thisObject.setIntField("MAX_VISIBLE_ICONS_ON_LOCK", 30)
+                } else {
+                    it.thisObject.setIntField("MAX_DOTS", 0)
+                    it.thisObject.setIntField("MAX_STATIC_ICONS", 0)
+                    it.thisObject.setIntField("MAX_VISIBLE_ICONS_ON_LOCK", 0)
+                }
+                it.thisObject.callMethod("updateState")
+            }
         }
     }
 }
\ No newline at end of file