From 605955ebc3a759522d68dac45736fecf5ac44601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Garc=C3=ADa?= <rafael.garcia@scopely.com>
Date: Mon, 16 Oct 2023 12:44:04 +0200
Subject: [PATCH] And more cleanup

---
 src/main/java/com/bladecoder/ink/runtime/Container.java | 2 +-
 src/main/java/com/bladecoder/ink/runtime/Story.java     | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/bladecoder/ink/runtime/Container.java b/src/main/java/com/bladecoder/ink/runtime/Container.java
index 877959f..a17cd07 100644
--- a/src/main/java/com/bladecoder/ink/runtime/Container.java
+++ b/src/main/java/com/bladecoder/ink/runtime/Container.java
@@ -51,7 +51,7 @@ public HashMap<String, RTObject> getNamedOnlyContent() {
         }
 
         for (RTObject c : getContent()) {
-            INamedContent named = c instanceof INamedContent ? (INamedContent) c : (INamedContent) null;
+            INamedContent named = c instanceof INamedContent ? (INamedContent) c : null;
             if (named != null && named.hasValidName()) {
                 namedOnlyContentDict.remove(named.getName());
             }
diff --git a/src/main/java/com/bladecoder/ink/runtime/Story.java b/src/main/java/com/bladecoder/ink/runtime/Story.java
index eacf5a1..6af48d1 100644
--- a/src/main/java/com/bladecoder/ink/runtime/Story.java
+++ b/src/main/java/com/bladecoder/ink/runtime/Story.java
@@ -139,7 +139,7 @@ protected T3 coerceArg2(Object arg) throws Exception {
         }
     }
 
-    class ExternalFunctionDef {
+    static class ExternalFunctionDef {
         public ExternalFunction<?> function;
         public boolean lookaheadSafe;
     }
@@ -186,7 +186,7 @@ public interface VariableObserver {
      */
     private boolean allowExternalFunctionFallbacks;
 
-    private HashMap<String, ExternalFunctionDef> externals;
+    private final HashMap<String, ExternalFunctionDef> externals;
 
     private boolean hasValidatedExternals;
 
@@ -196,7 +196,7 @@ public interface VariableObserver {
 
     private HashMap<String, List<VariableObserver>> variableObservers;
 
-    private List<Container> prevContainers = new ArrayList<>();
+    private final List<Container> prevContainers = new ArrayList<>();
 
     private Profiler profiler;
 
@@ -1594,7 +1594,6 @@ boolean performLogicAndFlowControl(RTObject contentObj) throws Exception {
         else if (contentObj instanceof ControlCommand) {
             ControlCommand evalCommand = (ControlCommand) contentObj;
 
-            int choiceCount;
             switch (evalCommand.getCommandType()) {
                 case EvalStart:
                     Assert(!state.getInExpressionEvaluation(), "Already in expression evaluation?");
@@ -1826,7 +1825,7 @@ else if (contentObj instanceof ControlCommand) {
                     break;
                 }
                 case ChoiceCount:
-                    choiceCount = state.getGeneratedChoices().size();
+                    int choiceCount = state.getGeneratedChoices().size();
                     state.pushEvaluationStack(new IntValue(choiceCount));
                     break;