diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index c4dfedd..27be130 100644
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -88,8 +88,8 @@ class RoleController extends Controller {
             //don't allow changing the admin slug, because it will make the routes inaccessbile due to faile ability check
             $role->delete();
             return response(['error' => 0, 'message' => 'role has been deleted']);
-        } else {
-            return response(['error' => 1, 'message' => 'you cannot delete this role'], 422);
         }
+
+        return response(['error' => 1, 'message' => 'you cannot delete this role'], 422);
     }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index bff84bf..7c110e5 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -75,14 +75,9 @@ class UserController extends Controller {
             $user->tokens()->delete();
         }
 
-
-        $roles =  $user->roles()->get();
-        $_roles = [];
-        foreach ($roles as $role) {
-            $_roles[] = $role->slug;
-        }
-
-        $plainTextToken = $user->createToken('hydra-api-token', $_roles)->plainTextToken;
+        $roles =  $user->roles->pluck('slug')->all();
+        
+        $plainTextToken = $user->createToken('hydra-api-token', $roles)->plainTextToken;
         return response(['error' => 0, 'id' => $user->id, 'token' => $plainTextToken], 200);
     }
 
diff --git a/app/Http/Controllers/UserRoleController.php b/app/Http/Controllers/UserRoleController.php
index 6c82925..9992fb0 100644
--- a/app/Http/Controllers/UserRoleController.php
+++ b/app/Http/Controllers/UserRoleController.php
@@ -31,10 +31,9 @@ class UserRoleController extends Controller {
         $role = Role::find($data['role_id']);
         if (!$user->roles()->find($data['role_id'])) {
             $user->roles()->attach($role);
-            return $user->load('roles');
-        } else {
-            return $user->load('roles');
         }
+        
+        return $user->load('roles');
     }
 
     /**