diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.java b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.java
index 4a6ffd9083..4fc97785ba 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.java
+++ b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanel.java
@@ -23,13 +23,19 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 
 /** The Image/Video Analyzer panel in the NetBeans provided Options Dialogs
- * accessed via Tool -> Options */
+ * accessed via Tool -> Options
+ *
+ * Uses {@link ImageAnalyzerPreferences} and {@link PerCaseProperties} to
+ * persist settings
+ */
 final class ImageAnalyzerOptionsPanel extends javax.swing.JPanel {
 
     ImageAnalyzerOptionsPanel(ImageAnalyzerOptionsPanelController controller) {
         initComponents();
 
+        //listen for interactions
         IngestManager.getInstance().addIngestJobEventListener(evt -> {
+            //disable during ingest
             enabledForCaseBox.setEnabled(Case.isCaseOpen() && IngestManager.getInstance().isIngestRunning() == false);
         });
 
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanelController.java b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanelController.java
index 3711d5dff2..5d1aa3c66d 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanelController.java
+++ b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerOptionsPanelController.java
@@ -26,6 +26,7 @@ import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
 
+/** OptionsPanelController for the ImageAnalyzerOptionPanel */
 @OptionsPanelController.TopLevelRegistration(
         categoryName = "#OptionsCategory_Name_Options",
         iconBase = "org/sleuthkit/autopsy/imageanalyzer/images/polaroid_48_silhouette.png",
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerPreferences.java b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerPreferences.java
index 784647bdac..403a9fec6a 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerPreferences.java
+++ b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/ImageAnalyzerPreferences.java
@@ -22,14 +22,14 @@ import java.util.prefs.PreferenceChangeListener;
 import java.util.prefs.Preferences;
 import org.openide.util.NbPreferences;
 
-/**
- *
- */
- class ImageAnalyzerPreferences {
+/** Persists Image Analyzer preference to a per user .properties file */
+class ImageAnalyzerPreferences {
 
+    /** NBPreferences object used to persist settings */
     private static final Preferences preferences = NbPreferences.forModule(ImageAnalyzerPreferences.class);
 
-    static final String ENABLED_BY_DEFAULT = "enabled_by_default";
+    /** key for the listening enabled for new cases setting */
+    private static final String ENABLED_BY_DEFAULT = "enabled_by_default";
 
     static boolean isEnabledByDefault() {
         final boolean aBoolean = preferences.getBoolean(ENABLED_BY_DEFAULT, true);