diff --git a/app/models/ability.rb b/app/models/ability.rb
index f53b7383..714d5a45 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -39,9 +39,7 @@ class Ability
              :approve, :invite, :reset, :undelete], :admin
       end
 
-      if highest_role.get_permission("can_manage_rooms_recordings")
-        can [:index, :server_recordings, :server_rooms], :admin
-      end
+      can [:index, :server_recordings, :server_rooms], :admin if highest_role.get_permission("can_manage_rooms_recordings")
 
       if !highest_role.get_permission("can_edit_site_settings") && !highest_role.get_permission("can_edit_roles") &&
          !highest_role.get_permission("can_manage_users") && !highest_role.get_permission("can_manage_rooms_recordings")
diff --git a/app/models/room.rb b/app/models/room.rb
index a00a23f6..7c7e7231 100644
--- a/app/models/room.rb
+++ b/app/models/room.rb
@@ -48,9 +48,7 @@ class Room < ApplicationRecord
     # Include the owner of the table
     table = joins(:owner)
 
-    if table.column_names.include?(column) || column == "users.name"
-      return table.order(Arel.sql("#{column} #{direction}"))
-    end
+    return table.order(Arel.sql("#{column} #{direction}")) if table.column_names.include?(column) || column == "users.name"
 
     table
   end