diff --git a/Runtime/DialogLineRef.cs b/Runtime/DialogLineRef.cs
index dc4da81..447e299 100644
--- a/Runtime/DialogLineRef.cs
+++ b/Runtime/DialogLineRef.cs
@@ -9,13 +9,11 @@ namespace Jovian.EncounterSystem {
         [TextArea(2, 6)] public string inlineText;
 
         public string Resolve(DialogLineLibrary library) {
-            if(library != null && !string.IsNullOrEmpty(id)) {
-                var text = library.Resolve(id);
-                if(!string.IsNullOrEmpty(text)) {
-                    return text;
-                }
+            if(!library || string.IsNullOrEmpty(id)) {
+                return inlineText;
             }
-            return inlineText;
+            var text = library.Resolve(id);
+            return !string.IsNullOrEmpty(text) ? text : inlineText;
         }
     }
 }
diff --git a/Runtime/EncounterDialogOptionSet.cs b/Runtime/EncounterDialogOptionSet.cs
index 5bba2d9..a16bda8 100644
--- a/Runtime/EncounterDialogOptionSet.cs
+++ b/Runtime/EncounterDialogOptionSet.cs
@@ -23,7 +23,7 @@ namespace Jovian.EncounterSystem {
         }
 
         private void RenameToMatchId() {
-            if(this == null || string.IsNullOrEmpty(id)) {
+            if(!this || string.IsNullOrEmpty(id)) {
                 return;
             }
 
diff --git a/Runtime/EncounterTable.cs b/Runtime/EncounterTable.cs
index 35245ab..1142d3f 100644
--- a/Runtime/EncounterTable.cs
+++ b/Runtime/EncounterTable.cs
@@ -18,7 +18,7 @@ namespace Jovian.EncounterSystem {
             }
 
             EnsureCache();
-            return idCache.TryGetValue(internalId, out var encounter) ? encounter : null;
+            return idCache.GetValueOrDefault(internalId);
         }
 
         /// <summary>Force the id lookup cache to rebuild on next use.</summary>
@@ -43,7 +43,7 @@ namespace Jovian.EncounterSystem {
 
             IEncounter selected = null;
             var seen = 0;
-            for(int i = 0; i < encounters.Count; i++) {
+            for(var i = 0; i < encounters.Count; i++) {
                 var encounter = encounters[i];
                 if(encounter == null || encounter.GetType() != type) {
                     continue;
@@ -68,7 +68,7 @@ namespace Jovian.EncounterSystem {
 
             IEncounter selected = null;
             var seen = 0;
-            for(int i = 0; i < encounters.Count; i++) {
+            for(var i = 0; i < encounters.Count; i++) {
                 var encounter = encounters[i];
                 if(encounter == null || !filter(encounter)) {
                     continue;
@@ -91,7 +91,7 @@ namespace Jovian.EncounterSystem {
                 return;
             }
 
-            for(int i = 0; i < encounters.Count; i++) {
+            for(var i = 0; i < encounters.Count; i++) {
                 var encounter = encounters[i];
                 var internalId = encounter?.EncounterDefinition?.internalId;
                 if(!string.IsNullOrEmpty(internalId)) {