diff --git a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/RemoveLockScreenCamera.kt b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/RemoveLockScreenCamera.kt
index 7549cdc9..8416d89e 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/RemoveLockScreenCamera.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/RemoveLockScreenCamera.kt
@@ -2,64 +2,34 @@ package com.lt2333.simplicitytools.hook.app.systemui
 
 import android.view.View
 import android.widget.LinearLayout
-import com.lt2333.simplicitytools.util.XSPUtils
+import com.lt2333.simplicitytools.util.getObjectField
+import com.lt2333.simplicitytools.util.hasEnable
+import com.lt2333.simplicitytools.util.hookAfterMethod
+import com.lt2333.simplicitytools.util.hookBeforeMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
-import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class RemoveLockScreenCamera : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
 
         //屏蔽右下角组件显示
-        val classIfExists1 = XposedHelpers.findClassIfExists(
-            "com.android.systemui.statusbar.phone.KeyguardBottomAreaView",
-            lpparam.classLoader
-        )
-        XposedHelpers.findAndHookMethod(
-            classIfExists1,
-            "onFinishInflate",
-            object : XC_MethodHook() {
-                override fun afterHookedMethod(param: MethodHookParam) {
-                    if (XSPUtils.getBoolean("remove_lock_screen_camera", false)) {
-                        val view = XposedHelpers.getObjectField(
-                            param.thisObject,
-                            "mRightAffordanceViewLayout"
-                        ) as LinearLayout
-                        view.visibility = View.GONE
-                    }
-                }
-            })
-
+        "com.android.systemui.statusbar.phone.KeyguardBottomAreaView".hookAfterMethod(lpparam.classLoader, "onFinishInflate") {
+            hasEnable("remove_lock_screen_camera") {
+                (it.thisObject.getObjectField("mRightAffordanceViewLayout") as LinearLayout).visibility = View.GONE
+            }
+        }
 
         //屏蔽滑动撞墙动画
-        val classIfExists2 = XposedHelpers.findClassIfExists(
-            "com.android.keyguard.KeyguardMoveRightController",
-            lpparam.classLoader
-        )
-
-        XposedHelpers.findAndHookMethod(
-            classIfExists2,
-            "onTouchMove",
-            Float::class.java,
-            Float::class.java,
-            object : XC_MethodHook() {
-                override fun beforeHookedMethod(param: MethodHookParam) {
-                    if (XSPUtils.getBoolean("remove_lock_screen_camera", false)) {
-                        param.result = false
-                    }
-                }
-            })
-        XposedHelpers.findAndHookMethod(
-            classIfExists2,
-            "reset",
-            object : XC_MethodHook() {
-                override fun beforeHookedMethod(param: MethodHookParam) {
-                    if (XSPUtils.getBoolean("remove_lock_screen_camera", false)) {
-                        param.result = null
-                    }
-                }
-            })
+        "com.android.keyguard.KeyguardMoveRightController".hookBeforeMethod(lpparam.classLoader, "onTouchMove", Float::class.java, Float::class.java) {
+            hasEnable("remove_lock_screen_camera") {
+                it.result = false
+            }
+        }
+        "com.android.keyguard.KeyguardMoveRightController".hookBeforeMethod(lpparam.classLoader, "reset") {
+            hasEnable("remove_lock_screen_camera") {
+                it.result = null
+            }
+        }
     }
 }