diff --git a/web/Areas/ClinicalScheduler/Controllers/RotationsController.cs b/web/Areas/ClinicalScheduler/Controllers/RotationsController.cs
index fac532700..8355dfa71 100644
--- a/web/Areas/ClinicalScheduler/Controllers/RotationsController.cs
+++ b/web/Areas/ClinicalScheduler/Controllers/RotationsController.cs
@@ -497,16 +497,18 @@ private object BuildWeekScheduleItem(WeekDto week, IEnumerable<InstructorSchedul
         {
             var weekSchedules = allSchedules
                 .Where(s => s.WeekId == week.WeekId)
-                .Select(i => new
+                .Select(i =>
                 {
-                    instructorScheduleId = i.InstructorScheduleId,
-                    firstName = personData.ContainsKey(i.MothraId) ? personData[i.MothraId].PersonDisplayFirstName : "Unknown",
-                    lastName = personData.ContainsKey(i.MothraId) ? personData[i.MothraId].PersonDisplayLastName : "Unknown",
-                    fullName = personData.ContainsKey(i.MothraId)
-                        ? personData[i.MothraId].PersonDisplayFullName
-                        : $"Person {i.MothraId}",
-                    mothraId = i.MothraId,
-                    isPrimaryEvaluator = i.Evaluator
+                    personData.TryGetValue(i.MothraId, out var p);
+                    return new
+                    {
+                        instructorScheduleId = i.InstructorScheduleId,
+                        firstName = p?.PersonDisplayFirstName ?? "Unknown",
+                        lastName = p?.PersonDisplayLastName ?? "Unknown",
+                        fullName = p?.PersonDisplayFullName ?? $"Person {i.MothraId}",
+                        mothraId = i.MothraId,
+                        isPrimaryEvaluator = i.Evaluator
+                    };
                 })
                 .ToList();
 
diff --git a/web/Areas/RAPS/Services/RAPSAuditService.cs b/web/Areas/RAPS/Services/RAPSAuditService.cs
index eda28d872..9006ab3e2 100644
--- a/web/Areas/RAPS/Services/RAPSAuditService.cs
+++ b/web/Areas/RAPS/Services/RAPSAuditService.cs
@@ -150,9 +150,8 @@ public async Task<List<AuditLog>> GetMemberRolesAndPermissionHistory(string inst
                     string key = auditLog?.RoleId != null
                         ? "role-" + auditLog.RoleId
                         : "permission-" + auditLog!.PermissionId;
-                    if (actionsPerformedOnObject.ContainsKey(key))
+                    if (actionsPerformedOnObject.TryGetValue(key, out var moreRecentActions))
                     {
-                        List<string> moreRecentActions = actionsPerformedOnObject[key];
                         bool undone = false;
                         switch (auditLog.Audit)
                         {
diff --git a/web/Areas/RAPS/Services/VMACSExport.cs b/web/Areas/RAPS/Services/VMACSExport.cs
index ce945db4d..70c0fae17 100644
--- a/web/Areas/RAPS/Services/VMACSExport.cs
+++ b/web/Areas/RAPS/Services/VMACSExport.cs
@@ -300,8 +300,8 @@ private List<VMACSExportUser> GetExportUsers(List<UserList> users, string rolePr
                         exportUsers[^1].AccessCodes = accessCodesBuilder.ToString();
                     }
                     accessCodesBuilder.Clear();
-                    string permissionIdList = permissionsByMemberId.ContainsKey(user.MothraId.Trim())
-                        ? permissionsByMemberId[user.MothraId.Trim()]
+                    string permissionIdList = permissionsByMemberId.TryGetValue(user.MothraId.Trim(), out var permIds)
+                        ? permIds
                         : "";
                     exportUsers.Add(new VMACSExportUser()
                     {
@@ -342,7 +342,7 @@ private string GetDefaultServer()
         private string GetServerUrl(string instance, string server)
         {
             string key = instance.ToLower() + "-" + server.ToLower();
-            return _vmacsServers.ContainsKey(key) ? _vmacsServers[key] : "";
+            return _vmacsServers.TryGetValue(key, out var url) ? url : "";
         }
 
         private static void RecordMessage(List<string> messages, string message)
diff --git a/web/Areas/RAPS/Views/Members/List.cshtml b/web/Areas/RAPS/Views/Members/List.cshtml
index 9b03e9f06..98816e24c 100644
--- a/web/Areas/RAPS/Views/Members/List.cshtml
+++ b/web/Areas/RAPS/Views/Members/List.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Members";
 }
 <h1>Search for a user</h1>
@@ -34,19 +34,19 @@
     no-results-label="No results found">
     <template v-slot:body-cell-links="props">
         <q-td :props="props">
-            @if(ViewData.ContainsKey("CanRSOP") && (bool)(ViewData["CanRSOP"] ?? false))
+            @if((bool)(ViewData["CanRSOP"] ?? false))
             {
                 <q-btn :props="props" size="sm" padding="xs" color="primary" square flat icon="policy" title="Combined permissions for user" :href="'RSOP?memberId=' + props.row.memberId"></q-btn>
             }
-            @if (ViewData.ContainsKey("canEditRoleMembership") && (bool)(ViewData["canEditRoleMembership"] ?? false))
+            @if ((bool)(ViewData["canEditRoleMembership"] ?? false))
             {
                 <q-btn :props="props" size="sm" padding="xs" color="primary" square flat icon="security" title="Show Roles for this user" :href="'MemberRoles?memberId=' + props.row.memberId"></q-btn>
             }
-            @if (ViewData.ContainsKey("canEditMemberPermissions") && (bool)(ViewData["canEditMemberPermissions"] ?? false))
+            @if ((bool)(ViewData["canEditMemberPermissions"] ?? false))
             {
                 <q-btn :props="props" size="sm" padding="xs" color="primary" square flat icon="lock" title="Show individual permissions for this user" :href="'MemberPermissions?memberId=' + props.row.memberId"></q-btn>
             }
-            @if (ViewData.ContainsKey("canViewHistory") && (bool)(ViewData["canViewHistory"] ?? false))
+            @if ((bool)(ViewData["canViewHistory"] ?? false))
             {
                 <q-btn :props="props" size="sm" padding="xs" color="primary" square flat icon="history" title="Show History" :href="'MemberHistory?memberId=' + props.row.memberId"></q-btn>
             }            
diff --git a/web/Areas/RAPS/Views/Members/Roles.cshtml b/web/Areas/RAPS/Views/Members/Roles.cshtml
index 586daabd4..7ef9a8bca 100644
--- a/web/Areas/RAPS/Views/Members/Roles.cshtml
+++ b/web/Areas/RAPS/Views/Members/Roles.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Member Roles";
 }
 <h1>Roles for {{member.displayFirstName}} {{member.displayLastName}}</h1>
@@ -74,7 +74,7 @@
         <template v-slot:body-cell-links="props">
             <q-td :props="props">
                 <q-btn :props="props" size="sm" padding="sm" color="primary" square flat icon="person" title="View members of this role" aria-label="View members of this role" :href="'RoleMembers?roleId=' + props.row.roleId"></q-btn>
-                @if (ViewData.ContainsKey("canEditPermissions") && (bool)(ViewData["canEditPermissions"] ?? false))
+                @if ((bool)(ViewData["canEditPermissions"] ?? false))
                 {
                     <q-btn :props="props" size="sm" padding="sm" color="primary" square flat icon="lock" title="Set permissions this role controls" aria-label="Set permissions this role controls" :href="'RolePermissions?roleId=' + props.row.roleId"></q-btn>
                 }
diff --git a/web/Areas/RAPS/Views/Roles/Members.cshtml b/web/Areas/RAPS/Views/Roles/Members.cshtml
index 5e74d13f6..d852e60d9 100644
--- a/web/Areas/RAPS/Views/Roles/Members.cshtml
+++ b/web/Areas/RAPS/Views/Roles/Members.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Role Members";
 }
 <h1>Members of {{ role.friendlyName }}</h1>
@@ -82,7 +82,7 @@
         <q-td :props="props">
             <q-btn :props="props" size="sm" padding="sm" color="primary" square flat icon="policy" title="Combined permissions for user" aria-label="Combined permissions for user" :href="'RSOP?memberId=' + props.row.memberId"></q-btn>
             <q-btn :props="props" size="sm" padding="sm" color="primary" square flat icon="security" title="View roles for this user" aria-label="View roles for this user" :href="'MemberRoles?memberId=' + props.row.memberId"></q-btn>
-            @if (ViewData.ContainsKey("canEditPermissions") && (bool)(ViewData["canEditPermissions"] ?? false))
+            @if ((bool)(ViewData["canEditPermissions"] ?? false))
             {
                 <q-btn :props="props" size="sm" padding="sm" color="primary" square flat icon="lock" title="View individual permissions" aria-label="View individual permissions" :href="'MemberPermissions?memberId=' + props.row.memberId"></q-btn>
             }
diff --git a/web/Areas/RAPS/Views/Roles/Templates.cshtml b/web/Areas/RAPS/Views/Roles/Templates.cshtml
index 086003138..4ef26a23f 100644
--- a/web/Areas/RAPS/Views/Roles/Templates.cshtml
+++ b/web/Areas/RAPS/Views/Roles/Templates.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Templates";
 }
 <h1>Role Templates</h1>
@@ -36,7 +36,7 @@
              :filter="templates.filter"
              :filter-method="filterTemplates"
              :pagination="templates.pagination">
-        @if (ViewData.ContainsKey("canEditRoleTemplates") && (bool)(ViewData["canEditRoleTemplates"] ?? false))
+        @if ((bool)(ViewData["canEditRoleTemplates"] ?? false))
         {
             <template v-slot:top-left="props">
                 <q-btn no-caps color="positive" label="Add Role Template" padding="xs md" @@click="templates.showForm = true"></q-btn>
@@ -51,11 +51,11 @@
         </template>
         <template v-slot:body-cell-links="props">
             <q-td :props="props">
-                @if (ViewData.ContainsKey("canApplyTemplates") && (bool)(ViewData["canApplyTemplates"] ?? false))
+                @if ((bool)(ViewData["canApplyTemplates"] ?? false))
                 {
                     <q-btn :props="props" size="sm" padding="sm" color="primary" square flat icon="person" title="Apply Role Template to one or more users" aria-label="Apply Role Template to one or more users" :href="'RoleTemplateApply?roleTemplateId=' + props.row.roleTemplateId"></q-btn>
                 }
-                @if (ViewData.ContainsKey("canEditRoleTemplates") && (bool)(ViewData["canEditRoleTemplates"] ?? false))
+                @if ((bool)(ViewData["canEditRoleTemplates"] ?? false))
                 {
                     <q-btn :props="props" size="sm" padding="sm" color="primary" square flat icon="security" title="View Roles for this Template" aria-label="View Roles for this Template" :href="'RoleTemplateRoles?roleTemplateId=' + props.row.roleTemplateId"></q-btn>
                 }
@@ -73,7 +73,7 @@
                 <br />
             </q-td>
         </template>
-        @if (ViewData.ContainsKey("canEditRoleTemplates") && (bool)(ViewData["canEditRoleTemplates"] ?? false))
+        @if ((bool)(ViewData["canEditRoleTemplates"] ?? false))
         {
             <template v-slot:body-cell-action="props">
                 <q-td :props="props">