diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhaseContext.java b/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhaseContext.java
index 90df2f1ef0e..237f43519fa 100644
--- a/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhaseContext.java
+++ b/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhaseContext.java
@@ -20,8 +20,9 @@
 package org.elasticsearch.search.fetch;
 
 /**
- * This class stores  if or if not a FetchSubPhase is supposed to execute.
- * It be extended by FetchSubPhases to hold information the phase needs to execute on hits.
+ * All configuration and context needed by the FetchSubPhase to execute on hits.
+ * The only required information in this base class is whether or not the sub phase needs to be run at all.
+ * It can be extended by FetchSubPhases to hold information the phase needs to execute on hits.
  * See {@link org.elasticsearch.search.fetch.FetchSubPhase.ContextFactory} and also {@link org.elasticsearch.search.fetch.fielddata.FieldDataFieldsContext} for an example.
  */
 public class FetchSubPhaseContext {
diff --git a/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginTests.java b/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginTests.java
index 5579768ac9f..a4263b20f9c 100644
--- a/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginTests.java
+++ b/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginTests.java
@@ -137,9 +137,7 @@ public class FetchSubPhasePluginTests extends ElasticsearchIntegrationTest {
 
         @Override
         public Map<String, ? extends SearchParseElement> parseElements() {
-            ImmutableMap.Builder<String, SearchParseElement> parseElements = ImmutableMap.builder();
-            parseElements.put("term_vectors_fetch", new TermVectorsFetchParseElement());
-            return parseElements.build();
+            return ImmutableMap.of("term_vectors_fetch", new TermVectorsFetchParseElement());
         }
 
         @Override