From 0a36a8ee5e7fd6dfcb610daa48f1e113ba0b5f5d Mon Sep 17 00:00:00 2001
From: Ari Trachtenberg <trachten@bu.edu>
Date: Tue, 23 Jan 2024 17:17:36 -0500
Subject: [PATCH] Cleaning up.

---
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           | 156 +++++-----------
 .../ec504/{spr19 => spr24}/Brain/Brain.java   |  27 +--
 .../Brain/LazyBrain.java}                     | 166 ++++++++++--------
 .../Brain/SimpleBrain.java}                   |   9 +-
 .../Brain/SmarterBrain.java}                  |   8 +-
 .../highScores/highScore.java                 |  38 ++--
 .../sameGameTris/CircleColor.java             |  26 +--
 .../sameGameTris/CircleRolloverEvent.java     |  34 ++--
 .../{spr19 => spr24}/sameGameTris/GUI.java    |  13 +-
 .../sameGameTris/SelfAwareCircle.java         |  97 +++++-----
 .../sameGameTris/SelfAwareListener.java       |   2 +-
 .../{spr19 => spr24}/sameGameTris/sge.java    |  59 ++++---
 13 files changed, 312 insertions(+), 325 deletions(-)
 rename src/edu/bu/ec504/{spr19 => spr24}/Brain/Brain.java (80%)
 rename src/edu/bu/ec504/{spr19/Brain/lazyBrain.java => spr24/Brain/LazyBrain.java} (70%)
 rename src/edu/bu/ec504/{spr19/Brain/simpleBrain.java => spr24/Brain/SimpleBrain.java} (78%)
 rename src/edu/bu/ec504/{spr19/Brain/smarterBrain.java => spr24/Brain/SmarterBrain.java} (68%)
 rename src/edu/bu/ec504/{spr19 => spr24}/highScores/highScore.java (86%)
 rename src/edu/bu/ec504/{spr19 => spr24}/sameGameTris/CircleColor.java (57%)
 rename src/edu/bu/ec504/{spr19 => spr24}/sameGameTris/CircleRolloverEvent.java (66%)
 rename src/edu/bu/ec504/{spr19 => spr24}/sameGameTris/GUI.java (90%)
 rename src/edu/bu/ec504/{spr19 => spr24}/sameGameTris/SelfAwareCircle.java (74%)
 rename src/edu/bu/ec504/{spr19 => spr24}/sameGameTris/SelfAwareListener.java (83%)
 rename src/edu/bu/ec504/{spr19 => spr24}/sameGameTris/sge.java (94%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 42fa23d..865b294 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <option name="OPTION_DOCUMENT_TAG_USE" value="true" />
     <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d99de8d..7679cf5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,25 @@
       <artifact name="sge_dist:jar" />
     </artifacts-to-build>
   </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="78671b20-6a1e-42c8-be28-50b7f38fa7ff" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.highscores.db" beforeDir="false" afterPath="$PROJECT_DIR$/.highscores.db" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/Brain/Brain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/Brain/Brain.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/Brain/lazyBrain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/Brain/LazyBrain.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/Brain/simpleBrain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/Brain/SimpleBrain.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/Brain/smarterBrain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/Brain/SmarterBrain.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/highScores/highScore.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/highScores/highScore.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/sameGameTris/CircleColor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/sameGameTris/CircleColor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/sameGameTris/CircleRolloverEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/sameGameTris/CircleRolloverEvent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/sameGameTris/GUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/sameGameTris/GUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/sameGameTris/SelfAwareCircle.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/sameGameTris/SelfAwareCircle.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/sameGameTris/SelfAwareListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/sameGameTris/SelfAwareListener.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/edu/bu/ec504/spr19/sameGameTris/sge.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/bu/ec504/spr24/sameGameTris/sge.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,24 +40,35 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="MacroExpansionManager">
+    <option name="directoryName" value="iond1hng" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 0
+}</component>
   <component name="ProjectId" id="1WwNkHNN3P3eLWEr1fM1C55vWZG" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548371024044" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
-  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "WebServerToolWindowFactoryState": "false",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.36091954",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
   <component name="RecentsManager">
+    <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="edu.bu.ec504.spr24.Brain.LazyBrain.Board" />
+    </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="edu.bu.ec504.spr19" />
       <recent name="edu.bu.ec504.spr19.sameGameTris" />
@@ -49,13 +76,14 @@
   </component>
   <component name="RunManager">
     <configuration name="EC504 SameGameTris" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" value="edu.bu.ec504.spr19.sameGameTris.sge" />
+      <option name="MAIN_CLASS_NAME" value="edu.bu.ec504.spr24.sameGameTris.sge" />
       <module name="sge_dist" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -68,6 +96,8 @@
       <updated>1548370618181</updated>
       <workItem from="1548370619328" duration="375000" />
       <workItem from="1580056843261" duration="23542000" />
+      <workItem from="1706041955741" duration="38000" />
+      <workItem from="1706042051986" duration="3619000" />
     </task>
     <task id="LOCAL-00001" summary="Apparently working version.">
       <created>1580084914114</created>
@@ -94,7 +124,7 @@
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Apparently working version." />
@@ -102,102 +132,4 @@
     <MESSAGE value="Minor tweaks" />
     <option name="LAST_COMMIT_MESSAGE" value="Minor tweaks" />
   </component>
-  <component name="WindowStateProjectService">
-    <state x="841" y="354" key="#Project_Structure" timestamp="1580086148601">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="841" y="354" key="#Project_Structure/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580086148601" />
-    <state x="744" y="354" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1580060472495">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="744" y="354" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580060472495" />
-    <state x="998" y="407" key="#com.intellij.ide.util.MemberChooser" timestamp="1580086367455">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="998" y="407" key="#com.intellij.ide.util.MemberChooser/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580086367455" />
-    <state x="980" y="473" key="#com.intellij.ide.util.PackageChooserDialog" timestamp="1580089168186">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="980" y="473" key="#com.intellij.ide.util.PackageChooserDialog/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580089168186" />
-    <state x="-881" y="453" key="#com.intellij.ide.util.TreeClassChooserDialog" timestamp="1580085697611">
-      <screen x="-2560" y="0" width="2560" height="1440" />
-    </state>
-    <state x="-881" y="453" key="#com.intellij.ide.util.TreeClassChooserDialog/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580085697611" />
-    <state x="822" y="379" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog" timestamp="1580063056139">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="822" y="379" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580063056139" />
-    <state x="937" y="450" key="#com.intellij.refactoring.memberPullUp.PullUpDialog" timestamp="1580090901945">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="937" y="450" key="#com.intellij.refactoring.memberPullUp.PullUpDialog/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580090901945" />
-    <state x="1006" y="601" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.packages" timestamp="1580089169702">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="1006" y="601" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.packages/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580089169702" />
-    <state x="699" y="23" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1580087575121">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="699" y="23" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580087575121" />
-    <state x="-815" y="390" key="#xdebugger.evaluate" timestamp="1580069192111">
-      <screen x="-2560" y="0" width="2560" height="1440" />
-    </state>
-    <state x="-815" y="390" key="#xdebugger.evaluate/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580069192111" />
-    <state x="1025" y="555" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1580093399530">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="1025" y="555" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580093399530" />
-    <state x="1025" y="292" key="CommitChangelistDialog2" timestamp="1580097683527">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="1025" y="292" key="CommitChangelistDialog2/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580097683527" />
-    <state width="2013" height="271" key="GridCell.Tab.0.bottom" timestamp="1580097406247">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state width="2013" height="271" key="GridCell.Tab.0.bottom/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580097406247" />
-    <state width="2013" height="271" key="GridCell.Tab.0.center" timestamp="1580097406247">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state width="2013" height="271" key="GridCell.Tab.0.center/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580097406247" />
-    <state width="2013" height="271" key="GridCell.Tab.0.left" timestamp="1580097406246">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state width="2013" height="271" key="GridCell.Tab.0.left/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580097406246" />
-    <state width="2013" height="271" key="GridCell.Tab.0.right" timestamp="1580097406247">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state width="2013" height="271" key="GridCell.Tab.0.right/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580097406247" />
-    <state width="2013" height="466" key="GridCell.Tab.1.bottom" timestamp="1580074485214">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state width="2013" height="466" key="GridCell.Tab.1.bottom/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580074485214" />
-    <state width="2013" height="466" key="GridCell.Tab.1.center" timestamp="1580074485214">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state width="2013" height="466" key="GridCell.Tab.1.center/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580074485214" />
-    <state width="2013" height="466" key="GridCell.Tab.1.left" timestamp="1580074485213">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state width="2013" height="466" key="GridCell.Tab.1.left/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580074485213" />
-    <state width="2013" height="466" key="GridCell.Tab.1.right" timestamp="1580074485214">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state width="2013" height="466" key="GridCell.Tab.1.right/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580074485214" />
-    <state x="-1131" y="242" key="SettingsEditor" timestamp="1580097700447">
-      <screen x="-2560" y="0" width="2560" height="1440" />
-    </state>
-    <state x="-1131" y="242" key="SettingsEditor/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580097700447" />
-    <state x="1046" y="429" key="Vcs.Push.Dialog.v2" timestamp="1580097685403">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="1046" y="429" key="Vcs.Push.Dialog.v2/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580097685403" />
-    <state x="934" y="525" key="com.intellij.ide.util.TipDialog" timestamp="1580056854823">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="934" y="525" key="com.intellij.ide.util.TipDialog/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580056854823" />
-    <state x="618" y="294" key="new project wizard" timestamp="1580094027542">
-      <screen x="0" y="23" width="2560" height="1337" />
-    </state>
-    <state x="618" y="294" key="new project wizard/0.23.2560.1337/-2560.0.2560.1440@0.23.2560.1337" timestamp="1580094027542" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/src/edu/bu/ec504/spr19/Brain/Brain.java b/src/edu/bu/ec504/spr24/Brain/Brain.java
similarity index 80%
rename from src/edu/bu/ec504/spr19/Brain/Brain.java
rename to src/edu/bu/ec504/spr24/Brain/Brain.java
index f3a3d15..63da5cf 100644
--- a/src/edu/bu/ec504/spr19/Brain/Brain.java
+++ b/src/edu/bu/ec504/spr24/Brain/Brain.java
@@ -1,6 +1,6 @@
-package edu.bu.ec504.spr19.Brain;
+package edu.bu.ec504.spr24.Brain;
 
-import edu.bu.ec504.spr19.sameGameTris.GUI;
+import edu.bu.ec504.spr24.sameGameTris.GUI;
 
 /**
  * The Brain is the artificial intelligence that tries to come up with the
@@ -9,26 +9,28 @@ import edu.bu.ec504.spr19.sameGameTris.GUI;
  * It typically runs in its own thread so that it will not interfere with other processing.
  */
 public abstract class Brain implements Runnable {
-	// fields
+	// FIELDS
 	protected final GUI myGUI; // the GUI class attached to this Brain
 	
-	// methods
+	// METHODS
+
 	/**
-	 * A constructor that accepts a parameter representing the GUI interface on which the game is played.
+	 * Constructs the brain
+	 * @param myGUI A reference to the Graphical User Interface on which the game is being played.
 	 */
 	Brain(GUI myGUI) { this.myGUI = myGUI; }
-	
-	/**
-	 * This is called when the Brain is being asked to close down (i.e., the game is over).
-	 * It should clean up any data structures and/or signal threads to close, etc.
-	 */
-	public abstract void allDone();
-	
+
 	/**
 	 * Each Brain should have a name, which is provided by this method.
 	 * @return the name of the brain
 	 */
 	public abstract String myName();
+
+	/**
+	 * This is called when the Brain is being asked to close down (i.e., the game is over).
+	 * It should clean up any data structures and/or signal threads to close, etc.
+	 */
+	public abstract void allDone();
 	
 	/**
 	 * Starts the Brain a'thinking.
@@ -36,5 +38,4 @@ public abstract class Brain implements Runnable {
 	 * @see java.lang.Runnable#run()
 	 */
 	public abstract void run();
-
 }
diff --git a/src/edu/bu/ec504/spr19/Brain/lazyBrain.java b/src/edu/bu/ec504/spr24/Brain/LazyBrain.java
similarity index 70%
rename from src/edu/bu/ec504/spr19/Brain/lazyBrain.java
rename to src/edu/bu/ec504/spr24/Brain/LazyBrain.java
index 127a6f0..7c42913 100644
--- a/src/edu/bu/ec504/spr19/Brain/lazyBrain.java
+++ b/src/edu/bu/ec504/spr24/Brain/LazyBrain.java
@@ -1,23 +1,34 @@
-package edu.bu.ec504.spr19.Brain;
+package edu.bu.ec504.spr24.Brain;
 
 import java.util.LinkedList;
 import java.util.Objects;
 
-import edu.bu.ec504.spr19.sameGameTris.GUI;
-import edu.bu.ec504.spr19.sameGameTris.CircleColor;
+import edu.bu.ec504.spr24.sameGameTris.GUI;
+import edu.bu.ec504.spr24.sameGameTris.CircleColor;
 
 /**
  * Does whatever a lazy brain does ...
  */
-public class lazyBrain extends Brain {
-	// fields
-	private volatile boolean allDone = false; // when set to true, the Brain should stop what it's doing and exit (at an appropriate time)
-	private board currState;
+public class LazyBrain extends Brain {
 
-	/** Instantiates a Brain linked to a specified myGUI
+	// FIELDS
+
+	/**
+	 * When set to true, the Brain should stop what it's doing and exit as soon as is appropriate.
+	 */
+	private volatile boolean allDone = false;
+
+	/**
+	 * The Brain's recording of the current state of the board.
+	 */
+	private Board currBoard;
+
+	// METHODS
+
+	/** Constructs a Brain linked to a specified myGUI
 	 * @param myGUI The GUI that will be instantiating the Brain
 	 */
-	public lazyBrain(GUI myGUI) {
+	public LazyBrain(GUI myGUI) {
 		super(myGUI);
 	}
 
@@ -32,48 +43,84 @@ public class lazyBrain extends Brain {
 	 * {@inheritDoc}
 	 */
 	public String myName() {
-		return "Greedy Brain";
+		return "Lazy Brain";
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public void run() {
-		// Initialize and set up the board with the current position
-		currState = new board();
+		// Initialize and set up the internal board state with the current position
+		currBoard = new Board();
 		for (int xx=0; xx<myGUI.boardWidth(); xx++)
 			for (int yy=0; yy<myGUI.boardHeight(); yy++)
-				currState.modify(xx, yy, myGUI.colorAt(xx, myGUI.boardHeight()-yy-1));
+				currBoard.modify(xx, yy, myGUI.colorAt(xx, myGUI.boardHeight()-yy-1));
 
+		// Keep making moves until the game is over
 		while (!allDone && !myGUI.gameOverQ()) {
-				pos nextMove = chooseMove();
+				Board.Pos nextMove = chooseMove();
 				myGUI.makeMove(nextMove.xx, nextMove.yy); // i.e. click on the lower left corner
 			}
 	}
 
-	// internal classes
-
+	// PRIVATE METHODS
 	/**
-	 * Stores an (xx,yy) coordinate
+	 * Chooses the next move to make.
+	 * @return the move chosen, in Board coordinates
 	 */
-	static class pos {
-		final int xx;
-		int yy;
-		pos(int xx, int yy) {this.xx=xx; this.yy=yy;}
+	private Board.Pos chooseMove() {
+		// greedy choice
+		int max=0;                  // the maximum number of points for the best position found
+		Board.Pos bestPos = new Board.Pos(0, 0); // the best position found
+		Board currStateCopy = new Board(currBoard);
+
+		for (int xx=0; xx< currBoard.columns(); xx++)
+			for (int yy=0; yy< currBoard.rows(xx); yy++) {
+				if (currStateCopy.get(xx,yy)!= CircleColor.NONE) {
+					Board test = new Board(currStateCopy);
+					currStateCopy.clickNodeHelper(xx, yy, test.get(xx,yy)); // mark all other nodes in the region as "clear" (but does not delete anything)
+					int count = test.clickNode(xx, yy); // try removing the region to see what is left over
+					if (count > max) {
+						// record a new best move
+						max = count;
+						bestPos = new Board.Pos(xx, yy);
+					}
+
+				}
+			}
+
+		// register the selected move on the board
+		currBoard.clickNode(bestPos.xx, bestPos.yy);
+		// convert bestPos to GUI coordinates
+		bestPos = new Board.Pos(bestPos.yy, myGUI.boardHeight() - 1 - bestPos.yy);
+
+		// return the result to the GUI
+		return bestPos;
 	}
 
+
+	// INTERNAL CLASSES
+
 	/**
 	 * Stores a board set up
 	 */
-	private class board {
+	private class Board {
+
+		/**
+		 * A 2-d Linked list of colors on the board.
+		 */
 		final LinkedList< LinkedList <CircleColor>> data;
+
+		/**
+		 * The width and height of the board.
+		 */
 		final private int width, height;
 
 		// constructs a board of specified width and height
-		board(int width, int height) {
+		Board(int width, int height) {
 			this.width = width; this.height = height;
 
-			// allocate the data structure
+			// allocate the data structure for storing board contents
 			data = new LinkedList<>();
 
 			// set up the data structure
@@ -82,27 +129,27 @@ public class lazyBrain extends Brain {
 				for (int jj=0; jj<height; jj++)
 					temp.add(CircleColor.NONE);
 				data.add(temp);
-			}		
+			}
 		}
 		/**
 		 * default constructor
 		 */
-		board() {
+		Board() {
 			this(myGUI.boardWidth(),myGUI.boardHeight());
 		}
 
 		/**
 		 * copy constructor
-		 * @param basis the board to copy
+		 * @param baseBoard the board to copy
 		 */
-		board(board basis) {
-			// allocate space
-			this(basis.width, basis.height);
+		Board(Board baseBoard) {
+			// allocate memory for the new board
+			this(baseBoard.width, baseBoard.height);
 
 			// copy over all the specific items
 			for (int xx=0; xx<columns(); xx++)
 				for (int yy=0; yy<rows(xx); yy++)
-					modify(xx,yy,basis.get(xx, yy));
+					modify(xx,yy,baseBoard.get(xx, yy));
 		}
 
 		/**
@@ -189,17 +236,17 @@ public class lazyBrain extends Brain {
 		private int clickNodeHelper(int xx, int yy, CircleColor col) {
 			if (get(xx,yy) == CircleColor.NONE || // we've either already seen this, or we've hit an empty space
 					get(xx,yy) != col)            // this is not the color we want
-				return 0; 
+				return 0;
 
 			// modify the current cell
 			modify(xx,yy,CircleColor.NONE);
 
 			return 1 + // 1 is for the current cell
-			clickNodeHelper(xx-1, yy, col) + // cell to the left
-			clickNodeHelper(xx+1, yy, col) + // cell to the right
-			clickNodeHelper(xx, yy-1, col) + // cell below
-			clickNodeHelper(xx, yy+1, col) // cell above
-			;
+					clickNodeHelper(xx-1, yy, col) + // cell to the left
+					clickNodeHelper(xx+1, yy, col) + // cell to the right
+					clickNodeHelper(xx, yy-1, col) + // cell below
+					clickNodeHelper(xx, yy+1, col) // cell above
+					;
 		}
 
 		/**
@@ -210,7 +257,7 @@ public class lazyBrain extends Brain {
 		}
 
 		/**
-		 * 
+		 *
 		 * @param xx the column being considered (assumed to exist)
 		 * @return the number of rows in column <b>xx</b>
 		 */
@@ -225,42 +272,15 @@ public class lazyBrain extends Brain {
 			String temp = data.toString();
 			return temp.replace("], [", "]\n[");
 		}
-	}
-
-	// internal methods
-	/**
-	 * Chooses the next move to make.
-	 * @return the move chosen, in GUI coordinates
-	 */
-	private pos chooseMove() {
-		// greedy choice
-		int max=0;                  // the maximum number of points for the best position found
-		pos bestPos = new pos(0, 0); // the best position found
-		board currStateCopy = new board(currState);
-
-		for (int xx=0; xx<currState.columns(); xx++)
-			for (int yy=0; yy<currState.rows(xx); yy++) {
-				if (currStateCopy.get(xx,yy)!= CircleColor.NONE) {
-					board test = new board(currStateCopy);
-					currStateCopy.clickNodeHelper(xx, yy, test.get(xx,yy)); // mark all other nodes in the region as "clear" (but does not delete anything)
-					int count = test.clickNode(xx, yy); // try removing the region to see what is left over
-					if (count > max) {
-						// record a new best move
-						max = count;
-						bestPos = new pos(xx, yy);
-					}
-
-				}
-			}
-
-		// register the selected move on the board
-		currState.clickNode(bestPos.xx, bestPos.yy);
-		// convert bestPos to GUI coordinates
-		bestPos.yy = myGUI.boardHeight() - 1 - bestPos.yy;
 
-		// return the result to the GUI
-		return bestPos;
+		/**
+		 * Stores an (xx,yy) position on the board.
+		 */
+		static class Pos {
+			final int xx;
+			final int yy;
+			Pos(int xx, int yy) {this.xx=xx; this.yy=yy;}
+		}
 	}
-
 }
 
diff --git a/src/edu/bu/ec504/spr19/Brain/simpleBrain.java b/src/edu/bu/ec504/spr24/Brain/SimpleBrain.java
similarity index 78%
rename from src/edu/bu/ec504/spr19/Brain/simpleBrain.java
rename to src/edu/bu/ec504/spr24/Brain/SimpleBrain.java
index 3f78b34..a20c245 100644
--- a/src/edu/bu/ec504/spr19/Brain/simpleBrain.java
+++ b/src/edu/bu/ec504/spr24/Brain/SimpleBrain.java
@@ -1,16 +1,16 @@
-package edu.bu.ec504.spr19.Brain;
+package edu.bu.ec504.spr24.Brain;
 
-import edu.bu.ec504.spr19.sameGameTris.GUI;
+import edu.bu.ec504.spr24.sameGameTris.GUI;
 
 /**
  * A very simple Brain for the game.
  */
-public class simpleBrain extends Brain {
+public class SimpleBrain extends Brain {
 	
 	// fields
 private volatile boolean allDone = false; // when set to true, the Brain should stop what it's doing and exit (at an appropriate time)
 
-	public simpleBrain(GUI myGUI) {
+	public SimpleBrain(GUI myGUI) {
 		super(myGUI);
 	}
 
@@ -36,4 +36,3 @@ private volatile boolean allDone = false; // when set to true, the Brain should
 				myGUI.makeMove(0, myGUI.boardHeight()-1); // i.e. click on the lower left corner
 	}
 }
-	
\ No newline at end of file
diff --git a/src/edu/bu/ec504/spr19/Brain/smarterBrain.java b/src/edu/bu/ec504/spr24/Brain/SmarterBrain.java
similarity index 68%
rename from src/edu/bu/ec504/spr19/Brain/smarterBrain.java
rename to src/edu/bu/ec504/spr24/Brain/SmarterBrain.java
index fd3f82b..0d72fd9 100644
--- a/src/edu/bu/ec504/spr19/Brain/smarterBrain.java
+++ b/src/edu/bu/ec504/spr24/Brain/SmarterBrain.java
@@ -1,14 +1,14 @@
-package edu.bu.ec504.spr19.Brain;
+package edu.bu.ec504.spr24.Brain;
 
-import edu.bu.ec504.spr19.sameGameTris.GUI;
+import edu.bu.ec504.spr24.sameGameTris.GUI;
 
 import javax.swing.*;
 
 /**
  * A smarter brain, for you to produce.
  */
-public class smarterBrain extends Brain {
-    public smarterBrain(GUI myGUI) {
+public class SmarterBrain extends Brain {
+    public SmarterBrain(GUI myGUI) {
         super(myGUI);
     }
 
diff --git a/src/edu/bu/ec504/spr19/highScores/highScore.java b/src/edu/bu/ec504/spr24/highScores/highScore.java
similarity index 86%
rename from src/edu/bu/ec504/spr19/highScores/highScore.java
rename to src/edu/bu/ec504/spr24/highScores/highScore.java
index e9403ec..00ac869 100644
--- a/src/edu/bu/ec504/spr19/highScores/highScore.java
+++ b/src/edu/bu/ec504/spr24/highScores/highScore.java
@@ -1,4 +1,4 @@
-package edu.bu.ec504.spr19.highScores;
+package edu.bu.ec504.spr24.highScores;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -25,8 +25,8 @@ public class highScore {
 	/*
 	 * where the high score database is kept
 	 */
-	private final String dataFile;
-	private final TreeSet<HSdata> db;
+	private final String _dataFile;
+	private final TreeSet<HSdata> _db;
 
 	// SUBCLASSES
 	/**
@@ -72,9 +72,9 @@ public class highScore {
 	 * @param fileName The name of the file to use for high score information.
 	 */
 	public highScore(String fileName) {
-		dataFile = fileName;
-		db = new TreeSet<>(new hsComp());
-		loadScores();
+		_dataFile = fileName;
+		_db = new TreeSet<>(new hsComp());
+		_loadScores();
 	}
 
 
@@ -85,10 +85,10 @@ public class highScore {
 	 */
 	public boolean putScore(HSdata foo) {
 		if (newRecordQ(foo.score)) {
-			db.add(foo);
-			while (db.size()>maxScores)
-				db.remove(db.last());
-			saveScores();
+			_db.add(foo);
+			while (_db.size()>maxScores)
+				_db.remove(_db.last());
+			_saveScores();
 			return true;
 		}
 		else
@@ -100,10 +100,10 @@ public class highScore {
 	 * @return true iff score is a new record on the high score list.
 	 */
 	public boolean newRecordQ(int score) {
-		if (db.isEmpty()) // nothing in the db so far
+		if (_db.isEmpty()) // nothing in the db so far
 			return true;
 		else
-			return (db.size()<maxScores-1 || score > db.last().score);
+			return (_db.size()<maxScores-1 || score > _db.last().score);
 	}
 
 
@@ -112,7 +112,7 @@ public class highScore {
 	 */
 	public String display() {
 		StringBuilder temp= new StringBuilder();
-		for (HSdata foo: db) {
+		for (HSdata foo: _db) {
 			temp.append(hsComp.weightedScore(foo)).append(" [weighted]: ").append(foo.score).append("[actual] (").append(foo.name).append(" on ").append(foo.boardSizeX).append("x").append(foo.boardSizeY).append(")\n");
 
 		}
@@ -123,10 +123,10 @@ public class highScore {
 	/**
 	 * Load high scores from the associated file.
 	 */
-	private void loadScores() {
+	private void _loadScores() {
 		FileInputStream fis;
 		try {
-			fis = new FileInputStream(dataFile);
+			fis = new FileInputStream(_dataFile);
 			DataInputStream in = new DataInputStream(fis);
 			BufferedReader br = new BufferedReader(new InputStreamReader(in));
 			String strLine;
@@ -134,7 +134,7 @@ public class highScore {
 			while ((strLine = br.readLine()) != null) {
 				String[] res = strLine.split("\t");
 				HSdata temp = new HSdata(res[0],new Integer(res[1]),new Integer(res[2]), new Integer(res[3]));
-				db.add(temp);
+				_db.add(temp);
 			}
 		} catch (FileNotFoundException e) {
 			System.err.println("High score file not found - Starting fresh!");
@@ -146,14 +146,14 @@ public class highScore {
 	/**
 	 * Save current database to the associated file.
 	 */
-	private void saveScores() {
+	private void _saveScores() {
 		FileOutputStream fos;
 		try {
-			fos = new FileOutputStream(dataFile);
+			fos = new FileOutputStream(_dataFile);
 			DataOutputStream out = new DataOutputStream(fos);
 			BufferedWriter br = new BufferedWriter(new OutputStreamWriter(out));
 
-			for (HSdata foo: db) {
+			for (HSdata foo: _db) {
 				br.write(foo.name+"\t"+foo.boardSizeX+"\t"+foo.boardSizeY+"\t"+foo.score+"\n");
 			}
 
diff --git a/src/edu/bu/ec504/spr19/sameGameTris/CircleColor.java b/src/edu/bu/ec504/spr24/sameGameTris/CircleColor.java
similarity index 57%
rename from src/edu/bu/ec504/spr19/sameGameTris/CircleColor.java
rename to src/edu/bu/ec504/spr24/sameGameTris/CircleColor.java
index 2ead8be..83748e6 100644
--- a/src/edu/bu/ec504/spr19/sameGameTris/CircleColor.java
+++ b/src/edu/bu/ec504/spr24/sameGameTris/CircleColor.java
@@ -1,8 +1,8 @@
-package edu.bu.ec504.spr19.sameGameTris;
+package edu.bu.ec504.spr24.sameGameTris;
 
 import java.awt.Color;
 
-import static edu.bu.ec504.spr19.sameGameTris.sge.randGen;
+import static edu.bu.ec504.spr24.sameGameTris.sge.randGen;
 
 /*
  * Records the color of one circle
@@ -11,21 +11,21 @@ import static edu.bu.ec504.spr19.sameGameTris.sge.randGen;
 public enum CircleColor {
 	NONE(null),
 	Red(new Color(255, 0, 0)),
-    Green(new Color(0, 255, 0)),
-    Blue(new Color(0, 0, 255)),
-    Pink(new Color(255,0,255));
+	Green(new Color(0, 255, 0)),
+	Blue(new Color(0, 0, 255)),
+	Pink(new Color(255, 0, 255));
 
-	// fields
-	private final Color myColor;
+	// FIELDS
+	private final Color _myColor;
 
-	// Constructor
+	// CONSTRUCTOR
 	CircleColor(Color myColor) {
-		this.myColor = myColor;
+		this._myColor = myColor;
 	}
 
-	// Accessors
+	// ACCESSOR
 	Color getColor() {
-		return myColor;
+		return _myColor;
 	}
 
 	/*
@@ -33,10 +33,10 @@ public enum CircleColor {
 	 */
 	static CircleColor randColor() {
 		if (sge.numColors < 1 || sge.numColors >= CircleColor.values().length)
-			throw new IndexOutOfBoundsException("Only " + CircleColor.values().length + " colors are available.  You requested choosing one of " + sge.numColors + " colors.");
+			throw new IndexOutOfBoundsException("Only " + CircleColor.values().length
+					+ " colors are available.  You requested choosing one of " + sge.numColors + " colors.");
 
 		int randNum = 1 + Math.abs(randGen.nextInt()) % sge.numColors;
 		return CircleColor.values()[randNum];
-
 	}
 }
diff --git a/src/edu/bu/ec504/spr19/sameGameTris/CircleRolloverEvent.java b/src/edu/bu/ec504/spr24/sameGameTris/CircleRolloverEvent.java
similarity index 66%
rename from src/edu/bu/ec504/spr19/sameGameTris/CircleRolloverEvent.java
rename to src/edu/bu/ec504/spr24/sameGameTris/CircleRolloverEvent.java
index 0f60337..0a5c1e5 100644
--- a/src/edu/bu/ec504/spr19/sameGameTris/CircleRolloverEvent.java
+++ b/src/edu/bu/ec504/spr24/sameGameTris/CircleRolloverEvent.java
@@ -1,4 +1,4 @@
-package edu.bu.ec504.spr19.sameGameTris;
+package edu.bu.ec504.spr24.sameGameTris;
 
 import java.util.EventObject;
 
@@ -12,31 +12,35 @@ class CircleRolloverEvent extends EventObject {
 	/*
 	 * the location of the button broadcasting the event
 	 */
-	private final int xx;
-	private final int yy;
+	private final int _xx;
+	private final int _yy;
 	private final CircleColor clr;
 	private final SelfAwareCircle.Visibility visibility;
-	
+
 	// Constructor(s)
 	/*
 	 * Records a rollover event on a specific button
+	 * @param source The "source" upon which the event initially occured
 	 * @param xx The x coordinate (in the gridlayout of buttons) of the button that was rolled over
 	 * @param yy The y coordinate (in the gridlayout of buttons) of the button that was rolled over
 	 * @param clr The color of the button that initiated the event
-	 * @param visibility Should circles be highlighted or unhighlighted
-	 * @param source The "source" upon which the event initially occured
+	 * @param vis Should circles be highlighted or unhighlighted
 	 */
-	public CircleRolloverEvent(Object source, int xx, int yy, CircleColor clr, SelfAwareCircle.Visibility toDo) {
+	public CircleRolloverEvent(Object source, int xx, int yy, CircleColor clr,
+			SelfAwareCircle.Visibility vis) {
 		super(source); // register with the superclass
-		this.xx=xx; this.yy=yy; this.clr=clr; this.visibility = toDo;
+		this._xx = xx;
+		this._yy = yy;
+		this.clr = clr;
+		this.visibility = vis;
 	}
-	
-	// Methods
-	// ... accessor
-	int getXX() { return xx; }
-	int getYY() { return yy; }
-	SelfAwareCircle.Visibility getAction() { return visibility; }
-	CircleColor getColor() { return clr; }
 
+	// ACCESSORS
+	int getXX() {return _xx;}
+
+	int getYY() {return _yy;}
+
+	SelfAwareCircle.Visibility getVisibility() {return visibility;}
 
+	CircleColor getColor() {return clr;}
 }
diff --git a/src/edu/bu/ec504/spr19/sameGameTris/GUI.java b/src/edu/bu/ec504/spr24/sameGameTris/GUI.java
similarity index 90%
rename from src/edu/bu/ec504/spr19/sameGameTris/GUI.java
rename to src/edu/bu/ec504/spr24/sameGameTris/GUI.java
index f03dd77..b11b7d6 100644
--- a/src/edu/bu/ec504/spr19/sameGameTris/GUI.java
+++ b/src/edu/bu/ec504/spr24/sameGameTris/GUI.java
@@ -1,4 +1,4 @@
-package edu.bu.ec504.spr19.sameGameTris;
+package edu.bu.ec504.spr24.sameGameTris;
 
 import javax.swing.*;
 
@@ -7,10 +7,17 @@ import javax.swing.*;
  * It contains all the interfaces your Brain might need to make its moves.
  */
 public abstract class GUI extends JFrame {
+
+	/**
+	 * A number used for serialization.
+	 */
 	private static final long serialVersionUID = 1L;
 
-	GUI(String s) {
-		super(s);
+	/**
+	 * @param title Creates a new GUI with the given title.
+	 */
+	GUI(String title) {
+		super(title);
 	}
 
 	/*
diff --git a/src/edu/bu/ec504/spr19/sameGameTris/SelfAwareCircle.java b/src/edu/bu/ec504/spr24/sameGameTris/SelfAwareCircle.java
similarity index 74%
rename from src/edu/bu/ec504/spr19/sameGameTris/SelfAwareCircle.java
rename to src/edu/bu/ec504/spr24/sameGameTris/SelfAwareCircle.java
index 765c1e7..58541a6 100644
--- a/src/edu/bu/ec504/spr19/sameGameTris/SelfAwareCircle.java
+++ b/src/edu/bu/ec504/spr24/sameGameTris/SelfAwareCircle.java
@@ -1,4 +1,4 @@
-package edu.bu.ec504.spr19.sameGameTris;
+package edu.bu.ec504.spr24.sameGameTris;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -15,25 +15,27 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 class SelfAwareCircle extends Component implements MouseListener, SelfAwareListener {
 	// Constants
-	private final Color hltColor = new Color(200,200,200); // the color to use for highlighting a button
+	private final Color _hltColor = new Color(200,200,200); // the color to use for highlighting a button
 
-	// Data fields
+	// FIELDS
 	public final int xx;
 	public final int yy;
 	public CircleColor clr;
 	private static final long serialVersionUID = 1L;
 	private final ArrayList<SelfAwareListener> _listeners = new ArrayList<>(); // who is listening to events fired by this circle
-	private static int id=0;
-	private final int myid; // the circle's ID
-	private Visibility state = Visibility.plain;	// the current state of the circle
-	private final sge sgeGui;                       // a link to the GUI that created this circle
+	private static int _id =0;
+	private final int _myID; // the circle's ID
+	private Visibility _state = Visibility.plain;	// the current state of the circle
+	private final sge sgeGUI;                       // a link to the GUI that created this circle
 
-	// concurrency variables
+	/**
+	 * Used to manage concurrency.
+	 */
 	private static final AtomicInteger regionLength = new AtomicInteger(0);
 
 	// SUBCLASSES
 	/*
-	 * Records the length of the selected region
+	 * Records the visibility of an object.
 	 */
 	public enum Visibility{
 		/*
@@ -65,9 +67,9 @@ class SelfAwareCircle extends Component implements MouseListener, SelfAwareListe
 			this.clr = clr; // record the color of the button
 			if (clr == CircleColor.NONE)    // circles with no color should be cleared
 				setClear();
-			this.sgeGui = sgeGui;   // record the GUI that created this button
+			this.sgeGUI = sgeGui;   // record the GUI that created this button
 			addMouseListener(this);        // register for mouse events
-			myid = id++;
+			_myID = _id++;
 		}
 
 		/**
@@ -86,11 +88,11 @@ class SelfAwareCircle extends Component implements MouseListener, SelfAwareListe
 		}
 
 		public int getId() {
-			return myid;
+			return _myID;
 		}
 
-		 Visibility getState() {
-			return state;
+		 Visibility get_state() {
+			return _state;
 		}
 
 		public CircleColor getColor() {
@@ -104,20 +106,20 @@ class SelfAwareCircle extends Component implements MouseListener, SelfAwareListe
 			clr=CircleColor.randColor();
 		}
 
-		void setState (Visibility state) {
-			if (state==Visibility.clear)
+		void set_state(Visibility _state) {
+			if (_state ==Visibility.clear)
 				setClear();   // i.e. there is extra overhead in clearing
 			else
-				this.state = state;
+				this._state = _state;
 			repaint();
 		}
 
 		boolean isCleared() {
-			return this.state == Visibility.clear;
+			return this._state == Visibility.clear;
 		}
 
 		void setClear() {
-			state = Visibility.clear;
+			_state = Visibility.clear;
 			repaint();
 		}
 
@@ -125,18 +127,18 @@ class SelfAwareCircle extends Component implements MouseListener, SelfAwareListe
 		 * Copies immutable elements of this SelfAwareCircle to "recipient"
 		 *    *except* position-dependent items (e.g. _listeners, xx, yy)
 		 */
-		void copy(SelfAwareCircle recipient) {
+		void copyTo(SelfAwareCircle recipient) {
 			recipient.clr=clr;
-			if (recipient.state == state)
+			if (recipient._state == _state)
 				return; // i.e. nothing to do
 
 			// special cases
 			// ... copying a cleared circle to an uncleared circle
-			if (state == Visibility.clear)
+			if (_state == Visibility.clear)
 				recipient.setClear();   // includes removing a mouse listener
 
 			// copy the state
-			recipient.setState(state);
+			recipient.set_state(_state);
 		}
 
 		// ... Mouse methods
@@ -146,7 +148,7 @@ class SelfAwareCircle extends Component implements MouseListener, SelfAwareListe
 		 * Highlights the button by changing its icon and firing off an event
 		 * @param state determines whether to highlight or unhighlight the circle
 		 */
-		private void highlightButton(Visibility stt) {
+		private void _highlightButton(Visibility stt) {
 			if (isCleared())  // don't go further with already cleared circles
 				return;
 
@@ -154,7 +156,7 @@ class SelfAwareCircle extends Component implements MouseListener, SelfAwareListe
 			if (stt==Visibility.clear) // clear has its own special treatment
 				setClear(); // properly clear this circle (including removal of mouse listener)
 			else
-				setState(stt);   // set the non-cleared state appropriately
+				set_state(stt);   // set the non-cleared state appropriately
 
 			// deal with the region length
 			regionLength.getAndIncrement(); // update the region length by the newly highlighted item
@@ -171,30 +173,43 @@ class SelfAwareCircle extends Component implements MouseListener, SelfAwareListe
 		 */
 		public void mouseEntered(MouseEvent e) {
 			regionLength.set(0); // i.e. reinitialize
-			highlightButton(Visibility.highlight);
+			_highlightButton(Visibility.highlight);
 		}
 
+	/**
+	 * Mouse exited the object area.
+	 * *  Change its button icon
+	 * *  Broadcast the change to other buttons
+	 */
 		public void mouseExited(MouseEvent e) {
 			regionLength.set(0); // i.e. reinitialize
-			highlightButton(Visibility.plain);
+			_highlightButton(Visibility.plain);
 		}
-		public void mousePressed(MouseEvent e) {
+
+	/**
+	 * The mouse button was pressed.
+	 */
+	public void mousePressed(MouseEvent e) {
 			regionLength.set(0); // i.e. reinitialize
 		}
-		public void mouseReleased(MouseEvent e) {
-			highlightButton(Visibility.clear);
+
+	/**
+	 * The mouse button was released.
+	 */
+	public void mouseReleased(MouseEvent e) {
+			_highlightButton(Visibility.clear);
 
 			// register the score
-			sgeGui.totalPoints.setText("" +
-					(Integer.parseInt(sgeGui.totalPoints.getText()) +
-							sgeGui.score(SelfAwareCircle.getRegionLength(), getColor())));
+			sgeGUI.totalPoints.setText("" +
+					(Integer.parseInt(sgeGUI.totalPoints.getText()) +
+							sgeGUI.score(SelfAwareCircle.getRegionLength(), getColor())));
 
 			// request that the board be shifted appropriately
-			sgeGui.shiftCircles();
+			sgeGUI.shiftCircles();
 
 			// update tetrising
-			sgeGui.updateNumClicks();
-			sgeGui.updateTetrising();
+			sgeGUI.updateNumClicks();
+			sgeGUI.updateTetrising();
 
 		}
 
@@ -225,22 +240,22 @@ class SelfAwareCircle extends Component implements MouseListener, SelfAwareListe
 		 * @param e the event broadcast by the other button
 		 */
 		public void rollingOver(CircleRolloverEvent e) {
-			if (state == e.getAction() || isCleared()) // i.e. this circle has already been processed
+			if (_state == e.getVisibility() || isCleared()) // i.e. this circle has already been processed
 				return;
 
 			if (e.getColor().equals(clr)) { // check if the color is the same as mine
-				highlightButton(e.getAction());
+				_highlightButton(e.getVisibility());
 			}
 			// in all other cases, only update the text field (i.e. stop the recursion)
-			sgeGui.regionPoints.setText(""+(SelfAwareCircle.getRegionLength())); // update the gui text field
+			sgeGUI.regionPoints.setText(""+(SelfAwareCircle.getRegionLength())); // update the gui text field
 		}
 
 		// ... drawing methods
 		public void paint(Graphics g) {
 			// set the color, depending on whether this is being highlighted
-			switch (state) {
+			switch (_state) {
 			case highlight:
-				g.setColor(hltColor); // change to highlighting color
+				g.setColor(_hltColor); // change to highlighting color
 				break;
 			case plain:
 				g.setColor(clr.getColor());      // the default color
diff --git a/src/edu/bu/ec504/spr19/sameGameTris/SelfAwareListener.java b/src/edu/bu/ec504/spr24/sameGameTris/SelfAwareListener.java
similarity index 83%
rename from src/edu/bu/ec504/spr19/sameGameTris/SelfAwareListener.java
rename to src/edu/bu/ec504/spr24/sameGameTris/SelfAwareListener.java
index 7a0be61..27f88bf 100644
--- a/src/edu/bu/ec504/spr19/sameGameTris/SelfAwareListener.java
+++ b/src/edu/bu/ec504/spr24/sameGameTris/SelfAwareListener.java
@@ -1,4 +1,4 @@
-package edu.bu.ec504.spr19.sameGameTris;
+package edu.bu.ec504.spr24.sameGameTris;
 
 /*
  * Listener for events of interest to SelfAwareJButtons
diff --git a/src/edu/bu/ec504/spr19/sameGameTris/sge.java b/src/edu/bu/ec504/spr24/sameGameTris/sge.java
similarity index 94%
rename from src/edu/bu/ec504/spr19/sameGameTris/sge.java
rename to src/edu/bu/ec504/spr24/sameGameTris/sge.java
index 77013c7..047f815 100644
--- a/src/edu/bu/ec504/spr19/sameGameTris/sge.java
+++ b/src/edu/bu/ec504/spr24/sameGameTris/sge.java
@@ -1,9 +1,4 @@
-package edu.bu.ec504.spr19.sameGameTris;
-
-/* An implementation of the "samegnome" game, possibly with a computer-aided solver.
-   Written by Prof. Ari Trachtenberg for EC504 at Boston University.
-*/
-
+package edu.bu.ec504.spr24.sameGameTris;
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
@@ -29,14 +24,18 @@ import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 
-import edu.bu.ec504.spr19.Brain.smarterBrain;
-import edu.bu.ec504.spr19.highScores.highScore;
-import edu.bu.ec504.spr19.Brain.Brain;
-import edu.bu.ec504.spr19.Brain.lazyBrain;
-import edu.bu.ec504.spr19.Brain.simpleBrain;
+import edu.bu.ec504.spr24.Brain.SmarterBrain;
+import edu.bu.ec504.spr24.highScores.highScore;
+import edu.bu.ec504.spr24.Brain.Brain;
+import edu.bu.ec504.spr24.Brain.LazyBrain;
+import edu.bu.ec504.spr24.Brain.SimpleBrain;
 
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 
+/**
+ * A Singleton Graphical User Interface for the game.
+ * @author Ari Trachtenberg
+ */
 class sge extends GUI implements ActionListener, ItemListener {
 
     // CONSTANTS
@@ -56,8 +55,11 @@ class sge extends GUI implements ActionListener, ItemListener {
     private SelfAwareCircle[][] circles;
     private String highScoreName = null;              // the name to use for the high score
     static final Random randGen = new Random();       // package-private random number generator used for the entire package (i.e., repeatedly seeding with the same value produces the same randomness).
-	private int numClicks = 1;	                      // Must be a positive integer; counts the number of clicks on circles since the last time the board was reset.
-
+	static private int numClicks = 1;	                      // Must be a positive integer; counts the number of clicks on circles since the last time the board was reset.
+  /**
+   * An instane of the SGE GUI.
+   */
+  private static sge Instance = null;
 
 	// ... GUI elements
     private JPanel circlePanel; // the panel containing the circles
@@ -94,12 +96,12 @@ class sge extends GUI implements ActionListener, ItemListener {
 			try {
 				int randColumn = randGen.nextInt(width);
 				SelfAwareCircle myCircle = circles[randColumn][0];
-				if (myCircle.getState() != SelfAwareCircle.Visibility.clear) { // i.e. the spot is already occupied
+				if (myCircle.get_state() != SelfAwareCircle.Visibility.clear) { // i.e. the spot is already occupied
 					doGameOver("overran column "+randColumn);
 				}
 				else {
 					myCircle.resetColor();
-					myCircle.setState(SelfAwareCircle.Visibility.plain);
+					myCircle.set_state(SelfAwareCircle.Visibility.plain);
 				}
 			} finally {
 				GUIlock.unlock();
@@ -124,8 +126,8 @@ class sge extends GUI implements ActionListener, ItemListener {
 					for (int yy = height - 2; yy >= 0; yy--) {  // go down to up, so as not to move circles more than once
 						SelfAwareCircle orig = circles[xx][yy],
 								dest = circles[xx][yy + 1];
-						if (orig.getState() != SelfAwareCircle.Visibility.clear &&        // a colored circle
-								dest.getState() == SelfAwareCircle.Visibility.clear) {    // above a cleared circle
+						if (orig.get_state() != SelfAwareCircle.Visibility.clear &&        // a colored circle
+								dest.get_state() == SelfAwareCircle.Visibility.clear) {    // above a cleared circle
 							// move it down
 							moveCircle(orig, dest);
 						}
@@ -138,12 +140,12 @@ class sge extends GUI implements ActionListener, ItemListener {
 		}
 	}
 
-    // PUBLIC ACCESS METHODS
+    // METHODS
 
     /*
      * Default no-args constructor
      */
-    public sge() {
+    private sge() {
         super("Ari's samegame");
         try {
             SwingUtilities.invokeAndWait(
@@ -154,6 +156,13 @@ class sge extends GUI implements ActionListener, ItemListener {
         }
     }
 
+    public static sge getInstance() {
+      if (sge.Instance == null) {
+        sge.Instance = new sge();
+      }
+      return Instance;
+    }
+
     /*
      * Returns the color of the circle at location [xx][yy], or NONE if the circle has been cleared
      * @param xx must be between 0 and width
@@ -422,7 +431,7 @@ class sge extends GUI implements ActionListener, ItemListener {
      */
     synchronized private void moveCircle(SelfAwareCircle orig, SelfAwareCircle dest) {
         // copy the immutable, position independent values
-        orig.copy(dest);
+        orig.copyTo(dest);
 
         // clear the top item
         orig.setClear();
@@ -605,11 +614,11 @@ class sge extends GUI implements ActionListener, ItemListener {
             if (source == noPlayerMenuItem)
                 return; // i.e. no players
             else if (source == simplePlayerMenuItem)
-                startBrain(new simpleBrain(this));
+                startBrain(new SimpleBrain(this));
             else if (source == lazyPlayerMenuItem)
-                startBrain(new lazyBrain(this));
+                startBrain(new LazyBrain(this));
             else if (source == smarterPlayerMenuItem)
-                startBrain(new smarterBrain( this));
+                startBrain(new SmarterBrain( this));
         } else {
             // deselected
             if (theBrain != null)
@@ -624,9 +633,9 @@ class sge extends GUI implements ActionListener, ItemListener {
      * Runs the application
      */
     public static void main(String[] args) {
-        JFrame myApp = new sge();
+        JFrame myApp = sge.getInstance();
         myApp.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         myApp.setSize(defaultWindowWidth, defaultWindowHeight);
         myApp.setVisible(true);
     }
-}
\ No newline at end of file
+}
-- 
GitLab