diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
index c3271b7ac1..d3b086f731 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
@@ -31,7 +31,6 @@ import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
-import org.sleuthkit.autopsy.datamodel.KeyValue;
 import org.sleuthkit.autopsy.keywordsearch.KeywordSearch.QueryType;
 
 /**
@@ -154,10 +153,10 @@ class KeywordSearchQueryManager {
         final String windowTitle = NbBundle.getMessage(this.getClass(), "KeywordSearchQueryManager.execute.exeWinTitle", ++resultWindowCount, queryStrShort);
         DataResultTopComponent searchResultWin = DataResultTopComponent.createInstance(windowTitle);
         if (queryRequests.size() > 0) {
-            Children childThingNodes =
+            Children childNodes =
                     Children.create(new KeywordSearchResultFactory(keywords, queryRequests, searchResultWin), true);
 
-            rootNode = new AbstractNode(childThingNodes);
+            rootNode = new AbstractNode(childNodes);
         } else {
             rootNode = Node.EMPTY;
         }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
index b162ddf364..d6143e7cab 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
@@ -441,7 +441,7 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQueryContent> {
                             snippet = LuceneQuery.querySnippet(snippetQuery, f.getId(), chunkId, !query.isLiteral(), true);
                         } catch (NoOpenCoreException e) {
                             logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e); //NON-NLS
-                            //no reason to continie
+                            //no reason to continue
                             return null;
                         } catch (Exception e) {
                             logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e); //NON-NLS
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryRequest.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryRequest.java
index fcfb0d43e2..1e50bc377e 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryRequest.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryRequest.java
@@ -47,8 +47,6 @@ class QueryRequest  {
         this.query = query;
     }
     
-
-    
     public String getQueryString() {
         return queryString;
     }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
index 43f16d472e..60af2acb46 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
@@ -424,25 +424,25 @@ public final class SearchRunner {
                         subProgresses[keywordsSearched - 1].finish();
                     }
 
-                    KeywordSearchQuery del = null;
+                    KeywordSearchQuery keywordSearchQuery = null;
 
                     boolean isRegex = !keywordQuery.isLiteral();
                     if (isRegex) {
-                        del = new TermComponentQuery(keywordQuery);
+                        keywordSearchQuery = new TermComponentQuery(keywordQuery);
                     } else {
-                        del = new LuceneQuery(keywordQuery);
-                        del.escape();
+                        keywordSearchQuery = new LuceneQuery(keywordQuery);
+                        keywordSearchQuery.escape();
                     }
 
                     //limit search to currently ingested data sources
                     //set up a filter with 1 or more image ids OR'ed
                     final KeywordQueryFilter dataSourceFilter = new KeywordQueryFilter(KeywordQueryFilter.FilterType.DATA_SOURCE, job.getDataSourceId());
-                    del.addFilter(dataSourceFilter);
+                    keywordSearchQuery.addFilter(dataSourceFilter);
 
                     QueryResults queryResult;
 
                     try {
-                        queryResult = del.performQuery();
+                        queryResult = keywordSearchQuery.performQuery();
                     } catch (NoOpenCoreException ex) {
                         logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), ex); //NON-NLS
                         //no reason to continue with next query if recovery failed
@@ -514,7 +514,7 @@ public final class SearchRunner {
                                 }
 
                                 // write the blackboard artifact for this keyword in this file
-                                KeywordWriteResult written = del.writeToBlackBoard(hitTerm.getQuery(), hitFile, snippet, listName);
+                                KeywordWriteResult written = keywordSearchQuery.writeToBlackBoard(hitTerm.getQuery(), hitFile, snippet, listName);
                                 if (written == null) {
                                     logger.log(Level.WARNING, "BB artifact for keyword hit not written, file: {0}, hit: {1}", new Object[]{hitFile, hitTerm.toString()}); //NON-NLS
                                     continue;
@@ -649,8 +649,8 @@ public final class SearchRunner {
             for (String name : keywordListNames) {
                 KeywordList list = loader.getList(name);
                 for (Keyword k : list.getKeywords()) {
-                    this.keywords.add(k);
-                    this.keywordToList.put(k.getQuery(), list);
+                    keywords.add(k);
+                    keywordToList.put(k.getQuery(), list);
                 }
             }
         }
@@ -683,20 +683,19 @@ public final class SearchRunner {
                     queryTermResultsIDs.add(ch.getId());
                 }
 
-                Keyword termResultK = new Keyword(termResult.toString(), !isRegex);
-                List<Long> curTermResults = job.currentKeywordResults(termResultK);
+                List<Long> curTermResults = job.currentKeywordResults(termResult);
                 if (curTermResults == null) {
-                    job.addKeywordResults(termResultK, queryTermResultsIDs);
-                    newResults.addResult(termResultK, queryTermResults);
+                    job.addKeywordResults(termResult, queryTermResultsIDs);
+                    newResults.addResult(termResult, queryTermResults);
                 } else {
                     //some AbstractFile hits already exist for this keyword
                     for (ContentHit res : queryTermResults) {
                         if (!curTermResults.contains(res.getId())) {
                             //add to new results
-                            List<ContentHit> newResultsFs = newResults.getResults(termResultK);
+                            List<ContentHit> newResultsFs = newResults.getResults(termResult);
                             if (newResultsFs == null) {
                                 newResultsFs = new ArrayList<>();
-                                newResults.addResult(termResultK, newResultsFs);
+                                newResults.addResult(termResult, newResultsFs);
                             }
                             newResultsFs.add(res);
                             curTermResults.add(res.getId());