diff --git a/app/Enums/SafetyAndPrivacySteps.php b/app/Enums/SafetyAndPrivacySteps.php
index 5589bdcf..b0e30776 100644
--- a/app/Enums/SafetyAndPrivacySteps.php
+++ b/app/Enums/SafetyAndPrivacySteps.php
@@ -8,9 +8,7 @@ enum SafetyAndPrivacySteps: int
     case MOSTANADAT_GAZAEI = 2;
     case BARKHORD = 3;
 
-
-
-    public static function name(int $state): string
+    public static function name(int $step): string
     {
         $mapArray = [
             1 =>  'گام اول (شناسایی)',
@@ -18,6 +16,6 @@ enum SafetyAndPrivacySteps: int
             3 => 'گام سوم (برخورد)',
         ];
 
-        return $mapArray[$state];
+        return $mapArray[$step];
     }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
index d5d6aa2a..2f5ddfa5 100644
--- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
+++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\V3\Dashboard;
 
 use App\Enums\AxisTypes;
 use App\Enums\SafetyAndPrivacyStatus;
+use App\Enums\SafetyAndPrivacySteps;
 use App\Exports\V3\SafetyAndPrivacy\CartableReport;
 use App\Facades\DataTable\DataTableFacade;
 use App\Facades\File\FileFacade;
@@ -76,8 +77,8 @@ class SafetyAndPrivacyController extends Controller
                 'way_id' => $nominatimService->get_way_id_from_nominatim($coordinates[0], $coordinates[1]),
                 'axis_type_id' => $request->axis_type_id,
                 'axis_type_name' => AxisTypes::name($request->axis_type_id),
-                'step' => 1,
-                'step_fa' => 'گام اول (شناسایی)',
+                'step' => SafetyAndPrivacySteps::SHENASAEI->value,
+                'step_fa' => SafetyAndPrivacySteps::name(1),
                 'is_finished' => false
             ]);
 
@@ -105,8 +106,8 @@ class SafetyAndPrivacyController extends Controller
             $safetyAndPrivacy->update([
                 'judiciary_document' => serialize($judiciary_document),
                 'judiciary_document_upload_date' => now(),
-                'step' => 2,
-                'step_fa' => 'گام دوم (مستندات قضایی)'
+                'step' => SafetyAndPrivacySteps::MOSTANADAT_GAZAEI->value,
+                'step_fa' => SafetyAndPrivacySteps::name(2),
             ]);
 
             $user->addActivityComplete(1135);
@@ -121,8 +122,8 @@ class SafetyAndPrivacyController extends Controller
 
         DB::transaction(function () use ($request, $safetyAndPrivacy, $user) {
             $safetyAndPrivacy->update([
-                'step' => 3,
-                'step_fa' => 'گام سوم (برخورد)',
+                'step' => SafetyAndPrivacySteps::BARKHORD->value,
+                'step_fa' => SafetyAndPrivacySteps::name(3),
                 'action_picture' => FileFacade::save($request->action_picture, "safety_and_privacy/{$safetyAndPrivacy->id}/action_picture"),
                 'action_picture_document_upload_date' => now(),
                 'action_date' => $request->action_date,
@@ -155,7 +156,7 @@ class SafetyAndPrivacyController extends Controller
 
     public function destroy(SafetyAndPrivacy $safetyAndPrivacy): JsonResponse
     {
-        Storage::deleteDirectory("public/safety_and_privacy/{$safetyAndPrivacy->id}");
+        FileFacade::deleteDirectory("safety_and_privacy/{$safetyAndPrivacy->id}");
 
         DB::transaction(function () use ($safetyAndPrivacy)
         {