diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 35e6b388e3..fc5f9d7986 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1475,7 +1475,7 @@ class Helper
     }
 
 
-    static public function getRedirectOption($request, $id, $table,$item_id = null)
+    static public function getRedirectOption($request, $id, $table, $item_id = null)
     {
 
         $redirect_option = Session::get('redirect_option');
@@ -1517,6 +1517,7 @@ class Helper
                     return route('consumables.show', $id ?? $item_id);
             }
         }
+
         // return to assignment target
         if ($redirect_option == 'target') {
             switch ($checkout_to_type) {
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
index 4cd1bb50b5..3c074d51fd 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -7,8 +7,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Accessory;
 use App\Models\AccessoryCheckout;
-use App\Models\Asset;
-use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use \Illuminate\Contracts\View\View;
@@ -51,7 +49,7 @@ class AccessoryCheckinController extends Controller
         }
 
         $accessory = Accessory::find($accessory_checkout->accessory_id);
-        $checkedInBy = 0;
+
         if($accessory_checkout->assigned_type === 'App\Models\User') {
             $checkedInBy = $accessory_checkout->assigned_to;
             session()->put('checkout_to_type', 'user');
diff --git a/app/Http/Controllers/Assets/AssetCheckinController.php b/app/Http/Controllers/Assets/AssetCheckinController.php
index 2286c37eb2..9e550c9755 100644
--- a/app/Http/Controllers/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -134,6 +134,7 @@ class AssetCheckinController extends Controller
         $asset->customFieldsForCheckinCheckout('display_checkin');
 
         if ($asset->save()) {
+
             event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
             return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.checkin.success'));
         }