diff --git a/lib/mv_web/live/role_live/form.ex b/lib/mv_web/live/role_live/form.ex
index 395455c..abb5f59 100644
--- a/lib/mv_web/live/role_live/form.ex
+++ b/lib/mv_web/live/role_live/form.ex
@@ -89,7 +89,6 @@ defmodule MvWeb.RoleLive.Form do
 
   @impl true
   def mount(params, _session, socket) do
-
     case params["id"] do
       nil ->
         action = gettext("New")
diff --git a/lib/mv_web/live/role_live/index.ex b/lib/mv_web/live/role_live/index.ex
index e44f11a..4c03c82 100644
--- a/lib/mv_web/live/role_live/index.ex
+++ b/lib/mv_web/live/role_live/index.ex
@@ -63,20 +63,18 @@ defmodule MvWeb.RoleLive.Index do
   end
 
   defp handle_delete_role(role, id, socket) do
-    cond do
-      role.is_system_role ->
+    if role.is_system_role do
+      {:noreply,
+       put_flash(
+         socket,
+         :error,
+         gettext("System roles cannot be deleted.")
+       )}
+    else
+      user_count = recalculate_user_count(role)
+
+      if user_count > 0 do
         {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("System roles cannot be deleted.")
-         )}
-
-      true ->
-        user_count = recalculate_user_count(role)
-
-        if user_count > 0 do
-          {:noreply,
          put_flash(
            socket,
            :error,
@@ -85,9 +83,9 @@ defmodule MvWeb.RoleLive.Index do
              count: user_count
            )
          )}
-        else
-          perform_role_deletion(role, id, socket)
-        end
+      else
+        perform_role_deletion(role, id, socket)
+      end
     end
   end
 
diff --git a/lib/mv_web/live/role_live/show.ex b/lib/mv_web/live/role_live/show.ex
index d947222..da6821d 100644
--- a/lib/mv_web/live/role_live/show.ex
+++ b/lib/mv_web/live/role_live/show.ex
@@ -91,20 +91,18 @@ defmodule MvWeb.RoleLive.Show do
   end
 
   defp handle_delete_role(role, socket) do
-    cond do
-      role.is_system_role ->
+    if role.is_system_role do
+      {:noreply,
+       put_flash(
+         socket,
+         :error,
+         gettext("System roles cannot be deleted.")
+       )}
+    else
+      user_count = recalculate_user_count(role)
+
+      if user_count > 0 do
         {:noreply,
-         put_flash(
-           socket,
-           :error,
-           gettext("System roles cannot be deleted.")
-         )}
-
-      true ->
-        user_count = recalculate_user_count(role)
-
-        if user_count > 0 do
-          {:noreply,
          put_flash(
            socket,
            :error,
@@ -113,9 +111,9 @@ defmodule MvWeb.RoleLive.Show do
              count: user_count
            )
          )}
-        else
-          perform_role_deletion(role, socket)
-        end
+      else
+        perform_role_deletion(role, socket)
+      end
     end
   end
 
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index f3e8a5d..8829b64 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -1437,6 +1437,7 @@ msgstr "Bereits bezahlte Zyklen bleiben mit dem alten Betrag."
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index fcb22e8..2e7691f 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -1438,6 +1438,7 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index dfafb89..46bc58d 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -1438,6 +1438,7 @@ msgstr ""
 
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/index.ex
 #: lib/mv_web/live/role_live/show.ex
 #, elixir-autogen, elixir-format