diff --git a/.editorconfig b/.editorconfig
index 2c0f81a480b..cd2391b636d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -111,6 +111,17 @@ csharp_space_between_method_call_parameter_list_parentheses = false:error
 csharp_preserve_single_line_statements = false:error
 csharp_preserve_single_line_blocks = true:error
 
+# Resharper
+resharper_csharp_braces_for_lock=required_for_complex
+resharper_csharp_braces_for_using=required_for_complex
+resharper_csharp_braces_for_while=required_for_complex
+resharper_csharp_braces_for_foreach=required_for_complex
+resharper_csharp_braces_for_for=required_for_complex
+resharper_csharp_braces_for_fixed=required_for_complex
+resharper_csharp_braces_for_ifelse=required_for_complex
+
+resharper_csharp_accessor_owner_body=expression_body
+
 # Override source included files
 [{SimpleJson|SynchronizedCollection}.cs]
 csharp_style_var_for_built_in_types = false:none
diff --git a/src/CodeGeneration/ApiGenerator/ApiGenerator.cs b/src/CodeGeneration/ApiGenerator/ApiGenerator.cs
index 6f1f9ea141c..06fe34dd6ad 100644
--- a/src/CodeGeneration/ApiGenerator/ApiGenerator.cs
+++ b/src/CodeGeneration/ApiGenerator/ApiGenerator.cs
@@ -4,10 +4,9 @@
 using System.IO;
 using System.Linq;
 using ApiGenerator.Domain;
-using Newtonsoft.Json;
-using ShellProgressBar;
 using Newtonsoft.Json.Linq;
 using RazorLight;
+using ShellProgressBar;
 
 namespace ApiGenerator
 {
@@ -17,39 +16,6 @@ public class ApiGenerator
 			.UseMemoryCachingProvider()
 			.Build();
 
-		public static void Generate(string downloadBranch, params string[] folders)
-		{
-			Warnings = new List<string>();
-			var spec = CreateRestApiSpecModel(downloadBranch, folders);
-			var actions = new Dictionary<Action<RestApiSpec>, string>
-			{
-				{  GenerateClientInterface, "Client interface" },
-				{  GenerateRequestParameters, "Request parameters" },
-				{  GenerateDescriptors, "Descriptors" },
-				{  GenerateRequests, "Requests" },
-				{  GenerateEnums, "Enums" },
-				{  GenerateRawClient, "Lowlevel client" },
-				{  GenerateRawDispatch, "Dispatch" },
-			};
-
-			using (var pbar = new ProgressBar(actions.Count, "Generating code", new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
-			{
-				foreach(var kv in actions)
-				{
-					pbar.Message = "Generating " + kv.Value;
-					kv.Key(spec);
-					pbar.Tick("Generated " + kv.Value);
-				}
-			}
-
-			if (Warnings.Count == 0) return;
-
-			Console.ForegroundColor = ConsoleColor.Yellow;
-			foreach (var warning in Warnings.Distinct().OrderBy(w=>w))
-				Console.WriteLine(warning);
-			Console.ResetColor();
-		}
-
 		public static List<string> Warnings { get; private set; }
 
 		private static string[] IgnoredApis { get; } =
@@ -85,27 +51,63 @@ public static void Generate(string downloadBranch, params string[] folders)
 			"nodes.reload_secure_settings.json"
 		};
 
+		public static void Generate(string downloadBranch, params string[] folders)
+		{
+			Warnings = new List<string>();
+			var spec = CreateRestApiSpecModel(downloadBranch, folders);
+			var actions = new Dictionary<Action<RestApiSpec>, string>
+			{
+				{ GenerateClientInterface, "Client interface" },
+				{ GenerateRequestParameters, "Request parameters" },
+				{ GenerateDescriptors, "Descriptors" },
+				{ GenerateRequests, "Requests" },
+				{ GenerateEnums, "Enums" },
+				{ GenerateRawClient, "Lowlevel client" },
+				{ GenerateRawDispatch, "Dispatch" },
+			};
+
+			using (var pbar = new ProgressBar(actions.Count, "Generating code", new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
+			{
+				foreach (var kv in actions)
+				{
+					pbar.Message = "Generating " + kv.Value;
+					kv.Key(spec);
+					pbar.Tick("Generated " + kv.Value);
+				}
+			}
+
+			if (Warnings.Count == 0) return;
+
+			Console.ForegroundColor = ConsoleColor.Yellow;
+			foreach (var warning in Warnings.Distinct().OrderBy(w => w))
+				Console.WriteLine(warning);
+			Console.ResetColor();
+		}
+
 		private static RestApiSpec CreateRestApiSpecModel(string downloadBranch, string[] folders)
 		{
 			var directories = Directory.GetDirectories(CodeConfiguration.RestSpecificationFolder, "*", SearchOption.AllDirectories)
-				.Where(f=>folders == null || folders.Length == 0 || folders.Contains(new DirectoryInfo(f).Name))
+				.Where(f => folders == null || folders.Length == 0 || folders.Contains(new DirectoryInfo(f).Name))
 				.ToList();
 
 			var endpoints = new Dictionary<string, ApiEndpoint>();
-			using (var pbar = new ProgressBar(directories.Count, $"Listing {directories.Count} directories", new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
+			using (var pbar = new ProgressBar(directories.Count, $"Listing {directories.Count} directories",
+				new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
 			{
 				var folderFiles = directories.Select(dir =>
 					Directory.GetFiles(dir)
-					.Where(f => f.EndsWith(".json") && !IgnoredApis.Contains(new FileInfo(f).Name))
-					.ToList()
+						.Where(f => f.EndsWith(".json") && !IgnoredApis.Contains(new FileInfo(f).Name))
+						.ToList()
 				);
 				var commonFile = Path.Combine(CodeConfiguration.RestSpecificationFolder, "Core", "_common.json");
 				if (!File.Exists(commonFile)) throw new Exception($"Expected to find {commonFile}");
+
 				RestApiSpec.CommonApiQueryParameters = CreateCommonApiQueryParameters(commonFile);
 
 				foreach (var jsonFiles in folderFiles)
 				{
-					using (var fileProgress = pbar.Spawn(jsonFiles.Count, $"Listing {jsonFiles.Count} files", new ProgressBarOptions { ProgressCharacter = '─', BackgroundColor = ConsoleColor.DarkGray }))
+					using (var fileProgress = pbar.Spawn(jsonFiles.Count, $"Listing {jsonFiles.Count} files",
+						new ProgressBarOptions { ProgressCharacter = '─', BackgroundColor = ConsoleColor.DarkGray }))
 					{
 						foreach (var file in jsonFiles)
 						{
@@ -118,6 +120,7 @@ private static RestApiSpec CreateRestApiSpecModel(string downloadBranch, string[
 								var endpoint = CreateApiEndpoint(file);
 								endpoints.Add(endpoint.Key, endpoint.Value);
 							}
+
 							fileProgress.Tick();
 						}
 					}
@@ -169,13 +172,7 @@ private static void PatchOfficialSpec(JObject original, string jsonFile)
 				MergeArrayHandling = MergeArrayHandling.Union
 			});
 
-			if (pathsOverride != null)
-			{
-				original.SelectToken("*.url.paths").Replace(pathsOverride);
-			}
-
-
-
+			if (pathsOverride != null) original.SelectToken("*.url.paths").Replace(pathsOverride);
 		}
 
 		private static Dictionary<string, ApiQueryParameters> CreateCommonApiQueryParameters(string jsonFile)
@@ -183,44 +180,43 @@ private static Dictionary<string, ApiQueryParameters> CreateCommonApiQueryParame
 			var json = File.ReadAllText(jsonFile);
 			var jobject = JObject.Parse(json);
 			var commonParameters = jobject.Property("params").Value.ToObject<Dictionary<string, ApiQueryParameters>>();
-			return ApiQueryParametersPatcher.Patch(null, commonParameters, null, checkCommon: false);
+			return ApiQueryParametersPatcher.Patch(null, commonParameters, null, false);
 		}
 
-		private static string CreateMethodName(string apiEndpointKey)
-		{
-			return PascalCase(apiEndpointKey);
-		}
+		private static string CreateMethodName(string apiEndpointKey) => PascalCase(apiEndpointKey);
 
-		private static string DoRazor(string name, string template, RestApiSpec model)
-		{
-			return Razor.CompileRenderAsync(name, template, model).GetAwaiter().GetResult();
-		}
+		private static string DoRazor(string name, string template, RestApiSpec model) =>
+			Razor.CompileRenderAsync(name, template, model).GetAwaiter().GetResult();
 
 		private static void GenerateClientInterface(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.EsNetFolder + @"IElasticLowLevelClient.Generated.cs";
-			var source = DoRazor(nameof(GenerateClientInterface), File.ReadAllText(CodeConfiguration.ViewFolder + @"IElasticLowLevelClient.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateClientInterface),
+				File.ReadAllText(CodeConfiguration.ViewFolder + @"IElasticLowLevelClient.Generated.cshtml"), model);
 			File.WriteAllText(targetFile, source);
 		}
 
 		private static void GenerateRawDispatch(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.NestFolder + @"_Generated/_LowLevelDispatch.generated.cs";
-			var source = DoRazor(nameof(GenerateRawDispatch), File.ReadAllText(CodeConfiguration.ViewFolder + @"_LowLevelDispatch.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateRawDispatch), File.ReadAllText(CodeConfiguration.ViewFolder + @"_LowLevelDispatch.Generated.cshtml"),
+				model);
 			File.WriteAllText(targetFile, source);
 		}
 
 		private static void GenerateRawClient(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.EsNetFolder + @"ElasticLowLevelClient.Generated.cs";
-			var source = DoRazor(nameof(GenerateRawClient), File.ReadAllText(CodeConfiguration.ViewFolder + @"ElasticLowLevelClient.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateRawClient),
+				File.ReadAllText(CodeConfiguration.ViewFolder + @"ElasticLowLevelClient.Generated.cshtml"), model);
 			File.WriteAllText(targetFile, source);
 		}
 
 		private static void GenerateDescriptors(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.NestFolder + @"_Generated\_Descriptors.generated.cs";
-			var source = DoRazor(nameof(GenerateDescriptors), File.ReadAllText(CodeConfiguration.ViewFolder + @"_Descriptors.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateDescriptors), File.ReadAllText(CodeConfiguration.ViewFolder + @"_Descriptors.Generated.cshtml"),
+				model);
 			File.WriteAllText(targetFile, source);
 		}
 
@@ -234,7 +230,8 @@ private static void GenerateRequests(RestApiSpec model)
 		private static void GenerateRequestParameters(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.EsNetFolder + @"Domain\RequestParameters\RequestParameters.Generated.cs";
-			var source = DoRazor(nameof(GenerateRequestParameters), File.ReadAllText(CodeConfiguration.ViewFolder + @"RequestParameters.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateRequestParameters),
+				File.ReadAllText(CodeConfiguration.ViewFolder + @"RequestParameters.Generated.cshtml"), model);
 			File.WriteAllText(targetFile, source);
 		}
 
diff --git a/src/CodeGeneration/ApiGenerator/CodeConfiguration.cs b/src/CodeGeneration/ApiGenerator/CodeConfiguration.cs
index 8b6e72edf23..5b2d60104c2 100644
--- a/src/CodeGeneration/ApiGenerator/CodeConfiguration.cs
+++ b/src/CodeGeneration/ApiGenerator/CodeConfiguration.cs
@@ -8,32 +8,9 @@ namespace ApiGenerator
 {
 	public static class CodeConfiguration
 	{
-		public static readonly Assembly Assembly = typeof(ApiGenerator).Assembly;
-
 		private static string _root = null;
 
-		private static string Root
-		{
-			get
-			{
-				if (CodeConfiguration._root != null) return CodeConfiguration._root;
-				var directoryInfo = new DirectoryInfo(Directory.GetCurrentDirectory());
-
-				var runningAsDnx =
-					directoryInfo.Name == "ApiGenerator" &&
-					directoryInfo.Parent != null &&
-					directoryInfo.Parent.Name == "CodeGeneration";
-
-				CodeConfiguration._root = runningAsDnx ? "" : @"..\..\..\";
-				return CodeConfiguration._root;
-			}
-		}
-
-		public static string NestFolder { get; } = $@"{Root}..\..\..\src\Nest\";
-		public static string EsNetFolder { get; } = $@"{Root}..\..\..\src\Elasticsearch.Net\";
-		public static string ViewFolder { get; } = $@"{Root}Views\";
-		public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification\";
-		public static string LastDownloadedVersionFile { get; } = Path.Combine(Root, "last_downloaded_version.txt");
+		public static readonly Assembly Assembly = typeof(ApiGenerator).Assembly;
 
 		public static readonly Dictionary<string, string> ApiNameMapping =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*.cs", SearchOption.AllDirectories)
@@ -41,8 +18,9 @@ private static string Root
 				let c = Regex.Replace(contents, @"^.+\[MapsApi\(""([^ \r\n]+)""\)\].*$", "$1", RegexOptions.Singleline)
 				where !c.Contains(" ") //filter results that did not match
 				select new { Value = f.Name.Replace("Request", ""), Key = c.Replace(".json", "") })
-				.DistinctBy(v => v.Key)
-				.ToDictionary(k => k.Key, v => v.Value.Replace(".cs", ""));
+			.DistinctBy(v => v.Key)
+			.ToDictionary(k => k.Key, v => v.Value.Replace(".cs", ""));
+
 
 		public static readonly Dictionary<string, string> MethodNameOverrides =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*.cs", SearchOption.AllDirectories)
@@ -50,26 +28,51 @@ private static string Root
 				let c = Regex.Replace(contents, @"^.+\[DescriptorFor\(""([^ \r\n]+)""\)\].*$", "$1", RegexOptions.Singleline)
 				where !c.Contains(" ") //filter results that did not match
 				select new { Value = f.Name.Replace("Request", ""), Key = c })
-				.DistinctBy(v => v.Key)
-				.ToDictionary(k => k.Key, v => v.Value.Replace(".cs", ""));
+			.DistinctBy(v => v.Key)
+			.ToDictionary(k => k.Key, v => v.Value.Replace(".cs", ""));
 
-		public static  readonly Dictionary<string, string> KnownDescriptors =
+		public static readonly Dictionary<string, string> KnownDescriptors =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
 				let contents = File.ReadAllText(f.FullName)
 				let c = Regex.Replace(contents, @"^.+class ([^ \r\n]+Descriptor(?:<[^>\r\n]+>)?[^ \r\n]*).*$", "$1", RegexOptions.Singleline)
 				select new { Key = Regex.Replace(c, "<.*$", ""), Value = Regex.Replace(c, @"^.*?(?:(\<.+>).*?)?$", "$1") })
-				.DistinctBy(v => v.Key)
-				.OrderBy(v => v.Key)
-				.ToDictionary(k => k.Key, v => v.Value);
+			.DistinctBy(v => v.Key)
+			.OrderBy(v => v.Key)
+			.ToDictionary(k => k.Key, v => v.Value);
 
-		public static  readonly Dictionary<string, string> KnownRequests =
+		public static readonly Dictionary<string, string> KnownRequests =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
 				let contents = File.ReadAllText(f.FullName)
 				let c = Regex.Replace(contents, @"^.+interface ([^ \r\n]+Request(?:<[^>\r\n]+>)?[^ \r\n]*).*$", "$1", RegexOptions.Singleline)
 				where c.StartsWith("I") && c.Contains("Request")
 				select new { Key = Regex.Replace(c, "<.*$", ""), Value = Regex.Replace(c, @"^.*?(?:(\<.+>).*?)?$", "$1") })
-				.DistinctBy(v => v.Key)
-				.ToDictionary(k => k.Key, v => v.Value);
+			.DistinctBy(v => v.Key)
+			.ToDictionary(k => k.Key, v => v.Value);
 
+
+		public static string EsNetFolder { get; } = $@"{Root}..\..\..\src\Elasticsearch.Net\";
+		public static string LastDownloadedVersionFile { get; } = Path.Combine(Root, "last_downloaded_version.txt");
+
+		public static string NestFolder { get; } = $@"{Root}..\..\..\src\Nest\";
+		public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification\";
+		public static string ViewFolder { get; } = $@"{Root}Views\";
+
+		private static string Root
+		{
+			get
+			{
+				if (_root != null) return _root;
+
+				var directoryInfo = new DirectoryInfo(Directory.GetCurrentDirectory());
+
+				var runningAsDnx =
+					directoryInfo.Name == "ApiGenerator" &&
+					directoryInfo.Parent != null &&
+					directoryInfo.Parent.Name == "CodeGeneration";
+
+				_root = runningAsDnx ? "" : @"..\..\..\";
+				return _root;
+			}
+		}
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/CodeGenerator.cs b/src/CodeGeneration/ApiGenerator/CodeGenerator.cs
index 13fa7f633df..d20e0f9518c 100644
--- a/src/CodeGeneration/ApiGenerator/CodeGenerator.cs
+++ b/src/CodeGeneration/ApiGenerator/CodeGenerator.cs
@@ -19,7 +19,10 @@ public static string Property(string type, string name, string key, string sette
 			A(PropertyGenerator(type, name, key, setter));
 			return string.Join("\r\n\t\t", components);
 
-			void A(string s) => components.Add(s);
+			void A(string s)
+			{
+				components.Add(s);
+			}
 		}
 
 		public static string Constructor(Constructor c)
@@ -32,9 +35,12 @@ public static string Constructor(Constructor c)
 			if (!c.Body.IsNullOrEmpty()) A(c.Body);
 			if (!c.AdditionalCode.IsNullOrEmpty()) A(c.AdditionalCode);
 			return string.Join("\r\n\t\t", components);
-			void A(string s) => components.Add(s);
-		}
 
+			void A(string s)
+			{
+				components.Add(s);
+			}
+		}
 
 
 		private static IEnumerable<string> RenderDocumentation(params string[] doc)
@@ -44,24 +50,30 @@ private static IEnumerable<string> RenderDocumentation(params string[] doc)
 			{
 				case 0: yield break;
 				case 1:
-					yield return ($"///<summary>{doc[0]}</summary>");
+					yield return $"///<summary>{doc[0]}</summary>";
+
 					yield break;
 				default:
 					yield return "///<summary>";
+
 					foreach (var d in doc) yield return $"/// {d}";
+
 					yield return "///</summary>";
+
 					yield break;
 			}
 		}
+
 		private static string[] WrapDocumentation(string documentation)
 		{
 			const int max = 140;
-			var lines = documentation.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries);
+			var lines = documentation.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
 			var charCount = 0;
 			return lines.GroupBy(Wrap).Select(l => string.Join(" ", l.ToArray())).ToArray();
+
 			int Wrap(string w)
 			{
-				var increase = (charCount % max + w.Length + 1 >= max ? max - (charCount % max) : 0);
+				var increase = charCount % max + w.Length + 1 >= max ? max - charCount % max : 0;
 				return (charCount += increase + w.Length + 1) / max;
 			}
 		}
diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs
index 1deabb99138..c6bf3bd1a81 100644
--- a/src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs
+++ b/src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using ApiGenerator.Overrides;
 using ApiGenerator.Overrides.Descriptors;
-using CsQuery.ExtensionMethods.Internal;
 
 namespace ApiGenerator.Domain
 {
@@ -12,6 +10,23 @@ public class RawDispatchInfo
 	{
 		public CsharpMethod CsharpMethod { get; set; }
 
+		public string IfCheck
+		{
+			get
+			{
+				var parts = CsharpMethod.Parts.Where(p => p.Name != "body").ToList();
+				if (!parts.Any()) return string.Empty;
+
+				var allPartsAreRequired = parts.Any() && parts.All(p => p.Required);
+				var call = allPartsAreRequired ? "AllSetNoFallback" : "AllSet";
+				var assignments = parts
+					.Select(p => $"p.RouteValues.{p.Name.ToPascalCase()}")
+					.ToList();
+
+				return $"{call}({string.Join(", ", assignments)})";
+			}
+		}
+
 		public IEnumerable<string> MethodArguments
 		{
 			get
@@ -31,86 +46,17 @@ public IEnumerable<string> MethodArguments
 								return $"p.RouteValues.{p.Name.ToPascalCase()}";
 						}
 					})
-					.Concat(new[] {"p.RequestParameters"});
+					.Concat(new[] { "p.RequestParameters" });
 				return methodArgs;
 			}
 		}
-
-		public string IfCheck
-		{
-			get
-			{
-				var parts = this.CsharpMethod.Parts.Where(p => p.Name != "body").ToList();
-				if (!parts.Any()) return string.Empty;
-
-				var allPartsAreRequired = parts.Any() && parts.All(p => p.Required);
-				var call = allPartsAreRequired ? "AllSetNoFallback" : "AllSet";
-				var assignments = parts
-					.Select(p => $"p.RouteValues.{p.Name.ToPascalCase()}")
-					.ToList();
-
-				return $"{call}({string.Join(", ", assignments)})";
-			}
-		}
 	}
 
 	public class ApiEndpoint
 	{
 		private List<CsharpMethod> _csharpMethods;
-
-		public string RestSpecName { get; set; }
-		public string CsharpMethodName { get; set; }
-		public string Documentation { get; set; }
-		public IEnumerable<string> Methods { get; set; }
-		public IDictionary<string, string> RemovedMethods { get; set; } = new Dictionary<string, string>();
-		public ApiUrl Url { get; set; }
 		public ApiBody Body { get; set; }
-
-		public string PascalCase(string s)
-		{
-			return ApiGenerator.PascalCase(s);
-		}
-
-		public IEnumerable<CsharpMethod> GetCsharpMethods()
-		{
-			//we distinct by here to catch aliased endpoints like:
-			//  /_cluster/nodes/hotthreads and /_nodes/hotthreads
-			return this.CsharpMethods.ToList()
-				.DistinctBy(m => m.ReturnType + "--" + m.FullName + "--" + m.Arguments
-				);
-		}
-
-		public IDictionary<string, IEnumerable<RawDispatchInfo>> RawDispatches
-		{
-			get
-			{
-				return this.GetCsharpMethods()
-					.GroupBy(p => p.HttpMethod)
-					.ToDictionary(kv => kv.Key, kv => kv
-						.DistinctBy(m => m.Path)
-						.OrderByDescending(m => m.Parts.Count())
-						.Select(m =>
-							new RawDispatchInfo
-							{
-								CsharpMethod = m,
-							}
-						)
-					);
-			}
-		}
-
-		public string OptionallyAppendHttpMethod(IEnumerable<string> availableMethods, string currentHttpMethod)
-		{
-			if (availableMethods.Count() == 1)
-				return string.Empty;
-			if (availableMethods.Count() == 2 && availableMethods.Contains("GET"))
-			{
-				//if on operation has two endpoints and one of them is GET always favor the other as default
-				return currentHttpMethod == "GET" ? "Get" : string.Empty;
-			}
-
-			return availableMethods.First() == currentHttpMethod ? string.Empty : this.PascalCase(currentHttpMethod);
-		}
+		public string CsharpMethodName { get; set; }
 
 		public IEnumerable<CsharpMethod> CsharpMethods
 		{
@@ -120,28 +66,29 @@ public IEnumerable<CsharpMethod> CsharpMethods
 				{
 					foreach (var csharpMethod in _csharpMethods)
 						yield return csharpMethod;
+
 					yield break;
 				}
 
 				// enumerate once and cache
 				_csharpMethods = new List<CsharpMethod>();
 
-				this.PatchEndpoint();
+				PatchEndpoint();
 
-				var methods = new Dictionary<string, string>(this.RemovedMethods);
-				foreach (var method in this.Methods) methods.Add(method, null);
+				var methods = new Dictionary<string, string>(RemovedMethods);
+				foreach (var method in Methods) methods.Add(method, null);
 				foreach (var kv in methods)
 				{
 					var method = kv.Key;
 					var obsoleteVersion = kv.Value;
-					var methodName = this.CsharpMethodName + this.OptionallyAppendHttpMethod(methods.Keys, method);
+					var methodName = CsharpMethodName + OptionallyAppendHttpMethod(methods.Keys, method);
 					//the distinctby here catches aliases routes i.e
 					//  /_cluster/nodes/{node_id}/hotthreads vs  /_cluster/nodes/{node_id}/hot_threads
-					foreach (var path in this.Url.Paths.DistinctBy(p => p.Replace("_", "")))
+					foreach (var path in Url.Paths.DistinctBy(p => p.Replace("_", "")))
 					{
-						var parts = (this.Url.Parts ?? new Dictionary<string, ApiUrlPart>())
+						var parts = (Url.Parts ?? new Dictionary<string, ApiUrlPart>())
 							.Where(p => path.Contains("{" + p.Key + "}"))
-							.OrderBy(p => path.IndexOf("{" + p.Key, System.StringComparison.Ordinal))
+							.OrderBy(p => path.IndexOf("{" + p.Key, StringComparison.Ordinal))
 							.Select(p =>
 							{
 								p.Value.Name = p.Key;
@@ -152,20 +99,15 @@ public IEnumerable<CsharpMethod> CsharpMethods
 						var args = parts.Select(p => p.Argument);
 
 						//.NET does not allow get requests to have a body payload.
-						if (method != "GET" && this.Body != null)
-						{
+						if (method != "GET" && Body != null)
 							parts.Add(new ApiUrlPart
 							{
 								Name = "body",
 								Type = "PostData",
-								Description = this.Body.Description
+								Description = Body.Description
 							});
-						}
-						if (this.Url.Params == null || !this.Url.Params.Any())
-						{
-							this.Url.Params = new Dictionary<string, ApiQueryParameters>();
-						}
-						var queryStringParamName = this.CsharpMethodName + "RequestParameters";
+						if (Url.Params == null || !Url.Params.Any()) Url.Params = new Dictionary<string, ApiQueryParameters>();
+						var queryStringParamName = CsharpMethodName + "RequestParameters";
 						var apiMethod = new CsharpMethod
 						{
 							QueryStringParamName = queryStringParamName,
@@ -175,11 +117,11 @@ public IEnumerable<CsharpMethod> CsharpMethods
 							ReturnDescription = "",
 							FullName = methodName,
 							HttpMethod = method,
-							Documentation = this.Documentation,
+							Documentation = Documentation,
 							ObsoleteMethodVersion = obsoleteVersion,
 							Path = path,
 							Parts = parts,
-							Url = this.Url
+							Url = Url
 						};
 						PatchMethod(apiMethod);
 
@@ -206,27 +148,62 @@ public IEnumerable<CsharpMethod> CsharpMethods
 							ReturnDescription = "",
 							FullName = methodName + "Async",
 							HttpMethod = method,
-							Documentation = this.Documentation,
+							Documentation = Documentation,
 							ObsoleteMethodVersion = obsoleteVersion,
 							Arguments = string.Join(", ", args),
 							Path = path,
 							Parts = parts,
-							Url = this.Url
+							Url = Url
 						};
 						PatchMethod(apiMethod);
 						_csharpMethods.Add(apiMethod);
 						yield return apiMethod;
-
 					}
 				}
 			}
 		}
 
+		public string Documentation { get; set; }
+		public IEnumerable<string> Methods { get; set; }
+
+		public IDictionary<string, IEnumerable<RawDispatchInfo>> RawDispatches => GetCsharpMethods()
+			.GroupBy(p => p.HttpMethod)
+			.ToDictionary(kv => kv.Key, kv => kv
+				.DistinctBy(m => m.Path)
+				.OrderByDescending(m => m.Parts.Count())
+				.Select(m =>
+					new RawDispatchInfo
+					{
+						CsharpMethod = m,
+					}
+				)
+			);
+
+		public IDictionary<string, string> RemovedMethods { get; set; } = new Dictionary<string, string>();
+
+		public string RestSpecName { get; set; }
+		public ApiUrl Url { get; set; }
+
+		public string PascalCase(string s) => ApiGenerator.PascalCase(s);
+
+		public IEnumerable<CsharpMethod> GetCsharpMethods() => CsharpMethods.ToList()
+			.DistinctBy(m => m.ReturnType + "--" + m.FullName + "--" + m.Arguments
+			);
+
+		public string OptionallyAppendHttpMethod(IEnumerable<string> availableMethods, string currentHttpMethod)
+		{
+			if (availableMethods.Count() == 1)
+				return string.Empty;
+			if (availableMethods.Count() == 2 && availableMethods.Contains("GET")) return currentHttpMethod == "GET" ? "Get" : string.Empty;
+
+			return availableMethods.First() == currentHttpMethod ? string.Empty : PascalCase(currentHttpMethod);
+		}
+
 
 		private IEndpointOverrides GetOverrides()
 		{
-			var method = this.CsharpMethodName;
-			if (CodeConfiguration.ApiNameMapping.TryGetValue(this.RestSpecName, out var mapsApiMethodName))
+			var method = CsharpMethodName;
+			if (CodeConfiguration.ApiNameMapping.TryGetValue(RestSpecName, out var mapsApiMethodName))
 				method = mapsApiMethodName;
 			else if (CodeConfiguration.MethodNameOverrides.TryGetValue(method, out var manualOverride))
 				method = manualOverride;
@@ -235,51 +212,47 @@ private IEndpointOverrides GetOverrides()
 			var type = CodeConfiguration.Assembly.GetType(typeName);
 			if (type != null && Activator.CreateInstance(type) is IEndpointOverrides overrides)
 				return overrides;
+
 			return null;
 		}
 
 
 		private void PatchEndpoint()
 		{
-			var overrides = this.GetOverrides();
+			var overrides = GetOverrides();
 			PatchRequestParameters(overrides);
 
 			//rename the {metric} route param to something more specific on XpackWatcherStats
 			// TODO: find a better place to do this
-			if (this.CsharpMethodName == "XpackWatcherStats")
+			if (CsharpMethodName == "XpackWatcherStats")
 			{
-				var metric = this.Url.Parts.First(p => p.Key == "metric");
+				var metric = Url.Parts.First(p => p.Key == "metric");
 
 				var apiUrlPart = metric.Value;
 				apiUrlPart.Name = "watcher_stats_metric";
 
-				if (this.Url.Parts.Remove("metric"))
-				{
-					this.Url.Parts.Add("watcher_stats_metric", apiUrlPart);
-				}
+				if (Url.Parts.Remove("metric")) Url.Parts.Add("watcher_stats_metric", apiUrlPart);
 
-				this.Url.Path = RenameMetricUrlPathParam(this.Url.Path);
-				this.Url.Paths = this.Url.Paths.Select(RenameMetricUrlPathParam);
+				Url.Path = RenameMetricUrlPathParam(Url.Path);
+				Url.Paths = Url.Paths.Select(RenameMetricUrlPathParam);
 			}
 		}
 
 
 		private void PatchRequestParameters(IEndpointOverrides overrides)
 		{
-			var newParams = ApiQueryParametersPatcher.Patch(this.Url.Path, this.Url.Params, overrides);
-			this.Url.Params = newParams;
+			var newParams = ApiQueryParametersPatcher.Patch(Url.Path, Url.Params, overrides);
+			Url.Params = newParams;
 		}
 
-		private static string RenameMetricUrlPathParam(string path)
-		{
-			return path.Replace("{metric}", "{watcher_stats_metric}");
-		}
+		private static string RenameMetricUrlPathParam(string path) => path.Replace("{metric}", "{watcher_stats_metric}");
 
 		//Patches a method name for the exceptions (IndicesStats needs better unique names for all the url endpoints)
 		//or to get rid of double verbs in an method name i,e ClusterGetSettingsGet > ClusterGetSettings
 		public void PatchMethod(CsharpMethod method)
 		{
 			if (method == null) return;
+
 			Func<string, bool> ms = s => method.FullName.StartsWith(s);
 			Func<string, bool> pc = s => method.Path.Contains(s);
 
@@ -294,10 +267,10 @@ public void PatchMethod(CsharpMethod method)
 			method.FullName =
 				Regex.Replace(method.FullName, m, a => a.Index != method.FullName.IndexOf(m, StringComparison.Ordinal) ? "" : m);
 
-			method = this.GetOverrides()?.PatchMethod(method) ?? method;
+			method = GetOverrides()?.PatchMethod(method) ?? method;
 
 			var key = method.QueryStringParamName.Replace("RequestParameters", "");
-			if (CodeConfiguration.ApiNameMapping.TryGetValue(this.RestSpecName, out var mapsApiMethodName))
+			if (CodeConfiguration.ApiNameMapping.TryGetValue(RestSpecName, out var mapsApiMethodName))
 				method.QueryStringParamName = mapsApiMethodName + "RequestParameters";
 			else if (CodeConfiguration.MethodNameOverrides.TryGetValue(key, out var manualOverride))
 				method.QueryStringParamName = manualOverride + "RequestParameters";
@@ -311,7 +284,6 @@ public void PatchMethod(CsharpMethod method)
 			if (CodeConfiguration.KnownDescriptors.TryGetValue(method.DescriptorType, out var generic))
 				method.DescriptorTypeGeneric = generic;
 			else method.Unmapped = true;
-
 		}
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParameters.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParameters.cs
index ad45d5e6ca9..19652fff1b2 100644
--- a/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParameters.cs
+++ b/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParameters.cs
@@ -1,73 +1,111 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using CsQuery.ExtensionMethods.Internal;
 
 namespace ApiGenerator.Domain
 {
 	public class ApiQueryParameters
 	{
-		public string QueryStringKey { get; set; }
+		private static readonly string[] FieldsParams = { "fields", "_source_include", "_source_exclude" };
 
-		public bool RenderPartial { get; set; }
+		public string ClsArgumentName => ClsName.ToCamelCase();
 
 		public string ClsName { get; set; }
 
+		public string Description { get; set; }
+
+		public IEnumerable<string> DescriptionHighLevel
+		{
+			get
+			{
+				switch (QueryStringKey)
+				{
+					case "routing":
+						yield return "A document is routed to a particular shard in an index using the following formula";
+						yield return "<para> shard_num = hash(_routing) % num_primary_shards</para>";
+						yield return "<para>Elasticsearch will use the document id if not provided. </para>";
+						yield return "<para>For requests that are constructed from/for a document NEST will automatically infer the routing key";
+						yield return
+							"if that document has a <see cref=\"Nest.JoinField\" /> or a routing mapping on for its type exists on <see cref=\"Nest.ConnectionSettings\" /></para> ";
+
+						yield break;
+					case "_source":
+						yield return "Whether the _source should be included in the response.";
+
+						yield break;
+					case "filter_path":
+						yield return Description;
+						yield return "<para>Use of response filtering can result in a response from Elasticsearch ";
+						yield return "that cannot be correctly deserialized to the respective response type for the request. ";
+						yield return "In such situations, use the low level client to issue the request and handle response deserialization</para>";
+
+						yield break;
+					default:
+						yield return Description;
+
+						yield break;
+				}
+			}
+		}
+
+		public string DescriptorArgumentType =>
+			Type == "list" && TypeHighLevel.EndsWith("[]") ? "params " + TypeHighLevel : TypeHighLevel;
+
+		public Func<string, string, string, string, string> FluentGenerator { get; set; }
+		public bool IsFieldParam => TypeHighLevel == "Field";
+
+		public bool IsFieldsParam => TypeHighLevel == "Fields";
+
 		public string Obsolete { get; set; }
 
 		public IEnumerable<string> Options { get; set; }
+		public string QueryStringKey { get; set; }
+
+		public bool RenderPartial { get; set; }
+		public string SetterHighLevel => "value";
+
+		public string SetterLowLevel => "value";
 
 		public string Type { get; set; }
 
-		private static readonly string[] FieldsParams = {"fields", "_source_include", "_source_exclude"};
 		public string TypeHighLevel
 		{
 			get
 			{
-				if (this.QueryStringKey == "routing") return "Routing";
-				var isFields = FieldsParams.Contains(this.QueryStringKey) || this.QueryStringKey.EndsWith("_fields");
+				if (QueryStringKey == "routing") return "Routing";
+
+				var isFields = FieldsParams.Contains(QueryStringKey) || QueryStringKey.EndsWith("_fields");
 
-				var csharpType = this.TypeLowLevel;
+				var csharpType = TypeLowLevel;
 				switch (csharpType)
 				{
 					case "TimeSpan": return "Time";
 				}
 
-				switch (this.Type)
+				switch (Type)
 				{
 					case "list" when isFields:
 					case "string" when isFields: return "Fields";
-					case "string" when this.QueryStringKey.Contains("field"): return "Field";
+					case "string" when QueryStringKey.Contains("field"): return "Field";
 					default:
 						return csharpType;
 				}
 			}
 		}
 
-		public string ClsArgumentName => this.ClsName.ToCamelCase();
-		public string DescriptorArgumentType =>
-			this.Type == "list" && this.TypeHighLevel.EndsWith("[]") ? "params " + this.TypeHighLevel : TypeHighLevel;
-		public string SetterHighLevel => "value";
-
-		public string SetterLowLevel => "value";
-
-		public bool IsFieldsParam => this.TypeHighLevel == "Fields";
-		public bool IsFieldParam => this.TypeHighLevel == "Field";
-
 		public string TypeLowLevel
 		{
 			get
 			{
-				switch (this.Type)
+				switch (Type)
 				{
 					case "boolean": return "bool?";
 					case "list": return "string[]";
 					case "integer": return "int?";
 					case "date": return "DateTimeOffset?";
-					case "enum": return $"{this.ClsName}?";
+					case "enum": return $"{ClsName}?";
 					case "number":
-						return new[] {"boost", "percen", "score"}.Any(s => this.QueryStringKey.ToLowerInvariant().Contains(s))
+						return new[] { "boost", "percen", "score" }.Any(s => QueryStringKey.ToLowerInvariant().Contains(s))
 							? "double?"
 							: "long?";
 					case "duration":
@@ -78,45 +116,12 @@ public string TypeLowLevel
 					case null:
 						return "string";
 					default:
-						return this.Type;
-				}
-			}
-		}
-
-		public string Description { get; set; }
-		public IEnumerable<string> DescriptionHighLevel
-		{
-			get
-			{
-				switch (this.QueryStringKey)
-				{
-					case "routing":
-						yield return "A document is routed to a particular shard in an index using the following formula";
-						yield return "<para> shard_num = hash(_routing) % num_primary_shards</para>";
-						yield return "<para>Elasticsearch will use the document id if not provided. </para>";
-						yield return "<para>For requests that are constructed from/for a document NEST will automatically infer the routing key";
-						yield return
-							"if that document has a <see cref=\"Nest.JoinField\" /> or a routing mapping on for its type exists on <see cref=\"Nest.ConnectionSettings\" /></para> ";
-						yield break;
-					case "_source":
-						yield return "Whether the _source should be included in the response.";
-						yield break;
-					case "filter_path":
-						yield return this.Description;
-						yield return "<para>Use of response filtering can result in a response from Elasticsearch ";
-						yield return "that cannot be correctly deserialized to the respective response type for the request. ";
-						yield return "In such situations, use the low level client to issue the request and handle response deserialization</para>";
-						yield break;
-					default:
-						yield return this.Description;
-						yield break;
+						return Type;
 				}
 			}
 		}
 
 		public string InitializerGenerator(string type, string name, string key, string setter, params string[] doc) =>
-			CodeGenerator.Property(type, name, key, setter, this.Obsolete, doc);
-
-		public Func<string, string, string, string, string> FluentGenerator { get; set; }
+			CodeGenerator.Property(type, name, key, setter, Obsolete, doc);
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs
index e97f4fc1989..50e773dcac4 100644
--- a/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs
+++ b/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs
@@ -8,12 +8,12 @@ namespace ApiGenerator.Domain
 {
 	public static class ApiQueryParametersPatcher
 	{
-
 		public static Dictionary<string, ApiQueryParameters> Patch(
 			string urlPath,
 			IDictionary<string, ApiQueryParameters> source,
 			IEndpointOverrides overrides,
-			bool checkCommon = true)
+			bool checkCommon = true
+		)
 		{
 			if (source == null) return null;
 
@@ -54,14 +54,13 @@ public static Dictionary<string, ApiQueryParameters> Patch(
 			}
 
 			return patchedParams;
-
 		}
 
 		private static string CreateCSharpName(string queryStringKey)
 		{
 			if (string.IsNullOrWhiteSpace(queryStringKey)) return "UNKNOWN";
 
-            var cased = queryStringKey.ToPascalCase();
+			var cased = queryStringKey.ToPascalCase();
 			switch (cased)
 			{
 				case "Type":
@@ -81,7 +80,8 @@ private static IList<string> CreatePartialList(IEndpointOverrides global, IEndpo
 			CreateList(global, local, "partial", e => e.RenderPartial, declaredKeys);
 
 		private static IDictionary<string, string> CreateLookup(IEndpointOverrides global, IEndpointOverrides local, string type,
-			Func<IEndpointOverrides, IDictionary<string, string>> @from, ICollection<string> declaredKeys)
+			Func<IEndpointOverrides, IDictionary<string, string>> @from, ICollection<string> declaredKeys
+		)
 		{
 			var d = new Dictionary<string, string>();
 			foreach (var kv in from(global)) d[kv.Key] = kv.Value;
@@ -99,7 +99,8 @@ private static IDictionary<string, string> CreateLookup(IEndpointOverrides globa
 		}
 
 		private static IList<string> CreateList(IEndpointOverrides global, IEndpointOverrides local, string type,
-			Func<IEndpointOverrides, IEnumerable<string>> @from, ICollection<string> declaredKeys)
+			Func<IEndpointOverrides, IEnumerable<string>> @from, ICollection<string> declaredKeys
+		)
 		{
 			var list = new List<string>();
 			if (global != null) list.AddRange(from(global));
@@ -115,12 +116,13 @@ private static IList<string> CreateList(IEndpointOverrides global, IEndpointOver
 		}
 
 		private static IDictionary<string, string> CreateRenameLookup(IEndpointOverrides global, IEndpointOverrides local,
-			ICollection<string> declaredKeys) =>
+			ICollection<string> declaredKeys
+		) =>
 			CreateLookup(global, local, "rename", e => e.RenameQueryStringParams, declaredKeys);
 
 		private static IDictionary<string, string> CreateObsoleteLookup(IEndpointOverrides global, IEndpointOverrides local,
-			ICollection<string> declaredKeys) =>
+			ICollection<string> declaredKeys
+		) =>
 			CreateLookup(global, local, "obsolete", e => e.ObsoleteQueryStringParams, declaredKeys);
-
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiUrl.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiUrl.cs
index 787b0adaa4a..b837d6fb6c5 100644
--- a/src/CodeGeneration/ApiGenerator/Domain/ApiUrl.cs
+++ b/src/CodeGeneration/ApiGenerator/Domain/ApiUrl.cs
@@ -10,21 +10,20 @@ public class ApiUrl
 		//allowing these will cause too many overloads being generated which helps noone
 		public static readonly string[] BlackListRouteValues = { "{search_groups}", "{indexing_types}", "{body}", "{scroll_id}" };
 		private IEnumerable<string> _paths;
+		public IDictionary<string, ApiQueryParameters> Params { get; set; }
+
+		public IDictionary<string, ApiUrlPart> Parts { get; set; }
 
 		public string Path { get; set; }
 
 		public IEnumerable<string> Paths
 		{
 			get => _paths?.Where(p => !BlackListRouteValues.Any(p.Contains))
-				       .ToList() ?? _paths;
-			set => _paths = this.EnsureBackslash(value);
+				.ToList() ?? _paths;
+			set => _paths = EnsureBackslash(value);
 		}
 
 		public IList<string> EnsureBackslash(IEnumerable<string> paths) =>
 			paths?.Select(p => p.StartsWith("/") ? p : $"/{p}").ToList();
-
-		public IDictionary<string, ApiUrlPart> Parts { get; set; }
-		public IDictionary<string, ApiQueryParameters> Params { get; set; }
-
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiUrlPart.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiUrlPart.cs
index 09f33a8c48b..dcdfd1bfbce 100644
--- a/src/CodeGeneration/ApiGenerator/Domain/ApiUrlPart.cs
+++ b/src/CodeGeneration/ApiGenerator/Domain/ApiUrlPart.cs
@@ -1,28 +1,30 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace ApiGenerator.Domain
 {
 	public class ApiUrlPart
 	{
-		public string Name { get; set; }
-		public string Type { get; set; }
-
-
 		private string _description;
-		public string Description
-		{
-			get => _description;
-			set => _description = CleanUpDescription(value);
-		}
-		public bool Required { get; set; }
-		public IEnumerable<string> Options { get; set; }
 
-
-		private string CleanUpDescription(string value)
+		public string Argument
 		{
-			if (string.IsNullOrWhiteSpace(value)) return value;
-			return value.Replace("use `_all` or empty string", "use the special string `_all` or Indices.All");
+			get
+			{
+				switch (Type)
+				{
+					case "int":
+					case "string":
+						return Type + " " + Name;
+					case "list":
+						return "string " + Name;
+					case "enum":
+						return ApiGenerator.PascalCase(Name) + " " + Name;
+					case "number":
+						return "string " + Name;
+					default:
+						return Type + " " + Name;
+				}
+			}
 		}
 
 		public string ClrTypeName
@@ -31,26 +33,26 @@ public string ClrTypeName
 			{
 				if (ClrTypeNameOverride != null) return ClrTypeNameOverride;
 
-				switch(this.Name)
+				switch (Name)
 				{
 					case "index":
 					case "new_index":
-						return this.Type == "string" ? "IndexName" : "Indices";
+						return Type == "string" ? "IndexName" : "Indices";
 					case "target":
 						return "IndexName";
-					case "type": return this.Type == "string" ? "TypeName" : "Types";
+					case "type": return Type == "string" ? "TypeName" : "Types";
 					case "watch_id":
 					case "job_id":
 					case "datafeed_id":
 					case "snapshot_id":
 					case "filter_id":
-					case "id": return this.Type == "string" ? "Id" : "Ids";
+					case "id": return Type == "string" ? "Id" : "Ids";
 					case "category_id": return "CategoryId";
 					case "nodes":
-					case "node_id": return this.Type == "string" ? "NodeId" : "NodeIds";
-					case "scroll_id": return this.Type == "string" ? "ScrollId" : "ScrollIds";
+					case "node_id": return Type == "string" ? "NodeId" : "NodeIds";
+					case "scroll_id": return Type == "string" ? "ScrollId" : "ScrollIds";
 					case "field":
-					case "fields": return this.Type == "string" ? "Field" : "Fields";
+					case "fields": return Type == "string" ? "Field" : "Fields";
 					case "index_metric": return "IndexMetrics";
 					case "metric":
 					case "watcher_stats_metric":
@@ -68,48 +70,46 @@ public string ClrTypeName
 					case "context":
 					case "name":
 					case "thread_pool_patterns":
-						return this.Type == "string" ? "Name" : "Names";
+						return Type == "string" ? "Name" : "Names";
 					case "parent_task_id":
 					case "task_id": return "TaskId";
 					case "timestamp": return "Timestamp";
-					default: return this.Type + "_";
+					default: return Type + "_";
 				}
 			}
 		}
 
 		public string ClrTypeNameOverride { get; set; }
 
+		public string Description
+		{
+			get => _description;
+			set => _description = CleanUpDescription(value);
+		}
+
 		public string InterfaceName
 		{
 			get
 			{
-				switch(this.Name)
+				switch (Name)
 				{
 					case "repository": return "RepositoryName";
-					default: return this.Name.ToPascalCase();
+					default: return Name.ToPascalCase();
 				}
 			}
 		}
 
-		public string Argument
+		public string Name { get; set; }
+		public IEnumerable<string> Options { get; set; }
+		public bool Required { get; set; }
+		public string Type { get; set; }
+
+
+		private string CleanUpDescription(string value)
 		{
-			get
-			{
-				switch (this.Type)
-				{
-					case "int":
-					case "string":
-						return this.Type + " " + this.Name;
-					case "list":
-						return "string " + this.Name;
-					case "enum":
-						return ApiGenerator.PascalCase(this.Name) + " " + this.Name;
-					case "number":
-						return "string " + this.Name;
-					default:
-						return this.Type + " " + this.Name;
-				}
-			}
+			if (string.IsNullOrWhiteSpace(value)) return value;
+
+			return value.Replace("use `_all` or empty string", "use the special string `_all` or Indices.All");
 		}
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/Domain/Constructor.cs b/src/CodeGeneration/ApiGenerator/Domain/Constructor.cs
index a540ac5b4c0..c4b1faf4892 100644
--- a/src/CodeGeneration/ApiGenerator/Domain/Constructor.cs
+++ b/src/CodeGeneration/ApiGenerator/Domain/Constructor.cs
@@ -1,14 +1,12 @@
-using CsQuery.ExtensionMethods.Internal;
-
-namespace ApiGenerator.Domain
+namespace ApiGenerator.Domain
 {
 	public class Constructor
 	{
-		public string Generated { get; set; }
+		public string AdditionalCode { get; set; } = string.Empty;
 		public string Body { get; set; }
-		public string Url { get; set; }
 		public string Description { get; set; }
-		public string AdditionalCode { get; set; } = string.Empty;
+		public string Generated { get; set; }
+		public string Url { get; set; }
 	}
 
 	public class FluentRouteSetter
diff --git a/src/CodeGeneration/ApiGenerator/Domain/CsharpMethod.cs b/src/CodeGeneration/ApiGenerator/Domain/CsharpMethod.cs
index cf3c777e02c..8ecd82d79cb 100644
--- a/src/CodeGeneration/ApiGenerator/Domain/CsharpMethod.cs
+++ b/src/CodeGeneration/ApiGenerator/Domain/CsharpMethod.cs
@@ -8,60 +8,74 @@ namespace ApiGenerator.Domain
 {
 	public class CsharpMethod
 	{
-		public string ReturnType { get; set; }
-		public string ReturnTypeGeneric { get; set; }
+		public IEnumerable<ApiUrlPart> AllParts =>
+			(Url?.Parts?.Values ?? Enumerable.Empty<ApiUrlPart>()).Where(p => !string.IsNullOrWhiteSpace(p.Name));
+
+		public string Arguments { get; set; }
 		public string CallTypeGeneric { get; set; }
-		public string ReturnDescription { get; set; }
-		public string FullName { get; set; }
-		public string QueryStringParamName { get; set; }
 		public string DescriptorType { get; set; }
 		public string DescriptorTypeGeneric { get; set; }
-		public string RequestType { get; set; }
-		public string ObsoleteMethodVersion { get; set; }
+		public string Documentation { get; set; }
+		public string FullName { get; set; }
+		public string HttpMethod { get; set; }
 
-		public string InterfaceType => "I" + (this.RequestTypeGeneric == "" || this.RequestTypeGeneric == "<T>" ? this.RequestType : this.RequestType + this.RequestTypeGeneric);
+		public bool IndicesAndTypes => AllParts.Count() == 2 && AllParts.All(p => p.Type == "list")
+			&& AllParts.All(p => new[] { "index", "type" }.Contains(p.Name));
+
+		public string InterfaceType =>
+			"I" + (RequestTypeGeneric == "" || RequestTypeGeneric == "<T>" ? RequestType : RequestType + RequestTypeGeneric);
+
+		public bool IsDocumentPath => AllParts.Count() == 3 && AllParts.All(p => p.Type != "list")
+			&& AllParts.All(p => new[] { "index", "type", "id" }.Contains(p.Name));
+
+		public bool IsDocumentRequest => IsDocumentPath && Url.Params.ContainsKey("routing");
+		public string ObsoleteMethodVersion { get; set; }
+		public IEnumerable<ApiUrlPart> Parts { get; set; }
+		public string Path { get; set; }
+		public string QueryStringParamName { get; set; }
+		public string RequestType { get; set; }
 
 		public string RequestTypeGeneric { get; set; }
 		public bool RequestTypeUnmapped { get; set; }
-		public string HttpMethod { get; set; }
-		public string Documentation { get; set; }
-		public string Path { get; set; }
-		public string Arguments { get; set; }
+		public string ReturnDescription { get; set; }
+		public string ReturnType { get; set; }
+		public string ReturnTypeGeneric { get; set; }
+
+		public bool SkipInterface { get; set; }
 		public bool Unmapped { get; set; }
-		public IEnumerable<ApiUrlPart> Parts { get; set; }
 		public ApiUrl Url { get; set; }
 
-		public bool SkipInterface { get; set; }
+		private bool IsPartless => Url.Parts == null || !Url.Parts.Any();
+		private bool IsScroll => Url.Parts.All(p => p.Key == "scroll_id");
+
+		private string MetricPrefix => RequestType.Replace("Request", "");
 
-		public static CsharpMethod Clone(CsharpMethod method)
+		public static CsharpMethod Clone(CsharpMethod method) => new CsharpMethod
 		{
-			return new CsharpMethod
-			{
-				Path = method.Path,
-				RequestType = method.RequestType,
-				ReturnDescription = method.ReturnDescription,
-				Arguments = method.Arguments,
-				CallTypeGeneric = method.CallTypeGeneric,
-				DescriptorType = method.DescriptorType,
-				DescriptorTypeGeneric = method.DescriptorTypeGeneric,
-				Documentation = method.Documentation,
-				FullName = method.FullName,
-				HttpMethod = method.HttpMethod,
-				Parts = method.Parts,
-				QueryStringParamName = method.QueryStringParamName,
-				RequestTypeGeneric = method.RequestTypeGeneric,
-				RequestTypeUnmapped = method.RequestTypeUnmapped,
-				ReturnType = method.ReturnType,
-				ReturnTypeGeneric = method.ReturnTypeGeneric,
-				Unmapped = method.Unmapped,
-				Url = method.Url,
-				SkipInterface = method.SkipInterface
-			};
-		}
+			Path = method.Path,
+			RequestType = method.RequestType,
+			ReturnDescription = method.ReturnDescription,
+			Arguments = method.Arguments,
+			CallTypeGeneric = method.CallTypeGeneric,
+			DescriptorType = method.DescriptorType,
+			DescriptorTypeGeneric = method.DescriptorTypeGeneric,
+			Documentation = method.Documentation,
+			FullName = method.FullName,
+			HttpMethod = method.HttpMethod,
+			Parts = method.Parts,
+			QueryStringParamName = method.QueryStringParamName,
+			RequestTypeGeneric = method.RequestTypeGeneric,
+			RequestTypeUnmapped = method.RequestTypeUnmapped,
+			ReturnType = method.ReturnType,
+			ReturnTypeGeneric = method.ReturnTypeGeneric,
+			Unmapped = method.Unmapped,
+			Url = method.Url,
+			SkipInterface = method.SkipInterface
+		};
 
-		private string MetricPrefix => this.RequestType.Replace("Request", "");
 		private string ClrParamType(string clrType) => clrType.EndsWith("Metrics", StringComparison.OrdinalIgnoreCase)
-			? this.MetricPrefix + clrType.Replace("Metrics", "Metric") : clrType;
+			? MetricPrefix + clrType.Replace("Metrics", "Metric")
+			: clrType;
 
 		public IEnumerable<Constructor> RequestConstructors()
 		{
@@ -73,10 +87,10 @@ public IEnumerable<Constructor> RequestConstructors()
 			// Scroll ids should always be passed as part of the request body and enforced via manual ctors
 			if (IsScroll) return ctors;
 
-			var m = this.RequestType;
-			foreach (var url in this.Url.Paths)
+			var m = RequestType;
+			foreach (var url in Url.Paths)
 			{
-				var urlRouteParameters = this.Url.Parts
+				var urlRouteParameters = Url.Parts
 					.Where(p => !ApiUrl.BlackListRouteValues.Contains(p.Key))
 					.Where(p => url.Contains($"{{{p.Value.Name}}}"))
 					.OrderBy(kv => url.IndexOf($"{{{kv.Value.Name}}}", StringComparison.Ordinal));
@@ -93,7 +107,6 @@ public IEnumerable<Constructor> RequestConstructors()
 				}
 
 				if (urlRouteParameters.Any())
-				{
 					routing = "r=>r." + string.Join(".", urlRouteParameters
 						.Select(p => new
 						{
@@ -106,26 +119,25 @@ public IEnumerable<Constructor> RequestConstructors()
 									: p.Key
 						})
 						.Select(p => $"{p.call}(\"{p.route}\", {p.v})")
-						);
-				}
+					);
 
 				var doc = $@"///<summary>{url}</summary>";
 				if (urlRouteParameters.Any())
-				{
-					doc += "\r\n\t\t" + string.Join("\r\n\t\t", urlRouteParameters.Select(p => $"///<param name=\"{p.Key}\">{(p.Value.Required ? "this parameter is required" : "Optional, accepts null")}</param>"));
-				}
+					doc += "\r\n\t\t" + string.Join("\r\n\t\t",
+						urlRouteParameters.Select(p =>
+							$"///<param name=\"{p.Key}\">{(p.Value.Required ? "this parameter is required" : "Optional, accepts null")}</param>"));
 				var generated = $"public {m}({par}) : base({routing})";
 
 				// special case SearchRequest<T> to pass the type of T as the type, when only the index is specified.
-				if ((m == "SearchRequest") && urlRouteParameters.Count() == 1 && !string.IsNullOrEmpty(this.RequestTypeGeneric))
+				if (m == "SearchRequest" && urlRouteParameters.Count() == 1 && !string.IsNullOrEmpty(RequestTypeGeneric))
 				{
-					var generic = this.RequestTypeGeneric.Replace("<", "").Replace(">", "");
+					var generic = RequestTypeGeneric.Replace("<", "").Replace(">", "");
 					generated = $"public {m}({par}) : this({urlRouteParameters.First().Key}, typeof({generic}))";
 				}
 
-				if (string.IsNullOrEmpty(par) && !string.IsNullOrEmpty(this.RequestTypeGeneric))
+				if (string.IsNullOrEmpty(par) && !string.IsNullOrEmpty(RequestTypeGeneric))
 				{
-					var generic = this.RequestTypeGeneric.Replace("<", "").Replace(">", "");
+					var generic = RequestTypeGeneric.Replace("<", "").Replace(">", "");
 					doc = AppendToSummary(doc, ". Will infer the index from the generic type");
 					generated = $"public {m}({par}) : this(typeof({generic}))";
 				}
@@ -134,22 +146,24 @@ public IEnumerable<Constructor> RequestConstructors()
 				{
 					Generated = generated,
 					Description = doc,
-					Body = this.IsDocumentRequest ? $" => Q(\"routing\", new Routing(() => AutoRouteDocument()));" : string.Empty
+					Body = IsDocumentRequest ? $" => Q(\"routing\", new Routing(() => AutoRouteDocument()));" : string.Empty
 				};
 
 				ctors.Add(c);
 			}
-			if (IsDocumentPath && !string.IsNullOrEmpty(this.RequestTypeGeneric))
+			if (IsDocumentPath && !string.IsNullOrEmpty(RequestTypeGeneric))
 			{
-				var documentPathGeneric = Regex.Replace(this.DescriptorTypeGeneric, @"^<?([^\s,>]+).*$", "$1");
-				var doc = $"/// <summary>{this.Url.Path}</summary>";
-				doc += "\r\n\t\t" + $"///<param name=\"document\"> describes an elasticsearch document of type <typeparamref name=\"{documentPathGeneric}\"/> from which the index, type and id can be inferred</param>";
-				var documentRoute = "r=>r.Required(\"index\", index ?? document.Self.Index).Required(\"type\", type ?? document.Self.Type).Required(\"id\", id ?? document.Self.Id)";
+				var documentPathGeneric = Regex.Replace(DescriptorTypeGeneric, @"^<?([^\s,>]+).*$", "$1");
+				var doc = $"/// <summary>{Url.Path}</summary>";
+				doc += "\r\n\t\t"
+					+ $"///<param name=\"document\"> describes an elasticsearch document of type <typeparamref name=\"{documentPathGeneric}\"/> from which the index, type and id can be inferred</param>";
+				var documentRoute =
+					"r=>r.Required(\"index\", index ?? document.Self.Index).Required(\"type\", type ?? document.Self.Type).Required(\"id\", id ?? document.Self.Id)";
 				var documentFromPath = $"partial void DocumentFromPath({documentPathGeneric} document);";
 
 				var constructor = $"DocumentPath<{documentPathGeneric}> document, IndexName index = null, TypeName type = null, Id id = null";
 
-				var autoRoute = this.IsDocumentRequest ? "Q(\"routing\", new Routing(() => AutoRouteDocument() ?? document.Document));" : string.Empty;
+				var autoRoute = IsDocumentRequest ? "Q(\"routing\", new Routing(() => AutoRouteDocument() ?? document.Document));" : string.Empty;
 				var body = $"{{ this.DocumentFromPath(document.Document); {autoRoute} }}";
 
 				var c = new Constructor
@@ -166,21 +180,22 @@ public IEnumerable<Constructor> RequestConstructors()
 
 		private void ParameterlessIndicesTypesConstructor(List<Constructor> ctors, string m)
 		{
-			var generic = this.RequestTypeGeneric?.Replace("<", "").Replace(">", "");
+			var generic = RequestTypeGeneric?.Replace("<", "").Replace(">", "");
 			string doc;
 			Constructor c;
 			if (string.IsNullOrEmpty(generic))
 			{
-				doc = $@"/// <summary>{this.Url.Path}</summary>";
+				doc = $@"/// <summary>{Url.Path}</summary>";
 				c = new Constructor { Generated = $"public {m}()", Description = doc };
 			}
 			else
 			{
-				doc = $"///<summary>{this.Url.Path}<para><typeparamref name=\"{generic}\"/> describes an elasticsearch document type from which the index, type and id can be inferred</para></summary>";
+				doc =
+					$"///<summary>{Url.Path}<para><typeparamref name=\"{generic}\"/> describes an elasticsearch document type from which the index, type and id can be inferred</para></summary>";
 				c = new Constructor { Generated = $"public {m}() : this(typeof({generic}), typeof({generic}))", Description = doc, };
 			}
 
-			c.Body = this.IsDocumentRequest ? $"Q(\"routing\", new Routing(() => AutoRouteDocument()));" : string.Empty;
+			c.Body = IsDocumentRequest ? $"Q(\"routing\", new Routing(() => AutoRouteDocument()));" : string.Empty;
 			ctors.Add(c);
 		}
 
@@ -188,10 +203,11 @@ public IEnumerable<Constructor> DescriptorConstructors()
 		{
 			var ctors = new List<Constructor>();
 			if (IsPartless) return ctors;
-			var m = this.DescriptorType;
-			foreach (var url in this.Url.Paths)
+
+			var m = DescriptorType;
+			foreach (var url in Url.Paths)
 			{
-				var requiredUrlRouteParameters = this.Url.Parts
+				var requiredUrlRouteParameters = Url.Parts
 					.Where(p => !ApiUrl.BlackListRouteValues.Contains(p.Key))
 					.Where(p => p.Value.Required)
 					.Where(p => url.Contains($"{{{p.Value.Name}}}"))
@@ -221,23 +237,23 @@ public IEnumerable<Constructor> DescriptorConstructors()
 					);
 				var doc = $@"/// <summary>{url}</summary>";
 				if (requiredUrlRouteParameters.Any())
-				{
-					doc += "\r\n\t\t" + string.Join("\r\n\t\t", requiredUrlRouteParameters.Select(p => $"///<param name=\"{p.Key}\"> this parameter is required</param>"));
-				}
+					doc += "\r\n\t\t" + string.Join("\r\n\t\t",
+						requiredUrlRouteParameters.Select(p => $"///<param name=\"{p.Key}\"> this parameter is required</param>"));
 
 				var generated = $"public {m}({par}) : base({routing})";
-				var body = this.IsDocumentRequest ? $"Q(\"routing\", new Routing(() => AutoRouteDocument()));" : string.Empty;
+				var body = IsDocumentRequest ? $"Q(\"routing\", new Routing(() => AutoRouteDocument()));" : string.Empty;
 
 				// Add typeof(T) as the default type when only index specified
-				if ((m == "DeleteByQueryDescriptor" || m == "UpdateByQueryDescriptor") && requiredUrlRouteParameters.Count() == 1 && !string.IsNullOrEmpty(this.RequestTypeGeneric))
+				if ((m == "DeleteByQueryDescriptor" || m == "UpdateByQueryDescriptor") && requiredUrlRouteParameters.Count() == 1
+					&& !string.IsNullOrEmpty(RequestTypeGeneric))
 				{
-					var generic = this.RequestTypeGeneric.Replace("<", "").Replace(">", "");
+					var generic = RequestTypeGeneric.Replace("<", "").Replace(">", "");
 					generated = $"public {m}({par}) : base({routing}.Required(\"type\", (Types)typeof({generic})))";
 				}
 
-				if ((m == "SearchShardsDescriptor") && !string.IsNullOrEmpty(this.RequestTypeGeneric))
+				if (m == "SearchShardsDescriptor" && !string.IsNullOrEmpty(RequestTypeGeneric))
 				{
-					var generic = this.RequestTypeGeneric.Replace("<", "").Replace(">", "");
+					var generic = RequestTypeGeneric.Replace("<", "").Replace(">", "");
 					doc = AppendToSummary(doc, ". Will infer the index from the generic type");
 					generated = $"public {m}({par}) : base(r => r.Optional(\"index\", (Indices)typeof({generic})))";
 				}
@@ -255,18 +271,20 @@ public IEnumerable<Constructor> DescriptorConstructors()
 				{
 					Generated = generated,
 					Description = doc,
-					Body = (!body.IsNullOrEmpty() && !body.StartsWith("{")) ? ("=> " + body) : body
+					Body = !body.IsNullOrEmpty() && !body.StartsWith("{") ? "=> " + body : body
 				};
 				ctors.Add(c);
 			}
-			if (IsDocumentPath && !string.IsNullOrEmpty(this.DescriptorTypeGeneric))
+			if (IsDocumentPath && !string.IsNullOrEmpty(DescriptorTypeGeneric))
 			{
-				var documentPathGeneric = Regex.Replace(this.DescriptorTypeGeneric, @"^<?([^\s,>]+).*$", "$1");
-				var doc = $"/// <summary>{this.Url.Path}</summary>";
-				doc += "\r\n\t\t" + $"///<param name=\"document\"> describes an elasticsearch document of type <typeparamref name=\"{documentPathGeneric}\"/> from which the index, type and id can be inferred</param>";
-				var documentRoute = "r=>r.Required(\"index\", document.Self.Index).Required(\"type\", document.Self.Type).Required(\"id\", document.Self.Id)";
+				var documentPathGeneric = Regex.Replace(DescriptorTypeGeneric, @"^<?([^\s,>]+).*$", "$1");
+				var doc = $"/// <summary>{Url.Path}</summary>";
+				doc += "\r\n\t\t"
+					+ $"///<param name=\"document\"> describes an elasticsearch document of type <typeparamref name=\"{documentPathGeneric}\"/> from which the index, type and id can be inferred</param>";
+				var documentRoute =
+					"r=>r.Required(\"index\", document.Self.Index).Required(\"type\", document.Self.Type).Required(\"id\", document.Self.Id)";
 				var documentFromPath = $"partial void DocumentFromPath({documentPathGeneric} document);";
-				var autoRoute = this.IsDocumentRequest ? $"Q(\"routing\", new Routing(() => AutoRouteDocument() ?? document.Document));" : string.Empty;
+				var autoRoute = IsDocumentRequest ? $"Q(\"routing\", new Routing(() => AutoRouteDocument() ?? document.Document));" : string.Empty;
 				var c = new Constructor
 				{
 					AdditionalCode = documentFromPath,
@@ -283,13 +301,13 @@ public IEnumerable<Constructor> DescriptorConstructors()
 
 		private void AddParameterlessIndicesTypesConstructor(List<Constructor> ctors, string m)
 		{
-			var generic = this.DescriptorTypeGeneric?.Replace("<", "").Replace(">", "");
-			var doc = $@"/// <summary>{this.Url.Path}</summary>";
+			var generic = DescriptorTypeGeneric?.Replace("<", "").Replace(">", "");
+			var doc = $@"/// <summary>{Url.Path}</summary>";
 			var documentRoute = $"r=> r.Required(\"index\", (Indices)typeof({generic})).Required(\"type\", (Types)typeof({generic}))";
 			var c = new Constructor { Generated = $"public {m}() : base({documentRoute})", Description = doc };
 			if (string.IsNullOrEmpty(generic))
 				c = new Constructor { Generated = $"public {m}()", Description = doc };
-			c.Body = this.IsDocumentRequest ? $" => Q(\"routing\", new Routing(() => AutoRouteDocument()));" : string.Empty;
+			c.Body = IsDocumentRequest ? $" => Q(\"routing\", new Routing(() => AutoRouteDocument()));" : string.Empty;
 			ctors.Add(c);
 		}
 
@@ -297,13 +315,14 @@ public IEnumerable<FluentRouteSetter> GetFluentRouteSetters()
 		{
 			var setters = new List<FluentRouteSetter>();
 			if (IsPartless) return setters;
+
 			var alwaysGenerate = new[] { "index", "type" };
-			var parts = this.Url.Parts
+			var parts = Url.Parts
 				.Where(p => !ApiUrl.BlackListRouteValues.Contains(p.Key))
 				.Where(p => !p.Value.Required || alwaysGenerate.Contains(p.Key))
 				.Where(p => !string.IsNullOrEmpty(p.Value.Name))
 				.ToList();
-			var returnType = this.DescriptorType + this.DescriptorTypeGeneric;
+			var returnType = DescriptorType + DescriptorTypeGeneric;
 			foreach (var part in parts)
 			{
 				var p = part.Value;
@@ -319,7 +338,8 @@ public IEnumerable<FluentRouteSetter> GetFluentRouteSetters()
 				if (paramName == "metric" || paramName == "watcherStatsMetric") routeValue = "(Metrics)" + paramName;
 				else if (paramName == "indexMetric") routeValue = "(IndexMetrics)indexMetric";
 
-				var code = $"public {returnType} {p.InterfaceName}({ClrParamType(p.ClrTypeName)} {paramName}) => Assign(a=>a.RouteValues.{routeSetter}(\"{p.Name}\", {routeValue}));";
+				var code =
+					$"public {returnType} {p.InterfaceName}({ClrParamType(p.ClrTypeName)} {paramName}) => Assign(a=>a.RouteValues.{routeSetter}(\"{p.Name}\", {routeValue}));";
 				var xmlDoc = $"///<summary>{p.Description}</summary>";
 				setters.Add(new FluentRouteSetter { Code = code, XmlDoc = xmlDoc });
 				if (paramName == "index" || paramName == "type")
@@ -352,19 +372,9 @@ public IEnumerable<FluentRouteSetter> GetFluentRouteSetters()
 			return setters;
 		}
 
-		private string AppendToSummary(string doc, string toAppend)
-		{
-			return Regex.Replace(
-						doc,
-						@"^(\/\/\/ <summary>)(.*?)(<\/summary>)(.*)",
-						"$1$2" + toAppend + "$3$4");
-		}
-
-		private bool IsPartless => this.Url.Parts == null || !this.Url.Parts.Any();
-		private bool IsScroll => this.Url.Parts.All(p => p.Key == "scroll_id");
-		public bool IndicesAndTypes => AllParts.Count() == 2 && AllParts.All(p => p.Type == "list") && AllParts.All(p => new[] { "index", "type" }.Contains(p.Name));
-		public bool IsDocumentPath => AllParts.Count() == 3 && AllParts.All(p => p.Type != "list") && AllParts.All(p => new[] { "index", "type", "id" }.Contains(p.Name));
-		public bool IsDocumentRequest => this.IsDocumentPath && this.Url.Params.ContainsKey("routing");
-		public IEnumerable<ApiUrlPart> AllParts => (this.Url?.Parts?.Values ?? Enumerable.Empty<ApiUrlPart>()).Where(p => !string.IsNullOrWhiteSpace(p.Name));
+		private string AppendToSummary(string doc, string toAppend) => Regex.Replace(
+			doc,
+			@"^(\/\/\/ <summary>)(.*?)(<\/summary>)(.*)",
+			"$1$2" + toAppend + "$3$4");
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs b/src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs
index af98365f6b7..442e9b96ba8 100644
--- a/src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs
+++ b/src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs
@@ -14,16 +14,38 @@ public class RestApiSpec
 		private IEnumerable<EnumDescription> _enumDescriptions;
 
 		public string Commit { get; set; }
-		public IDictionary<string, ApiEndpoint> Endpoints { get; set; }
 
 		public static Dictionary<string, ApiQueryParameters> CommonApiQueryParameters { get; set; }
 
+
+		public IEnumerable<CsharpMethod> CsharpMethodsWithQueryStringInfo =>
+			(from u in Endpoints.Values.SelectMany(v => v.CsharpMethods)
+				where u.QueryStringParamName != "FluentQueryString"
+				select u).GroupBy(m => m.QueryStringParamName)
+			.Select(g =>
+			{
+				if (g.Count() == 1) return g.First();
+
+				return g.OrderBy(v =>
+					{
+						switch (v.HttpMethod.ToUpper())
+						{
+							case "GET": return 1;
+							default: return 0;
+						}
+					})
+					.First();
+			});
+
+		public IDictionary<string, ApiEndpoint> Endpoints { get; set; }
+
 		public IEnumerable<EnumDescription> EnumsInTheSpec
 		{
 			get
 			{
 				if (_enumDescriptions != null) return _enumDescriptions;
-				var queryParamEnums = from m in this.CsharpMethodsWithQueryStringInfo.SelectMany(m => m.Url.Params)
+
+				var queryParamEnums = from m in CsharpMethodsWithQueryStringInfo.SelectMany(m => m.Url.Params)
 					where m.Value.Type == "enum"
 					select new EnumDescription
 					{
@@ -31,7 +53,7 @@ public IEnumerable<EnumDescription> EnumsInTheSpec
 						Options = m.Value.Options
 					};
 
-				var urlParamEnums = from data in this.Endpoints.Values
+				var urlParamEnums = from data in Endpoints.Values
 						.SelectMany(v => v.CsharpMethods.Select(m => new { m, n = v.CsharpMethodName }))
 						.SelectMany(m => m.m.Parts.Select(part => new { m = m.n, p = part }))
 					let p = data.p
@@ -50,24 +72,6 @@ public IEnumerable<EnumDescription> EnumsInTheSpec
 
 				return _enumDescriptions;
 			}
-
 		}
-
-
-		public IEnumerable<CsharpMethod> CsharpMethodsWithQueryStringInfo =>
-			(from u in this.Endpoints.Values.SelectMany(v => v.CsharpMethods)
-			where u.QueryStringParamName != "FluentQueryString"
-			select u).GroupBy(m => m.QueryStringParamName).Select(g =>
-		{
-			if (g.Count() == 1) return g.First();
-			return g.OrderBy(v =>
-			{
-				switch (v.HttpMethod.ToUpper())
-				{
-					case "GET": return 1;
-					default: return 0;
-				}
-			}).First();
-		});
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/Extensions.cs b/src/CodeGeneration/ApiGenerator/Extensions.cs
index d5d450eb9b1..3cc1a179650 100644
--- a/src/CodeGeneration/ApiGenerator/Extensions.cs
+++ b/src/CodeGeneration/ApiGenerator/Extensions.cs
@@ -9,18 +9,18 @@ namespace ApiGenerator
 {
 	public static class Extensions
 	{
-		public static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Func<T, TKey> property)
-		{
-			return items.GroupBy(property).Select(x => x.First());
-		}
-
 		/// <summary>
 		/// Removes _ . but not an underscore at the start of the string, unless the string is _all or removeLeadingUnderscore == true.
 		/// </summary>
 		private static readonly Regex RemovePunctuationExceptFirstUnderScore = new Regex(@"(?!^_(?!All$))[_\.]");
+
+		public static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Func<T, TKey> property) =>
+			items.GroupBy(property).Select(x => x.First());
+
 		public static string ToPascalCase(this string s, bool removeLeadingUnderscore = false)
 		{
 			if (string.IsNullOrEmpty(s)) return s;
+
 			var textInfo = new CultureInfo("en-US").TextInfo;
 			var titleCased = textInfo.ToTitleCase(s.ToLowerInvariant());
 			var result = RemovePunctuationExceptFirstUnderScore.Replace(titleCased, "");
@@ -28,11 +28,14 @@ public static string ToPascalCase(this string s, bool removeLeadingUnderscore =
 				result = result.TrimStart('_');
 			return result;
 		}
+
 		public static string ToCamelCase(this string s)
 		{
 			if (string.IsNullOrEmpty(s)) return s;
+
 			var pascal = s.ToPascalCase(true);
 			if (pascal.Length <= 1) return pascal;
+
 			return pascal[0].ToLower() + s.Substring(1);
 		}
 	}
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/EndpointOverridesBase.cs b/src/CodeGeneration/ApiGenerator/Overrides/EndpointOverridesBase.cs
index cd79fa14a11..54055487b92 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/EndpointOverridesBase.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/EndpointOverridesBase.cs
@@ -5,15 +5,14 @@
 
 namespace ApiGenerator.Overrides
 {
-	public abstract class EndpointOverridesBase: IEndpointOverrides
+	public abstract class EndpointOverridesBase : IEndpointOverrides
 	{
-		public virtual IEnumerable<string> SkipQueryStringParams { get; } = Enumerable.Empty<string>();
-
-		public virtual IEnumerable<string> RenderPartial { get; } = Enumerable.Empty<string>();
+		public virtual IDictionary<string, string> ObsoleteQueryStringParams { get; set; } = new Dictionary<string, string>();
 
 		public virtual IDictionary<string, string> RenameQueryStringParams { get; } = new Dictionary<string, string>();
 
-		public virtual IDictionary<string, string> ObsoleteQueryStringParams { get; set; } = new Dictionary<string, string>();
+		public virtual IEnumerable<string> RenderPartial { get; } = Enumerable.Empty<string>();
+		public virtual IEnumerable<string> SkipQueryStringParams { get; } = Enumerable.Empty<string>();
 
 
 		public virtual CsharpMethod PatchMethod(CsharpMethod method) => method;
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ClearCacheOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ClearCacheOverrides.cs
index eeba987d98d..34fe76dca71 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ClearCacheOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ClearCacheOverrides.cs
@@ -5,7 +5,7 @@ namespace ApiGenerator.Overrides.Endpoints
 	// ReSharper disable once UnusedMember.Global
 	public class ClearCacheOverrides : EndpointOverridesBase
 	{
-		public override IEnumerable<string> SkipQueryStringParams => new []
+		public override IEnumerable<string> SkipQueryStringParams => new[]
 		{
 			"field_data" //this API declares both field_data and fielddata, this is the odd one out.
 		};
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ForecastJobOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ForecastJobOverrides.cs
index cd10b99de0a..7f02b557c9f 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ForecastJobOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ForecastJobOverrides.cs
@@ -10,4 +10,4 @@ public class ForecastJobOverrides : EndpointOverridesBase
 			"expires_in"
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/IndicesStatsOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/IndicesStatsOverrides.cs
index c5176ef3225..54f562ba770 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/IndicesStatsOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/IndicesStatsOverrides.cs
@@ -5,7 +5,7 @@ namespace ApiGenerator.Overrides.Endpoints
 	// ReSharper disable once UnusedMember.Global
 	public class IndicesStatsOverrides : EndpointOverridesBase
 	{
-		public override IEnumerable<string> SkipQueryStringParams => new []
+		public override IEnumerable<string> SkipQueryStringParams => new[]
 		{
 			"types"
 		};
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/MultiTermVectorsOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/MultiTermVectorsOverrides.cs
index 53dc0d4ce3b..83628f85cee 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/MultiTermVectorsOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/MultiTermVectorsOverrides.cs
@@ -5,7 +5,7 @@ namespace ApiGenerator.Overrides.Endpoints
 	// ReSharper disable once UnusedMember.Global
 	public class MultiTermVectorsOverrides : EndpointOverridesBase
 	{
-		public override IEnumerable<string> SkipQueryStringParams => new []
+		public override IEnumerable<string> SkipQueryStringParams => new[]
 		{
 			"ids"
 		};
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/NodesHotThreadsOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/NodesHotThreadsOverrides.cs
index 344f6e33d69..eabe68bea16 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/NodesHotThreadsOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/NodesHotThreadsOverrides.cs
@@ -7,7 +7,7 @@ public class NodesHotThreadsOverrides : EndpointOverridesBase
 	{
 		public override IDictionary<string, string> RenameQueryStringParams => new Dictionary<string, string>
 		{
-			{ "type", "thread_type"}
+			{ "type", "thread_type" }
 		};
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/PutIndexTemplateOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/PutIndexTemplateOverrides.cs
index abd02915a6a..0e6b40ecb12 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/PutIndexTemplateOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/PutIndexTemplateOverrides.cs
@@ -5,7 +5,7 @@ namespace ApiGenerator.Overrides.Endpoints
 	// ReSharper disable once UnusedMember.Global
 	public class PutIndexTemplateOverrides : EndpointOverridesBase
 	{
-		public override IEnumerable<string> SkipQueryStringParams => new []
+		public override IEnumerable<string> SkipQueryStringParams => new[]
 		{
 			"order"
 		};
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ScrollOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ScrollOverrides.cs
index d34c523a6e2..801004d3112 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ScrollOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/ScrollOverrides.cs
@@ -5,7 +5,7 @@ namespace ApiGenerator.Overrides.Endpoints
 	// ReSharper disable once UnusedMember.Global
 	public class ScrollOverrides : EndpointOverridesBase
 	{
-		public override IEnumerable<string> SkipQueryStringParams => new []
+		public override IEnumerable<string> SkipQueryStringParams => new[]
 		{
 			"scroll_id", "scroll"
 		};
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/SearchOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/SearchOverrides.cs
index 690db3fecb1..e6acff9afde 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/SearchOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/SearchOverrides.cs
@@ -5,7 +5,7 @@ namespace ApiGenerator.Overrides.Endpoints
 	// ReSharper disable once UnusedMember.Global
 	public class SearchOverrides : EndpointOverridesBase
 	{
-		public override IEnumerable<string> SkipQueryStringParams => new []
+		public override IEnumerable<string> SkipQueryStringParams => new[]
 		{
 			"size",
 			"from",
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/UpdateOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/UpdateOverrides.cs
index 132c347a481..29292e03795 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/UpdateOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/UpdateOverrides.cs
@@ -5,7 +5,7 @@ namespace ApiGenerator.Overrides.Endpoints
 	// ReSharper disable once UnusedMember.Global
 	public class UpdateOverrides : EndpointOverridesBase
 	{
-		public override IEnumerable<string> SkipQueryStringParams => new []
+		public override IEnumerable<string> SkipQueryStringParams => new[]
 		{
 			"fields", "_source_include", "_source_exclude"
 		};
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/GlobalOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/GlobalOverrides.cs
index b11d09cf4fe..558551ad24b 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/GlobalOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/GlobalOverrides.cs
@@ -1,42 +1,47 @@
-using System;
 using System.Collections.Generic;
-using ApiGenerator.Overrides.Descriptors;
 
 namespace ApiGenerator.Overrides
 {
 	public class GlobalOverrides : EndpointOverridesBase
 	{
-		public override IEnumerable<string> RenderPartial => new[]
+		public IDictionary<string, Dictionary<string, string>> ObsoleteEnumMembers { get; set; } = new Dictionary<string, Dictionary<string, string>>
 		{
-			"stored_fields",
-			"script_fields",
-			"docvalue_fields"
+			{
+				"NodesStatsIndexMetric",
+				new Dictionary<string, string> { { "suggest", "As of 5.0 this option always returned an empty object in the response" } }
+			},
+			{
+				"IndicesStatsMetric",
+				new Dictionary<string, string> { { "suggest", "Suggest stats have folded under the search stats, this alias will be removed" } }
+			}
 		};
-		public IDictionary<string, Dictionary<string, string>> ObsoleteEnumMembers { get; set; } = new Dictionary<string, Dictionary<string, string>>
+
+		public override IDictionary<string, string> ObsoleteQueryStringParams { get; set; } = new Dictionary<string, string>
 		{
-			{ "NodesStatsIndexMetric", new Dictionary<string, string>{{"suggest", "As of 5.0 this option always returned an empty object in the response"}}},
-			{ "IndicesStatsMetric", new Dictionary<string, string>{{"suggest", "Suggest stats have folded under the search stats, this alias will be removed"}}}
+			{ "parent", "the parent parameter has been deprecated from elasticsearch, please use routing instead directly." },
+			{ "update_all_types", "Elasticsearch 6.x only allows a single type per index so this parameter is now useless" },
+			{ "copy_settings", "Elasticsearch 6.4 will throw an exception if this is turned off see elastic/elasticsearch#30404" }
 		};
 
 		public override IDictionary<string, string> RenameQueryStringParams { get; } = new Dictionary<string, string>
 		{
-			{"_source", "source_enabled"},
-			{"_source_include", "source_include"},
-			{"_source_exclude", "source_exclude"},
-			{"docvalue_fields", "doc_value_fields"},
-			{"q", "query_on_query_string"},
+			{ "_source", "source_enabled" },
+			{ "_source_include", "source_include" },
+			{ "_source_exclude", "source_exclude" },
+			{ "docvalue_fields", "doc_value_fields" },
+			{ "q", "query_on_query_string" },
 			//make cat parameters more descriptive
-			{"h", "Headers"},
-			{"s", "sort_by_columns"},
-			{"v", "verbose"},
-			{"ts", "include_timestamp"},
+			{ "h", "Headers" },
+			{ "s", "sort_by_columns" },
+			{ "v", "verbose" },
+			{ "ts", "include_timestamp" },
 		};
 
-		public override IDictionary<string, string> ObsoleteQueryStringParams { get; set; } = new Dictionary<string, string>
+		public override IEnumerable<string> RenderPartial => new[]
 		{
-			{ "parent", "the parent parameter has been deprecated from elasticsearch, please use routing instead directly."},
-			{ "update_all_types", "Elasticsearch 6.x only allows a single type per index so this parameter is now useless"},
-			{ "copy_settings", "Elasticsearch 6.4 will throw an exception if this is turned off see elastic/elasticsearch#30404"}
+			"stored_fields",
+			"script_fields",
+			"docvalue_fields"
 		};
 
 		public override IEnumerable<string> SkipQueryStringParams { get; } = new[]
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/IEndpointOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/IEndpointOverrides.cs
index 2889a694637..70b54934306 100644
--- a/src/CodeGeneration/ApiGenerator/Overrides/IEndpointOverrides.cs
+++ b/src/CodeGeneration/ApiGenerator/Overrides/IEndpointOverrides.cs
@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using ApiGenerator.Domain;
 
 namespace ApiGenerator.Overrides.Descriptors
@@ -10,26 +9,26 @@ namespace ApiGenerator.Overrides.Descriptors
 	public interface IEndpointOverrides
 	{
 		/// <summary>
-		/// Sometimes params can be defined on the body as well as on the querystring
-		/// We favor specifying params on the body so here we can specify params we don't want on the querystring.
+		/// A map of key -> obsolete message for properties in the spec that should not be used any longer
 		/// </summary>
-		IEnumerable<string> SkipQueryStringParams { get; }
+		IDictionary<string, string> ObsoleteQueryStringParams { get; set; }
 
 		/// <summary>
-		/// Force these be rendered as interface properties only, so that they'd have to be implemented manually
-		/// and become part of the body. This only takes affect on requests that take a body (e.g not GET or HEAD).
+		/// Override how the query param name is exposed to the client.
 		/// </summary>
-		IEnumerable<string> RenderPartial { get; }
+		IDictionary<string, string> RenameQueryStringParams { get; }
 
 		/// <summary>
-		/// Override how the query param name is exposed to the client.
+		/// Force these be rendered as interface properties only, so that they'd have to be implemented manually
+		/// and become part of the body. This only takes affect on requests that take a body (e.g not GET or HEAD).
 		/// </summary>
-		IDictionary<string, string> RenameQueryStringParams { get; }
+		IEnumerable<string> RenderPartial { get; }
 
 		/// <summary>
-		/// A map of key -> obsolete message for properties in the spec that should not be used any longer
+		/// Sometimes params can be defined on the body as well as on the querystring
+		/// We favor specifying params on the body so here we can specify params we don't want on the querystring.
 		/// </summary>
-		IDictionary<string, string>  ObsoleteQueryStringParams { get; set; }
+		IEnumerable<string> SkipQueryStringParams { get; }
 
 		/// <summary>
 		/// Patch the CSharp method
diff --git a/src/CodeGeneration/ApiGenerator/Program.cs b/src/CodeGeneration/ApiGenerator/Program.cs
index d45640a127e..18793411d0a 100644
--- a/src/CodeGeneration/ApiGenerator/Program.cs
+++ b/src/CodeGeneration/ApiGenerator/Program.cs
@@ -7,10 +7,10 @@ public static class Program
 	{
 		private static readonly string DownloadBranch = "master";
 
-		static void Main(string[] args)
+		private static void Main(string[] args)
 		{
-			bool redownloadCoreSpecification = false;
-			string downloadBranch = DownloadBranch;
+			var redownloadCoreSpecification = false;
+			var downloadBranch = DownloadBranch;
 
 			var answer = "invalid";
 			while (answer != "y" && answer != "n" && answer != "")
@@ -30,9 +30,7 @@ static void Main(string[] args)
 			{
 				// read last downloaded branch from file.
 				if (File.Exists(CodeConfiguration.LastDownloadedVersionFile))
-				{
 					downloadBranch = File.ReadAllText(CodeConfiguration.LastDownloadedVersionFile);
-				}
 			}
 
 			if (string.IsNullOrEmpty(downloadBranch))
@@ -41,7 +39,8 @@ static void Main(string[] args)
 			if (redownloadCoreSpecification)
 				RestSpecDownloader.Download(downloadBranch);
 
-			ApiGenerator.Generate(downloadBranch, "Core", "Graph", "License", "Security", "Watcher", "Info", "MachineLearning", "Migration", "Sql", "Rollup");
+			ApiGenerator.Generate(downloadBranch, "Core", "Graph", "License", "Security", "Watcher", "Info", "MachineLearning", "Migration", "Sql",
+				"Rollup");
 		}
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecDownloader.cs b/src/CodeGeneration/ApiGenerator/RestSpecDownloader.cs
index b43bb6f99db..395bfa508be 100644
--- a/src/CodeGeneration/ApiGenerator/RestSpecDownloader.cs
+++ b/src/CodeGeneration/ApiGenerator/RestSpecDownloader.cs
@@ -10,21 +10,13 @@ namespace ApiGenerator
 {
 	public class RestSpecDownloader
 	{
-		public static RestSpecDownloader Download(string branch) => new RestSpecDownloader(branch);
+		private static readonly ProgressBarOptions MainProgressBarOptions = new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray };
 
 		private static readonly Dictionary<string, string> OnlineSpecifications = new Dictionary<string, string>
 		{
 			{ "Core", "https://github.com/elastic/elasticsearch/tree/{version}/rest-api-spec/src/main/resources/rest-api-spec/api" },
 		};
-		private class Specification
-		{
-			public string FolderOnDisk { get; set; }
-			public string GithubListingUrl { get; set; }
-			public string Branch { get; set; }
-			public string GithubDownloadUrl(string file) => this.GithubListingUrl.Replace("github.com", "raw.githubusercontent.com").Replace("tree/", "") + "/" + file;
-		}
 
-		private static readonly ProgressBarOptions MainProgressBarOptions = new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray };
 		private static readonly ProgressBarOptions SubProgressBarOptions = new ProgressBarOptions
 		{
 			ForegroundColor = ConsoleColor.Cyan,
@@ -54,6 +46,8 @@ private RestSpecDownloader(string branch)
 			File.WriteAllText(CodeConfiguration.LastDownloadedVersionFile, branch);
 		}
 
+		public static RestSpecDownloader Download(string branch) => new RestSpecDownloader(branch);
+
 		private void DownloadJsonDefinitions(Specification spec, IProgressBar pbar)
 		{
 			using (var client = new WebClient())
@@ -98,5 +92,15 @@ private void WriteToEndpointsFolder(string folder, string filename, string conte
 			if (!Directory.Exists(f)) Directory.CreateDirectory(f);
 			File.WriteAllText(f + "\\" + filename, contents);
 		}
+
+		private class Specification
+		{
+			public string Branch { get; set; }
+			public string FolderOnDisk { get; set; }
+			public string GithubListingUrl { get; set; }
+
+			public string GithubDownloadUrl(string file) =>
+				GithubListingUrl.Replace("github.com", "raw.githubusercontent.com").Replace("tree/", "") + "/" + file;
+		}
 	}
 }
diff --git a/src/CodeGeneration/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs b/src/CodeGeneration/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs
index 820df6e4e94..533861a42cc 100644
--- a/src/CodeGeneration/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs
+++ b/src/CodeGeneration/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs
@@ -1,20 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
 using AsciiDocNet;
-using DocGenerator.Walkers;
 using DocGenerator.XmlDocs;
 using Elasticsearch.Net;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
 using Nest;
 using NuDoq;
 using Container = AsciiDocNet.Container;
@@ -29,15 +23,15 @@ namespace DocGenerator.AsciiDoc
 	/// </summary>
 	public class GeneratedAsciidocVisitor : NoopVisitor
 	{
-		private static readonly Dictionary<string,string> Ids = new Dictionary<string, string>();
-
-		private readonly FileInfo _source;
+		private static readonly Dictionary<string, string> Ids = new Dictionary<string, string>();
 		private readonly FileInfo _destination;
 		private readonly Dictionary<string, Project> _projects;
-		private int _topSectionTitleLevel;
+
+		private readonly FileInfo _source;
 		private Document _document;
 		private Document _newDocument;
 		private bool _topLevel = true;
+		private int _topSectionTitleLevel;
 
 		public GeneratedAsciidocVisitor(FileInfo source, FileInfo destination, Dictionary<string, Project> projects)
 		{
@@ -61,35 +55,22 @@ public override void VisitDocument(Document document)
 				DocType = document.DocType
 			};
 
-			foreach (var authorInfo in document.Authors)
-			{
-				_newDocument.Authors.Add(authorInfo);
-			}
+			foreach (var authorInfo in document.Authors) _newDocument.Authors.Add(authorInfo);
 
 			RemoveDocDirectoryAttribute(_newDocument);
 			RemoveDocDirectoryAttribute(document);
 
-			foreach (var attributeEntry in document.Attributes)
-			{
-				_newDocument.Attributes.Add(attributeEntry);
-			}
+			foreach (var attributeEntry in document.Attributes) _newDocument.Attributes.Add(attributeEntry);
 
 			if (document.Attributes.All(a => a.Name != "ref_current"))
-			{
 				_newDocument.Attributes.Add(new AttributeEntry("ref_current",
 					$"https://www.elastic.co/guide/en/elasticsearch/reference/{Program.DocVersion}"));
-			}
 
 			var github = "https://github.com/elastic/elasticsearch-net";
-			if (document.Attributes.All(a => a.Name != "github"))
-			{
-				_newDocument.Attributes.Add(new AttributeEntry("github", github));
-			}
+			if (document.Attributes.All(a => a.Name != "github")) _newDocument.Attributes.Add(new AttributeEntry("github", github));
 
 			if (document.Attributes.All(a => a.Name != "nuget"))
-			{
 				_newDocument.Attributes.Add(new AttributeEntry("nuget", "https://www.nuget.org/packages"));
-			}
 
 			var originalFile = Regex.Replace(_source.FullName.Replace("\\", "/"), @"^(.*Tests/)",
 				$"{github}/tree/{Program.BranchName}/src/Tests/Tests/");
@@ -98,15 +79,15 @@ public override void VisitDocument(Document document)
 			{
 				Style = CommentStyle.MultiLine,
 				Text = $"IMPORTANT NOTE\r\n==============\r\nThis file has been generated from {originalFile}. \r\n" +
-				       "If you wish to submit a PR for any spelling mistakes, typos or grammatical errors for this file,\r\n" +
-				       "please modify the original csharp file found at the link and submit the PR with that change. Thanks!"
+					"If you wish to submit a PR for any spelling mistakes, typos or grammatical errors for this file,\r\n" +
+					"please modify the original csharp file found at the link and submit the PR with that change. Thanks!"
 			});
 
 			_topSectionTitleLevel = _source.Directory.Name.Equals("request", StringComparison.OrdinalIgnoreCase) &&
-			                        _source.Directory.Parent != null &&
-			                        _source.Directory.Parent.Name.Equals("search", StringComparison.OrdinalIgnoreCase)
-				? 2
-				: 3;
+				_source.Directory.Parent != null &&
+				_source.Directory.Parent.Name.Equals("search", StringComparison.OrdinalIgnoreCase)
+					? 2
+					: 3;
 
 			// see if the document has some kind of top level title and add one with an anchor if not.
 			// Used to add titles to *Usage test files
@@ -118,7 +99,7 @@ public override void VisitDocument(Document document)
 				if (sectionTitle != null && sectionTitle.Level <= 3)
 					_topSectionTitleLevel = sectionTitle.Level;
 
-				if (sectionTitle == null || (sectionTitle.Level > 3))
+				if (sectionTitle == null || sectionTitle.Level > 3)
 				{
 					var id = Path.GetFileNameWithoutExtension(_destination.Name);
 					var title = id.LowercaseHyphenToPascal();
@@ -136,7 +117,7 @@ public override void VisitContainer(Container elements)
 			if (_topLevel)
 			{
 				_topLevel = false;
-				for (int index = 0; index < elements.Count; index++)
+				for (var index = 0; index < elements.Count; index++)
 				{
 					var element = elements[index];
 					var source = element as Source;
@@ -144,10 +125,7 @@ public override void VisitContainer(Container elements)
 					if (source != null)
 					{
 						// remove empty source blocks
-						if (string.IsNullOrWhiteSpace(source.Text))
-						{
-							continue;
-						}
+						if (string.IsNullOrWhiteSpace(source.Text)) continue;
 
 						var method = source.Attributes.OfType<NamedAttribute>().FirstOrDefault(a => a.Name == "method");
 						if (method == null)
@@ -176,9 +154,7 @@ public override void VisitContainer(Container elements)
 							case "queryfluent":
 							case "fluentaggs":
 								if (!LastSectionTitleMatches(text => text.StartsWith("Fluent DSL", StringComparison.OrdinalIgnoreCase)))
-								{
 									_newDocument.Add(CreateSubsectionTitle("Fluent DSL example"));
-								}
 
 								_newDocument.Add(source);
 								break;
@@ -191,9 +167,7 @@ public override void VisitContainer(Container elements)
 							case "expectresponse":
 								// Don't add the Handlng Response section title if it was the last title (it might be defined in the doc already)
 								if (!LastSectionTitleMatches(text => text.Equals("Handling responses", StringComparison.OrdinalIgnoreCase)))
-								{
 									_newDocument.Add(CreateSubsectionTitle("Handling Responses"));
-								}
 								_newDocument.Add(source);
 								break;
 							default:
@@ -202,9 +176,7 @@ public override void VisitContainer(Container elements)
 						}
 					}
 					else
-					{
 						_newDocument.Add(element);
-					}
 				}
 			}
 
@@ -216,10 +188,7 @@ public override void VisitSource(Source source)
 			// remove method attributes as the elastic doc generation doesn't like them; it
 			// expects a linenumbering in the index 2 position of a source block
 			var methodAttribute = source.Attributes.FirstOrDefault(a => a.Name == "method");
-			if (methodAttribute != null)
-			{
-				source.Attributes.Remove(methodAttribute);
-			}
+			if (methodAttribute != null) source.Attributes.Remove(methodAttribute);
 
 			// Replace tabs with spaces and remove C# comment escaping from callouts
 			// (elastic docs generation does not like this callout format)
@@ -231,13 +200,10 @@ public override void VisitSource(Source source)
 		public override void VisitSectionTitle(SectionTitle sectionTitle)
 		{
 			// Generate an anchor for all top level section titles
-			if (this._document.IndexOf(sectionTitle) == 0 && !sectionTitle.Attributes.HasAnchor)
+			if (_document.IndexOf(sectionTitle) == 0 && !sectionTitle.Attributes.HasAnchor)
 			{
 				var builder = new StringBuilder();
-				using (var writer = new AsciiDocVisitor(new StringWriter(builder)))
-				{
-					writer.VisitInlineContainer(sectionTitle);
-				}
+				using (var writer = new AsciiDocVisitor(new StringWriter(builder))) writer.VisitInlineContainer(sectionTitle);
 
 				var title = builder.ToString().PascalToHyphen();
 				sectionTitle.Attributes.Add(new Anchor(title));
@@ -248,9 +214,7 @@ public override void VisitSectionTitle(SectionTitle sectionTitle)
 				// Check for duplicate ids across documents
 				var key = sectionTitle.Attributes.Anchor.Id;
 				if (Ids.TryGetValue(key, out var existingFile))
-				{
 					throw new Exception($"duplicate id {key} in {_destination.FullName}. Id already exists in {existingFile}");
-				}
 
 				Ids.Add(key, _destination.FullName);
 			}
@@ -261,6 +225,7 @@ public override void VisitSectionTitle(SectionTitle sectionTitle)
 		public override void VisitAttributeEntry(AttributeEntry attributeEntry)
 		{
 			if (attributeEntry.Name != "xml-docs") return;
+
 			//true when running from the IDE, build/output might have not been created
 			string configuration = null;
 			if (Program.BuildOutputPath.Contains("src"))
@@ -274,6 +239,7 @@ string XmlFile(string project)
 			{
 				if (configuration == null)
 					return Path.Combine(Program.BuildOutputPath, project, "netstandard2.0", $"{project}.XML");
+
 				return Path.Combine(Program.BuildOutputPath, project, "bin", configuration, "netstandard2.0",
 					$"{project}.XML");
 			}
@@ -328,10 +294,7 @@ string XmlFile(string project)
 							diagnostic.Severity == DiagnosticSeverity.Error);
 
 						var builder = new StringBuilder($"Unable to emit compilation for: {assemblyName}");
-						foreach (var diagnostic in failures)
-						{
-							builder.AppendLine($"{diagnostic.Id}: {diagnostic.GetMessage()}");
-						}
+						foreach (var diagnostic in failures) builder.AppendLine($"{diagnostic.Id}: {diagnostic.GetMessage()}");
 
 						builder.AppendLine(new string('-', 30));
 
@@ -348,10 +311,7 @@ string XmlFile(string project)
 			if (visitor.LabeledListItems.Any())
 			{
 				var labeledList = new LabeledList();
-				foreach (var item in visitor.LabeledListItems.OrderBy(l => l.Label))
-				{
-					labeledList.Items.Add(item);
-				}
+				foreach (var item in visitor.LabeledListItems.OrderBy(l => l.Label)) labeledList.Items.Add(item);
 
 				_newDocument.Insert(_newDocument.IndexOf(attributeEntry), labeledList);
 			}
@@ -360,10 +320,7 @@ string XmlFile(string project)
 		private void RemoveDocDirectoryAttribute(Document document)
 		{
 			var directoryAttribute = document.Attributes.FirstOrDefault(a => a.Name == "docdir");
-			if (directoryAttribute != null)
-			{
-				document.Attributes.Remove(directoryAttribute);
-			}
+			if (directoryAttribute != null) document.Attributes.Remove(directoryAttribute);
 		}
 
 		private bool LastSectionTitleMatches(Func<string, bool> predicate)
@@ -372,10 +329,7 @@ private bool LastSectionTitleMatches(Func<string, bool> predicate)
 			if (lastSectionTitle != null && lastSectionTitle.Level == _topSectionTitleLevel + 1)
 			{
 				var builder = new StringBuilder();
-				using (var visitor = new AsciiDocVisitor(new StringWriter(builder)))
-				{
-					visitor.VisitInlineContainer(lastSectionTitle);
-				}
+				using (var visitor = new AsciiDocVisitor(new StringWriter(builder))) visitor.VisitInlineContainer(lastSectionTitle);
 
 				return predicate(builder.ToString());
 			}
diff --git a/src/CodeGeneration/DocGenerator/AsciiDoc/RawAsciidocVisitor.cs b/src/CodeGeneration/DocGenerator/AsciiDoc/RawAsciidocVisitor.cs
index bbd6ed51c01..31be614a28f 100644
--- a/src/CodeGeneration/DocGenerator/AsciiDoc/RawAsciidocVisitor.cs
+++ b/src/CodeGeneration/DocGenerator/AsciiDoc/RawAsciidocVisitor.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -12,8 +11,8 @@ namespace DocGenerator.AsciiDoc
 	/// </summary>
 	public class RawAsciidocVisitor : NoopVisitor
 	{
-		private readonly FileInfo _source;
 		private readonly FileInfo _destination;
+		private readonly FileInfo _source;
 		private Document _document;
 
 		public RawAsciidocVisitor(FileInfo source, FileInfo destination)
@@ -27,10 +26,7 @@ public override void VisitDocument(Document document)
 			_document = document;
 
 			var directoryAttribute = document.Attributes.FirstOrDefault(a => a.Name == "docdir");
-			if (directoryAttribute != null)
-			{
-				document.Attributes.Remove(directoryAttribute);
-			}
+			if (directoryAttribute != null) document.Attributes.Remove(directoryAttribute);
 
 			var github = "https://github.com/elastic/elasticsearch-net";
 			var originalFile = Regex.Replace(_source.FullName.Replace("\\", "/"), @"^(.*Tests/)", $"{github}/tree/master/src/Tests/Tests/");
@@ -38,8 +34,8 @@ public override void VisitDocument(Document document)
 			{
 				Style = CommentStyle.MultiLine,
 				Text = $"IMPORTANT NOTE\r\n==============\r\nThis file has been generated from {originalFile}. \r\n" +
-					   "If you wish to submit a PR for any spelling mistakes, typos or grammatical errors for this file,\r\n" +
-					   "please modify the original csharp file found at the link and submit the PR with that change. Thanks!"
+					"If you wish to submit a PR for any spelling mistakes, typos or grammatical errors for this file,\r\n" +
+					"please modify the original csharp file found at the link and submit the PR with that change. Thanks!"
 			});
 
 			base.VisitDocument(document);
@@ -56,7 +52,8 @@ public override void VisitAttributeEntry(AttributeEntry attributeEntry)
 
 				foreach (var directory in directories)
 				{
-					foreach (var file in Directory.EnumerateFiles(Path.Combine(Program.OutputDirPath, directory), "*.asciidoc", SearchOption.AllDirectories))
+					foreach (var file in Directory.EnumerateFiles(Path.Combine(Program.OutputDirPath, directory), "*.asciidoc",
+						SearchOption.AllDirectories))
 					{
 						var fileInfo = new FileInfo(file);
 						var referencedFileUri = new Uri(fileInfo.FullName);
@@ -69,12 +66,9 @@ public override void VisitAttributeEntry(AttributeEntry attributeEntry)
 							++counter;
 						}
 						else
-						{
 							_document.Add(include);
-						}
 					}
 				}
-
 			}
 			else if (attributeEntry.Name == "anchor-list")
 			{
@@ -84,7 +78,8 @@ public override void VisitAttributeEntry(AttributeEntry attributeEntry)
 
 				foreach (var directory in directories)
 				{
-					foreach (var file in Directory.EnumerateFiles(Path.Combine(Program.OutputDirPath, directory), "*.asciidoc", SearchOption.AllDirectories))
+					foreach (var file in Directory.EnumerateFiles(Path.Combine(Program.OutputDirPath, directory), "*.asciidoc",
+						SearchOption.AllDirectories))
 					{
 						var fileInfo = new FileInfo(file);
 						var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileInfo.Name);
@@ -97,13 +92,9 @@ public override void VisitAttributeEntry(AttributeEntry attributeEntry)
 				}
 
 				if (attributeEntry.Parent != null)
-				{
 					attributeEntry.Parent.Insert(attributeEntry.Parent.IndexOf(attributeEntry) + 1, list);
-				}
 				else
-				{
 					_document.Add(list);
-				}
 			}
 
 			base.VisitAttributeEntry(attributeEntry);
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/AnalyzerManager.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/AnalyzerManager.cs
index 9ac58dbc13e..0a1b44035d1 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/AnalyzerManager.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/AnalyzerManager.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
@@ -34,131 +36,114 @@
 
 namespace DocGenerator.Buildalyzer
 {
- public class AnalyzerManager
-    {
-        private readonly Dictionary<string, ProjectAnalyzer> _projects = new Dictionary<string, ProjectAnalyzer>();
-
-        public IReadOnlyDictionary<string, ProjectAnalyzer> Projects => _projects;
-
-        internal ILogger<ProjectAnalyzer> ProjectLogger { get; }
-
-        internal LoggerVerbosity LoggerVerbosity { get; }
-
-        public string SolutionDirectory { get; }
-
-        public AnalyzerManager(ILoggerFactory loggerFactory = null, LoggerVerbosity loggerVerbosity = LoggerVerbosity.Normal)
-            : this(null, null, loggerFactory, loggerVerbosity)
-        {
-        }
-
-        public AnalyzerManager(TextWriter logWriter, LoggerVerbosity loggerVerbosity = LoggerVerbosity.Normal)
-            : this(null, logWriter, loggerVerbosity)
-        {
-        }
-
-        public AnalyzerManager(string solutionFilePath, string[] projects, ILoggerFactory loggerFactory = null, LoggerVerbosity loggerVerbosity = LoggerVerbosity.Normal)
-        {
-            LoggerVerbosity = loggerVerbosity;
-            ProjectLogger = loggerFactory?.CreateLogger<ProjectAnalyzer>();
-
-            if (solutionFilePath != null)
-            {
-                solutionFilePath = ValidatePath(solutionFilePath, true);
-                SolutionDirectory = Path.GetDirectoryName(solutionFilePath);
-                GetProjectsInSolution(solutionFilePath, projects);
-            }
-        }
-
-        public AnalyzerManager(string solutionFilePath, TextWriter logWriter, LoggerVerbosity loggerVerbosity = LoggerVerbosity.Normal)
-        {
-            LoggerVerbosity = loggerVerbosity;
-            if (logWriter != null)
-            {
-                LoggerFactory loggerFactory = new LoggerFactory();
-                loggerFactory.AddProvider(new TextWriterLoggerProvider(logWriter));
-                ProjectLogger = loggerFactory.CreateLogger<ProjectAnalyzer>();
-            }
-
-            if (solutionFilePath != null)
-            {
-                solutionFilePath = ValidatePath(solutionFilePath, true);
-                SolutionDirectory = Path.GetDirectoryName(solutionFilePath);
-                GetProjectsInSolution(solutionFilePath);
-            }
-        }
-
-        private void GetProjectsInSolution(string solutionFilePath, string[] projects = null)
-        {
-	        projects = projects ?? new string[] { };
-            var supportedType = new[]
-            {
-                SolutionProjectType.KnownToBeMSBuildFormat,
-                SolutionProjectType.WebProject
-            };
-
-            SolutionFile solution = SolutionFile.Parse(solutionFilePath);
-            foreach(ProjectInSolution project in solution.ProjectsInOrder)
-            {
-                if (!supportedType.Contains(project.ProjectType)) continue;
-	            if (projects.Length > 0 && !projects.Contains(project.ProjectName)) continue;
-                GetProject(project.AbsolutePath);
-            }
-        }
-
-        public ProjectAnalyzer GetProject(string projectFilePath)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-
-            // Normalize as .sln uses backslash regardless of OS the sln is created on
-            projectFilePath = projectFilePath.Replace('\\', Path.DirectorySeparatorChar);
-            projectFilePath = ValidatePath(projectFilePath, true);
-            if (_projects.TryGetValue(projectFilePath, out ProjectAnalyzer project))
-            {
-                return project;
-            }
-            project = new ProjectAnalyzer(this, projectFilePath);
-            _projects.Add(projectFilePath, project);
-            return project;
-        }
-
-        public ProjectAnalyzer GetProject(string projectFilePath, XDocument projectDocument)
-        {
-            if (projectFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(projectFilePath));
-            }
-            if (projectDocument == null)
-            {
-                throw new ArgumentNullException(nameof(projectDocument));
-            }
-
-            // Normalize as .sln uses backslash regardless of OS the sln is created on
-            projectFilePath = projectFilePath.Replace('\\', Path.DirectorySeparatorChar);
-            projectFilePath = ValidatePath(projectFilePath, false);
-            if (_projects.TryGetValue(projectFilePath, out ProjectAnalyzer project))
-            {
-                return project;
-            }
-            project = new ProjectAnalyzer(this, projectFilePath, projectDocument);
-            _projects.Add(projectFilePath, project);
-            return project;
-        }
-
-        private static string ValidatePath(string path, bool checkExists)
-        {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-            path = Path.GetFullPath(path); // Normalize the path
-            if (checkExists && !File.Exists(path))
-            {
-                throw new ArgumentException($"The path {path} could not be found.");
-            }
-            return path;
-        }
-    }
+	public class AnalyzerManager
+	{
+		private readonly Dictionary<string, ProjectAnalyzer> _projects = new Dictionary<string, ProjectAnalyzer>();
+
+		public AnalyzerManager(ILoggerFactory loggerFactory = null, LoggerVerbosity loggerVerbosity = LoggerVerbosity.Normal)
+			: this(null, null, loggerFactory, loggerVerbosity) { }
+
+		public AnalyzerManager(TextWriter logWriter, LoggerVerbosity loggerVerbosity = LoggerVerbosity.Normal)
+			: this(null, logWriter, loggerVerbosity) { }
+
+		public AnalyzerManager(string solutionFilePath, string[] projects, ILoggerFactory loggerFactory = null,
+			LoggerVerbosity loggerVerbosity = LoggerVerbosity.Normal
+		)
+		{
+			LoggerVerbosity = loggerVerbosity;
+			ProjectLogger = loggerFactory?.CreateLogger<ProjectAnalyzer>();
+
+			if (solutionFilePath != null)
+			{
+				solutionFilePath = ValidatePath(solutionFilePath, true);
+				SolutionDirectory = Path.GetDirectoryName(solutionFilePath);
+				GetProjectsInSolution(solutionFilePath, projects);
+			}
+		}
+
+		public AnalyzerManager(string solutionFilePath, TextWriter logWriter, LoggerVerbosity loggerVerbosity = LoggerVerbosity.Normal)
+		{
+			LoggerVerbosity = loggerVerbosity;
+			if (logWriter != null)
+			{
+				var loggerFactory = new LoggerFactory();
+				loggerFactory.AddProvider(new TextWriterLoggerProvider(logWriter));
+				ProjectLogger = loggerFactory.CreateLogger<ProjectAnalyzer>();
+			}
+
+			if (solutionFilePath != null)
+			{
+				solutionFilePath = ValidatePath(solutionFilePath, true);
+				SolutionDirectory = Path.GetDirectoryName(solutionFilePath);
+				GetProjectsInSolution(solutionFilePath);
+			}
+		}
+
+		public IReadOnlyDictionary<string, ProjectAnalyzer> Projects => _projects;
+
+		public string SolutionDirectory { get; }
+
+		internal LoggerVerbosity LoggerVerbosity { get; }
+
+		internal ILogger<ProjectAnalyzer> ProjectLogger { get; }
+
+		private void GetProjectsInSolution(string solutionFilePath, string[] projects = null)
+		{
+			projects = projects ?? new string[] { };
+			var supportedType = new[]
+			{
+				SolutionProjectType.KnownToBeMSBuildFormat,
+				SolutionProjectType.WebProject
+			};
+
+			var solution = SolutionFile.Parse(solutionFilePath);
+			foreach (var project in solution.ProjectsInOrder)
+			{
+				if (!supportedType.Contains(project.ProjectType)) continue;
+				if (projects.Length > 0 && !projects.Contains(project.ProjectName)) continue;
+
+				GetProject(project.AbsolutePath);
+			}
+		}
+
+		public ProjectAnalyzer GetProject(string projectFilePath)
+		{
+			if (projectFilePath == null) throw new ArgumentNullException(nameof(projectFilePath));
+
+			// Normalize as .sln uses backslash regardless of OS the sln is created on
+			projectFilePath = projectFilePath.Replace('\\', Path.DirectorySeparatorChar);
+			projectFilePath = ValidatePath(projectFilePath, true);
+			if (_projects.TryGetValue(projectFilePath, out var project)) return project;
+
+			project = new ProjectAnalyzer(this, projectFilePath);
+			_projects.Add(projectFilePath, project);
+			return project;
+		}
+
+		public ProjectAnalyzer GetProject(string projectFilePath, XDocument projectDocument)
+		{
+			if (projectFilePath == null) throw new ArgumentNullException(nameof(projectFilePath));
+
+			if (projectDocument == null) throw new ArgumentNullException(nameof(projectDocument));
+
+			// Normalize as .sln uses backslash regardless of OS the sln is created on
+			projectFilePath = projectFilePath.Replace('\\', Path.DirectorySeparatorChar);
+			projectFilePath = ValidatePath(projectFilePath, false);
+			if (_projects.TryGetValue(projectFilePath, out var project)) return project;
+
+			project = new ProjectAnalyzer(this, projectFilePath, projectDocument);
+			_projects.Add(projectFilePath, project);
+			return project;
+		}
+
+		private static string ValidatePath(string path, bool checkExists)
+		{
+			if (path == null) throw new ArgumentNullException(nameof(path));
+
+			path = Path.GetFullPath(path); // Normalize the path
+			if (checkExists && !File.Exists(path)) throw new ArgumentException($"The path {path} could not be found.");
+
+			return path;
+		}
+	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/AnalyzerManagerExtensions.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/AnalyzerManagerExtensions.cs
index bd80736f010..663953b4a4b 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/AnalyzerManagerExtensions.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/AnalyzerManagerExtensions.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using Microsoft.CodeAnalysis;
@@ -30,11 +32,8 @@ public static class AnalyzerManagerExtensions
 	{
 		public static AdhocWorkspace GetWorkspace(this AnalyzerManager manager)
 		{
-			AdhocWorkspace workspace = new AdhocWorkspace();
-			foreach (ProjectAnalyzer project in manager.Projects.Values)
-			{
-				project.AddToWorkspace(workspace);
-			}
+			var workspace = new AdhocWorkspace();
+			foreach (var project in manager.Projects.Values) project.AddToWorkspace(workspace);
 			return workspace;
 		}
 	}
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/BuildEnvironment.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/BuildEnvironment.cs
index ed90e292e8c..75014c96f44 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/BuildEnvironment.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/BuildEnvironment.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System.Collections.Generic;
@@ -62,13 +64,8 @@ public virtual void SetEnvironmentVars(IReadOnlyDictionary<string, string> globa
 		public virtual void UnsetEnvironmentVars()
 		{
 			if (_oldMsBuildExtensionsPath != null)
-			{
 				System.Environment.SetEnvironmentVariable(MsBuildProperties.MSBuildExtensionsPath, _oldMsBuildExtensionsPath);
-			}
-			if (_oldMsBuildSdksPath != null)
-			{
-				System.Environment.SetEnvironmentVariable(MsBuildProperties.MSBuildSDKsPath, _oldMsBuildSdksPath);
-			}
+			if (_oldMsBuildSdksPath != null) System.Environment.SetEnvironmentVariable(MsBuildProperties.MSBuildSDKsPath, _oldMsBuildSdksPath);
 		}
 	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/CoreEnvironment.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/CoreEnvironment.cs
index fc5a5243006..15b0a37c6c5 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/CoreEnvironment.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/CoreEnvironment.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System.Collections.Generic;
@@ -31,25 +33,25 @@ namespace DocGenerator.Buildalyzer.Environment
 	// https://github.com/OmniSharp/omnisharp-roslyn/blob/78ccc8b4376c73da282a600ac6fb10fce8620b52/src/OmniSharp.Abstractions/Services/DotNetCliService.cs
 	internal class CoreEnvironment : BuildEnvironment
 	{
-		public string ToolsPath { get; }
-		public string ExtensionsPath { get; }
-		public string SDKsPath { get; }
-		public string RoslynTargetsPath { get; }
-
 		public CoreEnvironment(string projectPath)
 		{
-			string dotnetPath = DotnetPathResolver.ResolvePath(projectPath);
+			var dotnetPath = DotnetPathResolver.ResolvePath(projectPath);
 			ToolsPath = dotnetPath;
 			ExtensionsPath = dotnetPath;
 			SDKsPath = Path.Combine(dotnetPath, "Sdks");
 			RoslynTargetsPath = Path.Combine(dotnetPath, "Roslyn");
 		}
 
+		public string ExtensionsPath { get; }
+		public string RoslynTargetsPath { get; }
+		public string SDKsPath { get; }
+		public string ToolsPath { get; }
+
 		public override string GetToolsPath() => ToolsPath;
 
 		public override Dictionary<string, string> GetGlobalProperties(string solutionDir)
 		{
-			Dictionary<string, string> globalProperties = base.GetGlobalProperties(solutionDir);
+			var globalProperties = base.GetGlobalProperties(solutionDir);
 			globalProperties.Add(MsBuildProperties.MSBuildExtensionsPath, ExtensionsPath);
 			globalProperties.Add(MsBuildProperties.MSBuildSDKsPath, SDKsPath);
 			globalProperties.Add(MsBuildProperties.RoslynTargetsPath, RoslynTargetsPath);
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/DotnetPathResolver.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/DotnetPathResolver.cs
index a89a5448499..4fd19c9c489 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/DotnetPathResolver.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/DotnetPathResolver.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
@@ -31,23 +33,20 @@ namespace DocGenerator.Buildalyzer.Environment
 {
 	internal static class DotnetPathResolver
 	{
-		const string DOTNET_CLI_UI_LANGUAGE = nameof(DOTNET_CLI_UI_LANGUAGE);
+		private const string DOTNET_CLI_UI_LANGUAGE = nameof(DOTNET_CLI_UI_LANGUAGE);
+		private static string BasePath = null;
 
 		private static readonly object BasePathLock = new object();
-		private static string BasePath = null;
 
 		public static string ResolvePath(string projectPath)
 		{
-			lock(BasePathLock)
+			lock (BasePathLock)
 			{
-				if(BasePath != null)
-				{
-					return BasePath;
-				}
+				if (BasePath != null) return BasePath;
 
 				// Need to rety calling "dotnet --info" and do a hacky timeout for the process otherwise it occasionally locks up during testing (and possibly in the field)
-				List<string> lines = GetInfo(projectPath);
-				int retry = 0;
+				var lines = GetInfo(projectPath);
+				var retry = 0;
 				do
 				{
 					lines = GetInfo(projectPath);
@@ -63,35 +62,33 @@ private static List<string> GetInfo(string projectPath)
 		{
 			// Ensure that we set the DOTNET_CLI_UI_LANGUAGE environment variable to "en-US" before
 			// running 'dotnet --info'. Otherwise, we may get localized results.
-			string originalCliLanguage = System.Environment.GetEnvironmentVariable(DOTNET_CLI_UI_LANGUAGE);
+			var originalCliLanguage = System.Environment.GetEnvironmentVariable(DOTNET_CLI_UI_LANGUAGE);
 			System.Environment.SetEnvironmentVariable(DOTNET_CLI_UI_LANGUAGE, "en-US");
 
 			try
 			{
 				// Create the process info
-				Process process = new Process();
+				var process = new Process();
 				process.StartInfo.FileName = "dotnet";
 				process.StartInfo.Arguments = "--info";
-				process.StartInfo.WorkingDirectory = Path.GetDirectoryName(projectPath); // global.json may change the version, so need to set working directory
+				process.StartInfo.WorkingDirectory =
+					Path.GetDirectoryName(projectPath); // global.json may change the version, so need to set working directory
 				process.StartInfo.CreateNoWindow = true;
 				process.StartInfo.UseShellExecute = false;
 
 				// Capture output
-				List<string> lines = new List<string>();
+				var lines = new List<string>();
 				process.StartInfo.RedirectStandardOutput = true;
 				process.OutputDataReceived += (s, e) => lines.Add(e.Data);
 
 				// Execute the process
 				process.Start();
 				process.BeginOutputReadLine();
-				Stopwatch sw = new Stopwatch();
+				var sw = new Stopwatch();
 				sw.Start();
 				while (!process.HasExited)
 				{
-					if (sw.ElapsedMilliseconds > 4000)
-					{
-						break;
-					}
+					if (sw.ElapsedMilliseconds > 4000) break;
 				}
 				sw.Stop();
 				process.Close();
@@ -105,36 +102,27 @@ private static List<string> GetInfo(string projectPath)
 
 		private static string ParseBasePath(List<string> lines)
 		{
-			if (lines == null || lines.Count == 0)
-			{
-				throw new InvalidOperationException("Could not get results from `dotnet --info` call");
-			}
+			if (lines == null || lines.Count == 0) throw new InvalidOperationException("Could not get results from `dotnet --info` call");
 
-			foreach (string line in lines)
+			foreach (var line in lines)
 			{
-				int colonIndex = line.IndexOf(':');
+				var colonIndex = line.IndexOf(':');
 				if (colonIndex >= 0
-				    && line.Substring(0, colonIndex).Trim().Equals("Base Path", StringComparison.OrdinalIgnoreCase))
+					&& line.Substring(0, colonIndex).Trim().Equals("Base Path", StringComparison.OrdinalIgnoreCase))
 				{
-					string basePath = line.Substring(colonIndex + 1).Trim();
+					var basePath = line.Substring(colonIndex + 1).Trim();
 
 					// Make sure the base path matches the runtime architecture if on Windows
 					// Note that this only works for the default installation locations under "Program Files"
 					if (basePath.Contains(@"\Program Files\") && !System.Environment.Is64BitProcess)
 					{
-						string newBasePath = basePath.Replace(@"\Program Files\", @"\Program Files (x86)\");
-						if (Directory.Exists(newBasePath))
-						{
-							basePath = newBasePath;
-						}
+						var newBasePath = basePath.Replace(@"\Program Files\", @"\Program Files (x86)\");
+						if (Directory.Exists(newBasePath)) basePath = newBasePath;
 					}
 					else if (basePath.Contains(@"\Program Files (x86)\") && System.Environment.Is64BitProcess)
 					{
-						string newBasePath = basePath.Replace(@"\Program Files (x86)\", @"\Program Files\");
-						if (Directory.Exists(newBasePath))
-						{
-							basePath = newBasePath;
-						}
+						var newBasePath = basePath.Replace(@"\Program Files (x86)\", @"\Program Files\");
+						if (Directory.Exists(newBasePath)) basePath = newBasePath;
 					}
 
 					return basePath;
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/EnvironmentFactory.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/EnvironmentFactory.cs
index 3c513c981ba..030942a4340 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/EnvironmentFactory.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/EnvironmentFactory.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,10 +21,12 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Xml.Linq;
 
 namespace DocGenerator.Buildalyzer.Environment
@@ -33,42 +36,36 @@ internal abstract class EnvironmentFactory
 		public static BuildEnvironment GetBuildEnvironment(string projectPath, XDocument projectDocument)
 		{
 			// If we're running on .NET Core, use the .NET Core SDK regardless of the project file
-			if (System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription
-				.Replace(" ", "").StartsWith(".NETCore", StringComparison.OrdinalIgnoreCase))
-			{
+			if (RuntimeInformation.FrameworkDescription
+				.Replace(" ", "")
+				.StartsWith(".NETCore", StringComparison.OrdinalIgnoreCase))
 				return new CoreEnvironment(projectPath);
-			}
 
 			// Look at the project file to determine
-			XElement projectElement = projectDocument.GetDescendants("Project").FirstOrDefault();
+			var projectElement = projectDocument.GetDescendants("Project").FirstOrDefault();
 			if (projectElement != null)
 			{
 				// Does this project use the SDK?
 				// Check for an SDK attribute on the project element
 				// If no <Project> attribute, check for a SDK import (see https://github.com/Microsoft/msbuild/issues/1493)
 				if (projectElement.GetAttributeValue("Sdk") != null
-				    || projectElement.GetDescendants("Import").Any(x => x.GetAttributeValue("Sdk") != null))
+					|| projectElement.GetDescendants("Import").Any(x => x.GetAttributeValue("Sdk") != null))
 				{
 					// Use the Framework tools if this project targets .NET Framework ("net" followed by a digit)
 					// https://docs.microsoft.com/en-us/dotnet/standard/frameworks
-					string targetFramework = projectElement.GetDescendants("TargetFramework").FirstOrDefault()?.Value;
-					if(targetFramework != null
-					   && targetFramework.StartsWith("net", StringComparison.OrdinalIgnoreCase)
-					   && targetFramework.Length > 3
-					   && char.IsDigit(targetFramework[4]))
-					{
+					var targetFramework = projectElement.GetDescendants("TargetFramework").FirstOrDefault()?.Value;
+					if (targetFramework != null
+						&& targetFramework.StartsWith("net", StringComparison.OrdinalIgnoreCase)
+						&& targetFramework.Length > 3
+						&& char.IsDigit(targetFramework[4]))
 						return new FrameworkEnvironment(projectPath, true);
-					}
 
 					// Otherwise use the .NET Core SDK
 					return new CoreEnvironment(projectPath);
 				}
 
 				// Use Framework tools if a ToolsVersion attribute
-				if (projectElement.GetAttributeValue("ToolsVersion") != null)
-				{
-					return new FrameworkEnvironment(projectPath, false);
-				}
+				if (projectElement.GetAttributeValue("ToolsVersion") != null) return new FrameworkEnvironment(projectPath, false);
 			}
 
 			throw new InvalidOperationException("Unrecognized project file format");
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/FrameworkEnvironment.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/FrameworkEnvironment.cs
index e41be6f9088..d14bd8f06c7 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/FrameworkEnvironment.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/FrameworkEnvironment.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
@@ -32,11 +34,6 @@ namespace DocGenerator.Buildalyzer.Environment
 {
 	internal class FrameworkEnvironment : BuildEnvironment
 	{
-		public string ToolsPath { get; }
-		public string ExtensionsPath { get; }
-		public string SDKsPath { get; }
-		public string RoslynTargetsPath { get; }
-
 		public FrameworkEnvironment(string projectPath, bool sdkProject)
 		{
 			ToolsPath = LocateToolsPath();
@@ -45,11 +42,16 @@ public FrameworkEnvironment(string projectPath, bool sdkProject)
 			RoslynTargetsPath = Path.Combine(ToolsPath, "Roslyn");
 		}
 
+		public string ExtensionsPath { get; }
+		public string RoslynTargetsPath { get; }
+		public string SDKsPath { get; }
+		public string ToolsPath { get; }
+
 		public override string GetToolsPath() => ToolsPath;
 
 		public override Dictionary<string, string> GetGlobalProperties(string solutionDir)
 		{
-			Dictionary<string, string> globalProperties = base.GetGlobalProperties(solutionDir);
+			var globalProperties = base.GetGlobalProperties(solutionDir);
 			globalProperties.Add(MsBuildProperties.MSBuildExtensionsPath, ExtensionsPath);
 			globalProperties.Add(MsBuildProperties.MSBuildSDKsPath, SDKsPath);
 			globalProperties.Add(MsBuildProperties.RoslynTargetsPath, RoslynTargetsPath);
@@ -58,24 +60,17 @@ public override Dictionary<string, string> GetGlobalProperties(string solutionDi
 
 		private static string LocateToolsPath()
 		{
-			string toolsPath = ToolLocationHelper.GetPathToBuildToolsFile("msbuild.exe", ToolLocationHelper.CurrentToolsVersion);
-			if (string.IsNullOrEmpty(toolsPath))
-			{
-				// Could not find the tools path, possibly due to https://github.com/Microsoft/msbuild/issues/2369
-				// Try to poll for it
-				toolsPath = PollForToolsPath();
-			}
-			if (string.IsNullOrEmpty(toolsPath))
-			{
-				throw new InvalidOperationException("Could not locate the tools (msbuild.exe) path");
-			}
+			var toolsPath = ToolLocationHelper.GetPathToBuildToolsFile("msbuild.exe", ToolLocationHelper.CurrentToolsVersion);
+			if (string.IsNullOrEmpty(toolsPath)) toolsPath = PollForToolsPath();
+			if (string.IsNullOrEmpty(toolsPath)) throw new InvalidOperationException("Could not locate the tools (msbuild.exe) path");
+
 			return Path.GetDirectoryName(toolsPath);
 		}
 
 		// From https://github.com/KirillOsenkov/MSBuildStructuredLog/blob/4649f55f900a324421bad5a714a2584926a02138/src/StructuredLogViewer/MSBuildLocator.cs
 		private static string PollForToolsPath()
 		{
-			string programFilesX86 = System.Environment.GetFolderPath(System.Environment.SpecialFolder.ProgramFilesX86);
+			var programFilesX86 = System.Environment.GetFolderPath(System.Environment.SpecialFolder.ProgramFilesX86);
 			return new[]
 				{
 					Path.Combine(programFilesX86, @"Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"),
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/MsBuildProperties.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/MsBuildProperties.cs
index fa44dd87217..889d7693d84 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/MsBuildProperties.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Environment/MsBuildProperties.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,25 +21,27 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 namespace DocGenerator.Buildalyzer.Environment
 {
 	public static class MsBuildProperties
 	{
-		// MSBuild Project Loading
-		public const string MSBuildExtensionsPath = nameof(MSBuildExtensionsPath);
-		public const string MSBuildSDKsPath = nameof(MSBuildSDKsPath);
-		public const string RoslynTargetsPath = nameof(RoslynTargetsPath);
-		public const string SolutionDir = nameof(SolutionDir);
+		public const string BuildProjectReferences = nameof(BuildProjectReferences);
 
 		// Design-time Build
 		public const string DesignTimeBuild = nameof(DesignTimeBuild);
-		public const string BuildProjectReferences = nameof(BuildProjectReferences);
-		public const string SkipCompilerExecution = nameof(SkipCompilerExecution);
-		public const string ProvideCommandLineArgs = nameof(ProvideCommandLineArgs);
 
 		// Others
 		public const string GenerateResourceMSBuildArchitecture = nameof(GenerateResourceMSBuildArchitecture);
+
+		// MSBuild Project Loading
+		public const string MSBuildExtensionsPath = nameof(MSBuildExtensionsPath);
+		public const string MSBuildSDKsPath = nameof(MSBuildSDKsPath);
+		public const string ProvideCommandLineArgs = nameof(ProvideCommandLineArgs);
+		public const string RoslynTargetsPath = nameof(RoslynTargetsPath);
+		public const string SkipCompilerExecution = nameof(SkipCompilerExecution);
+		public const string SolutionDir = nameof(SolutionDir);
 	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/EmptyDisposable.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/EmptyDisposable.cs
index a8d34fac0cd..745f4b14915 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/EmptyDisposable.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/EmptyDisposable.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
@@ -28,8 +30,6 @@ namespace DocGenerator.Buildalyzer.Logging
 {
 	public class EmptyDisposable : IDisposable
 	{
-		public void Dispose()
-		{
-		}
+		public void Dispose() { }
 	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/TextWriterLogger.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/TextWriterLogger.cs
index 1d90e4dd622..da28a3df10b 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/TextWriterLogger.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/TextWriterLogger.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
@@ -32,16 +34,13 @@ internal class TextWriterLogger : ILogger
 	{
 		private readonly TextWriter _textWriter;
 
-		public TextWriterLogger(TextWriter textWriter)
-		{
-			_textWriter = textWriter;
-		}
+		public TextWriterLogger(TextWriter textWriter) => _textWriter = textWriter;
 
-		public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) =>
-			_textWriter.Write(formatter(state, exception));
+		public IDisposable BeginScope<TState>(TState state) => new EmptyDisposable();
 
 		public bool IsEnabled(LogLevel logLevel) => true;
 
-		public IDisposable BeginScope<TState>(TState state) => new EmptyDisposable();
+		public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) =>
+			_textWriter.Write(formatter(state, exception));
 	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/TextWriterLoggerProvider.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/TextWriterLoggerProvider.cs
index afadaa24bc6..dc700a89d12 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/TextWriterLoggerProvider.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/Logging/TextWriterLoggerProvider.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System.IO;
@@ -31,14 +33,9 @@ public class TextWriterLoggerProvider : ILoggerProvider
 	{
 		private readonly TextWriter _textWriter;
 
-		public TextWriterLoggerProvider(TextWriter textWriter)
-		{
-			_textWriter = textWriter;
-		}
+		public TextWriterLoggerProvider(TextWriter textWriter) => _textWriter = textWriter;
 
-		public void Dispose()
-		{
-		}
+		public void Dispose() { }
 
 		public ILogger CreateLogger(string categoryName) => new TextWriterLogger(_textWriter);
 	}
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzer.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzer.cs
index 2cdba3b3de4..f8f5502c573 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzer.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzer.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,13 +21,13 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Xml;
 using System.Xml.Linq;
 using DocGenerator.Buildalyzer.Environment;
 using Microsoft.Build.Evaluation;
@@ -41,32 +42,16 @@ namespace DocGenerator.Buildalyzer
 {
 	public class ProjectAnalyzer
 	{
-		private readonly XDocument _projectDocument;
-		private readonly Dictionary<string, string> _globalProperties;
 		private readonly BuildEnvironment _buildEnvironment;
+		private readonly Dictionary<string, string> _globalProperties;
 		private readonly ConsoleLogger _logger;
-
-		private Project _project = null;
+		private readonly XDocument _projectDocument;
 		private ProjectInstance _compiledProject = null;
 
-		public AnalyzerManager Manager { get; }
-
-		public string ProjectFilePath { get; }
-
-		/// <summary>
-		/// The global properties for MSBuild. By default, each project
-		/// is configured with properties that use a design-time build without calling the compiler.
-		/// </summary>
-		public IReadOnlyDictionary<string, string> GlobalProperties => _globalProperties;
-
-		public Project Project => Load();
-
-		public ProjectInstance CompiledProject => Compile();
+		private Project _project = null;
 
 		internal ProjectAnalyzer(AnalyzerManager manager, string projectFilePath)
-			: this(manager, projectFilePath, XDocument.Load(projectFilePath))
-		{
-		}
+			: this(manager, projectFilePath, XDocument.Load(projectFilePath)) { }
 
 		internal ProjectAnalyzer(AnalyzerManager manager, string projectFilePath, XDocument projectDocument)
 		{
@@ -79,34 +64,43 @@ internal ProjectAnalyzer(AnalyzerManager manager, string projectFilePath, XDocum
 			_buildEnvironment = EnvironmentFactory.GetBuildEnvironment(projectFilePath, _projectDocument);
 
 			// Preload/enforce referencing some required asemblies
-			Copy copy = new Copy();
+			var copy = new Copy();
 
 
-			string solutionDir = manager.SolutionDirectory ?? projectFolder;
+			var solutionDir = manager.SolutionDirectory ?? projectFolder;
 			_globalProperties = _buildEnvironment.GetGlobalProperties(solutionDir);
 
 			// Create the logger
 			if (manager.ProjectLogger != null)
-			{
 				_logger = new ConsoleLogger(manager.LoggerVerbosity, x => manager.ProjectLogger.LogInformation(x), null, null);
-			}
 		}
 
+		public ProjectInstance CompiledProject => Compile();
+
+		/// <summary>
+		/// The global properties for MSBuild. By default, each project
+		/// is configured with properties that use a design-time build without calling the compiler.
+		/// </summary>
+		public IReadOnlyDictionary<string, string> GlobalProperties => _globalProperties;
+
+		public AnalyzerManager Manager { get; }
+
+		public Project Project => Load();
+
+		public string ProjectFilePath { get; }
+
 		public Project Load()
 		{
-			if (_project != null)
-			{
-				return _project;
-			}
+			if (_project != null) return _project;
 
 			// Create a project collection for each project since the toolset might change depending on the type of project
-			ProjectCollection projectCollection = CreateProjectCollection();
+			var projectCollection = CreateProjectCollection();
 
 			// Load the project
 			_buildEnvironment.SetEnvironmentVars(GlobalProperties);
 			try
 			{
-				using (XmlReader projectReader = _projectDocument.CreateReader())
+				using (var projectReader = _projectDocument.CreateReader())
 				{
 					_project = projectCollection.LoadProject(projectReader);
 					_project.FullPath = ProjectFilePath;
@@ -120,11 +114,10 @@ public Project Load()
 		}
 
 
-
 		// Tweaks the project file a bit to ensure a succesfull build
 		private static XDocument TweakProjectDocument(XDocument projectDocument, string projectFolder)
 		{
-			foreach (XElement import in projectDocument.GetDescendants("Import").ToArray())
+			foreach (var import in projectDocument.GetDescendants("Import").ToArray())
 			{
 				var att = import.Attribute("Project");
 				if (att == null) continue;
@@ -132,23 +125,17 @@ private static XDocument TweakProjectDocument(XDocument projectDocument, string
 				var project = att.Value;
 
 				if (!ResolveKnownPropsPath(projectFolder, project, att, "PublishArtifacts.build.props"))
-				{
 					ResolveKnownPropsPath(projectFolder, project, att, "Artifacts.build.props");
-				}
 				ResolveKnownPropsPath(projectFolder, project, att, "Library.build.props");
 			}
 			// Add SkipGetTargetFrameworkProperties to every ProjectReference
-			foreach (XElement projectReference in projectDocument.GetDescendants("ProjectReference").ToArray())
-			{
+			foreach (var projectReference in projectDocument.GetDescendants("ProjectReference").ToArray())
 				projectReference.AddChildElement("SkipGetTargetFrameworkProperties", "true");
-			}
 
 			// Removes all EnsureNuGetPackageBuildImports
-			foreach (XElement ensureNuGetPackageBuildImports in
+			foreach (var ensureNuGetPackageBuildImports in
 				projectDocument.GetDescendants("Target").Where(x => x.GetAttributeValue("Name") == "EnsureNuGetPackageBuildImports").ToArray())
-			{
 				ensureNuGetPackageBuildImports.Remove();
-			}
 
 			return projectDocument;
 		}
@@ -156,53 +143,43 @@ private static XDocument TweakProjectDocument(XDocument projectDocument, string
 		private static bool ResolveKnownPropsPath(string projectFolder, string project, XAttribute att, string buildPropFile)
 		{
 			if (!project.Contains(buildPropFile)) return false;
+
 			var dir = new DirectoryInfo(projectFolder).Parent;
 			while (dir != null && dir.Name != "src")
 				dir = dir.Parent;
 			if (dir == null) return true;
+
 			att.Value = Path.GetFullPath(Path.Combine(dir.FullName, buildPropFile));
 			return false;
 		}
 
 		private ProjectCollection CreateProjectCollection()
 		{
-			ProjectCollection projectCollection = new ProjectCollection(_globalProperties);
+			var projectCollection = new ProjectCollection(_globalProperties);
 			projectCollection.RemoveAllToolsets(); // Make sure we're only using the latest tools
 			projectCollection.AddToolset(
 				new Toolset(ToolLocationHelper.CurrentToolsVersion, _buildEnvironment.GetToolsPath(), projectCollection, string.Empty));
 			projectCollection.DefaultToolsVersion = ToolLocationHelper.CurrentToolsVersion;
-			if (_logger != null)
-			{
-				projectCollection.RegisterLogger(_logger);
-			}
+			if (_logger != null) projectCollection.RegisterLogger(_logger);
 			return projectCollection;
 		}
 
 		public ProjectInstance Compile()
 		{
-			if (_compiledProject != null)
-			{
-				return _compiledProject;
-			}
-			Project project = Load();
-			if (project == null)
-			{
-				return null;
-			}
+			if (_compiledProject != null) return _compiledProject;
+
+			var project = Load();
+			if (project == null) return null;
 
 			// Compile the project
 			_buildEnvironment.SetEnvironmentVars(GlobalProperties);
 			try
 			{
-				ProjectInstance projectInstance = project.CreateProjectInstance();
-				if (!projectInstance.Build("Clean", _logger == null ? null : new ILogger[] { _logger }))
-				{
-					return null;
-				}
-				if (!projectInstance.Build("Compile", _logger == null ? null : new ILogger[] { _logger }))
-				{
-					return null;
-				}
+				var projectInstance = project.CreateProjectInstance();
+				if (!projectInstance.Build("Clean", _logger == null ? null : new ILogger[] { _logger })) return null;
+
+				if (!projectInstance.Build("Compile", _logger == null ? null : new ILogger[] { _logger })) return null;
+
 				_compiledProject = projectInstance;
 				return _compiledProject;
 			}
@@ -213,38 +190,37 @@ public ProjectInstance Compile()
 		}
 
 		public IReadOnlyList<string> GetSourceFiles() =>
-			Compile()?.Items
+			Compile()
+				?.Items
 				.Where(x => x.ItemType == "CscCommandLineArgs" && !x.EvaluatedInclude.StartsWith("/"))
 				.Select(x => Path.GetFullPath(Path.Combine(Path.GetDirectoryName(ProjectFilePath), x.EvaluatedInclude)))
 				.ToList();
 
 		public IReadOnlyList<string> GetReferences() =>
-			Compile()?.Items
+			Compile()
+				?.Items
 				.Where(x => x.ItemType == "CscCommandLineArgs" && x.EvaluatedInclude.StartsWith("/reference:"))
 				.Select(x => x.EvaluatedInclude.Substring(11).Trim('"'))
 				.ToList();
 
 		public IReadOnlyList<string> GetProjectReferences() =>
-			Compile()?.Items
+			Compile()
+				?.Items
 				.Where(x => x.ItemType == "ProjectReference")
 				.Select(x => Path.GetFullPath(Path.Combine(Path.GetDirectoryName(ProjectFilePath), x.EvaluatedInclude)))
 				.ToList();
 
 		public void SetGlobalProperty(string key, string value)
 		{
-			if (_project != null)
-			{
-				throw new InvalidOperationException("Can not change global properties once project has been loaded");
-			}
+			if (_project != null) throw new InvalidOperationException("Can not change global properties once project has been loaded");
+
 			_globalProperties[key] = value;
 		}
 
 		public bool RemoveGlobalProperty(string key)
 		{
-			if (_project != null)
-			{
-				throw new InvalidOperationException("Can not change global properties once project has been loaded");
-			}
+			if (_project != null) throw new InvalidOperationException("Can not change global properties once project has been loaded");
+
 			return _globalProperties.Remove(key);
 		}
 	}
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzerExtensions.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzerExtensions.cs
index d3ead88b114..8e2d08f8e34 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzerExtensions.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzerExtensions.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
@@ -39,15 +41,16 @@ public static class ProjectAnalyzerExtensions
 		/// Gets a Roslyn workspace for the analyzed project.
 		/// </summary>
 		/// <param name="analyzer">The Buildalyzer project analyzer.</param>
-		/// <param name="addProjectReferences"><c>true</c> to add projects to the workspace for project references that exist in the same <see cref="AnalyzerManager"/>.</param>
+		/// <param name="addProjectReferences">
+		/// <c>true</c> to add projects to the workspace for project references that exist in the same
+		/// <see cref="AnalyzerManager" />.
+		/// </param>
 		/// <returns>A Roslyn workspace.</returns>
 		public static AdhocWorkspace GetWorkspace(this ProjectAnalyzer analyzer, bool addProjectReferences = false)
 		{
-			if (analyzer == null)
-			{
-				throw new ArgumentNullException(nameof(analyzer));
-			}
-			AdhocWorkspace workspace = new AdhocWorkspace();
+			if (analyzer == null) throw new ArgumentNullException(nameof(analyzer));
+
+			var workspace = new AdhocWorkspace();
 			AddToWorkspace(analyzer, workspace, addProjectReferences);
 			return workspace;
 		}
@@ -57,59 +60,52 @@ public static AdhocWorkspace GetWorkspace(this ProjectAnalyzer analyzer, bool ad
 		/// </summary>
 		/// <param name="analyzer">The Buildalyzer project analyzer.</param>
 		/// <param name="workspace">A Roslyn workspace.</param>
-		/// <param name="addProjectReferences"><c>true</c> to add projects to the workspace for project references that exist in the same <see cref="AnalyzerManager"/>.</param>
+		/// <param name="addProjectReferences">
+		/// <c>true</c> to add projects to the workspace for project references that exist in the same
+		/// <see cref="AnalyzerManager" />.
+		/// </param>
 		/// <returns>The newly added Roslyn project.</returns>
 		public static Project AddToWorkspace(this ProjectAnalyzer analyzer, AdhocWorkspace workspace, bool addProjectReferences = false)
 		{
-			if (analyzer == null)
-			{
-				throw new ArgumentNullException(nameof(analyzer));
-			}
-			if (workspace == null)
-			{
-				throw new ArgumentNullException(nameof(workspace));
-			}
+			if (analyzer == null) throw new ArgumentNullException(nameof(analyzer));
+
+			if (workspace == null) throw new ArgumentNullException(nameof(workspace));
 
 			// Get or create an ID for this project
-			string projectGuid = analyzer.CompiledProject?.GetPropertyValue("ProjectGuid");
-			ProjectId projectId = !string.IsNullOrEmpty(projectGuid)
-			                      && Guid.TryParse(analyzer.CompiledProject?.GetPropertyValue("ProjectGuid"), out var projectIdGuid)
-				? ProjectId.CreateFromSerialized(projectIdGuid)
-				: ProjectId.CreateNewId();
+			var projectGuid = analyzer.CompiledProject?.GetPropertyValue("ProjectGuid");
+			var projectId = !string.IsNullOrEmpty(projectGuid)
+				&& Guid.TryParse(analyzer.CompiledProject?.GetPropertyValue("ProjectGuid"), out var projectIdGuid)
+					? ProjectId.CreateFromSerialized(projectIdGuid)
+					: ProjectId.CreateNewId();
 
 			// Create and add the project
-			ProjectInfo projectInfo = GetProjectInfo(analyzer, workspace, projectId);
-			Solution solution = workspace.CurrentSolution.AddProject(projectInfo);
+			var projectInfo = GetProjectInfo(analyzer, workspace, projectId);
+			var solution = workspace.CurrentSolution.AddProject(projectInfo);
 
 			// Check if this project is referenced by any other projects in the workspace
-			foreach (Project existingProject in solution.Projects.ToArray())
+			foreach (var existingProject in solution.Projects.ToArray())
 			{
 				if (!existingProject.Id.Equals(projectId)
-				    && analyzer.Manager.Projects.TryGetValue(existingProject.FilePath, out ProjectAnalyzer existingAnalyzer)
-				    && (existingAnalyzer.GetProjectReferences()?.Contains(analyzer.ProjectFilePath) ?? false))
+					&& analyzer.Manager.Projects.TryGetValue(existingProject.FilePath, out var existingAnalyzer)
+					&& (existingAnalyzer.GetProjectReferences()?.Contains(analyzer.ProjectFilePath) ?? false))
 				{
 					// Add the reference to the existing project
-					ProjectReference projectReference = new ProjectReference(projectId);
+					var projectReference = new ProjectReference(projectId);
 					solution = solution.AddProjectReference(existingProject.Id, projectReference);
 				}
 			}
 
 			// Apply solution changes
-			if (!workspace.TryApplyChanges(solution))
-			{
-				throw new InvalidOperationException("Could not apply workspace solution changes");
-			}
+			if (!workspace.TryApplyChanges(solution)) throw new InvalidOperationException("Could not apply workspace solution changes");
 
 			// Add any project references not already added
-			if(addProjectReferences)
+			if (addProjectReferences)
 			{
-				foreach(ProjectAnalyzer referencedAnalyzer in GetReferencedAnalyzerProjects(analyzer))
+				foreach (var referencedAnalyzer in GetReferencedAnalyzerProjects(analyzer))
 				{
 					// Check if the workspace contains the project inside the loop since adding one might also add this one due to transitive references
-					if(!workspace.CurrentSolution.Projects.Any(x => x.FilePath == referencedAnalyzer.ProjectFilePath))
-					{
+					if (!workspace.CurrentSolution.Projects.Any(x => x.FilePath == referencedAnalyzer.ProjectFilePath))
 						AddToWorkspace(referencedAnalyzer, workspace, addProjectReferences);
-					}
 				}
 			}
 
@@ -119,16 +115,16 @@ public static Project AddToWorkspace(this ProjectAnalyzer analyzer, AdhocWorkspa
 
 		private static ProjectInfo GetProjectInfo(ProjectAnalyzer analyzer, AdhocWorkspace workspace, ProjectId projectId)
 		{
-			string projectName = Path.GetFileNameWithoutExtension(analyzer.ProjectFilePath);
-			string languageName = GetLanguageName(analyzer.ProjectFilePath);
-			ProjectInfo projectInfo = ProjectInfo.Create(
+			var projectName = Path.GetFileNameWithoutExtension(analyzer.ProjectFilePath);
+			var languageName = GetLanguageName(analyzer.ProjectFilePath);
+			var projectInfo = ProjectInfo.Create(
 				projectId,
 				VersionStamp.Create(),
 				projectName,
 				projectName,
 				languageName,
-				filePath: analyzer.ProjectFilePath,
-				outputFilePath: analyzer.CompiledProject?.GetPropertyValue("TargetPath"),
+				analyzer.ProjectFilePath,
+				analyzer.CompiledProject?.GetPropertyValue("TargetPath"),
 				documents: GetDocuments(analyzer, projectId),
 				projectReferences: GetExistingProjectReferences(analyzer, workspace),
 				metadataReferences: GetMetadataReferences(analyzer),
@@ -138,7 +134,7 @@ private static ProjectInfo GetProjectInfo(ProjectAnalyzer analyzer, AdhocWorkspa
 
 		private static CompilationOptions CreateCompilationOptions(Microsoft.Build.Evaluation.Project project, string languageName)
 		{
-			string outputType = project.GetPropertyValue("OutputType");
+			var outputType = project.GetPropertyValue("OutputType");
 			OutputKind? kind = null;
 			switch (outputType)
 			{
@@ -158,14 +154,9 @@ private static CompilationOptions CreateCompilationOptions(Microsoft.Build.Evalu
 
 			if (kind.HasValue)
 			{
-				if (languageName == LanguageNames.CSharp)
-				{
-					return new CSharpCompilationOptions(kind.Value);
-				}
-				if (languageName == LanguageNames.VisualBasic)
-				{
-					return new VisualBasicCompilationOptions(kind.Value);
-				}
+				if (languageName == LanguageNames.CSharp) return new CSharpCompilationOptions(kind.Value);
+
+				if (languageName == LanguageNames.VisualBasic) return new VisualBasicCompilationOptions(kind.Value);
 			}
 
 			return null;
@@ -180,7 +171,7 @@ private static IEnumerable<ProjectReference> GetExistingProjectReferences(Projec
 
 		private static IEnumerable<ProjectAnalyzer> GetReferencedAnalyzerProjects(ProjectAnalyzer analyzer) =>
 			analyzer.GetProjectReferences()
-				?.Select(x => analyzer.Manager.Projects.TryGetValue(x, out ProjectAnalyzer a) ? a : null)
+				?.Select(x => analyzer.Manager.Projects.TryGetValue(x, out var a) ? a : null)
 				.Where(x => x != null)
 			?? Array.Empty<ProjectAnalyzer>();
 
diff --git a/src/CodeGeneration/DocGenerator/Buildalyzer/XDocumentExtensions.cs b/src/CodeGeneration/DocGenerator/Buildalyzer/XDocumentExtensions.cs
index 999dfdd99f0..86dd59a5546 100644
--- a/src/CodeGeneration/DocGenerator/Buildalyzer/XDocumentExtensions.cs
+++ b/src/CodeGeneration/DocGenerator/Buildalyzer/XDocumentExtensions.cs
@@ -1,4 +1,5 @@
 #region License
+
 //MIT License
 //
 //Copyright (c) 2017 Dave Glick
@@ -20,6 +21,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
+
 #endregion
 
 using System;
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Blocks/CSharpBlock.cs b/src/CodeGeneration/DocGenerator/Documentation/Blocks/CSharpBlock.cs
index 406c6b269a1..199936d4787 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Blocks/CSharpBlock.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Blocks/CSharpBlock.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,70 +7,62 @@
 
 namespace DocGenerator.Documentation.Blocks
 {
-    public class CSharpBlock : CodeBlock
-    {
-        private static readonly Regex Callout = new Regex(@"//[ \t]*(?<callout>\<\d+\>)[ \t]*(?<text>\S.*)", RegexOptions.Compiled);
-        private static readonly Regex CalloutReplacer = new Regex(@"//[ \t]*\<(\d+)\>.*", RegexOptions.Compiled);
+	public class CSharpBlock : CodeBlock
+	{
+		private static readonly Regex Callout = new Regex(@"//[ \t]*(?<callout>\<\d+\>)[ \t]*(?<text>\S.*)", RegexOptions.Compiled);
+		private static readonly Regex CalloutReplacer = new Regex(@"//[ \t]*\<(\d+)\>.*", RegexOptions.Compiled);
 
-        private List<string> Callouts { get; } = new List<string>();
+		public CSharpBlock(SyntaxNode node, int depth, string memberName = null)
+			: base(node.WithoutLeadingTrivia().ToFullStringWithoutPragmaWarningDirectiveTrivia(),
+				node.StartingLine(),
+				node.IsKind(SyntaxKind.ClassDeclaration) ? depth : depth + 2,
+				"csharp",
+				memberName) { }
 
-        public CSharpBlock(SyntaxNode node, int depth, string memberName = null)
-            : base(node.WithoutLeadingTrivia().ToFullStringWithoutPragmaWarningDirectiveTrivia(),
-                node.StartingLine(),
-                node.IsKind(SyntaxKind.ClassDeclaration) ? depth : depth + 2,
-                "csharp",
-                memberName)
-        {
-        }
+		private List<string> Callouts { get; } = new List<string>();
 
-        public void AddNode(SyntaxNode node) => Lines.Add(node.WithLeadingEndOfLineTrivia().ToFullStringWithoutPragmaWarningDirectiveTrivia());
+		public void AddNode(SyntaxNode node) => Lines.Add(node.WithLeadingEndOfLineTrivia().ToFullStringWithoutPragmaWarningDirectiveTrivia());
 
-        public override string ToAsciiDoc()
-        {
-            var builder = new StringBuilder();
+		public override string ToAsciiDoc()
+		{
+			var builder = new StringBuilder();
 
-            // method attribute is used to add section titles in GeneratedAsciidocVisitor
-            builder.AppendLine(!string.IsNullOrEmpty(MemberName)
-                ? $"[source, {Language.ToLowerInvariant()}, method=\"{MemberName.ToLowerInvariant()}\"]"
-                : $"[source, {Language.ToLowerInvariant()}]");
+			// method attribute is used to add section titles in GeneratedAsciidocVisitor
+			builder.AppendLine(!string.IsNullOrEmpty(MemberName)
+				? $"[source, {Language.ToLowerInvariant()}, method=\"{MemberName.ToLowerInvariant()}\"]"
+				: $"[source, {Language.ToLowerInvariant()}]");
 
-            builder.AppendLine("----");
+			builder.AppendLine("----");
 
-            var code = ExtractCallOutsFromCode(Value);
+			var code = ExtractCallOutsFromCode(Value);
 
-            code = code.RemoveNumberOfLeadingTabsOrSpacesAfterNewline(Depth);
-            builder.AppendLine(code);
+			code = code.RemoveNumberOfLeadingTabsOrSpacesAfterNewline(Depth);
+			builder.AppendLine(code);
 
-            builder.AppendLine("----");
-            foreach (var callout in Callouts)
-            {
-                builder.AppendLine(callout);
-            }
-            return builder.ToString();
-        }
+			builder.AppendLine("----");
+			foreach (var callout in Callouts) builder.AppendLine(callout);
+			return builder.ToString();
+		}
 
-        /// <summary>
-        /// Extracts the callouts from code. The callout comment is defined inline within
-        /// source code to play nicely with C# semantics, but needs to be extracted and placed after the
-        /// source block delimiter to be valid asciidoc.
-        /// </summary>
-        private string ExtractCallOutsFromCode(string value)
-        {
-            var matches = Callout.Matches(value);
-            var callouts = new List<string>();
+		/// <summary>
+		/// Extracts the callouts from code. The callout comment is defined inline within
+		/// source code to play nicely with C# semantics, but needs to be extracted and placed after the
+		/// source block delimiter to be valid asciidoc.
+		/// </summary>
+		private string ExtractCallOutsFromCode(string value)
+		{
+			var matches = Callout.Matches(value);
+			var callouts = new List<string>();
 
-            foreach (Match match in matches)
-            {
-                callouts.Add($"{match.Groups["callout"].Value} {match.Groups["text"].Value}");
-            }
+			foreach (Match match in matches) callouts.Add($"{match.Groups["callout"].Value} {match.Groups["text"].Value}");
 
-            if (callouts.Any())
-            {
-                value = CalloutReplacer.Replace(value, "//<$1>");
-                Callouts.AddRange(callouts);
-            }
+			if (callouts.Any())
+			{
+				value = CalloutReplacer.Replace(value, "//<$1>");
+				Callouts.AddRange(callouts);
+			}
 
-            return value.Trim();
-        }
-    }
+			return value.Trim();
+		}
+	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Blocks/CodeBlock.cs b/src/CodeGeneration/DocGenerator/Documentation/Blocks/CodeBlock.cs
index 9b52736d691..5fa5c59636e 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Blocks/CodeBlock.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Blocks/CodeBlock.cs
@@ -1,31 +1,30 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace DocGenerator.Documentation.Blocks
 {
-    public abstract class CodeBlock : IDocumentationBlock
-    {
-        protected readonly IList<string> Lines = new List<string>();
+	public abstract class CodeBlock : IDocumentationBlock
+	{
+		protected readonly IList<string> Lines = new List<string>();
 
-        public string Language { get; }
-        public int LineNumber { get; }
-        public int Depth { get; }
-        public string MemberName { get; }
+		protected CodeBlock(string text, int startingLine, int depth, string language, string memberName)
+		{
+			Lines.Add(text);
+			LineNumber = startingLine;
+			Depth = depth;
+			Language = language;
+			MemberName = memberName?.ToLowerInvariant() ?? string.Empty;
+		}
 
-        public string Value => string.Join(string.Empty, Lines);
+		public int Depth { get; }
 
-        public void AddLine(string line) => Lines.Add(line);
+		public string Language { get; }
+		public int LineNumber { get; }
+		public string MemberName { get; }
 
-        protected CodeBlock(string text, int startingLine, int depth, string language, string memberName)
-        {
-            Lines.Add(text);
-            LineNumber = startingLine;
-            Depth = depth;
-            Language = language;
-            MemberName = memberName?.ToLowerInvariant() ?? string.Empty;
-        }
+		public string Value => string.Join(string.Empty, Lines);
 
-        public abstract string ToAsciiDoc();
-    }
-}
\ No newline at end of file
+		public abstract string ToAsciiDoc();
+
+		public void AddLine(string line) => Lines.Add(line);
+	}
+}
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Blocks/IDocumentationBlock.cs b/src/CodeGeneration/DocGenerator/Documentation/Blocks/IDocumentationBlock.cs
index 61b760516b5..90d5acd2a0b 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Blocks/IDocumentationBlock.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Blocks/IDocumentationBlock.cs
@@ -1,9 +1,10 @@
 namespace DocGenerator.Documentation.Blocks
 {
-    public interface IDocumentationBlock
-    {
-        int LineNumber { get; }
-        string Value { get; }
-        string ToAsciiDoc();
-    }
-}
\ No newline at end of file
+	public interface IDocumentationBlock
+	{
+		int LineNumber { get; }
+		string Value { get; }
+
+		string ToAsciiDoc();
+	}
+}
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Blocks/JavaScriptBlock.cs b/src/CodeGeneration/DocGenerator/Documentation/Blocks/JavaScriptBlock.cs
index 284090fcc7a..3a4a46aa0e0 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Blocks/JavaScriptBlock.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Blocks/JavaScriptBlock.cs
@@ -2,28 +2,26 @@
 
 namespace DocGenerator.Documentation.Blocks
 {
-    public class JavaScriptBlock : CodeBlock
-    {
-        public JavaScriptBlock(string text, int startingLine, int depth, string memberName = null)
-            : base(text, startingLine, depth, "javascript", memberName)
-        {
-        }
+	public class JavaScriptBlock : CodeBlock
+	{
+		public JavaScriptBlock(string text, int startingLine, int depth, string memberName = null)
+			: base(text, startingLine, depth, "javascript", memberName) { }
 
-        public string Title { get; set; }
+		public string Title { get; set; }
 
-        public override string ToAsciiDoc()
-        {
-            var builder = new StringBuilder();
+		public override string ToAsciiDoc()
+		{
+			var builder = new StringBuilder();
 
-            if (!string.IsNullOrEmpty(Title))
-                builder.AppendLine("." + Title);
-            builder.AppendLine(!string.IsNullOrEmpty(MemberName)
-                ? $"[source, {Language.ToLowerInvariant()}, method=\"{MemberName.ToLowerInvariant()}\"]"
-                : $"[source, {Language.ToLowerInvariant()}]");
-            builder.AppendLine("----");
-            builder.AppendLine(Value);
-            builder.AppendLine("----");
-            return builder.ToString();
-        }
-    }
-}
\ No newline at end of file
+			if (!string.IsNullOrEmpty(Title))
+				builder.AppendLine("." + Title);
+			builder.AppendLine(!string.IsNullOrEmpty(MemberName)
+				? $"[source, {Language.ToLowerInvariant()}, method=\"{MemberName.ToLowerInvariant()}\"]"
+				: $"[source, {Language.ToLowerInvariant()}]");
+			builder.AppendLine("----");
+			builder.AppendLine(Value);
+			builder.AppendLine("----");
+			return builder.ToString();
+		}
+	}
+}
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Blocks/TextBlock.cs b/src/CodeGeneration/DocGenerator/Documentation/Blocks/TextBlock.cs
index cafafbdafe0..f31a5fddf16 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Blocks/TextBlock.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Blocks/TextBlock.cs
@@ -1,16 +1,17 @@
 namespace DocGenerator.Documentation.Blocks
 {
-    public class TextBlock : IDocumentationBlock
-    {
-        public TextBlock(string text, int lineNumber)
-        {
-            Value = text;
-            LineNumber = lineNumber;
-        }
+	public class TextBlock : IDocumentationBlock
+	{
+		public TextBlock(string text, int lineNumber)
+		{
+			Value = text;
+			LineNumber = lineNumber;
+		}
 
-        public string Value { get; }
-        public int LineNumber { get; }
+		public int LineNumber { get; }
 
-        public string ToAsciiDoc() => Value;
-    }
-}
\ No newline at end of file
+		public string Value { get; }
+
+		public string ToAsciiDoc() => Value;
+	}
+}
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Files/CSharpDocumentationFile.cs b/src/CodeGeneration/DocGenerator/Documentation/Files/CSharpDocumentationFile.cs
index c3e5da65d45..5d28a97d37b 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Files/CSharpDocumentationFile.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Files/CSharpDocumentationFile.cs
@@ -11,44 +11,39 @@
 
 namespace DocGenerator.Documentation.Files
 {
-    public class CSharpDocumentationFile : DocumentationFile
-    {
-        private readonly Document _document;
-        private readonly Dictionary<string, Project> _projects;
-
-        public CSharpDocumentationFile(Document document, Dictionary<string, Project> projects)
-            : base(new FileInfo(document.FilePath))
-        {
-            _document = document;
-            _projects = projects;
-        }
-
-	    public override async Task SaveToDocumentationFolderAsync()
-        {
-            var converter = new DocConverter();
-	        var blocks = await converter.ConvertAsync(_document).ConfigureAwait(false);
-
-            if (!blocks.Any()) return;
-
-            var builder = new StringBuilder();
-            using (var writer = new StringWriter(builder))
-            {
-                foreach (var block in blocks)
-                    await writer.WriteLineAsync(block.ToAsciiDoc()).ConfigureAwait(false);
-            }
-
-            var destination = this.CreateDocumentationLocation();
-
-            // Now add Asciidoc headers, rearrange sections, etc.
-            var document = AsciiDocNet.Document.Parse(builder.ToString());
-            var visitor = new GeneratedAsciidocVisitor(this.FileLocation, destination, _projects);
-            document = visitor.Convert(document);
-
-            // Write out document to file
-            using (var writer = new StreamWriter(destination.FullName))
-            {
-                document.Accept(new AsciiDocVisitor(writer));
-            }
-        }
-    }
+	public class CSharpDocumentationFile : DocumentationFile
+	{
+		private readonly Document _document;
+		private readonly Dictionary<string, Project> _projects;
+
+		public CSharpDocumentationFile(Document document, Dictionary<string, Project> projects)
+			: base(new FileInfo(document.FilePath))
+		{
+			_document = document;
+			_projects = projects;
+		}
+
+		public override async Task SaveToDocumentationFolderAsync()
+		{
+			var converter = new DocConverter();
+			var blocks = await converter.ConvertAsync(_document).ConfigureAwait(false);
+
+			if (!blocks.Any()) return;
+
+			var builder = new StringBuilder();
+			using (var writer = new StringWriter(builder))
+				foreach (var block in blocks)
+					await writer.WriteLineAsync(block.ToAsciiDoc()).ConfigureAwait(false);
+
+			var destination = CreateDocumentationLocation();
+
+			// Now add Asciidoc headers, rearrange sections, etc.
+			var document = AsciiDocNet.Document.Parse(builder.ToString());
+			var visitor = new GeneratedAsciidocVisitor(FileLocation, destination, _projects);
+			document = visitor.Convert(document);
+
+			// Write out document to file
+			using (var writer = new StreamWriter(destination.FullName)) document.Accept(new AsciiDocVisitor(writer));
+		}
+	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Files/DocumentationFile.cs b/src/CodeGeneration/DocGenerator/Documentation/Files/DocumentationFile.cs
index 7e920e9e567..f30e1362205 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Files/DocumentationFile.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Files/DocumentationFile.cs
@@ -7,20 +7,16 @@ namespace DocGenerator.Documentation.Files
 {
 	public abstract class DocumentationFile
 	{
-		protected FileInfo FileLocation { get; }
-
-		protected string Extension => this.FileLocation?.Extension.ToLowerInvariant();
+		protected DocumentationFile(FileInfo fileLocation) => FileLocation = fileLocation;
 
-		protected DocumentationFile(FileInfo fileLocation)
-		{
-			this.FileLocation = fileLocation;
-		}
+		protected string Extension => FileLocation?.Extension.ToLowerInvariant();
+		protected FileInfo FileLocation { get; }
 
 		public abstract Task SaveToDocumentationFolderAsync();
 
 		public static DocumentationFile Load(FileInfo fileLocation)
 		{
-            if (fileLocation == null) throw new ArgumentNullException(nameof(fileLocation));
+			if (fileLocation == null) throw new ArgumentNullException(nameof(fileLocation));
 
 			var extension = fileLocation.Extension;
 			switch (extension)
@@ -32,36 +28,38 @@ public static DocumentationFile Load(FileInfo fileLocation)
 					return new ImageDocumentationFile(fileLocation);
 				case ".asciidoc":
 					return new RawDocumentationFile(fileLocation);
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(fileLocation), 
-                        $"The extension you specified is currently not supported: {extension}");
-            }
+				default:
+					throw new ArgumentOutOfRangeException(nameof(fileLocation),
+						$"The extension you specified is currently not supported: {extension}");
+			}
 		}
 
 		protected virtual FileInfo CreateDocumentationLocation()
 		{
-			var testFullPath = this.FileLocation.FullName;
+			var testFullPath = FileLocation.FullName;
 			var p = "\\" + Path.DirectorySeparatorChar.ToString();
 			var testInDocumentationFolder =
-				Regex.Replace(testFullPath, $@"(^.+{p}Tests{p}|\" + this.Extension + "$)", "")
-				.TrimEnd(".doc")
-				.TrimEnd("Tests")
-				.PascalToHyphen() + ".asciidoc";
+				Regex.Replace(testFullPath, $@"(^.+{p}Tests{p}|\" + Extension + "$)", "")
+					.TrimEnd(".doc")
+					.TrimEnd("Tests")
+					.PascalToHyphen() + ".asciidoc";
 
 			var documentationTargetPath = Path.GetFullPath(Path.Combine(Program.OutputDirPath, testInDocumentationFolder));
 			var fileInfo = new FileInfo(documentationTargetPath);
 
-            if (fileInfo.Directory != null)
+			if (fileInfo.Directory != null)
 				Directory.CreateDirectory(fileInfo.Directory.FullName);
 
 			return fileInfo;
 		}
 
-	    protected async Task CopyFileAsync(string sourceFile, string destinationFile)
-	    {
-	        using (var sourceStream = new FileStream(sourceFile, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, FileOptions.Asynchronous | FileOptions.SequentialScan))
-	        using (var destinationStream = new FileStream(destinationFile, FileMode.Create, FileAccess.Write, FileShare.None, 4096, FileOptions.Asynchronous | FileOptions.SequentialScan))
-	            await sourceStream.CopyToAsync(destinationStream);
-	    }
+		protected async Task CopyFileAsync(string sourceFile, string destinationFile)
+		{
+			using (var sourceStream = new FileStream(sourceFile, FileMode.Open, FileAccess.Read, FileShare.Read, 4096,
+				FileOptions.Asynchronous | FileOptions.SequentialScan))
+			using (var destinationStream = new FileStream(destinationFile, FileMode.Create, FileAccess.Write, FileShare.None, 4096,
+				FileOptions.Asynchronous | FileOptions.SequentialScan))
+				await sourceStream.CopyToAsync(destinationStream);
+		}
 	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Files/ImageDocumentationFile.cs b/src/CodeGeneration/DocGenerator/Documentation/Files/ImageDocumentationFile.cs
index f43997f2bae..678d98cbae3 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Files/ImageDocumentationFile.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Files/ImageDocumentationFile.cs
@@ -10,25 +10,25 @@ public ImageDocumentationFile(FileInfo fileLocation) : base(fileLocation) { }
 
 		public override async Task SaveToDocumentationFolderAsync()
 		{
-			var docFileName = this.CreateDocumentationLocation();
+			var docFileName = CreateDocumentationLocation();
 
-            // copy for asciidoc to work when viewing a single asciidoc in the browser (path is relative to file)
-            var copyRelativeTask = CopyFileAsync(this.FileLocation.FullName, docFileName.FullName);
+			// copy for asciidoc to work when viewing a single asciidoc in the browser (path is relative to file)
+			var copyRelativeTask = CopyFileAsync(FileLocation.FullName, docFileName.FullName);
 
-            // copy to the root as well, for the doc generation process (path is relative to root)
-            var copyRootTask = CopyFileAsync(this.FileLocation.FullName, Path.Combine(Program.OutputDirPath, docFileName.Name));
+			// copy to the root as well, for the doc generation process (path is relative to root)
+			var copyRootTask = CopyFileAsync(FileLocation.FullName, Path.Combine(Program.OutputDirPath, docFileName.Name));
 
-		    await copyRelativeTask;
-		    await copyRootTask;
+			await copyRelativeTask;
+			await copyRootTask;
 		}
 
 		protected override FileInfo CreateDocumentationLocation()
 		{
-			var testFullPath = this.FileLocation.FullName;
+			var testFullPath = FileLocation.FullName;
 
 			var p = "\\" + Path.DirectorySeparatorChar.ToString();
-			var testInDocumenationFolder = Regex.Replace(testFullPath, $@"(^.+{p}Tests{p}|\" + this.Extension + "$)", "")
-				.PascalToHyphen() + this.Extension;
+			var testInDocumenationFolder = Regex.Replace(testFullPath, $@"(^.+{p}Tests{p}|\" + Extension + "$)", "")
+				.PascalToHyphen() + Extension;
 
 			var documentationTargetPath = Path.GetFullPath(Path.Combine(Program.OutputDirPath, testInDocumenationFolder));
 
diff --git a/src/CodeGeneration/DocGenerator/Documentation/Files/RawDocumentationFile.cs b/src/CodeGeneration/DocGenerator/Documentation/Files/RawDocumentationFile.cs
index cfd8e960a48..aeca30e9ac5 100644
--- a/src/CodeGeneration/DocGenerator/Documentation/Files/RawDocumentationFile.cs
+++ b/src/CodeGeneration/DocGenerator/Documentation/Files/RawDocumentationFile.cs
@@ -13,7 +13,7 @@ public RawDocumentationFile(FileInfo fileLocation) : base(fileLocation) { }
 		public override Task SaveToDocumentationFolderAsync()
 		{
 			//load the asciidoc file for processing
-			var docFileName = this.CreateDocumentationLocation();
+			var docFileName = CreateDocumentationLocation();
 			var document = Document.Load(FileLocation.FullName);
 
 			// make any modifications
@@ -21,19 +21,16 @@ public override Task SaveToDocumentationFolderAsync()
 			document.Accept(rawVisitor);
 
 			// write out asciidoc to file
-			using (var visitor = new AsciiDocVisitor(docFileName.FullName))
-			{
-				document.Accept(visitor);
-			}
+			using (var visitor = new AsciiDocVisitor(docFileName.FullName)) document.Accept(visitor);
 
-		    return Task.FromResult(0);
+			return Task.FromResult(0);
 		}
 
 		protected override FileInfo CreateDocumentationLocation()
 		{
-			var testFullPath = this.FileLocation.FullName;
+			var testFullPath = FileLocation.FullName;
 			var p = "\\" + Path.DirectorySeparatorChar.ToString();
-			var testInDocumenationFolder = Regex.Replace(testFullPath, $@"(^.+{p}Tests{p}|\" + this.Extension + "$)", "").PascalToHyphen() + this.Extension;
+			var testInDocumenationFolder = Regex.Replace(testFullPath, $@"(^.+{p}Tests{p}|\" + Extension + "$)", "").PascalToHyphen() + Extension;
 
 			var documenationTargetPath = Path.GetFullPath(Path.Combine(Program.OutputDirPath, testInDocumenationFolder));
 			var fileInfo = new FileInfo(documenationTargetPath);
diff --git a/src/CodeGeneration/DocGenerator/LitUp.cs b/src/CodeGeneration/DocGenerator/LitUp.cs
index a2e5772f05d..a282f40f2b4 100644
--- a/src/CodeGeneration/DocGenerator/LitUp.cs
+++ b/src/CodeGeneration/DocGenerator/LitUp.cs
@@ -6,17 +6,16 @@
 using System.Threading.Tasks;
 using DocGenerator.Buildalyzer;
 using DocGenerator.Documentation.Files;
-using Microsoft.Build.Framework;
 using Microsoft.CodeAnalysis;
-using Microsoft.Extensions.Logging;
 
 namespace DocGenerator
 {
 	public static class LitUp
 	{
-		private static readonly string[] SkipFolders = {"Debug", "Release"};
+		private static readonly string[] SkipFolders = { "Debug", "Release" };
 
 		private static string GetProjectDir(string projectName) => Path.Combine(Program.InputDirPath, projectName);
+
 		private static string GetProjectFile(string projectName) => Path.Combine(GetProjectDir(projectName), $"{projectName}.csproj");
 
 		public static IEnumerable<DocumentationFile> InputFiles(string path) =>
@@ -40,6 +39,7 @@ public static IEnumerable<IEnumerable<DocumentationFile>> GetDocumentFiles(Dicti
 			yield return InputFiles("*.png");
 			yield return InputFiles("*.gif");
 			yield return InputFiles("*.jpg");
+
 			// process asciidocs last as they may have generated
 			// includes to other output asciidocs
 			yield return InputFiles("*.asciidoc");
@@ -68,10 +68,7 @@ public static async Task GoAsync(string[] args)
 			var projects = workspace.CurrentSolution.Projects
 				.ToDictionary(p => p.Name, StringComparer.OrdinalIgnoreCase);
 
-			foreach (var file in GetDocumentFiles(projects).SelectMany(s => s))
-			{
-				await file.SaveToDocumentationFolderAsync();
-			}
+			foreach (var file in GetDocumentFiles(projects).SelectMany(s => s)) await file.SaveToDocumentationFolderAsync();
 
 			Console.ForegroundColor = ConsoleColor.Green;
 			Console.WriteLine("Documentation generated.");
@@ -105,9 +102,7 @@ private static void AddDocumentsToWorkspace(AdhocWorkspace workspace)
 				}
 
 				if (!workspace.TryApplyChanges(project.Solution))
-				{
 					Console.WriteLine($"failed to apply changes to workspace from project {project.Name}");
-				}
 			}
 		}
 	}
diff --git a/src/CodeGeneration/DocGenerator/MethodInfoExtensions.cs b/src/CodeGeneration/DocGenerator/MethodInfoExtensions.cs
index c2b16b0016a..1efd31adcd1 100644
--- a/src/CodeGeneration/DocGenerator/MethodInfoExtensions.cs
+++ b/src/CodeGeneration/DocGenerator/MethodInfoExtensions.cs
@@ -1,130 +1,127 @@
 using System;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text;
 
 namespace DocGenerator
 {
-    public static class MethodInfoExtensions
-    {
-        /// <summary>
-        /// Return the method signature as a string.
-        /// </summary>
-        /// <param name="method">The Method</param>
-        /// <param name="callable">Return as an callable string(public void a(string b) would return a(b))</param>
-        /// <returns>Method signature</returns>
-        public static string GetSignature(this MethodInfo method, bool callable = false)
-        {
-            var firstParam = true;
-            var sigBuilder = new StringBuilder();
-            sigBuilder.Append(method.Name);
+	public static class MethodInfoExtensions
+	{
+		/// <summary>
+		/// Return the method signature as a string.
+		/// </summary>
+		/// <param name="method">The Method</param>
+		/// <param name="callable">Return as an callable string(public void a(string b) would return a(b))</param>
+		/// <returns>Method signature</returns>
+		public static string GetSignature(this MethodInfo method, bool callable = false)
+		{
+			var firstParam = true;
+			var sigBuilder = new StringBuilder();
+			sigBuilder.Append(method.Name);
 
-            // Add method generics
-            if (method.IsGenericMethod)
-            {
-                sigBuilder.Append("<");
-                foreach (var g in method.GetGenericArguments())
-                {
-                    if (firstParam)
-                        firstParam = false;
-                    else
-                        sigBuilder.Append(", ");
-                    sigBuilder.Append(TypeName(g));
-                }
-                sigBuilder.Append(">");
-            }
-            sigBuilder.Append("(");
-            firstParam = true;
-            var secondParam = false;
-            foreach (var param in method.GetParameters())
-            {
-                if (firstParam)
-                {
-                    firstParam = false;
-                    if (method.IsDefined(typeof(System.Runtime.CompilerServices.ExtensionAttribute), false))
-                    {
-                        if (callable)
-                        {
-                            secondParam = true;
-                            continue;
-                        }
-                        sigBuilder.Append("this ");
-                    }
-                }
-                else if (secondParam == true)
-                    secondParam = false;
-                else
-                    sigBuilder.Append(", ");
-                if (param.ParameterType.IsByRef)
-                    sigBuilder.Append("ref ");
-                else if (param.IsOut)
-                    sigBuilder.Append("out ");
-                if (!callable)
-                {
-                    sigBuilder.Append(TypeName(param.ParameterType));
-                    sigBuilder.Append(' ');
-                }
-                sigBuilder.Append(param.Name);
+			// Add method generics
+			if (method.IsGenericMethod)
+			{
+				sigBuilder.Append("<");
+				foreach (var g in method.GetGenericArguments())
+				{
+					if (firstParam)
+						firstParam = false;
+					else
+						sigBuilder.Append(", ");
+					sigBuilder.Append(TypeName(g));
+				}
+				sigBuilder.Append(">");
+			}
+			sigBuilder.Append("(");
+			firstParam = true;
+			var secondParam = false;
+			foreach (var param in method.GetParameters())
+			{
+				if (firstParam)
+				{
+					firstParam = false;
+					if (method.IsDefined(typeof(ExtensionAttribute), false))
+					{
+						if (callable)
+						{
+							secondParam = true;
+							continue;
+						}
+						sigBuilder.Append("this ");
+					}
+				}
+				else if (secondParam == true)
+					secondParam = false;
+				else
+					sigBuilder.Append(", ");
+				if (param.ParameterType.IsByRef)
+					sigBuilder.Append("ref ");
+				else if (param.IsOut)
+					sigBuilder.Append("out ");
+				if (!callable)
+				{
+					sigBuilder.Append(TypeName(param.ParameterType));
+					sigBuilder.Append(' ');
+				}
+				sigBuilder.Append(param.Name);
 
-                if (param.HasDefaultValue)
-                {
-                    object defaultValue;
-                    if (param.ParameterType == typeof(bool))
-                    {
-                        defaultValue = (bool) param.DefaultValue ? "true" : "false";
-                    }
-                    else
-                    {
-                        defaultValue = param.DefaultValue;
-                    }
+				if (param.HasDefaultValue)
+				{
+					object defaultValue;
+					if (param.ParameterType == typeof(bool))
+						defaultValue = (bool)param.DefaultValue ? "true" : "false";
+					else
+						defaultValue = param.DefaultValue;
 
-                    sigBuilder.Append(" = " + defaultValue);
-                }
+					sigBuilder.Append(" = " + defaultValue);
+				}
+			}
+			sigBuilder.Append(")");
+			return sigBuilder.ToString();
+		}
 
-            }
-            sigBuilder.Append(")");
-            return sigBuilder.ToString();
-        }
+		/// <summary>
+		/// Get full type name with full namespace names
+		/// </summary>
+		/// <param name="type">Type. May be generic or nullable</param>
+		/// <returns>Full type name, fully qualified namespaces</returns>
+		public static string TypeName(Type type)
+		{
+			var nullableType = Nullable.GetUnderlyingType(type);
+			if (nullableType != null)
+				return nullableType.Name + "?";
 
-        /// <summary>
-        /// Get full type name with full namespace names
-        /// </summary>
-        /// <param name="type">Type. May be generic or nullable</param>
-        /// <returns>Full type name, fully qualified namespaces</returns>
-        public static string TypeName(Type type)
-        {
-            var nullableType = Nullable.GetUnderlyingType(type);
-            if (nullableType != null)
-                return nullableType.Name + "?";
+			if (!type.IsGenericType)
+			{
+				switch (type.Name)
+				{
+					case "String": return "string";
+					case "Int32": return "int";
+					case "Decimal": return "decimal";
+					case "Object": return "object";
+					case "Void": return "void";
+					default:
+					{
+						return string.IsNullOrWhiteSpace(type.FullName) ? type.Name : type.FullName;
+					}
+				}
+			}
 
-            if (!type.IsGenericType)
-                switch (type.Name)
-                {
-                    case "String": return "string";
-                    case "Int32": return "int";
-                    case "Decimal": return "decimal";
-                    case "Object": return "object";
-                    case "Void": return "void";
-                    default:
-                    {
-                        return string.IsNullOrWhiteSpace(type.FullName) ? type.Name : type.FullName;
-                    }
-                }
-
-            var sb = new StringBuilder(type.Name.Substring(0,
-                type.Name.IndexOf('`'))
-                );
-            sb.Append('<');
-            var first = true;
-            foreach (var t in type.GetGenericArguments())
-            {
-                if (!first)
-                    sb.Append(',');
-                sb.Append(TypeName(t));
-                first = false;
-            }
-            sb.Append('>');
-            return sb.ToString();
-        }
-
-    }
-}
\ No newline at end of file
+			var sb = new StringBuilder(type.Name.Substring(0,
+				type.Name.IndexOf('`'))
+			);
+			sb.Append('<');
+			var first = true;
+			foreach (var t in type.GetGenericArguments())
+			{
+				if (!first)
+					sb.Append(',');
+				sb.Append(TypeName(t));
+				first = false;
+			}
+			sb.Append('>');
+			return sb.ToString();
+		}
+	}
+}
diff --git a/src/CodeGeneration/DocGenerator/Program.cs b/src/CodeGeneration/DocGenerator/Program.cs
index e0c9fa45c63..e1e95b3de6b 100644
--- a/src/CodeGeneration/DocGenerator/Program.cs
+++ b/src/CodeGeneration/DocGenerator/Program.cs
@@ -14,19 +14,19 @@ string P(string path)
 			}
 
 			var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
-            if (currentDirectory.Name == "DocGenerator" && currentDirectory.Parent.Name == "CodeGeneration")
+			if (currentDirectory.Name == "DocGenerator" && currentDirectory.Parent.Name == "CodeGeneration")
 			{
 				Console.WriteLine("IDE: " + currentDirectory);
-                InputDirPath = P(@"..\..\");
+				InputDirPath = P(@"..\..\");
 				OutputDirPath = P(@"..\..\..\docs");
-                BuildOutputPath = P(@"..\..\..\src");
+				BuildOutputPath = P(@"..\..\..\src");
 			}
 			else
 			{
 				Console.WriteLine("CMD: " + currentDirectory);
 				InputDirPath = P(@"..\..\..\..\src");
 				OutputDirPath = P(@"..\..\..\..\docs");
-                BuildOutputPath = P(@"..\..\..\..\build\output");
+				BuildOutputPath = P(@"..\..\..\..\build\output");
 			}
 
 			var process = new Process
@@ -56,44 +56,42 @@ string P(string path)
 			{
 				process.Dispose();
 			}
-        }
-
-        public static string BuildOutputPath { get; }
-
-		public static string InputDirPath { get; }
-
-		public static string OutputDirPath { get; }
+		}
 
 		/// <summary>
 		/// The branch name to include in generated docs to link back to the original source file
 		/// </summary>
 		public static string BranchName { get; set; }
 
+		public static string BuildOutputPath { get; }
+
 		/// <summary>
 		/// The Elasticsearch documentation version to link to
 		/// </summary>
 		public static string DocVersion => "6.4";
 
-		static int Main(string[] args)
+		public static string InputDirPath { get; }
+
+		public static string OutputDirPath { get; }
+
+		private static int Main(string[] args)
 		{
-		    try
-		    {
-			    if (args.Length > 0)
-				    BranchName = args[0];
+			try
+			{
+				if (args.Length > 0)
+					BranchName = args[0];
 
-			    Console.WriteLine($"Using branch name {BranchName} in documentation");
+				Console.WriteLine($"Using branch name {BranchName} in documentation");
 
-                LitUp.GoAsync(args).Wait();
-			    return 0;
-		    }
-		    catch (AggregateException ae)
-		    {
-			    var ex = ae.InnerException ?? ae;
-                Console.WriteLine(ex.Message);
-			    return 1;
-		    }
+				LitUp.GoAsync(args).Wait();
+				return 0;
+			}
+			catch (AggregateException ae)
+			{
+				var ex = ae.InnerException ?? ae;
+				Console.WriteLine(ex.Message);
+				return 1;
+			}
 		}
 	}
 }
-
-
diff --git a/src/CodeGeneration/DocGenerator/StringExtensions.cs b/src/CodeGeneration/DocGenerator/StringExtensions.cs
index a91f2bf7dd3..49959c6b902 100644
--- a/src/CodeGeneration/DocGenerator/StringExtensions.cs
+++ b/src/CodeGeneration/DocGenerator/StringExtensions.cs
@@ -14,134 +14,29 @@ namespace DocGenerator
 {
 	public static class StringExtensions
 	{
-        private static readonly Regex LeadingSpacesAndAsterisk = new Regex(@"^(?<value>[ \t]*\*\s?).*", RegexOptions.Compiled);
-        private static readonly Regex LeadingMultiLineComment = new Regex(@"^(?<value>[ \t]*\/\*)", RegexOptions.Compiled);
-        private static readonly Regex TrailingMultiLineComment = new Regex(@"(?<value>\*\/[ \t]*)$", RegexOptions.Compiled);
-
-		public static string PascalToHyphen(this string input)
-		{
-			if (string.IsNullOrEmpty(input)) return string.Empty;
-
-			return Regex.Replace(
-				Regex.Replace(
-					Regex.Replace(input, @"([A-Z]+)([A-Z][a-z])", "$1-$2"), @"([a-z\d])([A-Z])", "$1-$2")
-				, @"[-\s]+", "-", RegexOptions.Compiled).TrimEnd('-').ToLower();
-		}
-
-		public static string LowercaseHyphenToPascal(this string lowercaseHyphenatedInput)
-		{
-			return Regex.Replace(
-                lowercaseHyphenatedInput.Replace("-", " "),
-                @"\b([a-z])",
-                m => m.Captures[0].Value.ToUpper());
-		}
-
-		public static string TrimEnd(this string input, string trim)
-		{
-			if (string.IsNullOrEmpty(input)) return string.Empty;
-
-			return input.EndsWith(trim, StringComparison.OrdinalIgnoreCase)
-				? input.Substring(0, input.Length - trim.Length)
-				: input;
-		}
-
-		public static string RemoveLeadingAndTrailingMultiLineComments(this string input)
-		{
-			var match = LeadingMultiLineComment.Match(input);
-
-			if (match.Success)
-			{
-				input = input.Substring(match.Groups["value"].Value.Length);
-			}
-
-			match = TrailingMultiLineComment.Match(input);
-
-			if (match.Success)
-			{
-				input = input.Substring(0, input.Length - match.Groups["value"].Value.Length);
-			}
-
-			return input;
-		}
-
-		public static string RemoveLeadingSpacesAndAsterisk(this string input)
-		{
-			var match = LeadingSpacesAndAsterisk.Match(input);
-			if (match.Success)
-			{
-				input = input.Substring(match.Groups["value"].Value.Length);
-			}
-
-			return input;
-		}
-
-        ///<summary>
-        /// Removes the specified number of tabs (or spaces, assuming 4 spaces = 1 tab)
-        /// from each line of the input
-        /// </summary>
-        public static string RemoveNumberOfLeadingTabsOrSpacesAfterNewline(this string input, int numberOfTabs)
-        {
-            var leadingCharacterIndex = input.IndexOf("\t", StringComparison.OrdinalIgnoreCase);
-
-            if (leadingCharacterIndex == -1)
-            {
-                leadingCharacterIndex = input.IndexOf(" ", StringComparison.OrdinalIgnoreCase);
-
-                if (leadingCharacterIndex == -1)
-                {
-                    return input;
-                }
-            }
-
-            int count = 0;
-            char firstNonTabCharacter = char.MinValue;
-
-            for (int i = leadingCharacterIndex; i < input.Length; i++)
-            {
-                if (input[i] != '\t' && input[i] != ' ')
-                {
-                    firstNonTabCharacter = input[i];
-                    count = i - leadingCharacterIndex;
-                    break;
-                }
-            }
-
-            if (firstNonTabCharacter == '{' && numberOfTabs != count)
-            {
-                numberOfTabs = count;
-            }
-
-            return Regex.Replace(
-                Regex.Replace(
-                    input,
-                    $"(?<tabs>[\n|\r\n]+\t{{{numberOfTabs}}})",
-                    m => m.Value.Replace("\t", string.Empty)
-                    ),
-                $"(?<spaces>[\n|\r\n]+\\s{{{numberOfTabs * 4}}})",
-                m => m.Value.Replace(" ", string.Empty)
-                );
-        }
-
-        public static string[] SplitOnNewLines(this string input, StringSplitOptions options)
-		{
-			return input.Split(new[] { "\r\n", "\n" }, options);
-		}
+		private static readonly Regex LeadingMultiLineComment = new Regex(@"^(?<value>[ \t]*\/\*)", RegexOptions.Compiled);
+		private static readonly Regex LeadingSpacesAndAsterisk = new Regex(@"^(?<value>[ \t]*\*\s?).*", RegexOptions.Compiled);
 
 		// TODO: Total Hack of replacements in anonymous types that represent json. This can be resolved by referencing tests assembly when building the dynamic assembly,
 		// but might want to put doc generation at same directory level as Tests to reference project directly.
-		private static Dictionary<string, string> Substitutions = new Dictionary<string, string>
+		private static readonly Dictionary<string, string> Substitutions = new Dictionary<string, string>
 		{
 			{ "FixedDate", "new DateTime(2015, 06, 06, 12, 01, 02, 123)" },
 			{ "FirstNameToFind", "\"pierce\"" },
 			{ "Project.First.Suggest.Context.Values.SelectMany(v => v).First()", "\"red\"" },
 			{ "Project.First.Suggest.Contexts.Values.SelectMany(v => v).First()", "\"red\"" },
 			{ "Project.Instance.Name", "\"Durgan LLC\"" },
-			{ "Project.InstanceAnonymous", "new {name = \"Koch, Collier and Mohr\", state = \"BellyUp\",startedOn = " +
-			                               "\"2015-01-01T00:00:00\",lastActivity = \"0001-01-01T00:00:00\",leadDeveloper = " +
-			                               "new { gender = \"Male\", id = 0, firstName = \"Martijn\", lastName = \"Laarman\" }," +
-										   "location = new { lat = 42.1523, lon = -80.321 }}" },
+			{
+				"Project.InstanceAnonymous", "new {name = \"Koch, Collier and Mohr\", state = \"BellyUp\",startedOn = " +
+				"\"2015-01-01T00:00:00\",lastActivity = \"0001-01-01T00:00:00\",leadDeveloper = " +
+				"new { gender = \"Male\", id = 0, firstName = \"Martijn\", lastName = \"Laarman\" }," +
+				"location = new { lat = 42.1523, lon = -80.321 }}"
+			},
 			{ "_templateString", "\"{ \\\"match\\\": { \\\"text\\\": \\\"{{query_string}}\\\" } }\"" },
-			{ "base.QueryJson", "new{ @bool = new { must = new[] { new { match_all = new { } } }, must_not = new[] { new { match_all = new { } } }, should = new[] { new { match_all = new { } } }, filter = new[] { new { match_all = new { } } }, minimum_should_match = 1, boost = 2.0, } }" },
+			{
+				"base.QueryJson",
+				"new{ @bool = new { must = new[] { new { match_all = new { } } }, must_not = new[] { new { match_all = new { } } }, should = new[] { new { match_all = new { } } }, filter = new[] { new { match_all = new { } } }, minimum_should_match = 1, boost = 2.0, } }"
+			},
 			{ "ExpectedTerms", "new [] { \"term1\", \"term2\" }" },
 			{ "_ctxNumberofCommits", "\"_source.numberOfCommits > 0\"" },
 			{ "Project.First.Name", "\"Lesch Group\"" },
@@ -149,8 +44,14 @@ public static string[] SplitOnNewLines(this string input, StringSplitOptions opt
 			{ "LastNameSearch", "\"Stokes\"" },
 			{ "First.Language", "\"painless\"" },
 			{ "First.Init", "\"params._agg.map = [:]\"" },
-			{ "First.Map", "\"if (params._agg.map.containsKey(doc['state'].value)) params._agg.map[doc['state'].value] += 1 else params._agg.map[doc['state'].value] = 1;\"" },
-			{ "First.Reduce", "\"def reduce = [:]; for (agg in params._aggs) { for (entry in agg.map.entrySet()) { if (reduce.containsKey(entry.getKey())) reduce[entry.getKey()] += entry.getValue(); else reduce[entry.getKey()] = entry.getValue(); } } return reduce;\"" },
+			{
+				"First.Map",
+				"\"if (params._agg.map.containsKey(doc['state'].value)) params._agg.map[doc['state'].value] += 1 else params._agg.map[doc['state'].value] = 1;\""
+			},
+			{
+				"First.Reduce",
+				"\"def reduce = [:]; for (agg in params._aggs) { for (entry in agg.map.entrySet()) { if (reduce.containsKey(entry.getKey())) reduce[entry.getKey()] += entry.getValue(); else reduce[entry.getKey()] = entry.getValue(); } } return reduce;\""
+			},
 			{ "Second.Language", "\"painless\"" },
 			{ "Second.Combine", "\"def sum = 0.0; for (c in params._agg.commits) { sum += c } return sum\"" },
 			{ "Second.Init", "\"params._agg.commits = []\"" },
@@ -164,13 +65,16 @@ public static string[] SplitOnNewLines(this string input, StringSplitOptions opt
 			{ "EnvelopeCoordinates", @"new [] { new [] { 45.0, -45.0 }, new [] { -45.0, 45.0 }}" },
 			{ "CircleCoordinates", @"new [] { 45.0, -45.0 }" },
 			{ "MultiPointCoordinates", @"new [] { new [] {38.897676, -77.03653}, new [] {38.889939, -77.009051} }" },
-			{ "MultiLineStringCoordinates", @"new[]
+			{
+				"MultiLineStringCoordinates", @"new[]
 											{
 												new [] { new [] { 2.0, 12.0 }, new [] { 2.0, 13.0 },new [] { 3.0, 13.0 }, new []{ 3.0, 12.0 } },
 												new [] { new [] { 0.0, 10.0 }, new [] { 0.0, 11.0 },new [] { 1.0, 11.0 }, new []{ 1.0, 10.0 } },
 												new [] { new [] { 0.2, 10.2 }, new [] { 0.2, 10.8 },new [] { 0.8, 10.8 }, new []{ 0.8, 12.0 } },
-											}" },
-			{ "MultiPolygonCoordinates", @"new[]
+											}"
+			},
+			{
+				"MultiPolygonCoordinates", @"new[]
 											{
 												new []
 												{
@@ -203,29 +107,123 @@ public static string[] SplitOnNewLines(this string input, StringSplitOptions opt
 														new [] { 8.0, -15.0}
 													}
 												}
-											}" },
-			{ "PolygonCoordinates", @"new[]{
+											}"
+			},
+			{
+				"PolygonCoordinates", @"new[]{
 										new []{ new [] {10.0, -17.0}, new [] {15.0, 16.0}, new [] {0.0, 12.0}, new [] {-15.0, 16.0}, new [] {-10.0, -17.0},new [] {10.0, -17.0}},
 										new []{ new [] {8.2, 18.2}, new [] {8.2, -18.8}, new [] {-8.8, -10.8}, new [] {8.8, 18.2}}
-									}" },
+									}"
+			},
 			{ "LineStringCoordinates", @"new [] { new [] {38.897676, -77.03653}, new [] {38.889939, -77.009051} }" },
 			{ "PointCoordinates", "new[] { 38.897676, -77.03653 }" },
-			{ "this._polygonCoordinates", @"new[]{
+			{
+				"this._polygonCoordinates", @"new[]{
 										new []{ new [] {10.0, -17.0}, new [] {15.0, 16.0}, new [] {0.0, 12.0}, new [] {-15.0, 16.0}, new [] {-10.0, -17.0},new [] {10.0, -17.0}},
 										new []{ new [] {8.2, 18.2}, new [] {8.2, -18.8}, new [] {-8.8, -10.8}, new [] {8.8, 18.2}}
-									}" },
-			{ "ProjectFilterExpectedJson", "new {term = new {type = new {value = \"project\"}}}"  }
+									}"
+			},
+			{ "ProjectFilterExpectedJson", "new {term = new {type = new {value = \"project\"}}}" }
 		};
 
-		public static bool TryGetJsonForAnonymousType(this string anonymousTypeString, out string json)
+		private static readonly Regex TrailingMultiLineComment = new Regex(@"(?<value>\*\/[ \t]*)$", RegexOptions.Compiled);
+
+		public static string PascalToHyphen(this string input)
 		{
-			json = null;
+			if (string.IsNullOrEmpty(input)) return string.Empty;
+
+			return Regex.Replace(
+					Regex.Replace(
+						Regex.Replace(input, @"([A-Z]+)([A-Z][a-z])", "$1-$2"), @"([a-z\d])([A-Z])", "$1-$2")
+					, @"[-\s]+", "-", RegexOptions.Compiled)
+				.TrimEnd('-')
+				.ToLower();
+		}
+
+		public static string LowercaseHyphenToPascal(this string lowercaseHyphenatedInput) => Regex.Replace(
+			lowercaseHyphenatedInput.Replace("-", " "),
+			@"\b([a-z])",
+			m => m.Captures[0].Value.ToUpper());
 
-			foreach (var substitution in Substitutions)
+		public static string TrimEnd(this string input, string trim)
+		{
+			if (string.IsNullOrEmpty(input)) return string.Empty;
+
+			return input.EndsWith(trim, StringComparison.OrdinalIgnoreCase)
+				? input.Substring(0, input.Length - trim.Length)
+				: input;
+		}
+
+		public static string RemoveLeadingAndTrailingMultiLineComments(this string input)
+		{
+			var match = LeadingMultiLineComment.Match(input);
+
+			if (match.Success) input = input.Substring(match.Groups["value"].Value.Length);
+
+			match = TrailingMultiLineComment.Match(input);
+
+			if (match.Success) input = input.Substring(0, input.Length - match.Groups["value"].Value.Length);
+
+			return input;
+		}
+
+		public static string RemoveLeadingSpacesAndAsterisk(this string input)
+		{
+			var match = LeadingSpacesAndAsterisk.Match(input);
+			if (match.Success) input = input.Substring(match.Groups["value"].Value.Length);
+
+			return input;
+		}
+
+		/// <summary>
+		///  Removes the specified number of tabs (or spaces, assuming 4 spaces = 1 tab)
+		///  from each line of the input
+		/// </summary>
+		public static string RemoveNumberOfLeadingTabsOrSpacesAfterNewline(this string input, int numberOfTabs)
+		{
+			var leadingCharacterIndex = input.IndexOf("\t", StringComparison.OrdinalIgnoreCase);
+
+			if (leadingCharacterIndex == -1)
 			{
-				anonymousTypeString = anonymousTypeString.Replace(substitution.Key, substitution.Value);
+				leadingCharacterIndex = input.IndexOf(" ", StringComparison.OrdinalIgnoreCase);
+
+				if (leadingCharacterIndex == -1) return input;
+			}
+
+			var count = 0;
+			var firstNonTabCharacter = char.MinValue;
+
+			for (var i = leadingCharacterIndex; i < input.Length; i++)
+			{
+				if (input[i] != '\t' && input[i] != ' ')
+				{
+					firstNonTabCharacter = input[i];
+					count = i - leadingCharacterIndex;
+					break;
+				}
 			}
 
+			if (firstNonTabCharacter == '{' && numberOfTabs != count) numberOfTabs = count;
+
+			return Regex.Replace(
+				Regex.Replace(
+					input,
+					$"(?<tabs>[\n|\r\n]+\t{{{numberOfTabs}}})",
+					m => m.Value.Replace("\t", string.Empty)
+				),
+				$"(?<spaces>[\n|\r\n]+\\s{{{numberOfTabs * 4}}})",
+				m => m.Value.Replace(" ", string.Empty)
+			);
+		}
+
+		public static string[] SplitOnNewLines(this string input, StringSplitOptions options) => input.Split(new[] { "\r\n", "\n" }, options);
+
+		public static bool TryGetJsonForAnonymousType(this string anonymousTypeString, out string json)
+		{
+			json = null;
+
+			foreach (var substitution in Substitutions) anonymousTypeString = anonymousTypeString.Replace(substitution.Key, substitution.Value);
+
 			var text =
 				$@"
 					using System;
@@ -288,10 +286,7 @@ public string Write()
 						diagnostic.Severity == DiagnosticSeverity.Error);
 
 					var builder = new StringBuilder($"Unable to serialize the following C# anonymous type string to json: {anonymousTypeString}");
-					foreach (var diagnostic in failures)
-					{
-						builder.AppendLine($"{diagnostic.Id}: {diagnostic.GetMessage()}");
-					}
+					foreach (var diagnostic in failures) builder.AppendLine($"{diagnostic.Id}: {diagnostic.GetMessage()}");
 					builder.AppendLine(new string('-', 30));
 
 					Console.Error.WriteLine(builder.ToString());
@@ -315,18 +310,18 @@ public string Write()
 			}
 		}
 
-	    public static string ReplaceArityWithGenericSignature(this string value)
-	    {
-            var indexOfBackTick = value.IndexOf("`");
+		public static string ReplaceArityWithGenericSignature(this string value)
+		{
+			var indexOfBackTick = value.IndexOf("`");
 
-            if (indexOfBackTick == -1)
-                return value;
+			if (indexOfBackTick == -1)
+				return value;
 
-            var arity = value[indexOfBackTick + 1];
-            value = value.Substring(0, indexOfBackTick);
+			var arity = value[indexOfBackTick + 1];
+			value = value.Substring(0, indexOfBackTick);
 
-            return Enumerable.Range(1, int.Parse(arity.ToString()))
-                .Aggregate(value + "<", (l, i) => l = l + (i == 1 ? "T" : $"T{i}")) + ">";
-	    }
+			return Enumerable.Range(1, int.Parse(arity.ToString()))
+				.Aggregate(value + "<", (l, i) => l = l + (i == 1 ? "T" : $"T{i}")) + ">";
+		}
 	}
 }
diff --git a/src/CodeGeneration/DocGenerator/SyntaxNodeExtensions.cs b/src/CodeGeneration/DocGenerator/SyntaxNodeExtensions.cs
index 0f88029efe1..0639c819db7 100644
--- a/src/CodeGeneration/DocGenerator/SyntaxNodeExtensions.cs
+++ b/src/CodeGeneration/DocGenerator/SyntaxNodeExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;
@@ -9,99 +8,94 @@ namespace DocGenerator
 {
 	public static class SyntaxNodeExtensions
 	{
-        private static readonly Regex SingleLineHideComment = new Regex(@"\/\/\s*hide", RegexOptions.Compiled);
-        private static readonly Regex SingleLineJsonComment = new Regex(@"\/\/\s*json", RegexOptions.Compiled);
-
-        /// <summary>
-        /// Determines if the node should be hidden i.e. not included in the documentation,
-        /// based on the precedence of a //hide single line comment
-        /// </summary>
-        public static bool ShouldBeHidden(this SyntaxNode node) =>
-            node.HasLeadingTrivia && ShouldBeHidden(node, node.GetLeadingTrivia());
-
-        public static bool ShouldBeHidden(this SyntaxNode node, SyntaxTriviaList leadingTrivia) =>
-            leadingTrivia != default(SyntaxTriviaList) &&
-            SingleLineHideComment.IsMatch(node.GetLeadingTrivia().ToFullString());
-
-        /// <summary>
-        /// Determines if the node should be json serialized based on the precedence of
-        /// a //json single line comment
-        /// </summary>
-        public static bool ShouldBeConvertedToJson(this SyntaxNode node) =>
-            node.HasLeadingTrivia && ShouldBeConvertedToJson(node, node.GetLeadingTrivia());
-
-        /// <summary>
-        /// Determines if the node should be json serialized based on the precedence of
-        /// a //json single line comment
-        /// </summary>
-        public static bool ShouldBeConvertedToJson(this SyntaxNode node, SyntaxTriviaList leadingTrivia)
-        {
-            if (leadingTrivia == default(SyntaxTriviaList))
-                return false;
-
-            var singleLineCommentIndex = leadingTrivia.IndexOf(SyntaxKind.SingleLineCommentTrivia);
-
-            if (singleLineCommentIndex == -1)
-                return false;
-
-            // all trivia after the single line should be whitespace or end of line
-            if (!leadingTrivia
-                .SkipWhile((l, i) => i < singleLineCommentIndex)
-                .Any(l => l.IsKind(SyntaxKind.EndOfLineTrivia) || l.IsKind(SyntaxKind.WhitespaceTrivia)))
-            {
-                return false;
-            }
-
-            return SingleLineJsonComment.IsMatch(leadingTrivia.ElementAt(singleLineCommentIndex).ToFullString());
-        }
-
-        /// <summary>
-        /// Determines if the node is preceded by any multiline documentation.
-        /// </summary>
-        /// <param name="node">The node.</param>
-        public static bool HasMultiLineDocumentationCommentTrivia(this SyntaxNode node) =>
-            node.HasLeadingTrivia &&
-	        node.GetLeadingTrivia().Any(c => c.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia));
-
-        /// <summary>
-        /// Try to get the json representation of the first anonymous object expression descendent
-        /// node.
-        /// </summary>
-        /// <param name="node"></param>
-        /// <param name="json"></param>
-        /// <returns></returns>
-        public static bool TryGetJsonForSyntaxNode(this SyntaxNode node, out string json)
-        {
-            json = null;
-
-            // find the first anonymous object expression
-            var creationExpressionSyntax = node.DescendantNodes()
-                .OfType<AnonymousObjectCreationExpressionSyntax>()
-                .FirstOrDefault();
-
-            return creationExpressionSyntax != null &&
-                   creationExpressionSyntax.ToFullString().TryGetJsonForAnonymousType(out json);
-        }
-
-        /// <summary>
-        /// Gets the starting line of the node
-        /// </summary>
-        /// <param name="node">The node.</param>
-        /// <returns></returns>
-        public static int StartingLine(this SyntaxNode node) =>
-            node.SyntaxTree.GetLineSpan(node.Span).StartLinePosition.Line;
-
-	    public static SyntaxNode WithLeadingEndOfLineTrivia(this SyntaxNode node)
-	    {
-	        var leadingTrivia = node.GetLeadingTrivia();
-	        var triviaToRemove = leadingTrivia.Reverse().SkipWhile(t => t.IsKind(SyntaxKind.EndOfLineTrivia));
-	        foreach (var syntaxTrivia in triviaToRemove)
-	        {
-                node = node.ReplaceTrivia(syntaxTrivia, default(SyntaxTrivia));
-            }
-
-	        return node;
-	    }
+		private static readonly Regex SingleLineHideComment = new Regex(@"\/\/\s*hide", RegexOptions.Compiled);
+		private static readonly Regex SingleLineJsonComment = new Regex(@"\/\/\s*json", RegexOptions.Compiled);
+
+		/// <summary>
+		/// Determines if the node should be hidden i.e. not included in the documentation,
+		/// based on the precedence of a //hide single line comment
+		/// </summary>
+		public static bool ShouldBeHidden(this SyntaxNode node) =>
+			node.HasLeadingTrivia && ShouldBeHidden(node, node.GetLeadingTrivia());
+
+		public static bool ShouldBeHidden(this SyntaxNode node, SyntaxTriviaList leadingTrivia) =>
+			leadingTrivia != default(SyntaxTriviaList) &&
+			SingleLineHideComment.IsMatch(node.GetLeadingTrivia().ToFullString());
+
+		/// <summary>
+		/// Determines if the node should be json serialized based on the precedence of
+		/// a //json single line comment
+		/// </summary>
+		public static bool ShouldBeConvertedToJson(this SyntaxNode node) =>
+			node.HasLeadingTrivia && ShouldBeConvertedToJson(node, node.GetLeadingTrivia());
+
+		/// <summary>
+		/// Determines if the node should be json serialized based on the precedence of
+		/// a //json single line comment
+		/// </summary>
+		public static bool ShouldBeConvertedToJson(this SyntaxNode node, SyntaxTriviaList leadingTrivia)
+		{
+			if (leadingTrivia == default(SyntaxTriviaList))
+				return false;
+
+			var singleLineCommentIndex = leadingTrivia.IndexOf(SyntaxKind.SingleLineCommentTrivia);
+
+			if (singleLineCommentIndex == -1)
+				return false;
+
+			// all trivia after the single line should be whitespace or end of line
+			if (!leadingTrivia
+				.SkipWhile((l, i) => i < singleLineCommentIndex)
+				.Any(l => l.IsKind(SyntaxKind.EndOfLineTrivia) || l.IsKind(SyntaxKind.WhitespaceTrivia)))
+				return false;
+
+			return SingleLineJsonComment.IsMatch(leadingTrivia.ElementAt(singleLineCommentIndex).ToFullString());
+		}
+
+		/// <summary>
+		/// Determines if the node is preceded by any multiline documentation.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public static bool HasMultiLineDocumentationCommentTrivia(this SyntaxNode node) =>
+			node.HasLeadingTrivia &&
+			node.GetLeadingTrivia().Any(c => c.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia));
+
+		/// <summary>
+		/// Try to get the json representation of the first anonymous object expression descendent
+		/// node.
+		/// </summary>
+		/// <param name="node"></param>
+		/// <param name="json"></param>
+		/// <returns></returns>
+		public static bool TryGetJsonForSyntaxNode(this SyntaxNode node, out string json)
+		{
+			json = null;
+
+			// find the first anonymous object expression
+			var creationExpressionSyntax = node.DescendantNodes()
+				.OfType<AnonymousObjectCreationExpressionSyntax>()
+				.FirstOrDefault();
+
+			return creationExpressionSyntax != null &&
+				creationExpressionSyntax.ToFullString().TryGetJsonForAnonymousType(out json);
+		}
+
+		/// <summary>
+		/// Gets the starting line of the node
+		/// </summary>
+		/// <param name="node">The node.</param>
+		/// <returns></returns>
+		public static int StartingLine(this SyntaxNode node) =>
+			node.SyntaxTree.GetLineSpan(node.Span).StartLinePosition.Line;
+
+		public static SyntaxNode WithLeadingEndOfLineTrivia(this SyntaxNode node)
+		{
+			var leadingTrivia = node.GetLeadingTrivia();
+			var triviaToRemove = leadingTrivia.Reverse().SkipWhile(t => t.IsKind(SyntaxKind.EndOfLineTrivia));
+			foreach (var syntaxTrivia in triviaToRemove) node = node.ReplaceTrivia(syntaxTrivia, default(SyntaxTrivia));
+
+			return node;
+		}
 
 		/// <summary>
 		/// Gets the text representation of a syntax node without #pragma directives
@@ -113,5 +107,5 @@ public static string ToFullStringWithoutPragmaWarningDirectiveTrivia(this Syntax
 			var pragma = node.DescendantTrivia(s => true, true).Where(t => t.IsKind(SyntaxKind.PragmaWarningDirectiveTrivia));
 			return node.ReplaceTrivia(pragma, (s, r) => default(SyntaxTrivia)).ToFullString();
 		}
-    }
+	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Walkers/CSharpDocumentationFileWalker.cs b/src/CodeGeneration/DocGenerator/Walkers/CSharpDocumentationFileWalker.cs
index 392705f5ac1..bb3665ca291 100644
--- a/src/CodeGeneration/DocGenerator/Walkers/CSharpDocumentationFileWalker.cs
+++ b/src/CodeGeneration/DocGenerator/Walkers/CSharpDocumentationFileWalker.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
 using DocGenerator.Documentation.Blocks;
 using Microsoft.CodeAnalysis;
@@ -9,289 +10,249 @@
 
 namespace DocGenerator.Walkers
 {
-    /// <summary>
-    /// Walks a C# syntax tree, extracting out code and multiline comments for use
-    /// within asciidoc documentation
-    /// </summary>
-    public class CSharpDocumentationFileWalker : CSharpSyntaxWalker
-    {
-        protected readonly IList<IDocumentationBlock> Blocks;
-
-        public CSharpDocumentationFileWalker(IList<IDocumentationBlock> blocks) : base(SyntaxWalkerDepth.StructuredTrivia)
-        {
-            Blocks = blocks;
-        }
-
-        protected int ClassDepth { get; set; }
-
-        public override void VisitInterfaceDeclaration(InterfaceDeclarationSyntax node)
-        {
-            if (node.ShouldBeHidden()) return;
-
-            if (node.ChildNodes().All(childNode => childNode.IsKind(SyntaxKind.PropertyDeclaration) ||
-                                                   childNode.IsKind(SyntaxKind.AttributeList)))
-            {
-                // simple nested interface	
-                AddNestedType(node);
-            }
-        }
-
-        public override void VisitClassDeclaration(ClassDeclarationSyntax node)
-        {
-            if (node.ShouldBeHidden()) return;
-
-            ++ClassDepth;
-            if (ClassDepth == 1)
-            {
-                // walk the top level class
-                base.VisitClassDeclaration(node);
-            }
-            else if (node.ChildNodes().All(childNode => childNode.IsKind(SyntaxKind.PropertyDeclaration) ||
-                                                        childNode.IsKind(SyntaxKind.AttributeList)))
-            {
-                // we have a simple nested POCO class inside of a class
-                AddNestedType(node);
-            }
-            else
-            {
-                var methods = node.ChildNodes().OfType<MethodDeclarationSyntax>();
-                if (!methods.Any(m => m.AttributeLists.SelectMany(a => a.Attributes).Any()))
-                {
-                    // nested class with methods that are not unit or integration tests 
-                    // e.g. example PropertyVisitor in Automap.doc.cs
-                    AddNestedType(node);
-                }
-            }
-            --ClassDepth;
-        }
-
-        protected virtual bool SerializePropertyDeclarationToJson(PropertyDeclarationSyntax node) => false;
-
-        public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
-        {
-            var trivia = node.HasLeadingTrivia
-                ? node.GetLeadingTrivia()
-                : default(SyntaxTriviaList);
-
-            if (node.ShouldBeHidden(trivia)) return;
-
-            // multiline comment on property
-            AddMultiLineDocumentationComment(trivia);
-
-            // allow derived types to determine if this method should be json serialized
-            if (SerializePropertyDeclarationToJson(node)) return;
-
-            var memberName = node.Identifier.Text;
-
-            // decide whether we should strip the modifier/accessor and return type, based on if
-            // this is a property on the top level class
-            if (ClassDepth == 1)
-            {
-                var arrowExpressionClauseSyntax =
-                    node.ChildNodes().OfType<ArrowExpressionClauseSyntax>().FirstOrDefault();
-
-                if (arrowExpressionClauseSyntax != null)
-                {
-                    var firstChildNode = arrowExpressionClauseSyntax.ChildNodes().First();
-                    Blocks.Add(new CSharpBlock(firstChildNode, ClassDepth, memberName));
-                }
-                else
-                {
-                    // property getter
-                    var blockNode = node.DescendantNodes().OfType<BlockSyntax>().FirstOrDefault();
-
-                    if (blockNode != null)
-                    {
-                        AddBlockChildNodes(blockNode, memberName);
-                    }
-                }
-            }
-            else
-            {
-                // assume this is a nested class' property
-                Blocks.Add(new CSharpBlock(node, ClassDepth, memberName));
-            }
-
-            if (node.HasTrailingTrivia)
-            {
-                trivia = node.GetTrailingTrivia();
-                AddMultiLineDocumentationComment(trivia);
-            }         
-        }
-
-        protected virtual bool SerializeMethodDeclarationToJson(MethodDeclarationSyntax node) => false;
-
-        public override void VisitMethodDeclaration(MethodDeclarationSyntax node)
-        {
-            var leadingTrivia = node.HasLeadingTrivia
-                ? node.GetLeadingTrivia()
-                : default(SyntaxTriviaList);
-
-            // multiline comment on method
-            AddMultiLineDocumentationComment(leadingTrivia);
-
-            if (node.ShouldBeHidden(leadingTrivia)) return;
-
-            // allow derived types to determine if this method should be json serialized
-            if (SerializeMethodDeclarationToJson(node)) return;
-
-            var memberName = node.Identifier.Text;
-
-            foreach(var blockNode in node.ChildNodes().OfType<BlockSyntax>())
-            {
-                AddBlockChildNodes(blockNode, memberName);
-            }
-
-            foreach (var syntax in node.ChildNodes().Where(c => c.IsKind(SyntaxKind.ArrowExpressionClause)))
-            {
-                var syntaxNode = syntax.ChildNodes().First();
-                Blocks.Add(new CSharpBlock(syntaxNode, ClassDepth, memberName));
-            }
-        }
-
-        public override void VisitTrivia(SyntaxTrivia trivia)
-        {
-            if (!trivia.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia))
-            {
-                base.VisitTrivia(trivia);
-                return;
-            }
-
-            var tokens = trivia.ToFullString()
-                .RemoveLeadingAndTrailingMultiLineComments()
-                .SplitOnNewLines(StringSplitOptions.None);
-            var builder = new StringBuilder();
-
-            foreach (var token in tokens)
-            {
-                var currentToken = token.RemoveLeadingSpacesAndAsterisk();
-                var decodedToken = System.Net.WebUtility.HtmlDecode(currentToken);
-                builder.AppendLine(decodedToken);
-            }
-
-            var text = builder.ToString();
-            var line = trivia.SyntaxTree.GetLineSpan(trivia.Span).StartLinePosition.Line;
-
-            Blocks.Add(new TextBlock(text, line));
-        }
-
-        private void AddNestedType(BaseTypeDeclarationSyntax node)
-        {
-            var blockAdded = false;
-
-            if (node.HasLeadingTrivia)
-            {
-                var leadingTrivia = node.GetLeadingTrivia();
-
-                if (node.ShouldBeHidden(leadingTrivia))
-                {
-                    return;
-                }
-
-                // inline multiline comment
-                AddMultiLineDocumentationComment(leadingTrivia);
-
-                if (node.ShouldBeConvertedToJson(leadingTrivia))
-                {
-                    string json;
-                    if (node.TryGetJsonForSyntaxNode(out json))
-                    {
-                        var startingLine = node.SyntaxTree.GetLineSpan(node.Span).StartLinePosition.Line;
-                        Blocks.Add(new JavaScriptBlock(json, startingLine, ClassDepth, node.Identifier.Text));
-                        blockAdded = true;
-                    }
-                }
-            }
-
-            if (!blockAdded)
-            {
-                Blocks.Add(new CSharpBlock(node, ClassDepth));
-            }
-        }
-
-        private void AddBlockChildNodes(BlockSyntax node, string memberName)
-        {
-            CSharpBlock codeBlock = null;
-            foreach (var blockChildNode in node.ChildNodes())
-            {
-                if (blockChildNode.HasLeadingTrivia)
-                {
-                    var trivia = blockChildNode.GetLeadingTrivia();
-
-                    // inside method multiline comment
-                    AddMultiLineDocumentationComment(trivia, () =>
-                    {
-                        // flush what we may have collected so far
-                        if (codeBlock != null)
-                        {
-                            Blocks.Add(codeBlock);
-                            codeBlock = null;
-                        }
-                    });
-
-                    if (blockChildNode.ShouldBeHidden(trivia))
-                        continue;
-
-                    if (blockChildNode.ShouldBeConvertedToJson(trivia))
-                    {
-                        string json;
-                        if (blockChildNode.TryGetJsonForSyntaxNode(out json))
-                        {
-                            // flush what we may have collected so far
-                            if (codeBlock != null)
-                            {
-                                Blocks.Add(codeBlock);
-                                codeBlock = null;
-                            }
-
-                            var startingLine = blockChildNode.StartingLine();
-                            Blocks.Add(new JavaScriptBlock(json, startingLine, ClassDepth, memberName));
-                            continue;
-                        }
-                    }
-                }
-
-                if (codeBlock == null)
-                {
-                    codeBlock = new CSharpBlock(blockChildNode, ClassDepth, memberName);
-                }
-                else
-                {
-                    codeBlock.AddNode(blockChildNode);
-                }
-
-                if (blockChildNode.HasTrailingTrivia)
-                {
-                    var trivia = blockChildNode.GetTrailingTrivia();
-                    AddMultiLineDocumentationComment(trivia, () =>
-                    {
-                        // flush what we may have collected so far
-                        if (codeBlock != null)
-                        {
-                            Blocks.Add(codeBlock);
-                            codeBlock = null;
-                        }
-                    });
-                }
-            }
-
-            if (codeBlock != null)
-            {
-                Blocks.Add(codeBlock);
-            }
-        }
-
-        private void AddMultiLineDocumentationComment(SyntaxTriviaList leadingTrivia, Action actionIfFound = null)
-        {
-            if (leadingTrivia.Any(l => l.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia)))
-            {
-                actionIfFound?.Invoke();
-
-                foreach (var trivia in leadingTrivia)
-                {
-                    VisitTrivia(trivia);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
+	/// <summary>
+	/// Walks a C# syntax tree, extracting out code and multiline comments for use
+	/// within asciidoc documentation
+	/// </summary>
+	public class CSharpDocumentationFileWalker : CSharpSyntaxWalker
+	{
+		protected readonly IList<IDocumentationBlock> Blocks;
+
+		public CSharpDocumentationFileWalker(IList<IDocumentationBlock> blocks) : base(SyntaxWalkerDepth.StructuredTrivia) => Blocks = blocks;
+
+		protected int ClassDepth { get; set; }
+
+		public override void VisitInterfaceDeclaration(InterfaceDeclarationSyntax node)
+		{
+			if (node.ShouldBeHidden()) return;
+
+			if (node.ChildNodes()
+				.All(childNode => childNode.IsKind(SyntaxKind.PropertyDeclaration) ||
+					childNode.IsKind(SyntaxKind.AttributeList)))
+				AddNestedType(node);
+		}
+
+		public override void VisitClassDeclaration(ClassDeclarationSyntax node)
+		{
+			if (node.ShouldBeHidden()) return;
+
+			++ClassDepth;
+			if (ClassDepth == 1)
+				base.VisitClassDeclaration(node);
+			else if (node.ChildNodes()
+				.All(childNode => childNode.IsKind(SyntaxKind.PropertyDeclaration) ||
+					childNode.IsKind(SyntaxKind.AttributeList)))
+				AddNestedType(node);
+			else
+			{
+				var methods = node.ChildNodes().OfType<MethodDeclarationSyntax>();
+				if (!methods.Any(m => m.AttributeLists.SelectMany(a => a.Attributes).Any())) AddNestedType(node);
+			}
+			--ClassDepth;
+		}
+
+		protected virtual bool SerializePropertyDeclarationToJson(PropertyDeclarationSyntax node) => false;
+
+		public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
+		{
+			var trivia = node.HasLeadingTrivia
+				? node.GetLeadingTrivia()
+				: default(SyntaxTriviaList);
+
+			if (node.ShouldBeHidden(trivia)) return;
+
+			// multiline comment on property
+			AddMultiLineDocumentationComment(trivia);
+
+			// allow derived types to determine if this method should be json serialized
+			if (SerializePropertyDeclarationToJson(node)) return;
+
+			var memberName = node.Identifier.Text;
+
+			// decide whether we should strip the modifier/accessor and return type, based on if
+			// this is a property on the top level class
+			if (ClassDepth == 1)
+			{
+				var arrowExpressionClauseSyntax =
+					node.ChildNodes().OfType<ArrowExpressionClauseSyntax>().FirstOrDefault();
+
+				if (arrowExpressionClauseSyntax != null)
+				{
+					var firstChildNode = arrowExpressionClauseSyntax.ChildNodes().First();
+					Blocks.Add(new CSharpBlock(firstChildNode, ClassDepth, memberName));
+				}
+				else
+				{
+					// property getter
+					var blockNode = node.DescendantNodes().OfType<BlockSyntax>().FirstOrDefault();
+
+					if (blockNode != null) AddBlockChildNodes(blockNode, memberName);
+				}
+			}
+			else
+				Blocks.Add(new CSharpBlock(node, ClassDepth, memberName));
+
+			if (node.HasTrailingTrivia)
+			{
+				trivia = node.GetTrailingTrivia();
+				AddMultiLineDocumentationComment(trivia);
+			}
+		}
+
+		protected virtual bool SerializeMethodDeclarationToJson(MethodDeclarationSyntax node) => false;
+
+		public override void VisitMethodDeclaration(MethodDeclarationSyntax node)
+		{
+			var leadingTrivia = node.HasLeadingTrivia
+				? node.GetLeadingTrivia()
+				: default(SyntaxTriviaList);
+
+			// multiline comment on method
+			AddMultiLineDocumentationComment(leadingTrivia);
+
+			if (node.ShouldBeHidden(leadingTrivia)) return;
+
+			// allow derived types to determine if this method should be json serialized
+			if (SerializeMethodDeclarationToJson(node)) return;
+
+			var memberName = node.Identifier.Text;
+
+			foreach (var blockNode in node.ChildNodes().OfType<BlockSyntax>()) AddBlockChildNodes(blockNode, memberName);
+
+			foreach (var syntax in node.ChildNodes().Where(c => c.IsKind(SyntaxKind.ArrowExpressionClause)))
+			{
+				var syntaxNode = syntax.ChildNodes().First();
+				Blocks.Add(new CSharpBlock(syntaxNode, ClassDepth, memberName));
+			}
+		}
+
+		public override void VisitTrivia(SyntaxTrivia trivia)
+		{
+			if (!trivia.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia))
+			{
+				base.VisitTrivia(trivia);
+				return;
+			}
+
+			var tokens = trivia.ToFullString()
+				.RemoveLeadingAndTrailingMultiLineComments()
+				.SplitOnNewLines(StringSplitOptions.None);
+			var builder = new StringBuilder();
+
+			foreach (var token in tokens)
+			{
+				var currentToken = token.RemoveLeadingSpacesAndAsterisk();
+				var decodedToken = WebUtility.HtmlDecode(currentToken);
+				builder.AppendLine(decodedToken);
+			}
+
+			var text = builder.ToString();
+			var line = trivia.SyntaxTree.GetLineSpan(trivia.Span).StartLinePosition.Line;
+
+			Blocks.Add(new TextBlock(text, line));
+		}
+
+		private void AddNestedType(BaseTypeDeclarationSyntax node)
+		{
+			var blockAdded = false;
+
+			if (node.HasLeadingTrivia)
+			{
+				var leadingTrivia = node.GetLeadingTrivia();
+
+				if (node.ShouldBeHidden(leadingTrivia)) return;
+
+				// inline multiline comment
+				AddMultiLineDocumentationComment(leadingTrivia);
+
+				if (node.ShouldBeConvertedToJson(leadingTrivia))
+				{
+					string json;
+					if (node.TryGetJsonForSyntaxNode(out json))
+					{
+						var startingLine = node.SyntaxTree.GetLineSpan(node.Span).StartLinePosition.Line;
+						Blocks.Add(new JavaScriptBlock(json, startingLine, ClassDepth, node.Identifier.Text));
+						blockAdded = true;
+					}
+				}
+			}
+
+			if (!blockAdded) Blocks.Add(new CSharpBlock(node, ClassDepth));
+		}
+
+		private void AddBlockChildNodes(BlockSyntax node, string memberName)
+		{
+			CSharpBlock codeBlock = null;
+			foreach (var blockChildNode in node.ChildNodes())
+			{
+				if (blockChildNode.HasLeadingTrivia)
+				{
+					var trivia = blockChildNode.GetLeadingTrivia();
+
+					// inside method multiline comment
+					AddMultiLineDocumentationComment(trivia, () =>
+					{
+						// flush what we may have collected so far
+						if (codeBlock != null)
+						{
+							Blocks.Add(codeBlock);
+							codeBlock = null;
+						}
+					});
+
+					if (blockChildNode.ShouldBeHidden(trivia))
+						continue;
+
+					if (blockChildNode.ShouldBeConvertedToJson(trivia))
+					{
+						string json;
+						if (blockChildNode.TryGetJsonForSyntaxNode(out json))
+						{
+							// flush what we may have collected so far
+							if (codeBlock != null)
+							{
+								Blocks.Add(codeBlock);
+								codeBlock = null;
+							}
+
+							var startingLine = blockChildNode.StartingLine();
+							Blocks.Add(new JavaScriptBlock(json, startingLine, ClassDepth, memberName));
+							continue;
+						}
+					}
+				}
+
+				if (codeBlock == null)
+					codeBlock = new CSharpBlock(blockChildNode, ClassDepth, memberName);
+				else
+					codeBlock.AddNode(blockChildNode);
+
+				if (blockChildNode.HasTrailingTrivia)
+				{
+					var trivia = blockChildNode.GetTrailingTrivia();
+					AddMultiLineDocumentationComment(trivia, () =>
+					{
+						// flush what we may have collected so far
+						if (codeBlock != null)
+						{
+							Blocks.Add(codeBlock);
+							codeBlock = null;
+						}
+					});
+				}
+			}
+
+			if (codeBlock != null) Blocks.Add(codeBlock);
+		}
+
+		private void AddMultiLineDocumentationComment(SyntaxTriviaList leadingTrivia, Action actionIfFound = null)
+		{
+			if (leadingTrivia.Any(l => l.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia)))
+			{
+				actionIfFound?.Invoke();
+
+				foreach (var trivia in leadingTrivia) VisitTrivia(trivia);
+			}
+		}
+	}
+}
diff --git a/src/CodeGeneration/DocGenerator/Walkers/DocConverter.cs b/src/CodeGeneration/DocGenerator/Walkers/DocConverter.cs
index 59571bcc8e1..9e932192b7b 100644
--- a/src/CodeGeneration/DocGenerator/Walkers/DocConverter.cs
+++ b/src/CodeGeneration/DocGenerator/Walkers/DocConverter.cs
@@ -1,176 +1,159 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using DocGenerator.Documentation.Blocks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
 
 namespace DocGenerator.Walkers
 {
-    public class DocConverter
-    {
-        public async Task<IList<IDocumentationBlock>> ConvertAsync(Document document)
-        {
-            var node = await document.GetSyntaxRootAsync().ConfigureAwait(false);
-	        string fileName = document.Name;
-	        IList<IDocumentationBlock> blocks = new List<IDocumentationBlock>();
-
-	        // use different walking rules for different source files
-	        if (fileName.EndsWith("UsageTests.cs", StringComparison.OrdinalIgnoreCase) ||
-	            fileName.Equals("WritingAggregations.doc.cs", StringComparison.OrdinalIgnoreCase))
-	        {
-		        var walker = new UsageTestsWalker(blocks);
-		        walker.Visit(node);
-
-		        // apply the usage conventions to writing aggregations,
-		        // but don't rearrange any blocks
-		        if (!fileName.Equals("WritingAggregations.doc.cs", StringComparison.OrdinalIgnoreCase))
-		        {
-			        blocks = RearrangeCodeBlocks(blocks);
-		        }
-	        }
-	        else
-	        {
-		        var walker = new CSharpDocumentationFileWalker(blocks);
-		        walker.Visit(node);
-		        blocks = CondenseCodeBlocks(blocks);
-	        }
-
-	        return blocks;
-        }
-
-	    private IList<IDocumentationBlock> CondenseCodeBlocks(IList<IDocumentationBlock> blocks)
-        {
-            var newBlocks = new List<IDocumentationBlock>(blocks.Count);
-            for (int i = 0; i < blocks.Count; i++)
-            {
-                var block = blocks[i];
-                var codeBlock = block as CodeBlock;
-                if (codeBlock == null)
-                {
-                    newBlocks.Add(block);
-                    continue;
-                }
-
-	            if (newBlocks.LastOrDefault() is CodeBlock previousBlock && previousBlock.Language == codeBlock.Language)
-                {
-                    previousBlock.AddLine(Environment.NewLine);
-                    previousBlock.AddLine(codeBlock.Value);
-                }
-                else
-                {
-                    newBlocks.Add(codeBlock);
-                }
-            }
-
-            return newBlocks;
-        }
-
-        /// <summary>
-        /// Rearranges the code blocks in usage tests so that they follow the order:
-        /// 1. Fluent Example
-        /// 2. Object Initializer Example
-        /// 3. Example json
-        /// </summary>
-        /// <param name="blocks">The blocks.</param>
-        /// <returns></returns>
-        private IList<IDocumentationBlock> RearrangeCodeBlocks(IList<IDocumentationBlock> blocks)
-        {
-            var newBlocks = new List<IDocumentationBlock>(blocks.Count);
-            var seenFluentExample = false;
-            var seenInitializerExample = false;
-            int index = -1;
-
-            CodeBlock javascriptBlock = null;
-            CodeBlock initializerExample = null;
-
-            for (int i = 0; i < blocks.Count; i++)
-            {
-                if (seenFluentExample && seenInitializerExample && javascriptBlock != null)
-                {
-                    newBlocks.Insert(index + 1, javascriptBlock);
-                    javascriptBlock = null;
-                    seenFluentExample = false;
-                    seenInitializerExample = false;
-                    index = -1;
-                }
-
-                var block = blocks[i];
-
-                var codeBlock = block as CodeBlock;
-                if (codeBlock == null)
-                {
-                    newBlocks.Add(block);
-                    continue;
-                }
-
-                if (codeBlock.Language == "javascript")
-                {
-                    ((JavaScriptBlock) codeBlock).Title = "Example json output";
-
-                    if (seenFluentExample && seenInitializerExample)
-                    {
-                        newBlocks.Insert(index + 1, codeBlock);
-                        seenFluentExample = false;
-                        seenInitializerExample = false;
-                        index = -1;
-                    }
-                    else
-                    {
-                        javascriptBlock = codeBlock;
-                    }
-                }
-                else
-                {
-                    if (codeBlock.MemberName != null && codeBlock.MemberName.Contains("fluent"))
-                    {
-                        seenFluentExample = true;
-                        newBlocks.Add(codeBlock);
-                        index = newBlocks.IndexOf(codeBlock);
-
-                        if (initializerExample != null)
-                        {
-                            newBlocks.Add(initializerExample);
-                            index = newBlocks.IndexOf(initializerExample);
-                            initializerExample = null;
-                        }
-                    }
-                    else if (codeBlock.MemberName != null && codeBlock.MemberName.Contains("initializer"))
-                    {
-                        seenInitializerExample = true;
-
-                        if (seenFluentExample)
-                        {
-                            newBlocks.Add(codeBlock);
-                            index = newBlocks.IndexOf(codeBlock);
-                        }
-                        else
-                        {
-                            initializerExample = codeBlock;
-                        }
-                    }
-                    else
-                    {
-                        newBlocks.Add(codeBlock);
-                    }
-                }
-
-                if (i == blocks.Count - 1 && javascriptBlock != null)
-                {
-                    if (seenFluentExample && seenInitializerExample)
-                    {
-                        newBlocks.Insert(index + 1, javascriptBlock);
-                    }
-                    else
-                    {
-                        newBlocks.Add(javascriptBlock);
-                    }
-                }
-            }
-
-            return newBlocks;
-        }
-    }
+	public class DocConverter
+	{
+		public async Task<IList<IDocumentationBlock>> ConvertAsync(Document document)
+		{
+			var node = await document.GetSyntaxRootAsync().ConfigureAwait(false);
+			var fileName = document.Name;
+			IList<IDocumentationBlock> blocks = new List<IDocumentationBlock>();
+
+			// use different walking rules for different source files
+			if (fileName.EndsWith("UsageTests.cs", StringComparison.OrdinalIgnoreCase) ||
+				fileName.Equals("WritingAggregations.doc.cs", StringComparison.OrdinalIgnoreCase))
+			{
+				var walker = new UsageTestsWalker(blocks);
+				walker.Visit(node);
+
+				// apply the usage conventions to writing aggregations,
+				// but don't rearrange any blocks
+				if (!fileName.Equals("WritingAggregations.doc.cs", StringComparison.OrdinalIgnoreCase)) blocks = RearrangeCodeBlocks(blocks);
+			}
+			else
+			{
+				var walker = new CSharpDocumentationFileWalker(blocks);
+				walker.Visit(node);
+				blocks = CondenseCodeBlocks(blocks);
+			}
+
+			return blocks;
+		}
+
+		private IList<IDocumentationBlock> CondenseCodeBlocks(IList<IDocumentationBlock> blocks)
+		{
+			var newBlocks = new List<IDocumentationBlock>(blocks.Count);
+			for (var i = 0; i < blocks.Count; i++)
+			{
+				var block = blocks[i];
+				var codeBlock = block as CodeBlock;
+				if (codeBlock == null)
+				{
+					newBlocks.Add(block);
+					continue;
+				}
+
+				if (newBlocks.LastOrDefault() is CodeBlock previousBlock && previousBlock.Language == codeBlock.Language)
+				{
+					previousBlock.AddLine(Environment.NewLine);
+					previousBlock.AddLine(codeBlock.Value);
+				}
+				else
+					newBlocks.Add(codeBlock);
+			}
+
+			return newBlocks;
+		}
+
+		/// <summary>
+		/// Rearranges the code blocks in usage tests so that they follow the order:
+		/// 1. Fluent Example
+		/// 2. Object Initializer Example
+		/// 3. Example json
+		/// </summary>
+		/// <param name="blocks">The blocks.</param>
+		/// <returns></returns>
+		private IList<IDocumentationBlock> RearrangeCodeBlocks(IList<IDocumentationBlock> blocks)
+		{
+			var newBlocks = new List<IDocumentationBlock>(blocks.Count);
+			var seenFluentExample = false;
+			var seenInitializerExample = false;
+			var index = -1;
+
+			CodeBlock javascriptBlock = null;
+			CodeBlock initializerExample = null;
+
+			for (var i = 0; i < blocks.Count; i++)
+			{
+				if (seenFluentExample && seenInitializerExample && javascriptBlock != null)
+				{
+					newBlocks.Insert(index + 1, javascriptBlock);
+					javascriptBlock = null;
+					seenFluentExample = false;
+					seenInitializerExample = false;
+					index = -1;
+				}
+
+				var block = blocks[i];
+
+				var codeBlock = block as CodeBlock;
+				if (codeBlock == null)
+				{
+					newBlocks.Add(block);
+					continue;
+				}
+
+				if (codeBlock.Language == "javascript")
+				{
+					((JavaScriptBlock)codeBlock).Title = "Example json output";
+
+					if (seenFluentExample && seenInitializerExample)
+					{
+						newBlocks.Insert(index + 1, codeBlock);
+						seenFluentExample = false;
+						seenInitializerExample = false;
+						index = -1;
+					}
+					else
+						javascriptBlock = codeBlock;
+				}
+				else
+				{
+					if (codeBlock.MemberName != null && codeBlock.MemberName.Contains("fluent"))
+					{
+						seenFluentExample = true;
+						newBlocks.Add(codeBlock);
+						index = newBlocks.IndexOf(codeBlock);
+
+						if (initializerExample != null)
+						{
+							newBlocks.Add(initializerExample);
+							index = newBlocks.IndexOf(initializerExample);
+							initializerExample = null;
+						}
+					}
+					else if (codeBlock.MemberName != null && codeBlock.MemberName.Contains("initializer"))
+					{
+						seenInitializerExample = true;
+
+						if (seenFluentExample)
+						{
+							newBlocks.Add(codeBlock);
+							index = newBlocks.IndexOf(codeBlock);
+						}
+						else
+							initializerExample = codeBlock;
+					}
+					else
+						newBlocks.Add(codeBlock);
+				}
+
+				if (i == blocks.Count - 1 && javascriptBlock != null)
+				{
+					if (seenFluentExample && seenInitializerExample)
+						newBlocks.Insert(index + 1, javascriptBlock);
+					else
+						newBlocks.Add(javascriptBlock);
+				}
+			}
+
+			return newBlocks;
+		}
+	}
 }
diff --git a/src/CodeGeneration/DocGenerator/Walkers/UsageTestsWalker.cs b/src/CodeGeneration/DocGenerator/Walkers/UsageTestsWalker.cs
index ccdd0fa7630..74534ae9e5d 100644
--- a/src/CodeGeneration/DocGenerator/Walkers/UsageTestsWalker.cs
+++ b/src/CodeGeneration/DocGenerator/Walkers/UsageTestsWalker.cs
@@ -6,64 +6,58 @@
 
 namespace DocGenerator.Walkers
 {
-    public class UsageTestsWalker : CSharpDocumentationFileWalker
-    {
-        public UsageTestsWalker(IList<IDocumentationBlock> blocks) : base(blocks)
-        {
-        }
-
-        private static readonly string[] ConvertToJson = {
-            "ExpectJson",
-            "QueryJson",
-	        "AggregationJson"
-        };
-
-        private static readonly string[] MembersOfInterest = {
-            "ExpectJson",
-            "QueryJson",
-	        "AggregationJson",
-            "Fluent",
-            "Initializer",
-            "QueryFluent",
-            "QueryInitializer",
-            "ExpectResponse",
-	        "FluentAggs",
-	        "InitializerAggs"
-        };
-
-        public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
-        {
-            if (MembersOfInterest.Contains(node.Identifier.Text))
-            {
-                base.VisitPropertyDeclaration(node);
-            }
-        }
-
-        public override void VisitMethodDeclaration(MethodDeclarationSyntax node)
-        {
-            if (MembersOfInterest.Contains(node.Identifier.Text))
-            {
-                base.VisitMethodDeclaration(node);
-            }
-        }
-
-        protected override bool SerializePropertyDeclarationToJson(PropertyDeclarationSyntax node) =>
-            SerializeToJson(node, node.Identifier.Text);
-
-        protected override bool SerializeMethodDeclarationToJson(MethodDeclarationSyntax node) =>
-            SerializeToJson(node, node.Identifier.Text);
-
-        private bool SerializeToJson(SyntaxNode node, string memberName)
-        {
-            if (!ConvertToJson.Contains(memberName)) return false;
-
-	        if (node.TryGetJsonForSyntaxNode(out var json))
-            {
-                var startingLine = node.StartingLine();
-                Blocks.Add(new JavaScriptBlock(json, startingLine, ClassDepth, memberName));
-            }
-
-            return true;
-        }
-    }
+	public class UsageTestsWalker : CSharpDocumentationFileWalker
+	{
+		private static readonly string[] ConvertToJson =
+		{
+			"ExpectJson",
+			"QueryJson",
+			"AggregationJson"
+		};
+
+		private static readonly string[] MembersOfInterest =
+		{
+			"ExpectJson",
+			"QueryJson",
+			"AggregationJson",
+			"Fluent",
+			"Initializer",
+			"QueryFluent",
+			"QueryInitializer",
+			"ExpectResponse",
+			"FluentAggs",
+			"InitializerAggs"
+		};
+
+		public UsageTestsWalker(IList<IDocumentationBlock> blocks) : base(blocks) { }
+
+		public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
+		{
+			if (MembersOfInterest.Contains(node.Identifier.Text)) base.VisitPropertyDeclaration(node);
+		}
+
+		public override void VisitMethodDeclaration(MethodDeclarationSyntax node)
+		{
+			if (MembersOfInterest.Contains(node.Identifier.Text)) base.VisitMethodDeclaration(node);
+		}
+
+		protected override bool SerializePropertyDeclarationToJson(PropertyDeclarationSyntax node) =>
+			SerializeToJson(node, node.Identifier.Text);
+
+		protected override bool SerializeMethodDeclarationToJson(MethodDeclarationSyntax node) =>
+			SerializeToJson(node, node.Identifier.Text);
+
+		private bool SerializeToJson(SyntaxNode node, string memberName)
+		{
+			if (!ConvertToJson.Contains(memberName)) return false;
+
+			if (node.TryGetJsonForSyntaxNode(out var json))
+			{
+				var startingLine = node.StartingLine();
+				Blocks.Add(new JavaScriptBlock(json, startingLine, ClassDepth, memberName));
+			}
+
+			return true;
+		}
+	}
 }
diff --git a/src/CodeGeneration/DocGenerator/XmlDocs/XmlDocsVisitor.cs b/src/CodeGeneration/DocGenerator/XmlDocs/XmlDocsVisitor.cs
index f0e3ff57007..5e2308221ea 100644
--- a/src/CodeGeneration/DocGenerator/XmlDocs/XmlDocsVisitor.cs
+++ b/src/CodeGeneration/DocGenerator/XmlDocs/XmlDocsVisitor.cs
@@ -7,143 +7,135 @@
 
 namespace DocGenerator.XmlDocs
 {
-    /// <summary>
-    /// Visits XML Documentation file to build an AsciiDoc
-    /// collection of labeled list items to include in documentation
-    /// </summary>
-    /// <seealso cref="NuDoq.Visitor" />
-    public class XmlDocsVisitor : Visitor
-    {
-        private LabeledListItem _labeledListItem;
-        private readonly Type _type;
-
-        // AsciiDocNet does not currently have a type for list item continuations, so mimic here
-        // for the moment
-        private const string ListItemContinuation = "\r\n+\r\n";
-
-        public List<LabeledListItem> LabeledListItems { get; } = new List<LabeledListItem>();
-
-        public XmlDocsVisitor(Type type)
-        {
-            _type = type;
-        }
-
-        public override void VisitText(Text text)
-        {
-            var content = text.Content.Trim();
-            if (!_labeledListItem.Any())
-                _labeledListItem.Add(new Paragraph(content));
-            else
-            {
-                var paragraph = _labeledListItem.Last() as Paragraph;
-
-                if (paragraph == null)
-                    _labeledListItem.Add(new Paragraph(content));
-                else
-                {
-                    var literal = paragraph.Last() as TextLiteral;
-
-                    if (literal != null && literal.Text == ListItemContinuation)
-                        paragraph.Add(new TextLiteral(content));
-                    else
-                        paragraph.Add(new TextLiteral(" " + content));
-                }
-            }
-        }
-
-        public override void VisitParam(Param param)
-        {
-            // TODO: add to docs. Omit for moment.
-        }
-
-        public override void VisitPara(Para para)
-        {
-            var paragraph = _labeledListItem.LastOrDefault() as Paragraph;
-            paragraph?.Add(new TextLiteral(ListItemContinuation));
-            base.VisitPara(para);
-        }
-
-        public override void VisitC(C code)
-        {
-            var content = EncloseInMarks(code.Content.Trim());
-            if (!_labeledListItem.Any())
-            {
-                _labeledListItem.Add(new Paragraph(content));
-            }
-            else
-            {
-                var paragraph = _labeledListItem.Last() as Paragraph;
-                if (paragraph == null)
-                    _labeledListItem.Add(new Paragraph(content));
-                else
-                    paragraph.Add(new TextLiteral(" " + content));
-            }
-        }
-
-        public override void VisitSee(See see)
-        {
-            var content = EncloseInMarks(ExtractLastTokenAndFillGenericParameters((see.Cref ?? see.Content).Trim()));
-            if (!_labeledListItem.Any())
-            {
-                _labeledListItem.Add(new Paragraph(content));
-            }
-            else
-            {
-                var paragraph = _labeledListItem.Last() as Paragraph;
-
-                if (paragraph == null)
-                    _labeledListItem.Add(new Paragraph(content));
-                else
-                    paragraph.Add(new TextLiteral(" " + content));
-            }
-        }
-
-        private string ExtractLastTokenAndFillGenericParameters(string value)
-        {
-            if (value == null)
-                return string.Empty;
-
-            var endOfToken = value.IndexOf("(", StringComparison.Ordinal);
-            if (endOfToken == -1)
-                endOfToken = value.Length;
-
-            var index = 0;
-
-            for (int i = 0; i < value.Length; i++)
-            {
-                if (value[i] == '.')
-                    index = i + 1;
-                else if (value[i] == '(')
-                    break;
-            }
-
-            var length = endOfToken - index;
-            var lastToken = value.Substring(index, length);
-
-            return lastToken.ReplaceArityWithGenericSignature();
-        }
-
-        private string EncloseInMarks(string value) => $"`{value}`";
-
-        public override void VisitMember(Member member)
-        {
-            if (member.Info != null)
-            {
-                if (member.Info.DeclaringType == _type &&
-                    member.Info.MemberType.HasFlag(MemberTypes.Method))
-                {
-                    var methodInfo = member.Info as MethodInfo;
-
-                    if (methodInfo != null && methodInfo.IsPublic)
-                    {
-                        if (_labeledListItem != null)
-                            LabeledListItems.Add(_labeledListItem);
-
-                        _labeledListItem = new LabeledListItem(EncloseInMarks(methodInfo.Name), 0);
-                        base.VisitMember(member);
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
+	/// <summary>
+	/// Visits XML Documentation file to build an AsciiDoc
+	/// collection of labeled list items to include in documentation
+	/// </summary>
+	/// <seealso cref="NuDoq.Visitor" />
+	public class XmlDocsVisitor : Visitor
+	{
+		// AsciiDocNet does not currently have a type for list item continuations, so mimic here
+		// for the moment
+		private const string ListItemContinuation = "\r\n+\r\n";
+		private readonly Type _type;
+		private LabeledListItem _labeledListItem;
+
+		public XmlDocsVisitor(Type type) => _type = type;
+
+		public List<LabeledListItem> LabeledListItems { get; } = new List<LabeledListItem>();
+
+		public override void VisitText(Text text)
+		{
+			var content = text.Content.Trim();
+			if (!_labeledListItem.Any())
+				_labeledListItem.Add(new Paragraph(content));
+			else
+			{
+				var paragraph = _labeledListItem.Last() as Paragraph;
+
+				if (paragraph == null)
+					_labeledListItem.Add(new Paragraph(content));
+				else
+				{
+					var literal = paragraph.Last() as TextLiteral;
+
+					if (literal != null && literal.Text == ListItemContinuation)
+						paragraph.Add(new TextLiteral(content));
+					else
+						paragraph.Add(new TextLiteral(" " + content));
+				}
+			}
+		}
+
+		public override void VisitParam(Param param)
+		{
+			// TODO: add to docs. Omit for moment.
+		}
+
+		public override void VisitPara(Para para)
+		{
+			var paragraph = _labeledListItem.LastOrDefault() as Paragraph;
+			paragraph?.Add(new TextLiteral(ListItemContinuation));
+			base.VisitPara(para);
+		}
+
+		public override void VisitC(C code)
+		{
+			var content = EncloseInMarks(code.Content.Trim());
+			if (!_labeledListItem.Any())
+				_labeledListItem.Add(new Paragraph(content));
+			else
+			{
+				var paragraph = _labeledListItem.Last() as Paragraph;
+				if (paragraph == null)
+					_labeledListItem.Add(new Paragraph(content));
+				else
+					paragraph.Add(new TextLiteral(" " + content));
+			}
+		}
+
+		public override void VisitSee(See see)
+		{
+			var content = EncloseInMarks(ExtractLastTokenAndFillGenericParameters((see.Cref ?? see.Content).Trim()));
+			if (!_labeledListItem.Any())
+				_labeledListItem.Add(new Paragraph(content));
+			else
+			{
+				var paragraph = _labeledListItem.Last() as Paragraph;
+
+				if (paragraph == null)
+					_labeledListItem.Add(new Paragraph(content));
+				else
+					paragraph.Add(new TextLiteral(" " + content));
+			}
+		}
+
+		private string ExtractLastTokenAndFillGenericParameters(string value)
+		{
+			if (value == null)
+				return string.Empty;
+
+			var endOfToken = value.IndexOf("(", StringComparison.Ordinal);
+			if (endOfToken == -1)
+				endOfToken = value.Length;
+
+			var index = 0;
+
+			for (var i = 0; i < value.Length; i++)
+			{
+				if (value[i] == '.')
+					index = i + 1;
+				else if (value[i] == '(')
+					break;
+			}
+
+			var length = endOfToken - index;
+			var lastToken = value.Substring(index, length);
+
+			return lastToken.ReplaceArityWithGenericSignature();
+		}
+
+		private string EncloseInMarks(string value) => $"`{value}`";
+
+		public override void VisitMember(Member member)
+		{
+			if (member.Info != null)
+			{
+				if (member.Info.DeclaringType == _type &&
+					member.Info.MemberType.HasFlag(MemberTypes.Method))
+				{
+					var methodInfo = member.Info as MethodInfo;
+
+					if (methodInfo != null && methodInfo.IsPublic)
+					{
+						if (_labeledListItem != null)
+							LabeledListItems.Add(_labeledListItem);
+
+						_labeledListItem = new LabeledListItem(EncloseInMarks(methodInfo.Name), 0);
+						base.VisitMember(member);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/Elasticsearch.Net/Auditing/Audit.cs b/src/Elasticsearch.Net/Auditing/Audit.cs
index 8a2bff34d33..5caeebec06e 100644
--- a/src/Elasticsearch.Net/Auditing/Audit.cs
+++ b/src/Elasticsearch.Net/Auditing/Audit.cs
@@ -2,42 +2,47 @@
 
 namespace Elasticsearch.Net
 {
-    /// <summary>
-    /// An audit of a request made
-    /// </summary>
-    public class Audit
+	/// <summary>
+	/// An audit of a request made
+	/// </summary>
+	public class Audit
 	{
-        /// <summary>
-        /// The type of audit event
-        /// </summary>
-        public AuditEvent Event { get; internal set; }
-        /// <summary>
-        /// The start date and time of the audit
-        /// </summary>
-        public DateTime Started { get; }
-        /// <summary>
-        /// The end date and time of the audit
-        /// </summary>
-        public DateTime Ended { get; internal set; }
-        /// <summary>
-        /// The node on which the request was made
-        /// </summary>
-        public Node Node { get; internal set; }
-        /// <summary>
-        /// The path of the request
-        /// </summary>
-        public string Path { get; internal set; }
-        /// <summary>
-        /// The exception for the audit, if there was one.
-        /// </summary>
-        public Exception Exception { get; internal set; }
-
 		public Audit(AuditEvent type, DateTime started)
 		{
-			this.Event = type;
-			this.Started = started;
+			Event = type;
+			Started = started;
 		}
 
+		/// <summary>
+		/// The end date and time of the audit
+		/// </summary>
+		public DateTime Ended { get; internal set; }
+
+		/// <summary>
+		/// The type of audit event
+		/// </summary>
+		public AuditEvent Event { get; internal set; }
+
+		/// <summary>
+		/// The exception for the audit, if there was one.
+		/// </summary>
+		public Exception Exception { get; internal set; }
+
+		/// <summary>
+		/// The node on which the request was made
+		/// </summary>
+		public Node Node { get; internal set; }
+
+		/// <summary>
+		/// The path of the request
+		/// </summary>
+		public string Path { get; internal set; }
+
+		/// <summary>
+		/// The start date and time of the audit
+		/// </summary>
+		public DateTime Started { get; }
+
 		public override string ToString()
 		{
 			var took = Ended - Started;
diff --git a/src/Elasticsearch.Net/Auditing/Auditable.cs b/src/Elasticsearch.Net/Auditing/Auditable.cs
index 5924cfd74bf..40bc3e75158 100644
--- a/src/Elasticsearch.Net/Auditing/Auditable.cs
+++ b/src/Elasticsearch.Net/Auditing/Auditable.cs
@@ -5,26 +5,38 @@ namespace Elasticsearch.Net
 {
 	internal class Auditable : IDisposable
 	{
-		readonly IDateTimeProvider _dateTimeProvider;
 		private readonly Audit _audit;
-
-		public Node Node { set { this._audit.Node = value; } }
-		public AuditEvent Event { set { this._audit.Event = value; } }
-		public Exception Exception { set { this._audit.Exception = value; } }
-		public string Path { set { this._audit.Path = value; } }
+		private readonly IDateTimeProvider _dateTimeProvider;
 
 		public Auditable(AuditEvent type, List<Audit> auditTrail, IDateTimeProvider dateTimeProvider)
 		{
-			this._dateTimeProvider = dateTimeProvider;
+			_dateTimeProvider = dateTimeProvider;
 			var started = _dateTimeProvider.Now();
 
-			this._audit = new Audit(type, started);
-			auditTrail.Add(this._audit);
+			_audit = new Audit(type, started);
+			auditTrail.Add(_audit);
+		}
+
+		public AuditEvent Event
+		{
+			set => _audit.Event = value;
 		}
 
-		public void Dispose()
+		public Exception Exception
 		{
-			this._audit.Ended = this._dateTimeProvider.Now();
+			set => _audit.Exception = value;
 		}
+
+		public Node Node
+		{
+			set => _audit.Node = value;
+		}
+
+		public string Path
+		{
+			set => _audit.Path = value;
+		}
+
+		public void Dispose() => _audit.Ended = _dateTimeProvider.Now();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs b/src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs
index 84ebb0a40db..c758acb9873 100644
--- a/src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs
+++ b/src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs
@@ -23,26 +23,20 @@ namespace Elasticsearch.Net
 	/// </summary>
 	public class ConnectionConfiguration : ConnectionConfiguration<ConnectionConfiguration>
 	{
-		internal static bool IsCurlHandler { get; } =
-            #if DOTNETCORE
-                typeof(HttpClientHandler).Assembly().GetType("System.Net.Http.CurlHandler") != null;
-            #else
-                 false;
-            #endif
-		public static readonly TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
 		public static readonly TimeSpan DefaultPingTimeout = TimeSpan.FromSeconds(2);
 		public static readonly TimeSpan DefaultPingTimeoutOnSSL = TimeSpan.FromSeconds(5);
+		public static readonly TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
 		public static readonly int DefaultConnectionLimit = IsCurlHandler ? Environment.ProcessorCount : 80;
 
+
 		/// <summary>
 		/// ConnectionConfiguration allows you to control how ElasticLowLevelClient behaves and where/how it connects
 		/// to elasticsearch
 		/// </summary>
 		/// <param name="uri">The root of the elasticsearch node we want to connect to. Defaults to http://localhost:9200</param>
-		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
 		public ConnectionConfiguration(Uri uri = null)
-			: this(new SingleNodeConnectionPool(uri ?? new Uri("http://localhost:9200")))
-		{ }
+			: this(new SingleNodeConnectionPool(uri ?? new Uri("http://localhost:9200"))) { }
 
 		/// <summary>
 		/// ConnectionConfiguration allows you to control how ElasticLowLevelClient behaves and where/how it connects
@@ -51,24 +45,27 @@ public ConnectionConfiguration(Uri uri = null)
 		/// <param name="connectionPool">A connection pool implementation that'll tell the client what nodes are available</param>
 		public ConnectionConfiguration(IConnectionPool connectionPool)
 			// ReSharper disable once IntroduceOptionalParameters.Global
-			: this(connectionPool, null, null)
-		{ }
+			: this(connectionPool, null, null) { }
 
 		public ConnectionConfiguration(IConnectionPool connectionPool, IConnection connection)
 			// ReSharper disable once IntroduceOptionalParameters.Global
-			: this(connectionPool, connection, null)
-		{ }
+			: this(connectionPool, connection, null) { }
 
 		public ConnectionConfiguration(IConnectionPool connectionPool, IElasticsearchSerializer serializer)
-			: this(connectionPool, null, serializer)
-		{ }
+			: this(connectionPool, null, serializer) { }
 
 		// ReSharper disable once MemberCanBePrivate.Global
 		// eventhough we use don't use this we very much would like to  expose this constructor
 
 		public ConnectionConfiguration(IConnectionPool connectionPool, IConnection connection, IElasticsearchSerializer serializer)
-			: base(connectionPool, connection, serializer)
-		{ }
+			: base(connectionPool, connection, serializer) { }
+
+		internal static bool IsCurlHandler { get; } =
+#if DOTNETCORE
+                typeof(HttpClientHandler).Assembly().GetType("System.Net.Http.CurlHandler") != null;
+            #else
+			false;
+#endif
 	}
 
 	[Browsable(false)]
@@ -76,141 +73,147 @@ public ConnectionConfiguration(IConnectionPool connectionPool, IConnection conne
 	public abstract class ConnectionConfiguration<T> : IConnectionConfigurationValues, IHideObjectMembers
 		where T : ConnectionConfiguration<T>
 	{
+		private readonly IConnection _connection;
+
+		private readonly IConnectionPool _connectionPool;
+
+		private readonly NameValueCollection _headers = new NameValueCollection();
+
+		private readonly NameValueCollection _queryString = new NameValueCollection();
 		private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-		SemaphoreSlim IConnectionConfigurationValues.BootstrapLock => this._semaphore;
 
-		private TimeSpan _requestTimeout;
-		TimeSpan IConnectionConfigurationValues.RequestTimeout => _requestTimeout;
+		private BasicAuthenticationCredentials _basicAuthCredentials;
 
-		private TimeSpan? _pingTimeout;
-		TimeSpan? IConnectionConfigurationValues.PingTimeout => _pingTimeout;
+		private X509CertificateCollection _clientCertificates;
+		private Action<IApiCallDetails> _completedRequestHandler = DefaultCompletedRequestHandler;
+
+		private int _connectionLimit;
 
 		private TimeSpan? _deadTimeout;
-		TimeSpan? IConnectionConfigurationValues.DeadTimeout => _deadTimeout;
 
-		private TimeSpan? _maxDeadTimeout;
-		TimeSpan? IConnectionConfigurationValues.MaxDeadTimeout => _maxDeadTimeout;
+		private bool _disableAutomaticProxyDetection = false;
 
-		private TimeSpan? _maxRetryTimeout;
-		TimeSpan? IConnectionConfigurationValues.MaxRetryTimeout => _maxRetryTimeout;
+		private bool _disableDirectStreaming = false;
 
-		private TimeSpan? _keepAliveTime;
-		TimeSpan? IConnectionConfigurationValues.KeepAliveTime => _keepAliveTime;
+		private bool _disablePings;
+
+		private bool _enableHttpCompression;
+
+		private bool _enableHttpPipelining = true;
 
 		private TimeSpan? _keepAliveInterval;
-		TimeSpan? IConnectionConfigurationValues.KeepAliveInterval => _keepAliveInterval;
 
-		private string _proxyUsername;
-		string IConnectionConfigurationValues.ProxyUsername => _proxyUsername;
+		private TimeSpan? _keepAliveTime;
 
-		private string _proxyPassword;
-		string IConnectionConfigurationValues.ProxyPassword => _proxyPassword;
+		private TimeSpan? _maxDeadTimeout;
 
-		private bool _disablePings;
-		bool IConnectionConfigurationValues.DisablePings => _disablePings;
+		private int? _maxRetries;
 
-		private string _proxyAddress;
-		string IConnectionConfigurationValues.ProxyAddress => _proxyAddress;
+		private TimeSpan? _maxRetryTimeout;
+
+		private Func<Node, bool> _nodePredicate = DefaultNodePredicate;
+		private Action<RequestData> _onRequestDataCreated = DefaultRequestDataCreated;
+
+		private TimeSpan? _pingTimeout;
 
 		private bool _prettyJson;
-		bool IConnectionConfigurationValues.PrettyJson => _prettyJson;
 
-		private bool _disableDirectStreaming = false;
-		bool IConnectionConfigurationValues.DisableDirectStreaming => _disableDirectStreaming;
+		private string _proxyAddress;
 
-		private bool _disableAutomaticProxyDetection = false;
-		bool IConnectionConfigurationValues.DisableAutomaticProxyDetection => _disableAutomaticProxyDetection;
+		private string _proxyPassword;
 
-		private int? _maxRetries;
-		int? IConnectionConfigurationValues.MaxRetries => _maxRetries;
+		private string _proxyUsername;
 
-		private int _connectionLimit;
-		int IConnectionConfigurationValues.ConnectionLimit => _connectionLimit;
+		private TimeSpan _requestTimeout;
 
-		private bool _sniffOnStartup;
-		bool IConnectionConfigurationValues.SniffsOnStartup => _sniffOnStartup;
+		private Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> _serverCertificateValidationCallback;
 
-		private bool _sniffOnConnectionFault;
-		bool IConnectionConfigurationValues.SniffsOnConnectionFault => _sniffOnConnectionFault;
+		private IReadOnlyCollection<int> _skipDeserializationForStatusCodes = new ReadOnlyCollection<int>(new int[] { });
 
 		private TimeSpan? _sniffLifeSpan;
-		TimeSpan? IConnectionConfigurationValues.SniffInformationLifeSpan => _sniffLifeSpan;
 
-		private bool _enableHttpCompression;
-		bool IConnectionConfigurationValues.EnableHttpCompression => _enableHttpCompression;
+		private bool _sniffOnConnectionFault;
 
-		private bool _enableHttpPipelining = true;
-		bool IConnectionConfigurationValues.HttpPipeliningEnabled => _enableHttpPipelining;
+		private bool _sniffOnStartup;
 
 		private bool _throwExceptions;
-		bool IConnectionConfigurationValues.ThrowExceptions => _throwExceptions;
 
-		private IReadOnlyCollection<int> _skipDeserializationForStatusCodes = new ReadOnlyCollection<int>(new int[] {});
-		IReadOnlyCollection<int> IConnectionConfigurationValues.SkipDeserializationForStatusCodes => _skipDeserializationForStatusCodes;
+		private readonly ElasticsearchUrlFormatter _urlFormatter;
 
-		private IMemoryStreamFactory _memoryStreamFactory = new RecyclableMemoryStreamFactory();
-		IMemoryStreamFactory IConnectionConfigurationValues.MemoryStreamFactory => _memoryStreamFactory;
+		protected ConnectionConfiguration(IConnectionPool connectionPool, IConnection connection, IElasticsearchSerializer requestResponseSerializer)
+		{
+			_connectionPool = connectionPool;
+			_connection = connection ?? new HttpConnection();
+			UseThisRequestResponseSerializer = requestResponseSerializer ?? new LowLevelRequestResponseSerializer();
+
+			_connectionLimit = ConnectionConfiguration.DefaultConnectionLimit;
+			_requestTimeout = ConnectionConfiguration.DefaultTimeout;
+			_sniffOnConnectionFault = true;
+			_sniffOnStartup = true;
+			_sniffLifeSpan = TimeSpan.FromHours(1);
+			if (_connectionPool.SupportsReseeding)
+				_nodePredicate = DefaultReseedableNodePredicate;
+
+			_urlFormatter = new ElasticsearchUrlFormatter(this);
+		}
 
-		private static void DefaultCompletedRequestHandler(IApiCallDetails response) { }
-		Action<IApiCallDetails> _completedRequestHandler = DefaultCompletedRequestHandler;
-		Action<IApiCallDetails> IConnectionConfigurationValues.OnRequestCompleted => _completedRequestHandler;
+		protected IElasticsearchSerializer UseThisRequestResponseSerializer { get; set; }
+		BasicAuthenticationCredentials IConnectionConfigurationValues.BasicAuthenticationCredentials => _basicAuthCredentials;
+		SemaphoreSlim IConnectionConfigurationValues.BootstrapLock => _semaphore;
+		X509CertificateCollection IConnectionConfigurationValues.ClientCertificates => _clientCertificates;
+		IConnection IConnectionConfigurationValues.Connection => _connection;
+		int IConnectionConfigurationValues.ConnectionLimit => _connectionLimit;
+		IConnectionPool IConnectionConfigurationValues.ConnectionPool => _connectionPool;
+		TimeSpan? IConnectionConfigurationValues.DeadTimeout => _deadTimeout;
+		bool IConnectionConfigurationValues.DisableAutomaticProxyDetection => _disableAutomaticProxyDetection;
+		bool IConnectionConfigurationValues.DisableDirectStreaming => _disableDirectStreaming;
+		bool IConnectionConfigurationValues.DisablePings => _disablePings;
+		bool IConnectionConfigurationValues.EnableHttpCompression => _enableHttpCompression;
+		NameValueCollection IConnectionConfigurationValues.Headers => _headers;
+		bool IConnectionConfigurationValues.HttpPipeliningEnabled => _enableHttpPipelining;
+		TimeSpan? IConnectionConfigurationValues.KeepAliveInterval => _keepAliveInterval;
+		TimeSpan? IConnectionConfigurationValues.KeepAliveTime => _keepAliveTime;
+		TimeSpan? IConnectionConfigurationValues.MaxDeadTimeout => _maxDeadTimeout;
+		int? IConnectionConfigurationValues.MaxRetries => _maxRetries;
+		TimeSpan? IConnectionConfigurationValues.MaxRetryTimeout => _maxRetryTimeout;
+		IMemoryStreamFactory IConnectionConfigurationValues.MemoryStreamFactory { get; } = new RecyclableMemoryStreamFactory();
 
-		private static void DefaultRequestDataCreated(RequestData response) { }
-		private Action<RequestData> _onRequestDataCreated = DefaultRequestDataCreated;
+		Func<Node, bool> IConnectionConfigurationValues.NodePredicate => _nodePredicate;
+		Action<IApiCallDetails> IConnectionConfigurationValues.OnRequestCompleted => _completedRequestHandler;
 		Action<RequestData> IConnectionConfigurationValues.OnRequestDataCreated => _onRequestDataCreated;
+		TimeSpan? IConnectionConfigurationValues.PingTimeout => _pingTimeout;
+		bool IConnectionConfigurationValues.PrettyJson => _prettyJson;
+		string IConnectionConfigurationValues.ProxyAddress => _proxyAddress;
+		string IConnectionConfigurationValues.ProxyPassword => _proxyPassword;
+		string IConnectionConfigurationValues.ProxyUsername => _proxyUsername;
+		NameValueCollection IConnectionConfigurationValues.QueryStringParameters => _queryString;
+		IElasticsearchSerializer IConnectionConfigurationValues.RequestResponseSerializer => UseThisRequestResponseSerializer;
+		TimeSpan IConnectionConfigurationValues.RequestTimeout => _requestTimeout;
 
-		private Func<object, X509Certificate,X509Chain,SslPolicyErrors, bool> _serverCertificateValidationCallback;
-		Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> IConnectionConfigurationValues.ServerCertificateValidationCallback => _serverCertificateValidationCallback;
-
-		private X509CertificateCollection _clientCertificates;
-		X509CertificateCollection IConnectionConfigurationValues.ClientCertificates => _clientCertificates;
+		Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> IConnectionConfigurationValues.ServerCertificateValidationCallback =>
+			_serverCertificateValidationCallback;
 
-		private ElasticsearchUrlFormatter _urlFormatter;
+		IReadOnlyCollection<int> IConnectionConfigurationValues.SkipDeserializationForStatusCodes => _skipDeserializationForStatusCodes;
+		TimeSpan? IConnectionConfigurationValues.SniffInformationLifeSpan => _sniffLifeSpan;
+		bool IConnectionConfigurationValues.SniffsOnConnectionFault => _sniffOnConnectionFault;
+		bool IConnectionConfigurationValues.SniffsOnStartup => _sniffOnStartup;
+		bool IConnectionConfigurationValues.ThrowExceptions => _throwExceptions;
 		ElasticsearchUrlFormatter IConnectionConfigurationValues.UrlFormatter => _urlFormatter;
 
+		void IDisposable.Dispose() => DisposeManagedResources();
+
+		private static void DefaultCompletedRequestHandler(IApiCallDetails response) { }
+
+		private static void DefaultRequestDataCreated(RequestData response) { }
+
 		/// <summary>
-		/// The default predicate for <see cref="IConnectionPool"/> implementations that return true for <see cref="IConnectionPool.SupportsReseeding"/>
+		/// The default predicate for <see cref="IConnectionPool" /> implementations that return true for
+		/// <see cref="IConnectionPool.SupportsReseeding" />
 		/// in which case master only nodes are excluded from API calls.
 		/// </summary>
 		private static bool DefaultReseedableNodePredicate(Node node) => !node.MasterOnlyNode;
-		private static bool DefaultNodePredicate(Node node) => true;
-		private Func<Node, bool> _nodePredicate = DefaultNodePredicate;
-		Func<Node, bool> IConnectionConfigurationValues.NodePredicate => _nodePredicate;
-
-		private readonly NameValueCollection _queryString = new NameValueCollection();
-		NameValueCollection IConnectionConfigurationValues.QueryStringParameters => _queryString;
-
-		private readonly NameValueCollection _headers = new NameValueCollection();
-		NameValueCollection IConnectionConfigurationValues.Headers => _headers;
-
-		BasicAuthenticationCredentials _basicAuthCredentials;
-		BasicAuthenticationCredentials IConnectionConfigurationValues.BasicAuthenticationCredentials => _basicAuthCredentials;
 
-		protected IElasticsearchSerializer UseThisRequestResponseSerializer { get; set; }
-		IElasticsearchSerializer IConnectionConfigurationValues.RequestResponseSerializer => UseThisRequestResponseSerializer;
-
-		private readonly IConnectionPool _connectionPool;
-		IConnectionPool IConnectionConfigurationValues.ConnectionPool => _connectionPool;
-
-		private readonly IConnection _connection;
-		IConnection IConnectionConfigurationValues.Connection => _connection;
-
-		protected ConnectionConfiguration(IConnectionPool connectionPool, IConnection connection, IElasticsearchSerializer requestResponseSerializer)
-		{
-			this._connectionPool = connectionPool;
-			this._connection = connection ?? new HttpConnection();
-			this.UseThisRequestResponseSerializer = requestResponseSerializer ?? new LowLevelRequestResponseSerializer();
-
-			this._connectionLimit = ConnectionConfiguration.DefaultConnectionLimit;
-			this._requestTimeout = ConnectionConfiguration.DefaultTimeout;
-			this._sniffOnConnectionFault = true;
-			this._sniffOnStartup = true;
-			this._sniffLifeSpan = TimeSpan.FromHours(1);
-			if (this._connectionPool.SupportsReseeding)
-				this._nodePredicate = DefaultReseedableNodePredicate;
-
-			this._urlFormatter = new ElasticsearchUrlFormatter(this);
-		}
+		private static bool DefaultNodePredicate(Node node) => true;
 
 		private T Assign(Action<ConnectionConfiguration<T>> assigner) => Fluent.Assign((T)this, assigner);
 
@@ -224,39 +227,49 @@ protected ConnectionConfiguration(IConnectionPool connectionPool, IConnection co
 		/// <para>For Desktop CLR, sets ServicePointManager.SetTcpKeepAlive</para>
 		/// </summary>
 		/// <param name="keepAliveTime">Specifies the timeout with no activity until the first keep-alive packet is sent.</param>
-		/// <param name="keepAliveInterval">Specifies the interval between when successive keep-alive packets are sent if no acknowledgement is received.</param>
+		/// <param name="keepAliveInterval">
+		/// Specifies the interval between when successive keep-alive packets are sent if no acknowledgement is
+		/// received.
+		/// </param>
 		public T EnableTcpKeepAlive(TimeSpan keepAliveTime, TimeSpan keepAliveInterval) =>
-			Assign(a => { this._keepAliveTime = keepAliveTime; this._keepAliveInterval = keepAliveInterval; });
+			Assign(a =>
+			{
+				_keepAliveTime = keepAliveTime;
+				_keepAliveInterval = keepAliveInterval;
+			});
 
 		/// <summary>
 		/// The maximum number of retries for a given request,
 		/// </summary>
 		public T MaximumRetries(int maxRetries) => Assign(a => a._maxRetries = maxRetries);
 
-        /// <summary>
-        /// Limits the number of concurrent connections that can be opened to an endpoint. Defaults to <c>80</c>.
-        /// <para>For Desktop CLR, this setting applies to the DefaultConnectionLimit property on the  ServicePointManager object when creating ServicePoint objects, affecting the default <see cref="IConnection"/> implementation.</para>
-        /// <para>For Core CLR, this setting applies to the MaxConnectionsPerServer property on the HttpClientHandler instances used by the HttpClient inside the default <see cref="IConnection"/> implementation</para>
-        /// </summary>
-        /// <param name="connectionLimit">The connection limit, a value lower then 0 will cause the connection limit not to be set at all</param>
-        public T ConnectionLimit(int connectionLimit)
-		{
-			return Assign(a => a._connectionLimit = connectionLimit);
-		}
+		/// <summary>
+		/// Limits the number of concurrent connections that can be opened to an endpoint. Defaults to <c>80</c>.
+		/// <para>
+		/// For Desktop CLR, this setting applies to the DefaultConnectionLimit property on the  ServicePointManager object when creating
+		/// ServicePoint objects, affecting the default <see cref="IConnection" /> implementation.
+		/// </para>
+		/// <para>
+		/// For Core CLR, this setting applies to the MaxConnectionsPerServer property on the HttpClientHandler instances used by the HttpClient
+		/// inside the default <see cref="IConnection" /> implementation
+		/// </para>
+		/// </summary>
+		/// <param name="connectionLimit">The connection limit, a value lower then 0 will cause the connection limit not to be set at all</param>
+		public T ConnectionLimit(int connectionLimit) => Assign(a => a._connectionLimit = connectionLimit);
 
-        /// <summary>
-        /// Enables resniffing of the cluster when a call fails, if the connection pool supports reseeding. Defaults to <c>true</c>
-        /// </summary>
-        public T SniffOnConnectionFault(bool sniffsOnConnectionFault = true) => Assign(a => a._sniffOnConnectionFault = sniffsOnConnectionFault);
+		/// <summary>
+		/// Enables resniffing of the cluster when a call fails, if the connection pool supports reseeding. Defaults to <c>true</c>
+		/// </summary>
+		public T SniffOnConnectionFault(bool sniffsOnConnectionFault = true) => Assign(a => a._sniffOnConnectionFault = sniffsOnConnectionFault);
 
-        /// <summary>
-        /// Enables sniffing on first usage of a connection pool if that pool supports reseeding. Defaults to <c>true</c>
-        /// </summary>
-        public T SniffOnStartup(bool sniffsOnStartup = true) => Assign(a => a._sniffOnStartup = sniffsOnStartup);
+		/// <summary>
+		/// Enables sniffing on first usage of a connection pool if that pool supports reseeding. Defaults to <c>true</c>
+		/// </summary>
+		public T SniffOnStartup(bool sniffsOnStartup = true) => Assign(a => a._sniffOnStartup = sniffsOnStartup);
 
 		/// <summary>
 		/// Set the duration after which a cluster state is considered stale and a sniff should be performed again.
-		/// An <see cref="IConnectionPool"/> has to signal it supports reseeding, otherwise sniffing will never happen.
+		/// An <see cref="IConnectionPool" /> has to signal it supports reseeding, otherwise sniffing will never happen.
 		/// Defaults to 1 hour.
 		/// Set to null to disable completely. Sniffing will only ever happen on ConnectionPools that return true for SupportsReseeding
 		/// </summary>
@@ -290,28 +303,30 @@ public T ConnectionLimit(int connectionLimit)
 		public T DisablePing(bool disable = true) => Assign(a => a._disablePings = disable);
 
 		/// <summary>
-		/// A collection of query string parameters that will be sent with every request. Useful in situations where you always need to pass a parameter e.g. an API key.
+		/// A collection of query string parameters that will be sent with every request. Useful in situations where you always need to pass a
+		/// parameter e.g. an API key.
 		/// </summary>
 		public T GlobalQueryStringParameters(NameValueCollection queryStringParameters) => Assign(a => a._queryString.Add(queryStringParameters));
 
 		/// <summary>
-		/// A collection of headers that will be sent with every request. Useful in situations where you always need to pass a header e.g. a custom auth header
+		/// A collection of headers that will be sent with every request. Useful in situations where you always need to pass a header e.g. a custom
+		/// auth header
 		/// </summary>
 		public T GlobalHeaders(NameValueCollection headers) => Assign(a => a._headers.Add(headers));
 
-        /// <summary>
-        /// Sets the default timeout in milliseconds for each request to Elasticsearch. Defaults to <c>60</c> seconds.
-        /// <para>NOTE: You can set this to a high value here, and specify a timeout on Elasticsearch's side.</para>
-        /// </summary>
-        /// <param name="timeout">time out in milliseconds</param>
-        public T RequestTimeout(TimeSpan timeout) => Assign(a => a._requestTimeout = timeout);
+		/// <summary>
+		/// Sets the default timeout in milliseconds for each request to Elasticsearch. Defaults to <c>60</c> seconds.
+		/// <para>NOTE: You can set this to a high value here, and specify a timeout on Elasticsearch's side.</para>
+		/// </summary>
+		/// <param name="timeout">time out in milliseconds</param>
+		public T RequestTimeout(TimeSpan timeout) => Assign(a => a._requestTimeout = timeout);
 
-        /// <summary>
-        /// Sets the default ping timeout in milliseconds for ping requests, which are used
-        /// to determine whether a node is alive. Pings should fail as fast as possible.
-        /// </summary>
-        /// <param name="timeout">The ping timeout in milliseconds defaults to <c>1000</c>, or <c>2000</c> if using SSL.</param>
-        public T PingTimeout(TimeSpan timeout) => Assign(a => a._pingTimeout = timeout);
+		/// <summary>
+		/// Sets the default ping timeout in milliseconds for ping requests, which are used
+		/// to determine whether a node is alive. Pings should fail as fast as possible.
+		/// </summary>
+		/// <param name="timeout">The ping timeout in milliseconds defaults to <c>1000</c>, or <c>2000</c> if using SSL.</param>
+		public T PingTimeout(TimeSpan timeout) => Assign(a => a._pingTimeout = timeout);
 
 		/// <summary>
 		/// Sets the default dead timeout factor when a node has been marked dead.
@@ -322,18 +337,18 @@ public T ConnectionLimit(int connectionLimit)
 
 		/// <summary>
 		/// Sets the maximum time a node can be marked dead.
-		/// Different implementations of <see cref="IConnectionPool"/> may choose a different default.
+		/// Different implementations of <see cref="IConnectionPool" /> may choose a different default.
 		/// </summary>
 		/// <param name="timeout">The timeout in milliseconds</param>
 		public T MaxDeadTimeout(TimeSpan timeout) => Assign(a => a._maxDeadTimeout = timeout);
 
-        /// <summary>
-        /// Limits the total runtime, including retries, separately from <see cref="RequestTimeout"/>
-        /// <para>
-        /// When not specified, defaults to <see cref="RequestTimeout"/>, which itself defaults to <c>60</c> seconds
-        /// </para>
-        /// </summary>
-        public T MaxRetryTimeout(TimeSpan maxRetryTimeout) => Assign(a => a._maxRetryTimeout = maxRetryTimeout);
+		/// <summary>
+		/// Limits the total runtime, including retries, separately from <see cref="RequestTimeout" />
+		/// <para>
+		/// When not specified, defaults to <see cref="RequestTimeout" />, which itself defaults to <c>60</c> seconds
+		/// </para>
+		/// </summary>
+		public T MaxRetryTimeout(TimeSpan maxRetryTimeout) => Assign(a => a._maxRetryTimeout = maxRetryTimeout);
 
 		/// <summary>
 		/// If your connection has to go through proxy, use this method to specify the proxy url
@@ -341,9 +356,9 @@ public T ConnectionLimit(int connectionLimit)
 		public T Proxy(Uri proxyAdress, string username, string password)
 		{
 			proxyAdress.ThrowIfNull(nameof(proxyAdress));
-			this._proxyAddress = proxyAdress.ToString();
-			this._proxyUsername = username;
-			this._proxyPassword = password;
+			_proxyAddress = proxyAdress.ToString();
+			_proxyUsername = username;
+			_proxyPassword = password;
 			return (T)this;
 		}
 
@@ -354,11 +369,11 @@ public T Proxy(Uri proxyAdress, string username, string password)
 		/// </summary>
 		public T PrettyJson(bool b = true) => Assign(a =>
 		{
-			this._prettyJson = b;
+			_prettyJson = b;
 			const string key = "pretty";
-			if (!b && this._queryString[key] != null) this._queryString.Remove(key);
-			else if (b && this._queryString[key] == null)
-				this.GlobalQueryStringParameters(new NameValueCollection { { key, "true" } });
+			if (!b && _queryString[key] != null) _queryString.Remove(key);
+			else if (b && _queryString[key] == null)
+				GlobalQueryStringParameters(new NameValueCollection { { key, "true" } });
 		});
 
 		/// <summary>
@@ -369,20 +384,22 @@ public T PrettyJson(bool b = true) => Assign(a =>
 		public T IncludeServerStackTraceOnError(bool b = true) => Assign(a =>
 		{
 			const string key = "error_trace";
-			if (!b && this._queryString[key] != null) this._queryString.Remove(key);
-			else if (b && this._queryString[key] == null)
-				this.GlobalQueryStringParameters(new NameValueCollection { { key, "true" } });
+			if (!b && _queryString[key] != null) _queryString.Remove(key);
+			else if (b && _queryString[key] == null)
+				GlobalQueryStringParameters(new NameValueCollection { { key, "true" } });
 		});
 
 		/// <summary>
-		/// Ensures the response bytes are always available on the <see cref="ElasticsearchResponse{T}"/>
-		/// <para>IMPORTANT: Depending on the registered serializer,
-		/// this may cause the response to be buffered in memory first, potentially affecting performance.</para>
+		/// Ensures the response bytes are always available on the <see cref="ElasticsearchResponse{T}" />
+		/// <para>
+		/// IMPORTANT: Depending on the registered serializer,
+		/// this may cause the response to be buffered in memory first, potentially affecting performance.
+		/// </para>
 		/// </summary>
 		public T DisableDirectStreaming(bool b = true) => Assign(a => a._disableDirectStreaming = b);
 
 		/// <summary>
-		/// Registers an <see cref="Action{IApiCallDetails}"/> that is called when a response is received from Elasticsearch.
+		/// Registers an <see cref="Action{IApiCallDetails}" /> that is called when a response is received from Elasticsearch.
 		/// This can be useful for implementing custom logging.
 		/// Multiple callbacks can be registered by calling this multiple times
 		/// </summary>
@@ -390,7 +407,7 @@ public T OnRequestCompleted(Action<IApiCallDetails> handler) =>
 			Assign(a => a._completedRequestHandler += handler ?? DefaultCompletedRequestHandler);
 
 		/// <summary>
-		/// Registers an <see cref="Action{RequestData}"/> that is called when <see cref="RequestData"/> is created.
+		/// Registers an <see cref="Action{RequestData}" /> that is called when <see cref="RequestData" /> is created.
 		/// Multiple callbacks can be registered by calling this multiple times
 		/// </summary>
 		public T OnRequestDataCreated(Action<RequestData> handler) =>
@@ -413,15 +430,19 @@ public T BasicAuthentication(string userName, string password) =>
 		public T EnableHttpPipelining(bool enabled = true) => Assign(a => a._enableHttpPipelining = enabled);
 
 		/// <summary>
-		/// Register a predicate to select which nodes that you want to execute API calls on. Note that sniffing requests omit this predicate and always execute on all nodes.
-		/// When using an <see cref="IConnectionPool"/> implementation that supports reseeding of nodes, this will default to omitting master only node from regular API calls.
-		/// When using static or single node connection pooling it is assumed the list of node you instantiate the client with should be taken verbatim.
+		/// Register a predicate to select which nodes that you want to execute API calls on. Note that sniffing requests omit this predicate and
+		/// always execute on all nodes.
+		/// When using an <see cref="IConnectionPool" /> implementation that supports reseeding of nodes, this will default to omitting master only
+		/// node from regular API calls.
+		/// When using static or single node connection pooling it is assumed the list of node you instantiate the client with should be taken
+		/// verbatim.
 		/// </summary>
 		/// <param name="predicate">Return true if you want the node to be used for API calls</param>
 		public T NodePredicate(Func<Node, bool> predicate)
 		{
-			if (predicate == null) return (T) this;
-			this._nodePredicate = predicate;
+			if (predicate == null) return (T)this;
+
+			_nodePredicate = predicate;
 			return (T)this;
 		}
 
@@ -437,13 +458,13 @@ public T NodePredicate(Func<Node, bool> predicate)
 		/// </param>
 		public T EnableDebugMode(Action<IApiCallDetails> onRequestCompleted = null)
 		{
-			this._disableDirectStreaming = true;
-			this.PrettyJson(true);
-			this.IncludeServerStackTraceOnError(true);
+			_disableDirectStreaming = true;
+			PrettyJson(true);
+			IncludeServerStackTraceOnError(true);
 
-			var originalCompletedRequestHandler = this._completedRequestHandler;
+			var originalCompletedRequestHandler = _completedRequestHandler;
 			var debugCompletedRequestHandler = onRequestCompleted ?? (d => Debug.WriteLine(d.DebugInformation));
-			this._completedRequestHandler = d =>
+			_completedRequestHandler = d =>
 			{
 				originalCompletedRequestHandler?.Invoke(d);
 				debugCompletedRequestHandler?.Invoke(d);
@@ -462,39 +483,37 @@ public T ServerCertificateValidationCallback(Func<object, X509Certificate, X509C
 
 		/// <summary>
 		/// Use the following certificates to authenticate all HTTP requests. You can also set them on individual
-		/// request using <see cref="RequestConfiguration.ClientCertificates"/>
+		/// request using <see cref="RequestConfiguration.ClientCertificates" />
 		/// </summary>
 		public T ClientCertificates(X509CertificateCollection certificates) =>
 			Assign(a => a._clientCertificates = certificates);
 
 		/// <summary>
 		/// Use the following certificate to authenticate all HTTP requests. You can also set them on individual
-		/// request using <see cref="RequestConfiguration.ClientCertificates"/>
+		/// request using <see cref="RequestConfiguration.ClientCertificates" />
 		/// </summary>
 		public T ClientCertificate(X509Certificate certificate) =>
 			Assign(a => a._clientCertificates = new X509Certificate2Collection { certificate });
 
 		/// <summary>
 		/// Use the following certificate to authenticate all HTTP requests. You can also set them on individual
-		/// request using <see cref="RequestConfiguration.ClientCertificates"/>
+		/// request using <see cref="RequestConfiguration.ClientCertificates" />
 		/// </summary>
 		public T ClientCertificate(string certificatePath) =>
 			Assign(a => a._clientCertificates = new X509Certificate2Collection { new X509Certificate(certificatePath) });
 
 		/// <summary>
-		/// Configure the client to skip deserialization of certain status codes e.g: you run elasticsearch behind a proxy that returns a HTML for 401, 500
+		/// Configure the client to skip deserialization of certain status codes e.g: you run elasticsearch behind a proxy that returns a HTML for 401,
+		/// 500
 		/// </summary>
 		public T SkipDeserializationForStatusCodes(params int[] statusCodes) =>
 			Assign(a => a._skipDeserializationForStatusCodes = new ReadOnlyCollection<int>(statusCodes));
 
-		void IDisposable.Dispose() => this.DisposeManagedResources();
-
 		protected virtual void DisposeManagedResources()
 		{
-			this._connectionPool?.Dispose();
-			this._connection?.Dispose();
-			this._semaphore?.Dispose();
+			_connectionPool?.Dispose();
+			_connection?.Dispose();
+			_semaphore?.Dispose();
 		}
 	}
 }
-
diff --git a/src/Elasticsearch.Net/Configuration/IConnectionConfigurationValues.cs b/src/Elasticsearch.Net/Configuration/IConnectionConfigurationValues.cs
index 8c346085854..53656c79ac4 100644
--- a/src/Elasticsearch.Net/Configuration/IConnectionConfigurationValues.cs
+++ b/src/Elasticsearch.Net/Configuration/IConnectionConfigurationValues.cs
@@ -9,30 +9,39 @@ namespace Elasticsearch.Net
 {
 	public interface IConnectionConfigurationValues : IDisposable
 	{
+		/// <summary>
+		/// Basic access authorization credentials to specify with all requests.
+		/// </summary>
+		BasicAuthenticationCredentials BasicAuthenticationCredentials { get; }
+
 		/// <summary> Provides a semaphoreslim to transport implementations that need to limit access to a resource</summary>
 		SemaphoreSlim BootstrapLock { get; }
 
-		/// <summary> Provides a memory stream factory</summary>
-		IMemoryStreamFactory MemoryStreamFactory { get; }
-
-		/// <summary> The connection pool to use when talking with Elasticsearch </summary>
-		IConnectionPool ConnectionPool { get; }
+		/// <summary>
+		/// Use the following certificates to authenticate all HTTP requests. You can also set them on individual
+		/// request using <see cref="RequestConfiguration.ClientCertificates" />
+		/// </summary>
+		X509CertificateCollection ClientCertificates { get; }
 
 		/// <summary> The connection implementation to use when talking with Elasticsearch </summary>
 		IConnection Connection { get; }
 
-		/// <summary>The serializer to use to serialize requests and deserialize responses</summary>
-		IElasticsearchSerializer RequestResponseSerializer { get; }
-
 		/// <summary>
-		/// The timeout in milliseconds for each request to Elasticsearch
+		/// Limits the number of concurrent connections that can be opened to an endpoint. Defaults to 80 (see
+		/// <see cref="ConnectionConfiguration.DefaultConnectionLimit" />).
+		/// <para>
+		/// For Desktop CLR, this setting applies to the DefaultConnectionLimit property on the  ServicePointManager object when creating
+		/// ServicePoint objects, affecting the default <see cref="IConnection" /> implementation.
+		/// </para>
+		/// <para>
+		/// For Core CLR, this setting applies to the MaxConnectionsPerServer property on the HttpClientHandler instances used by the HttpClient
+		/// inside the default <see cref="IConnection" /> implementation
+		/// </para>
 		/// </summary>
-		TimeSpan RequestTimeout { get; }
+		int ConnectionLimit { get; }
 
-		/// <summary>
-		/// The timeout in milliseconds to use for ping requests, which are issued to determine whether a node is alive
-		/// </summary>
-		TimeSpan? PingTimeout { get; }
+		/// <summary> The connection pool to use when talking with Elasticsearch </summary>
+		IConnectionPool ConnectionPool { get; }
 
 		/// <summary>
 		/// The time to put dead nodes out of rotation (this will be multiplied by the number of times they've been dead)
@@ -40,30 +49,17 @@ public interface IConnectionConfigurationValues : IDisposable
 		TimeSpan? DeadTimeout { get; }
 
 		/// <summary>
-		/// The maximum ammount of time a node is allowed to marked dead
-		/// </summary>
-		TimeSpan? MaxDeadTimeout { get; }
-
-		/// <summary>
-		/// Limits the total runtime including retries separately from <see cref="RequestTimeout"/>
-		/// <pre>
-		/// When not specified defaults to <see cref="RequestTimeout"/> which itself defaults to 60 seconds
-		/// </pre>
-		/// </summary>
-		TimeSpan? MaxRetryTimeout { get; }
-
-		/// <summary>
-		/// When a retryable exception occurs or status code is returned this controls the maximum
-		/// amount of times we should retry the call to elasticsearch
+		/// Disabled proxy detection on the webrequest, in some cases this may speed up the first connection
+		/// your appdomain makes, in other cases it will actually increase the time for the first connection.
+		/// No silver bullet! use with care!
 		/// </summary>
-		int? MaxRetries { get; }
+		bool DisableAutomaticProxyDetection { get; }
 
 		/// <summary>
-		/// Limits the number of concurrent connections that can be opened to an endpoint. Defaults to 80 (see <see cref="ConnectionConfiguration.DefaultConnectionLimit"/>).
-		/// <para>For Desktop CLR, this setting applies to the DefaultConnectionLimit property on the  ServicePointManager object when creating ServicePoint objects, affecting the default <see cref="IConnection"/> implementation.</para>
-		/// <para>For Core CLR, this setting applies to the MaxConnectionsPerServer property on the HttpClientHandler instances used by the HttpClient inside the default <see cref="IConnection"/> implementation</para>
+		/// When set to true will disable (de)serializing directly to the request and response stream and return a byte[]
+		/// copy of the raw request and response on elasticsearch calls. Defaults to  false
 		/// </summary>
-		int ConnectionLimit { get; }
+		bool DisableDirectStreaming { get; }
 
 		/// <summary>
 		/// This signals that we do not want to send initial pings to unknown/previously dead nodes
@@ -78,128 +74,143 @@ public interface IConnectionConfigurationValues : IDisposable
 		bool EnableHttpCompression { get; }
 
 		/// <summary>
-		/// When set will force all connections through this proxy
+		/// Try to send these headers for every request
 		/// </summary>
-		string ProxyAddress { get; }
+		NameValueCollection Headers { get; }
 
 		/// <summary>
-		/// The username for the proxy, when configured
+		/// By default the client enables http pipelining as elasticsearch 2.0 defaults to true as well
 		/// </summary>
-		string ProxyUsername { get; }
+		bool HttpPipeliningEnabled { get; }
 
 		/// <summary>
-		/// The password for the proxy, when configured
+		/// KeepAliveInterval - specifies the interval, in milliseconds, between
+		/// when successive keep-alive packets are sent if no acknowledgement is
+		/// received.
 		/// </summary>
-		string ProxyPassword { get; }
+		TimeSpan? KeepAliveInterval { get; }
 
 		/// <summary>
-		/// Forces all requests to have ?pretty=true, causing elasticsearch to return formatted json.
-		/// Also forces the client to send out formatted json. Defaults to false
+		/// KeepAliveTime - specifies the timeout, in milliseconds, with no
+		/// activity until the first keep-alive packet is sent.
 		/// </summary>
-		bool PrettyJson { get; }
+		TimeSpan? KeepAliveTime { get; }
 
 		/// <summary>
-		/// When set to true will disable (de)serializing directly to the request and response stream and return a byte[]
-		/// copy of the raw request and response on elasticsearch calls. Defaults to  false
+		/// The maximum ammount of time a node is allowed to marked dead
 		/// </summary>
-		bool DisableDirectStreaming { get; }
+		TimeSpan? MaxDeadTimeout { get; }
 
 		/// <summary>
-		/// Disabled proxy detection on the webrequest, in some cases this may speed up the first connection
-		/// your appdomain makes, in other cases it will actually increase the time for the first connection.
-		/// No silver bullet! use with care!
+		/// When a retryable exception occurs or status code is returned this controls the maximum
+		/// amount of times we should retry the call to elasticsearch
 		/// </summary>
-		bool DisableAutomaticProxyDetection { get; }
+		int? MaxRetries { get; }
 
 		/// <summary>
-		/// By default the client enables http pipelining as elasticsearch 2.0 defaults to true as well
+		/// Limits the total runtime including retries separately from <see cref="RequestTimeout" />
+		/// <pre>
+		/// When not specified defaults to <see cref="RequestTimeout" /> which itself defaults to 60 seconds
+		/// </pre>
 		/// </summary>
-		bool HttpPipeliningEnabled { get; }
+		TimeSpan? MaxRetryTimeout { get; }
+
+		/// <summary> Provides a memory stream factory</summary>
+		IMemoryStreamFactory MemoryStreamFactory { get; }
 
 		/// <summary>
-		/// Instead of following a c/go like error checking on response.IsValid always throw an exception
-		/// on the client when a call resulted in an exception on either the client or the Elasticsearch server.
-		/// <para>Reasons for such exceptions could be search parser errors, index missing exceptions, etc...</para>
+		/// Register a predicate to select which nodes that you want to execute API calls on. Note that sniffing requests omit this predicate and
+		/// always execute on all nodes.
+		/// When using an <see cref="IConnectionPool" /> implementation that supports reseeding of nodes, this will default to omitting master only
+		/// node from regular API calls.
+		/// When using static or single node connection pooling it is assumed the list of node you instantiate the client with should be taken
+		/// verbatim.
 		/// </summary>
-		bool ThrowExceptions { get; }
+		Func<Node, bool> NodePredicate { get; }
 
 		/// <summary>
-		/// Sniff the cluster state immediatly on startup
+		/// Allows you to register a callback every time a an API call is returned
 		/// </summary>
-		bool SniffsOnStartup { get; }
+		Action<IApiCallDetails> OnRequestCompleted { get; }
 
 		/// <summary>
-		/// Force a new sniff for the cluster state everytime a connection dies
+		/// An action to run when the <see cref="RequestData" /> for a request has been
+		/// created.
 		/// </summary>
-		bool SniffsOnConnectionFault { get; }
+		Action<RequestData> OnRequestDataCreated { get; }
 
 		/// <summary>
-		/// Force a new sniff for the cluster when the cluster state information is older than
-		/// the specified timespan
+		/// The timeout in milliseconds to use for ping requests, which are issued to determine whether a node is alive
 		/// </summary>
-		TimeSpan? SniffInformationLifeSpan { get; }
+		TimeSpan? PingTimeout { get; }
 
 		/// <summary>
-		/// Append these query string parameters automatically to every request
+		/// Forces all requests to have ?pretty=true, causing elasticsearch to return formatted json.
+		/// Also forces the client to send out formatted json. Defaults to false
 		/// </summary>
-		NameValueCollection QueryStringParameters { get; }
+		bool PrettyJson { get; }
 
 		/// <summary>
-		/// Try to send these headers for every request
+		/// When set will force all connections through this proxy
 		/// </summary>
-		NameValueCollection Headers { get; }
+		string ProxyAddress { get; }
 
 		/// <summary>
-		/// Allows you to register a callback every time a an API call is returned
+		/// The password for the proxy, when configured
 		/// </summary>
-		Action<IApiCallDetails> OnRequestCompleted { get; }
+		string ProxyPassword { get; }
 
 		/// <summary>
-		/// Basic access authorization credentials to specify with all requests.
+		/// The username for the proxy, when configured
 		/// </summary>
-		BasicAuthenticationCredentials BasicAuthenticationCredentials { get; }
+		string ProxyUsername { get; }
 
 		/// <summary>
-		/// An action to run when the <see cref="RequestData"/> for a request has been
-		/// created.
+		/// Append these query string parameters automatically to every request
 		/// </summary>
-		Action<RequestData> OnRequestDataCreated { get; }
+		NameValueCollection QueryStringParameters { get; }
+
+		/// <summary>The serializer to use to serialize requests and deserialize responses</summary>
+		IElasticsearchSerializer RequestResponseSerializer { get; }
 
 		/// <summary>
-		/// KeepAliveTime - specifies the timeout, in milliseconds, with no
-		/// activity until the first keep-alive packet is sent.
+		/// The timeout in milliseconds for each request to Elasticsearch
 		/// </summary>
-		TimeSpan? KeepAliveTime { get; }
+		TimeSpan RequestTimeout { get; }
 
 		/// <summary>
-		/// KeepAliveInterval - specifies the interval, in milliseconds, between
-		/// when successive keep-alive packets are sent if no acknowledgement is
-		/// received.
+		/// Register a ServerCertificateValidationCallback per request
 		/// </summary>
-		TimeSpan? KeepAliveInterval { get; }
+		Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> ServerCertificateValidationCallback { get; }
 
 		/// <summary>
-		/// Register a ServerCertificateValidationCallback per request
+		/// Configure the client to skip deserialization of certain status codes e.g: you run elasticsearch behind a proxy that returns an unexpected
+		/// json format
 		/// </summary>
-		Func<object, X509Certificate,X509Chain,SslPolicyErrors, bool>  ServerCertificateValidationCallback { get; }
+		IReadOnlyCollection<int> SkipDeserializationForStatusCodes { get; }
 
 		/// <summary>
-		/// Register a predicate to select which nodes that you want to execute API calls on. Note that sniffing requests omit this predicate and always execute on all nodes.
-		/// When using an <see cref="IConnectionPool"/> implementation that supports reseeding of nodes, this will default to omitting master only node from regular API calls.
-		/// When using static or single node connection pooling it is assumed the list of node you instantiate the client with should be taken verbatim.
+		/// Force a new sniff for the cluster when the cluster state information is older than
+		/// the specified timespan
 		/// </summary>
-		Func<Node, bool> NodePredicate { get; }
+		TimeSpan? SniffInformationLifeSpan { get; }
 
 		/// <summary>
-		/// Use the following certificates to authenticate all HTTP requests. You can also set them on individual
-		/// request using <see cref="RequestConfiguration.ClientCertificates"/>
+		/// Force a new sniff for the cluster state everytime a connection dies
 		/// </summary>
-		X509CertificateCollection ClientCertificates { get; }
+		bool SniffsOnConnectionFault { get; }
 
 		/// <summary>
-		/// Configure the client to skip deserialization of certain status codes e.g: you run elasticsearch behind a proxy that returns an unexpected json format
+		/// Sniff the cluster state immediatly on startup
 		/// </summary>
-		IReadOnlyCollection<int> SkipDeserializationForStatusCodes { get; }
+		bool SniffsOnStartup { get; }
+
+		/// <summary>
+		/// Instead of following a c/go like error checking on response.IsValid always throw an exception
+		/// on the client when a call resulted in an exception on either the client or the Elasticsearch server.
+		/// <para>Reasons for such exceptions could be search parser errors, index missing exceptions, etc...</para>
+		/// </summary>
+		bool ThrowExceptions { get; }
 
 		ElasticsearchUrlFormatter UrlFormatter { get; }
 	}
diff --git a/src/Elasticsearch.Net/Configuration/RequestConfiguration.cs b/src/Elasticsearch.Net/Configuration/RequestConfiguration.cs
index 460474b88f1..f90d00d14e1 100644
--- a/src/Elasticsearch.Net/Configuration/RequestConfiguration.cs
+++ b/src/Elasticsearch.Net/Configuration/RequestConfiguration.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 
@@ -9,40 +8,41 @@ namespace Elasticsearch.Net
 	public interface IRequestConfiguration
 	{
 		/// <summary>
-		/// The timeout for this specific request, takes precedence over the global timeout settings
+		/// Force a different Accept header on the request
 		/// </summary>
-		TimeSpan? RequestTimeout { get; set; }
+		string Accept { get; set; }
 
 		/// <summary>
-		/// The ping timeout for this specific request
+		/// Treat the following statuses (on top of the 200 range) NOT as error.
 		/// </summary>
-		TimeSpan? PingTimeout { get; set;  }
+		IEnumerable<int> AllowedStatusCodes { get; set; }
 
 		/// <summary>
-		/// Force a different Content-Type header on the request
+		/// Basic access authorization credentials to specify with this request.
+		/// Overrides any credentials that are set at the global IConnectionSettings level.
 		/// </summary>
-		string ContentType { get; set; }
+		BasicAuthenticationCredentials BasicAuthenticationCredentials { get; set; }
 
 		/// <summary>
-		/// Associate an Id with this user-initiated task, such that it can be located in the cluster task list.
-		/// Valid only for Elasticsearch 6.2.0+
+		/// Use the following client certificates to authenticate this single request
 		/// </summary>
-		string OpaqueId { get; set; }
+		X509CertificateCollection ClientCertificates { get; set; }
 
 		/// <summary>
-		/// Force a different Accept header on the request
+		/// Force a different Content-Type header on the request
 		/// </summary>
-		string Accept { get; set; }
+		string ContentType { get; set; }
 
 		/// <summary>
-		/// This will override whatever is set on the connection configuration or whatever default the connectionpool has.
+		/// Whether to buffer the request and response bytes for the call
 		/// </summary>
-		int? MaxRetries { get; set; }
+		bool? DisableDirectStreaming { get; set; }
 
 		/// <summary>
-		/// This will force the operation on the specified node, this will bypass any configured connection pool and will no retry.
+		/// Under no circumstance do a ping before the actual call. If a node was previously dead a small ping with
+		/// low connect timeout will be tried first in normal circumstances
 		/// </summary>
-		Uri ForceNode { get; set; }
+		bool? DisablePing { get; set; }
 
 		/// <summary>
 		/// Forces no sniffing to occur on the request no matter what configuration is in place
@@ -51,42 +51,41 @@ public interface IRequestConfiguration
 		bool? DisableSniff { get; set; }
 
 		/// <summary>
-		/// Under no circumstance do a ping before the actual call. If a node was previously dead a small ping with
-		/// low connect timeout will be tried first in normal circumstances
+		/// Whether or not this request should be pipelined. http://en.wikipedia.org/wiki/HTTP_pipelining defaults to true
 		/// </summary>
-		bool? DisablePing { get; set; }
+		bool EnableHttpPipelining { get; set; }
 
 		/// <summary>
-		/// Whether to buffer the request and response bytes for the call
+		/// This will force the operation on the specified node, this will bypass any configured connection pool and will no retry.
 		/// </summary>
-		bool? DisableDirectStreaming { get; set; }
+		Uri ForceNode { get; set; }
 
 		/// <summary>
-		/// Treat the following statuses (on top of the 200 range) NOT as error.
+		/// This will override whatever is set on the connection configuration or whatever default the connectionpool has.
 		/// </summary>
-		IEnumerable<int> AllowedStatusCodes { get; set; }
+		int? MaxRetries { get; set; }
 
 		/// <summary>
-		/// Basic access authorization credentials to specify with this request.
-		/// Overrides any credentials that are set at the global IConnectionSettings level.
+		/// Associate an Id with this user-initiated task, such that it can be located in the cluster task list.
+		/// Valid only for Elasticsearch 6.2.0+
 		/// </summary>
-		BasicAuthenticationCredentials BasicAuthenticationCredentials { get; set; }
+		string OpaqueId { get; set; }
 
 		/// <summary>
-		/// Whether or not this request should be pipelined. http://en.wikipedia.org/wiki/HTTP_pipelining defaults to true
+		/// The ping timeout for this specific request
 		/// </summary>
-		bool EnableHttpPipelining { get; set; }
+		TimeSpan? PingTimeout { get; set; }
 
 		/// <summary>
-		/// Submit the request on behalf in the context of a different shield user
-		/// <pre/>https://www.elastic.co/guide/en/shield/current/submitting-requests-for-other-users.html
+		/// The timeout for this specific request, takes precedence over the global timeout settings
 		/// </summary>
-		string RunAs { get; set; }
+		TimeSpan? RequestTimeout { get; set; }
 
 		/// <summary>
-		/// Use the following client certificates to authenticate this single request
+		/// Submit the request on behalf in the context of a different shield user
+		/// <pre />https://www.elastic.co/guide/en/shield/current/submitting-requests-for-other-users.html
 		/// </summary>
-		X509CertificateCollection ClientCertificates { get; set; }
+		string RunAs { get; set; }
 
 		/// <summary>
 		/// Instead of following a c/go like error checking on response.IsValid always throw an exception
@@ -98,51 +97,34 @@ public interface IRequestConfiguration
 
 	public class RequestConfiguration : IRequestConfiguration
 	{
-		public TimeSpan? RequestTimeout { get; set; }
-		public TimeSpan? PingTimeout { get; set; }
-		public string ContentType { get; set; }
-		public string OpaqueId { get; set; }
 		public string Accept { get; set; }
-		public int? MaxRetries { get; set; }
-		public Uri ForceNode { get; set; }
-		public bool? DisableSniff { get; set; }
-		public bool? DisablePing { get; set; }
-		public bool? DisableDirectStreaming { get; set; }
 		public IEnumerable<int> AllowedStatusCodes { get; set; }
 		public BasicAuthenticationCredentials BasicAuthenticationCredentials { get; set; }
-		public bool EnableHttpPipelining { get; set; } = true;
 		public CancellationToken CancellationToken { get; set; }
+
+		public X509CertificateCollection ClientCertificates { get; set; }
+		public string ContentType { get; set; }
+		public bool? DisableDirectStreaming { get; set; }
+		public bool? DisablePing { get; set; }
+		public bool? DisableSniff { get; set; }
+		public bool EnableHttpPipelining { get; set; } = true;
+		public Uri ForceNode { get; set; }
+		public int? MaxRetries { get; set; }
+		public string OpaqueId { get; set; }
+		public TimeSpan? PingTimeout { get; set; }
+		public TimeSpan? RequestTimeout { get; set; }
+
 		/// <summary>
 		/// Submit the request on behalf in the context of a different user
 		/// https://www.elastic.co/guide/en/shield/current/submitting-requests-for-other-users.html
 		/// </summary>
 		public string RunAs { get; set; }
 
-		public X509CertificateCollection ClientCertificates { get; set; }
 		public bool ThrowExceptions { get; set; }
 	}
 
 	public class RequestConfigurationDescriptor : IRequestConfiguration
 	{
-		private IRequestConfiguration Self => this;
-		TimeSpan? IRequestConfiguration.RequestTimeout { get; set; }
-		TimeSpan? IRequestConfiguration.PingTimeout { get; set; }
-		string IRequestConfiguration.ContentType { get; set; }
-		string IRequestConfiguration.OpaqueId { get; set; }
-		string IRequestConfiguration.Accept { get; set; }
-
-		int? IRequestConfiguration.MaxRetries { get; set; }
-		Uri IRequestConfiguration.ForceNode { get; set; }
-		bool? IRequestConfiguration.DisableSniff { get; set; }
-		bool? IRequestConfiguration.DisablePing { get; set; }
-		bool? IRequestConfiguration.DisableDirectStreaming { get; set; }
-		IEnumerable<int> IRequestConfiguration.AllowedStatusCodes { get; set; }
-		BasicAuthenticationCredentials IRequestConfiguration.BasicAuthenticationCredentials { get; set; }
-		bool IRequestConfiguration.EnableHttpPipelining { get; set; } = true;
-		string IRequestConfiguration.RunAs { get; set; }
-		X509CertificateCollection IRequestConfiguration.ClientCertificates { get; set; }
-		bool IRequestConfiguration.ThrowExceptions { get; set; }
-
 		public RequestConfigurationDescriptor(IRequestConfiguration config)
 		{
 			Self.RequestTimeout = config?.RequestTimeout;
@@ -162,9 +144,28 @@ public RequestConfigurationDescriptor(IRequestConfiguration config)
 			Self.OpaqueId = config?.OpaqueId;
 		}
 
+		string IRequestConfiguration.Accept { get; set; }
+		IEnumerable<int> IRequestConfiguration.AllowedStatusCodes { get; set; }
+		BasicAuthenticationCredentials IRequestConfiguration.BasicAuthenticationCredentials { get; set; }
+		X509CertificateCollection IRequestConfiguration.ClientCertificates { get; set; }
+		string IRequestConfiguration.ContentType { get; set; }
+		bool? IRequestConfiguration.DisableDirectStreaming { get; set; }
+		bool? IRequestConfiguration.DisablePing { get; set; }
+		bool? IRequestConfiguration.DisableSniff { get; set; }
+		bool IRequestConfiguration.EnableHttpPipelining { get; set; } = true;
+		Uri IRequestConfiguration.ForceNode { get; set; }
+
+		int? IRequestConfiguration.MaxRetries { get; set; }
+		string IRequestConfiguration.OpaqueId { get; set; }
+		TimeSpan? IRequestConfiguration.PingTimeout { get; set; }
+		TimeSpan? IRequestConfiguration.RequestTimeout { get; set; }
+		string IRequestConfiguration.RunAs { get; set; }
+		private IRequestConfiguration Self => this;
+		bool IRequestConfiguration.ThrowExceptions { get; set; }
+
 		/// <summary>
 		/// Submit the request on behalf in the context of a different shield user
-		/// <pre/>https://www.elastic.co/guide/en/shield/current/submitting-requests-for-other-users.html
+		/// <pre />https://www.elastic.co/guide/en/shield/current/submitting-requests-for-other-users.html
 		/// </summary>
 		public RequestConfigurationDescriptor RunAs(string username)
 		{
@@ -278,11 +279,10 @@ public RequestConfigurationDescriptor ClientCertificates(X509CertificateCollecti
 
 		/// <summary> Use the following client certificate to authenticate this request to Elasticsearch </summary>
 		public RequestConfigurationDescriptor ClientCertificate(X509Certificate certificate) =>
-			this.ClientCertificates(new X509Certificate2Collection { certificate });
+			ClientCertificates(new X509Certificate2Collection { certificate });
 
 		/// <summary> Use the following client certificate to authenticate this request to Elasticsearch </summary>
 		public RequestConfigurationDescriptor ClientCertificate(string certificatePath) =>
-			this.ClientCertificates(new X509Certificate2Collection {new X509Certificate(certificatePath)});
-
+			ClientCertificates(new X509Certificate2Collection { new X509Certificate(certificatePath) });
 	}
 }
diff --git a/src/Elasticsearch.Net/Configuration/Security/BasicAuthenticationCredentials.cs b/src/Elasticsearch.Net/Configuration/Security/BasicAuthenticationCredentials.cs
index 04b195e0a91..2a3b4b0478f 100644
--- a/src/Elasticsearch.Net/Configuration/Security/BasicAuthenticationCredentials.cs
+++ b/src/Elasticsearch.Net/Configuration/Security/BasicAuthenticationCredentials.cs
@@ -2,10 +2,9 @@
 {
 	public class BasicAuthenticationCredentials
 	{
-		public string Username { get; set; }
-
 		public string Password { get; set; }
+		public string Username { get; set; }
 
-		public override string ToString() => $"{this.Username}:{this.Password}";
+		public override string ToString() => $"{Username}:{Password}";
 	}
 }
diff --git a/src/Elasticsearch.Net/Connection/CertificateValidations.cs b/src/Elasticsearch.Net/Connection/CertificateValidations.cs
index 0a6038dcbd3..c7ee0af7c13 100644
--- a/src/Elasticsearch.Net/Connection/CertificateValidations.cs
+++ b/src/Elasticsearch.Net/Connection/CertificateValidations.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Concurrent;
-using System.Net;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 
@@ -28,12 +26,14 @@ public static class CertificateValidations
 		/// generate the nodes certificates with. This callback expects the CA to be part of the chain as intermediate CA.
 		/// </summary>
 		/// <param name="caCertificate">The ca certificate used to generate the nodes certificate </param>
-		/// <param name="trustRoot">Custom CA are never trusted by default unless they are in the machines trusted store, set this to true
+		/// <param name="trustRoot">
+		/// Custom CA are never trusted by default unless they are in the machines trusted store, set this to true
 		/// if you've added the CA to the machines trusted store. In which case UntrustedRoot should not be accepted.
 		/// </param>
 		/// <param name="revocationMode">By default we do not check revocation, it is however recommended to check this (either offline or online).</param>
 		public static Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> AuthorityPartOfChain(
-			X509Certificate caCertificate, bool trustRoot = true, X509RevocationMode revocationMode = X509RevocationMode.NoCheck) =>
+			X509Certificate caCertificate, bool trustRoot = true, X509RevocationMode revocationMode = X509RevocationMode.NoCheck
+		) =>
 			(sender, cert, chain, errors) =>
 				errors == SslPolicyErrors.None
 				|| ValidIntermediateCa(caCertificate, cert, chain, trustRoot, revocationMode);
@@ -45,30 +45,33 @@ public static Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> Au
 		/// the CA in the certificate chain.
 		/// </summary>
 		/// <param name="caCertificate">The ca certificate used to generate the nodes certificate </param>
-		/// <param name="trustRoot">Custom CA are never trusted by default unless they are in the machines trusted store, set this to true
+		/// <param name="trustRoot">
+		/// Custom CA are never trusted by default unless they are in the machines trusted store, set this to true
 		/// if you've added the CA to the machines trusted store. In which case UntrustedRoot should not be accepted.
 		/// </param>
 		/// <param name="revocationMode">By default we do not check revocation, it is however recommended to check this (either offline or online).</param>
 		public static Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> AuthorityIsRoot(
-			X509Certificate caCertificate, bool trustRoot = true, X509RevocationMode revocationMode = X509RevocationMode.NoCheck) =>
+			X509Certificate caCertificate, bool trustRoot = true, X509RevocationMode revocationMode = X509RevocationMode.NoCheck
+		) =>
 			(sender, cert, chain, errors) =>
 				errors == SslPolicyErrors.None
 				|| ValidRootCa(caCertificate, cert, chain, trustRoot, revocationMode);
 
 		private static X509Certificate2 to2(X509Certificate certificate)
 		{
-			#if DOTNETCORE
+#if DOTNETCORE
 				return new X509Certificate2(certificate.Export(X509ContentType.Cert));
 			#else
-				return new X509Certificate2(certificate);
-			#endif
+			return new X509Certificate2(certificate);
+#endif
 		}
 
 		private static bool ValidRootCa(X509Certificate caCertificate, X509Certificate certificate, X509Chain chain, bool trustRoot,
-			X509RevocationMode revocationMode)
+			X509RevocationMode revocationMode
+		)
 		{
 			var ca = to2(caCertificate);
-			var privateChain = new X509Chain {ChainPolicy = {RevocationMode = revocationMode}};
+			var privateChain = new X509Chain { ChainPolicy = { RevocationMode = revocationMode } };
 			privateChain.ChainPolicy.ExtraStore.Add(ca);
 			privateChain.Build(to2(certificate));
 
@@ -78,20 +81,22 @@ private static bool ValidRootCa(X509Certificate caCertificate, X509Certificate c
 				//custom CA's that are not in the machine trusted store will always have this status
 				//by setting trustRoot = true (default) we skip this error
 				if (chainStatus.Status == X509ChainStatusFlags.UntrustedRoot && trustRoot) continue;
+
 				//trustRoot is false so we expected our CA to be in the machines trusted store
 				if (chainStatus.Status == X509ChainStatusFlags.UntrustedRoot) return false;
+
 				//otherwise if the chain has any error of any sort return false
 				if (chainStatus.Status != X509ChainStatusFlags.NoError) return false;
 			}
 			return true;
-
 		}
 
 		private static bool ValidIntermediateCa(X509Certificate caCertificate, X509Certificate certificate, X509Chain chain, bool trustRoot,
-			X509RevocationMode revocationMode)
+			X509RevocationMode revocationMode
+		)
 		{
 			var ca = to2(caCertificate);
-			var privateChain = new X509Chain {ChainPolicy = {RevocationMode = revocationMode}};
+			var privateChain = new X509Chain { ChainPolicy = { RevocationMode = revocationMode } };
 			privateChain.ChainPolicy.ExtraStore.Add(ca);
 			privateChain.Build(to2(certificate));
 
@@ -104,8 +109,10 @@ private static bool ValidIntermediateCa(X509Certificate caCertificate, X509Certi
 				//custom CA's that are not in the machine trusted store will always have this status
 				//by setting trustRoot = true (default) we skip this error
 				if (chainStatus.Status == X509ChainStatusFlags.UntrustedRoot && trustRoot) continue;
+
 				//trustRoot is false so we expected our CA to be in the machines trusted store
 				if (chainStatus.Status == X509ChainStatusFlags.UntrustedRoot) return false;
+
 				//otherwise if the chain has any error of any sort return false
 				if (chainStatus.Status != X509ChainStatusFlags.NoError) return false;
 			}
@@ -121,6 +128,7 @@ private static bool ValidIntermediateCa(X509Certificate caCertificate, X509Certi
 
 				//mis aligned certificate chain, return false so we do not accept this certificate
 				if (c != cPrivate) return false;
+
 				i++;
 			}
 			return found;
diff --git a/src/Elasticsearch.Net/Connection/ClientCertificate.cs b/src/Elasticsearch.Net/Connection/ClientCertificate.cs
index 8ab6541d8a4..be85d0121f9 100644
--- a/src/Elasticsearch.Net/Connection/ClientCertificate.cs
+++ b/src/Elasticsearch.Net/Connection/ClientCertificate.cs
@@ -29,7 +29,6 @@ THE SOFTWARE.
 */
 
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
@@ -62,6 +61,7 @@ private static RSACryptoServiceProvider DecodeRsaPrivateKey(byte[] privkey)
 
 				twobytes = binr.ReadUInt16();
 				if (twobytes != 0x0102) return null; //version number
+
 				var bt = binr.ReadByte();
 				if (bt != 0x00) return null;
 
@@ -109,7 +109,7 @@ private static int GetSizeOfIntegerToReadNext(BinaryReader br)
 				case 0x82:
 					var highbyte = br.ReadByte();
 					var lowbyte = br.ReadByte();
-					byte[] modint = {lowbyte, highbyte, 0x00, 0x00};
+					byte[] modint = { lowbyte, highbyte, 0x00, 0x00 };
 					count = BitConverter.ToInt32(modint, 0);
 					break;
 				default:
diff --git a/src/Elasticsearch.Net/Connection/HttpConnection.cs b/src/Elasticsearch.Net/Connection/HttpConnection.cs
index f951ca13592..6fef2976838 100644
--- a/src/Elasticsearch.Net/Connection/HttpConnection.cs
+++ b/src/Elasticsearch.Net/Connection/HttpConnection.cs
@@ -3,7 +3,7 @@
 
 namespace Elasticsearch.Net
 {
-	/// <summary> The default IConnection implementation. Uses <see cref="HttpWebRequest"/> on the current .NET desktop framework.</summary>
+	/// <summary> The default IConnection implementation. Uses <see cref="HttpWebRequest" /> on the current .NET desktop framework.</summary>
 	public class HttpConnection : HttpWebRequestConnection { }
 }
 #endif
diff --git a/src/Elasticsearch.Net/Connection/HttpMethod.cs b/src/Elasticsearch.Net/Connection/HttpMethod.cs
index d13ee52a0c8..c1ad63a9552 100644
--- a/src/Elasticsearch.Net/Connection/HttpMethod.cs
+++ b/src/Elasticsearch.Net/Connection/HttpMethod.cs
@@ -8,12 +8,16 @@ public enum HttpMethod
 	{
 		[EnumMember(Value = "GET")]
 		GET,
+
 		[EnumMember(Value = "POST")]
 		POST,
+
 		[EnumMember(Value = "PUT")]
 		PUT,
+
 		[EnumMember(Value = "DELETE")]
 		DELETE,
+
 		[EnumMember(Value = "HEAD")]
 		HEAD
 	}
diff --git a/src/Elasticsearch.Net/Connection/HttpWebRequestConnection.cs b/src/Elasticsearch.Net/Connection/HttpWebRequestConnection.cs
index 61b53c7bf86..c8755d2f9c9 100644
--- a/src/Elasticsearch.Net/Connection/HttpWebRequestConnection.cs
+++ b/src/Elasticsearch.Net/Connection/HttpWebRequestConnection.cs
@@ -16,22 +16,135 @@ namespace Elasticsearch.Net
 #endif
 	public class HttpWebRequestConnection : IConnection
 	{
-		internal static bool IsMono { get; } = Type.GetType("Mono.Runtime") != null;
-
 		static HttpWebRequestConnection()
 		{
 			//Not available under mono
 			if (!IsMono) HttpWebRequest.DefaultMaximumErrorResponseLength = -1;
 		}
 
+		internal static bool IsMono { get; } = Type.GetType("Mono.Runtime") != null;
+
+		public virtual TResponse Request<TResponse>(RequestData requestData)
+			where TResponse : class, IElasticsearchResponse, new()
+		{
+			int? statusCode = null;
+			IEnumerable<string> warnings = null;
+			Stream responseStream = null;
+			Exception ex = null;
+			string mimeType = null;
+			try
+			{
+				var request = CreateHttpWebRequest(requestData);
+				var data = requestData.PostData;
+
+				if (data != null)
+				{
+					using (var stream = request.GetRequestStream())
+					{
+						if (requestData.HttpCompression)
+							using (var zipStream = new GZipStream(stream, CompressionMode.Compress))
+								data.Write(zipStream, requestData.ConnectionSettings);
+						else
+							data.Write(stream, requestData.ConnectionSettings);
+					}
+				}
+				requestData.MadeItToResponse = true;
+
+				//http://msdn.microsoft.com/en-us/library/system.net.httpwebresponse.getresponsestream.aspx
+				//Either the stream or the response object needs to be closed but not both although it won't
+				//throw any errors if both are closed atleast one of them has to be Closed.
+				//Since we expose the stream we let closing the stream determining when to close the connection
+				var response = (HttpWebResponse)request.GetResponse();
+				HandleResponse(response, out statusCode, out responseStream, out mimeType);
+
+				//response.Headers.HasKeys() can return false even if response.Headers.AllKeys has values.
+				if (response.SupportsHeaders && response.Headers.Count > 0 && response.Headers.AllKeys.Contains("Warning"))
+					warnings = response.Headers.GetValues("Warning");
+			}
+			catch (WebException e)
+			{
+				ex = e;
+				if (e.Response is HttpWebResponse response)
+					HandleResponse(response, out statusCode, out responseStream, out mimeType);
+			}
+			responseStream = responseStream ?? Stream.Null;
+			return ResponseBuilder.ToResponse<TResponse>(requestData, ex, statusCode, warnings, responseStream, mimeType);
+		}
+
+		public virtual async Task<TResponse> RequestAsync<TResponse>(RequestData requestData,
+			CancellationToken cancellationToken
+		)
+			where TResponse : class, IElasticsearchResponse, new()
+		{
+			Action unregisterWaitHandle = null;
+			int? statusCode = null;
+			IEnumerable<string> warnings = null;
+			Stream responseStream = null;
+			Exception ex = null;
+			string mimeType = null;
+			try
+			{
+				var data = requestData.PostData;
+				var request = CreateHttpWebRequest(requestData);
+				using (cancellationToken.Register(() => request.Abort()))
+				{
+					if (data != null)
+					{
+						var apmGetRequestStreamTask =
+							Task.Factory.FromAsync<Stream>(request.BeginGetRequestStream, r => request.EndGetRequestStream(r), null);
+						unregisterWaitHandle = RegisterApmTaskTimeout(apmGetRequestStreamTask, request, requestData);
+
+						using (var stream = await apmGetRequestStreamTask.ConfigureAwait(false))
+						{
+							if (requestData.HttpCompression)
+								using (var zipStream = new GZipStream(stream, CompressionMode.Compress))
+									await data.WriteAsync(zipStream, requestData.ConnectionSettings, cancellationToken).ConfigureAwait(false);
+							else
+								await data.WriteAsync(stream, requestData.ConnectionSettings, cancellationToken).ConfigureAwait(false);
+						}
+						unregisterWaitHandle?.Invoke();
+					}
+					requestData.MadeItToResponse = true;
+					//http://msdn.microsoft.com/en-us/library/system.net.httpwebresponse.getresponsestream.aspx
+					//Either the stream or the response object needs to be closed but not both although it won't
+					//throw any errors if both are closed atleast one of them has to be Closed.
+					//Since we expose the stream we let closing the stream determining when to close the connection
+
+					var apmGetResponseTask = Task.Factory.FromAsync<WebResponse>(request.BeginGetResponse, r => request.EndGetResponse(r), null);
+					unregisterWaitHandle = RegisterApmTaskTimeout(apmGetResponseTask, request, requestData);
+
+					var response = (HttpWebResponse)await apmGetResponseTask.ConfigureAwait(false);
+					HandleResponse(response, out statusCode, out responseStream, out mimeType);
+					if (response.SupportsHeaders && response.Headers.HasKeys() && response.Headers.AllKeys.Contains("Warning"))
+						warnings = response.Headers.GetValues("Warning");
+				}
+			}
+			catch (WebException e)
+			{
+				ex = e;
+				if (e.Response is HttpWebResponse response)
+					HandleResponse(response, out statusCode, out responseStream, out mimeType);
+			}
+			finally
+			{
+				unregisterWaitHandle?.Invoke();
+			}
+			responseStream = responseStream ?? Stream.Null;
+			return await ResponseBuilder.ToResponseAsync<TResponse>
+					(requestData, ex, statusCode, warnings, responseStream, mimeType, cancellationToken)
+				.ConfigureAwait(false);
+		}
+
+		void IDisposable.Dispose() => DisposeManagedResources();
+
 		protected virtual HttpWebRequest CreateHttpWebRequest(RequestData requestData)
 		{
-			var request = this.CreateWebRequest(requestData);
-			this.SetBasicAuthenticationIfNeeded(request, requestData);
-			this.SetProxyIfNeeded(request, requestData);
-			this.SetServerCertificateValidationCallBackIfNeeded(request, requestData);
-			this.SetClientCertificates(request, requestData);
-			this.AlterServicePoint(request.ServicePoint, requestData);
+			var request = CreateWebRequest(requestData);
+			SetBasicAuthenticationIfNeeded(request, requestData);
+			SetProxyIfNeeded(request, requestData);
+			SetServerCertificateValidationCallBackIfNeeded(request, requestData);
+			SetClientCertificates(request, requestData);
+			AlterServicePoint(request.ServicePoint, requestData);
 			return request;
 		}
 
@@ -56,7 +169,7 @@ protected virtual void SetServerCertificateValidationCallBackIfNeeded(HttpWebReq
 
 		protected virtual HttpWebRequest CreateWebRequest(RequestData requestData)
 		{
-			var request = (HttpWebRequest) WebRequest.Create(requestData.Uri);
+			var request = (HttpWebRequest)WebRequest.Create(requestData.Uri);
 
 			request.Accept = requestData.Accept;
 			request.ContentType = requestData.RequestMimeType;
@@ -78,7 +191,7 @@ protected virtual HttpWebRequest CreateWebRequest(RequestData requestData)
 			if (requestData.Headers != null && requestData.Headers.HasKeys())
 				request.Headers.Add(requestData.Headers);
 
-			var timeout = (int) requestData.RequestTimeout.TotalMilliseconds;
+			var timeout = (int)requestData.RequestTimeout.TotalMilliseconds;
 			request.Timeout = timeout;
 			request.ReadWriteTimeout = timeout;
 
@@ -87,7 +200,7 @@ protected virtual HttpWebRequest CreateWebRequest(RequestData requestData)
 			//see: https://github.com/elasticsearch/elasticsearch-net/issues/562
 			var m = requestData.Method.GetStringValue();
 			request.Method = m;
-			if (m != "HEAD" && m != "GET" && (requestData.PostData == null))
+			if (m != "HEAD" && m != "GET" && requestData.PostData == null)
 				request.ContentLength = 0;
 
 			return request;
@@ -136,53 +249,6 @@ protected virtual void SetBasicAuthenticationIfNeeded(HttpWebRequest request, Re
 				request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(userInfo));
 		}
 
-		public virtual TResponse Request<TResponse>(RequestData requestData)
-			where TResponse : class, IElasticsearchResponse, new()
-		{
-			int? statusCode = null;
-			IEnumerable<string> warnings = null;
-			Stream responseStream = null;
-			Exception ex = null;
-			string mimeType = null;
-			try
-			{
-				var request = this.CreateHttpWebRequest(requestData);
-				var data = requestData.PostData;
-
-				if (data != null)
-				{
-					using (var stream = request.GetRequestStream())
-					{
-						if (requestData.HttpCompression)
-							using (var zipStream = new GZipStream(stream, CompressionMode.Compress))
-								data.Write(zipStream, requestData.ConnectionSettings);
-						else
-							data.Write(stream, requestData.ConnectionSettings);
-					}
-				}
-				requestData.MadeItToResponse = true;
-
-				//http://msdn.microsoft.com/en-us/library/system.net.httpwebresponse.getresponsestream.aspx
-				//Either the stream or the response object needs to be closed but not both although it won't
-				//throw any errors if both are closed atleast one of them has to be Closed.
-				//Since we expose the stream we let closing the stream determining when to close the connection
-				var response = (HttpWebResponse) request.GetResponse();
-				HandleResponse(response, out statusCode, out responseStream, out mimeType);
-
-				//response.Headers.HasKeys() can return false even if response.Headers.AllKeys has values.
-				if (response.SupportsHeaders && response.Headers.Count > 0 && response.Headers.AllKeys.Contains("Warning"))
-					warnings = response.Headers.GetValues("Warning");
-			}
-			catch (WebException e)
-			{
-                ex = e;
-				if (e.Response is HttpWebResponse response)
-					HandleResponse(response, out statusCode, out responseStream, out mimeType);
-			}
-			responseStream = responseStream ?? Stream.Null;
-			return ResponseBuilder.ToResponse<TResponse>(requestData, ex, statusCode, warnings, responseStream, mimeType);
-		}
-
 
 		/// <summary>
 		/// Registers an APM async task cancellation on the threadpool
@@ -199,74 +265,13 @@ private static Action RegisterApmTaskTimeout(IAsyncResult result, WebRequest req
 		private static void TimeoutCallback(object state, bool timedOut)
 		{
 			if (!timedOut) return;
-			(state as WebRequest)?.Abort();
-		}
 
-		public virtual async Task<TResponse> RequestAsync<TResponse>(RequestData requestData,
-			CancellationToken cancellationToken)
-			where TResponse : class, IElasticsearchResponse, new()
-		{
-			Action unregisterWaitHandle = null;
-			int? statusCode = null;
-			IEnumerable<string> warnings = null;
-			Stream responseStream = null;
-			Exception ex = null;
-			string mimeType = null;
-			try
-			{
-				var data = requestData.PostData;
-				var request = this.CreateHttpWebRequest(requestData);
-				using (cancellationToken.Register(() => request.Abort()))
-				{
-					if (data != null)
-					{
-						var apmGetRequestStreamTask = Task.Factory.FromAsync<Stream>(request.BeginGetRequestStream, r => request.EndGetRequestStream(r), null);
-						unregisterWaitHandle = RegisterApmTaskTimeout(apmGetRequestStreamTask, request, requestData);
-
-						using (var stream = await apmGetRequestStreamTask.ConfigureAwait(false))
-						{
-							if (requestData.HttpCompression)
-								using (var zipStream = new GZipStream(stream, CompressionMode.Compress))
-									await data.WriteAsync(zipStream, requestData.ConnectionSettings, cancellationToken).ConfigureAwait(false);
-							else
-								await data.WriteAsync(stream, requestData.ConnectionSettings, cancellationToken).ConfigureAwait(false);
-						}
-						unregisterWaitHandle?.Invoke();
-					}
-					requestData.MadeItToResponse = true;
-					//http://msdn.microsoft.com/en-us/library/system.net.httpwebresponse.getresponsestream.aspx
-					//Either the stream or the response object needs to be closed but not both although it won't
-					//throw any errors if both are closed atleast one of them has to be Closed.
-					//Since we expose the stream we let closing the stream determining when to close the connection
-
-					var apmGetResponseTask = Task.Factory.FromAsync<WebResponse>(request.BeginGetResponse, r => request.EndGetResponse(r), null);
-					unregisterWaitHandle = RegisterApmTaskTimeout(apmGetResponseTask, request, requestData);
-
-					var response = (HttpWebResponse) (await apmGetResponseTask.ConfigureAwait(false));
-					HandleResponse(response, out statusCode, out responseStream, out mimeType);
-					if (response.SupportsHeaders && response.Headers.HasKeys() && response.Headers.AllKeys.Contains("Warning"))
-						warnings = response.Headers.GetValues("Warning");
-				}
-			}
-			catch (WebException e)
-			{
-				ex = e;
-				if (e.Response is HttpWebResponse response)
-					HandleResponse(response, out statusCode, out responseStream, out mimeType);
-			}
-			finally
-			{
-				unregisterWaitHandle?.Invoke();
-			}
-			responseStream = responseStream ?? Stream.Null;
-			return await ResponseBuilder.ToResponseAsync<TResponse>
-					(requestData, ex, statusCode, warnings, responseStream, mimeType, cancellationToken)
-					.ConfigureAwait(false);
+			(state as WebRequest)?.Abort();
 		}
 
 		private static void HandleResponse(HttpWebResponse response, out int? statusCode, out Stream responseStream, out string mimeType)
 		{
-			statusCode = (int) response.StatusCode;
+			statusCode = (int)response.StatusCode;
 			responseStream = response.GetResponseStream();
 			mimeType = response.ContentType;
 			// https://github.com/elastic/elasticsearch-net/issues/2311
@@ -274,8 +279,6 @@ private static void HandleResponse(HttpWebResponse response, out int? statusCode
 			if (responseStream == null || responseStream == Stream.Null) response.Dispose();
 		}
 
-		void IDisposable.Dispose() => this.DisposeManagedResources();
-
 		protected virtual void DisposeManagedResources() { }
 	}
 }
diff --git a/src/Elasticsearch.Net/Connection/InMemoryConnection.cs b/src/Elasticsearch.Net/Connection/InMemoryConnection.cs
index 65957d91ccd..9f1abc0d37d 100644
--- a/src/Elasticsearch.Net/Connection/InMemoryConnection.cs
+++ b/src/Elasticsearch.Net/Connection/InMemoryConnection.cs
@@ -9,20 +9,17 @@ namespace Elasticsearch.Net
 {
 	public class InMemoryConnection : IConnection
 	{
+		internal static readonly byte[] EmptyBody = Encoding.UTF8.GetBytes("");
+		private readonly string _contentType;
+		private readonly Exception _exception;
 		private readonly byte[] _responseBody;
 		private readonly int _statusCode;
-		private readonly Exception _exception;
-		private readonly string _contentType;
-		internal static readonly byte[] EmptyBody = Encoding.UTF8.GetBytes("");
 
 		/// <summary>
 		/// Every request will succeed with this overload, note that it won't actually return mocked responses
 		/// so using this overload might fail if you are using it to test high level bits that need to deserialize the response.
 		/// </summary>
-		public InMemoryConnection()
-		{
-			_statusCode = 200;
-		}
+		public InMemoryConnection() => _statusCode = 200;
 
 		public InMemoryConnection(byte[] responseBody, int statusCode = 200, Exception exception = null, string contentType = RequestData.MimeType)
 		{
@@ -32,15 +29,19 @@ public InMemoryConnection(byte[] responseBody, int statusCode = 200, Exception e
 			_contentType = contentType;
 		}
 
-		public virtual Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
+		public virtual TResponse Request<TResponse>(RequestData requestData)
 			where TResponse : class, IElasticsearchResponse, new() =>
-			this.ReturnConnectionStatusAsync<TResponse>(requestData, cancellationToken);
+			ReturnConnectionStatus<TResponse>(requestData);
 
-		public virtual TResponse Request<TResponse>(RequestData requestData)
+		public virtual Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
 			where TResponse : class, IElasticsearchResponse, new() =>
-			this.ReturnConnectionStatus<TResponse>(requestData);
+			ReturnConnectionStatusAsync<TResponse>(requestData, cancellationToken);
 
-		protected TResponse ReturnConnectionStatus<TResponse>(RequestData requestData, byte[] responseBody = null, int? statusCode = null, string contentType = null)
+		void IDisposable.Dispose() => DisposeManagedResources();
+
+		protected TResponse ReturnConnectionStatus<TResponse>(RequestData requestData, byte[] responseBody = null, int? statusCode = null,
+			string contentType = null
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
 			var body = responseBody ?? _responseBody;
@@ -58,12 +59,14 @@ protected TResponse ReturnConnectionStatus<TResponse>(RequestData requestData, b
 			}
 			requestData.MadeItToResponse = true;
 
-			var sc = statusCode ?? this._statusCode;
-			Stream s = (body != null) ? requestData.MemoryStreamFactory.Create(body) : requestData.MemoryStreamFactory.Create(EmptyBody);
+			var sc = statusCode ?? _statusCode;
+			Stream s = body != null ? requestData.MemoryStreamFactory.Create(body) : requestData.MemoryStreamFactory.Create(EmptyBody);
 			return ResponseBuilder.ToResponse<TResponse>(requestData, _exception, sc, null, s, contentType ?? _contentType ?? RequestData.MimeType);
 		}
 
-		protected async Task<TResponse> ReturnConnectionStatusAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken, byte[] responseBody = null, int? statusCode = null, string contentType = null)
+		protected async Task<TResponse> ReturnConnectionStatusAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken,
+			byte[] responseBody = null, int? statusCode = null, string contentType = null
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
 			var body = responseBody ?? _responseBody;
@@ -81,14 +84,13 @@ protected async Task<TResponse> ReturnConnectionStatusAsync<TResponse>(RequestDa
 			}
 			requestData.MadeItToResponse = true;
 
-			var sc = statusCode ?? this._statusCode;
-			Stream s = (body != null) ? requestData.MemoryStreamFactory.Create(body) : requestData.MemoryStreamFactory.Create(EmptyBody);
-			return await ResponseBuilder.ToResponseAsync<TResponse>(requestData, _exception, sc, null, s, contentType ?? _contentType, cancellationToken)
+			var sc = statusCode ?? _statusCode;
+			Stream s = body != null ? requestData.MemoryStreamFactory.Create(body) : requestData.MemoryStreamFactory.Create(EmptyBody);
+			return await ResponseBuilder
+				.ToResponseAsync<TResponse>(requestData, _exception, sc, null, s, contentType ?? _contentType, cancellationToken)
 				.ConfigureAwait(false);
 		}
 
-		void IDisposable.Dispose() => DisposeManagedResources();
-
 		protected virtual void DisposeManagedResources() { }
 	}
 }
diff --git a/src/Elasticsearch.Net/ConnectionPool/IConnectionPool.cs b/src/Elasticsearch.Net/ConnectionPool/IConnectionPool.cs
index 1fee6bb77aa..cfba082d7a7 100644
--- a/src/Elasticsearch.Net/ConnectionPool/IConnectionPool.cs
+++ b/src/Elasticsearch.Net/ConnectionPool/IConnectionPool.cs
@@ -6,11 +6,9 @@ namespace Elasticsearch.Net
 	public interface IConnectionPool : IDisposable
 	{
 		/// <summary>
-		/// Returns a read only view of all the nodes in the cluster, which might involve creating copies of nodes e.g
-		/// if you are using <see cref="SniffingConnectionPool"/>.
-		/// If you do not need an isolated copy of the nodes, please read <see cref="CreateView"/> to completion
+		/// The last time that this instance was updated
 		/// </summary>
-		IReadOnlyCollection<Node> Nodes { get; }
+		DateTime LastUpdate { get; }
 
 		/// <summary>
 		/// Returns the default maximum retries for the connection pool implementation.
@@ -20,9 +18,17 @@ public interface IConnectionPool : IDisposable
 		int MaxRetries { get; }
 
 		/// <summary>
-		/// Whether reseeding with new nodes is supported
+		/// Returns a read only view of all the nodes in the cluster, which might involve creating copies of nodes e.g
+		/// if you are using <see cref="SniffingConnectionPool" />.
+		/// If you do not need an isolated copy of the nodes, please read <see cref="CreateView" /> to completion
 		/// </summary>
-		bool SupportsReseeding { get; }
+		IReadOnlyCollection<Node> Nodes { get; }
+
+		/// <summary>
+		/// Whether a sniff is seen on startup. The implementation is
+		/// responsible for setting this in a thread safe fashion.
+		/// </summary>
+		bool SniffedOnStartup { get; set; }
 
 		/// <summary>
 		/// Whether pinging is supported
@@ -30,21 +36,15 @@ public interface IConnectionPool : IDisposable
 		bool SupportsPinging { get; }
 
 		/// <summary>
-		/// The last time that this instance was updated
+		/// Whether reseeding with new nodes is supported
 		/// </summary>
-		DateTime LastUpdate { get; }
+		bool SupportsReseeding { get; }
 
 		/// <summary>
 		/// Whether SSL/TLS is being used
 		/// </summary>
 		bool UsingSsl { get; }
 
-		/// <summary>
-		/// Whether a sniff is seen on startup. The implementation is
-		/// responsible for setting this in a thread safe fashion.
-		/// </summary>
-		bool SniffedOnStartup { get; set; }
-
 		/// <summary>
 		/// Creates a view over the nodes, with changing starting positions, that wraps over on each call
 		/// e.g Thread A might get 1,2,3,4,5 and thread B will get 2,3,4,5,1.
@@ -56,6 +56,5 @@ public interface IConnectionPool : IDisposable
 		/// Reseeds the nodes. The implementation is responsible for thread safety
 		/// </summary>
 		void Reseed(IEnumerable<Node> nodes);
-
 	}
 }
diff --git a/src/Elasticsearch.Net/ConnectionPool/Node.cs b/src/Elasticsearch.Net/ConnectionPool/Node.cs
index bef75f36839..cf7d2c5e1af 100644
--- a/src/Elasticsearch.Net/ConnectionPool/Node.cs
+++ b/src/Elasticsearch.Net/ConnectionPool/Node.cs
@@ -6,89 +6,100 @@ namespace Elasticsearch.Net
 {
 	public class Node : IEquatable<Node>
 	{
+		private static readonly IReadOnlyDictionary<string, object> EmptySettings =
+			new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
+
 		public Node(Uri uri)
 		{
 			//this makes sure that elasticsearch paths stay relative to the path passed in
 			//http://my-saas-provider.com/instance
 			if (!uri.OriginalString.EndsWith("/", StringComparison.Ordinal))
 				uri = new Uri(uri.OriginalString + "/");
-			this.Uri = uri;
-			this.IsAlive = true;
-			this.HoldsData = true;
-			this.MasterEligible = true;
-			this.IsResurrected = true;
+			Uri = uri;
+			IsAlive = true;
+			HoldsData = true;
+			MasterEligible = true;
+			IsResurrected = true;
 		}
 
-		public Uri Uri { get; }
+		public bool ClientNode => !MasterEligible && !HoldsData;
 
-		/// <summary> When set this signals the transport that a ping before first usage would be wise</summary>
-		public bool IsResurrected { get; set; }
+		/// <summary> When marked dead this reflects the date that the node has to be taken out of rotation till</summary>
+		public DateTime DeadUntil { get; private set; }
 
-		/// <summary>Whether HTTP is enabled on the node or not</summary>
-		public bool HttpEnabled { get; set; } = true;
+		/// <summary> The number of failed attempts trying to use this node, resets when a node is marked alive</summary>
+		public int FailedAttempts { get; private set; }
 
 		/// <summary>Indicates whether this node holds data, defaults to true when unknown/unspecified</summary>
 		public bool HoldsData { get; set; }
 
-		/// <summary>Indicates whether this node is master eligible, defaults to true when unknown/unspecified</summary>
-		public bool MasterEligible { get; set; }
+		/// <summary>Whether HTTP is enabled on the node or not</summary>
+		public bool HttpEnabled { get; set; } = true;
+
+		/// <summary>The id of the node, defaults to null when unknown/unspecified</summary>
+		public string Id { get; set; }
 
 		/// <summary>Indicates whether this node is allowed to run ingest pipelines, defaults to true when unknown/unspecified</summary>
 		public bool IngestEnabled { get; set; }
 
-		public bool MasterOnlyNode => this.MasterEligible && !this.HoldsData;
+		public virtual bool IsAlive { get; private set; }
 
-		public bool ClientNode => !this.MasterEligible && !this.HoldsData;
+		/// <summary> When set this signals the transport that a ping before first usage would be wise</summary>
+		public bool IsResurrected { get; set; }
 
-		/// <summary>The id of the node, defaults to null when unknown/unspecified</summary>
-		public string Id { get; set; }
+		/// <summary>Indicates whether this node is master eligible, defaults to true when unknown/unspecified</summary>
+		public bool MasterEligible { get; set; }
+
+		public bool MasterOnlyNode => MasterEligible && !HoldsData;
 
 		/// <summary>The name of the node, defaults to null when unknown/unspecified</summary>
 		public string Name { get; set; }
 
-		private static readonly IReadOnlyDictionary<string, object> EmptySettings = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
 		public IReadOnlyDictionary<string, object> Settings { get; set; } = EmptySettings;
 
-		/// <summary> The number of failed attempts trying to use this node, resets when a node is marked alive</summary>
-		public int FailedAttempts { get; private set; }
+		public Uri Uri { get; }
 
-		/// <summary> When marked dead this reflects the date that the node has to be taken out of rotation till</summary>
-		public DateTime DeadUntil { get; private set; }
+		//a Node is only unique by its Uri
+		public bool Equals(Node other)
+		{
+			if (ReferenceEquals(null, other)) return false;
+			if (ReferenceEquals(this, other)) return true;
 
-		public virtual bool IsAlive { get; private set; }
+			return Uri == other.Uri;
+		}
 
 		public void MarkDead(DateTime untill)
 		{
-			this.FailedAttempts++;
-			this.IsAlive = false;
-			this.IsResurrected = false;
-			this.DeadUntil = untill;
+			FailedAttempts++;
+			IsAlive = false;
+			IsResurrected = false;
+			DeadUntil = untill;
 		}
 
 		public void MarkAlive()
 		{
-			this.FailedAttempts = 0;
-			this.IsAlive = true;
-			this.IsResurrected = false;
-			this.DeadUntil = default(DateTime);
+			FailedAttempts = 0;
+			IsAlive = true;
+			IsResurrected = false;
+			DeadUntil = default(DateTime);
 		}
 
-		public Uri CreatePath(string path) => new Uri(this.Uri, path);
+		public Uri CreatePath(string path) => new Uri(Uri, path);
 
 		public Node Clone() =>
-			new Node(this.Uri)
+			new Node(Uri)
 			{
-				IsResurrected = this.IsResurrected,
-				Id = this.Id,
-				Name = this.Name,
-				HoldsData = this.HoldsData,
-				MasterEligible = this.MasterEligible,
-				FailedAttempts = this.FailedAttempts,
-				DeadUntil = this.DeadUntil,
-				IsAlive = this.IsAlive,
-				Settings = this.Settings,
-				IngestEnabled = this.IngestEnabled,
-				HttpEnabled = this.HttpEnabled
+				IsResurrected = IsResurrected,
+				Id = Id,
+				Name = Name,
+				HoldsData = HoldsData,
+				MasterEligible = MasterEligible,
+				FailedAttempts = FailedAttempts,
+				DeadUntil = DeadUntil,
+				IsAlive = IsAlive,
+				Settings = Settings,
+				IngestEnabled = IngestEnabled,
+				HttpEnabled = HttpEnabled
 			};
 
 
@@ -99,22 +110,15 @@ public Node Clone() =>
 
 		public static implicit operator Node(Uri uri) => new Node(uri);
 
-		//a Node is only unique by its Uri
-		public bool Equals(Node other)
-		{
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return this.Uri == other.Uri;
-		}
-
 		public override bool Equals(object obj)
 		{
 			if (ReferenceEquals(null, obj)) return false;
 			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != this.GetType()) return false;
+			if (obj.GetType() != GetType()) return false;
+
 			return Equals((Node)obj);
 		}
 
-		public override int GetHashCode() => this.Uri.GetHashCode();
+		public override int GetHashCode() => Uri.GetHashCode();
 	}
 }
diff --git a/src/Elasticsearch.Net/ConnectionPool/SingleNodeConnectionPool.cs b/src/Elasticsearch.Net/ConnectionPool/SingleNodeConnectionPool.cs
index 62986860d33..98db354aedc 100644
--- a/src/Elasticsearch.Net/ConnectionPool/SingleNodeConnectionPool.cs
+++ b/src/Elasticsearch.Net/ConnectionPool/SingleNodeConnectionPool.cs
@@ -8,43 +8,47 @@ namespace Elasticsearch.Net
 	/// </summary>
 	public class SingleNodeConnectionPool : IConnectionPool
 	{
-		/// <inheritdoc/>
-		public int MaxRetries => 0;
+		/// <inheritdoc />
+		public SingleNodeConnectionPool(Uri uri, IDateTimeProvider dateTimeProvider = null)
+		{
+			var node = new Node(uri);
+			UsingSsl = node.Uri.Scheme == "https";
+			Nodes = new List<Node> { node };
+			LastUpdate = (dateTimeProvider ?? DateTimeProvider.Default).Now();
+		}
 
-		/// <inheritdoc/>
-		public bool SupportsReseeding => false;
+		/// <inheritdoc />
+		public DateTime LastUpdate { get; }
 
-		/// <inheritdoc/>
-		public bool SupportsPinging => false;
+		/// <inheritdoc />
+		public int MaxRetries => 0;
 
-		/// <inheritdoc/>
-		public void Reseed(IEnumerable<Node> nodes) { } //ignored
+		/// <inheritdoc />
+		public IReadOnlyCollection<Node> Nodes { get; }
 
-		/// <inheritdoc/>
-		public bool UsingSsl { get; }
+		/// <inheritdoc />
+		public bool SniffedOnStartup
+		{
+			get => true;
+			set { }
+		}
 
-		/// <inheritdoc/>
-		public bool SniffedOnStartup { get => true; set {  } }
+		/// <inheritdoc />
+		public bool SupportsPinging => false;
 
-		/// <inheritdoc/>
-		public IReadOnlyCollection<Node> Nodes { get; }
+		/// <inheritdoc />
+		public bool SupportsReseeding => false;
 
-		/// <inheritdoc/>
-		public DateTime LastUpdate { get; }
+		/// <inheritdoc />
+		public bool UsingSsl { get; }
 
-		/// <inheritdoc/>
-		public SingleNodeConnectionPool(Uri uri, IDateTimeProvider dateTimeProvider = null)
-		{
-			var node = new Node(uri);
-			this.UsingSsl = node.Uri.Scheme == "https";
-			this.Nodes = new List<Node> { node };
-			this.LastUpdate = (dateTimeProvider ?? DateTimeProvider.Default).Now();
-		}
+		/// <inheritdoc />
+		public IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null) => Nodes;
 
-		/// <inheritdoc/>
-		public IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null) => this.Nodes;
+		/// <inheritdoc />
+		public void Reseed(IEnumerable<Node> nodes) { } //ignored
 
-		void IDisposable.Dispose() => this.DisposeManagedResources();
+		void IDisposable.Dispose() => DisposeManagedResources();
 
 		protected virtual void DisposeManagedResources() { }
 	}
diff --git a/src/Elasticsearch.Net/ConnectionPool/SniffingConnectionPool.cs b/src/Elasticsearch.Net/ConnectionPool/SniffingConnectionPool.cs
index 251dcf308db..2838b55b8d8 100644
--- a/src/Elasticsearch.Net/ConnectionPool/SniffingConnectionPool.cs
+++ b/src/Elasticsearch.Net/ConnectionPool/SniffingConnectionPool.cs
@@ -9,15 +9,8 @@ public class SniffingConnectionPool : StaticConnectionPool
 	{
 		private readonly ReaderWriterLockSlim _readerWriter = new ReaderWriterLockSlim();
 
-		/// <inheritdoc/>
-		public override bool SupportsReseeding => true;
-
-		/// <inheritdoc/>
-		public override bool SupportsPinging => true;
-
 		public SniffingConnectionPool(IEnumerable<Uri> uris, bool randomize = true, IDateTimeProvider dateTimeProvider = null)
-			: base(uris, randomize, dateTimeProvider)
-		{ }
+			: base(uris, randomize, dateTimeProvider) { }
 
 		public SniffingConnectionPool(IEnumerable<Node> nodes, bool randomize = true, IDateTimeProvider dateTimeProvider = null)
 			: base(nodes, randomize, dateTimeProvider) { }
@@ -25,7 +18,7 @@ public SniffingConnectionPool(IEnumerable<Node> nodes, bool randomize = true, ID
 		public SniffingConnectionPool(IEnumerable<Node> nodes, Func<Node, float> nodeScorer, IDateTimeProvider dateTimeProvider = null)
 			: base(nodes, nodeScorer, dateTimeProvider) { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public override IReadOnlyCollection<Node> Nodes
 		{
 			get
@@ -34,55 +27,61 @@ public override IReadOnlyCollection<Node> Nodes
 				{
 					//since internalnodes can be changed after returning we return
 					//a completely new list of cloned nodes
-					this._readerWriter.EnterReadLock();
-					return this.InternalNodes.Select(n => n.Clone()).ToList();
+					_readerWriter.EnterReadLock();
+					return InternalNodes.Select(n => n.Clone()).ToList();
 				}
 				finally
 				{
-					this._readerWriter.ExitReadLock();
+					_readerWriter.ExitReadLock();
 				}
 			}
 		}
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public override bool SupportsPinging => true;
+
+		/// <inheritdoc />
+		public override bool SupportsReseeding => true;
+
+		/// <inheritdoc />
 		public override void Reseed(IEnumerable<Node> nodes)
 		{
 			if (!nodes.HasAny()) return;
 
 			try
 			{
-				this._readerWriter.EnterWriteLock();
-				var sortedNodes = this.SortNodes(nodes)
+				_readerWriter.EnterWriteLock();
+				var sortedNodes = SortNodes(nodes)
 					.DistinctBy(n => n.Uri)
 					.ToList();
 
-				this.InternalNodes = sortedNodes;
-				this.GlobalCursor = -1;
-				this.LastUpdate = this.DateTimeProvider.Now();
+				InternalNodes = sortedNodes;
+				GlobalCursor = -1;
+				LastUpdate = DateTimeProvider.Now();
 			}
 			finally
 			{
-				this._readerWriter.ExitWriteLock();
+				_readerWriter.ExitWriteLock();
 			}
 		}
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public override IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null)
 		{
-			this._readerWriter.EnterReadLock();
+			_readerWriter.EnterReadLock();
 			try
 			{
 				return base.CreateView(audit);
 			}
 			finally
 			{
-				this._readerWriter.ExitReadLock();
+				_readerWriter.ExitReadLock();
 			}
 		}
 
 		protected override void DisposeManagedResources()
 		{
-			this._readerWriter?.Dispose();
+			_readerWriter?.Dispose();
 			base.DisposeManagedResources();
 		}
 	}
diff --git a/src/Elasticsearch.Net/ConnectionPool/StaticConnectionPool.cs b/src/Elasticsearch.Net/ConnectionPool/StaticConnectionPool.cs
index 11b8028b794..ce632a190f7 100644
--- a/src/Elasticsearch.Net/ConnectionPool/StaticConnectionPool.cs
+++ b/src/Elasticsearch.Net/ConnectionPool/StaticConnectionPool.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading;
 
@@ -8,79 +7,74 @@ namespace Elasticsearch.Net
 {
 	public class StaticConnectionPool : IConnectionPool
 	{
+		protected int GlobalCursor = -1;
 		private readonly Func<Node, float> _nodeScorer;
-		protected IDateTimeProvider DateTimeProvider { get; }
-		protected Random Random { get; } = new Random();
-		protected bool Randomize { get; }
-
-		protected List<Node> InternalNodes { get; set; }
-
-		protected List<Node> AliveNodes
-		{
-			get
-			{
-				var now = DateTimeProvider.Now();
-                return this.InternalNodes
-                    .Where(n => n.IsAlive || n.DeadUntil <= now)
-                    .ToList();
-			}
-		}
-
-		/// <inheritdoc/>
-		public virtual IReadOnlyCollection<Node> Nodes => this.InternalNodes;
-
-		/// <inheritdoc/>
-		public int MaxRetries => this.InternalNodes.Count - 1;
-
-		/// <inheritdoc/>
-		public virtual bool SupportsReseeding => false;
-		/// <inheritdoc/>
-		public virtual bool SupportsPinging => true;
-
-		/// <inheritdoc/>
-		public virtual void Reseed(IEnumerable<Node> nodes) { } //ignored
-
-		/// <inheritdoc/>
-		public bool UsingSsl { get; }
-
-		/// <inheritdoc/>
-		public bool SniffedOnStartup { get; set; }
-
-		/// <inheritdoc/>
-		public DateTime LastUpdate { get; protected set; }
 
 		public StaticConnectionPool(IEnumerable<Uri> uris, bool randomize = true, IDateTimeProvider dateTimeProvider = null)
-			: this(uris.Select(uri => new Node(uri)), randomize, dateTimeProvider)
-		{ }
+			: this(uris.Select(uri => new Node(uri)), randomize, dateTimeProvider) { }
 
 		public StaticConnectionPool(IEnumerable<Node> nodes, bool randomize = true, IDateTimeProvider dateTimeProvider = null)
-			: this(nodes, null, dateTimeProvider)
-		{
-			this.Randomize = randomize;
-		}
+			: this(nodes, null, dateTimeProvider) => Randomize = randomize;
 
 		//this constructor is protected because nodeScorer only makes sense on subclasses that support reseeding
 		//otherwise just manually sort `nodes` before instantiating.
 		protected StaticConnectionPool(IEnumerable<Node> nodes, Func<Node, float> nodeScorer, IDateTimeProvider dateTimeProvider = null)
 		{
 			nodes.ThrowIfEmpty(nameof(nodes));
-			this.DateTimeProvider = dateTimeProvider ?? Elasticsearch.Net.DateTimeProvider.Default;
+			DateTimeProvider = dateTimeProvider ?? Net.DateTimeProvider.Default;
 
 			var nn = nodes.ToList();
 			var uris = nn.Select(n => n.Uri).ToList();
 			if (uris.Select(u => u.Scheme).Distinct().Count() > 1)
 				throw new ArgumentException("Trying to instantiate a connection pool with mixed URI Schemes");
 
-			this.UsingSsl = uris.Any(uri => uri.Scheme == "https");
+			UsingSsl = uris.Any(uri => uri.Scheme == "https");
 
-			this._nodeScorer = nodeScorer;
-			this.InternalNodes = this.SortNodes(nn)
+			_nodeScorer = nodeScorer;
+			InternalNodes = SortNodes(nn)
 				.DistinctBy(n => n.Uri)
 				.ToList();
-			this.LastUpdate = this.DateTimeProvider.Now();
+			LastUpdate = DateTimeProvider.Now();
 		}
 
-		protected int GlobalCursor = -1;
+		/// <inheritdoc />
+		public DateTime LastUpdate { get; protected set; }
+
+		/// <inheritdoc />
+		public int MaxRetries => InternalNodes.Count - 1;
+
+		/// <inheritdoc />
+		public virtual IReadOnlyCollection<Node> Nodes => InternalNodes;
+
+		/// <inheritdoc />
+		public bool SniffedOnStartup { get; set; }
+
+		/// <inheritdoc />
+		public virtual bool SupportsPinging => true;
+
+		/// <inheritdoc />
+		public virtual bool SupportsReseeding => false;
+
+		/// <inheritdoc />
+		public bool UsingSsl { get; }
+
+		protected List<Node> AliveNodes
+		{
+			get
+			{
+				var now = DateTimeProvider.Now();
+				return InternalNodes
+					.Where(n => n.IsAlive || n.DeadUntil <= now)
+					.ToList();
+			}
+		}
+
+		protected IDateTimeProvider DateTimeProvider { get; }
+
+		protected List<Node> InternalNodes { get; set; }
+		protected Random Random { get; } = new Random();
+		protected bool Randomize { get; }
+
 		/// <summary>
 		/// Creates a view of all the live nodes with changing starting positions that wraps over on each call
 		/// e.g Thread A might get 1,2,3,4,5 and thread B will get 2,3,4,5,1.
@@ -88,28 +82,32 @@ protected StaticConnectionPool(IEnumerable<Node> nodes, Func<Node, float> nodeSc
 		/// </summary>
 		public virtual IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null)
 		{
-			var nodes = this.AliveNodes;
+			var nodes = AliveNodes;
 
 			var globalCursor = Interlocked.Increment(ref GlobalCursor);
 
 			if (nodes.Count == 0)
 			{
 				//could not find a suitable node retrying on first node off globalCursor
-				yield return this.RetryInternalNodes(globalCursor, audit);
+				yield return RetryInternalNodes(globalCursor, audit);
+
 				yield break;
 			}
 
 			var localCursor = globalCursor % nodes.Count;
-			foreach (var aliveNode in SelectAliveNodes(localCursor, nodes, audit))
-			{
-				yield return aliveNode;
-			}
+			foreach (var aliveNode in SelectAliveNodes(localCursor, nodes, audit)) yield return aliveNode;
 		}
 
+		/// <inheritdoc />
+		public virtual void Reseed(IEnumerable<Node> nodes) { } //ignored
+
+
+		void IDisposable.Dispose() => DisposeManagedResources();
+
 		protected virtual Node RetryInternalNodes(int globalCursor, Action<AuditEvent, Node> audit = null)
 		{
 			audit?.Invoke(AuditEvent.AllNodesDead, null);
-			var node = this.InternalNodes[globalCursor % this.InternalNodes.Count];
+			var node = InternalNodes[globalCursor % InternalNodes.Count];
 			node.IsResurrected = true;
 			audit?.Invoke(AuditEvent.Resurrection, node);
 
@@ -134,12 +132,9 @@ protected virtual IEnumerable<Node> SelectAliveNodes(int cursor, List<Node> aliv
 		}
 
 		protected IOrderedEnumerable<Node> SortNodes(IEnumerable<Node> nodes) =>
-			this._nodeScorer != null
+			_nodeScorer != null
 				? nodes.OrderByDescending(_nodeScorer)
-				: nodes.OrderBy(n => this.Randomize ? this.Random.Next() : 1);
-
-
-		void IDisposable.Dispose() => this.DisposeManagedResources();
+				: nodes.OrderBy(n => Randomize ? Random.Next() : 1);
 
 		protected virtual void DisposeManagedResources() { }
 	}
diff --git a/src/Elasticsearch.Net/ConnectionPool/StickyConnectionPool.cs b/src/Elasticsearch.Net/ConnectionPool/StickyConnectionPool.cs
index e0c54324f94..134e0fb2068 100644
--- a/src/Elasticsearch.Net/ConnectionPool/StickyConnectionPool.cs
+++ b/src/Elasticsearch.Net/ConnectionPool/StickyConnectionPool.cs
@@ -7,33 +7,32 @@ namespace Elasticsearch.Net
 	public class StickyConnectionPool : StaticConnectionPool
 	{
 		public StickyConnectionPool(IEnumerable<Uri> uris, IDateTimeProvider dateTimeProvider = null)
-			: base(uris, false, dateTimeProvider)
-		{ }
+			: base(uris, false, dateTimeProvider) { }
 
 		public StickyConnectionPool(IEnumerable<Node> nodes, IDateTimeProvider dateTimeProvider = null)
-			: base(nodes, false, dateTimeProvider)
-		{ }
+			: base(nodes, false, dateTimeProvider) { }
 
 		public override IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null)
 		{
-			var nodes = this.AliveNodes;
+			var nodes = AliveNodes;
 
 			if (nodes.Count == 0)
 			{
-				var globalCursor = Interlocked.Increment(ref this.GlobalCursor);
+				var globalCursor = Interlocked.Increment(ref GlobalCursor);
 
 				//could not find a suitable node retrying on first node off globalCursor
-				yield return this.RetryInternalNodes(globalCursor, audit);
+				yield return RetryInternalNodes(globalCursor, audit);
+
 				yield break;
 			}
 
 			// If the cursor is greater than the default then it's been
 			// set already but we now have a live node so we should reset it
-			if (this.GlobalCursor > -1)
-				Interlocked.Exchange(ref this.GlobalCursor, -1);
+			if (GlobalCursor > -1)
+				Interlocked.Exchange(ref GlobalCursor, -1);
 
 			var localCursor = 0;
-			foreach (var aliveNode in this.SelectAliveNodes(localCursor, nodes, audit))
+			foreach (var aliveNode in SelectAliveNodes(localCursor, nodes, audit))
 				yield return aliveNode;
 		}
 
diff --git a/src/Elasticsearch.Net/ConnectionPool/StickySniffingConnectionPool.cs b/src/Elasticsearch.Net/ConnectionPool/StickySniffingConnectionPool.cs
index f243fab61f7..eebe9d560a5 100644
--- a/src/Elasticsearch.Net/ConnectionPool/StickySniffingConnectionPool.cs
+++ b/src/Elasticsearch.Net/ConnectionPool/StickySniffingConnectionPool.cs
@@ -7,35 +7,36 @@ namespace Elasticsearch.Net
 {
 	public class StickySniffingConnectionPool : SniffingConnectionPool
 	{
-		public override bool SupportsPinging => true;
-		public override bool SupportsReseeding => true;
-
 		public StickySniffingConnectionPool(IEnumerable<Uri> uris, Func<Node, float> nodeScorer, IDateTimeProvider dateTimeProvider = null)
 			: base(uris.Select(uri => new Node(uri)), nodeScorer ?? DefaultNodeScore, dateTimeProvider) { }
 
 		public StickySniffingConnectionPool(IEnumerable<Node> nodes, Func<Node, float> nodeScorer, IDateTimeProvider dateTimeProvider = null)
 			: base(nodes, nodeScorer ?? DefaultNodeScore, dateTimeProvider) { }
 
+		public override bool SupportsPinging => true;
+		public override bool SupportsReseeding => true;
+
 		public override IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null)
 		{
-			var nodes = this.AliveNodes;
+			var nodes = AliveNodes;
 
 			if (nodes.Count == 0)
 			{
-				var globalCursor = Interlocked.Increment(ref this.GlobalCursor);
+				var globalCursor = Interlocked.Increment(ref GlobalCursor);
 
 				//could not find a suitable node retrying on first node off globalCursor
-				yield return this.RetryInternalNodes(globalCursor, audit);
+				yield return RetryInternalNodes(globalCursor, audit);
+
 				yield break;
 			}
 
 			// If the cursor is greater than the default then it's been
 			// set already but we now have a live node so we should reset it
-			if (this.GlobalCursor > -1)
-				Interlocked.Exchange(ref this.GlobalCursor, -1);
+			if (GlobalCursor > -1)
+				Interlocked.Exchange(ref GlobalCursor, -1);
 
 			var localCursor = 0;
-			foreach (var aliveNode in this.SelectAliveNodes(localCursor, nodes, audit))
+			foreach (var aliveNode in SelectAliveNodes(localCursor, nodes, audit))
 				yield return aliveNode;
 		}
 
diff --git a/src/Elasticsearch.Net/CrossPlatform/TypeExtensions.cs b/src/Elasticsearch.Net/CrossPlatform/TypeExtensions.cs
index 6a071038273..560e9d47cc0 100644
--- a/src/Elasticsearch.Net/CrossPlatform/TypeExtensions.cs
+++ b/src/Elasticsearch.Net/CrossPlatform/TypeExtensions.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 
 namespace Elasticsearch.Net
 {
@@ -25,7 +22,7 @@ internal static bool AssignableFrom(this Type type, Type from)
 			return type.IsAssignableFrom(from);
 #endif
 		}
-		
+
 		internal static Assembly Assembly(this Type type)
 		{
 #if DOTNETCORE
diff --git a/src/Elasticsearch.Net/Domain/IHideObjectMembers.cs b/src/Elasticsearch.Net/Domain/IHideObjectMembers.cs
index ddcaafb47ed..6db4acf4f25 100644
--- a/src/Elasticsearch.Net/Domain/IHideObjectMembers.cs
+++ b/src/Elasticsearch.Net/Domain/IHideObjectMembers.cs
@@ -6,7 +6,7 @@
 namespace Elasticsearch.Net
 {
 	/// <summary>
-	/// Helper interface used to hide the base <see cref="object"/>  members from the fluent API to make it much cleaner 
+	/// Helper interface used to hide the base <see cref="object" />  members from the fluent API to make it much cleaner
 	/// in Visual Studio intellisense.
 	/// </summary>
 	/// <remarks>Created by Daniel Cazzulino http://www.clariusconsulting.net/blogs/kzu/archive/2008/03/10/58301.aspx</remarks>
@@ -15,32 +15,31 @@ namespace Elasticsearch.Net
 	public interface IHideObjectMembers
 	{
 		/// <summary>
-		/// Hides the <see cref="Equals"/> method.
+		/// Hides the <see cref="Equals" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		bool Equals(object obj);
 
 		/// <summary>
-		/// Hides the <see cref="GetHashCode"/> method.
+		/// Hides the <see cref="GetHashCode" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		int GetHashCode();
 
 		/// <summary>
-		/// Hides the <see cref="GetType"/> method.
+		/// Hides the <see cref="GetType" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		Type GetType();
 
 		/// <summary>
-		/// Hides the <see cref="ToString"/> method.
+		/// Hides the <see cref="ToString" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		string ToString();
 	}
-
 }
diff --git a/src/Elasticsearch.Net/Domain/RequestParameters/IRequestParameters.cs b/src/Elasticsearch.Net/Domain/RequestParameters/IRequestParameters.cs
index c095ef5de01..3463c5bc012 100644
--- a/src/Elasticsearch.Net/Domain/RequestParameters/IRequestParameters.cs
+++ b/src/Elasticsearch.Net/Domain/RequestParameters/IRequestParameters.cs
@@ -9,24 +9,24 @@ public interface IRequestParameters
 		HttpMethod DefaultHttpMethod { get; }
 
 		/// <summary>
-		/// The querystring that should be appended to the path of the request
+		/// A method that can be set on the request to take ownership of creating the response object.
+		/// When set this will be called instead of the internal .Deserialize();
 		/// </summary>
-		Dictionary<string, object> QueryString { get; set; }
+		Func<IApiCallDetails, Stream, object> DeserializationOverride { get; set; }
 
 		/// <summary>
-		/// A method that can be set on the request to take ownership of creating the response object.
-		/// When set this will be called instead of the internal .Deserialize();
+		/// The querystring that should be appended to the path of the request
 		/// </summary>
-		Func<IApiCallDetails, Stream, object> DeserializationOverride { get; set;  }
+		Dictionary<string, object> QueryString { get; set; }
 
 		/// <summary>
 		/// Configuration for this specific request, i.e disable sniffing, custom timeouts etcetera.
 		/// </summary>
 		IRequestConfiguration RequestConfiguration { get; set; }
 
-		/// <summary> Sets a query string param. If <paramref name="value"/> is null and the parameter exists it will be removed </summary>
+		/// <summary> Sets a query string param. If <paramref name="value" /> is null and the parameter exists it will be removed </summary>
 		/// <param name="name">The query string parameter to add</param>
-		/// <param name="value">The value to set, if null removes <paramref name="name"/> from the query string if it exists</param>
+		/// <param name="value">The value to set, if null removes <paramref name="name" /> from the query string if it exists</param>
 		void SetQueryString(string name, object value);
 
 		bool ContainsQueryString(string name);
diff --git a/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Patched.cs b/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Patched.cs
index 0950f52954b..8966d2ca6f4 100644
--- a/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Patched.cs
+++ b/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Patched.cs
@@ -6,6 +6,7 @@ public partial class ForceMergeRequestParameters
 	{
 		[Obsolete("Removed in Elasticsearch 6.2. Will be removed in NEST 7.x. Calling this is a no-op.")]
 		public string OperationThreading { get; set; }
+
 		[Obsolete("Removed in Elasticsearch 6.2. Will be removed in NEST 7.x. Calling this is a no-op.")]
 		public bool? WaitForMerge { get; set; }
 	}
diff --git a/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.cs b/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.cs
index 72df06e51c4..0cc8d5a7f4d 100644
--- a/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.cs
+++ b/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.cs
@@ -12,46 +12,50 @@ namespace Elasticsearch.Net
 	/// <typeparam name="T"></typeparam>
 	public abstract class RequestParameters<T> : IRequestParameters where T : RequestParameters<T>
 	{
-		private IRequestParameters Self => this;
+		public abstract HttpMethod DefaultHttpMethod { get; }
 
 		public Func<IApiCallDetails, Stream, object> DeserializationOverride { get; set; }
-		public IRequestConfiguration RequestConfiguration { get; set; }
-
-		public abstract HttpMethod DefaultHttpMethod { get; }
 		public Dictionary<string, object> QueryString { get; set; } = new Dictionary<string, object>();
+		public IRequestConfiguration RequestConfiguration { get; set; }
+		private IRequestParameters Self => this;
 
-		//These exists solely so the generated code can call these shortened methods
-		protected TOut Q<TOut>(string name) => this.GetQueryStringValue<TOut>(name);
-		protected void Q(string name, object value) => this.SetQueryString(name, value);
-
-		/// <inheritdoc />
-		public void SetQueryString(string name, object value)
-		{
-			if (value == null) this.RemoveQueryString(name);
-			else Self.QueryString[name] = value;
-		}
-		private void RemoveQueryString(string name)
-		{
-			if (!Self.QueryString.ContainsKey(name)) return;
-			Self.QueryString.Remove(name);
-		}
 		/// <inheritdoc />
 		public bool ContainsQueryString(string name) => Self.QueryString != null && Self.QueryString.ContainsKey(name);
 
 		/// <inheritdoc />
 		public TOut GetQueryStringValue<TOut>(string name)
 		{
-			if (!this.ContainsQueryString(name))
+			if (!ContainsQueryString(name))
 				return default(TOut);
+
 			var value = Self.QueryString[name];
 			if (value == null)
 				return default(TOut);
+
 			return (TOut)value;
 		}
 
 		/// <inheritdoc />
 		public string GetResolvedQueryStringValue(string n, IConnectionConfigurationValues s) =>
 			CreateString(GetQueryStringValue<object>(n), s);
-	}
 
+		/// <inheritdoc />
+		public void SetQueryString(string name, object value)
+		{
+			if (value == null) RemoveQueryString(name);
+			else Self.QueryString[name] = value;
+		}
+
+		//These exists solely so the generated code can call these shortened methods
+		protected TOut Q<TOut>(string name) => GetQueryStringValue<TOut>(name);
+
+		protected void Q(string name, object value) => SetQueryString(name, value);
+
+		private void RemoveQueryString(string name)
+		{
+			if (!Self.QueryString.ContainsKey(name)) return;
+
+			Self.QueryString.Remove(name);
+		}
+	}
 }
diff --git a/src/Elasticsearch.Net/ElasticLowLevelClient.Patched.cs b/src/Elasticsearch.Net/ElasticLowLevelClient.Patched.cs
index 097782a0a64..e401fc0b300 100644
--- a/src/Elasticsearch.Net/ElasticLowLevelClient.Patched.cs
+++ b/src/Elasticsearch.Net/ElasticLowLevelClient.Patched.cs
@@ -7,30 +7,46 @@ namespace Elasticsearch.Net
 {
 	public partial class ElasticLowLevelClient
 	{
-		///<summary>GET on /_xpack/migration/deprecations <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para></summary>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
+		/// <summary>GET on /_xpack/migration/deprecations
+		/// <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para>
+		/// </summary>
+		/// <param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		[Obsolete("Use XpackMigrationDeprecations")]
 		public TResponse XpackDeprecationInfo<TResponse>(DeprecationInfoRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() => this.DoRequest<TResponse>(GET, Url($"_xpack/migration/deprecations"), null, _params(requestParameters));
+			where TResponse : class, IElasticsearchResponse, new() =>
+			DoRequest<TResponse>(GET, Url($"_xpack/migration/deprecations"), null, _params(requestParameters));
 
-		///<summary>GET on /_xpack/migration/deprecations <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para></summary>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		[Obsolete("Use XpackMigrationDeprecationsAsync")]
-		public Task<TResponse> XpackDeprecationInfoAsync<TResponse>(DeprecationInfoRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken))
-			where TResponse : class, IElasticsearchResponse, new() => this.DoRequestAsync<TResponse>(GET, Url($"_xpack/migration/deprecations"), ctx, null, _params(requestParameters));
-
-		///<summary>GET on /{index}/_xpack/migration/deprecations <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para></summary>
-		///<param name="index">Index pattern</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
+		/// <summary>GET on /{index}/_xpack/migration/deprecations
+		/// <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para>
+		/// </summary>
+		/// <param name="index">Index pattern</param>
+		/// <param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		[Obsolete("Use XpackMigrationDeprecations")]
 		public TResponse XpackDeprecationInfo<TResponse>(string index, DeprecationInfoRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() => this.DoRequest<TResponse>(GET, Url($"{index.NotNull("index")}/_xpack/migration/deprecations"), null, _params(requestParameters));
+			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(GET,
+			Url($"{index.NotNull("index")}/_xpack/migration/deprecations"), null, _params(requestParameters));
+
+		/// <summary>GET on /_xpack/migration/deprecations
+		/// <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para>
+		/// </summary>
+		/// <param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
+		[Obsolete("Use XpackMigrationDeprecationsAsync")]
+		public Task<TResponse> XpackDeprecationInfoAsync<TResponse>(DeprecationInfoRequestParameters requestParameters = null,
+			CancellationToken ctx = default(CancellationToken)
+		)
+			where TResponse : class, IElasticsearchResponse, new() =>
+			DoRequestAsync<TResponse>(GET, Url($"_xpack/migration/deprecations"), ctx, null, _params(requestParameters));
 
-		///<summary>GET on /{index}/_xpack/migration/deprecations <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para></summary>
-		///<param name="index">Index pattern</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
+		/// <summary>GET on /{index}/_xpack/migration/deprecations
+		/// <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para>
+		/// </summary>
+		/// <param name="index">Index pattern</param>
+		/// <param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		[Obsolete("Use XpackMigrationDeprecationsAsync")]
-		public Task<TResponse> XpackDeprecationInfoAsync<TResponse>(string index, DeprecationInfoRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken))
-			where TResponse : class, IElasticsearchResponse, new() => this.DoRequestAsync<TResponse>(GET, Url($"{index.NotNull("index")}/_xpack/migration/deprecations"), ctx, null, _params(requestParameters));
+		public Task<TResponse> XpackDeprecationInfoAsync<TResponse>(string index, DeprecationInfoRequestParameters requestParameters = null,
+			CancellationToken ctx = default(CancellationToken)
+		)
+			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET,
+			Url($"{index.NotNull("index")}/_xpack/migration/deprecations"), ctx, null, _params(requestParameters));
 	}
 }
diff --git a/src/Elasticsearch.Net/ElasticLowLevelClient.cs b/src/Elasticsearch.Net/ElasticLowLevelClient.cs
index c8999297cfd..07dcf2e0342 100644
--- a/src/Elasticsearch.Net/ElasticLowLevelClient.cs
+++ b/src/Elasticsearch.Net/ElasticLowLevelClient.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -11,18 +12,14 @@ public partial class ElasticLowLevelClient : IElasticLowLevelClient
 	{
 		private readonly ElasticsearchUrlFormatter _formatter;
 
-		public IConnectionConfigurationValues Settings => this.Transport.Settings;
-		public IElasticsearchSerializer Serializer => this.Transport.Settings.RequestResponseSerializer;
-
-		protected ITransport<IConnectionConfigurationValues> Transport { get; set; }
-
 		/// <summary>Instantiate a new low level elasticsearch client to http://localhost:9200</summary>
-		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
 		public ElasticLowLevelClient() : this(new Transport<IConnectionConfigurationValues>(new ConnectionConfiguration())) { }
 
 		/// <summary>Instantiate a new low level elasticsearch client using the specified settings</summary>
-		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
-		public ElasticLowLevelClient(IConnectionConfigurationValues settings) : this(new Transport<IConnectionConfigurationValues>(settings ?? new ConnectionConfiguration())) { }
+		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+		public ElasticLowLevelClient(IConnectionConfigurationValues settings) : this(
+			new Transport<IConnectionConfigurationValues>(settings ?? new ConnectionConfiguration())) { }
 
 		/// <summary>
 		/// Instantiate a new low level elasticsearch client explicitly specifying a custom transport setup
@@ -33,10 +30,26 @@ public ElasticLowLevelClient(ITransport<IConnectionConfigurationValues> transpor
 			transport.Settings.ThrowIfNull(nameof(transport.Settings));
 			transport.Settings.RequestResponseSerializer.ThrowIfNull(nameof(transport.Settings.RequestResponseSerializer));
 
-			this.Transport = transport;
-			this._formatter = this.Transport.Settings.UrlFormatter;
+			Transport = transport;
+			_formatter = Transport.Settings.UrlFormatter;
 		}
 
+		public IElasticsearchSerializer Serializer => Transport.Settings.RequestResponseSerializer;
+
+		public IConnectionConfigurationValues Settings => Transport.Settings;
+
+		protected ITransport<IConnectionConfigurationValues> Transport { get; set; }
+
+		public TResponse DoRequest<TResponse>(HttpMethod method, string path, PostData data = null, IRequestParameters requestParameters = null)
+			where TResponse : class, IElasticsearchResponse, new() =>
+			Transport.Request<TResponse>(method, path, data, requestParameters);
+
+		public Task<TResponse> DoRequestAsync<TResponse>(HttpMethod method, string path, CancellationToken cancellationToken, PostData data = null,
+			IRequestParameters requestParameters = null
+		)
+			where TResponse : class, IElasticsearchResponse, new() =>
+			Transport.RequestAsync<TResponse>(method, path, cancellationToken, data, requestParameters);
+
 		private string Url(FormattableString formattable) => formattable.ToString(_formatter);
 
 		private TRequestParams _params<TRequestParams>(TRequestParams requestParams, string contentType = null, string accept = null)
@@ -47,20 +60,13 @@ private TRequestParams _params<TRequestParams>(TRequestParams requestParams, str
 			requestParams = requestParams ?? new TRequestParams();
 			//The properties are set here on RequestConfiguration here because they are not nullable (fixed in master).
 			if (requestParams.RequestConfiguration == null)
-				requestParams.RequestConfiguration = new RequestConfiguration { EnableHttpPipelining = Settings.HttpPipeliningEnabled, ThrowExceptions = Settings.ThrowExceptions };
+				requestParams.RequestConfiguration = new RequestConfiguration
+					{ EnableHttpPipelining = Settings.HttpPipeliningEnabled, ThrowExceptions = Settings.ThrowExceptions };
 			if (!contentType.IsNullOrEmpty() && requestParams.RequestConfiguration.ContentType.IsNullOrEmpty())
 				requestParams.RequestConfiguration.ContentType = contentType;
 			if (!accept.IsNullOrEmpty() && requestParams.RequestConfiguration.Accept.IsNullOrEmpty())
 				requestParams.RequestConfiguration.Accept = accept;
 			return requestParams;
 		}
-
-		public TResponse DoRequest<TResponse>(HttpMethod method, string path, PostData data = null, IRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() =>
-			this.Transport.Request<TResponse>(method, path, data, requestParameters);
-
-		public Task<TResponse> DoRequestAsync<TResponse>(HttpMethod method, string path, CancellationToken cancellationToken, PostData data = null, IRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() =>
-			this.Transport.RequestAsync<TResponse>(method, path, cancellationToken, data, requestParameters);
 	}
 }
diff --git a/src/Elasticsearch.Net/Exceptions/ElasticsearchClientException.cs b/src/Elasticsearch.Net/Exceptions/ElasticsearchClientException.cs
index 4ec7ed8d282..fdc39731964 100644
--- a/src/Elasticsearch.Net/Exceptions/ElasticsearchClientException.cs
+++ b/src/Elasticsearch.Net/Exceptions/ElasticsearchClientException.cs
@@ -7,24 +7,10 @@ namespace Elasticsearch.Net
 {
 	public class ElasticsearchClientException : Exception
 	{
-		public PipelineFailure? FailureReason { get;  }
-
-		public RequestData Request { get; internal set; }
-
-		public IApiCallDetails Response { get; internal set; }
-
-		public List<Audit> AuditTrail { get; internal set; }
-
-		public ElasticsearchClientException(string message) : base(message)
-		{
-			this.FailureReason = PipelineFailure.Unexpected;
-		}
+		public ElasticsearchClientException(string message) : base(message) => FailureReason = PipelineFailure.Unexpected;
 
 		public ElasticsearchClientException(PipelineFailure failure, string message, Exception innerException)
-			: base(message, innerException)
-		{
-			FailureReason = failure;
-		}
+			: base(message, innerException) => FailureReason = failure;
 
 		public ElasticsearchClientException(PipelineFailure failure, string message, IApiCallDetails apiCall)
 			: this(message)
@@ -34,25 +20,27 @@ public ElasticsearchClientException(PipelineFailure failure, string message, IAp
 			AuditTrail = apiCall?.AuditTrail;
 		}
 
+		public List<Audit> AuditTrail { get; internal set; }
+
 		public string DebugInformation
 		{
 			get
 			{
 				var sb = new StringBuilder();
 				var failureReason = FailureReason.GetStringValue();
-				if (this.FailureReason == PipelineFailure.Unexpected && (this.AuditTrail.HasAny()))
-				{
-					failureReason = "Unrecoverable/Unexpected " + this.AuditTrail.Last().Event.GetStringValue();
-				}
-				var path = Request.Uri != null ? Request.Uri.ToString() : Request.PathAndQuery + " on an empty node, likely a node predicate on ConnectionSettings not matching ANY nodes";
+				if (FailureReason == PipelineFailure.Unexpected && AuditTrail.HasAny())
+					failureReason = "Unrecoverable/Unexpected " + AuditTrail.Last().Event.GetStringValue();
+				var path = Request.Uri != null
+					? Request.Uri.ToString()
+					: Request.PathAndQuery + " on an empty node, likely a node predicate on ConnectionSettings not matching ANY nodes";
 
 				sb.AppendLine($"# FailureReason: {failureReason} while attempting {Request.Method.GetStringValue()} on {path}");
-				if (this.Response != null)
-					ResponseStatics.DebugInformationBuilder(this.Response, sb);
+				if (Response != null)
+					ResponseStatics.DebugInformationBuilder(Response, sb);
 				else
 				{
-					ResponseStatics.DebugAuditTrail(this.AuditTrail, sb);
-					ResponseStatics.DebugAuditTrailExceptions(this.AuditTrail, sb);
+					ResponseStatics.DebugAuditTrail(AuditTrail, sb);
+					ResponseStatics.DebugAuditTrailExceptions(AuditTrail, sb);
 				}
 				if (InnerException != null)
 				{
@@ -60,11 +48,16 @@ public string DebugInformation
 					sb.AppendLine(InnerException.ToString());
 				}
 				sb.AppendLine($"# Exception:");
-				sb.AppendLine(this.ToString());
+				sb.AppendLine(ToString());
 
 				return sb.ToString();
 			}
 		}
 
+		public PipelineFailure? FailureReason { get; }
+
+		public RequestData Request { get; internal set; }
+
+		public IApiCallDetails Response { get; internal set; }
 	}
 }
diff --git a/src/Elasticsearch.Net/Exceptions/UnexpectedElasticsearchClientException.cs b/src/Elasticsearch.Net/Exceptions/UnexpectedElasticsearchClientException.cs
index 9b4ead04f80..b2a799b4a18 100644
--- a/src/Elasticsearch.Net/Exceptions/UnexpectedElasticsearchClientException.cs
+++ b/src/Elasticsearch.Net/Exceptions/UnexpectedElasticsearchClientException.cs
@@ -5,12 +5,10 @@ namespace Elasticsearch.Net
 {
 	public class UnexpectedElasticsearchClientException : ElasticsearchClientException
 	{
-		public List<PipelineException> SeenExceptions { get; set; }
-
 		public UnexpectedElasticsearchClientException(Exception killerException, List<PipelineException> seenExceptions)
-			: base(PipelineFailure.Unexpected, killerException?.Message ?? "An unexpected exception occurred.", killerException)
-		{
-			this.SeenExceptions = seenExceptions;
-		}
+			: base(PipelineFailure.Unexpected, killerException?.Message ?? "An unexpected exception occurred.", killerException) =>
+			SeenExceptions = seenExceptions;
+
+		public List<PipelineException> SeenExceptions { get; set; }
 	}
 }
diff --git a/src/Elasticsearch.Net/Extensions/EnumExtensions.cs b/src/Elasticsearch.Net/Extensions/EnumExtensions.cs
index 58cb4dec1aa..3eca9eec8e7 100644
--- a/src/Elasticsearch.Net/Extensions/EnumExtensions.cs
+++ b/src/Elasticsearch.Net/Extensions/EnumExtensions.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Elasticsearch.Net
 {
diff --git a/src/Elasticsearch.Net/Extensions/Extensions.cs b/src/Elasticsearch.Net/Extensions/Extensions.cs
index f8e9d5e24a0..00f0329c811 100644
--- a/src/Elasticsearch.Net/Extensions/Extensions.cs
+++ b/src/Elasticsearch.Net/Extensions/Extensions.cs
@@ -14,10 +14,7 @@ internal static class Extensions
 		internal static string Utf8String(this byte[] bytes) => bytes == null ? null : Encoding.UTF8.GetString(bytes, 0, bytes.Length);
 #endif
 
-		internal static byte[] Utf8Bytes(this string s)
-		{
-			return s.IsNullOrEmpty() ? null : Encoding.UTF8.GetBytes(s);
-		}
+		internal static byte[] Utf8Bytes(this string s) => s.IsNullOrEmpty() ? null : Encoding.UTF8.GetBytes(s);
 
 		internal static string ToCamelCase(this string s)
 		{
@@ -27,7 +24,7 @@ internal static string ToCamelCase(this string s)
 			if (!char.IsUpper(s[0]))
 				return s;
 
-			string camelCase = char.ToLowerInvariant(s[0]).ToString();
+			var camelCase = char.ToLowerInvariant(s[0]).ToString();
 			if (s.Length > 1)
 				camelCase += s.Substring(1);
 
@@ -39,6 +36,7 @@ internal static string NotNull(this string @object, string parameterName)
 			@object.ThrowIfNull(parameterName);
 			if (string.IsNullOrWhiteSpace(@object))
 				throw new ArgumentException("String argument is empty", parameterName);
+
 			return @object;
 		}
 
@@ -54,15 +52,14 @@ internal static void ThrowIfEmpty<T>(this IEnumerable<T> @object, string paramet
 			if (!@object.Any())
 				throw new ArgumentException("Argument can not be an empty collection", parameterName);
 		}
-		internal static bool HasAny<T>(this IEnumerable<T> list)
-		{
-			return list != null && list.Any();
-		}
+
+		internal static bool HasAny<T>(this IEnumerable<T> list) => list != null && list.Any();
 
 		internal static Exception AsAggregateOrFirst(this IEnumerable<Exception> exceptions)
 		{
-			var es= exceptions as Exception[] ?? exceptions?.ToArray();
+			var es = exceptions as Exception[] ?? exceptions?.ToArray();
 			if (es == null || es.Length == 0) return null;
+
 			return es.Length == 1 ? es[0] : new AggregateException(es);
 		}
 
@@ -71,15 +68,11 @@ internal static void ThrowIfNull<T>(this T value, string name)
 			if (value == null)
 				throw new ArgumentNullException(name);
 		}
-		internal static bool IsNullOrEmpty(this string value)
-		{
-			return string.IsNullOrEmpty(value);
-		}
 
-		internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Func<T, TKey> property)
-		{
-			return items.GroupBy(property).Select(x => x.First());
-		}
+		internal static bool IsNullOrEmpty(this string value) => string.IsNullOrEmpty(value);
+
+		internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Func<T, TKey> property) =>
+			items.GroupBy(property).Select(x => x.First());
 
 		private static readonly long _week = (long)TimeSpan.FromDays(7).TotalMilliseconds;
 		private static readonly long _day = (long)TimeSpan.FromDays(1).TotalMilliseconds;
@@ -126,6 +119,5 @@ internal static string ToTimeUnit(this TimeSpan timeSpan)
 
 			return factor.ToString("0.##", CultureInfo.InvariantCulture) + interval;
 		}
-
 	}
 }
diff --git a/src/Elasticsearch.Net/Extensions/Fluent.cs b/src/Elasticsearch.Net/Extensions/Fluent.cs
index 4ca8e2e7a6c..0387c501335 100644
--- a/src/Elasticsearch.Net/Extensions/Fluent.cs
+++ b/src/Elasticsearch.Net/Extensions/Fluent.cs
@@ -11,5 +11,4 @@ internal static TDescriptor Assign<TDescriptor, TInterface>(TDescriptor self, Ac
 			return self;
 		}
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Elasticsearch.Net/Extensions/TypeExtensions.cs b/src/Elasticsearch.Net/Extensions/TypeExtensions.cs
index 9ea0a809368..32d4411e0bd 100644
--- a/src/Elasticsearch.Net/Extensions/TypeExtensions.cs
+++ b/src/Elasticsearch.Net/Extensions/TypeExtensions.cs
@@ -16,7 +16,8 @@ internal static class TypeExtensions
 		private static readonly ConcurrentDictionary<string, ObjectActivator<object>> CachedActivators =
 			new ConcurrentDictionary<string, ObjectActivator<object>>();
 
-		internal static T CreateInstance<T>(this Type t, params object[] args) => (T) t.CreateInstance(args);
+
+		internal static T CreateInstance<T>(this Type t, params object[] args) => (T)t.CreateInstance(args);
 
 		internal static object CreateInstance(this Type t, params object[] args)
 		{
@@ -27,18 +28,20 @@ internal static object CreateInstance(this Type t, params object[] args)
 
 			var generic = GetActivatorMethodInfo.MakeGenericMethod(t);
 			var constructors = from c in t.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
-							   let p = c.GetParameters()
-							   let k = string.Join(",", p.Select(a => a.ParameterType.Name))
-							   where p.Length == args.Length
-							   select c;
+				let p = c.GetParameters()
+				let k = string.Join(",", p.Select(a => a.ParameterType.Name))
+				where p.Length == args.Length
+				select c;
 
 			var ctor = constructors.FirstOrDefault();
 			if (ctor == null)
 				throw new Exception($"Cannot create an instance of {t.FullName} because it has no constructor taking {args.Length} arguments");
-			activator = (ObjectActivator<object>) generic.Invoke(null, new[] {ctor});
+
+			activator = (ObjectActivator<object>)generic.Invoke(null, new[] { ctor });
 			CachedActivators.TryAdd(key, activator);
 			return activator(args);
 		}
+
 		internal static bool IsValueType(this Type type)
 		{
 #if DOTNETCORE
@@ -61,7 +64,7 @@ private static ObjectActivator<T> GetActivator<T>(ConstructorInfo ctor)
 
 			//pick each arg from the params array
 			//and create a typed expression of them
-			for (int i = 0; i < paramsInfo.Length; i++)
+			for (var i = 0; i < paramsInfo.Length; i++)
 			{
 				var index = Expression.Constant(i);
 				var paramType = paramsInfo[i].ParameterType;
@@ -82,7 +85,7 @@ private static ObjectActivator<T> GetActivator<T>(ConstructorInfo ctor)
 			var lambda = Expression.Lambda(typeof(ObjectActivator<T>), newExp, param);
 
 			//compile it
-			var compiled = (ObjectActivator<T>) lambda.Compile();
+			var compiled = (ObjectActivator<T>)lambda.Compile();
 			return compiled;
 		}
 	}
diff --git a/src/Elasticsearch.Net/Extensions/X509CertificateExtensions.cs b/src/Elasticsearch.Net/Extensions/X509CertificateExtensions.cs
index 7e14e1e292a..8501764507c 100644
--- a/src/Elasticsearch.Net/Extensions/X509CertificateExtensions.cs
+++ b/src/Elasticsearch.Net/Extensions/X509CertificateExtensions.cs
@@ -1,4 +1,6 @@
-using System.Security.Cryptography.X509Certificates;
+#if DOTNETCORE
+using System.Security.Cryptography.X509Certificates;
+#endif
 
 namespace Elasticsearch.Net
 {
@@ -35,6 +37,5 @@ private static string EncodeHexString(byte[] sArray)
 		}
 
 #endif
-
 	}
 }
diff --git a/src/Elasticsearch.Net/GlobalSuppressions.cs b/src/Elasticsearch.Net/GlobalSuppressions.cs
index 8dac84cb514..9acff261cb6 100644
Binary files a/src/Elasticsearch.Net/GlobalSuppressions.cs and b/src/Elasticsearch.Net/GlobalSuppressions.cs differ
diff --git a/src/Elasticsearch.Net/IElasticLowLevelClient.Patched.cs b/src/Elasticsearch.Net/IElasticLowLevelClient.Patched.cs
index ee8d54c5ffc..cf13493a0da 100644
--- a/src/Elasticsearch.Net/IElasticLowLevelClient.Patched.cs
+++ b/src/Elasticsearch.Net/IElasticLowLevelClient.Patched.cs
@@ -6,26 +6,40 @@ namespace Elasticsearch.Net
 {
 	public partial interface IElasticLowLevelClient
 	{
-		///<summary>GET on /_xpack/migration/deprecations <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para></summary>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
+		/// <summary>GET on /_xpack/migration/deprecations
+		/// <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para>
+		/// </summary>
+		/// <param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		[Obsolete("Use XpackMigrationDeprecations")]
-		TResponse XpackDeprecationInfo<TResponse>(DeprecationInfoRequestParameters requestParameters = null) where TResponse : class, IElasticsearchResponse, new();
+		TResponse XpackDeprecationInfo<TResponse>(DeprecationInfoRequestParameters requestParameters = null)
+			where TResponse : class, IElasticsearchResponse, new();
 
-		///<summary>GET on /_xpack/migration/deprecations <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para></summary>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
+		/// <summary>GET on /_xpack/migration/deprecations
+		/// <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para>
+		/// </summary>
+		/// <param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		[Obsolete("Use XpackMigrationDeprecationsAsync")]
-		Task<TResponse> XpackDeprecationInfoAsync<TResponse>(DeprecationInfoRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken)) where TResponse : class, IElasticsearchResponse, new();
+		Task<TResponse> XpackDeprecationInfoAsync<TResponse>(DeprecationInfoRequestParameters requestParameters = null,
+			CancellationToken ctx = default(CancellationToken)
+		) where TResponse : class, IElasticsearchResponse, new();
 
-		///<summary>GET on /{index}/_xpack/migration/deprecations <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para></summary>
-		///<param name="index">Index pattern</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
+		/// <summary>GET on /{index}/_xpack/migration/deprecations
+		/// <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para>
+		/// </summary>
+		/// <param name="index">Index pattern</param>
+		/// <param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		[Obsolete("Use XpackMigrationDeprecations")]
-		TResponse XpackDeprecationInfo<TResponse>(string index, DeprecationInfoRequestParameters requestParameters = null) where TResponse : class, IElasticsearchResponse, new();
+		TResponse XpackDeprecationInfo<TResponse>(string index, DeprecationInfoRequestParameters requestParameters = null)
+			where TResponse : class, IElasticsearchResponse, new();
 
-		///<summary>GET on /{index}/_xpack/migration/deprecations <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para></summary>
-		///<param name="index">Index pattern</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
+		/// <summary>GET on /{index}/_xpack/migration/deprecations
+		/// <para>http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html</para>
+		/// </summary>
+		/// <param name="index">Index pattern</param>
+		/// <param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		[Obsolete("Use XpackMigrationDeprecationsAsync")]
-		Task<TResponse> XpackDeprecationInfoAsync<TResponse>(string index, DeprecationInfoRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken)) where TResponse : class, IElasticsearchResponse, new();
+		Task<TResponse> XpackDeprecationInfoAsync<TResponse>(string index, DeprecationInfoRequestParameters requestParameters = null,
+			CancellationToken ctx = default(CancellationToken)
+		) where TResponse : class, IElasticsearchResponse, new();
 	}
 }
diff --git a/src/Elasticsearch.Net/IElasticLowLevelClient.cs b/src/Elasticsearch.Net/IElasticLowLevelClient.cs
index 203a4081b64..d1ee69d5984 100644
--- a/src/Elasticsearch.Net/IElasticLowLevelClient.cs
+++ b/src/Elasticsearch.Net/IElasticLowLevelClient.cs
@@ -26,7 +26,9 @@ TResponse DoRequest<TResponse>(HttpMethod method, string path, PostData data = n
 		/// <param name="data">The body of the request, string and byte[] are posted as is other types will be serialized to JSON</param>
 		/// <param name="requestParameters">Optionally configure request specific timeouts, headers</param>
 		/// <returns>A task of ElasticsearchResponse of T where T represents the JSON response body</returns>
-		Task<TResponse> DoRequestAsync<TResponse>(HttpMethod method, string path, CancellationToken cancellationToken, PostData data = null, IRequestParameters requestParameters = null)
+		Task<TResponse> DoRequestAsync<TResponse>(HttpMethod method, string path, CancellationToken cancellationToken, PostData data = null,
+			IRequestParameters requestParameters = null
+		)
 			where TResponse : class, IElasticsearchResponse, new();
 	}
 }
diff --git a/src/Elasticsearch.Net/Properties/ClsCompliancy.cs b/src/Elasticsearch.Net/Properties/ClsCompliancy.cs
index 6139b4fad9e..8c114539a19 100644
--- a/src/Elasticsearch.Net/Properties/ClsCompliancy.cs
+++ b/src/Elasticsearch.Net/Properties/ClsCompliancy.cs
@@ -1,4 +1,3 @@
 using System;
 
 [assembly: CLSCompliant(true)]
-
diff --git a/src/Elasticsearch.Net/Providers/DateTimeProvider.cs b/src/Elasticsearch.Net/Providers/DateTimeProvider.cs
index 3e586f0b59b..32321bc45ff 100644
--- a/src/Elasticsearch.Net/Providers/DateTimeProvider.cs
+++ b/src/Elasticsearch.Net/Providers/DateTimeProvider.cs
@@ -4,13 +4,10 @@ namespace Elasticsearch.Net
 {
 	public class DateTimeProvider : IDateTimeProvider
 	{
+		public static readonly DateTimeProvider Default = new DateTimeProvider();
 		private static readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(60);
 		private static readonly TimeSpan MaximumTimeout = TimeSpan.FromMinutes(30);
 
-		public static readonly DateTimeProvider Default = new DateTimeProvider();
-
-		public virtual DateTime Now() => DateTime.UtcNow;
-
 		public virtual DateTime DeadTime(int attempts, TimeSpan? timeoutFactor, TimeSpan? maxDeadTimeout)
 		{
 			var timeout = timeoutFactor.GetValueOrDefault(DefaultTimeout);
@@ -18,5 +15,7 @@ public virtual DateTime DeadTime(int attempts, TimeSpan? timeoutFactor, TimeSpan
 			var milliSeconds = Math.Min(timeout.TotalMilliseconds * 2 * Math.Pow(2, attempts * 0.5 - 1), maxTimeout.TotalMilliseconds);
 			return Now().AddMilliseconds(milliSeconds);
 		}
+
+		public virtual DateTime Now() => DateTime.UtcNow;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Elasticsearch.Net/Providers/IDateTimeProvider.cs b/src/Elasticsearch.Net/Providers/IDateTimeProvider.cs
index 12b66b33df3..dbf3b601d6e 100644
--- a/src/Elasticsearch.Net/Providers/IDateTimeProvider.cs
+++ b/src/Elasticsearch.Net/Providers/IDateTimeProvider.cs
@@ -5,6 +5,7 @@ namespace Elasticsearch.Net
 	public interface IDateTimeProvider
 	{
 		DateTime Now();
+
 		DateTime DeadTime(int attempts, TimeSpan? timeoutFactor, TimeSpan? maxDeadTimeout);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Elasticsearch.Net/Providers/IRequestPipelineFactory.cs b/src/Elasticsearch.Net/Providers/IRequestPipelineFactory.cs
index f5fb12df976..39c92bcfb58 100644
--- a/src/Elasticsearch.Net/Providers/IRequestPipelineFactory.cs
+++ b/src/Elasticsearch.Net/Providers/IRequestPipelineFactory.cs
@@ -2,12 +2,16 @@
 {
 	public interface IRequestPipelineFactory
 	{
-		IRequestPipeline Create(IConnectionConfigurationValues configurationValues, IDateTimeProvider dateTimeProvider, IMemoryStreamFactory memorystreamFactory, IRequestParameters requestParameters);
+		IRequestPipeline Create(IConnectionConfigurationValues configurationValues, IDateTimeProvider dateTimeProvider,
+			IMemoryStreamFactory memorystreamFactory, IRequestParameters requestParameters
+		);
 	}
 
 	public class RequestPipelineFactory : IRequestPipelineFactory
 	{
-		public IRequestPipeline Create(IConnectionConfigurationValues configurationValues, IDateTimeProvider dateTimeProvider, IMemoryStreamFactory memorystreamFactory, IRequestParameters requestParameters) =>
+		public IRequestPipeline Create(IConnectionConfigurationValues configurationValues, IDateTimeProvider dateTimeProvider,
+			IMemoryStreamFactory memorystreamFactory, IRequestParameters requestParameters
+		) =>
 			new RequestPipeline(configurationValues, dateTimeProvider, memorystreamFactory, requestParameters);
-    }
-}
\ No newline at end of file
+	}
+}
diff --git a/src/Elasticsearch.Net/Providers/MemoryStreamFactory.cs b/src/Elasticsearch.Net/Providers/MemoryStreamFactory.cs
index 7b6c8d0d2da..c5a0254f572 100644
--- a/src/Elasticsearch.Net/Providers/MemoryStreamFactory.cs
+++ b/src/Elasticsearch.Net/Providers/MemoryStreamFactory.cs
@@ -3,17 +3,17 @@
 namespace Elasticsearch.Net
 {
 	/// <summary>
-	/// A factory for creating memory streams using instances of <see cref="MemoryStream"/>
+	/// A factory for creating memory streams using instances of <see cref="MemoryStream" />
 	/// </summary>
 	public class MemoryStreamFactory : IMemoryStreamFactory
 	{
 		/// <summary>
-		/// Creates a memory stream using <see cref="MemoryStream"/>
+		/// Creates a memory stream using <see cref="MemoryStream" />
 		/// </summary>
 		public MemoryStream Create() => new MemoryStream();
 
 		/// <summary>
-		/// Creates a memory stream using <see cref="MemoryStream"/> with the bytes written to the stream
+		/// Creates a memory stream using <see cref="MemoryStream" /> with the bytes written to the stream
 		/// </summary>
 		public MemoryStream Create(byte[] bytes) => new MemoryStream(bytes);
 	}
diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs
index 7a37bcef3b1..3032e3cee89 100644
--- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs
+++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs
@@ -32,33 +32,29 @@
 namespace Elasticsearch.Net
 {
 	/// <summary>
-	/// MemoryStream implementation that deals with pooling and managing memory streams which use potentially large
-	/// buffers.
+	///  MemoryStream implementation that deals with pooling and managing memory streams which use potentially large
+	///  buffers.
 	/// </summary>
 	/// <remarks>
-	/// This class works in tandem with the RecylableMemoryStreamManager to supply MemoryStream
-	/// objects to callers, while avoiding these specific problems:
-	/// 1. LOH allocations - since all large buffers are pooled, they will never incur a Gen2 GC
-	/// 2. Memory waste - A standard memory stream doubles its size when it runs out of room. This
-	/// leads to continual memory growth as each stream approaches the maximum allowed size.
-	/// 3. Memory copying - Each time a MemoryStream grows, all the bytes are copied into new buffers.
-	/// This implementation only copies the bytes when GetBuffer is called.
-	/// 4. Memory fragmentation - By using homogeneous buffer sizes, it ensures that blocks of memory
-	/// can be easily reused.
-	///
-	/// The stream is implemented on top of a series of uniformly-sized blocks. As the stream's length grows,
-	/// additional blocks are retrieved from the memory manager. It is these blocks that are pooled, not the stream
-	/// object itself.
-	///
-	/// The biggest wrinkle in this implementation is when GetBuffer() is called. This requires a single
-	/// contiguous buffer. If only a single block is in use, then that block is returned. If multiple blocks
-	/// are in use, we retrieve a larger buffer from the memory manager. These large buffers are also pooled,
-	/// split by size--they are multiples of a chunk size (1 MB by default).
-	///
-	/// Once a large buffer is assigned to the stream the blocks are NEVER again used for this stream. All operations take place on the
-	/// large buffer. The large buffer can be replaced by a larger buffer from the pool as needed. All blocks and large buffers
-	/// are maintained in the stream until the stream is disposed (unless AggressiveBufferReturn is enabled in the stream manager).
-	///
+	///  This class works in tandem with the RecylableMemoryStreamManager to supply MemoryStream
+	///  objects to callers, while avoiding these specific problems:
+	///  1. LOH allocations - since all large buffers are pooled, they will never incur a Gen2 GC
+	///  2. Memory waste - A standard memory stream doubles its size when it runs out of room. This
+	///  leads to continual memory growth as each stream approaches the maximum allowed size.
+	///  3. Memory copying - Each time a MemoryStream grows, all the bytes are copied into new buffers.
+	///  This implementation only copies the bytes when GetBuffer is called.
+	///  4. Memory fragmentation - By using homogeneous buffer sizes, it ensures that blocks of memory
+	///  can be easily reused.
+	///  The stream is implemented on top of a series of uniformly-sized blocks. As the stream's length grows,
+	///  additional blocks are retrieved from the memory manager. It is these blocks that are pooled, not the stream
+	///  object itself.
+	///  The biggest wrinkle in this implementation is when GetBuffer() is called. This requires a single
+	///  contiguous buffer. If only a single block is in use, then that block is returned. If multiple blocks
+	///  are in use, we retrieve a larger buffer from the memory manager. These large buffers are also pooled,
+	///  split by size--they are multiples of a chunk size (1 MB by default).
+	///  Once a large buffer is assigned to the stream the blocks are NEVER again used for this stream. All operations take place on the
+	///  large buffer. The large buffer can be replaced by a larger buffer from the pool as needed. All blocks and large buffers
+	///  are maintained in the stream until the stream is disposed (unless AggressiveBufferReturn is enabled in the stream manager).
 	/// </remarks>
 	internal class RecyclableMemoryStream : MemoryStream
 	{
@@ -91,51 +87,16 @@ internal class RecyclableMemoryStream : MemoryStream
 		/// This is only set by GetBuffer() if the necessary buffer is larger than a single block size, or on
 		/// construction if the caller immediately requests a single large buffer.
 		/// </summary>
-		/// <remarks>If this field is non-null, it contains the concatenation of the bytes found in the individual
+		/// <remarks>
+		/// If this field is non-null, it contains the concatenation of the bytes found in the individual
 		/// blocks. Once it is created, this (or a larger) largeBuffer will be used for the life of the stream.
 		/// </remarks>
 		private byte[] _largeBuffer;
 
-		/// <summary>
-		/// Unique identifier for this stream across it's entire lifetime
-		/// </summary>
-		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
-		internal Guid Id
-		{
-			get
-			{
-				this.CheckDisposed();
-				return this._id;
-			}
-		}
-
-		/// <summary>
-		/// A temporary identifier for the current usage of this stream.
-		/// </summary>
-		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
-		internal string Tag
-		{
-			get
-			{
-				this.CheckDisposed();
-				return this._tag;
-			}
-		}
+		private int length;
 
-		/// <summary>
-		/// Gets the memory manager being used by this stream.
-		/// </summary>
-		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
-		internal RecyclableMemoryStreamManager MemoryManager
-		{
-			get
-			{
-				this.CheckDisposed();
-				return this._memoryManager;
-			}
-		}
+		private int position;
 
-		#region Constructors
 		/// <summary>
 		/// Allocate a new RecyclableMemoryStream object.
 		/// </summary>
@@ -166,101 +127,52 @@ public RecyclableMemoryStream(RecyclableMemoryStreamManager memoryManager, strin
 		/// <param name="memoryManager">The memory manager</param>
 		/// <param name="tag">A string identifying this stream for logging and debugging purposes</param>
 		/// <param name="requestedSize">The initial requested size to prevent future allocations</param>
-		/// <param name="initialLargeBuffer">An initial buffer to use. This buffer will be owned by the stream and returned to the memory manager upon Dispose.</param>
+		/// <param name="initialLargeBuffer">
+		/// An initial buffer to use. This buffer will be owned by the stream and returned to the memory manager upon
+		/// Dispose.
+		/// </param>
 		internal RecyclableMemoryStream(RecyclableMemoryStreamManager memoryManager, string tag, int requestedSize,
-			byte[] initialLargeBuffer)
+			byte[] initialLargeBuffer
+		)
 			: base(EmptyArray)
 		{
-			this._memoryManager = memoryManager;
-			this._id = Guid.NewGuid();
-			this._tag = tag;
+			_memoryManager = memoryManager;
+			_id = Guid.NewGuid();
+			_tag = tag;
 
-			if (requestedSize < memoryManager.BlockSize)
-			{
-				requestedSize = memoryManager.BlockSize;
-			}
+			if (requestedSize < memoryManager.BlockSize) requestedSize = memoryManager.BlockSize;
 
 			if (initialLargeBuffer == null)
-			{
-				this.EnsureCapacity(requestedSize);
-			}
+				EnsureCapacity(requestedSize);
 			else
-			{
-				this._largeBuffer = initialLargeBuffer;
-			}
-		}
-		#endregion
-
-		#region Dispose and Finalize
-		~RecyclableMemoryStream()
-		{
-			this.Dispose(false);
+				_largeBuffer = initialLargeBuffer;
 		}
 
 		/// <summary>
-		/// Returns the memory used by this stream back to the pool.
+		/// Whether the stream can currently read
 		/// </summary>
-		/// <param name="disposing">Whether we're disposing (true), or being called by the finalizer (false)</param>
-		[SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly",
-			Justification = "We have different disposal semantics, so SuppressFinalize is in a different spot.")]
-		protected override void Dispose(bool disposing)
-		{
-			if (Interlocked.CompareExchange(ref this._disposedState, 1, 0) != 0)
-			{
-				return;
-			}
+		public override bool CanRead => !Disposed;
 
-			if (disposing)
-			{
-				GC.SuppressFinalize(this);
-			}
-			else
-			{
-#if !DOTNETCORE
-				if (AppDomain.CurrentDomain.IsFinalizingForUnload())
-				{
-					// If we're being finalized because of a shutdown, don't go any further.
-					// We have no idea what's already been cleaned up. Triggering events may cause
-					// a crash.
-					base.Dispose(disposing);
-					return;
-				}
-#endif
-			}
-
-			if (this._largeBuffer != null)
-			{
-				this._memoryManager.ReturnLargeBuffer(this._largeBuffer, this._tag);
-			}
-
-			if (this._dirtyBuffers != null)
-			{
-				foreach (var buffer in this._dirtyBuffers)
-				{
-					this._memoryManager.ReturnLargeBuffer(buffer, this._tag);
-				}
-			}
-
-			this._memoryManager.ReturnBlocks(this._blocks, this._tag);
-			this._blocks.Clear();
+		/// <summary>
+		/// Whether the stream can currently seek
+		/// </summary>
+		public override bool CanSeek => !Disposed;
 
-			base.Dispose(disposing);
-		}
+		/// <summary>
+		/// Always false
+		/// </summary>
+		public override bool CanTimeout => false;
 
 		/// <summary>
-		/// Equivalent to Dispose
+		/// Whether the stream can currently write
 		/// </summary>
-		public override void Close()
-		{
-			this.Dispose(true);
-		}
-		#endregion
+		public override bool CanWrite => !Disposed;
 
-		#region MemoryStream overrides
 		/// <summary>
 		/// Gets or sets the capacity
 		/// </summary>
-		/// <remarks>Capacity is always in multiples of the memory manager's block size, unless
+		/// <remarks>
+		/// Capacity is always in multiples of the memory manager's block size, unless
 		/// the large buffer is in use.  Capacity never decreases during a stream's lifetime.
 		/// Explicitly setting the capacity to a lower value than the current value will have no effect.
 		/// This is because the buffers are all pooled by chunks and there's little reason to
@@ -271,24 +183,19 @@ public override int Capacity
 		{
 			get
 			{
-				this.CheckDisposed();
-				if (this._largeBuffer != null)
-				{
-					return this._largeBuffer.Length;
-				}
+				CheckDisposed();
+				if (_largeBuffer != null) return _largeBuffer.Length;
 
-				long size = (long)this._blocks.Count * this._memoryManager.BlockSize;
+				var size = (long)_blocks.Count * _memoryManager.BlockSize;
 				return (int)Math.Min(int.MaxValue, size);
 			}
 			set
 			{
-				this.CheckDisposed();
-				this.EnsureCapacity(value);
+				CheckDisposed();
+				EnsureCapacity(value);
 			}
 		}
 
-		private int length;
-
 		/// <summary>
 		/// Gets the number of bytes written to this stream.
 		/// </summary>
@@ -297,13 +204,11 @@ public override long Length
 		{
 			get
 			{
-				this.CheckDisposed();
-				return this.length;
+				CheckDisposed();
+				return length;
 			}
 		}
 
-		private int position;
-
 		/// <summary>
 		/// Gets the current position in the stream
 		/// </summary>
@@ -312,86 +217,142 @@ public override long Position
 		{
 			get
 			{
-				this.CheckDisposed();
-				return this.position;
+				CheckDisposed();
+				return position;
 			}
 			set
 			{
-				this.CheckDisposed();
-				if (value < 0)
-				{
-					throw new ArgumentOutOfRangeException("value", "value must be non-negative");
-				}
+				CheckDisposed();
+				if (value < 0) throw new ArgumentOutOfRangeException("value", "value must be non-negative");
 
-				if (value > MaxStreamLength)
-				{
-					throw new ArgumentOutOfRangeException("value", "value cannot be more than " + MaxStreamLength);
-				}
+				if (value > MaxStreamLength) throw new ArgumentOutOfRangeException("value", "value cannot be more than " + MaxStreamLength);
 
-				this.position = (int)value;
+				position = (int)value;
 			}
 		}
 
 		/// <summary>
-		/// Whether the stream can currently read
+		/// Unique identifier for this stream across it's entire lifetime
 		/// </summary>
-		public override bool CanRead => !this.Disposed;
+		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
+		internal Guid Id
+		{
+			get
+			{
+				CheckDisposed();
+				return _id;
+			}
+		}
 
 		/// <summary>
-		/// Whether the stream can currently seek
+		/// Gets the memory manager being used by this stream.
 		/// </summary>
-		public override bool CanSeek => !this.Disposed;
+		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
+		internal RecyclableMemoryStreamManager MemoryManager
+		{
+			get
+			{
+				CheckDisposed();
+				return _memoryManager;
+			}
+		}
 
 		/// <summary>
-		/// Always false
+		/// A temporary identifier for the current usage of this stream.
 		/// </summary>
-		public override bool CanTimeout => false;
+		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
+		internal string Tag
+		{
+			get
+			{
+				CheckDisposed();
+				return _tag;
+			}
+		}
+
+		private bool Disposed => Interlocked.Read(ref _disposedState) != 0;
+
+		~RecyclableMemoryStream() => Dispose(false);
 
 		/// <summary>
-		/// Whether the stream can currently write
+		/// Returns the memory used by this stream back to the pool.
+		/// </summary>
+		/// <param name="disposing">Whether we're disposing (true), or being called by the finalizer (false)</param>
+		[SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly",
+			Justification = "We have different disposal semantics, so SuppressFinalize is in a different spot.")]
+		protected override void Dispose(bool disposing)
+		{
+			if (Interlocked.CompareExchange(ref _disposedState, 1, 0) != 0) return;
+
+			if (disposing)
+				GC.SuppressFinalize(this);
+			else
+			{
+#if !DOTNETCORE
+				if (AppDomain.CurrentDomain.IsFinalizingForUnload())
+				{
+					// If we're being finalized because of a shutdown, don't go any further.
+					// We have no idea what's already been cleaned up. Triggering events may cause
+					// a crash.
+					base.Dispose(disposing);
+					return;
+				}
+#endif
+			}
+
+			if (_largeBuffer != null) _memoryManager.ReturnLargeBuffer(_largeBuffer, _tag);
+
+			if (_dirtyBuffers != null)
+				foreach (var buffer in _dirtyBuffers)
+					_memoryManager.ReturnLargeBuffer(buffer, _tag);
+
+			_memoryManager.ReturnBlocks(_blocks, _tag);
+			_blocks.Clear();
+
+			base.Dispose(disposing);
+		}
+
+		/// <summary>
+		/// Equivalent to Dispose
 		/// </summary>
-		public override bool CanWrite => !this.Disposed;
+		public override void Close() => Dispose(true);
 
 		/// <summary>
 		/// Returns a single buffer containing the contents of the stream.
 		/// The buffer may be longer than the stream length.
 		/// </summary>
 		/// <returns>A byte[] buffer</returns>
-		/// <remarks>IMPORTANT: Doing a Write() after calling GetBuffer() invalidates the buffer. The old buffer is held onto
-		/// until Dispose is called, but the next time GetBuffer() is called, a new buffer from the pool will be required.</remarks>
+		/// <remarks>
+		/// IMPORTANT: Doing a Write() after calling GetBuffer() invalidates the buffer. The old buffer is held onto
+		/// until Dispose is called, but the next time GetBuffer() is called, a new buffer from the pool will be required.
+		/// </remarks>
 		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
 		public override byte[] GetBuffer()
 		{
-			this.CheckDisposed();
+			CheckDisposed();
 
-			if (this._largeBuffer != null)
-			{
-				return this._largeBuffer;
-			}
+			if (_largeBuffer != null) return _largeBuffer;
 
-			if (this._blocks.Count == 1)
-			{
-				return this._blocks[0];
-			}
+			if (_blocks.Count == 1) return _blocks[0];
 
 			// Buffer needs to reflect the capacity, not the length, because
 			// it's possible that people will manipulate the buffer directly
 			// and set the length afterward. Capacity sets the expectation
 			// for the size of the buffer.
-			var newBuffer = this._memoryManager.GetLargeBuffer(this.Capacity, this._tag);
+			var newBuffer = _memoryManager.GetLargeBuffer(Capacity, _tag);
 
 			// InternalRead will check for existence of largeBuffer, so make sure we
 			// don't set it until after we've copied the data.
-			this.InternalRead(newBuffer, 0, this.length, 0);
-			this._largeBuffer = newBuffer;
+			InternalRead(newBuffer, 0, length, 0);
+			_largeBuffer = newBuffer;
 
-			if (this._blocks.Count > 0 && this._memoryManager.AggressiveBufferReturn)
+			if (_blocks.Count > 0 && _memoryManager.AggressiveBufferReturn)
 			{
-				this._memoryManager.ReturnBlocks(this._blocks, this._tag);
-				this._blocks.Clear();
+				_memoryManager.ReturnBlocks(_blocks, _tag);
+				_blocks.Clear();
 			}
 
-			return this._largeBuffer;
+			return _largeBuffer;
 		}
 
 		/// <summary>
@@ -404,10 +365,10 @@ public override byte[] GetBuffer()
 		[Obsolete("This method has degraded performance vs. GetBuffer and should be avoided.")]
 		public override byte[] ToArray()
 		{
-			this.CheckDisposed();
-			var newBuffer = new byte[this.Length];
+			CheckDisposed();
+			var newBuffer = new byte[Length];
 
-			this.InternalRead(newBuffer, 0, this.length, 0);
+			InternalRead(newBuffer, 0, length, 0);
 			return newBuffer;
 		}
 #pragma warning restore CS0809
@@ -423,10 +384,7 @@ public override byte[] ToArray()
 		/// <exception cref="ArgumentOutOfRangeException">offset or count is less than 0</exception>
 		/// <exception cref="ArgumentException">offset subtracted from the buffer length is less than count</exception>
 		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
-		public override int Read(byte[] buffer, int offset, int count)
-		{
-			return this.SafeRead(buffer, offset, count, ref this.position);
-		}
+		public override int Read(byte[] buffer, int offset, int count) => SafeRead(buffer, offset, count, ref position);
 
 		/// <summary>
 		/// Reads from the specified position into the provided buffer
@@ -442,28 +400,16 @@ public override int Read(byte[] buffer, int offset, int count)
 		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
 		public int SafeRead(byte[] buffer, int offset, int count, ref int streamPosition)
 		{
-			this.CheckDisposed();
-			if (buffer == null)
-			{
-				throw new ArgumentNullException(nameof(buffer));
-			}
+			CheckDisposed();
+			if (buffer == null) throw new ArgumentNullException(nameof(buffer));
 
-			if (offset < 0)
-			{
-				throw new ArgumentOutOfRangeException(nameof(offset), "offset cannot be negative");
-			}
+			if (offset < 0) throw new ArgumentOutOfRangeException(nameof(offset), "offset cannot be negative");
 
-			if (count < 0)
-			{
-				throw new ArgumentOutOfRangeException(nameof(count), "count cannot be negative");
-			}
+			if (count < 0) throw new ArgumentOutOfRangeException(nameof(count), "count cannot be negative");
 
-			if (offset + count > buffer.Length)
-			{
-				throw new ArgumentException("buffer length must be at least offset + count");
-			}
+			if (offset + count > buffer.Length) throw new ArgumentException("buffer length must be at least offset + count");
 
-			int amountRead = this.InternalRead(buffer, offset, count, streamPosition);
+			var amountRead = InternalRead(buffer, offset, count, streamPosition);
 			streamPosition += amountRead;
 			return amountRead;
 		}
@@ -480,56 +426,39 @@ public int SafeRead(byte[] buffer, int offset, int count, ref int streamPosition
 		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
 		public override void Write(byte[] buffer, int offset, int count)
 		{
-			this.CheckDisposed();
-			if (buffer == null)
-			{
-				throw new ArgumentNullException(nameof(buffer));
-			}
+			CheckDisposed();
+			if (buffer == null) throw new ArgumentNullException(nameof(buffer));
 
 			if (offset < 0)
-			{
 				throw new ArgumentOutOfRangeException(nameof(offset), offset,
 					"Offset must be in the range of 0 - buffer.Length-1");
-			}
 
-			if (count < 0)
-			{
-				throw new ArgumentOutOfRangeException(nameof(count), count, "count must be non-negative");
-			}
+			if (count < 0) throw new ArgumentOutOfRangeException(nameof(count), count, "count must be non-negative");
 
-			if (count + offset > buffer.Length)
-			{
-				throw new ArgumentException("count must be greater than buffer.Length - offset");
-			}
+			if (count + offset > buffer.Length) throw new ArgumentException("count must be greater than buffer.Length - offset");
 
-			int blockSize = this._memoryManager.BlockSize;
-			long end = (long)this.position + count;
+			var blockSize = _memoryManager.BlockSize;
+			var end = (long)position + count;
 			// Check for overflow
-			if (end > MaxStreamLength)
-			{
-				throw new IOException("Maximum capacity exceeded");
-			}
+			if (end > MaxStreamLength) throw new IOException("Maximum capacity exceeded");
 
-			long requiredBuffers = (end + blockSize - 1) / blockSize;
+			var requiredBuffers = (end + blockSize - 1) / blockSize;
 
-			if (requiredBuffers * blockSize > MaxStreamLength)
-			{
-				throw new IOException("Maximum capacity exceeded");
-			}
+			if (requiredBuffers * blockSize > MaxStreamLength) throw new IOException("Maximum capacity exceeded");
 
-			this.EnsureCapacity((int)end);
+			EnsureCapacity((int)end);
 
-			if (this._largeBuffer == null)
+			if (_largeBuffer == null)
 			{
-				int bytesRemaining = count;
-				int bytesWritten = 0;
-				var blockAndOffset = this.GetBlockAndRelativeOffset(this.position);
+				var bytesRemaining = count;
+				var bytesWritten = 0;
+				var blockAndOffset = GetBlockAndRelativeOffset(position);
 
 				while (bytesRemaining > 0)
 				{
-					byte[] currentBlock = this._blocks[blockAndOffset.Block];
-					int remainingInBlock = blockSize - blockAndOffset.Offset;
-					int amountToWriteInBlock = Math.Min(remainingInBlock, bytesRemaining);
+					var currentBlock = _blocks[blockAndOffset.Block];
+					var remainingInBlock = blockSize - blockAndOffset.Offset;
+					var amountToWriteInBlock = Math.Min(remainingInBlock, bytesRemaining);
 
 					Buffer.BlockCopy(buffer, offset + bytesWritten, currentBlock, blockAndOffset.Offset,
 						amountToWriteInBlock);
@@ -542,20 +471,15 @@ public override void Write(byte[] buffer, int offset, int count)
 				}
 			}
 			else
-			{
-				Buffer.BlockCopy(buffer, offset, this._largeBuffer, this.position, count);
-			}
-			this.position = (int)end;
-			this.length = Math.Max(this.position, this.length);
+				Buffer.BlockCopy(buffer, offset, _largeBuffer, position, count);
+			position = (int)end;
+			length = Math.Max(position, length);
 		}
 
 		/// <summary>
 		/// Returns a useful string for debugging. This should not normally be called in actual production code.
 		/// </summary>
-		public override string ToString()
-		{
-			return $"Id = {this.Id}, Tag = {this.Tag}, Length = {this.Length:N0} bytes";
-		}
+		public override string ToString() => $"Id = {Id}, Tag = {Tag}, Length = {Length:N0} bytes";
 
 		/// <summary>
 		/// Writes a single byte to the current position in the stream.
@@ -564,31 +488,26 @@ public override string ToString()
 		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
 		public override void WriteByte(byte value)
 		{
-			this.CheckDisposed();
-			int end = this.position + 1;
+			CheckDisposed();
+			var end = position + 1;
 
 			// Check for overflow
-			if (end > MaxStreamLength)
-			{
-				throw new IOException("Maximum capacity exceeded");
-			}
+			if (end > MaxStreamLength) throw new IOException("Maximum capacity exceeded");
 
-			this.EnsureCapacity(end);
-			if (this._largeBuffer == null)
+			EnsureCapacity(end);
+			if (_largeBuffer == null)
 			{
-				var blockSize = this._memoryManager.BlockSize;
-				var block = this.position / blockSize;
-				var offset = this.position - block * blockSize;
-				var currentBlock = this._blocks[block];
+				var blockSize = _memoryManager.BlockSize;
+				var block = position / blockSize;
+				var offset = position - block * blockSize;
+				var currentBlock = _blocks[block];
 				currentBlock[offset] = value;
 			}
 			else
-			{
-				this._largeBuffer[this.position] = value;
-			}
+				_largeBuffer[position] = value;
 
-			this.position = end;
-			this.length = Math.Max(this.position, this.length);
+			position = end;
+			length = Math.Max(position, length);
 		}
 
 		/// <summary>
@@ -596,10 +515,7 @@ public override void WriteByte(byte value)
 		/// </summary>
 		/// <returns>The byte at the current position, or -1 if the position is at the end of the stream.</returns>
 		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
-		public override int ReadByte()
-		{
-			return this.SafeReadByte(ref this.position);
-		}
+		public override int ReadByte() => SafeReadByte(ref position);
 
 		/// <summary>
 		/// Reads a single byte from the specified position in the stream.
@@ -609,21 +525,17 @@ public override int ReadByte()
 		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
 		public int SafeReadByte(ref int streamPosition)
 		{
-			this.CheckDisposed();
-			if (streamPosition == this.length)
-			{
-				return -1;
-			}
+			CheckDisposed();
+			if (streamPosition == length) return -1;
+
 			byte value;
-			if (this._largeBuffer == null)
+			if (_largeBuffer == null)
 			{
-				var blockAndOffset = this.GetBlockAndRelativeOffset(streamPosition);
-				value = this._blocks[blockAndOffset.Block][blockAndOffset.Offset];
+				var blockAndOffset = GetBlockAndRelativeOffset(streamPosition);
+				value = _blocks[blockAndOffset.Block][blockAndOffset.Offset];
 			}
 			else
-			{
-				value = this._largeBuffer[streamPosition];
-			}
+				value = _largeBuffer[streamPosition];
 			streamPosition++;
 			return value;
 		}
@@ -635,20 +547,15 @@ public int SafeReadByte(ref int streamPosition)
 		/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
 		public override void SetLength(long value)
 		{
-			this.CheckDisposed();
+			CheckDisposed();
 			if (value < 0 || value > MaxStreamLength)
-			{
 				throw new ArgumentOutOfRangeException(nameof(value),
 					"value must be non-negative and at most " + MaxStreamLength);
-			}
 
-			this.EnsureCapacity((int)value);
+			EnsureCapacity((int)value);
 
-			this.length = (int)value;
-			if (this.position > value)
-			{
-				this.position = (int)value;
-			}
+			length = (int)value;
+			if (position > value) position = (int)value;
 		}
 
 		/// <summary>
@@ -663,11 +570,8 @@ public override void SetLength(long value)
 		/// <exception cref="IOException">Attempt to set negative position</exception>
 		public override long Seek(long offset, SeekOrigin loc)
 		{
-			this.CheckDisposed();
-			if (offset > MaxStreamLength)
-			{
-				throw new ArgumentOutOfRangeException(nameof(offset), "offset cannot be larger than " + MaxStreamLength);
-			}
+			CheckDisposed();
+			if (offset > MaxStreamLength) throw new ArgumentOutOfRangeException(nameof(offset), "offset cannot be larger than " + MaxStreamLength);
 
 			int newPosition;
 			switch (loc)
@@ -676,20 +580,18 @@ public override long Seek(long offset, SeekOrigin loc)
 					newPosition = (int)offset;
 					break;
 				case SeekOrigin.Current:
-					newPosition = (int)offset + this.position;
+					newPosition = (int)offset + position;
 					break;
 				case SeekOrigin.End:
-					newPosition = (int)offset + this.length;
+					newPosition = (int)offset + length;
 					break;
 				default:
 					throw new ArgumentException("Invalid seek origin", nameof(loc));
 			}
-			if (newPosition < 0)
-			{
-				throw new IOException("Seek before beginning");
-			}
-			this.position = newPosition;
-			return this.position;
+			if (newPosition < 0) throw new IOException("Seek before beginning");
+
+			position = newPosition;
+			return position;
 		}
 
 		/// <summary>
@@ -699,21 +601,18 @@ public override long Seek(long offset, SeekOrigin loc)
 		/// <remarks>Important: This does a synchronous write, which may not be desired in some situations</remarks>
 		public override void WriteTo(Stream stream)
 		{
-			this.CheckDisposed();
-			if (stream == null)
-			{
-				throw new ArgumentNullException(nameof(stream));
-			}
+			CheckDisposed();
+			if (stream == null) throw new ArgumentNullException(nameof(stream));
 
-			if (this._largeBuffer == null)
+			if (_largeBuffer == null)
 			{
-				int currentBlock = 0;
-				int bytesRemaining = this.length;
+				var currentBlock = 0;
+				var bytesRemaining = length;
 
 				while (bytesRemaining > 0)
 				{
-					int amountToCopy = Math.Min(this._blocks[currentBlock].Length, bytesRemaining);
-					stream.Write(this._blocks[currentBlock], 0, amountToCopy);
+					var amountToCopy = Math.Min(_blocks[currentBlock].Length, bytesRemaining);
+					stream.Write(_blocks[currentBlock], 0, amountToCopy);
 
 					bytesRemaining -= amountToCopy;
 
@@ -721,44 +620,32 @@ public override void WriteTo(Stream stream)
 				}
 			}
 			else
-			{
-				stream.Write(this._largeBuffer, 0, this.length);
-			}
+				stream.Write(_largeBuffer, 0, length);
 		}
-		#endregion
-
-		#region Helper Methods
-		private bool Disposed => Interlocked.Read(ref this._disposedState) != 0;
 
 		private void CheckDisposed()
 		{
-			if (this.Disposed)
-			{
-				throw new ObjectDisposedException($"The stream with Id {this._id} and Tag {this._tag} is disposed.");
-			}
+			if (Disposed) throw new ObjectDisposedException($"The stream with Id {_id} and Tag {_tag} is disposed.");
 		}
 
 		private int InternalRead(byte[] buffer, int offset, int count, int fromPosition)
 		{
-			if (this.length - fromPosition <= 0)
-			{
-				return 0;
-			}
+			if (length - fromPosition <= 0) return 0;
 
 			int amountToCopy;
 
-			if (this._largeBuffer == null)
+			if (_largeBuffer == null)
 			{
-				var blockAndOffset = this.GetBlockAndRelativeOffset(fromPosition);
-				int bytesWritten = 0;
-				int bytesRemaining = Math.Min(count, this.length - fromPosition);
+				var blockAndOffset = GetBlockAndRelativeOffset(fromPosition);
+				var bytesWritten = 0;
+				var bytesRemaining = Math.Min(count, length - fromPosition);
 
 				while (bytesRemaining > 0)
 				{
-					amountToCopy = Math.Min(this._blocks[blockAndOffset.Block].Length - blockAndOffset.Offset,
+					amountToCopy = Math.Min(_blocks[blockAndOffset.Block].Length - blockAndOffset.Offset,
 						bytesRemaining);
 
-					Buffer.BlockCopy(this._blocks[blockAndOffset.Block], blockAndOffset.Offset, buffer,
+					Buffer.BlockCopy(_blocks[blockAndOffset.Block], blockAndOffset.Offset, buffer,
 						bytesWritten + offset, amountToCopy);
 
 					bytesWritten += amountToCopy;
@@ -769,54 +656,36 @@ private int InternalRead(byte[] buffer, int offset, int count, int fromPosition)
 				}
 				return bytesWritten;
 			}
-			amountToCopy = Math.Min(count, this.length - fromPosition);
-			Buffer.BlockCopy(this._largeBuffer, fromPosition, buffer, offset, amountToCopy);
+			amountToCopy = Math.Min(count, length - fromPosition);
+			Buffer.BlockCopy(_largeBuffer, fromPosition, buffer, offset, amountToCopy);
 			return amountToCopy;
 		}
 
-		private struct BlockAndOffset
-		{
-			public int Block;
-			public int Offset;
-
-			public BlockAndOffset(int block, int offset)
-			{
-				this.Block = block;
-				this.Offset = offset;
-			}
-		}
-
 		private BlockAndOffset GetBlockAndRelativeOffset(int offset)
 		{
-			var blockSize = this._memoryManager.BlockSize;
+			var blockSize = _memoryManager.BlockSize;
 			return new BlockAndOffset(offset / blockSize, offset % blockSize);
 		}
 
 		private void EnsureCapacity(int newCapacity)
 		{
-			if (newCapacity > this._memoryManager.MaximumStreamCapacity && this._memoryManager.MaximumStreamCapacity > 0)
-			{
+			if (newCapacity > _memoryManager.MaximumStreamCapacity && _memoryManager.MaximumStreamCapacity > 0)
 				throw new InvalidOperationException("Requested capacity is too large: " + newCapacity + ". Limit is " +
-				                                    this._memoryManager.MaximumStreamCapacity);
-			}
+					_memoryManager.MaximumStreamCapacity);
 
-			if (this._largeBuffer != null)
+			if (_largeBuffer != null)
 			{
-				if (newCapacity > this._largeBuffer.Length)
+				if (newCapacity > _largeBuffer.Length)
 				{
-					var newBuffer = this._memoryManager.GetLargeBuffer(newCapacity, this._tag);
-					this.InternalRead(newBuffer, 0, this.length, 0);
-					this.ReleaseLargeBuffer();
-					this._largeBuffer = newBuffer;
+					var newBuffer = _memoryManager.GetLargeBuffer(newCapacity, _tag);
+					InternalRead(newBuffer, 0, length, 0);
+					ReleaseLargeBuffer();
+					_largeBuffer = newBuffer;
 				}
 			}
 			else
-			{
-				while (this.Capacity < newCapacity)
-				{
-					_blocks.Add((this._memoryManager.GetBlock()));
-				}
-			}
+				while (Capacity < newCapacity)
+					_blocks.Add(_memoryManager.GetBlock());
 		}
 
 		/// <summary>
@@ -824,22 +693,27 @@ private void EnsureCapacity(int newCapacity)
 		/// </summary>
 		private void ReleaseLargeBuffer()
 		{
-			if (this._memoryManager.AggressiveBufferReturn)
-			{
-				this._memoryManager.ReturnLargeBuffer(this._largeBuffer, this._tag);
-			}
+			if (_memoryManager.AggressiveBufferReturn)
+				_memoryManager.ReturnLargeBuffer(_largeBuffer, _tag);
 			else
 			{
-				if (this._dirtyBuffers == null)
-				{
-					// We most likely will only ever need space for one
-					this._dirtyBuffers = new List<byte[]>(1);
-				}
-				this._dirtyBuffers.Add(this._largeBuffer);
+				if (_dirtyBuffers == null) _dirtyBuffers = new List<byte[]>(1);
+				_dirtyBuffers.Add(_largeBuffer);
 			}
 
-			this._largeBuffer = null;
+			_largeBuffer = null;
+		}
+
+		private struct BlockAndOffset
+		{
+			public int Block;
+			public int Offset;
+
+			public BlockAndOffset(int block, int offset)
+			{
+				Block = block;
+				Offset = offset;
+			}
 		}
-		#endregion
 	}
 }
diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamFactory.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamFactory.cs
index a75a7857da3..9b99ed10d65 100644
--- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamFactory.cs
+++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamFactory.cs
@@ -1,10 +1,9 @@
 using System.IO;
-using System.Linq;
 
 namespace Elasticsearch.Net
 {
 	/// <summary>
-	/// A factory for creating memory streams using a recyclable pool of <see cref="MemoryStream"/> instances
+	/// A factory for creating memory streams using a recyclable pool of <see cref="MemoryStream" /> instances
 	/// </summary>
 	public class RecyclableMemoryStreamFactory : IMemoryStreamFactory
 	{
diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs
index ab9499fd925..453de76356e 100644
--- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs
+++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs
@@ -38,10 +38,8 @@ internal class RecyclableMemoryStreamManager
 		public const int DefaultLargeBufferMultiple = 1024 * 1024;
 		public const int DefaultMaximumBufferSize = 128 * 1024 * 1024;
 
-		private readonly int _blockSize;
 		private readonly long[] _largeBufferFreeSize;
 		private readonly long[] _largeBufferInUseSize;
-		private readonly int _largeBufferMultiple;
 
 		/// <summary>
 		/// pools[0] = 1x largeBufferMultiple buffers
@@ -50,7 +48,6 @@ internal class RecyclableMemoryStreamManager
 		/// </summary>
 		private readonly ConcurrentStack<byte[]>[] largePools;
 
-		private readonly int _maximumBufferSize;
 		private readonly ConcurrentStack<byte[]> smallPool;
 
 		private long _smallPoolFreeSize;
@@ -68,78 +65,75 @@ public RecyclableMemoryStreamManager()
 		/// <param name="blockSize">Size of each block that is pooled. Must be > 0.</param>
 		/// <param name="largeBufferMultiple">Each large buffer will be a multiple of this value.</param>
 		/// <param name="maximumBufferSize">Buffers larger than this are not pooled</param>
-		/// <exception cref="ArgumentOutOfRangeException">blockSize is not a positive number, or largeBufferMultiple is not a positive number, or maximumBufferSize is less than blockSize.</exception>
+		/// <exception cref="ArgumentOutOfRangeException">
+		/// blockSize is not a positive number, or largeBufferMultiple is not a positive number, or
+		/// maximumBufferSize is less than blockSize.
+		/// </exception>
 		/// <exception cref="ArgumentException">maximumBufferSize is not a multiple of largeBufferMultiple</exception>
 		public RecyclableMemoryStreamManager(int blockSize, int largeBufferMultiple, int maximumBufferSize)
 		{
-			if (blockSize <= 0)
-			{
-				throw new ArgumentOutOfRangeException(nameof(blockSize), blockSize, "blockSize must be a positive number");
-			}
+			if (blockSize <= 0) throw new ArgumentOutOfRangeException(nameof(blockSize), blockSize, "blockSize must be a positive number");
 
 			if (largeBufferMultiple <= 0)
-			{
 				throw new ArgumentOutOfRangeException(nameof(largeBufferMultiple),
 					"largeBufferMultiple must be a positive number");
-			}
 
 			if (maximumBufferSize < blockSize)
-			{
 				throw new ArgumentOutOfRangeException(nameof(maximumBufferSize),
 					"maximumBufferSize must be at least blockSize");
-			}
 
-			this._blockSize = blockSize;
-			this._largeBufferMultiple = largeBufferMultiple;
-			this._maximumBufferSize = maximumBufferSize;
+			BlockSize = blockSize;
+			LargeBufferMultiple = largeBufferMultiple;
+			MaximumBufferSize = maximumBufferSize;
 
-			if (!this.IsLargeBufferMultiple(maximumBufferSize))
-			{
+			if (!IsLargeBufferMultiple(maximumBufferSize))
 				throw new ArgumentException("maximumBufferSize is not a multiple of largeBufferMultiple",
 					nameof(maximumBufferSize));
-			}
 
-			this.smallPool = new ConcurrentStack<byte[]>();
+			smallPool = new ConcurrentStack<byte[]>();
 			var numLargePools = maximumBufferSize / largeBufferMultiple;
 
 			// +1 to store size of bytes in use that are too large to be pooled
-			this._largeBufferInUseSize = new long[numLargePools + 1];
-			this._largeBufferFreeSize = new long[numLargePools];
+			_largeBufferInUseSize = new long[numLargePools + 1];
+			_largeBufferFreeSize = new long[numLargePools];
 
-			this.largePools = new ConcurrentStack<byte[]>[numLargePools];
+			largePools = new ConcurrentStack<byte[]>[numLargePools];
 
-			for (var i = 0; i < this.largePools.Length; ++i)
-			{
-				this.largePools[i] = new ConcurrentStack<byte[]>();
-			}
+			for (var i = 0; i < largePools.Length; ++i) largePools[i] = new ConcurrentStack<byte[]>();
 		}
 
 		/// <summary>
-		/// The size of each block. It must be set at creation and cannot be changed.
-		/// </summary>
-		public int BlockSize => this._blockSize;
-
-		/// <summary>
-		/// All buffers are multiples of this number. It must be set at creation and cannot be changed.
+		/// Whether dirty buffers can be immediately returned to the buffer pool. E.g. when GetBuffer() is called on
+		/// a stream and creates a single large buffer, if this setting is enabled, the other blocks will be returned
+		/// to the buffer pool immediately.
+		/// Note when enabling this setting that the user is responsible for ensuring that any buffer previously
+		/// retrieved from a stream which is subsequently modified is not used after modification (as it may no longer
+		/// be valid).
 		/// </summary>
-		public int LargeBufferMultiple => this._largeBufferMultiple;
+		public bool AggressiveBufferReturn { get; set; }
 
 		/// <summary>
-		/// Gets or sets the maximum buffer size.
+		/// The size of each block. It must be set at creation and cannot be changed.
 		/// </summary>
-		/// <remarks>Any buffer that is returned to the pool that is larger than this will be
-		/// discarded and garbage collected.</remarks>
-		public int MaximumBufferSize => this._maximumBufferSize;
+		public int BlockSize { get; }
 
 		/// <summary>
-		/// Number of bytes in small pool not currently in use
+		/// All buffers are multiples of this number. It must be set at creation and cannot be changed.
 		/// </summary>
-		public long SmallPoolFreeSize => this._smallPoolFreeSize;
+		public int LargeBufferMultiple { get; }
 
 		/// <summary>
-		/// Number of bytes currently in use by stream from the small pool
+		/// How many buffers are in the large pool
 		/// </summary>
-		public long SmallPoolInUseSize => this._smallPoolInUseSize;
+		public long LargeBuffersFree
+		{
+			get
+			{
+				long free = 0;
+				foreach (var pool in largePools) free += pool.Count;
+				return free;
+			}
+		}
 
 		/// <summary>
 		/// Number of bytes in large pool not currently in use
@@ -149,9 +143,9 @@ public long LargePoolFreeSize
 			get
 			{
 				long sum = 0;
-				for (var index = 0; index < this._largeBufferFreeSize.Length; index++)
+				for (var index = 0; index < _largeBufferFreeSize.Length; index++)
 				{
-					var freeSize = this._largeBufferFreeSize[index];
+					var freeSize = _largeBufferFreeSize[index];
 					sum += freeSize;
 				}
 
@@ -167,9 +161,9 @@ public long LargePoolInUseSize
 			get
 			{
 				long sum = 0;
-				for (var index = 0; index < this._largeBufferInUseSize.Length; index++)
+				for (var index = 0; index < _largeBufferInUseSize.Length; index++)
 				{
-					var inUseSize = this._largeBufferInUseSize[index];
+					var inUseSize = _largeBufferInUseSize[index];
 					sum += inUseSize;
 				}
 
@@ -178,25 +172,19 @@ public long LargePoolInUseSize
 		}
 
 		/// <summary>
-		/// How many blocks are in the small pool
+		/// Gets or sets the maximum buffer size.
 		/// </summary>
-		public long SmallBlocksFree => this.smallPool.Count;
+		/// <remarks>
+		/// Any buffer that is returned to the pool that is larger than this will be
+		/// discarded and garbage collected.
+		/// </remarks>
+		public int MaximumBufferSize { get; }
 
 		/// <summary>
-		/// How many buffers are in the large pool
+		/// How many bytes of large free buffers to allow before we start dropping
+		/// those returned to us.
 		/// </summary>
-		public long LargeBuffersFree
-		{
-			get
-			{
-				long free = 0;
-				foreach (var pool in this.largePools)
-				{
-					free += pool.Count;
-				}
-				return free;
-			}
-		}
+		public long MaximumFreeLargePoolBytes { get; set; }
 
 		/// <summary>
 		/// How many bytes of small free blocks to allow before we start dropping
@@ -204,12 +192,6 @@ public long LargeBuffersFree
 		/// </summary>
 		public long MaximumFreeSmallPoolBytes { get; set; }
 
-		/// <summary>
-		/// How many bytes of large free buffers to allow before we start dropping
-		/// those returned to us.
-		/// </summary>
-		public long MaximumFreeLargePoolBytes { get; set; }
-
 		/// <summary>
 		/// Maximum stream capacity in bytes. Attempts to set a larger capacity will
 		/// result in an exception.
@@ -218,14 +200,19 @@ public long LargeBuffersFree
 		public long MaximumStreamCapacity { get; set; }
 
 		/// <summary>
-		/// Whether dirty buffers can be immediately returned to the buffer pool. E.g. when GetBuffer() is called on
-		/// a stream and creates a single large buffer, if this setting is enabled, the other blocks will be returned
-		/// to the buffer pool immediately.
-		/// Note when enabling this setting that the user is responsible for ensuring that any buffer previously
-		/// retrieved from a stream which is subsequently modified is not used after modification (as it may no longer
-		/// be valid).
+		/// How many blocks are in the small pool
 		/// </summary>
-		public bool AggressiveBufferReturn { get; set; }
+		public long SmallBlocksFree => smallPool.Count;
+
+		/// <summary>
+		/// Number of bytes in small pool not currently in use
+		/// </summary>
+		public long SmallPoolFreeSize => _smallPoolFreeSize;
+
+		/// <summary>
+		/// Number of bytes currently in use by stream from the small pool
+		/// </summary>
+		public long SmallPoolInUseSize => _smallPoolInUseSize;
 
 		/// <summary>
 		/// Removes and returns a single block from the pool.
@@ -233,18 +220,12 @@ public long LargeBuffersFree
 		/// <returns>A byte[] array</returns>
 		internal byte[] GetBlock()
 		{
-			if (!this.smallPool.TryPop(out var block))
-			{
-				// We'll add this back to the pool when the stream is disposed
-				// (unless our free pool is too large)
-				block = new byte[this.BlockSize];
-			}
+			if (!smallPool.TryPop(out var block))
+				block = new byte[BlockSize];
 			else
-			{
-				Interlocked.Add(ref this._smallPoolFreeSize, -this.BlockSize);
-			}
+				Interlocked.Add(ref _smallPoolFreeSize, -BlockSize);
 
-			Interlocked.Add(ref this._smallPoolInUseSize, this.BlockSize);
+			Interlocked.Add(ref _smallPoolInUseSize, BlockSize);
 			return block;
 		}
 
@@ -257,21 +238,17 @@ internal byte[] GetBlock()
 		/// <returns>A buffer of at least the required size.</returns>
 		internal byte[] GetLargeBuffer(int requiredSize, string tag)
 		{
-			requiredSize = this.RoundToLargeBufferMultiple(requiredSize);
+			requiredSize = RoundToLargeBufferMultiple(requiredSize);
 
-			var poolIndex = requiredSize / this._largeBufferMultiple - 1;
+			var poolIndex = requiredSize / LargeBufferMultiple - 1;
 
 			byte[] buffer;
-			if (poolIndex < this.largePools.Length)
+			if (poolIndex < largePools.Length)
 			{
-				if (!this.largePools[poolIndex].TryPop(out buffer))
-				{
+				if (!largePools[poolIndex].TryPop(out buffer))
 					buffer = new byte[requiredSize];
-				}
 				else
-				{
-					Interlocked.Add(ref this._largeBufferFreeSize[poolIndex], -buffer.Length);
-				}
+					Interlocked.Add(ref _largeBufferFreeSize[poolIndex], -buffer.Length);
 			}
 			else
 			{
@@ -279,26 +256,21 @@ internal byte[] GetLargeBuffer(int requiredSize, string tag)
 
 				// We still want to track the size, though, and we've reserved a slot
 				// in the end of the inuse array for nonpooled bytes in use.
-				poolIndex = this._largeBufferInUseSize.Length - 1;
+				poolIndex = _largeBufferInUseSize.Length - 1;
 
 				// We still want to round up to reduce heap fragmentation.
 				buffer = new byte[requiredSize];
 			}
 
-			Interlocked.Add(ref this._largeBufferInUseSize[poolIndex], buffer.Length);
+			Interlocked.Add(ref _largeBufferInUseSize[poolIndex], buffer.Length);
 
 			return buffer;
 		}
 
-		private int RoundToLargeBufferMultiple(int requiredSize)
-		{
-			return ((requiredSize + this.LargeBufferMultiple - 1) / this.LargeBufferMultiple) * this.LargeBufferMultiple;
-		}
+		private int RoundToLargeBufferMultiple(int requiredSize) =>
+			(requiredSize + LargeBufferMultiple - 1) / LargeBufferMultiple * LargeBufferMultiple;
 
-		private bool IsLargeBufferMultiple(int value)
-		{
-			return (value != 0) && (value % this.LargeBufferMultiple) == 0;
-		}
+		private bool IsLargeBufferMultiple(int value) => value != 0 && value % LargeBufferMultiple == 0;
 
 		/// <summary>
 		/// Returns the buffer to the large pool
@@ -309,37 +281,28 @@ private bool IsLargeBufferMultiple(int value)
 		/// <exception cref="ArgumentException">buffer.Length is not a multiple of LargeBufferMultiple (it did not originate from this pool)</exception>
 		internal void ReturnLargeBuffer(byte[] buffer, string tag)
 		{
-			if (buffer == null)
-			{
-				throw new ArgumentNullException(nameof(buffer));
-			}
+			if (buffer == null) throw new ArgumentNullException(nameof(buffer));
 
-			if (!this.IsLargeBufferMultiple(buffer.Length))
-			{
+			if (!IsLargeBufferMultiple(buffer.Length))
 				throw new ArgumentException(
 					"buffer did not originate from this memory manager. The size is not a multiple of " +
-					this.LargeBufferMultiple);
-			}
+					LargeBufferMultiple);
 
-			var poolIndex = buffer.Length / this._largeBufferMultiple - 1;
+			var poolIndex = buffer.Length / LargeBufferMultiple - 1;
 
-			if (poolIndex < this.largePools.Length)
+			if (poolIndex < largePools.Length)
 			{
-				if ((this.largePools[poolIndex].Count + 1) * buffer.Length <= this.MaximumFreeLargePoolBytes ||
-				    this.MaximumFreeLargePoolBytes == 0)
+				if ((largePools[poolIndex].Count + 1) * buffer.Length <= MaximumFreeLargePoolBytes ||
+					MaximumFreeLargePoolBytes == 0)
 				{
-					this.largePools[poolIndex].Push(buffer);
-					Interlocked.Add(ref this._largeBufferFreeSize[poolIndex], buffer.Length);
+					largePools[poolIndex].Push(buffer);
+					Interlocked.Add(ref _largeBufferFreeSize[poolIndex], buffer.Length);
 				}
 			}
 			else
-			{
-				// This is a non-poolable buffer, but we still want to track its size for inuse
-				// analysis. We have space in the inuse array for this.
-				poolIndex = this._largeBufferInUseSize.Length - 1;
-			}
+				poolIndex = _largeBufferInUseSize.Length - 1;
 
-			Interlocked.Add(ref this._largeBufferInUseSize[poolIndex], -buffer.Length);
+			Interlocked.Add(ref _largeBufferInUseSize[poolIndex], -buffer.Length);
 		}
 
 		/// <summary>
@@ -351,33 +314,26 @@ internal void ReturnLargeBuffer(byte[] buffer, string tag)
 		/// <exception cref="ArgumentException">blocks contains buffers that are the wrong size (or null) for this memory manager</exception>
 		internal void ReturnBlocks(ICollection<byte[]> blocks, string tag)
 		{
-			if (blocks == null)
-			{
-				throw new ArgumentNullException(nameof(blocks));
-			}
+			if (blocks == null) throw new ArgumentNullException(nameof(blocks));
 
-			var bytesToReturn = blocks.Count * this.BlockSize;
-			Interlocked.Add(ref this._smallPoolInUseSize, -bytesToReturn);
+			var bytesToReturn = blocks.Count * BlockSize;
+			Interlocked.Add(ref _smallPoolInUseSize, -bytesToReturn);
 
 			foreach (var block in blocks)
 			{
-				if (block == null || block.Length != this.BlockSize)
-				{
+				if (block == null || block.Length != BlockSize)
 					throw new ArgumentException("blocks contains buffers that are not BlockSize in length");
-				}
 			}
 
 			foreach (var block in blocks)
 			{
-				if (this.MaximumFreeSmallPoolBytes == 0 || this.SmallPoolFreeSize < this.MaximumFreeSmallPoolBytes)
+				if (MaximumFreeSmallPoolBytes == 0 || SmallPoolFreeSize < MaximumFreeSmallPoolBytes)
 				{
-					Interlocked.Add(ref this._smallPoolFreeSize, this.BlockSize);
-					this.smallPool.Push(block);
+					Interlocked.Add(ref _smallPoolFreeSize, BlockSize);
+					smallPool.Push(block);
 				}
 				else
-				{
 					break;
-				}
 			}
 		}
 
@@ -386,20 +342,14 @@ internal void ReturnBlocks(ICollection<byte[]> blocks, string tag)
 		/// Retrieve a new MemoryStream object with no tag and a default initial capacity.
 		/// </summary>
 		/// <returns>A MemoryStream.</returns>
-		public MemoryStream GetStream()
-		{
-			return new RecyclableMemoryStream(this);
-		}
+		public MemoryStream GetStream() => new RecyclableMemoryStream(this);
 
 		/// <summary>
 		/// Retrieve a new MemoryStream object with the given tag and a default initial capacity.
 		/// </summary>
 		/// <param name="tag">A tag which can be used to track the source of the stream.</param>
 		/// <returns>A MemoryStream.</returns>
-		public MemoryStream GetStream(string tag)
-		{
-			return new RecyclableMemoryStream(this, tag);
-		}
+		public MemoryStream GetStream(string tag) => new RecyclableMemoryStream(this, tag);
 
 		/// <summary>
 		/// Retrieve a new MemoryStream object with the given tag and at least the given capacity.
@@ -407,31 +357,27 @@ public MemoryStream GetStream(string tag)
 		/// <param name="tag">A tag which can be used to track the source of the stream.</param>
 		/// <param name="requiredSize">The minimum desired capacity for the stream.</param>
 		/// <returns>A MemoryStream.</returns>
-		public MemoryStream GetStream(string tag, int requiredSize)
-		{
-			return new RecyclableMemoryStream(this, tag, requiredSize);
-		}
+		public MemoryStream GetStream(string tag, int requiredSize) => new RecyclableMemoryStream(this, tag, requiredSize);
 
 		/// <summary>
 		/// Retrieve a new MemoryStream object with the given tag and at least the given capacity, possibly using
 		/// a single continugous underlying buffer.
 		/// </summary>
-		/// <remarks>Retrieving a MemoryStream which provides a single contiguous buffer can be useful in situations
+		/// <remarks>
+		/// Retrieving a MemoryStream which provides a single contiguous buffer can be useful in situations
 		/// where the initial size is known and it is desirable to avoid copying data between the smaller underlying
 		/// buffers to a single large one. This is most helpful when you know that you will always call GetBuffer
-		/// on the underlying stream.</remarks>
+		/// on the underlying stream.
+		/// </remarks>
 		/// <param name="tag">A tag which can be used to track the source of the stream.</param>
 		/// <param name="requiredSize">The minimum desired capacity for the stream.</param>
 		/// <param name="asContiguousBuffer">Whether to attempt to use a single contiguous buffer.</param>
 		/// <returns>A MemoryStream.</returns>
 		public MemoryStream GetStream(string tag, int requiredSize, bool asContiguousBuffer)
 		{
-			if (!asContiguousBuffer || requiredSize <= this.BlockSize)
-			{
-				return this.GetStream(tag, requiredSize);
-			}
+			if (!asContiguousBuffer || requiredSize <= BlockSize) return GetStream(tag, requiredSize);
 
-			return new RecyclableMemoryStream(this, tag, requiredSize, this.GetLargeBuffer(requiredSize, tag));
+			return new RecyclableMemoryStream(this, tag, requiredSize, GetLargeBuffer(requiredSize, tag));
 		}
 
 		/// <summary>
diff --git a/src/Elasticsearch.Net/Responses/Dynamic/DynamicBody.cs b/src/Elasticsearch.Net/Responses/Dynamic/DynamicBody.cs
index c08879ece25..bcffe6e14ed 100644
--- a/src/Elasticsearch.Net/Responses/Dynamic/DynamicBody.cs
+++ b/src/Elasticsearch.Net/Responses/Dynamic/DynamicBody.cs
@@ -12,94 +12,36 @@ namespace Elasticsearch.Net
 	/// <summary>
 	/// A dictionary that supports dynamic access.
 	/// </summary>
-	public class DynamicBody :
-		DynamicObject,
-		IEquatable<DynamicBody>,
-		IEnumerable<string>,
-		IDictionary<string, object>
+	public class DynamicBody
+		: DynamicObject,
+			IEquatable<DynamicBody>,
+			IEnumerable<string>,
+			IDictionary<string, object>
 	{
 		private readonly IDictionary<string, dynamic> BackingDictionary = new Dictionary<string, dynamic>(StringComparer.OrdinalIgnoreCase);
 
 		/// <summary>
-		/// Returns an empty dynamic dictionary.
-		/// </summary>
-		/// <value>A <see cref="DynamicBody"/> instance.</value>
-		public static DynamicBody Empty => new DynamicBody();
-
-		/// <summary>
-		/// Creates a dynamic dictionary from an <see cref="IDictionary{TKey,TValue}"/> instance.
+		/// Gets the number of elements contained in the <see cref="DynamicBody" />.
 		/// </summary>
-		/// <param name="values">An <see cref="IDictionary{TKey,TValue}"/> instance, that the dynamic dictionary should be created from.</param>
-		/// <returns>An <see cref="DynamicBody"/> instance.</returns>
-		public static DynamicBody Create(IDictionary<string, object> values)
-		{
-			var instance = new DynamicBody();
-
-			foreach (var key in values.Keys)
-			{
-				instance[key] = values[key];
-			}
-
-			return instance;
-		}
+		/// <returns>The number of elements contained in the <see cref="DynamicBody" />.</returns>
+		public int Count => BackingDictionary.Count;
 
 		/// <summary>
-		/// Provides the implementation for operations that set member values. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations such as setting a value for a property.
-		/// </summary>
-		/// <returns>true if the operation is successful; otherwise, false. If this method returns false, the run-time binder of the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.)</returns>
-		/// <param name="binder">Provides information about the object that called the dynamic operation. The binder.Name property provides the name of the member to which the value is being assigned. For example, for the statement sampleObject.SampleProperty = "Test", where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Name returns "SampleProperty". The binder.IgnoreCase property specifies whether the member name is case-sensitive.</param><param name="value">The value to set to the member. For example, for sampleObject.SampleProperty = "Test", where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, the <paramref name="value"/> is "Test".</param>
-		public override bool TrySetMember(SetMemberBinder binder, object value)
-		{
-			this[binder.Name] = value;
-			return true;
-		}
-
-		/// <summary>
-		/// Provides the implementation for operations that get member values. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations such as getting a value for a property.
-		/// </summary>
-		/// <returns>true if the operation is successful; otherwise, false. If this method returns false, the run-time binder of the language determines the behavior. (In most cases, a run-time exception is thrown.)</returns>
-		/// <param name="binder">Provides information about the object that called the dynamic operation. The binder.Name property provides the name of the member on which the dynamic operation is performed. For example, for the Console.WriteLine(sampleObject.SampleProperty) statement, where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Name returns "SampleProperty". The binder.IgnoreCase property specifies whether the member name is case-sensitive.</param><param name="result">The result of the get operation. For example, if the method is called for a property, you can assign the property value to <paramref name="result"/>.</param>
-		public override bool TryGetMember(GetMemberBinder binder, out object result)
-		{
-			if (!BackingDictionary.TryGetValue(binder.Name, out result))
-			{
-				result = new ElasticsearchDynamicValue(null);
-			}
-
-			return true;
-		}
-
-		/// <summary>
-		/// Returns the enumeration of all dynamic member names.
-		/// </summary>
-		/// <returns>A <see cref="IEnumerable{T}"/> that contains dynamic member names.</returns>
-		public override IEnumerable<string> GetDynamicMemberNames()
-		{
-			return BackingDictionary.Keys;
-		}
-
-		/// <summary>
-		/// Returns the enumeration of all dynamic member names.
+		/// Returns an empty dynamic dictionary.
 		/// </summary>
-		/// <returns>A <see cref="IEnumerable{T}"/> that contains dynamic member names.</returns>
-		public IEnumerator<string> GetEnumerator()
-		{
-			return BackingDictionary.Keys.GetEnumerator();
-		}
+		/// <value>A <see cref="DynamicBody" /> instance.</value>
+		public static DynamicBody Empty => new DynamicBody();
 
 		/// <summary>
-		/// Returns the enumeration of all dynamic member names.
+		/// Gets a value indicating whether the <see cref="DynamicBody" /> is read-only.
 		/// </summary>
-		/// <returns>A <see cref="IEnumerator"/> that contains dynamic member names.</returns>
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return BackingDictionary.Keys.GetEnumerator();
-		}
+		/// <returns>Always returns <see langword="false" />.</returns>
+		public bool IsReadOnly => false;
 
 		/// <summary>
-		/// Gets or sets the <see cref="ElasticsearchDynamicValue"/> with the specified name.
+		/// Gets or sets the <see cref="ElasticsearchDynamicValue" /> with the specified name.
 		/// </summary>
-		/// <value>A <see cref="ElasticsearchDynamicValue"/> instance containing a value.</value>
+		/// <value>A <see cref="ElasticsearchDynamicValue" /> instance containing a value.</value>
 		public dynamic this[string name]
 		{
 			get
@@ -107,10 +49,7 @@ public dynamic this[string name]
 				name = GetNeutralKey(name);
 
 				dynamic member;
-				if (!BackingDictionary.TryGetValue(name, out member))
-				{
-					member = new ElasticsearchDynamicValue(null);
-				}
+				if (!BackingDictionary.TryGetValue(name, out member)) member = new ElasticsearchDynamicValue(null);
 
 				return member;
 			}
@@ -123,182 +62,240 @@ public dynamic this[string name]
 		}
 
 		/// <summary>
-		/// Indicates whether the current <see cref="DynamicBody"/> is equal to another object of the same type.
+		/// Gets an <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the <see cref="DynamicBody" />.
 		/// </summary>
-		/// <returns><see langword="true"/> if the current instance is equal to the <paramref name="other"/> parameter; otherwise, <see langword="false"/>.</returns>
-		/// <param name="other">An <see cref="DynamicBody"/> instance to compare with this instance.</param>
-		public bool Equals(DynamicBody other)
-		{
-			if (ReferenceEquals(null, other))
-			{
-				return false;
-			}
-
-			return ReferenceEquals(this, other) || Equals(other.BackingDictionary, this.BackingDictionary);
-		}
+		/// <returns>An <see cref="T:System.Collections.Generic.ICollection`1" /> containing the keys of the <see cref="DynamicBody" />.</returns>
+		public ICollection<string> Keys => BackingDictionary.Keys;
 
 		/// <summary>
-		/// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+		/// Gets an <see cref="T:System.Collections.Generic.ICollection`1" /> containing the values in the <see cref="DynamicBody" />.
 		/// </summary>
-		/// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-		/// <returns><see langword="true"/> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <see langword="false"/>.</returns>
-		public override bool Equals(object obj)
-		{
-			if (ReferenceEquals(null, obj))
-			{
-				return false;
-			}
+		/// <returns>An <see cref="T:System.Collections.Generic.ICollection`1" /> containing the values in the <see cref="DynamicBody" />.</returns>
+		public ICollection<dynamic> Values => BackingDictionary.Values;
 
-			if (ReferenceEquals(this, obj))
-			{
-				return true;
-			}
+		/// <summary>
+		/// Adds an item to the <see cref="DynamicBody" />.
+		/// </summary>
+		/// <param name="item">The object to add to the <see cref="DynamicBody" />.</param>
+		public void Add(KeyValuePair<string, dynamic> item) => this[item.Key] = item.Value;
 
-			return obj.GetType() == typeof(DynamicBody) && this.Equals((DynamicBody)obj);
-		}
+		/// <summary>
+		/// Removes all items from the <see cref="DynamicBody" />.
+		/// </summary>
+		public void Clear() => BackingDictionary.Clear();
 
 		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
+		/// Determines whether the <see cref="DynamicBody" /> contains a specific value.
 		/// </summary>
-		/// <returns>A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.</returns>
-		IEnumerator<KeyValuePair<string, dynamic>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
+		/// <returns>
+		/// <see langword="true" /> if <paramref name="item" /> is found in the <see cref="DynamicBody" />; otherwise, <see langword="false" />.
+		/// </returns>
+		/// <param name="item">The object to locate in the <see cref="DynamicBody" />.</param>
+		public bool Contains(KeyValuePair<string, dynamic> item)
 		{
-			return this.BackingDictionary.GetEnumerator();
+			var dynamicValueKeyValuePair =
+				GetDynamicKeyValuePair(item);
+
+			return BackingDictionary.Contains(dynamicValueKeyValuePair);
 		}
 
 		/// <summary>
-		/// Returns a hash code for this <see cref="DynamicBody"/>.
+		/// Copies the elements of the <see cref="DynamicBody" /> to an <see cref="T:System.Array" />, starting at a particular
+		/// <see cref="T:System.Array" /> index.
 		/// </summary>
-		/// <returns> A hash code for this <see cref="DynamicBody"/>, suitable for use in hashing algorithms and data structures like a hash table.</returns>
-		public override int GetHashCode() => BackingDictionary?.GetHashCode() ?? 0;
+		/// <param name="array">
+		/// The one-dimensional <see cref="T:System.Array" /> that is the destination of the elements copied from the
+		/// <see cref="DynamicBody" />. The <see cref="T:System.Array" /> must have zero-based indexing.
+		/// </param>
+		/// <param name="arrayIndex">The zero-based index in <paramref name="array" /> at which copying begins.</param>
+		public void CopyTo(KeyValuePair<string, dynamic>[] array, int arrayIndex) => BackingDictionary.CopyTo(array, arrayIndex);
 
 		/// <summary>
-		/// Adds an element with the provided key and value to the <see cref="DynamicBody"/>.
+		/// Removes the first occurrence of a specific object from the <see cref="DynamicBody" />.
 		/// </summary>
-		/// <param name="key">The object to use as the key of the element to add.</param>
-		/// <param name="value">The object to use as the value of the element to add.</param>
-		public void Add(string key, dynamic value)
+		/// <returns>
+		/// <see langword="true" /> if <paramref name="item" /> was successfully removed from the <see cref="DynamicBody" />; otherwise,
+		/// <see langword="false" />.
+		/// </returns>
+		/// <param name="item">The object to remove from the <see cref="DynamicBody" />.</param>
+		public bool Remove(KeyValuePair<string, dynamic> item)
 		{
-			this[key] = value;
+			var dynamicValueKeyValuePair =
+				GetDynamicKeyValuePair(item);
+
+			return BackingDictionary.Remove(dynamicValueKeyValuePair);
 		}
 
 		/// <summary>
-		/// Adds an item to the <see cref="DynamicBody"/>.
+		/// Adds an element with the provided key and value to the <see cref="DynamicBody" />.
 		/// </summary>
-		/// <param name="item">The object to add to the <see cref="DynamicBody"/>.</param>
-		public void Add(KeyValuePair<string, dynamic> item)
-		{
-			this[item.Key] = item.Value;
-		}
+		/// <param name="key">The object to use as the key of the element to add.</param>
+		/// <param name="value">The object to use as the value of the element to add.</param>
+		public void Add(string key, dynamic value) => this[key] = value;
 
 		/// <summary>
-		/// Determines whether the <see cref="DynamicBody"/> contains an element with the specified key.
+		/// Determines whether the <see cref="DynamicBody" /> contains an element with the specified key.
 		/// </summary>
-		/// <returns><see langword="true" /> if the <see cref="DynamicBody"/> contains an element with the key; otherwise, <see langword="false" />.
+		/// <returns>
+		/// <see langword="true" /> if the <see cref="DynamicBody" /> contains an element with the key; otherwise, <see langword="false" />.
 		/// </returns>
-		/// <param name="key">The key to locate in the <see cref="DynamicBody"/>.</param>
-		public bool ContainsKey(string key)
-		{
-			return this.BackingDictionary.ContainsKey(key);
-		}
+		/// <param name="key">The key to locate in the <see cref="DynamicBody" />.</param>
+		public bool ContainsKey(string key) => BackingDictionary.ContainsKey(key);
 
 		/// <summary>
-		/// Gets an <see cref="T:System.Collections.Generic.ICollection`1"/> containing the keys of the <see cref="DynamicBody"/>.
+		/// Removes the element with the specified key from the <see cref="DynamicBody" />.
 		/// </summary>
-		/// <returns>An <see cref="T:System.Collections.Generic.ICollection`1"/> containing the keys of the <see cref="DynamicBody"/>.</returns>
-		public ICollection<string> Keys => this.BackingDictionary.Keys;
+		/// <returns><see langword="true" /> if the element is successfully removed; otherwise, <see langword="false" />.</returns>
+		/// <param name="key">The key of the element to remove.</param>
+		public bool Remove(string key)
+		{
+			key = GetNeutralKey(key);
+			return BackingDictionary.Remove(key);
+		}
 
 		/// <summary>
 		/// Gets the value associated with the specified key.
 		/// </summary>
-		/// <returns><see langword="true" /> if the <see cref="DynamicBody"/> contains an element with the specified key; otherwise, <see langword="false" />.</returns>
+		/// <returns>
+		/// <see langword="true" /> if the <see cref="DynamicBody" /> contains an element with the specified key; otherwise,
+		/// <see langword="false" />.
+		/// </returns>
 		/// <param name="key">The key whose value to get.</param>
-		/// <param name="value">When this method returns, the value associated with the specified key, if the key is found; otherwise, the default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.</param>
+		/// <param name="value">
+		/// When this method returns, the value associated with the specified key, if the key is found; otherwise, the default
+		/// value for the type of the <paramref name="value" /> parameter. This parameter is passed uninitialized.
+		/// </param>
 		public bool TryGetValue(string key, out dynamic value)
 		{
-			if (this.BackingDictionary.TryGetValue(key, out value)) return true;
+			if (BackingDictionary.TryGetValue(key, out value)) return true;
+
 			return false;
 		}
 
 		/// <summary>
-		/// Removes all items from the <see cref="DynamicBody"/>.
+		/// Returns the enumeration of all dynamic member names.
 		/// </summary>
-		public void Clear() => this.BackingDictionary.Clear();
+		/// <returns>A <see cref="IEnumerator" /> that contains dynamic member names.</returns>
+		IEnumerator IEnumerable.GetEnumerator() => BackingDictionary.Keys.GetEnumerator();
 
 		/// <summary>
-		/// Gets the number of elements contained in the <see cref="DynamicBody"/>.
+		/// Returns an enumerator that iterates through the collection.
 		/// </summary>
-		/// <returns>The number of elements contained in the <see cref="DynamicBody"/>.</returns>
-		public int Count
-		{
-			get { return this.BackingDictionary.Count; }
-		}
+		/// <returns>A <see cref="T:System.Collections.Generic.IEnumerator`1" /> that can be used to iterate through the collection.</returns>
+		IEnumerator<KeyValuePair<string, dynamic>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator() => BackingDictionary.GetEnumerator();
+
+		/// <summary>
+		/// Returns the enumeration of all dynamic member names.
+		/// </summary>
+		/// <returns>A <see cref="IEnumerable{T}" /> that contains dynamic member names.</returns>
+		public IEnumerator<string> GetEnumerator() => BackingDictionary.Keys.GetEnumerator();
 
 		/// <summary>
-		/// Determines whether the <see cref="DynamicBody"/> contains a specific value.
+		/// Indicates whether the current <see cref="DynamicBody" /> is equal to another object of the same type.
 		/// </summary>
-		/// <returns><see langword="true" /> if <paramref name="item"/> is found in the <see cref="DynamicBody"/>; otherwise, <see langword="false" />.
+		/// <returns>
+		/// <see langword="true" /> if the current instance is equal to the <paramref name="other" /> parameter; otherwise,
+		/// <see langword="false" />.
 		/// </returns>
-		/// <param name="item">The object to locate in the <see cref="DynamicBody"/>.</param>
-		public bool Contains(KeyValuePair<string, dynamic> item)
+		/// <param name="other">An <see cref="DynamicBody" /> instance to compare with this instance.</param>
+		public bool Equals(DynamicBody other)
 		{
-			var dynamicValueKeyValuePair =
-				GetDynamicKeyValuePair(item);
+			if (ReferenceEquals(null, other)) return false;
 
-			return this.BackingDictionary.Contains(dynamicValueKeyValuePair);
+			return ReferenceEquals(this, other) || Equals(other.BackingDictionary, BackingDictionary);
 		}
 
 		/// <summary>
-		/// Copies the elements of the <see cref="DynamicBody"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
+		/// Creates a dynamic dictionary from an <see cref="IDictionary{TKey,TValue}" /> instance.
 		/// </summary>
-		/// <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from the <see cref="DynamicBody"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param>
-		/// <param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param>
-		public void CopyTo(KeyValuePair<string, dynamic>[] array, int arrayIndex)
+		/// <param name="values">An <see cref="IDictionary{TKey,TValue}" /> instance, that the dynamic dictionary should be created from.</param>
+		/// <returns>An <see cref="DynamicBody" /> instance.</returns>
+		public static DynamicBody Create(IDictionary<string, object> values)
 		{
-			this.BackingDictionary.CopyTo(array, arrayIndex);
+			var instance = new DynamicBody();
+
+			foreach (var key in values.Keys) instance[key] = values[key];
+
+			return instance;
 		}
 
 		/// <summary>
-		/// Gets a value indicating whether the <see cref="DynamicBody"/> is read-only.
+		/// Provides the implementation for operations that set member values. Classes derived from the <see cref="T:System.Dynamic.DynamicObject" />
+		/// class can override this method to specify dynamic behavior for operations such as setting a value for a property.
 		/// </summary>
-		/// <returns>Always returns <see langword="false" />.</returns>
-		public bool IsReadOnly
+		/// <returns>
+		/// true if the operation is successful; otherwise, false. If this method returns false, the run-time binder of the language
+		/// determines the behavior. (In most cases, a language-specific run-time exception is thrown.)
+		/// </returns>
+		/// <param name="binder">
+		/// Provides information about the object that called the dynamic operation. The binder.Name property provides the name of
+		/// the member to which the value is being assigned. For example, for the statement sampleObject.SampleProperty = "Test", where sampleObject is
+		/// an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject" /> class, binder.Name returns "SampleProperty". The
+		/// binder.IgnoreCase property specifies whether the member name is case-sensitive.
+		/// </param>
+		/// <param name="value">
+		/// The value to set to the member. For example, for sampleObject.SampleProperty = "Test", where sampleObject is an
+		/// instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject" /> class, the <paramref name="value" /> is "Test".
+		/// </param>
+		public override bool TrySetMember(SetMemberBinder binder, object value)
 		{
-			get { return false; }
+			this[binder.Name] = value;
+			return true;
 		}
 
 		/// <summary>
-		/// Removes the element with the specified key from the <see cref="DynamicBody"/>.
+		/// Provides the implementation for operations that get member values. Classes derived from the <see cref="T:System.Dynamic.DynamicObject" />
+		/// class can override this method to specify dynamic behavior for operations such as getting a value for a property.
 		/// </summary>
-		/// <returns><see langword="true" /> if the element is successfully removed; otherwise, <see langword="false" />.</returns>
-		/// <param name="key">The key of the element to remove.</param>
-		public bool Remove(string key)
+		/// <returns>
+		/// true if the operation is successful; otherwise, false. If this method returns false, the run-time binder of the language
+		/// determines the behavior. (In most cases, a run-time exception is thrown.)
+		/// </returns>
+		/// <param name="binder">
+		/// Provides information about the object that called the dynamic operation. The binder.Name property provides the name of
+		/// the member on which the dynamic operation is performed. For example, for the Console.WriteLine(sampleObject.SampleProperty) statement,
+		/// where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject" /> class, binder.Name returns
+		/// "SampleProperty". The binder.IgnoreCase property specifies whether the member name is case-sensitive.
+		/// </param>
+		/// <param name="result">
+		/// The result of the get operation. For example, if the method is called for a property, you can assign the property
+		/// value to <paramref name="result" />.
+		/// </param>
+		public override bool TryGetMember(GetMemberBinder binder, out object result)
 		{
-			key = GetNeutralKey(key);
-			return this.BackingDictionary.Remove(key);
+			if (!BackingDictionary.TryGetValue(binder.Name, out result)) result = new ElasticsearchDynamicValue(null);
+
+			return true;
 		}
 
 		/// <summary>
-		/// Removes the first occurrence of a specific object from the <see cref="DynamicBody"/>.
+		/// Returns the enumeration of all dynamic member names.
 		/// </summary>
-		/// <returns><see langword="true" /> if <paramref name="item"/> was successfully removed from the <see cref="DynamicBody"/>; otherwise, <see langword="false" />.</returns>
-		/// <param name="item">The object to remove from the <see cref="DynamicBody"/>.</param>
-		public bool Remove(KeyValuePair<string, dynamic> item)
+		/// <returns>A <see cref="IEnumerable{T}" /> that contains dynamic member names.</returns>
+		public override IEnumerable<string> GetDynamicMemberNames() => BackingDictionary.Keys;
+
+		/// <summary>
+		/// Determines whether the specified <see cref="System.Object" /> is equal to this instance.
+		/// </summary>
+		/// <param name="obj">The <see cref="System.Object" /> to compare with this instance.</param>
+		/// <returns>
+		/// <see langword="true" /> if the specified <see cref="System.Object" /> is equal to this instance; otherwise,
+		/// <see langword="false" />.
+		/// </returns>
+		public override bool Equals(object obj)
 		{
-			var dynamicValueKeyValuePair =
-				GetDynamicKeyValuePair(item);
+			if (ReferenceEquals(null, obj)) return false;
 
-			return this.BackingDictionary.Remove(dynamicValueKeyValuePair);
+			if (ReferenceEquals(this, obj)) return true;
+
+			return obj.GetType() == typeof(DynamicBody) && Equals((DynamicBody)obj);
 		}
 
 		/// <summary>
-		/// Gets an <see cref="T:System.Collections.Generic.ICollection`1"/> containing the values in the <see cref="DynamicBody"/>.
+		/// Returns a hash code for this <see cref="DynamicBody" />.
 		/// </summary>
-		/// <returns>An <see cref="T:System.Collections.Generic.ICollection`1"/> containing the values in the <see cref="DynamicBody"/>.</returns>
-		public ICollection<dynamic> Values
-		{
-			get { return this.BackingDictionary.Values; }
-		}
+		/// <returns> A hash code for this <see cref="DynamicBody" />, suitable for use in hashing algorithms and data structures like a hash table.</returns>
+		public override int GetHashCode() => BackingDictionary?.GetHashCode() ?? 0;
 
 		private static KeyValuePair<string, dynamic> GetDynamicKeyValuePair(KeyValuePair<string, dynamic> item)
 		{
@@ -307,9 +304,6 @@ private static KeyValuePair<string, dynamic> GetDynamicKeyValuePair(KeyValuePair
 			return dynamicValueKeyValuePair;
 		}
 
-		private static string GetNeutralKey(string key)
-		{
-			return key;
-		}
+		private static string GetNeutralKey(string key) => key;
 	}
 }
diff --git a/src/Elasticsearch.Net/Responses/Dynamic/DynamicResponse.cs b/src/Elasticsearch.Net/Responses/Dynamic/DynamicResponse.cs
index 65883f26b2b..48b7181c773 100644
--- a/src/Elasticsearch.Net/Responses/Dynamic/DynamicResponse.cs
+++ b/src/Elasticsearch.Net/Responses/Dynamic/DynamicResponse.cs
@@ -3,6 +3,7 @@
 	public class DynamicResponse : ElasticsearchResponse<dynamic>
 	{
 		public DynamicResponse() { }
-		public DynamicResponse(DynamicBody body) => this.Body = body;
+
+		public DynamicResponse(DynamicBody body) => Body = body;
 	}
 }
diff --git a/src/Elasticsearch.Net/Responses/Dynamic/ElasticsearchDynamicValue.cs b/src/Elasticsearch.Net/Responses/Dynamic/ElasticsearchDynamicValue.cs
index 62aa2f639a4..68f078e4e3e 100644
--- a/src/Elasticsearch.Net/Responses/Dynamic/ElasticsearchDynamicValue.cs
+++ b/src/Elasticsearch.Net/Responses/Dynamic/ElasticsearchDynamicValue.cs
@@ -5,10 +5,8 @@
 using System.Dynamic;
 using System.Globalization;
 using System.Linq.Expressions;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using Microsoft.CSharp.RuntimeBinder;
-using Binder = Microsoft.CSharp.RuntimeBinder.Binder;
 
 namespace Elasticsearch.Net
 {
@@ -16,6 +14,297 @@ public class ElasticsearchDynamicValue : DynamicObject, IEquatable<Elasticsearch
 	{
 		internal readonly object value;
 
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ElasticsearchDynamicValue" /> class.
+		/// </summary>
+		/// <param name="value">The value to store in the instance</param>
+		public ElasticsearchDynamicValue(object value) => this.value = value;
+
+		/// <summary>
+		/// Gets a value indicating whether this instance has value.
+		/// </summary>
+		/// <value><c>true</c> if this instance has value; otherwise, <c>false</c>.</value>
+		/// <remarks><see langword="null" /> is considered as not being a value.</remarks>
+		public bool HasValue => value != null;
+
+		public ElasticsearchDynamicValue this[string name]
+		{
+			get
+			{
+				object r;
+				Dispatch(out r, name);
+				return (ElasticsearchDynamicValue)r;
+			}
+		}
+
+		public ElasticsearchDynamicValue this[int i]
+		{
+			get
+			{
+				if (!HasValue)
+					return new ElasticsearchDynamicValue(null);
+
+				var l = Value as IList;
+				if (l != null && l.Count - 1 >= i) return new ElasticsearchDynamicValue(l[i]);
+
+				return new ElasticsearchDynamicValue(null);
+			}
+		}
+
+		/// <summary>
+		/// Gets the inner value
+		/// </summary>
+		public object Value => value;
+
+		/// <summary>
+		/// Returns the <see cref="T:System.TypeCode" /> for this instance.
+		/// </summary>
+		/// <returns>
+		/// The enumerated constant that is the <see cref="T:System.TypeCode" /> of the class or value type that implements this interface.
+		/// </returns>
+		/// <filterpriority>2</filterpriority>
+		public TypeCode GetTypeCode()
+		{
+			if (value == null) return TypeCode.Empty;
+
+			return value.GetType().GetTypeCode();
+		}
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent Boolean value using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// A Boolean value equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public bool ToBoolean(IFormatProvider provider) => Convert.ToBoolean(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent 8-bit unsigned integer using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An 8-bit unsigned integer equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public byte ToByte(IFormatProvider provider) => Convert.ToByte(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent Unicode character using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// A Unicode character equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public char ToChar(IFormatProvider provider) => Convert.ToChar(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent <see cref="T:System.DateTime" /> using the specified culture-specific formatting
+		/// information.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="T:System.DateTime" /> instance equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public DateTime ToDateTime(IFormatProvider provider) => Convert.ToDateTime(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent <see cref="T:System.Decimal" /> number using the specified culture-specific formatting
+		/// information.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="T:System.Decimal" /> number equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public decimal ToDecimal(IFormatProvider provider) => Convert.ToDecimal(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent double-precision floating-point number using the specified culture-specific formatting
+		/// information.
+		/// </summary>
+		/// <returns>
+		/// A double-precision floating-point number equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public double ToDouble(IFormatProvider provider) => Convert.ToDouble(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent 16-bit signed integer using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An 16-bit signed integer equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public short ToInt16(IFormatProvider provider) => Convert.ToInt16(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent 32-bit signed integer using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An 32-bit signed integer equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public int ToInt32(IFormatProvider provider) => Convert.ToInt32(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent 64-bit signed integer using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An 64-bit signed integer equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public long ToInt64(IFormatProvider provider) => Convert.ToInt64(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent 8-bit signed integer using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An 8-bit signed integer equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		[CLSCompliant(false)]
+		public sbyte ToSByte(IFormatProvider provider) => Convert.ToSByte(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent single-precision floating-point number using the specified culture-specific formatting
+		/// information.
+		/// </summary>
+		/// <returns>
+		/// A single-precision floating-point number equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public float ToSingle(IFormatProvider provider) => Convert.ToSingle(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent <see cref="T:System.String" /> using the specified culture-specific formatting
+		/// information.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="T:System.String" /> instance equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public string ToString(IFormatProvider provider) => Convert.ToString(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an <see cref="T:System.Object" /> of the specified <see cref="T:System.Type" /> that has an
+		/// equivalent value, using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="T:System.Object" /> instance of type <paramref name="conversionType" /> whose value is equivalent to the value of this
+		/// instance.
+		/// </returns>
+		/// <param name="conversionType">The <see cref="T:System.Type" /> to which the value of this instance is converted. </param>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		public object ToType(Type conversionType, IFormatProvider provider) => Convert.ChangeType(value, conversionType, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent 16-bit unsigned integer using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An 16-bit unsigned integer equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		[CLSCompliant(false)]
+		public ushort ToUInt16(IFormatProvider provider) => Convert.ToUInt16(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent 32-bit unsigned integer using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An 32-bit unsigned integer equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		[CLSCompliant(false)]
+		public uint ToUInt32(IFormatProvider provider) => Convert.ToUInt32(value, provider);
+
+		/// <summary>
+		/// Converts the value of this instance to an equivalent 64-bit unsigned integer using the specified culture-specific formatting information.
+		/// </summary>
+		/// <returns>
+		/// An 64-bit unsigned integer equivalent to the value of this instance.
+		/// </returns>
+		/// <param name="provider">
+		/// An <see cref="T:System.IFormatProvider" /> interface implementation that supplies culture-specific formatting
+		/// information.
+		/// </param>
+		/// <filterpriority>2</filterpriority>
+		[CLSCompliant(false)]
+		public ulong ToUInt64(IFormatProvider provider) => Convert.ToUInt64(value, provider);
+
+
+		/// <summary>
+		/// Indicates whether the current object is equal to another object of the same type.
+		/// </summary>
+		/// <returns>
+		/// <c>true</c> if the current object is equal to the <paramref name="compareValue" /> parameter; otherwise, <c>false</c>.
+		/// </returns>
+		/// <param name="compareValue">An <see cref="ElasticsearchDynamicValue" /> to compare with this instance.</param>
+		public bool Equals(ElasticsearchDynamicValue compareValue)
+		{
+			if (ReferenceEquals(null, compareValue)) return false;
+
+			return ReferenceEquals(this, compareValue) || Equals(compareValue.value, value);
+		}
+
 		public override bool TryGetMember(GetMemberBinder binder, out object result)
 		{
 			var name = binder.Name;
@@ -26,96 +315,45 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
 
 		private bool Dispatch(out object result, string name)
 		{
-			if (!this.HasValue)
+			if (!HasValue)
 			{
 				result = new ElasticsearchDynamicValue(null);
 				return true;
 			}
 
-			var d = this.Value as IDictionary<string, object>;
+			var d = Value as IDictionary<string, object>;
 			object r;
 			if (d != null && d.TryGetValue(name, out r))
 			{
 				result = new ElasticsearchDynamicValue(r);
 				return true;
 			}
-			var x = this.Value as IDynamicMetaObjectProvider;
+			var x = Value as IDynamicMetaObjectProvider;
 			if (x != null)
 			{
-				var dm = GetDynamicMember(this.Value, name);
+				var dm = GetDynamicMember(Value, name);
 				result = new ElasticsearchDynamicValue(dm);
 				return true;
 			}
-			var ds = this.Value as IDictionary;
+			var ds = Value as IDictionary;
 			if (ds != null && ds.Contains(name))
 			{
 				result = new ElasticsearchDynamicValue(ds[name]);
 				return true;
 			}
 
-			result = new ElasticsearchDynamicValue(this.Value);
+			result = new ElasticsearchDynamicValue(Value);
 			return true;
 		}
 
-		static object GetDynamicMember(object obj, string memberName)
+		private static object GetDynamicMember(object obj, string memberName)
 		{
-			var binder = Binder.GetMember(CSharpBinderFlags.None, memberName, null, new[] { CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) });
+			var binder = Binder.GetMember(CSharpBinderFlags.None, memberName, null,
+				new[] { CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) });
 			var callsite = CallSite<Func<CallSite, object, object>>.Create(binder);
 			return callsite.Target(callsite, obj);
 		}
 
-		public ElasticsearchDynamicValue this[string name]
-		{
-			get
-			{
-				object r;
-				Dispatch(out r, name);
-				return (ElasticsearchDynamicValue) r;
-			}
-		}
-
-		public ElasticsearchDynamicValue this[int i]
-		{
-			get
-			{
-				if (!this.HasValue)
-					return new ElasticsearchDynamicValue(null);
-				var l = this.Value as IList;
-				if (l != null && l.Count -1 >= i)
-				{
-					return new ElasticsearchDynamicValue(l[i]);
-				}
-				return new ElasticsearchDynamicValue(null);
-			}
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ElasticsearchDynamicValue"/> class.
-		/// </summary>
-		/// <param name="value">The value to store in the instance</param>
-		public ElasticsearchDynamicValue(object value)
-		{
-			this.value = value;
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether this instance has value.
-		/// </summary>
-		/// <value><c>true</c> if this instance has value; otherwise, <c>false</c>.</value>
-		/// <remarks><see langword="null"/> is considered as not being a value.</remarks>
-		public bool HasValue
-		{
-			get { return (this.value != null); }
-		}
-
-		/// <summary>
-		/// Gets the inner value
-		/// </summary>
-		public object Value
-		{
-			get { return this.value; }
-		}
-
 		/// <summary>
 		/// Returns a default value if Value is null
 		/// </summary>
@@ -124,7 +362,7 @@ public object Value
 		/// <returns>If value is not null, value is returned, else default value is returned</returns>
 		public T Default<T>(T defaultValue = default(T))
 		{
-			if (this.HasValue)
+			if (HasValue)
 			{
 				try
 				{
@@ -134,7 +372,7 @@ public object Value
 				{
 					var typeName = value.GetType().Name;
 					var message = string.Format("Cannot convert value of type '{0}' to type '{1}'",
-												typeName, typeof(T).Name);
+						typeName, typeof(T).Name);
 
 					throw new InvalidCastException(message);
 				}
@@ -149,16 +387,13 @@ public object Value
 		/// <typeparam name="T">When no default value is supplied, required to supply the default type</typeparam>
 		/// <param name="defaultValue">Optional parameter for default value, if not given it returns default of type T</param>
 		/// <returns>If value is not null, value is returned, else default value is returned</returns>
-		public T TryParse<T>(T defaultValue = default (T))
+		public T TryParse<T>(T defaultValue = default(T))
 		{
-			if (this.HasValue)
+			if (HasValue)
 			{
 				try
 				{
-					if (value.GetType().IsAssignableFrom(typeof(T)))
-					{
-						return (T)value;
-					}
+					if (value.GetType().IsAssignableFrom(typeof(T))) return (T)value;
 
 					var TType = typeof(T);
 
@@ -167,10 +402,7 @@ public object Value
 					{
 						DateTime result;
 
-						if (DateTime.TryParse(stringValue, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
-						{
-							return (T)((object)result);
-						}
+						if (DateTime.TryParse(stringValue, CultureInfo.InvariantCulture, DateTimeStyles.None, out result)) return (T)(object)result;
 					}
 					else if (stringValue != null)
 					{
@@ -179,16 +411,10 @@ public object Value
 #if DOTNETCORE
 						return (T)converter.ConvertFromInvariantString(stringValue);
 #else
-						if (converter.IsValid(stringValue))
-						{
-							return (T)converter.ConvertFromInvariantString(stringValue);
-						}
+						if (converter.IsValid(stringValue)) return (T)converter.ConvertFromInvariantString(stringValue);
 #endif
 					}
-					else if (TType == typeof(string))
-					{
-						return (T)Convert.ChangeType(value, TypeCode.String, CultureInfo.InvariantCulture);
-					}
+					else if (TType == typeof(string)) return (T)Convert.ChangeType(value, TypeCode.String, CultureInfo.InvariantCulture);
 				}
 				catch
 				{
@@ -201,111 +427,96 @@ public object Value
 
 		public static bool operator ==(ElasticsearchDynamicValue dynamicValue, object compareValue)
 		{
-			if (dynamicValue.value == null && compareValue == null)
-			{
-				return true;
-			}
+			if (dynamicValue.value == null && compareValue == null) return true;
 
 			return dynamicValue.value != null && dynamicValue.value.Equals(compareValue);
 		}
 
-		public static bool operator !=(ElasticsearchDynamicValue dynamicValue, object compareValue)
-		{
-			return !(dynamicValue == compareValue);
-		}
-
+		public static bool operator !=(ElasticsearchDynamicValue dynamicValue, object compareValue) => !(dynamicValue == compareValue);
 
 		/// <summary>
-		/// Indicates whether the current object is equal to another object of the same type.
+		/// Determines whether the specified <see cref="object" /> is equal to the current <see cref="object" />.
 		/// </summary>
-		/// <returns><c>true</c> if the current object is equal to the <paramref name="compareValue"/> parameter; otherwise, <c>false</c>.
+		/// <returns>
+		/// <c>true</c> if the specified <see cref="object" /> is equal to the current <see cref="ElasticsearchDynamicValue" />; otherwise,
+		/// <c>false</c>.
 		/// </returns>
-		/// <param name="compareValue">An <see cref="ElasticsearchDynamicValue"/> to compare with this instance.</param>
-		public bool Equals(ElasticsearchDynamicValue compareValue)
-		{
-			if (ReferenceEquals(null, compareValue))
-			{
-				return false;
-			}
-
-			return ReferenceEquals(this, compareValue) || Equals(compareValue.value, this.value);
-		}
-
-		/// <summary>
-		/// Determines whether the specified <see cref="object"/> is equal to the current <see cref="object"/>.
-		/// </summary>
-		/// <returns><c>true</c> if the specified <see cref="object"/> is equal to the current <see cref="ElasticsearchDynamicValue"/>; otherwise, <c>false</c>.</returns>
-		/// <param name="compareValue">The <see cref="object"/> to compare with the current <see cref="ElasticsearchDynamicValue"/>.</param>
+		/// <param name="compareValue">The <see cref="object" /> to compare with the current <see cref="ElasticsearchDynamicValue" />.</param>
 		public override bool Equals(object compareValue)
 		{
-			if (ReferenceEquals(null, compareValue))
-			{
-				return false;
-			}
+			if (ReferenceEquals(null, compareValue)) return false;
 
 			if (ReferenceEquals(this, compareValue)
-				|| ReferenceEquals(this.value, compareValue)
-				|| Equals(this.value, compareValue)
-				)
-			{
+				|| ReferenceEquals(value, compareValue)
+				|| Equals(value, compareValue)
+			)
 				return true;
-			}
 
-			return compareValue.GetType() == typeof(ElasticsearchDynamicValue) && this.Equals((ElasticsearchDynamicValue)compareValue);
+			return compareValue.GetType() == typeof(ElasticsearchDynamicValue) && Equals((ElasticsearchDynamicValue)compareValue);
 		}
 
 		/// <summary>
 		/// Serves as a hash function for a particular type.
 		/// </summary>
 		/// <returns>A hash code for the current instance.</returns>
-		public override int GetHashCode()
-		{
-			return (this.value != null ? this.value.GetHashCode() : 0);
-		}
+		public override int GetHashCode() => value != null ? value.GetHashCode() : 0;
 
 		/// <summary>
-		/// Provides implementation for binary operations. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations such as addition and multiplication.
+		/// Provides implementation for binary operations. Classes derived from the <see cref="T:System.Dynamic.DynamicObject" /> class can override
+		/// this method to specify dynamic behavior for operations such as addition and multiplication.
 		/// </summary>
-		/// <returns><c>true</c> if the operation is successful; otherwise, <c>false</c>. If this method returns <c>false</c>, the run-time binder of the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.)</returns>
-		/// <param name="binder">Provides information about the binary operation. The binder.Operation property returns an <see cref="T:System.Linq.Expressions.ExpressionType"/> object. For example, for the sum = first + second statement, where first and second are derived from the DynamicObject class, binder.Operation returns ExpressionType.Add.</param><param name="arg">The right operand for the binary operation. For example, for the sum = first + second statement, where first and second are derived from the DynamicObject class, <paramref name="arg"/> is equal to second.</param><param name="result">The result of the binary operation.</param>
+		/// <returns>
+		/// <c>true</c> if the operation is successful; otherwise, <c>false</c>. If this method returns <c>false</c>, the run-time binder of
+		/// the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.)
+		/// </returns>
+		/// <param name="binder">
+		/// Provides information about the binary operation. The binder.Operation property returns an
+		/// <see cref="T:System.Linq.Expressions.ExpressionType" /> object. For example, for the sum = first + second statement, where first and second
+		/// are derived from the DynamicObject class, binder.Operation returns ExpressionType.Add.
+		/// </param>
+		/// <param name="arg">
+		/// The right operand for the binary operation. For example, for the sum = first + second statement, where first and second
+		/// are derived from the DynamicObject class, <paramref name="arg" /> is equal to second.
+		/// </param>
+		/// <param name="result">The result of the binary operation.</param>
 		public override bool TryBinaryOperation(BinaryOperationBinder binder, object arg, out object result)
 		{
 			object resultOfCast;
 			result = null;
 
-			if (binder.Operation != ExpressionType.Equal)
-			{
-				return false;
-			}
+			if (binder.Operation != ExpressionType.Equal) return false;
 
 			var convert =
 				Binder.Convert(CSharpBinderFlags.None, arg.GetType(), typeof(ElasticsearchDynamicValue));
 
-			if (!TryConvert((ConvertBinder)convert, out resultOfCast))
-			{
-				return false;
-			}
+			if (!TryConvert((ConvertBinder)convert, out resultOfCast)) return false;
 
-			result = (resultOfCast == null) ?
-				Equals(arg, resultOfCast) :
-				resultOfCast.Equals(arg);
+			result = resultOfCast == null ? Equals(arg, resultOfCast) : resultOfCast.Equals(arg);
 
 			return true;
 		}
 
 		/// <summary>
-		/// Provides implementation for type conversion operations. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations that convert an object from one type to another.
+		/// Provides implementation for type conversion operations. Classes derived from the <see cref="T:System.Dynamic.DynamicObject" /> class can
+		/// override this method to specify dynamic behavior for operations that convert an object from one type to another.
 		/// </summary>
-		/// <returns><c>true</c> if the operation is successful; otherwise, <c>false</c>. If this method returns <c>false</c>, the run-time binder of the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.)</returns>
-		/// <param name="binder">Provides information about the conversion operation. The binder.Type property provides the type to which the object must be converted. For example, for the statement (String)sampleObject in C# (CType(sampleObject, Type) in Visual Basic), where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Type returns the <see cref="T:System.String"/> type. The binder.Explicit property provides information about the kind of conversion that occurs. It returns true for explicit conversion and false for implicit conversion.</param><param name="result">The result of the type conversion operation.</param>
+		/// <returns>
+		/// <c>true</c> if the operation is successful; otherwise, <c>false</c>. If this method returns <c>false</c>, the run-time binder of
+		/// the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.)
+		/// </returns>
+		/// <param name="binder">
+		/// Provides information about the conversion operation. The binder.Type property provides the type to which the object
+		/// must be converted. For example, for the statement (String)sampleObject in C# (CType(sampleObject, Type) in Visual Basic), where
+		/// sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject" /> class, binder.Type returns the
+		/// <see cref="T:System.String" /> type. The binder.Explicit property provides information about the kind of conversion that occurs. It returns
+		/// true for explicit conversion and false for implicit conversion.
+		/// </param>
+		/// <param name="result">The result of the type conversion operation.</param>
 		public override bool TryConvert(ConvertBinder binder, out object result)
 		{
 			result = null;
 
-			if (value == null)
-			{
-				return true;
-			}
+			if (value == null) return true;
 
 			var binderType = binder.Type;
 			if (binderType == typeof(String))
@@ -335,9 +546,7 @@ public override bool TryConvert(ConvertBinder binder, out object result)
 			else
 			{
 				if (binderType.IsGeneric() && binderType.GetGenericTypeDefinition() == typeof(Nullable<>))
-				{
 					binderType = binderType.GetGenericArguments()[0];
-				}
 
 				var typeCode = binderType.GetTypeCode();
 
@@ -349,9 +558,7 @@ public override bool TryConvert(ConvertBinder binder, out object result)
 						return true;
 					}
 					else
-					{
 						return false;
-					}
 				}
 #if DOTNETCORE
 				result = Convert.ChangeType(value, binderType);
@@ -364,331 +571,78 @@ public override bool TryConvert(ConvertBinder binder, out object result)
 			return base.TryConvert(binder, out result);
 		}
 
-		public override string ToString()
-		{
-			return this.value == null ? base.ToString() : Convert.ToString(this.value);
-		}
+		public override string ToString() => value == null ? base.ToString() : Convert.ToString(value);
 
 		public static implicit operator bool(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (!dynamicValue.HasValue)
-			{
-				return false;
-			}
+			if (!dynamicValue.HasValue) return false;
 
-			if (dynamicValue.value.GetType().IsValue())
-			{
-				return (Convert.ToBoolean(dynamicValue.value));
-			}
+			if (dynamicValue.value.GetType().IsValue()) return Convert.ToBoolean(dynamicValue.value);
 
 			bool result;
-			if (bool.TryParse(dynamicValue.ToString(), out result))
-			{
-				return result;
-			}
+			if (bool.TryParse(dynamicValue.ToString(), out result)) return result;
 
 			return true;
 		}
 
-		public static implicit operator string(ElasticsearchDynamicValue dynamicValue)
-		{
-			return dynamicValue.HasValue
-					   ? Convert.ToString(dynamicValue.value)
-					   : null;
-		}
+		public static implicit operator string(ElasticsearchDynamicValue dynamicValue) => dynamicValue.HasValue
+			? Convert.ToString(dynamicValue.value)
+			: null;
 
 		public static implicit operator int(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (dynamicValue.value.GetType().IsValue())
-			{
-				return Convert.ToInt32(dynamicValue.value);
-			}
+			if (dynamicValue.value.GetType().IsValue()) return Convert.ToInt32(dynamicValue.value);
 
 			return int.Parse(dynamicValue.ToString());
 		}
 
 		public static implicit operator Guid(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (dynamicValue.value is Guid)
-			{
-				return (Guid)dynamicValue.value;
-			}
+			if (dynamicValue.value is Guid) return (Guid)dynamicValue.value;
 
 			return Guid.Parse(dynamicValue.ToString());
 		}
 
 		public static implicit operator DateTime(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (dynamicValue.value is DateTime)
-			{
-				return (DateTime)dynamicValue.value;
-			}
+			if (dynamicValue.value is DateTime) return (DateTime)dynamicValue.value;
 
 			return DateTime.Parse(dynamicValue.ToString());
 		}
 
 		public static implicit operator TimeSpan(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (dynamicValue.value is TimeSpan)
-			{
-				return (TimeSpan)dynamicValue.value;
-			}
+			if (dynamicValue.value is TimeSpan) return (TimeSpan)dynamicValue.value;
 
 			return TimeSpan.Parse(dynamicValue.ToString());
 		}
 
 		public static implicit operator long(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (dynamicValue.value.GetType().IsValue())
-			{
-				return Convert.ToInt64(dynamicValue.value);
-			}
+			if (dynamicValue.value.GetType().IsValue()) return Convert.ToInt64(dynamicValue.value);
 
 			return long.Parse(dynamicValue.ToString());
 		}
 
 		public static implicit operator float(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (dynamicValue.value.GetType().IsValue())
-			{
-				return Convert.ToSingle(dynamicValue.value);
-			}
+			if (dynamicValue.value.GetType().IsValue()) return Convert.ToSingle(dynamicValue.value);
 
 			return float.Parse(dynamicValue.ToString());
 		}
 
 		public static implicit operator decimal(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (dynamicValue.value.GetType().IsValue())
-			{
-				return Convert.ToDecimal(dynamicValue.value);
-			}
+			if (dynamicValue.value.GetType().IsValue()) return Convert.ToDecimal(dynamicValue.value);
 
 			return decimal.Parse(dynamicValue.ToString());
 		}
 
 		public static implicit operator double(ElasticsearchDynamicValue dynamicValue)
 		{
-			if (dynamicValue.value.GetType().IsValue())
-			{
-				return Convert.ToDouble(dynamicValue.value);
-			}
+			if (dynamicValue.value.GetType().IsValue()) return Convert.ToDouble(dynamicValue.value);
 
 			return double.Parse(dynamicValue.ToString());
 		}
-
-#region Implementation of IConvertible
-
-		/// <summary>
-		/// Returns the <see cref="T:System.TypeCode"/> for this instance.
-		/// </summary>
-		/// <returns>
-		/// The enumerated constant that is the <see cref="T:System.TypeCode"/> of the class or value type that implements this interface.
-		/// </returns>
-		/// <filterpriority>2</filterpriority>
-		public TypeCode GetTypeCode()
-		{
-			if (value == null) return TypeCode.Empty;
-			return value.GetType().GetTypeCode();
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent Boolean value using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// A Boolean value equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public bool ToBoolean(IFormatProvider provider)
-		{
-			return Convert.ToBoolean(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent Unicode character using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// A Unicode character equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public char ToChar(IFormatProvider provider)
-		{
-			return Convert.ToChar(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent 8-bit signed integer using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An 8-bit signed integer equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		[CLSCompliant(false)]
-		public sbyte ToSByte(IFormatProvider provider)
-		{
-			return Convert.ToSByte(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent 8-bit unsigned integer using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An 8-bit unsigned integer equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public byte ToByte(IFormatProvider provider)
-		{
-			return Convert.ToByte(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent 16-bit signed integer using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An 16-bit signed integer equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public short ToInt16(IFormatProvider provider)
-		{
-			return Convert.ToInt16(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent 16-bit unsigned integer using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An 16-bit unsigned integer equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		[CLSCompliant(false)]
-		public ushort ToUInt16(IFormatProvider provider)
-		{
-			return Convert.ToUInt16(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent 32-bit signed integer using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An 32-bit signed integer equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public int ToInt32(IFormatProvider provider)
-		{
-			return Convert.ToInt32(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent 32-bit unsigned integer using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An 32-bit unsigned integer equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		[CLSCompliant(false)]
-		public uint ToUInt32(IFormatProvider provider)
-		{
-			return Convert.ToUInt32(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent 64-bit signed integer using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An 64-bit signed integer equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public long ToInt64(IFormatProvider provider)
-		{
-			return Convert.ToInt64(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent 64-bit unsigned integer using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An 64-bit unsigned integer equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		[CLSCompliant(false)]
-		public ulong ToUInt64(IFormatProvider provider)
-		{
-			return Convert.ToUInt64(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent single-precision floating-point number using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// A single-precision floating-point number equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public float ToSingle(IFormatProvider provider)
-		{
-			return Convert.ToSingle(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent double-precision floating-point number using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// A double-precision floating-point number equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public double ToDouble(IFormatProvider provider)
-		{
-			return Convert.ToDouble(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent <see cref="T:System.Decimal"/> number using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// A <see cref="T:System.Decimal"/> number equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public decimal ToDecimal(IFormatProvider provider)
-		{
-			return Convert.ToDecimal(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent <see cref="T:System.DateTime"/> using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// A <see cref="T:System.DateTime"/> instance equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public DateTime ToDateTime(IFormatProvider provider)
-		{
-			return Convert.ToDateTime(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an equivalent <see cref="T:System.String"/> using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// A <see cref="T:System.String"/> instance equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public string ToString(IFormatProvider provider)
-		{
-			return Convert.ToString(value, provider);
-		}
-
-		/// <summary>
-		/// Converts the value of this instance to an <see cref="T:System.Object"/> of the specified <see cref="T:System.Type"/> that has an equivalent value, using the specified culture-specific formatting information.
-		/// </summary>
-		/// <returns>
-		/// An <see cref="T:System.Object"/> instance of type <paramref name="conversionType"/> whose value is equivalent to the value of this instance.
-		/// </returns>
-		/// <param name="conversionType">The <see cref="T:System.Type"/> to which the value of this instance is converted. </param><param name="provider">An <see cref="T:System.IFormatProvider"/> interface implementation that supplies culture-specific formatting information. </param><filterpriority>2</filterpriority>
-		public object ToType(Type conversionType, IFormatProvider provider)
-		{
-			return Convert.ChangeType(value, conversionType, provider);
-		}
-
-#endregion
-
 	}
 }
diff --git a/src/Elasticsearch.Net/Responses/ElasticsearchResponse.cs b/src/Elasticsearch.Net/Responses/ElasticsearchResponse.cs
index 9d6f36548c7..c4f5f2784dc 100644
--- a/src/Elasticsearch.Net/Responses/ElasticsearchResponse.cs
+++ b/src/Elasticsearch.Net/Responses/ElasticsearchResponse.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Elasticsearch.Net
 {
@@ -11,44 +9,43 @@ namespace Elasticsearch.Net
 	public abstract class ElasticsearchResponseBase : IApiCallDetails, IElasticsearchResponse
 	{
 		public IApiCallDetails ApiCall { get; set; }
+		public List<Audit> AuditTrail => ApiCall.AuditTrail;
 
-		bool IElasticsearchResponse.TryGetServerErrorReason(out string reason) => this.TryGetServerErrorReason(out reason);
-
-		protected virtual bool TryGetServerErrorReason(out string reason)
-		{
-			reason = null;
-			return false;
-		}
-
-		//ignored
-		List<Audit> IApiCallDetails.AuditTrail { get; set; }
-
-		public bool Success => this.ApiCall.Success;
-		public string ResponseMimeType => this.ApiCall.ResponseMimeType;
-		public HttpMethod HttpMethod => this.ApiCall.HttpMethod;
-		public Uri Uri => this.ApiCall.Uri;
-		public int? HttpStatusCode => this.ApiCall.HttpStatusCode;
-		public List<Audit> AuditTrail => this.ApiCall.AuditTrail;
-		public IEnumerable<string> DeprecationWarnings => this.ApiCall.DeprecationWarnings;
-		public bool SuccessOrKnownError => this.ApiCall.SuccessOrKnownError;
-		public Exception OriginalException => this.ApiCall.OriginalException;
+		public string DebugInformation => ApiCall.DebugInformation;
+		public IEnumerable<string> DeprecationWarnings => ApiCall.DeprecationWarnings;
+		public HttpMethod HttpMethod => ApiCall.HttpMethod;
+		public int? HttpStatusCode => ApiCall.HttpStatusCode;
+		public Exception OriginalException => ApiCall.OriginalException;
 
 		/// <summary>The raw byte request message body, only set when DisableDirectStreaming() is set on Connection configuration</summary>
-		public byte[] RequestBodyInBytes => this.ApiCall.RequestBodyInBytes;
+		public byte[] RequestBodyInBytes => ApiCall.RequestBodyInBytes;
 
 		/// <summary>The raw byte response message body, only set when DisableDirectStreaming() is set on Connection configuration</summary>
-		public byte[] ResponseBodyInBytes => this.ApiCall.ResponseBodyInBytes;
+		public byte[] ResponseBodyInBytes => ApiCall.ResponseBodyInBytes;
 
-		public string DebugInformation => this.ApiCall.DebugInformation;
+		public string ResponseMimeType => ApiCall.ResponseMimeType;
 
-		public override string ToString() => this.ApiCall.ToString();
+		public bool Success => ApiCall.Success;
+		public bool SuccessOrKnownError => ApiCall.SuccessOrKnownError;
+		public Uri Uri => ApiCall.Uri;
 
+		//ignored
+		List<Audit> IApiCallDetails.AuditTrail { get; set; }
+
+		bool IElasticsearchResponse.TryGetServerErrorReason(out string reason) => TryGetServerErrorReason(out reason);
+
+		protected virtual bool TryGetServerErrorReason(out string reason)
+		{
+			reason = null;
+			return false;
+		}
 
+		public override string ToString() => ApiCall.ToString();
 	}
 
 	/// <summary>
 	/// A response from Elasticsearch including details about the request/response life cycle. Base class for the built in low level response
-	/// types: <see cref="StringResponse"/> <see cref="BytesResponse"/> and <see cref="DynamicResponse"/>
+	/// types: <see cref="StringResponse" /> <see cref="BytesResponse" /> and <see cref="DynamicResponse" />
 	/// </summary>
 	public abstract class ElasticsearchResponse<T> : ElasticsearchResponseBase
 	{
diff --git a/src/Elasticsearch.Net/Responses/HttpDetails/ApiCallDetails.cs b/src/Elasticsearch.Net/Responses/HttpDetails/ApiCallDetails.cs
index e371c8867dc..ac9bc288132 100644
--- a/src/Elasticsearch.Net/Responses/HttpDetails/ApiCallDetails.cs
+++ b/src/Elasticsearch.Net/Responses/HttpDetails/ApiCallDetails.cs
@@ -6,35 +6,36 @@ namespace Elasticsearch.Net
 {
 	public class ApiCallDetails : IApiCallDetails
 	{
-		public bool Success { get; set; }
-		public string ResponseMimeType { get; set; }
-		public Exception OriginalException { get; set; }
-		public ServerError ServerError { get; set; }
-		public HttpMethod HttpMethod { get; set; }
-		public Uri Uri { get; set; }
-		public int? HttpStatusCode { get; set; }
-		public bool SuccessOrKnownError =>
-			this.Success || (
-				HttpStatusCode >= 400 && HttpStatusCode < 599
-				&& HttpStatusCode != 504 //Gateway timeout needs to be retried
-				&& HttpStatusCode != 503 //service unavailable needs to be retried
-				&& HttpStatusCode != 502 //bad gateway needs to be retried
-			);
-		public byte[] ResponseBodyInBytes { get; set; }
-		public byte[] RequestBodyInBytes { get; set; }
 		public List<Audit> AuditTrail { get; set; }
-		public IEnumerable<string> DeprecationWarnings { get; set; }
 
 		public string DebugInformation
 		{
 			get
 			{
 				var sb = new StringBuilder();
-				sb.AppendLine(this.ToString());
+				sb.AppendLine(ToString());
 				return ResponseStatics.DebugInformationBuilder(this, sb);
 			}
 		}
 
+		public IEnumerable<string> DeprecationWarnings { get; set; }
+		public HttpMethod HttpMethod { get; set; }
+		public int? HttpStatusCode { get; set; }
+		public Exception OriginalException { get; set; }
+		public byte[] RequestBodyInBytes { get; set; }
+		public byte[] ResponseBodyInBytes { get; set; }
+		public string ResponseMimeType { get; set; }
+		public ServerError ServerError { get; set; }
+		public bool Success { get; set; }
+
+		public bool SuccessOrKnownError =>
+			Success || HttpStatusCode >= 400 && HttpStatusCode < 599
+			&& HttpStatusCode != 504 //Gateway timeout needs to be retried
+			&& HttpStatusCode != 503 //service unavailable needs to be retried
+			&& HttpStatusCode != 502;
+
+		public Uri Uri { get; set; }
+
 		public override string ToString() =>
 			$"{(Success ? "S" : "Uns")}uccessful low level call on {HttpMethod.GetStringValue()}: {Uri.PathAndQuery}";
 	}
diff --git a/src/Elasticsearch.Net/Responses/HttpDetails/IApiCallDetails.cs b/src/Elasticsearch.Net/Responses/HttpDetails/IApiCallDetails.cs
index d055e4490ef..6766b1df821 100644
--- a/src/Elasticsearch.Net/Responses/HttpDetails/IApiCallDetails.cs
+++ b/src/Elasticsearch.Net/Responses/HttpDetails/IApiCallDetails.cs
@@ -6,19 +6,23 @@ namespace Elasticsearch.Net
 {
 	public interface IApiCallDetails
 	{
+		//TODO Get rid of setter
 		/// <summary>
-		/// The response status code is in the 200 range or is in the allowed list of status codes set on the request.
+		/// An audit trail of requests made to nodes within the cluster
 		/// </summary>
-		bool Success { get; }
+		List<Audit> AuditTrail { get; set; }
 
-		/// <summary>The response mime type </summary>
-		string ResponseMimeType { get; }
+		/// <summary>
+		/// A lazy human readable string representation of what happened during this request for both successful and
+		/// failed requests.
+		/// </summary>
+		string DebugInformation { get; }
 
 		/// <summary>
-		/// If <see cref="Success"/> is <c>false</c>, this will hold the original exception.
-		/// This will be the orginating CLR exception in most cases.
+		/// A collection of deprecation warnings returned from Elasticsearch.
+		/// <para>Used to signal that the request uses an API feature that is marked as deprecated</para>
 		/// </summary>
-		Exception OriginalException { get; }
+		IEnumerable<string> DeprecationWarnings { get; }
 
 		/// <summary>
 		/// The HTTP method used by the request
@@ -26,51 +30,47 @@ public interface IApiCallDetails
 		HttpMethod HttpMethod { get; }
 
 		/// <summary>
-		/// The url as requested
+		/// The HTTP status code as returned by Elasticsearch
 		/// </summary>
-		Uri Uri { get; }
+		int? HttpStatusCode { get; }
 
 		/// <summary>
-		/// The HTTP status code as returned by Elasticsearch
+		/// If <see cref="Success" /> is <c>false</c>, this will hold the original exception.
+		/// This will be the orginating CLR exception in most cases.
 		/// </summary>
-		int? HttpStatusCode { get; }
+		Exception OriginalException { get; }
 
 		/// <summary>
-		/// The response is successful or has a response code between 400-599, the call should not be retried.
-		/// Only on 502,503 and 504 will this return false;
+		/// The request body bytes.
+		/// <para>NOTE: Only set when disable direct streaming is set for the request</para>
 		/// </summary>
-		bool SuccessOrKnownError { get; }
+		[DebuggerDisplay("{RequestBodyInBytes != null ? System.Text.Encoding.UTF8.GetString(RequestBodyInBytes) : null,nq}")]
+		byte[] RequestBodyInBytes { get; }
 
-        /// <summary>
-        /// The response body bytes.
-        /// <para>NOTE: Only set when disable direct streaming is set for the request</para>
-        /// </summary>
-        [DebuggerDisplay("{ResponseBodyInBytes != null ? System.Text.Encoding.UTF8.GetString(ResponseBodyInBytes) : null,nq}")]
+		/// <summary>
+		/// The response body bytes.
+		/// <para>NOTE: Only set when disable direct streaming is set for the request</para>
+		/// </summary>
+		[DebuggerDisplay("{ResponseBodyInBytes != null ? System.Text.Encoding.UTF8.GetString(ResponseBodyInBytes) : null,nq}")]
 		byte[] ResponseBodyInBytes { get; }
 
-        /// <summary>
-        /// The request body bytes.
-        /// <para>NOTE: Only set when disable direct streaming is set for the request</para>
-        /// </summary>
-        [DebuggerDisplay("{RequestBodyInBytes != null ? System.Text.Encoding.UTF8.GetString(RequestBodyInBytes) : null,nq}")]
-		byte[] RequestBodyInBytes { get; }
+		/// <summary>The response mime type </summary>
+		string ResponseMimeType { get; }
 
-		//TODO Get rid of setter
-        /// <summary>
-        /// An audit trail of requests made to nodes within the cluster
-        /// </summary>
-        List<Audit> AuditTrail { get; set; }
+		/// <summary>
+		/// The response status code is in the 200 range or is in the allowed list of status codes set on the request.
+		/// </summary>
+		bool Success { get; }
 
-        /// <summary>
-        /// A lazy human readable string representation of what happened during this request for both successful and
-        /// failed requests.
-        /// </summary>
-        string DebugInformation { get; }
+		/// <summary>
+		/// The response is successful or has a response code between 400-599, the call should not be retried.
+		/// Only on 502,503 and 504 will this return false;
+		/// </summary>
+		bool SuccessOrKnownError { get; }
 
-        /// <summary>
-        ///A collection of deprecation warnings returned from Elasticsearch.
-        ///<para>Used to signal that the request uses an API feature that is marked as deprecated</para>
-        /// </summary>
-        IEnumerable<string> DeprecationWarnings { get; }
+		/// <summary>
+		/// The url as requested
+		/// </summary>
+		Uri Uri { get; }
 	}
 }
diff --git a/src/Elasticsearch.Net/Responses/IElasticsearchResponse.cs b/src/Elasticsearch.Net/Responses/IElasticsearchResponse.cs
index dc1f0e9eb0c..2991010d36c 100644
--- a/src/Elasticsearch.Net/Responses/IElasticsearchResponse.cs
+++ b/src/Elasticsearch.Net/Responses/IElasticsearchResponse.cs
@@ -7,7 +7,7 @@ namespace Elasticsearch.Net
 	public interface IElasticsearchResponse
 	{
 		/// <summary>
-		/// Sets and returns the <see cref="IApiCallDetails"/> diagnostic information
+		/// Sets and returns the <see cref="IApiCallDetails" /> diagnostic information
 		/// </summary>
 		IApiCallDetails ApiCall { get; set; }
 
diff --git a/src/Elasticsearch.Net/Responses/ResponseStatics.cs b/src/Elasticsearch.Net/Responses/ResponseStatics.cs
index 4d1b72654b7..e8914f18f93 100644
--- a/src/Elasticsearch.Net/Responses/ResponseStatics.cs
+++ b/src/Elasticsearch.Net/Responses/ResponseStatics.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
@@ -8,14 +6,18 @@ namespace Elasticsearch.Net
 {
 	public static class ResponseStatics
 	{
-		private static readonly string ResponseAlreadyCaptured = "<Response stream not captured or already read to completion by serializer. Set DisableDirectStreaming() on ConnectionSettings to force it to be set on the response.>";
-		private static readonly string RequestAlreadyCaptured = "<Request stream not captured or already read to completion by serializer. Set DisableDirectStreaming() on ConnectionSettings to force it to be set on the response.>";
+		private static readonly string RequestAlreadyCaptured =
+			"<Request stream not captured or already read to completion by serializer. Set DisableDirectStreaming() on ConnectionSettings to force it to be set on the response.>";
+
+		private static readonly string ResponseAlreadyCaptured =
+			"<Response stream not captured or already read to completion by serializer. Set DisableDirectStreaming() on ConnectionSettings to force it to be set on the response.>";
+
 		public static string DebugInformationBuilder(IApiCallDetails r, StringBuilder sb)
 		{
 			if (r.DeprecationWarnings.HasAny())
 			{
 				sb.AppendLine($"# Server indicated deprecations:");
-				foreach(var deprecation in r.DeprecationWarnings)
+				foreach (var deprecation in r.DeprecationWarnings)
 					sb.AppendLine($"- {deprecation}");
 			}
 			sb.AppendLine($"# Audit trail of this API call:");
@@ -24,8 +26,8 @@ public static string DebugInformationBuilder(IApiCallDetails r, StringBuilder sb
 			if (r.OriginalException != null) sb.AppendLine($"# OriginalException: {r.OriginalException}");
 			DebugAuditTrailExceptions(auditTrail, sb);
 
-			var response = r.ResponseBodyInBytes?.Utf8String() ?? ResponseStatics.ResponseAlreadyCaptured;
-			var request = r.RequestBodyInBytes?.Utf8String() ?? ResponseStatics.RequestAlreadyCaptured;
+			var response = r.ResponseBodyInBytes?.Utf8String() ?? ResponseAlreadyCaptured;
+			var request = r.RequestBodyInBytes?.Utf8String() ?? RequestAlreadyCaptured;
 			sb.AppendLine($"# Request:\r\n{request}");
 			sb.AppendLine($"# Response:\r\n{response}");
 
@@ -34,7 +36,7 @@ public static string DebugInformationBuilder(IApiCallDetails r, StringBuilder sb
 
 		public static void DebugAuditTrailExceptions(List<Audit> auditTrail, StringBuilder sb)
 		{
-			var auditExceptions = auditTrail.Select((audit, i) => new {audit, i}).Where(a => a.audit.Exception != null);
+			var auditExceptions = auditTrail.Select((audit, i) => new { audit, i }).Where(a => a.audit.Exception != null);
 			foreach (var a in auditExceptions)
 				sb.AppendLine($"# Audit exception in step {a.i + 1} {a.audit.Event.GetStringValue()}:\r\n{a.audit.Exception}");
 		}
@@ -42,7 +44,8 @@ public static void DebugAuditTrailExceptions(List<Audit> auditTrail, StringBuild
 		public static void DebugAuditTrail(List<Audit> auditTrail, StringBuilder sb)
 		{
 			if (auditTrail == null) return;
-			foreach (var a in auditTrail.Select((a, i)=> new { a, i }))
+
+			foreach (var a in auditTrail.Select((a, i) => new { a, i }))
 			{
 				var audit = a.a;
 				sb.Append($" - [{a.i + 1}] {audit.Event.GetStringValue()}:");
diff --git a/src/Elasticsearch.Net/Responses/ServerException/Error.cs b/src/Elasticsearch.Net/Responses/ServerException/Error.cs
index 6ed44dd7c92..218b21f5f35 100644
--- a/src/Elasticsearch.Net/Responses/ServerException/Error.cs
+++ b/src/Elasticsearch.Net/Responses/ServerException/Error.cs
@@ -9,21 +9,21 @@ public class Error : ErrorCause
 		private static readonly IReadOnlyDictionary<string, string> DefaultHeaders =
 			new ReadOnlyDictionary<string, string>(new Dictionary<string, string>(0));
 
-		public IReadOnlyCollection<ErrorCause> RootCause { get; set; }
-
 		public IReadOnlyDictionary<string, string> Headers { get; set; } = DefaultHeaders;
 
+		public IReadOnlyCollection<ErrorCause> RootCause { get; set; }
+
 		internal static Error CreateError(IDictionary<string, object> dict, IJsonSerializerStrategy strategy)
 		{
 			var error = new Error();
 			error.FillValues(dict);
 
 			if (dict.TryGetValue("caused_by", out var causedBy))
-				error.CausedBy = (ErrorCause) strategy.DeserializeObject(causedBy, typeof(ErrorCause));
+				error.CausedBy = (ErrorCause)strategy.DeserializeObject(causedBy, typeof(ErrorCause));
 
 			if (dict.TryGetValue("headers", out var headers))
 			{
-				var d = (IDictionary<string, string>) strategy.DeserializeObject(headers, typeof(IDictionary<string, string>));
+				var d = (IDictionary<string, string>)strategy.DeserializeObject(headers, typeof(IDictionary<string, string>));
 				if (d != null) error.Headers = new ReadOnlyDictionary<string, string>(d);
 			}
 
@@ -37,7 +37,8 @@ private static Error ReadRootCause(IDictionary<string, object> dict, IJsonSerial
 			if (!dict.TryGetValue("root_cause", out var rootCause)) return error;
 
 			if (!(rootCause is object[] os)) return error;
-			error.RootCause = os.Select(o => (ErrorCause) strategy.DeserializeObject(o, typeof(ErrorCause))).ToList().AsReadOnly();
+
+			error.RootCause = os.Select(o => (ErrorCause)strategy.DeserializeObject(o, typeof(ErrorCause))).ToList().AsReadOnly();
 			return error;
 		}
 	}
diff --git a/src/Elasticsearch.Net/Responses/ServerException/ErrorCause.cs b/src/Elasticsearch.Net/Responses/ServerException/ErrorCause.cs
index d262a0dacae..9afc9b4c386 100644
--- a/src/Elasticsearch.Net/Responses/ServerException/ErrorCause.cs
+++ b/src/Elasticsearch.Net/Responses/ServerException/ErrorCause.cs
@@ -6,11 +6,11 @@ namespace Elasticsearch.Net
 {
 	public class ErrorCause
 	{
-		public string Reason { get; set; }
-		public string Type { get; set; }
 		public ErrorCause CausedBy { get; set; }
-		public string StackTrace { get; set; }
 		public ErrorCauseMetadata Metadata { get; set; }
+		public string Reason { get; set; }
+		public string StackTrace { get; set; }
+		public string Type { get; set; }
 
 		internal static ErrorCause CreateErrorCause(IDictionary<string, object> dict, IJsonSerializerStrategy strategy)
 		{
@@ -24,9 +24,9 @@ internal static ErrorCause CreateErrorCause(IDictionary<string, object> dict, IJ
 			return causedBy;
 		}
 
-		public override string ToString() => this.CausedBy == null
-			? $"Type: {this.Type} Reason: \"{this.Reason}\""
-			: $"Type: {this.Type} Reason: \"{this.Reason}\" CausedBy: \"{this.CausedBy}\"";
+		public override string ToString() => CausedBy == null
+			? $"Type: {Type} Reason: \"{Reason}\""
+			: $"Type: {Type} Reason: \"{Reason}\" CausedBy: \"{CausedBy}\"";
 
 		public class ErrorCauseMetadata
 		{
@@ -36,31 +36,32 @@ public class ErrorCauseMetadata
 			private static readonly IReadOnlyCollection<ShardFailure> DefaultFailedShards =
 				new ReadOnlyCollection<ShardFailure>(new ShardFailure[0] { });
 
-			public string LicensedExpiredFeature { get; set; }
+			public long? BytesLimit { get; set; }
+
+			public long? BytesWanted { get; set; }
+			public int? Column { get; set; }
+
+			public IReadOnlyCollection<ShardFailure> FailedShards { get; set; } = DefaultFailedShards;
+			public bool? Grouped { get; set; }
 			public string Index { get; set; }
 			public string IndexUUID { get; set; }
-			public string ResourceType { get; set; }
-			public IReadOnlyCollection<string> ResourceId { get; set; } = DefaultCollection;
-			public int? Shard { get; set; }
+			public string Language { get; set; }
 
-			public IReadOnlyCollection<ShardFailure> FailedShards { get; set; } = DefaultFailedShards;
+			public string LicensedExpiredFeature { get; set; }
 
 			public int? Line { get; set; }
-			public int? Column { get; set; }
-
-			public long? BytesWanted { get; set; }
-			public long? BytesLimit { get; set; }
 
 			public string Phase { get; set; }
-			public bool? Grouped { get; set; }
+			public IReadOnlyCollection<string> ResourceId { get; set; } = DefaultCollection;
+			public string ResourceType { get; set; }
+			public string Script { get; set; }
 
 			public IReadOnlyCollection<string> ScriptStack { get; set; } = DefaultCollection;
-			public string Script { get; set; }
-			public string Language { get; set; }
+			public int? Shard { get; set; }
 
-            internal static ErrorCauseMetadata CreateCauseMetadata(IDictionary<string, object> dict, IJsonSerializerStrategy strategy)
-            {
-                var m = new ErrorCauseMetadata();
+			internal static ErrorCauseMetadata CreateCauseMetadata(IDictionary<string, object> dict, IJsonSerializerStrategy strategy)
+			{
+				var m = new ErrorCauseMetadata();
 				if (dict.TryGetValue("license.expired.feature", out var feature)) m.LicensedExpiredFeature = Convert.ToString(feature);
 				if (dict.TryGetValue("index", out var index)) m.Index = Convert.ToString(index);
 				if (dict.TryGetValue("index_uuid", out var indexUUID)) m.IndexUUID = Convert.ToString(indexUUID);
@@ -80,10 +81,10 @@ internal static ErrorCauseMetadata CreateCauseMetadata(IDictionary<string, objec
 				if (dict.TryGetValue("lang", out var language)) m.Language = Convert.ToString(language);
 				if (dict.TryGetValue("failed_shards", out var failedShards))
 					m.FailedShards = GetShardFailures(failedShards, strategy);
-                return m;
-            }
+				return m;
+			}
 
-			private static IReadOnlyCollection<ShardFailure> GetShardFailures(object value,IJsonSerializerStrategy strategy)
+			private static IReadOnlyCollection<ShardFailure> GetShardFailures(object value, IJsonSerializerStrategy strategy)
 			{
 				if (!(value is object[] objects))
 					return DefaultFailedShards;
@@ -91,15 +92,16 @@ private static IReadOnlyCollection<ShardFailure> GetShardFailures(object value,I
 				var values = new List<ShardFailure>();
 				foreach (var v in objects)
 				{
-					var cause = (ShardFailure) strategy.DeserializeObject(v, typeof(ShardFailure));
+					var cause = (ShardFailure)strategy.DeserializeObject(v, typeof(ShardFailure));
 					if (cause != null) values.Add(cause);
 				}
 				return new ReadOnlyCollection<ShardFailure>(values.ToArray());
 			}
 
-			private static IReadOnlyCollection<string> GetStringArray(object value,IJsonSerializerStrategy strategy)
+			private static IReadOnlyCollection<string> GetStringArray(object value, IJsonSerializerStrategy strategy)
 			{
-				if (value is string s) return new ReadOnlyCollection<string>(new [] {s});
+				if (value is string s) return new ReadOnlyCollection<string>(new[] { s });
+
 				if (value is object[] objects)
 				{
 					var values = new List<string>();
@@ -110,7 +112,6 @@ private static IReadOnlyCollection<string> GetStringArray(object value,IJsonSeri
 					return new ReadOnlyCollection<string>(values.ToArray());
 				}
 				return DefaultCollection;
-
 			}
 		}
 	}
diff --git a/src/Elasticsearch.Net/Responses/ServerException/ErrorCauseExtensions.cs b/src/Elasticsearch.Net/Responses/ServerException/ErrorCauseExtensions.cs
index e3d638d6d71..7e546f2b742 100644
--- a/src/Elasticsearch.Net/Responses/ServerException/ErrorCauseExtensions.cs
+++ b/src/Elasticsearch.Net/Responses/ServerException/ErrorCauseExtensions.cs
@@ -8,6 +8,7 @@ internal static class ErrorCauseExtensions
 		public static void FillValues(this ErrorCause rootCause, IDictionary<string, object> dict)
 		{
 			if (dict == null) return;
+
 			if (dict.TryGetValue("reason", out var reason)) rootCause.Reason = Convert.ToString(reason);
 			if (dict.TryGetValue("type", out var type)) rootCause.Type = Convert.ToString(type);
 			if (dict.TryGetValue("stack_trace", out var stackTrace)) rootCause.StackTrace = Convert.ToString(stackTrace);
diff --git a/src/Elasticsearch.Net/Responses/ServerException/ServerError.cs b/src/Elasticsearch.Net/Responses/ServerException/ServerError.cs
index d48cbd0caf5..c3c2822af61 100644
--- a/src/Elasticsearch.Net/Responses/ServerException/ServerError.cs
+++ b/src/Elasticsearch.Net/Responses/ServerException/ServerError.cs
@@ -11,8 +11,8 @@ public class ServerError
 	{
 		public ServerError(Error error, int? statusCode)
 		{
-			this.Error = error;
-			this.Status = statusCode.GetValueOrDefault();
+			Error = error;
+			Status = statusCode.GetValueOrDefault();
 		}
 
 		public Error Error { get; }
@@ -32,12 +32,11 @@ internal static ServerError Create(IDictionary<string, object> dict, IJsonSerial
 				statusCode = Convert.ToInt32(status);
 
 			if (!dict.TryGetValue("error", out var error)) return null;
+
 			Error err;
 			if (error is string s)
-			{
-				err = new Error {Reason = s};
-			}
-			else err = (Error) strategy.DeserializeObject(error, typeof(Error));
+				err = new Error { Reason = s };
+			else err = (Error)strategy.DeserializeObject(error, typeof(Error));
 
 			return new ServerError(err, statusCode);
 		}
diff --git a/src/Elasticsearch.Net/Responses/ServerException/ShardFailure.cs b/src/Elasticsearch.Net/Responses/ServerException/ShardFailure.cs
index 4d0f6c532c4..75178d2b626 100644
--- a/src/Elasticsearch.Net/Responses/ServerException/ShardFailure.cs
+++ b/src/Elasticsearch.Net/Responses/ServerException/ShardFailure.cs
@@ -5,10 +5,10 @@ namespace Elasticsearch.Net
 {
 	public class ShardFailure
 	{
-		public ErrorCause Reason { get; set; }
-		public int? Shard { get; set; }
 		public string Index { get; set; }
 		public string Node { get; set; }
+		public ErrorCause Reason { get; set; }
+		public int? Shard { get; set; }
 		public string Status { get; set; }
 
 		internal static ShardFailure CreateShardFailure(IDictionary<string, object> dict, IJsonSerializerStrategy strategy)
@@ -20,10 +20,10 @@ internal static ShardFailure CreateShardFailure(IDictionary<string, object> dict
 			if (dict.TryGetValue("status", out var status)) f.Status = Convert.ToString(status);
 			if (dict.TryGetValue("reason", out var reason))
 			{
-				var cause = (ErrorCause) strategy.DeserializeObject(reason, typeof(ErrorCause));
+				var cause = (ErrorCause)strategy.DeserializeObject(reason, typeof(ErrorCause));
 				f.Reason = cause;
 			}
 			return f;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Elasticsearch.Net/Responses/Sniff/SniffResponse.cs b/src/Elasticsearch.Net/Responses/Sniff/SniffResponse.cs
index 17c831b3ba2..9e9d4146970 100644
--- a/src/Elasticsearch.Net/Responses/Sniff/SniffResponse.cs
+++ b/src/Elasticsearch.Net/Responses/Sniff/SniffResponse.cs
@@ -13,6 +13,7 @@ public static class SniffParser
 		public static Uri ParseToUri(string boundAddress, bool forceHttp)
 		{
 			if (boundAddress == null) throw new ArgumentNullException(nameof(boundAddress));
+
 			var suffix = forceHttp ? "s" : string.Empty;
 			var match = AddressRegex.Match(boundAddress);
 			if (!match.Success) throw new Exception($"Can not parse bound_address: {boundAddress} to Uri");
@@ -62,29 +63,31 @@ public IEnumerable<Node> ToNodes(bool forceHttp = false)
 
 	internal class NodeInfo
 	{
-		public string name { get; set; }
-		public string transport_address { get; set; }
+		public string build_hash { get; set; }
 		public string host { get; set; }
+		public NodeInfoHttp http { get; set; }
 		public string ip { get; set; }
-		public string version { get; set; }
-		public string build_hash { get; set; }
+		public string name { get; set; }
 		public IList<string> roles { get; set; }
-		public NodeInfoHttp http { get; set; }
 		public IDictionary<string, object> settings { get; set; }
-
-		internal bool MasterEligible => this.roles?.Contains("master") ?? false;
-		internal bool HoldsData => this.roles?.Contains("data") ?? false;
-		internal bool IngestEnabled => this.roles?.Contains("ingest") ?? false;
+		public string transport_address { get; set; }
+		public string version { get; set; }
+		internal bool HoldsData => roles?.Contains("data") ?? false;
 
 		internal bool HttpEnabled
 		{
 			get
 			{
-				if (this.settings != null && this.settings.ContainsKey("http.enabled"))
-					return Convert.ToBoolean(this.settings["http.enabled"]);
+				if (settings != null && settings.ContainsKey("http.enabled"))
+					return Convert.ToBoolean(settings["http.enabled"]);
+
 				return http != null;
 			}
 		}
+
+		internal bool IngestEnabled => roles?.Contains("ingest") ?? false;
+
+		internal bool MasterEligible => roles?.Contains("master") ?? false;
 	}
 
 	internal class NodeInfoHttp
diff --git a/src/Elasticsearch.Net/Responses/Special/BytesResponse.cs b/src/Elasticsearch.Net/Responses/Special/BytesResponse.cs
index 43879c879b6..8f6895822eb 100644
--- a/src/Elasticsearch.Net/Responses/Special/BytesResponse.cs
+++ b/src/Elasticsearch.Net/Responses/Special/BytesResponse.cs
@@ -1,18 +1,19 @@
 using System.IO;
-using System.Text;
 
 namespace Elasticsearch.Net
 {
 	public class BytesResponse : ElasticsearchResponse<byte[]>
 	{
 		public BytesResponse() { }
-		public BytesResponse(byte[] body) => this.Body = body;
+
+		public BytesResponse(byte[] body) => Body = body;
 
 		public bool TryGetServerError(out ServerError serverError)
 		{
 			serverError = null;
-			if (this.Body == null || this.Body.Length == 0) return false;
-			using(var stream = new MemoryStream(this.Body))
+			if (Body == null || Body.Length == 0) return false;
+
+			using (var stream = new MemoryStream(Body))
 				serverError = ServerError.Create(stream);
 			return true;
 		}
@@ -20,7 +21,8 @@ public bool TryGetServerError(out ServerError serverError)
 		protected override bool TryGetServerErrorReason(out string reason)
 		{
 			reason = null;
-			if (!this.TryGetServerError(out var serverError)) return false;
+			if (!TryGetServerError(out var serverError)) return false;
+
 			reason = serverError?.Error?.ToString();
 			return !reason.IsNullOrEmpty();
 		}
diff --git a/src/Elasticsearch.Net/Responses/Special/StringResponse.cs b/src/Elasticsearch.Net/Responses/Special/StringResponse.cs
index 8077ef10ed8..bb9201d3a2d 100644
--- a/src/Elasticsearch.Net/Responses/Special/StringResponse.cs
+++ b/src/Elasticsearch.Net/Responses/Special/StringResponse.cs
@@ -6,13 +6,15 @@ namespace Elasticsearch.Net
 	public class StringResponse : ElasticsearchResponse<string>
 	{
 		public StringResponse() { }
-		public StringResponse(string body) => this.Body = body;
+
+		public StringResponse(string body) => Body = body;
 
 		public bool TryGetServerError(out ServerError serverError)
 		{
 			serverError = null;
-			if (string.IsNullOrEmpty(this.Body)) return false;
-			using(var stream = new MemoryStream(Encoding.UTF8.GetBytes(this.Body)))
+			if (string.IsNullOrEmpty(Body)) return false;
+
+			using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(Body)))
 				serverError = ServerError.Create(stream);
 			return true;
 		}
@@ -20,7 +22,8 @@ public bool TryGetServerError(out ServerError serverError)
 		protected override bool TryGetServerErrorReason(out string reason)
 		{
 			reason = null;
-			if (!this.TryGetServerError(out var serverError)) return false;
+			if (!TryGetServerError(out var serverError)) return false;
+
 			reason = serverError?.Error?.ToString();
 			return !reason.IsNullOrEmpty();
 		}
diff --git a/src/Elasticsearch.Net/Responses/Special/VoidResponse.cs b/src/Elasticsearch.Net/Responses/Special/VoidResponse.cs
index abfc537dece..69e0d95fc4d 100644
--- a/src/Elasticsearch.Net/Responses/Special/VoidResponse.cs
+++ b/src/Elasticsearch.Net/Responses/Special/VoidResponse.cs
@@ -1,10 +1,7 @@
-using System;
-
-namespace Elasticsearch.Net
+namespace Elasticsearch.Net
 {
 	public class VoidResponse : ElasticsearchResponse<VoidResponse.VoidBody>
 	{
 		public class VoidBody { }
-
 	}
 }
diff --git a/src/Elasticsearch.Net/Serialization/ElasticsearchNetJsonStrategy.cs b/src/Elasticsearch.Net/Serialization/ElasticsearchNetJsonStrategy.cs
index 53319f708bf..1d7f2db0e35 100644
--- a/src/Elasticsearch.Net/Serialization/ElasticsearchNetJsonStrategy.cs
+++ b/src/Elasticsearch.Net/Serialization/ElasticsearchNetJsonStrategy.cs
@@ -15,7 +15,7 @@ public override bool TrySerializeNonPrimitiveObject(object input, out object out
 				return base.TrySerializeNonPrimitiveObject(input, out output);
 
 			var e = input as Exception;
-			var exceptionsJson = this.FlattenExceptions(e).ToList();
+			var exceptionsJson = FlattenExceptions(e).ToList();
 			var array = new JsonArray(exceptionsJson.Count);
 			array.AddRange(exceptionsJson);
 			output = array;
@@ -31,9 +31,9 @@ private IEnumerable<JsonObject> FlattenExceptions(Exception e)
 				var o = ToExceptionJsonObject(e, depth);
 				depth++;
 				yield return o;
+
 				e = e.InnerException;
-			}
-			while (depth < maxExceptions && e != null);
+			} while (depth < maxExceptions && e != null);
 		}
 
 		private JsonObject ToExceptionJsonObject(Exception e, int depth)
@@ -124,16 +124,17 @@ public override object DeserializeObject(object value, Type type)
 			}
 			if (type == typeof(Error))
 			{
-                if (value is string s)
-                    return new Error {Reason = s};
+				if (value is string s)
+					return new Error { Reason = s };
 
 				var dict = base.DeserializeObject(value, typeof(IDictionary<string, object>)) as IDictionary<string, object>;
 				return Error.CreateError(dict, this);
 			}
 			if (type == typeof(ErrorCause))
 			{
-                if (value is string s)
-                    return new ErrorCause {Reason = s};
+				if (value is string s)
+					return new ErrorCause { Reason = s };
+
 				var dict = base.DeserializeObject(value, typeof(IDictionary<string, object>)) as IDictionary<string, object>;
 				return ErrorCause.CreateErrorCause(dict, this);
 			}
diff --git a/src/Elasticsearch.Net/Serialization/ElasticsearchUrlFormatter.cs b/src/Elasticsearch.Net/Serialization/ElasticsearchUrlFormatter.cs
index b39710d644f..3d39068c22a 100644
--- a/src/Elasticsearch.Net/Serialization/ElasticsearchUrlFormatter.cs
+++ b/src/Elasticsearch.Net/Serialization/ElasticsearchUrlFormatter.cs
@@ -12,28 +12,27 @@ public class ElasticsearchUrlFormatter : IFormatProvider, ICustomFormatter
 	{
 		private readonly IConnectionConfigurationValues _settings;
 
-		public ElasticsearchUrlFormatter(IConnectionConfigurationValues settings)
-		{
-			_settings = settings;
-		}
-
-		public object GetFormat(Type formatType) => formatType == typeof(ICustomFormatter) ? this : null;
+		public ElasticsearchUrlFormatter(IConnectionConfigurationValues settings) => _settings = settings;
 
 		public string Format(string format, object arg, IFormatProvider formatProvider)
 		{
 			if (arg == null) throw new ArgumentNullException();
+
 			if (format == "r") return arg.ToString();
-			var value = CreateString(arg, this._settings);
+
+			var value = CreateString(arg, _settings);
 			return value.IsNullOrEmpty() ? string.Empty : Uri.EscapeDataString(value);
 		}
 
+		public object GetFormat(Type formatType) => formatType == typeof(ICustomFormatter) ? this : null;
+
 		public string CreateEscapedString(object value)
 		{
-			var r = CreateString(value, this._settings);
+			var r = CreateString(value, _settings);
 			return r.IsNullOrEmpty() ? string.Empty : Uri.EscapeDataString(r);
 		}
 
-		public string CreateString(object value) => CreateString(value, this._settings);
+		public string CreateString(object value) => CreateString(value, _settings);
 
 		public static string CreateString(object value, IConnectionConfigurationValues settings)
 		{
@@ -46,7 +45,7 @@ public static string CreateString(object value, IConnectionConfigurationValues s
 				case bool b: return b ? "true" : "false";
 				case DateTimeOffset offset: return offset.ToString("o");
 				case IEnumerable<object> pns:
-					return string.Join(",", pns.Select(o=> ResolveUrlParameterOrDefault(o, settings)));
+					return string.Join(",", pns.Select(o => ResolveUrlParameterOrDefault(o, settings)));
 				case TimeSpan timeSpan: return timeSpan.ToTimeUnit();
 				default:
 					return ResolveUrlParameterOrDefault(value, settings);
diff --git a/src/Elasticsearch.Net/Serialization/IElasticsearchSerializer.cs b/src/Elasticsearch.Net/Serialization/IElasticsearchSerializer.cs
index 141d6892336..6b013f7d1e8 100644
--- a/src/Elasticsearch.Net/Serialization/IElasticsearchSerializer.cs
+++ b/src/Elasticsearch.Net/Serialization/IElasticsearchSerializer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -19,13 +18,15 @@ public interface IElasticsearchSerializer
 		void Serialize<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented);
 
 		Task SerializeAsync<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented,
-			CancellationToken cancellationToken = default(CancellationToken));
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public static class ElasticsearchSerializerExtensions
 	{
-
-		public static byte[] SerializeToBytes<T>(this IElasticsearchSerializer serializer, T data, SerializationFormatting formatting = SerializationFormatting.Indented)
+		public static byte[] SerializeToBytes<T>(this IElasticsearchSerializer serializer, T data,
+			SerializationFormatting formatting = SerializationFormatting.Indented
+		)
 		{
 			using (var ms = new MemoryStream())
 			{
@@ -33,7 +34,10 @@ public static byte[] SerializeToBytes<T>(this IElasticsearchSerializer serialize
 				return ms.ToArray();
 			}
 		}
-		public static string SerializeToString<T>(this IElasticsearchSerializer serializer, T data, SerializationFormatting formatting = SerializationFormatting.Indented) =>
+
+		public static string SerializeToString<T>(this IElasticsearchSerializer serializer, T data,
+			SerializationFormatting formatting = SerializationFormatting.Indented
+		) =>
 			serializer.SerializeToBytes(data, formatting).Utf8String();
 	}
 }
diff --git a/src/Elasticsearch.Net/Serialization/IUrlParameter.cs b/src/Elasticsearch.Net/Serialization/IUrlParameter.cs
index e84760eb28b..2a77927ee68 100644
--- a/src/Elasticsearch.Net/Serialization/IUrlParameter.cs
+++ b/src/Elasticsearch.Net/Serialization/IUrlParameter.cs
@@ -4,4 +4,4 @@ public interface IUrlParameter
 	{
 		string GetString(IConnectionConfigurationValues settings);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Elasticsearch.Net/Serialization/LowLevelRequestResponseSerializer.cs b/src/Elasticsearch.Net/Serialization/LowLevelRequestResponseSerializer.cs
index 42a9bcda2f8..223af56a4a5 100644
--- a/src/Elasticsearch.Net/Serialization/LowLevelRequestResponseSerializer.cs
+++ b/src/Elasticsearch.Net/Serialization/LowLevelRequestResponseSerializer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -9,27 +8,26 @@ namespace Elasticsearch.Net
 {
 	public class LowLevelRequestResponseSerializer : IElasticsearchSerializer
 	{
+		private const int BufferSize = 81920;
 		public static readonly LowLevelRequestResponseSerializer Instance = new LowLevelRequestResponseSerializer();
 		private static readonly ElasticsearchNetJsonStrategy Strategy = new ElasticsearchNetJsonStrategy();
 
-		private const int BufferSize = 81920;
-
-		private static object Default(Type type) => type.IsValueType() ? type.CreateInstance() : null;
 		public object Deserialize(Type type, Stream stream)
 		{
 			if (stream == null) return Default(type);
 
 			using (var ms = new MemoryStream())
-			using(stream)
+			using (stream)
 			{
 				stream.CopyTo(ms);
 				var buffer = ms.ToArray();
 				if (buffer.Length <= 1) return Default(type);
+
 				return SimpleJson.DeserializeObject(buffer.Utf8String(), type, Strategy);
 			}
 		}
 
-		public T Deserialize<T>(Stream stream) => (T) this.Deserialize(typeof(T), stream);
+		public T Deserialize<T>(Stream stream) => (T)Deserialize(typeof(T), stream);
 
 		public async Task<object> DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default(CancellationToken))
 		{
@@ -41,6 +39,7 @@ public object Deserialize(Type type, Stream stream)
 				await stream.CopyToAsync(ms, BufferSize, cancellationToken).ConfigureAwait(false);
 				var buffer = ms.ToArray();
 				if (buffer.Length <= 1) return Default(type);
+
 				var r = SimpleJson.DeserializeObject(buffer.Utf8String(), type, Strategy);
 				return r;
 			}
@@ -48,36 +47,30 @@ public object Deserialize(Type type, Stream stream)
 
 		public async Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			var o = await this.DeserializeAsync(typeof(T), stream, cancellationToken).ConfigureAwait(false);
-			return (T) o;
+			var o = await DeserializeAsync(typeof(T), stream, cancellationToken).ConfigureAwait(false);
+			return (T)o;
 		}
 
 		public void Serialize<T>(T data, Stream writableStream, SerializationFormatting formatting = SerializationFormatting.Indented)
 		{
 			var serialized = SimpleJson.SerializeObject(data, Strategy);
 			if (formatting == SerializationFormatting.None) serialized = RemoveNewLinesAndTabs(serialized);
-			using (var ms = new MemoryStream(serialized.Utf8Bytes()))
-			{
-				ms.CopyTo(writableStream);
-			}
+			using (var ms = new MemoryStream(serialized.Utf8Bytes())) ms.CopyTo(writableStream);
 		}
 
 		public async Task SerializeAsync<T>(T data, Stream writableStream, SerializationFormatting formatting,
-			CancellationToken cancellationToken = default(CancellationToken))
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 		{
 			var serialized = SimpleJson.SerializeObject(data, Strategy);
 			if (formatting == SerializationFormatting.None) serialized = RemoveNewLinesAndTabs(serialized);
-			using (var ms = new MemoryStream(serialized.Utf8Bytes()))
-			{
-				await ms.CopyToAsync(writableStream).ConfigureAwait(false);
-			}
+			using (var ms = new MemoryStream(serialized.Utf8Bytes())) await ms.CopyToAsync(writableStream).ConfigureAwait(false);
 		}
 
-		private static string RemoveNewLinesAndTabs(string input)
-		{
-			return new string(input
-				.Where(c => c != '\r' && c != '\n')
-				.ToArray());
-		}
+		private static object Default(Type type) => type.IsValueType() ? type.CreateInstance() : null;
+
+		private static string RemoveNewLinesAndTabs(string input) => new string(input
+			.Where(c => c != '\r' && c != '\n')
+			.ToArray());
 	}
 }
diff --git a/src/Elasticsearch.Net/Serialization/SerializationFormatting.cs b/src/Elasticsearch.Net/Serialization/SerializationFormatting.cs
index c4140e7ba91..3b90055c3c5 100644
--- a/src/Elasticsearch.Net/Serialization/SerializationFormatting.cs
+++ b/src/Elasticsearch.Net/Serialization/SerializationFormatting.cs
@@ -5,4 +5,4 @@ public enum SerializationFormatting
 		None,
 		Indented
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Elasticsearch.Net/Serialization/SimpleJson.cs b/src/Elasticsearch.Net/Serialization/SimpleJson.cs
index 0bf318022d4..0c5ac95602b 100644
--- a/src/Elasticsearch.Net/Serialization/SimpleJson.cs
+++ b/src/Elasticsearch.Net/Serialization/SimpleJson.cs
@@ -17,6 +17,8 @@
 // <website>https://github.com/facebook-csharp-sdk/simple-json</website>
 //-----------------------------------------------------------------------
 
+// @formatter:on — enable formatter after this line
+
 // VERSION: 0.32.0
 
 // NOTE: uncomment the following line to make SimpleJson class internal.
@@ -46,9 +48,7 @@
 
 // original json parsing code from http://techblog.procurios.nl/k/618/news/view/14605/14863/How-do-I-write-my-own-parser-for-JSON.html
 
-#if NETFX_CORE || DOTNETCORE
 #define SIMPLE_JSON_TYPEINFO
-#endif
 using System;
 using System.CodeDom.Compiler;
 using System.Collections;
@@ -61,6 +61,15 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text;
+// ReSharper disable ArrangeMethodOrOperatorBody
+// ReSharper disable SuggestVarOrType_BuiltInTypes
+// ReSharper disable ArrangeAccessorOwnerBody
+// ReSharper disable ArrangeConstructorOrDestructorBody
+// ReSharper disable SuggestVarOrType_Elsewhere
+// ReSharper disable SuggestVarOrType_SimpleTypes
+// ReSharper disable ArrangeTypeMemberModifiers
+// ReSharper disable RemoveRedundantBraces
+// ReSharper disable BuiltInTypeReferenceStyle
 
 namespace Elasticsearch.Net
 {
@@ -2081,3 +2090,4 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
 // ReSharper restore RedundantExplicitArrayCreation
 // ReSharper restore SuggestUseVarKeywordEvident
 }
+// @formatter:on — enable formatter after this line
diff --git a/src/Elasticsearch.Net/Transport/ITransport.cs b/src/Elasticsearch.Net/Transport/ITransport.cs
index 08f7b08d800..4aad961b21f 100644
--- a/src/Elasticsearch.Net/Transport/ITransport.cs
+++ b/src/Elasticsearch.Net/Transport/ITransport.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -14,9 +13,8 @@ TResponse Request<TResponse>(HttpMethod method, string path, PostData data = nul
 			where TResponse : class, IElasticsearchResponse, new();
 
 		Task<TResponse> RequestAsync<TResponse>(
-			HttpMethod method, string path, CancellationToken ctx, PostData data = null, IRequestParameters requestParameters = null)
+			HttpMethod method, string path, CancellationToken ctx, PostData data = null, IRequestParameters requestParameters = null
+		)
 			where TResponse : class, IElasticsearchResponse, new();
-
 	}
-
 }
diff --git a/src/Elasticsearch.Net/Transport/Pipeline/IRequestPipeline.cs b/src/Elasticsearch.Net/Transport/Pipeline/IRequestPipeline.cs
index d6109be09c8..387bdea5294 100644
--- a/src/Elasticsearch.Net/Transport/Pipeline/IRequestPipeline.cs
+++ b/src/Elasticsearch.Net/Transport/Pipeline/IRequestPipeline.cs
@@ -7,18 +7,17 @@ namespace Elasticsearch.Net
 {
 	public interface IRequestPipeline : IDisposable
 	{
+		List<Audit> AuditTrail { get; }
 		bool FirstPoolUsageNeedsSniffing { get; }
+		bool IsTakingTooLong { get; }
+		int MaxRetries { get; }
+
+		int Retried { get; }
 		bool SniffsOnConnectionFailure { get; }
 		bool SniffsOnStaleCluster { get; }
 		bool StaleClusterState { get; }
 
-		List<Audit> AuditTrail { get; }
-
 		DateTime StartedOn { get; }
-		bool IsTakingTooLong { get; }
-
-		int Retried { get; }
-		int MaxRetries { get; }
 
 		TResponse CallElasticsearch<TResponse>(RequestData requestData)
 			where TResponse : class, IElasticsearchResponse, new();
@@ -27,23 +26,29 @@ Task<TResponse> CallElasticsearchAsync<TResponse>(RequestData requestData, Cance
 			where TResponse : class, IElasticsearchResponse, new();
 
 		void MarkAlive(Node node);
+
 		void MarkDead(Node node);
 
 		IEnumerable<Node> NextNode();
 
 		void Ping(Node node);
+
 		Task PingAsync(Node node, CancellationToken cancellationToken);
 
 		void FirstPoolUsage(SemaphoreSlim semaphore);
+
 		Task FirstPoolUsageAsync(SemaphoreSlim semaphore, CancellationToken cancellationToken);
 
 		void Sniff();
+
 		Task SniffAsync(CancellationToken cancellationToken);
 
 		void SniffOnStaleCluster();
+
 		Task SniffOnStaleClusterAsync(CancellationToken cancellationToken);
 
 		void SniffOnConnectionFailure();
+
 		Task SniffOnConnectionFailureAsync(CancellationToken cancellationToken);
 
 		void BadResponse<TResponse>(ref TResponse response, IApiCallDetails callDetails, RequestData data, ElasticsearchClientException exception)
@@ -53,7 +58,9 @@ void BadResponse<TResponse>(ref TResponse response, IApiCallDetails callDetails,
 
 		void AuditCancellationRequested();
 
-		ElasticsearchClientException CreateClientException<TResponse>(TResponse response, IApiCallDetails callDetails, RequestData data, List<PipelineException> seenExceptions)
+		ElasticsearchClientException CreateClientException<TResponse>(TResponse response, IApiCallDetails callDetails, RequestData data,
+			List<PipelineException> seenExceptions
+		)
 			where TResponse : class, IElasticsearchResponse, new();
 	}
 }
diff --git a/src/Elasticsearch.Net/Transport/Pipeline/PipelineException.cs b/src/Elasticsearch.Net/Transport/Pipeline/PipelineException.cs
index 6a26e50a704..e8c9b8f0fae 100644
--- a/src/Elasticsearch.Net/Transport/Pipeline/PipelineException.cs
+++ b/src/Elasticsearch.Net/Transport/Pipeline/PipelineException.cs
@@ -4,9 +4,17 @@ namespace Elasticsearch.Net
 {
 	public class PipelineException : Exception
 	{
-		public PipelineFailure FailureReason { get; }
+		public PipelineException(PipelineFailure failure)
+			: base(GetMessage(failure)) => FailureReason = failure;
+
+		public PipelineException(string message)
+			: base(message) => FailureReason = PipelineFailure.BadResponse;
+
+		public PipelineException(PipelineFailure failure, Exception innerException)
+			: base(GetMessage(failure), innerException) => FailureReason = failure;
 
 		public IApiCallDetails ApiCall { get; internal set; }
+		public PipelineFailure FailureReason { get; }
 
 		public bool Recoverable =>
 			FailureReason == PipelineFailure.BadRequest
@@ -15,27 +23,9 @@ public class PipelineException : Exception
 
 		public IElasticsearchResponse Response { get; internal set; }
 
-		public PipelineException(PipelineFailure failure)
-			: base(GetMessage(failure))
-		{
-			this.FailureReason = failure;
-		}
-
-		public PipelineException(string message)
-			: base(message)
-		{
-			this.FailureReason = PipelineFailure.BadResponse;
-		}
-
-		public PipelineException(PipelineFailure failure, Exception innerException)
-			: base(GetMessage(failure), innerException)
-		{
-			this.FailureReason = failure;
-		}
-
 		private static string GetMessage(PipelineFailure failure)
 		{
-			switch(failure)
+			switch (failure)
 			{
 				case PipelineFailure.BadRequest: return "An error occurred trying to write the request data to the specified node.";
 				case PipelineFailure.BadResponse: return "An error occurred trying to read the response from the specified node.";
diff --git a/src/Elasticsearch.Net/Transport/Pipeline/RequestData.cs b/src/Elasticsearch.Net/Transport/Pipeline/RequestData.cs
index acef7e38e21..276425dff91 100644
--- a/src/Elasticsearch.Net/Transport/Pipeline/RequestData.cs
+++ b/src/Elasticsearch.Net/Transport/Pipeline/RequestData.cs
@@ -4,58 +4,22 @@
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 
 namespace Elasticsearch.Net
 {
 	public class RequestData
 	{
 		public const string MimeType = "application/json";
-		public const string RunAsSecurityHeader = "es-security-runas-user";
 		public const string OpaqueIdHeader = "X-Opaque-Id";
+		public const string RunAsSecurityHeader = "es-security-runas-user";
 
-		public Uri Uri => this.Node != null ? new Uri(this.Node.Uri, this.PathAndQuery) : null;
-
-		public HttpMethod Method { get; private set; }
-		public string PathAndQuery { get; }
-		public PostData PostData { get; }
-		public bool MadeItToResponse { get; set;}
-		public AuditEvent OnFailureAuditEvent => this.MadeItToResponse ? AuditEvent.BadResponse : AuditEvent.BadRequest;
-		public PipelineFailure OnFailurePipelineFailure => this.MadeItToResponse ? PipelineFailure.BadResponse : PipelineFailure.BadRequest;
-
-		public Node Node { get; set; }
-		public TimeSpan RequestTimeout { get; }
-		public TimeSpan PingTimeout { get; }
-		public int KeepAliveTime { get; }
-		public int KeepAliveInterval { get; }
-
-		public bool Pipelined { get; }
-		public bool HttpCompression { get; }
-		public string RequestMimeType { get; }
-		public string Accept { get; }
-		public string RunAs { get; }
-		public IReadOnlyCollection<int> SkipDeserializationForStatusCodes { get; }
-
-		public NameValueCollection Headers { get; }
-		public string ProxyAddress { get; }
-		public string ProxyUsername { get; }
-		public string ProxyPassword { get; }
-		public bool DisableAutomaticProxyDetection { get; }
-		public bool ThrowExceptions { get; }
-
-		public BasicAuthenticationCredentials BasicAuthorizationCredentials { get; }
-		public IEnumerable<int> AllowedStatusCodes { get; }
-		public Func<IApiCallDetails, Stream, object> CustomConverter { get; }
-		public IConnectionConfigurationValues ConnectionSettings { get; }
-		public IMemoryStreamFactory MemoryStreamFactory { get; }
-
-		public X509CertificateCollection ClientCertificates { get; }
-
-		public RequestData(HttpMethod method, string path, PostData data, IConnectionConfigurationValues global, IRequestParameters local, IMemoryStreamFactory memoryStreamFactory)
+		public RequestData(HttpMethod method, string path, PostData data, IConnectionConfigurationValues global, IRequestParameters local,
+			IMemoryStreamFactory memoryStreamFactory
+		)
 			: this(method, data, global, local?.RequestConfiguration, memoryStreamFactory)
 		{
-			this.CustomConverter = local?.DeserializationOverride;
-			this.PathAndQuery = this.CreatePathWithQueryStrings(path, this.ConnectionSettings, local);
+			CustomConverter = local?.DeserializationOverride;
+			PathAndQuery = CreatePathWithQueryStrings(path, ConnectionSettings, local);
 		}
 
 		private RequestData(
@@ -63,47 +27,86 @@ private RequestData(
 			PostData data,
 			IConnectionConfigurationValues global,
 			IRequestConfiguration local,
-			IMemoryStreamFactory memoryStreamFactory)
+			IMemoryStreamFactory memoryStreamFactory
+		)
 		{
-			this.ConnectionSettings = global;
-			this.MemoryStreamFactory = memoryStreamFactory;
-			this.Method = method;
-			this.PostData = data;
+			ConnectionSettings = global;
+			MemoryStreamFactory = memoryStreamFactory;
+			Method = method;
+			PostData = data;
 
 			if (data != null)
 				data.DisableDirectStreaming = local?.DisableDirectStreaming ?? global.DisableDirectStreaming;
 
-			this.Pipelined = local?.EnableHttpPipelining ?? global.HttpPipeliningEnabled;
-			this.HttpCompression = global.EnableHttpCompression;
-			this.RequestMimeType = local?.ContentType ?? MimeType;
-			this.Accept = local?.Accept ?? MimeType;
-			this.Headers = global.Headers != null ? new NameValueCollection(global.Headers) : new NameValueCollection();
+			Pipelined = local?.EnableHttpPipelining ?? global.HttpPipeliningEnabled;
+			HttpCompression = global.EnableHttpCompression;
+			RequestMimeType = local?.ContentType ?? MimeType;
+			Accept = local?.Accept ?? MimeType;
+			Headers = global.Headers != null ? new NameValueCollection(global.Headers) : new NameValueCollection();
 
 			if (!string.IsNullOrEmpty(local?.OpaqueId))
-				this.Headers.Add(OpaqueIdHeader, local.OpaqueId);
+				Headers.Add(OpaqueIdHeader, local.OpaqueId);
 
-			this.RunAs = local?.RunAs;
-			this.SkipDeserializationForStatusCodes = global?.SkipDeserializationForStatusCodes;
-			this.ThrowExceptions = local?.ThrowExceptions ?? global.ThrowExceptions;
+			RunAs = local?.RunAs;
+			SkipDeserializationForStatusCodes = global?.SkipDeserializationForStatusCodes;
+			ThrowExceptions = local?.ThrowExceptions ?? global.ThrowExceptions;
 
-			this.RequestTimeout = local?.RequestTimeout ?? global.RequestTimeout;
-			this.PingTimeout =
+			RequestTimeout = local?.RequestTimeout ?? global.RequestTimeout;
+			PingTimeout =
 				local?.PingTimeout
 				?? global?.PingTimeout
 				?? (global.ConnectionPool.UsingSsl ? ConnectionConfiguration.DefaultPingTimeoutOnSSL : ConnectionConfiguration.DefaultPingTimeout);
 
-			this.KeepAliveInterval = (int)(global.KeepAliveInterval?.TotalMilliseconds ?? 2000);
-			this.KeepAliveTime = (int)(global.KeepAliveTime?.TotalMilliseconds ?? 2000);
+			KeepAliveInterval = (int)(global.KeepAliveInterval?.TotalMilliseconds ?? 2000);
+			KeepAliveTime = (int)(global.KeepAliveTime?.TotalMilliseconds ?? 2000);
 
-			this.ProxyAddress = global.ProxyAddress;
-			this.ProxyUsername = global.ProxyUsername;
-			this.ProxyPassword = global.ProxyPassword;
-			this.DisableAutomaticProxyDetection = global.DisableAutomaticProxyDetection;
-			this.BasicAuthorizationCredentials = local?.BasicAuthenticationCredentials ?? global.BasicAuthenticationCredentials;
-			this.AllowedStatusCodes = local?.AllowedStatusCodes ?? Enumerable.Empty<int>();
-			this.ClientCertificates = local?.ClientCertificates ?? global.ClientCertificates;
+			ProxyAddress = global.ProxyAddress;
+			ProxyUsername = global.ProxyUsername;
+			ProxyPassword = global.ProxyPassword;
+			DisableAutomaticProxyDetection = global.DisableAutomaticProxyDetection;
+			BasicAuthorizationCredentials = local?.BasicAuthenticationCredentials ?? global.BasicAuthenticationCredentials;
+			AllowedStatusCodes = local?.AllowedStatusCodes ?? Enumerable.Empty<int>();
+			ClientCertificates = local?.ClientCertificates ?? global.ClientCertificates;
 		}
 
+		public string Accept { get; }
+		public IEnumerable<int> AllowedStatusCodes { get; }
+
+		public BasicAuthenticationCredentials BasicAuthorizationCredentials { get; }
+
+		public X509CertificateCollection ClientCertificates { get; }
+		public IConnectionConfigurationValues ConnectionSettings { get; }
+		public Func<IApiCallDetails, Stream, object> CustomConverter { get; }
+		public bool DisableAutomaticProxyDetection { get; }
+
+		public NameValueCollection Headers { get; }
+		public bool HttpCompression { get; }
+		public int KeepAliveInterval { get; }
+		public int KeepAliveTime { get; }
+		public bool MadeItToResponse { get; set; }
+		public IMemoryStreamFactory MemoryStreamFactory { get; }
+
+		public HttpMethod Method { get; private set; }
+
+		public Node Node { get; set; }
+		public AuditEvent OnFailureAuditEvent => MadeItToResponse ? AuditEvent.BadResponse : AuditEvent.BadRequest;
+		public PipelineFailure OnFailurePipelineFailure => MadeItToResponse ? PipelineFailure.BadResponse : PipelineFailure.BadRequest;
+		public string PathAndQuery { get; }
+		public TimeSpan PingTimeout { get; }
+
+		public bool Pipelined { get; }
+		public PostData PostData { get; }
+		public string ProxyAddress { get; }
+		public string ProxyPassword { get; }
+		public string ProxyUsername { get; }
+		public string RequestMimeType { get; }
+		public TimeSpan RequestTimeout { get; }
+		public string RunAs { get; }
+		public IReadOnlyCollection<int> SkipDeserializationForStatusCodes { get; }
+		public bool ThrowExceptions { get; }
+
+		public Uri Uri => Node != null ? new Uri(Node.Uri, PathAndQuery) : null;
+
 		private string CreatePathWithQueryStrings(string path, IConnectionConfigurationValues global, IRequestParameters request)
 		{
 			path = path ?? string.Empty;
@@ -118,7 +121,7 @@ private string CreatePathWithQueryStrings(string path, IConnectionConfigurationV
 			var nv = g == null ? new NameValueCollection() : new NameValueCollection(g);
 
 			//set all querystring pairs from local `l` on the querystring collection
-			var formatter = this.ConnectionSettings.UrlFormatter;
+			var formatter = ConnectionSettings.UrlFormatter;
 			nv.UpdateFromDictionary(l, formatter);
 
 			//if nv has no keys simply return path as provided
@@ -137,11 +140,18 @@ internal static string ToQueryString(this NameValueCollection nv)
 		{
 			if (nv == null) return string.Empty;
 			if (nv.AllKeys.Length == 0) return string.Empty;
-			string E(string v) => Uri.EscapeDataString(v);
+
+			string E(string v)
+			{
+				return Uri.EscapeDataString(v);
+			}
+
 			return "?" + string.Join("&", nv.AllKeys.Select(key => $"{E(key)}={E(nv[key])}"));
 		}
 
-		internal static void UpdateFromDictionary(this NameValueCollection queryString, Dictionary<string, object> queryStringUpdates, ElasticsearchUrlFormatter provider)
+		internal static void UpdateFromDictionary(this NameValueCollection queryString, Dictionary<string, object> queryStringUpdates,
+			ElasticsearchUrlFormatter provider
+		)
 		{
 			if (queryString == null || queryString.Count < 0) return;
 			if (queryStringUpdates == null || queryStringUpdates.Count < 0) return;
diff --git a/src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs b/src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs
index df29a74047a..099d5f8e97d 100644
--- a/src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs
+++ b/src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs
@@ -8,144 +8,265 @@
 
 namespace Elasticsearch.Net
 {
-
 	public class RequestPipeline : IRequestPipeline
 	{
-		private readonly IConnectionConfigurationValues _settings;
+		private static readonly string NoNodesAttemptedMessage =
+			"No nodes were attempted, this can happen when a node predicate does not match any nodes";
+
 		private readonly IConnection _connection;
 		private readonly IConnectionPool _connectionPool;
 		private readonly IDateTimeProvider _dateTimeProvider;
 		private readonly IMemoryStreamFactory _memoryStreamFactory;
-
-		private IRequestParameters RequestParameters { get; }
-		private IRequestConfiguration RequestConfiguration { get; }
-
-		public DateTime StartedOn { get; }
-
-		public List<Audit> AuditTrail { get; } = new List<Audit>();
-		private int _retried = 0;
-		public int Retried => _retried;
+		private readonly IConnectionConfigurationValues _settings;
 
 		public RequestPipeline(
 			IConnectionConfigurationValues configurationValues,
 			IDateTimeProvider dateTimeProvider,
 			IMemoryStreamFactory memoryStreamFactory,
-			IRequestParameters requestParameters)
+			IRequestParameters requestParameters
+		)
 		{
-			this._settings = configurationValues;
-			this._connectionPool = this._settings.ConnectionPool;
-			this._connection = this._settings.Connection;
-			this._dateTimeProvider = dateTimeProvider;
-			this._memoryStreamFactory = memoryStreamFactory;
-
-			this.RequestParameters = requestParameters;
-			this.RequestConfiguration = requestParameters?.RequestConfiguration;
-			this.StartedOn = dateTimeProvider.Now();
+			_settings = configurationValues;
+			_connectionPool = _settings.ConnectionPool;
+			_connection = _settings.Connection;
+			_dateTimeProvider = dateTimeProvider;
+			_memoryStreamFactory = memoryStreamFactory;
+
+			RequestParameters = requestParameters;
+			RequestConfiguration = requestParameters?.RequestConfiguration;
+			StartedOn = dateTimeProvider.Now();
 		}
 
-		public int MaxRetries =>
-			this.RequestConfiguration?.ForceNode != null
-			? 0
-			: Math.Min(this.RequestConfiguration?.MaxRetries ?? this._settings.MaxRetries.GetValueOrDefault(int.MaxValue), this._connectionPool.MaxRetries);
+		public List<Audit> AuditTrail { get; } = new List<Audit>();
 
-		private bool RequestDisabledSniff => this.RequestConfiguration != null && (this.RequestConfiguration.DisableSniff ?? false);
+		// TODO: rename to DepeletedRetries in 7.x
+		public bool DepleededRetries => Retried >= MaxRetries + 1 || IsTakingTooLong;
 
 		public bool FirstPoolUsageNeedsSniffing =>
-			!this.RequestDisabledSniff
-				&& this._connectionPool.SupportsReseeding && this._settings.SniffsOnStartup && !this._connectionPool.SniffedOnStartup;
+			!RequestDisabledSniff
+			&& _connectionPool.SupportsReseeding && _settings.SniffsOnStartup && !_connectionPool.SniffedOnStartup;
+
+		public bool IsTakingTooLong
+		{
+			get
+			{
+				var timeout = _settings.MaxRetryTimeout.GetValueOrDefault(RequestTimeout);
+				var now = _dateTimeProvider.Now();
+
+				//we apply a soft margin so that if a request timesout at 59 seconds when the maximum is 60 we also abort.
+				var margin = timeout.TotalMilliseconds / 100.0 * 98;
+				var marginTimeSpan = TimeSpan.FromMilliseconds(margin);
+				var timespanCall = now - StartedOn;
+				var tookToLong = timespanCall >= marginTimeSpan;
+				return tookToLong;
+			}
+		}
+
+		public int MaxRetries =>
+			RequestConfiguration?.ForceNode != null
+				? 0
+				: Math.Min(RequestConfiguration?.MaxRetries ?? _settings.MaxRetries.GetValueOrDefault(int.MaxValue), _connectionPool.MaxRetries);
+
+		public bool Refresh { get; private set; }
+		public int Retried { get; private set; } = 0;
+
+		public IEnumerable<Node> SniffNodes => _connectionPool
+			.CreateView(LazyAuditable)
+			.ToList()
+			.OrderBy(n => n.MasterEligible ? n.Uri.Port : int.MaxValue);
+
+		public static string SniffPath => "_nodes/http,settings";
 
 		public bool SniffsOnConnectionFailure =>
-			!this.RequestDisabledSniff
-				&& this._connectionPool.SupportsReseeding && this._settings.SniffsOnConnectionFault;
+			!RequestDisabledSniff
+			&& _connectionPool.SupportsReseeding && _settings.SniffsOnConnectionFault;
 
 		public bool SniffsOnStaleCluster =>
-			!this.RequestDisabledSniff
-				&& this._connectionPool.SupportsReseeding && this._settings.SniffInformationLifeSpan.HasValue;
+			!RequestDisabledSniff
+			&& _connectionPool.SupportsReseeding && _settings.SniffInformationLifeSpan.HasValue;
 
 		public bool StaleClusterState
 		{
 			get
 			{
 				if (!SniffsOnStaleCluster) return false;
+
 				// ReSharper disable once PossibleInvalidOperationException
 				// already checked by SniffsOnStaleCluster
-				var sniffLifeSpan = this._settings.SniffInformationLifeSpan.Value;
+				var sniffLifeSpan = _settings.SniffInformationLifeSpan.Value;
 
-				var now = this._dateTimeProvider.Now();
-				var lastSniff = this._connectionPool.LastUpdate;
+				var now = _dateTimeProvider.Now();
+				var lastSniff = _connectionPool.LastUpdate;
 
-				return sniffLifeSpan < (now - lastSniff);
+				return sniffLifeSpan < now - lastSniff;
 			}
 		}
 
-		private bool PingDisabled(Node node) =>
-			(this.RequestConfiguration?.DisablePing).GetValueOrDefault(false)
-				|| this._settings.DisablePings || !this._connectionPool.SupportsPinging || !node.IsResurrected;
+		public DateTime StartedOn { get; }
 
-		TimeSpan PingTimeout =>
-			 this.RequestConfiguration?.PingTimeout
-			?? this._settings.PingTimeout
-			?? (this._connectionPool.UsingSsl ? ConnectionConfiguration.DefaultPingTimeoutOnSSL : ConnectionConfiguration.DefaultPingTimeout);
+		private TimeSpan PingTimeout =>
+			RequestConfiguration?.PingTimeout
+			?? _settings.PingTimeout
+			?? (_connectionPool.UsingSsl ? ConnectionConfiguration.DefaultPingTimeoutOnSSL : ConnectionConfiguration.DefaultPingTimeout);
 
-		TimeSpan RequestTimeout => this.RequestConfiguration?.RequestTimeout ?? this._settings.RequestTimeout;
+		private IRequestConfiguration RequestConfiguration { get; }
 
-		public bool IsTakingTooLong
+		private bool RequestDisabledSniff => RequestConfiguration != null && (RequestConfiguration.DisableSniff ?? false);
+
+		private IRequestParameters RequestParameters { get; }
+
+		private TimeSpan RequestTimeout => RequestConfiguration?.RequestTimeout ?? _settings.RequestTimeout;
+
+		private NodesInfoRequestParameters SniffParameters => new NodesInfoRequestParameters
 		{
-			get
-			{
-				var timeout = this._settings.MaxRetryTimeout.GetValueOrDefault(this.RequestTimeout);
-				var now = this._dateTimeProvider.Now();
+			Timeout = PingTimeout,
+			FlatSettings = true
+		};
 
-				//we apply a soft margin so that if a request timesout at 59 seconds when the maximum is 60 we also abort.
-				var margin = (timeout.TotalMilliseconds / 100.0) * 98;
-				var marginTimeSpan = TimeSpan.FromMilliseconds(margin);
-				var timespanCall = (now - this.StartedOn);
-				var tookToLong = timespanCall >= marginTimeSpan;
-				return tookToLong;
-			}
-		}
+		void IDisposable.Dispose() => Dispose();
 
-		public bool Refresh { get; private set; }
+		public void AuditCancellationRequested() => Audit(CancellationRequested).Dispose();
 
-		// TODO: rename to DepeletedRetries in 7.x
-		public bool DepleededRetries => this.Retried >= this.MaxRetries + 1 || this.IsTakingTooLong;
+		public void BadResponse<TResponse>(ref TResponse response, IApiCallDetails callDetails, RequestData data,
+			ElasticsearchClientException exception
+		)
+			where TResponse : class, IElasticsearchResponse, new()
+		{
+			if (response == null)
+			{
+				//make sure we copy over the error body in case we disabled direct streaming.
+				var s = callDetails?.ResponseBodyInBytes == null ? Stream.Null : new MemoryStream(callDetails.ResponseBodyInBytes);
+				var m = callDetails?.ResponseMimeType ?? RequestData.MimeType;
+				response = ResponseBuilder.ToResponse<TResponse>(data, exception, callDetails?.HttpStatusCode, null, s, m);
+			}
 
-		private Auditable Audit(AuditEvent type) => new Auditable(type, this.AuditTrail, this._dateTimeProvider);
+			response.ApiCall.AuditTrail = AuditTrail;
+		}
 
-		private static string NoNodesAttemptedMessage = "No nodes were attempted, this can happen when a node predicate does not match any nodes";
-		public void ThrowNoNodesAttempted(RequestData requestData, List<PipelineException> seenExceptions)
+		public TResponse CallElasticsearch<TResponse>(RequestData requestData)
+			where TResponse : class, IElasticsearchResponse, new()
 		{
-			var clientException = new ElasticsearchClientException(PipelineFailure.NoNodesAttempted, NoNodesAttemptedMessage, (Exception) null);
-			using(this.Audit(NoNodesAttempted))
-				throw new UnexpectedElasticsearchClientException(clientException, seenExceptions)
+			using (var audit = Audit(HealthyResponse))
+			{
+				audit.Node = requestData.Node;
+				audit.Path = requestData.PathAndQuery;
+
+				TResponse response = null;
+				try
 				{
-					Request  = requestData,
-					AuditTrail = this.AuditTrail
-				};
+					response = _connection.Request<TResponse>(requestData);
+					response.ApiCall.AuditTrail = AuditTrail;
+					ThrowBadAuthPipelineExceptionWhenNeeded(response.ApiCall, response);
+					if (!response.ApiCall.Success) audit.Event = requestData.OnFailureAuditEvent;
+					return response;
+				}
+				catch (Exception e)
+				{
+					(response as ElasticsearchResponse<Stream>)?.Body?.Dispose();
+					audit.Event = requestData.OnFailureAuditEvent;
+					audit.Exception = e;
+					throw;
+				}
+			}
 		}
 
-		public void AuditCancellationRequested() => Audit(CancellationRequested).Dispose();
-
-		public void MarkDead(Node node)
+		public async Task<TResponse> CallElasticsearchAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
+			where TResponse : class, IElasticsearchResponse, new()
 		{
-			var deadUntil = this._dateTimeProvider.DeadTime(node.FailedAttempts, this._settings.DeadTimeout, this._settings.MaxDeadTimeout);
-			node.MarkDead(deadUntil);
-			this._retried++;
+			using (var audit = Audit(HealthyResponse))
+			{
+				audit.Node = requestData.Node;
+				audit.Path = requestData.PathAndQuery;
+
+				TResponse response = null;
+				try
+				{
+					response = await _connection.RequestAsync<TResponse>(requestData, cancellationToken).ConfigureAwait(false);
+					response.ApiCall.AuditTrail = AuditTrail;
+					ThrowBadAuthPipelineExceptionWhenNeeded(response.ApiCall, response);
+					if (!response.ApiCall.Success) audit.Event = requestData.OnFailureAuditEvent;
+					return response;
+				}
+				catch (Exception e)
+				{
+					(response as ElasticsearchResponse<Stream>)?.Body?.Dispose();
+					audit.Event = requestData.OnFailureAuditEvent;
+					audit.Exception = e;
+					throw;
+				}
+			}
 		}
 
-		public void MarkAlive(Node node) => node.MarkAlive();
+		public ElasticsearchClientException CreateClientException<TResponse>(
+			TResponse response, IApiCallDetails callDetails, RequestData data, List<PipelineException> pipelineExceptions
+		)
+			where TResponse : class, IElasticsearchResponse, new()
+		{
+			if (callDetails?.Success ?? false) return null;
+
+			var innerException = pipelineExceptions.HasAny() ? pipelineExceptions.AsAggregateOrFirst() : callDetails?.OriginalException;
+
+			var statusCode = callDetails?.HttpStatusCode != null ? callDetails.HttpStatusCode.Value.ToString() : "unknown";
+			var resource = callDetails == null
+				? "unknown resource"
+				: $"Status code {statusCode} from: {callDetails.HttpMethod} {callDetails.Uri.PathAndQuery}";
+
+
+			var exceptionMessage = innerException?.Message ?? $"Request failed to execute";
+
+			var pipelineFailure = data.OnFailurePipelineFailure;
+			if (pipelineExceptions.HasAny())
+				pipelineFailure = pipelineExceptions.Last().FailureReason;
+
+			if (IsTakingTooLong)
+			{
+				pipelineFailure = PipelineFailure.MaxTimeoutReached;
+				Audit(MaxTimeoutReached);
+				exceptionMessage = "Maximum timeout reached while retrying request";
+			}
+			else if (Retried >= MaxRetries && MaxRetries > 0)
+			{
+				pipelineFailure = PipelineFailure.MaxRetriesReached;
+				Audit(MaxRetriesReached);
+				exceptionMessage = "Maximum number of retries reached";
+
+				var now = _dateTimeProvider.Now();
+				// TODO make AliveNodes on IConnectionPool public in 7.0 (default interface C# 8 FTW)
+				var activeNodes = _connectionPool.Nodes.Count(n => n.IsAlive || n.DeadUntil <= now);
+				if (Retried >= activeNodes)
+				{
+					Audit(FailedOverAllNodes);
+					exceptionMessage += ", failed over to all the known alive nodes before failing";
+				}
+			}
+
+			exceptionMessage += $". Call: {resource}";
+			if (response != null && response.TryGetServerErrorReason(out var reason))
+				exceptionMessage += $". ServerError: {reason}";
+
+			var clientException = new ElasticsearchClientException(pipelineFailure, exceptionMessage, innerException)
+			{
+				Request = data,
+				Response = callDetails,
+				AuditTrail = AuditTrail
+			};
+
+			return clientException;
+		}
 
 		public void FirstPoolUsage(SemaphoreSlim semaphore)
 		{
-			if (!this.FirstPoolUsageNeedsSniffing) return;
-			if (!semaphore.Wait(this._settings.RequestTimeout))
+			if (!FirstPoolUsageNeedsSniffing) return;
+
+			if (!semaphore.Wait(_settings.RequestTimeout))
 			{
-				if (this.FirstPoolUsageNeedsSniffing)
+				if (FirstPoolUsageNeedsSniffing)
 					throw new PipelineException(PipelineFailure.CouldNotStartSniffOnStartup, null);
+
 				return;
 			}
 
-			if (!this.FirstPoolUsageNeedsSniffing)
+			if (!FirstPoolUsageNeedsSniffing)
 			{
 				semaphore.Release();
 				return;
@@ -153,10 +274,10 @@ public void FirstPoolUsage(SemaphoreSlim semaphore)
 
 			try
 			{
-				using (this.Audit(SniffOnStartup))
+				using (Audit(SniffOnStartup))
 				{
-					this.Sniff();
-					this._connectionPool.SniffedOnStartup = true;
+					Sniff();
+					_connectionPool.SniffedOnStartup = true;
 				}
 			}
 			finally
@@ -167,26 +288,28 @@ public void FirstPoolUsage(SemaphoreSlim semaphore)
 
 		public async Task FirstPoolUsageAsync(SemaphoreSlim semaphore, CancellationToken cancellationToken)
 		{
-			if (!this.FirstPoolUsageNeedsSniffing) return;
-			var success = await semaphore.WaitAsync(this._settings.RequestTimeout, cancellationToken).ConfigureAwait(false);
+			if (!FirstPoolUsageNeedsSniffing) return;
+
+			var success = await semaphore.WaitAsync(_settings.RequestTimeout, cancellationToken).ConfigureAwait(false);
 			if (!success)
 			{
-				if(this.FirstPoolUsageNeedsSniffing)
+				if (FirstPoolUsageNeedsSniffing)
 					throw new PipelineException(PipelineFailure.CouldNotStartSniffOnStartup, null);
+
 				return;
 			}
 
-			if (!this.FirstPoolUsageNeedsSniffing)
+			if (!FirstPoolUsageNeedsSniffing)
 			{
 				semaphore.Release();
 				return;
 			}
 			try
 			{
-				using (this.Audit(SniffOnStartup))
+				using (Audit(SniffOnStartup))
 				{
-					await this.SniffAsync(cancellationToken).ConfigureAwait(false);
-					this._connectionPool.SniffedOnStartup = true;
+					await SniffAsync(cancellationToken).ConfigureAwait(false);
+					_connectionPool.SniffedOnStartup = true;
 				}
 			}
 			finally
@@ -195,31 +318,21 @@ public async Task FirstPoolUsageAsync(SemaphoreSlim semaphore, CancellationToken
 			}
 		}
 
-		public void SniffOnStaleCluster()
-		{
-			if (!StaleClusterState) return;
-			using (this.Audit(AuditEvent.SniffOnStaleCluster))
-			{
-				this.Sniff();
-				this._connectionPool.SniffedOnStartup = true;
-			}
-		}
+		public void MarkAlive(Node node) => node.MarkAlive();
 
-		public async Task SniffOnStaleClusterAsync(CancellationToken cancellationToken)
+		public void MarkDead(Node node)
 		{
-			if (!StaleClusterState) return;
-			using (this.Audit(AuditEvent.SniffOnStaleCluster))
-			{
-				await this.SniffAsync(cancellationToken).ConfigureAwait(false);
-				this._connectionPool.SniffedOnStartup = true;
-			}
+			var deadUntil = _dateTimeProvider.DeadTime(node.FailedAttempts, _settings.DeadTimeout, _settings.MaxDeadTimeout);
+			node.MarkDead(deadUntil);
+			Retried++;
 		}
 
 		public IEnumerable<Node> NextNode()
 		{
-			if (this.RequestConfiguration?.ForceNode != null)
+			if (RequestConfiguration?.ForceNode != null)
 			{
-				yield return new Node(this.RequestConfiguration.ForceNode);
+				yield return new Node(RequestConfiguration.ForceNode);
+
 				yield break;
 			}
 
@@ -229,15 +342,19 @@ public IEnumerable<Node> NextNode()
 			var refreshed = false;
 			for (var i = 0; i < 100; i++)
 			{
-				if (this.DepleededRetries) yield break;
-				foreach (var node in this._connectionPool
+				if (DepleededRetries) yield break;
+
+				foreach (var node in _connectionPool
 					.CreateView(LazyAuditable)
-					.TakeWhile(node => !this.DepleededRetries))
+					.TakeWhile(node => !DepleededRetries))
 				{
-					if (!this._settings.NodePredicate(node)) continue;
+					if (!_settings.NodePredicate(node)) continue;
+
 					yield return node;
-					if (!this.Refresh) continue;
-					this.Refresh = false;
+
+					if (!Refresh) continue;
+
+					Refresh = false;
 					refreshed = true;
 					break;
 				}
@@ -247,39 +364,20 @@ public IEnumerable<Node> NextNode()
 			}
 		}
 
-		private RequestData CreatePingRequestData(Node node, Auditable audit)
-		{
-			audit.Node = node;
-
-			var requestOverrides = new RequestConfiguration
-			{
-				PingTimeout = this.PingTimeout,
-				RequestTimeout = this.PingTimeout,
-				BasicAuthenticationCredentials = this._settings.BasicAuthenticationCredentials,
-				EnableHttpPipelining = this.RequestConfiguration?.EnableHttpPipelining ?? this._settings.HttpPipeliningEnabled,
-				ForceNode = this.RequestConfiguration?.ForceNode
-			};
-			IRequestParameters requestParameters = new RootNodeInfoRequestParameters();
-			requestParameters.RequestConfiguration = requestOverrides;
-
-			var data = new RequestData(HttpMethod.HEAD, "/", null, this._settings, requestParameters, this._memoryStreamFactory) { Node = node };
-			audit.Path = data.PathAndQuery;
-			return data;
-		}
-
 		public void Ping(Node node)
 		{
 			if (PingDisabled(node)) return;
 
-			using (var audit = this.Audit(PingSuccess))
+			using (var audit = Audit(PingSuccess))
 			{
 				try
 				{
 					var pingData = CreatePingRequestData(node, audit);
-					var response = this._connection.Request<VoidResponse>(pingData);
+					var response = _connection.Request<VoidResponse>(pingData);
 					ThrowBadAuthPipelineExceptionWhenNeeded(response);
 					//ping should not silently accept bad but valid http responses
-					if (!response.Success) throw new PipelineException(pingData.OnFailurePipelineFailure, response.OriginalException) { ApiCall = response };
+					if (!response.Success)
+						throw new PipelineException(pingData.OnFailurePipelineFailure, response.OriginalException) { ApiCall = response };
 				}
 				catch (Exception e)
 				{
@@ -295,15 +393,16 @@ public async Task PingAsync(Node node, CancellationToken cancellationToken)
 		{
 			if (PingDisabled(node)) return;
 
-			using (var audit = this.Audit(PingSuccess))
+			using (var audit = Audit(PingSuccess))
 			{
 				try
 				{
 					var pingData = CreatePingRequestData(node, audit);
-					var response = await this._connection.RequestAsync<VoidResponse>(pingData, cancellationToken).ConfigureAwait(false);
+					var response = await _connection.RequestAsync<VoidResponse>(pingData, cancellationToken).ConfigureAwait(false);
 					ThrowBadAuthPipelineExceptionWhenNeeded(response);
 					//ping should not silently accept bad but valid http responses
-					if (!response.Success) throw new PipelineException(pingData.OnFailurePipelineFailure, response.OriginalException) { ApiCall = response };
+					if (!response.Success)
+						throw new PipelineException(pingData.OnFailurePipelineFailure, response.OriginalException) { ApiCall = response };
 				}
 				catch (Exception e)
 				{
@@ -315,66 +414,27 @@ public async Task PingAsync(Node node, CancellationToken cancellationToken)
 			}
 		}
 
-		private static void ThrowBadAuthPipelineExceptionWhenNeeded(IApiCallDetails details, IElasticsearchResponse response = null)
-		{
-			if (details?.HttpStatusCode == 401)
-				throw new PipelineException(PipelineFailure.BadAuthentication, details.OriginalException)
-				{
-					Response = response,
-					ApiCall = details
-				};
-		}
-
-		public static string SniffPath => "_nodes/http,settings";
-		private NodesInfoRequestParameters SniffParameters => new NodesInfoRequestParameters
-		{
-			Timeout = this.PingTimeout,
-			FlatSettings = true
-		};
-
-		public IEnumerable<Node> SniffNodes => this._connectionPool
-			.CreateView(LazyAuditable)
-			.ToList()
-			.OrderBy(n => n.MasterEligible ? n.Uri.Port : int.MaxValue);
-
-		private void LazyAuditable(AuditEvent e, Node n)
-		{
-			using (new Auditable(e, this.AuditTrail, this._dateTimeProvider) { Node = n }) {};
-		}
-
-		public void SniffOnConnectionFailure()
-		{
-			if (!this.SniffsOnConnectionFailure) return;
-			using (this.Audit(SniffOnFail))
-				this.Sniff();
-		}
-
-		public async Task SniffOnConnectionFailureAsync(CancellationToken cancellationToken)
-		{
-			if (!this.SniffsOnConnectionFailure) return;
-			using (this.Audit(SniffOnFail))
-				await this.SniffAsync(cancellationToken).ConfigureAwait(false);
-		}
-
 		public void Sniff()
 		{
 			var exceptions = new List<Exception>();
-			foreach (var node in this.SniffNodes)
+			foreach (var node in SniffNodes)
 			{
-				using (var audit = this.Audit(SniffSuccess))
+				using (var audit = Audit(SniffSuccess))
 				{
 					audit.Node = node;
 					try
 					{
 						var requestData = CreateSniffRequestData(node);
 						audit.Path = requestData.PathAndQuery;
-						var response = this._connection.Request<SniffResponse>(requestData);
+						var response = _connection.Request<SniffResponse>(requestData);
 						ThrowBadAuthPipelineExceptionWhenNeeded(response);
 						//sniff should not silently accept bad but valid http responses
-						if (!response.Success) throw new PipelineException(requestData.OnFailurePipelineFailure, response.OriginalException) { ApiCall = response };
-						var nodes = response.ToNodes(this._connectionPool.UsingSsl);
-						this._connectionPool.Reseed(nodes);
-						this.Refresh = true;
+						if (!response.Success)
+							throw new PipelineException(requestData.OnFailurePipelineFailure, response.OriginalException) { ApiCall = response };
+
+						var nodes = response.ToNodes(_connectionPool.UsingSsl);
+						_connectionPool.Reseed(nodes);
+						Refresh = true;
 						return;
 					}
 					catch (Exception e)
@@ -392,21 +452,23 @@ public void Sniff()
 		public async Task SniffAsync(CancellationToken cancellationToken)
 		{
 			var exceptions = new List<Exception>();
-			foreach (var node in this.SniffNodes)
+			foreach (var node in SniffNodes)
 			{
-				using (var audit = this.Audit(SniffSuccess))
+				using (var audit = Audit(SniffSuccess))
 				{
 					audit.Node = node;
 					try
 					{
 						var requestData = CreateSniffRequestData(node);
 						audit.Path = requestData.PathAndQuery;
-						var response = await this._connection.RequestAsync<SniffResponse>(requestData, cancellationToken).ConfigureAwait(false);
+						var response = await _connection.RequestAsync<SniffResponse>(requestData, cancellationToken).ConfigureAwait(false);
 						ThrowBadAuthPipelineExceptionWhenNeeded(response);
 						//sniff should not silently accept bad but valid http responses
-						if (!response.Success) throw new PipelineException(requestData.OnFailurePipelineFailure, response.OriginalException) { ApiCall = response };
-						this._connectionPool.Reseed(response.ToNodes(this._connectionPool.UsingSsl));
-						this.Refresh = true;
+						if (!response.Success)
+							throw new PipelineException(requestData.OnFailurePipelineFailure, response.OriginalException) { ApiCall = response };
+
+						_connectionPool.Reseed(response.ToNodes(_connectionPool.UsingSsl));
+						Refresh = true;
 						return;
 					}
 					catch (Exception e)
@@ -421,138 +483,103 @@ public async Task SniffAsync(CancellationToken cancellationToken)
 			throw new PipelineException(PipelineFailure.SniffFailure, exceptions.AsAggregateOrFirst());
 		}
 
-		private RequestData CreateSniffRequestData(Node node) =>
-			new RequestData(HttpMethod.GET, SniffPath, null, this._settings, this.SniffParameters, this._memoryStreamFactory)
-			{
-				Node = node
-			};
+		public void SniffOnConnectionFailure()
+		{
+			if (!SniffsOnConnectionFailure) return;
 
-		public TResponse CallElasticsearch<TResponse>(RequestData requestData)
-			where TResponse : class, IElasticsearchResponse, new()
+			using (Audit(SniffOnFail))
+				Sniff();
+		}
+
+		public async Task SniffOnConnectionFailureAsync(CancellationToken cancellationToken)
 		{
-			using (var audit = this.Audit(HealthyResponse))
-			{
-				audit.Node = requestData.Node;
-				audit.Path = requestData.PathAndQuery;
+			if (!SniffsOnConnectionFailure) return;
 
-				TResponse response = null;
-				try
-				{
-					response = this._connection.Request<TResponse>(requestData);
-					response.ApiCall.AuditTrail = this.AuditTrail;
-					ThrowBadAuthPipelineExceptionWhenNeeded(response.ApiCall, response);
-					if (!response.ApiCall.Success) audit.Event = requestData.OnFailureAuditEvent;
-					return response;
-				}
-				catch (Exception e)
-				{
-					(response as ElasticsearchResponse<Stream>)?.Body?.Dispose();
-					audit.Event = requestData.OnFailureAuditEvent;
-					audit.Exception = e;
-					throw;
-				}
-			}
+			using (Audit(SniffOnFail))
+				await SniffAsync(cancellationToken).ConfigureAwait(false);
 		}
 
-		public async Task<TResponse> CallElasticsearchAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
-			where TResponse : class, IElasticsearchResponse, new()
+		public void SniffOnStaleCluster()
 		{
-			using (var audit = this.Audit(HealthyResponse))
-			{
-				audit.Node = requestData.Node;
-				audit.Path = requestData.PathAndQuery;
+			if (!StaleClusterState) return;
 
-				TResponse response = null;
-				try
-				{
-					response = await this._connection.RequestAsync<TResponse>(requestData, cancellationToken).ConfigureAwait(false);
-					response.ApiCall.AuditTrail = this.AuditTrail;
-					ThrowBadAuthPipelineExceptionWhenNeeded(response.ApiCall, response);
-					if (!response.ApiCall.Success) audit.Event = requestData.OnFailureAuditEvent;
-					return response;
-				}
-				catch (Exception e)
-				{
-					(response as ElasticsearchResponse<Stream>)?.Body?.Dispose();
-					audit.Event = requestData.OnFailureAuditEvent;
-					audit.Exception = e;
-					throw;
-				}
+			using (Audit(AuditEvent.SniffOnStaleCluster))
+			{
+				Sniff();
+				_connectionPool.SniffedOnStartup = true;
 			}
 		}
 
-		public void BadResponse<TResponse>(ref TResponse response, IApiCallDetails callDetails, RequestData data, ElasticsearchClientException exception)
-			where TResponse : class, IElasticsearchResponse, new()
+		public async Task SniffOnStaleClusterAsync(CancellationToken cancellationToken)
 		{
-			if (response == null)
+			if (!StaleClusterState) return;
+
+			using (Audit(AuditEvent.SniffOnStaleCluster))
 			{
-				//make sure we copy over the error body in case we disabled direct streaming.
-				var s = callDetails?.ResponseBodyInBytes == null ? Stream.Null : new MemoryStream(callDetails.ResponseBodyInBytes);
-				var m = callDetails?.ResponseMimeType ?? RequestData.MimeType;
-				response = ResponseBuilder.ToResponse<TResponse>(data, exception, callDetails?.HttpStatusCode, null, s, m);
+				await SniffAsync(cancellationToken).ConfigureAwait(false);
+				_connectionPool.SniffedOnStartup = true;
 			}
-
-			response.ApiCall.AuditTrail = this.AuditTrail;
 		}
 
-		public ElasticsearchClientException CreateClientException<TResponse>(
-			TResponse response, IApiCallDetails callDetails, RequestData data, List<PipelineException> pipelineExceptions
-		)
-			where TResponse : class, IElasticsearchResponse, new()
+		public void ThrowNoNodesAttempted(RequestData requestData, List<PipelineException> seenExceptions)
 		{
-			if (callDetails?.Success ?? false) return null;
-			var innerException = pipelineExceptions.HasAny() ? pipelineExceptions.AsAggregateOrFirst() : callDetails?.OriginalException;
-
-			var statusCode = callDetails?.HttpStatusCode != null ? callDetails.HttpStatusCode.Value.ToString() : "unknown";
-			var resource = callDetails == null
-				? "unknown resource"
-				: $"Status code {statusCode} from: {callDetails.HttpMethod} {callDetails.Uri.PathAndQuery}";
+			var clientException = new ElasticsearchClientException(PipelineFailure.NoNodesAttempted, NoNodesAttemptedMessage, (Exception)null);
+			using (Audit(NoNodesAttempted))
+				throw new UnexpectedElasticsearchClientException(clientException, seenExceptions)
+				{
+					Request = requestData,
+					AuditTrail = AuditTrail
+				};
+		}
 
+		private bool PingDisabled(Node node) =>
+			(RequestConfiguration?.DisablePing).GetValueOrDefault(false)
+			|| _settings.DisablePings || !_connectionPool.SupportsPinging || !node.IsResurrected;
 
-			var exceptionMessage = innerException?.Message ?? $"Request failed to execute";
+		private Auditable Audit(AuditEvent type) => new Auditable(type, AuditTrail, _dateTimeProvider);
 
-			var pipelineFailure = data.OnFailurePipelineFailure;
-			if (pipelineExceptions.HasAny())
-				pipelineFailure = pipelineExceptions.Last().FailureReason;
+		private RequestData CreatePingRequestData(Node node, Auditable audit)
+		{
+			audit.Node = node;
 
-			if (this.IsTakingTooLong)
-			{
-				pipelineFailure = PipelineFailure.MaxTimeoutReached;
-				this.Audit(MaxTimeoutReached);
-				exceptionMessage = "Maximum timeout reached while retrying request";
-			}
-			else if (this.Retried >= this.MaxRetries && this.MaxRetries > 0)
+			var requestOverrides = new RequestConfiguration
 			{
-				pipelineFailure = PipelineFailure.MaxRetriesReached;
-				this.Audit(MaxRetriesReached);
-				exceptionMessage = "Maximum number of retries reached";
+				PingTimeout = PingTimeout,
+				RequestTimeout = PingTimeout,
+				BasicAuthenticationCredentials = _settings.BasicAuthenticationCredentials,
+				EnableHttpPipelining = RequestConfiguration?.EnableHttpPipelining ?? _settings.HttpPipeliningEnabled,
+				ForceNode = RequestConfiguration?.ForceNode
+			};
+			IRequestParameters requestParameters = new RootNodeInfoRequestParameters();
+			requestParameters.RequestConfiguration = requestOverrides;
 
-				var now = this._dateTimeProvider.Now();
-				// TODO make AliveNodes on IConnectionPool public in 7.0 (default interface C# 8 FTW)
-				var activeNodes = this._connectionPool.Nodes.Count(n => n.IsAlive || n.DeadUntil <= now);
-				if (this.Retried >= activeNodes)
+			var data = new RequestData(HttpMethod.HEAD, "/", null, _settings, requestParameters, _memoryStreamFactory) { Node = node };
+			audit.Path = data.PathAndQuery;
+			return data;
+		}
+
+		private static void ThrowBadAuthPipelineExceptionWhenNeeded(IApiCallDetails details, IElasticsearchResponse response = null)
+		{
+			if (details?.HttpStatusCode == 401)
+				throw new PipelineException(PipelineFailure.BadAuthentication, details.OriginalException)
 				{
-                    this.Audit(FailedOverAllNodes);
-                    exceptionMessage += ", failed over to all the known alive nodes before failing";
-				}
-			}
+					Response = response,
+					ApiCall = details
+				};
+		}
 
-			exceptionMessage += $". Call: {resource}";
-			if (response != null && response.TryGetServerErrorReason(out var reason))
-				exceptionMessage += $". ServerError: {reason}";
+		private void LazyAuditable(AuditEvent e, Node n)
+		{
+			using (new Auditable(e, AuditTrail, _dateTimeProvider) { Node = n }) { }
+			;
+		}
 
-			var clientException = new ElasticsearchClientException(pipelineFailure, exceptionMessage, innerException)
+		private RequestData CreateSniffRequestData(Node node) =>
+			new RequestData(HttpMethod.GET, SniffPath, null, _settings, SniffParameters, _memoryStreamFactory)
 			{
-				Request = data,
-				Response = callDetails,
-				AuditTrail = this.AuditTrail
+				Node = node
 			};
 
-			return clientException;
-		}
-
-		void IDisposable.Dispose() => this.Dispose();
-
 		protected virtual void Dispose() { }
 	}
 }
diff --git a/src/Elasticsearch.Net/Transport/Pipeline/ResponseBuilder.cs b/src/Elasticsearch.Net/Transport/Pipeline/ResponseBuilder.cs
index 26c6e21d048..2f32f9fca28 100644
--- a/src/Elasticsearch.Net/Transport/Pipeline/ResponseBuilder.cs
+++ b/src/Elasticsearch.Net/Transport/Pipeline/ResponseBuilder.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -12,6 +11,11 @@ public static class ResponseBuilder
 	{
 		public const int BufferSize = 81920;
 
+		private static readonly Type[] SpecialTypes =
+			{ typeof(StringResponse), typeof(BytesResponse), typeof(VoidResponse), typeof(DynamicResponse) };
+
+		private static readonly VoidResponse StaticVoid = new VoidResponse { Body = new VoidResponse.VoidBody() };
+
 		public static TResponse ToResponse<TResponse>(
 			RequestData requestData,
 			Exception ex,
@@ -19,7 +23,7 @@ public static TResponse ToResponse<TResponse>(
 			IEnumerable<string> warnings,
 			Stream responseStream,
 			string mimeType = RequestData.MimeType
-			)
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
 			responseStream.ThrowIfNull(nameof(responseStream));
@@ -37,7 +41,7 @@ public static async Task<TResponse> ToResponseAsync<TResponse>(
 			Stream responseStream,
 			string mimeType = RequestData.MimeType,
 			CancellationToken cancellationToken = default(CancellationToken)
-			)
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
 			responseStream.ThrowIfNull(nameof(responseStream));
@@ -49,17 +53,16 @@ public static async Task<TResponse> ToResponseAsync<TResponse>(
 		}
 
 		private static ApiCallDetails Initialize(
-			RequestData requestData, Exception exception, int? statusCode, IEnumerable<string> warnings, string mimeType)
+			RequestData requestData, Exception exception, int? statusCode, IEnumerable<string> warnings, string mimeType
+		)
 		{
 			var success = false;
 			var allowedStatusCodes = requestData.AllowedStatusCodes.ToList();
 			if (statusCode.HasValue)
-			{
 				success = statusCode >= 200 && statusCode < 300
-				          || (requestData.Method == HttpMethod.HEAD && statusCode == 404)
-				          || allowedStatusCodes.Contains(statusCode.Value)
-				          || allowedStatusCodes.Contains(-1);
-			}
+					|| requestData.Method == HttpMethod.HEAD && statusCode == 404
+					|| allowedStatusCodes.Contains(statusCode.Value)
+					|| allowedStatusCodes.Contains(-1);
 			var details = new ApiCallDetails
 			{
 				Success = success,
@@ -96,14 +99,16 @@ private static TResponse SetBody<TResponse>(ApiCallDetails details, RequestData
 					return null;
 
 				if (requestData.CustomConverter != null) return requestData.CustomConverter(details, responseStream) as TResponse;
+
 				return mimeType == null || !mimeType.StartsWith(requestData.RequestMimeType, StringComparison.Ordinal)
-						? null
-					 	: requestData.ConnectionSettings.RequestResponseSerializer.Deserialize<TResponse>(responseStream);
+					? null
+					: requestData.ConnectionSettings.RequestResponseSerializer.Deserialize<TResponse>(responseStream);
 			}
 		}
 
 		private static async Task<TResponse> SetBodyAsync<TResponse>(
-			ApiCallDetails details, RequestData requestData, Stream responseStream, string mimeType, CancellationToken cancellationToken)
+			ApiCallDetails details, RequestData requestData, Stream responseStream, string mimeType, CancellationToken cancellationToken
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
 			byte[] bytes = null;
@@ -124,18 +129,15 @@ private static async Task<TResponse> SetBodyAsync<TResponse>(
 					return null;
 
 				if (requestData.CustomConverter != null) return requestData.CustomConverter(details, responseStream) as TResponse;
+
 				return mimeType == null || !mimeType.StartsWith(requestData.RequestMimeType, StringComparison.Ordinal)
-						? null
-					 	: await requestData.ConnectionSettings.RequestResponseSerializer
-							.DeserializeAsync<TResponse>(responseStream, cancellationToken)
-							.ConfigureAwait(false);
+					? null
+					: await requestData.ConnectionSettings.RequestResponseSerializer
+						.DeserializeAsync<TResponse>(responseStream, cancellationToken)
+						.ConfigureAwait(false);
 			}
 		}
 
-		private static readonly VoidResponse StaticVoid = new VoidResponse { Body = new VoidResponse.VoidBody() };
-		private static readonly Type[] SpecialTypes =
-			{typeof(StringResponse), typeof(BytesResponse), typeof(VoidResponse), typeof(DynamicResponse)};
-
 		private static bool SetSpecialTypes<TResponse>(byte[] bytes, out TResponse cs)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
diff --git a/src/Elasticsearch.Net/Transport/PostData.cs b/src/Elasticsearch.Net/Transport/PostData.cs
index 96639d0cb3a..079ff170c59 100644
--- a/src/Elasticsearch.Net/Transport/PostData.cs
+++ b/src/Elasticsearch.Net/Transport/PostData.cs
@@ -9,6 +9,7 @@ public interface IPostData
 	{
 		void Write(Stream writableStream, IConnectionConfigurationValues settings);
 	}
+
 	public interface IPostData<out T> : IPostData { }
 
 	public enum PostType
@@ -23,60 +24,90 @@ public enum PostType
 	public abstract class PostData
 	{
 		protected const int BufferSize = 81920;
-		protected static readonly byte[] NewLineByteArray = { (byte)'\n' };
 		protected const string NewLineString = "\n";
+		protected static readonly byte[] NewLineByteArray = { (byte)'\n' };
 
 		public bool? DisableDirectStreaming { get; set; }
-		public byte[] WrittenBytes { get; protected set; }
 		public PostType Type { get; protected set; }
+		public byte[] WrittenBytes { get; protected set; }
 
 		public abstract void Write(Stream writableStream, IConnectionConfigurationValues settings);
 
 		public abstract Task WriteAsync(Stream writableStream, IConnectionConfigurationValues settings, CancellationToken cancellationToken);
 
-		public static implicit operator PostData(byte[] byteArray) => PostData.Bytes(byteArray);
-		public static implicit operator PostData(string literalString) => PostData.String(literalString);
+		public static implicit operator PostData(byte[] byteArray) => Bytes(byteArray);
+
+		public static implicit operator PostData(string literalString) => String(literalString);
 
 		public static SerializableData<T> Serializable<T>(T o) => new SerializableData<T>(o);
+
 		public static PostData MultiJson(IEnumerable<string> listOfString) => new PostData<object>(listOfString);
+
 		public static PostData MultiJson(IEnumerable<object> listOfObjects) => new PostData<object>(listOfObjects);
+
 		public static PostData Bytes(byte[] bytes) => new PostData<object>(bytes);
+
 		public static PostData String(string serializedString) => new PostData<object>(serializedString);
 	}
 
 	public class PostData<T> : PostData, IPostData<T>
 	{
-		private readonly string _literalString;
-		private readonly IEnumerable<string> _enumurableOfStrings;
 		private readonly IEnumerable<object> _enumerableOfObject;
+		private readonly IEnumerable<string> _enumurableOfStrings;
+		private readonly string _literalString;
 		private readonly T _serializable;
 
-		protected internal PostData(byte[] item) { WrittenBytes = item; Type = PostType.ByteArray; }
-		protected internal PostData(string item) { _literalString = item; Type = PostType.LiteralString; }
-		protected internal PostData(IEnumerable<string> item) { _enumurableOfStrings = item; Type = PostType.EnumerableOfString; }
-		protected internal PostData(IEnumerable<object> item) { _enumerableOfObject = item; Type = PostType.EnumerableOfObject; }
+		protected internal PostData(byte[] item)
+		{
+			WrittenBytes = item;
+			Type = PostType.ByteArray;
+		}
+
+		protected internal PostData(string item)
+		{
+			_literalString = item;
+			Type = PostType.LiteralString;
+		}
+
+		protected internal PostData(IEnumerable<string> item)
+		{
+			_enumurableOfStrings = item;
+			Type = PostType.EnumerableOfString;
+		}
+
+		protected internal PostData(IEnumerable<object> item)
+		{
+			_enumerableOfObject = item;
+			Type = PostType.EnumerableOfObject;
+		}
+
 		private PostData(T item)
 		{
 			var boxedType = item.GetType();
 			if (typeof(byte[]).AssignableFrom(boxedType))
 			{
-				WrittenBytes = item as byte[]; Type = PostType.ByteArray;
+				WrittenBytes = item as byte[];
+				Type = PostType.ByteArray;
 			}
 			else if (typeof(string).AssignableFrom(boxedType))
 			{
-				_literalString = item as string; Type = PostType.LiteralString;
+				_literalString = item as string;
+				Type = PostType.LiteralString;
 			}
 			else if (typeof(IEnumerable<string>).AssignableFrom(boxedType))
 			{
-				_enumurableOfStrings = (IEnumerable<string>)item; Type = PostType.EnumerableOfString;
+				_enumurableOfStrings = (IEnumerable<string>)item;
+				Type = PostType.EnumerableOfString;
 			}
 			else if (typeof(IEnumerable<object>).AssignableFrom(boxedType))
 			{
-				_enumerableOfObject = (IEnumerable<object>)item; Type = PostType.EnumerableOfObject;
+				_enumerableOfObject = (IEnumerable<object>)item;
+				Type = PostType.EnumerableOfObject;
 			}
 			else
 			{
-				_serializable = item; Type = PostType.Serializable;
+				_serializable = item;
+				Type = PostType.Serializable;
 			}
 		}
 
@@ -94,12 +125,14 @@ public override void Write(Stream writableStream, IConnectionConfigurationValues
 					ms = !string.IsNullOrEmpty(_literalString) ? new MemoryStream(_literalString?.Utf8Bytes()) : null;
 					break;
 				case PostType.EnumerableOfString:
-					ms = _enumurableOfStrings.HasAny() ? new MemoryStream((string.Join(NewLineString, _enumurableOfStrings) + NewLineString).Utf8Bytes()) : null;
+					ms = _enumurableOfStrings.HasAny()
+						? new MemoryStream((string.Join(NewLineString, _enumurableOfStrings) + NewLineString).Utf8Bytes())
+						: null;
 					break;
 				case PostType.EnumerableOfObject:
 					if (!_enumerableOfObject.HasAny()) return;
 
-					if (this.DisableDirectStreaming ?? settings.DisableDirectStreaming)
+					if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 					{
 						ms = new MemoryStream();
 						stream = ms;
@@ -113,12 +146,12 @@ public override void Write(Stream writableStream, IConnectionConfigurationValues
 					break;
 				case PostType.Serializable:
 					stream = writableStream;
-					if (this.DisableDirectStreaming ?? settings.DisableDirectStreaming)
+					if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 					{
 						ms = new MemoryStream();
 						stream = ms;
 					}
-					settings.RequestResponseSerializer.Serialize(this._serializable, stream, indent);
+					settings.RequestResponseSerializer.Serialize(_serializable, stream, indent);
 					break;
 			}
 			if (ms != null)
@@ -126,14 +159,15 @@ public override void Write(Stream writableStream, IConnectionConfigurationValues
 				ms.Position = 0;
 				ms.CopyTo(writableStream, BufferSize);
 			}
-			if (this.Type != 0)
-				this.WrittenBytes = ms?.ToArray();
+			if (Type != 0)
+				WrittenBytes = ms?.ToArray();
 		}
 
 		public override async Task WriteAsync(Stream writableStream, IConnectionConfigurationValues settings, CancellationToken cancellationToken)
 		{
 			var indent = settings.PrettyJson ? SerializationFormatting.Indented : SerializationFormatting.None;
-			MemoryStream ms = null; Stream stream = null;
+			MemoryStream ms = null;
+			Stream stream = null;
 			switch (Type)
 			{
 				case PostType.ByteArray:
@@ -143,11 +177,14 @@ public override async Task WriteAsync(Stream writableStream, IConnectionConfigur
 					ms = !string.IsNullOrEmpty(_literalString) ? new MemoryStream(_literalString.Utf8Bytes()) : null;
 					break;
 				case PostType.EnumerableOfString:
-					ms = _enumurableOfStrings.HasAny() ? new MemoryStream((string.Join(NewLineString, _enumurableOfStrings) + NewLineString).Utf8Bytes()) : null;
+					ms = _enumurableOfStrings.HasAny()
+						? new MemoryStream((string.Join(NewLineString, _enumurableOfStrings) + NewLineString).Utf8Bytes())
+						: null;
 					break;
 				case PostType.EnumerableOfObject:
 					if (!_enumerableOfObject.HasAny()) return;
-					if (this.DisableDirectStreaming ?? settings.DisableDirectStreaming)
+
+					if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 					{
 						ms = new MemoryStream();
 						stream = ms;
@@ -155,18 +192,19 @@ public override async Task WriteAsync(Stream writableStream, IConnectionConfigur
 					else stream = writableStream;
 					foreach (var o in _enumerableOfObject)
 					{
-						await settings.RequestResponseSerializer.SerializeAsync(o, stream, SerializationFormatting.None, cancellationToken).ConfigureAwait(false);
+						await settings.RequestResponseSerializer.SerializeAsync(o, stream, SerializationFormatting.None, cancellationToken)
+							.ConfigureAwait(false);
 						await stream.WriteAsync(NewLineByteArray, 0, 1, cancellationToken).ConfigureAwait(false);
 					}
 					break;
 				case PostType.Serializable:
 					stream = writableStream;
-					if (this.DisableDirectStreaming ?? settings.DisableDirectStreaming)
+					if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 					{
 						ms = new MemoryStream();
 						stream = ms;
 					}
-					await settings.RequestResponseSerializer.SerializeAsync(this._serializable, stream, indent, cancellationToken).ConfigureAwait(false);
+					await settings.RequestResponseSerializer.SerializeAsync(_serializable, stream, indent, cancellationToken).ConfigureAwait(false);
 					break;
 			}
 			if (ms != null)
@@ -174,8 +212,8 @@ public override async Task WriteAsync(Stream writableStream, IConnectionConfigur
 				ms.Position = 0;
 				await ms.CopyToAsync(writableStream, BufferSize, cancellationToken).ConfigureAwait(false);
 			}
-			if (this.Type != 0)
-				this.WrittenBytes = ms?.ToArray();
+			if (Type != 0)
+				WrittenBytes = ms?.ToArray();
 		}
 	}
 }
diff --git a/src/Elasticsearch.Net/Transport/SerializableData.cs b/src/Elasticsearch.Net/Transport/SerializableData.cs
index 8c8c43bab55..fc084b92be1 100644
--- a/src/Elasticsearch.Net/Transport/SerializableData.cs
+++ b/src/Elasticsearch.Net/Transport/SerializableData.cs
@@ -13,46 +13,47 @@ public SerializableData(T item)
 			Type = PostType.Serializable;
 			_serializable = item;
 		}
-		public static implicit operator SerializableData<T>(T serialiableData) => new SerializableData<T>(serialiableData);
 
 		public override void Write(Stream writableStream, IConnectionConfigurationValues settings)
 		{
 			var indent = settings.PrettyJson ? SerializationFormatting.Indented : SerializationFormatting.None;
 			var stream = writableStream;
 			MemoryStream ms = null;
-			if (this.DisableDirectStreaming ?? settings.DisableDirectStreaming)
+			if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 			{
 				ms = new MemoryStream();
 				stream = ms;
 			}
-			settings.RequestResponseSerializer.Serialize(this._serializable, stream, indent);
+			settings.RequestResponseSerializer.Serialize(_serializable, stream, indent);
 			if (ms != null)
 			{
 				ms.Position = 0;
 				ms.CopyTo(writableStream, BufferSize);
 			}
-			if (this.Type != 0)
-				this.WrittenBytes = ms?.ToArray();
+			if (Type != 0)
+				WrittenBytes = ms?.ToArray();
 		}
 
+		public static implicit operator SerializableData<T>(T serialiableData) => new SerializableData<T>(serialiableData);
+
 		public override async Task WriteAsync(Stream writableStream, IConnectionConfigurationValues settings, CancellationToken cancellationToken)
 		{
 			var indent = settings.PrettyJson ? SerializationFormatting.Indented : SerializationFormatting.None;
 			var stream = writableStream;
 			MemoryStream ms = null;
-			if (this.DisableDirectStreaming ?? settings.DisableDirectStreaming)
+			if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 			{
 				ms = new MemoryStream();
 				stream = ms;
 			}
-			await settings.RequestResponseSerializer.SerializeAsync(this._serializable, stream, indent, cancellationToken).ConfigureAwait(false);
+			await settings.RequestResponseSerializer.SerializeAsync(_serializable, stream, indent, cancellationToken).ConfigureAwait(false);
 			if (ms != null)
 			{
 				ms.Position = 0;
 				await ms.CopyToAsync(writableStream, BufferSize, cancellationToken).ConfigureAwait(false);
 			}
-			if (this.Type != 0)
-				this.WrittenBytes = ms?.ToArray();
+			if (Type != 0)
+				WrittenBytes = ms?.ToArray();
 		}
 	}
 }
diff --git a/src/Elasticsearch.Net/Transport/Transport.cs b/src/Elasticsearch.Net/Transport/Transport.cs
index 425ae3ffb42..d68ecb3e312 100644
--- a/src/Elasticsearch.Net/Transport/Transport.cs
+++ b/src/Elasticsearch.Net/Transport/Transport.cs
@@ -1,10 +1,11 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Threading;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 #if !DOTNETCORE
 using System.Net;
+
 #endif
 
 namespace Elasticsearch.Net
@@ -12,12 +13,6 @@ namespace Elasticsearch.Net
 	public class Transport<TConnectionSettings> : ITransport<TConnectionSettings>
 		where TConnectionSettings : IConnectionConfigurationValues
 	{
-		public TConnectionSettings Settings { get; }
-
-		private IDateTimeProvider DateTimeProvider { get; }
-		private IMemoryStreamFactory MemoryStreamFactory { get; }
-		private IRequestPipelineFactory PipelineProvider { get; }
-
 		/// <summary>
 		/// Transport coordinates the client requests over the connection pool nodes and is in charge of falling over on different nodes
 		/// </summary>
@@ -36,28 +31,34 @@ public Transport(
 			IRequestPipelineFactory pipelineProvider,
 			IDateTimeProvider dateTimeProvider,
 			IMemoryStreamFactory memoryStreamFactory
-			)
+		)
 		{
 			configurationValues.ThrowIfNull(nameof(configurationValues));
 			configurationValues.ConnectionPool.ThrowIfNull(nameof(configurationValues.ConnectionPool));
 			configurationValues.Connection.ThrowIfNull(nameof(configurationValues.Connection));
 			configurationValues.RequestResponseSerializer.ThrowIfNull(nameof(configurationValues.RequestResponseSerializer));
 
-			this.Settings = configurationValues;
-			this.PipelineProvider = pipelineProvider ?? new RequestPipelineFactory();
-			this.DateTimeProvider = dateTimeProvider ?? Elasticsearch.Net.DateTimeProvider.Default;
-			this.MemoryStreamFactory = memoryStreamFactory ?? configurationValues.MemoryStreamFactory;
+			Settings = configurationValues;
+			PipelineProvider = pipelineProvider ?? new RequestPipelineFactory();
+			DateTimeProvider = dateTimeProvider ?? Net.DateTimeProvider.Default;
+			MemoryStreamFactory = memoryStreamFactory ?? configurationValues.MemoryStreamFactory;
 		}
 
+		public TConnectionSettings Settings { get; }
+
+		private IDateTimeProvider DateTimeProvider { get; }
+		private IMemoryStreamFactory MemoryStreamFactory { get; }
+		private IRequestPipelineFactory PipelineProvider { get; }
+
 		public TResponse Request<TResponse>(HttpMethod method, string path, PostData data = null, IRequestParameters requestParameters = null)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
-			using (var pipeline = this.PipelineProvider.Create(this.Settings, this.DateTimeProvider, this.MemoryStreamFactory, requestParameters))
+			using (var pipeline = PipelineProvider.Create(Settings, DateTimeProvider, MemoryStreamFactory, requestParameters))
 			{
-				pipeline.FirstPoolUsage(this.Settings.BootstrapLock);
+				pipeline.FirstPoolUsage(Settings.BootstrapLock);
 
-				var requestData = new RequestData(method, path, data, this.Settings, requestParameters, this.MemoryStreamFactory);
-				this.Settings.OnRequestDataCreated?.Invoke(requestData);
+				var requestData = new RequestData(method, path, data, Settings, requestParameters, MemoryStreamFactory);
+				Settings.OnRequestDataCreated?.Invoke(requestData);
 				TResponse response = null;
 
 				var seenExceptions = new List<PipelineException>();
@@ -94,6 +95,7 @@ public TResponse Request<TResponse>(HttpMethod method, string path, PostData dat
 						};
 					}
 					if (response == null || !response.ApiCall.SuccessOrKnownError) continue;
+
 					pipeline.MarkAlive(node);
 					break;
 				}
@@ -101,15 +103,17 @@ public TResponse Request<TResponse>(HttpMethod method, string path, PostData dat
 			}
 		}
 
-		public async Task<TResponse> RequestAsync<TResponse>(HttpMethod method, string path, CancellationToken cancellationToken, PostData data = null, IRequestParameters requestParameters = null)
+		public async Task<TResponse> RequestAsync<TResponse>(HttpMethod method, string path, CancellationToken cancellationToken,
+			PostData data = null, IRequestParameters requestParameters = null
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
-			using (var pipeline = this.PipelineProvider.Create(this.Settings, this.DateTimeProvider, this.MemoryStreamFactory, requestParameters))
+			using (var pipeline = PipelineProvider.Create(Settings, DateTimeProvider, MemoryStreamFactory, requestParameters))
 			{
-				await pipeline.FirstPoolUsageAsync(this.Settings.BootstrapLock, cancellationToken).ConfigureAwait(false);
+				await pipeline.FirstPoolUsageAsync(Settings.BootstrapLock, cancellationToken).ConfigureAwait(false);
 
-				var requestData = new RequestData(method, path, data, this.Settings, requestParameters, this.MemoryStreamFactory);
-				this.Settings.OnRequestDataCreated?.Invoke(requestData);
+				var requestData = new RequestData(method, path, data, Settings, requestParameters, MemoryStreamFactory);
+				Settings.OnRequestDataCreated?.Invoke(requestData);
 				TResponse response = null;
 
 				var seenExceptions = new List<PipelineException>();
@@ -151,6 +155,7 @@ public async Task<TResponse> RequestAsync<TResponse>(HttpMethod method, string p
 						break;
 					}
 					if (response == null || !response.ApiCall.SuccessOrKnownError) continue;
+
 					pipeline.MarkAlive(node);
 					break;
 				}
@@ -159,7 +164,8 @@ public async Task<TResponse> RequestAsync<TResponse>(HttpMethod method, string p
 		}
 
 		private static void HandlePipelineException<TResponse>(
-			ref TResponse response, PipelineException ex, IRequestPipeline pipeline, Node node, List<PipelineException> seenExceptions)
+			ref TResponse response, PipelineException ex, IRequestPipeline pipeline, Node node, List<PipelineException> seenExceptions
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
 			if (response == null) response = ex.Response as TResponse;
@@ -168,7 +174,8 @@ private static void HandlePipelineException<TResponse>(
 		}
 
 		private TResponse FinalizeResponse<TResponse>(RequestData requestData, IRequestPipeline pipeline, List<PipelineException> seenExceptions,
-			TResponse response) where TResponse : class, IElasticsearchResponse, new()
+			TResponse response
+		) where TResponse : class, IElasticsearchResponse, new()
 		{
 			if (requestData.Node == null) //foreach never ran
 				pipeline.ThrowNoNodesAttempted(requestData, seenExceptions);
@@ -186,7 +193,7 @@ private TResponse FinalizeResponse<TResponse>(RequestData requestData, IRequestP
 		private static IApiCallDetails GetMostRecentCallDetails<TResponse>(TResponse response, IEnumerable<PipelineException> seenExceptions)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
-			var callDetails = response?.ApiCall ?? seenExceptions.LastOrDefault(e=>e.ApiCall != null)?.ApiCall;
+			var callDetails = response?.ApiCall ?? seenExceptions.LastOrDefault(e => e.ApiCall != null)?.ApiCall;
 			return callDetails;
 		}
 
@@ -209,7 +216,7 @@ private void HandleElasticsearchClientException(RequestData data, Exception clie
 #endif
 			}
 
-			this.Settings.OnRequestCompleted?.Invoke(response.ApiCall);
+			Settings.OnRequestCompleted?.Invoke(response.ApiCall);
 			if (clientException != null && data.ThrowExceptions) throw clientException;
 		}
 
@@ -238,6 +245,5 @@ private static async Task PingAsync(IRequestPipeline pipeline, Node node, Cancel
 				throw;
 			}
 		}
-
 	}
 }
diff --git a/src/Elasticsearch.sln.DotSettings b/src/Elasticsearch.sln.DotSettings
index c5e478c115b..c0aa08ce146 100644
--- a/src/Elasticsearch.sln.DotSettings
+++ b/src/Elasticsearch.sln.DotSettings
@@ -1,17 +1,23 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntelliSenseCompletingCharacters/CSharpCompletingCharacters/UpgradedFromVSSettings/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=56A87048_002D9065_002D459B_002D826D_002D3DF68B409845_002Fd_003AViews/@EntryIndexedValue">56A87048-9065-459B-826D-3DF68B409845/d:Views</s:String>
+	<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=_002A_002Edoc_002Ecs/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=_002A_002EDoc_002Ecs/@EntryIndexedValue">*.Doc.cs</s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=_002A_002Edoc_002Ecs/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StyleCop_002ESA1124/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=SilentCodeCleanUp/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="SilentCodeCleanUp"&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_IMPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;IMPLICIT_WHEN_INITIALIZER_HAS_TYPE&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_IMPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=SilentCodeCleanUp/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="SilentCodeCleanUp"&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_IMPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;IMPLICIT_WHEN_INITIALIZER_HAS_TYPE&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_IMPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" /&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
   &amp;lt;option name="myName" value="SilentCodeCleanUp" /&amp;gt;&#xD;
-&amp;lt;/profile&amp;gt;&lt;/IDEA_SETTINGS&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="False" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="False" ArrangeArgumentsStyle="False" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" /&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+&amp;lt;/profile&amp;gt;&lt;/IDEA_SETTINGS&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">SilentCodeCleanUp</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">SilentCodeCleanUp</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGNMENT_TAB_FILL_STYLE/@EntryValue">OPTIMAL_FILL</s:String>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_AUTO_PROPERTY/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AFTER_BLOCK_STATEMENTS/@EntryValue">0</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AFTER_CONTROL_TRANSFER_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_AUTO_PROPERTY/@EntryValue">0</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_PROPERTY/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_PROPERTY/@EntryValue">0</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">TOGETHER_SAME_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FIXED_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOR_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOREACH_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
@@ -32,11 +38,15 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/USE_INDENT_FROM_VS/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_DECLARATION_RPAR/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_EXTENDS_COLON/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">150</s:Int64>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentSubtags/@EntryValue">DoNotTouch</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentTagContent/@EntryValue">DoNotTouch</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
   &lt;TypePattern DisplayName="COM interfaces or structs" RemoveRegions="All" Priority="100"&gt;&#xD;
@@ -225,12 +235,7 @@
         &lt;Name Is="Enter Pattern Here" /&gt;&#xD;
       &lt;/Entry.SortBy&gt;&#xD;
     &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members"&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Access /&gt;&#xD;
-        &lt;Name Is="Enter Pattern Here" /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
     &lt;Entry DisplayName="Nested Types"&gt;&#xD;
       &lt;Entry.Match&gt;&#xD;
         &lt;Kind Is="Type" /&gt;&#xD;
@@ -462,68 +467,15 @@
 	<s:Boolean x:Key="/Default/CodeStyle/IntroduceVariableUseVar/UseVarForIntroduceVariableRefactoring/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/LiveTemplatesUseVar/UseVar/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KM/@EntryIndexedValue">KM</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=AutoRecoverer/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=Format/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=Roslyn_002Dswea/@EntryIndexedValue">DO_NOTHING</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=ShowAnnotations/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=SolExp_002DTrack/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=StartPage_002DIsDownloadRefreshEnabled/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=StartPage_002DOnEnvironmentStatup/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=SyncSettings/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=TextEditor_002DCodeLens/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=TextEditor_002DTrackChanges_002D2/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=VCS/@EntryIndexedValue">LIVE_MONITOR</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=VsBulb/@EntryIndexedValue">DO_NOTHING</s:String>
-	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=XAML_0020Designer/@EntryIndexedValue">LIVE_MONITOR</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/HighlightingManager/HighlightingEnabledByDefault/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=B68C83B0AE11204AAA509A6033251E74/@KeyIndexDefined">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=B68C83B0AE11204AAA509A6033251E74/Color/@EntryValue">HotTrack</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=B68C83B0AE11204AAA509A6033251E74/Name/@EntryValue">Hack</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=B68C83B0AE11204AAA509A6033251E74/Pattern/@EntryValue">(?&lt;=\W|^)(?&lt;TAG&gt;HACK)(\W|$)(.*)</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=B68C83B0AE11204AAA509A6033251E74/TodoIconStyle/@EntryValue">Warning</s:String>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/Nest/Aggregations/AggregateDictionary.cs b/src/Nest/Aggregations/AggregateDictionary.cs
index 94fcf5ab8c6..fa46421ce6f 100644
--- a/src/Nest/Aggregations/AggregateDictionary.cs
+++ b/src/Nest/Aggregations/AggregateDictionary.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -12,10 +11,12 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregateDictionaryConverter))]
 	public class AggregateDictionary : IsAReadOnlyDictionaryBase<string, IAggregate>
 	{
-		public static AggregateDictionary Default { get; } = new AggregateDictionary(EmptyReadOnly<string, IAggregate>.Dictionary);
+		internal static readonly char[] TypedKeysSeparator = { '#' };
 
 		public AggregateDictionary(IReadOnlyDictionary<string, IAggregate> backingDictionary) : base(backingDictionary) { }
 
+		public static AggregateDictionary Default { get; } = new AggregateDictionary(EmptyReadOnly<string, IAggregate>.Dictionary);
+
 		protected override string Sanitize(string key)
 		{
 			//typed_keys = true on results in aggregation keys being returned as "<type>#<name>"
@@ -23,103 +24,102 @@ protected override string Sanitize(string key)
 			return tokens.Length > 1 ? tokens[1] : tokens[0];
 		}
 
-		internal static readonly char[] TypedKeysSeparator = {'#'};
 		internal static string[] TypedKeyTokens(string key)
 		{
 			var tokens = key.Split(TypedKeysSeparator, 2, StringSplitOptions.RemoveEmptyEntries);
 			return tokens;
 		}
 
-		public ValueAggregate Min(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate Min(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate Max(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate Max(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate Sum(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate Sum(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate Cardinality(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate Cardinality(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate Average(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate Average(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate ValueCount(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate ValueCount(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate AverageBucket(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate AverageBucket(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate Derivative(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate Derivative(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate SumBucket(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate SumBucket(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate MovingAverage(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate MovingAverage(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate CumulativeSum(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate CumulativeSum(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate BucketScript(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate BucketScript(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate SerialDifferencing(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate SerialDifferencing(string key) => TryGet<ValueAggregate>(key);
 
-		public ValueAggregate WeightedAverage(string key) => this.TryGet<ValueAggregate>(key);
+		public ValueAggregate WeightedAverage(string key) => TryGet<ValueAggregate>(key);
 
-		public KeyedValueAggregate MaxBucket(string key) => this.TryGet<KeyedValueAggregate>(key);
+		public KeyedValueAggregate MaxBucket(string key) => TryGet<KeyedValueAggregate>(key);
 
-		public KeyedValueAggregate MinBucket(string key) => this.TryGet<KeyedValueAggregate>(key);
+		public KeyedValueAggregate MinBucket(string key) => TryGet<KeyedValueAggregate>(key);
 
 		public ScriptedMetricAggregate ScriptedMetric(string key)
 		{
-			var valueMetric = this.TryGet<ValueAggregate>(key);
+			var valueMetric = TryGet<ValueAggregate>(key);
 
 			return valueMetric != null
 				? new ScriptedMetricAggregate(valueMetric.Value) { Meta = valueMetric.Meta }
-				: this.TryGet<ScriptedMetricAggregate>(key);
+				: TryGet<ScriptedMetricAggregate>(key);
 		}
 
-		public StatsAggregate Stats(string key) => this.TryGet<StatsAggregate>(key);
+		public StatsAggregate Stats(string key) => TryGet<StatsAggregate>(key);
 
-		public StatsAggregate StatsBucket(string key) => this.TryGet<StatsAggregate>(key);
+		public StatsAggregate StatsBucket(string key) => TryGet<StatsAggregate>(key);
 
-		public ExtendedStatsAggregate ExtendedStats(string key) => this.TryGet<ExtendedStatsAggregate>(key);
+		public ExtendedStatsAggregate ExtendedStats(string key) => TryGet<ExtendedStatsAggregate>(key);
 
-		public ExtendedStatsAggregate ExtendedStatsBucket(string key) => this.TryGet<ExtendedStatsAggregate>(key);
+		public ExtendedStatsAggregate ExtendedStatsBucket(string key) => TryGet<ExtendedStatsAggregate>(key);
 
-		public GeoBoundsAggregate GeoBounds(string key) => this.TryGet<GeoBoundsAggregate>(key);
+		public GeoBoundsAggregate GeoBounds(string key) => TryGet<GeoBoundsAggregate>(key);
 
-		public PercentilesAggregate Percentiles(string key) => this.TryGet<PercentilesAggregate>(key);
+		public PercentilesAggregate Percentiles(string key) => TryGet<PercentilesAggregate>(key);
 
-		public PercentilesAggregate PercentilesBucket(string key) => this.TryGet<PercentilesAggregate>(key);
+		public PercentilesAggregate PercentilesBucket(string key) => TryGet<PercentilesAggregate>(key);
 
-		public PercentilesAggregate PercentileRanks(string key) => this.TryGet<PercentilesAggregate>(key);
+		public PercentilesAggregate PercentileRanks(string key) => TryGet<PercentilesAggregate>(key);
 
-		public TopHitsAggregate TopHits(string key) => this.TryGet<TopHitsAggregate>(key);
+		public TopHitsAggregate TopHits(string key) => TryGet<TopHitsAggregate>(key);
 
 		public FiltersAggregate Filters(string key)
 		{
-			var named = this.TryGet<FiltersAggregate>(key);
+			var named = TryGet<FiltersAggregate>(key);
 			if (named != null)
 				return named;
 
-			var anonymous = this.TryGet<BucketAggregate>(key);
+			var anonymous = TryGet<BucketAggregate>(key);
 			return anonymous != null
 				? new FiltersAggregate { Buckets = anonymous.Items.OfType<FiltersBucketItem>().ToList(), Meta = anonymous.Meta }
 				: null;
 		}
 
-		public SingleBucketAggregate Global(string key) => this.TryGet<SingleBucketAggregate>(key);
+		public SingleBucketAggregate Global(string key) => TryGet<SingleBucketAggregate>(key);
 
-		public SingleBucketAggregate Filter(string key) => this.TryGet<SingleBucketAggregate>(key);
+		public SingleBucketAggregate Filter(string key) => TryGet<SingleBucketAggregate>(key);
 
-		public SingleBucketAggregate Missing(string key) => this.TryGet<SingleBucketAggregate>(key);
+		public SingleBucketAggregate Missing(string key) => TryGet<SingleBucketAggregate>(key);
 
-		public SingleBucketAggregate Nested(string key) => this.TryGet<SingleBucketAggregate>(key);
+		public SingleBucketAggregate Nested(string key) => TryGet<SingleBucketAggregate>(key);
 
-		public SingleBucketAggregate ReverseNested(string key) => this.TryGet<SingleBucketAggregate>(key);
+		public SingleBucketAggregate ReverseNested(string key) => TryGet<SingleBucketAggregate>(key);
 
-		public SingleBucketAggregate Children(string key) => this.TryGet<SingleBucketAggregate>(key);
+		public SingleBucketAggregate Children(string key) => TryGet<SingleBucketAggregate>(key);
 
-		public SingleBucketAggregate Sampler(string key) => this.TryGet<SingleBucketAggregate>(key);
+		public SingleBucketAggregate Sampler(string key) => TryGet<SingleBucketAggregate>(key);
 
-		public GeoCentroidAggregate GeoCentroid(string key) => this.TryGet<GeoCentroidAggregate>(key);
+		public GeoCentroidAggregate GeoCentroid(string key) => TryGet<GeoCentroidAggregate>(key);
 
 		public SignificantTermsAggregate SignificantTerms(string key)
 		{
-			var bucket = this.TryGet<BucketAggregate>(key);
+			var bucket = TryGet<BucketAggregate>(key);
 			return bucket == null
 				? null
 				: new SignificantTermsAggregate
@@ -133,7 +133,7 @@ public SignificantTermsAggregate SignificantTerms(string key)
 
 		public SignificantTermsAggregate SignificantText(string key)
 		{
-			var bucket = this.TryGet<BucketAggregate>(key);
+			var bucket = TryGet<BucketAggregate>(key);
 			return bucket == null
 				? null
 				: new SignificantTermsAggregate
@@ -147,7 +147,7 @@ public SignificantTermsAggregate SignificantText(string key)
 
 		public TermsAggregate<TKey> Terms<TKey>(string key)
 		{
-			var bucket = this.TryGet<BucketAggregate>(key);
+			var bucket = TryGet<BucketAggregate>(key);
 			return bucket == null
 				? null
 				: new TermsAggregate<TKey>
@@ -179,8 +179,9 @@ public TermsAggregate<TKey> Terms<TKey>(string key)
 
 		public CompositeBucketAggregate Composite(string key)
 		{
-			var bucket = this.TryGet<BucketAggregate>(key);
+			var bucket = TryGet<BucketAggregate>(key);
 			if (bucket == null) return null;
+
 			return new CompositeBucketAggregate
 			{
 				Buckets = bucket.Items.OfType<CompositeBucket>().ToList(),
@@ -189,30 +190,33 @@ public CompositeBucketAggregate Composite(string key)
 			};
 		}
 
-		public MatrixStatsAggregate MatrixStats(string key) => this.TryGet<MatrixStatsAggregate>(key);
+		public MatrixStatsAggregate MatrixStats(string key) => TryGet<MatrixStatsAggregate>(key);
 
 		private TAggregate TryGet<TAggregate>(string key)
 			where TAggregate : class, IAggregate
 		{
 			IAggregate agg;
-			return this.BackingDictionary.TryGetValue(key, out agg) ? agg as TAggregate : null;
+			return BackingDictionary.TryGetValue(key, out agg) ? agg as TAggregate : null;
 		}
 
 		private MultiBucketAggregate<TBucket> GetMultiBucketAggregate<TBucket>(string key)
 			where TBucket : IBucket
 		{
-			var bucket = this.TryGet<BucketAggregate>(key);
+			var bucket = TryGet<BucketAggregate>(key);
 			if (bucket == null) return null;
+
 			return new MultiBucketAggregate<TBucket>
 			{
 				Buckets = bucket.Items.OfType<TBucket>().ToList(),
 				Meta = bucket.Meta,
 			};
 		}
+
 		private MultiBucketAggregate<KeyedBucket<TKey>> GetMultiKeyedBucketAggregate<TKey>(string key)
 		{
-			var bucket = this.TryGet<BucketAggregate>(key);
+			var bucket = TryGet<BucketAggregate>(key);
 			if (bucket == null) return null;
+
 			return new MultiBucketAggregate<KeyedBucket<TKey>>
 			{
 				Buckets = GetKeyedBuckets<TKey>(bucket.Items).ToList(),
@@ -226,7 +230,6 @@ private IEnumerable<KeyedBucket<TKey>> GetKeyedBuckets<TKey>(IEnumerable<IBucket
 			var buckets = items.Cast<KeyedBucket<object>>();
 
 			foreach (var bucket in buckets)
-			{
 				yield return new KeyedBucket<TKey>(bucket.BackingDictionary)
 				{
 					Key = (TKey)Convert.ChangeType(bucket.Key, typeof(TKey)),
@@ -234,8 +237,6 @@ private IEnumerable<KeyedBucket<TKey>> GetKeyedBuckets<TKey>(IEnumerable<IBucket
 					DocCount = bucket.DocCount,
 					DocCountErrorUpperBound = bucket.DocCountErrorUpperBound
 				};
-			}
 		}
-
 	}
 }
diff --git a/src/Nest/Aggregations/AggregateDictionaryConverter.cs b/src/Nest/Aggregations/AggregateDictionaryConverter.cs
index a0cc88b1815..a76626452b8 100644
--- a/src/Nest/Aggregations/AggregateDictionaryConverter.cs
+++ b/src/Nest/Aggregations/AggregateDictionaryConverter.cs
@@ -25,6 +25,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				reader.Read();
 				var typedProperty = reader.Value as string;
 				if (typedProperty.IsNullOrEmpty()) break;
+
 				var tokens = AggregateDictionary.TypedKeyTokens(typedProperty);
 				if (tokens.Length == 1)
 					ParseAggregate(reader, serializer, tokens[0], dictionary);
@@ -51,7 +52,9 @@ private static void ReadAggregate(JsonReader r, JsonSerializer s, string[] token
 			}
 		}
 
-		private static void ReadAggregate<TAggregate>(JsonReader reader, JsonSerializer serializer, Dictionary<string, IAggregate> dictionary, string name)
+		private static void ReadAggregate<TAggregate>(JsonReader reader, JsonSerializer serializer, Dictionary<string, IAggregate> dictionary,
+			string name
+		)
 			where TAggregate : IAggregate
 		{
 			reader.Read();
diff --git a/src/Nest/Aggregations/AggregateJsonConverter.cs b/src/Nest/Aggregations/AggregateJsonConverter.cs
index d7b0f86c105..3585924fe4e 100644
--- a/src/Nest/Aggregations/AggregateJsonConverter.cs
+++ b/src/Nest/Aggregations/AggregateJsonConverter.cs
@@ -13,63 +13,6 @@ internal class AggregateJsonConverter : JsonConverter
 	{
 		private static readonly Regex _numeric = new Regex(@"^[\d.]+(\.[\d.]+)?$");
 
-		public override bool CanWrite => false;
-
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
-			JsonSerializer serializer) => this.ReadAggregate(reader, serializer);
-
-		public override bool CanConvert(Type objectType) => objectType == typeof(IAggregate);
-
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
-			throw new NotSupportedException();
-
-		private static class Parser
-		{
-			public const string Values = "values";
-			public const string Value = "value";
-			public const string Buckets = "buckets";
-			public const string DocCountErrorUpperBound = "doc_count_error_upper_bound";
-			public const string Count = "count";
-			public const string DocCount = "doc_count";
-			public const string BgCount = "bg_count";
-			public const string Bounds = "bounds";
-			public const string Hits = "hits";
-			public const string Location = "location";
-			public const string Fields = "fields";
-			public const string AfterKey = "after_key";
-
-			public const string Key = "key";
-			public const string From = "from";
-			public const string To = "to";
-			public const string KeyAsString = "key_as_string";
-
-			public const string Total = "total";
-			public const string MaxScore = "max_score";
-
-			public const string TopLeft = "top_left";
-			public const string BottomRight = "bottom_right";
-
-			public const string AsStringSuffix = "_as_string";
-
-			public const string Upper = "upper";
-			public const string Lower = "lower";
-			public const string StdDeviationBoundsAsString = "std_deviation_bounds_as_string";
-
-			public const string SumOtherDocCount = "sum_other_doc_count";
-
-			public const string ValueAsString = "value_as_string";
-			public const string Keys = "keys";
-
-			public const string FromAsString = "from_as_string";
-			public const string ToAsString = "to_as_string";
-
-			public const string Score = "score";
-			public const string Meta = "meta";
-		}
-
-		public static string[] AllReservedAggregationNames { get; }
-		public static string UsingReservedAggNameFormat { get; }
-
 		static AggregateJsonConverter()
 		{
 			AllReservedAggregationNames = typeof(Parser)
@@ -91,10 +34,25 @@ static AggregateJsonConverter()
 				+ allKeys;
 		}
 
+		public static string[] AllReservedAggregationNames { get; }
+
+		public override bool CanWrite => false;
+		public static string UsingReservedAggNameFormat { get; }
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+			JsonSerializer serializer
+		) => ReadAggregate(reader, serializer);
+
+		public override bool CanConvert(Type objectType) => objectType == typeof(IAggregate);
+
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
+			throw new NotSupportedException();
+
 		private IAggregate ReadAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject)
 				return null;
+
 			reader.Read();
 
 			if (reader.TokenType != JsonToken.PropertyName)
@@ -102,9 +60,9 @@ private IAggregate ReadAggregate(JsonReader reader, JsonSerializer serializer)
 
 			IAggregate aggregate = null;
 
-			var propertyName = (string) reader.Value;
+			var propertyName = (string)reader.Value;
 			if (_numeric.IsMatch(propertyName))
-				aggregate = GetPercentilesAggregate(reader, serializer, oldFormat: true);
+				aggregate = GetPercentilesAggregate(reader, serializer, true);
 
 			var meta = propertyName == Parser.Meta
 				? GetMetadata(serializer, reader)
@@ -116,7 +74,7 @@ private IAggregate ReadAggregate(JsonReader reader, JsonSerializer serializer)
 				return aggregate;
 			}
 
-			propertyName = (string) reader.Value;
+			propertyName = (string)reader.Value;
 			switch (propertyName)
 			{
 				case Parser.Values:
@@ -132,7 +90,7 @@ private IAggregate ReadAggregate(JsonReader reader, JsonSerializer serializer)
 					var afterKeys = serializer.Deserialize<Dictionary<string, object>>(reader);
 					reader.Read();
 					var bucketAggregate = reader.Value.ToString() == Parser.Buckets
-						? this.GetMultiBucketAggregate(reader, serializer) as BucketAggregate ?? new BucketAggregate()
+						? GetMultiBucketAggregate(reader, serializer) as BucketAggregate ?? new BucketAggregate()
 						: new BucketAggregate();
 					bucketAggregate.AfterKey = afterKeys;
 					aggregate = bucketAggregate;
@@ -170,13 +128,14 @@ private IBucket ReadBucket(JsonReader reader, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject)
 				return null;
+
 			reader.Read();
 
 			if (reader.TokenType != JsonToken.PropertyName)
 				return null;
 
 			IBucket item;
-			var property = (string) reader.Value;
+			var property = (string)reader.Value;
 			switch (property)
 			{
 				case Parser.Key:
@@ -211,7 +170,7 @@ private Dictionary<string, object> GetMetadata(JsonSerializer serializer, JsonRe
 		private IAggregate GetMatrixStatsAggregate(JsonReader reader, JsonSerializer serializer, long? docCount = null)
 		{
 			reader.Read();
-			var matrixStats = new MatrixStatsAggregate {DocCount = docCount};
+			var matrixStats = new MatrixStatsAggregate { DocCount = docCount };
 			var array = JArray.Load(reader);
 			matrixStats.Fields = array.ToObject<List<MatrixStatsField>>();
 			return matrixStats;
@@ -230,7 +189,7 @@ private IAggregate GetTopHitsAggregate(JsonReader reader, JsonSerializer seriali
 			reader.Read();
 			//using request/response serializer here because doc is wrapped in NEST's Hit<T>
 			var s = serializer.GetConnectionSettings().RequestResponseSerializer;
-			var lazyHits = hits.Select(h => new LazyDocument(h,s)).ToList();
+			var lazyHits = hits.Select(h => new LazyDocument(h, s)).ToList();
 			return new TopHitsAggregate(lazyHits)
 			{
 				Total = total,
@@ -241,12 +200,12 @@ private IAggregate GetTopHitsAggregate(JsonReader reader, JsonSerializer seriali
 		private IAggregate GetGeoCentroidAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
-			var geoCentroid = new GeoCentroidAggregate {Location = serializer.Deserialize<GeoLocation>(reader)};
+			var geoCentroid = new GeoCentroidAggregate { Location = serializer.Deserialize<GeoLocation>(reader) };
 			reader.Read();
-			if (reader.TokenType == JsonToken.PropertyName && (string) reader.Value == Parser.Count)
+			if (reader.TokenType == JsonToken.PropertyName && (string)reader.Value == Parser.Count)
 			{
 				reader.Read();
-				geoCentroid.Count = (long) reader.Value;
+				geoCentroid.Count = (long)reader.Value;
 				reader.Read();
 			}
 			return geoCentroid;
@@ -258,6 +217,7 @@ private IAggregate GetGeoBoundsAggregate(JsonReader reader, JsonSerializer seria
 			var o = JObject.Load(reader);
 			if (o == null)
 				return null;
+
 			var geoBoundsMetric = new GeoBoundsAggregate();
 			if (o.TryGetValue(Parser.TopLeft, out var topLeftToken) && topLeftToken != null)
 			{
@@ -284,7 +244,7 @@ private IAggregate GetPercentilesAggregate(JsonReader reader, JsonSerializer ser
 				reader.Read();
 			while (reader.TokenType != JsonToken.EndObject)
 			{
-				var propertyName = (string) reader.Value;
+				var propertyName = (string)reader.Value;
 				if (propertyName.Contains(Parser.AsStringSuffix))
 				{
 					reader.Read();
@@ -292,7 +252,7 @@ private IAggregate GetPercentilesAggregate(JsonReader reader, JsonSerializer ser
 				}
 				if (reader.TokenType != JsonToken.EndObject)
 				{
-					var percentileValue = (string) reader.Value;
+					var percentileValue = (string)reader.Value;
 					var percentile = double.Parse(percentileValue, CultureInfo.InvariantCulture);
 					reader.Read();
 					var value = reader.Value as double?;
@@ -320,14 +280,13 @@ private IAggregate GetSingleBucketAggregate(JsonReader reader, JsonSerializer se
 				reader.Read();
 				bgCount = (reader.Value as long?).GetValueOrDefault(0);
 				reader.Read();
-
 			}
 			if ((string)reader.Value == Parser.Fields)
 				return GetMatrixStatsAggregate(reader, serializer, docCount);
 
-			if (reader.TokenType == JsonToken.PropertyName && (string) reader.Value == Parser.Buckets)
+			if (reader.TokenType == JsonToken.PropertyName && (string)reader.Value == Parser.Buckets)
 			{
-				var b = this.GetMultiBucketAggregate(reader, serializer) as BucketAggregate;
+				var b = GetMultiBucketAggregate(reader, serializer) as BucketAggregate;
 				return new BucketAggregate
 				{
 					BgCount = bgCount,
@@ -336,7 +295,7 @@ private IAggregate GetSingleBucketAggregate(JsonReader reader, JsonSerializer se
 				};
 			}
 
-			var nestedAggregations = this.GetSubAggregates(reader, serializer);
+			var nestedAggregations = GetSubAggregates(reader, serializer);
 			var bucket = new SingleBucketAggregate(nestedAggregations)
 			{
 				DocCount = docCount
@@ -350,10 +309,8 @@ private IAggregate GetStatsAggregate(JsonReader reader, JsonSerializer serialize
 			reader.Read();
 			var count = (reader.Value as long?).GetValueOrDefault(0);
 			reader.Read();
-			if (reader.TokenType == JsonToken.EndObject)
-			{
-				return new GeoCentroidAggregate {Count = count};
-			}
+			if (reader.TokenType == JsonToken.EndObject) return new GeoCentroidAggregate { Count = count };
+
 			reader.Read();
 			var min = reader.Value as double?;
 			reader.Read();
@@ -380,7 +337,7 @@ private IAggregate GetStatsAggregate(JsonReader reader, JsonSerializer serialize
 			if (reader.TokenType == JsonToken.EndObject)
 				return statsMetric;
 
-			var propertyName = (string) reader.Value;
+			var propertyName = (string)reader.Value;
 			while (reader.TokenType != JsonToken.EndObject && propertyName.Contains(Parser.AsStringSuffix))
 			{
 				reader.Read();
@@ -405,13 +362,13 @@ private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonRea
 			};
 
 			reader.Read();
-			extendedStatsMetric.SumOfSquares = (reader.Value as double?);
+			extendedStatsMetric.SumOfSquares = reader.Value as double?;
 			reader.Read();
 			reader.Read();
-			extendedStatsMetric.Variance = (reader.Value as double?);
+			extendedStatsMetric.Variance = reader.Value as double?;
 			reader.Read();
 			reader.Read();
-			extendedStatsMetric.StdDeviation = (reader.Value as double?);
+			extendedStatsMetric.StdDeviation = reader.Value as double?;
 			reader.Read();
 
 			string propertyName;
@@ -422,7 +379,7 @@ private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonRea
 				reader.Read();
 				reader.Read();
 
-				propertyName = (string) reader.Value;
+				propertyName = (string)reader.Value;
 				if (propertyName == Parser.Upper)
 				{
 					reader.Read();
@@ -430,7 +387,7 @@ private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonRea
 				}
 				reader.Read();
 
-				propertyName = (string) reader.Value;
+				propertyName = (string)reader.Value;
 				if (propertyName == Parser.Lower)
 				{
 					reader.Read();
@@ -441,7 +398,7 @@ private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonRea
 				reader.Read();
 			}
 
-			propertyName = (string) reader.Value;
+			propertyName = (string)reader.Value;
 			while (reader.TokenType != JsonToken.EndObject && propertyName.Contains(Parser.AsStringSuffix))
 			{
 				// std_deviation_bounds is an object, so we need to skip its properties
@@ -467,9 +424,9 @@ private Dictionary<string, IAggregate> GetSubAggregates(JsonReader reader, JsonS
 			var currentDepth = reader.Depth;
 			do
 			{
-				var fieldName = (string) reader.Value;
+				var fieldName = (string)reader.Value;
 				reader.Read();
-				var agg = this.ReadAggregate(reader, serializer);
+				var agg = ReadAggregate(reader, serializer);
 				nestedAggs.Add(fieldName, agg);
 				reader.Read();
 				if (reader.Depth == currentDepth && reader.TokenType == JsonToken.EndObject || reader.Depth < currentDepth)
@@ -481,14 +438,14 @@ private Dictionary<string, IAggregate> GetSubAggregates(JsonReader reader, JsonS
 		private IAggregate GetMultiBucketAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			var bucket = new BucketAggregate();
-			var propertyName = (string) reader.Value;
+			var propertyName = (string)reader.Value;
 			if (propertyName == Parser.DocCountErrorUpperBound)
 			{
 				reader.Read();
 				bucket.DocCountErrorUpperBound = reader.Value as long?;
 				reader.Read();
 			}
-			propertyName = (string) reader.Value;
+			propertyName = (string)reader.Value;
 			if (propertyName == Parser.SumOtherDocCount)
 			{
 				reader.Read();
@@ -506,7 +463,7 @@ private IAggregate GetMultiBucketAggregate(JsonReader reader, JsonSerializer ser
 				{
 					var name = reader.Value.ToString();
 					reader.Read();
-					var innerAgg = this.ReadAggregate(reader, serializer);
+					var innerAgg = ReadAggregate(reader, serializer);
 					aggs.Add(name, innerAgg);
 					reader.Read();
 				}
@@ -517,6 +474,7 @@ private IAggregate GetMultiBucketAggregate(JsonReader reader, JsonSerializer ser
 
 			if (reader.TokenType != JsonToken.StartArray)
 				return null;
+
 			reader.Read(); //move from start array to start object
 			if (reader.TokenType == JsonToken.EndArray)
 			{
@@ -526,7 +484,7 @@ private IAggregate GetMultiBucketAggregate(JsonReader reader, JsonSerializer ser
 			}
 			do
 			{
-				var item = this.ReadBucket(reader, serializer);
+				var item = ReadBucket(reader, serializer);
 				items.Add(item);
 				reader.Read();
 			} while (reader.TokenType != JsonToken.EndArray);
@@ -554,7 +512,7 @@ private IAggregate GetValueAggregate(JsonReader reader, JsonSerializer serialize
 				{
 					if (reader.TokenType == JsonToken.PropertyName)
 					{
-						var propertyName = (string) reader.Value;
+						var propertyName = (string)reader.Value;
 
 						if (propertyName == Parser.ValueAsString)
 						{
@@ -564,7 +522,7 @@ private IAggregate GetValueAggregate(JsonReader reader, JsonSerializer serialize
 
 						if (reader.TokenType == JsonToken.PropertyName)
 						{
-							propertyName = (string) reader.Value;
+							propertyName = (string)reader.Value;
 							if (propertyName == Parser.Keys)
 							{
 								var keyedValueMetric = new KeyedValueAggregate
@@ -618,13 +576,13 @@ public IBucket GetRangeBucket(JsonReader reader, JsonSerializer serializer, stri
 					case Parser.From:
 						reader.Read();
 						if (reader.ValueType == typeof(double))
-							fromDouble = (double) reader.Value;
+							fromDouble = (double)reader.Value;
 						reader.Read();
 						break;
 					case Parser.To:
 						reader.Read();
 						if (reader.ValueType == typeof(double))
-							toDouble = (double) reader.Value;
+							toDouble = (double)reader.Value;
 						reader.Read();
 						break;
 					case Parser.Key:
@@ -650,7 +608,7 @@ public IBucket GetRangeBucket(JsonReader reader, JsonSerializer serializer, stri
 				}
 			}
 
-			var nestedAggregations = this.GetSubAggregates(reader, serializer);
+			var nestedAggregations = GetSubAggregates(reader, serializer);
 
 			var bucket = new RangeBucket(nestedAggregations)
 			{
@@ -676,7 +634,7 @@ private IBucket GetDateHistogramBucket(JsonReader reader, JsonSerializer seriali
 			var docCount = (reader.Value as long?).GetValueOrDefault(0);
 			reader.Read();
 
-			var nestedAggregations = this.GetSubAggregates(reader, serializer);
+			var nestedAggregations = GetSubAggregates(reader, serializer);
 
 			var dateHistogram = new DateHistogramBucket(nestedAggregations)
 			{
@@ -697,7 +655,7 @@ private IBucket GetKeyedBucket(JsonReader reader, JsonSerializer serializer)
 
 			var key = reader.Value;
 			reader.Read();
-			var propertyName = (string) reader.Value;
+			var propertyName = (string)reader.Value;
 			if (propertyName == Parser.From || propertyName == Parser.To)
 				return GetRangeBucket(reader, serializer, key as string);
 
@@ -713,7 +671,7 @@ private IBucket GetKeyedBucket(JsonReader reader, JsonSerializer serializer)
 			var docCount = reader.Value as long?;
 			reader.Read();
 
-			var nextProperty = (string) reader.Value;
+			var nextProperty = (string)reader.Value;
 			if (nextProperty == Parser.Score)
 				return GetSignificantTermsBucket(reader, serializer, key, keyAsString, docCount);
 
@@ -724,7 +682,7 @@ private IBucket GetKeyedBucket(JsonReader reader, JsonSerializer serializer)
 				docCountErrorUpperBound = reader.Value as long?;
 				reader.Read();
 			}
-			var nestedAggregates = this.GetSubAggregates(reader, serializer);
+			var nestedAggregates = GetSubAggregates(reader, serializer);
 			var bucket = new KeyedBucket<object>(nestedAggregates)
 			{
 				Key = key,
@@ -747,7 +705,7 @@ private IBucket GetCompositeBucket(JsonReader reader, JsonSerializer serializer)
 				reader.Read();
 			}
 
-			var nestedAggregates = this.GetSubAggregates(reader, serializer);
+			var nestedAggregates = GetSubAggregates(reader, serializer);
 			return new CompositeBucket(nestedAggregates, key) { DocCount = docCount };
 		}
 
@@ -759,7 +717,7 @@ private IBucket GetSignificantTermsBucket(JsonReader reader, JsonSerializer seri
 			reader.Read();
 			var bgCount = reader.Value as long?;
 			reader.Read();
-			var nestedAggregations = this.GetSubAggregates(reader, serializer);
+			var nestedAggregations = GetSubAggregates(reader, serializer);
 			var significantTermItem = new SignificantTermsBucket(nestedAggregations)
 			{
 				Key = key as string,
@@ -775,12 +733,56 @@ private IBucket GetFiltersBucket(JsonReader reader, JsonSerializer serializer)
 			reader.Read();
 			var docCount = (reader.Value as long?).GetValueOrDefault(0);
 			reader.Read();
-			var nestedAggregations = this.GetSubAggregates(reader, serializer);
+			var nestedAggregations = GetSubAggregates(reader, serializer);
 			var filtersBucketItem = new FiltersBucketItem(nestedAggregations)
 			{
 				DocCount = docCount
 			};
 			return filtersBucketItem;
 		}
+
+		private static class Parser
+		{
+			public const string AfterKey = "after_key";
+
+			public const string AsStringSuffix = "_as_string";
+			public const string BgCount = "bg_count";
+			public const string BottomRight = "bottom_right";
+			public const string Bounds = "bounds";
+			public const string Buckets = "buckets";
+			public const string Count = "count";
+			public const string DocCount = "doc_count";
+			public const string DocCountErrorUpperBound = "doc_count_error_upper_bound";
+			public const string Fields = "fields";
+			public const string From = "from";
+
+			public const string FromAsString = "from_as_string";
+			public const string Hits = "hits";
+
+			public const string Key = "key";
+			public const string KeyAsString = "key_as_string";
+			public const string Keys = "keys";
+			public const string Location = "location";
+			public const string Lower = "lower";
+			public const string MaxScore = "max_score";
+			public const string Meta = "meta";
+
+			public const string Score = "score";
+			public const string StdDeviationBoundsAsString = "std_deviation_bounds_as_string";
+
+			public const string SumOtherDocCount = "sum_other_doc_count";
+			public const string To = "to";
+			public const string ToAsString = "to_as_string";
+
+			public const string TopLeft = "top_left";
+
+			public const string Total = "total";
+
+			public const string Upper = "upper";
+			public const string Value = "value";
+
+			public const string ValueAsString = "value_as_string";
+			public const string Values = "values";
+		}
 	}
 }
diff --git a/src/Nest/Aggregations/Aggregation.cs b/src/Nest/Aggregations/Aggregation.cs
index a718e82731d..afa33ab84ac 100644
--- a/src/Nest/Aggregations/Aggregation.cs
+++ b/src/Nest/Aggregations/Aggregation.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -10,33 +10,30 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IAggregation
 	{
-		/// <summary>
-		/// name of the aggregation
-		/// </summary>
-		string Name { get; set; }
-
 		/// <summary>
 		/// metadata to associate with the individual aggregation at request time that
 		/// will be returned in place at response time
 		/// </summary>
 		IDictionary<string, object> Meta { get; set; }
+
+		/// <summary>
+		/// name of the aggregation
+		/// </summary>
+		string Name { get; set; }
 	}
 
 	/// <inheritdoc />
 	public abstract class AggregationBase : IAggregation
 	{
-		/// <inheritdoc />
-		string IAggregation.Name { get; set; }
+		internal AggregationBase() { }
+
+		protected AggregationBase(string name) => ((IAggregation)this).Name = name;
 
 		/// <inheritdoc />
 		public IDictionary<string, object> Meta { get; set; }
 
-		internal AggregationBase() { }
-
-		protected AggregationBase(string name)
-		{
-			((IAggregation)this).Name = name;
-		}
+		/// <inheritdoc />
+		string IAggregation.Name { get; set; }
 
 		internal abstract void WrapInContainer(AggregationContainer container);
 
@@ -55,16 +52,16 @@ protected AggregationBase(string name)
 	/// </summary>
 	internal class AggregationCombinator : AggregationBase, IAggregation
 	{
-		internal List<AggregationBase> Aggregations { get; } = new List<AggregationBase>();
-
-		internal override void WrapInContainer(AggregationContainer container) { }
-
 		public AggregationCombinator(string name, AggregationBase left, AggregationBase right) : base(name)
 		{
-			this.AddAggregation(left);
-			this.AddAggregation(right);
+			AddAggregation(left);
+			AddAggregation(right);
 		}
 
+		internal List<AggregationBase> Aggregations { get; } = new List<AggregationBase>();
+
+		internal override void WrapInContainer(AggregationContainer container) { }
+
 		private void AddAggregation(AggregationBase agg)
 		{
 			switch (agg)
@@ -72,10 +69,10 @@ private void AddAggregation(AggregationBase agg)
 				case null:
 					return;
 				case AggregationCombinator combinator when combinator.Aggregations.Any():
-					this.Aggregations.AddRange(combinator.Aggregations);
+					Aggregations.AddRange(combinator.Aggregations);
 					break;
 				default:
-					this.Aggregations.Add(agg);
+					Aggregations.Add(agg);
 					break;
 			}
 		}
diff --git a/src/Nest/Aggregations/AggregationContainer.cs b/src/Nest/Aggregations/AggregationContainer.cs
index beddf797152..fab58e88c56 100644
--- a/src/Nest/Aggregations/AggregationContainer.cs
+++ b/src/Nest/Aggregations/AggregationContainer.cs
@@ -14,11 +14,12 @@ namespace Nest
 	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, IAggregationContainer>))]
 	public class AggregationDictionary : IsADictionaryBase<string, IAggregationContainer>
 	{
-		public AggregationDictionary() {}
+		public AggregationDictionary() { }
+
 		public AggregationDictionary(IDictionary<string, IAggregationContainer> container) : base(container) { }
+
 		public AggregationDictionary(Dictionary<string, AggregationContainer> container)
-			: base(container.ToDictionary(kv => kv.Key, kv => (IAggregationContainer)kv.Value))
-		{ }
+			: base(container.ToDictionary(kv => kv.Key, kv => (IAggregationContainer)kv.Value)) { }
 
 		public static implicit operator AggregationDictionary(Dictionary<string, IAggregationContainer> container) =>
 			new AggregationDictionary(container);
@@ -37,6 +38,7 @@ public static implicit operator AggregationDictionary(AggregationBase aggregator
 					b = agg;
 					if (b.Name.IsNullOrEmpty())
 						throw new ArgumentException($"{aggregator.GetType().Name} .Name is not set!");
+
 					dict.Add(b.Name, agg);
 				}
 				return dict;
@@ -45,16 +47,18 @@ public static implicit operator AggregationDictionary(AggregationBase aggregator
 			b = aggregator;
 			if (b.Name.IsNullOrEmpty())
 				throw new ArgumentException($"{aggregator.GetType().Name} .Name is not set!");
+
 			return new AggregationDictionary { { b.Name, aggregator } };
 		}
 
-		public void Add(string key, AggregationContainer value) => this.BackingDictionary.Add(ValidateKey(key), value);
+		public void Add(string key, AggregationContainer value) => BackingDictionary.Add(ValidateKey(key), value);
 
 		protected override string ValidateKey(string key)
 		{
 			if (AggregateJsonConverter.AllReservedAggregationNames.Contains(key))
 				throw new ArgumentException(
 					string.Format(AggregateJsonConverter.UsingReservedAggNameFormat, key), nameof(key));
+
 			return key;
 		}
 	}
@@ -64,78 +68,135 @@ protected override string ValidateKey(string key)
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<AggregationContainer>))]
 	public interface IAggregationContainer
 	{
-		[JsonProperty("meta")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
-		IDictionary<string, object> Meta { get; set; }
+		[JsonProperty("adjacency_matrix")]
+		IAdjacencyMatrixAggregation AdjacencyMatrix { get; set; }
+
+		[JsonProperty("aggs")]
+		AggregationDictionary Aggregations { get; set; }
 
 		[JsonProperty("avg")]
 		IAverageAggregation Average { get; set; }
 
+		[JsonProperty("avg_bucket")]
+		IAverageBucketAggregation AverageBucket { get; set; }
+
+		[JsonProperty("bucket_script")]
+		IBucketScriptAggregation BucketScript { get; set; }
+
+		[JsonProperty("bucket_selector")]
+		IBucketSelectorAggregation BucketSelector { get; set; }
+
+		[JsonProperty("bucket_sort")]
+		IBucketSortAggregation BucketSort { get; set; }
+
+		[JsonProperty("cardinality")]
+		ICardinalityAggregation Cardinality { get; set; }
+
+		[JsonProperty("children")]
+		IChildrenAggregation Children { get; set; }
+
+		[JsonProperty("composite")]
+		ICompositeAggregation Composite { get; set; }
+
+		[JsonProperty("cumulative_sum")]
+		ICumulativeSumAggregation CumulativeSum { get; set; }
+
 		[JsonProperty("date_histogram")]
 		IDateHistogramAggregation DateHistogram { get; set; }
 
-		[JsonProperty("percentiles")]
-		IPercentilesAggregation Percentiles { get; set; }
-
 		[JsonProperty("date_range")]
 		IDateRangeAggregation DateRange { get; set; }
 
+		[JsonProperty("derivative")]
+		IDerivativeAggregation Derivative { get; set; }
+
 		[JsonProperty("extended_stats")]
 		IExtendedStatsAggregation ExtendedStats { get; set; }
 
+		[JsonProperty("extended_stats_bucket")]
+		IExtendedStatsBucketAggregation ExtendedStatsBucket { get; set; }
+
 		[JsonProperty("filter")]
 		IFilterAggregation Filter { get; set; }
 
 		[JsonProperty("filters")]
 		IFiltersAggregation Filters { get; set; }
 
+		[JsonProperty("geo_bounds")]
+		IGeoBoundsAggregation GeoBounds { get; set; }
+
+		[JsonProperty("geo_centroid")]
+		IGeoCentroidAggregation GeoCentroid { get; set; }
+
 		[JsonProperty("geo_distance")]
 		IGeoDistanceAggregation GeoDistance { get; set; }
 
 		[JsonProperty("geohash_grid")]
 		IGeoHashGridAggregation GeoHash { get; set; }
 
-		[JsonProperty("geo_bounds")]
-		IGeoBoundsAggregation GeoBounds { get; set; }
+		[JsonProperty("global")]
+		IGlobalAggregation Global { get; set; }
 
 		[JsonProperty("histogram")]
 		IHistogramAggregation Histogram { get; set; }
 
-		[JsonProperty("global")]
-		IGlobalAggregation Global { get; set; }
-
 		[JsonProperty("ip_range")]
 		IIpRangeAggregation IpRange { get; set; }
 
+		[JsonProperty("matrix_stats")]
+		IMatrixStatsAggregation MatrixStats { get; set; }
+
 		[JsonProperty("max")]
 		IMaxAggregation Max { get; set; }
 
+		[JsonProperty("max_bucket")]
+		IMaxBucketAggregation MaxBucket { get; set; }
+
+		[JsonProperty("meta")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
+		IDictionary<string, object> Meta { get; set; }
+
 		[JsonProperty("min")]
 		IMinAggregation Min { get; set; }
 
-		[JsonProperty("cardinality")]
-		ICardinalityAggregation Cardinality { get; set; }
+		[JsonProperty("min_bucket")]
+		IMinBucketAggregation MinBucket { get; set; }
 
 		[JsonProperty("missing")]
 		IMissingAggregation Missing { get; set; }
 
+		[JsonProperty("moving_avg")]
+		IMovingAverageAggregation MovingAverage { get; set; }
+
+		[JsonProperty("moving_fn")]
+		IMovingFunctionAggregation MovingFunction { get; set; }
+
 		[JsonProperty("nested")]
 		INestedAggregation Nested { get; set; }
 
-		[JsonProperty("reverse_nested")]
-		IReverseNestedAggregation ReverseNested { get; set; }
+		[JsonProperty("percentile_ranks")]
+		IPercentileRanksAggregation PercentileRanks { get; set; }
+
+		[JsonProperty("percentiles")]
+		IPercentilesAggregation Percentiles { get; set; }
+
+		[JsonProperty("percentiles_bucket")]
+		IPercentilesBucketAggregation PercentilesBucket { get; set; }
 
 		[JsonProperty("range")]
 		IRangeAggregation Range { get; set; }
 
-		[JsonProperty("stats")]
-		IStatsAggregation Stats { get; set; }
+		[JsonProperty("reverse_nested")]
+		IReverseNestedAggregation ReverseNested { get; set; }
 
-		[JsonProperty("sum")]
-		ISumAggregation Sum { get; set; }
+		[JsonProperty("sampler")]
+		ISamplerAggregation Sampler { get; set; }
 
-		[JsonProperty("terms")]
-		ITermsAggregation Terms { get; set; }
+		[JsonProperty("scripted_metric")]
+		IScriptedMetricAggregation ScriptedMetric { get; set; }
+
+		[JsonProperty("serial_diff")]
+		ISerialDifferencingAggregation SerialDifferencing { get; set; }
 
 		[JsonProperty("significant_terms")]
 		ISignificantTermsAggregation SignificantTerms { get; set; }
@@ -143,193 +204,142 @@ public interface IAggregationContainer
 		[JsonProperty("significant_text")]
 		ISignificantTextAggregation SignificantText { get; set; }
 
-		[JsonProperty("value_count")]
-		IValueCountAggregation ValueCount { get; set; }
-
-		[JsonProperty("percentile_ranks")]
-		IPercentileRanksAggregation PercentileRanks { get; set; }
-
-		[JsonProperty("top_hits")]
-		ITopHitsAggregation TopHits { get; set; }
-
-		[JsonProperty("children")]
-		IChildrenAggregation Children { get; set; }
-
-		[JsonProperty("scripted_metric")]
-		IScriptedMetricAggregation ScriptedMetric { get; set; }
-
-		[JsonProperty("avg_bucket")]
-		IAverageBucketAggregation AverageBucket { get; set; }
-
-		[JsonProperty("derivative")]
-		IDerivativeAggregation Derivative { get; set; }
-
-		[JsonProperty("max_bucket")]
-		IMaxBucketAggregation MaxBucket { get; set; }
-
-		[JsonProperty("min_bucket")]
-		IMinBucketAggregation MinBucket { get; set; }
-
-		[JsonProperty("sum_bucket")]
-		ISumBucketAggregation SumBucket { get; set; }
+		[JsonProperty("stats")]
+		IStatsAggregation Stats { get; set; }
 
 		[JsonProperty("stats_bucket")]
 		IStatsBucketAggregation StatsBucket { get; set; }
 
-		[JsonProperty("extended_stats_bucket")]
-		IExtendedStatsBucketAggregation ExtendedStatsBucket { get; set; }
-
-		[JsonProperty("percentiles_bucket")]
-		IPercentilesBucketAggregation PercentilesBucket { get; set; }
-
-		[JsonProperty("moving_avg")]
-		IMovingAverageAggregation MovingAverage { get; set; }
-
-		[JsonProperty("moving_fn")]
-		IMovingFunctionAggregation MovingFunction { get; set; }
-
-		[JsonProperty("cumulative_sum")]
-		ICumulativeSumAggregation CumulativeSum { get; set; }
-
-		[JsonProperty("serial_diff")]
-		ISerialDifferencingAggregation SerialDifferencing { get; set; }
-
-		[JsonProperty("bucket_script")]
-		IBucketScriptAggregation BucketScript { get; set; }
-
-		[JsonProperty("bucket_selector")]
-		IBucketSelectorAggregation BucketSelector { get; set; }
-
-		[JsonProperty("bucket_sort")]
-		IBucketSortAggregation BucketSort { get; set; }
-
-		[JsonProperty("sampler")]
-		ISamplerAggregation Sampler { get; set; }
+		[JsonProperty("sum")]
+		ISumAggregation Sum { get; set; }
 
-		[JsonProperty("geo_centroid")]
-		IGeoCentroidAggregation GeoCentroid { get; set; }
+		[JsonProperty("sum_bucket")]
+		ISumBucketAggregation SumBucket { get; set; }
 
-		[JsonProperty("matrix_stats")]
-		IMatrixStatsAggregation MatrixStats { get; set; }
+		[JsonProperty("terms")]
+		ITermsAggregation Terms { get; set; }
 
-		[JsonProperty("adjacency_matrix")]
-		IAdjacencyMatrixAggregation AdjacencyMatrix { get; set; }
+		[JsonProperty("top_hits")]
+		ITopHitsAggregation TopHits { get; set; }
 
-		[JsonProperty("composite")]
-		ICompositeAggregation Composite { get; set; }
+		[JsonProperty("value_count")]
+		IValueCountAggregation ValueCount { get; set; }
 
 		[JsonProperty("weighted_avg")]
 		IWeightedAverageAggregation WeightedAverage { get; set; }
 
-		[JsonProperty("aggs")]
-		AggregationDictionary Aggregations { get; set; }
-
 		void Accept(IAggregationVisitor visitor);
 	}
 
 	public class AggregationContainer : IAggregationContainer
 	{
-		public IDictionary<string, object> Meta { get; set; }
+		public IAdjacencyMatrixAggregation AdjacencyMatrix { get; set; }
+
+		public AggregationDictionary Aggregations { get; set; }
 		public IAverageAggregation Average { get; set; }
-		public IValueCountAggregation ValueCount { get; set; }
-		public IMaxAggregation Max { get; set; }
-		public IMinAggregation Min { get; set; }
-		public IStatsAggregation Stats { get; set; }
-		public ISumAggregation Sum { get; set; }
-		public IExtendedStatsAggregation ExtendedStats { get; set; }
-		public IDateHistogramAggregation DateHistogram { get; set; }
 
-		public IPercentilesAggregation Percentiles { get; set; }
+		public IAverageBucketAggregation AverageBucket { get; set; }
 
-		public IDateRangeAggregation DateRange { get; set; }
+		public IBucketScriptAggregation BucketScript { get; set; }
 
-		public IFilterAggregation Filter { get; set; }
+		public IBucketSelectorAggregation BucketSelector { get; set; }
 
-		public IFiltersAggregation Filters { get; set; }
+		public IBucketSortAggregation BucketSort { get; set; }
 
-		public IGeoDistanceAggregation GeoDistance { get; set; }
+		public ICardinalityAggregation Cardinality { get; set; }
 
-		public IGeoHashGridAggregation GeoHash { get; set; }
+		public IChildrenAggregation Children { get; set; }
 
-		public IGeoBoundsAggregation GeoBounds { get; set; }
+		public ICompositeAggregation Composite { get; set; }
 
-		public IHistogramAggregation Histogram { get; set; }
+		public ICumulativeSumAggregation CumulativeSum { get; set; }
+		public IDateHistogramAggregation DateHistogram { get; set; }
 
-		public IGlobalAggregation Global { get; set; }
+		public IDateRangeAggregation DateRange { get; set; }
 
-		public IIpRangeAggregation IpRange { get; set; }
+		public IDerivativeAggregation Derivative { get; set; }
+		public IExtendedStatsAggregation ExtendedStats { get; set; }
 
-		public ICardinalityAggregation Cardinality { get; set; }
+		public IExtendedStatsBucketAggregation ExtendedStatsBucket { get; set; }
 
-		public IMissingAggregation Missing { get; set; }
+		public IFilterAggregation Filter { get; set; }
 
-		public INestedAggregation Nested { get; set; }
+		public IFiltersAggregation Filters { get; set; }
 
-		public IReverseNestedAggregation ReverseNested { get; set; }
+		public IGeoBoundsAggregation GeoBounds { get; set; }
 
-		public IRangeAggregation Range { get; set; }
+		public IGeoCentroidAggregation GeoCentroid { get; set; }
 
-		public ITermsAggregation Terms { get; set; }
+		public IGeoDistanceAggregation GeoDistance { get; set; }
 
-		public ISignificantTermsAggregation SignificantTerms { get; set; }
+		public IGeoHashGridAggregation GeoHash { get; set; }
 
-		public ISignificantTextAggregation SignificantText { get; set; }
+		public IGlobalAggregation Global { get; set; }
 
-		public IPercentileRanksAggregation PercentileRanks { get; set; }
+		public IHistogramAggregation Histogram { get; set; }
 
-		public ITopHitsAggregation TopHits { get; set; }
+		public IIpRangeAggregation IpRange { get; set; }
 
-		public IChildrenAggregation Children { get; set; }
+		public IMatrixStatsAggregation MatrixStats { get; set; }
+		public IMaxAggregation Max { get; set; }
 
-		public IScriptedMetricAggregation ScriptedMetric { get; set; }
+		public IMaxBucketAggregation MaxBucket { get; set; }
+		public IDictionary<string, object> Meta { get; set; }
+		public IMinAggregation Min { get; set; }
 
-		public IAverageBucketAggregation AverageBucket { get; set; }
+		public IMinBucketAggregation MinBucket { get; set; }
 
-		public IDerivativeAggregation Derivative { get; set; }
+		public IMissingAggregation Missing { get; set; }
 
-		public IMaxBucketAggregation MaxBucket { get; set; }
+		public IMovingAverageAggregation MovingAverage { get; set; }
 
-		public IMinBucketAggregation MinBucket { get; set; }
+		public IMovingFunctionAggregation MovingFunction { get; set; }
 
-		public ISumBucketAggregation SumBucket { get; set; }
+		public INestedAggregation Nested { get; set; }
 
-		public IStatsBucketAggregation StatsBucket { get; set; }
+		public IPercentileRanksAggregation PercentileRanks { get; set; }
 
-		public IExtendedStatsBucketAggregation ExtendedStatsBucket { get; set; }
+		public IPercentilesAggregation Percentiles { get; set; }
 
 		public IPercentilesBucketAggregation PercentilesBucket { get; set; }
 
-		public IMovingAverageAggregation MovingAverage { get; set; }
-
-		public IMovingFunctionAggregation MovingFunction { get; set; }
+		public IRangeAggregation Range { get; set; }
 
-		public ICumulativeSumAggregation CumulativeSum { get; set; }
+		public IReverseNestedAggregation ReverseNested { get; set; }
 
-		public ISerialDifferencingAggregation SerialDifferencing { get; set; }
+		public ISamplerAggregation Sampler { get; set; }
 
-		public IBucketScriptAggregation BucketScript { get; set; }
+		public IScriptedMetricAggregation ScriptedMetric { get; set; }
 
-		public IBucketSelectorAggregation BucketSelector { get; set; }
+		public ISerialDifferencingAggregation SerialDifferencing { get; set; }
 
-		public IBucketSortAggregation BucketSort { get; set; }
+		public ISignificantTermsAggregation SignificantTerms { get; set; }
 
-		public ISamplerAggregation Sampler { get; set; }
+		public ISignificantTextAggregation SignificantText { get; set; }
+		public IStatsAggregation Stats { get; set; }
 
-		public IGeoCentroidAggregation GeoCentroid { get; set; }
+		public IStatsBucketAggregation StatsBucket { get; set; }
+		public ISumAggregation Sum { get; set; }
 
-		public IMatrixStatsAggregation MatrixStats { get; set; }
+		public ISumBucketAggregation SumBucket { get; set; }
 
-		public IAdjacencyMatrixAggregation AdjacencyMatrix { get; set; }
+		public ITermsAggregation Terms { get; set; }
 
-		public ICompositeAggregation Composite { get; set; }
+		public ITopHitsAggregation TopHits { get; set; }
+		public IValueCountAggregation ValueCount { get; set; }
 
 		public IWeightedAverageAggregation WeightedAverage { get; set; }
 
-		public AggregationDictionary Aggregations { get; set; }
+		public void Accept(IAggregationVisitor visitor)
+		{
+			if (visitor.Scope == AggregationVisitorScope.Unknown) visitor.Scope = AggregationVisitorScope.Aggregation;
+			new AggregationWalker().Walk(this, visitor);
+		}
 
 		public static implicit operator AggregationContainer(AggregationBase aggregator)
 		{
 			if (aggregator == null) return null;
+
 			var container = new AggregationContainer();
 			aggregator.WrapInContainer(container);
 			var bucket = aggregator as BucketAggregationBase;
@@ -340,332 +350,382 @@ public static implicit operator AggregationContainer(AggregationBase aggregator)
 			{
 				var dict = new AggregationDictionary();
 				foreach (var agg in combinator.Aggregations)
-					dict.Add(((IAggregation) agg).Name, agg);
+					dict.Add(((IAggregation)agg).Name, agg);
 				container.Aggregations = dict;
 			}
 
 			container.Meta = aggregator.Meta;
 			return container;
 		}
-
-		public void Accept(IAggregationVisitor visitor)
-		{
-			if (visitor.Scope == AggregationVisitorScope.Unknown) visitor.Scope = AggregationVisitorScope.Aggregation;
-			new AggregationWalker().Walk(this, visitor);
-		}
 	}
 
 	public class AggregationContainerDescriptor<T> : DescriptorBase<AggregationContainerDescriptor<T>, IAggregationContainer>, IAggregationContainer
 		where T : class
 	{
-		IDictionary<string, object> IAggregationContainer.Meta { get; set; }
+		IAdjacencyMatrixAggregation IAggregationContainer.AdjacencyMatrix { get; set; }
 
 		AggregationDictionary IAggregationContainer.Aggregations { get; set; }
 
 		IAverageAggregation IAggregationContainer.Average { get; set; }
 
-		IDateHistogramAggregation IAggregationContainer.DateHistogram { get; set; }
-
-		IPercentilesAggregation IAggregationContainer.Percentiles { get; set; }
-
-		IDateRangeAggregation IAggregationContainer.DateRange { get; set; }
-
-		IExtendedStatsAggregation IAggregationContainer.ExtendedStats { get; set; }
+		IAverageBucketAggregation IAggregationContainer.AverageBucket { get; set; }
 
-		IFilterAggregation IAggregationContainer.Filter { get; set; }
+		IBucketScriptAggregation IAggregationContainer.BucketScript { get; set; }
 
-		IFiltersAggregation IAggregationContainer.Filters { get; set; }
+		IBucketSelectorAggregation IAggregationContainer.BucketSelector { get; set; }
 
-		IGeoDistanceAggregation IAggregationContainer.GeoDistance { get; set; }
+		IBucketSortAggregation IAggregationContainer.BucketSort { get; set; }
 
-		IGeoHashGridAggregation IAggregationContainer.GeoHash { get; set; }
+		ICardinalityAggregation IAggregationContainer.Cardinality { get; set; }
 
-		IGeoBoundsAggregation IAggregationContainer.GeoBounds { get; set; }
+		IChildrenAggregation IAggregationContainer.Children { get; set; }
 
-		IHistogramAggregation IAggregationContainer.Histogram { get; set; }
+		ICompositeAggregation IAggregationContainer.Composite { get; set; }
 
-		IGlobalAggregation IAggregationContainer.Global { get; set; }
+		ICumulativeSumAggregation IAggregationContainer.CumulativeSum { get; set; }
 
-		IIpRangeAggregation IAggregationContainer.IpRange { get; set; }
+		IDateHistogramAggregation IAggregationContainer.DateHistogram { get; set; }
 
-		IMaxAggregation IAggregationContainer.Max { get; set; }
+		IDateRangeAggregation IAggregationContainer.DateRange { get; set; }
 
-		IMinAggregation IAggregationContainer.Min { get; set; }
+		IDerivativeAggregation IAggregationContainer.Derivative { get; set; }
 
-		ICardinalityAggregation IAggregationContainer.Cardinality { get; set; }
+		IExtendedStatsAggregation IAggregationContainer.ExtendedStats { get; set; }
 
-		IMissingAggregation IAggregationContainer.Missing { get; set; }
+		IExtendedStatsBucketAggregation IAggregationContainer.ExtendedStatsBucket { get; set; }
 
-		INestedAggregation IAggregationContainer.Nested { get; set; }
+		IFilterAggregation IAggregationContainer.Filter { get; set; }
 
-		IReverseNestedAggregation IAggregationContainer.ReverseNested { get; set; }
+		IFiltersAggregation IAggregationContainer.Filters { get; set; }
 
-		IRangeAggregation IAggregationContainer.Range { get; set; }
+		IGeoBoundsAggregation IAggregationContainer.GeoBounds { get; set; }
 
-		IStatsAggregation IAggregationContainer.Stats { get; set; }
+		IGeoCentroidAggregation IAggregationContainer.GeoCentroid { get; set; }
 
-		ISumAggregation IAggregationContainer.Sum { get; set; }
+		IGeoDistanceAggregation IAggregationContainer.GeoDistance { get; set; }
 
-		IValueCountAggregation IAggregationContainer.ValueCount { get; set; }
+		IGeoHashGridAggregation IAggregationContainer.GeoHash { get; set; }
 
-		ISignificantTermsAggregation IAggregationContainer.SignificantTerms { get; set; }
+		IGlobalAggregation IAggregationContainer.Global { get; set; }
 
-		ISignificantTextAggregation IAggregationContainer.SignificantText { get; set; }
+		IHistogramAggregation IAggregationContainer.Histogram { get; set; }
 
-		IPercentileRanksAggregation IAggregationContainer.PercentileRanks { get; set; }
+		IIpRangeAggregation IAggregationContainer.IpRange { get; set; }
 
-		ITermsAggregation IAggregationContainer.Terms { get; set; }
+		IMatrixStatsAggregation IAggregationContainer.MatrixStats { get; set; }
 
-		ITopHitsAggregation IAggregationContainer.TopHits { get; set; }
+		IMaxAggregation IAggregationContainer.Max { get; set; }
 
-		IChildrenAggregation IAggregationContainer.Children { get; set; }
+		IMaxBucketAggregation IAggregationContainer.MaxBucket { get; set; }
+		IDictionary<string, object> IAggregationContainer.Meta { get; set; }
 
-		IScriptedMetricAggregation IAggregationContainer.ScriptedMetric { get; set; }
+		IMinAggregation IAggregationContainer.Min { get; set; }
 
-		IAverageBucketAggregation IAggregationContainer.AverageBucket { get; set; }
+		IMinBucketAggregation IAggregationContainer.MinBucket { get; set; }
 
-		IDerivativeAggregation IAggregationContainer.Derivative { get; set; }
+		IMissingAggregation IAggregationContainer.Missing { get; set; }
 
-		IMaxBucketAggregation IAggregationContainer.MaxBucket { get; set; }
+		IMovingAverageAggregation IAggregationContainer.MovingAverage { get; set; }
 
-		IMinBucketAggregation IAggregationContainer.MinBucket { get; set; }
+		IMovingFunctionAggregation IAggregationContainer.MovingFunction { get; set; }
 
-		ISumBucketAggregation IAggregationContainer.SumBucket { get; set; }
+		INestedAggregation IAggregationContainer.Nested { get; set; }
 
-		IStatsBucketAggregation IAggregationContainer.StatsBucket { get; set; }
+		IPercentileRanksAggregation IAggregationContainer.PercentileRanks { get; set; }
 
-		IExtendedStatsBucketAggregation IAggregationContainer.ExtendedStatsBucket { get; set; }
+		IPercentilesAggregation IAggregationContainer.Percentiles { get; set; }
 
 		IPercentilesBucketAggregation IAggregationContainer.PercentilesBucket { get; set; }
 
-		IMovingAverageAggregation IAggregationContainer.MovingAverage { get; set; }
+		IRangeAggregation IAggregationContainer.Range { get; set; }
 
-		IMovingFunctionAggregation IAggregationContainer.MovingFunction { get; set; }
+		IReverseNestedAggregation IAggregationContainer.ReverseNested { get; set; }
 
-		ICumulativeSumAggregation IAggregationContainer.CumulativeSum { get; set; }
+		ISamplerAggregation IAggregationContainer.Sampler { get; set; }
+
+		IScriptedMetricAggregation IAggregationContainer.ScriptedMetric { get; set; }
 
 		ISerialDifferencingAggregation IAggregationContainer.SerialDifferencing { get; set; }
 
-		IBucketScriptAggregation IAggregationContainer.BucketScript { get; set; }
+		ISignificantTermsAggregation IAggregationContainer.SignificantTerms { get; set; }
 
-		IBucketSelectorAggregation IAggregationContainer.BucketSelector { get; set; }
+		ISignificantTextAggregation IAggregationContainer.SignificantText { get; set; }
 
-		IBucketSortAggregation IAggregationContainer.BucketSort { get; set; }
+		IStatsAggregation IAggregationContainer.Stats { get; set; }
 
-		ISamplerAggregation IAggregationContainer.Sampler { get; set; }
+		IStatsBucketAggregation IAggregationContainer.StatsBucket { get; set; }
 
-		IGeoCentroidAggregation IAggregationContainer.GeoCentroid { get; set; }
+		ISumAggregation IAggregationContainer.Sum { get; set; }
 
-		IMatrixStatsAggregation IAggregationContainer.MatrixStats { get; set; }
+		ISumBucketAggregation IAggregationContainer.SumBucket { get; set; }
 
-		IAdjacencyMatrixAggregation IAggregationContainer.AdjacencyMatrix { get; set; }
+		ITermsAggregation IAggregationContainer.Terms { get; set; }
 
-		ICompositeAggregation IAggregationContainer.Composite { get; set; }
+		ITopHitsAggregation IAggregationContainer.TopHits { get; set; }
+
+		IValueCountAggregation IAggregationContainer.ValueCount { get; set; }
 
 		IWeightedAverageAggregation IAggregationContainer.WeightedAverage { get; set; }
 
+		public void Accept(IAggregationVisitor visitor)
+		{
+			if (visitor.Scope == AggregationVisitorScope.Unknown) visitor.Scope = AggregationVisitorScope.Aggregation;
+			new AggregationWalker().Walk(this, visitor);
+		}
+
 		public AggregationContainerDescriptor<T> Average(string name,
-			Func<AverageAggregationDescriptor<T>, IAverageAggregation> selector) =>
+			Func<AverageAggregationDescriptor<T>, IAverageAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Average = d);
 
 		public AggregationContainerDescriptor<T> DateHistogram(string name,
-			Func<DateHistogramAggregationDescriptor<T>, IDateHistogramAggregation> selector) =>
+			Func<DateHistogramAggregationDescriptor<T>, IDateHistogramAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.DateHistogram = d);
 
 		public AggregationContainerDescriptor<T> Percentiles(string name,
-			Func<PercentilesAggregationDescriptor<T>, IPercentilesAggregation> selector) =>
+			Func<PercentilesAggregationDescriptor<T>, IPercentilesAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Percentiles = d);
 
 		public AggregationContainerDescriptor<T> PercentileRanks(string name,
-			Func<PercentileRanksAggregationDescriptor<T>, IPercentileRanksAggregation> selector) =>
+			Func<PercentileRanksAggregationDescriptor<T>, IPercentileRanksAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.PercentileRanks = d);
 
 		public AggregationContainerDescriptor<T> DateRange(string name,
-			Func<DateRangeAggregationDescriptor<T>, IDateRangeAggregation> selector) =>
+			Func<DateRangeAggregationDescriptor<T>, IDateRangeAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.DateRange = d);
 
 		public AggregationContainerDescriptor<T> ExtendedStats(string name,
-			Func<ExtendedStatsAggregationDescriptor<T>, IExtendedStatsAggregation> selector) =>
+			Func<ExtendedStatsAggregationDescriptor<T>, IExtendedStatsAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.ExtendedStats = d);
 
 		public AggregationContainerDescriptor<T> Filter(string name,
-			Func<FilterAggregationDescriptor<T>, IFilterAggregation> selector) =>
+			Func<FilterAggregationDescriptor<T>, IFilterAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Filter = d);
 
 		public AggregationContainerDescriptor<T> Filters(string name,
-			Func<FiltersAggregationDescriptor<T>, IFiltersAggregation> selector) =>
+			Func<FiltersAggregationDescriptor<T>, IFiltersAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Filters = d);
 
 		public AggregationContainerDescriptor<T> GeoDistance(string name,
-			Func<GeoDistanceAggregationDescriptor<T>, IGeoDistanceAggregation> selector) =>
+			Func<GeoDistanceAggregationDescriptor<T>, IGeoDistanceAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.GeoDistance = d);
 
 		public AggregationContainerDescriptor<T> GeoHash(string name,
-			Func<GeoHashGridAggregationDescriptor<T>, IGeoHashGridAggregation> selector) =>
+			Func<GeoHashGridAggregationDescriptor<T>, IGeoHashGridAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.GeoHash = d);
 
 		public AggregationContainerDescriptor<T> GeoBounds(string name,
-			Func<GeoBoundsAggregationDescriptor<T>, IGeoBoundsAggregation> selector) =>
+			Func<GeoBoundsAggregationDescriptor<T>, IGeoBoundsAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.GeoBounds = d);
 
 		public AggregationContainerDescriptor<T> Histogram(string name,
-			Func<HistogramAggregationDescriptor<T>, IHistogramAggregation> selector) =>
+			Func<HistogramAggregationDescriptor<T>, IHistogramAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Histogram = d);
 
 		public AggregationContainerDescriptor<T> Global(string name,
-			Func<GlobalAggregationDescriptor<T>, IGlobalAggregation> selector) =>
+			Func<GlobalAggregationDescriptor<T>, IGlobalAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Global = d);
 
 		public AggregationContainerDescriptor<T> IpRange(string name,
-			Func<IpRangeAggregationDescriptor<T>, IIpRangeAggregation> selector) =>
+			Func<IpRangeAggregationDescriptor<T>, IIpRangeAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.IpRange = d);
 
 		public AggregationContainerDescriptor<T> Max(string name,
-			Func<MaxAggregationDescriptor<T>, IMaxAggregation> selector) =>
+			Func<MaxAggregationDescriptor<T>, IMaxAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Max = d);
 
 		public AggregationContainerDescriptor<T> Min(string name,
-			Func<MinAggregationDescriptor<T>, IMinAggregation> selector) =>
+			Func<MinAggregationDescriptor<T>, IMinAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Min = d);
 
 		public AggregationContainerDescriptor<T> Cardinality(string name,
-			Func<CardinalityAggregationDescriptor<T>, ICardinalityAggregation> selector) =>
+			Func<CardinalityAggregationDescriptor<T>, ICardinalityAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Cardinality = d);
 
 		public AggregationContainerDescriptor<T> Missing(string name,
-			Func<MissingAggregationDescriptor<T>, IMissingAggregation> selector) =>
+			Func<MissingAggregationDescriptor<T>, IMissingAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Missing = d);
 
 		public AggregationContainerDescriptor<T> Nested(string name,
-			Func<NestedAggregationDescriptor<T>, INestedAggregation> selector) =>
+			Func<NestedAggregationDescriptor<T>, INestedAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Nested = d);
 
 		public AggregationContainerDescriptor<T> ReverseNested(string name,
-			Func<ReverseNestedAggregationDescriptor<T>, IReverseNestedAggregation> selector) =>
+			Func<ReverseNestedAggregationDescriptor<T>, IReverseNestedAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.ReverseNested = d);
 
 		public AggregationContainerDescriptor<T> Range(string name,
-			Func<RangeAggregationDescriptor<T>, IRangeAggregation> selector) =>
+			Func<RangeAggregationDescriptor<T>, IRangeAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Range = d);
 
 		public AggregationContainerDescriptor<T> Stats(string name,
-			Func<StatsAggregationDescriptor<T>, IStatsAggregation> selector) =>
+			Func<StatsAggregationDescriptor<T>, IStatsAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Stats = d);
 
 		public AggregationContainerDescriptor<T> Sum(string name,
-			Func<SumAggregationDescriptor<T>, ISumAggregation> selector) =>
+			Func<SumAggregationDescriptor<T>, ISumAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Sum = d);
 
 		public AggregationContainerDescriptor<T> Terms(string name,
-			Func<TermsAggregationDescriptor<T>, ITermsAggregation> selector) =>
+			Func<TermsAggregationDescriptor<T>, ITermsAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Terms = d);
 
 		public AggregationContainerDescriptor<T> SignificantTerms(string name,
-			Func<SignificantTermsAggregationDescriptor<T>, ISignificantTermsAggregation> selector) =>
+			Func<SignificantTermsAggregationDescriptor<T>, ISignificantTermsAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.SignificantTerms = d);
 
 		public AggregationContainerDescriptor<T> SignificantText(string name,
-			Func<SignificantTextAggregationDescriptor<T>, ISignificantTextAggregation> selector) =>
+			Func<SignificantTextAggregationDescriptor<T>, ISignificantTextAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.SignificantText = d);
 
 		public AggregationContainerDescriptor<T> ValueCount(string name,
-			Func<ValueCountAggregationDescriptor<T>, IValueCountAggregation> selector) =>
+			Func<ValueCountAggregationDescriptor<T>, IValueCountAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.ValueCount = d);
 
 		public AggregationContainerDescriptor<T> TopHits(string name,
-			Func<TopHitsAggregationDescriptor<T>, ITopHitsAggregation> selector) =>
+			Func<TopHitsAggregationDescriptor<T>, ITopHitsAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.TopHits = d);
 
 		public AggregationContainerDescriptor<T> Children<TChild>(string name,
-			Func<ChildrenAggregationDescriptor<TChild>, IChildrenAggregation> selector) where TChild : class =>
+			Func<ChildrenAggregationDescriptor<TChild>, IChildrenAggregation> selector
+		) where TChild : class =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Children = d);
 
 		public AggregationContainerDescriptor<T> ScriptedMetric(string name,
-			Func<ScriptedMetricAggregationDescriptor<T>, IScriptedMetricAggregation> selector) =>
+			Func<ScriptedMetricAggregationDescriptor<T>, IScriptedMetricAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.ScriptedMetric = d);
 
 		public AggregationContainerDescriptor<T> AverageBucket(string name,
-			Func<AverageBucketAggregationDescriptor, IAverageBucketAggregation> selector) =>
+			Func<AverageBucketAggregationDescriptor, IAverageBucketAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.AverageBucket = d);
 
 		public AggregationContainerDescriptor<T> Derivative(string name,
-			Func<DerivativeAggregationDescriptor, IDerivativeAggregation> selector) =>
+			Func<DerivativeAggregationDescriptor, IDerivativeAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Derivative = d);
 
 		public AggregationContainerDescriptor<T> MaxBucket(string name,
-			Func<MaxBucketAggregationDescriptor, IMaxBucketAggregation> selector) =>
+			Func<MaxBucketAggregationDescriptor, IMaxBucketAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.MaxBucket = d);
 
 		public AggregationContainerDescriptor<T> MinBucket(string name,
-			Func<MinBucketAggregationDescriptor, IMinBucketAggregation> selector) =>
+			Func<MinBucketAggregationDescriptor, IMinBucketAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.MinBucket = d);
 
 		public AggregationContainerDescriptor<T> SumBucket(string name,
-			Func<SumBucketAggregationDescriptor, ISumBucketAggregation> selector) =>
+			Func<SumBucketAggregationDescriptor, ISumBucketAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.SumBucket = d);
 
 		public AggregationContainerDescriptor<T> StatsBucket(string name,
-			Func<StatsBucketAggregationDescriptor, IStatsBucketAggregation> selector) =>
+			Func<StatsBucketAggregationDescriptor, IStatsBucketAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.StatsBucket = d);
 
 		public AggregationContainerDescriptor<T> ExtendedStatsBucket(string name,
-			Func<ExtendedStatsBucketAggregationDescriptor, IExtendedStatsBucketAggregation> selector) =>
+			Func<ExtendedStatsBucketAggregationDescriptor, IExtendedStatsBucketAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.ExtendedStatsBucket = d);
 
 		public AggregationContainerDescriptor<T> PercentilesBucket(string name,
-			Func<PercentilesBucketAggregationDescriptor, IPercentilesBucketAggregation> selector) =>
+			Func<PercentilesBucketAggregationDescriptor, IPercentilesBucketAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.PercentilesBucket = d);
 
 		public AggregationContainerDescriptor<T> MovingAverage(string name,
-			Func<MovingAverageAggregationDescriptor, IMovingAverageAggregation> selector) =>
+			Func<MovingAverageAggregationDescriptor, IMovingAverageAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.MovingAverage = d);
 
 		public AggregationContainerDescriptor<T> MovingFunction(string name,
-			Func<MovingFunctionAggregationDescriptor, IMovingFunctionAggregation> selector) =>
+			Func<MovingFunctionAggregationDescriptor, IMovingFunctionAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.MovingFunction = d);
 
 		public AggregationContainerDescriptor<T> CumulativeSum(string name,
-			Func<CumulativeSumAggregationDescriptor, ICumulativeSumAggregation> selector) =>
+			Func<CumulativeSumAggregationDescriptor, ICumulativeSumAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.CumulativeSum = d);
 
 		public AggregationContainerDescriptor<T> SerialDifferencing(string name,
-			Func<SerialDifferencingAggregationDescriptor, ISerialDifferencingAggregation> selector) =>
+			Func<SerialDifferencingAggregationDescriptor, ISerialDifferencingAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.SerialDifferencing = d);
 
 		public AggregationContainerDescriptor<T> BucketScript(string name,
-			Func<BucketScriptAggregationDescriptor, IBucketScriptAggregation> selector) =>
+			Func<BucketScriptAggregationDescriptor, IBucketScriptAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.BucketScript = d);
 
 		public AggregationContainerDescriptor<T> BucketSelector(string name,
-			Func<BucketSelectorAggregationDescriptor, IBucketSelectorAggregation> selector) =>
+			Func<BucketSelectorAggregationDescriptor, IBucketSelectorAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.BucketSelector = d);
 
 		public AggregationContainerDescriptor<T> BucketSort(string name,
-			Func<BucketSortAggregationDescriptor<T>, IBucketSortAggregation> selector) =>
+			Func<BucketSortAggregationDescriptor<T>, IBucketSortAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.BucketSort = d);
 
 		public AggregationContainerDescriptor<T> Sampler(string name,
-			Func<SamplerAggregationDescriptor<T>, ISamplerAggregation> selector) =>
+			Func<SamplerAggregationDescriptor<T>, ISamplerAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Sampler = d);
 
 		public AggregationContainerDescriptor<T> GeoCentroid(string name,
-			Func<GeoCentroidAggregationDescriptor<T>, IGeoCentroidAggregation> selector) =>
+			Func<GeoCentroidAggregationDescriptor<T>, IGeoCentroidAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.GeoCentroid = d);
 
 		public AggregationContainerDescriptor<T> MatrixStats(string name,
-			Func<MatrixStatsAggregationDescriptor<T>, IMatrixStatsAggregation> selector) =>
+			Func<MatrixStatsAggregationDescriptor<T>, IMatrixStatsAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.MatrixStats = d);
 
 		public AggregationContainerDescriptor<T> AdjacencyMatrix(string name,
-			Func<AdjacencyMatrixAggregationDescriptor<T>, IAdjacencyMatrixAggregation> selector) =>
+			Func<AdjacencyMatrixAggregationDescriptor<T>, IAdjacencyMatrixAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.AdjacencyMatrix = d);
 
 		public AggregationContainerDescriptor<T> Composite(string name,
-			Func<CompositeAggregationDescriptor<T>, ICompositeAggregation> selector) =>
+			Func<CompositeAggregationDescriptor<T>, ICompositeAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.Composite = d);
 
 		public AggregationContainerDescriptor<T> WeightedAverage(string name,
-			Func<WeightedAverageAggregationDescriptor<T>, IWeightedAverageAggregation> selector) =>
+			Func<WeightedAverageAggregationDescriptor<T>, IWeightedAverageAggregation> selector
+		) =>
 			_SetInnerAggregation(name, selector, (a, d) => a.WeightedAverage = d);
 
 		/// <summary>
@@ -703,12 +763,6 @@ Func<TAggregator, TAggregatorInterface> selector
 			return this;
 		}
 
-		public void Accept(IAggregationVisitor visitor)
-		{
-			if (visitor.Scope == AggregationVisitorScope.Unknown) visitor.Scope = AggregationVisitorScope.Aggregation;
-			new AggregationWalker().Walk(this, visitor);
-		}
-
 		//always evaluate to false so that each side of && equation is evaluated
 		public static bool operator false(AggregationContainerDescriptor<T> a) => false;
 
@@ -724,7 +778,7 @@ public void Accept(IAggregationVisitor visitor)
 			var d = new AggregationContainerDescriptor<T>();
 			var leftAggs = (IDictionary<string, IAggregationContainer>)((IAggregationContainer)left).Aggregations;
 			var rightAggs = (IDictionary<string, IAggregationContainer>)((IAggregationContainer)right).Aggregations;
-			foreach(var kv in rightAggs)
+			foreach (var kv in rightAggs)
 			{
 				if (leftAggs.ContainsKey(kv.Key))
 				{
@@ -737,6 +791,5 @@ public void Accept(IAggregationVisitor visitor)
 			((IAggregationContainer)d).Aggregations = ((IAggregationContainer)left).Aggregations;
 			return d;
 		}
-
 	}
 }
diff --git a/src/Nest/Aggregations/AggregationJsonConverter.cs b/src/Nest/Aggregations/AggregationJsonConverter.cs
index 7457eb38b5b..0efa771dbf2 100644
--- a/src/Nest/Aggregations/AggregationJsonConverter.cs
+++ b/src/Nest/Aggregations/AggregationJsonConverter.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	internal class AggregationJsonConverter<TReadAs> : ReadAsTypeJsonConverter<TReadAs>
-		where TReadAs : class
-	{ }
+		where TReadAs : class { }
 }
diff --git a/src/Nest/Aggregations/Bucket/AdjacencyMatrix/AdjacencyMatrixAggregation.cs b/src/Nest/Aggregations/Bucket/AdjacencyMatrix/AdjacencyMatrixAggregation.cs
index c65c15e8ae5..95bdb97ffba 100644
--- a/src/Nest/Aggregations/Bucket/AdjacencyMatrix/AdjacencyMatrixAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/AdjacencyMatrix/AdjacencyMatrixAggregation.cs
@@ -24,13 +24,12 @@ public AdjacencyMatrixAggregation(string name) : base(name) { }
 
 	public class AdjacencyMatrixAggregationDescriptor<T>
 		: BucketAggregationDescriptorBase<AdjacencyMatrixAggregationDescriptor<T>, IAdjacencyMatrixAggregation, T>
-		, IAdjacencyMatrixAggregation
+			, IAdjacencyMatrixAggregation
 		where T : class
 	{
 		INamedFiltersContainer IAdjacencyMatrixAggregation.Filters { get; set; }
 
 		public AdjacencyMatrixAggregationDescriptor<T> Filters(Func<NamedFiltersContainerDescriptor<T>, IPromise<INamedFiltersContainer>> selector) =>
 			Assign(a => a.Filters = selector?.Invoke(new NamedFiltersContainerDescriptor<T>())?.Value);
-
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Bucket.cs b/src/Nest/Aggregations/Bucket/Bucket.cs
index a3f24607efd..0a327f7ba4f 100644
--- a/src/Nest/Aggregations/Bucket/Bucket.cs
+++ b/src/Nest/Aggregations/Bucket/Bucket.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Nest
 {
diff --git a/src/Nest/Aggregations/Bucket/BucketAggregate.cs b/src/Nest/Aggregations/Bucket/BucketAggregate.cs
index 0d47b6568c7..a65dfb5af16 100644
--- a/src/Nest/Aggregations/Bucket/BucketAggregate.cs
+++ b/src/Nest/Aggregations/Bucket/BucketAggregate.cs
@@ -3,7 +3,7 @@
 
 namespace Nest
 {
-	public abstract class BucketAggregateBase : AggregateDictionary , IAggregate
+	public abstract class BucketAggregateBase : AggregateDictionary, IAggregate
 	{
 		protected BucketAggregateBase(IReadOnlyDictionary<string, IAggregate> aggregations) : base(aggregations) { }
 
@@ -36,17 +36,17 @@ public SingleBucketAggregate(IReadOnlyDictionary<string, IAggregate> aggregation
 	public class MultiBucketAggregate<TBucket> : IAggregate
 		where TBucket : IBucket
 	{
-		/// <inheritdoc />
-		public IReadOnlyDictionary<string, object> Meta { get; set; }
-
 		/// <summary>
 		/// The buckets into which results are grouped
 		/// </summary>
 		public IReadOnlyCollection<TBucket> Buckets { get; set; } = EmptyReadOnly<TBucket>.Collection;
+
+		/// <inheritdoc />
+		public IReadOnlyDictionary<string, object> Meta { get; set; }
 	}
 
 	/// <summary>
-	/// Aggregation response of <see cref="CompositeAggregation"/>
+	/// Aggregation response of <see cref="CompositeAggregation" />
 	/// </summary>
 	public class CompositeBucketAggregate : MultiBucketAggregate<CompositeBucket>
 	{
@@ -54,7 +54,7 @@ public class CompositeBucketAggregate : MultiBucketAggregate<CompositeBucket>
 		/// The composite key of the last bucket returned
 		/// in the response before any filtering by pipeline aggregations.
 		/// If all buckets are filtered/removed by pipeline aggregations,
-		/// <see cref="AfterKey"/> will contain the composite key of the last bucket before filtering.
+		/// <see cref="AfterKey" /> will contain the composite key of the last bucket before filtering.
 		/// </summary>
 		/// <remarks> Valid for Elasticsearch 6.3.0+ </remarks>
 		public CompositeKey AfterKey { get; set; }
@@ -63,12 +63,12 @@ public class CompositeBucketAggregate : MultiBucketAggregate<CompositeBucket>
 	// Intermediate object used for deserialization
 	public class BucketAggregate : IAggregate
 	{
-		public IReadOnlyCollection<IBucket> Items { get; set; } = EmptyReadOnly<IBucket>.Collection;
+		public IReadOnlyDictionary<string, object> AfterKey { get; set; } = EmptyReadOnly<string, object>.Dictionary;
+		public long BgCount { get; set; }
+		public long DocCount { get; set; }
 		public long? DocCountErrorUpperBound { get; set; }
-		public long? SumOtherDocCount { get; set; }
+		public IReadOnlyCollection<IBucket> Items { get; set; } = EmptyReadOnly<IBucket>.Collection;
 		public IReadOnlyDictionary<string, object> Meta { get; set; } = EmptyReadOnly<string, object>.Dictionary;
-		public long DocCount { get; set; }
-		public long BgCount { get; set; }
-		public IReadOnlyDictionary<string, object> AfterKey { get; set; } = EmptyReadOnly<string, object>.Dictionary;
+		public long? SumOtherDocCount { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/BucketAggregation.cs b/src/Nest/Aggregations/Bucket/BucketAggregation.cs
index c83a7011a06..f287d20259f 100644
--- a/src/Nest/Aggregations/Bucket/BucketAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/BucketAggregation.cs
@@ -10,30 +10,29 @@ public interface IBucketAggregation : IAggregation
 
 	public abstract class BucketAggregationBase : AggregationBase, IBucketAggregation
 	{
-		public AggregationDictionary Aggregations { get; set; }
-
 		internal BucketAggregationBase() { }
 
 		protected BucketAggregationBase(string name) : base(name) { }
+
+		public AggregationDictionary Aggregations { get; set; }
 	}
 
 	public abstract class BucketAggregationDescriptorBase<TBucketAggregation, TBucketAggregationInterface, T>
 		: IBucketAggregation, IDescriptor
 		where TBucketAggregation : BucketAggregationDescriptorBase<TBucketAggregation, TBucketAggregationInterface, T>
-			, TBucketAggregationInterface, IBucketAggregation
+		, TBucketAggregationInterface, IBucketAggregation
 		where T : class
 		where TBucketAggregationInterface : class, IBucketAggregation
 	{
+		protected TBucketAggregationInterface Self => (TBucketAggregation)this;
 		AggregationDictionary IBucketAggregation.Aggregations { get; set; }
 
-		protected TBucketAggregation Assign(Action<TBucketAggregationInterface> assigner) =>
-			Fluent.Assign(((TBucketAggregation)this), assigner);
-
-		protected TBucketAggregationInterface Self => (TBucketAggregation)this;
+		IDictionary<string, object> IAggregation.Meta { get; set; }
 
 		string IAggregation.Name { get; set; }
 
-		IDictionary<string, object> IAggregation.Meta { get; set; }
+		protected TBucketAggregation Assign(Action<TBucketAggregationInterface> assigner) =>
+			Fluent.Assign((TBucketAggregation)this, assigner);
 
 		public TBucketAggregation Aggregations(Func<AggregationContainerDescriptor<T>, IAggregationContainer> selector) =>
 			Assign(a => a.Aggregations = selector?.Invoke(new AggregationContainerDescriptor<T>())?.Aggregations);
@@ -44,5 +43,4 @@ public TBucketAggregation Aggregations(AggregationDictionary aggregations) =>
 		public TBucketAggregation Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector) =>
 			Assign(a => a.Meta = selector?.Invoke(new FluentDictionary<string, object>()));
 	}
-
 }
diff --git a/src/Nest/Aggregations/Bucket/Children/ChildrenAggregation.cs b/src/Nest/Aggregations/Bucket/Children/ChildrenAggregation.cs
index a5bcdc8ec6b..03dbf5874fa 100644
--- a/src/Nest/Aggregations/Bucket/Children/ChildrenAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Children/ChildrenAggregation.cs
@@ -14,14 +14,11 @@ public interface IChildrenAggregation : IBucketAggregation
 
 	public class ChildrenAggregation : BucketAggregationBase, IChildrenAggregation
 	{
-		public RelationName Type { get; set; }
-
 		internal ChildrenAggregation() { }
 
-		public ChildrenAggregation(string name, RelationName type) : base(name)
-		{
-			this.Type = type;
-		}
+		public ChildrenAggregation(string name, RelationName type) : base(name) => Type = type;
+
+		public RelationName Type { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.Children = this;
 	}
diff --git a/src/Nest/Aggregations/Bucket/Composite/CompositeAggregation.cs b/src/Nest/Aggregations/Bucket/Composite/CompositeAggregation.cs
index 5e9a8b6805e..d70ff267791 100644
--- a/src/Nest/Aggregations/Bucket/Composite/CompositeAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Composite/CompositeAggregation.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -13,10 +12,11 @@ namespace Nest
 	public interface ICompositeAggregation : IBucketAggregation
 	{
 		/// <summary>
-		/// Controls the sources that should be used to build the composite buckets
+		/// Used to retrieve the composite buckets that are after the
+		/// last composite buckets returned in a previous round
 		/// </summary>
-		[JsonProperty("sources")]
-		IEnumerable<ICompositeAggregationSource> Sources { get; set; }
+		[JsonProperty("after")]
+		object After { get; set; }
 
 		/// <summary>
 		/// Defines how many composite buckets should be returned.
@@ -28,50 +28,51 @@ public interface ICompositeAggregation : IBucketAggregation
 		int? Size { get; set; }
 
 		/// <summary>
-		/// Used to retrieve the composite buckets that are after the
-		/// last composite buckets returned in a previous round
+		/// Controls the sources that should be used to build the composite buckets
 		/// </summary>
-		[JsonProperty("after")]
-		object After { get; set; }
+		[JsonProperty("sources")]
+		IEnumerable<ICompositeAggregationSource> Sources { get; set; }
 	}
 
-	/// <inheritdoc cref="ICompositeAggregation"/>
+	/// <inheritdoc cref="ICompositeAggregation" />
 	public class CompositeAggregation : BucketAggregationBase, ICompositeAggregation
 	{
 		internal CompositeAggregation() { }
 
 		public CompositeAggregation(string name) : base(name) { }
 
-		internal override void WrapInContainer(AggregationContainer c) => c.Composite = this;
-
 		/// <inheritdoc />
-		public IEnumerable<ICompositeAggregationSource> Sources { get; set; }
+		public object After { get; set; }
 
 		/// <inheritdoc />
 		public int? Size { get; set; }
 
 		/// <inheritdoc />
-		public object After { get; set; }
+		public IEnumerable<ICompositeAggregationSource> Sources { get; set; }
+
+		internal override void WrapInContainer(AggregationContainer c) => c.Composite = this;
 	}
 
-	/// <inheritdoc cref="ICompositeAggregation"/>
+	/// <inheritdoc cref="ICompositeAggregation" />
 	public class CompositeAggregationDescriptor<T>
 		: BucketAggregationDescriptorBase<CompositeAggregationDescriptor<T>, ICompositeAggregation, T>
 			, ICompositeAggregation
 		where T : class
 	{
-		IEnumerable<ICompositeAggregationSource> ICompositeAggregation.Sources { get; set; }
-		int? ICompositeAggregation.Size { get; set; }
 		object ICompositeAggregation.After { get; set; }
+		int? ICompositeAggregation.Size { get; set; }
+		IEnumerable<ICompositeAggregationSource> ICompositeAggregation.Sources { get; set; }
 
-		/// <inheritdoc cref="ICompositeAggregation.Sources"/>
-		public CompositeAggregationDescriptor<T> Sources(Func<CompositeAggregationSourcesDescriptor<T>, IPromise<IList<ICompositeAggregationSource>>> selector) =>
+		/// <inheritdoc cref="ICompositeAggregation.Sources" />
+		public CompositeAggregationDescriptor<T> Sources(
+			Func<CompositeAggregationSourcesDescriptor<T>, IPromise<IList<ICompositeAggregationSource>>> selector
+		) =>
 			Assign(a => a.Sources = selector?.Invoke(new CompositeAggregationSourcesDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="ICompositeAggregation.Size"/>
+		/// <inheritdoc cref="ICompositeAggregation.Size" />
 		public CompositeAggregationDescriptor<T> Size(int? size) => Assign(a => a.Size = size);
 
-		/// <inheritdoc cref="ICompositeAggregation.After"/>
+		/// <inheritdoc cref="ICompositeAggregation.After" />
 		public CompositeAggregationDescriptor<T> After(object after) => Assign(a => a.After = after);
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Composite/CompositeAggregationSource.cs b/src/Nest/Aggregations/Bucket/Composite/CompositeAggregationSource.cs
index cb736b1f704..a7ea04f992f 100644
--- a/src/Nest/Aggregations/Bucket/Composite/CompositeAggregationSource.cs
+++ b/src/Nest/Aggregations/Bucket/Composite/CompositeAggregationSource.cs
@@ -8,54 +8,47 @@
 namespace Nest
 {
 	/// <summary>
-	/// A values source for <see cref="ICompositeAggregation"/>
+	/// A values source for <see cref="ICompositeAggregation" />
 	/// </summary>
 	[ContractJsonConverter(typeof(CompositeAggregationSourceConverter))]
 	public interface ICompositeAggregationSource
 	{
 		/// <summary>
-		/// The name of the source
+		/// The field from which to extract value
 		/// </summary>
-		[JsonIgnore]
-		string Name { get; set; }
+		[JsonProperty("field")]
+		Field Field { get; set; }
 
 		/// <summary>
-		/// The type of the source
+		/// By default documents without a value for a given source are ignored. It is possible to include
+		/// them in the response as null by setting this to true
 		/// </summary>
-		[JsonIgnore]
-		string SourceType { get; }
+		[JsonProperty("missing_bucket")]
+		bool? MissingBucket { get; set; }
 
 		/// <summary>
-		/// The field from which to extract value
+		/// The name of the source
 		/// </summary>
-		[JsonProperty("field")]
-		Field Field { get; set; }
+		[JsonIgnore]
+		string Name { get; set; }
 
 		/// <summary>
 		/// Defines the direction of sorting for each
-		/// value source. Defaults to <see cref="SortOrder.Ascending"/>
+		/// value source. Defaults to <see cref="SortOrder.Ascending" />
 		/// </summary>
 		[JsonProperty("order")]
 		SortOrder? Order { get; set; }
 
 		/// <summary>
-		/// By default documents without a value for a given source are ignored. It is possible to include
-		/// them in the response as null by setting this to true
+		/// The type of the source
 		/// </summary>
-		[JsonProperty("missing_bucket")]
-		bool? MissingBucket { get; set; }
+		[JsonIgnore]
+		string SourceType { get; }
 	}
 
 	/// <inheritdoc />
 	public abstract class CompositeAggregationSourceBase : ICompositeAggregationSource
 	{
-		/// <inheritdoc />
-		string ICompositeAggregationSource.Name { get; set; }
-		string ICompositeAggregationSource.SourceType => SourceType;
-
-		/// <inheritdoc cref="ICompositeAggregationSource.SourceType"/>
-		protected abstract string SourceType { get;  }
-
 		internal CompositeAggregationSourceBase() { }
 
 		protected CompositeAggregationSourceBase(string name) =>
@@ -64,34 +57,48 @@ protected CompositeAggregationSourceBase(string name) =>
 		/// <inheritdoc />
 		public Field Field { get; set; }
 
+		/// <inheritdoc />
+		public bool? MissingBucket { get; set; }
+
 		/// <inheritdoc />
 		public SortOrder? Order { get; set; }
 
+		/// <inheritdoc cref="ICompositeAggregationSource.SourceType" />
+		protected abstract string SourceType { get; }
+
 		/// <inheritdoc />
-		public bool? MissingBucket { get; set; }
+		string ICompositeAggregationSource.Name { get; set; }
+
+		string ICompositeAggregationSource.SourceType => SourceType;
 	}
 
-	/// <inheritdoc cref="ICompositeAggregationSource"/>
-	public class CompositeAggregationSourcesDescriptor<T> :
-		DescriptorPromiseBase<CompositeAggregationSourcesDescriptor<T>, IList<ICompositeAggregationSource>>
+	/// <inheritdoc cref="ICompositeAggregationSource" />
+	public class CompositeAggregationSourcesDescriptor<T>
+		: DescriptorPromiseBase<CompositeAggregationSourcesDescriptor<T>, IList<ICompositeAggregationSource>>
 		where T : class
 	{
-		public CompositeAggregationSourcesDescriptor() : base(new List<ICompositeAggregationSource>()) {}
+		public CompositeAggregationSourcesDescriptor() : base(new List<ICompositeAggregationSource>()) { }
 
-		/// <inheritdoc cref="ITermsCompositeAggregationSource"/>
-		public CompositeAggregationSourcesDescriptor<T> Terms(string name, Func<TermsCompositeAggregationSourceDescriptor<T>, ITermsCompositeAggregationSource> selector) =>
+		/// <inheritdoc cref="ITermsCompositeAggregationSource" />
+		public CompositeAggregationSourcesDescriptor<T> Terms(string name,
+			Func<TermsCompositeAggregationSourceDescriptor<T>, ITermsCompositeAggregationSource> selector
+		) =>
 			Assign(a => a.Add(selector?.Invoke(new TermsCompositeAggregationSourceDescriptor<T>(name))));
 
-		/// <inheritdoc cref="IHistogramCompositeAggregationSource"/>
-		public CompositeAggregationSourcesDescriptor<T> Histogram(string name, Func<HistogramCompositeAggregationSourceDescriptor<T>, IHistogramCompositeAggregationSource> selector) =>
+		/// <inheritdoc cref="IHistogramCompositeAggregationSource" />
+		public CompositeAggregationSourcesDescriptor<T> Histogram(string name,
+			Func<HistogramCompositeAggregationSourceDescriptor<T>, IHistogramCompositeAggregationSource> selector
+		) =>
 			Assign(a => a.Add(selector?.Invoke(new HistogramCompositeAggregationSourceDescriptor<T>(name))));
 
-		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource"/>
-		public CompositeAggregationSourcesDescriptor<T> DateHistogram(string name, Func<DateHistogramCompositeAggregationSourceDescriptor<T>, IDateHistogramCompositeAggregationSource> selector) =>
+		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource" />
+		public CompositeAggregationSourcesDescriptor<T> DateHistogram(string name,
+			Func<DateHistogramCompositeAggregationSourceDescriptor<T>, IDateHistogramCompositeAggregationSource> selector
+		) =>
 			Assign(a => a.Add(selector?.Invoke(new DateHistogramCompositeAggregationSourceDescriptor<T>(name))));
 	}
 
-	/// <inheritdoc cref="ICompositeAggregationSource"/>
+	/// <inheritdoc cref="ICompositeAggregationSource" />
 	public abstract class CompositeAggregationSourceDescriptorBase<TDescriptor, TInterface, T>
 		: DescriptorBase<TDescriptor, TInterface>, ICompositeAggregationSource
 		where TDescriptor : CompositeAggregationSourceDescriptorBase<TDescriptor, TInterface, T>, TInterface
@@ -99,28 +106,29 @@ public abstract class CompositeAggregationSourceDescriptorBase<TDescriptor, TInt
 	{
 		private readonly string _sourceType;
 
-		string ICompositeAggregationSource.Name { get; set; }
-		string ICompositeAggregationSource.SourceType => _sourceType;
-		Field ICompositeAggregationSource.Field { get; set; }
-		SortOrder? ICompositeAggregationSource.Order { get; set; }
-		bool? ICompositeAggregationSource.MissingBucket { get; set; }
-
 		protected CompositeAggregationSourceDescriptorBase(string name, string sourceType)
 		{
 			_sourceType = sourceType;
 			Self.Name = name;
 		}
 
-		/// <inheritdoc cref="ICompositeAggregationSource.Field"/>
+		Field ICompositeAggregationSource.Field { get; set; }
+		bool? ICompositeAggregationSource.MissingBucket { get; set; }
+
+		string ICompositeAggregationSource.Name { get; set; }
+		SortOrder? ICompositeAggregationSource.Order { get; set; }
+		string ICompositeAggregationSource.SourceType => _sourceType;
+
+		/// <inheritdoc cref="ICompositeAggregationSource.Field" />
 		public TDescriptor Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="ICompositeAggregationSource.Field"/>
-		public TDescriptor Field(Expression<Func<T,object>> objectPath) => Assign(a => a.Field = objectPath);
+		/// <inheritdoc cref="ICompositeAggregationSource.Field" />
+		public TDescriptor Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc cref="ICompositeAggregationSource.Order"/>
+		/// <inheritdoc cref="ICompositeAggregationSource.Order" />
 		public TDescriptor Order(SortOrder? order) => Assign(a => a.Order = order);
 
-		/// <inheritdoc cref="ICompositeAggregationSource.MissingBucket"/>
+		/// <inheritdoc cref="ICompositeAggregationSource.MissingBucket" />
 		public TDescriptor MissingBucket(bool? includeMissing = true) => Assign(a => a.MissingBucket = includeMissing);
 	}
 
@@ -158,11 +166,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		protected override void SerializeJson(JsonWriter writer, object value, ICompositeAggregationSource castValue, JsonSerializer serializer)
 		{
 			writer.WriteStartObject();
-				writer.WritePropertyName(castValue.Name);
-				writer.WriteStartObject();
-					writer.WritePropertyName(castValue.SourceType);
-					base.Reserialize(writer, value, serializer);
-				writer.WriteEndObject();
+			writer.WritePropertyName(castValue.Name);
+			writer.WriteStartObject();
+			writer.WritePropertyName(castValue.SourceType);
+			Reserialize(writer, value, serializer);
+			writer.WriteEndObject();
 			writer.WriteEndObject();
 		}
 	}
diff --git a/src/Nest/Aggregations/Bucket/Composite/CompositeBucket.cs b/src/Nest/Aggregations/Bucket/Composite/CompositeBucket.cs
index 72c95479d35..2eb228e7435 100644
--- a/src/Nest/Aggregations/Bucket/Composite/CompositeBucket.cs
+++ b/src/Nest/Aggregations/Bucket/Composite/CompositeBucket.cs
@@ -12,26 +12,24 @@ public CompositeBucket(IReadOnlyDictionary<string, IAggregate> dict, CompositeKe
 			Key = key;
 
 		/// <summary>
-		/// The bucket key
+		/// The count of documents
 		/// </summary>
-		public CompositeKey Key { get; }
+		public long? DocCount { get; set; }
 
 		/// <summary>
-		/// The count of documents
+		/// The bucket key
 		/// </summary>
-		public long? DocCount { get; set; }
+		public CompositeKey Key { get; }
 	}
 
 	/// <summary>
-	/// A key for a <see cref="CompositeBucket"/>
+	/// A key for a <see cref="CompositeBucket" />
 	/// </summary>
 	public class CompositeKey : IsAReadOnlyDictionaryBase<string, object>
 	{
 		private static readonly DateTimeOffset Epoch = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero);
 
-		public CompositeKey(IReadOnlyDictionary<string, object> backingDictionary) : base(backingDictionary)
-		{
-		}
+		public CompositeKey(IReadOnlyDictionary<string, object> backingDictionary) : base(backingDictionary) { }
 
 		/// <summary>
 		/// Tries to get a value with the given key as a string. Returns <c>false</c> if the key does
@@ -92,7 +90,7 @@ public bool TryGetValue(string key, out DateTimeOffset value)
 
 		private bool TryGetValue<TValue>(string key, out TValue value)
 		{
-			if (!this.BackingDictionary.TryGetValue(key, out var obj))
+			if (!BackingDictionary.TryGetValue(key, out var obj))
 			{
 				value = default(TValue);
 				return false;
@@ -100,7 +98,7 @@ private bool TryGetValue<TValue>(string key, out TValue value)
 
 			try
 			{
-				value = (TValue) Convert.ChangeType(obj, typeof(TValue));
+				value = (TValue)Convert.ChangeType(obj, typeof(TValue));
 				return true;
 			}
 			catch
diff --git a/src/Nest/Aggregations/Bucket/Composite/DateHistogramCompositeAggregationSource.cs b/src/Nest/Aggregations/Bucket/Composite/DateHistogramCompositeAggregationSource.cs
index fc700b44987..8cca5eb08ad 100644
--- a/src/Nest/Aggregations/Bucket/Composite/DateHistogramCompositeAggregationSource.cs
+++ b/src/Nest/Aggregations/Bucket/Composite/DateHistogramCompositeAggregationSource.cs
@@ -10,7 +10,14 @@ namespace Nest
 	public interface IDateHistogramCompositeAggregationSource : ICompositeAggregationSource
 	{
 		/// <summary>
-		///	The interval to use when bucketing documents
+		/// Return a formatted date string as the key instead an epoch long
+		/// </summary>
+		/// <remarks> Valid for Elasticsearch 6.3.0+ </remarks>
+		[JsonProperty("format")]
+		string Format { get; set; }
+
+		/// <summary>
+		/// 	The interval to use when bucketing documents
 		/// </summary>
 		[JsonProperty("interval")]
 		Union<DateInterval?, Time> Interval { get; set; }
@@ -22,56 +29,49 @@ public interface IDateHistogramCompositeAggregationSource : ICompositeAggregatio
 		/// </summary>
 		[JsonProperty("time_zone")]
 		string Timezone { get; set; }
-
-		/// <summary>
-		/// Return a formatted date string as the key instead an epoch long
-		/// </summary>
-		/// <remarks> Valid for Elasticsearch 6.3.0+ </remarks>
-		[JsonProperty("format")]
-		string Format { get; set; }
 	}
 
-	/// <inheritdoc cref="IDateHistogramCompositeAggregationSource"/>
+	/// <inheritdoc cref="IDateHistogramCompositeAggregationSource" />
 	public class DateHistogramCompositeAggregationSource : CompositeAggregationSourceBase, IDateHistogramCompositeAggregationSource
 	{
-		public DateHistogramCompositeAggregationSource(string name) : base(name) {}
+		public DateHistogramCompositeAggregationSource(string name) : base(name) { }
 
 		/// <inheritdoc />
-		public Union<DateInterval?,Time> Interval { get; set; }
+		public string Format { get; set; }
 
 		/// <inheritdoc />
-		public string Timezone { get; set; }
+		public Union<DateInterval?, Time> Interval { get; set; }
 
 		/// <inheritdoc />
-		public string Format { get; set; }
+		public string Timezone { get; set; }
 
 		/// <inheritdoc />
 		protected override string SourceType => "date_histogram";
 	}
 
-	/// <inheritdoc cref="IDateHistogramCompositeAggregationSource"/>
+	/// <inheritdoc cref="IDateHistogramCompositeAggregationSource" />
 	public class DateHistogramCompositeAggregationSourceDescriptor<T>
 		: CompositeAggregationSourceDescriptorBase<DateHistogramCompositeAggregationSourceDescriptor<T>, IDateHistogramCompositeAggregationSource, T>,
 			IDateHistogramCompositeAggregationSource
 	{
-		Union<DateInterval?,Time> IDateHistogramCompositeAggregationSource.Interval { get; set; }
-		string IDateHistogramCompositeAggregationSource.Timezone { get; set; }
-		string IDateHistogramCompositeAggregationSource.Format { get; set; }
+		public DateHistogramCompositeAggregationSourceDescriptor(string name) : base(name, "date_histogram") { }
 
-		public DateHistogramCompositeAggregationSourceDescriptor(string name) : base(name, "date_histogram") {}
+		string IDateHistogramCompositeAggregationSource.Format { get; set; }
+		Union<DateInterval?, Time> IDateHistogramCompositeAggregationSource.Interval { get; set; }
+		string IDateHistogramCompositeAggregationSource.Timezone { get; set; }
 
-		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Interval"/>
+		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Interval" />
 		public DateHistogramCompositeAggregationSourceDescriptor<T> Interval(DateInterval? interval) =>
 			Assign(a => a.Interval = interval);
 
-		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Interval"/>
+		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Interval" />
 		public DateHistogramCompositeAggregationSourceDescriptor<T> Interval(Time interval) =>
 			Assign(a => a.Interval = interval);
 
-		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Timezone"/>
+		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Timezone" />
 		public DateHistogramCompositeAggregationSourceDescriptor<T> Timezone(string timezone) => Assign(a => a.Timezone = timezone);
 
-		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Timezone"/>
+		/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Timezone" />
 		public DateHistogramCompositeAggregationSourceDescriptor<T> Format(string format) => Assign(a => a.Format = format);
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Composite/HistogramCompositeAggregationSource.cs b/src/Nest/Aggregations/Bucket/Composite/HistogramCompositeAggregationSource.cs
index b9ff0522168..d3ab6b9dfcd 100644
--- a/src/Nest/Aggregations/Bucket/Composite/HistogramCompositeAggregationSource.cs
+++ b/src/Nest/Aggregations/Bucket/Composite/HistogramCompositeAggregationSource.cs
@@ -11,48 +11,49 @@ namespace Nest
 	/// </summary>
 	public interface IHistogramCompositeAggregationSource : ICompositeAggregationSource
 	{
-		/// <summary>
-		/// A script to create the values for the composite buckets
-		/// </summary>
-		[JsonProperty("script")]
-		IScript Script { get; set; }
-
 		/// <summary>
 		/// The interval to use when bucketing documents
 		/// </summary>
 		[JsonProperty("interval")]
 		double? Interval { get; set; }
+
+		/// <summary>
+		/// A script to create the values for the composite buckets
+		/// </summary>
+		[JsonProperty("script")]
+		IScript Script { get; set; }
 	}
 
-	/// <inheritdoc cref="IHistogramCompositeAggregationSource"/>
+	/// <inheritdoc cref="IHistogramCompositeAggregationSource" />
 	public class HistogramCompositeAggregationSource : CompositeAggregationSourceBase, IHistogramCompositeAggregationSource
 	{
-		public HistogramCompositeAggregationSource(string name) : base(name) {}
+		public HistogramCompositeAggregationSource(string name) : base(name) { }
 
 		/// <inheritdoc />
-		public IScript Script { get; set; }
+		public double? Interval { get; set; }
 
 		/// <inheritdoc />
-		public double? Interval { get; set; }
+		public IScript Script { get; set; }
 
 		/// <inheritdoc />
 		protected override string SourceType => "histogram";
 	}
 
-	/// <inheritdoc cref="IHistogramCompositeAggregationSource"/>
+	/// <inheritdoc cref="IHistogramCompositeAggregationSource" />
 	public class HistogramCompositeAggregationSourceDescriptor<T>
-		: CompositeAggregationSourceDescriptorBase<HistogramCompositeAggregationSourceDescriptor<T>, IHistogramCompositeAggregationSource, T>, IHistogramCompositeAggregationSource
+		: CompositeAggregationSourceDescriptorBase<HistogramCompositeAggregationSourceDescriptor<T>, IHistogramCompositeAggregationSource, T>,
+			IHistogramCompositeAggregationSource
 	{
+		public HistogramCompositeAggregationSourceDescriptor(string name) : base(name, "histogram") { }
+
 		double? IHistogramCompositeAggregationSource.Interval { get; set; }
 		IScript IHistogramCompositeAggregationSource.Script { get; set; }
 
-		public HistogramCompositeAggregationSourceDescriptor(string name) : base(name, "histogram") {}
-
-		/// <inheritdoc cref="IHistogramCompositeAggregationSource.Interval"/>
+		/// <inheritdoc cref="IHistogramCompositeAggregationSource.Interval" />
 		public HistogramCompositeAggregationSourceDescriptor<T> Interval(double? interval) =>
 			Assign(a => a.Interval = interval);
 
-		/// <inheritdoc cref="IHistogramCompositeAggregationSource.Script"/>
+		/// <inheritdoc cref="IHistogramCompositeAggregationSource.Script" />
 		public HistogramCompositeAggregationSourceDescriptor<T> Script(Func<ScriptDescriptor, IScript> selector) =>
 			Assign(a => a.Script = selector?.Invoke(new ScriptDescriptor()));
 	}
diff --git a/src/Nest/Aggregations/Bucket/Composite/TermsCompositeAggregationSource.cs b/src/Nest/Aggregations/Bucket/Composite/TermsCompositeAggregationSource.cs
index 27e09850f6a..45202289d7d 100644
--- a/src/Nest/Aggregations/Bucket/Composite/TermsCompositeAggregationSource.cs
+++ b/src/Nest/Aggregations/Bucket/Composite/TermsCompositeAggregationSource.cs
@@ -3,7 +3,6 @@
 
 namespace Nest
 {
-
 	/// <summary>
 	/// A values source that is equivalent to a simple terms aggregation.
 	/// The values are extracted from a field or a script exactly like the terms aggregation.
@@ -17,10 +16,10 @@ public interface ITermsCompositeAggregationSource : ICompositeAggregationSource
 		IScript Script { get; set; }
 	}
 
-	/// <inheritdoc cref="ITermsCompositeAggregationSource"/>
+	/// <inheritdoc cref="ITermsCompositeAggregationSource" />
 	public class TermsCompositeAggregationSource : CompositeAggregationSourceBase, ITermsCompositeAggregationSource
 	{
-		public TermsCompositeAggregationSource(string name) : base(name) {}
+		public TermsCompositeAggregationSource(string name) : base(name) { }
 
 		/// <inheritdoc />
 		public IScript Script { get; set; }
@@ -29,15 +28,16 @@ public TermsCompositeAggregationSource(string name) : base(name) {}
 		protected override string SourceType => "terms";
 	}
 
-	/// <inheritdoc cref="ITermsCompositeAggregationSource"/>
+	/// <inheritdoc cref="ITermsCompositeAggregationSource" />
 	public class TermsCompositeAggregationSourceDescriptor<T>
-		: CompositeAggregationSourceDescriptorBase<TermsCompositeAggregationSourceDescriptor<T>, ITermsCompositeAggregationSource, T>, ITermsCompositeAggregationSource
+		: CompositeAggregationSourceDescriptorBase<TermsCompositeAggregationSourceDescriptor<T>, ITermsCompositeAggregationSource, T>,
+			ITermsCompositeAggregationSource
 	{
-		IScript ITermsCompositeAggregationSource.Script { get; set; }
+		public TermsCompositeAggregationSourceDescriptor(string name) : base(name, "terms") { }
 
-		public TermsCompositeAggregationSourceDescriptor(string name) : base(name, "terms") {}
+		IScript ITermsCompositeAggregationSource.Script { get; set; }
 
-		/// <inheritdoc cref="ITermsCompositeAggregationSource.Script"/>
+		/// <inheritdoc cref="ITermsCompositeAggregationSource.Script" />
 		public TermsCompositeAggregationSourceDescriptor<T> Script(Func<ScriptDescriptor, IScript> selector) =>
 			Assign(a => a.Script = selector?.Invoke(new ScriptDescriptor()));
 	}
diff --git a/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs b/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs
index 136fd1e9782..469577c23b1 100644
--- a/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs
@@ -9,26 +9,23 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<DateHistogramAggregation>))]
 	public interface IDateHistogramAggregation : IBucketAggregation
 	{
+		[JsonProperty("extended_bounds")]
+		ExtendedBounds<DateMath> ExtendedBounds { get; set; }
+
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("script")]
-		IScript Script { get; set; }
-
-		[JsonProperty("params")]
-		IDictionary<string, object> Params { get; set; }
+		[JsonProperty("format")]
+		string Format { get; set; }
 
 		[JsonProperty("interval")]
 		Union<DateInterval, Time> Interval { get; set; }
 
-		[JsonProperty("format")]
-		string Format { get; set; }
-
 		[JsonProperty("min_doc_count")]
 		int? MinimumDocumentCount { get; set; }
 
-		[JsonProperty("time_zone")]
-		string TimeZone { get; set; }
+		[JsonProperty("missing")]
+		DateTime? Missing { get; set; }
 
 		[JsonProperty("offset")]
 		string Offset { get; set; }
@@ -36,41 +33,46 @@ public interface IDateHistogramAggregation : IBucketAggregation
 		[JsonProperty("order")]
 		HistogramOrder Order { get; set; }
 
-		[JsonProperty("extended_bounds")]
-		ExtendedBounds<DateMath> ExtendedBounds { get; set; }
+		[JsonProperty("params")]
+		IDictionary<string, object> Params { get; set; }
 
-		[JsonProperty("missing")]
-		DateTime? Missing { get; set; }
+		[JsonProperty("script")]
+		IScript Script { get; set; }
+
+		[JsonProperty("time_zone")]
+		string TimeZone { get; set; }
 	}
 
 	public class DateHistogramAggregation : BucketAggregationBase, IDateHistogramAggregation
 	{
 		private string _format;
+
+		internal DateHistogramAggregation() { }
+
+		public DateHistogramAggregation(string name) : base(name) { }
+
+		public ExtendedBounds<DateMath> ExtendedBounds { get; set; }
 		public Field Field { get; set; }
-		public IScript Script { get; set; }
-		public IDictionary<string, object> Params { get; set; }
-		public Union<DateInterval, Time> Interval { get; set; }
 
 		public string Format
 		{
 			get => !string.IsNullOrEmpty(_format) &&
-			       !_format.Contains("date_optional_time") &&
-			       (ExtendedBounds != null || Missing.HasValue)
-				? _format + "||date_optional_time"
-				: _format;
+				!_format.Contains("date_optional_time") &&
+				(ExtendedBounds != null || Missing.HasValue)
+					? _format + "||date_optional_time"
+					: _format;
 			set => _format = value;
 		}
 
+		public Union<DateInterval, Time> Interval { get; set; }
+
 		public int? MinimumDocumentCount { get; set; }
-		public string TimeZone { get; set; }
+		public DateTime? Missing { get; set; }
 		public string Offset { get; set; }
 		public HistogramOrder Order { get; set; }
-		public ExtendedBounds<DateMath> ExtendedBounds { get; set; }
-		public DateTime? Missing { get; set; }
-
-		internal DateHistogramAggregation() { }
-
-		public DateHistogramAggregation(string name) : base(name) { }
+		public IDictionary<string, object> Params { get; set; }
+		public IScript Script { get; set; }
+		public string TimeZone { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.DateHistogram = this;
 	}
@@ -81,35 +83,35 @@ public class DateHistogramAggregationDescriptor<T>
 		where T : class
 	{
 		private string _format;
-		Field IDateHistogramAggregation.Field { get; set; }
 
-		IScript IDateHistogramAggregation.Script { get; set; }
-
-		IDictionary<string, object> IDateHistogramAggregation.Params { get; set; }
-
-		Union<DateInterval, Time> IDateHistogramAggregation.Interval { get; set; }
+		ExtendedBounds<DateMath> IDateHistogramAggregation.ExtendedBounds { get; set; }
+		Field IDateHistogramAggregation.Field { get; set; }
 
 		string IDateHistogramAggregation.Format
 		{
 			get => !string.IsNullOrEmpty(_format) &&
-			       !_format.Contains("date_optional_time") &&
-			       (Self.ExtendedBounds != null || Self.Missing.HasValue)
-				? _format + "||date_optional_time"
-				: _format;
+				!_format.Contains("date_optional_time") &&
+				(Self.ExtendedBounds != null || Self.Missing.HasValue)
+					? _format + "||date_optional_time"
+					: _format;
 			set => _format = value;
 		}
 
+		Union<DateInterval, Time> IDateHistogramAggregation.Interval { get; set; }
+
 		int? IDateHistogramAggregation.MinimumDocumentCount { get; set; }
 
-		string IDateHistogramAggregation.TimeZone { get; set; }
+		DateTime? IDateHistogramAggregation.Missing { get; set; }
 
 		string IDateHistogramAggregation.Offset { get; set; }
 
 		HistogramOrder IDateHistogramAggregation.Order { get; set; }
 
-		ExtendedBounds<DateMath> IDateHistogramAggregation.ExtendedBounds { get; set; }
+		IDictionary<string, object> IDateHistogramAggregation.Params { get; set; }
 
-		DateTime? IDateHistogramAggregation.Missing { get; set; }
+		IScript IDateHistogramAggregation.Script { get; set; }
+
+		string IDateHistogramAggregation.TimeZone { get; set; }
 
 		public DateHistogramAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
@@ -143,7 +145,7 @@ public DateHistogramAggregationDescriptor<T> OrderDescending(string key) =>
 			Assign(a => a.Order = new HistogramOrder { Key = key, Order = SortOrder.Descending });
 
 		public DateHistogramAggregationDescriptor<T> ExtendedBounds(DateMath min, DateMath max) =>
-			Assign(a=>a.ExtendedBounds = new ExtendedBounds<DateMath> { Minimum = min, Maximum = max });
+			Assign(a => a.ExtendedBounds = new ExtendedBounds<DateMath> { Minimum = min, Maximum = max });
 
 		public DateHistogramAggregationDescriptor<T> Missing(DateTime? missing) => Assign(a => a.Missing = missing);
 	}
diff --git a/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramBucket.cs b/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramBucket.cs
index 6c655595dd6..34cce9f6523 100644
--- a/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramBucket.cs
+++ b/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramBucket.cs
@@ -1,18 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
 	public class DateHistogramBucket : KeyedBucket<double>
 	{
-        private static readonly long EpochTicks = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero).Ticks;
+		private static readonly long EpochTicks = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero).Ticks;
 
 		public DateHistogramBucket(IReadOnlyDictionary<string, IAggregate> dict) : base(dict) { }
 
 		// Get a DateTime form of the returned key
-		public DateTime Date => new DateTime(EpochTicks + ((long)this.Key * TimeSpan.TicksPerMillisecond), DateTimeKind.Utc);
+		public DateTime Date => new DateTime(EpochTicks + (long)Key * TimeSpan.TicksPerMillisecond, DateTimeKind.Utc);
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/DateHistogram/DateInterval.cs b/src/Nest/Aggregations/Bucket/DateHistogram/DateInterval.cs
index 2b219c36381..91982ab408c 100644
--- a/src/Nest/Aggregations/Bucket/DateHistogram/DateInterval.cs
+++ b/src/Nest/Aggregations/Bucket/DateHistogram/DateInterval.cs
@@ -8,21 +8,27 @@ namespace Nest
 	public enum DateInterval
 	{
 		[EnumMember(Value = "second")]
-		Second, 
+		Second,
+
 		[EnumMember(Value = "minute")]
-		Minute, 
+		Minute,
+
 		[EnumMember(Value = "hour")]
-		Hour, 
+		Hour,
+
 		[EnumMember(Value = "day")]
 		Day,
+
 		[EnumMember(Value = "week")]
-		Week, 
+		Week,
+
 		[EnumMember(Value = "month")]
-		Month, 
+		Month,
+
 		[EnumMember(Value = "quarter")]
-		Quarter, 
+		Quarter,
+
 		[EnumMember(Value = "year")]
 		Year
 	}
-
 }
diff --git a/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs b/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs
index 5d8b5d5a014..e904609ff3e 100644
--- a/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs
@@ -25,15 +25,15 @@ public interface IDateRangeAggregation : IBucketAggregation
 
 	public class DateRangeAggregation : BucketAggregationBase, IDateRangeAggregation
 	{
+		internal DateRangeAggregation() { }
+
+		public DateRangeAggregation(string name) : base(name) { }
+
 		public Field Field { get; set; }
 		public string Format { get; set; }
 		public IEnumerable<IDateRangeExpression> Ranges { get; set; }
 		public string TimeZone { get; set; }
 
-		internal DateRangeAggregation() { }
-
-		public DateRangeAggregation(string name) : base(name) { }
-
 		internal override void WrapInContainer(AggregationContainer c) => c.DateRange = this;
 	}
 
@@ -57,14 +57,14 @@ public class DateRangeAggregationDescriptor<T>
 		public DateRangeAggregationDescriptor<T> Format(string format) => Assign(a => a.Format = format);
 
 		public DateRangeAggregationDescriptor<T> Ranges(params IDateRangeExpression[] ranges) =>
-			Assign(a=>a.Ranges = ranges.ToListOrNullIfEmpty());
+			Assign(a => a.Ranges = ranges.ToListOrNullIfEmpty());
 
 		public DateRangeAggregationDescriptor<T> TimeZone(string timeZone) => Assign(a => a.TimeZone = timeZone);
 
 		public DateRangeAggregationDescriptor<T> Ranges(params Func<DateRangeExpressionDescriptor, IDateRangeExpression>[] ranges) =>
-			Assign(a=>a.Ranges = ranges?.Select(r=>r(new DateRangeExpressionDescriptor())).ToListOrNullIfEmpty());
+			Assign(a => a.Ranges = ranges?.Select(r => r(new DateRangeExpressionDescriptor())).ToListOrNullIfEmpty());
 
 		public DateRangeAggregationDescriptor<T> Ranges(IEnumerable<Func<DateRangeExpressionDescriptor, IDateRangeExpression>> ranges) =>
-			Assign(a=>a.Ranges = ranges?.Select(r=>r(new DateRangeExpressionDescriptor())).ToListOrNullIfEmpty());
+			Assign(a => a.Ranges = ranges?.Select(r => r(new DateRangeExpressionDescriptor())).ToListOrNullIfEmpty());
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs b/src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs
index b1472e4ce78..f8b10c834be 100644
--- a/src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs
+++ b/src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs
@@ -8,32 +8,35 @@ public interface IDateRangeExpression
 		[JsonProperty("from")]
 		DateMath From { get; set; }
 
-		[JsonProperty("to")]
-		DateMath To { get; set; }
-
 		[JsonProperty("key")]
 		string Key { get; set; }
+
+		[JsonProperty("to")]
+		DateMath To { get; set; }
 	}
 
 	public class DateRangeExpression : IDateRangeExpression
 	{
 		public DateMath From { get; set; }
 
-		public DateMath To { get; set; }
-
 		public string Key { get; set; }
+
+		public DateMath To { get; set; }
 	}
 
 	public class DateRangeExpressionDescriptor
 		: DescriptorBase<DateRangeExpressionDescriptor, IDateRangeExpression>, IDateRangeExpression
 	{
 		DateMath IDateRangeExpression.From { get; set; }
-		public DateRangeExpressionDescriptor From(DateMath from) => Assign(a => a.From = from);
+
+		string IDateRangeExpression.Key { get; set; }
 
 		DateMath IDateRangeExpression.To { get; set; }
+
+		public DateRangeExpressionDescriptor From(DateMath from) => Assign(a => a.From = from);
+
 		public DateRangeExpressionDescriptor To(DateMath to) => Assign(a => a.To = to);
 
-		string IDateRangeExpression.Key { get; set; }
 		public DateRangeExpressionDescriptor Key(string key) => Assign(a => a.Key = key);
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Filter/FilterAggregation.cs b/src/Nest/Aggregations/Bucket/Filter/FilterAggregation.cs
index 89b7fbf90b7..9ca113729ef 100644
--- a/src/Nest/Aggregations/Bucket/Filter/FilterAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Filter/FilterAggregation.cs
@@ -13,24 +13,23 @@ public interface IFilterAggregation : IBucketAggregation
 
 	public class FilterAggregation : BucketAggregationBase, IFilterAggregation
 	{
-		public QueryContainer Filter { get; set; }
-
 		internal FilterAggregation() { }
 
 		public FilterAggregation(string name) : base(name) { }
 
+		public QueryContainer Filter { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.Filter = this;
 	}
 
 	public class FilterAggregationDescriptor<T>
-		: BucketAggregationDescriptorBase<FilterAggregationDescriptor<T>,IFilterAggregation, T>
+		: BucketAggregationDescriptorBase<FilterAggregationDescriptor<T>, IFilterAggregation, T>
 			, IFilterAggregation
 		where T : class
 	{
 		QueryContainer IFilterAggregation.Filter { get; set; }
 
 		public FilterAggregationDescriptor<T> Filter(Func<QueryContainerDescriptor<T>, QueryContainer> selector) =>
-			Assign(a=> a.Filter = selector?.Invoke(new QueryContainerDescriptor<T>()));
-
+			Assign(a => a.Filter = selector?.Invoke(new QueryContainerDescriptor<T>()));
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Filter/FilterAggregationJsonConverter.cs b/src/Nest/Aggregations/Bucket/Filter/FilterAggregationJsonConverter.cs
index f20ead0b1ad..35faa34d500 100644
--- a/src/Nest/Aggregations/Bucket/Filter/FilterAggregationJsonConverter.cs
+++ b/src/Nest/Aggregations/Bucket/Filter/FilterAggregationJsonConverter.cs
@@ -19,7 +19,8 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				writer.WriteStartObject();
 				writer.WriteEndObject();
 				return;
-			};
+			}
+			;
 
 			serializer.Serialize(writer, f.Filter);
 		}
@@ -27,6 +28,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject) return null;
+
 			var container = new QueryContainer();
 			serializer.Populate(reader, container);
 			var agg = new FilterAggregation();
@@ -34,5 +36,4 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return agg;
 		}
 	}
-
 }
diff --git a/src/Nest/Aggregations/Bucket/Filters/FiltersAggregate.cs b/src/Nest/Aggregations/Bucket/Filters/FiltersAggregate.cs
index 9370d1498cd..1c85a5a95c4 100644
--- a/src/Nest/Aggregations/Bucket/Filters/FiltersAggregate.cs
+++ b/src/Nest/Aggregations/Bucket/Filters/FiltersAggregate.cs
@@ -1,5 +1,4 @@
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Nest
@@ -25,13 +24,13 @@ public FiltersBucketItem(IReadOnlyDictionary<string, IAggregate> dict) : base(di
 	public class FiltersAggregate : BucketAggregateBase
 	{
 		public FiltersAggregate() : base(EmptyReadOnly<string, IAggregate>.Dictionary) { }
-		public FiltersAggregate(IReadOnlyDictionary<string, IAggregate> aggregations) : base(aggregations) { }
-
-		public SingleBucketAggregate NamedBucket(string key) => this.Global(key);
 
-		public IList<FiltersBucketItem> AnonymousBuckets() => this.Buckets?.ToList();
+		public FiltersAggregate(IReadOnlyDictionary<string, IAggregate> aggregations) : base(aggregations) { }
 
 		public IReadOnlyCollection<FiltersBucketItem> Buckets { get; set; } = EmptyReadOnly<FiltersBucketItem>.Collection;
 
+		public SingleBucketAggregate NamedBucket(string key) => Global(key);
+
+		public IList<FiltersBucketItem> AnonymousBuckets() => Buckets?.ToList();
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Filters/FiltersAggregation.cs b/src/Nest/Aggregations/Bucket/Filters/FiltersAggregation.cs
index bda9bd8b4f9..28f972394df 100644
--- a/src/Nest/Aggregations/Bucket/Filters/FiltersAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Filters/FiltersAggregation.cs
@@ -21,6 +21,10 @@ public interface IFiltersAggregation : IBucketAggregation
 
 	public class FiltersAggregation : BucketAggregationBase, IFiltersAggregation
 	{
+		internal FiltersAggregation() { }
+
+		public FiltersAggregation(string name) : base(name) { }
+
 		public Union<INamedFiltersContainer, List<QueryContainer>> Filters { get; set; }
 
 		/// <summary>
@@ -36,27 +40,23 @@ public class FiltersAggregation : BucketAggregationBase, IFiltersAggregation
 
 		/// <summary>
 		/// Gets or sets the key for the other bucket to a value other than the default "_other_".
-		/// Setting this parameter will implicitly set the <see cref="OtherBucket"/> parameter to true
+		/// Setting this parameter will implicitly set the <see cref="OtherBucket" /> parameter to true
 		/// </summary>
 		public string OtherBucketKey { get; set; }
 
-		internal FiltersAggregation() { }
-
-		public FiltersAggregation(string name) : base(name) { }
-
 		internal override void WrapInContainer(AggregationContainer c) => c.Filters = this;
 	}
 
 	public class FiltersAggregationDescriptor<T>
 		: BucketAggregationDescriptorBase<FiltersAggregationDescriptor<T>, IFiltersAggregation, T>
-		, IFiltersAggregation
+			, IFiltersAggregation
 		where T : class
 	{
 		Union<INamedFiltersContainer, List<QueryContainer>> IFiltersAggregation.Filters { get; set; }
 
-		bool? IFiltersAggregation.OtherBucket{ get; set; }
+		bool? IFiltersAggregation.OtherBucket { get; set; }
 
-		string IFiltersAggregation.OtherBucketKey{ get; set; }
+		string IFiltersAggregation.OtherBucketKey { get; set; }
 
 		/// <summary>
 		/// Adds a bucket to the response which will contain all documents
@@ -68,27 +68,27 @@ public class FiltersAggregationDescriptor<T>
 		/// the other bucket.
 		/// </summary>
 		/// <param name="otherBucket">whether to set the other bucket</param>
-		/// <returns>the <see cref="FiltersAggregationDescriptor{T}"/></returns>
+		/// <returns>the <see cref="FiltersAggregationDescriptor{T}" /></returns>
 		public FiltersAggregationDescriptor<T> OtherBucket(bool? otherBucket = true) =>
 			Assign(a => a.OtherBucket = otherBucket);
 
 		/// <summary>
 		/// Sets the key for the other bucket to a value other than the default "_other_".
-		/// Setting this parameter will implicitly set the <see cref="OtherBucket"/> parameter to true
+		/// Setting this parameter will implicitly set the <see cref="OtherBucket" /> parameter to true
 		/// </summary>
 		/// <param name="otherBucketKey">the name for the other bucket</param>
-		/// <returns>the <see cref="FiltersAggregationDescriptor{T}"/></returns>
+		/// <returns>the <see cref="FiltersAggregationDescriptor{T}" /></returns>
 		public FiltersAggregationDescriptor<T> OtherBucketKey(string otherBucketKey) =>
 			Assign(a => a.OtherBucketKey = otherBucketKey);
 
 		public FiltersAggregationDescriptor<T> NamedFilters(Func<NamedFiltersContainerDescriptor<T>, IPromise<INamedFiltersContainer>> selector) =>
-			Assign(a => a.Filters = new Union<INamedFiltersContainer, List<QueryContainer>>(selector?.Invoke(new NamedFiltersContainerDescriptor<T>())?.Value));
+			Assign(a => a.Filters =
+				new Union<INamedFiltersContainer, List<QueryContainer>>(selector?.Invoke(new NamedFiltersContainerDescriptor<T>())?.Value));
 
 		public FiltersAggregationDescriptor<T> AnonymousFilters(params Func<QueryContainerDescriptor<T>, QueryContainer>[] selectors) =>
-			Assign(a => a.Filters = selectors.Select(s=>s?.Invoke(new QueryContainerDescriptor<T>())).ToList());
+			Assign(a => a.Filters = selectors.Select(s => s?.Invoke(new QueryContainerDescriptor<T>())).ToList());
 
 		public FiltersAggregationDescriptor<T> AnonymousFilters(IEnumerable<Func<QueryContainerDescriptor<T>, QueryContainer>> selectors) =>
-			Assign(a => a.Filters = selectors.Select(s=>s?.Invoke(new QueryContainerDescriptor<T>())).ToList());
-
+			Assign(a => a.Filters = selectors.Select(s => s?.Invoke(new QueryContainerDescriptor<T>())).ToList());
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Filters/NamedFiltersContainer.cs b/src/Nest/Aggregations/Bucket/Filters/NamedFiltersContainer.cs
index a5cb7d69c7b..18d0443b65a 100644
--- a/src/Nest/Aggregations/Bucket/Filters/NamedFiltersContainer.cs
+++ b/src/Nest/Aggregations/Bucket/Filters/NamedFiltersContainer.cs
@@ -8,19 +8,22 @@ namespace Nest
 	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<NamedFiltersContainer, string, IQueryContainer>))]
 	public interface INamedFiltersContainer : IIsADictionary<string, IQueryContainer> { }
 
-	public class NamedFiltersContainer: IsADictionaryBase<string, IQueryContainer>, INamedFiltersContainer
+	public class NamedFiltersContainer : IsADictionaryBase<string, IQueryContainer>, INamedFiltersContainer
 	{
-		public NamedFiltersContainer() {}
+		public NamedFiltersContainer() { }
+
 		public NamedFiltersContainer(IDictionary<string, IQueryContainer> container) : base(container) { }
+
 		public NamedFiltersContainer(Dictionary<string, QueryContainer> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => (IQueryContainer)kv.Value))
-		{ }
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => (IQueryContainer)kv.Value)) { }
 
 		public void Add(string name, IQueryContainer filter) => BackingDictionary.Add(name, filter);
+
 		public void Add(string name, QueryContainer filter) => BackingDictionary.Add(name, filter);
 	}
 
-	public class NamedFiltersContainerDescriptor<T> : IsADictionaryDescriptorBase<NamedFiltersContainerDescriptor<T>, INamedFiltersContainer, string, IQueryContainer>
+	public class NamedFiltersContainerDescriptor<T>
+		: IsADictionaryDescriptorBase<NamedFiltersContainerDescriptor<T>, INamedFiltersContainer, string, IQueryContainer>
 		where T : class
 	{
 		public NamedFiltersContainerDescriptor() : base(new NamedFiltersContainer()) { }
@@ -33,7 +36,5 @@ public NamedFiltersContainerDescriptor<T> Filter(string name, Func<QueryContaine
 		public NamedFiltersContainerDescriptor<T> Filter<TOther>(string name, Func<QueryContainerDescriptor<TOther>, QueryContainer> selector)
 			where TOther : class =>
 			Assign(name, selector?.Invoke(new QueryContainerDescriptor<TOther>()));
-
 	}
-
 }
diff --git a/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs b/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs
index abd9e00f5de..859ab2e48be 100644
--- a/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs
@@ -10,57 +10,54 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<GeoDistanceAggregation>))]
 	public interface IGeoDistanceAggregation : IBucketAggregation
 	{
+		[JsonProperty("distance_type")]
+		GeoDistanceType? DistanceType { get; set; }
+
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
 		[JsonProperty("origin")]
 		GeoLocation Origin { get; set; }
 
-		[JsonProperty("unit")]
-		DistanceUnit? Unit { get; set; }
-
-		[JsonProperty("distance_type")]
-		GeoDistanceType? DistanceType { get; set; }
-
 		[JsonProperty("ranges")]
 		IEnumerable<IAggregationRange> Ranges { get; set; }
 
+		[JsonProperty("unit")]
+		DistanceUnit? Unit { get; set; }
 	}
 
 	public class GeoDistanceAggregation : BucketAggregationBase, IGeoDistanceAggregation
 	{
-		public Field Field { get; set; }
-
-		public GeoLocation Origin { get; set; }
+		internal GeoDistanceAggregation() { }
 
-		public DistanceUnit? Unit { get; set; }
+		public GeoDistanceAggregation(string name) : base(name) { }
 
 		public GeoDistanceType? DistanceType { get; set; }
+		public Field Field { get; set; }
 
-		public IEnumerable<IAggregationRange> Ranges { get; set; }
+		public GeoLocation Origin { get; set; }
 
-		internal GeoDistanceAggregation() { }
+		public IEnumerable<IAggregationRange> Ranges { get; set; }
 
-		public GeoDistanceAggregation(string name) : base(name) { }
+		public DistanceUnit? Unit { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.GeoDistance = this;
 	}
 
-	public class GeoDistanceAggregationDescriptor<T> :
-		BucketAggregationDescriptorBase<GeoDistanceAggregationDescriptor<T>, IGeoDistanceAggregation, T>
+	public class GeoDistanceAggregationDescriptor<T>
+		: BucketAggregationDescriptorBase<GeoDistanceAggregationDescriptor<T>, IGeoDistanceAggregation, T>
 			, IGeoDistanceAggregation
 		where T : class
 	{
+		GeoDistanceType? IGeoDistanceAggregation.DistanceType { get; set; }
 		Field IGeoDistanceAggregation.Field { get; set; }
 
 		GeoLocation IGeoDistanceAggregation.Origin { get; set; }
 
-		DistanceUnit? IGeoDistanceAggregation.Unit { get; set; }
-
-		GeoDistanceType? IGeoDistanceAggregation.DistanceType { get; set; }
-
 		IEnumerable<IAggregationRange> IGeoDistanceAggregation.Ranges { get; set; }
 
+		DistanceUnit? IGeoDistanceAggregation.Unit { get; set; }
+
 		public GeoDistanceAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
 		public GeoDistanceAggregationDescriptor<T> Field(Expression<Func<T, object>> field) => Assign(a => a.Field = field);
diff --git a/src/Nest/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregation.cs b/src/Nest/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregation.cs
index b816bebf52c..d61e82f404c 100644
--- a/src/Nest/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregation.cs
@@ -11,27 +11,27 @@ public interface IGeoHashGridAggregation : IBucketAggregation
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("size")]
-		int? Size { get; set; }
+		[JsonProperty("precision")]
+		GeoHashPrecision? Precision { get; set; }
 
 		[JsonProperty("shard_size")]
 		int? ShardSize { get; set; }
 
-		[JsonProperty("precision")]
-		GeoHashPrecision? Precision { get; set; }
+		[JsonProperty("size")]
+		int? Size { get; set; }
 	}
 
 	public class GeoHashGridAggregation : BucketAggregationBase, IGeoHashGridAggregation
 	{
-		public Field Field { get; set; }
-		public int? Size { get; set; }
-		public int? ShardSize { get; set; }
-		public GeoHashPrecision? Precision { get; set; }
-
 		internal GeoHashGridAggregation() { }
 
 		public GeoHashGridAggregation(string name) : base(name) { }
 
+		public Field Field { get; set; }
+		public GeoHashPrecision? Precision { get; set; }
+		public int? ShardSize { get; set; }
+		public int? Size { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.GeoHash = this;
 	}
 
@@ -42,11 +42,11 @@ public class GeoHashGridAggregationDescriptor<T>
 	{
 		Field IGeoHashGridAggregation.Field { get; set; }
 
-		int? IGeoHashGridAggregation.Size { get; set; }
+		GeoHashPrecision? IGeoHashGridAggregation.Precision { get; set; }
 
 		int? IGeoHashGridAggregation.ShardSize { get; set; }
 
-		GeoHashPrecision? IGeoHashGridAggregation.Precision { get; set; }
+		int? IGeoHashGridAggregation.Size { get; set; }
 
 		public GeoHashGridAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
diff --git a/src/Nest/Aggregations/Bucket/Global/GlobalAggregation.cs b/src/Nest/Aggregations/Bucket/Global/GlobalAggregation.cs
index 4a2f080e1dc..6fec34a3b11 100644
--- a/src/Nest/Aggregations/Bucket/Global/GlobalAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Global/GlobalAggregation.cs
@@ -2,7 +2,6 @@
 
 namespace Nest
 {
-
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[ContractJsonConverter(typeof(AggregationJsonConverter<GlobalAggregation>))]
 	public interface IGlobalAggregation : IBucketAggregation { }
@@ -16,8 +15,8 @@ public GlobalAggregation(string name) : base(name) { }
 		internal override void WrapInContainer(AggregationContainer c) => c.Global = this;
 	}
 
-	public class GlobalAggregationDescriptor<T> 
+	public class GlobalAggregationDescriptor<T>
 		: BucketAggregationDescriptorBase<GlobalAggregationDescriptor<T>, IGlobalAggregation, T>
 			, IGlobalAggregation
 		where T : class { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Bucket/Histogram/ExtendedBounds.cs b/src/Nest/Aggregations/Bucket/Histogram/ExtendedBounds.cs
index c3ef9951885..12e58c0e3a2 100644
--- a/src/Nest/Aggregations/Bucket/Histogram/ExtendedBounds.cs
+++ b/src/Nest/Aggregations/Bucket/Histogram/ExtendedBounds.cs
@@ -4,10 +4,10 @@ namespace Nest
 {
 	public class ExtendedBounds<T>
 	{
-		[JsonProperty("min")]
-		public T Minimum { get; set; }
-
 		[JsonProperty("max")]
 		public T Maximum { get; set; }
+
+		[JsonProperty("min")]
+		public T Minimum { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs b/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs
index 7d359ccb712..7e8b6777dcb 100644
--- a/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs
@@ -8,45 +8,45 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<HistogramAggregation>))]
 	public interface IHistogramAggregation : IBucketAggregation
 	{
+		[JsonProperty("extended_bounds")]
+		ExtendedBounds<double> ExtendedBounds { get; set; }
+
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("script")]
-		IScript Script { get; set; }
-
 		[JsonProperty("interval")]
 		double? Interval { get; set; }
 
 		[JsonProperty("min_doc_count")]
 		int? MinimumDocumentCount { get; set; }
 
-		[JsonProperty("order")]
-		HistogramOrder Order { get; set; }
-
-		[JsonProperty("extended_bounds")]
-		ExtendedBounds<double> ExtendedBounds { get; set; }
+		[JsonProperty("missing")]
+		double? Missing { get; set; }
 
 		[JsonProperty("offset")]
 		double? Offset { get; set; }
 
-		[JsonProperty("missing")]
-		double? Missing { get; set; }
+		[JsonProperty("order")]
+		HistogramOrder Order { get; set; }
+
+		[JsonProperty("script")]
+		IScript Script { get; set; }
 	}
 
 	public class HistogramAggregation : BucketAggregationBase, IHistogramAggregation
 	{
+		internal HistogramAggregation() { }
+
+		public HistogramAggregation(string name) : base(name) { }
+
+		public ExtendedBounds<double> ExtendedBounds { get; set; }
 		public Field Field { get; set; }
-		public IScript Script { get; set; }
 		public double? Interval { get; set; }
 		public int? MinimumDocumentCount { get; set; }
-		public HistogramOrder Order { get; set; }
-		public ExtendedBounds<double> ExtendedBounds { get; set; }
-		public double? Offset { get; set; }
 		public double? Missing { get; set; }
-
-		internal HistogramAggregation() { }
-
-		public HistogramAggregation(string name) : base(name) { }
+		public double? Offset { get; set; }
+		public HistogramOrder Order { get; set; }
+		public IScript Script { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.Histogram = this;
 	}
@@ -55,21 +55,20 @@ public class HistogramAggregationDescriptor<T>
 		: BucketAggregationDescriptorBase<HistogramAggregationDescriptor<T>, IHistogramAggregation, T>, IHistogramAggregation
 		where T : class
 	{
+		ExtendedBounds<double> IHistogramAggregation.ExtendedBounds { get; set; }
 		Field IHistogramAggregation.Field { get; set; }
 
-		IScript IHistogramAggregation.Script { get; set; }
-
 		double? IHistogramAggregation.Interval { get; set; }
 
 		int? IHistogramAggregation.MinimumDocumentCount { get; set; }
 
-		HistogramOrder IHistogramAggregation.Order { get; set; }
-
-		ExtendedBounds<double> IHistogramAggregation.ExtendedBounds { get; set; }
+		double? IHistogramAggregation.Missing { get; set; }
 
 		double? IHistogramAggregation.Offset { get; set; }
 
-		double? IHistogramAggregation.Missing { get; set; }
+		HistogramOrder IHistogramAggregation.Order { get; set; }
+
+		IScript IHistogramAggregation.Script { get; set; }
 
 		public HistogramAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
diff --git a/src/Nest/Aggregations/Bucket/Histogram/HistogramOrder.cs b/src/Nest/Aggregations/Bucket/Histogram/HistogramOrder.cs
index 176c610248d..2903ebe7e26 100644
--- a/src/Nest/Aggregations/Bucket/Histogram/HistogramOrder.cs
+++ b/src/Nest/Aggregations/Bucket/Histogram/HistogramOrder.cs
@@ -5,14 +5,12 @@ namespace Nest
 	[JsonConverter(typeof(KeyValueJsonConverter<HistogramOrder, SortOrder>))]
 	public class HistogramOrder
 	{
-		public string Key { get; set; }
-		public SortOrder Order { get; set; }
-
 		public static HistogramOrder CountAscending => new HistogramOrder { Key = "_count", Order = SortOrder.Ascending };
 		public static HistogramOrder CountDescending => new HistogramOrder { Key = "_count", Order = SortOrder.Descending };
+		public string Key { get; set; }
 
 		public static HistogramOrder KeyAscending => new HistogramOrder { Key = "_key", Order = SortOrder.Ascending };
 		public static HistogramOrder KeyDescending => new HistogramOrder { Key = "_key", Order = SortOrder.Descending };
-
+		public SortOrder Order { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Bucket/IpRange/IpRange.cs b/src/Nest/Aggregations/Bucket/IpRange/IpRange.cs
index a79beed37c7..b84b6aa1abf 100644
--- a/src/Nest/Aggregations/Bucket/IpRange/IpRange.cs
+++ b/src/Nest/Aggregations/Bucket/IpRange/IpRange.cs
@@ -9,20 +9,20 @@ public interface IIpRange
 		[JsonProperty("from")]
 		string From { get; set; }
 
-		[JsonProperty("to")]
-		string To { get; set; }
-
 		[JsonProperty("mask")]
 		string Mask { get; set; }
+
+		[JsonProperty("to")]
+		string To { get; set; }
 	}
 
 	public class IpRange : IIpRange
 	{
 		public string From { get; set; }
 
-		public string To { get; set; }
-
 		public string Mask { get; set; }
+
+		public string To { get; set; }
 	}
 
 	public class IpRangeDescriptor
@@ -33,7 +33,9 @@ public class IpRangeDescriptor
 		string IIpRange.To { get; set; }
 
 		public IpRangeDescriptor From(string from) => Assign(a => a.From = from);
+
 		public IpRangeDescriptor To(string to) => Assign(a => a.To = to);
+
 		public IpRangeDescriptor Mask(string mask) => Assign(a => a.Mask = mask);
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs b/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs
index e6c179393aa..54e14f964b3 100644
--- a/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs
@@ -19,18 +19,18 @@ public interface IIpRangeAggregation : IBucketAggregation
 
 	public class IpRangeAggregation : BucketAggregationBase, IIpRangeAggregation
 	{
-		public Field Field { get; set; }
-		public IEnumerable<IIpRange> Ranges { get; set; }
-
 		internal IpRangeAggregation() { }
 
 		public IpRangeAggregation(string name) : base(name) { }
 
+		public Field Field { get; set; }
+		public IEnumerable<IIpRange> Ranges { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.IpRange = this;
 	}
 
-	public class IpRangeAggregationDescriptor<T> :
-		BucketAggregationDescriptorBase<IpRangeAggregationDescriptor<T>,IIpRangeAggregation, T>
+	public class IpRangeAggregationDescriptor<T>
+		: BucketAggregationDescriptorBase<IpRangeAggregationDescriptor<T>, IIpRangeAggregation, T>
 			, IIpRangeAggregation
 		where T : class
 	{
diff --git a/src/Nest/Aggregations/Bucket/KeyedBucket.cs b/src/Nest/Aggregations/Bucket/KeyedBucket.cs
index 4577f9cc0e4..7817ee9ac62 100644
--- a/src/Nest/Aggregations/Bucket/KeyedBucket.cs
+++ b/src/Nest/Aggregations/Bucket/KeyedBucket.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Nest
 {
@@ -9,10 +6,11 @@ public class KeyedBucket<TKey> : BucketBase
 	{
 		public KeyedBucket(IReadOnlyDictionary<string, IAggregate> dict) : base(dict) { }
 
-		public TKey Key { get; set; }
-		public string KeyAsString { get; set; }
 		public long? DocCount { get; set; }
 
 		public long? DocCountErrorUpperBound { get; set; }
+
+		public TKey Key { get; set; }
+		public string KeyAsString { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Missing/MissingAggregation.cs b/src/Nest/Aggregations/Bucket/Missing/MissingAggregation.cs
index 1c14dd97680..4a5789bfd1d 100644
--- a/src/Nest/Aggregations/Bucket/Missing/MissingAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Missing/MissingAggregation.cs
@@ -14,17 +14,17 @@ public interface IMissingAggregation : IBucketAggregation
 
 	public class MissingAggregation : BucketAggregationBase, IMissingAggregation
 	{
-		public Field Field { get; set; }
-
 		internal MissingAggregation() { }
 
 		public MissingAggregation(string name) : base(name) { }
 
+		public Field Field { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.Missing = this;
 	}
 
 	public class MissingAggregationDescriptor<T>
-		: BucketAggregationDescriptorBase<MissingAggregationDescriptor<T>,IMissingAggregation, T>
+		: BucketAggregationDescriptorBase<MissingAggregationDescriptor<T>, IMissingAggregation, T>
 			, IMissingAggregation
 		where T : class
 	{
diff --git a/src/Nest/Aggregations/Bucket/Nested/NestedAggregation.cs b/src/Nest/Aggregations/Bucket/Nested/NestedAggregation.cs
index 0e1a27c857c..f806b5a39bb 100644
--- a/src/Nest/Aggregations/Bucket/Nested/NestedAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Nested/NestedAggregation.cs
@@ -9,17 +9,17 @@ namespace Nest
 	public interface INestedAggregation : IBucketAggregation
 	{
 		[JsonProperty("path")]
-		Field Path { get; set;}
+		Field Path { get; set; }
 	}
 
 	public class NestedAggregation : BucketAggregationBase, INestedAggregation
 	{
-		public Field Path { get; set; }
-
 		internal NestedAggregation() { }
 
 		public NestedAggregation(string name) : base(name) { }
 
+		public Field Path { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.Nested = this;
 	}
 
diff --git a/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs b/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs
index b36396a59a4..da951727be7 100644
--- a/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs
@@ -13,22 +13,23 @@ public interface IRangeAggregation : IBucketAggregation
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("script")]
-		IScript Script { get; set; }
-
 		[JsonProperty("ranges")]
 		IEnumerable<IAggregationRange> Ranges { get; set; }
+
+		[JsonProperty("script")]
+		IScript Script { get; set; }
 	}
 
 	public class RangeAggregation : BucketAggregationBase, IRangeAggregation
 	{
-		public Field Field { get; set; }
-		public IScript Script { get; set; }
-		public IEnumerable<IAggregationRange> Ranges { get; set; }
 		internal RangeAggregation() { }
 
 		public RangeAggregation(string name) : base(name) { }
 
+		public Field Field { get; set; }
+		public IEnumerable<IAggregationRange> Ranges { get; set; }
+		public IScript Script { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.Range = this;
 	}
 
@@ -38,10 +39,10 @@ public class RangeAggregationDescriptor<T>
 	{
 		Field IRangeAggregation.Field { get; set; }
 
-		IScript IRangeAggregation.Script { get; set; }
-
 		IEnumerable<IAggregationRange> IRangeAggregation.Ranges { get; set; }
 
+		IScript IRangeAggregation.Script { get; set; }
+
 		public RangeAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
 		public RangeAggregationDescriptor<T> Field(Expression<Func<T, object>> field) => Assign(a => a.Field = field);
diff --git a/src/Nest/Aggregations/Bucket/Range/RangeBucket.cs b/src/Nest/Aggregations/Bucket/Range/RangeBucket.cs
index 20f11969d58..490e9a7a3f4 100644
--- a/src/Nest/Aggregations/Bucket/Range/RangeBucket.cs
+++ b/src/Nest/Aggregations/Bucket/Range/RangeBucket.cs
@@ -6,11 +6,12 @@ public class RangeBucket : BucketBase, IBucket
 	{
 		public RangeBucket(IReadOnlyDictionary<string, IAggregate> dict) : base(dict) { }
 
-		public string Key { get; set; }
+		public long DocCount { get; set; }
 		public double? From { get; set; }
 		public string FromAsString { get; set; }
+
+		public string Key { get; set; }
 		public double? To { get; set; }
 		public string ToAsString { get; set; }
-		public long DocCount { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/ReverseNested/ReverseNestedAggregation.cs b/src/Nest/Aggregations/Bucket/ReverseNested/ReverseNestedAggregation.cs
index 098fde530ff..e4e9377e3fd 100644
--- a/src/Nest/Aggregations/Bucket/ReverseNested/ReverseNestedAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/ReverseNested/ReverseNestedAggregation.cs
@@ -14,18 +14,18 @@ public interface IReverseNestedAggregation : IBucketAggregation
 
 	public class ReverseNestedAggregation : BucketAggregationBase, IReverseNestedAggregation
 	{
-		[JsonProperty("path")]
-		public Field Path { get; set; }
-
 		internal ReverseNestedAggregation() { }
 
 		public ReverseNestedAggregation(string name) : base(name) { }
 
+		[JsonProperty("path")]
+		public Field Path { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.ReverseNested = this;
 	}
 
 	public class ReverseNestedAggregationDescriptor<T>
-		: BucketAggregationDescriptorBase<ReverseNestedAggregationDescriptor<T>,IReverseNestedAggregation, T>
+		: BucketAggregationDescriptorBase<ReverseNestedAggregationDescriptor<T>, IReverseNestedAggregation, T>
 			, IReverseNestedAggregation
 		where T : class
 	{
diff --git a/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregation.cs b/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregation.cs
index 1f28e64638a..da703030afc 100644
--- a/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregation.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq.Expressions;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -8,8 +7,8 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<SamplerAggregation>))]
 	public interface ISamplerAggregation : IBucketAggregation
 	{
-		[JsonProperty("shard_size")]
-		int? ShardSize { get; set; }
+		[JsonProperty("execution_hint")]
+		SamplerAggregationExecutionHint? ExecutionHint { get; set; }
 
 		[JsonProperty("max_docs_per_value")]
 		int? MaxDocsPerValue { get; set; }
@@ -17,21 +16,21 @@ public interface ISamplerAggregation : IBucketAggregation
 		[JsonProperty("script")]
 		IScript Script { get; set; }
 
-		[JsonProperty("execution_hint")]
-		SamplerAggregationExecutionHint? ExecutionHint { get; set; }
+		[JsonProperty("shard_size")]
+		int? ShardSize { get; set; }
 	}
 
 	public class SamplerAggregation : BucketAggregationBase, ISamplerAggregation
 	{
+		internal SamplerAggregation() { }
+
+		public SamplerAggregation(string name) : base(name) { }
+
 		public SamplerAggregationExecutionHint? ExecutionHint { get; set; }
 		public int? MaxDocsPerValue { get; set; }
 		public IScript Script { get; set; }
 		public int? ShardSize { get; set; }
 
-		internal SamplerAggregation() { }
-
-		public SamplerAggregation(string name) : base(name) { }
-
 		internal override void WrapInContainer(AggregationContainer c) => c.Sampler = this;
 	}
 
diff --git a/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregationExecutionHint.cs b/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregationExecutionHint.cs
index de04ff9104f..16f7a8c4921 100644
--- a/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregationExecutionHint.cs
+++ b/src/Nest/Aggregations/Bucket/Sampler/SamplerAggregationExecutionHint.cs
@@ -9,9 +9,11 @@ public enum SamplerAggregationExecutionHint
 	{
 		[EnumMember(Value = "map")]
 		Map,
-        [EnumMember(Value = "global_ordinals")]
+
+		[EnumMember(Value = "global_ordinals")]
 		GlobalOrdinals,
-        [EnumMember(Value = "bytes_hash")]
+
+		[EnumMember(Value = "bytes_hash")]
 		BytesHash
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/ChiSquareHeuristic.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/ChiSquareHeuristic.cs
index 09d3640805b..438b9989146 100644
--- a/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/ChiSquareHeuristic.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/ChiSquareHeuristic.cs
@@ -6,17 +6,17 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<ChiSquareHeuristic>))]
 	public interface IChiSquareHeuristic
 	{
-		[JsonProperty("include_negatives")]
-		bool? IncludeNegatives { get; set; }
-
 		[JsonProperty("background_is_superset")]
 		bool? BackgroundIsSuperSet { get; set; }
+
+		[JsonProperty("include_negatives")]
+		bool? IncludeNegatives { get; set; }
 	}
 
 	public class ChiSquareHeuristic : IChiSquareHeuristic
 	{
-		public bool? IncludeNegatives { get; set; }
 		public bool? BackgroundIsSuperSet { get; set; }
+		public bool? IncludeNegatives { get; set; }
 	}
 
 	public class ChiSquareHeuristicDescriptor
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/MutualInformationHeuristic.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/MutualInformationHeuristic.cs
index 8fb00aa7355..c4be34af93e 100644
--- a/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/MutualInformationHeuristic.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/MutualInformationHeuristic.cs
@@ -6,24 +6,24 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<MutualInformationHeuristic>))]
 	public interface IMutualInformationHeuristic
 	{
-		[JsonProperty("include_negatives")]
-		bool? IncludeNegatives { get; set; }
-
 		[JsonProperty("background_is_superset")]
 		bool? BackgroundIsSuperSet { get; set; }
+
+		[JsonProperty("include_negatives")]
+		bool? IncludeNegatives { get; set; }
 	}
 
 	public class MutualInformationHeuristic : IMutualInformationHeuristic
 	{
-		public bool? IncludeNegatives { get; set; }
 		public bool? BackgroundIsSuperSet { get; set; }
+		public bool? IncludeNegatives { get; set; }
 	}
 
 	public class MutualInformationHeuristicDescriptor
 		: DescriptorBase<MutualInformationHeuristicDescriptor, IMutualInformationHeuristic>, IMutualInformationHeuristic
 	{
-		bool? IMutualInformationHeuristic.IncludeNegatives { get; set; }
 		bool? IMutualInformationHeuristic.BackgroundIsSuperSet { get; set; }
+		bool? IMutualInformationHeuristic.IncludeNegatives { get; set; }
 
 		public MutualInformationHeuristicDescriptor IncludeNegatives(bool? includeNegatives = true) =>
 			Assign(a => a.IncludeNegatives = includeNegatives);
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/PercentageScoreHeuristic.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/PercentageScoreHeuristic.cs
index 16782ff88dc..6305fa96236 100644
--- a/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/PercentageScoreHeuristic.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/PercentageScoreHeuristic.cs
@@ -8,7 +8,6 @@ public interface IPercentageScoreHeuristic { }
 
 	public class PercentageScoreHeuristic { }
 
-	public class PercentageScoreHeuristicDescriptor 
-		: DescriptorBase<PercentageScoreHeuristicDescriptor, IPercentageScoreHeuristic>, IPercentageScoreHeuristic
-	{ }
-}
\ No newline at end of file
+	public class PercentageScoreHeuristicDescriptor
+		: DescriptorBase<PercentageScoreHeuristicDescriptor, IPercentageScoreHeuristic>, IPercentageScoreHeuristic { }
+}
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/ScriptedHeuristic.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/ScriptedHeuristic.cs
index 20b4dda9489..c4e1bb5d91a 100644
--- a/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/ScriptedHeuristic.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantTerms/Heuristics/ScriptedHeuristic.cs
@@ -5,7 +5,7 @@ namespace Nest
 {
 	[JsonObject]
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<ScriptedHeuristic>))]
-	public interface IScriptedHeuristic 
+	public interface IScriptedHeuristic
 	{
 		[JsonProperty("script")]
 		IScript Script { get; set; }
@@ -16,7 +16,7 @@ public class ScriptedHeuristic : IScriptedHeuristic
 		public IScript Script { get; set; }
 	}
 
-	public class ScriptedHeuristicDescriptor 
+	public class ScriptedHeuristicDescriptor
 		: DescriptorBase<ScriptedHeuristicDescriptor, IScriptedHeuristic>, IScriptedHeuristic
 	{
 		IScript IScriptedHeuristic.Script { get; set; }
@@ -26,4 +26,4 @@ public class ScriptedHeuristicDescriptor
 		public ScriptedHeuristicDescriptor Script(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.Script = scriptSelector?.Invoke(new ScriptDescriptor()));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregate.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregate.cs
index 61f452a18a2..d15d2c3941c 100644
--- a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregate.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregate.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public class SignificantTermsAggregate : MultiBucketAggregate<SignificantTermsBucket>
 	{
-		public long DocCount { get; set; }
 		public long? BgCount { get; set; }
+		public long DocCount { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregation.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregation.cs
index 92180e0a143..0f9f81735c3 100644
--- a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregation.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
 
@@ -11,46 +10,43 @@ namespace Nest
 	public interface ISignificantTermsAggregation : IBucketAggregation
 	{
 		/// <summary>
-		/// The field on which to run the aggregation
+		/// The default source of statistical information for background term
+		/// frequencies is the entire index. This scope can be narrowed
+		/// through the use of a background filter to focus in on significant
+		/// terms within a narrower context
 		/// </summary>
-		[JsonProperty("field")]
-		Field Field { get; set; }
+		[JsonProperty("background_filter")]
+		QueryContainer BackgroundFilter { get; set; }
 
 		/// <summary>
-		/// Defines how many term buckets should be returned out of the overall
-		/// terms list
+		/// Use chi square to calculate significance score
 		/// </summary>
-		[JsonProperty("size")]
-		int? Size { get; set; }
+		[JsonProperty("chi_square")]
+		IChiSquareHeuristic ChiSquare { get; set; }
 
 		/// <summary>
-		/// Controls the number of candidate terms produced by each shard from which
-		/// the <see cref="Size"/> of terms is selected.
+		/// Exclude term values for which buckets will be created.
 		/// </summary>
-		[JsonProperty("shard_size")]
-		int? ShardSize { get; set; }
+		[JsonProperty("exclude")]
+		SignificantTermsIncludeExclude Exclude { get; set; }
 
 		/// <summary>
-		/// Return only terms that match equal to or more than a configurable
-		/// number of hits
+		/// Determines the mechanism by which aggregations are executed
 		/// </summary>
-		[JsonProperty("min_doc_count")]
-		long? MinimumDocumentCount { get; set; }
+		[JsonProperty("execution_hint")]
+		TermsAggregationExecutionHint? ExecutionHint { get; set; }
 
 		/// <summary>
-		/// Regulates the certainty a shard has if the term should actually be added to the candidate
-		/// list or not with respect to the <see cref="MinimumDocumentCount"/>.
-		/// Terms will only be considered if their local shard frequency within
-		/// the set is higher than the <see cref="ShardMinimumDocumentCount"/>.
+		/// The field on which to run the aggregation
 		/// </summary>
-		[JsonProperty("shard_min_doc_count")]
-		long? ShardMinimumDocumentCount { get; set; }
+		[JsonProperty("field")]
+		Field Field { get; set; }
 
 		/// <summary>
-		/// Determines the mechanism by which aggregations are executed
+		/// Use Google normalized distance to calculate significance score
 		/// </summary>
-		[JsonProperty("execution_hint")]
-		TermsAggregationExecutionHint? ExecutionHint { get; set; }
+		[JsonProperty("gnd")]
+		IGoogleNormalizedDistanceHeuristic GoogleNormalizedDistance { get; set; }
 
 		/// <summary>
 		/// Include term values for which buckets will be created.
@@ -59,10 +55,11 @@ public interface ISignificantTermsAggregation : IBucketAggregation
 		SignificantTermsIncludeExclude Include { get; set; }
 
 		/// <summary>
-		/// Exclude term values for which buckets will be created.
+		/// Return only terms that match equal to or more than a configurable
+		/// number of hits
 		/// </summary>
-		[JsonProperty("exclude")]
-		SignificantTermsIncludeExclude Exclude { get; set; }
+		[JsonProperty("min_doc_count")]
+		long? MinimumDocumentCount { get; set; }
 
 		/// <summary>
 		/// Use mutual information to calculate significance score
@@ -70,24 +67,14 @@ public interface ISignificantTermsAggregation : IBucketAggregation
 		[JsonProperty("mutual_information")]
 		IMutualInformationHeuristic MutualInformation { get; set; }
 
-		/// <summary>
-		/// Use chi square to calculate significance score
-		/// </summary>
-		[JsonProperty("chi_square")]
-		IChiSquareHeuristic ChiSquare { get; set; }
-
-		/// <summary>
-		/// Use Google normalized distance to calculate significance score
-		/// </summary>
-		[JsonProperty("gnd")]
-		IGoogleNormalizedDistanceHeuristic GoogleNormalizedDistance { get; set; }
-
 		/// <summary>
 		/// Use percentage to calculate significance score.
-		/// <para>A simple calculation of the number of documents in the foreground
+		/// <para>
+		/// A simple calculation of the number of documents in the foreground
 		/// sample with a term divided by the number of documents in the background
 		/// with the term. By default this produces a score greater than zero
-		///  and less than one.</para>
+		///  and less than one.
+		/// </para>
 		/// </summary>
 		[JsonProperty("percentage")]
 		IPercentageScoreHeuristic PercentageScore { get; set; }
@@ -99,49 +86,76 @@ public interface ISignificantTermsAggregation : IBucketAggregation
 		IScriptedHeuristic Script { get; set; }
 
 		/// <summary>
-		/// The default source of statistical information for background term
-		/// frequencies is the entire index. This scope can be narrowed
-		/// through the use of a background filter to focus in on significant
-		/// terms within a narrower context
+		/// Regulates the certainty a shard has if the term should actually be added to the candidate
+		/// list or not with respect to the <see cref="MinimumDocumentCount" />.
+		/// Terms will only be considered if their local shard frequency within
+		/// the set is higher than the <see cref="ShardMinimumDocumentCount" />.
 		/// </summary>
-		[JsonProperty("background_filter")]
-		QueryContainer BackgroundFilter { get; set; }
+		[JsonProperty("shard_min_doc_count")]
+		long? ShardMinimumDocumentCount { get; set; }
+
+		/// <summary>
+		/// Controls the number of candidate terms produced by each shard from which
+		/// the <see cref="Size" /> of terms is selected.
+		/// </summary>
+		[JsonProperty("shard_size")]
+		int? ShardSize { get; set; }
+
+		/// <summary>
+		/// Defines how many term buckets should be returned out of the overall
+		/// terms list
+		/// </summary>
+		[JsonProperty("size")]
+		int? Size { get; set; }
 	}
 
 	public class SignificantTermsAggregation : BucketAggregationBase, ISignificantTermsAggregation
 	{
+		internal SignificantTermsAggregation() { }
+
+		public SignificantTermsAggregation(string name) : base(name) { }
+
 		/// <inheritdoc />
-		public Field Field { get; set; }
+		public QueryContainer BackgroundFilter { get; set; }
+
 		/// <inheritdoc />
-		public int? Size { get; set; }
+		public IChiSquareHeuristic ChiSquare { get; set; }
+
 		/// <inheritdoc />
-		public int? ShardSize { get; set; }
+		public SignificantTermsIncludeExclude Exclude { get; set; }
+
 		/// <inheritdoc />
-		public long? MinimumDocumentCount { get; set; }
+		public TermsAggregationExecutionHint? ExecutionHint { get; set; }
+
 		/// <inheritdoc />
-		public long? ShardMinimumDocumentCount { get; set; }
+		public Field Field { get; set; }
+
 		/// <inheritdoc />
-		public TermsAggregationExecutionHint? ExecutionHint { get; set; }
+		public IGoogleNormalizedDistanceHeuristic GoogleNormalizedDistance { get; set; }
+
 		/// <inheritdoc />
 		public SignificantTermsIncludeExclude Include { get; set; }
+
 		/// <inheritdoc />
-		public SignificantTermsIncludeExclude Exclude { get; set; }
+		public long? MinimumDocumentCount { get; set; }
+
 		/// <inheritdoc />
 		public IMutualInformationHeuristic MutualInformation { get; set; }
-		/// <inheritdoc />
-		public IChiSquareHeuristic ChiSquare { get; set; }
-		/// <inheritdoc />
-		public IGoogleNormalizedDistanceHeuristic GoogleNormalizedDistance { get; set; }
+
 		/// <inheritdoc />
 		public IPercentageScoreHeuristic PercentageScore { get; set; }
+
 		/// <inheritdoc />
 		public IScriptedHeuristic Script { get; set; }
+
 		/// <inheritdoc />
-		public QueryContainer BackgroundFilter { get; set; }
+		public long? ShardMinimumDocumentCount { get; set; }
 
-		internal SignificantTermsAggregation() { }
+		/// <inheritdoc />
+		public int? ShardSize { get; set; }
 
-		public SignificantTermsAggregation(string name) : base(name) { }
+		/// <inheritdoc />
+		public int? Size { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.SignificantTerms = this;
 	}
@@ -151,33 +165,32 @@ public class SignificantTermsAggregationDescriptor<T>
 			, ISignificantTermsAggregation
 		where T : class
 	{
-		Field ISignificantTermsAggregation.Field { get; set; }
-
-		int? ISignificantTermsAggregation.Size { get; set; }
-
-		int? ISignificantTermsAggregation.ShardSize { get; set; }
+		QueryContainer ISignificantTermsAggregation.BackgroundFilter { get; set; }
 
-		long? ISignificantTermsAggregation.MinimumDocumentCount { get; set; }
+		IChiSquareHeuristic ISignificantTermsAggregation.ChiSquare { get; set; }
 
-		long? ISignificantTermsAggregation.ShardMinimumDocumentCount { get; set; }
+		SignificantTermsIncludeExclude ISignificantTermsAggregation.Exclude { get; set; }
 
 		TermsAggregationExecutionHint? ISignificantTermsAggregation.ExecutionHint { get; set; }
+		Field ISignificantTermsAggregation.Field { get; set; }
+
+		IGoogleNormalizedDistanceHeuristic ISignificantTermsAggregation.GoogleNormalizedDistance { get; set; }
 
 		SignificantTermsIncludeExclude ISignificantTermsAggregation.Include { get; set; }
 
-		SignificantTermsIncludeExclude ISignificantTermsAggregation.Exclude { get; set; }
+		long? ISignificantTermsAggregation.MinimumDocumentCount { get; set; }
 
 		IMutualInformationHeuristic ISignificantTermsAggregation.MutualInformation { get; set; }
 
-		IChiSquareHeuristic ISignificantTermsAggregation.ChiSquare { get; set; }
-
-		IGoogleNormalizedDistanceHeuristic ISignificantTermsAggregation.GoogleNormalizedDistance { get; set; }
-
 		IPercentageScoreHeuristic ISignificantTermsAggregation.PercentageScore { get; set; }
 
 		IScriptedHeuristic ISignificantTermsAggregation.Script { get; set; }
 
-		QueryContainer ISignificantTermsAggregation.BackgroundFilter { get; set; }
+		long? ISignificantTermsAggregation.ShardMinimumDocumentCount { get; set; }
+
+		int? ISignificantTermsAggregation.ShardSize { get; set; }
+
+		int? ISignificantTermsAggregation.Size { get; set; }
 
 		/// <inheritdoc />
 		public SignificantTermsAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
@@ -219,7 +232,9 @@ public SignificantTermsAggregationDescriptor<T> ShardMinimumDocumentCount(long?
 			Assign(a => a.ShardMinimumDocumentCount = shardMinimumDocumentCount);
 
 		/// <inheritdoc />
-		public SignificantTermsAggregationDescriptor<T> MutualInformation(Func<MutualInformationHeuristicDescriptor, IMutualInformationHeuristic> mutualInformationSelector = null) =>
+		public SignificantTermsAggregationDescriptor<T> MutualInformation(
+			Func<MutualInformationHeuristicDescriptor, IMutualInformationHeuristic> mutualInformationSelector = null
+		) =>
 			Assign(a => a.MutualInformation = mutualInformationSelector.InvokeOrDefault(new MutualInformationHeuristicDescriptor()));
 
 		/// <inheritdoc />
@@ -227,11 +242,15 @@ public SignificantTermsAggregationDescriptor<T> ChiSquare(Func<ChiSquareHeuristi
 			Assign(a => a.ChiSquare = chiSquareSelector.InvokeOrDefault(new ChiSquareHeuristicDescriptor()));
 
 		/// <inheritdoc />
-		public SignificantTermsAggregationDescriptor<T> GoogleNormalizedDistance(Func<GoogleNormalizedDistanceHeuristicDescriptor, IGoogleNormalizedDistanceHeuristic> gndSelector) =>
+		public SignificantTermsAggregationDescriptor<T> GoogleNormalizedDistance(
+			Func<GoogleNormalizedDistanceHeuristicDescriptor, IGoogleNormalizedDistanceHeuristic> gndSelector
+		) =>
 			Assign(a => a.GoogleNormalizedDistance = gndSelector.InvokeOrDefault(new GoogleNormalizedDistanceHeuristicDescriptor()));
 
 		/// <inheritdoc />
-		public SignificantTermsAggregationDescriptor<T> PercentageScore(Func<PercentageScoreHeuristicDescriptor, IPercentageScoreHeuristic> percentageScoreSelector) =>
+		public SignificantTermsAggregationDescriptor<T> PercentageScore(
+			Func<PercentageScoreHeuristicDescriptor, IPercentageScoreHeuristic> percentageScoreSelector
+		) =>
 			Assign(a => a.PercentageScore = percentageScoreSelector.InvokeOrDefault(new PercentageScoreHeuristicDescriptor()));
 
 		/// <inheritdoc />
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsBucket.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsBucket.cs
index db04ad36936..6be5df8b49d 100644
--- a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsBucket.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsBucket.cs
@@ -6,9 +6,10 @@ public class SignificantTermsBucket : BucketBase, IBucket
 	{
 		public SignificantTermsBucket(IReadOnlyDictionary<string, IAggregate> dict) : base(dict) { }
 
-		public string Key { get; set; }
 		public long BgCount { get; set; }
 		public long DocCount { get; set; }
+
+		public string Key { get; set; }
 		public double Score { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsIncludeExclude.cs b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsIncludeExclude.cs
index b47dd4e1ead..7578bbcbeed 100644
--- a/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsIncludeExclude.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantTerms/SignificantTermsIncludeExclude.cs
@@ -7,15 +7,15 @@ namespace Nest
 	[JsonConverter(typeof(SignificantTermsIncludeExcludeJsonConverter))]
 	public class SignificantTermsIncludeExclude
 	{
+		public SignificantTermsIncludeExclude(string pattern) => Pattern = pattern;
+
+		public SignificantTermsIncludeExclude(IEnumerable<string> values) => Values = values;
+
 		[JsonIgnore]
 		public string Pattern { get; set; }
 
 		[JsonIgnore]
 		public IEnumerable<string> Values { get; set; }
-
-		public SignificantTermsIncludeExclude(string pattern) => Pattern = pattern;
-
-		public SignificantTermsIncludeExclude(IEnumerable<string> values) => Values = values;
 	}
 
 	internal class SignificantTermsIncludeExcludeJsonConverter : JsonConverter
diff --git a/src/Nest/Aggregations/Bucket/SignificantText/SignificantTextAggregation.cs b/src/Nest/Aggregations/Bucket/SignificantText/SignificantTextAggregation.cs
index c76196a0939..2a9cf7245c2 100644
--- a/src/Nest/Aggregations/Bucket/SignificantText/SignificantTextAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/SignificantText/SignificantTextAggregation.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
 
@@ -14,46 +13,49 @@ namespace Nest
 	public interface ISignificantTextAggregation : IBucketAggregation
 	{
 		/// <summary>
-		/// The field on which to run the aggregation
+		/// The default source of statistical information for background term
+		/// frequencies is the entire index. This scope can be narrowed
+		/// through the use of a background filter to focus in on significant
+		/// terms within a narrower context
 		/// </summary>
-		[JsonProperty("field")]
-		Field Field { get; set; }
+		[JsonProperty("background_filter")]
+		QueryContainer BackgroundFilter { get; set; }
 
 		/// <summary>
-		/// Defines how many term buckets should be returned out of the overall
-		/// terms list
+		/// Use chi square to calculate significance score
 		/// </summary>
-		[JsonProperty("size")]
-		int? Size { get; set; }
+		[JsonProperty("chi_square")]
+		IChiSquareHeuristic ChiSquare { get; set; }
 
 		/// <summary>
-		/// Controls the number of candidate terms produced by each shard from which
-		/// the <see cref="Size"/> of terms is selected.
+		/// Exclude term values for which buckets will be created.
 		/// </summary>
-		[JsonProperty("shard_size")]
-		int? ShardSize { get; set; }
+		[JsonProperty("exclude")]
+		SignificantTermsIncludeExclude Exclude { get; set; }
 
 		/// <summary>
-		/// Return only terms that match equal to or more than a configurable
-		/// number of hits
+		/// Determines the mechanism by which aggregations are executed
 		/// </summary>
-		[JsonProperty("min_doc_count")]
-		long? MinimumDocumentCount { get; set; }
+		[JsonProperty("execution_hint")]
+		TermsAggregationExecutionHint? ExecutionHint { get; set; }
 
 		/// <summary>
-		/// Regulates the certainty a shard has if the term should actually be added to the candidate
-		/// list or not with respect to the <see cref="MinimumDocumentCount"/>.
-		/// Terms will only be considered if their local shard frequency within
-		/// the set is higher than the <see cref="ShardMinimumDocumentCount"/>.
+		/// The field on which to run the aggregation
 		/// </summary>
-		[JsonProperty("shard_min_doc_count")]
-		long? ShardMinimumDocumentCount { get; set; }
+		[JsonProperty("field")]
+		Field Field { get; set; }
 
 		/// <summary>
-		/// Determines the mechanism by which aggregations are executed
+		/// Whether to filter out near-duplicate text
 		/// </summary>
-		[JsonProperty("execution_hint")]
-		TermsAggregationExecutionHint? ExecutionHint { get; set; }
+		[JsonProperty("filter_duplicate_text")]
+		bool? FilterDuplicateText { get; set; }
+
+		/// <summary>
+		/// Use Google normalized distance to calculate significance score
+		/// </summary>
+		[JsonProperty("gnd")]
+		IGoogleNormalizedDistanceHeuristic GoogleNormalizedDistance { get; set; }
 
 		/// <summary>
 		/// Include term values for which buckets will be created.
@@ -62,10 +64,11 @@ public interface ISignificantTextAggregation : IBucketAggregation
 		SignificantTermsIncludeExclude Include { get; set; }
 
 		/// <summary>
-		/// Exclude term values for which buckets will be created.
+		/// Return only terms that match equal to or more than a configurable
+		/// number of hits
 		/// </summary>
-		[JsonProperty("exclude")]
-		SignificantTermsIncludeExclude Exclude { get; set; }
+		[JsonProperty("min_doc_count")]
+		long? MinimumDocumentCount { get; set; }
 
 		/// <summary>
 		/// Use mutual information to calculate significance score
@@ -73,24 +76,14 @@ public interface ISignificantTextAggregation : IBucketAggregation
 		[JsonProperty("mutual_information")]
 		IMutualInformationHeuristic MutualInformation { get; set; }
 
-		/// <summary>
-		/// Use chi square to calculate significance score
-		/// </summary>
-		[JsonProperty("chi_square")]
-		IChiSquareHeuristic ChiSquare { get; set; }
-
-		/// <summary>
-		/// Use Google normalized distance to calculate significance score
-		/// </summary>
-		[JsonProperty("gnd")]
-		IGoogleNormalizedDistanceHeuristic GoogleNormalizedDistance { get; set; }
-
 		/// <summary>
 		/// Use percentage to calculate significance score.
-		/// <para>A simple calculation of the number of documents in the foreground
+		/// <para>
+		/// A simple calculation of the number of documents in the foreground
 		/// sample with a term divided by the number of documents in the background
 		/// with the term. By default this produces a score greater than zero
-		///  and less than one.</para>
+		///  and less than one.
+		/// </para>
 		/// </summary>
 		[JsonProperty("percentage")]
 		IPercentageScoreHeuristic PercentageScore { get; set; }
@@ -102,19 +95,27 @@ public interface ISignificantTextAggregation : IBucketAggregation
 		IScriptedHeuristic Script { get; set; }
 
 		/// <summary>
-		/// The default source of statistical information for background term
-		/// frequencies is the entire index. This scope can be narrowed
-		/// through the use of a background filter to focus in on significant
-		/// terms within a narrower context
+		/// Regulates the certainty a shard has if the term should actually be added to the candidate
+		/// list or not with respect to the <see cref="MinimumDocumentCount" />.
+		/// Terms will only be considered if their local shard frequency within
+		/// the set is higher than the <see cref="ShardMinimumDocumentCount" />.
 		/// </summary>
-		[JsonProperty("background_filter")]
-		QueryContainer BackgroundFilter { get; set; }
+		[JsonProperty("shard_min_doc_count")]
+		long? ShardMinimumDocumentCount { get; set; }
 
 		/// <summary>
-		/// Whether to filter out near-duplicate text
+		/// Controls the number of candidate terms produced by each shard from which
+		/// the <see cref="Size" /> of terms is selected.
 		/// </summary>
-		[JsonProperty("filter_duplicate_text")]
-		bool? FilterDuplicateText { get; set; }
+		[JsonProperty("shard_size")]
+		int? ShardSize { get; set; }
+
+		/// <summary>
+		/// Defines how many term buckets should be returned out of the overall
+		/// terms list
+		/// </summary>
+		[JsonProperty("size")]
+		int? Size { get; set; }
 
 		/// <summary>
 		/// Ordinarily the indexed field name and the original JSON field being
@@ -122,165 +123,185 @@ public interface ISignificantTextAggregation : IBucketAggregation
 		/// mappings using features like copy_to the source JSON field(s)
 		/// and the indexed field being aggregated can differ.
 		/// In these cases it is possible to list the JSON _source fields
-		/// from which text will be analyzed using <see cref="SourceFields"/>
+		/// from which text will be analyzed using <see cref="SourceFields" />
 		/// </summary>
 		[JsonProperty("source_fields")]
 		Fields SourceFields { get; set; }
 	}
 
-	/// <inheritdoc cref="ISignificantTextAggregation"/>
+	/// <inheritdoc cref="ISignificantTextAggregation" />
 	public class SignificantTextAggregation : BucketAggregationBase, ISignificantTextAggregation
 	{
+		internal SignificantTextAggregation() { }
+
+		public SignificantTextAggregation(string name) : base(name) { }
+
 		/// <inheritdoc />
-		public Field Field { get; set; }
+		public QueryContainer BackgroundFilter { get; set; }
+
 		/// <inheritdoc />
-		public int? Size { get; set; }
+		public IChiSquareHeuristic ChiSquare { get; set; }
+
 		/// <inheritdoc />
-		public int? ShardSize { get; set; }
+		public SignificantTermsIncludeExclude Exclude { get; set; }
+
 		/// <inheritdoc />
-		public long? MinimumDocumentCount { get; set; }
+		public TermsAggregationExecutionHint? ExecutionHint { get; set; }
+
 		/// <inheritdoc />
-		public long? ShardMinimumDocumentCount { get; set; }
+		public Field Field { get; set; }
+
 		/// <inheritdoc />
-		public TermsAggregationExecutionHint? ExecutionHint { get; set; }
+		public bool? FilterDuplicateText { get; set; }
+
+		/// <inheritdoc />
+		public IGoogleNormalizedDistanceHeuristic GoogleNormalizedDistance { get; set; }
+
 		/// <inheritdoc />
 		public SignificantTermsIncludeExclude Include { get; set; }
+
 		/// <inheritdoc />
-		public SignificantTermsIncludeExclude Exclude { get; set; }
+		public long? MinimumDocumentCount { get; set; }
+
 		/// <inheritdoc />
 		public IMutualInformationHeuristic MutualInformation { get; set; }
-		/// <inheritdoc />
-		public IChiSquareHeuristic ChiSquare { get; set; }
-		/// <inheritdoc />
-		public IGoogleNormalizedDistanceHeuristic GoogleNormalizedDistance { get; set; }
+
 		/// <inheritdoc />
 		public IPercentageScoreHeuristic PercentageScore { get; set; }
+
 		/// <inheritdoc />
 		public IScriptedHeuristic Script { get; set; }
+
 		/// <inheritdoc />
-		public QueryContainer BackgroundFilter { get; set; }
-		/// <inheritdoc />
-		public bool? FilterDuplicateText { get; set; }
+		public long? ShardMinimumDocumentCount { get; set; }
+
 		/// <inheritdoc />
-		public Fields SourceFields { get; set; }
+		public int? ShardSize { get; set; }
 
-		internal SignificantTextAggregation() { }
+		/// <inheritdoc />
+		public int? Size { get; set; }
 
-		public SignificantTextAggregation(string name) : base(name) { }
+		/// <inheritdoc />
+		public Fields SourceFields { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.SignificantText = this;
 	}
 
-	/// <inheritdoc cref="ISignificantTextAggregation"/>
+	/// <inheritdoc cref="ISignificantTextAggregation" />
 	public class SignificantTextAggregationDescriptor<T>
 		: BucketAggregationDescriptorBase<SignificantTextAggregationDescriptor<T>, ISignificantTextAggregation, T>
 			, ISignificantTextAggregation
 		where T : class
 	{
-		Field ISignificantTextAggregation.Field { get; set; }
+		QueryContainer ISignificantTextAggregation.BackgroundFilter { get; set; }
 
-		int? ISignificantTextAggregation.Size { get; set; }
+		IChiSquareHeuristic ISignificantTextAggregation.ChiSquare { get; set; }
 
-		int? ISignificantTextAggregation.ShardSize { get; set; }
+		SignificantTermsIncludeExclude ISignificantTextAggregation.Exclude { get; set; }
 
-		long? ISignificantTextAggregation.MinimumDocumentCount { get; set; }
+		TermsAggregationExecutionHint? ISignificantTextAggregation.ExecutionHint { get; set; }
+		Field ISignificantTextAggregation.Field { get; set; }
 
-		long? ISignificantTextAggregation.ShardMinimumDocumentCount { get; set; }
+		bool? ISignificantTextAggregation.FilterDuplicateText { get; set; }
 
-		TermsAggregationExecutionHint? ISignificantTextAggregation.ExecutionHint { get; set; }
+		IGoogleNormalizedDistanceHeuristic ISignificantTextAggregation.GoogleNormalizedDistance { get; set; }
 
 		SignificantTermsIncludeExclude ISignificantTextAggregation.Include { get; set; }
 
-		SignificantTermsIncludeExclude ISignificantTextAggregation.Exclude { get; set; }
+		long? ISignificantTextAggregation.MinimumDocumentCount { get; set; }
 
 		IMutualInformationHeuristic ISignificantTextAggregation.MutualInformation { get; set; }
 
-		IChiSquareHeuristic ISignificantTextAggregation.ChiSquare { get; set; }
-
-		IGoogleNormalizedDistanceHeuristic ISignificantTextAggregation.GoogleNormalizedDistance { get; set; }
-
 		IPercentageScoreHeuristic ISignificantTextAggregation.PercentageScore { get; set; }
 
 		IScriptedHeuristic ISignificantTextAggregation.Script { get; set; }
 
-		QueryContainer ISignificantTextAggregation.BackgroundFilter { get; set; }
+		long? ISignificantTextAggregation.ShardMinimumDocumentCount { get; set; }
 
-		bool? ISignificantTextAggregation.FilterDuplicateText { get; set; }
+		int? ISignificantTextAggregation.ShardSize { get; set; }
+
+		int? ISignificantTextAggregation.Size { get; set; }
 
 		Fields ISignificantTextAggregation.SourceFields { get; set; }
 
-		/// <inheritdoc cref="ISignificantTextAggregation.Field"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.Field" />
 		public SignificantTextAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.Field"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.Field" />
 		public SignificantTextAggregationDescriptor<T> Field(Expression<Func<T, object>> field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.Size"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.Size" />
 		public SignificantTextAggregationDescriptor<T> Size(int? size) => Assign(a => a.Size = size);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.ExecutionHint"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.ExecutionHint" />
 		public SignificantTextAggregationDescriptor<T> ExecutionHint(TermsAggregationExecutionHint? hint) => Assign(a => a.ExecutionHint = hint);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.Include"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.Include" />
 		public SignificantTextAggregationDescriptor<T> Include(string includePattern) =>
 			Assign(a => a.Include = new SignificantTermsIncludeExclude(includePattern));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.Include"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.Include" />
 		public SignificantTextAggregationDescriptor<T> Include(IEnumerable<string> values) =>
 			Assign(a => a.Include = new SignificantTermsIncludeExclude(values));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.Exclude"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.Exclude" />
 		public SignificantTextAggregationDescriptor<T> Exclude(string excludePattern) =>
 			Assign(a => a.Exclude = new SignificantTermsIncludeExclude(excludePattern));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.Exclude"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.Exclude" />
 		public SignificantTextAggregationDescriptor<T> Exclude(IEnumerable<string> values) =>
 			Assign(a => a.Exclude = new SignificantTermsIncludeExclude(values));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.ShardSize"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.ShardSize" />
 		public SignificantTextAggregationDescriptor<T> ShardSize(int? shardSize) => Assign(a => a.ShardSize = shardSize);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.MinimumDocumentCount"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.MinimumDocumentCount" />
 		public SignificantTextAggregationDescriptor<T> MinimumDocumentCount(long? minimumDocumentCount) =>
 			Assign(a => a.MinimumDocumentCount = minimumDocumentCount);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.ShardMinimumDocumentCount"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.ShardMinimumDocumentCount" />
 		public SignificantTextAggregationDescriptor<T> ShardMinimumDocumentCount(long? shardMinimumDocumentCount) =>
 			Assign(a => a.ShardMinimumDocumentCount = shardMinimumDocumentCount);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.MutualInformation"/>
-		public SignificantTextAggregationDescriptor<T> MutualInformation(Func<MutualInformationHeuristicDescriptor, IMutualInformationHeuristic> mutualInformationSelector = null) =>
+		/// <inheritdoc cref="ISignificantTextAggregation.MutualInformation" />
+		public SignificantTextAggregationDescriptor<T> MutualInformation(
+			Func<MutualInformationHeuristicDescriptor, IMutualInformationHeuristic> mutualInformationSelector = null
+		) =>
 			Assign(a => a.MutualInformation = mutualInformationSelector.InvokeOrDefault(new MutualInformationHeuristicDescriptor()));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.ChiSquare"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.ChiSquare" />
 		public SignificantTextAggregationDescriptor<T> ChiSquare(Func<ChiSquareHeuristicDescriptor, IChiSquareHeuristic> chiSquareSelector) =>
 			Assign(a => a.ChiSquare = chiSquareSelector.InvokeOrDefault(new ChiSquareHeuristicDescriptor()));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.GoogleNormalizedDistance"/>
-		public SignificantTextAggregationDescriptor<T> GoogleNormalizedDistance(Func<GoogleNormalizedDistanceHeuristicDescriptor, IGoogleNormalizedDistanceHeuristic> gndSelector) =>
+		/// <inheritdoc cref="ISignificantTextAggregation.GoogleNormalizedDistance" />
+		public SignificantTextAggregationDescriptor<T> GoogleNormalizedDistance(
+			Func<GoogleNormalizedDistanceHeuristicDescriptor, IGoogleNormalizedDistanceHeuristic> gndSelector
+		) =>
 			Assign(a => a.GoogleNormalizedDistance = gndSelector.InvokeOrDefault(new GoogleNormalizedDistanceHeuristicDescriptor()));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.PercentageScore"/>
-		public SignificantTextAggregationDescriptor<T> PercentageScore(Func<PercentageScoreHeuristicDescriptor, IPercentageScoreHeuristic> percentageScoreSelector) =>
+		/// <inheritdoc cref="ISignificantTextAggregation.PercentageScore" />
+		public SignificantTextAggregationDescriptor<T> PercentageScore(
+			Func<PercentageScoreHeuristicDescriptor, IPercentageScoreHeuristic> percentageScoreSelector
+		) =>
 			Assign(a => a.PercentageScore = percentageScoreSelector.InvokeOrDefault(new PercentageScoreHeuristicDescriptor()));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.Script"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.Script" />
 		public SignificantTextAggregationDescriptor<T> Script(Func<ScriptedHeuristicDescriptor, IScriptedHeuristic> scriptSelector) =>
 			Assign(a => a.Script = scriptSelector?.Invoke(new ScriptedHeuristicDescriptor()));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.BackgroundFilter"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.BackgroundFilter" />
 		public SignificantTextAggregationDescriptor<T> BackgroundFilter(Func<QueryContainerDescriptor<T>, QueryContainer> selector) =>
 			Assign(a => a.BackgroundFilter = selector?.Invoke(new QueryContainerDescriptor<T>()));
 
-		/// <inheritdoc cref="ISignificantTextAggregation.FilterDuplicateText"/>
-		public SignificantTextAggregationDescriptor<T> FilterDuplicateText(bool? filterDuplicateText = true) => Assign(a => a.FilterDuplicateText = filterDuplicateText);
+		/// <inheritdoc cref="ISignificantTextAggregation.FilterDuplicateText" />
+		public SignificantTextAggregationDescriptor<T> FilterDuplicateText(bool? filterDuplicateText = true) =>
+			Assign(a => a.FilterDuplicateText = filterDuplicateText);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.SourceFields"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.SourceFields" />
 		public SignificantTextAggregationDescriptor<T> SourceFields(Func<FieldsDescriptor<T>, IPromise<Fields>> sourceFields) =>
 			Assign(a => a.SourceFields = sourceFields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="ISignificantTextAggregation.SourceFields"/>
+		/// <inheritdoc cref="ISignificantTextAggregation.SourceFields" />
 		public SignificantTextAggregationDescriptor<T> SourceFields(Fields sourceFields) => Assign(a => a.SourceFields = sourceFields);
-
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsAggregate.cs b/src/Nest/Aggregations/Bucket/Terms/TermsAggregate.cs
index b88eb8e8c73..d177a1d3d40 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsAggregate.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsAggregate.cs
@@ -1,9 +1,8 @@
 namespace Nest
 {
-    public class TermsAggregate<TKey> : MultiBucketAggregate<KeyedBucket<TKey>>
-    {
+	public class TermsAggregate<TKey> : MultiBucketAggregate<KeyedBucket<TKey>>
+	{
 		public long? DocCountErrorUpperBound { get; set; }
 		public long? SumOtherDocCount { get; set; }
-
-    }
+	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsAggregation.cs b/src/Nest/Aggregations/Bucket/Terms/TermsAggregation.cs
index aed0865f013..1b25292a56e 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsAggregation.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsAggregation.cs
@@ -9,61 +9,61 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<TermsAggregation>))]
 	public interface ITermsAggregation : IBucketAggregation
 	{
-		[JsonProperty("field")]
-		Field Field { get; set; }
+		[JsonProperty("collect_mode")]
+		TermsAggregationCollectMode? CollectMode { get; set; }
 
-		[JsonProperty("script")]
-		IScript Script { get; set; }
+		[JsonProperty("exclude")]
+		TermsExclude Exclude { get; set; }
 
-		[JsonProperty("size")]
-		int? Size { get; set; }
+		[JsonProperty("execution_hint")]
+		TermsAggregationExecutionHint? ExecutionHint { get; set; }
 
-		[JsonProperty("shard_size")]
-		int? ShardSize { get; set; }
+		[JsonProperty("field")]
+		Field Field { get; set; }
+
+		[JsonProperty("include")]
+		TermsInclude Include { get; set; }
 
 		[JsonProperty("min_doc_count")]
 		int? MinimumDocumentCount { get; set; }
 
-		[JsonProperty("execution_hint")]
-		TermsAggregationExecutionHint? ExecutionHint { get; set; }
+		[JsonProperty("missing")]
+		object Missing { get; set; }
 
 		[JsonProperty("order")]
 		IList<TermsOrder> Order { get; set; }
 
-		[JsonProperty("include")]
-		TermsInclude Include { get; set; }
-
-		[JsonProperty("exclude")]
-		TermsExclude Exclude { get; set; }
+		[JsonProperty("script")]
+		IScript Script { get; set; }
 
-		[JsonProperty("collect_mode")]
-		TermsAggregationCollectMode? CollectMode { get; set; }
+		[JsonProperty("shard_size")]
+		int? ShardSize { get; set; }
 
 		[JsonProperty("show_term_doc_count_error")]
 		bool? ShowTermDocCountError { get; set; }
 
-		[JsonProperty("missing")]
-		object Missing { get; set; }
+		[JsonProperty("size")]
+		int? Size { get; set; }
 	}
 
 	public class TermsAggregation : BucketAggregationBase, ITermsAggregation
 	{
-		public Field Field { get; set; }
-		public IScript Script { get; set; }
-		public int? Size { get; set; }
-		public int? ShardSize { get; set; }
-		public int? MinimumDocumentCount { get; set; }
+		internal TermsAggregation() { }
+
+		public TermsAggregation(string name) : base(name) { }
+
+		public TermsAggregationCollectMode? CollectMode { get; set; }
+		public TermsExclude Exclude { get; set; }
 		public TermsAggregationExecutionHint? ExecutionHint { get; set; }
-		public IList<TermsOrder> Order { get; set; }
+		public Field Field { get; set; }
 		public TermsInclude Include { get; set; }
-		public TermsExclude Exclude { get; set; }
-		public TermsAggregationCollectMode? CollectMode { get; set; }
+		public int? MinimumDocumentCount { get; set; }
 		public object Missing { get; set; }
+		public IList<TermsOrder> Order { get; set; }
+		public IScript Script { get; set; }
+		public int? ShardSize { get; set; }
 		public bool? ShowTermDocCountError { get; set; }
-
-		internal TermsAggregation() { }
-
-		public TermsAggregation(string name) : base(name) { }
+		public int? Size { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.Terms = this;
 	}
@@ -72,30 +72,29 @@ public class TermsAggregationDescriptor<T>
 		: BucketAggregationDescriptorBase<TermsAggregationDescriptor<T>, ITermsAggregation, T>, ITermsAggregation
 		where T : class
 	{
-		Field ITermsAggregation.Field { get; set; }
+		TermsAggregationCollectMode? ITermsAggregation.CollectMode { get; set; }
 
-		IScript ITermsAggregation.Script { get; set; }
+		TermsExclude ITermsAggregation.Exclude { get; set; }
 
-		int? ITermsAggregation.Size { get; set; }
+		TermsAggregationExecutionHint? ITermsAggregation.ExecutionHint { get; set; }
+		Field ITermsAggregation.Field { get; set; }
 
-		int? ITermsAggregation.ShardSize { get; set; }
+		TermsInclude ITermsAggregation.Include { get; set; }
 
 		int? ITermsAggregation.MinimumDocumentCount { get; set; }
 
-		TermsAggregationExecutionHint? ITermsAggregation.ExecutionHint { get; set; }
+		object ITermsAggregation.Missing { get; set; }
 
 		IList<TermsOrder> ITermsAggregation.Order { get; set; }
 
-		TermsInclude ITermsAggregation.Include { get; set; }
-
-		TermsExclude ITermsAggregation.Exclude { get; set; }
-
-		TermsAggregationCollectMode? ITermsAggregation.CollectMode { get; set; }
+		IScript ITermsAggregation.Script { get; set; }
 
-		object ITermsAggregation.Missing { get; set; }
+		int? ITermsAggregation.ShardSize { get; set; }
 
 		bool? ITermsAggregation.ShowTermDocCountError { get; set; }
 
+		int? ITermsAggregation.Size { get; set; }
+
 		public TermsAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
 		public TermsAggregationDescriptor<T> Field(Expression<Func<T, object>> field) => Assign(a => a.Field = field);
@@ -138,6 +137,7 @@ public TermsAggregationDescriptor<T> CollectMode(TermsAggregationCollectMode? co
 
 		public TermsAggregationDescriptor<T> Missing(object missing) => Assign(a => a.Missing = missing);
 
-		public TermsAggregationDescriptor<T> ShowTermDocCountError(bool? showTermDocCountError = true) => Assign(a => a.ShowTermDocCountError = showTermDocCountError);
+		public TermsAggregationDescriptor<T> ShowTermDocCountError(bool? showTermDocCountError = true) =>
+			Assign(a => a.ShowTermDocCountError = showTermDocCountError);
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsAggregationCollectMode.cs b/src/Nest/Aggregations/Bucket/Terms/TermsAggregationCollectMode.cs
index bc394690548..267d86a58ae 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsAggregationCollectMode.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsAggregationCollectMode.cs
@@ -11,14 +11,15 @@ namespace Nest
 	public enum TermsAggregationCollectMode
 	{
 		/// <summary>
-		/// Order by using field values directly in order to aggregate data per-bucket 
+		/// Order by using field values directly in order to aggregate data per-bucket
 		/// </summary>
 		[EnumMember(Value = "depth_first")]
 		DepthFirst,
+
 		/// <summary>
 		/// Order by using ordinals of the field values instead of the values themselves
 		/// </summary>
 		[EnumMember(Value = "breadth_first")]
 		BreadthFirst
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsAggregationExecutionHint.cs b/src/Nest/Aggregations/Bucket/Terms/TermsAggregationExecutionHint.cs
index 533ccfc14f9..146d353040d 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsAggregationExecutionHint.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsAggregationExecutionHint.cs
@@ -11,24 +11,27 @@ namespace Nest
 	public enum TermsAggregationExecutionHint
 	{
 		/// <summary>
-		/// Order by using field values directly in order to aggregate data per-bucket 
+		/// Order by using field values directly in order to aggregate data per-bucket
 		/// </summary>
 		[EnumMember(Value = "map")]
 		Map,
+
 		/// <summary>
 		/// Order by using ordinals of the field and preemptively allocating one bucket per ordinal value
 		/// </summary>
 		[EnumMember(Value = "global_ordinals")]
 		GlobalOrdinals,
+
 		/// <summary>
 		/// Order by using ordinals of the field and dynamically allocating one bucket per ordinal value
 		/// </summary>
 		[EnumMember(Value = "global_ordinals_hash")]
 		GlobalOrdinalsHash,
+
 		/// <summary>
 		/// Order by using per-segment ordinals to compute counts and remap these counts to global counts using global ordinals
 		/// </summary>
 		[EnumMember(Value = "global_ordinals_low_cardinality")]
 		GlobalOrdinalsLowCardinality
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsExclude.cs b/src/Nest/Aggregations/Bucket/Terms/TermsExclude.cs
index 08a4d530eee..e22a7111c76 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsExclude.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsExclude.cs
@@ -10,29 +10,29 @@ namespace Nest
 	public class TermsExclude
 	{
 		/// <summary>
-		/// The regular expression pattern to determine terms to exclude from the response
-		/// </summary>
-		[JsonIgnore]
-		public string Pattern { get; set; }
-
-		/// <summary>
-		/// Collection of terms to exclude from the response
-		/// </summary>
-		[JsonIgnore]
-		public IEnumerable<string> Values { get; set; }
-
-		/// <summary>
-		/// Creates an instance of <see cref="TermsExclude"/> that uses a regular expression pattern
+		/// Creates an instance of <see cref="TermsExclude" /> that uses a regular expression pattern
 		/// to determine the terms to exclude from the response
 		/// </summary>
 		/// <param name="pattern">The regular expression pattern</param>
 		public TermsExclude(string pattern) => Pattern = pattern;
 
 		/// <summary>
-		/// Creates an instance of <see cref="TermsExclude"/> that uses a collection of terms
+		/// Creates an instance of <see cref="TermsExclude" /> that uses a collection of terms
 		/// to exclude from the response
 		/// </summary>
 		/// <param name="values">The exact terms to exclude</param>
 		public TermsExclude(IEnumerable<string> values) => Values = values;
+
+		/// <summary>
+		/// The regular expression pattern to determine terms to exclude from the response
+		/// </summary>
+		[JsonIgnore]
+		public string Pattern { get; set; }
+
+		/// <summary>
+		/// Collection of terms to exclude from the response
+		/// </summary>
+		[JsonIgnore]
+		public IEnumerable<string> Values { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsExcludeJsonConverter.cs b/src/Nest/Aggregations/Bucket/Terms/TermsExcludeJsonConverter.cs
index a000ba4bf46..9dbf85881f4 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsExcludeJsonConverter.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsExcludeJsonConverter.cs
@@ -40,4 +40,4 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				writer.WriteValue(termsExclude.Pattern);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsInclude.cs b/src/Nest/Aggregations/Bucket/Terms/TermsInclude.cs
index b036181c26b..702da055ec4 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsInclude.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsInclude.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
@@ -11,22 +10,30 @@ namespace Nest
 	public class TermsInclude
 	{
 		/// <summary>
-		/// The regular expression pattern to determine terms to include in the response
+		/// Creates an instance of <see cref="TermsInclude" /> that uses a regular expression pattern
+		/// to determine the terms to include in the response
 		/// </summary>
-		[JsonIgnore]
-		public string Pattern { get; set; }
+		/// <param name="pattern">The regular expression pattern</param>
+		public TermsInclude(string pattern) => Pattern = pattern;
 
 		/// <summary>
-		/// Collection of terms to include in the response
+		/// Creates an instance of <see cref="TermsInclude" /> that uses a collection of terms
+		/// to include in the response
 		/// </summary>
-		[JsonIgnore]
-		public IEnumerable<string> Values { get; set; }
+		/// <param name="values">The exact terms to include</param>
+		public TermsInclude(IEnumerable<string> values) => Values = values;
 
 		/// <summary>
-		/// The current partition of terms we are interested in
+		/// Creates an instance of <see cref="TermsInclude" /> that partitions the terms into a number of
+		/// partitions to receive in multiple requests. Used to process many unique terms
 		/// </summary>
-		[JsonProperty("partition")]
-		public long? Partition { get; set; }
+		/// <param name="partition">The 0-based partition number for this request</param>
+		/// <param name="numberOfPartitions">The total number of partitions</param>
+		public TermsInclude(long partition, long numberOfPartitions)
+		{
+			Partition = partition;
+			NumberOfPartitions = numberOfPartitions;
+		}
 
 		/// <summary>
 		/// The total number of paritions we are interested in
@@ -35,29 +42,21 @@ public class TermsInclude
 		public long? NumberOfPartitions { get; set; }
 
 		/// <summary>
-		/// Creates an instance of <see cref="TermsInclude"/> that uses a regular expression pattern
-		/// to determine the terms to include in the response
+		/// The current partition of terms we are interested in
 		/// </summary>
-		/// <param name="pattern">The regular expression pattern</param>
-		public TermsInclude(string pattern) => Pattern = pattern;
+		[JsonProperty("partition")]
+		public long? Partition { get; set; }
 
 		/// <summary>
-		/// Creates an instance of <see cref="TermsInclude"/> that uses a collection of terms
-		/// to include in the response
+		/// The regular expression pattern to determine terms to include in the response
 		/// </summary>
-		/// <param name="values">The exact terms to include</param>
-		public TermsInclude(IEnumerable<string> values) => Values = values;
+		[JsonIgnore]
+		public string Pattern { get; set; }
 
 		/// <summary>
-		/// Creates an instance of <see cref="TermsInclude"/> that partitions the terms into a number of
-		/// partitions to receive in multiple requests. Used to process many unique terms
+		/// Collection of terms to include in the response
 		/// </summary>
-		/// <param name="partition">The 0-based partition number for this request</param>
-		/// <param name="numberOfPartitions">The total number of partitions</param>
-		public TermsInclude(long partition, long numberOfPartitions)
-		{
-			Partition = partition;
-			NumberOfPartitions = numberOfPartitions;
-		}
+		[JsonIgnore]
+		public IEnumerable<string> Values { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsIncludeJsonConverter.cs b/src/Nest/Aggregations/Bucket/Terms/TermsIncludeJsonConverter.cs
index 7ce678ef75f..4fa3742f50a 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsIncludeJsonConverter.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsIncludeJsonConverter.cs
@@ -16,7 +16,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			switch (reader.TokenType)
 			{
 				case JsonToken.StartArray:
-					termsInclude =new TermsInclude(serializer.Deserialize<IEnumerable<string>>(reader));
+					termsInclude = new TermsInclude(serializer.Deserialize<IEnumerable<string>>(reader));
 					break;
 				case JsonToken.StartObject:
 					long partition = 0;
diff --git a/src/Nest/Aggregations/Bucket/Terms/TermsOrder.cs b/src/Nest/Aggregations/Bucket/Terms/TermsOrder.cs
index b7d77b6c66d..bced94033ce 100644
--- a/src/Nest/Aggregations/Bucket/Terms/TermsOrder.cs
+++ b/src/Nest/Aggregations/Bucket/Terms/TermsOrder.cs
@@ -6,16 +6,17 @@ namespace Nest
 	[JsonConverter(typeof(KeyValueJsonConverter<TermsOrder, SortOrder>))]
 	public class TermsOrder
 	{
+		public static TermsOrder CountAscending => new TermsOrder { Key = "_count", Order = SortOrder.Ascending };
+		public static TermsOrder CountDescending => new TermsOrder { Key = "_count", Order = SortOrder.Descending };
 		public string Key { get; set; }
+		public static TermsOrder KeyAscending => new TermsOrder { Key = "_key", Order = SortOrder.Ascending };
+		public static TermsOrder KeyDescending => new TermsOrder { Key = "_key", Order = SortOrder.Descending };
 		public SortOrder Order { get; set; }
 
-		public static TermsOrder CountAscending => new TermsOrder { Key = "_count", Order = SortOrder.Ascending };
-		public static TermsOrder CountDescending => new TermsOrder { Key = "_count", Order = SortOrder.Descending };
 		[Obsolete("Deprecated in Elasticsearch 6.0. Use KeyAscending")]
 		public static TermsOrder TermAscending => new TermsOrder { Key = "_key", Order = SortOrder.Ascending };
+
 		[Obsolete("Deprecated in Elasticsearch 6.0. Use KeyDescending")]
 		public static TermsOrder TermDescending => new TermsOrder { Key = "_key", Order = SortOrder.Descending };
-		public static TermsOrder KeyAscending => new TermsOrder { Key = "_key", Order = SortOrder.Ascending };
-		public static TermsOrder KeyDescending => new TermsOrder { Key = "_key", Order = SortOrder.Descending };
 	}
 }
diff --git a/src/Nest/Aggregations/Matrix/MatrixAggregate.cs b/src/Nest/Aggregations/Matrix/MatrixAggregate.cs
index a00055ff240..5673a6e2ba2 100644
--- a/src/Nest/Aggregations/Matrix/MatrixAggregate.cs
+++ b/src/Nest/Aggregations/Matrix/MatrixAggregate.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Nest
 {
diff --git a/src/Nest/Aggregations/Matrix/MatrixAggregation.cs b/src/Nest/Aggregations/Matrix/MatrixAggregation.cs
index 7e83e05c6c2..d34ce5f4f13 100644
--- a/src/Nest/Aggregations/Matrix/MatrixAggregation.cs
+++ b/src/Nest/Aggregations/Matrix/MatrixAggregation.cs
@@ -1,10 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -21,10 +17,7 @@ public abstract class MatrixAggregationBase : AggregationBase, IMatrixAggregatio
 	{
 		internal MatrixAggregationBase() { }
 
-		protected MatrixAggregationBase(string name, Fields field) : base(name)
-		{
-			this.Fields = field;
-		}
+		protected MatrixAggregationBase(string name, Fields field) : base(name) => Fields = field;
 
 		public Fields Fields { get; set; }
 
diff --git a/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsAggregate.cs b/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsAggregate.cs
index edab5fa89be..db8c28b0fc5 100644
--- a/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsAggregate.cs
+++ b/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsAggregate.cs
@@ -1,40 +1,34 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
-
 	[JsonObject]
 	public class MatrixStatsField
 	{
-		[JsonProperty("name")]
-		public string Name { get; set; }
+		[JsonProperty("correlation")]
+		public Dictionary<string, double> Correlation { get; set; }
 
 		[JsonProperty("count")]
 		public int Count { get; set; }
 
+		[JsonProperty("covariance")]
+		public Dictionary<string, double> Covariance { get; set; }
+
+		[JsonProperty("kurtosis")]
+		public double Kurtosis { get; set; }
+
 		[JsonProperty("mean")]
 		public double Mean { get; set; }
 
-		[JsonProperty("variance")]
-		public double Variance { get; set; }
+		[JsonProperty("name")]
+		public string Name { get; set; }
 
 		[JsonProperty("skewness")]
 		public double Skewness { get; set; }
 
-		[JsonProperty("kurtosis")]
-		public double Kurtosis { get; set; }
-
-		[JsonProperty("covariance")]
-		public Dictionary<string, double> Covariance { get; set; }
-
-		[JsonProperty("correlation")]
-		public Dictionary<string, double> Correlation { get; set; }
-
+		[JsonProperty("variance")]
+		public double Variance { get; set; }
 	}
 
 	[JsonObject]
diff --git a/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsAggregation.cs b/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsAggregation.cs
index 06e550d8f5c..6d9641e51e1 100644
--- a/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsAggregation.cs
+++ b/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsAggregation.cs
@@ -1,9 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -28,7 +23,7 @@ public MatrixStatsAggregation(string name, Fields fields) : base(name, fields) {
 
 	public class MatrixStatsAggregationDescriptor<T>
 		: MatrixAggregationDescriptorBase<MatrixStatsAggregationDescriptor<T>, IMatrixStatsAggregation, T>
-		, IMatrixStatsAggregation
+			, IMatrixStatsAggregation
 		where T : class
 	{
 		MatrixStatsMode? IMatrixStatsAggregation.Mode { get; set; }
diff --git a/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsMode.cs b/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsMode.cs
index 659b57837f9..9dd08161a70 100644
--- a/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsMode.cs
+++ b/src/Nest/Aggregations/Matrix/MatrixStats/MatrixStatsMode.cs
@@ -1,11 +1,6 @@
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -22,21 +17,25 @@ public enum MatrixStatsMode
 		/// </summary>
 		[EnumMember(Value = "avg")]
 		Avg,
+
 		/// <summary>
 		/// Pick the lowest value.
 		/// </summary>
 		[EnumMember(Value = "min")]
 		Min,
+
 		/// <summary>
-		///	Pick the highest value.
+		/// 	Pick the highest value.
 		/// </summary>
 		[EnumMember(Value = "max")]
 		Max,
+
 		/// <summary>
 		/// Use the sum of all values.
 		/// </summary>
 		[EnumMember(Value = "sum")]
 		Sum,
+
 		/// <summary>
 		/// Use the median of all values.
 		/// </summary>
diff --git a/src/Nest/Aggregations/Metric/Average/AverageAggregation.cs b/src/Nest/Aggregations/Metric/Average/AverageAggregation.cs
index 08e77057a23..2539eba4cb1 100644
--- a/src/Nest/Aggregations/Metric/Average/AverageAggregation.cs
+++ b/src/Nest/Aggregations/Metric/Average/AverageAggregation.cs
@@ -15,8 +15,8 @@ public AverageAggregation(string name, Field field) : base(name, field) { }
 		internal override void WrapInContainer(AggregationContainer c) => c.Average = this;
 	}
 
-	public class AverageAggregationDescriptor<T> 
+	public class AverageAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<AverageAggregationDescriptor<T>, IAverageAggregation, T>
-			, IAverageAggregation 
+			, IAverageAggregation
 		where T : class { }
 }
diff --git a/src/Nest/Aggregations/Metric/Cardinality/CardinalityAggregation.cs b/src/Nest/Aggregations/Metric/Cardinality/CardinalityAggregation.cs
index 885a2ea1597..0338ac4a68d 100644
--- a/src/Nest/Aggregations/Metric/Cardinality/CardinalityAggregation.cs
+++ b/src/Nest/Aggregations/Metric/Cardinality/CardinalityAggregation.cs
@@ -15,13 +15,13 @@ public interface ICardinalityAggregation : IMetricAggregation
 
 	public class CardinalityAggregation : MetricAggregationBase, ICardinalityAggregation
 	{
-		public int? PrecisionThreshold { get; set; }
-		public bool? Rehash { get; set; }
-
 		internal CardinalityAggregation() { }
 
 		public CardinalityAggregation(string name, Field field) : base(name, field) { }
 
+		public int? PrecisionThreshold { get; set; }
+		public bool? Rehash { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.Cardinality = this;
 	}
 
@@ -38,6 +38,5 @@ public CardinalityAggregationDescriptor<T> PrecisionThreshold(int? precisionThre
 			=> Assign(a => a.PrecisionThreshold = precisionThreshold);
 
 		public CardinalityAggregationDescriptor<T> Rehash(bool? rehash = true) => Assign(a => a.Rehash = rehash);
-
 	}
 }
diff --git a/src/Nest/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregate.cs b/src/Nest/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregate.cs
index 8945ccf3b1e..fdec3f71267 100644
--- a/src/Nest/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregate.cs
+++ b/src/Nest/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregate.cs
@@ -2,20 +2,20 @@
 {
 	public class ExtendedStatsAggregate : MetricAggregateBase
 	{
+		public double? Average { get; set; }
 		public long Count { get; set; }
-		public double? Min { get; set; }
 		public double? Max { get; set; }
-		public double? Average { get; set; }
+		public double? Min { get; set; }
+		public double? StdDeviation { get; set; }
+		public StandardDeviationBounds StdDeviationBounds { get; set; }
 		public double? Sum { get; set; }
 		public double? SumOfSquares { get; set; }
 		public double? Variance { get; set; }
-		public double? StdDeviation { get; set; }
-		public StandardDeviationBounds StdDeviationBounds { get; set; }
 	}
 
 	public class StandardDeviationBounds
 	{
-		public double? Upper { get; set; }
 		public double? Lower { get; set; }
+		public double? Upper { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregate.cs b/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregate.cs
index 9fde9789ed0..3aee6736de4 100644
--- a/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregate.cs
+++ b/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregate.cs
@@ -2,17 +2,14 @@
 {
 	public class GeoBoundsAggregate : MetricAggregateBase
 	{
-		public GeoBoundsAggregate()
-		{
-			Bounds = new GeoBounds();
-		}
+		public GeoBoundsAggregate() => Bounds = new GeoBounds();
 
 		public GeoBounds Bounds { get; set; }
 	}
 
 	public class GeoBounds
 	{
-		public LatLon TopLeft { get; set; }
 		public LatLon BottomRight { get; set; }
+		public LatLon TopLeft { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregation.cs b/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregation.cs
index 5393c6f5f74..6ea24ed1e6e 100644
--- a/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregation.cs
+++ b/src/Nest/Aggregations/Metric/GeoBounds/GeoBoundsAggregation.cs
@@ -12,12 +12,12 @@ public interface IGeoBoundsAggregation : IMetricAggregation
 
 	public class GeoBoundsAggregation : MetricAggregationBase, IGeoBoundsAggregation
 	{
-		public bool? WrapLongitude { get; set; }
-
 		internal GeoBoundsAggregation() { }
 
 		public GeoBoundsAggregation(string name, Field field) : base(name, field) { }
 
+		public bool? WrapLongitude { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.GeoBounds = this;
 	}
 
diff --git a/src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregate.cs b/src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregate.cs
index 079f967607c..fbbf81a39cf 100644
--- a/src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregate.cs
+++ b/src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregate.cs
@@ -4,9 +4,10 @@ namespace Nest
 {
 	public class GeoCentroidAggregate : MetricAggregateBase
 	{
-		[JsonProperty("location")]
-		public GeoLocation Location { get; set; }
 		[JsonProperty("count")]
 		public long Count { get; set; }
+
+		[JsonProperty("location")]
+		public GeoLocation Location { get; set; }
 	}
 }
diff --git a/src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregation.cs b/src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregation.cs
index 43ef8ee3ca8..d653ea65313 100644
--- a/src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregation.cs
+++ b/src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregation.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -23,7 +18,5 @@ public GeoCentroidAggregation(string name, Field field) : base(name, field) { }
 	public class GeoCentroidAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<GeoCentroidAggregationDescriptor<T>, IGeoCentroidAggregation, T>
 			, IGeoCentroidAggregation
-		where T : class
-	{
-	}
+		where T : class { }
 }
diff --git a/src/Nest/Aggregations/Metric/Max/MaxAggregation.cs b/src/Nest/Aggregations/Metric/Max/MaxAggregation.cs
index 5cf419108a4..5b9599a4715 100644
--- a/src/Nest/Aggregations/Metric/Max/MaxAggregation.cs
+++ b/src/Nest/Aggregations/Metric/Max/MaxAggregation.cs
@@ -15,8 +15,8 @@ public MaxAggregation(string name, Field field) : base(name, field) { }
 		internal override void WrapInContainer(AggregationContainer c) => c.Max = this;
 	}
 
-	public class MaxAggregationDescriptor<T> 
+	public class MaxAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<MaxAggregationDescriptor<T>, IMaxAggregation, T>
-			, IMaxAggregation 
+			, IMaxAggregation
 		where T : class { }
 }
diff --git a/src/Nest/Aggregations/Metric/MetricAggregate.cs b/src/Nest/Aggregations/Metric/MetricAggregate.cs
index ef6b67b8fba..81d5b53e8b0 100644
--- a/src/Nest/Aggregations/Metric/MetricAggregate.cs
+++ b/src/Nest/Aggregations/Metric/MetricAggregate.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -7,6 +6,6 @@ namespace Nest
 	public abstract class MetricAggregateBase : IAggregate
 	{
 		[JsonProperty("meta")]
-		public IReadOnlyDictionary<string, object> Meta { get;  set; } = EmptyReadOnly<string, object>.Dictionary;
+		public IReadOnlyDictionary<string, object> Meta { get; set; } = EmptyReadOnly<string, object>.Dictionary;
 	}
 }
diff --git a/src/Nest/Aggregations/Metric/MetricAggregation.cs b/src/Nest/Aggregations/Metric/MetricAggregation.cs
index eb429e81b02..d8141e0748b 100644
--- a/src/Nest/Aggregations/Metric/MetricAggregation.cs
+++ b/src/Nest/Aggregations/Metric/MetricAggregation.cs
@@ -10,40 +10,40 @@ public interface IMetricAggregation : IAggregation
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("script")]
-		IScript Script { get; set; }
-
 		[JsonProperty("missing")]
 		double? Missing { get; set; }
+
+		[JsonProperty("script")]
+		IScript Script { get; set; }
 	}
 
 	public abstract class MetricAggregationBase : AggregationBase, IMetricAggregation
 	{
 		internal MetricAggregationBase() { }
 
-		protected MetricAggregationBase(string name, Field field) : base(name) => this.Field = field;
+		protected MetricAggregationBase(string name, Field field) : base(name) => Field = field;
 
 		public Field Field { get; set; }
-		public virtual IScript Script { get; set; }
 		public double? Missing { get; set; }
+		public virtual IScript Script { get; set; }
 	}
 
 	public abstract class MetricAggregationDescriptorBase<TMetricAggregation, TMetricAggregationInterface, T>
-		:  DescriptorBase<TMetricAggregation, TMetricAggregationInterface>, IMetricAggregation
+		: DescriptorBase<TMetricAggregation, TMetricAggregationInterface>, IMetricAggregation
 		where TMetricAggregation : MetricAggregationDescriptorBase<TMetricAggregation, TMetricAggregationInterface, T>
-			, TMetricAggregationInterface, IMetricAggregation
+		, TMetricAggregationInterface, IMetricAggregation
 		where T : class
 		where TMetricAggregationInterface : class, IMetricAggregation
 	{
 		Field IMetricAggregation.Field { get; set; }
 
-		IScript IMetricAggregation.Script { get; set; }
+		IDictionary<string, object> IAggregation.Meta { get; set; }
 
 		double? IMetricAggregation.Missing { get; set; }
 
 		string IAggregation.Name { get; set; }
 
-		IDictionary<string, object> IAggregation.Meta { get; set; }
+		IScript IMetricAggregation.Script { get; set; }
 
 		public TMetricAggregation Field(Field field) => Assign(a => a.Field = field);
 
diff --git a/src/Nest/Aggregations/Metric/Min/MinAggregation.cs b/src/Nest/Aggregations/Metric/Min/MinAggregation.cs
index 39e5545979d..bd804f481d3 100644
--- a/src/Nest/Aggregations/Metric/Min/MinAggregation.cs
+++ b/src/Nest/Aggregations/Metric/Min/MinAggregation.cs
@@ -15,8 +15,8 @@ public MinAggregation(string name, Field field) : base(name, field) { }
 		internal override void WrapInContainer(AggregationContainer c) => c.Min = this;
 	}
 
-	public class MinAggregationDescriptor<T> 
+	public class MinAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<MinAggregationDescriptor<T>, IMinAggregation, T>
-			, IMinAggregation 
+			, IMinAggregation
 		where T : class { }
 }
diff --git a/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregation.cs b/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregation.cs
index 496af2553a2..fc26bf8b125 100644
--- a/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregation.cs
+++ b/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregation.cs
@@ -7,29 +7,28 @@ namespace Nest
 	[ContractJsonConverter(typeof(PercentileRanksAggregationJsonConverter))]
 	public interface IPercentileRanksAggregation : IMetricAggregation
 	{
-		IEnumerable<double> Values { get; set; }
 		IPercentilesMethod Method { get; set; }
+		IEnumerable<double> Values { get; set; }
 	}
 
 	public class PercentileRanksAggregation : MetricAggregationBase, IPercentileRanksAggregation
 	{
-		public IEnumerable<double> Values { get; set; }
-		public IPercentilesMethod Method { get; set; }
-
 		internal PercentileRanksAggregation() { }
 
 		public PercentileRanksAggregation(string name, Field field) : base(name, field) { }
 
+		public IPercentilesMethod Method { get; set; }
+		public IEnumerable<double> Values { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.PercentileRanks = this;
 	}
 
-	public class PercentileRanksAggregationDescriptor<T> 
+	public class PercentileRanksAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<PercentileRanksAggregationDescriptor<T>, IPercentileRanksAggregation, T>, IPercentileRanksAggregation
 		where T : class
 	{
-		IEnumerable<double> IPercentileRanksAggregation.Values { get; set; }
-
 		IPercentilesMethod IPercentileRanksAggregation.Method { get; set; }
+		IEnumerable<double> IPercentileRanksAggregation.Values { get; set; }
 
 		public PercentileRanksAggregationDescriptor<T> Values(IEnumerable<double> values) =>
 			Assign(a => a.Values = values?.ToList());
diff --git a/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationJsonConverter.cs b/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationJsonConverter.cs
index 72b15201678..cc3546fcc2f 100644
--- a/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationJsonConverter.cs
+++ b/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationJsonConverter.cs
@@ -19,13 +19,16 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			percentileRanks.Method = ReadMethodProperty(properties);
 			if (properties.ContainsKey("values"))
 				percentileRanks.Values = properties["values"].ToObject<List<double>>();
-			return percentileRanks;;
+			return percentileRanks;
+
+			;
 		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var percentileRanks = value as IPercentileRanksAggregation;
 			if (percentileRanks == null) return;
+
 			writer.WriteStartObject();
 			WriteMetricProperties(percentileRanks, writer, serializer);
 			if (percentileRanks.Values != null)
diff --git a/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregation.cs b/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregation.cs
index 886c0c5c2d7..4ad15f7cfa3 100644
--- a/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregation.cs
+++ b/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregation.cs
@@ -7,38 +7,37 @@ namespace Nest
 	[ContractJsonConverter(typeof(PercentilesAggregationJsonConverter))]
 	public interface IPercentilesAggregation : IMetricAggregation
 	{
-		IEnumerable<double> Percents { get; set; }
 		IPercentilesMethod Method { get; set; }
+		IEnumerable<double> Percents { get; set; }
 	}
 
 	public class PercentilesAggregation : MetricAggregationBase, IPercentilesAggregation
 	{
-		public IEnumerable<double> Percents { get; set; }
-		public IPercentilesMethod Method { get; set; }
-			
 		internal PercentilesAggregation() { }
 
-		public PercentilesAggregation(string name, Field field) : base(name, field) { } 
+		public PercentilesAggregation(string name, Field field) : base(name, field) { }
+
+		public IPercentilesMethod Method { get; set; }
+		public IEnumerable<double> Percents { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.Percentiles = this;
 	}
 
-	public class PercentilesAggregationDescriptor<T> 
+	public class PercentilesAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<PercentilesAggregationDescriptor<T>, IPercentilesAggregation, T>
-			, IPercentilesAggregation 
+			, IPercentilesAggregation
 		where T : class
 	{
-		IEnumerable<double> IPercentilesAggregation.Percents { get; set; }
-
 		IPercentilesMethod IPercentilesAggregation.Method { get; set; }
+		IEnumerable<double> IPercentilesAggregation.Percents { get; set; }
 
-		public PercentilesAggregationDescriptor<T> Percents(IEnumerable<double> percentages) => 
+		public PercentilesAggregationDescriptor<T> Percents(IEnumerable<double> percentages) =>
 			Assign(a => a.Percents = percentages?.ToList());
 
-		public PercentilesAggregationDescriptor<T> Percents(params double[] percentages) => 
+		public PercentilesAggregationDescriptor<T> Percents(params double[] percentages) =>
 			Assign(a => a.Percents = percentages?.ToList());
 
-		public PercentilesAggregationDescriptor<T> Method(Func<PercentilesMethodDescriptor, IPercentilesMethod> methodSelector) => 
+		public PercentilesAggregationDescriptor<T> Method(Func<PercentilesMethodDescriptor, IPercentilesMethod> methodSelector) =>
 			Assign(a => a.Method = methodSelector?.Invoke(new PercentilesMethodDescriptor()));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationJsonConverter.cs b/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationJsonConverter.cs
index aed0f3b634a..457bda12d8f 100644
--- a/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationJsonConverter.cs
+++ b/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationJsonConverter.cs
@@ -54,6 +54,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		{
 			var percentiles = value as IPercentilesAggregation;
 			if (percentiles == null) return;
+
 			writer.WriteStartObject();
 			WriteMetricProperties(percentiles, writer, serializer);
 			if (percentiles.Percents != null)
@@ -98,7 +99,6 @@ protected void WriteMethodProperty(IPercentilesMethod method, JsonWriter writer,
 
 		protected void WriteMetricProperties(IMetricAggregation metric, JsonWriter writer, JsonSerializer serializer)
 		{
-
 			if (metric.Field != null)
 			{
 				var settings = serializer.GetConnectionSettings();
diff --git a/src/Nest/Aggregations/Metric/Percentiles/PercentilesMetricAggregate.cs b/src/Nest/Aggregations/Metric/Percentiles/PercentilesMetricAggregate.cs
index 044418220b6..d50b0e75b78 100644
--- a/src/Nest/Aggregations/Metric/Percentiles/PercentilesMetricAggregate.cs
+++ b/src/Nest/Aggregations/Metric/Percentiles/PercentilesMetricAggregate.cs
@@ -2,7 +2,6 @@
 
 namespace Nest
 {
-
 	public class PercentileItem
 	{
 		public double Percentile { get; internal set; }
@@ -13,4 +12,4 @@ public class PercentilesAggregate : MetricAggregateBase
 	{
 		public IList<PercentileItem> Items { get; internal set; } = new List<PercentileItem>();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregate.cs b/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregate.cs
index 097b26e8493..fe9e9c88697 100644
--- a/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregate.cs
+++ b/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregate.cs
@@ -1,24 +1,21 @@
-
-using System;
-using Newtonsoft.Json.Linq;
+using System;
 
 namespace Nest
 {
 	public class ScriptedMetricAggregate : MetricAggregateBase
 	{
 		private readonly object _value;
+
 		internal ScriptedMetricAggregate(object value) => _value = value;
+
 		public ScriptedMetricAggregate() { }
 
 		/// <summary>
 		/// Get the result of the scripted metric aggregation as T
 		/// </summary>
 		/// <typeparam name="T">The type that best represents the result of your scripted metric aggrgation</typeparam>
-		public T Value<T>()
-		{
-			return this._value is LazyDocument lazyDocument
-				? lazyDocument.As<T>()
-				: (T)Convert.ChangeType(this._value, typeof(T));
-		}
+		public T Value<T>() => _value is LazyDocument lazyDocument
+			? lazyDocument.As<T>()
+			: (T)Convert.ChangeType(_value, typeof(T));
 	}
 }
diff --git a/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregation.cs b/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregation.cs
index 4462e7fb1d3..c458c49161c 100644
--- a/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregation.cs
+++ b/src/Nest/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregation.cs
@@ -8,64 +8,70 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<ScriptedMetricAggregation>))]
 	public interface IScriptedMetricAggregation : IMetricAggregation
 	{
+		[JsonProperty("combine_script")]
+		IScript CombineScript { get; set; }
+
 		[JsonProperty("init_script")]
 		IScript InitScript { get; set; }
-		
+
 		[JsonProperty("map_script")]
 		IScript MapScript { get; set; }
 
-		[JsonProperty("combine_script")]
-		IScript CombineScript { get; set; }
+		[JsonProperty("params")]
+		IDictionary<string, object> Params { get; set; }
 
 		[JsonProperty("reduce_script")]
 		IScript ReduceScript { get; set; }
-
-		[JsonProperty("params")]
-		IDictionary<string, object> Params { get; set; }
 	}
 
 	public class ScriptedMetricAggregation : MetricAggregationBase, IScriptedMetricAggregation
 	{
-		public IScript InitScript { get; set; }
-		public IScript MapScript { get; set; }
-		public IScript CombineScript { get; set; }
-		public IScript ReduceScript { get; set; }
-		public IDictionary<string, object> Params { get; set; }
-
 		internal ScriptedMetricAggregation() { }
 
 		public ScriptedMetricAggregation(string name) : base(name, null) { }
 
+		public IScript CombineScript { get; set; }
+		public IScript InitScript { get; set; }
+		public IScript MapScript { get; set; }
+		public IDictionary<string, object> Params { get; set; }
+		public IScript ReduceScript { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.ScriptedMetric = this;
 	}
+
 	public class ScriptedMetricAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<ScriptedMetricAggregationDescriptor<T>, IScriptedMetricAggregation, T>
-		, IScriptedMetricAggregation
+			, IScriptedMetricAggregation
 		where T : class
 	{
+		IScript IScriptedMetricAggregation.CombineScript { get; set; }
 		IScript IScriptedMetricAggregation.InitScript { get; set; }
 		IScript IScriptedMetricAggregation.MapScript { get; set; }
-		IScript IScriptedMetricAggregation.CombineScript { get; set; }
-		IScript IScriptedMetricAggregation.ReduceScript { get; set; }
 		IDictionary<string, object> IScriptedMetricAggregation.Params { get; set; }
+		IScript IScriptedMetricAggregation.ReduceScript { get; set; }
 
 		public ScriptedMetricAggregationDescriptor<T> InitScript(string script) => Assign(a => a.InitScript = (InlineScript)script);
-		public ScriptedMetricAggregationDescriptor<T> InitScript(Func<ScriptDescriptor, IScript> scriptSelector) => 
+
+		public ScriptedMetricAggregationDescriptor<T> InitScript(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.InitScript = scriptSelector?.Invoke(new ScriptDescriptor()));
 
 		public ScriptedMetricAggregationDescriptor<T> MapScript(string script) => Assign(a => a.MapScript = (InlineScript)script);
-		public ScriptedMetricAggregationDescriptor<T> MapScript(Func<ScriptDescriptor, IScript> scriptSelector) => 
+
+		public ScriptedMetricAggregationDescriptor<T> MapScript(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.MapScript = scriptSelector?.Invoke(new ScriptDescriptor()));
 
 		public ScriptedMetricAggregationDescriptor<T> CombineScript(string script) => Assign(a => a.CombineScript = (InlineScript)script);
-		public ScriptedMetricAggregationDescriptor<T> CombineScript(Func<ScriptDescriptor, IScript> scriptSelector) => 
+
+		public ScriptedMetricAggregationDescriptor<T> CombineScript(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.CombineScript = scriptSelector?.Invoke(new ScriptDescriptor()));
 
 		public ScriptedMetricAggregationDescriptor<T> ReduceScript(string script) => Assign(a => a.ReduceScript = (InlineScript)script);
-		public ScriptedMetricAggregationDescriptor<T> ReduceScript(Func<ScriptDescriptor, IScript> scriptSelector) => 
+
+		public ScriptedMetricAggregationDescriptor<T> ReduceScript(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.ReduceScript = scriptSelector?.Invoke(new ScriptDescriptor()));
 
-		public ScriptedMetricAggregationDescriptor<T> Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramSelector) =>
-				Assign(a => a.Params = paramSelector?.Invoke(new FluentDictionary<string, object>()));
+		public ScriptedMetricAggregationDescriptor<T>
+			Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramSelector) =>
+			Assign(a => a.Params = paramSelector?.Invoke(new FluentDictionary<string, object>()));
 	}
 }
diff --git a/src/Nest/Aggregations/Metric/Stats/StatsAggregate.cs b/src/Nest/Aggregations/Metric/Stats/StatsAggregate.cs
index 84eb9d6c805..33eff2af25c 100644
--- a/src/Nest/Aggregations/Metric/Stats/StatsAggregate.cs
+++ b/src/Nest/Aggregations/Metric/Stats/StatsAggregate.cs
@@ -2,10 +2,10 @@
 {
 	public class StatsAggregate : MetricAggregateBase
 	{
+		public double? Average { get; set; }
 		public long Count { get; set; }
-		public double? Min { get; set; }
 		public double? Max { get; set; }
-		public double? Average { get; set; }
+		public double? Min { get; set; }
 		public double? Sum { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Metric/Sum/SumAggregation.cs b/src/Nest/Aggregations/Metric/Sum/SumAggregation.cs
index c55dc191a35..148928447cd 100644
--- a/src/Nest/Aggregations/Metric/Sum/SumAggregation.cs
+++ b/src/Nest/Aggregations/Metric/Sum/SumAggregation.cs
@@ -15,8 +15,8 @@ public SumAggregation(string name, Field field) : base(name, field) { }
 		internal override void WrapInContainer(AggregationContainer c) => c.Sum = this;
 	}
 
-	public class SumAggregationDescriptor<T> 
+	public class SumAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<SumAggregationDescriptor<T>, ISumAggregation, T>
-			, ISumAggregation 
+			, ISumAggregation
 		where T : class { }
 }
diff --git a/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregate.cs b/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregate.cs
index 1050b9130fa..31cc245237f 100644
--- a/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregate.cs
+++ b/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregate.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -9,25 +7,22 @@ public class TopHitsAggregate : MetricAggregateBase
 	{
 		private readonly IList<LazyDocument> _hits;
 
-		public long Total { get; set; }
+		public TopHitsAggregate() { }
 
-		public double? MaxScore { get; set; }
+		internal TopHitsAggregate(IList<LazyDocument> hits) => _hits = hits;
 
-		public TopHitsAggregate() { }
+		public double? MaxScore { get; set; }
 
-		internal TopHitsAggregate(IList<LazyDocument> hits)
-		{
-			_hits = hits;
-		}
+		public long Total { get; set; }
 
 		private IEnumerable<Hit<TDocument>> ConvertHits<TDocument>()
 			where TDocument : class => _hits.Select(h => h.As<Hit<TDocument>>());
 
 		public IReadOnlyCollection<Hit<TDocument>> Hits<TDocument>()
 			where TDocument : class =>
-			this.ConvertHits<TDocument>().ToList().AsReadOnly();
+			ConvertHits<TDocument>().ToList().AsReadOnly();
 
 		public IReadOnlyCollection<TDocument> Documents<TDocument>() where TDocument : class =>
-			this.ConvertHits<TDocument>().Select(h => h.Source).ToList().AsReadOnly();
+			ConvertHits<TDocument>().Select(h => h.Source).ToList().AsReadOnly();
 	}
 }
diff --git a/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregation.cs b/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregation.cs
index 9ec0eba2196..2575cbdd36e 100644
--- a/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregation.cs
+++ b/src/Nest/Aggregations/Metric/TopHits/TopHitsAggregation.cs
@@ -8,9 +8,22 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<TopHitsAggregation>))]
 	public interface ITopHitsAggregation : IMetricAggregation
 	{
+		[JsonProperty("docvalue_fields")]
+		Fields DocValueFields { get; set; }
+
+		[JsonProperty("explain")]
+		bool? Explain { get; set; }
+
 		[JsonProperty("from")]
 		int? From { get; set; }
 
+		[JsonProperty("highlight")]
+		IHighlight Highlight { get; set; }
+
+		[JsonProperty("script_fields")]
+		[JsonConverter(typeof(ReadAsTypeJsonConverter<ScriptFields>))]
+		IScriptFields ScriptFields { get; set; }
+
 		[JsonProperty("size")]
 		int? Size { get; set; }
 
@@ -20,46 +33,33 @@ public interface ITopHitsAggregation : IMetricAggregation
 		[JsonProperty("_source")]
 		Union<bool, ISourceFilter> Source { get; set; }
 
-		[JsonProperty("highlight")]
-		IHighlight Highlight { get; set; }
-
-		[JsonProperty("explain")]
-		bool? Explain { get; set; }
-
-		[JsonProperty("script_fields")]
-		[JsonConverter(typeof(ReadAsTypeJsonConverter<ScriptFields>))]
-		IScriptFields ScriptFields { get; set; }
-
 		[JsonProperty("stored_fields")]
 		Fields StoredFields { get; set; }
 
-		[JsonProperty("docvalue_fields")]
-		Fields DocValueFields { get; set; }
+		[JsonProperty("track_scores")]
+		bool? TrackScores { get; set; }
 
 		[JsonProperty("version")]
 		bool? Version { get; set; }
-
-		[JsonProperty("track_scores")]
-		bool? TrackScores { get; set; }
 	}
 
 	public class TopHitsAggregation : MetricAggregationBase, ITopHitsAggregation
 	{
+		internal TopHitsAggregation() { }
+
+		public TopHitsAggregation(string name) : base(name, null) { }
+
+		public Fields DocValueFields { get; set; }
+		public bool? Explain { get; set; }
 		public int? From { get; set; }
+		public IHighlight Highlight { get; set; }
+		public IScriptFields ScriptFields { get; set; }
 		public int? Size { get; set; }
 		public IList<ISort> Sort { get; set; }
 		public Union<bool, ISourceFilter> Source { get; set; }
-		public IHighlight Highlight { get; set; }
-		public bool? Explain { get; set; }
-		public IScriptFields ScriptFields { get; set; }
 		public Fields StoredFields { get; set; }
-		public bool? Version { get; set; }
 		public bool? TrackScores { get; set; }
-		public Fields DocValueFields { get; set; }
-
-		internal TopHitsAggregation() { }
-
-		public TopHitsAggregation(string name) : base(name, null) { }
+		public bool? Version { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.TopHits = this;
 	}
@@ -69,27 +69,26 @@ public class TopHitsAggregationDescriptor<T>
 			, ITopHitsAggregation
 		where T : class
 	{
+		Fields ITopHitsAggregation.DocValueFields { get; set; }
+
+		bool? ITopHitsAggregation.Explain { get; set; }
 		int? ITopHitsAggregation.From { get; set; }
 
+		IHighlight ITopHitsAggregation.Highlight { get; set; }
+
+		IScriptFields ITopHitsAggregation.ScriptFields { get; set; }
+
 		int? ITopHitsAggregation.Size { get; set; }
 
 		IList<ISort> ITopHitsAggregation.Sort { get; set; }
 
 		Union<bool, ISourceFilter> ITopHitsAggregation.Source { get; set; }
 
-		IHighlight ITopHitsAggregation.Highlight { get; set; }
-
-		bool? ITopHitsAggregation.Explain { get; set; }
-
-		IScriptFields ITopHitsAggregation.ScriptFields { get; set; }
-
 		Fields ITopHitsAggregation.StoredFields { get; set; }
 
-		bool? ITopHitsAggregation.Version { get; set; }
-
 		bool? ITopHitsAggregation.TrackScores { get; set; }
 
-		Fields ITopHitsAggregation.DocValueFields { get; set; }
+		bool? ITopHitsAggregation.Version { get; set; }
 
 		public TopHitsAggregationDescriptor<T> From(int? from) => Assign(a => a.From = from);
 
diff --git a/src/Nest/Aggregations/Metric/ValueCount/ValueCountAggregation.cs b/src/Nest/Aggregations/Metric/ValueCount/ValueCountAggregation.cs
index 5c90cd111e0..1efdf709877 100644
--- a/src/Nest/Aggregations/Metric/ValueCount/ValueCountAggregation.cs
+++ b/src/Nest/Aggregations/Metric/ValueCount/ValueCountAggregation.cs
@@ -2,7 +2,6 @@
 
 namespace Nest
 {
-
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[ContractJsonConverter(typeof(AggregationJsonConverter<ValueCountAggregation>))]
 	public interface IValueCountAggregation : IMetricAggregation { }
@@ -16,8 +15,8 @@ public ValueCountAggregation(string name, Field field) : base(name, field) { }
 		internal override void WrapInContainer(AggregationContainer c) => c.ValueCount = this;
 	}
 
-	public class ValueCountAggregationDescriptor<T> 
+	public class ValueCountAggregationDescriptor<T>
 		: MetricAggregationDescriptorBase<ValueCountAggregationDescriptor<T>, IValueCountAggregation, T>
-			, IValueCountAggregation 
+			, IValueCountAggregation
 		where T : class { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Aggregations/Metric/WeightedAverage/WeightedAverageAggregation.cs b/src/Nest/Aggregations/Metric/WeightedAverage/WeightedAverageAggregation.cs
index 678fd785b31..fd2ee0e8d6c 100644
--- a/src/Nest/Aggregations/Metric/WeightedAverage/WeightedAverageAggregation.cs
+++ b/src/Nest/Aggregations/Metric/WeightedAverage/WeightedAverageAggregation.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -9,35 +8,42 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<WeightedAverageAggregation>))]
 	public interface IWeightedAverageAggregation : IAggregation
 	{
-		/// <summary> The configuration for the field or script that provides the values</summary>
-		[JsonProperty("value")]
-		IWeightedAverageValue Value { get; set; }
-		/// <summary> The configuration for the field or script that provides the weights</summary>
-		[JsonProperty("weight")]
-		IWeightedAverageValue Weight { get; set; }
 		/// <summary> The optional numeric response formatter</summary>
 		[JsonProperty("format")]
 		string Format { get; set; }
+
+		/// <summary> The configuration for the field or script that provides the values</summary>
+		[JsonProperty("value")]
+		IWeightedAverageValue Value { get; set; }
+
 		/// <summary> A hint about the values for pure scripts or unmapped fields </summary>
 		[JsonProperty("value_type")]
 		ValueType? ValueType { get; set; }
+
+		/// <summary> The configuration for the field or script that provides the weights</summary>
+		[JsonProperty("weight")]
+		IWeightedAverageValue Weight { get; set; }
 	}
 
 	public class WeightedAverageAggregation : AggregationBase, IWeightedAverageAggregation
 	{
 		internal WeightedAverageAggregation() { }
+
 		public WeightedAverageAggregation(string name) : base(name) { }
 
-		internal override void WrapInContainer(AggregationContainer c) => c.WeightedAverage = this;
+		/// <inheritdoc cref="IWeightedAverageAggregation.Format" />
+		public string Format { get; set; }
 
-		/// <inheritdoc cref="IWeightedAverageAggregation.Value"/>
+		/// <inheritdoc cref="IWeightedAverageAggregation.Value" />
 		public IWeightedAverageValue Value { get; set; }
-		/// <inheritdoc cref="IWeightedAverageAggregation.Weight"/>
-		public IWeightedAverageValue Weight { get; set; }
-		/// <inheritdoc cref="IWeightedAverageAggregation.Format"/>
-		public string Format { get; set; }
-		/// <inheritdoc cref="IWeightedAverageAggregation.ValueType"/>
+
+		/// <inheritdoc cref="IWeightedAverageAggregation.ValueType" />
 		public ValueType? ValueType { get; set; }
+
+		/// <inheritdoc cref="IWeightedAverageAggregation.Weight" />
+		public IWeightedAverageValue Weight { get; set; }
+
+		internal override void WrapInContainer(AggregationContainer c) => c.WeightedAverage = this;
 	}
 
 	public class WeightedAverageAggregationDescriptor<T>
@@ -45,29 +51,29 @@ public class WeightedAverageAggregationDescriptor<T>
 			, IWeightedAverageAggregation
 		where T : class
 	{
-		IWeightedAverageValue IWeightedAverageAggregation.Value { get; set; }
-		IWeightedAverageValue IWeightedAverageAggregation.Weight { get; set; }
 		string IWeightedAverageAggregation.Format { get; set; }
-		ValueType? IWeightedAverageAggregation.ValueType { get; set; }
-		string IAggregation.Name { get; set; }
 		IDictionary<string, object> IAggregation.Meta { get; set; }
+		string IAggregation.Name { get; set; }
+		IWeightedAverageValue IWeightedAverageAggregation.Value { get; set; }
+		ValueType? IWeightedAverageAggregation.ValueType { get; set; }
+		IWeightedAverageValue IWeightedAverageAggregation.Weight { get; set; }
 
-		/// <inheritdoc cref="IAggregation.Meta"/>
+		/// <inheritdoc cref="IAggregation.Meta" />
 		public WeightedAverageAggregationDescriptor<T> Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector) =>
 			Assign(a => a.Meta = selector?.Invoke(new FluentDictionary<string, object>()));
 
-		/// <inheritdoc cref="IWeightedAverageAggregation.Value"/>
+		/// <inheritdoc cref="IWeightedAverageAggregation.Value" />
 		public WeightedAverageAggregationDescriptor<T> Value(Func<WeightedAverageValueDescriptor<T>, IWeightedAverageValue> selector) =>
 			Assign(a => a.Value = selector?.Invoke(new WeightedAverageValueDescriptor<T>()));
 
-		/// <inheritdoc cref="IWeightedAverageAggregation.Weight"/>
+		/// <inheritdoc cref="IWeightedAverageAggregation.Weight" />
 		public WeightedAverageAggregationDescriptor<T> Weight(Func<WeightedAverageValueDescriptor<T>, IWeightedAverageValue> selector) =>
 			Assign(a => a.Weight = selector?.Invoke(new WeightedAverageValueDescriptor<T>()));
 
-		/// <inheritdoc cref="IWeightedAverageAggregation.Format"/>
+		/// <inheritdoc cref="IWeightedAverageAggregation.Format" />
 		public WeightedAverageAggregationDescriptor<T> Format(string format) => Assign(a => a.Format = format);
 
-		/// <inheritdoc cref="IWeightedAverageAggregation.ValueType"/>
+		/// <inheritdoc cref="IWeightedAverageAggregation.ValueType" />
 		public WeightedAverageAggregationDescriptor<T> ValueType(ValueType? valueType) => Assign(a => a.ValueType = valueType);
 	}
 }
diff --git a/src/Nest/Aggregations/Metric/WeightedAverage/WeightedAverageValue.cs b/src/Nest/Aggregations/Metric/WeightedAverage/WeightedAverageValue.cs
index 8c83af09915..65476b99674 100644
--- a/src/Nest/Aggregations/Metric/WeightedAverage/WeightedAverageValue.cs
+++ b/src/Nest/Aggregations/Metric/WeightedAverage/WeightedAverageValue.cs
@@ -8,7 +8,7 @@ namespace Nest
 {
 	/// <summary>
 	/// The configuration for a field or scrip that provides a value or weight
-	/// for <see cref="WeightedAverageAggregation"/>
+	/// for <see cref="WeightedAverageAggregation" />
 	/// </summary>
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[ContractJsonConverter(typeof(ReadAsTypeJsonConverter<WeightedAverageValue>))]
@@ -20,12 +20,6 @@ public interface IWeightedAverageValue
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		/// <summary>
-		/// A script to derive the value and the weight from
-		/// </summary>
-		[JsonProperty("script")]
-		IScript Script { get; set; }
-
 		/// <summary>
 		///  defines how documents that are missing a value should be treated.
 		/// The default behavior is different for value and weight:
@@ -35,31 +29,42 @@ public interface IWeightedAverageValue
 		/// </summary>
 		[JsonProperty("missing")]
 		double? Missing { get; set; }
+
+		/// <summary>
+		/// A script to derive the value and the weight from
+		/// </summary>
+		[JsonProperty("script")]
+		IScript Script { get; set; }
 	}
 
 	/// <inheritdoc />
 	public class WeightedAverageValue : IWeightedAverageValue
 	{
 		internal WeightedAverageValue() { }
-		public WeightedAverageValue(Field field) => this.Field = field;
-		public WeightedAverageValue(IScript script) => this.Script = script;
+
+		public WeightedAverageValue(Field field) => Field = field;
+
+		public WeightedAverageValue(IScript script) => Script = script;
 
 		/// <inheritdoc />
 		public Field Field { get; set; }
-		/// <inheritdoc />
-		public IScript Script { get; set; }
+
 		/// <inheritdoc />
 		public double? Missing { get; set; }
+
+		/// <inheritdoc />
+		public IScript Script { get; set; }
 	}
 
 	/// <inheritdoc cref="IWeightedAverageAggregation" />
-	public class WeightedAverageValueDescriptor<T> : DescriptorBase<WeightedAverageValueDescriptor<T>, IWeightedAverageValue>
+	public class WeightedAverageValueDescriptor<T>
+		: DescriptorBase<WeightedAverageValueDescriptor<T>, IWeightedAverageValue>
 			, IWeightedAverageValue
 		where T : class
 	{
 		Field IWeightedAverageValue.Field { get; set; }
-		IScript IWeightedAverageValue.Script { get; set; }
 		double? IWeightedAverageValue.Missing { get; set; }
+		IScript IWeightedAverageValue.Script { get; set; }
 
 		/// <inheritdoc cref="IWeightedAverageValue.Field" />
 		public WeightedAverageValueDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
@@ -86,20 +91,28 @@ public enum ValueType
 	{
 		/// <summary>A string value</summary>
 		[EnumMember(Value = "string")] String,
+
 		/// <summary>A long value that can be used to represent byte, short, integer and long</summary>
 		[EnumMember(Value = "long")] Long,
+
 		/// <summary>A double value that can be used to represent float and double</summary>
 		[EnumMember(Value = "double")] Double,
+
 		/// <summary>A number value</summary>
 		[EnumMember(Value = "number")] Number,
+
 		/// <summary>A date value</summary>
 		[EnumMember(Value = "date")] Date,
+
 		/// <summary>An IP value</summary>
 		[EnumMember(Value = "ip")] Ip,
+
 		/// <summary>A numeric value</summary>
 		[EnumMember(Value = "numeric")] Numeric,
+
 		/// <summary>A geo_point value</summary>
 		[EnumMember(Value = "geo_point")] GeoPoint,
+
 		/// <summary>A boolean value</summary>
 		[EnumMember(Value = "boolean")] Boolean,
 	}
diff --git a/src/Nest/Aggregations/Pipeline/AverageBucket/AverageBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/AverageBucket/AverageBucketAggregation.cs
index 332ea99e201..f80d70e283b 100644
--- a/src/Nest/Aggregations/Pipeline/AverageBucket/AverageBucketAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/AverageBucket/AverageBucketAggregation.cs
@@ -9,7 +9,7 @@ public interface IAverageBucketAggregation : IPipelineAggregation { }
 	public class AverageBucketAggregation
 		: PipelineAggregationBase, IAverageBucketAggregation
 	{
-		internal AverageBucketAggregation () { }
+		internal AverageBucketAggregation() { }
 
 		public AverageBucketAggregation(string name, SingleBucketsPath bucketsPath)
 			: base(name, bucketsPath) { }
@@ -19,7 +19,5 @@ public AverageBucketAggregation(string name, SingleBucketsPath bucketsPath)
 
 	public class AverageBucketAggregationDescriptor
 		: PipelineAggregationDescriptorBase<AverageBucketAggregationDescriptor, IAverageBucketAggregation, SingleBucketsPath>
-		, IAverageBucketAggregation
-	{
-	}
+			, IAverageBucketAggregation { }
 }
diff --git a/src/Nest/Aggregations/Pipeline/BucketScript/BucketScriptAggregation.cs b/src/Nest/Aggregations/Pipeline/BucketScript/BucketScriptAggregation.cs
index b38f5c76636..5ee0fe01538 100644
--- a/src/Nest/Aggregations/Pipeline/BucketScript/BucketScriptAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/BucketScript/BucketScriptAggregation.cs
@@ -14,19 +14,19 @@ public interface IBucketScriptAggregation : IPipelineAggregation
 	public class BucketScriptAggregation
 		: PipelineAggregationBase, IBucketScriptAggregation
 	{
-		public IScript Script { get; set; }
-
-		internal BucketScriptAggregation () { }
+		internal BucketScriptAggregation() { }
 
 		public BucketScriptAggregation(string name, MultiBucketsPath bucketsPath)
 			: base(name, bucketsPath) { }
 
+		public IScript Script { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.BucketScript = this;
 	}
 
 	public class BucketScriptAggregationDescriptor
 		: PipelineAggregationDescriptorBase<BucketScriptAggregationDescriptor, IBucketScriptAggregation, MultiBucketsPath>
-		, IBucketScriptAggregation
+			, IBucketScriptAggregation
 	{
 		IScript IBucketScriptAggregation.Script { get; set; }
 
diff --git a/src/Nest/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregation.cs b/src/Nest/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregation.cs
index e6a2f4e652e..ecd50dd9c59 100644
--- a/src/Nest/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregation.cs
@@ -14,19 +14,19 @@ public interface IBucketSelectorAggregation : IPipelineAggregation
 	public class BucketSelectorAggregation
 		: PipelineAggregationBase, IBucketSelectorAggregation
 	{
-		public IScript Script { get; set; }
-
-		internal BucketSelectorAggregation () { }
+		internal BucketSelectorAggregation() { }
 
 		public BucketSelectorAggregation(string name, MultiBucketsPath bucketsPath)
 			: base(name, bucketsPath) { }
 
+		public IScript Script { get; set; }
+
 		internal override void WrapInContainer(AggregationContainer c) => c.BucketSelector = this;
 	}
 
 	public class BucketSelectorAggregationDescriptor
 		: PipelineAggregationDescriptorBase<BucketSelectorAggregationDescriptor, IBucketSelectorAggregation, MultiBucketsPath>
-		, IBucketSelectorAggregation
+			, IBucketSelectorAggregation
 	{
 		IScript IBucketSelectorAggregation.Script { get; set; }
 
diff --git a/src/Nest/Aggregations/Pipeline/BucketSort/BucketSortAggregation.cs b/src/Nest/Aggregations/Pipeline/BucketSort/BucketSortAggregation.cs
index 48b5d0a64dc..5158a3099a8 100644
--- a/src/Nest/Aggregations/Pipeline/BucketSort/BucketSortAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/BucketSort/BucketSortAggregation.cs
@@ -14,12 +14,6 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<BucketSortAggregation>))]
 	public interface IBucketSortAggregation : IAggregation
 	{
-		/// <summary>
-		/// The list of fields to sort on
-		/// </summary>
-		[JsonProperty("sort")]
-		IList<ISort> Sort { get; set; }
-
 		/// <summary>
 		/// Buckets in positions prior to the set value will be truncated
 		/// </summary>
@@ -27,42 +21,44 @@ public interface IBucketSortAggregation : IAggregation
 		int? From { get; set; }
 
 		/// <summary>
-		///	The number of buckets to return. Defaults to all buckets of the parent aggregation
+		/// The policy to apply when gaps are found in the data
+		/// </summary>
+		[JsonProperty("gap_policy")]
+		GapPolicy? GapPolicy { get; set; }
+
+		/// <summary>
+		/// 	The number of buckets to return. Defaults to all buckets of the parent aggregation
 		/// </summary>
 		[JsonProperty("size")]
 		int? Size { get; set; }
 
 		/// <summary>
-		/// The policy to apply when gaps are found in the data
+		/// The list of fields to sort on
 		/// </summary>
-		[JsonProperty("gap_policy")]
-		GapPolicy? GapPolicy { get; set; }
+		[JsonProperty("sort")]
+		IList<ISort> Sort { get; set; }
 	}
 
 	/// <inheritdoc cref="IBucketSortAggregation" />
 	public class BucketSortAggregation
 		: AggregationBase, IBucketSortAggregation
 	{
-		internal BucketSortAggregation()
-		{
-		}
+		internal BucketSortAggregation() { }
 
 		public BucketSortAggregation(string name)
-			: base(name)
-		{
-		}
+			: base(name) { }
 
 		/// <inheritdoc />
-		public IList<ISort> Sort { get; set; }
+		public int? From { get; set; }
 
 		/// <inheritdoc />
-		public int? From { get; set; }
+		public GapPolicy? GapPolicy { get; set; }
 
 		/// <inheritdoc />
 		public int? Size { get; set; }
 
 		/// <inheritdoc />
-		public GapPolicy? GapPolicy { get; set; }
+		public IList<ISort> Sort { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.BucketSort = this;
 	}
@@ -73,12 +69,11 @@ public class BucketSortAggregationDescriptor<T>
 			, IBucketSortAggregation
 		where T : class
 	{
-		string IAggregation.Name { get; set; }
-		IDictionary<string, object> IAggregation.Meta { get; set; }
-
 		int? IBucketSortAggregation.From { get; set; }
-		int? IBucketSortAggregation.Size { get; set; }
 		GapPolicy? IBucketSortAggregation.GapPolicy { get; set; }
+		IDictionary<string, object> IAggregation.Meta { get; set; }
+		string IAggregation.Name { get; set; }
+		int? IBucketSortAggregation.Size { get; set; }
 		IList<ISort> IBucketSortAggregation.Sort { get; set; }
 
 		/// <summary>
@@ -93,7 +88,7 @@ public BucketSortAggregationDescriptor<T> Sort(Func<SortDescriptor<T>, IPromise<
 		public BucketSortAggregationDescriptor<T> From(int? from) => Assign(a => a.From = from);
 
 		/// <summary>
-		///	The number of buckets to return. Defaults to all buckets of the parent aggregation
+		/// 	The number of buckets to return. Defaults to all buckets of the parent aggregation
 		/// </summary>
 		public BucketSortAggregationDescriptor<T> Size(int? size) => Assign(a => a.Size = size);
 
diff --git a/src/Nest/Aggregations/Pipeline/BucketsPath.cs b/src/Nest/Aggregations/Pipeline/BucketsPath.cs
index 935293f128d..11d52c9bebe 100644
--- a/src/Nest/Aggregations/Pipeline/BucketsPath.cs
+++ b/src/Nest/Aggregations/Pipeline/BucketsPath.cs
@@ -10,12 +10,9 @@ public interface IBucketsPath { }
 
 	public class SingleBucketsPath : IBucketsPath
 	{
-		public string BucketsPath { get; }
+		public SingleBucketsPath(string bucketsPath) => BucketsPath = bucketsPath;
 
-		public SingleBucketsPath(string bucketsPath)
-		{
-			this.BucketsPath = bucketsPath;
-		}
+		public string BucketsPath { get; }
 
 		public static implicit operator SingleBucketsPath(string bucketsPath) => new SingleBucketsPath(bucketsPath);
 	}
@@ -24,13 +21,14 @@ public interface IMultiBucketsPath : IIsADictionary<string, string>, IBucketsPat
 
 	public class MultiBucketsPath : IsADictionaryBase<string, string>, IMultiBucketsPath
 	{
-		public MultiBucketsPath() {}
+		public MultiBucketsPath() { }
+
 		public MultiBucketsPath(IDictionary<string, string> container) : base(container) { }
+
 		public MultiBucketsPath(Dictionary<string, string> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
-		public void Add(string name, string bucketsPath) => this.BackingDictionary.Add(name, bucketsPath);
+		public void Add(string name, string bucketsPath) => BackingDictionary.Add(name, bucketsPath);
 
 		public static implicit operator MultiBucketsPath(Dictionary<string, string> bucketsPath) => new MultiBucketsPath(bucketsPath);
 	}
@@ -83,7 +81,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			if (multi != null)
 			{
 				writer.WriteStartObject();
-				foreach(var kv in multi)
+				foreach (var kv in multi)
 				{
 					writer.WritePropertyName(kv.Key);
 					writer.WriteValue(kv.Value);
diff --git a/src/Nest/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregation.cs b/src/Nest/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregation.cs
index e6d50e41914..0e0186f900f 100644
--- a/src/Nest/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregation.cs
@@ -9,7 +9,7 @@ public interface ICumulativeSumAggregation : IPipelineAggregation { }
 	public class CumulativeSumAggregation
 		: PipelineAggregationBase, ICumulativeSumAggregation
 	{
-		internal CumulativeSumAggregation () { }
+		internal CumulativeSumAggregation() { }
 
 		public CumulativeSumAggregation(string name, SingleBucketsPath bucketsPath)
 			: base(name, bucketsPath) { }
@@ -19,7 +19,5 @@ public CumulativeSumAggregation(string name, SingleBucketsPath bucketsPath)
 
 	public class CumulativeSumAggregationDescriptor
 		: PipelineAggregationDescriptorBase<CumulativeSumAggregationDescriptor, ICumulativeSumAggregation, SingleBucketsPath>
-		, ICumulativeSumAggregation
-	{
-	}
+			, ICumulativeSumAggregation { }
 }
diff --git a/src/Nest/Aggregations/Pipeline/Derivative/DerivativeAggregation.cs b/src/Nest/Aggregations/Pipeline/Derivative/DerivativeAggregation.cs
index ec660300c18..18f38bb0084 100644
--- a/src/Nest/Aggregations/Pipeline/Derivative/DerivativeAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/Derivative/DerivativeAggregation.cs
@@ -18,5 +18,5 @@ public DerivativeAggregation(string name, SingleBucketsPath bucketsPath)
 
 	public class DerivativeAggregationDescriptor
 		: PipelineAggregationDescriptorBase<DerivativeAggregationDescriptor, IDerivativeAggregation, SingleBucketsPath>
-		, IDerivativeAggregation { }
+			, IDerivativeAggregation { }
 }
diff --git a/src/Nest/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregation.cs
index 096b1260ab0..145014968a2 100644
--- a/src/Nest/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregation.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -17,8 +16,7 @@ public class ExtendedStatsBucketAggregation
 		internal ExtendedStatsBucketAggregation() { }
 
 		public ExtendedStatsBucketAggregation(string name, SingleBucketsPath bucketsPath)
-			: base(name, bucketsPath)
-		{ }
+			: base(name, bucketsPath) { }
 
 		public double? Sigma { get; set; }
 
@@ -27,12 +25,10 @@ public ExtendedStatsBucketAggregation(string name, SingleBucketsPath bucketsPath
 
 	public class ExtendedStatsBucketAggregationDescriptor
 		: PipelineAggregationDescriptorBase<ExtendedStatsBucketAggregationDescriptor, IExtendedStatsBucketAggregation, SingleBucketsPath>
-		, IExtendedStatsBucketAggregation
+			, IExtendedStatsBucketAggregation
 	{
-
 		double? IExtendedStatsBucketAggregation.Sigma { get; set; }
 
 		public ExtendedStatsBucketAggregationDescriptor Sigma(double? sigma) => Assign(a => a.Sigma = sigma);
-
 	}
 }
diff --git a/src/Nest/Aggregations/Pipeline/GapPolicy.cs b/src/Nest/Aggregations/Pipeline/GapPolicy.cs
index bd3ba01153a..e2f2c9968b9 100644
--- a/src/Nest/Aggregations/Pipeline/GapPolicy.cs
+++ b/src/Nest/Aggregations/Pipeline/GapPolicy.cs
@@ -9,6 +9,7 @@ public enum GapPolicy
 	{
 		[EnumMember(Value = "skip")]
 		Skip,
+
 		[EnumMember(Value = "insert_zeros")]
 		InsertZeros
 	}
diff --git a/src/Nest/Aggregations/Pipeline/MaxBucket/MaxBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/MaxBucket/MaxBucketAggregation.cs
index 67aba2981d9..94d4ed47a29 100644
--- a/src/Nest/Aggregations/Pipeline/MaxBucket/MaxBucketAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/MaxBucket/MaxBucketAggregation.cs
@@ -9,7 +9,7 @@ public interface IMaxBucketAggregation : IPipelineAggregation { }
 	public class MaxBucketAggregation
 		: PipelineAggregationBase, IMaxBucketAggregation
 	{
-		internal MaxBucketAggregation () { }
+		internal MaxBucketAggregation() { }
 
 		public MaxBucketAggregation(string name, SingleBucketsPath bucketsPath)
 			: base(name, bucketsPath) { }
@@ -19,7 +19,5 @@ public MaxBucketAggregation(string name, SingleBucketsPath bucketsPath)
 
 	public class MaxBucketAggregationDescriptor
 		: PipelineAggregationDescriptorBase<MaxBucketAggregationDescriptor, IMaxBucketAggregation, SingleBucketsPath>
-		, IMaxBucketAggregation
-	{
-	}
+			, IMaxBucketAggregation { }
 }
diff --git a/src/Nest/Aggregations/Pipeline/MinBucket/MinBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/MinBucket/MinBucketAggregation.cs
index 9a27eb026c9..1a7f2983ff8 100644
--- a/src/Nest/Aggregations/Pipeline/MinBucket/MinBucketAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/MinBucket/MinBucketAggregation.cs
@@ -9,7 +9,7 @@ public interface IMinBucketAggregation : IPipelineAggregation { }
 	public class MinBucketAggregation
 		: PipelineAggregationBase, IMinBucketAggregation
 	{
-		internal MinBucketAggregation () { }
+		internal MinBucketAggregation() { }
 
 		public MinBucketAggregation(string name, SingleBucketsPath bucketsPath)
 			: base(name, bucketsPath) { }
@@ -19,7 +19,5 @@ public MinBucketAggregation(string name, SingleBucketsPath bucketsPath)
 
 	public class MinBucketAggregationDescriptor
 		: PipelineAggregationDescriptorBase<MinBucketAggregationDescriptor, IMinBucketAggregation, SingleBucketsPath>
-		, IMinBucketAggregation
-	{
-	}
+			, IMinBucketAggregation { }
 }
diff --git a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/EwmaModel.cs b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/EwmaModel.cs
index 347a8255ab4..c2caa1d3934 100644
--- a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/EwmaModel.cs
+++ b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/EwmaModel.cs
@@ -11,16 +11,15 @@ public interface IEwmaModel : IMovingAverageModel
 
 	public class EwmaModel : IEwmaModel
 	{
-		string IMovingAverageModel.Name { get; } = "ewma";
-
 		public float? Alpha { get; set; }
+		string IMovingAverageModel.Name { get; } = "ewma";
 	}
 
 	public class EwmaModelDescriptor
 		: DescriptorBase<EwmaModelDescriptor, IEwmaModel>, IEwmaModel
 	{
-		string IMovingAverageModel.Name { get; } = "ewma";
 		float? IEwmaModel.Alpha { get; set; }
+		string IMovingAverageModel.Name { get; } = "ewma";
 
 		public EwmaModelDescriptor Alpha(float? alpha) => Assign(a => a.Alpha = alpha);
 	}
diff --git a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/HoltLinearModel.cs b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/HoltLinearModel.cs
index 07a6cf10f2b..a8a60483f0a 100644
--- a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/HoltLinearModel.cs
+++ b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/HoltLinearModel.cs
@@ -14,18 +14,17 @@ public interface IHoltLinearModel : IMovingAverageModel
 
 	public class HoltLinearModel : IHoltLinearModel
 	{
-		string IMovingAverageModel.Name { get; } = "holt";
-
 		public float? Alpha { get; set; }
 		public float? Beta { get; set; }
+		string IMovingAverageModel.Name { get; } = "holt";
 	}
 
 	public class HoltLinearModelDescriptor
 		: DescriptorBase<HoltLinearModelDescriptor, IHoltLinearModel>, IHoltLinearModel
 	{
-		string IMovingAverageModel.Name { get; } = "holt";
 		float? IHoltLinearModel.Alpha { get; set; }
 		float? IHoltLinearModel.Beta { get; set; }
+		string IMovingAverageModel.Name { get; } = "holt";
 
 		public HoltLinearModelDescriptor Alpha(float? alpha) => Assign(a => a.Alpha = alpha);
 
diff --git a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/HoltWintersModel.cs b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/HoltWintersModel.cs
index 2612f187921..6f76304b030 100644
--- a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/HoltWintersModel.cs
+++ b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/HoltWintersModel.cs
@@ -9,6 +9,7 @@ public enum HoltWintersType
 	{
 		[EnumMember(Value = "add")]
 		Additive,
+
 		[EnumMember(Value = "mult")]
 		Multiplicative
 	}
@@ -25,35 +26,34 @@ public interface IHoltWintersModel : IMovingAverageModel
 		[JsonProperty("gamma")]
 		float? Gamma { get; set; }
 
+		[JsonProperty("pad")]
+		bool? Pad { get; set; }
+
 		[JsonProperty("period")]
 		int? Period { get; set; }
 
 		[JsonProperty("type")]
 		HoltWintersType? Type { get; set; }
-
-		[JsonProperty("pad")]
-		bool? Pad { get; set; }
 	}
 
 	public class HoltWintersModel : IHoltWintersModel
 	{
-		string IMovingAverageModel.Name { get; } = "holt_winters";
-
 		public float? Alpha { get; set; }
 		public float? Beta { get; set; }
 		public float? Gamma { get; set; }
+		public bool? Pad { get; set; }
 		public int? Period { get; set; }
 		public HoltWintersType? Type { get; set; }
-		public bool? Pad { get; set; }
+		string IMovingAverageModel.Name { get; } = "holt_winters";
 	}
 
 	public class HoltWintersModelDescriptor
 		: DescriptorBase<HoltWintersModelDescriptor, IHoltWintersModel>, IHoltWintersModel
 	{
-		string IMovingAverageModel.Name { get; } = "holt_winters";
 		float? IHoltWintersModel.Alpha { get; set; }
 		float? IHoltWintersModel.Beta { get; set; }
 		float? IHoltWintersModel.Gamma { get; set; }
+		string IMovingAverageModel.Name { get; } = "holt_winters";
 		bool? IHoltWintersModel.Pad { get; set; }
 		int? IHoltWintersModel.Period { get; set; }
 		HoltWintersType? IHoltWintersModel.Type { get; set; }
diff --git a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/IMovingAverageModel.cs b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/IMovingAverageModel.cs
index f3865903312..6e6c5b6f8fa 100644
--- a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/IMovingAverageModel.cs
+++ b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/IMovingAverageModel.cs
@@ -2,26 +2,26 @@
 
 namespace Nest
 {
-	public interface IMovingAverageModel 
+	public interface IMovingAverageModel
 	{
 		string Name { get; }
 	}
 
 	public class MovingAverageModelDescriptor : DescriptorBase<MovingAverageModelDescriptor, IDescriptor>
 	{
-		public IEwmaModel Ewma(Func<EwmaModelDescriptor, IEwmaModel> ewmaSelector = null) => 
+		public IEwmaModel Ewma(Func<EwmaModelDescriptor, IEwmaModel> ewmaSelector = null) =>
 			ewmaSelector.InvokeOrDefault(new EwmaModelDescriptor());
 
-		public IHoltLinearModel HoltLinear(Func<HoltLinearModelDescriptor, IHoltLinearModel> holtSelector = null) => 
+		public IHoltLinearModel HoltLinear(Func<HoltLinearModelDescriptor, IHoltLinearModel> holtSelector = null) =>
 			holtSelector.InvokeOrDefault(new HoltLinearModelDescriptor());
 
-		public IHoltWintersModel HoltWinters(Func<HoltWintersModelDescriptor, IHoltWintersModel> holtWintersSelector) => 
+		public IHoltWintersModel HoltWinters(Func<HoltWintersModelDescriptor, IHoltWintersModel> holtWintersSelector) =>
 			holtWintersSelector?.Invoke(new HoltWintersModelDescriptor());
 
-		public ILinearModel Linear(Func<LinearModelDescriptor, ILinearModel> linearSelector = null) => 
+		public ILinearModel Linear(Func<LinearModelDescriptor, ILinearModel> linearSelector = null) =>
 			linearSelector.InvokeOrDefault(new LinearModelDescriptor());
 
-		public ISimpleModel Simple(Func<SimpleModelDescriptor, ISimpleModel> simpleSelector = null) => 
+		public ISimpleModel Simple(Func<SimpleModelDescriptor, ISimpleModel> simpleSelector = null) =>
 			simpleSelector.InvokeOrDefault(new SimpleModelDescriptor());
 	}
 }
diff --git a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/LinearModel.cs b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/LinearModel.cs
index d83f5ceb634..e58009d9d63 100644
--- a/src/Nest/Aggregations/Pipeline/MovingAverage/Models/LinearModel.cs
+++ b/src/Nest/Aggregations/Pipeline/MovingAverage/Models/LinearModel.cs
@@ -4,10 +4,10 @@ namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface ILinearModel : IMovingAverageModel { }
-	
+
 	public class LinearModel : ILinearModel
 	{
-		string IMovingAverageModel.Name  { get; } = "linear";
+		string IMovingAverageModel.Name { get; } = "linear";
 	}
 
 	public class LinearModelDescriptor
diff --git a/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregation.cs b/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregation.cs
index d3dcaebfd23..2ea83bf3b13 100644
--- a/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregation.cs
@@ -7,42 +7,41 @@ namespace Nest
 	[ContractJsonConverter(typeof(MovingAverageAggregationJsonConverter))]
 	public interface IMovingAverageAggregation : IPipelineAggregation
 	{
-		IMovingAverageModel Model { get; set; }
-
-		[JsonProperty("window")]
-		int? Window { get; set; }
-
 		[JsonProperty("minimize")]
 		bool? Minimize { get; set; }
 
+		IMovingAverageModel Model { get; set; }
+
 		[JsonProperty("predict")]
 		int? Predict { get; set; }
+
+		[JsonProperty("window")]
+		int? Window { get; set; }
 	}
 
 	public class MovingAverageAggregation : PipelineAggregationBase, IMovingAverageAggregation
 	{
-		public bool? Minimize { get; set; }
-		public IMovingAverageModel Model { get; set; }
-		public int? Window { get; set; }
-		public int? Predict { get; set; }
-
 		internal MovingAverageAggregation() { }
 
 		public MovingAverageAggregation(string name, SingleBucketsPath bucketsPath)
-			: base(name, bucketsPath)
-		{ }
+			: base(name, bucketsPath) { }
+
+		public bool? Minimize { get; set; }
+		public IMovingAverageModel Model { get; set; }
+		public int? Predict { get; set; }
+		public int? Window { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.MovingAverage = this;
 	}
 
 	public class MovingAverageAggregationDescriptor
 		: PipelineAggregationDescriptorBase<MovingAverageAggregationDescriptor, IMovingAverageAggregation, SingleBucketsPath>
-		, IMovingAverageAggregation
+			, IMovingAverageAggregation
 	{
 		bool? IMovingAverageAggregation.Minimize { get; set; }
 		IMovingAverageModel IMovingAverageAggregation.Model { get; set; }
-		int? IMovingAverageAggregation.Window { get; set; }
 		int? IMovingAverageAggregation.Predict { get; set; }
+		int? IMovingAverageAggregation.Window { get; set; }
 
 		public MovingAverageAggregationDescriptor Minimize(bool? minimize = true) => Assign(a => a.Minimize = minimize);
 
@@ -52,6 +51,5 @@ public class MovingAverageAggregationDescriptor
 
 		public MovingAverageAggregationDescriptor Model(Func<MovingAverageModelDescriptor, IMovingAverageModel> modelSelector) =>
 			Assign(a => a.Model = modelSelector?.Invoke(new MovingAverageModelDescriptor()));
-
 	}
 }
diff --git a/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregationJsonConverter.cs b/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregationJsonConverter.cs
index a588b1f0737..7d6770a4e02 100644
--- a/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregationJsonConverter.cs
+++ b/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregationJsonConverter.cs
@@ -28,13 +28,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 #if DOTNETCORE
 			JToken value;
 			if (ps.TryGetValue("buckets_path", out value) && value != null)
-			{
 				aggregation.BucketsPath = new SingleBucketsPath((string)value);
-			}
 			else
-			{
 				aggregation.BucketsPath = default(SingleBucketsPath);
-			}
 
 #else
 			aggregation.BucketsPath = GetOrDefault<SingleBucketsPath>("buckets_path", ps);
@@ -46,6 +42,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		{
 			var movingAvg = value as IMovingAverageAggregation;
 			if (movingAvg == null) return;
+
 			writer.WriteStartObject();
 			writer.WritePropertyName("buckets_path");
 			serializer.Serialize(writer, movingAvg.BucketsPath);
@@ -100,6 +97,7 @@ private T GetOrDefault<T>(string key, Dictionary<string, JToken> properties)
 			if (value.IsNullOrEmpty()) return null;
 			if (value == "insert_zeros") return GapPolicy.InsertZeros;
 			if (value == "skip") return GapPolicy.Skip;
+
 			return null;
 		}
 
@@ -121,6 +119,7 @@ private IMovingAverageModel GetModel(Dictionary<string, JToken> properties)
 				return settings.ToObject<HoltLinearModel>();
 			else if (name == "holt_winters")
 				return settings.ToObject<HoltWintersModel>();
+
 			return null;
 		}
 	}
diff --git a/src/Nest/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregation.cs b/src/Nest/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregation.cs
index 13153915c42..d5c1a2109db 100644
--- a/src/Nest/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregation.cs
@@ -6,33 +6,34 @@ namespace Nest
 	[ContractJsonConverter(typeof(AggregationJsonConverter<MovingFunctionAggregation>))]
 	public interface IMovingFunctionAggregation : IPipelineAggregation
 	{
-		[JsonProperty("window")]
-		int? Window { get; set; }
-
 		[JsonProperty("script")]
 		string Script { get; set; }
+
+		[JsonProperty("window")]
+		int? Window { get; set; }
 	}
 
 	public class MovingFunctionAggregation
 		: PipelineAggregationBase, IMovingFunctionAggregation
 	{
-		internal MovingFunctionAggregation () { }
+		internal MovingFunctionAggregation() { }
 
 		public MovingFunctionAggregation(string name, SingleBucketsPath bucketsPath)
 			: base(name, bucketsPath) { }
 
-		internal override void WrapInContainer(AggregationContainer c) => c.MovingFunction = this;
+		public string Script { get; set; }
 
 		public int? Window { get; set; }
-		public string Script { get; set; }
+
+		internal override void WrapInContainer(AggregationContainer c) => c.MovingFunction = this;
 	}
 
 	public class MovingFunctionAggregationDescriptor
 		: PipelineAggregationDescriptorBase<MovingFunctionAggregationDescriptor, IMovingFunctionAggregation, SingleBucketsPath>
-		, IMovingFunctionAggregation
+			, IMovingFunctionAggregation
 	{
-		int? IMovingFunctionAggregation.Window { get; set; }
 		string IMovingFunctionAggregation.Script { get; set; }
+		int? IMovingFunctionAggregation.Window { get; set; }
 
 		public MovingFunctionAggregationDescriptor Window(int? windowSize) => Assign(a => a.Window = windowSize);
 
diff --git a/src/Nest/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregation.cs
index 2b1430e40fe..5b0086a5d5a 100644
--- a/src/Nest/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregation.cs
@@ -1,7 +1,6 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -16,20 +15,19 @@ public interface IPercentilesBucketAggregation : IPipelineAggregation
 	public class PercentilesBucketAggregation
 		: PipelineAggregationBase, IPercentilesBucketAggregation
 	{
-		public IEnumerable<double> Percents { get; set; }
-
 		internal PercentilesBucketAggregation() { }
 
 		public PercentilesBucketAggregation(string name, SingleBucketsPath bucketsPath)
-			: base(name, bucketsPath)
-		{ }
+			: base(name, bucketsPath) { }
+
+		public IEnumerable<double> Percents { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.PercentilesBucket = this;
 	}
 
 	public class PercentilesBucketAggregationDescriptor
 		: PipelineAggregationDescriptorBase<PercentilesBucketAggregationDescriptor, IPercentilesBucketAggregation, SingleBucketsPath>
-		, IPercentilesBucketAggregation
+			, IPercentilesBucketAggregation
 	{
 		IEnumerable<double> IPercentilesBucketAggregation.Percents { get; set; }
 
@@ -38,6 +36,5 @@ public PercentilesBucketAggregationDescriptor Percents(IEnumerable<double> perce
 
 		public PercentilesBucketAggregationDescriptor Percents(params double[] percentages) =>
 			Assign(a => a.Percents = percentages?.ToList());
-
 	}
 }
diff --git a/src/Nest/Aggregations/Pipeline/PipelineAggregationBase.cs b/src/Nest/Aggregations/Pipeline/PipelineAggregationBase.cs
index 42e4483e244..3e8ea39c033 100644
--- a/src/Nest/Aggregations/Pipeline/PipelineAggregationBase.cs
+++ b/src/Nest/Aggregations/Pipeline/PipelineAggregationBase.cs
@@ -9,18 +9,18 @@ public interface IPipelineAggregation : IAggregation
 		[JsonProperty("buckets_path")]
 		IBucketsPath BucketsPath { get; set; }
 
-		[JsonProperty("gap_policy")]
-		GapPolicy? GapPolicy { get; set; }
-
 		[JsonProperty("format")]
 		string Format { get; set; }
+
+		[JsonProperty("gap_policy")]
+		GapPolicy? GapPolicy { get; set; }
 	}
 
 	public abstract class PipelineAggregationBase : AggregationBase, IPipelineAggregation
 	{
 		internal PipelineAggregationBase() { }
 
-		public PipelineAggregationBase(string name, IBucketsPath bucketsPath) : base(name) => this.BucketsPath = bucketsPath;
+		public PipelineAggregationBase(string name, IBucketsPath bucketsPath) : base(name) => BucketsPath = bucketsPath;
 
 		public IBucketsPath BucketsPath { get; set; }
 		public string Format { get; set; }
@@ -30,7 +30,7 @@ internal PipelineAggregationBase() { }
 	public abstract class PipelineAggregationDescriptorBase<TPipelineAggregation, TPipelineAggregationInterface, TBucketsPath>
 		: DescriptorBase<TPipelineAggregation, TPipelineAggregationInterface>, IPipelineAggregation
 		where TPipelineAggregation : PipelineAggregationDescriptorBase<TPipelineAggregation, TPipelineAggregationInterface, TBucketsPath>
-			, TPipelineAggregationInterface, IPipelineAggregation
+		, TPipelineAggregationInterface, IPipelineAggregation
 		where TPipelineAggregationInterface : class, IPipelineAggregation
 		where TBucketsPath : IBucketsPath
 	{
@@ -38,10 +38,10 @@ public abstract class PipelineAggregationDescriptorBase<TPipelineAggregation, TP
 		string IPipelineAggregation.Format { get; set; }
 		GapPolicy? IPipelineAggregation.GapPolicy { get; set; }
 
-		string IAggregation.Name { get; set; }
-
 		IDictionary<string, object> IAggregation.Meta { get; set; }
 
+		string IAggregation.Name { get; set; }
+
 		public TPipelineAggregation Format(string format) => Assign(a => a.Format = format);
 
 		public TPipelineAggregation GapPolicy(GapPolicy? gapPolicy) => Assign(a => a.GapPolicy = gapPolicy);
diff --git a/src/Nest/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregation.cs b/src/Nest/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregation.cs
index 9c125616635..bb3b7751173 100644
--- a/src/Nest/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregation.cs
@@ -12,20 +12,19 @@ public interface ISerialDifferencingAggregation : IPipelineAggregation
 
 	public class SerialDifferencingAggregation : PipelineAggregationBase, ISerialDifferencingAggregation
 	{
-		public int? Lag { get; set; }
-
 		internal SerialDifferencingAggregation() { }
 
 		public SerialDifferencingAggregation(string name, SingleBucketsPath bucketsPath)
-			: base(name, bucketsPath)
-		{ }
+			: base(name, bucketsPath) { }
+
+		public int? Lag { get; set; }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.SerialDifferencing = this;
 	}
 
 	public class SerialDifferencingAggregationDescriptor
 		: PipelineAggregationDescriptorBase<SerialDifferencingAggregationDescriptor, ISerialDifferencingAggregation, SingleBucketsPath>
-		, ISerialDifferencingAggregation
+			, ISerialDifferencingAggregation
 	{
 		int? ISerialDifferencingAggregation.Lag { get; set; }
 
diff --git a/src/Nest/Aggregations/Pipeline/StatsBucket/StatsBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/StatsBucket/StatsBucketAggregation.cs
index d937c86d694..68cce925277 100644
--- a/src/Nest/Aggregations/Pipeline/StatsBucket/StatsBucketAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/StatsBucket/StatsBucketAggregation.cs
@@ -12,15 +12,12 @@ public class StatsBucketAggregation
 		internal StatsBucketAggregation() { }
 
 		public StatsBucketAggregation(string name, SingleBucketsPath bucketsPath)
-			: base(name, bucketsPath)
-		{ }
+			: base(name, bucketsPath) { }
 
 		internal override void WrapInContainer(AggregationContainer c) => c.StatsBucket = this;
 	}
 
 	public class StatsBucketAggregationDescriptor
 		: PipelineAggregationDescriptorBase<StatsBucketAggregationDescriptor, IStatsBucketAggregation, SingleBucketsPath>
-		, IStatsBucketAggregation
-	{
-	}
+			, IStatsBucketAggregation { }
 }
diff --git a/src/Nest/Aggregations/Pipeline/SumBucket/SumBucketAggregation.cs b/src/Nest/Aggregations/Pipeline/SumBucket/SumBucketAggregation.cs
index 657701003ee..1c780b52abf 100644
--- a/src/Nest/Aggregations/Pipeline/SumBucket/SumBucketAggregation.cs
+++ b/src/Nest/Aggregations/Pipeline/SumBucket/SumBucketAggregation.cs
@@ -9,7 +9,7 @@ public interface ISumBucketAggregation : IPipelineAggregation { }
 	public class SumBucketAggregation
 		: PipelineAggregationBase, ISumBucketAggregation
 	{
-		internal SumBucketAggregation () { }
+		internal SumBucketAggregation() { }
 
 		public SumBucketAggregation(string name, SingleBucketsPath bucketsPath)
 			: base(name, bucketsPath) { }
@@ -19,7 +19,5 @@ public SumBucketAggregation(string name, SingleBucketsPath bucketsPath)
 
 	public class SumBucketAggregationDescriptor
 		: PipelineAggregationDescriptorBase<SumBucketAggregationDescriptor, ISumBucketAggregation, SingleBucketsPath>
-		, ISumBucketAggregation
-	{
-	}
+			, ISumBucketAggregation { }
 }
diff --git a/src/Nest/Aggregations/Visitor/AggregationVisitor.cs b/src/Nest/Aggregations/Visitor/AggregationVisitor.cs
index 8ade3c0fb6b..ac046d2c1e0 100644
--- a/src/Nest/Aggregations/Visitor/AggregationVisitor.cs
+++ b/src/Nest/Aggregations/Visitor/AggregationVisitor.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IAggregationVisitor
 	{
@@ -29,52 +23,99 @@ public interface IAggregationVisitor
 		/// </summary>
 		/// <param name="aggregation">The IAggregation object that will be visited</param>
 		void Visit(IAggregation aggregation);
+
 		void Visit(IAverageAggregation aggregation);
+
 		void Visit(IValueCountAggregation aggregation);
+
 		void Visit(IMaxAggregation aggregation);
+
 		void Visit(IMinAggregation aggregation);
+
 		void Visit(IStatsAggregation aggregation);
+
 		void Visit(ISumAggregation aggregation);
+
 		void Visit(IExtendedStatsAggregation aggregation);
+
 		void Visit(IDateHistogramAggregation aggregation);
+
 		void Visit(IPercentilesAggregation aggregation);
+
 		void Visit(IDateRangeAggregation aggregation);
+
 		void Visit(IFilterAggregation aggregation);
+
 		void Visit(IFiltersAggregation aggregation);
+
 		void Visit(IGeoDistanceAggregation aggregation);
+
 		void Visit(IGeoHashGridAggregation aggregation);
+
 		void Visit(IGeoBoundsAggregation aggregation);
+
 		void Visit(IHistogramAggregation aggregation);
+
 		void Visit(IGlobalAggregation aggregation);
+
 		void Visit(IIpRangeAggregation aggregation);
+
 		void Visit(ICardinalityAggregation aggregation);
+
 		void Visit(IMissingAggregation aggregation);
+
 		void Visit(INestedAggregation aggregation);
+
 		void Visit(IReverseNestedAggregation aggregation);
+
 		void Visit(IRangeAggregation aggregation);
+
 		void Visit(ITermsAggregation aggregation);
+
 		void Visit(ISignificantTermsAggregation aggregation);
+
 		void Visit(ISignificantTextAggregation aggregation);
+
 		void Visit(IPercentileRanksAggregation aggregation);
+
 		void Visit(ITopHitsAggregation aggregation);
+
 		void Visit(IChildrenAggregation aggregation);
+
 		void Visit(IScriptedMetricAggregation aggregation);
+
 		void Visit(IAverageBucketAggregation aggregation);
+
 		void Visit(IDerivativeAggregation aggregation);
+
 		void Visit(IMaxBucketAggregation aggregation);
+
 		void Visit(IMinBucketAggregation aggregation);
+
 		void Visit(ISumBucketAggregation aggregation);
+
 		void Visit(IStatsBucketAggregation aggregation);
+
 		void Visit(IExtendedStatsBucketAggregation aggregation);
+
 		void Visit(IPercentilesBucketAggregation aggregation);
+
 		void Visit(IMovingAverageAggregation aggregation);
+
 		void Visit(ICumulativeSumAggregation aggregation);
+
 		void Visit(ISerialDifferencingAggregation aggregation);
+
 		void Visit(IBucketScriptAggregation aggregation);
+
 		void Visit(IBucketSelectorAggregation aggregation);
+
 		void Visit(IBucketSortAggregation aggregation);
+
 		void Visit(ISamplerAggregation aggregation);
+
 		void Visit(IGeoCentroidAggregation aggregation);
+
 		void Visit(ICompositeAggregation aggregation);
 	}
 
@@ -84,200 +125,102 @@ public class AggregationVisitor : IAggregationVisitor
 
 		public AggregationVisitorScope Scope { get; set; }
 
-		public virtual void Visit(IValueCountAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IValueCountAggregation aggregation) { }
 
-		public virtual void Visit(IMinAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IMinAggregation aggregation) { }
 
-		public virtual void Visit(ISumAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ISumAggregation aggregation) { }
 
-		public virtual void Visit(IDateHistogramAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IDateHistogramAggregation aggregation) { }
 
-		public virtual void Visit(IDateRangeAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IDateRangeAggregation aggregation) { }
 
-		public virtual void Visit(IFiltersAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IFiltersAggregation aggregation) { }
 
-		public virtual void Visit(IGeoHashGridAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IGeoHashGridAggregation aggregation) { }
 
-		public virtual void Visit(IHistogramAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IHistogramAggregation aggregation) { }
 
-		public virtual void Visit(IIpRangeAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IIpRangeAggregation aggregation) { }
 
-		public virtual void Visit(IMissingAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IMissingAggregation aggregation) { }
 
-		public virtual void Visit(IReverseNestedAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IReverseNestedAggregation aggregation) { }
 
-		public virtual void Visit(ITermsAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ITermsAggregation aggregation) { }
 
-		public void Visit(ISignificantTextAggregation aggregation)
-		{
-		}
+		public void Visit(ISignificantTextAggregation aggregation) { }
 
-		public virtual void Visit(IPercentileRanksAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IPercentileRanksAggregation aggregation) { }
 
-		public virtual void Visit(IChildrenAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IChildrenAggregation aggregation) { }
 
-		public virtual void Visit(IAverageBucketAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IAverageBucketAggregation aggregation) { }
 
-		public virtual void Visit(IMaxBucketAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IMaxBucketAggregation aggregation) { }
 
-		public virtual void Visit(ISumBucketAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ISumBucketAggregation aggregation) { }
 
-		public virtual void Visit(IStatsBucketAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IStatsBucketAggregation aggregation) { }
 
-		public virtual void Visit(IExtendedStatsBucketAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IExtendedStatsBucketAggregation aggregation) { }
 
-		public virtual void Visit(IPercentilesBucketAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IPercentilesBucketAggregation aggregation) { }
 
-		public virtual void Visit(ICumulativeSumAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ICumulativeSumAggregation aggregation) { }
 
-		public virtual void Visit(IBucketScriptAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IBucketScriptAggregation aggregation) { }
 
-		public virtual void Visit(ISamplerAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ISamplerAggregation aggregation) { }
 
-		public virtual void Visit(IBucketSelectorAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IBucketSelectorAggregation aggregation) { }
 
-		public virtual void Visit(IBucketSortAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IBucketSortAggregation aggregation) { }
 
-		public virtual void Visit(ISerialDifferencingAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ISerialDifferencingAggregation aggregation) { }
 
-		public virtual void Visit(IMovingAverageAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IMovingAverageAggregation aggregation) { }
 
-		public virtual void Visit(IMinBucketAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IMinBucketAggregation aggregation) { }
 
-		public virtual void Visit(IDerivativeAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IDerivativeAggregation aggregation) { }
 
-		public virtual void Visit(IScriptedMetricAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IScriptedMetricAggregation aggregation) { }
 
-		public virtual void Visit(ITopHitsAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ITopHitsAggregation aggregation) { }
 
-		public virtual void Visit(ISignificantTermsAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ISignificantTermsAggregation aggregation) { }
 
-		public virtual void Visit(IRangeAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IRangeAggregation aggregation) { }
 
-		public virtual void Visit(INestedAggregation aggregation)
-		{
-		}
+		public virtual void Visit(INestedAggregation aggregation) { }
 
-		public virtual void Visit(ICardinalityAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ICardinalityAggregation aggregation) { }
 
-		public virtual void Visit(IGlobalAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IGlobalAggregation aggregation) { }
 
-		public virtual void Visit(IGeoBoundsAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IGeoBoundsAggregation aggregation) { }
 
-		public virtual void Visit(IGeoDistanceAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IGeoDistanceAggregation aggregation) { }
 
-		public virtual void Visit(IFilterAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IFilterAggregation aggregation) { }
 
-		public virtual void Visit(IPercentilesAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IPercentilesAggregation aggregation) { }
 
-		public virtual void Visit(IExtendedStatsAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IExtendedStatsAggregation aggregation) { }
 
-		public virtual void Visit(IStatsAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IStatsAggregation aggregation) { }
 
-		public virtual void Visit(IMaxAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IMaxAggregation aggregation) { }
 
-		public virtual void Visit(IAverageAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IAverageAggregation aggregation) { }
 
-		public virtual void Visit(IGeoCentroidAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IGeoCentroidAggregation aggregation) { }
 
-		public virtual void Visit(ICompositeAggregation aggregation)
-		{
-		}
+		public virtual void Visit(ICompositeAggregation aggregation) { }
 
-		public virtual void Visit(IAggregation aggregation)
-		{
-		}
+		public virtual void Visit(IAggregation aggregation) { }
 
-		public virtual void Visit(IAggregationContainer aggregationContainer)
-		{
-		}
+		public virtual void Visit(IAggregationContainer aggregationContainer) { }
 	}
 }
diff --git a/src/Nest/Aggregations/Visitor/AggregationVisitorScope.cs b/src/Nest/Aggregations/Visitor/AggregationVisitorScope.cs
index c8d09f35df1..83374192bcd 100644
--- a/src/Nest/Aggregations/Visitor/AggregationVisitorScope.cs
+++ b/src/Nest/Aggregations/Visitor/AggregationVisitorScope.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public enum AggregationVisitorScope
 	{
diff --git a/src/Nest/Aggregations/Visitor/AggregationWalker.cs b/src/Nest/Aggregations/Visitor/AggregationWalker.cs
index 2ea41941bd0..ee506161b34 100644
--- a/src/Nest/Aggregations/Visitor/AggregationWalker.cs
+++ b/src/Nest/Aggregations/Visitor/AggregationWalker.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -11,13 +7,17 @@ public class AggregationWalker
 		private void Accept(IAggregationVisitor visitor, AggregationDictionary aggregations)
 		{
 			if (!aggregations.HasAny()) return;
+
 			foreach (var f in aggregations)
-				this.Accept(visitor, f.Value, AggregationVisitorScope.Bucket);
+				Accept(visitor, f.Value, AggregationVisitorScope.Bucket);
 		}
 
-		private void Accept(IAggregationVisitor visitor, IAggregationContainer aggregation, AggregationVisitorScope scope = AggregationVisitorScope.Aggregation)
+		private void Accept(IAggregationVisitor visitor, IAggregationContainer aggregation,
+			AggregationVisitorScope scope = AggregationVisitorScope.Aggregation
+		)
 		{
 			if (aggregation == null) return;
+
 			visitor.Scope = scope;
 			aggregation.Accept(visitor);
 		}
@@ -42,43 +42,115 @@ public void Walk(IAggregationContainer aggregation, IAggregationVisitor visitor)
 			AcceptAggregation(aggregation.BucketSort, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.BucketSelector, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.Cardinality, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.Children, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.Children, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.CumulativeSum, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.DateHistogram, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.DateRange, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.DateHistogram, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.DateRange, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.Derivative, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.ExtendedStats, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.Filter, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.Filters, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.Filter, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.Filters, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.GeoBounds, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.GeoDistance, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.GeoHash, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.Global, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.Histogram, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.IpRange, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.GeoDistance, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.GeoHash, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.Global, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.Histogram, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.IpRange, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.Max, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.MaxBucket, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.Min, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.MinBucket, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.Missing, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.Missing, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.MovingAverage, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.Nested, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.Nested, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.PercentileRanks, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.Percentiles, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.Range, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.ReverseNested, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.Sampler, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.Range, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.ReverseNested, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.Sampler, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.ScriptedMetric, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.SerialDifferencing, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.SignificantTerms, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
-			AcceptAggregation(aggregation.SignificantText, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.SignificantTerms, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
+			AcceptAggregation(aggregation.SignificantText, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.Stats, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.Sum, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.SumBucket, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.StatsBucket, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.ExtendedStatsBucket, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.PercentilesBucket, visitor, (v, d) => v.Visit(d));
-			AcceptAggregation(aggregation.Terms, visitor, (v, d) => { v.Visit(d); this.Accept(v, d.Aggregations); });
+			AcceptAggregation(aggregation.Terms, visitor, (v, d) =>
+			{
+				v.Visit(d);
+				Accept(v, d.Aggregations);
+			});
 			AcceptAggregation(aggregation.TopHits, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.ValueCount, visitor, (v, d) => v.Visit(d));
 			AcceptAggregation(aggregation.GeoCentroid, visitor, (v, d) => v.Visit(d));
diff --git a/src/Nest/Analysis/Analysis.cs b/src/Nest/Analysis/Analysis.cs
index 2f3702f02a6..1ff0dc1b4ef 100644
--- a/src/Nest/Analysis/Analysis.cs
+++ b/src/Nest/Analysis/Analysis.cs
@@ -7,33 +7,37 @@ public interface IAnalysis
 	{
 		[JsonProperty("analyzer")]
 		IAnalyzers Analyzers { get; set; }
+
 		[JsonProperty("char_filter")]
 		ICharFilters CharFilters { get; set; }
+
+		[JsonProperty("normalizer")]
+		INormalizers Normalizers { get; set; }
+
 		[JsonProperty("filter")]
 		ITokenFilters TokenFilters { get; set; }
+
 		[JsonProperty("tokenizer")]
 		ITokenizers Tokenizers { get; set; }
-		[JsonProperty("normalizer")]
-		INormalizers Normalizers { get; set; }
 	}
 
 	public class Analysis : IAnalysis
 	{
 		public IAnalyzers Analyzers { get; set; }
 		public ICharFilters CharFilters { get; set; }
-		public ITokenFilters TokenFilters { get; set; }
-		public ITokenizers Tokenizers { get; set; }
 
 		public INormalizers Normalizers { get; set; }
+		public ITokenFilters TokenFilters { get; set; }
+		public ITokenizers Tokenizers { get; set; }
 	}
 
 	public class AnalysisDescriptor : DescriptorBase<AnalysisDescriptor, IAnalysis>, IAnalysis
 	{
 		IAnalyzers IAnalysis.Analyzers { get; set; }
 		ICharFilters IAnalysis.CharFilters { get; set; }
+		INormalizers IAnalysis.Normalizers { get; set; }
 		ITokenFilters IAnalysis.TokenFilters { get; set; }
 		ITokenizers IAnalysis.Tokenizers { get; set; }
-		INormalizers IAnalysis.Normalizers { get; set; }
 
 		public AnalysisDescriptor Analyzers(Func<AnalyzersDescriptor, IPromise<IAnalyzers>> selector) =>
 			Assign(a => a.Analyzers = selector?.Invoke(new AnalyzersDescriptor())?.Value);
diff --git a/src/Nest/Analysis/Analyzers/AnalyzerBase.cs b/src/Nest/Analysis/Analyzers/AnalyzerBase.cs
index 503c0324dd9..321f91597bc 100644
--- a/src/Nest/Analysis/Analyzers/AnalyzerBase.cs
+++ b/src/Nest/Analysis/Analyzers/AnalyzerBase.cs
@@ -5,11 +5,11 @@ namespace Nest
 	[ContractJsonConverter(typeof(AnalyzerJsonConverter))]
 	public interface IAnalyzer
 	{
-		[JsonProperty("version")]
-		string Version { get; set; }
-
 		[JsonProperty("type")]
 		string Type { get; }
+
+		[JsonProperty("version")]
+		string Version { get; set; }
 	}
 
 	public abstract class AnalyzerBase : IAnalyzer
@@ -18,9 +18,9 @@ internal AnalyzerBase() { }
 
 		protected AnalyzerBase(string type) => Type = type;
 
-		public string Version { get; set; }
-
 		public virtual string Type { get; protected set; }
+
+		public string Version { get; set; }
 	}
 
 	public abstract class AnalyzerDescriptorBase<TAnalyzer, TAnalyzerInterface>
@@ -28,11 +28,10 @@ public abstract class AnalyzerDescriptorBase<TAnalyzer, TAnalyzerInterface>
 		where TAnalyzer : AnalyzerDescriptorBase<TAnalyzer, TAnalyzerInterface>, TAnalyzerInterface
 		where TAnalyzerInterface : class, IAnalyzer
 	{
-		string IAnalyzer.Version { get; set; }
-		string IAnalyzer.Type => this.Type;
 		protected abstract string Type { get; }
+		string IAnalyzer.Type => Type;
+		string IAnalyzer.Version { get; set; }
 
 		public TAnalyzer Version(string version) => Assign(a => a.Version = version);
 	}
-
 }
diff --git a/src/Nest/Analysis/Analyzers/AnalyzerJsonConverter.cs b/src/Nest/Analysis/Analyzers/AnalyzerJsonConverter.cs
index d47253dfda4..285f019eba3 100644
--- a/src/Nest/Analysis/Analyzers/AnalyzerJsonConverter.cs
+++ b/src/Nest/Analysis/Analyzers/AnalyzerJsonConverter.cs
@@ -6,9 +6,10 @@ namespace Nest
 {
 	internal class AnalyzerJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-		public override bool CanWrite => false;
 		public override bool CanRead => true;
+		public override bool CanWrite => false;
+
+		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
@@ -18,7 +19,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			if (typeProperty == null) return null;
 
 			var typePropertyValue = typeProperty.Value.ToString();
-			switch(typePropertyValue)
+			switch (typePropertyValue)
 			{
 				case "stop": return o.ToObject<StopAnalyzer>(ElasticContractResolver.Empty);
 				case "standard": return o.ToObject<StandardAnalyzer>(ElasticContractResolver.Empty);
@@ -33,13 +34,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				default:
 					if (o.Property("tokenizer") != null)
 						return o.ToObject<CustomAnalyzer>(ElasticContractResolver.Empty);
+
 					return o.ToObject<LanguageAnalyzer>(ElasticContractResolver.Empty);
 			}
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 	}
 }
diff --git a/src/Nest/Analysis/Analyzers/Analyzers.cs b/src/Nest/Analysis/Analyzers/Analyzers.cs
index 4f78b5e4741..da4987729c4 100644
--- a/src/Nest/Analysis/Analyzers/Analyzers.cs
+++ b/src/Nest/Analysis/Analyzers/Analyzers.cs
@@ -10,11 +10,12 @@ public interface IAnalyzers : IIsADictionary<string, IAnalyzer> { }
 
 	public class Analyzers : IsADictionaryBase<string, IAnalyzer>, IAnalyzers
 	{
-		public Analyzers() {}
+		public Analyzers() { }
+
 		public Analyzers(IDictionary<string, IAnalyzer> container) : base(container) { }
+
 		public Analyzers(Dictionary<string, IAnalyzer> container)
-			: base(container.ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+			: base(container.ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		public void Add(string name, IAnalyzer analyzer) => BackingDictionary.Add(name, analyzer);
 	}
@@ -28,8 +29,10 @@ public AnalyzersDescriptor() : base(new Analyzers()) { }
 		/// <summary>
 		/// An analyzer of type custom that allows to combine a Tokenizer with zero or more Token Filters,
 		/// and zero or more Char Filters.
-		/// <para>The custom analyzer accepts a logical/registered name of the tokenizer to use, and a list of
-		/// logical/registered names of token filters.</para>
+		/// <para>
+		/// The custom analyzer accepts a logical/registered name of the tokenizer to use, and a list of
+		/// logical/registered names of token filters.
+		/// </para>
 		/// </summary>
 		public AnalyzersDescriptor Custom(string name, Func<CustomAnalyzerDescriptor, ICustomAnalyzer> selector) =>
 			Assign(name, selector?.Invoke(new CustomAnalyzerDescriptor()));
@@ -61,13 +64,17 @@ public AnalyzersDescriptor Simple(string name, Func<SimpleAnalyzerDescriptor, IS
 
 		/// <summary>
 		/// An analyzer of type snowball that uses the standard tokenizer, with standard filter, lowercase filter, stop filter, and snowball filter.
-		/// <para> The Snowball Analyzer is a stemming analyzer from Lucene that is originally based on the snowball project from snowball.tartarus.org.</para>
+		/// <para>
+		/// The Snowball Analyzer is a stemming analyzer from Lucene that is originally based on the snowball project from
+		/// snowball.tartarus.org.
+		/// </para>
 		/// </summary>
 		public AnalyzersDescriptor Snowball(string name, Func<SnowballAnalyzerDescriptor, ISnowballAnalyzer> selector) =>
 			Assign(name, selector?.Invoke(new SnowballAnalyzerDescriptor()));
 
 		/// <summary>
-		/// An analyzer of type standard that is built of using Standard Tokenizer, with Standard Token Filter, Lower Case Token Filter, and Stop Token Filter.
+		/// An analyzer of type standard that is built of using Standard Tokenizer, with Standard Token Filter, Lower Case Token Filter, and Stop Token
+		/// Filter.
 		/// </summary>
 		public AnalyzersDescriptor Standard(string name, Func<StandardAnalyzerDescriptor, IStandardAnalyzer> selector) =>
 			Assign(name, selector?.Invoke(new StandardAnalyzerDescriptor()));
@@ -98,7 +105,7 @@ public AnalyzersDescriptor Fingerprint(string name, Func<FingerprintAnalyzerDesc
 		public AnalyzersDescriptor Kuromoji(string name, Func<KuromojiAnalyzerDescriptor, IKuromojiAnalyzer> selector = null) =>
 			Assign(name, selector.InvokeOrDefault(new KuromojiAnalyzerDescriptor()));
 
-		/// <inheritdoc cref="INoriAnalyzer"/>
+		/// <inheritdoc cref="INoriAnalyzer" />
 		public AnalyzersDescriptor Nori(string name, Func<NoriAnalyzerDescriptor, INoriAnalyzer> selector) =>
 			Assign(name, selector?.Invoke(new NoriAnalyzerDescriptor()));
 	}
diff --git a/src/Nest/Analysis/Analyzers/CustomAnalyzer.cs b/src/Nest/Analysis/Analyzers/CustomAnalyzer.cs
index 15b9bb8e860..f87312643a8 100644
--- a/src/Nest/Analysis/Analyzers/CustomAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/CustomAnalyzer.cs
@@ -6,8 +6,10 @@ namespace Nest
 	/// <summary>
 	/// An analyzer of type custom that allows to combine a Tokenizer with zero or more Token Filters,
 	/// and zero or more Char Filters.
-	/// <para>The custom analyzer accepts a logical/registered name of the tokenizer to use, and a list of
-	/// logical/registered names of token filters.</para>
+	/// <para>
+	/// The custom analyzer accepts a logical/registered name of the tokenizer to use, and a list of
+	/// logical/registered names of token filters.
+	/// </para>
 	/// </summary>
 	public interface ICustomAnalyzer : IAnalyzer
 	{
@@ -25,35 +27,35 @@ public interface ICustomAnalyzer : IAnalyzer
 		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<string>))]
 		IEnumerable<string> Filter { get; set; }
 
-		/// <summary>
-		/// An optional list of logical / registered name of char filters.
-		/// </summary>
-		[JsonProperty("tokenizer")]
-		string Tokenizer { get; set; }
-
 		/// <summary>
 		/// An optional number of positions to increment between each field value of a
 		/// field using this analyzer.
 		/// </summary>
 		[JsonProperty("position_offset_gap")]
 		int? PositionOffsetGap { get; set; }
+
+		/// <summary>
+		/// An optional list of logical / registered name of char filters.
+		/// </summary>
+		[JsonProperty("tokenizer")]
+		string Tokenizer { get; set; }
 	}
 
 	public class CustomAnalyzer : AnalyzerBase, ICustomAnalyzer
 	{
-		public CustomAnalyzer() : base("custom") {}
+		public CustomAnalyzer() : base("custom") { }
 
-		/// <inheritdoc/>
-		public string Tokenizer { get; set; }
+		/// <inheritdoc />
+		public IEnumerable<string> CharFilter { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> Filter { get; set; }
 
-		/// <inheritdoc/>
-		public IEnumerable<string> CharFilter { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? PositionOffsetGap { get; set; }
+
+		/// <inheritdoc />
+		public string Tokenizer { get; set; }
 	}
 
 	public class CustomAnalyzerDescriptor
@@ -63,25 +65,25 @@ public class CustomAnalyzerDescriptor
 
 		IEnumerable<string> ICustomAnalyzer.CharFilter { get; set; }
 		IEnumerable<string> ICustomAnalyzer.Filter { get; set; }
-		string ICustomAnalyzer.Tokenizer { get; set; }
 		int? ICustomAnalyzer.PositionOffsetGap { get; set; }
+		string ICustomAnalyzer.Tokenizer { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomAnalyzerDescriptor Filters(params string[] filters) => Assign(a => a.Filter = filters);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomAnalyzerDescriptor Filters(IEnumerable<string> filters) => Assign(a => a.Filter = filters);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomAnalyzerDescriptor CharFilters(params string[] charFilters) => Assign(a => a.CharFilter = charFilters);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomAnalyzerDescriptor CharFilters(IEnumerable<string> charFilters) => Assign(a => a.CharFilter = charFilters);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomAnalyzerDescriptor Tokenizer(string tokenizer) => Assign(a => a.Tokenizer = tokenizer);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomAnalyzerDescriptor PositionOffsetGap(int? positionOffsetGap) =>
 			Assign(a => a.PositionOffsetGap = positionOffsetGap);
 	}
diff --git a/src/Nest/Analysis/Analyzers/FingerprintAnalyzer.cs b/src/Nest/Analysis/Analyzers/FingerprintAnalyzer.cs
index 54aafa207bf..1cd281be5e2 100644
--- a/src/Nest/Analysis/Analyzers/FingerprintAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/FingerprintAnalyzer.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -13,12 +9,6 @@ namespace Nest
 	/// </summary>
 	public interface IFingerprintAnalyzer : IAnalyzer
 	{
-		/// <summary>
-		/// The character that separates the tokens after concatenation. Defaults to a space.
-		/// </summary>
-		[JsonProperty("separator")]
-		string Separator { get; set; }
-
 		/// <summary>
 		/// The maximum token size to emit. Defaults to 255.
 		/// </summary>
@@ -32,6 +22,12 @@ public interface IFingerprintAnalyzer : IAnalyzer
 		[JsonProperty("preserve_original")]
 		bool? PreserveOriginal { get; set; }
 
+		/// <summary>
+		/// The character that separates the tokens after concatenation. Defaults to a space.
+		/// </summary>
+		[JsonProperty("separator")]
+		string Separator { get; set; }
+
 		/// <summary>
 		/// A list of stop words to use. Defaults to an empty list
 		/// </summary>
@@ -43,7 +39,7 @@ public interface IFingerprintAnalyzer : IAnalyzer
 		/// A path(either relative to config location, or absolute) to a stopwords
 		/// file configuration.Each stop word should be in its own "line"
 		/// (separated by a line break). The file must be UTF-8 encoded.
-	    /// </summary>
+		/// </summary>
 		[JsonProperty("stopwords_path")]
 		string StopWordsPath { get; set; }
 	}
@@ -51,28 +47,27 @@ public interface IFingerprintAnalyzer : IAnalyzer
 	/// <inheritdoc />
 	public class FingerprintAnalyzer : AnalyzerBase, IFingerprintAnalyzer
 	{
-		public FingerprintAnalyzer() : base("fingerprint") {}
-
-		public string Separator { get; set; }
+		public FingerprintAnalyzer() : base("fingerprint") { }
 
 		public int? MaxOutputSize { get; set; }
 
 		public bool? PreserveOriginal { get; set; }
 
+		public string Separator { get; set; }
+
 		public StopWords StopWords { get; set; }
 
 		public string StopWordsPath { get; set; }
 	}
 
-	/// <inheritdoc/>
-	public class FingerprintAnalyzerDescriptor :
-		AnalyzerDescriptorBase<FingerprintAnalyzerDescriptor, IFingerprintAnalyzer>, IFingerprintAnalyzer
+	/// <inheritdoc />
+	public class FingerprintAnalyzerDescriptor : AnalyzerDescriptorBase<FingerprintAnalyzerDescriptor, IFingerprintAnalyzer>, IFingerprintAnalyzer
 	{
 		protected override string Type => "fingerprint";
-
-		string IFingerprintAnalyzer.Separator { get; set; }
 		int? IFingerprintAnalyzer.MaxOutputSize { get; set; }
 		bool? IFingerprintAnalyzer.PreserveOriginal { get; set; }
+
+		string IFingerprintAnalyzer.Separator { get; set; }
 		StopWords IFingerprintAnalyzer.StopWords { get; set; }
 		string IFingerprintAnalyzer.StopWordsPath { get; set; }
 
diff --git a/src/Nest/Analysis/Analyzers/KeywordAnalyzer.cs b/src/Nest/Analysis/Analyzers/KeywordAnalyzer.cs
index 2237df6f07f..f0408b88e77 100644
--- a/src/Nest/Analysis/Analyzers/KeywordAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/KeywordAnalyzer.cs
@@ -5,13 +5,14 @@
 	/// <para>Note, when using mapping definitions, it make more sense to simply mark the field as not_analyzed.</para>
 	/// </summary>
 	public interface IKeywordAnalyzer : IAnalyzer { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class KeywordAnalyzer : AnalyzerBase, IKeywordAnalyzer
 	{
-		public KeywordAnalyzer() : base("keyword") {}
+		public KeywordAnalyzer() : base("keyword") { }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KeywordAnalyzerDescriptor
 		: AnalyzerDescriptorBase<KeywordAnalyzerDescriptor, IKeywordAnalyzer>, IKeywordAnalyzer
 	{
diff --git a/src/Nest/Analysis/Analyzers/LanguageAnalyzer.cs b/src/Nest/Analysis/Analyzers/LanguageAnalyzer.cs
index a0645e3f57d..09e5722be79 100644
--- a/src/Nest/Analysis/Analyzers/LanguageAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/LanguageAnalyzer.cs
@@ -9,6 +9,12 @@ namespace Nest
 	/// </summary>
 	public interface ILanguageAnalyzer : IAnalyzer
 	{
+		/// <summary>
+		/// The stem_exclusion parameter allows you to specify an array of lowercase words that should not be stemmed.
+		/// </summary>
+		[JsonProperty("stem_exclusion")]
+		IEnumerable<string> StemExclusionList { get; set; }
+
 		/// <summary>
 		/// A list of stopword to initialize the stop filter with. Defaults to the english stop words.
 		/// </summary>
@@ -16,12 +22,6 @@ public interface ILanguageAnalyzer : IAnalyzer
 		[JsonConverter(typeof(StopWordsJsonConverter))]
 		StopWords StopWords { get; set; }
 
-		/// <summary>
-		/// The stem_exclusion parameter allows you to specify an array of lowercase words that should not be stemmed.
-		/// </summary>
-		[JsonProperty("stem_exclusion")]
-		IEnumerable<string> StemExclusionList { get; set; }
-
 		/// <summary>
 		/// A path (either relative to config location, or absolute) to a stopwords file configuration.
 		/// </summary>
@@ -29,51 +29,55 @@ public interface ILanguageAnalyzer : IAnalyzer
 		string StopwordsPath { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class LanguageAnalyzer : AnalyzerBase, ILanguageAnalyzer
 	{
 		private string _type = "language";
-		public override string Type
+
+		/// <inheritdoc />
+		[JsonIgnore]
+		public Language? Language
 		{
-			get { return _type; }
-			protected set { this._type = value; this.Language = value.ToEnum<Language>(); }
+			get => _type.ToEnum<Language>();
+			set => _type = value.GetStringValue().ToLowerInvariant();
 		}
 
-		/// <inheritdoc/>
-		public StopWords StopWords { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> StemExclusionList { get; set; }
 
-		/// <inheritdoc/>
-		[JsonIgnore]
-		public Language? Language {
-			get { return _type.ToEnum<Language>(); }
-			set { _type = value.GetStringValue().ToLowerInvariant(); }
-		}
+		/// <inheritdoc />
+		public StopWords StopWords { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string StopwordsPath { get; set; }
+
+		public override string Type
+		{
+			get => _type;
+			protected set
+			{
+				_type = value;
+				Language = value.ToEnum<Language>();
+			}
+		}
 	}
 
-	/// <inheritdoc/>
-	public class LanguageAnalyzerDescriptor :
-		AnalyzerDescriptorBase<LanguageAnalyzerDescriptor, ILanguageAnalyzer>, ILanguageAnalyzer
+	/// <inheritdoc />
+	public class LanguageAnalyzerDescriptor : AnalyzerDescriptorBase<LanguageAnalyzerDescriptor, ILanguageAnalyzer>, ILanguageAnalyzer
 	{
 		private string _type = "language";
 		protected override string Type => _type;
+		IEnumerable<string> ILanguageAnalyzer.StemExclusionList { get; set; }
 
 		StopWords ILanguageAnalyzer.StopWords { get; set; }
-		IEnumerable<string> ILanguageAnalyzer.StemExclusionList { get; set; }
 		string ILanguageAnalyzer.StopwordsPath { get; set; }
 
-		public LanguageAnalyzerDescriptor Language(Language? language) => Assign(a => this._type = language?.GetStringValue().ToLowerInvariant());
+		public LanguageAnalyzerDescriptor Language(Language? language) => Assign(a => _type = language?.GetStringValue().ToLowerInvariant());
 
 		public LanguageAnalyzerDescriptor StopWords(StopWords stopWords) => Assign(a => a.StopWords = stopWords);
 
 		public LanguageAnalyzerDescriptor StopWords(params string[] stopWords) => Assign(a => a.StopWords = stopWords);
 
 		public LanguageAnalyzerDescriptor StopWords(IEnumerable<string> stopWords) => Assign(a => a.StopWords = stopWords.ToListOrNullIfEmpty());
-
 	}
 }
diff --git a/src/Nest/Analysis/Analyzers/NoriAnalyzer.cs b/src/Nest/Analysis/Analyzers/NoriAnalyzer.cs
index 010caad0020..6471b724ff8 100644
--- a/src/Nest/Analysis/Analyzers/NoriAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/NoriAnalyzer.cs
@@ -4,55 +4,55 @@
 namespace Nest
 {
 	/// <summary>
-	///The nori analyzer consists of the following tokenizer and token filters:
-	///<para> - nori_tokenizer</para>
-	///<para> - nori_part_of_speech token filter</para>
-	///<para> - nori_readingform token filter</para>
-	///<para> - lowercase token filter</para>
+	/// The nori analyzer consists of the following tokenizer and token filters:
+	/// <para> - nori_tokenizer</para>
+	/// <para> - nori_part_of_speech token filter</para>
+	/// <para> - nori_readingform token filter</para>
+	/// <para> - lowercase token filter</para>
 	/// </summary>
 	public interface INoriAnalyzer : IAnalyzer
 	{
-		/// <inheritdoc cref="INoriTokenizer.DecompoundMode"/>
+		/// <inheritdoc cref="INoriTokenizer.DecompoundMode" />
 		[JsonProperty("decompound_mode")]
 		NoriDecompoundMode? DecompoundMode { get; set; }
 
-		/// <inheritdoc cref="INoriTokenizer.UserDictionary"/>
-		[JsonProperty("user_dictionary")]
-		string UserDictionary { get; set; }
-
-		/// <inheritdoc cref="INoriPartOfSpeechTokenFilter.StopTags"/>
+		/// <inheritdoc cref="INoriPartOfSpeechTokenFilter.StopTags" />
 		[JsonProperty("stoptags")]
 		IEnumerable<string> StopTags { get; set; }
+
+		/// <inheritdoc cref="INoriTokenizer.UserDictionary" />
+		[JsonProperty("user_dictionary")]
+		string UserDictionary { get; set; }
 	}
 
-	/// <inheritdoc cref="INoriAnalyzer"/>
+	/// <inheritdoc cref="INoriAnalyzer" />
 	public class NoriAnalyzer : AnalyzerBase, INoriAnalyzer
 	{
-		public NoriAnalyzer() : base("nori") {}
-
-		/// <inheritdoc cref="INoriTokenizer.DecompoundMode"/>
-	    public NoriDecompoundMode? DecompoundMode { get; set; }
+		public NoriAnalyzer() : base("nori") { }
 
-		/// <inheritdoc cref="INoriTokenizer.UserDictionary"/>
-	    public string UserDictionary { get; set; }
+		/// <inheritdoc cref="INoriTokenizer.DecompoundMode" />
+		public NoriDecompoundMode? DecompoundMode { get; set; }
 
 		///<inheritdoc cref="INoriPartOfSpeechTokenFilter.StopTags" />
 		public IEnumerable<string> StopTags { get; set; }
+
+		/// <inheritdoc cref="INoriTokenizer.UserDictionary" />
+		public string UserDictionary { get; set; }
 	}
 
-	/// <inheritdoc cref="INoriAnalyzer"/>
+	/// <inheritdoc cref="INoriAnalyzer" />
 	public class NoriAnalyzerDescriptor : AnalyzerDescriptorBase<NoriAnalyzerDescriptor, INoriAnalyzer>, INoriAnalyzer
 	{
 		protected override string Type => "nori";
 
-	    NoriDecompoundMode? INoriAnalyzer.DecompoundMode { get; set; }
-	    string INoriAnalyzer.UserDictionary { get; set; }
+		NoriDecompoundMode? INoriAnalyzer.DecompoundMode { get; set; }
 		IEnumerable<string> INoriAnalyzer.StopTags { get; set; }
+		string INoriAnalyzer.UserDictionary { get; set; }
 
-		/// <inheritdoc cref="INoriTokenizer.DecompoundMode"/>
+		/// <inheritdoc cref="INoriTokenizer.DecompoundMode" />
 		public NoriAnalyzerDescriptor DecompoundMode(NoriDecompoundMode? mode) => Assign(a => a.DecompoundMode = mode);
 
-		/// <inheritdoc cref="INoriTokenizer.UserDictionary"/>
+		/// <inheritdoc cref="INoriTokenizer.UserDictionary" />
 		public NoriAnalyzerDescriptor UserDictionary(string path) => Assign(a => a.UserDictionary = path);
 
 		///<inheritdoc cref="INoriPartOfSpeechTokenFilter.StopTags" />
@@ -60,6 +60,5 @@ public class NoriAnalyzerDescriptor : AnalyzerDescriptorBase<NoriAnalyzerDescrip
 
 		///<inheritdoc cref="INoriPartOfSpeechTokenFilter.StopTags" />
 		public NoriAnalyzerDescriptor StopTags(params string[] stopTags) => Assign(a => a.StopTags = stopTags);
-
 	}
 }
diff --git a/src/Nest/Analysis/Analyzers/PatternAnalyzer.cs b/src/Nest/Analysis/Analyzers/PatternAnalyzer.cs
index b296023fbca..22aca44aaea 100644
--- a/src/Nest/Analysis/Analyzers/PatternAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/PatternAnalyzer.cs
@@ -8,15 +8,15 @@ namespace Nest
 	/// </summary>
 	public interface IPatternAnalyzer : IAnalyzer
 	{
+		[JsonProperty("flags")]
+		string Flags { get; set; }
+
 		[JsonProperty("lowercase")]
 		bool? Lowercase { get; set; }
 
 		[JsonProperty("pattern")]
 		string Pattern { get; set; }
 
-		[JsonProperty("flags")]
-		string Flags { get; set; }
-
 		/// <summary>
 		/// A list of stopword to initialize the stop filter with. Defaults to an empty list
 		/// </summary>
@@ -25,30 +25,29 @@ public interface IPatternAnalyzer : IAnalyzer
 		StopWords StopWords { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class PatternAnalyzer : AnalyzerBase, IPatternAnalyzer
 	{
-		public PatternAnalyzer() : base("pattern") {}
+		public PatternAnalyzer() : base("pattern") { }
+
+		public string Flags { get; set; }
 
 		public bool? Lowercase { get; set; }
 
 		public string Pattern { get; set; }
 
-		public string Flags { get; set; }
-
 		public StopWords StopWords { get; set; }
 	}
 
-	/// <inheritdoc/>
-	public class PatternAnalyzerDescriptor :
-		AnalyzerDescriptorBase<PatternAnalyzerDescriptor, IPatternAnalyzer>, IPatternAnalyzer
+	/// <inheritdoc />
+	public class PatternAnalyzerDescriptor : AnalyzerDescriptorBase<PatternAnalyzerDescriptor, IPatternAnalyzer>, IPatternAnalyzer
 	{
 		protected override string Type => "pattern";
-
-		StopWords IPatternAnalyzer.StopWords { get; set; }
-		string IPatternAnalyzer.Pattern { get; set; }
 		string IPatternAnalyzer.Flags { get; set; }
 		bool? IPatternAnalyzer.Lowercase { get; set; }
+		string IPatternAnalyzer.Pattern { get; set; }
+
+		StopWords IPatternAnalyzer.StopWords { get; set; }
 
 		public PatternAnalyzerDescriptor StopWords(params string[] stopWords) => Assign(a => a.StopWords = stopWords);
 
@@ -62,6 +61,5 @@ public PatternAnalyzerDescriptor StopWords(IEnumerable<string> stopWords) =>
 		public PatternAnalyzerDescriptor Flags(string flags) => Assign(a => a.Flags = flags);
 
 		public PatternAnalyzerDescriptor Lowercase(bool? lowercase = true) => Assign(a => a.Lowercase = lowercase);
-
 	}
 }
diff --git a/src/Nest/Analysis/Analyzers/SimpleAnalyzer.cs b/src/Nest/Analysis/Analyzers/SimpleAnalyzer.cs
index da24bec09e9..cf914acf2ae 100644
--- a/src/Nest/Analysis/Analyzers/SimpleAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/SimpleAnalyzer.cs
@@ -5,15 +5,14 @@
 	/// </summary>
 	public interface ISimpleAnalyzer : IAnalyzer { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class SimpleAnalyzer : AnalyzerBase, ISimpleAnalyzer
 	{
-		public SimpleAnalyzer() : base("simple") {}
+		public SimpleAnalyzer() : base("simple") { }
 	}
 
-	/// <inheritdoc/>
-	public class SimpleAnalyzerDescriptor :
-		AnalyzerDescriptorBase<SimpleAnalyzerDescriptor, ISimpleAnalyzer>, ISimpleAnalyzer
+	/// <inheritdoc />
+	public class SimpleAnalyzerDescriptor : AnalyzerDescriptorBase<SimpleAnalyzerDescriptor, ISimpleAnalyzer>, ISimpleAnalyzer
 	{
 		protected override string Type => "simple";
 	}
diff --git a/src/Nest/Analysis/Analyzers/SnowballAnalyzer.cs b/src/Nest/Analysis/Analyzers/SnowballAnalyzer.cs
index 8461163b15e..398c210710a 100644
--- a/src/Nest/Analysis/Analyzers/SnowballAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/SnowballAnalyzer.cs
@@ -5,7 +5,10 @@ namespace Nest
 {
 	/// <summary>
 	/// An analyzer of type snowball that uses the standard tokenizer, with standard filter, lowercase filter, stop filter, and snowball filter.
-	/// <para> The Snowball Analyzer is a stemming analyzer from Lucene that is originally based on the snowball project from snowball.tartarus.org.</para>
+	/// <para>
+	/// The Snowball Analyzer is a stemming analyzer from Lucene that is originally based on the snowball project from
+	/// snowball.tartarus.org.
+	/// </para>
 	/// </summary>
 	public interface ISnowballAnalyzer : IAnalyzer
 	{
@@ -16,29 +19,31 @@ public interface ISnowballAnalyzer : IAnalyzer
 		[JsonConverter(typeof(StopWordsJsonConverter))]
 		StopWords StopWords { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class SnowballAnalyzer : AnalyzerBase, ISnowballAnalyzer
 	{
-		public SnowballAnalyzer() : base("snowball") {}
+		public SnowballAnalyzer() : base("snowball") { }
 
 		public SnowballLanguage? Language { get; set; }
 
 		public StopWords StopWords { get; set; }
 	}
-	/// <inheritdoc/>
-	public class SnowballAnalyzerDescriptor :
-		AnalyzerDescriptorBase<SnowballAnalyzerDescriptor, ISnowballAnalyzer>, ISnowballAnalyzer
+
+	/// <inheritdoc />
+	public class SnowballAnalyzerDescriptor : AnalyzerDescriptorBase<SnowballAnalyzerDescriptor, ISnowballAnalyzer>, ISnowballAnalyzer
 	{
 		protected override string Type => "snowball";
+		SnowballLanguage? ISnowballAnalyzer.Language { get; set; }
 
 		StopWords ISnowballAnalyzer.StopWords { get; set; }
-		SnowballLanguage? ISnowballAnalyzer.Language { get; set; }
 
 		public SnowballAnalyzerDescriptor StopWords(StopWords stopWords) => Assign(a => a.StopWords = stopWords);
+
 		public SnowballAnalyzerDescriptor StopWords(IEnumerable<string> stopWords) => Assign(a => a.StopWords = stopWords.ToListOrNullIfEmpty());
+
 		public SnowballAnalyzerDescriptor StopWords(params string[] stopWords) => Assign(a => a.StopWords = stopWords.ToListOrNullIfEmpty());
 
 		public SnowballAnalyzerDescriptor Language(SnowballLanguage? language) => Assign(a => a.Language = language);
-
 	}
 }
diff --git a/src/Nest/Analysis/Analyzers/StandardAnalyzer.cs b/src/Nest/Analysis/Analyzers/StandardAnalyzer.cs
index 6b591d8012f..58403a946a8 100644
--- a/src/Nest/Analysis/Analyzers/StandardAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/StandardAnalyzer.cs
@@ -4,44 +4,44 @@
 namespace Nest
 {
 	/// <summary>
-	/// An analyzer of type standard that is built of using Standard Tokenizer, with Standard Token Filter, Lower Case Token Filter, and Stop Token Filter.
+	/// An analyzer of type standard that is built of using Standard Tokenizer, with Standard Token Filter, Lower Case Token Filter, and Stop Token
+	/// Filter.
 	/// </summary>
 	public interface IStandardAnalyzer : IAnalyzer
 	{
+		/// <summary>
+		/// The maximum token length. If a token is seen that exceeds this length then it is discarded. Defaults to 255.
+		/// </summary>
+		[JsonProperty("max_token_length")]
+		int? MaxTokenLength { get; set; }
+
 		/// <summary>
 		/// A list of stopword to initialize the stop filter with. Defaults to the english stop words.
 		/// </summary>
 		[JsonProperty("stopwords")]
 		[JsonConverter(typeof(StopWordsJsonConverter))]
 		StopWords StopWords { get; set; }
-
-		/// <summary>
-		/// The maximum token length. If a token is seen that exceeds this length then it is discarded. Defaults to 255.
-		/// </summary>
-		[JsonProperty("max_token_length")]
-		int? MaxTokenLength { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class StandardAnalyzer : AnalyzerBase, IStandardAnalyzer
 	{
-		public StandardAnalyzer() : base("standard") {}
+		public StandardAnalyzer() : base("standard") { }
 
-		/// <inheritdoc/>
-		public StopWords StopWords { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MaxTokenLength { get; set; }
+
+		/// <inheritdoc />
+		public StopWords StopWords { get; set; }
 	}
 
-	/// <inheritdoc/>
-	public class StandardAnalyzerDescriptor :
-		AnalyzerDescriptorBase<StandardAnalyzerDescriptor, IStandardAnalyzer>, IStandardAnalyzer
+	/// <inheritdoc />
+	public class StandardAnalyzerDescriptor : AnalyzerDescriptorBase<StandardAnalyzerDescriptor, IStandardAnalyzer>, IStandardAnalyzer
 	{
 		protected override string Type => "standard";
+		int? IStandardAnalyzer.MaxTokenLength { get; set; }
 
 		StopWords IStandardAnalyzer.StopWords { get; set; }
-		int? IStandardAnalyzer.MaxTokenLength { get; set; }
 
 		public StandardAnalyzerDescriptor StopWords(params string[] stopWords) =>
 			Assign(a => a.StopWords = stopWords);
@@ -53,6 +53,5 @@ public StandardAnalyzerDescriptor StopWords(IEnumerable<string> stopWords) =>
 
 		public StandardAnalyzerDescriptor MaxTokenLength(int? maxTokenLength) =>
 			Assign(a => a.MaxTokenLength = maxTokenLength);
-
 	}
 }
diff --git a/src/Nest/Analysis/Analyzers/StopAnalyzer.cs b/src/Nest/Analysis/Analyzers/StopAnalyzer.cs
index 3dde8b4938b..d3be89a7195 100644
--- a/src/Nest/Analysis/Analyzers/StopAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/StopAnalyzer.cs
@@ -22,21 +22,20 @@ public interface IStopAnalyzer : IAnalyzer
 		string StopwordsPath { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class StopAnalyzer : AnalyzerBase, IStopAnalyzer
 	{
-		public StopAnalyzer() : base("stop") {}
+		public StopAnalyzer() : base("stop") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public StopWords StopWords { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string StopwordsPath { get; set; }
 	}
 
-	/// <inheritdoc/>
-	public class StopAnalyzerDescriptor :
-		AnalyzerDescriptorBase<StopAnalyzerDescriptor, IStopAnalyzer>, IStopAnalyzer
+	/// <inheritdoc />
+	public class StopAnalyzerDescriptor : AnalyzerDescriptorBase<StopAnalyzerDescriptor, IStopAnalyzer>, IStopAnalyzer
 	{
 		protected override string Type => "stop";
 
@@ -51,6 +50,5 @@ public StopAnalyzerDescriptor StopWords(IEnumerable<string> stopWords) =>
 		public StopAnalyzerDescriptor StopWords(StopWords stopWords) => Assign(a => a.StopWords = stopWords);
 
 		public StopAnalyzerDescriptor StopwordsPath(string path) => Assign(a => a.StopwordsPath = path);
-
 	}
 }
diff --git a/src/Nest/Analysis/Analyzers/WhitespaceAnalyzer.cs b/src/Nest/Analysis/Analyzers/WhitespaceAnalyzer.cs
index 582ad72ca80..8a268b735ea 100644
--- a/src/Nest/Analysis/Analyzers/WhitespaceAnalyzer.cs
+++ b/src/Nest/Analysis/Analyzers/WhitespaceAnalyzer.cs
@@ -5,15 +5,14 @@
 	/// </summary>
 	public interface IWhitespaceAnalyzer : IAnalyzer { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class WhitespaceAnalyzer : AnalyzerBase, IWhitespaceAnalyzer
 	{
-		public WhitespaceAnalyzer() : base("whitespace") {}
+		public WhitespaceAnalyzer() : base("whitespace") { }
 	}
 
-	/// <inheritdoc/>
-	public class WhitespaceAnalyzerDescriptor :
-		AnalyzerDescriptorBase<WhitespaceAnalyzerDescriptor, IWhitespaceAnalyzer>, IWhitespaceAnalyzer
+	/// <inheritdoc />
+	public class WhitespaceAnalyzerDescriptor : AnalyzerDescriptorBase<WhitespaceAnalyzerDescriptor, IWhitespaceAnalyzer>, IWhitespaceAnalyzer
 	{
 		protected override string Type => "whitespace";
 	}
diff --git a/src/Nest/Analysis/CharFilters/CharFilterBase.cs b/src/Nest/Analysis/CharFilters/CharFilterBase.cs
index c7595d1cb0c..bb33a8bce76 100644
--- a/src/Nest/Analysis/CharFilters/CharFilterBase.cs
+++ b/src/Nest/Analysis/CharFilters/CharFilterBase.cs
@@ -5,23 +5,20 @@ namespace Nest
 	[ContractJsonConverter(typeof(CharFilterJsonConverter))]
 	public interface ICharFilter
 	{
-		[JsonProperty("version")]
-		string Version { get; set; }
-
 		[JsonProperty("type")]
 		string Type { get; }
+
+		[JsonProperty("version")]
+		string Version { get; set; }
 	}
 
 
 	public abstract class CharFilterBase : ICharFilter
 	{
-		protected CharFilterBase(string type)
-		{
-			this.Type = type;
-		}
-		public string Version { get; set; }
+		protected CharFilterBase(string type) => Type = type;
 
 		public string Type { get; protected set; }
+		public string Version { get; set; }
 	}
 
 	public abstract class CharFilterDescriptorBase<TCharFilter, TCharFilterInterface>
@@ -29,10 +26,10 @@ public abstract class CharFilterDescriptorBase<TCharFilter, TCharFilterInterface
 		where TCharFilter : CharFilterDescriptorBase<TCharFilter, TCharFilterInterface>, TCharFilterInterface
 		where TCharFilterInterface : class, ICharFilter
 	{
-		string ICharFilter.Version { get; set; }
-		string ICharFilter.Type => this.Type;
 		protected abstract string Type { get; }
+		string ICharFilter.Type => Type;
+		string ICharFilter.Version { get; set; }
 
 		public TCharFilter Version(string version) => Assign(a => a.Version = version);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/CharFilters/CharFilterJsonConverter.cs b/src/Nest/Analysis/CharFilters/CharFilterJsonConverter.cs
index ffa0a912e76..ecc332bd960 100644
--- a/src/Nest/Analysis/CharFilters/CharFilterJsonConverter.cs
+++ b/src/Nest/Analysis/CharFilters/CharFilterJsonConverter.cs
@@ -6,19 +6,20 @@ namespace Nest
 {
 	internal class CharFilterJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-		public override bool CanWrite => false;
 		public override bool CanRead => true;
+		public override bool CanWrite => false;
+
+		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			JObject o = JObject.Load(reader);
+			var o = JObject.Load(reader);
 
-			JProperty typeProperty = o.Property("type");
+			var typeProperty = o.Property("type");
 			if (typeProperty == null) return null;
 
 			var typePropertyValue = typeProperty.Value.ToString();
-			switch(typePropertyValue)
+			switch (typePropertyValue)
 			{
 				case "html_strip": return o.ToObject<HtmlStripCharFilter>(ElasticContractResolver.Empty);
 				case "mapping": return o.ToObject<MappingCharFilter>(ElasticContractResolver.Empty);
@@ -29,9 +30,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return null;
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 	}
 }
diff --git a/src/Nest/Analysis/CharFilters/CharFilters.cs b/src/Nest/Analysis/CharFilters/CharFilters.cs
index 01124d2e7b9..2e8a67019aa 100644
--- a/src/Nest/Analysis/CharFilters/CharFilters.cs
+++ b/src/Nest/Analysis/CharFilters/CharFilters.cs
@@ -10,11 +10,12 @@ public interface ICharFilters : IIsADictionary<string, ICharFilter> { }
 
 	public class CharFilters : IsADictionaryBase<string, ICharFilter>, ICharFilters
 	{
-		public CharFilters() {}
+		public CharFilters() { }
+
 		public CharFilters(IDictionary<string, ICharFilter> container) : base(container) { }
+
 		public CharFilters(Dictionary<string, ICharFilter> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{}
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		public void Add(string name, ICharFilter analyzer) => BackingDictionary.Add(name, analyzer);
 	}
@@ -47,14 +48,17 @@ public CharFiltersDescriptor Mapping(string name, Func<MappingCharFilterDescript
 		/// The kuromoji_iteration_mark normalizes Japanese horizontal iteration marks (odoriji) to their expanded form.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
-		public CharFiltersDescriptor KuromojiIterationMark(string name, Func<KuromojiIterationMarkCharFilterDescriptor, IKuromojiIterationMarkCharFilter> selector = null) =>
+		public CharFiltersDescriptor KuromojiIterationMark(string name,
+			Func<KuromojiIterationMarkCharFilterDescriptor, IKuromojiIterationMarkCharFilter> selector = null
+		) =>
 			Assign(name, selector?.InvokeOrDefault(new KuromojiIterationMarkCharFilterDescriptor()));
 
 		/// <summary>
 		/// Normalizes as defined here: http://userguide.icu-project.org/transforms/normalization
 		/// Part of the `analysis-icu` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html
 		/// </summary>
-		public CharFiltersDescriptor IcuNormalization(string name, Func<IcuNormalizationCharFilterDescriptor, IIcuNormalizationCharFilter> selector) =>
+		public CharFiltersDescriptor IcuNormalization(string name, Func<IcuNormalizationCharFilterDescriptor, IIcuNormalizationCharFilter> selector
+		) =>
 			Assign(name, selector?.Invoke(new IcuNormalizationCharFilterDescriptor()));
 	}
 }
diff --git a/src/Nest/Analysis/CharFilters/HtmlStripCharFilter.cs b/src/Nest/Analysis/CharFilters/HtmlStripCharFilter.cs
index e0265b12bc3..2f7b667f3ad 100644
--- a/src/Nest/Analysis/CharFilters/HtmlStripCharFilter.cs
+++ b/src/Nest/Analysis/CharFilters/HtmlStripCharFilter.cs
@@ -4,17 +4,17 @@
 	/// A char filter of type html_strip stripping out HTML elements from an analyzed text.
 	/// </summary>
 	public interface IHtmlStripCharFilter : ICharFilter { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class HtmlStripCharFilter : CharFilterBase, IHtmlStripCharFilter
 	{
 		public HtmlStripCharFilter() : base("html_strip") { }
 	}
 
-	/// <inheritdoc/>
-	public class HtmlStripCharFilterDescriptor 
+	/// <inheritdoc />
+	public class HtmlStripCharFilterDescriptor
 		: CharFilterDescriptorBase<HtmlStripCharFilterDescriptor, IHtmlStripCharFilter>, IHtmlStripCharFilter
 	{
 		protected override string Type => "html_strip";
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/CharFilters/MappingCharFilter.cs b/src/Nest/Analysis/CharFilters/MappingCharFilter.cs
index ed42c97fda3..7cb35ea081e 100644
--- a/src/Nest/Analysis/CharFilters/MappingCharFilter.cs
+++ b/src/Nest/Analysis/CharFilters/MappingCharFilter.cs
@@ -14,37 +14,37 @@ public interface IMappingCharFilter : ICharFilter
 		[JsonProperty("mappings_path")]
 		string MappingsPath { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class MappingCharFilter : CharFilterBase, IMappingCharFilter
 	{
 		public MappingCharFilter() : base("mapping") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> Mappings { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string MappingsPath { get; set; }
 	}
 
-	/// <inheritdoc/>
-	public class MappingCharFilterDescriptor 
+	/// <inheritdoc />
+	public class MappingCharFilterDescriptor
 		: CharFilterDescriptorBase<MappingCharFilterDescriptor, IMappingCharFilter>, IMappingCharFilter
 	{
 		protected override string Type => "mapping";
 		IEnumerable<string> IMappingCharFilter.Mappings { get; set; }
 		string IMappingCharFilter.MappingsPath { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public MappingCharFilterDescriptor Mappings(params string[] mappings) =>
 			Assign(a => a.Mappings = mappings);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public MappingCharFilterDescriptor Mappings(IEnumerable<string> mappings) =>
 			Assign(a => a.Mappings = mappings);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public MappingCharFilterDescriptor MappingsPath(string path) =>
 			Assign(a => a.MappingsPath = path);
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/CharFilters/PatternReplaceCharFilter.cs b/src/Nest/Analysis/CharFilters/PatternReplaceCharFilter.cs
index 308839f181a..2e5f549a47d 100644
--- a/src/Nest/Analysis/CharFilters/PatternReplaceCharFilter.cs
+++ b/src/Nest/Analysis/CharFilters/PatternReplaceCharFilter.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// The pattern_replace char filter allows the use of a regex to manipulate the characters in a string before analysis. 
+	/// The pattern_replace char filter allows the use of a regex to manipulate the characters in a string before analysis.
 	/// </summary>
 	public interface IPatternReplaceCharFilter : ICharFilter
 	{
@@ -13,33 +13,33 @@ public interface IPatternReplaceCharFilter : ICharFilter
 		[JsonProperty("replacement")]
 		string Replacement { get; set; }
 	}
-	
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class PatternReplaceCharFilter : CharFilterBase, IPatternReplaceCharFilter
 	{
 		public PatternReplaceCharFilter() : base("pattern_replace") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string Pattern { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string Replacement { get; set; }
 	}
-	/// <inheritdoc/>
-	public class PatternReplaceCharFilterDescriptor 
+
+	/// <inheritdoc />
+	public class PatternReplaceCharFilterDescriptor
 		: CharFilterDescriptorBase<PatternReplaceCharFilterDescriptor, IPatternReplaceCharFilter>, IPatternReplaceCharFilter
 	{
 		protected override string Type => "pattern_replace";
 		string IPatternReplaceCharFilter.Pattern { get; set; }
 		string IPatternReplaceCharFilter.Replacement { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PatternReplaceCharFilterDescriptor Pattern(string pattern) =>
 			Assign(a => a.Pattern = pattern);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PatternReplaceCharFilterDescriptor Replacement(string replacement) =>
 			Assign(a => a.Replacement = replacement);
-
 	}
 }
diff --git a/src/Nest/Analysis/Languages/Language.cs b/src/Nest/Analysis/Languages/Language.cs
index 3ac32c0e0a9..0e897ef4a53 100644
--- a/src/Nest/Analysis/Languages/Language.cs
+++ b/src/Nest/Analysis/Languages/Language.cs
@@ -9,38 +9,38 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum Language
 	{
-		Arabic, 
-		Armenian, 
-		Basque, 
-		Brazilian, 
-		Bulgarian, 
-		Catalan, 
-		Chinese, 
-		Cjk, 
-		Czech, 
-		Danish, 
-		Dutch, 
-		English, 
-		Finnish, 
-		French, 
-		Galician, 
-		German, 
-		Greek, 
-		Hindi, 
-		Hungarian, 
-		Indonesian, 
-		Irish, 
-		Italian, 
+		Arabic,
+		Armenian,
+		Basque,
+		Brazilian,
+		Bulgarian,
+		Catalan,
+		Chinese,
+		Cjk,
+		Czech,
+		Danish,
+		Dutch,
+		English,
+		Finnish,
+		French,
+		Galician,
+		German,
+		Greek,
+		Hindi,
+		Hungarian,
+		Indonesian,
+		Irish,
+		Italian,
 		Latvian,
-		Norwegian, 
-		Persian, 
-		Portuguese, 
-		Romanian, 
-		Russian, 
+		Norwegian,
+		Persian,
+		Portuguese,
+		Romanian,
+		Russian,
 		Sorani,
-		Spanish, 
-		Swedish, 
-		Turkish, 
+		Spanish,
+		Swedish,
+		Turkish,
 		Thai
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Languages/SnowballLanguage.cs b/src/Nest/Analysis/Languages/SnowballLanguage.cs
index 9d8bb4d997a..a2e2023983b 100644
--- a/src/Nest/Analysis/Languages/SnowballLanguage.cs
+++ b/src/Nest/Analysis/Languages/SnowballLanguage.cs
@@ -5,54 +5,75 @@
 namespace Nest
 {
 	/// <summary>
-	/// Snowball compatible languages 
+	/// Snowball compatible languages
 	/// </summary>
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum SnowballLanguage
 	{
-		[EnumMember(Value="Armenian")]
+		[EnumMember(Value = "Armenian")]
 		Armenian,
-		[EnumMember(Value="Basque")]
+
+		[EnumMember(Value = "Basque")]
 		Basque,
-		[EnumMember(Value="Catalan")]
+
+		[EnumMember(Value = "Catalan")]
 		Catalan,
-		[EnumMember(Value="Danish")]
+
+		[EnumMember(Value = "Danish")]
 		Danish,
-		[EnumMember(Value="Dutch")]
+
+		[EnumMember(Value = "Dutch")]
 		Dutch,
-		[EnumMember(Value="English")]
+
+		[EnumMember(Value = "English")]
 		English,
-		[EnumMember(Value="Finnish")]
+
+		[EnumMember(Value = "Finnish")]
 		Finnish,
-		[EnumMember(Value="French")]
+
+		[EnumMember(Value = "French")]
 		French,
-		[EnumMember(Value="German")]
+
+		[EnumMember(Value = "German")]
 		German,
-		[EnumMember(Value="German2")]
+
+		[EnumMember(Value = "German2")]
 		German2,
-		[EnumMember(Value="Hungarian")]
+
+		[EnumMember(Value = "Hungarian")]
 		Hungarian,
-		[EnumMember(Value="Italian")]
+
+		[EnumMember(Value = "Italian")]
 		Italian,
-		[EnumMember(Value="Kp")]
+
+		[EnumMember(Value = "Kp")]
 		Kp,
-		[EnumMember(Value="Lovins")]
+
+		[EnumMember(Value = "Lovins")]
 		Lovins,
-		[EnumMember(Value="Norwegian")]
+
+		[EnumMember(Value = "Norwegian")]
 		Norwegian,
-		[EnumMember(Value="Porter")]
+
+		[EnumMember(Value = "Porter")]
 		Porter,
-		[EnumMember(Value="Portuguese")]
+
+		[EnumMember(Value = "Portuguese")]
 		Portuguese,
-		[EnumMember(Value="Romanian")]
+
+		[EnumMember(Value = "Romanian")]
 		Romanian,
-		[EnumMember(Value="Russian")]
+
+		[EnumMember(Value = "Russian")]
 		Russian,
-		[EnumMember(Value="Spanish")]
+
+		[EnumMember(Value = "Spanish")]
 		Spanish,
-		[EnumMember(Value="Swedish")]
+
+		[EnumMember(Value = "Swedish")]
 		Swedish,
-		[EnumMember(Value="Turkish")]
+
+		[EnumMember(Value = "Turkish")]
 		Turkish
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Normalizers/CustomNormalizer.cs b/src/Nest/Analysis/Normalizers/CustomNormalizer.cs
index 63bc5630952..dee562fb001 100644
--- a/src/Nest/Analysis/Normalizers/CustomNormalizer.cs
+++ b/src/Nest/Analysis/Normalizers/CustomNormalizer.cs
@@ -28,19 +28,19 @@ public interface ICustomNormalizer : INormalizer
 		IEnumerable<string> Filter { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class CustomNormalizer : NormalizerBase, ICustomNormalizer
 	{
-		public CustomNormalizer() : base("custom") {}
+		public CustomNormalizer() : base("custom") { }
 
-		/// <inheritdoc/>
-		public IEnumerable<string> Filter { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> CharFilter { get; set; }
+
+		/// <inheritdoc />
+		public IEnumerable<string> Filter { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class CustomNormalizerDescriptor
 		: NormalizerDescriptorBase<CustomNormalizerDescriptor, ICustomNormalizer>, ICustomNormalizer
 	{
@@ -48,17 +48,17 @@ public class CustomNormalizerDescriptor
 
 		IEnumerable<string> ICustomNormalizer.CharFilter { get; set; }
 		IEnumerable<string> ICustomNormalizer.Filter { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public CustomNormalizerDescriptor Filters(params string[] filters) => Assign(a => a.Filter = filters);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomNormalizerDescriptor Filters(IEnumerable<string> filters) => Assign(a => a.Filter = filters);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomNormalizerDescriptor CharFilters(params string[] charFilters) => Assign(a => a.CharFilter = charFilters);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CustomNormalizerDescriptor CharFilters(IEnumerable<string> charFilters) => Assign(a => a.CharFilter = charFilters);
-
 	}
 }
diff --git a/src/Nest/Analysis/Normalizers/NormalizerBase.cs b/src/Nest/Analysis/Normalizers/NormalizerBase.cs
index c34b07df9ca..c745d302494 100644
--- a/src/Nest/Analysis/Normalizers/NormalizerBase.cs
+++ b/src/Nest/Analysis/Normalizers/NormalizerBase.cs
@@ -5,11 +5,11 @@ namespace Nest
 	[ContractJsonConverter(typeof(NormalizerJsonConverter))]
 	public interface INormalizer
 	{
-		[JsonProperty("version")]
-		string Version { get; set; }
-
 		[JsonProperty("type")]
 		string Type { get; }
+
+		[JsonProperty("version")]
+		string Version { get; set; }
 	}
 
 	public abstract class NormalizerBase : INormalizer
@@ -18,9 +18,9 @@ internal NormalizerBase() { }
 
 		protected NormalizerBase(string type) => Type = type;
 
-		public string Version { get; set; }
-
 		public virtual string Type { get; protected set; }
+
+		public string Version { get; set; }
 	}
 
 	public abstract class NormalizerDescriptorBase<TNormalizer, TNormalizerInterface>
@@ -28,11 +28,10 @@ public abstract class NormalizerDescriptorBase<TNormalizer, TNormalizerInterface
 		where TNormalizer : NormalizerDescriptorBase<TNormalizer, TNormalizerInterface>, TNormalizerInterface
 		where TNormalizerInterface : class, INormalizer
 	{
-		string INormalizer.Version { get; set; }
-		string INormalizer.Type => this.Type;
 		protected abstract string Type { get; }
+		string INormalizer.Type => Type;
+		string INormalizer.Version { get; set; }
 
 		public TNormalizer Version(string version) => Assign(a => a.Version = version);
 	}
-
 }
diff --git a/src/Nest/Analysis/Normalizers/NormalizerJsonConverter.cs b/src/Nest/Analysis/Normalizers/NormalizerJsonConverter.cs
index 6707180f9c2..da84714c085 100644
--- a/src/Nest/Analysis/Normalizers/NormalizerJsonConverter.cs
+++ b/src/Nest/Analysis/Normalizers/NormalizerJsonConverter.cs
@@ -6,9 +6,10 @@ namespace Nest
 {
 	internal class NormalizerJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-		public override bool CanWrite => false;
 		public override bool CanRead => true;
+		public override bool CanWrite => false;
+
+		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
@@ -18,16 +19,13 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			if (typeProperty == null) return null;
 
 			var typePropertyValue = typeProperty.Value.ToString();
-			switch(typePropertyValue)
+			switch (typePropertyValue)
 			{
 				default:
 					return o.ToObject<CustomNormalizer>(ElasticContractResolver.Empty);
 			}
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 	}
 }
diff --git a/src/Nest/Analysis/Normalizers/Normalizers.cs b/src/Nest/Analysis/Normalizers/Normalizers.cs
index 5d4740c0563..41a1fc557a4 100644
--- a/src/Nest/Analysis/Normalizers/Normalizers.cs
+++ b/src/Nest/Analysis/Normalizers/Normalizers.cs
@@ -10,11 +10,12 @@ public interface INormalizers : IIsADictionary<string, INormalizer> { }
 
 	public class Normalizers : IsADictionaryBase<string, INormalizer>, INormalizers
 	{
-		public Normalizers() {}
+		public Normalizers() { }
+
 		public Normalizers(IDictionary<string, INormalizer> container) : base(container) { }
+
 		public Normalizers(Dictionary<string, INormalizer> container)
-			: base(container.ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+			: base(container.ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		public void Add(string name, INormalizer analyzer) => BackingDictionary.Add(name, analyzer);
 	}
diff --git a/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationAlternate.cs b/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationAlternate.cs
index a9fcf0e4924..5a9911aac36 100644
--- a/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationAlternate.cs
+++ b/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationAlternate.cs
@@ -11,7 +11,7 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum IcuCollationAlternate
 	{
-		[EnumMember(Value="shifted")] Shifted,
-		[EnumMember(Value="non-ignorable")] NonIgnorable
+		[EnumMember(Value = "shifted")] Shifted,
+		[EnumMember(Value = "non-ignorable")] NonIgnorable
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationCaseFirst.cs b/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationCaseFirst.cs
index 218bf231ade..6139a977296 100644
--- a/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationCaseFirst.cs
+++ b/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationCaseFirst.cs
@@ -11,7 +11,7 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum IcuCollationCaseFirst
 	{
-		[EnumMember(Value="lower")] Lower,
-		[EnumMember(Value="upper")] Upper
+		[EnumMember(Value = "lower")] Lower,
+		[EnumMember(Value = "upper")] Upper
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationDecomposition.cs b/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationDecomposition.cs
index c7059697728..0d3ca4aed30 100644
--- a/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationDecomposition.cs
+++ b/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationDecomposition.cs
@@ -16,7 +16,7 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum IcuCollationDecomposition
 	{
-		[EnumMember(Value="no")] No,
-		[EnumMember(Value="identical")] Canonical
+		[EnumMember(Value = "no")] No,
+		[EnumMember(Value = "identical")] Canonical
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationStrength.cs b/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationStrength.cs
index bd1139c11dc..f3068c91324 100644
--- a/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationStrength.cs
+++ b/src/Nest/Analysis/Plugins/Icu/Collation/IcuCollationStrength.cs
@@ -17,14 +17,16 @@ public enum IcuCollationStrength
 		/// It is the strongest difference. For example, dictionaries are divided into different sections by
 		/// base character.
 		/// </summary>
-		[EnumMember(Value="primary")] Primary,
+		[EnumMember(Value = "primary")] Primary,
+
 		/// <summary>
 		/// Accents in the characters are considered secondary differences (for example, "as" &lt; "às" &lt; "at").
 		/// Other differences between letters can also be considered secondary differences, depending on
 		/// the language. A secondary difference is ignored when there is a primary difference anywhere
 		/// in the strings.
 		/// </summary>
-		[EnumMember(Value="secondary")] Secondary,
+		[EnumMember(Value = "secondary")] Secondary,
+
 		/// <summary>
 		/// Upper and lower case differences in characters are distinguished at tertiary strength
 		/// (for example, "ao" &lt; "Ao" &lt; "aò"). In addition, a variant of a letter differs from the base
@@ -32,7 +34,8 @@ public enum IcuCollationStrength
 		/// large and small Kana. A tertiary difference is ignored when there is a primary or secondary
 		/// difference anywhere in the strings.
 		/// </summary>
-		[EnumMember(Value="tertiary")] Tertiary,
+		[EnumMember(Value = "tertiary")] Tertiary,
+
 		/// <summary>
 		/// When punctuation is ignored (see Ignoring Punctuations in the User Guide) at PRIMARY to
 		/// TERTIARY strength, an additional strength level can be used to distinguish words with
@@ -40,7 +43,8 @@ public enum IcuCollationStrength
 		/// when there is a PRIMARY, SECONDARY or TERTIARY difference. The QUATERNARY strength should
 		/// only be used if ignoring punctuation is required.
 		/// </summary>
-		[EnumMember(Value="quaternary")] Quaternary,
+		[EnumMember(Value = "quaternary")] Quaternary,
+
 		/// <summary>
 		/// When all other strengths are equal, the IDENTICAL strength is used as a tiebreaker.
 		/// The Unicode code point values of the NFD form of each string are compared, just in
@@ -50,6 +54,6 @@ public enum IcuCollationStrength
 		/// this strength substantially decreases the performance for both comparison and collation key
 		/// generation APIs. This strength also increases the size of the collation key.
 		/// </summary>
-		[EnumMember(Value="identical")] Indentical,
+		[EnumMember(Value = "identical")] Indentical,
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/IcuCollationTokenFilter.cs b/src/Nest/Analysis/Plugins/Icu/IcuCollationTokenFilter.cs
index d83fcdfc68f..921170ae2b1 100644
--- a/src/Nest/Analysis/Plugins/Icu/IcuCollationTokenFilter.cs
+++ b/src/Nest/Analysis/Plugins/Icu/IcuCollationTokenFilter.cs
@@ -1,29 +1,36 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	/// <summary>
-	/// Collations are used for sorting documents in a language-specific word order. The icu_collation token filter is available to all indices and defaults to using the DUCET collation, which is a best-effort attempt at language-neutral sorting.
+	/// Collations are used for sorting documents in a language-specific word order. The icu_collation token filter is available to all indices and
+	/// defaults to using the DUCET collation, which is a best-effort attempt at language-neutral sorting.
 	/// Part of the `analysis-icu` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html
 	/// </summary>
 	public interface IIcuCollationTokenFilter : ITokenFilter
 	{
-		[JsonProperty("language")]
-		string Language { get; set; }
-
-		[JsonProperty("country")]
-		string Country { get; set; }
+		/// <summary>
+		/// Sets the alternate handling for strength quaternary to be either shifted or non-ignorable.
+		/// Which boils down to ignoring punctuation and whitespace.
+		/// </summary>
+		[JsonProperty("alternate")]
+		IcuCollationAlternate? Alternate { get; set; }
 
-		[JsonProperty("variant")]
-		string Variant { get; set; }
+		/// <summary>
+		/// Useful to control which case is sorted first when case is not ignored for strength tertiary.
+		/// The default depends on the collation.
+		/// </summary>
+		[JsonProperty("caseFirst")]
+		IcuCollationCaseFirst? CaseFirst { get; set; }
 
 		/// <summary>
-		/// The strength property determines the minimum level of difference considered significant during comparison.
+		/// Whether case level sorting is required. When strength is set to primary this will ignore accent differences
 		/// </summary>
-		[JsonProperty("strength")]
-		IcuCollationStrength? Strength { get; set; }
+		[JsonProperty("caseLevel")]
+		bool? CaseLevel { get; set; }
+
+		[JsonProperty("country")]
+		string Country { get; set; }
 
 		/// <summary>
 		/// Setting this decomposition property to canonical allows the Collator to handle unnormalized text properly,
@@ -37,24 +44,13 @@ public interface IIcuCollationTokenFilter : ITokenFilter
 		IcuCollationDecomposition? Decomposition { get; set; }
 
 		/// <summary>
-		/// Sets the alternate handling for strength quaternary to be either shifted or non-ignorable.
-		/// Which boils down to ignoring punctuation and whitespace.
-		/// </summary>
-		[JsonProperty("alternate")]
-		IcuCollationAlternate? Alternate { get; set; }
-
-		/// <summary>
-		/// Whether case level sorting is required. When strength is set to primary this will ignore accent differences
+		/// Distinguishing between Katakana and Hiragana characters in quaternary strength.
 		/// </summary>
-		[JsonProperty("caseLevel")]
-		bool? CaseLevel { get; set; }
+		[JsonProperty("hiraganaQuaternaryMode")]
+		bool? HiraganaQuaternaryMode { get; set; }
 
-		/// <summary>
-		/// Useful to control which case is sorted first when case is not ignored for strength tertiary.
-		/// The default depends on the collation.
-		/// </summary>
-		[JsonProperty("caseFirst")]
-		IcuCollationCaseFirst? CaseFirst { get; set; }
+		[JsonProperty("language")]
+		string Language { get; set; }
 
 		/// <summary>
 		/// Whether digits are sorted according to their numeric representation.
@@ -64,87 +60,110 @@ public interface IIcuCollationTokenFilter : ITokenFilter
 		bool? Numeric { get; set; }
 
 		/// <summary>
-		/// Single character or contraction. Controls what is variable for <see cref="Alternate"/>.
+		/// The strength property determines the minimum level of difference considered significant during comparison.
 		/// </summary>
-		[JsonProperty("variableTop")]
-		string VariableTop { get; set; }
+		[JsonProperty("strength")]
+		IcuCollationStrength? Strength { get; set; }
 
 		/// <summary>
-		/// Distinguishing between Katakana and Hiragana characters in quaternary strength.
+		/// Single character or contraction. Controls what is variable for <see cref="Alternate" />.
 		/// </summary>
-		[JsonProperty("hiraganaQuaternaryMode")]
-		bool? HiraganaQuaternaryMode { get; set; }
+		[JsonProperty("variableTop")]
+		string VariableTop { get; set; }
+
+		[JsonProperty("variant")]
+		string Variant { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IcuCollationTokenFilter : TokenFilterBase, IIcuCollationTokenFilter
 	{
 		public IcuCollationTokenFilter() : base("icu_collation") { }
 
-		///<inheritdoc/>
-		public string Language { get; set; }
-		///<inheritdoc/>
-		public string Country { get; set; }
-		///<inheritdoc/>
-		public string Variant { get; set; }
-		///<inheritdoc/>
-		public IcuCollationStrength? Strength { get; set; }
-		///<inheritdoc/>
-		public IcuCollationDecomposition? Decomposition { get; set; }
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IcuCollationAlternate? Alternate { get; set; }
-		///<inheritdoc/>
-		public bool? CaseLevel { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public IcuCollationCaseFirst? CaseFirst { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
+		public bool? CaseLevel { get; set; }
+
+		/// <inheritdoc />
+		public string Country { get; set; }
+
+		/// <inheritdoc />
+		public IcuCollationDecomposition? Decomposition { get; set; }
+
+		/// <inheritdoc />
+		public bool? HiraganaQuaternaryMode { get; set; }
+
+		/// <inheritdoc />
+		public string Language { get; set; }
+
+		/// <inheritdoc />
 		public bool? Numeric { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
+		public IcuCollationStrength? Strength { get; set; }
+
+		/// <inheritdoc />
 		public string VariableTop { get; set; }
-		///<inheritdoc/>
-		public bool? HiraganaQuaternaryMode { get; set; }
+
+		/// <inheritdoc />
+		public string Variant { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class IcuCollationTokenFilterDescriptor
 		: TokenFilterDescriptorBase<IcuCollationTokenFilterDescriptor, IIcuCollationTokenFilter>, IIcuCollationTokenFilter
 	{
 		protected override string Type => "icu_collation";
-
-		string IIcuCollationTokenFilter.Language { get; set; }
-		string IIcuCollationTokenFilter.Country { get; set; }
-		string IIcuCollationTokenFilter.Variant { get; set; }
-		IcuCollationStrength? IIcuCollationTokenFilter.Strength { get; set; }
-		IcuCollationDecomposition? IIcuCollationTokenFilter.Decomposition { get; set; }
 		IcuCollationAlternate? IIcuCollationTokenFilter.Alternate { get; set; }
-		bool? IIcuCollationTokenFilter.CaseLevel { get; set; }
 		IcuCollationCaseFirst? IIcuCollationTokenFilter.CaseFirst { get; set; }
+		bool? IIcuCollationTokenFilter.CaseLevel { get; set; }
+		string IIcuCollationTokenFilter.Country { get; set; }
+		IcuCollationDecomposition? IIcuCollationTokenFilter.Decomposition { get; set; }
+		bool? IIcuCollationTokenFilter.HiraganaQuaternaryMode { get; set; }
+
+		string IIcuCollationTokenFilter.Language { get; set; }
 		bool? IIcuCollationTokenFilter.Numeric { get; set; }
+		IcuCollationStrength? IIcuCollationTokenFilter.Strength { get; set; }
 		string IIcuCollationTokenFilter.VariableTop { get; set; }
-		bool? IIcuCollationTokenFilter.HiraganaQuaternaryMode { get; set; }
+		string IIcuCollationTokenFilter.Variant { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor Language(string language) => Assign(a => a.Language = language);
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor Country(string country) => Assign(a => a.Country = country);
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor Variant(string variant) => Assign(a => a.Variant = variant);
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor Strength(IcuCollationStrength? strength) => Assign(a => a.Strength = strength);
-		///<inheritdoc/>
-		public IcuCollationTokenFilterDescriptor Decomposition(IcuCollationDecomposition? decomposition) => Assign(a => a.Decomposition = decomposition);
-		///<inheritdoc/>
+
+		/// <inheritdoc />
+		public IcuCollationTokenFilterDescriptor Decomposition(IcuCollationDecomposition? decomposition) =>
+			Assign(a => a.Decomposition = decomposition);
+
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor Alternate(IcuCollationAlternate? alternate) => Assign(a => a.Alternate = alternate);
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor CaseFirst(IcuCollationCaseFirst? caseFirst) => Assign(a => a.CaseFirst = caseFirst);
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor CaseLevel(bool? caseLevel = true) => Assign(a => a.CaseLevel = caseLevel);
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor Numeric(bool? numeric = true) => Assign(a => a.Numeric = numeric);
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public IcuCollationTokenFilterDescriptor HiraganaQuaternaryMode(bool? mode = true) => Assign(a => a.HiraganaQuaternaryMode = mode);
-		///<inheritdoc/>
-		public IcuCollationTokenFilterDescriptor VariableTop(string variableTop) => Assign(a => a.VariableTop = variableTop);
 
+		/// <inheritdoc />
+		public IcuCollationTokenFilterDescriptor VariableTop(string variableTop) => Assign(a => a.VariableTop = variableTop);
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/IcuFoldingTokenFilter.cs b/src/Nest/Analysis/Plugins/Icu/IcuFoldingTokenFilter.cs
index 139e16d3204..ce699f31c26 100644
--- a/src/Nest/Analysis/Plugins/Icu/IcuFoldingTokenFilter.cs
+++ b/src/Nest/Analysis/Plugins/Icu/IcuFoldingTokenFilter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -17,16 +15,16 @@ public interface IIcuFoldingTokenFilter : ITokenFilter
 		string UnicodeSetFilter { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IcuFoldingTokenFilter : TokenFilterBase, IIcuFoldingTokenFilter
 	{
 		public IcuFoldingTokenFilter() : base("icu_folding") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string UnicodeSetFilter { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class IcuFoldingTokenFilterDescriptor
 		: TokenFilterDescriptorBase<IcuFoldingTokenFilterDescriptor, IIcuFoldingTokenFilter>, IIcuFoldingTokenFilter
 	{
@@ -34,7 +32,7 @@ public class IcuFoldingTokenFilterDescriptor
 
 		string IIcuFoldingTokenFilter.UnicodeSetFilter { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IcuFoldingTokenFilterDescriptor UnicodeSetFilter(string filter) =>
 			Assign(a => a.UnicodeSetFilter = filter);
 	}
diff --git a/src/Nest/Analysis/Plugins/Icu/IcuNormalizationCharFilter.cs b/src/Nest/Analysis/Plugins/Icu/IcuNormalizationCharFilter.cs
index 24d4dc3e5e9..057cc091744 100644
--- a/src/Nest/Analysis/Plugins/Icu/IcuNormalizationCharFilter.cs
+++ b/src/Nest/Analysis/Plugins/Icu/IcuNormalizationCharFilter.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -9,45 +8,45 @@ namespace Nest
 	/// </summary>
 	public interface IIcuNormalizationCharFilter : ICharFilter
 	{
-		/// <summary>
-		/// The type of normalization
-		/// </summary>
-		[JsonProperty("name")]
-		IcuNormalizationType? Name { get; set; }
-
 		/// <summary>
 		/// Set the mode parameter to decompose to convert nfc to nfd or nfkc to nfkd respectively
 		/// </summary>
 		[JsonProperty("mode")]
 		IcuNormalizationMode? Mode { get; set; }
+
+		/// <summary>
+		/// The type of normalization
+		/// </summary>
+		[JsonProperty("name")]
+		IcuNormalizationType? Name { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class IcuNormalizationCharFilter : CharFilterBase, IIcuNormalizationCharFilter
 	{
 		public IcuNormalizationCharFilter() : base("icu_normalizer") { }
 
-		/// <inheritdoc/>
-		public IcuNormalizationType? Name { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IcuNormalizationMode? Mode { get; set; }
+
+		/// <inheritdoc />
+		public IcuNormalizationType? Name { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IcuNormalizationCharFilterDescriptor
 		: CharFilterDescriptorBase<IcuNormalizationCharFilterDescriptor, IIcuNormalizationCharFilter>, IIcuNormalizationCharFilter
 	{
 		protected override string Type => "icu_normalizer";
-		IcuNormalizationType? IIcuNormalizationCharFilter.Name { get; set; }
 		IcuNormalizationMode? IIcuNormalizationCharFilter.Mode { get; set; }
+		IcuNormalizationType? IIcuNormalizationCharFilter.Name { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IcuNormalizationCharFilterDescriptor Name(IcuNormalizationType? name = null) =>
 			Assign(a => a.Name = name);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IcuNormalizationCharFilterDescriptor Mode(IcuNormalizationMode? mode = null) =>
 			Assign(a => a.Mode = mode);
-
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/IcuNormalizationTokenFilter.cs b/src/Nest/Analysis/Plugins/Icu/IcuNormalizationTokenFilter.cs
index 0d21393e121..06c0a02b198 100644
--- a/src/Nest/Analysis/Plugins/Icu/IcuNormalizationTokenFilter.cs
+++ b/src/Nest/Analysis/Plugins/Icu/IcuNormalizationTokenFilter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -17,16 +15,16 @@ public interface IIcuNormalizationTokenFilter : ITokenFilter
 		IcuNormalizationType? Name { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IcuNormalizationTokenFilter : TokenFilterBase, IIcuNormalizationTokenFilter
 	{
 		public IcuNormalizationTokenFilter() : base("icu_normalizer") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IcuNormalizationType? Name { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class IcuNormalizationTokenFilterDescriptor
 		: TokenFilterDescriptorBase<IcuNormalizationTokenFilterDescriptor, IIcuNormalizationTokenFilter>, IIcuNormalizationTokenFilter
 	{
@@ -34,7 +32,7 @@ public class IcuNormalizationTokenFilterDescriptor
 
 		IcuNormalizationType? IIcuNormalizationTokenFilter.Name { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IcuNormalizationTokenFilterDescriptor Name(IcuNormalizationType? name) => Assign(a => a.Name = name);
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/IcuTokenizer.cs b/src/Nest/Analysis/Plugins/Icu/IcuTokenizer.cs
index 288f69af4a7..1bd9e6c1025 100644
--- a/src/Nest/Analysis/Plugins/Icu/IcuTokenizer.cs
+++ b/src/Nest/Analysis/Plugins/Icu/IcuTokenizer.cs
@@ -19,16 +19,16 @@ public interface IIcuTokenizer : ITokenizer
 		string RuleFiles { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IcuTokenizer : TokenizerBase, IIcuTokenizer
-    {
-		public IcuTokenizer() { Type = "icu_tokenizer"; }
+	{
+		public IcuTokenizer() => Type = "icu_tokenizer";
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string RuleFiles { get; set; }
-    }
+	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IcuTokenizerDescriptor
 		: TokenizerDescriptorBase<IcuTokenizerDescriptor, IIcuTokenizer>, IIcuTokenizer
 	{
@@ -36,7 +36,7 @@ public class IcuTokenizerDescriptor
 
 		string IIcuTokenizer.RuleFiles { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IcuTokenizerDescriptor RuleFiles(string ruleFiles) => Assign(a => a.RuleFiles = ruleFiles);
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/IcuTransformTokenFilter.cs b/src/Nest/Analysis/Plugins/Icu/IcuTransformTokenFilter.cs
index ae5eb02f1bb..0542d372f06 100644
--- a/src/Nest/Analysis/Plugins/Icu/IcuTransformTokenFilter.cs
+++ b/src/Nest/Analysis/Plugins/Icu/IcuTransformTokenFilter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -21,18 +19,18 @@ public interface IIcuTransformTokenFilter : ITokenFilter
 		string Id { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IcuTransformTokenFilter : TokenFilterBase, IIcuTransformTokenFilter
 	{
 		public IcuTransformTokenFilter() : base("icu_transform") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IcuTransformDirection? Direction { get; set; }
 
 		public string Id { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class IcuTransformTokenFilterDescriptor
 		: TokenFilterDescriptorBase<IcuTransformTokenFilterDescriptor, IIcuTransformTokenFilter>, IIcuTransformTokenFilter
 	{
@@ -41,10 +39,10 @@ public class IcuTransformTokenFilterDescriptor
 		IcuTransformDirection? IIcuTransformTokenFilter.Direction { get; set; }
 		string IIcuTransformTokenFilter.Id { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IcuTransformTokenFilterDescriptor Direction(IcuTransformDirection? direction) => Assign(a => a.Direction = direction);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IcuTransformTokenFilterDescriptor Id(string id) => Assign(a => a.Id = id);
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/Normalization/IcuNormalizationMode.cs b/src/Nest/Analysis/Plugins/Icu/Normalization/IcuNormalizationMode.cs
index 1efca53c301..7164c22c1f5 100644
--- a/src/Nest/Analysis/Plugins/Icu/Normalization/IcuNormalizationMode.cs
+++ b/src/Nest/Analysis/Plugins/Icu/Normalization/IcuNormalizationMode.cs
@@ -13,13 +13,14 @@ public enum IcuNormalizationMode
 		/// <summary>
 		/// Switch normalization type to decompose
 		/// </summary>
-		[EnumMember(Value="decompose")]
+		[EnumMember(Value = "decompose")]
 		Decompose,
+
 		/// <summary>
 		/// Switch normalization type to compose, which is the default so you'd never need to set this
 		/// Included here for completeness sake because the Java API has it.
 		/// </summary>
-		[EnumMember(Value="compose")]
+		[EnumMember(Value = "compose")]
 		Compose
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/Normalization/IcuNormalizationType.cs b/src/Nest/Analysis/Plugins/Icu/Normalization/IcuNormalizationType.cs
index 982061934c4..0824674906d 100644
--- a/src/Nest/Analysis/Plugins/Icu/Normalization/IcuNormalizationType.cs
+++ b/src/Nest/Analysis/Plugins/Icu/Normalization/IcuNormalizationType.cs
@@ -13,17 +13,19 @@ public enum IcuNormalizationType
 		/// <summary>
 		/// Characters are decomposed and then recomposed by canonical equivalence.
 		/// </summary>
-		[EnumMember(Value="nfc")]
+		[EnumMember(Value = "nfc")]
 		Canonical,
+
 		/// <summary>
 		/// Characters are decomposed by compatibility, then recomposed by canonical equivalence.
 		/// </summary>
-		[EnumMember(Value="nfkc")]
+		[EnumMember(Value = "nfkc")]
 		Compatibility,
+
 		/// <summary>
 		/// Characters are decomposed by compatibility, then recomposed by canonical equivalence with case folding
 		/// </summary>
-		[EnumMember(Value="nfkc_cf")]
+		[EnumMember(Value = "nfkc_cf")]
 		CompatibilityCaseFold
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Icu/Transform/IcuNormalizationType.cs b/src/Nest/Analysis/Plugins/Icu/Transform/IcuNormalizationType.cs
index f251c8c8ede..08670cc0de8 100644
--- a/src/Nest/Analysis/Plugins/Icu/Transform/IcuNormalizationType.cs
+++ b/src/Nest/Analysis/Plugins/Icu/Transform/IcuNormalizationType.cs
@@ -11,10 +11,11 @@ namespace Nest
 	public enum IcuTransformDirection
 	{
 		/// <summary>LTR</summary>
-		[EnumMember(Value="forward")]
+		[EnumMember(Value = "forward")]
 		Forward,
+
 		/// <summary> RTL</summary>
-		[EnumMember(Value="reverse")]
+		[EnumMember(Value = "reverse")]
 		Reverse,
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiAnalyzer.cs b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiAnalyzer.cs
index d99140f0ce6..200a2382162 100644
--- a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiAnalyzer.cs
+++ b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiAnalyzer.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -16,19 +15,18 @@ public interface IKuromojiAnalyzer : IAnalyzer
 		string UserDictionary { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiAnalyzer : AnalyzerBase, IKuromojiAnalyzer
 	{
-		public KuromojiAnalyzer() : base("kuromoji") {}
+		public KuromojiAnalyzer() : base("kuromoji") { }
 
 		public KuromojiTokenizationMode? Mode { get; set; }
 
 		public string UserDictionary { get; set; }
 	}
 
-	/// <inheritdoc/>
-	public class KuromojiAnalyzerDescriptor :
-		AnalyzerDescriptorBase<KuromojiAnalyzerDescriptor, IKuromojiAnalyzer>, IKuromojiAnalyzer
+	/// <inheritdoc />
+	public class KuromojiAnalyzerDescriptor : AnalyzerDescriptorBase<KuromojiAnalyzerDescriptor, IKuromojiAnalyzer>, IKuromojiAnalyzer
 	{
 		protected override string Type => "kuromoji";
 
@@ -38,6 +36,5 @@ public class KuromojiAnalyzerDescriptor :
 		public KuromojiAnalyzerDescriptor Mode(KuromojiTokenizationMode? mode) => Assign(a => a.Mode = mode);
 
 		public KuromojiAnalyzerDescriptor UserDictionary(string userDictionary) => Assign(a => a.UserDictionary = userDictionary);
-
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiIterationMarkCharFilter.cs b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiIterationMarkCharFilter.cs
index 9f30fc52c79..b2caf4fa203 100644
--- a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiIterationMarkCharFilter.cs
+++ b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiIterationMarkCharFilter.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -9,39 +8,39 @@ namespace Nest
 	/// </summary>
 	public interface IKuromojiIterationMarkCharFilter : ICharFilter
 	{
-		[JsonProperty("normalize_kanji")]
-		bool? NormalizeKanji { get; set; }
-
 		[JsonProperty("normalize_kana")]
 		bool? NormalizeKana { get; set; }
+
+		[JsonProperty("normalize_kanji")]
+		bool? NormalizeKanji { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class KuromojiIterationMarkCharFilter : CharFilterBase, IKuromojiIterationMarkCharFilter
 	{
 		public KuromojiIterationMarkCharFilter() : base("kuromoji_iteration_mark") { }
 
-		/// <inheritdoc/>
-		public bool? NormalizeKanji { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? NormalizeKana { get; set; }
+
+		/// <inheritdoc />
+		public bool? NormalizeKanji { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiIterationMarkCharFilterDescriptor
 		: CharFilterDescriptorBase<KuromojiIterationMarkCharFilterDescriptor, IKuromojiIterationMarkCharFilter>, IKuromojiIterationMarkCharFilter
 	{
 		protected override string Type => "kuromoji_iteration_mark";
-		bool? IKuromojiIterationMarkCharFilter.NormalizeKanji { get; set; }
 		bool? IKuromojiIterationMarkCharFilter.NormalizeKana { get; set; }
+		bool? IKuromojiIterationMarkCharFilter.NormalizeKanji { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiIterationMarkCharFilterDescriptor NormalizeKanji(bool? normalize = true) =>
 			Assign(a => a.NormalizeKanji = normalize);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiIterationMarkCharFilterDescriptor NormalizeKana(bool? normalize = true) =>
 			Assign(a => a.NormalizeKana = normalize);
-
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiPartOfSpeechTokenFilter.cs b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiPartOfSpeechTokenFilter.cs
index b244f976973..2b7a6c9dabb 100644
--- a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiPartOfSpeechTokenFilter.cs
+++ b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiPartOfSpeechTokenFilter.cs
@@ -17,16 +17,16 @@ public interface IKuromojiPartOfSpeechTokenFilter : ITokenFilter
 		IEnumerable<string> StopTags { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiPartOfSpeechTokenFilter : TokenFilterBase, IKuromojiPartOfSpeechTokenFilter
 	{
 		public KuromojiPartOfSpeechTokenFilter() : base("kuromoji_part_of_speech") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> StopTags { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiPartOfSpeechTokenFilterDescriptor
 		: TokenFilterDescriptorBase<KuromojiPartOfSpeechTokenFilterDescriptor, IKuromojiPartOfSpeechTokenFilter>, IKuromojiPartOfSpeechTokenFilter
 	{
@@ -34,12 +34,10 @@ public class KuromojiPartOfSpeechTokenFilterDescriptor
 
 		IEnumerable<string> IKuromojiPartOfSpeechTokenFilter.StopTags { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiPartOfSpeechTokenFilterDescriptor StopTags(IEnumerable<string> stopTags) => Assign(a => a.StopTags = stopTags);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiPartOfSpeechTokenFilterDescriptor StopTags(params string[] stopTags) => Assign(a => a.StopTags = stopTags);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiReadingFormTokenFilter.cs b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiReadingFormTokenFilter.cs
index 4a3d21f53f6..1a5254dedd0 100644
--- a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiReadingFormTokenFilter.cs
+++ b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiReadingFormTokenFilter.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -16,16 +15,16 @@ public interface IKuromojiReadingFormTokenFilter : ITokenFilter
 		bool? UseRomaji { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiReadingFormTokenFilter : TokenFilterBase, IKuromojiReadingFormTokenFilter
 	{
 		public KuromojiReadingFormTokenFilter() : base("kuromoji_readingform") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? UseRomaji { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiReadingFormTokenFilterDescriptor
 		: TokenFilterDescriptorBase<KuromojiReadingFormTokenFilterDescriptor, IKuromojiReadingFormTokenFilter>, IKuromojiReadingFormTokenFilter
 	{
@@ -33,10 +32,7 @@ public class KuromojiReadingFormTokenFilterDescriptor
 
 		bool? IKuromojiReadingFormTokenFilter.UseRomaji { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiReadingFormTokenFilterDescriptor UseRomaji(bool? useRomaji = true) => Assign(a => a.UseRomaji = useRomaji);
-
-
 	}
-
 }
diff --git a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiStemmerTokenFilter.cs b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiStemmerTokenFilter.cs
index 503923d2724..d0bd41330c3 100644
--- a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiStemmerTokenFilter.cs
+++ b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiStemmerTokenFilter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -18,16 +16,16 @@ public interface IKuromojiStemmerTokenFilter : ITokenFilter
 		int? MinimumLength { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiStemmerTokenFilter : TokenFilterBase, IKuromojiStemmerTokenFilter
 	{
 		public KuromojiStemmerTokenFilter() : base("kuromoji_stemmer") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MinimumLength { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiStemmerTokenFilterDescriptor
 		: TokenFilterDescriptorBase<KuromojiStemmerTokenFilterDescriptor, IKuromojiStemmerTokenFilter>, IKuromojiStemmerTokenFilter
 	{
@@ -35,7 +33,7 @@ public class KuromojiStemmerTokenFilterDescriptor
 
 		int? IKuromojiStemmerTokenFilter.MinimumLength { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiStemmerTokenFilterDescriptor MinimumLength(int? minimumLength) => Assign(a => a.MinimumLength = minimumLength);
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiTokenizationMode.cs b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiTokenizationMode.cs
index b66b54429f2..c54073a1d85 100644
--- a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiTokenizationMode.cs
+++ b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiTokenizationMode.cs
@@ -16,17 +16,18 @@ public enum KuromojiTokenizationMode
 		/// </summary>
 		[EnumMember(Value = "normal")]
 		Normal,
+
 		/// <summary>
 		/// Segmentation geared towards search. This includes a decompounding process for long nouns,
 		/// also including the full compound token as a synonym.
 		/// </summary>
 		[EnumMember(Value = "search")]
 		Search,
+
 		/// <summary>
 		/// Extended mode outputs unigrams for unknown words.
 		/// </summary>
 		[EnumMember(Value = "extended")]
 		Extended
-
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiTokenizer.cs b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiTokenizer.cs
index 7c1eafe9487..a6530100500 100644
--- a/src/Nest/Analysis/Plugins/Kuromoji/KuromojiTokenizer.cs
+++ b/src/Nest/Analysis/Plugins/Kuromoji/KuromojiTokenizer.cs
@@ -8,12 +8,6 @@ namespace Nest
 	/// </summary>
 	public interface IKuromojiTokenizer : ITokenizer
 	{
-		/// <summary>
-		/// The tokenization mode determines how the tokenizer handles compound and unknown words.
-		/// </summary>
-		[JsonProperty("mode")]
-		KuromojiTokenizationMode? Mode { get; set; }
-
 		/// <summary>
 		/// Whether punctuation should be discarded from the output. Defaults to true.
 		/// </summary>
@@ -21,74 +15,80 @@ public interface IKuromojiTokenizer : ITokenizer
 		bool? DiscardPunctuation { get; set; }
 
 		/// <summary>
-		/// The Kuromoji tokenizer uses the MeCab-IPADIC dictionary by default. A user_dictionary may be
-		/// appended to the default dictionary.
+		/// The tokenization mode determines how the tokenizer handles compound and unknown words.
 		/// </summary>
-		[JsonProperty("user_dictionary")]
-		string UserDictionary { get; set; }
+		[JsonProperty("mode")]
+		KuromojiTokenizationMode? Mode { get; set; }
 
 		/// <summary>
-		///The nbest_examples can be used to find a nbest_cost value based on examples. For example,
-		/// a value of /箱根山-箱根/成田空港-成田/ indicates that in the texts, 箱根山 (Mt. Hakone) and 成田空港 (Narita Airport)
-		/// we’d like a cost that gives is us 箱根 (Hakone) and 成田 (Narita).
+		/// The nbest_cost parameter specifies an additional Viterbi cost. The KuromojiTokenizer will include all tokens in
+		/// Viterbi paths that are within the nbest_cost value of the best path.
+		/// </summary>
+		[JsonProperty("nbest_cost")]
+		int? NBestCost { get; set; }
+
+		/// <summary>
+		/// The nbest_examples can be used to find a nbest_cost value based on examples. For example,
+		///  a value of /箱根山-箱根/成田空港-成田/ indicates that in the texts, 箱根山 (Mt. Hakone) and 成田空港 (Narita Airport)
+		///  we’d like a cost that gives is us 箱根 (Hakone) and 成田 (Narita).
 		/// </summary>
 		[JsonProperty("nbest_examples")]
 		string NBestExamples { get; set; }
 
 		/// <summary>
-		/// The nbest_cost parameter specifies an additional Viterbi cost. The KuromojiTokenizer will include all tokens in
-		/// Viterbi paths that are within the nbest_cost value of the best path.
+		/// The Kuromoji tokenizer uses the MeCab-IPADIC dictionary by default. A user_dictionary may be
+		/// appended to the default dictionary.
 		/// </summary>
-		[JsonProperty("nbest_cost")]
-		int? NBestCost { get; set; }
+		[JsonProperty("user_dictionary")]
+		string UserDictionary { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiTokenizer : TokenizerBase, IKuromojiTokenizer
-    {
-		public KuromojiTokenizer() { Type = "kuromoji_tokenizer"; }
-
-		/// <inheritdoc/>
-		public KuromojiTokenizationMode? Mode { get; set; }
+	{
+		public KuromojiTokenizer() => Type = "kuromoji_tokenizer";
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? DiscardPunctuation { get; set; }
 
-		/// <inheritdoc/>
-		public string UserDictionary { get; set; }
+		/// <inheritdoc />
+		public KuromojiTokenizationMode? Mode { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public int? NBestCost { get; set; }
+
+		/// <inheritdoc />
 		public string NBestExamples { get; set; }
 
-		/// <inheritdoc/>
-		public int? NBestCost { get; set; }
-    }
+		/// <inheritdoc />
+		public string UserDictionary { get; set; }
+	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KuromojiTokenizerDescriptor
 		: TokenizerDescriptorBase<KuromojiTokenizerDescriptor, IKuromojiTokenizer>, IKuromojiTokenizer
 	{
 		protected override string Type => "kuromoji_tokenizer";
+		bool? IKuromojiTokenizer.DiscardPunctuation { get; set; }
 
 		KuromojiTokenizationMode? IKuromojiTokenizer.Mode { get; set; }
-		bool? IKuromojiTokenizer.DiscardPunctuation { get; set; }
-		string IKuromojiTokenizer.UserDictionary { get; set; }
-		string IKuromojiTokenizer.NBestExamples { get; set; }
 		int? IKuromojiTokenizer.NBestCost { get; set; }
+		string IKuromojiTokenizer.NBestExamples { get; set; }
+		string IKuromojiTokenizer.UserDictionary { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiTokenizerDescriptor Mode(KuromojiTokenizationMode? mode) => Assign(a => a.Mode = mode);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiTokenizerDescriptor DiscardPunctuation(bool? discard = true) => Assign(a => a.DiscardPunctuation = discard);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiTokenizerDescriptor UserDictionary(string userDictionary) => Assign(a => a.UserDictionary = userDictionary);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiTokenizerDescriptor NBestExamples(string examples) => Assign(a => a.NBestExamples = examples);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public KuromojiTokenizerDescriptor NBestCost(int? cost) => Assign(a => a.NBestCost = cost);
 	}
 }
diff --git a/src/Nest/Analysis/Plugins/Phonetic/PhoneticEncoder.cs b/src/Nest/Analysis/Plugins/Phonetic/PhoneticEncoder.cs
index f63aac80e5b..7bf44c11fe7 100644
--- a/src/Nest/Analysis/Plugins/Phonetic/PhoneticEncoder.cs
+++ b/src/Nest/Analysis/Plugins/Phonetic/PhoneticEncoder.cs
@@ -9,26 +9,37 @@ public enum PhoneticEncoder
 	{
 		[EnumMember(Value = "metaphone")]
 		Metaphone,
+
 		[EnumMember(Value = "double_metaphone")]
 		DoubleMetaphone,
+
 		[EnumMember(Value = "soundex")]
 		Soundex,
+
 		[EnumMember(Value = "refined_soundex")]
 		RefinedSoundex,
+
 		[EnumMember(Value = "caverphone1")]
 		Caverphone1,
+
 		[EnumMember(Value = "caverphone2")]
 		Caverphone2,
+
 		[EnumMember(Value = "cologne")]
 		Cologne,
+
 		[EnumMember(Value = "nysiis")]
 		Nysiis,
+
 		[EnumMember(Value = "koelnerphonetik")]
 		KoelnerPhonetik,
+
 		[EnumMember(Value = "haasephonetik")]
 		HaasePhonetik,
+
 		[EnumMember(Value = "beider_morse")]
 		Beidermorse,
+
 		[EnumMember(Value = "daitch_mokotoff")]
 		DaitchMokotoff
 	}
diff --git a/src/Nest/Analysis/Plugins/Phonetic/PhoneticLanguage.cs b/src/Nest/Analysis/Plugins/Phonetic/PhoneticLanguage.cs
index 7f6732228b9..893ded4c559 100644
--- a/src/Nest/Analysis/Plugins/Phonetic/PhoneticLanguage.cs
+++ b/src/Nest/Analysis/Plugins/Phonetic/PhoneticLanguage.cs
@@ -43,4 +43,4 @@ public enum PhoneticLanguage
 		[EnumMember(Value = "spanish")]
 		Spanish,
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Plugins/Phonetic/PhoneticNameType.cs b/src/Nest/Analysis/Plugins/Phonetic/PhoneticNameType.cs
index 54dfd7dd9ef..6aec77c132a 100644
--- a/src/Nest/Analysis/Plugins/Phonetic/PhoneticNameType.cs
+++ b/src/Nest/Analysis/Plugins/Phonetic/PhoneticNameType.cs
@@ -16,4 +16,4 @@ public enum PhoneticNameType
 		[EnumMember(Value = "sephardic")]
 		Sephardic
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Plugins/Phonetic/PhoneticRuleType.cs b/src/Nest/Analysis/Plugins/Phonetic/PhoneticRuleType.cs
index d5ba7190274..ef0674b6074 100644
--- a/src/Nest/Analysis/Plugins/Phonetic/PhoneticRuleType.cs
+++ b/src/Nest/Analysis/Plugins/Phonetic/PhoneticRuleType.cs
@@ -13,4 +13,4 @@ public enum PhoneticRuleType
 		[EnumMember(Value = "exact")]
 		Exact
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Plugins/Phonetic/PhoneticTokenFilter.cs b/src/Nest/Analysis/Plugins/Phonetic/PhoneticTokenFilter.cs
index 63eed861f94..946c80b899f 100644
--- a/src/Nest/Analysis/Plugins/Phonetic/PhoneticTokenFilter.cs
+++ b/src/Nest/Analysis/Plugins/Phonetic/PhoneticTokenFilter.cs
@@ -19,47 +19,47 @@ public interface IPhoneticTokenFilter : ITokenFilter
 		PhoneticEncoder? Encoder { get; set; }
 
 		/// <summary>
-		///The replace parameter (defaults to true) controls if the token processed should be replaced
-		/// with the encoded one (set it to true), or added (set it to false).
+		/// An array of languages to check. If not specified, then the language will be guessed
 		/// </summary>
-		[JsonProperty("replace")]
-		bool? Replace { get; set; }
+		/// <remarks>
+		/// Valid for <see cref="PhoneticEncoder.Beidermorse" /> only
+		/// </remarks>
+		[JsonProperty("languageset")]
+		IEnumerable<PhoneticLanguage> LanguageSet { get; set; }
 
 		/// <summary>
 		/// The maximum length of the emitted metaphone token. Defaults to <c>4</c>
 		/// </summary>
 		/// <remarks>
-		/// Valid for <see cref="PhoneticEncoder.DoubleMetaphone"/> only
+		/// Valid for <see cref="PhoneticEncoder.DoubleMetaphone" /> only
 		/// </remarks>
 		[JsonProperty("max_code_len")]
 		int? MaxCodeLength { get; set; }
 
-		/// <summary>
-		/// Whether matching should be exact or approximate. Defaults to approximate
-		/// </summary>
-		/// <remarks>
-		/// Valid for <see cref="PhoneticEncoder.Beidermorse"/> only
-		/// </remarks>
-		[JsonProperty("rule_type")]
-		PhoneticRuleType? RuleType { get; set; }
-
 		/// <summary>
 		/// Whether names are ashkenazi, sephardic, or generic. Defaults to generic
 		/// </summary>
 		/// <remarks>
-		/// Valid for <see cref="PhoneticEncoder.Beidermorse"/> only
+		/// Valid for <see cref="PhoneticEncoder.Beidermorse" /> only
 		/// </remarks>
 		[JsonProperty("name_type")]
 		PhoneticNameType? NameType { get; set; }
 
 		/// <summary>
-		/// An array of languages to check. If not specified, then the language will be guessed
+		/// The replace parameter (defaults to true) controls if the token processed should be replaced
+		///  with the encoded one (set it to true), or added (set it to false).
+		/// </summary>
+		[JsonProperty("replace")]
+		bool? Replace { get; set; }
+
+		/// <summary>
+		/// Whether matching should be exact or approximate. Defaults to approximate
 		/// </summary>
 		/// <remarks>
-		/// Valid for <see cref="PhoneticEncoder.Beidermorse"/> only
+		/// Valid for <see cref="PhoneticEncoder.Beidermorse" /> only
 		/// </remarks>
-		[JsonProperty("languageset")]
-		IEnumerable<PhoneticLanguage> LanguageSet { get; set; }
+		[JsonProperty("rule_type")]
+		PhoneticRuleType? RuleType { get; set; }
 	}
 
 	/// <inheritdoc cref="IPhoneticTokenFilter" />
@@ -67,23 +67,23 @@ public class PhoneticTokenFilter : TokenFilterBase, IPhoneticTokenFilter
 	{
 		public PhoneticTokenFilter() : base("phonetic") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PhoneticEncoder? Encoder { get; set; }
 
-		/// <inheritdoc/>
-		public bool? Replace { get; set; }
+		/// <inheritdoc />
+		public IEnumerable<PhoneticLanguage> LanguageSet { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MaxCodeLength { get; set; }
 
-		/// <inheritdoc/>
-		public PhoneticRuleType? RuleType { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PhoneticNameType? NameType { get; set; }
 
-		/// <inheritdoc/>
-		public IEnumerable<PhoneticLanguage> LanguageSet { get; set; }
+		/// <inheritdoc />
+		public bool? Replace { get; set; }
+
+		/// <inheritdoc />
+		public PhoneticRuleType? RuleType { get; set; }
 	}
 
 	/// <inheritdoc cref="IPhoneticTokenFilter" />
@@ -91,13 +91,13 @@ public class PhoneticTokenFilterDescriptor
 		: TokenFilterDescriptorBase<PhoneticTokenFilterDescriptor, IPhoneticTokenFilter>, IPhoneticTokenFilter
 	{
 		protected override string Type => "phonetic";
-
-		bool? IPhoneticTokenFilter.Replace { get; set; }
 		PhoneticEncoder? IPhoneticTokenFilter.Encoder { get; set; }
+		IEnumerable<PhoneticLanguage> IPhoneticTokenFilter.LanguageSet { get; set; }
 		int? IPhoneticTokenFilter.MaxCodeLength { get; set; }
-		PhoneticRuleType? IPhoneticTokenFilter.RuleType { get; set; }
 		PhoneticNameType? IPhoneticTokenFilter.NameType { get; set; }
-		IEnumerable<PhoneticLanguage> IPhoneticTokenFilter.LanguageSet { get; set; }
+
+		bool? IPhoneticTokenFilter.Replace { get; set; }
+		PhoneticRuleType? IPhoneticTokenFilter.RuleType { get; set; }
 
 		/// <inheritdoc cref="IPhoneticTokenFilter.Replace" />
 		public PhoneticTokenFilterDescriptor Replace(bool? replace = true) => Assign(a => a.Replace = replace);
diff --git a/src/Nest/Analysis/StopWords.cs b/src/Nest/Analysis/StopWords.cs
index fdb94d6d653..b9c0f3e105c 100644
--- a/src/Nest/Analysis/StopWords.cs
+++ b/src/Nest/Analysis/StopWords.cs
@@ -8,33 +8,33 @@ namespace Nest
 	public class StopWords : Union<string, IEnumerable<string>>
 	{
 		public StopWords(string item) : base(item) { }
+
 		public StopWords(IEnumerable<string> item) : base(item) { }
 
 		public static implicit operator StopWords(string first) => new StopWords(first);
+
 		public static implicit operator StopWords(List<string> second) => new StopWords(second);
+
 		public static implicit operator StopWords(string[] second) => new StopWords(second);
 	}
 
-	internal class StopWordsJsonConverter :JsonConverter
+	internal class StopWordsJsonConverter : JsonConverter
 	{
+		public static UnionJsonConverter<string, IEnumerable<string>> Unionconverter = new UnionJsonConverter<string, IEnumerable<string>>();
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
 
-		public static UnionJsonConverter<string, IEnumerable<string>> Unionconverter = new UnionJsonConverter<string, IEnumerable<string>>();
-
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var union = Unionconverter.ReadJson(reader, objectType, existingValue, serializer) as Union<string, IEnumerable<string>>;
 			if (union.Item1 != null) return new StopWords(union.Item1);
+
 			return new StopWords(union.Item2);
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
 			Unionconverter.WriteJson(writer, value, serializer);
-		}
 
 		public override bool CanConvert(Type objectType) => true;
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/AsciiFoldingTokenFilter.cs b/src/Nest/Analysis/TokenFilters/AsciiFoldingTokenFilter.cs
index ed97554e41c..22f7f4786cb 100644
--- a/src/Nest/Analysis/TokenFilters/AsciiFoldingTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/AsciiFoldingTokenFilter.cs
@@ -2,7 +2,6 @@
 
 namespace Nest
 {
-
 	/// <summary>
 	/// A token filter of type asciifolding that converts alphabetic, numeric, and symbolic Unicode characters which are
 	/// <para> not in the first 127 ASCII characters (the “Basic Latin” Unicode block) into their ASCII equivalents, if one exists.</para>
@@ -13,7 +12,7 @@ public interface IAsciiFoldingTokenFilter : ITokenFilter
 		bool? PreserveOriginal { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class AsciiFoldingTokenFilter : TokenFilterBase, IAsciiFoldingTokenFilter
 	{
 		public AsciiFoldingTokenFilter() : base("asciifolding") { }
@@ -21,7 +20,7 @@ public AsciiFoldingTokenFilter() : base("asciifolding") { }
 		public bool? PreserveOriginal { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class AsciiFoldingTokenFilterDescriptor
 		: TokenFilterDescriptorBase<AsciiFoldingTokenFilterDescriptor, IAsciiFoldingTokenFilter>, IAsciiFoldingTokenFilter
 	{
@@ -29,8 +28,7 @@ public class AsciiFoldingTokenFilterDescriptor
 
 		bool? IAsciiFoldingTokenFilter.PreserveOriginal { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AsciiFoldingTokenFilterDescriptor PreserveOriginal(bool? preserve = true) => Assign(a => a.PreserveOriginal = preserve);
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/CommonGramsTokenFilter.cs b/src/Nest/Analysis/TokenFilters/CommonGramsTokenFilter.cs
index 78f427ff2c4..7b9ec0b7ad4 100644
--- a/src/Nest/Analysis/TokenFilters/CommonGramsTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/CommonGramsTokenFilter.cs
@@ -4,8 +4,8 @@
 namespace Nest
 {
 	/// <summary>
-	/// Token filter that generates bigrams for frequently occuring terms. Single terms are still indexed.
-	///<para>Note, common_words or common_words_path field is required.</para>
+	///  Token filter that generates bigrams for frequently occuring terms. Single terms are still indexed.
+	/// <para>Note, common_words or common_words_path field is required.</para>
 	/// </summary>
 	public interface ICommonGramsTokenFilter : ITokenFilter
 	{
@@ -35,27 +35,26 @@ public interface ICommonGramsTokenFilter : ITokenFilter
 		bool? QueryMode { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class CommonGramsTokenFilter : TokenFilterBase, ICommonGramsTokenFilter
 	{
 		public CommonGramsTokenFilter() : base("common_grams") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> CommonWords { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string CommonWordsPath { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? IgnoreCase { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? QueryMode { get; set; }
-
 	}
 
-	///<inheritdoc/>
-	public class CommonGramsTokenFilterDescriptor 
+	/// <inheritdoc />
+	public class CommonGramsTokenFilterDescriptor
 		: TokenFilterDescriptorBase<CommonGramsTokenFilterDescriptor, ICommonGramsTokenFilter>, ICommonGramsTokenFilter
 	{
 		protected override string Type => "common_grams";
@@ -65,21 +64,19 @@ public class CommonGramsTokenFilterDescriptor
 		bool? ICommonGramsTokenFilter.IgnoreCase { get; set; }
 		bool? ICommonGramsTokenFilter.QueryMode { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonGramsTokenFilterDescriptor QueryMode(bool? queryMode = true) => Assign(a => a.QueryMode = queryMode);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonGramsTokenFilterDescriptor IgnoreCase(bool? ignoreCase = true) => Assign(a => a.IgnoreCase = ignoreCase);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonGramsTokenFilterDescriptor CommonWordsPath(string path) => Assign(a => a.CommonWordsPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonGramsTokenFilterDescriptor CommonWords(IEnumerable<string> commonWords) => Assign(a => a.CommonWords = commonWords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonGramsTokenFilterDescriptor CommonWords(params string[] commonWords) => Assign(a => a.CommonWords = commonWords);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/CompoundWord/CompoundWordTokenFilterBase.cs b/src/Nest/Analysis/TokenFilters/CompoundWord/CompoundWordTokenFilterBase.cs
index 9f602b0f367..30ef879cdbf 100644
--- a/src/Nest/Analysis/TokenFilters/CompoundWord/CompoundWordTokenFilterBase.cs
+++ b/src/Nest/Analysis/TokenFilters/CompoundWord/CompoundWordTokenFilterBase.cs
@@ -8,18 +8,6 @@ namespace Nest
 	/// </summary>
 	public interface ICompoundWordTokenFilter : ITokenFilter
 	{
-		/// <summary>
-		/// A list of words to use.
-		/// </summary>
-		[JsonProperty("word_list")]
-		IEnumerable<string> WordList { get; set; }
-
-		/// <summary>
-		/// A path (either relative to config location, or absolute) to a list of words.
-		/// </summary>
-		[JsonProperty("word_list_path")]
-		string WordListPath { get; set; }
-
 		/// <summary>
 		/// A path (either relative to config location, or absolute) to a FOP XML hyphenation pattern file.
 		/// </summary>
@@ -27,10 +15,10 @@ public interface ICompoundWordTokenFilter : ITokenFilter
 		string HyphenationPatternsPath { get; set; }
 
 		/// <summary>
-		/// Minimum word size.
+		/// Maximum subword size.
 		/// </summary>
-		[JsonProperty("min_word_size")]
-		int? MinWordSize { get; set; }
+		[JsonProperty("max_subword_size")]
+		int? MaxSubwordSize { get; set; }
 
 		/// <summary>
 		/// Minimum subword size.
@@ -39,80 +27,91 @@ public interface ICompoundWordTokenFilter : ITokenFilter
 		int? MinSubwordSize { get; set; }
 
 		/// <summary>
-		/// Maximum subword size.
+		/// Minimum word size.
 		/// </summary>
-		[JsonProperty("max_subword_size")]
-		int? MaxSubwordSize { get; set; }
+		[JsonProperty("min_word_size")]
+		int? MinWordSize { get; set; }
 
 		/// <summary>
 		/// Only matching the longest.
 		/// </summary>
 		[JsonProperty("only_longest_match")]
 		bool? OnlyLongestMatch { get; set; }
+
+		/// <summary>
+		/// A list of words to use.
+		/// </summary>
+		[JsonProperty("word_list")]
+		IEnumerable<string> WordList { get; set; }
+
+		/// <summary>
+		/// A path (either relative to config location, or absolute) to a list of words.
+		/// </summary>
+		[JsonProperty("word_list_path")]
+		string WordListPath { get; set; }
 	}
 
 	public abstract class CompoundWordTokenFilterBase : TokenFilterBase, ICompoundWordTokenFilter
 	{
 		protected CompoundWordTokenFilterBase(string type) : base(type) { }
 
-		/// <inheritdoc/>
-		public IEnumerable<string> WordList { get; set; }
-
-		/// <inheritdoc/>
-		public string WordListPath { get; set; }
+		public string HyphenationPatternsPath { get; set; }
 
-		/// <inheritdoc/>
-		public int? MinWordSize { get; set; }
+		/// <inheritdoc />
+		public int? MaxSubwordSize { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MinSubwordSize { get; set; }
 
-		/// <inheritdoc/>
-		public int? MaxSubwordSize { get; set; }
+		/// <inheritdoc />
+		public int? MinWordSize { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? OnlyLongestMatch { get; set; }
 
-		public string HyphenationPatternsPath { get; set; }
+		/// <inheritdoc />
+		public IEnumerable<string> WordList { get; set; }
+
+		/// <inheritdoc />
+		public string WordListPath { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public abstract class CompoundWordTokenFilterDescriptorBase<TCompound, TCompoundInterface>
 		: TokenFilterDescriptorBase<TCompound, TCompoundInterface>, ICompoundWordTokenFilter
 		where TCompound : CompoundWordTokenFilterDescriptorBase<TCompound, TCompoundInterface>, TCompoundInterface
 		where TCompoundInterface : class, ICompoundWordTokenFilter
 	{
-		IEnumerable<string> ICompoundWordTokenFilter.WordList { get; set; }
-		string ICompoundWordTokenFilter.WordListPath { get; set; }
-		int? ICompoundWordTokenFilter.MinWordSize { get; set; }
-		int? ICompoundWordTokenFilter.MinSubwordSize { get; set; }
+		string ICompoundWordTokenFilter.HyphenationPatternsPath { get; set; }
 		int? ICompoundWordTokenFilter.MaxSubwordSize { get; set; }
+		int? ICompoundWordTokenFilter.MinSubwordSize { get; set; }
+		int? ICompoundWordTokenFilter.MinWordSize { get; set; }
 		bool? ICompoundWordTokenFilter.OnlyLongestMatch { get; set; }
-		string ICompoundWordTokenFilter.HyphenationPatternsPath { get; set; }
+		IEnumerable<string> ICompoundWordTokenFilter.WordList { get; set; }
+		string ICompoundWordTokenFilter.WordListPath { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TCompound WordList(IEnumerable<string> wordList) => Assign(a => a.WordList = wordList);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TCompound WordList(params string[] wordList) => Assign(a => a.WordList = wordList);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TCompound WordListPath(string path) => Assign(a => a.WordListPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TCompound HyphenationPatternsPath(string path) => Assign(a => a.HyphenationPatternsPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TCompound MinWordSize(int? minWordSize) => Assign(a => a.MinWordSize = minWordSize);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TCompound MinSubwordSize(int? minSubwordSize) => Assign(a => a.MinSubwordSize = minSubwordSize);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TCompound MaxSubwordSize(int? maxSubwordSize) => Assign(a => a.MaxSubwordSize = maxSubwordSize);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TCompound OnlyLongestMatch(bool? onlyLongest = true) => Assign(a => a.OnlyLongestMatch = onlyLongest);
-
 	}
 }
diff --git a/src/Nest/Analysis/TokenFilters/CompoundWord/DictionaryDecompounderTokenFilter.cs b/src/Nest/Analysis/TokenFilters/CompoundWord/DictionaryDecompounderTokenFilter.cs
index 0d435cdc7ad..cb6f83b2449 100644
--- a/src/Nest/Analysis/TokenFilters/CompoundWord/DictionaryDecompounderTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/CompoundWord/DictionaryDecompounderTokenFilter.cs
@@ -1,16 +1,18 @@
 namespace Nest
 {
 	public interface IDictionaryDecompounderTokenFilter : ICompoundWordTokenFilter { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class DictionaryDecompounderTokenFilter : CompoundWordTokenFilterBase, IDictionaryDecompounderTokenFilter
 	{
 		public DictionaryDecompounderTokenFilter() : base("dictionary_decompounder") { }
 	}
-	///<inheritdoc/>
+
+	/// <inheritdoc />
 	public class DictionaryDecompounderTokenFilterDescriptor
 		: CompoundWordTokenFilterDescriptorBase<DictionaryDecompounderTokenFilterDescriptor, IDictionaryDecompounderTokenFilter>
-		, IDictionaryDecompounderTokenFilter
+			, IDictionaryDecompounderTokenFilter
 	{
 		protected override string Type => "dictionary_decompounder";
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/CompoundWord/HyphenationDecompounderTokenFilter.cs b/src/Nest/Analysis/TokenFilters/CompoundWord/HyphenationDecompounderTokenFilter.cs
index c67796afac4..9d31838c66d 100644
--- a/src/Nest/Analysis/TokenFilters/CompoundWord/HyphenationDecompounderTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/CompoundWord/HyphenationDecompounderTokenFilter.cs
@@ -4,17 +4,18 @@ namespace Nest
 	/// Token filters that allow to decompose compound words.
 	/// </summary>
 	public interface IHyphenationDecompounderTokenFilter : ICompoundWordTokenFilter { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class HyphenationDecompounderTokenFilter : CompoundWordTokenFilterBase, IHyphenationDecompounderTokenFilter
 	{
 		public HyphenationDecompounderTokenFilter() : base("hyphenation_decompounder") { }
 	}
-	///<inheritdoc/>
-	public class HyphenationDecompounderTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class HyphenationDecompounderTokenFilterDescriptor
 		: CompoundWordTokenFilterDescriptorBase<HyphenationDecompounderTokenFilterDescriptor, IHyphenationDecompounderTokenFilter>
-		, IHyphenationDecompounderTokenFilter
+			, IHyphenationDecompounderTokenFilter
 	{
 		protected override string Type => "hyphenation_decompounder";
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/DelimitedPayload/DelimitedPayloadEncoding.cs b/src/Nest/Analysis/TokenFilters/DelimitedPayload/DelimitedPayloadEncoding.cs
index a45bf0a96e3..a6fde9852b2 100644
--- a/src/Nest/Analysis/TokenFilters/DelimitedPayload/DelimitedPayloadEncoding.cs
+++ b/src/Nest/Analysis/TokenFilters/DelimitedPayload/DelimitedPayloadEncoding.cs
@@ -9,9 +9,11 @@ public enum DelimitedPayloadEncoding
 	{
 		[EnumMember(Value = "int")]
 		Integer,
+
 		[EnumMember(Value = "float")]
 		Float,
+
 		[EnumMember(Value = "identity")]
 		Identity,
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/DelimitedPayload/DelimitedPayloadTokenFilter.cs b/src/Nest/Analysis/TokenFilters/DelimitedPayload/DelimitedPayloadTokenFilter.cs
index 3420962794e..1b3c3bc5d3c 100644
--- a/src/Nest/Analysis/TokenFilters/DelimitedPayload/DelimitedPayloadTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/DelimitedPayload/DelimitedPayloadTokenFilter.cs
@@ -18,23 +18,21 @@ public interface IDelimitedPayloadTokenFilter : ITokenFilter
 		/// </summary>
 		[JsonProperty("encoding")]
 		DelimitedPayloadEncoding? Encoding { get; set; }
-
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DelimitedPayloadTokenFilter : TokenFilterBase, IDelimitedPayloadTokenFilter
 	{
 		public DelimitedPayloadTokenFilter() : base("delimited_payload_filter") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public char? Delimiter { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DelimitedPayloadEncoding? Encoding { get; set; }
-
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class DelimitedPayloadTokenFilterDescriptor
 		: TokenFilterDescriptorBase<DelimitedPayloadTokenFilterDescriptor, IDelimitedPayloadTokenFilter>, IDelimitedPayloadTokenFilter
 	{
@@ -43,12 +41,10 @@ public class DelimitedPayloadTokenFilterDescriptor
 		char? IDelimitedPayloadTokenFilter.Delimiter { get; set; }
 		DelimitedPayloadEncoding? IDelimitedPayloadTokenFilter.Encoding { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public DelimitedPayloadTokenFilterDescriptor Delimiter(char? delimiter) => Assign(a => a.Delimiter = delimiter);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public DelimitedPayloadTokenFilterDescriptor Encoding(DelimitedPayloadEncoding? encoding) => Assign(a => a.Encoding = encoding);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/EdgeNGram/EdgeNGramSide.cs b/src/Nest/Analysis/TokenFilters/EdgeNGram/EdgeNGramSide.cs
index 3b4e1ce8c4b..9d86f8f9035 100644
--- a/src/Nest/Analysis/TokenFilters/EdgeNGram/EdgeNGramSide.cs
+++ b/src/Nest/Analysis/TokenFilters/EdgeNGram/EdgeNGramSide.cs
@@ -9,7 +9,8 @@ public enum EdgeNGramSide
 	{
 		[EnumMember(Value = "front")]
 		Front,
+
 		[EnumMember(Value = "back")]
 		Back,
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/EdgeNGram/EdgeNGramTokenFilter.cs b/src/Nest/Analysis/TokenFilters/EdgeNGram/EdgeNGramTokenFilter.cs
index 04c5cfa87d3..1700b356d9c 100644
--- a/src/Nest/Analysis/TokenFilters/EdgeNGram/EdgeNGramTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/EdgeNGram/EdgeNGramTokenFilter.cs
@@ -8,57 +8,56 @@ namespace Nest
 	public interface IEdgeNGramTokenFilter : ITokenFilter
 	{
 		/// <summary>
-		///Defaults to 1. 
+		/// Defaults to 2.
 		/// </summary>
-		[JsonProperty("min_gram")]
-		int? MinGram { get; set; }
+		[JsonProperty("max_gram")]
+		int? MaxGram { get; set; }
 
 		/// <summary>
-		///Defaults to 2. 
+		/// Defaults to 1.
 		/// </summary>
-		[JsonProperty("max_gram")]
-		int? MaxGram { get; set; }
+		[JsonProperty("min_gram")]
+		int? MinGram { get; set; }
 
 		/// <summary>
 		/// Either front or back. Defaults to front.
 		/// </summary>
 		[JsonProperty("side")]
 		EdgeNGramSide? Side { get; set; }
-
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class EdgeNGramTokenFilter : TokenFilterBase, IEdgeNGramTokenFilter
 	{
 		public EdgeNGramTokenFilter() : base("edge_ngram") { }
 
-		/// <inheritdoc/>
-		public int? MinGram { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MaxGram { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public int? MinGram { get; set; }
+
+		/// <inheritdoc />
 		public EdgeNGramSide? Side { get; set; }
 	}
-	///<inheritdoc/>
-	public class EdgeNGramTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class EdgeNGramTokenFilterDescriptor
 		: TokenFilterDescriptorBase<EdgeNGramTokenFilterDescriptor, IEdgeNGramTokenFilter>, IEdgeNGramTokenFilter
 	{
 		protected override string Type => "edge_ngram";
+		int? IEdgeNGramTokenFilter.MaxGram { get; set; }
 
 		int? IEdgeNGramTokenFilter.MinGram { get; set; }
-		int? IEdgeNGramTokenFilter.MaxGram { get; set; }
 		EdgeNGramSide? IEdgeNGramTokenFilter.Side { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public EdgeNGramTokenFilterDescriptor MinGram(int? minGram) => Assign(a => a.MinGram = minGram);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public EdgeNGramTokenFilterDescriptor MaxGram(int? maxGram) => Assign(a => a.MaxGram = maxGram);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public EdgeNGramTokenFilterDescriptor Side(EdgeNGramSide? side) => Assign(a => a.Side = side);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/ElisionTokenFilter.cs b/src/Nest/Analysis/TokenFilters/ElisionTokenFilter.cs
index 731abb6353a..b6bf95f9221 100644
--- a/src/Nest/Analysis/TokenFilters/ElisionTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/ElisionTokenFilter.cs
@@ -15,28 +15,27 @@ public interface IElisionTokenFilter : ITokenFilter
 		IEnumerable<string> Articles { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class ElisionTokenFilter : TokenFilterBase, IElisionTokenFilter
 	{
 		public ElisionTokenFilter() : base("elision") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> Articles { get; set; }
 	}
-	///<inheritdoc/>
-	public class ElisionTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class ElisionTokenFilterDescriptor
 		: TokenFilterDescriptorBase<ElisionTokenFilterDescriptor, IElisionTokenFilter>, IElisionTokenFilter
 	{
 		protected override string Type => "elision";
 
 		IEnumerable<string> IElisionTokenFilter.Articles { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ElisionTokenFilterDescriptor Articles(IEnumerable<string> articles) => Assign(a => a.Articles = articles);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ElisionTokenFilterDescriptor Articles(params string[] articles) => Assign(a => a.Articles = articles);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/FingerprintTokenFilter.cs b/src/Nest/Analysis/TokenFilters/FingerprintTokenFilter.cs
index 6139252ae78..12872c30c64 100644
--- a/src/Nest/Analysis/TokenFilters/FingerprintTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/FingerprintTokenFilter.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -15,44 +10,45 @@ namespace Nest
 	/// </summary>
 	public interface IFingerprintTokenFilter : ITokenFilter
 	{
+		/// <summary>
+		/// The maximum token size to emit. Defaults to 255.
+		/// </summary>
+		[JsonProperty("max_output_size")]
+		int? MaxOutputSize { get; set; }
+
 		/// <summary>
 		/// The character that separates the tokens after concatenation.
 		/// Defaults to a space.
 		/// </summary>
 		[JsonProperty("separator")]
 		string Separator { get; set; }
-
-		/// <summary>
-		/// The maximum token size to emit. Defaults to 255.
-		/// </summary>
-		[JsonProperty("max_output_size")]
-		int? MaxOutputSize { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class FingerprintTokenFilter : TokenFilterBase, IFingerprintTokenFilter
 	{
 		public FingerprintTokenFilter() : base("fingerprint") { }
 
 		/// <summary>
-		/// The character that separates the tokens after concatenation.
-		/// Defaults to a space.
+		/// The maximum token size to emit. Defaults to 255.
 		/// </summary>
-		public string Separator { get; set; }
+		public int? MaxOutputSize { get; set; }
 
 		/// <summary>
-		/// The maximum token size to emit. Defaults to 255.
+		/// The character that separates the tokens after concatenation.
+		/// Defaults to a space.
 		/// </summary>
-		public int? MaxOutputSize { get; set; }
+		public string Separator { get; set; }
 	}
-	///<inheritdoc/>
+
+	/// <inheritdoc />
 	public class FingerprintTokenFilterDescriptor
 		: TokenFilterDescriptorBase<FingerprintTokenFilterDescriptor, IFingerprintTokenFilter>, IFingerprintTokenFilter
 	{
 		protected override string Type => "fingerprint";
+		int? IFingerprintTokenFilter.MaxOutputSize { get; set; }
 
 		string IFingerprintTokenFilter.Separator { get; set; }
-		int? IFingerprintTokenFilter.MaxOutputSize { get; set; }
 
 		public FingerprintTokenFilterDescriptor Separator(string separator) => Assign(a => a.Separator = separator);
 
diff --git a/src/Nest/Analysis/TokenFilters/HunspellTokenFilter.cs b/src/Nest/Analysis/TokenFilters/HunspellTokenFilter.cs
index 5c4355befac..feeaf819a22 100644
--- a/src/Nest/Analysis/TokenFilters/HunspellTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/HunspellTokenFilter.cs
@@ -1,19 +1,18 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	/// <summary>
-	/// Basic support for hunspell stemming.
-	///<para> Hunspell dictionaries will be picked up from a dedicated hunspell directory on the filesystem.</para>
+	///  Basic support for hunspell stemming.
+	/// <para> Hunspell dictionaries will be picked up from a dedicated hunspell directory on the filesystem.</para>
 	/// </summary>
 	public interface IHunspellTokenFilter : ITokenFilter
 	{
 		/// <summary>
-		/// A locale for this filter. If this is unset, the lang or language are used instead - so one of these has to be set.
+		/// If only unique terms should be returned, this needs to be set to true.
 		/// </summary>
-		[JsonProperty("locale")]
-		string Locale { get; set; }
+		[JsonProperty("dedup")]
+		bool? Dedup { get; set; }
 
 		/// <summary>
 		/// The name of a dictionary.The path to your hunspell dictionaries should be configured via
@@ -23,62 +22,57 @@ public interface IHunspellTokenFilter : ITokenFilter
 		string Dictionary { get; set; }
 
 		/// <summary>
-		/// If only unique terms should be returned, this needs to be set to true.
+		/// A locale for this filter. If this is unset, the lang or language are used instead - so one of these has to be set.
 		/// </summary>
-		[JsonProperty("dedup")]
-		bool? Dedup { get; set; }
+		[JsonProperty("locale")]
+		string Locale { get; set; }
 
 		/// <summary>
 		/// If only the longest term should be returned, set this to true.
 		/// </summary>
 		[JsonProperty("longest_only")]
 		bool? LongestOnly { get; set; }
-
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class HunspellTokenFilter : TokenFilterBase, IHunspellTokenFilter
 	{
 		public HunspellTokenFilter() : base("hunspell") { }
 
-		/// <inheritdoc/>
-		public string Locale { get; set; }
+		/// <inheritdoc />
+		public bool? Dedup { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string Dictionary { get; set; }
 
-		/// <inheritdoc/>
-		public bool? Dedup { get; set; }
+		/// <inheritdoc />
+		public string Locale { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? LongestOnly { get; set; }
-
-
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class HunspellTokenFilterDescriptor
 		: TokenFilterDescriptorBase<HunspellTokenFilterDescriptor, IHunspellTokenFilter>, IHunspellTokenFilter
 	{
 		protected override string Type => "hunspell";
-
-		bool? IHunspellTokenFilter.LongestOnly { get; set; }
 		bool? IHunspellTokenFilter.Dedup { get; set; }
-		string IHunspellTokenFilter.Locale { get; set; }
 		string IHunspellTokenFilter.Dictionary { get; set; }
+		string IHunspellTokenFilter.Locale { get; set; }
+
+		bool? IHunspellTokenFilter.LongestOnly { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public HunspellTokenFilterDescriptor LongestOnly(bool? longestOnly = true) => Assign(a => a.LongestOnly = longestOnly);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public HunspellTokenFilterDescriptor Dedup(bool? dedup = true) => Assign(a => a.Dedup = dedup);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public HunspellTokenFilterDescriptor Locale(string locale) => Assign(a => a.Locale = locale);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public HunspellTokenFilterDescriptor Dictionary(string dictionary) => Assign(a => a.Dictionary = dictionary);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/KStemTokenFilter.cs b/src/Nest/Analysis/TokenFilters/KStemTokenFilter.cs
index def2a0913be..aec25078e27 100644
--- a/src/Nest/Analysis/TokenFilters/KStemTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/KStemTokenFilter.cs
@@ -1,20 +1,21 @@
 namespace Nest
 {
 	/// <summary>
-	///The kstem token filter is a high performance filter for english. 
-	///<para> All terms must already be lowercased (use lowercase filter) for this filter to work correctly.</para>
+	/// The kstem token filter is a high performance filter for english.
+	/// <para> All terms must already be lowercased (use lowercase filter) for this filter to work correctly.</para>
 	/// </summary>
 	public interface IKStemTokenFilter : ITokenFilter { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class KStemTokenFilter : TokenFilterBase, IKStemTokenFilter
 	{
 		public KStemTokenFilter() : base("kstem") { }
 	}
-	///<inheritdoc/>
-	public class KStemTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class KStemTokenFilterDescriptor
 		: TokenFilterDescriptorBase<KStemTokenFilterDescriptor, IKStemTokenFilter>, IKStemTokenFilter
 	{
 		protected override string Type => "kstem";
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/KeepTypesTokenFilter.cs b/src/Nest/Analysis/TokenFilters/KeepTypesTokenFilter.cs
index 70b88d679f6..7d34ee5b268 100644
--- a/src/Nest/Analysis/TokenFilters/KeepTypesTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/KeepTypesTokenFilter.cs
@@ -8,8 +8,9 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum KeepTypesMode
 	{
-		[EnumMember(Value="include")]
+		[EnumMember(Value = "include")]
 		Include,
+
 		[EnumMember(Value = "exclude")]
 		Exclude
 	}
@@ -19,45 +20,43 @@ public enum KeepTypesMode
 	/// </summary>
 	public interface IKeepTypesTokenFilter : ITokenFilter
 	{
+		/// <summary> Whether to include or exclude the types provided on <see cref="Types" /> </summary>
+		[JsonProperty("mode")]
+		KeepTypesMode? Mode { get; set; }
+
 		/// <summary> A list of types to keep. </summary>
 		[JsonProperty("types")]
 		IEnumerable<string> Types { get; set; }
-
-		/// <summary> Whether to include or exclude the types provided on <see cref="Types"/> </summary>
-		[JsonProperty("mode")]
-		KeepTypesMode? Mode { get; set; }
 	}
-	/// <inheritdoc cref="IKeepTypesTokenFilter"/>
+
+	/// <inheritdoc cref="IKeepTypesTokenFilter" />
 	public class KeepTypesTokenFilter : TokenFilterBase
 	{
 		public KeepTypesTokenFilter() : base("keep_types") { }
 
-		/// <inheritdoc cref="IKeepTypesTokenFilter.Types"/>
-		public IEnumerable<string> Types { get; set; }
-
-		/// <inheritdoc cref="IKeepTypesTokenFilter.Mode"/>
+		/// <inheritdoc cref="IKeepTypesTokenFilter.Mode" />
 		public KeepTypesMode? Mode { get; set; }
 
+		/// <inheritdoc cref="IKeepTypesTokenFilter.Types" />
+		public IEnumerable<string> Types { get; set; }
 	}
-	/// <inheritdoc cref="IKeepTypesTokenFilter"/>
+
+	/// <inheritdoc cref="IKeepTypesTokenFilter" />
 	public class KeepTypesTokenFilterDescriptor
 		: TokenFilterDescriptorBase<KeepTypesTokenFilterDescriptor, IKeepTypesTokenFilter>, IKeepTypesTokenFilter
 	{
 		protected override string Type => "keep_types";
+		KeepTypesMode? IKeepTypesTokenFilter.Mode { get; set; }
 
 		IEnumerable<string> IKeepTypesTokenFilter.Types { get; set; }
-		KeepTypesMode? IKeepTypesTokenFilter.Mode { get; set; }
 
-		/// <inheritdoc cref="IKeepTypesTokenFilter.Types"/>
+		/// <inheritdoc cref="IKeepTypesTokenFilter.Types" />
 		public KeepTypesTokenFilterDescriptor Types(IEnumerable<string> types) => Assign(a => a.Types = types);
 
-		/// <inheritdoc cref="IKeepTypesTokenFilter.Types"/>
+		/// <inheritdoc cref="IKeepTypesTokenFilter.Types" />
 		public KeepTypesTokenFilterDescriptor Types(params string[] types) => Assign(a => a.Types = types);
 
-		/// <inheritdoc cref="IKeepTypesTokenFilter.Mode"/>
+		/// <inheritdoc cref="IKeepTypesTokenFilter.Mode" />
 		public KeepTypesTokenFilterDescriptor Mode(KeepTypesMode? mode) => Assign(a => a.Mode = mode);
-
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/KeepWordsTokenFilter.cs b/src/Nest/Analysis/TokenFilters/KeepWordsTokenFilter.cs
index b2549fad0c8..3e9e11572d0 100644
--- a/src/Nest/Analysis/TokenFilters/KeepWordsTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/KeepWordsTokenFilter.cs
@@ -14,56 +14,54 @@ public interface IKeepWordsTokenFilter : ITokenFilter
 		[JsonProperty("keep_words")]
 		IEnumerable<string> KeepWords { get; set; }
 
-		/// <summary>
-		/// A path to a words file.
-		/// </summary>
-		[JsonProperty("keep_words_path")]
-		string KeepWordsPath { get; set; }
-
 		/// <summary>
 		/// A boolean indicating whether to lower case the words.
 		/// </summary>
 		[JsonProperty("keep_words_case")]
 		bool? KeepWordsCase { get; set; }
 
+		/// <summary>
+		/// A path to a words file.
+		/// </summary>
+		[JsonProperty("keep_words_path")]
+		string KeepWordsPath { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class KeepWordsTokenFilter : TokenFilterBase, IKeepWordsTokenFilter
 	{
 		public KeepWordsTokenFilter() : base("keep") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> KeepWords { get; set; }
 
-		/// <inheritdoc/>
-		public string KeepWordsPath { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? KeepWordsCase { get; set; }
 
+		/// <inheritdoc />
+		public string KeepWordsPath { get; set; }
 	}
-	///<inheritdoc/>
-	public class KeepWordsTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class KeepWordsTokenFilterDescriptor
 		: TokenFilterDescriptorBase<KeepWordsTokenFilterDescriptor, IKeepWordsTokenFilter>, IKeepWordsTokenFilter
 	{
 		protected override string Type => "keep";
+		IEnumerable<string> IKeepWordsTokenFilter.KeepWords { get; set; }
 
 		bool? IKeepWordsTokenFilter.KeepWordsCase { get; set; }
 		string IKeepWordsTokenFilter.KeepWordsPath { get; set; }
-		IEnumerable<string> IKeepWordsTokenFilter.KeepWords { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KeepWordsTokenFilterDescriptor KeepWordsCase(bool? keepCase = true) => Assign(a => a.KeepWordsCase = keepCase);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KeepWordsTokenFilterDescriptor KeepWordsPath(string path) => Assign(a => a.KeepWordsPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KeepWordsTokenFilterDescriptor KeepWords(IEnumerable<string> keepWords) => Assign(a => a.KeepWords = keepWords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KeepWordsTokenFilterDescriptor KeepWords(params string[] keepWords) => Assign(a => a.KeepWords = keepWords);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/KeywordMarkerTokenFilter.cs b/src/Nest/Analysis/TokenFilters/KeywordMarkerTokenFilter.cs
index eea9e3d078e..c58b6a11049 100644
--- a/src/Nest/Analysis/TokenFilters/KeywordMarkerTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/KeywordMarkerTokenFilter.cs
@@ -6,8 +6,14 @@ namespace Nest
 	/// <summary>
 	/// Protects words from being modified by stemmers. Must be placed before any stemming filters.
 	/// </summary>
-	public interface IKeywordMarkerTokenFilter: ITokenFilter
+	public interface IKeywordMarkerTokenFilter : ITokenFilter
 	{
+		/// <summary>
+		/// Set to true to lower case all words first. Defaults to false.
+		/// </summary>
+		[JsonProperty("ignore_case")]
+		bool? IgnoreCase { get; set; }
+
 		/// <summary>
 		/// A list of words to use.
 		/// </summary>
@@ -19,48 +25,43 @@ public interface IKeywordMarkerTokenFilter: ITokenFilter
 		/// </summary>
 		[JsonProperty("keywords_path")]
 		string KeywordsPath { get; set; }
-
-		/// <summary>
-		/// Set to true to lower case all words first. Defaults to false.
-		/// </summary>
-		[JsonProperty("ignore_case")]
-		bool? IgnoreCase { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class KeywordMarkerTokenFilter : TokenFilterBase, IKeywordMarkerTokenFilter
 	{
 		public KeywordMarkerTokenFilter() : base("keyword_marker") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public bool? IgnoreCase { get; set; }
+
+		/// <inheritdoc />
 		public IEnumerable<string> Keywords { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string KeywordsPath { get; set; }
-
-		/// <inheritdoc/>
-		public bool? IgnoreCase { get; set; }
 	}
-	///<inheritdoc/>
-	public class KeywordMarkerTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class KeywordMarkerTokenFilterDescriptor
 		: TokenFilterDescriptorBase<KeywordMarkerTokenFilterDescriptor, IKeywordMarkerTokenFilter>, IKeywordMarkerTokenFilter
 	{
 		protected override string Type => "keyword_marker";
+		bool? IKeywordMarkerTokenFilter.IgnoreCase { get; set; }
 
 		IEnumerable<string> IKeywordMarkerTokenFilter.Keywords { get; set; }
 		string IKeywordMarkerTokenFilter.KeywordsPath { get; set; }
-		bool? IKeywordMarkerTokenFilter.IgnoreCase { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KeywordMarkerTokenFilterDescriptor IgnoreCase(bool? ignoreCase = true) => Assign(a => a.IgnoreCase = ignoreCase);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KeywordMarkerTokenFilterDescriptor KeywordsPath(string path) => Assign(a => a.KeywordsPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KeywordMarkerTokenFilterDescriptor Keywords(IEnumerable<string> keywords) => Assign(a => a.Keywords = keywords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public KeywordMarkerTokenFilterDescriptor Keywords(params string[] keywords) => Assign(a => a.Keywords = keywords);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/LengthTokenFilter.cs b/src/Nest/Analysis/TokenFilters/LengthTokenFilter.cs
index 949f77cc78d..2a5b4ce4364 100644
--- a/src/Nest/Analysis/TokenFilters/LengthTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/LengthTokenFilter.cs
@@ -7,44 +7,44 @@ namespace Nest
 	/// </summary>
 	public interface ILengthTokenFilter : ITokenFilter
 	{
-		/// <summary>
-		/// The minimum number. Defaults to 0. 
-		/// </summary>
-		[JsonProperty("min")]
-		int? Min { get; set; }
-
 		/// <summary>
 		/// The maximum number. Defaults to Integer.MAX_VALUE.
 		/// </summary>
 		[JsonProperty("max")]
 		int? Max { get; set; }
+
+		/// <summary>
+		/// The minimum number. Defaults to 0.
+		/// </summary>
+		[JsonProperty("min")]
+		int? Min { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class LengthTokenFilter : TokenFilterBase, ILengthTokenFilter
 	{
 		public LengthTokenFilter() : base("length") { }
 
-		/// <inheritdoc/>
-		public int? Min { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? Max { get; set; }
+
+		/// <inheritdoc />
+		public int? Min { get; set; }
 	}
-	///<inheritdoc/>
-	public class LengthTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class LengthTokenFilterDescriptor
 		: TokenFilterDescriptorBase<LengthTokenFilterDescriptor, ILengthTokenFilter>, ILengthTokenFilter
 	{
 		protected override string Type => "length";
+		int? ILengthTokenFilter.Max { get; set; }
 
 		int? ILengthTokenFilter.Min { get; set; }
-		int? ILengthTokenFilter.Max { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public LengthTokenFilterDescriptor Min(int? minimum) => Assign(a => a.Min = minimum);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public LengthTokenFilterDescriptor Max(int? maximum) => Assign(a => a.Max = maximum);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/LimitTokenCountTokenFilter.cs b/src/Nest/Analysis/TokenFilters/LimitTokenCountTokenFilter.cs
index 218fd31dc1d..9deb845c5d5 100644
--- a/src/Nest/Analysis/TokenFilters/LimitTokenCountTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/LimitTokenCountTokenFilter.cs
@@ -7,44 +7,45 @@ namespace Nest
 	/// </summary>
 	public interface ILimitTokenCountTokenFilter : ITokenFilter
 	{
-		/// <summary>
-		/// The maximum number of tokens that should be indexed per document and field.
-		/// </summary>
-		[JsonProperty("max_token_count")]
-		int? MaxTokenCount { get; set; }
-
 		/// <summary>
 		/// If set to true the filter exhaust the stream even if max_token_count tokens have been consumed already.
 		/// </summary>
 		[JsonProperty("consume_all_tokens")]
 		bool? ConsumeAllTokens { get; set; }
+
+		/// <summary>
+		/// The maximum number of tokens that should be indexed per document and field.
+		/// </summary>
+		[JsonProperty("max_token_count")]
+		int? MaxTokenCount { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class LimitTokenCountTokenFilter : TokenFilterBase, ILimitTokenCountTokenFilter
 	{
 		public LimitTokenCountTokenFilter() : base("limit") { }
 
-		/// <inheritdoc/>
-		public int? MaxTokenCount { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? ConsumeAllTokens { get; set; }
+
+		/// <inheritdoc />
+		public int? MaxTokenCount { get; set; }
 	}
-	///<inheritdoc/>
-	public class LimitTokenCountTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class LimitTokenCountTokenFilterDescriptor
 		: TokenFilterDescriptorBase<LimitTokenCountTokenFilterDescriptor, ILimitTokenCountTokenFilter>, ILimitTokenCountTokenFilter
 	{
 		protected override string Type => "limit";
+		bool? ILimitTokenCountTokenFilter.ConsumeAllTokens { get; set; }
 
 		int? ILimitTokenCountTokenFilter.MaxTokenCount { get; set; }
-		bool? ILimitTokenCountTokenFilter.ConsumeAllTokens { get; set; }
 
-		///<inheritdoc/>
-		public LimitTokenCountTokenFilterDescriptor ConsumeAllToken(bool? consumeAllTokens = true) => Assign(a => a.ConsumeAllTokens = consumeAllTokens);
+		/// <inheritdoc />
+		public LimitTokenCountTokenFilterDescriptor ConsumeAllToken(bool? consumeAllTokens = true) =>
+			Assign(a => a.ConsumeAllTokens = consumeAllTokens);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public LimitTokenCountTokenFilterDescriptor MaxTokenCount(int? maxTokenCount) => Assign(a => a.MaxTokenCount = maxTokenCount);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/LowercaseTokenFilter.cs b/src/Nest/Analysis/TokenFilters/LowercaseTokenFilter.cs
index a28a5d9f988..3d6fa4f85e6 100644
--- a/src/Nest/Analysis/TokenFilters/LowercaseTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/LowercaseTokenFilter.cs
@@ -3,8 +3,8 @@
 namespace Nest
 {
 	/// <summary>
-	/// A token filter of type lowercase that normalizes token text to lower case.
-	///<para> Lowercase token filter supports Greek and Turkish lowercase token filters through the language parameter.</para>
+	///  A token filter of type lowercase that normalizes token text to lower case.
+	/// <para> Lowercase token filter supports Greek and Turkish lowercase token filters through the language parameter.</para>
 	/// </summary>
 	public interface ILowercaseTokenFilter : ITokenFilter
 	{
@@ -14,24 +14,25 @@ public interface ILowercaseTokenFilter : ITokenFilter
 		[JsonProperty("language")]
 		string Language { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class LowercaseTokenFilter : TokenFilterBase, ILowercaseTokenFilter
 	{
 		public LowercaseTokenFilter() : base("lowercase") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string Language { get; set; }
 	}
-	///<inheritdoc/>
-	public class LowercaseTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class LowercaseTokenFilterDescriptor
 		: TokenFilterDescriptorBase<LowercaseTokenFilterDescriptor, ILowercaseTokenFilter>, ILowercaseTokenFilter
 	{
 		protected override string Type => "lowercase";
 
 		string ILowercaseTokenFilter.Language { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public LowercaseTokenFilterDescriptor Language(string language) => Assign(a => a.Language = language);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/MultiplexerTokenFilter.cs b/src/Nest/Analysis/TokenFilters/MultiplexerTokenFilter.cs
index 9454b6ad78a..d1d1ef56eee 100644
--- a/src/Nest/Analysis/TokenFilters/MultiplexerTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/MultiplexerTokenFilter.cs
@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -16,19 +15,21 @@ public interface IMultiplexerTokenFilter : ITokenFilter
 		[JsonProperty("preserve_original")]
 		bool? PreserveOriginal { get; set; }
 	}
+
 	public class MultiplexerTokenFilter : TokenFilterBase, IMultiplexerTokenFilter
 	{
 		internal const string TokenType = "multiplexer";
+
 		public MultiplexerTokenFilter() : base(TokenType) { }
 
-		/// <inheritdoc cref="IMultiplexerTokenFilter.Filters"/>
+		/// <inheritdoc cref="IMultiplexerTokenFilter.Filters" />
 		public IEnumerable<string> Filters { get; set; }
 
-		/// <inheritdoc cref="IMultiplexerTokenFilter.PreserveOriginal"/>
+		/// <inheritdoc cref="IMultiplexerTokenFilter.PreserveOriginal" />
 		public bool? PreserveOriginal { get; set; }
-
 	}
-	///<inheritdoc cref="IMultiplexerTokenFilter"/>
+
+	/// <inheritdoc cref="IMultiplexerTokenFilter" />
 	public class MultiplexerTokenFilterDescriptor
 		: TokenFilterDescriptorBase<MultiplexerTokenFilterDescriptor, IMultiplexerTokenFilter>, IMultiplexerTokenFilter
 	{
@@ -37,14 +38,13 @@ public class MultiplexerTokenFilterDescriptor
 		IEnumerable<string> IMultiplexerTokenFilter.Filters { get; set; }
 		bool? IMultiplexerTokenFilter.PreserveOriginal { get; set; }
 
-		/// <inheritdoc cref="IMultiplexerTokenFilter.Filters"/>
+		/// <inheritdoc cref="IMultiplexerTokenFilter.Filters" />
 		public MultiplexerTokenFilterDescriptor Filters(IEnumerable<string> filters) => Assign(a => a.Filters = filters);
 
-		/// <inheritdoc cref="IMultiplexerTokenFilter.Filters"/>
+		/// <inheritdoc cref="IMultiplexerTokenFilter.Filters" />
 		public MultiplexerTokenFilterDescriptor Filters(params string[] filters) => Assign(a => a.Filters = filters);
 
-		/// <inheritdoc cref="IMultiplexerTokenFilter.PreserveOriginal"/>
+		/// <inheritdoc cref="IMultiplexerTokenFilter.PreserveOriginal" />
 		public MultiplexerTokenFilterDescriptor PreserveOriginal(bool? preserve = true) => Assign(a => a.PreserveOriginal = preserve);
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/NgramTokenFilter.cs b/src/Nest/Analysis/TokenFilters/NgramTokenFilter.cs
index 65204840b0a..8d168fa0056 100644
--- a/src/Nest/Analysis/TokenFilters/NgramTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/NgramTokenFilter.cs
@@ -8,44 +8,43 @@ namespace Nest
 	public interface INGramTokenFilter : ITokenFilter
 	{
 		/// <summary>
-		/// Defaults to 1. 
+		/// Defaults to 2
 		/// </summary>
-		[JsonProperty("min_gram")]
-		int? MinGram { get; set; }
+		[JsonProperty("max_gram")]
+		int? MaxGram { get; set; }
 
 		/// <summary>
-		/// Defaults to 2 
+		/// Defaults to 1.
 		/// </summary>
-		[JsonProperty("max_gram")]
-		int? MaxGram { get; set; }
+		[JsonProperty("min_gram")]
+		int? MinGram { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class NGramTokenFilter : TokenFilterBase, INGramTokenFilter
 	{
 		public NGramTokenFilter() : base("ngram") { }
 
-		/// <inheritdoc/>
-		public int? MinGram { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MaxGram { get; set; }
+
+		/// <inheritdoc />
+		public int? MinGram { get; set; }
 	}
-	///<inheritdoc/>
-	public class NGramTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class NGramTokenFilterDescriptor
 		: TokenFilterDescriptorBase<NGramTokenFilterDescriptor, INGramTokenFilter>, INGramTokenFilter
 	{
 		protected override string Type => "ngram";
+		int? INGramTokenFilter.MaxGram { get; set; }
 
 		int? INGramTokenFilter.MinGram { get; set; }
-		int? INGramTokenFilter.MaxGram { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public NGramTokenFilterDescriptor MinGram(int? minGram) => Assign(a => a.MinGram = minGram);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public NGramTokenFilterDescriptor MaxGram(int? maxGram) => Assign(a => a.MaxGram = maxGram);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/NoriPartOfSpeechTokenFilter.cs b/src/Nest/Analysis/TokenFilters/NoriPartOfSpeechTokenFilter.cs
index 93870344550..0c41ffecfa6 100644
--- a/src/Nest/Analysis/TokenFilters/NoriPartOfSpeechTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/NoriPartOfSpeechTokenFilter.cs
@@ -11,7 +11,7 @@ public interface INoriPartOfSpeechTokenFilter : ITokenFilter
 		IEnumerable<string> StopTags { get; set; }
 	}
 
-	/// <inheritdoc cref="INoriPartOfSpeechTokenFilter"/>
+	/// <inheritdoc cref="INoriPartOfSpeechTokenFilter" />
 	public class NoriPartOfSpeechTokenFilter : TokenFilterBase, INoriPartOfSpeechTokenFilter
 	{
 		public NoriPartOfSpeechTokenFilter() : base("nori_part_of_speech") { }
@@ -19,7 +19,8 @@ public NoriPartOfSpeechTokenFilter() : base("nori_part_of_speech") { }
 		///<inheritdoc cref="INoriPartOfSpeechTokenFilter.StopTags" />
 		public IEnumerable<string> StopTags { get; set; }
 	}
-	/// <inheritdoc cref="INoriPartOfSpeechTokenFilter"/>
+
+	/// <inheritdoc cref="INoriPartOfSpeechTokenFilter" />
 	public class NoriPartOfSpeechTokenFilterDescriptor
 		: TokenFilterDescriptorBase<NoriPartOfSpeechTokenFilterDescriptor, INoriPartOfSpeechTokenFilter>, INoriPartOfSpeechTokenFilter
 	{
@@ -32,7 +33,5 @@ public class NoriPartOfSpeechTokenFilterDescriptor
 
 		///<inheritdoc cref="INoriPartOfSpeechTokenFilter.StopTags" />
 		public NoriPartOfSpeechTokenFilterDescriptor StopTags(params string[] stopTags) => Assign(a => a.StopTags = stopTags);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/PatternCaptureTokenFilter.cs b/src/Nest/Analysis/TokenFilters/PatternCaptureTokenFilter.cs
index 5d6c895f481..ae87470e440 100644
--- a/src/Nest/Analysis/TokenFilters/PatternCaptureTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/PatternCaptureTokenFilter.cs
@@ -20,35 +20,35 @@ public interface IPatternCaptureTokenFilter : ITokenFilter
 		[JsonProperty("preserve_original")]
 		bool? PreserveOriginal { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class PatternCaptureTokenFilter : TokenFilterBase, IPatternCaptureTokenFilter
 	{
 		public PatternCaptureTokenFilter() : base("pattern_capture") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> Patterns { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? PreserveOriginal { get; set; }
 	}
-	///<inheritdoc/>
-	public class PatternCaptureTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class PatternCaptureTokenFilterDescriptor
 		: TokenFilterDescriptorBase<PatternCaptureTokenFilterDescriptor, IPatternCaptureTokenFilter>, IPatternCaptureTokenFilter
 	{
 		protected override string Type => "pattern_capture";
+		IEnumerable<string> IPatternCaptureTokenFilter.Patterns { get; set; }
 
 		bool? IPatternCaptureTokenFilter.PreserveOriginal { get; set; }
-		IEnumerable<string> IPatternCaptureTokenFilter.Patterns { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public PatternCaptureTokenFilterDescriptor PreserveOriginal(bool? preserve = true) => Assign(a => a.PreserveOriginal = preserve);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public PatternCaptureTokenFilterDescriptor Patterns(IEnumerable<string> patterns) => Assign(a => a.Patterns = patterns);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public PatternCaptureTokenFilterDescriptor Patterns(params string[] patterns) => Assign(a => a.Patterns = patterns);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/PatternReplaceTokenFilter.cs b/src/Nest/Analysis/TokenFilters/PatternReplaceTokenFilter.cs
index 2029142c7ce..84d4d6bc5ac 100644
--- a/src/Nest/Analysis/TokenFilters/PatternReplaceTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/PatternReplaceTokenFilter.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// The pattern_replace token filter allows to easily handle string replacements based on a regular expression. 
+	/// The pattern_replace token filter allows to easily handle string replacements based on a regular expression.
 	/// </summary>
 	public interface IPatternReplaceTokenFilter : ITokenFilter
 	{
@@ -19,19 +19,21 @@ public interface IPatternReplaceTokenFilter : ITokenFilter
 		[JsonProperty("replacement")]
 		string Replacement { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class PatternReplaceTokenFilter : TokenFilterBase, IPatternReplaceTokenFilter
 	{
 		public PatternReplaceTokenFilter() : base("pattern_replace") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string Pattern { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string Replacement { get; set; }
 	}
-	///<inheritdoc/>
-	public class PatternReplaceTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class PatternReplaceTokenFilterDescriptor
 		: TokenFilterDescriptorBase<PatternReplaceTokenFilterDescriptor, IPatternReplaceTokenFilter>, IPatternReplaceTokenFilter
 	{
 		protected override string Type => "pattern_replace";
@@ -40,12 +42,10 @@ public class PatternReplaceTokenFilterDescriptor
 
 		string IPatternReplaceTokenFilter.Replacement { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public PatternReplaceTokenFilterDescriptor Pattern(string pattern) => Assign(a => a.Pattern = pattern);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public PatternReplaceTokenFilterDescriptor Replacement(string replacement) => Assign(a => a.Replacement = replacement);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/PorterStemTokenFilter.cs b/src/Nest/Analysis/TokenFilters/PorterStemTokenFilter.cs
index 74accd94eb2..50a6a2568e8 100644
--- a/src/Nest/Analysis/TokenFilters/PorterStemTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/PorterStemTokenFilter.cs
@@ -4,16 +4,17 @@
 	/// A token filter of type porterStem that transforms the token stream as per the Porter stemming algorithm.
 	/// </summary>
 	public interface IPorterStemTokenFilter : ITokenFilter { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class PorterStemTokenFilter : TokenFilterBase, IPorterStemTokenFilter
 	{
 		public PorterStemTokenFilter() : base("porter_stem") { }
 	}
-	///<inheritdoc/>
-	public class PorterStemTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class PorterStemTokenFilterDescriptor
 		: TokenFilterDescriptorBase<PorterStemTokenFilterDescriptor, IPorterStemTokenFilter>, IPorterStemTokenFilter
 	{
 		protected override string Type => "porter_stem";
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/RemoveDuplicatesTokenFilter.cs b/src/Nest/Analysis/TokenFilters/RemoveDuplicatesTokenFilter.cs
index 8916cd1490b..3e59dd5da15 100644
--- a/src/Nest/Analysis/TokenFilters/RemoveDuplicatesTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/RemoveDuplicatesTokenFilter.cs
@@ -1,22 +1,19 @@
-using System.Collections;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	/// <summary>
 	/// A token filter that drops identical tokens at the same position
 	/// </summary>
 	public interface IRemoveDuplicatesTokenFilter : ITokenFilter { }
 
-	///<inheritdoc cref="IRemoveDuplicatesTokenFilter"/>
+	/// <inheritdoc cref="IRemoveDuplicatesTokenFilter" />
 	public class RemoveDuplicatesTokenFilter : TokenFilterBase, IRemoveDuplicatesTokenFilter
 	{
 		internal const string TokenType = "remove_duplicates";
+
 		public RemoveDuplicatesTokenFilter() : base(TokenType) { }
 	}
 
-	///<inheritdoc cref="IRemoveDuplicatesTokenFilter"/>
+	/// <inheritdoc cref="IRemoveDuplicatesTokenFilter" />
 	public class RemoveDuplicatesTokenFilterDescriptor
 		: TokenFilterDescriptorBase<RemoveDuplicatesTokenFilterDescriptor, IRemoveDuplicatesTokenFilter>, IRemoveDuplicatesTokenFilter
 	{
diff --git a/src/Nest/Analysis/TokenFilters/ReverseTokenFilter.cs b/src/Nest/Analysis/TokenFilters/ReverseTokenFilter.cs
index 469bb867155..32a2a4f2b0b 100644
--- a/src/Nest/Analysis/TokenFilters/ReverseTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/ReverseTokenFilter.cs
@@ -4,16 +4,17 @@
 	/// A token filter of type reverse that simply reverses the tokens.
 	/// </summary>
 	public interface IReverseTokenFilter : ITokenFilter { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class ReverseTokenFilter : TokenFilterBase, IReverseTokenFilter
 	{
 		public ReverseTokenFilter() : base("reverse") { }
 	}
-	///<inheritdoc/>
-	public class ReverseTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class ReverseTokenFilterDescriptor
 		: TokenFilterDescriptorBase<ReverseTokenFilterDescriptor, IReverseTokenFilter>, IReverseTokenFilter
 	{
 		protected override string Type => "reverse";
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/Shingle/ShingleTokenFilter.cs b/src/Nest/Analysis/TokenFilters/Shingle/ShingleTokenFilter.cs
index 47b72bc8a98..f61d4e0a5b2 100644
--- a/src/Nest/Analysis/TokenFilters/Shingle/ShingleTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/Shingle/ShingleTokenFilter.cs
@@ -3,16 +3,17 @@
 namespace Nest
 {
 	/// <summary>
-	/// A token filter of type shingle that constructs shingles (token n-grams) from a token stream. 
+	/// A token filter of type shingle that constructs shingles (token n-grams) from a token stream.
 	/// <para>In other words, it creates combinations of tokens as a single token. </para>
 	/// </summary>
 	public interface IShingleTokenFilter : ITokenFilter
 	{
 		/// <summary>
-		/// The minimum shingle size. Defaults to 2.
+		/// The string to use as a replacement for each position at which there is no actual token in the stream. For instance this string is used if
+		/// the position increment is greater than one when a stop filter is used together with the shingle filter. Defaults to "_"
 		/// </summary>
-		[JsonProperty("min_shingle_size")]
-		int? MinShingleSize { get; set; }
+		[JsonProperty("filler_token")]
+		string FillerToken { get; set; }
 
 		/// <summary>
 		/// The maximum shingle size. Defaults to 2.
@@ -20,6 +21,12 @@ public interface IShingleTokenFilter : ITokenFilter
 		[JsonProperty("max_shingle_size")]
 		int? MaxShingleSize { get; set; }
 
+		/// <summary>
+		/// The minimum shingle size. Defaults to 2.
+		/// </summary>
+		[JsonProperty("min_shingle_size")]
+		int? MinShingleSize { get; set; }
+
 		/// <summary>
 		/// If true the output will contain the input tokens (unigrams) as well as the shingles. Defaults to true.
 		/// </summary>
@@ -27,7 +34,7 @@ public interface IShingleTokenFilter : ITokenFilter
 		bool? OutputUnigrams { get; set; }
 
 		/// <summary>
-		/// If output_unigrams is false the output will contain the input tokens (unigrams) if no shingles are available. 
+		/// If output_unigrams is false the output will contain the input tokens (unigrams) if no shingles are available.
 		/// <para>Note if output_unigrams is set to true this setting has no effect. Defaults to false.</para>
 		/// </summary>
 		[JsonProperty("output_unigrams_if_no_shingles")]
@@ -38,68 +45,62 @@ public interface IShingleTokenFilter : ITokenFilter
 		/// </summary>
 		[JsonProperty("token_separator")]
 		string TokenSeparator { get; set; }
-
-		/// <summary>
-		/// The string to use as a replacement for each position at which there is no actual token in the stream. For instance this string is used if the position increment is greater than one when a stop filter is used together with the shingle filter. Defaults to "_"
-		/// </summary>
-		[JsonProperty("filler_token")]
-		string FillerToken { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class ShingleTokenFilter : TokenFilterBase, IShingleTokenFilter
 	{
 		public ShingleTokenFilter() : base("shingle") { }
 
-		/// <inheritdoc/>
-		public int? MinShingleSize { get; set; }
+		/// <inheritdoc />
+		public string FillerToken { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MaxShingleSize { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public int? MinShingleSize { get; set; }
+
+		/// <inheritdoc />
 		public bool? OutputUnigrams { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? OutputUnigramsIfNoShingles { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string TokenSeparator { get; set; }
-
-		/// <inheritdoc/>
-		public string FillerToken { get; set; }
 	}
-	///<inheritdoc/>
-	public class ShingleTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class ShingleTokenFilterDescriptor
 		: TokenFilterDescriptorBase<ShingleTokenFilterDescriptor, IShingleTokenFilter>, IShingleTokenFilter
 	{
 		protected override string Type => "shingle";
+		string IShingleTokenFilter.FillerToken { get; set; }
+		int? IShingleTokenFilter.MaxShingleSize { get; set; }
+		int? IShingleTokenFilter.MinShingleSize { get; set; }
 
 		bool? IShingleTokenFilter.OutputUnigrams { get; set; }
 		bool? IShingleTokenFilter.OutputUnigramsIfNoShingles { get; set; }
-		int? IShingleTokenFilter.MinShingleSize { get; set; }
-		int? IShingleTokenFilter.MaxShingleSize { get; set; }
 		string IShingleTokenFilter.TokenSeparator { get; set; }
-		string IShingleTokenFilter.FillerToken { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShingleTokenFilterDescriptor OutputUnigrams(bool? output = true) => Assign(a => a.OutputUnigrams = output);
 
-		///<inheritdoc/>
-		public ShingleTokenFilterDescriptor OutputUnigramsIfNoShingles(bool? outputIfNo = true) => Assign(a => a.OutputUnigramsIfNoShingles = outputIfNo);
+		/// <inheritdoc />
+		public ShingleTokenFilterDescriptor OutputUnigramsIfNoShingles(bool? outputIfNo = true) =>
+			Assign(a => a.OutputUnigramsIfNoShingles = outputIfNo);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShingleTokenFilterDescriptor MinShingleSize(int? minShingleSize) => Assign(a => a.MinShingleSize = minShingleSize);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShingleTokenFilterDescriptor MaxShingleSize(int? maxShingleSize) => Assign(a => a.MaxShingleSize = maxShingleSize);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShingleTokenFilterDescriptor TokenSeparator(string separator) => Assign(a => a.TokenSeparator = separator);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShingleTokenFilterDescriptor FillerToken(string filler) => Assign(a => a.FillerToken = filler);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/SnowballTokenFilter.cs b/src/Nest/Analysis/TokenFilters/SnowballTokenFilter.cs
index 79c4f77e0e9..30dab4e1439 100644
--- a/src/Nest/Analysis/TokenFilters/SnowballTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/SnowballTokenFilter.cs
@@ -11,26 +11,25 @@ public interface ISnowballTokenFilter : ITokenFilter
 		SnowballLanguage? Language { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class SnowballTokenFilter : TokenFilterBase, ISnowballTokenFilter
 	{
 		public SnowballTokenFilter() : base("snowball") { }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		[JsonProperty("language")]
 		public SnowballLanguage? Language { get; set; }
-
 	}
-	///<inheritdoc/>
-	public class SnowballTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class SnowballTokenFilterDescriptor
 		: TokenFilterDescriptorBase<SnowballTokenFilterDescriptor, ISnowballTokenFilter>, ISnowballTokenFilter
 	{
 		protected override string Type => "snowball";
 
 		SnowballLanguage? ISnowballTokenFilter.Language { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SnowballTokenFilterDescriptor Language(SnowballLanguage? language) => Assign(a => a.Language = language);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs b/src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs
index e92f0007707..1b9aef0c122 100644
--- a/src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs
@@ -4,17 +4,17 @@
 	/// A token filter of type standard that normalizes tokens extracted with the Standard Tokenizer.
 	/// </summary>
 	public interface IStandardTokenFilter : ITokenFilter { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class StandardTokenFilter : TokenFilterBase, IStandardTokenFilter
 	{
 		public StandardTokenFilter() : base("standard") { }
 	}
 
-	///<inheritdoc/>
-	public class StandardTokenFilterDescriptor 
+	/// <inheritdoc />
+	public class StandardTokenFilterDescriptor
 		: TokenFilterDescriptorBase<StandardTokenFilterDescriptor, IStandardTokenFilter>, IStandardTokenFilter
 	{
 		protected override string Type => "standard";
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/StemmerOverrideTokenFilter.cs b/src/Nest/Analysis/TokenFilters/StemmerOverrideTokenFilter.cs
index 4bf2b231c54..7f1c5871a44 100644
--- a/src/Nest/Analysis/TokenFilters/StemmerOverrideTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/StemmerOverrideTokenFilter.cs
@@ -4,7 +4,8 @@
 namespace Nest
 {
 	/// <summary>
-	/// Overrides stemming algorithms, by applying a custom mapping, then protecting these terms from being modified by stemmers. Must be placed before any stemming filters.
+	/// Overrides stemming algorithms, by applying a custom mapping, then protecting these terms from being modified by stemmers. Must be placed
+	/// before any stemming filters.
 	/// </summary>
 	public interface IStemmerOverrideTokenFilter : ITokenFilter
 	{
@@ -20,20 +21,21 @@ public interface IStemmerOverrideTokenFilter : ITokenFilter
 		[JsonProperty("rules_path")]
 		string RulesPath { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class StemmerOverrideTokenFilter : TokenFilterBase, IStemmerOverrideTokenFilter
 	{
 		public StemmerOverrideTokenFilter() : base("stemmer_override") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> Rules { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string RulesPath { get; set; }
-
 	}
-	///<inheritdoc/>
-	public class StemmerOverrideTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class StemmerOverrideTokenFilterDescriptor
 		: TokenFilterDescriptorBase<StemmerOverrideTokenFilterDescriptor, IStemmerOverrideTokenFilter>, IStemmerOverrideTokenFilter
 	{
 		protected override string Type => "stemmer_override";
@@ -41,15 +43,13 @@ public class StemmerOverrideTokenFilterDescriptor
 		IEnumerable<string> IStemmerOverrideTokenFilter.Rules { get; set; }
 		string IStemmerOverrideTokenFilter.RulesPath { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StemmerOverrideTokenFilterDescriptor Rules(IEnumerable<string> rules) => Assign(a => a.Rules = rules);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StemmerOverrideTokenFilterDescriptor Rules(params string[] rules) => Assign(a => a.Rules = rules);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StemmerOverrideTokenFilterDescriptor RulesPath(string path) => Assign(a => a.RulesPath = path);
-
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/StemmerTokenFilter.cs b/src/Nest/Analysis/TokenFilters/StemmerTokenFilter.cs
index 9133292f316..8e4552fb0af 100644
--- a/src/Nest/Analysis/TokenFilters/StemmerTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/StemmerTokenFilter.cs
@@ -10,23 +10,23 @@ public interface IStemmerTokenFilter : ITokenFilter
 		[JsonProperty("language")]
 		string Language { get; set; }
 	}
+
 	public class StemmerTokenFilter : TokenFilterBase, IStemmerTokenFilter
 	{
 		public StemmerTokenFilter() : base("stemmer") { }
 
 		public string Language { get; set; }
-
 	}
-	///<inheritdoc/>
-	public class StemmerTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class StemmerTokenFilterDescriptor
 		: TokenFilterDescriptorBase<StemmerTokenFilterDescriptor, IStemmerTokenFilter>, IStemmerTokenFilter
 	{
 		protected override string Type => "stemmer";
 
 		string IStemmerTokenFilter.Language { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StemmerTokenFilterDescriptor Language(string language) => Assign(a => a.Language = language);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/Stop/StopTokenFilter.cs b/src/Nest/Analysis/TokenFilters/Stop/StopTokenFilter.cs
index 21a24c19142..a7187f03057 100644
--- a/src/Nest/Analysis/TokenFilters/Stop/StopTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/Stop/StopTokenFilter.cs
@@ -8,6 +8,20 @@ namespace Nest
 	/// </summary>
 	public interface IStopTokenFilter : ITokenFilter
 	{
+		/// <summary>
+		/// Set to true to lower case all words first. Defaults to false.
+		/// </summary>
+		[JsonProperty("ignore_case")]
+		bool? IgnoreCase { get; set; }
+
+		/// <summary>
+		/// Set to false in order to not ignore the last term of a search if it is a stop word.
+		/// This is very useful for  the completion suggester as a query like green a can
+		/// be extended to green apple even though  you remove stop words in general. Defaults to true.
+		/// </summary>
+		[JsonProperty("remove_trailing")]
+		bool? RemoveTrailing { get; set; }
+
 		/// <summary>
 		/// A list of stop words to use. Defaults to `_english_` stop words.
 		/// </summary>
@@ -15,12 +29,6 @@ public interface IStopTokenFilter : ITokenFilter
 		[JsonConverter(typeof(StopWordsJsonConverter))]
 		StopWords StopWords { get; set; }
 
-		/// <summary>
-		/// Set to true to lower case all words first. Defaults to false.
-		/// </summary>
-		[JsonProperty("ignore_case")]
-		bool? IgnoreCase { get; set; }
-
 		/// <summary>
 		/// A path (either relative to config location, or absolute) to a stopwords
 		/// file configuration. Each stop word should be in its own "line"
@@ -28,34 +36,27 @@ public interface IStopTokenFilter : ITokenFilter
 		/// </summary>
 		[JsonProperty("stopwords_path")]
 		string StopWordsPath { get; set; }
-
-		/// <summary>
-		/// Set to false in order to not ignore the last term of a search if it is a stop word.
-		/// This is very useful for  the completion suggester as a query like green a can
-		/// be extended to green apple even though  you remove stop words in general. Defaults to true.
-		/// </summary>
-		[JsonProperty("remove_trailing")]
-		bool? RemoveTrailing { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class StopTokenFilter : TokenFilterBase, IStopTokenFilter
 	{
 		public StopTokenFilter() : base("stop") { }
 
-		/// <inheritdoc/>
-		public StopWords StopWords { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? IgnoreCase { get; set; }
 
-		/// <inheritdoc/>
-		public string StopWordsPath { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? RemoveTrailing { get; set; }
+
+		/// <inheritdoc />
+		public StopWords StopWords { get; set; }
+
+		/// <inheritdoc />
+		public string StopWordsPath { get; set; }
 	}
-	///<inheritdoc/>
+
+	/// <inheritdoc />
 	public class StopTokenFilterDescriptor
 		: TokenFilterDescriptorBase<StopTokenFilterDescriptor, IStopTokenFilter>, IStopTokenFilter
 	{
@@ -66,24 +67,22 @@ public class StopTokenFilterDescriptor
 		StopWords IStopTokenFilter.StopWords { get; set; }
 		string IStopTokenFilter.StopWordsPath { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StopTokenFilterDescriptor IgnoreCase(bool? ignoreCase = true) => Assign(a => a.IgnoreCase = ignoreCase);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StopTokenFilterDescriptor RemoveTrailing(bool? removeTrailing = true) => Assign(a => a.RemoveTrailing = removeTrailing);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StopTokenFilterDescriptor StopWords(StopWords stopWords) => Assign(a => a.StopWords = stopWords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StopTokenFilterDescriptor StopWords(IEnumerable<string> stopWords) => Assign(a => a.StopWords = stopWords.ToListOrNullIfEmpty());
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StopTokenFilterDescriptor StopWords(params string[] stopWords) => Assign(a => a.StopWords = stopWords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public StopTokenFilterDescriptor StopWordsPath(string path) => Assign(a => a.StopWordsPath = path);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/Synonym/SynonymFormat.cs b/src/Nest/Analysis/TokenFilters/Synonym/SynonymFormat.cs
index 11e226b5da8..5d1de75e498 100644
--- a/src/Nest/Analysis/TokenFilters/Synonym/SynonymFormat.cs
+++ b/src/Nest/Analysis/TokenFilters/Synonym/SynonymFormat.cs
@@ -9,7 +9,8 @@ public enum SynonymFormat
 	{
 		[EnumMember(Value = "solr")]
 		Solr,
+
 		[EnumMember(Value = "wordnet")]
 		WordNet
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/Synonym/SynonymGraphTokenFilter.cs b/src/Nest/Analysis/TokenFilters/Synonym/SynonymGraphTokenFilter.cs
index db2ab8bc889..d8bf3e45d0f 100644
--- a/src/Nest/Analysis/TokenFilters/Synonym/SynonymGraphTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/Synonym/SynonymGraphTokenFilter.cs
@@ -10,101 +10,100 @@ namespace Nest
 	/// </summary>
 	public interface ISynonymGraphTokenFilter : ITokenFilter
 	{
-		/// <summary>
-		///  a path a synonyms file relative to the node's `config` location.
-		/// </summary>
-		[JsonProperty("synonyms_path")]
-		string SynonymsPath { get; set; }
+		[JsonProperty("expand")]
+		bool? Expand { get; set; }
 
 		[JsonProperty("format")]
 		SynonymFormat? Format { get; set; }
 
-		[JsonProperty("synonyms")]
-		IEnumerable<string> Synonyms { get; set; }
-
 		[JsonProperty("ignore_case")]
 		[Obsolete("Will be removed in Elasticsearch 7.x, if you need to ignore case add a lowercase filter before this synonym filter")]
 		bool? IgnoreCase { get; set; }
 
-		[JsonProperty("expand")]
-		bool? Expand { get; set; }
+		/// <inheritdoc cref="ISynonymTokenFilter.Lenient" />
+		[JsonProperty("lenient")]
+		bool? Lenient { get; set; }
+
+		[JsonProperty("synonyms")]
+		IEnumerable<string> Synonyms { get; set; }
+
+		/// <summary>
+		///  a path a synonyms file relative to the node's `config` location.
+		/// </summary>
+		[JsonProperty("synonyms_path")]
+		string SynonymsPath { get; set; }
 
 		[JsonProperty("tokenizer")]
 		string Tokenizer { get; set; }
-
-		/// <inheritdoc cref="ISynonymTokenFilter.Lenient"/>
-		[JsonProperty("lenient")]
-		bool? Lenient { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class SynonymGraphTokenFilter : TokenFilterBase, ISynonymGraphTokenFilter
 	{
 		public SynonymGraphTokenFilter() : base("synonym_graph") { }
 
-		/// <inheritdoc/>
-		public string SynonymsPath { get; set; }
+		/// <inheritdoc />
+		public bool? Expand { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SynonymFormat? Format { get; set; }
 
-		/// <inheritdoc/>
-		public IEnumerable<string> Synonyms { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		[Obsolete("Will be removed in Elasticsearch 7.x, if you need to ignore case add a lowercase filter before this synonym filter")]
 		public bool? IgnoreCase { get; set; }
 
-		/// <inheritdoc/>
-		public bool? Expand { get; set; }
-
-		/// <inheritdoc cref="ISynonymTokenFilter.Lenient"/>
+		/// <inheritdoc cref="ISynonymTokenFilter.Lenient" />
 		public bool? Lenient { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public IEnumerable<string> Synonyms { get; set; }
+
+		/// <inheritdoc />
+		public string SynonymsPath { get; set; }
+
+		/// <inheritdoc />
 		public string Tokenizer { get; set; }
 	}
-	///<inheritdoc/>
+
+	/// <inheritdoc />
 	public class SynonymGraphTokenFilterDescriptor
 		: TokenFilterDescriptorBase<SynonymGraphTokenFilterDescriptor, ISynonymGraphTokenFilter>, ISynonymGraphTokenFilter
 	{
 		protected override string Type => "synonym_graph";
+		bool? ISynonymGraphTokenFilter.Expand { get; set; }
+		SynonymFormat? ISynonymGraphTokenFilter.Format { get; set; }
 
 		bool? ISynonymGraphTokenFilter.IgnoreCase { get; set; }
-		bool? ISynonymGraphTokenFilter.Expand { get; set; }
 		bool? ISynonymGraphTokenFilter.Lenient { get; set; }
-		string ISynonymGraphTokenFilter.Tokenizer { get; set; }
-		string ISynonymGraphTokenFilter.SynonymsPath { get; set; }
-		SynonymFormat? ISynonymGraphTokenFilter.Format{ get; set; }
 
 		IEnumerable<string> ISynonymGraphTokenFilter.Synonyms { get; set; }
+		string ISynonymGraphTokenFilter.SynonymsPath { get; set; }
+		string ISynonymGraphTokenFilter.Tokenizer { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		[Obsolete("Will be removed in Elasticsearch 7.x, if you need to ignore case add a lowercase filter before this synonym filter")]
 		public SynonymGraphTokenFilterDescriptor IgnoreCase(bool? ignoreCase = true) => Assign(a => a.IgnoreCase = ignoreCase);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymGraphTokenFilterDescriptor Expand(bool? expand = true) => Assign(a => a.Expand = expand);
 
-		/// <inheritdoc cref="ISynonymTokenFilter.Lenient"/>
+		/// <inheritdoc cref="ISynonymTokenFilter.Lenient" />
 		public SynonymGraphTokenFilterDescriptor Lenient(bool? lenient = true) => Assign(a => a.Lenient = lenient);
 
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymGraphTokenFilterDescriptor Tokenizer(string tokenizer) => Assign(a => a.Tokenizer = tokenizer);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymGraphTokenFilterDescriptor SynonymsPath(string path) => Assign(a => a.SynonymsPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymGraphTokenFilterDescriptor Format(SynonymFormat? format) => Assign(a => a.Format = format);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymGraphTokenFilterDescriptor Synonyms(IEnumerable<string> synonymGraphs) => Assign(a => a.Synonyms = synonymGraphs);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymGraphTokenFilterDescriptor Synonyms(params string[] synonymGraphs) => Assign(a => a.Synonyms = synonymGraphs);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/Synonym/SynonymTokenFilter.cs b/src/Nest/Analysis/TokenFilters/Synonym/SynonymTokenFilter.cs
index fbdb7f153f7..06182640cc2 100644
--- a/src/Nest/Analysis/TokenFilters/Synonym/SynonymTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/Synonym/SynonymTokenFilter.cs
@@ -9,102 +9,101 @@ namespace Nest
 	/// </summary>
 	public interface ISynonymTokenFilter : ITokenFilter
 	{
-		/// <summary>
-		///  a path a synonyms file relative to the node's `config` location.
-		/// </summary>
-		[JsonProperty("synonyms_path")]
-		string SynonymsPath { get; set; }
+		[JsonProperty("expand")]
+		bool? Expand { get; set; }
 
 		[JsonProperty("format")]
 		SynonymFormat? Format { get; set; }
 
-		[JsonProperty("synonyms")]
-		IEnumerable<string> Synonyms { get; set; }
-
 		[JsonProperty("ignore_case")]
 		[Obsolete("Will be removed in Elasticsearch 7.x, if you need to ignore case add a lowercase filter before this synonym filter")]
 		bool? IgnoreCase { get; set; }
 
-		[JsonProperty("expand")]
-		bool? Expand { get; set; }
-
-		[JsonProperty("tokenizer")]
-		string Tokenizer { get; set; }
-
 		/// <summary>
 		/// If `true` ignores exceptions while parsing the synonym configuration. It is important
 		// to note that only those synonym rules which cannot get parsed are ignored.
 		/// </summary>
 		[JsonProperty("lenient")]
 		bool? Lenient { get; set; }
+
+		[JsonProperty("synonyms")]
+		IEnumerable<string> Synonyms { get; set; }
+
+		/// <summary>
+		///  a path a synonyms file relative to the node's `config` location.
+		/// </summary>
+		[JsonProperty("synonyms_path")]
+		string SynonymsPath { get; set; }
+
+		[JsonProperty("tokenizer")]
+		string Tokenizer { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class SynonymTokenFilter : TokenFilterBase, ISynonymTokenFilter
 	{
 		public SynonymTokenFilter() : base("synonym") { }
 
-		/// <inheritdoc/>
-		public string SynonymsPath { get; set; }
+		/// <inheritdoc />
+		public bool? Expand { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SynonymFormat? Format { get; set; }
 
-		/// <inheritdoc/>
-		public IEnumerable<string> Synonyms { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		[Obsolete("Will be removed in Elasticsearch 7.x, if you need to ignore case add a lowercase filter before this synonym filter")]
 		public bool? IgnoreCase { get; set; }
 
-		/// <inheritdoc/>
-		public bool? Expand { get; set; }
-
-		/// <inheritdoc cref="ISynonymTokenFilter.Lenient"/>
+		/// <inheritdoc cref="ISynonymTokenFilter.Lenient" />
 		public bool? Lenient { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public IEnumerable<string> Synonyms { get; set; }
+
+		/// <inheritdoc />
+		public string SynonymsPath { get; set; }
+
+		/// <inheritdoc />
 		public string Tokenizer { get; set; }
 	}
-	///<inheritdoc/>
+
+	/// <inheritdoc />
 	public class SynonymTokenFilterDescriptor
 		: TokenFilterDescriptorBase<SynonymTokenFilterDescriptor, ISynonymTokenFilter>, ISynonymTokenFilter
 	{
 		protected override string Type => "synonym";
+		bool? ISynonymTokenFilter.Expand { get; set; }
+		SynonymFormat? ISynonymTokenFilter.Format { get; set; }
 
 		bool? ISynonymTokenFilter.IgnoreCase { get; set; }
-		bool? ISynonymTokenFilter.Expand { get; set; }
 		bool? ISynonymTokenFilter.Lenient { get; set; }
-		string ISynonymTokenFilter.Tokenizer { get; set; }
-		string ISynonymTokenFilter.SynonymsPath { get; set; }
-		SynonymFormat? ISynonymTokenFilter.Format { get; set; }
 		IEnumerable<string> ISynonymTokenFilter.Synonyms { get; set; }
+		string ISynonymTokenFilter.SynonymsPath { get; set; }
+		string ISynonymTokenFilter.Tokenizer { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		[Obsolete("Will be removed in Elasticsearch 7.x, if you need to ignore case add a lowercase filter before this synonym filter")]
 		public SynonymTokenFilterDescriptor IgnoreCase(bool? ignoreCase = true) => Assign(a => a.IgnoreCase = ignoreCase);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymTokenFilterDescriptor Expand(bool? expand = true) => Assign(a => a.Expand = expand);
 
-		/// <inheritdoc cref="ISynonymTokenFilter.Lenient"/>
+		/// <inheritdoc cref="ISynonymTokenFilter.Lenient" />
 		public SynonymTokenFilterDescriptor Lenient(bool? lenient = true) => Assign(a => a.Lenient = lenient);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymTokenFilterDescriptor Tokenizer(string tokenizer) => Assign(a => a.Tokenizer = tokenizer);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymTokenFilterDescriptor SynonymsPath(string path) => Assign(a => a.SynonymsPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymTokenFilterDescriptor Format(SynonymFormat? format) => Assign(a => a.Format = format);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymTokenFilterDescriptor Synonyms(IEnumerable<string> synonyms) => Assign(a => a.Synonyms = synonyms);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public SynonymTokenFilterDescriptor Synonyms(params string[] synonyms) => Assign(a => a.Synonyms = synonyms);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/TokenFilterBase.cs b/src/Nest/Analysis/TokenFilters/TokenFilterBase.cs
index a13fe3a58a1..155a50233bb 100644
--- a/src/Nest/Analysis/TokenFilters/TokenFilterBase.cs
+++ b/src/Nest/Analysis/TokenFilters/TokenFilterBase.cs
@@ -5,38 +5,33 @@ namespace Nest
 	[ContractJsonConverter(typeof(TokenFilterJsonConverter))]
 	public interface ITokenFilter
 	{
-		[JsonProperty("version")]
-		string Version { get; set; }
-
 		[JsonProperty("type")]
 		string Type { get; }
 
+		[JsonProperty("version")]
+		string Version { get; set; }
 	}
 
 	public abstract class TokenFilterBase : ITokenFilter
 	{
-		protected TokenFilterBase(string type)
-		{
-			this.Type = type;
-		}
-
-		[JsonProperty("version")]
-		public string Version { get; set; }
+		protected TokenFilterBase(string type) => Type = type;
 
 		[JsonProperty("type")]
 		public string Type { get; protected set; }
+
+		[JsonProperty("version")]
+		public string Version { get; set; }
 	}
 
-	public abstract class TokenFilterDescriptorBase<TTokenFilter, TTokenFilterInterface> 
+	public abstract class TokenFilterDescriptorBase<TTokenFilter, TTokenFilterInterface>
 		: DescriptorBase<TTokenFilter, TTokenFilterInterface>, ITokenFilter
 		where TTokenFilter : TokenFilterDescriptorBase<TTokenFilter, TTokenFilterInterface>, TTokenFilterInterface
 		where TTokenFilterInterface : class, ITokenFilter
 	{
-		string ITokenFilter.Version { get; set; }
-		string ITokenFilter.Type => this.Type;
 		protected abstract string Type { get; }
+		string ITokenFilter.Type => Type;
+		string ITokenFilter.Version { get; set; }
 
 		public TTokenFilter Version(string version) => Assign(a => a.Version = version);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs b/src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs
index fc36dae5144..ab43f823164 100644
--- a/src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs
+++ b/src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs
@@ -6,19 +6,20 @@ namespace Nest
 {
 	internal class TokenFilterJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-		public override bool CanWrite => false;
 		public override bool CanRead => true;
+		public override bool CanWrite => false;
+
+		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			JObject o = JObject.Load(reader);
+			var o = JObject.Load(reader);
 
-			JProperty typeProperty = o.Property("type");
+			var typeProperty = o.Property("type");
 			if (typeProperty == null) return null;
 
 			var typePropertyValue = typeProperty.Value.ToString();
-			switch(typePropertyValue.ToLowerInvariant())
+			switch (typePropertyValue.ToLowerInvariant())
 			{
 				case "asciifolding": return o.ToObject<AsciiFoldingTokenFilter>(ElasticContractResolver.Empty);
 				case "common_grams": return o.ToObject<CommonGramsTokenFilter>(ElasticContractResolver.Empty);
@@ -67,9 +68,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return null;
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 	}
 }
diff --git a/src/Nest/Analysis/TokenFilters/TokenFilters.cs b/src/Nest/Analysis/TokenFilters/TokenFilters.cs
index a0bc22e0c02..55a04c40424 100644
--- a/src/Nest/Analysis/TokenFilters/TokenFilters.cs
+++ b/src/Nest/Analysis/TokenFilters/TokenFilters.cs
@@ -6,33 +6,23 @@
 namespace Nest
 {
 	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<TokenFilters, string, ITokenFilter>))]
-	public interface ITokenFilters : IIsADictionary<string, ITokenFilter>
-	{
-	}
+	public interface ITokenFilters : IIsADictionary<string, ITokenFilter> { }
 
 	public class TokenFilters : IsADictionaryBase<string, ITokenFilter>, ITokenFilters
 	{
-		public TokenFilters()
-		{
-		}
+		public TokenFilters() { }
 
-		public TokenFilters(IDictionary<string, ITokenFilter> container) : base(container)
-		{
-		}
+		public TokenFilters(IDictionary<string, ITokenFilter> container) : base(container) { }
 
 		public TokenFilters(Dictionary<string, ITokenFilter> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{
-		}
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		public void Add(string name, ITokenFilter analyzer) => BackingDictionary.Add(name, analyzer);
 	}
 
 	public class TokenFiltersDescriptor : IsADictionaryDescriptorBase<TokenFiltersDescriptor, ITokenFilters, string, ITokenFilter>
 	{
-		public TokenFiltersDescriptor() : base(new TokenFilters())
-		{
-		}
+		public TokenFiltersDescriptor() : base(new TokenFilters()) { }
 
 		public TokenFiltersDescriptor UserDefined(string name, ITokenFilter analyzer) => Assign(name, analyzer);
 
@@ -40,14 +30,16 @@ public TokenFiltersDescriptor() : base(new TokenFilters())
 		/// Token filters that allow to decompose compound words using a dictionary
 		/// </summary>
 		public TokenFiltersDescriptor DictionaryDecompounder(string name,
-			Func<DictionaryDecompounderTokenFilterDescriptor, IDictionaryDecompounderTokenFilter> selector) =>
+			Func<DictionaryDecompounderTokenFilterDescriptor, IDictionaryDecompounderTokenFilter> selector
+		) =>
 			Assign(name, selector?.Invoke(new DictionaryDecompounderTokenFilterDescriptor()));
 
 		/// <summary>
 		/// Token filters that allow to decompose compound words using FOP XML
 		/// </summary>
 		public TokenFiltersDescriptor HyphenationDecompounder(string name,
-			Func<HyphenationDecompounderTokenFilterDescriptor, IHyphenationDecompounderTokenFilter> selector) =>
+			Func<HyphenationDecompounderTokenFilterDescriptor, IHyphenationDecompounderTokenFilter> selector
+		) =>
 			Assign(name, selector?.Invoke(new HyphenationDecompounderTokenFilterDescriptor()));
 
 		/// <summary>
@@ -99,7 +91,9 @@ public TokenFiltersDescriptor WordDelimiter(string name, Func<WordDelimiterToken
 		/// A token filter of type asciifolding that converts alphabetic, numeric, and symbolic Unicode characters which are
 		/// <para> not in the first 127 ASCII characters (the “Basic Latin” Unicode block) into their ASCII equivalents, if one exists.</para>
 		/// </summary>
-		public TokenFiltersDescriptor WordDelimiterGraph(string name, Func<WordDelimiterGraphTokenFilterDescriptor, IWordDelimiterGraphTokenFilter> selector) =>
+		public TokenFiltersDescriptor WordDelimiterGraph(string name,
+			Func<WordDelimiterGraphTokenFilterDescriptor, IWordDelimiterGraphTokenFilter> selector
+		) =>
 			Assign(name, selector?.Invoke(new WordDelimiterGraphTokenFilterDescriptor()));
 
 		/// <summary>
@@ -110,8 +104,8 @@ public TokenFiltersDescriptor AsciiFolding(string name, Func<AsciiFoldingTokenFi
 			Assign(name, selector?.Invoke(new AsciiFoldingTokenFilterDescriptor()));
 
 		/// <summary>
-		/// Token filter that generates bigrams for frequently occuring terms. Single terms are still indexed.
-		///<para>Note, common_words or common_words_path field is required.</para>
+		///  Token filter that generates bigrams for frequently occuring terms. Single terms are still indexed.
+		/// <para>Note, common_words or common_words_path field is required.</para>
 		/// </summary>
 		public TokenFiltersDescriptor CommonGrams(string name, Func<CommonGramsTokenFilterDescriptor, ICommonGramsTokenFilter> selector) =>
 			Assign(name, selector?.Invoke(new CommonGramsTokenFilterDescriptor()));
@@ -119,7 +113,8 @@ public TokenFiltersDescriptor CommonGrams(string name, Func<CommonGramsTokenFilt
 		/// <summary>
 		/// Splits tokens into tokens and payload whenever a delimiter character is found.
 		/// </summary>
-		public TokenFiltersDescriptor DelimitedPayload(string name, Func<DelimitedPayloadTokenFilterDescriptor, IDelimitedPayloadTokenFilter> selector) =>
+		public TokenFiltersDescriptor DelimitedPayload(string name, Func<DelimitedPayloadTokenFilterDescriptor, IDelimitedPayloadTokenFilter> selector
+		) =>
 			Assign(name, selector?.Invoke(new DelimitedPayloadTokenFilterDescriptor()));
 
 		/// <summary>
@@ -129,8 +124,8 @@ public TokenFiltersDescriptor Elision(string name, Func<ElisionTokenFilterDescri
 			Assign(name, selector?.Invoke(new ElisionTokenFilterDescriptor()));
 
 		/// <summary>
-		/// Basic support for hunspell stemming.
-		///<para> Hunspell dictionaries will be picked up from a dedicated hunspell directory on the filesystem.</para>
+		///  Basic support for hunspell stemming.
+		/// <para> Hunspell dictionaries will be picked up from a dedicated hunspell directory on the filesystem.</para>
 		/// </summary>
 		public TokenFiltersDescriptor Hunspell(string name, Func<HunspellTokenFilterDescriptor, IHunspellTokenFilter> selector) =>
 			Assign(name, selector?.Invoke(new HunspellTokenFilterDescriptor()));
@@ -154,8 +149,8 @@ public TokenFiltersDescriptor KeywordMarker(string name, Func<KeywordMarkerToken
 			Assign(name, selector?.Invoke(new KeywordMarkerTokenFilterDescriptor()));
 
 		/// <summary>
-		///The kstem token filter is a high performance filter for english.
-		///<para> All terms must already be lowercased (use lowercase filter) for this filter to work correctly.</para>
+		/// The kstem token filter is a high performance filter for english.
+		/// <para> All terms must already be lowercased (use lowercase filter) for this filter to work correctly.</para>
 		/// </summary>
 		public TokenFiltersDescriptor KStem(string name, Func<KStemTokenFilterDescriptor, IKStemTokenFilter> selector = null) =>
 			Assign(name, selector.InvokeOrDefault(new KStemTokenFilterDescriptor()));
@@ -169,12 +164,13 @@ public TokenFiltersDescriptor Length(string name, Func<LengthTokenFilterDescript
 		/// <summary>
 		/// Limits the number of tokens that are indexed per document and field.
 		/// </summary>
-		public TokenFiltersDescriptor LimitTokenCount(string name, Func<LimitTokenCountTokenFilterDescriptor, ILimitTokenCountTokenFilter> selector) =>
+		public TokenFiltersDescriptor LimitTokenCount(string name, Func<LimitTokenCountTokenFilterDescriptor, ILimitTokenCountTokenFilter> selector
+		) =>
 			Assign(name, selector?.Invoke(new LimitTokenCountTokenFilterDescriptor()));
 
 		/// <summary>
-		/// A token filter of type lowercase that normalizes token text to lower case.
-		///<para> Lowercase token filter supports Greek and Turkish lowercase token filters through the language parameter.</para>
+		///  A token filter of type lowercase that normalizes token text to lower case.
+		/// <para> Lowercase token filter supports Greek and Turkish lowercase token filters through the language parameter.</para>
 		/// </summary>
 		public TokenFiltersDescriptor Lowercase(string name, Func<LowercaseTokenFilterDescriptor, ILowercaseTokenFilter> selector = null) =>
 			Assign(name, selector.InvokeOrDefault(new LowercaseTokenFilterDescriptor()));
@@ -228,9 +224,11 @@ public TokenFiltersDescriptor Stemmer(string name, Func<StemmerTokenFilterDescri
 			Assign(name, selector?.Invoke(new StemmerTokenFilterDescriptor()));
 
 		/// <summary>
-		/// Overrides stemming algorithms, by applying a custom mapping, then protecting these terms from being modified by stemmers. Must be placed before any stemming filters.
+		/// Overrides stemming algorithms, by applying a custom mapping, then protecting these terms from being modified by stemmers. Must be placed
+		/// before any stemming filters.
 		/// </summary>
-		public TokenFiltersDescriptor StemmerOverride(string name, Func<StemmerOverrideTokenFilterDescriptor, IStemmerOverrideTokenFilter> selector) =>
+		public TokenFiltersDescriptor StemmerOverride(string name, Func<StemmerOverrideTokenFilterDescriptor, IStemmerOverrideTokenFilter> selector
+		) =>
 			Assign(name, selector?.Invoke(new StemmerOverrideTokenFilterDescriptor()));
 
 		/// <summary>
@@ -271,26 +269,33 @@ public TokenFiltersDescriptor Fingerprint(string name, Func<FingerprintTokenFilt
 		/// long sound character by removing this character (U+30FC). Only full-width katakana characters are supported.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
-		public TokenFiltersDescriptor KuromojiStemmer(string name, Func<KuromojiStemmerTokenFilterDescriptor, IKuromojiStemmerTokenFilter> selector = null) =>
+		public TokenFiltersDescriptor KuromojiStemmer(string name,
+			Func<KuromojiStemmerTokenFilterDescriptor, IKuromojiStemmerTokenFilter> selector = null
+		) =>
 			Assign(name, selector.InvokeOrDefault(new KuromojiStemmerTokenFilterDescriptor()));
 
 		/// <summary>
 		/// The kuromoji_readingform token filter replaces the token with its reading form in either katakana or romaji.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
-		public TokenFiltersDescriptor KuromojiReadingForm(string name, Func<KuromojiReadingFormTokenFilterDescriptor, IKuromojiReadingFormTokenFilter> selector) =>
+		public TokenFiltersDescriptor KuromojiReadingForm(string name,
+			Func<KuromojiReadingFormTokenFilterDescriptor, IKuromojiReadingFormTokenFilter> selector
+		) =>
 			Assign(name, selector.Invoke(new KuromojiReadingFormTokenFilterDescriptor()));
 
 		/// <summary>
 		/// The kuromoji_part_of_speech token filter removes tokens that match a set of part-of-speech tags.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
-		public TokenFiltersDescriptor KuromojiPartOfSpeech(string name, Func<KuromojiPartOfSpeechTokenFilterDescriptor, IKuromojiPartOfSpeechTokenFilter> selector) =>
+		public TokenFiltersDescriptor KuromojiPartOfSpeech(string name,
+			Func<KuromojiPartOfSpeechTokenFilterDescriptor, IKuromojiPartOfSpeechTokenFilter> selector
+		) =>
 			Assign(name, selector.Invoke(new KuromojiPartOfSpeechTokenFilterDescriptor()));
 
 
 		/// <summary>
-		/// Collations are used for sorting documents in a language-specific word order. The icu_collation token filter is available to all indices and defaults to using the DUCET collation, which is a best-effort attempt at language-neutral sorting.
+		/// Collations are used for sorting documents in a language-specific word order. The icu_collation token filter is available to all indices and
+		/// defaults to using the DUCET collation, which is a best-effort attempt at language-neutral sorting.
 		/// Part of the `analysis-icu` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html
 		/// </summary>
 		public TokenFiltersDescriptor IcuCollation(string name, Func<IcuCollationTokenFilterDescriptor, IIcuCollationTokenFilter> selector) =>
@@ -307,7 +312,8 @@ public TokenFiltersDescriptor IcuFolding(string name, Func<IcuFoldingTokenFilter
 		/// Normalizes as defined here: http://userguide.icu-project.org/transforms/normalization
 		/// Part of the `analysis-icu` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html
 		/// </summary>
-		public TokenFiltersDescriptor IcuNormalization(string name, Func<IcuNormalizationTokenFilterDescriptor, IIcuNormalizationTokenFilter> selector) =>
+		public TokenFiltersDescriptor IcuNormalization(string name, Func<IcuNormalizationTokenFilterDescriptor, IIcuNormalizationTokenFilter> selector
+		) =>
 			Assign(name, selector.Invoke(new IcuNormalizationTokenFilterDescriptor()));
 
 		/// <summary>
@@ -318,8 +324,9 @@ public TokenFiltersDescriptor IcuNormalization(string name, Func<IcuNormalizatio
 		public TokenFiltersDescriptor IcuTransform(string name, Func<IcuTransformTokenFilterDescriptor, IIcuTransformTokenFilter> selector) =>
 			Assign(name, selector.Invoke(new IcuTransformTokenFilterDescriptor()));
 
-		/// <inheritdoc cref="INoriPartOfSpeechTokenFilter"/>
-		public TokenFiltersDescriptor NoriPartOfSpeech(string name, Func<NoriPartOfSpeechTokenFilterDescriptor, INoriPartOfSpeechTokenFilter> selector) =>
+		/// <inheritdoc cref="INoriPartOfSpeechTokenFilter" />
+		public TokenFiltersDescriptor NoriPartOfSpeech(string name, Func<NoriPartOfSpeechTokenFilterDescriptor, INoriPartOfSpeechTokenFilter> selector
+		) =>
 			Assign(name, selector.Invoke(new NoriPartOfSpeechTokenFilterDescriptor()));
 
 		/// <summary>
@@ -330,7 +337,9 @@ public TokenFiltersDescriptor Multiplexer(string name, Func<MultiplexerTokenFilt
 			Assign(name, selector.Invoke(new MultiplexerTokenFilterDescriptor()));
 
 		/// <summary> A token filter of type remove_duplicates that drops identical tokens at the same position. </summary>
-		public TokenFiltersDescriptor RemoveDuplicates(string name, Func<RemoveDuplicatesTokenFilterDescriptor, IRemoveDuplicatesTokenFilter> selector = null) =>
+		public TokenFiltersDescriptor RemoveDuplicates(string name,
+			Func<RemoveDuplicatesTokenFilterDescriptor, IRemoveDuplicatesTokenFilter> selector = null
+		) =>
 			Assign(name, selector.InvokeOrDefault(new RemoveDuplicatesTokenFilterDescriptor()));
 	}
 }
diff --git a/src/Nest/Analysis/TokenFilters/TrimTokenFilter.cs b/src/Nest/Analysis/TokenFilters/TrimTokenFilter.cs
index e204728eae2..313b5636f45 100644
--- a/src/Nest/Analysis/TokenFilters/TrimTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/TrimTokenFilter.cs
@@ -5,15 +5,16 @@
 	/// </summary>
 	public interface ITrimTokenFilter : ITokenFilter { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class TrimTokenFilter : TokenFilterBase, ITrimTokenFilter
 	{
 		public TrimTokenFilter() : base("trim") { }
 	}
-	///<inheritdoc/>
-	public class TrimTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class TrimTokenFilterDescriptor
 		: TokenFilterDescriptorBase<TrimTokenFilterDescriptor, ITrimTokenFilter>, ITrimTokenFilter
 	{
 		protected override string Type => "trim";
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/TruncateTokenFilter.cs b/src/Nest/Analysis/TokenFilters/TruncateTokenFilter.cs
index 117bf514dea..d5a310c4f0f 100644
--- a/src/Nest/Analysis/TokenFilters/TruncateTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/TruncateTokenFilter.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// The truncate token filter can be used to truncate tokens into a specific length. This can come in handy with keyword (single token) 
+	/// The truncate token filter can be used to truncate tokens into a specific length. This can come in handy with keyword (single token)
 	/// <para> based mapped fields that are used for sorting in order to reduce memory usage.</para>
 	/// </summary>
 	public interface ITruncateTokenFilter : ITokenFilter
@@ -13,26 +13,26 @@ public interface ITruncateTokenFilter : ITokenFilter
 		/// </summary>
 		[JsonProperty("length")]
 		int? Length { get; set; }
-	} 
+	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class TruncateTokenFilter : TokenFilterBase, ITruncateTokenFilter
 	{
 		public TruncateTokenFilter() : base("truncate") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? Length { get; set; }
 	}
-	///<inheritdoc/>
-	public class TruncateTokenFilterDescriptor 
+
+	/// <inheritdoc />
+	public class TruncateTokenFilterDescriptor
 		: TokenFilterDescriptorBase<TruncateTokenFilterDescriptor, ITruncateTokenFilter>, ITruncateTokenFilter
 	{
 		protected override string Type => "truncate";
 
 		int? ITruncateTokenFilter.Length { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public TruncateTokenFilterDescriptor Length(int? length) => Assign(a => a.Length = length);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/UniqueTokenFilter.cs b/src/Nest/Analysis/TokenFilters/UniqueTokenFilter.cs
index 4495357da5b..dcdc44cec41 100644
--- a/src/Nest/Analysis/TokenFilters/UniqueTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/UniqueTokenFilter.cs
@@ -14,25 +14,24 @@ public interface IUniqueTokenFilter : ITokenFilter
 		bool? OnlyOnSamePosition { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class UniqueTokenFilter : TokenFilterBase, IUniqueTokenFilter
 	{
 		public UniqueTokenFilter() : base("unique") { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? OnlyOnSamePosition { get; set; }
 	}
 
-	///<inheritdoc/>
-	public class UniqueTokenFilterDescriptor 
+	/// <inheritdoc />
+	public class UniqueTokenFilterDescriptor
 		: TokenFilterDescriptorBase<UniqueTokenFilterDescriptor, IUniqueTokenFilter>, IUniqueTokenFilter
 	{
 		protected override string Type => "unique";
 
 		bool? IUniqueTokenFilter.OnlyOnSamePosition { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public UniqueTokenFilterDescriptor OnlyOnSamePosition(bool? samePositionOnly = true) => Assign(a => a.OnlyOnSamePosition = samePositionOnly);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/UppercaseTokenFilter.cs b/src/Nest/Analysis/TokenFilters/UppercaseTokenFilter.cs
index dc3ace155b3..832e8282078 100644
--- a/src/Nest/Analysis/TokenFilters/UppercaseTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/UppercaseTokenFilter.cs
@@ -5,17 +5,16 @@
 	/// </summary>
 	public interface IUppercaseTokenFilter : ITokenFilter { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class UppercaseTokenFilter : TokenFilterBase, IUppercaseTokenFilter
 	{
 		public UppercaseTokenFilter() : base("uppercase") { }
 	}
 
-	///<inheritdoc/>
-	public class UppercaseTokenFilterDescriptor 
+	/// <inheritdoc />
+	public class UppercaseTokenFilterDescriptor
 		: TokenFilterDescriptorBase<UppercaseTokenFilterDescriptor, IUppercaseTokenFilter>, IUppercaseTokenFilter
 	{
 		protected override string Type => "uppercase";
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/TokenFilters/WordDelimiter/WordDelimiterTokenFilter.cs b/src/Nest/Analysis/TokenFilters/WordDelimiter/WordDelimiterTokenFilter.cs
index 56e104d3fcf..1bd832fd798 100644
--- a/src/Nest/Analysis/TokenFilters/WordDelimiter/WordDelimiterTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/WordDelimiter/WordDelimiterTokenFilter.cs
@@ -9,16 +9,16 @@ namespace Nest
 	public interface IWordDelimiterTokenFilter : ITokenFilter
 	{
 		/// <summary>
-		/// If true causes parts of words to be generated: "PowerShot" ⇒ "Power" "Shot". Defaults to true.
+		/// If true causes all subword parts to be catenated: "wi-fi-4000" ⇒ "wifi4000". Defaults to false.
 		/// </summary>
-		[JsonProperty("generate_word_parts")]
-		bool? GenerateWordParts { get; set; }
+		[JsonProperty("catenate_all")]
+		bool? CatenateAll { get; set; }
 
 		/// <summary>
-		/// If true causes number subwords to be generated: "500-42" ⇒ "500" "42". Defaults to true.
+		/// If true causes maximum runs of number parts to be catenated: "500-42" ⇒ "50042". Defaults to false.
 		/// </summary>
-		[JsonProperty("generate_number_parts")]
-		bool? GenerateNumberParts { get; set; }
+		[JsonProperty("catenate_numbers")]
+		bool? CatenateNumbers { get; set; }
 
 		/// <summary>
 		/// If true causes maximum runs of word parts to be catenated: "wi-fi" ⇒ "wifi". Defaults to false.
@@ -27,22 +27,16 @@ public interface IWordDelimiterTokenFilter : ITokenFilter
 		bool? CatenateWords { get; set; }
 
 		/// <summary>
-		/// If true causes maximum runs of number parts to be catenated: "500-42" ⇒ "50042". Defaults to false.
-		/// </summary>
-		[JsonProperty("catenate_numbers")]
-		bool? CatenateNumbers { get; set; }
-
-		/// <summary>
-		/// If true causes all subword parts to be catenated: "wi-fi-4000" ⇒ "wifi4000". Defaults to false.
+		/// If true causes number subwords to be generated: "500-42" ⇒ "500" "42". Defaults to true.
 		/// </summary>
-		[JsonProperty("catenate_all")]
-		bool? CatenateAll { get; set; }
+		[JsonProperty("generate_number_parts")]
+		bool? GenerateNumberParts { get; set; }
 
 		/// <summary>
-		/// If true causes "PowerShot" to be two tokens; ("Power-Shot" remains two parts regards). Defaults to true.
+		/// If true causes parts of words to be generated: "PowerShot" ⇒ "Power" "Shot". Defaults to true.
 		/// </summary>
-		[JsonProperty("split_on_case_change")]
-		bool? SplitOnCaseChange { get; set; }
+		[JsonProperty("generate_word_parts")]
+		bool? GenerateWordParts { get; set; }
 
 		/// <summary>
 		/// If true includes original words in subwords: "500-42" ⇒ "500-42" "500" "42". Defaults to false.
@@ -51,29 +45,35 @@ public interface IWordDelimiterTokenFilter : ITokenFilter
 		bool? PreserveOriginal { get; set; }
 
 		/// <summary>
-		/// If true causes "j2se" to be three tokens; "j" "2" "se". Defaults to true.
+		///  A list of protected words from being delimiter.
 		/// </summary>
-		[JsonProperty("split_on_numerics")]
-		bool? SplitOnNumerics { get; set; }
+		[JsonProperty("protected_words")]
+		IEnumerable<string> ProtectedWords { get; set; }
 
 		/// <summary>
-		/// If true causes trailing "'s" to be removed for each subword: "O’Neil’s" ⇒ "O", "Neil". Defaults to true. 
+		/// protected_words_path which resolved to a file configured with protected words (one on each line).
+		///  Automatically resolves to config/ based location if exists.
 		/// </summary>
-		[JsonProperty("stem_english_possessive")]
-		bool? StemEnglishPossessive { get; set; }
+		[JsonProperty("protected_words_path ")]
+		string ProtectedWordsPath { get; set; }
 
 		/// <summary>
-		///  A list of protected words from being delimiter.
+		/// If true causes "PowerShot" to be two tokens; ("Power-Shot" remains two parts regards). Defaults to true.
 		/// </summary>
-		[JsonProperty("protected_words")]
-		IEnumerable<string> ProtectedWords { get; set; }
+		[JsonProperty("split_on_case_change")]
+		bool? SplitOnCaseChange { get; set; }
 
 		/// <summary>
-		///protected_words_path which resolved to a file configured with protected words (one on each line). 
-		/// Automatically resolves to config/ based location if exists.
+		/// If true causes "j2se" to be three tokens; "j" "2" "se". Defaults to true.
 		/// </summary>
-		[JsonProperty("protected_words_path ")]
-		string ProtectedWordsPath { get; set; }
+		[JsonProperty("split_on_numerics")]
+		bool? SplitOnNumerics { get; set; }
+
+		/// <summary>
+		/// If true causes trailing "'s" to be removed for each subword: "O’Neil’s" ⇒ "O", "Neil". Defaults to true.
+		/// </summary>
+		[JsonProperty("stem_english_possessive")]
+		bool? StemEnglishPossessive { get; set; }
 
 		/// <summary>
 		/// A custom type mapping table
@@ -86,119 +86,119 @@ public interface IWordDelimiterTokenFilter : ITokenFilter
 		/// </summary>
 		[JsonProperty("type_table_path")]
 		string TypeTablePath { get; set; }
-
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class WordDelimiterTokenFilter : TokenFilterBase, IWordDelimiterTokenFilter
 	{
 		public WordDelimiterTokenFilter() : base("word_delimiter") { }
 
-		/// <inheritdoc/>
-		public bool? GenerateWordParts { get; set; }
+		/// <inheritdoc />
+		public bool? CatenateAll { get; set; }
 
-		/// <inheritdoc/>
-		public bool? GenerateNumberParts { get; set; }
+		/// <inheritdoc />
+		public bool? CatenateNumbers { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? CatenateWords { get; set; }
 
-		/// <inheritdoc/>
-		public bool? CatenateNumbers { get; set; }
-
-		/// <inheritdoc/>
-		public bool? CatenateAll { get; set; }
+		/// <inheritdoc />
+		public bool? GenerateNumberParts { get; set; }
 
-		/// <inheritdoc/>
-		public bool? SplitOnCaseChange { get; set; }
+		/// <inheritdoc />
+		public bool? GenerateWordParts { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? PreserveOriginal { get; set; }
 
-		/// <inheritdoc/>
-		public bool? SplitOnNumerics { get; set; }
-
-		/// <inheritdoc/>
-		public bool? StemEnglishPossessive { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> ProtectedWords { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string ProtectedWordsPath { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public bool? SplitOnCaseChange { get; set; }
+
+		/// <inheritdoc />
+		public bool? SplitOnNumerics { get; set; }
+
+		/// <inheritdoc />
+		public bool? StemEnglishPossessive { get; set; }
+
+		/// <inheritdoc />
 		public IEnumerable<string> TypeTable { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string TypeTablePath { get; set; }
 	}
 
-	///<inheritdoc/>
-	public class WordDelimiterTokenFilterDescriptor 
+	/// <inheritdoc />
+	public class WordDelimiterTokenFilterDescriptor
 		: TokenFilterDescriptorBase<WordDelimiterTokenFilterDescriptor, IWordDelimiterTokenFilter>, IWordDelimiterTokenFilter
 	{
 		protected override string Type => "word_delimiter";
+		bool? IWordDelimiterTokenFilter.CatenateAll { get; set; }
+		bool? IWordDelimiterTokenFilter.CatenateNumbers { get; set; }
+		bool? IWordDelimiterTokenFilter.CatenateWords { get; set; }
+		bool? IWordDelimiterTokenFilter.GenerateNumberParts { get; set; }
+		bool? IWordDelimiterTokenFilter.GenerateWordParts { get; set; }
+		bool? IWordDelimiterTokenFilter.PreserveOriginal { get; set; }
 
 		IEnumerable<string> IWordDelimiterTokenFilter.ProtectedWords { get; set; }
 		string IWordDelimiterTokenFilter.ProtectedWordsPath { get; set; }
-		IEnumerable<string> IWordDelimiterTokenFilter.TypeTable { get; set; }
-		string IWordDelimiterTokenFilter.TypeTablePath { get; set; }
-		bool? IWordDelimiterTokenFilter.GenerateWordParts { get; set; }
-		bool? IWordDelimiterTokenFilter.GenerateNumberParts { get; set; }
-		bool? IWordDelimiterTokenFilter.CatenateWords { get; set; }
-		bool? IWordDelimiterTokenFilter.CatenateNumbers { get; set; }
-		bool? IWordDelimiterTokenFilter.CatenateAll { get; set; }
 		bool? IWordDelimiterTokenFilter.SplitOnCaseChange { get; set; }
-		bool? IWordDelimiterTokenFilter.PreserveOriginal { get; set; }
 		bool? IWordDelimiterTokenFilter.SplitOnNumerics { get; set; }
 		bool? IWordDelimiterTokenFilter.StemEnglishPossessive { get; set; }
+		IEnumerable<string> IWordDelimiterTokenFilter.TypeTable { get; set; }
+		string IWordDelimiterTokenFilter.TypeTablePath { get; set; }
 
-		///<inheritdoc/>
-		public WordDelimiterTokenFilterDescriptor GenerateWordParts(bool? generateWordParts = true) => Assign(a => a.GenerateWordParts = generateWordParts);
+		/// <inheritdoc />
+		public WordDelimiterTokenFilterDescriptor GenerateWordParts(bool? generateWordParts = true) =>
+			Assign(a => a.GenerateWordParts = generateWordParts);
 
-		///<inheritdoc/>
-		public WordDelimiterTokenFilterDescriptor GenerateNumberParts(bool? generateNumberParts = true) => Assign(a => a.GenerateNumberParts = generateNumberParts);
+		/// <inheritdoc />
+		public WordDelimiterTokenFilterDescriptor GenerateNumberParts(bool? generateNumberParts = true) =>
+			Assign(a => a.GenerateNumberParts = generateNumberParts);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor CatenateWords(bool? catenateWords = true) => Assign(a => a.CatenateWords = catenateWords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor CatenateNumbers(bool? catenateNumbers = true) => Assign(a => a.CatenateNumbers = catenateNumbers);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor CatenateAll(bool? catenateAll = true) => Assign(a => a.CatenateAll = catenateAll);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor SplitOnCaseChange(bool? split = true) => Assign(a => a.SplitOnCaseChange = split);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor SplitOnNumerics(bool? split = true) => Assign(a => a.SplitOnNumerics = split);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor PreserveOriginal(bool? preserve = true) => Assign(a => a.PreserveOriginal = preserve);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor StemEnglishPossessive(bool? stem = true) => Assign(a => a.StemEnglishPossessive = stem);
 
-		///<inheritdoc/>
-		public WordDelimiterTokenFilterDescriptor ProtectedWords(IEnumerable<string> protectedWords) => Assign(a => a.ProtectedWords = protectedWords);
+		/// <inheritdoc />
+		public WordDelimiterTokenFilterDescriptor ProtectedWords(IEnumerable<string> protectedWords) =>
+			Assign(a => a.ProtectedWords = protectedWords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor ProtectedWords(params string[] protectedWords) => Assign(a => a.ProtectedWords = protectedWords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor ProtectedWordsPath(string path) => Assign(a => a.ProtectedWordsPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor TypeTable(IEnumerable<string> typeTable) => Assign(a => a.TypeTable = typeTable);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor TypeTable(params string[] typeTable) => Assign(a => a.TypeTable = typeTable);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterTokenFilterDescriptor TypeTablePath(string path) => Assign(a => a.TypeTablePath = path);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/TokenFilters/WordDelimiterGraph/WordDelimiterGraphTokenFilter.cs b/src/Nest/Analysis/TokenFilters/WordDelimiterGraph/WordDelimiterGraphTokenFilter.cs
index 12e84aa707c..15dba2f4ae9 100644
--- a/src/Nest/Analysis/TokenFilters/WordDelimiterGraph/WordDelimiterGraphTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/WordDelimiterGraph/WordDelimiterGraphTokenFilter.cs
@@ -10,16 +10,16 @@ namespace Nest
 	public interface IWordDelimiterGraphTokenFilter : ITokenFilter
 	{
 		/// <summary>
-		/// If true causes parts of words to be generated: "PowerShot" ⇒ "Power" "Shot". Defaults to true.
+		/// If true causes all subword parts to be catenated: "wi-fi-4000" ⇒ "wifi4000". Defaults to false.
 		/// </summary>
-		[JsonProperty("generate_word_parts")]
-		bool? GenerateWordParts { get; set; }
+		[JsonProperty("catenate_all")]
+		bool? CatenateAll { get; set; }
 
 		/// <summary>
-		/// If true causes number subwords to be generated: "500-42" ⇒ "500" "42". Defaults to true.
+		/// If true causes maximum runs of number parts to be catenated: "500-42" ⇒ "50042". Defaults to false.
 		/// </summary>
-		[JsonProperty("generate_number_parts")]
-		bool? GenerateNumberParts { get; set; }
+		[JsonProperty("catenate_numbers")]
+		bool? CatenateNumbers { get; set; }
 
 		/// <summary>
 		/// If true causes maximum runs of word parts to be catenated: "wi-fi" ⇒ "wifi". Defaults to false.
@@ -28,22 +28,16 @@ public interface IWordDelimiterGraphTokenFilter : ITokenFilter
 		bool? CatenateWords { get; set; }
 
 		/// <summary>
-		/// If true causes maximum runs of number parts to be catenated: "500-42" ⇒ "50042". Defaults to false.
-		/// </summary>
-		[JsonProperty("catenate_numbers")]
-		bool? CatenateNumbers { get; set; }
-
-		/// <summary>
-		/// If true causes all subword parts to be catenated: "wi-fi-4000" ⇒ "wifi4000". Defaults to false.
+		/// If true causes number subwords to be generated: "500-42" ⇒ "500" "42". Defaults to true.
 		/// </summary>
-		[JsonProperty("catenate_all")]
-		bool? CatenateAll { get; set; }
+		[JsonProperty("generate_number_parts")]
+		bool? GenerateNumberParts { get; set; }
 
 		/// <summary>
-		/// If true causes "PowerShot" to be two tokens; ("Power-Shot" remains two parts regards). Defaults to true.
+		/// If true causes parts of words to be generated: "PowerShot" ⇒ "Power" "Shot". Defaults to true.
 		/// </summary>
-		[JsonProperty("split_on_case_change")]
-		bool? SplitOnCaseChange { get; set; }
+		[JsonProperty("generate_word_parts")]
+		bool? GenerateWordParts { get; set; }
 
 		/// <summary>
 		/// If true includes original words in subwords: "500-42" ⇒ "500-42" "500" "42". Defaults to false.
@@ -52,29 +46,35 @@ public interface IWordDelimiterGraphTokenFilter : ITokenFilter
 		bool? PreserveOriginal { get; set; }
 
 		/// <summary>
-		/// If true causes "j2se" to be three tokens; "j" "2" "se". Defaults to true.
+		///  A list of protected words from being delimiter.
 		/// </summary>
-		[JsonProperty("split_on_numerics")]
-		bool? SplitOnNumerics { get; set; }
+		[JsonProperty("protected_words")]
+		IEnumerable<string> ProtectedWords { get; set; }
 
 		/// <summary>
-		/// If true causes trailing "'s" to be removed for each subword: "O’Neil’s" ⇒ "O", "Neil". Defaults to true.
+		/// protected_words_path which resolved to a file configured with protected words (one on each line).
+		///  Automatically resolves to config/ based location if exists.
 		/// </summary>
-		[JsonProperty("stem_english_possessive")]
-		bool? StemEnglishPossessive { get; set; }
+		[JsonProperty("protected_words_path ")]
+		string ProtectedWordsPath { get; set; }
 
 		/// <summary>
-		///  A list of protected words from being delimiter.
+		/// If true causes "PowerShot" to be two tokens; ("Power-Shot" remains two parts regards). Defaults to true.
 		/// </summary>
-		[JsonProperty("protected_words")]
-		IEnumerable<string> ProtectedWords { get; set; }
+		[JsonProperty("split_on_case_change")]
+		bool? SplitOnCaseChange { get; set; }
 
 		/// <summary>
-		///protected_words_path which resolved to a file configured with protected words (one on each line).
-		/// Automatically resolves to config/ based location if exists.
+		/// If true causes "j2se" to be three tokens; "j" "2" "se". Defaults to true.
 		/// </summary>
-		[JsonProperty("protected_words_path ")]
-		string ProtectedWordsPath { get; set; }
+		[JsonProperty("split_on_numerics")]
+		bool? SplitOnNumerics { get; set; }
+
+		/// <summary>
+		/// If true causes trailing "'s" to be removed for each subword: "O’Neil’s" ⇒ "O", "Neil". Defaults to true.
+		/// </summary>
+		[JsonProperty("stem_english_possessive")]
+		bool? StemEnglishPossessive { get; set; }
 
 		/// <summary>
 		/// A custom type mapping table
@@ -87,119 +87,121 @@ public interface IWordDelimiterGraphTokenFilter : ITokenFilter
 		/// </summary>
 		[JsonProperty("type_table_path")]
 		string TypeTablePath { get; set; }
-
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class WordDelimiterGraphTokenFilter : TokenFilterBase, IWordDelimiterGraphTokenFilter
 	{
 		public WordDelimiterGraphTokenFilter() : base("word_delimiter_graph") { }
 
-		/// <inheritdoc/>
-		public bool? GenerateWordParts { get; set; }
+		/// <inheritdoc />
+		public bool? CatenateAll { get; set; }
 
-		/// <inheritdoc/>
-		public bool? GenerateNumberParts { get; set; }
+		/// <inheritdoc />
+		public bool? CatenateNumbers { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? CatenateWords { get; set; }
 
-		/// <inheritdoc/>
-		public bool? CatenateNumbers { get; set; }
-
-		/// <inheritdoc/>
-		public bool? CatenateAll { get; set; }
+		/// <inheritdoc />
+		public bool? GenerateNumberParts { get; set; }
 
-		/// <inheritdoc/>
-		public bool? SplitOnCaseChange { get; set; }
+		/// <inheritdoc />
+		public bool? GenerateWordParts { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? PreserveOriginal { get; set; }
 
-		/// <inheritdoc/>
-		public bool? SplitOnNumerics { get; set; }
-
-		/// <inheritdoc/>
-		public bool? StemEnglishPossessive { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> ProtectedWords { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string ProtectedWordsPath { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public bool? SplitOnCaseChange { get; set; }
+
+		/// <inheritdoc />
+		public bool? SplitOnNumerics { get; set; }
+
+		/// <inheritdoc />
+		public bool? StemEnglishPossessive { get; set; }
+
+		/// <inheritdoc />
 		public IEnumerable<string> TypeTable { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string TypeTablePath { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class WordDelimiterGraphTokenFilterDescriptor
 		: TokenFilterDescriptorBase<WordDelimiterGraphTokenFilterDescriptor, IWordDelimiterGraphTokenFilter>, IWordDelimiterGraphTokenFilter
 	{
 		protected override string Type => "word_delimiter_graph";
+		bool? IWordDelimiterGraphTokenFilter.CatenateAll { get; set; }
+		bool? IWordDelimiterGraphTokenFilter.CatenateNumbers { get; set; }
+		bool? IWordDelimiterGraphTokenFilter.CatenateWords { get; set; }
+		bool? IWordDelimiterGraphTokenFilter.GenerateNumberParts { get; set; }
+		bool? IWordDelimiterGraphTokenFilter.GenerateWordParts { get; set; }
+		bool? IWordDelimiterGraphTokenFilter.PreserveOriginal { get; set; }
 
 		IEnumerable<string> IWordDelimiterGraphTokenFilter.ProtectedWords { get; set; }
 		string IWordDelimiterGraphTokenFilter.ProtectedWordsPath { get; set; }
-		IEnumerable<string> IWordDelimiterGraphTokenFilter.TypeTable { get; set; }
-		string IWordDelimiterGraphTokenFilter.TypeTablePath { get; set; }
-		bool? IWordDelimiterGraphTokenFilter.GenerateWordParts { get; set; }
-		bool? IWordDelimiterGraphTokenFilter.GenerateNumberParts { get; set; }
-		bool? IWordDelimiterGraphTokenFilter.CatenateWords { get; set; }
-		bool? IWordDelimiterGraphTokenFilter.CatenateNumbers { get; set; }
-		bool? IWordDelimiterGraphTokenFilter.CatenateAll { get; set; }
 		bool? IWordDelimiterGraphTokenFilter.SplitOnCaseChange { get; set; }
-		bool? IWordDelimiterGraphTokenFilter.PreserveOriginal { get; set; }
 		bool? IWordDelimiterGraphTokenFilter.SplitOnNumerics { get; set; }
 		bool? IWordDelimiterGraphTokenFilter.StemEnglishPossessive { get; set; }
+		IEnumerable<string> IWordDelimiterGraphTokenFilter.TypeTable { get; set; }
+		string IWordDelimiterGraphTokenFilter.TypeTablePath { get; set; }
 
-		///<inheritdoc/>
-		public WordDelimiterGraphTokenFilterDescriptor GenerateWordParts(bool? generateWordParts = true) => Assign(a => a.GenerateWordParts = generateWordParts);
+		/// <inheritdoc />
+		public WordDelimiterGraphTokenFilterDescriptor GenerateWordParts(bool? generateWordParts = true) =>
+			Assign(a => a.GenerateWordParts = generateWordParts);
 
-		///<inheritdoc/>
-		public WordDelimiterGraphTokenFilterDescriptor GenerateNumberParts(bool? generateNumberParts = true) => Assign(a => a.GenerateNumberParts = generateNumberParts);
+		/// <inheritdoc />
+		public WordDelimiterGraphTokenFilterDescriptor GenerateNumberParts(bool? generateNumberParts = true) =>
+			Assign(a => a.GenerateNumberParts = generateNumberParts);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor CatenateWords(bool? catenateWords = true) => Assign(a => a.CatenateWords = catenateWords);
 
-		///<inheritdoc/>
-		public WordDelimiterGraphTokenFilterDescriptor CatenateNumbers(bool? catenateNumbers = true) => Assign(a => a.CatenateNumbers = catenateNumbers);
+		/// <inheritdoc />
+		public WordDelimiterGraphTokenFilterDescriptor CatenateNumbers(bool? catenateNumbers = true) =>
+			Assign(a => a.CatenateNumbers = catenateNumbers);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor CatenateAll(bool? catenateAll = true) => Assign(a => a.CatenateAll = catenateAll);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor SplitOnCaseChange(bool? split = true) => Assign(a => a.SplitOnCaseChange = split);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor SplitOnNumerics(bool? split = true) => Assign(a => a.SplitOnNumerics = split);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor PreserveOriginal(bool? preserve = true) => Assign(a => a.PreserveOriginal = preserve);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor StemEnglishPossessive(bool? stem = true) => Assign(a => a.StemEnglishPossessive = stem);
 
-		///<inheritdoc/>
-		public WordDelimiterGraphTokenFilterDescriptor ProtectedWords(IEnumerable<string> protectedWords) => Assign(a => a.ProtectedWords = protectedWords);
+		/// <inheritdoc />
+		public WordDelimiterGraphTokenFilterDescriptor ProtectedWords(IEnumerable<string> protectedWords) =>
+			Assign(a => a.ProtectedWords = protectedWords);
 
-		///<inheritdoc/>
-		public WordDelimiterGraphTokenFilterDescriptor ProtectedWords(params string[] protectedWords) => Assign(a => a.ProtectedWords = protectedWords);
+		/// <inheritdoc />
+		public WordDelimiterGraphTokenFilterDescriptor ProtectedWords(params string[] protectedWords) =>
+			Assign(a => a.ProtectedWords = protectedWords);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor ProtectedWordsPath(string path) => Assign(a => a.ProtectedWordsPath = path);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor TypeTable(IEnumerable<string> typeTable) => Assign(a => a.TypeTable = typeTable);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor TypeTable(params string[] typeTable) => Assign(a => a.TypeTable = typeTable);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public WordDelimiterGraphTokenFilterDescriptor TypeTablePath(string path) => Assign(a => a.TypeTablePath = path);
-
 	}
-
 }
diff --git a/src/Nest/Analysis/Tokenizers/CharGroupTokenizer.cs b/src/Nest/Analysis/Tokenizers/CharGroupTokenizer.cs
index 3996824fc8a..1f7d2611155 100644
--- a/src/Nest/Analysis/Tokenizers/CharGroupTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/CharGroupTokenizer.cs
@@ -5,7 +5,7 @@ namespace Nest
 {
 	/// <summary>
 	/// A tokenizer that breaks text into terms whenever it encounters a character which is in a defined set. It is mostly useful
-	/// for cases where a simple custom tokenization is desired, and the overhead of use of <see cref="PatternTokenizer"/> is not acceptable.
+	/// for cases where a simple custom tokenization is desired, and the overhead of use of <see cref="PatternTokenizer" /> is not acceptable.
 	/// </summary>
 	public interface ICharGroupTokenizer : ITokenizer
 	{
@@ -18,18 +18,18 @@ public interface ICharGroupTokenizer : ITokenizer
 		IEnumerable<string> TokenizeOnCharacters { get; set; }
 	}
 
-	/// <inheritdoc cref="ICharGroupTokenizer"/>
+	/// <inheritdoc cref="ICharGroupTokenizer" />
 	public class CharGroupTokenizer : TokenizerBase, ICharGroupTokenizer
-    {
-	    internal const string TokenizerType = "char_group";
+	{
+		internal const string TokenizerType = "char_group";
 
-		public CharGroupTokenizer() => this.Type = TokenizerType;
+		public CharGroupTokenizer() => Type = TokenizerType;
 
-	    /// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters"/>
+		/// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters" />
 		public IEnumerable<string> TokenizeOnCharacters { get; set; }
-    }
+	}
 
-	/// <inheritdoc cref="ICharGroupTokenizer"/>
+	/// <inheritdoc cref="ICharGroupTokenizer" />
 	public class CharGroupTokenizerDescriptor
 		: TokenizerDescriptorBase<CharGroupTokenizerDescriptor, ICharGroupTokenizer>, ICharGroupTokenizer
 	{
@@ -37,12 +37,12 @@ public class CharGroupTokenizerDescriptor
 
 		IEnumerable<string> ICharGroupTokenizer.TokenizeOnCharacters { get; set; }
 
-	    /// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters"/>
+		/// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters" />
 		public CharGroupTokenizerDescriptor TokenizeOnCharacters(params string[] characters) =>
-		    Assign(a => a.TokenizeOnCharacters = characters);
+			Assign(a => a.TokenizeOnCharacters = characters);
 
-	    /// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters"/>
+		/// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters" />
 		public CharGroupTokenizerDescriptor TokenizeOnCharacters(IEnumerable<string> characters) =>
-		    Assign(a => a.TokenizeOnCharacters = characters);
+			Assign(a => a.TokenizeOnCharacters = characters);
 	}
 }
diff --git a/src/Nest/Analysis/Tokenizers/KeywordTokenizer.cs b/src/Nest/Analysis/Tokenizers/KeywordTokenizer.cs
index a348195238c..c7605018e52 100644
--- a/src/Nest/Analysis/Tokenizers/KeywordTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/KeywordTokenizer.cs
@@ -13,23 +13,25 @@ public interface IKeywordTokenizer : ITokenizer
 		[JsonProperty("buffer_size")]
 		int? BufferSize { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class KeywordTokenizer : TokenizerBase, IKeywordTokenizer
-    {
-		public KeywordTokenizer() { Type = "keyword"; }
+	{
+		public KeywordTokenizer() => Type = "keyword";
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? BufferSize { get; set; }
-    }
-	/// <inheritdoc/>
-	public class KeywordTokenizerDescriptor 
+	}
+
+	/// <inheritdoc />
+	public class KeywordTokenizerDescriptor
 		: TokenizerDescriptorBase<KeywordTokenizerDescriptor, IKeywordTokenizer>, IKeywordTokenizer
 	{
 		protected override string Type => "keyword";
 
 		int? IKeywordTokenizer.BufferSize { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public KeywordTokenizerDescriptor BufferSize(int? size) => Assign(a => a.BufferSize = size);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Tokenizers/LetterTokenizer.cs b/src/Nest/Analysis/Tokenizers/LetterTokenizer.cs
index 9fc074fbffa..b838134f230 100644
--- a/src/Nest/Analysis/Tokenizers/LetterTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/LetterTokenizer.cs
@@ -1,19 +1,24 @@
 namespace Nest
 {
 	/// <summary>
-	/// A tokenizer of type letter that divides text at non-letters. That’s to say, it defines tokens as maximal strings of adjacent letters. 
-	/// <para>Note, this does a decent job for most European languages, but does a terrible job for some Asian languages, where words are not separated by spaces.</para>
+	/// A tokenizer of type letter that divides text at non-letters. That’s to say, it defines tokens as maximal strings of adjacent letters.
+	/// <para>
+	/// Note, this does a decent job for most European languages, but does a terrible job for some Asian languages, where words are not
+	/// separated by spaces.
+	/// </para>
 	/// </summary>
 	public interface ILetterTokenizer : ITokenizer { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class LetterTokenizer : TokenizerBase, ILetterTokenizer
-    {
-		public LetterTokenizer() { Type = "letter"; }
-    }
-	/// <inheritdoc/>
-	public class LetterTokenizerDescriptor 
+	{
+		public LetterTokenizer() => Type = "letter";
+	}
+
+	/// <inheritdoc />
+	public class LetterTokenizerDescriptor
 		: TokenizerDescriptorBase<LetterTokenizerDescriptor, ILetterTokenizer>, ILetterTokenizer
 	{
 		protected override string Type => "letter";
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Tokenizers/LowercaseTokenizer.cs b/src/Nest/Analysis/Tokenizers/LowercaseTokenizer.cs
index 253b39421f7..fe7c1ceda97 100644
--- a/src/Nest/Analysis/Tokenizers/LowercaseTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/LowercaseTokenizer.cs
@@ -1,21 +1,23 @@
 namespace Nest
 {
 	/// <summary>
-	/// A tokenizer of type lowercase that performs the function of Letter Tokenizer and Lower Case Token Filter together. 
+	/// A tokenizer of type lowercase that performs the function of Letter Tokenizer and Lower Case Token Filter together.
 	/// <para>It divides text at non-letters and converts them to lower case. </para>
 	/// <para>While it is functionally equivalent to the combination of Letter Tokenizer and Lower Case Token Filter, </para>
 	/// <para>there is a performance advantage to doing the two tasks at once, hence this (redundant) implementation.</para>
 	/// </summary>
 	public interface ILowercaseTokenizer : ITokenizer { }
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class LowercaseTokenizer : TokenizerBase, ILowercaseTokenizer
-    {
-		public LowercaseTokenizer() { Type = "lowercase"; }
+	{
+		public LowercaseTokenizer() => Type = "lowercase";
 	}
-	/// <inheritdoc/>
-	public class LowercaseTokenizerDescriptor 
+
+	/// <inheritdoc />
+	public class LowercaseTokenizerDescriptor
 		: TokenizerDescriptorBase<LowercaseTokenizerDescriptor, ILowercaseTokenizer>, ILowercaseTokenizer
 	{
 		protected override string Type => "lowercase";
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Tokenizers/NGram/EdgeNGramTokenizer.cs b/src/Nest/Analysis/Tokenizers/NGram/EdgeNGramTokenizer.cs
index c046bb53b2a..524eefc87d7 100644
--- a/src/Nest/Analysis/Tokenizers/NGram/EdgeNGramTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/NGram/EdgeNGramTokenizer.cs
@@ -8,18 +8,18 @@ namespace Nest
 	/// </summary>
 	public interface IEdgeNGramTokenizer : ITokenizer
 	{
-		/// <summary>
-		/// Minimum size in codepoints of a single n-gram
-		/// </summary>
-		[JsonProperty("min_gram")]
-		int? MinGram { get; set; }
-
 		/// <summary>
 		/// Maximum size in codepoints of a single n-gram
 		/// </summary>
 		[JsonProperty("max_gram")]
 		int? MaxGram { get; set; }
 
+		/// <summary>
+		/// Minimum size in codepoints of a single n-gram
+		/// </summary>
+		[JsonProperty("min_gram")]
+		int? MinGram { get; set; }
+
 		/// <summary>
 		/// Characters classes to keep in the tokens, Elasticsearch
 		///  will split on characters that don’t belong to any of these classes.
@@ -27,43 +27,44 @@ public interface IEdgeNGramTokenizer : ITokenizer
 		[JsonProperty("token_chars")]
 		IEnumerable<TokenChar> TokenChars { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class EdgeNGramTokenizer : TokenizerBase, IEdgeNGramTokenizer
 	{
-		public EdgeNGramTokenizer() { Type = "edge_ngram"; }
+		public EdgeNGramTokenizer() => Type = "edge_ngram";
 
-		/// <inheritdoc/>
-		public int? MinGram { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MaxGram { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public int? MinGram { get; set; }
+
+		/// <inheritdoc />
 		public IEnumerable<TokenChar> TokenChars { get; set; }
 	}
-	/// <inheritdoc/>
-	public class EdgeNGramTokenizerDescriptor 
+
+	/// <inheritdoc />
+	public class EdgeNGramTokenizerDescriptor
 		: TokenizerDescriptorBase<EdgeNGramTokenizerDescriptor, IEdgeNGramTokenizer>, IEdgeNGramTokenizer
 	{
 		protected override string Type => "edge_ngram";
+		int? IEdgeNGramTokenizer.MaxGram { get; set; }
 
 		int? IEdgeNGramTokenizer.MinGram { get; set; }
-		int? IEdgeNGramTokenizer.MaxGram { get; set; }
 		IEnumerable<TokenChar> IEdgeNGramTokenizer.TokenChars { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public EdgeNGramTokenizerDescriptor MinGram(int? minGram) => Assign(a => a.MinGram = minGram);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public EdgeNGramTokenizerDescriptor MaxGram(int? maxGram) => Assign(a => a.MaxGram = maxGram);
 
-		/// <inheritdoc/>
-		public EdgeNGramTokenizerDescriptor TokenChars(IEnumerable<TokenChar> tokenChars) => 
+		/// <inheritdoc />
+		public EdgeNGramTokenizerDescriptor TokenChars(IEnumerable<TokenChar> tokenChars) =>
 			Assign(a => a.TokenChars = tokenChars);
 
-		/// <inheritdoc/>
-		public EdgeNGramTokenizerDescriptor TokenChars(params TokenChar[] tokenChars) => 
+		/// <inheritdoc />
+		public EdgeNGramTokenizerDescriptor TokenChars(params TokenChar[] tokenChars) =>
 			Assign(a => a.TokenChars = tokenChars);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Tokenizers/NGram/NGramTokenizer.cs b/src/Nest/Analysis/Tokenizers/NGram/NGramTokenizer.cs
index 0d34f26d791..5d287edcd50 100644
--- a/src/Nest/Analysis/Tokenizers/NGram/NGramTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/NGram/NGramTokenizer.cs
@@ -8,62 +8,62 @@ namespace Nest
 	/// </summary>
 	public interface INGramTokenizer : ITokenizer
 	{
-		/// <summary>
-		/// Minimum size in codepoints of a single n-gram, defaults to 1.
-		/// </summary>
-		[JsonProperty("min_gram")]
-		int? MinGram { get; set; }
-
 		/// <summary>
 		/// Maximum size in codepoints of a single n-gram, defaults to 2.
 		/// </summary>
 		[JsonProperty("max_gram")]
 		int? MaxGram { get; set; }
 
+		/// <summary>
+		/// Minimum size in codepoints of a single n-gram, defaults to 1.
+		/// </summary>
+		[JsonProperty("min_gram")]
+		int? MinGram { get; set; }
+
 		/// <summary>
 		/// Characters classes to keep in the tokens, Elasticsearch will
-		/// split on characters that don’t belong to any of these classes. 
+		/// split on characters that don’t belong to any of these classes.
 		/// </summary>
 		[JsonProperty("token_chars")]
 		IEnumerable<TokenChar> TokenChars { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class NGramTokenizer : TokenizerBase, INGramTokenizer
 	{
-		public NGramTokenizer() { Type = "ngram"; }
+		public NGramTokenizer() => Type = "ngram";
 
-		/// <inheritdoc/>
-		public int? MinGram { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MaxGram { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public int? MinGram { get; set; }
+
+		/// <inheritdoc />
 		public IEnumerable<TokenChar> TokenChars { get; set; }
 	}
-	/// <inheritdoc/>
-	public class NGramTokenizerDescriptor 
+
+	/// <inheritdoc />
+	public class NGramTokenizerDescriptor
 		: TokenizerDescriptorBase<NGramTokenizerDescriptor, INGramTokenizer>, INGramTokenizer
 	{
 		protected override string Type => "ngram";
+		int? INGramTokenizer.MaxGram { get; set; }
 
 		int? INGramTokenizer.MinGram { get; set; }
-		int? INGramTokenizer.MaxGram { get; set; }
 		IEnumerable<TokenChar> INGramTokenizer.TokenChars { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public NGramTokenizerDescriptor MinGram(int? minGram) => Assign(a => a.MinGram = minGram);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public NGramTokenizerDescriptor MaxGram(int? minGram) => Assign(a => a.MaxGram = minGram);
 
-		/// <inheritdoc/>
-		public NGramTokenizerDescriptor TokenChars(IEnumerable<TokenChar> tokenChars) => 
+		/// <inheritdoc />
+		public NGramTokenizerDescriptor TokenChars(IEnumerable<TokenChar> tokenChars) =>
 			Assign(a => a.TokenChars = tokenChars);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public NGramTokenizerDescriptor TokenChars(params TokenChar[] tokenChars) => Assign(a => a.TokenChars = tokenChars);
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Tokenizers/NGram/TokenChar.cs b/src/Nest/Analysis/Tokenizers/NGram/TokenChar.cs
index 81b1889b646..504b564f25c 100644
--- a/src/Nest/Analysis/Tokenizers/NGram/TokenChar.cs
+++ b/src/Nest/Analysis/Tokenizers/NGram/TokenChar.cs
@@ -9,13 +9,17 @@ public enum TokenChar
 	{
 		[EnumMember(Value = "letter")]
 		Letter,
+
 		[EnumMember(Value = "digit")]
 		Digit,
+
 		[EnumMember(Value = "whitespace")]
 		Whitespace,
+
 		[EnumMember(Value = "punctuation")]
 		Punctuation,
+
 		[EnumMember(Value = "symbol")]
 		Symbol,
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Tokenizers/NoriTokenizer.cs b/src/Nest/Analysis/Tokenizers/NoriTokenizer.cs
index 435d24f7117..761f4e3d8c4 100644
--- a/src/Nest/Analysis/Tokenizers/NoriTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/NoriTokenizer.cs
@@ -9,13 +9,15 @@ namespace Nest
 	public enum NoriDecompoundMode
 	{
 		/// <summary> Decomposes compounds and discards the original form (default). </summary>
-		[EnumMember(Value="discard")]
+		[EnumMember(Value = "discard")]
 		Discard,
+
 		/// <summary> No decomposition for compounds </summary>
-		[EnumMember(Value="none")]
+		[EnumMember(Value = "none")]
 		None,
+
 		/// <summary> Decomposes compounds and keeps the original form </summary>
-		[EnumMember(Value="mixed")]
+		[EnumMember(Value = "mixed")]
 		Mixed
 	}
 
@@ -36,28 +38,31 @@ public interface INoriTokenizer : ITokenizer
 		string UserDictionary { get; set; }
 	}
 
-	/// <inheritdoc cref="INoriTokenizer"/>
+	/// <inheritdoc cref="INoriTokenizer" />
 	public class NoriTokenizer : TokenizerBase, INoriTokenizer
-    {
-		public NoriTokenizer() => this.Type = "nori_tokenizer";
-		/// <inheritdoc cref="INoriTokenizer.DecompoundMode"/>
-	    public NoriDecompoundMode? DecompoundMode { get; set; }
-		/// <inheritdoc cref="INoriTokenizer.UserDictionary"/>
-	    public string UserDictionary { get; set; }
-    }
-	/// <inheritdoc cref="INoriTokenizer"/>
+	{
+		public NoriTokenizer() => Type = "nori_tokenizer";
+
+		/// <inheritdoc cref="INoriTokenizer.DecompoundMode" />
+		public NoriDecompoundMode? DecompoundMode { get; set; }
+
+		/// <inheritdoc cref="INoriTokenizer.UserDictionary" />
+		public string UserDictionary { get; set; }
+	}
+
+	/// <inheritdoc cref="INoriTokenizer" />
 	public class NoriTokenizerDescriptor
 		: TokenizerDescriptorBase<NoriTokenizerDescriptor, INoriTokenizer>, INoriTokenizer
 	{
 		protected override string Type => "nori_tokenizer";
 
-	    NoriDecompoundMode? INoriTokenizer.DecompoundMode { get; set; }
-	    string INoriTokenizer.UserDictionary { get; set; }
+		NoriDecompoundMode? INoriTokenizer.DecompoundMode { get; set; }
+		string INoriTokenizer.UserDictionary { get; set; }
 
-		/// <inheritdoc cref="INoriTokenizer.DecompoundMode"/>
+		/// <inheritdoc cref="INoriTokenizer.DecompoundMode" />
 		public NoriTokenizerDescriptor DecompoundMode(NoriDecompoundMode? mode) => Assign(a => a.DecompoundMode = mode);
 
-		/// <inheritdoc cref="INoriTokenizer.UserDictionary"/>
+		/// <inheritdoc cref="INoriTokenizer.UserDictionary" />
 		public NoriTokenizerDescriptor UserDictionary(string path) => Assign(a => a.UserDictionary = path);
 	}
 }
diff --git a/src/Nest/Analysis/Tokenizers/PathHierarchyTokenizer.cs b/src/Nest/Analysis/Tokenizers/PathHierarchyTokenizer.cs
index 52b84e46fe5..319c3c73901 100644
--- a/src/Nest/Analysis/Tokenizers/PathHierarchyTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/PathHierarchyTokenizer.cs
@@ -3,16 +3,22 @@
 namespace Nest
 {
 	/// <summary>
-	/// The path_hierarchy tokenizer takes something like this:
-	///<para>/something/something/else</para>
-	///<para>And produces tokens:</para>
-	///<para></para>
-	///<para>/something</para>
-	///<para>/something/something</para>
-	///<para>/something/something/else</para>
+	///  The path_hierarchy tokenizer takes something like this:
+	/// <para>/something/something/else</para>
+	/// <para>And produces tokens:</para>
+	/// <para></para>
+	/// <para>/something</para>
+	/// <para>/something/something</para>
+	/// <para>/something/something/else</para>
 	/// </summary>
 	public interface IPathHierarchyTokenizer : ITokenizer
 	{
+		/// <summary>
+		/// The buffer size to use, defaults to 1024.
+		/// </summary>
+		[JsonProperty("buffer_size")]
+		int? BufferSize { get; set; }
+
 		/// <summary>
 		/// The character delimiter to use, defaults to /.
 		/// </summary>
@@ -25,12 +31,6 @@ public interface IPathHierarchyTokenizer : ITokenizer
 		[JsonProperty("replacement")]
 		char? Replacement { get; set; }
 
-		/// <summary>
-		/// The buffer size to use, defaults to 1024.
-		/// </summary>
-		[JsonProperty("buffer_size")]
-		int? BufferSize { get; set; }
-
 		/// <summary>
 		/// Generates tokens in reverse order, defaults to false.
 		/// </summary>
@@ -44,53 +44,53 @@ public interface IPathHierarchyTokenizer : ITokenizer
 		int? Skip { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class PathHierarchyTokenizer : TokenizerBase, IPathHierarchyTokenizer
 	{
-		public PathHierarchyTokenizer() { Type = "path_hierarchy"; }
+		public PathHierarchyTokenizer() => Type = "path_hierarchy";
+
+		/// <summary />
+		public int? BufferSize { get; set; }
 
-		/// <summary/>
+		/// <summary />
 		public char? Delimiter { get; set; }
 
-		/// <summary/>
+		/// <summary />
 		public char? Replacement { get; set; }
 
-		/// <summary/>
-		public int? BufferSize { get; set; }
-
-		/// <summary/>
+		/// <summary />
 		public bool? Reverse { get; set; }
 
-		/// <summary/>
+		/// <summary />
 		public int? Skip { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class PathHierarchyTokenizerDescriptor
 		: TokenizerDescriptorBase<PathHierarchyTokenizerDescriptor, IPathHierarchyTokenizer>, IPathHierarchyTokenizer
 	{
 		protected override string Type => "path_hierarchy";
 
 		int? IPathHierarchyTokenizer.BufferSize { get; set; }
-		int? IPathHierarchyTokenizer.Skip { get; set; }
-		bool? IPathHierarchyTokenizer.Reverse { get; set; }
 		char? IPathHierarchyTokenizer.Delimiter { get; set; }
 		char? IPathHierarchyTokenizer.Replacement { get; set; }
+		bool? IPathHierarchyTokenizer.Reverse { get; set; }
+		int? IPathHierarchyTokenizer.Skip { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PathHierarchyTokenizerDescriptor BufferSize(int? bufferSize) => Assign(a => a.BufferSize = bufferSize);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PathHierarchyTokenizerDescriptor Skip(int? skip) => Assign(a => a.Skip = skip);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PathHierarchyTokenizerDescriptor Reverse(bool? reverse = true) => Assign(a => a.Reverse = reverse);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PathHierarchyTokenizerDescriptor Delimiter(char? delimiter) => Assign(a => a.Delimiter = delimiter);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PathHierarchyTokenizerDescriptor Replacement(char? replacement) =>
 			Assign(a => a.Replacement = replacement);
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Tokenizers/PatternTokenizer.cs b/src/Nest/Analysis/Tokenizers/PatternTokenizer.cs
index 23df200c6c5..5ab367aad6b 100644
--- a/src/Nest/Analysis/Tokenizers/PatternTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/PatternTokenizer.cs
@@ -7,12 +7,6 @@ namespace Nest
 	/// </summary>
 	public interface IPatternTokenizer : ITokenizer
 	{
-		/// <summary>
-		/// The regular expression pattern, defaults to \W+.
-		/// </summary>
-		[JsonProperty("pattern")]
-		string Pattern { get; set; }
-
 		/// <summary>
 		/// The regular expression flags.
 		/// </summary>
@@ -25,40 +19,45 @@ public interface IPatternTokenizer : ITokenizer
 		[JsonProperty("group")]
 		int? Group { get; set; }
 
+		/// <summary>
+		/// The regular expression pattern, defaults to \W+.
+		/// </summary>
+		[JsonProperty("pattern")]
+		string Pattern { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class PatternTokenizer : TokenizerBase, IPatternTokenizer
-    {
-		public PatternTokenizer() { Type = "pattern"; }
-
-		/// <inheritdoc/>
-		public string Pattern { get; set; }
+	{
+		public PatternTokenizer() => Type = "pattern";
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string Flags { get; set; }
 
-		/// <summary/>
+		/// <summary />
 		public int? Group { get; set; }
-    }
-	/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public string Pattern { get; set; }
+	}
+
+	/// <inheritdoc />
 	public class PatternTokenizerDescriptor
 		: TokenizerDescriptorBase<PatternTokenizerDescriptor, IPatternTokenizer>, IPatternTokenizer
 	{
 		protected override string Type => "pattern";
+		string IPatternTokenizer.Flags { get; set; }
 
 		int? IPatternTokenizer.Group { get; set; }
 		string IPatternTokenizer.Pattern { get; set; }
-		string IPatternTokenizer.Flags { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PatternTokenizerDescriptor Group(int? group) => Assign(a => a.Group = group);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PatternTokenizerDescriptor Pattern(string pattern) => Assign(a => a.Pattern = pattern);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PatternTokenizerDescriptor Flags(string flags) => Assign(a => a.Flags = flags);
-
 	}
 }
diff --git a/src/Nest/Analysis/Tokenizers/StandardTokenizer.cs b/src/Nest/Analysis/Tokenizers/StandardTokenizer.cs
index 8771022ea72..ace2e48064e 100644
--- a/src/Nest/Analysis/Tokenizers/StandardTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/StandardTokenizer.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// A tokenizer of type standard providing grammar based tokenizer that is a good tokenizer for most European language documents. 
+	/// A tokenizer of type standard providing grammar based tokenizer that is a good tokenizer for most European language documents.
 	/// <para>The tokenizer implements the Unicode Text Segmentation algorithm, as specified in Unicode Standard Annex #29.</para>
 	/// </summary>
 	public interface IStandardTokenizer : ITokenizer
@@ -12,24 +12,26 @@ public interface IStandardTokenizer : ITokenizer
 		/// The maximum token length. If a token is seen that exceeds this length then it is discarded. Defaults to 255.
 		/// </summary>
 		[JsonProperty("max_token_length")]
-		int? MaxTokenLength { get; set; }		
+		int? MaxTokenLength { get; set; }
 	}
-	/// <summary/>
+
+	/// <summary />
 	public class StandardTokenizer : TokenizerBase, IStandardTokenizer
-    {
-		public StandardTokenizer() { Type = "standard"; }
+	{
+		public StandardTokenizer() => Type = "standard";
+
+		/// <summary />
+		public int? MaxTokenLength { get; set; }
+	}
 
-		/// <summary/>
-		public int? MaxTokenLength { get; set; }		
-    }
-	public class StandardTokenizerDescriptor 
+	public class StandardTokenizerDescriptor
 		: TokenizerDescriptorBase<StandardTokenizerDescriptor, IStandardTokenizer>, IStandardTokenizer
 	{
 		protected override string Type => "standard";
 
 		int? IStandardTokenizer.MaxTokenLength { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public StandardTokenizerDescriptor MaxTokenLength(int? maxLength) => Assign(a => a.MaxTokenLength = maxLength);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Analysis/Tokenizers/TokenizerBase.cs b/src/Nest/Analysis/Tokenizers/TokenizerBase.cs
index e484092dcce..8bd1bf35a7e 100644
--- a/src/Nest/Analysis/Tokenizers/TokenizerBase.cs
+++ b/src/Nest/Analysis/Tokenizers/TokenizerBase.cs
@@ -5,18 +5,17 @@ namespace Nest
 	[ContractJsonConverter(typeof(TokenizerJsonConverter))]
 	public interface ITokenizer
 	{
-		[JsonProperty("version")]
-		string Version { get; set; }
-
 		[JsonProperty("type")]
 		string Type { get; }
+
+		[JsonProperty("version")]
+		string Version { get; set; }
 	}
 
 	public abstract class TokenizerBase : ITokenizer
 	{
-		public string Version { get; set; }
-
 		public string Type { get; protected set; }
+		public string Version { get; set; }
 	}
 
 	public abstract class TokenizerDescriptorBase<TTokenizer, TTokenizerInterface>
@@ -24,11 +23,10 @@ public abstract class TokenizerDescriptorBase<TTokenizer, TTokenizerInterface>
 		where TTokenizer : TokenizerDescriptorBase<TTokenizer, TTokenizerInterface>, TTokenizerInterface
 		where TTokenizerInterface : class, ITokenizer
 	{
-		string ITokenizer.Version { get; set; }
-		string ITokenizer.Type => this.Type;
 		protected abstract string Type { get; }
+		string ITokenizer.Type => Type;
+		string ITokenizer.Version { get; set; }
 
 		public TTokenizer Version(string version) => Assign(a => a.Version = version);
 	}
-
 }
diff --git a/src/Nest/Analysis/Tokenizers/TokenizerJsonConverter.cs b/src/Nest/Analysis/Tokenizers/TokenizerJsonConverter.cs
index 2f0b34cd91a..e6be0f235a6 100644
--- a/src/Nest/Analysis/Tokenizers/TokenizerJsonConverter.cs
+++ b/src/Nest/Analysis/Tokenizers/TokenizerJsonConverter.cs
@@ -6,19 +6,20 @@ namespace Nest
 {
 	internal class TokenizerJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-		public override bool CanWrite => false;
 		public override bool CanRead => true;
+		public override bool CanWrite => false;
+
+		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			JObject o = JObject.Load(reader);
+			var o = JObject.Load(reader);
 
-			JProperty typeProperty = o.Property("type");
+			var typeProperty = o.Property("type");
 			if (typeProperty == null) return null;
 
 			var typePropertyValue = typeProperty.Value.ToString();
-			switch(typePropertyValue.ToLowerInvariant())
+			switch (typePropertyValue.ToLowerInvariant())
 			{
 				case "edgengram":
 				case "edge_ngram": return o.ToObject<EdgeNGramTokenizer>(ElasticContractResolver.Empty);
@@ -34,9 +35,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return null;
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 	}
 }
diff --git a/src/Nest/Analysis/Tokenizers/Tokenizers.cs b/src/Nest/Analysis/Tokenizers/Tokenizers.cs
index 330162c49b4..ed9cd1cc1d7 100644
--- a/src/Nest/Analysis/Tokenizers/Tokenizers.cs
+++ b/src/Nest/Analysis/Tokenizers/Tokenizers.cs
@@ -10,11 +10,12 @@ public interface ITokenizers : IIsADictionary<string, ITokenizer> { }
 
 	public class Tokenizers : IsADictionaryBase<string, ITokenizer>, ITokenizers
 	{
-		public Tokenizers() {}
+		public Tokenizers() { }
+
 		public Tokenizers(IDictionary<string, ITokenizer> container) : base(container) { }
+
 		public Tokenizers(Dictionary<string, ITokenizer> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{}
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		public void Add(string name, ITokenizer analyzer) => BackingDictionary.Add(name, analyzer);
 	}
@@ -45,7 +46,10 @@ public TokenizersDescriptor Keyword(string name, Func<KeywordTokenizerDescriptor
 
 		/// <summary>
 		/// A tokenizer of type letter that divides text at non-letters. That’s to say, it defines tokens as maximal strings of adjacent letters.
-		/// <para>Note, this does a decent job for most European languages, but does a terrible job for some Asian languages, where words are not separated by spaces.</para>
+		/// <para>
+		/// Note, this does a decent job for most European languages, but does a terrible job for some Asian languages, where words are not
+		/// separated by spaces.
+		/// </para>
 		/// </summary>
 		public TokenizersDescriptor Letter(string name, Func<LetterTokenizerDescriptor, ILetterTokenizer> selector) =>
 			Assign(name, selector?.Invoke(new LetterTokenizerDescriptor()));
@@ -60,13 +64,13 @@ public TokenizersDescriptor Lowercase(string name, Func<LowercaseTokenizerDescri
 			Assign(name, selector?.Invoke(new LowercaseTokenizerDescriptor()));
 
 		/// <summary>
-		/// The path_hierarchy tokenizer takes something like this:
-		///<para>/something/something/else</para>
-		///<para>And produces tokens:</para>
-		///<para></para>
-		///<para>/something</para>
-		///<para>/something/something</para>
-		///<para>/something/something/else</para>
+		///  The path_hierarchy tokenizer takes something like this:
+		/// <para>/something/something/else</para>
+		/// <para>And produces tokens:</para>
+		/// <para></para>
+		/// <para>/something</para>
+		/// <para>/something/something</para>
+		/// <para>/something/something/else</para>
 		/// </summary>
 		public TokenizersDescriptor PathHierarchy(string name, Func<PathHierarchyTokenizerDescriptor, IPathHierarchyTokenizer> selector) =>
 			Assign(name, selector?.Invoke(new PathHierarchyTokenizerDescriptor()));
@@ -113,11 +117,12 @@ public TokenizersDescriptor Kuromoji(string name, Func<KuromojiTokenizerDescript
 		public TokenizersDescriptor Icu(string name, Func<IcuTokenizerDescriptor, IIcuTokenizer> selector) =>
 			Assign(name, selector?.Invoke(new IcuTokenizerDescriptor()));
 
-		/// <inheritdoc cref="INoriTokenizer"/>
+		/// <inheritdoc cref="INoriTokenizer" />
 		public TokenizersDescriptor Nori(string name, Func<NoriTokenizerDescriptor, INoriTokenizer> selector) =>
 			Assign(name, selector?.Invoke(new NoriTokenizerDescriptor()));
 
-	    /// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters"/>>
+		/// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters" />
+		/// >
 		public TokenizersDescriptor CharGroup(string name, Func<CharGroupTokenizerDescriptor, ICharGroupTokenizer> selector) =>
 			Assign(name, selector?.Invoke(new CharGroupTokenizerDescriptor()));
 	}
diff --git a/src/Nest/Analysis/Tokenizers/UaxEmailUrlTokenizer.cs b/src/Nest/Analysis/Tokenizers/UaxEmailUrlTokenizer.cs
index e1e07530ce7..005d6274566 100644
--- a/src/Nest/Analysis/Tokenizers/UaxEmailUrlTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/UaxEmailUrlTokenizer.cs
@@ -11,25 +11,27 @@ public interface IUaxEmailUrlTokenizer : ITokenizer
 		/// The maximum token length. If a token is seen that exceeds this length then it is discarded. Defaults to 255.
 		/// </summary>
 		[JsonProperty("max_token_length")]
-		int? MaxTokenLength { get; set; }		
+		int? MaxTokenLength { get; set; }
 	}
-	/// <summary/>
+
+	/// <summary />
 	public class UaxEmailUrlTokenizer : TokenizerBase, IUaxEmailUrlTokenizer
-    {
-		public UaxEmailUrlTokenizer() { Type = "uax_url_email"; }
+	{
+		public UaxEmailUrlTokenizer() => Type = "uax_url_email";
+
+		/// <summary />
+		public int? MaxTokenLength { get; set; }
+	}
 
-		/// <summary/>
-		public int? MaxTokenLength { get; set; }		
-    }
-	/// <summary/>
-	public class UaxEmailUrlTokenizerDescriptor 
+	/// <summary />
+	public class UaxEmailUrlTokenizerDescriptor
 		: TokenizerDescriptorBase<UaxEmailUrlTokenizerDescriptor, IUaxEmailUrlTokenizer>, IUaxEmailUrlTokenizer
 	{
 		protected override string Type => "uax_url_email";
 
 		int? IUaxEmailUrlTokenizer.MaxTokenLength { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UaxEmailUrlTokenizerDescriptor MaxTokenLength(int? maxLength) => Assign(a => a.MaxTokenLength = maxLength);
 	}
 }
diff --git a/src/Nest/Analysis/Tokenizers/WhitespaceTokenizer.cs b/src/Nest/Analysis/Tokenizers/WhitespaceTokenizer.cs
index 00787340a49..c86a67c7a66 100644
--- a/src/Nest/Analysis/Tokenizers/WhitespaceTokenizer.cs
+++ b/src/Nest/Analysis/Tokenizers/WhitespaceTokenizer.cs
@@ -9,7 +9,7 @@ public interface IWhitespaceTokenizer : ITokenizer
 	{
 		/// <summary>
 		/// The maximum token length. If a token is seen that exceeds this length then it is split at
-		/// <see cref="MaxTokenLength"/> intervals. Defaults to 255.
+		/// <see cref="MaxTokenLength" /> intervals. Defaults to 255.
 		/// </summary>
 		/// <remarks>
 		/// Valid for Elasticsearch 6.1.0+
@@ -18,16 +18,16 @@ public interface IWhitespaceTokenizer : ITokenizer
 		int? MaxTokenLength { get; set; }
 	}
 
-	/// <inheritdoc cref="IWhitespaceTokenizer"/>
+	/// <inheritdoc cref="IWhitespaceTokenizer" />
 	public class WhitespaceTokenizer : TokenizerBase, IWhitespaceTokenizer
-    {
-		public WhitespaceTokenizer() { Type = "whitespace"; }
+	{
+		public WhitespaceTokenizer() => Type = "whitespace";
 
-	    /// <inheritdoc />
-	    public int? MaxTokenLength { get; set; }
-    }
+		/// <inheritdoc />
+		public int? MaxTokenLength { get; set; }
+	}
 
-	/// <inheritdoc cref="IWhitespaceTokenizer"/>
+	/// <inheritdoc cref="IWhitespaceTokenizer" />
 	public class WhitespaceTokenizerDescriptor
 		: TokenizerDescriptorBase<WhitespaceTokenizerDescriptor, IWhitespaceTokenizer>, IWhitespaceTokenizer
 	{
@@ -35,7 +35,7 @@ public class WhitespaceTokenizerDescriptor
 
 		int? IWhitespaceTokenizer.MaxTokenLength { get; set; }
 
-		/// <inheritdoc cref="IWhitespaceTokenizer.MaxTokenLength"/>
+		/// <inheritdoc cref="IWhitespaceTokenizer.MaxTokenLength" />
 		public WhitespaceTokenizerDescriptor MaxTokenLength(int? maxTokenLength) =>
 			Assign(a => a.MaxTokenLength = maxTokenLength);
 	}
diff --git a/src/Nest/Cat/CatAliases/CatAliasesRecord.cs b/src/Nest/Cat/CatAliases/CatAliasesRecord.cs
index 9b5e3b54055..8f959df3835 100644
--- a/src/Nest/Cat/CatAliases/CatAliasesRecord.cs
+++ b/src/Nest/Cat/CatAliases/CatAliasesRecord.cs
@@ -8,16 +8,16 @@ public class CatAliasesRecord : ICatRecord
 		[JsonProperty("alias")]
 		public string Alias { get; set; }
 
-		[JsonProperty("index")]
-		public string Index { get; set; }
-
 		[JsonProperty("filter")]
 		public string Filter { get; set; }
 
+		[JsonProperty("index")]
+		public string Index { get; set; }
+
 		[JsonProperty("indexRouting")]
 		public string IndexRouting { get; set; }
 
 		[JsonProperty("searchRouting")]
 		public string SearchRouting { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatAliases/ElasticClient-CatAliases.cs b/src/Nest/Cat/CatAliases/ElasticClient-CatAliases.cs
index fe56122acec..0ae2210d327 100644
--- a/src/Nest/Cat/CatAliases/ElasticClient-CatAliases.cs
+++ b/src/Nest/Cat/CatAliases/ElasticClient-CatAliases.cs
@@ -1,43 +1,51 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatAliasesRecord> CatAliases(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatAliasesRecord> CatAliases(ICatAliasesRequest request);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(ICatAliasesRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(ICatAliasesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatAliasesRecord> CatAliases(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null) =>
-			this.CatAliases(selector.InvokeOrDefault(new CatAliasesDescriptor()));
+			CatAliases(selector.InvokeOrDefault(new CatAliasesDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatAliasesRecord> CatAliases(ICatAliasesRequest request) =>
-			this.DoCat<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request, this.LowLevelDispatch.CatAliasesDispatch<CatResponse<CatAliasesRecord>>);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CatAliasesAsync(selector.InvokeOrDefault(new CatAliasesDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(ICatAliasesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request, cancellationToken, this.LowLevelDispatch.CatAliasesDispatchAsync<CatResponse<CatAliasesRecord>>);
-
+			DoCat<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request,
+				LowLevelDispatch.CatAliasesDispatch<CatResponse<CatAliasesRecord>>);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CatAliasesAsync(selector.InvokeOrDefault(new CatAliasesDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatAliasesRecord>> CatAliasesAsync(ICatAliasesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request, cancellationToken,
+				LowLevelDispatch.CatAliasesDispatchAsync<CatResponse<CatAliasesRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatAllocation/CatAllocationRecord.cs b/src/Nest/Cat/CatAllocation/CatAllocationRecord.cs
index 1a4c9375b9a..fb92cb007b0 100644
--- a/src/Nest/Cat/CatAllocation/CatAllocationRecord.cs
+++ b/src/Nest/Cat/CatAllocation/CatAllocationRecord.cs
@@ -5,22 +5,22 @@ namespace Nest
 	[JsonObject]
 	public class CatAllocationRecord : ICatRecord
 	{
-		[JsonProperty("shards")]
-		public string Shards { get; set; }
-
-		[JsonProperty("diskUsed")]
-		public string DiskUsed { get; set; }
-
 		[JsonProperty("diskAvail")]
 		public string DiskAvailable { get; set; }
 
 		[JsonProperty("diskRatio")]
 		public string DiskRatio { get; set; }
 
+		[JsonProperty("diskUsed")]
+		public string DiskUsed { get; set; }
+
 		[JsonProperty("ip")]
 		public string Ip { get; set; }
 
 		[JsonProperty("node")]
 		public string Node { get; set; }
+
+		[JsonProperty("shards")]
+		public string Shards { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatAllocation/ElasticClient-CatAllocation.cs b/src/Nest/Cat/CatAllocation/ElasticClient-CatAllocation.cs
index f065c67f3db..08c2b529a48 100644
--- a/src/Nest/Cat/CatAllocation/ElasticClient-CatAllocation.cs
+++ b/src/Nest/Cat/CatAllocation/ElasticClient-CatAllocation.cs
@@ -1,50 +1,55 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatAllocationRecord> CatAllocation(Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatAllocationRecord> CatAllocation(ICatAllocationRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(
 			Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(ICatAllocationRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(ICatAllocationRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatAllocationRecord> CatAllocation(Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null) =>
-			this.CatAllocation(selector.InvokeOrDefault(new CatAllocationDescriptor()));
+			CatAllocation(selector.InvokeOrDefault(new CatAllocationDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatAllocationRecord> CatAllocation(ICatAllocationRequest request) =>
-			this.DoCat<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(request, this.LowLevelDispatch.CatAllocationDispatch<CatResponse<CatAllocationRecord>>);
+			DoCat<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(request,
+				LowLevelDispatch.CatAllocationDispatch<CatResponse<CatAllocationRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(
 			Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatAllocationAsync(selector.InvokeOrDefault(new CatAllocationDescriptor()), cancellationToken);
+		) => CatAllocationAsync(selector.InvokeOrDefault(new CatAllocationDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(ICatAllocationRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(
+		/// <inheritdoc />
+		public Task<ICatResponse<CatAllocationRecord>> CatAllocationAsync(ICatAllocationRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.CatAllocationDispatchAsync<CatResponse<CatAllocationRecord>>
+				LowLevelDispatch.CatAllocationDispatchAsync<CatResponse<CatAllocationRecord>>
 			);
 	}
 }
diff --git a/src/Nest/Cat/CatCount/CatCountRecord.cs b/src/Nest/Cat/CatCount/CatCountRecord.cs
index 99efe3535f2..8b57ca5b74a 100644
--- a/src/Nest/Cat/CatCount/CatCountRecord.cs
+++ b/src/Nest/Cat/CatCount/CatCountRecord.cs
@@ -5,13 +5,13 @@ namespace Nest
 	[JsonObject]
 	public class CatCountRecord : ICatRecord
 	{
+		[JsonProperty("count")]
+		public string Count { get; set; }
+
 		[JsonProperty("epoch")]
 		public string Epoch { get; set; }
 
 		[JsonProperty("timestamp")]
 		public string Timestamp { get; set; }
-
-		[JsonProperty("count")]
-		public string Count { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatCount/ElasticClient-CatCount.cs b/src/Nest/Cat/CatCount/ElasticClient-CatCount.cs
index 346859d50ee..f616d5f6455 100644
--- a/src/Nest/Cat/CatCount/ElasticClient-CatCount.cs
+++ b/src/Nest/Cat/CatCount/ElasticClient-CatCount.cs
@@ -1,42 +1,49 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatCountRecord> CatCount(Func<CatCountDescriptor, ICatCountRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatCountRecord> CatCount(ICatCountRequest request);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatCountRecord>> CatCountAsync(Func<CatCountDescriptor, ICatCountRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatCountRecord>> CatCountAsync(Func<CatCountDescriptor, ICatCountRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatCountRecord>> CatCountAsync(ICatCountRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatCountRecord> CatCount(Func<CatCountDescriptor, ICatCountRequest> selector = null) =>
-			this.CatCount(selector.InvokeOrDefault(new CatCountDescriptor()));
-
-		/// <inheritdoc/>
-		public ICatResponse<CatCountRecord> CatCount(ICatCountRequest request)=>
-			this.DoCat<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request, this.LowLevelDispatch.CatCountDispatch<CatResponse<CatCountRecord>>);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatCountRecord>> CatCountAsync(Func<CatCountDescriptor, ICatCountRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CatCountAsync(selector.InvokeOrDefault(new CatCountDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatCountRecord>> CatCountAsync(ICatCountRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request, cancellationToken, this.LowLevelDispatch.CatCountDispatchAsync<CatResponse<CatCountRecord>>);
-
+			CatCount(selector.InvokeOrDefault(new CatCountDescriptor()));
+
+		/// <inheritdoc />
+		public ICatResponse<CatCountRecord> CatCount(ICatCountRequest request) =>
+			DoCat<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request,
+				LowLevelDispatch.CatCountDispatch<CatResponse<CatCountRecord>>);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatCountRecord>> CatCountAsync(Func<CatCountDescriptor, ICatCountRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CatCountAsync(selector.InvokeOrDefault(new CatCountDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatCountRecord>> CatCountAsync(ICatCountRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request, cancellationToken,
+				LowLevelDispatch.CatCountDispatchAsync<CatResponse<CatCountRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatFielddata/CatFielddataRecord.cs b/src/Nest/Cat/CatFielddata/CatFielddataRecord.cs
index e2b15f06818..380cf768c1d 100644
--- a/src/Nest/Cat/CatFielddata/CatFielddataRecord.cs
+++ b/src/Nest/Cat/CatFielddata/CatFielddataRecord.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -7,11 +6,11 @@ namespace Nest
 	[JsonConverter(typeof(CatFielddataRecordJsonConverter))]
 	public class CatFielddataRecord : ICatRecord
 	{
-		public string Id { get; set; }
+		public string Field { get; set; }
 		public string Host { get; set; }
+		public string Id { get; set; }
 		public string Ip { get; set; }
 		public string Node { get; set; }
-		public string Field { get; set; }
 		public string Size { get; set; }
 	}
 }
diff --git a/src/Nest/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs b/src/Nest/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs
index c08853de631..53dad182ce2 100644
--- a/src/Nest/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs
+++ b/src/Nest/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -8,13 +7,11 @@ internal class CatFielddataRecordJsonConverter : JsonConverter
 	{
 		public override bool CanWrite => false;
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
-										JsonSerializer serializer)
+			JsonSerializer serializer
+		)
 		{
 			var record = new CatFielddataRecord();
 			while (reader.Read())
diff --git a/src/Nest/Cat/CatFielddata/ElasticClient-CatFielddata.cs b/src/Nest/Cat/CatFielddata/ElasticClient-CatFielddata.cs
index 0d75d860721..ef7f6d3c2b3 100644
--- a/src/Nest/Cat/CatFielddata/ElasticClient-CatFielddata.cs
+++ b/src/Nest/Cat/CatFielddata/ElasticClient-CatFielddata.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatFielddataRecord> CatFielddata(Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatFielddataRecord> CatFielddata(ICatFielddataRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(
 			Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(ICatFielddataRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(ICatFielddataRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatFielddataRecord> CatFielddata(Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null) =>
-			this.CatFielddata(selector.InvokeOrDefault(new CatFielddataDescriptor()));
+			CatFielddata(selector.InvokeOrDefault(new CatFielddataDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatFielddataRecord> CatFielddata(ICatFielddataRequest request) =>
-			this.DoCat<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request, this.LowLevelDispatch.CatFielddataDispatch<CatResponse<CatFielddataRecord>>);
+			DoCat<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request,
+				LowLevelDispatch.CatFielddataDispatch<CatResponse<CatFielddataRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(
 			Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatFielddataAsync(selector.InvokeOrDefault(new CatFielddataDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(ICatFielddataRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request, cancellationToken, this.LowLevelDispatch.CatFielddataDispatchAsync<CatResponse<CatFielddataRecord>>);
+		) => CatFielddataAsync(selector.InvokeOrDefault(new CatFielddataDescriptor()), cancellationToken);
 
+		/// <inheritdoc />
+		public Task<ICatResponse<CatFielddataRecord>> CatFielddataAsync(ICatFielddataRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request, cancellationToken,
+				LowLevelDispatch.CatFielddataDispatchAsync<CatResponse<CatFielddataRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatHealth/CatHealthRecord.cs b/src/Nest/Cat/CatHealth/CatHealthRecord.cs
index c8c4104b88e..68ef41efbf1 100644
--- a/src/Nest/Cat/CatHealth/CatHealthRecord.cs
+++ b/src/Nest/Cat/CatHealth/CatHealthRecord.cs
@@ -11,21 +11,24 @@ public class CatHealthRecord : ICatRecord
 		[JsonProperty("epoch")]
 		public string Epoch { get; set; }
 
+		[JsonProperty("init")]
+		public string Initializing { get; set; }
+
 		[JsonProperty("node.data")]
 		public string NodeData { get; set; }
 
 		[JsonProperty("node.total")]
 		public string NodeTotal { get; set; }
 
+		[JsonProperty("pending_tasks")]
+		public string PendingTasks { get; set; }
+
 		[JsonProperty("pri")]
 		public string Primary { get; set; }
 
 		[JsonProperty("relo")]
 		public string Relocating { get; set; }
 
-		[JsonProperty("init")]
-		public string Initializing { get; set; }
-
 		[JsonProperty("shards")]
 		public string Shards { get; set; }
 
@@ -37,8 +40,5 @@ public class CatHealthRecord : ICatRecord
 
 		[JsonProperty("unassign")]
 		public string Unassigned { get; set; }
-
-		[JsonProperty("pending_tasks")]
-		public string PendingTasks { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatHealth/ElasticClient-CatHealth.cs b/src/Nest/Cat/CatHealth/ElasticClient-CatHealth.cs
index d115bfbc474..0bacbdea5f4 100644
--- a/src/Nest/Cat/CatHealth/ElasticClient-CatHealth.cs
+++ b/src/Nest/Cat/CatHealth/ElasticClient-CatHealth.cs
@@ -1,47 +1,51 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatHealthRecord> CatHealth(Func<CatHealthDescriptor, ICatHealthRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatHealthRecord> CatHealth(ICatHealthRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatHealthRecord>> CatHealthAsync(
 			Func<CatHealthDescriptor, ICatHealthRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatHealthRecord>> CatHealthAsync(ICatHealthRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatHealthRecord>> CatHealthAsync(ICatHealthRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatHealthRecord> CatHealth(Func<CatHealthDescriptor, ICatHealthRequest> selector = null) =>
-			this.CatHealth(selector.InvokeOrDefault(new CatHealthDescriptor()));
+			CatHealth(selector.InvokeOrDefault(new CatHealthDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatHealthRecord> CatHealth(ICatHealthRequest request) =>
-			DoCat<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request, LowLevelDispatch.CatHealthDispatch<CatResponse<CatHealthRecord>>);
+			DoCat<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request,
+				LowLevelDispatch.CatHealthDispatch<CatResponse<CatHealthRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatHealthRecord>> CatHealthAsync(
 			Func<CatHealthDescriptor, ICatHealthRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatHealthAsync(selector.InvokeOrDefault(new CatHealthDescriptor()), cancellationToken);
+		) => CatHealthAsync(selector.InvokeOrDefault(new CatHealthDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatHealthRecord>> CatHealthAsync(ICatHealthRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			DoCatAsync<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request, cancellationToken, LowLevelDispatch.CatHealthDispatchAsync<CatResponse<CatHealthRecord>>);
+		/// <inheritdoc />
+		public Task<ICatResponse<CatHealthRecord>> CatHealthAsync(ICatHealthRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request, cancellationToken,
+				LowLevelDispatch.CatHealthDispatchAsync<CatResponse<CatHealthRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatHelp/CatHelpRecord.cs b/src/Nest/Cat/CatHelp/CatHelpRecord.cs
index 107e37db804..24d67ab0bda 100644
--- a/src/Nest/Cat/CatHelp/CatHelpRecord.cs
+++ b/src/Nest/Cat/CatHelp/CatHelpRecord.cs
@@ -7,6 +7,5 @@ public class CatHelpRecord : ICatRecord
 	{
 		[JsonProperty("endpoint")]
 		public string Endpoint { get; set; }
-
 	}
 }
diff --git a/src/Nest/Cat/CatHelp/ElasticClient-CatHelp.cs b/src/Nest/Cat/CatHelp/ElasticClient-CatHelp.cs
index e3409fa4e5a..464bc78e7af 100644
--- a/src/Nest/Cat/CatHelp/ElasticClient-CatHelp.cs
+++ b/src/Nest/Cat/CatHelp/ElasticClient-CatHelp.cs
@@ -1,32 +1,59 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatHelpRecord> CatHelp(Func<CatHelpDescriptor, ICatHelpRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatHelpRecord> CatHelp(ICatHelpRequest request);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatHelpRecord>> CatHelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatHelpRecord>> CatHelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatHelpRecord>> CatHelpAsync(ICatHelpRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
+		/// <inheritdoc />
+		public ICatResponse<CatHelpRecord> CatHelp(Func<CatHelpDescriptor, ICatHelpRequest> selector = null) =>
+			CatHelp(selector.InvokeOrDefault(new CatHelpDescriptor()));
+
+		/// <inheritdoc />
+		public ICatResponse<CatHelpRecord> CatHelp(ICatHelpRequest request) =>
+			Dispatcher.Dispatch<ICatHelpRequest, CatHelpRequestParameters, CatResponse<CatHelpRecord>>(
+				request,
+				new Func<IApiCallDetails, Stream, CatResponse<CatHelpRecord>>(DeserializeCatHelpResponse),
+				(p, d) => LowLevelDispatch.CatHelpDispatch<CatResponse<CatHelpRecord>>(p)
+			);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatHelpRecord>> CatHelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CatHelpAsync(selector.InvokeOrDefault(new CatHelpDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatHelpRecord>> CatHelpAsync(ICatHelpRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ICatHelpRequest, CatHelpRequestParameters, CatResponse<CatHelpRecord>, ICatResponse<CatHelpRecord>>(
+				request,
+				cancellationToken,
+				new Func<IApiCallDetails, Stream, CatResponse<CatHelpRecord>>(DeserializeCatHelpResponse),
+				(p, d, c) => LowLevelDispatch.CatHelpDispatchAsync<CatResponse<CatHelpRecord>>(p, c)
+			);
 
 		private CatResponse<CatHelpRecord> DeserializeCatHelpResponse(IApiCallDetails response, Stream stream)
 		{
@@ -37,37 +64,12 @@ private CatResponse<CatHelpRecord> DeserializeCatHelpResponse(IApiCallDetails re
 				var body = ms.ToArray().Utf8String();
 				return new CatResponse<CatHelpRecord>
 				{
-					Records = body.Split('\n').Skip(1)
+					Records = body.Split('\n')
+						.Skip(1)
 						.Select(f => new CatHelpRecord { Endpoint = f.Trim() })
 						.ToList()
 				};
 			}
 		}
-
-		/// <inheritdoc/>
-		public ICatResponse<CatHelpRecord> CatHelp(Func<CatHelpDescriptor, ICatHelpRequest> selector = null) =>
-			this.CatHelp(selector.InvokeOrDefault(new CatHelpDescriptor()));
-
-		/// <inheritdoc/>
-		public ICatResponse<CatHelpRecord> CatHelp(ICatHelpRequest request) =>
-			this.Dispatcher.Dispatch<ICatHelpRequest, CatHelpRequestParameters, CatResponse<CatHelpRecord>>(
-				request,
-				new Func<IApiCallDetails, Stream, CatResponse<CatHelpRecord>>(this.DeserializeCatHelpResponse),
-				(p, d) => this.LowLevelDispatch.CatHelpDispatch<CatResponse<CatHelpRecord>>(p)
-			);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatHelpRecord>> CatHelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CatHelpAsync(selector.InvokeOrDefault(new CatHelpDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatHelpRecord>> CatHelpAsync(ICatHelpRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ICatHelpRequest, CatHelpRequestParameters, CatResponse<CatHelpRecord>, ICatResponse<CatHelpRecord>>(
-				request,
-				cancellationToken,
-				new Func<IApiCallDetails, Stream, CatResponse<CatHelpRecord>>(this.DeserializeCatHelpResponse),
-				(p, d, c) => this.LowLevelDispatch.CatHelpDispatchAsync<CatResponse<CatHelpRecord>>(p, c)
-			);
-
 	}
 }
diff --git a/src/Nest/Cat/CatIndices/CatIndicesRecord.cs b/src/Nest/Cat/CatIndices/CatIndicesRecord.cs
index e96e68af3e9..1c934512397 100644
--- a/src/Nest/Cat/CatIndices/CatIndicesRecord.cs
+++ b/src/Nest/Cat/CatIndices/CatIndicesRecord.cs
@@ -26,13 +26,13 @@ public class CatIndicesRecord : ICatRecord
 		[JsonProperty("rep")]
 		public string Replica { get; set; }
 
-		[JsonProperty("store.size")]
-		public string StoreSize { get; set; }
-
 		[JsonProperty("status")]
 		public string Status { get; set; }
 
+		[JsonProperty("store.size")]
+		public string StoreSize { get; set; }
+
 		[JsonProperty("tm")]
 		public string TotalMemory { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatIndices/ElasticClient-CatIndices.cs b/src/Nest/Cat/CatIndices/ElasticClient-CatIndices.cs
index 59f970090c6..322f9df40e9 100644
--- a/src/Nest/Cat/CatIndices/ElasticClient-CatIndices.cs
+++ b/src/Nest/Cat/CatIndices/ElasticClient-CatIndices.cs
@@ -1,47 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatIndicesRecord> CatIndices(Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatIndicesRecord> CatIndices(ICatIndicesRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(
 			Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(ICatIndicesRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(ICatIndicesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatIndicesRecord> CatIndices(Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null) =>
-			this.CatIndices(selector.InvokeOrDefault(new CatIndicesDescriptor()));
+			CatIndices(selector.InvokeOrDefault(new CatIndicesDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatIndicesRecord> CatIndices(ICatIndicesRequest request) =>
-			this.DoCat<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request, this.LowLevelDispatch.CatIndicesDispatch<CatResponse<CatIndicesRecord>>);
+			DoCat<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request,
+				LowLevelDispatch.CatIndicesDispatch<CatResponse<CatIndicesRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(
 			Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatIndicesAsync(selector.InvokeOrDefault(new CatIndicesDescriptor()), cancellationToken);
+		) => CatIndicesAsync(selector.InvokeOrDefault(new CatIndicesDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(ICatIndicesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request, cancellationToken, this.LowLevelDispatch.CatIndicesDispatchAsync<CatResponse<CatIndicesRecord>>);
+		/// <inheritdoc />
+		public Task<ICatResponse<CatIndicesRecord>> CatIndicesAsync(ICatIndicesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request, cancellationToken,
+				LowLevelDispatch.CatIndicesDispatchAsync<CatResponse<CatIndicesRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatMaster/CatMasterRecord.cs b/src/Nest/Cat/CatMaster/CatMasterRecord.cs
index b4963861d09..ff631f86c01 100644
--- a/src/Nest/Cat/CatMaster/CatMasterRecord.cs
+++ b/src/Nest/Cat/CatMaster/CatMasterRecord.cs
@@ -14,4 +14,4 @@ public class CatMasterRecord : ICatRecord
 		[JsonProperty("node")]
 		public string Node { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatMaster/ElasticClient-CatMaster.cs b/src/Nest/Cat/CatMaster/ElasticClient-CatMaster.cs
index 78e8acad4f3..ad326c6e9a7 100644
--- a/src/Nest/Cat/CatMaster/ElasticClient-CatMaster.cs
+++ b/src/Nest/Cat/CatMaster/ElasticClient-CatMaster.cs
@@ -1,45 +1,51 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatMasterRecord> CatMaster(Func<CatMasterDescriptor, ICatMasterRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatMasterRecord> CatMaster(ICatMasterRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatMasterRecord>> CatMasterAsync(
 			Func<CatMasterDescriptor, ICatMasterRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatMasterRecord>> CatMasterAsync(ICatMasterRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatMasterRecord>> CatMasterAsync(ICatMasterRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatMasterRecord> CatMaster(Func<CatMasterDescriptor, ICatMasterRequest> selector = null) =>
-			this.CatMaster(selector.InvokeOrDefault(new CatMasterDescriptor()));
+			CatMaster(selector.InvokeOrDefault(new CatMasterDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatMasterRecord> CatMaster(ICatMasterRequest request) =>
-			this.DoCat<ICatMasterRequest, CatMasterRequestParameters, CatMasterRecord>(request, this.LowLevelDispatch.CatMasterDispatch<CatResponse<CatMasterRecord>>);
+			DoCat<ICatMasterRequest, CatMasterRequestParameters, CatMasterRecord>(request,
+				LowLevelDispatch.CatMasterDispatch<CatResponse<CatMasterRecord>>);
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatMasterRecord>> CatMasterAsync(Func<CatMasterDescriptor, ICatMasterRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CatMasterAsync(selector.InvokeOrDefault(new CatMasterDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<ICatResponse<CatMasterRecord>> CatMasterAsync(Func<CatMasterDescriptor, ICatMasterRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CatMasterAsync(selector.InvokeOrDefault(new CatMasterDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatMasterRecord>> CatMasterAsync(ICatMasterRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatMasterRequest, CatMasterRequestParameters, CatMasterRecord>(request, cancellationToken, this.LowLevelDispatch.CatMasterDispatchAsync<CatResponse<CatMasterRecord>>);
+		/// <inheritdoc />
+		public Task<ICatResponse<CatMasterRecord>> CatMasterAsync(ICatMasterRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatMasterRequest, CatMasterRequestParameters, CatMasterRecord>(request, cancellationToken,
+				LowLevelDispatch.CatMasterDispatchAsync<CatResponse<CatMasterRecord>>);
 	}
 }
-
diff --git a/src/Nest/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs b/src/Nest/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs
index 787f069f106..77515bb0704 100644
--- a/src/Nest/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs
+++ b/src/Nest/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs
@@ -5,30 +5,29 @@ namespace Nest
 	[JsonObject]
 	public class CatNodeAttributesRecord : ICatRecord
 	{
-		// duration indices successful_shards failed_shards total_shards
-		[JsonProperty("id")]
-		public string Id { get; set; }
-
-		[JsonProperty("node")]
-		public string Node { get; set; }
-
-		[JsonProperty("pid")]
-		public long ProcessId { get; set; }
+		[JsonProperty("attr")]
+		public string Attribute { get; set; }
 
 		[JsonProperty("host")]
 		public string Host { get; set; }
 
+		// duration indices successful_shards failed_shards total_shards
+		[JsonProperty("id")]
+		public string Id { get; set; }
+
 		[JsonProperty("ip")]
 		public string Ip { get; set; }
 
+		[JsonProperty("node")]
+		public string Node { get; set; }
+
 		[JsonProperty("port")]
 		public long Port { get; set; }
 
-		[JsonProperty("attr")]
-		public string Attribute { get; set; }
+		[JsonProperty("pid")]
+		public long ProcessId { get; set; }
 
 		[JsonProperty("value")]
 		public string Value { get; set; }
-
 	}
 }
diff --git a/src/Nest/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs b/src/Nest/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs
index ca8329771f9..3c3957cc7e2 100644
--- a/src/Nest/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs
+++ b/src/Nest/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs
@@ -1,5 +1,4 @@
-using System;
-#pragma warning disable 612, 618
+#pragma warning disable 612, 618
 
 namespace Nest
 {
diff --git a/src/Nest/Cat/CatNodeAttributes/ElasticClient-CatNodeAttributes.cs b/src/Nest/Cat/CatNodeAttributes/ElasticClient-CatNodeAttributes.cs
index 42cf4ec2fad..eedfc0665b7 100644
--- a/src/Nest/Cat/CatNodeAttributes/ElasticClient-CatNodeAttributes.cs
+++ b/src/Nest/Cat/CatNodeAttributes/ElasticClient-CatNodeAttributes.cs
@@ -1,48 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatNodeAttributesRecord> CatNodeAttributes(Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatNodeAttributesRecord> CatNodeAttributes(ICatNodeAttributesRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatNodeAttributesRecord>> CatNodeAttributesAsync(
 			Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatNodeAttributesRecord>> CatNodeAttributesAsync(ICatNodeAttributesRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatNodeAttributesRecord>> CatNodeAttributesAsync(ICatNodeAttributesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public ICatResponse<CatNodeAttributesRecord> CatNodeAttributes(Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null) =>
-			this.CatNodeAttributes(selector.InvokeOrDefault(new CatNodeAttributesDescriptor()));
+		/// <inheritdoc />
+		public ICatResponse<CatNodeAttributesRecord>
+			CatNodeAttributes(Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null) =>
+			CatNodeAttributes(selector.InvokeOrDefault(new CatNodeAttributesDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatNodeAttributesRecord> CatNodeAttributes(ICatNodeAttributesRequest request) =>
-			this.DoCat<ICatNodeAttributesRequest, CatNodeAttributesRequestParameters, CatNodeAttributesRecord>(request, this.LowLevelDispatch.CatNodeattrsDispatch<CatResponse<CatNodeAttributesRecord>>);
+			DoCat<ICatNodeAttributesRequest, CatNodeAttributesRequestParameters, CatNodeAttributesRecord>(request,
+				LowLevelDispatch.CatNodeattrsDispatch<CatResponse<CatNodeAttributesRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatNodeAttributesRecord>> CatNodeAttributesAsync(
 			Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatNodeAttributesAsync(selector.InvokeOrDefault(new CatNodeAttributesDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatNodeAttributesRecord>> CatNodeAttributesAsync(ICatNodeAttributesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatNodeAttributesRequest, CatNodeAttributesRequestParameters, CatNodeAttributesRecord>(request, cancellationToken, this.LowLevelDispatch.CatNodeattrsDispatchAsync<CatResponse<CatNodeAttributesRecord>>);
+		) => CatNodeAttributesAsync(selector.InvokeOrDefault(new CatNodeAttributesDescriptor()), cancellationToken);
 
+		/// <inheritdoc />
+		public Task<ICatResponse<CatNodeAttributesRecord>> CatNodeAttributesAsync(ICatNodeAttributesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatNodeAttributesRequest, CatNodeAttributesRequestParameters, CatNodeAttributesRecord>(request, cancellationToken,
+				LowLevelDispatch.CatNodeattrsDispatchAsync<CatResponse<CatNodeAttributesRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatNodes/CatNodesRecord.cs b/src/Nest/Cat/CatNodes/CatNodesRecord.cs
index 81a53a8884a..62951c42261 100644
--- a/src/Nest/Cat/CatNodes/CatNodesRecord.cs
+++ b/src/Nest/Cat/CatNodes/CatNodesRecord.cs
@@ -5,538 +5,668 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public class CatNodesRecord : ICatRecord
 	{
-		[JsonProperty("id")]
-		internal string _id { get; set; }
-		[JsonProperty("nodeId")]
-		internal string _nodeId { get; set; }
-		public string NodeId => this._id ?? this._nodeId;
+		public string Build => _b ?? _build;
+		public string CompletionSize => _completionSize ?? _cs ?? _completion_size;
 
-		[JsonProperty("pid")]
-		internal string _pid { get; set; }
-		[JsonProperty("p")]
-		internal string _p { get; set; }
-		public string Pid => this._p ?? this._pid;
+		[JsonProperty("cpu")]
+		public string CPU { get; internal set; }
 
-		[JsonProperty("ip")]
-		internal string _ip { get; set; }
-		[JsonProperty("i")]
-		internal string _i { get; set; }
-		public string Ip => this._i ?? this._ip;
+		public string DiskAvailable => _diskAvail ?? _disk ?? _d ?? _disk_avail;
+		public string FielddataEvictions => _fielddataEvictions ?? _fe ?? _fielddata_evictions;
+		public string FielddataMemory => _fielddataMemory ?? _fm ?? _fielddata_memory_size;
+		public int? FileDescriptorCurrent => _fileDescriptorCurrent ?? _fdc ?? _file_desc_current;
+		public int? FileDescriptorMax => _fileDescriptorMax ?? _fdm ?? _file_desc_max;
+		public int? FileDescriptorPercent => _fileDescriptorPercent ?? _fdp ?? _file_desc_percent;
+		public string FilterCacheEvictions => _filterCacheEvictions ?? _fce ?? _filter_cache_evictions;
+		public string FilterCacheMemory => _filterCacheMemory ?? _fcm ?? _filter_cache_memory_size;
+		public string FlushTotal => _flushTotal ?? _ft ?? _flush_total;
+		public string FlushTotalTime => _flushTotalTime ?? _ftt ?? _flush_total_time;
+		public string GetCurrent => _getCurrent ?? _gc ?? _get_current;
+		public string GetExistsTime => _getExistsTime ?? _geti ?? _get_exists_time;
+		public string GetExistsTotal => _getExistsTotal ?? _geto ?? _get_exists_total;
+		public string GetMissingTime => _getMissingTime ?? _gmti ?? _get_missing_time;
+		public string GetMissingTotal => _getMissingTotal ?? _gmto ?? _get_missing_total;
+		public string GetTime => _getTime ?? _gti ?? _get_time;
+		public string GetTotal => _getTotal ?? _gto ?? _get_total;
+		public string HeapCurrent => _heapCurrent ?? _hc ?? _heap_current;
+		public string HeapMax => _heapMax ?? _hm ?? _heap_max;
+		public string HeapPercent => _heapPercent ?? _hp ?? _heap_percent;
+		public string IdCacheMemory => _idCacheMemory ?? _im ?? _id_cache_memory_size;
+		public string IndexingDeleteCurrent => _indexingDeleteCurrent ?? _idcs ?? _indexing_delete_current;
+		public string IndexingDeleteTime => _indexingDeleteTime ?? _idti ?? _indexing_delete_time;
+		public string IndexingDeleteTotal => _indexingDeleteTotal ?? _idto ?? _indexing_delete_total;
+		public string IndexingIndexCurrent => _indexingIndexCurrent ?? _iic ?? _indexing_index_current;
+		public string IndexingIndexTime => _indexingIndexTime ?? _iiti ?? _indexing_index_time;
+		public string IndexingIndexTotal => _indexingIndexTotal ?? _iito ?? _indexing_index_total;
+		public string Ip => _i ?? _ip;
+		public string Jdk => _j ?? _jdk;
 
-		[JsonProperty("port")]
-		internal string _port { get; set; }
-		[JsonProperty("po")]
-		internal string _po { get; set; }
-		public string Port => this._po ?? this._port;
+		[JsonProperty("load_15m")]
+		public string LoadFifteenMinute { get; internal set; }
 
-		[JsonProperty("version")]
-		internal string _version { get; set; }
-		[JsonProperty("v")]
-		internal string _v { get; set; }
-		public string Version => this._v ?? this._version;
+		[JsonProperty("load_5m")]
+		public string LoadFiveMinute { get; internal set; }
+
+		[JsonProperty("load_1m")]
+		public string LoadOneMinute { get; internal set; }
+
+		public string Master => _m ?? _master;
+		public string MergesCurrent => _mergesCurrent ?? _mc ?? _merges_current;
+		public string MergesCurrentDocs => _mergesCurrentDocs ?? _mcd ?? _merges_current_docs;
+		public string MergesCurrentSize => _mergesCurrentSize ?? _mcs ?? _merges_current_size;
+		public string MergesTotal => _mergesTotal ?? _mt ?? _merges_total;
+		public string MergesTotalDocs => _mergesTotalDocs ?? _mtd ?? _merges_total_docs;
+		public string MergesTotalTime => _mergesTotalTime ?? _mtt ?? _merges_total_time;
+		public string Name => _n ?? _name;
+		public string NodeId => _id ?? _nodeId;
+		public string NodeRole => _nodeRole ?? _data_client ?? _dc ?? _r ?? _node_role;
+		public string PercolateCurrent => _percolateCurrent ?? _pc ?? _percolate_current;
+		public string PercolateMemory => _percolateMemory ?? _pm ?? _percolate_memory_size;
+		public string PercolateQueries => _percolate_queries ?? _pq ?? _percolate_queries;
+		public string PercolateTime => _percolateTime ?? _pti ?? _percolate_time;
+		public string PercolateTotal => _percolateTotal ?? _pto ?? _percolate_total;
+		public string Pid => _p ?? _pid;
+		public string Port => _po ?? _port;
+		public string RamCurrent => _ramCurrent ?? _rc ?? _ram_current;
+		public string RamMax => _ramMax ?? _rm ?? _ram_max;
+		public string RamPercent => _ramPercent ?? _rp ?? _ram_percent;
+		public string RefreshTime => _refreshTime ?? _rti ?? _refreshTime;
+		public string RefreshTotal => _refreshTotal ?? _rto ?? _refresh_total;
+		public string SearchFetchCurrent => _searchFetchCurrent ?? _sfc ?? _search_fetch_current;
+		public string SearchFetchTime => _searchFetchTime ?? _sfti ?? _search_fetch_time;
+		public string SearchFetchTotal => _searchFetchTotal ?? _sfto ?? _searchFetchTotal;
+		public string SearchOpenContexts => _searchOpenContexts ?? _so ?? _search_open_contexts;
+		public string SearchQueryCurrent => _searchQueryCurrent ?? _sqc ?? _search_query_current;
+		public string SearchQueryTime => _searchQueryTime ?? _sqti ?? _search_query_time;
+		public string SearchQueryTotal => _searchQueryTotal ?? _sqto ?? _search_query_total;
+		public string SegmentsCount => _segmentsCount ?? _sc ?? _segmentsCount;
+		public string SegmentsIndexWriterMaxMemory => _segmentsIndexWriterMaxMemory ?? _siwmx ?? _segments_index_writer_max_memory;
+		public string SegmentsIndexWriterMemory => _segmentsIndexWriterMemory ?? _siwm ?? _segments_index_writer_memory;
+		public string SegmentsMemory => _segmentsMemory ?? _sm ?? _segments_memory;
+		public string SegmentsVersionMapMemory => _segmentsVersionMapMemory ?? _svmm ?? _segments_version_map_memory;
+		public string Uptime => _u ?? _uptime;
+		public string Version => _v ?? _version;
 
-		[JsonProperty("build")]
-		internal string _build { get; set; }
 		[JsonProperty("b")]
 		internal string _b { get; set; }
-		public string Build => this._b ?? this._build;
 
-		[JsonProperty("jdk")]
-		internal string _jdk { get; set; }
-		[JsonProperty("j")]
-		internal string _j { get; set; }
-		public string Jdk => this._j ?? this._jdk;
+		[JsonProperty("build")]
+		internal string _build { get; set; }
+
+		[JsonProperty("completion.size")]
+		internal string _completion_size { get; set; }
+
+		[JsonProperty("completionSize")]
+		internal string _completionSize { get; set; }
+
+		[JsonProperty("cs")]
+		internal string _cs { get; set; }
 
-		[JsonProperty("disk.avail")]
-		internal string _disk_avail { get; set; }
 		[JsonProperty("d")]
 		internal string _d { get; set; }
+
+		[JsonProperty("data/client")]
+		internal string _data_client { get; set; }
+
+		[JsonProperty("dc")]
+		internal string _dc { get; set; }
+
 		[JsonProperty("disk")]
 		internal string _disk { get; set; }
+
+		[JsonProperty("disk.avail")]
+		internal string _disk_avail { get; set; }
+
 		[JsonProperty("diskAvail")]
 		internal string _diskAvail { get; set; }
-		public string DiskAvailable => this._diskAvail ?? this._disk ?? this._d ?? this._disk_avail;
 
-		[JsonProperty("heap.current")]
-		internal string _heap_current { get; set; }
-		[JsonProperty("hc")]
-		internal string _hc { get; set; }
-		[JsonProperty("heapCurrent")]
-		internal string _heapCurrent { get; set; }
-		public string HeapCurrent => this._heapCurrent ?? this._hc ?? this._heap_current;
+		[JsonProperty("fce")]
+		internal string _fce { get; set; }
 
-		[JsonProperty("heap.percent")]
-		internal string _heap_percent { get; set; }
-		[JsonProperty("hp")]
-		internal string _hp { get; set; }
-		[JsonProperty("heapPercent")]
-		internal string _heapPercent { get; set; }
-		public string HeapPercent => this._heapPercent ?? this._hp ?? this._heap_percent;
+		[JsonProperty("fcm")]
+		internal string _fcm { get; set; }
 
-		[JsonProperty("heap.max")]
-		internal string _heap_max { get; set; }
-		[JsonProperty("hm")]
-		internal string _hm { get; set; }
-		[JsonProperty("heapMax")]
-		internal string _heapMax { get; set; }
-		public string HeapMax => this._heapMax ?? this._hm ?? this._heap_max;
+		[JsonProperty("fdc")]
+		internal int? _fdc { get; set; }
 
-		[JsonProperty("ram.current")]
-		internal string _ram_current { get; set; }
-		[JsonProperty("rc")]
-		internal string _rc { get; set; }
-		[JsonProperty("ramCurrent")]
-		internal string _ramCurrent { get; set; }
-		public string RamCurrent => this._ramCurrent ?? this._rc ?? this._ram_current;
+		[JsonProperty("fdm")]
+		internal int? _fdm { get; set; }
 
-		[JsonProperty("ram.percent")]
-		internal string _ram_percent { get; set; }
-		[JsonProperty("rp")]
-		internal string _rp { get; set; }
-		[JsonProperty("ramPercent")]
-		internal string _ramPercent { get; set; }
-		public string RamPercent => this._ramPercent ?? this._rp ?? this._ram_percent;
+		[JsonProperty("fdp")]
+		internal int? _fdp { get; set; }
 
-		[JsonProperty("ram.max")]
-		internal string _ram_max { get; set; }
-		[JsonProperty("rm")]
-		internal string _rm { get; set; }
-		[JsonProperty("ramMax")]
-		internal string _ramMax { get; set; }
-		public string RamMax => this._ramMax ?? this._rm ?? this._ram_max;
+		[JsonProperty("fe")]
+		internal string _fe { get; set; }
 
-		[JsonProperty("load_1m")]
-		public string LoadOneMinute { get; internal set; }
+		[JsonProperty("fielddata.evictions")]
+		internal string _fielddata_evictions { get; set; }
 
-		[JsonProperty("load_5m")]
-		public string LoadFiveMinute { get; internal set; }
+		[JsonProperty("fielddata.memory_size")]
+		internal string _fielddata_memory_size { get; set; }
 
-		[JsonProperty("load_15m")]
-		public string LoadFifteenMinute { get; internal set; }
+		[JsonProperty("fielddataEvictions")]
+		internal string _fielddataEvictions { get; set; }
 
-		[JsonProperty("cpu")]
-		public string CPU { get; internal set; }
+		[JsonProperty("fielddataMemory")]
+		internal string _fielddataMemory { get; set; }
 
-		[JsonProperty("uptime")]
-		internal string _uptime { get; set; }
-		[JsonProperty("u")]
-		internal string _u { get; set; }
-		public string Uptime => this._u ?? this._uptime;
+		[JsonProperty("file_desc.current")]
+		internal int? _file_desc_current { get; set; }
 
-		[JsonProperty("node.role")]
-		internal string _node_role { get; set; }
-		[JsonProperty("r")]
-		internal string _r { get; set; }
-		[JsonProperty("dc")]
-		internal string _dc { get; set; }
-		[JsonProperty("data/client")]
-		internal string _data_client { get; set; }
-		[JsonProperty("nodeRole")]
-		internal string _nodeRole { get; set; }
-		public string NodeRole => this._nodeRole ?? this._data_client ?? this._dc ?? this._r ?? this._node_role;
+		[JsonProperty("file_desc.max")]
+		internal int? _file_desc_max { get; set; }
 
-		[JsonProperty("master")]
-		internal string _master { get; set; }
-		[JsonProperty("m")]
-		internal string _m { get; set; }
-		public string Master => this._m ?? this._master;
+		[JsonProperty("file_desc.percent")]
+		internal int? _file_desc_percent { get; set; }
 
-		[JsonProperty("name")]
-		internal string _name { get; set; }
-		[JsonProperty("n")]
-		internal string _n { get; set; }
-		public string Name => this._n ?? this._name;
+		[JsonProperty("fileDescriptorCurrent")]
+		internal int? _fileDescriptorCurrent { get; set; }
 
-		[JsonProperty("completion.size")]
-		internal string _completion_size { get; set; }
-		[JsonProperty("cs")]
-		internal string _cs { get; set; }
-		[JsonProperty("completionSize")]
-		internal string _completionSize { get; set; }
-		public string CompletionSize => this._completionSize ?? this._cs ?? this._completion_size;
+		[JsonProperty("fileDescriptorMax")]
+		internal int? _fileDescriptorMax { get; set; }
 
-		[JsonProperty("fielddata.memory_size")]
-		internal string _fielddata_memory_size { get; set; }
-		[JsonProperty("fm")]
-		internal string _fm { get; set; }
-		[JsonProperty("fielddataMemory")]
-		internal string _fielddataMemory { get; set; }
-		public string FielddataMemory => this._fielddataMemory ?? this._fm ?? this._fielddata_memory_size;
+		[JsonProperty("fileDescriptorPercent")]
+		internal int? _fileDescriptorPercent { get; set; }
 
-		[JsonProperty("fielddata.evictions")]
-		internal string _fielddata_evictions { get; set; }
-		[JsonProperty("fe")]
-		internal string _fe { get; set; }
-		[JsonProperty("fielddataEvictions")]
-		internal string _fielddataEvictions { get; set; }
-		public string FielddataEvictions => this._fielddataEvictions ?? this._fe ?? this._fielddata_evictions;
+		[JsonProperty("filter_cache.evictions")]
+		internal string _filter_cache_evictions { get; set; }
 
 		[JsonProperty("filter_cache.memory_size")]
 		internal string _filter_cache_memory_size { get; set; }
-		[JsonProperty("fcm")]
-		internal string _fcm { get; set; }
-		[JsonProperty("filterCacheMemory")]
-		internal string _filterCacheMemory { get; set; }
-		public string FilterCacheMemory => this._filterCacheMemory ?? this._fcm ?? this._filter_cache_memory_size;
 
-		[JsonProperty("filter_cache.evictions")]
-		internal string _filter_cache_evictions { get; set; }
-		[JsonProperty("fce")]
-		internal string _fce { get; set; }
 		[JsonProperty("filterCacheEvictions")]
 		internal string _filterCacheEvictions { get; set; }
-		public string FilterCacheEvictions => this._filterCacheEvictions ?? this._fce ?? this._filter_cache_evictions;
+
+		[JsonProperty("filterCacheMemory")]
+		internal string _filterCacheMemory { get; set; }
 
 		[JsonProperty("flush.total")]
 		internal string _flush_total { get; set; }
-		[JsonProperty("ft")]
-		internal string _ft { get; set; }
-		[JsonProperty("flushTotal")]
-		internal string _flushTotal { get; set; }
-		public string FlushTotal => this._flushTotal ?? this._ft ?? this._flush_total;
 
 		[JsonProperty("flush.total_time")]
 		internal string _flush_total_time { get; set; }
-		[JsonProperty("ftt")]
-		internal string _ftt { get; set; }
+
+		[JsonProperty("flushTotal")]
+		internal string _flushTotal { get; set; }
+
 		[JsonProperty("flushTotalTime")]
 		internal string _flushTotalTime { get; set; }
-		public string FlushTotalTime => this._flushTotalTime ?? this._ftt ?? this._flush_total_time;
 
-		[JsonProperty("file_desc.current")]
-		internal int? _file_desc_current { get; set; }
-		[JsonProperty("fdc")]
-		internal int? _fdc { get; set; }
-		[JsonProperty("fileDescriptorCurrent")]
-		internal int? _fileDescriptorCurrent { get; set; }
-		public int? FileDescriptorCurrent => this._fileDescriptorCurrent ?? this._fdc ?? this._file_desc_current;
+		[JsonProperty("fm")]
+		internal string _fm { get; set; }
 
-		[JsonProperty("file_desc.percent")]
-		internal int? _file_desc_percent { get; set; }
-		[JsonProperty("fdp")]
-		internal int? _fdp { get; set; }
-		[JsonProperty("fileDescriptorPercent")]
-		internal int? _fileDescriptorPercent { get; set; }
-		public int? FileDescriptorPercent => this._fileDescriptorPercent ?? this._fdp ?? this._file_desc_percent;
+		[JsonProperty("ft")]
+		internal string _ft { get; set; }
 
-		[JsonProperty("file_desc.max")]
-		internal int? _file_desc_max { get; set; }
-		[JsonProperty("fdm")]
-		internal int? _fdm { get; set; }
-		[JsonProperty("fileDescriptorMax")]
-		internal int? _fileDescriptorMax { get; set; }
-		public int? FileDescriptorMax => this._fileDescriptorMax ?? this._fdm ?? this._file_desc_max;
+		[JsonProperty("ftt")]
+		internal string _ftt { get; set; }
 
-		[JsonProperty("get.current")]
-		internal string _get_current { get; set; }
 		[JsonProperty("gc")]
 		internal string _gc { get; set; }
-		[JsonProperty("getCurrent")]
-		internal string _getCurrent { get; set; }
-		public string GetCurrent => this._getCurrent ?? this._gc ?? this._get_current;
+
+		[JsonProperty("get.current")]
+		internal string _get_current { get; set; }
+
+		[JsonProperty("get.exists_time")]
+		internal string _get_exists_time { get; set; }
+
+		[JsonProperty("get.exists_total")]
+		internal string _get_exists_total { get; set; }
+
+		[JsonProperty("get.missing_time")]
+		internal string _get_missing_time { get; set; }
+
+		[JsonProperty("get.missing_total")]
+		internal string _get_missing_total { get; set; }
 
 		[JsonProperty("get.time")]
 		internal string _get_time { get; set; }
-		[JsonProperty("gti")]
-		internal string _gti { get; set; }
-		[JsonProperty("getTime")]
-		internal string _getTime { get; set; }
-		public string GetTime => this._getTime ?? this._gti ?? this._get_time;
 
 		[JsonProperty("get.total")]
 		internal string _get_total { get; set; }
-		[JsonProperty("gto")]
-		internal string _gto { get; set; }
-		[JsonProperty("getTotal")]
-		internal string _getTotal { get; set; }
-		public string GetTotal => this._getTotal ?? this._gto ?? this._get_total;
 
-		[JsonProperty("get.exists_time")]
-		internal string _get_exists_time { get; set; }
-		[JsonProperty("geti")]
-		internal string _geti { get; set; }
+		[JsonProperty("getCurrent")]
+		internal string _getCurrent { get; set; }
+
 		[JsonProperty("getExistsTime")]
 		internal string _getExistsTime { get; set; }
-		public string GetExistsTime => this._getExistsTime ?? this._geti ?? this._get_exists_time;
 
-		[JsonProperty("get.exists_total")]
-		internal string _get_exists_total { get; set; }
-		[JsonProperty("geto")]
-		internal string _geto { get; set; }
 		[JsonProperty("getExistsTotal")]
 		internal string _getExistsTotal { get; set; }
-		public string GetExistsTotal => this._getExistsTotal ?? this._geto ?? this._get_exists_total;
 
-		[JsonProperty("get.missing_time")]
-		internal string _get_missing_time { get; set; }
-		[JsonProperty("gmti")]
-		internal string _gmti { get; set; }
+		[JsonProperty("geti")]
+		internal string _geti { get; set; }
+
 		[JsonProperty("getMissingTime")]
 		internal string _getMissingTime { get; set; }
-		public string GetMissingTime => this._getMissingTime ?? this._gmti ?? this._get_missing_time;
 
-		[JsonProperty("get.missing_total")]
-		internal string _get_missing_total { get; set; }
-		[JsonProperty("gmto")]
-		internal string _gmto { get; set; }
 		[JsonProperty("getMissingTotal")]
 		internal string _getMissingTotal { get; set; }
-		public string GetMissingTotal => this._getMissingTotal ?? this._gmto ?? this._get_missing_total;
+
+		[JsonProperty("geto")]
+		internal string _geto { get; set; }
+
+		[JsonProperty("getTime")]
+		internal string _getTime { get; set; }
+
+		[JsonProperty("getTotal")]
+		internal string _getTotal { get; set; }
+
+		[JsonProperty("gmti")]
+		internal string _gmti { get; set; }
+
+		[JsonProperty("gmto")]
+		internal string _gmto { get; set; }
+
+		[JsonProperty("gti")]
+		internal string _gti { get; set; }
+
+		[JsonProperty("gto")]
+		internal string _gto { get; set; }
+
+		[JsonProperty("hc")]
+		internal string _hc { get; set; }
+
+		[JsonProperty("heap.current")]
+		internal string _heap_current { get; set; }
+
+		[JsonProperty("heap.max")]
+		internal string _heap_max { get; set; }
+
+		[JsonProperty("heap.percent")]
+		internal string _heap_percent { get; set; }
+
+		[JsonProperty("heapCurrent")]
+		internal string _heapCurrent { get; set; }
+
+		[JsonProperty("heapMax")]
+		internal string _heapMax { get; set; }
+
+		[JsonProperty("heapPercent")]
+		internal string _heapPercent { get; set; }
+
+		[JsonProperty("hm")]
+		internal string _hm { get; set; }
+
+		[JsonProperty("hp")]
+		internal string _hp { get; set; }
+
+		[JsonProperty("i")]
+		internal string _i { get; set; }
+
+		[JsonProperty("id")]
+		internal string _id { get; set; }
 
 		[JsonProperty("id_cache.memory_size")]
 		internal string _id_cache_memory_size { get; set; }
-		[JsonProperty("im")]
-		internal string _im { get; set; }
+
 		[JsonProperty("idCacheMemory")]
 		internal string _idCacheMemory { get; set; }
-		public string IdCacheMemory => this._idCacheMemory ?? this._im ?? this._id_cache_memory_size;
 
-		[JsonProperty("indexing.delete_current")]
-		internal string _indexing_delete_current { get; set; }
 		[JsonProperty("idc")]
 		internal string _idcs { get; set; }
-		[JsonProperty("indexingDeleteCurrent")]
-		internal string _indexingDeleteCurrent { get; set; }
-		public string IndexingDeleteCurrent => this._indexingDeleteCurrent ?? this._idcs ?? this._indexing_delete_current;
 
-		[JsonProperty("indexing.delete_time")]
-		internal string _indexing_delete_time { get; set; }
 		[JsonProperty("idti")]
 		internal string _idti { get; set; }
-		[JsonProperty("indexingDeleteTime")]
-		internal string _indexingDeleteTime { get; set; }
-		public string IndexingDeleteTime => this._indexingDeleteTime ?? this._idti ?? this._indexing_delete_time;
 
-		[JsonProperty("indexing.delete_total")]
-		internal string _indexing_delete_total { get; set; }
 		[JsonProperty("idto")]
 		internal string _idto { get; set; }
-		[JsonProperty("indexingDeleteTotal")]
-		internal string _indexingDeleteTotal { get; set; }
-		public string IndexingDeleteTotal => this._indexingDeleteTotal ?? this._idto ?? this._indexing_delete_total;
 
-		[JsonProperty("indexing.index_current")]
-		internal string _indexing_index_current { get; set; }
 		[JsonProperty("iic")]
 		internal string _iic { get; set; }
-		[JsonProperty("indexingIndexCurrent")]
-		internal string _indexingIndexCurrent { get; set; }
-		public string IndexingIndexCurrent => this._indexingIndexCurrent ?? this._iic ?? this._indexing_index_current;
 
-		[JsonProperty("indexing.index_time")]
-		internal string _indexing_index_time { get; set; }
 		[JsonProperty("iiti")]
 		internal string _iiti { get; set; }
-		[JsonProperty("indexingIndexTime")]
-		internal string _indexingIndexTime { get; set; }
-		public string IndexingIndexTime => this._indexingIndexTime ?? this._iiti ?? this._indexing_index_time;
 
-		[JsonProperty("indexing.index_total")]
-		internal string _indexing_index_total { get; set; }
 		[JsonProperty("iito")]
 		internal string _iito { get; set; }
+
+		[JsonProperty("im")]
+		internal string _im { get; set; }
+
+		[JsonProperty("indexing.delete_current")]
+		internal string _indexing_delete_current { get; set; }
+
+		[JsonProperty("indexing.delete_time")]
+		internal string _indexing_delete_time { get; set; }
+
+		[JsonProperty("indexing.delete_total")]
+		internal string _indexing_delete_total { get; set; }
+
+		[JsonProperty("indexing.index_current")]
+		internal string _indexing_index_current { get; set; }
+
+		[JsonProperty("indexing.index_time")]
+		internal string _indexing_index_time { get; set; }
+
+		[JsonProperty("indexing.index_total")]
+		internal string _indexing_index_total { get; set; }
+
+		[JsonProperty("indexingDeleteCurrent")]
+		internal string _indexingDeleteCurrent { get; set; }
+
+		[JsonProperty("indexingDeleteTime")]
+		internal string _indexingDeleteTime { get; set; }
+
+		[JsonProperty("indexingDeleteTotal")]
+		internal string _indexingDeleteTotal { get; set; }
+
+		[JsonProperty("indexingIndexCurrent")]
+		internal string _indexingIndexCurrent { get; set; }
+
+		[JsonProperty("indexingIndexTime")]
+		internal string _indexingIndexTime { get; set; }
+
 		[JsonProperty("indexingIndexTotal")]
 		internal string _indexingIndexTotal { get; set; }
-		public string IndexingIndexTotal => this._indexingIndexTotal ?? this._iito ?? this._indexing_index_total;
 
-		[JsonProperty("merges.current")]
-		internal string _merges_current { get; set; }
+		[JsonProperty("ip")]
+		internal string _ip { get; set; }
+
+		[JsonProperty("j")]
+		internal string _j { get; set; }
+
+		[JsonProperty("jdk")]
+		internal string _jdk { get; set; }
+
+		[JsonProperty("m")]
+		internal string _m { get; set; }
+
+		[JsonProperty("master")]
+		internal string _master { get; set; }
+
 		[JsonProperty("mc")]
 		internal string _mc { get; set; }
-		[JsonProperty("mergesCurrent")]
-		internal string _mergesCurrent { get; set; }
-		public string MergesCurrent => this._mergesCurrent ?? this._mc ?? this._merges_current;
 
-		[JsonProperty("merges.current_docs")]
-		internal string _merges_current_docs { get; set; }
 		[JsonProperty("mcd")]
 		internal string _mcd { get; set; }
-		[JsonProperty("mergesCurrentDocs")]
-		internal string _mergesCurrentDocs { get; set; }
-		public string MergesCurrentDocs => this._mergesCurrentDocs ?? this._mcd ?? this._merges_current_docs;
 
-		[JsonProperty("merges.current_size")]
-		internal string _merges_current_size { get; set; }
 		[JsonProperty("mcs")]
 		internal string _mcs { get; set; }
+
+		[JsonProperty("merges.current")]
+		internal string _merges_current { get; set; }
+
+		[JsonProperty("merges.current_docs")]
+		internal string _merges_current_docs { get; set; }
+
+		[JsonProperty("merges.current_size")]
+		internal string _merges_current_size { get; set; }
+
+		[JsonProperty("merges.total")]
+		internal string _merges_total { get; set; }
+
+		[JsonProperty("merges.total_docs")]
+		internal string _merges_total_docs { get; set; }
+
+		[JsonProperty("merges.total_time")]
+		internal string _merges_total_time { get; set; }
+
+		[JsonProperty("mergesCurrent")]
+		internal string _mergesCurrent { get; set; }
+
+		[JsonProperty("mergesCurrentDocs")]
+		internal string _mergesCurrentDocs { get; set; }
+
 		[JsonProperty("mergesCurrentSize")]
 		internal string _mergesCurrentSize { get; set; }
-		public string MergesCurrentSize => this._mergesCurrentSize ?? this._mcs ?? this._merges_current_size;
 
-		[JsonProperty("merges.total")]
-		internal string _merges_total { get; set; }
+		[JsonProperty("mergesTotal")]
+		internal string _mergesTotal { get; set; }
+
+		[JsonProperty("mergesTotalDocs")]
+		internal string _mergesTotalDocs { get; set; }
+
+		[JsonProperty("mergesTotalTime")]
+		internal string _mergesTotalTime { get; set; }
+
 		[JsonProperty("mt")]
 		internal string _mt { get; set; }
-		[JsonProperty("mergesTotal")]
-		internal string _mergesTotal { get; set; }
-		public string MergesTotal => this._mergesTotal ?? this._mt ?? this._merges_total;
 
-		[JsonProperty("merges.total_docs")]
-		internal string _merges_total_docs { get; set; }
 		[JsonProperty("mtd")]
 		internal string _mtd { get; set; }
-		[JsonProperty("mergesTotalDocs")]
-		internal string _mergesTotalDocs { get; set; }
-		public string MergesTotalDocs => this._mergesTotalDocs ?? this._mtd ?? this._merges_total_docs;
 
-		[JsonProperty("merges.total_time")]
-		internal string _merges_total_time { get; set; }
 		[JsonProperty("mtt")]
 		internal string _mtt { get; set; }
-		[JsonProperty("mergesTotalTime")]
-		internal string _mergesTotalTime { get; set; }
-		public string MergesTotalTime => this._mergesTotalTime ?? this._mtt ?? this._merges_total_time;
 
-		[JsonProperty("percolate.current")]
-		internal string _percolate_current { get; set; }
+		[JsonProperty("n")]
+		internal string _n { get; set; }
+
+		[JsonProperty("name")]
+		internal string _name { get; set; }
+
+		[JsonProperty("node.role")]
+		internal string _node_role { get; set; }
+
+		[JsonProperty("nodeId")]
+		internal string _nodeId { get; set; }
+
+		[JsonProperty("nodeRole")]
+		internal string _nodeRole { get; set; }
+
+		[JsonProperty("p")]
+		internal string _p { get; set; }
+
 		[JsonProperty("pc")]
 		internal string _pc { get; set; }
-		[JsonProperty("percolateCurrent")]
-		internal string _percolateCurrent { get; set; }
-		public string PercolateCurrent => this._percolateCurrent ?? this._pc ?? this._percolate_current;
+
+		[JsonProperty("percolate.current")]
+		internal string _percolate_current { get; set; }
 
 		[JsonProperty("percolate.memory_size")]
 		internal string _percolate_memory_size { get; set; }
-		[JsonProperty("pm")]
-		internal string _pm { get; set; }
-		[JsonProperty("percolateMemory")]
-		internal string _percolateMemory { get; set; }
-		public string PercolateMemory => this._percolateMemory ?? this._pm ?? this._percolate_memory_size;
 
 		[JsonProperty("percolate.queries")]
 		internal string _percolate_queries { get; set; }
-		[JsonProperty("pq")]
-		internal string _pq { get; set; }
-		[JsonProperty("percolateQueries")]
-		internal string _percolateQueries { get; set; }
-		public string PercolateQueries => this._percolate_queries ?? this._pq ?? this._percolate_queries;
 
 		[JsonProperty("percolate.time")]
 		internal string _percolate_time { get; set; }
-		[JsonProperty("pti")]
-		internal string _pti { get; set; }
-		[JsonProperty("percolateTime")]
-		internal string _percolateTime { get; set; }
-		public string PercolateTime => this._percolateTime ?? this._pti ?? this._percolate_time;
 
 		[JsonProperty("percolate.total")]
 		internal string _percolate_total { get; set; }
-		[JsonProperty("pto")]
-		internal string _pto { get; set; }
+
+		[JsonProperty("percolateCurrent")]
+		internal string _percolateCurrent { get; set; }
+
+		[JsonProperty("percolateMemory")]
+		internal string _percolateMemory { get; set; }
+
+		[JsonProperty("percolateQueries")]
+		internal string _percolateQueries { get; set; }
+
+		[JsonProperty("percolateTime")]
+		internal string _percolateTime { get; set; }
+
 		[JsonProperty("percolateTotal")]
 		internal string _percolateTotal { get; set; }
-		public string PercolateTotal => this._percolateTotal ?? this._pto ?? this._percolate_total;
+
+		[JsonProperty("pid")]
+		internal string _pid { get; set; }
+
+		[JsonProperty("pm")]
+		internal string _pm { get; set; }
+
+		[JsonProperty("po")]
+		internal string _po { get; set; }
+
+		[JsonProperty("port")]
+		internal string _port { get; set; }
+
+		[JsonProperty("pq")]
+		internal string _pq { get; set; }
+
+		[JsonProperty("pti")]
+		internal string _pti { get; set; }
+
+		[JsonProperty("pto")]
+		internal string _pto { get; set; }
+
+		[JsonProperty("r")]
+		internal string _r { get; set; }
+
+		[JsonProperty("ram.current")]
+		internal string _ram_current { get; set; }
+
+		[JsonProperty("ram.max")]
+		internal string _ram_max { get; set; }
+
+		[JsonProperty("ram.percent")]
+		internal string _ram_percent { get; set; }
+
+		[JsonProperty("ramCurrent")]
+		internal string _ramCurrent { get; set; }
+
+		[JsonProperty("ramMax")]
+		internal string _ramMax { get; set; }
+
+		[JsonProperty("ramPercent")]
+		internal string _ramPercent { get; set; }
+
+		[JsonProperty("rc")]
+		internal string _rc { get; set; }
+
+		[JsonProperty("refresh.time")]
+		internal string _refresh_time { get; set; }
 
 		[JsonProperty("refresh.total")]
 		internal string _refresh_total { get; set; }
-		[JsonProperty("rto")]
-		internal string _rto { get; set; }
+
+		[JsonProperty("refreshTime")]
+		internal string _refreshTime { get; set; }
+
 		[JsonProperty("refreshTotal")]
 		internal string _refreshTotal { get; set; }
-		public string RefreshTotal => this._refreshTotal ?? this._rto ?? this._refresh_total;
 
-		[JsonProperty("refresh.time")]
-		internal string _refresh_time { get; set; }
+		[JsonProperty("rm")]
+		internal string _rm { get; set; }
+
+		[JsonProperty("rp")]
+		internal string _rp { get; set; }
+
 		[JsonProperty("rti")]
 		internal string _rti { get; set; }
-		[JsonProperty("refreshTime")]
-		internal string _refreshTime { get; set; }
-		public string RefreshTime => this._refreshTime ?? this._rti ?? this._refreshTime;
+
+		[JsonProperty("rto")]
+		internal string _rto { get; set; }
+
+		[JsonProperty("sc")]
+		internal string _sc { get; set; }
 
 		[JsonProperty("search.fetch_current")]
 		internal string _search_fetch_current { get; set; }
-		[JsonProperty("sfc")]
-		internal string _sfc { get; set; }
-		[JsonProperty("searchFetchCurrent")]
-		internal string _searchFetchCurrent { get; set; }
-		public string SearchFetchCurrent => this._searchFetchCurrent ?? this._sfc ?? this._search_fetch_current;
 
 		[JsonProperty("search.fetch_time")]
 		internal string _search_fetch_time { get; set; }
-		[JsonProperty("sfti")]
-		internal string _sfti { get; set; }
-		[JsonProperty("searchFetchTime")]
-		internal string _searchFetchTime { get; set; }
-		public string SearchFetchTime => this._searchFetchTime ?? this._sfti ?? this._search_fetch_time;
 
 		[JsonProperty("search.fetch_total")]
 		internal string _search_fetch_total { get; set; }
-		[JsonProperty("sfto")]
-		internal string _sfto { get; set; }
-		[JsonProperty("searchFetchTotal")]
-		internal string _searchFetchTotal { get; set; }
-		public string SearchFetchTotal => this._searchFetchTotal ?? this._sfto ?? this._searchFetchTotal;
 
 		[JsonProperty("search.open_contexts")]
 		internal string _search_open_contexts { get; set; }
-		[JsonProperty("so")]
-		internal string _so { get; set; }
-		[JsonProperty("searchOpenContexts")]
-		internal string _searchOpenContexts { get; set; }
-		public string SearchOpenContexts => this._searchOpenContexts ?? this._so ?? this._search_open_contexts;
 
 		[JsonProperty("search.query_current")]
 		internal string _search_query_current { get; set; }
-		[JsonProperty("sqc")]
-		internal string _sqc { get; set; }
-		[JsonProperty("searchQueryCurrent")]
-		internal string _searchQueryCurrent { get; set; }
-		public string SearchQueryCurrent => this._searchQueryCurrent ?? this._sqc ?? this._search_query_current;
 
 		[JsonProperty("search.query_time")]
 		internal string _search_query_time { get; set; }
-		[JsonProperty("sqti")]
-		internal string _sqti { get; set; }
-		[JsonProperty("searchQueryTime")]
-		internal string _searchQueryTime { get; set; }
-		public string SearchQueryTime => this._searchQueryTime ?? this._sqti ?? this._search_query_time;
 
 		[JsonProperty("search.query_total")]
 		internal string _search_query_total { get; set; }
-		[JsonProperty("sqto")]
-		internal string _sqto { get; set; }
+
+		[JsonProperty("searchFetchCurrent")]
+		internal string _searchFetchCurrent { get; set; }
+
+		[JsonProperty("searchFetchTime")]
+		internal string _searchFetchTime { get; set; }
+
+		[JsonProperty("searchFetchTotal")]
+		internal string _searchFetchTotal { get; set; }
+
+		[JsonProperty("searchOpenContexts")]
+		internal string _searchOpenContexts { get; set; }
+
+		[JsonProperty("searchQueryCurrent")]
+		internal string _searchQueryCurrent { get; set; }
+
+		[JsonProperty("searchQueryTime")]
+		internal string _searchQueryTime { get; set; }
+
 		[JsonProperty("searchQueryTotal")]
 		internal string _searchQueryTotal { get; set; }
-		public string SearchQueryTotal => this._searchQueryTotal ?? this._sqto ?? this._search_query_total;
 
 		[JsonProperty("segments.count")]
 		internal string _segments_count { get; set; }
-		[JsonProperty("sc")]
-		internal string _sc { get; set; }
-		[JsonProperty("segmentsCount")]
-		internal string _segmentsCount { get; set; }
-		public string SegmentsCount => this._segmentsCount ?? this._sc ?? this._segmentsCount;
+
+		[JsonProperty("segments.index_writer_max_memory")]
+		internal string _segments_index_writer_max_memory { get; set; }
+
+		[JsonProperty("segments.index_writer_memory")]
+		internal string _segments_index_writer_memory { get; set; }
 
 		[JsonProperty("segments.memory")]
 		internal string _segments_memory { get; set; }
-		[JsonProperty("sm")]
-		internal string _sm { get; set; }
+
+		[JsonProperty("segments.version_map_memory")]
+		internal string _segments_version_map_memory { get; set; }
+
+		[JsonProperty("segmentsCount")]
+		internal string _segmentsCount { get; set; }
+
+		[JsonProperty("segmentsIndexWriterMaxMemory")]
+		internal string _segmentsIndexWriterMaxMemory { get; set; }
+
+		[JsonProperty("segmentsIndexWriterMemory")]
+		internal string _segmentsIndexWriterMemory { get; set; }
+
 		[JsonProperty("segmentsMemory")]
 		internal string _segmentsMemory { get; set; }
-		public string SegmentsMemory => this._segmentsMemory ?? this._sm ?? this._segments_memory;
 
-		[JsonProperty("segments.index_writer_memory")]
-		internal string _segments_index_writer_memory { get; set; }
+		[JsonProperty("segmentsVersionMapMemory")]
+		internal string _segmentsVersionMapMemory { get; set; }
+
+		[JsonProperty("sfc")]
+		internal string _sfc { get; set; }
+
+		[JsonProperty("sfti")]
+		internal string _sfti { get; set; }
+
+		[JsonProperty("sfto")]
+		internal string _sfto { get; set; }
+
 		[JsonProperty("siwm")]
 		internal string _siwm { get; set; }
-		[JsonProperty("segmentsIndexWriterMemory")]
-		internal string _segmentsIndexWriterMemory { get; set; }
-		public string SegmentsIndexWriterMemory => this._segmentsIndexWriterMemory ?? this._siwm ?? this._segments_index_writer_memory;
 
-		[JsonProperty("segments.index_writer_max_memory")]
-		internal string _segments_index_writer_max_memory { get; set; }
 		[JsonProperty("siwmx")]
 		internal string _siwmx { get; set; }
-		[JsonProperty("segmentsIndexWriterMaxMemory")]
-		internal string _segmentsIndexWriterMaxMemory { get; set; }
-		public string SegmentsIndexWriterMaxMemory => this._segmentsIndexWriterMaxMemory ?? this._siwmx ?? this._segments_index_writer_max_memory;
 
-		[JsonProperty("segments.version_map_memory")]
-		internal string _segments_version_map_memory { get; set; }
+		[JsonProperty("sm")]
+		internal string _sm { get; set; }
+
+		[JsonProperty("so")]
+		internal string _so { get; set; }
+
+		[JsonProperty("sqc")]
+		internal string _sqc { get; set; }
+
+		[JsonProperty("sqti")]
+		internal string _sqti { get; set; }
+
+		[JsonProperty("sqto")]
+		internal string _sqto { get; set; }
+
 		[JsonProperty("svmm")]
 		internal string _svmm { get; set; }
-		[JsonProperty("segmentsVersionMapMemory")]
-		internal string _segmentsVersionMapMemory { get; set; }
-		public string SegmentsVersionMapMemory => this._segmentsVersionMapMemory ?? this._svmm ?? this._segments_version_map_memory;
+
+		[JsonProperty("u")]
+		internal string _u { get; set; }
+
+		[JsonProperty("uptime")]
+		internal string _uptime { get; set; }
+
+		[JsonProperty("v")]
+		internal string _v { get; set; }
+
+		[JsonProperty("version")]
+		internal string _version { get; set; }
 	}
 }
diff --git a/src/Nest/Cat/CatNodes/ElasticClient-CatNodes.cs b/src/Nest/Cat/CatNodes/ElasticClient-CatNodes.cs
index 513ef6f0756..c5c28690b29 100644
--- a/src/Nest/Cat/CatNodes/ElasticClient-CatNodes.cs
+++ b/src/Nest/Cat/CatNodes/ElasticClient-CatNodes.cs
@@ -1,42 +1,49 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatNodesRecord> CatNodes(Func<CatNodesDescriptor, ICatNodesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatNodesRecord> CatNodes(ICatNodesRequest request);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatNodesRecord>> CatNodesAsync(Func<CatNodesDescriptor, ICatNodesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatNodesRecord>> CatNodesAsync(Func<CatNodesDescriptor, ICatNodesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatNodesRecord>> CatNodesAsync(ICatNodesRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatNodesRecord> CatNodes(Func<CatNodesDescriptor, ICatNodesRequest> selector = null) =>
-			this.CatNodes(selector.InvokeOrDefault(new CatNodesDescriptor()));
-
-		/// <inheritdoc/>
-		public ICatResponse<CatNodesRecord> CatNodes(ICatNodesRequest request)=>
-			this.DoCat<ICatNodesRequest, CatNodesRequestParameters, CatNodesRecord>(request, this.LowLevelDispatch.CatNodesDispatch<CatResponse<CatNodesRecord>>);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatNodesRecord>> CatNodesAsync(Func<CatNodesDescriptor, ICatNodesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CatNodesAsync(selector.InvokeOrDefault(new CatNodesDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatNodesRecord>> CatNodesAsync(ICatNodesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatNodesRequest, CatNodesRequestParameters, CatNodesRecord>(request, cancellationToken, this.LowLevelDispatch.CatNodesDispatchAsync<CatResponse<CatNodesRecord>>);
+			CatNodes(selector.InvokeOrDefault(new CatNodesDescriptor()));
+
+		/// <inheritdoc />
+		public ICatResponse<CatNodesRecord> CatNodes(ICatNodesRequest request) =>
+			DoCat<ICatNodesRequest, CatNodesRequestParameters, CatNodesRecord>(request,
+				LowLevelDispatch.CatNodesDispatch<CatResponse<CatNodesRecord>>);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatNodesRecord>> CatNodesAsync(Func<CatNodesDescriptor, ICatNodesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CatNodesAsync(selector.InvokeOrDefault(new CatNodesDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatNodesRecord>> CatNodesAsync(ICatNodesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatNodesRequest, CatNodesRequestParameters, CatNodesRecord>(request, cancellationToken,
+				LowLevelDispatch.CatNodesDispatchAsync<CatResponse<CatNodesRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatPendingTasks/CatPendingTasksRecord.cs b/src/Nest/Cat/CatPendingTasks/CatPendingTasksRecord.cs
index b29a4c82665..63db30b72af 100644
--- a/src/Nest/Cat/CatPendingTasks/CatPendingTasksRecord.cs
+++ b/src/Nest/Cat/CatPendingTasks/CatPendingTasksRecord.cs
@@ -8,14 +8,13 @@ public class CatPendingTasksRecord : ICatRecord
 		[JsonProperty("insertOrder")]
 		public int? InsertOrder { get; set; }
 
-		[JsonProperty("timeInQueue")]
-		public string TimeInQueue { get; set; }
-
 		[JsonProperty("priority")]
 		public string Priority { get; set; }
 
 		[JsonProperty("source")]
 		public string Source { get; set; }
 
+		[JsonProperty("timeInQueue")]
+		public string TimeInQueue { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatPendingTasks/ElasticClient-CatPendingTasks.cs b/src/Nest/Cat/CatPendingTasks/ElasticClient-CatPendingTasks.cs
index 07b423cf1ca..e790d5862ed 100644
--- a/src/Nest/Cat/CatPendingTasks/ElasticClient-CatPendingTasks.cs
+++ b/src/Nest/Cat/CatPendingTasks/ElasticClient-CatPendingTasks.cs
@@ -1,46 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatPendingTasksRecord> CatPendingTasks(Func<CatPendingTasksDescriptor, ICatPendingTasksRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatPendingTasksRecord> CatPendingTasks(ICatPendingTasksRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatPendingTasksRecord>> CatPendingTasksAsync(
 			Func<CatPendingTasksDescriptor, ICatPendingTasksRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatPendingTasksRecord>> CatPendingTasksAsync(ICatPendingTasksRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatPendingTasksRecord>> CatPendingTasksAsync(ICatPendingTasksRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatPendingTasksRecord> CatPendingTasks(Func<CatPendingTasksDescriptor, ICatPendingTasksRequest> selector = null) =>
-			this.CatPendingTasks(selector.InvokeOrDefault(new CatPendingTasksDescriptor()));
+			CatPendingTasks(selector.InvokeOrDefault(new CatPendingTasksDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatPendingTasksRecord> CatPendingTasks(ICatPendingTasksRequest request) =>
-			this.DoCat<ICatPendingTasksRequest, CatPendingTasksRequestParameters, CatPendingTasksRecord>(request, this.LowLevelDispatch.CatPendingTasksDispatch<CatResponse<CatPendingTasksRecord>>);
+			DoCat<ICatPendingTasksRequest, CatPendingTasksRequestParameters, CatPendingTasksRecord>(request,
+				LowLevelDispatch.CatPendingTasksDispatch<CatResponse<CatPendingTasksRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatPendingTasksRecord>> CatPendingTasksAsync(
 			Func<CatPendingTasksDescriptor, ICatPendingTasksRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatPendingTasksAsync(selector.InvokeOrDefault(new CatPendingTasksDescriptor()), cancellationToken);
+		) => CatPendingTasksAsync(selector.InvokeOrDefault(new CatPendingTasksDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatPendingTasksRecord>> CatPendingTasksAsync(ICatPendingTasksRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatPendingTasksRequest, CatPendingTasksRequestParameters, CatPendingTasksRecord>(request, cancellationToken, this.LowLevelDispatch.CatPendingTasksDispatchAsync<CatResponse<CatPendingTasksRecord>>);
+		/// <inheritdoc />
+		public Task<ICatResponse<CatPendingTasksRecord>> CatPendingTasksAsync(ICatPendingTasksRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatPendingTasksRequest, CatPendingTasksRequestParameters, CatPendingTasksRecord>(request, cancellationToken,
+				LowLevelDispatch.CatPendingTasksDispatchAsync<CatResponse<CatPendingTasksRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatPlugins/CatPluginsRecord.cs b/src/Nest/Cat/CatPlugins/CatPluginsRecord.cs
index d0b245315ac..2f62769676f 100644
--- a/src/Nest/Cat/CatPlugins/CatPluginsRecord.cs
+++ b/src/Nest/Cat/CatPlugins/CatPluginsRecord.cs
@@ -5,28 +5,28 @@ namespace Nest
 	[JsonObject]
 	public class CatPluginsRecord : ICatRecord
 	{
-		[JsonProperty("id")]
-		public string Id { get; set; }
-
-		[JsonProperty("name")]
-		public string Name  { get; set; }
-
 		[JsonProperty("component")]
 		public string Component { get; set; }
 
-		[JsonProperty("version")]
-		public string Version { get; set; }
+		[JsonProperty("description")]
+		public string Description { get; set; }
 
-		[JsonProperty("type")]
-		public string Type { get; set; }
+		[JsonProperty("id")]
+		public string Id { get; set; }
 
 		[JsonProperty("isolation")]
 		public string Isolation { get; set; }
 
+		[JsonProperty("name")]
+		public string Name { get; set; }
+
+		[JsonProperty("type")]
+		public string Type { get; set; }
+
 		[JsonProperty("url")]
 		public string Url { get; set; }
 
-		[JsonProperty("description")]
-		public string Description { get; set; }
+		[JsonProperty("version")]
+		public string Version { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatPlugins/ElasticClient-CatPlugins.cs b/src/Nest/Cat/CatPlugins/ElasticClient-CatPlugins.cs
index 4a61325bd09..1c8e1d00d15 100644
--- a/src/Nest/Cat/CatPlugins/ElasticClient-CatPlugins.cs
+++ b/src/Nest/Cat/CatPlugins/ElasticClient-CatPlugins.cs
@@ -1,43 +1,49 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatPluginsRecord> CatPlugins(Func<CatPluginsDescriptor, ICatPluginsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatPluginsRecord> CatPlugins(ICatPluginsRequest request);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatPluginsRecord>> CatPluginsAsync(Func<CatPluginsDescriptor, ICatPluginsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<ICatResponse<CatPluginsRecord>> CatPluginsAsync(ICatPluginsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatPluginsRecord>> CatPluginsAsync(Func<CatPluginsDescriptor, ICatPluginsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<ICatResponse<CatPluginsRecord>> CatPluginsAsync(ICatPluginsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatPluginsRecord> CatPlugins(Func<CatPluginsDescriptor, ICatPluginsRequest> selector = null) =>
-			this.CatPlugins(selector.InvokeOrDefault(new CatPluginsDescriptor()));
+			CatPlugins(selector.InvokeOrDefault(new CatPluginsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatPluginsRecord> CatPlugins(ICatPluginsRequest request) =>
-			this.DoCat<ICatPluginsRequest, CatPluginsRequestParameters, CatPluginsRecord>(request, this.LowLevelDispatch.CatPluginsDispatch<CatResponse<CatPluginsRecord>>);
+			DoCat<ICatPluginsRequest, CatPluginsRequestParameters, CatPluginsRecord>(request,
+				LowLevelDispatch.CatPluginsDispatch<CatResponse<CatPluginsRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatPluginsRecord>> CatPluginsAsync(
 			Func<CatPluginsDescriptor, ICatPluginsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatPluginsAsync(selector.InvokeOrDefault(new CatPluginsDescriptor()), cancellationToken);
-
-		public Task<ICatResponse<CatPluginsRecord>> CatPluginsAsync(ICatPluginsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatPluginsRequest, CatPluginsRequestParameters, CatPluginsRecord>(request, cancellationToken, this.LowLevelDispatch.CatPluginsDispatchAsync<CatResponse<CatPluginsRecord>>);
+		) => CatPluginsAsync(selector.InvokeOrDefault(new CatPluginsDescriptor()), cancellationToken);
 
+		public Task<ICatResponse<CatPluginsRecord>> CatPluginsAsync(ICatPluginsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatPluginsRequest, CatPluginsRequestParameters, CatPluginsRecord>(request, cancellationToken,
+				LowLevelDispatch.CatPluginsDispatchAsync<CatResponse<CatPluginsRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatRecovery/CatRecoveryRecord.cs b/src/Nest/Cat/CatRecovery/CatRecoveryRecord.cs
index 5d138e69a65..627e128490e 100644
--- a/src/Nest/Cat/CatRecovery/CatRecoveryRecord.cs
+++ b/src/Nest/Cat/CatRecovery/CatRecoveryRecord.cs
@@ -5,62 +5,59 @@ namespace Nest
 	[JsonObject]
 	public class CatRecoveryRecord : ICatRecord
 	{
-		[JsonProperty("index")]
-		public string Index { get; set; }
+		[JsonProperty("bytes")]
+		public string Bytes { get; set; }
 
-		[JsonProperty("shard")]
-		public string Shard  { get; set; }
+		[JsonProperty("bytes_percent")]
+		public string BytesPercent { get; set; }
 
-		[JsonProperty("time")]
-		public string Time { get; set; }
+		[JsonProperty("bytes_recovered")]
+		public string BytesRecovered { get; set; }
 
-		[JsonProperty("type")]
-		public string Type { get; set; }
+		[JsonProperty("bytes_total")]
+		public string BytesTotal { get; set; }
 
-		[JsonProperty("stage")]
-		public string Stage { get; set; }
+		[JsonProperty("files")]
+		public string Files { get; set; }
 
-		[JsonProperty("source_host")]
-		public string SourceHost { get; set; }
+		[JsonProperty("files_percent")]
+		public string FilesPercent { get; set; }
 
-		[JsonProperty("source_node")]
-		public string SourceNode { get; set; }
+		[JsonProperty("files_recovered")]
+		public string FilesRecovered { get; set; }
 
-		[JsonProperty("target_host")]
-		public string TargetHost { get; set; }
+		[JsonProperty("files_total")]
+		public string FilesTotal { get; set; }
 
-		[JsonProperty("target_node")]
-		public string TargetNode { get; set; }
+		[JsonProperty("index")]
+		public string Index { get; set; }
 
 		[JsonProperty("repository")]
 		public string Repository { get; set; }
 
+		[JsonProperty("shard")]
+		public string Shard { get; set; }
+
 		[JsonProperty("snapshot")]
 		public string Snapshot { get; set; }
 
-		[JsonProperty("files")]
-		public string Files { get; set; }
-
-		[JsonProperty("files_recovered")]
-		public string FilesRecovered { get; set; }
-
-		[JsonProperty("files_percent")]
-		public string FilesPercent { get; set; }
+		[JsonProperty("source_host")]
+		public string SourceHost { get; set; }
 
-		[JsonProperty("files_total")]
-		public string FilesTotal { get; set; }
+		[JsonProperty("source_node")]
+		public string SourceNode { get; set; }
 
-		[JsonProperty("bytes")]
-		public string Bytes { get; set; }
+		[JsonProperty("stage")]
+		public string Stage { get; set; }
 
-		[JsonProperty("bytes_recovered")]
-		public string BytesRecovered { get; set; }
+		[JsonProperty("target_host")]
+		public string TargetHost { get; set; }
 
-		[JsonProperty("bytes_percent")]
-		public string BytesPercent { get; set; }
+		[JsonProperty("target_node")]
+		public string TargetNode { get; set; }
 
-		[JsonProperty("bytes_total")]
-		public string BytesTotal { get; set; }
+		[JsonProperty("time")]
+		public string Time { get; set; }
 
 		[JsonProperty("translog_ops")]
 		public long? TranslogOps { get; set; }
@@ -70,5 +67,8 @@ public class CatRecoveryRecord : ICatRecord
 
 		[JsonProperty("translog_ops_recovered")]
 		public long? TranslogOpsRecovered { get; set; }
+
+		[JsonProperty("type")]
+		public string Type { get; set; }
 	}
 }
diff --git a/src/Nest/Cat/CatRecovery/ElasticClient-CatRecovery.cs b/src/Nest/Cat/CatRecovery/ElasticClient-CatRecovery.cs
index a168532f45e..b18e1fd0438 100644
--- a/src/Nest/Cat/CatRecovery/ElasticClient-CatRecovery.cs
+++ b/src/Nest/Cat/CatRecovery/ElasticClient-CatRecovery.cs
@@ -1,47 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatRecoveryRecord> CatRecovery(Func<CatRecoveryDescriptor, ICatRecoveryRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatRecoveryRecord> CatRecovery(ICatRecoveryRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatRecoveryRecord>> CatRecoveryAsync(
 			Func<CatRecoveryDescriptor, ICatRecoveryRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatRecoveryRecord>> CatRecoveryAsync(ICatRecoveryRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatRecoveryRecord>> CatRecoveryAsync(ICatRecoveryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatRecoveryRecord> CatRecovery(Func<CatRecoveryDescriptor, ICatRecoveryRequest> selector = null) =>
-			this.CatRecovery(selector.InvokeOrDefault(new CatRecoveryDescriptor()));
+			CatRecovery(selector.InvokeOrDefault(new CatRecoveryDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatRecoveryRecord> CatRecovery(ICatRecoveryRequest request) =>
-			this.DoCat<ICatRecoveryRequest, CatRecoveryRequestParameters, CatRecoveryRecord>(request, this.LowLevelDispatch.CatRecoveryDispatch<CatResponse<CatRecoveryRecord>>);
+			DoCat<ICatRecoveryRequest, CatRecoveryRequestParameters, CatRecoveryRecord>(request,
+				LowLevelDispatch.CatRecoveryDispatch<CatResponse<CatRecoveryRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatRecoveryRecord>> CatRecoveryAsync(
 			Func<CatRecoveryDescriptor, ICatRecoveryRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatRecoveryAsync(selector.InvokeOrDefault(new CatRecoveryDescriptor()), cancellationToken);
+		) => CatRecoveryAsync(selector.InvokeOrDefault(new CatRecoveryDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatRecoveryRecord>> CatRecoveryAsync(ICatRecoveryRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatRecoveryRequest, CatRecoveryRequestParameters, CatRecoveryRecord>(request, cancellationToken, this.LowLevelDispatch.CatRecoveryDispatchAsync<CatResponse<CatRecoveryRecord>>);
+		/// <inheritdoc />
+		public Task<ICatResponse<CatRecoveryRecord>> CatRecoveryAsync(ICatRecoveryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatRecoveryRequest, CatRecoveryRequestParameters, CatRecoveryRecord>(request, cancellationToken,
+				LowLevelDispatch.CatRecoveryDispatchAsync<CatResponse<CatRecoveryRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatRepositories/ElasticClient-CatRepositories.cs b/src/Nest/Cat/CatRepositories/ElasticClient-CatRepositories.cs
index e2995346e15..51fe56a8605 100644
--- a/src/Nest/Cat/CatRepositories/ElasticClient-CatRepositories.cs
+++ b/src/Nest/Cat/CatRepositories/ElasticClient-CatRepositories.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatRepositoriesRecord> CatRepositories(Func<CatRepositoriesDescriptor, ICatRepositoriesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatRepositoriesRecord> CatRepositories(ICatRepositoriesRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatRepositoriesRecord>> CatRepositoriesAsync(
 			Func<CatRepositoriesDescriptor, ICatRepositoriesRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatRepositoriesRecord>> CatRepositoriesAsync(ICatRepositoriesRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatRepositoriesRecord>> CatRepositoriesAsync(ICatRepositoriesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatRepositoriesRecord> CatRepositories(Func<CatRepositoriesDescriptor, ICatRepositoriesRequest> selector = null) =>
-			this.CatRepositories(selector.InvokeOrDefault(new CatRepositoriesDescriptor()));
+			CatRepositories(selector.InvokeOrDefault(new CatRepositoriesDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatRepositoriesRecord> CatRepositories(ICatRepositoriesRequest request) =>
-			this.DoCat<ICatRepositoriesRequest, CatRepositoriesRequestParameters, CatRepositoriesRecord>(request, this.LowLevelDispatch.CatRepositoriesDispatch<CatResponse<CatRepositoriesRecord>>);
+			DoCat<ICatRepositoriesRequest, CatRepositoriesRequestParameters, CatRepositoriesRecord>(request,
+				LowLevelDispatch.CatRepositoriesDispatch<CatResponse<CatRepositoriesRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatRepositoriesRecord>> CatRepositoriesAsync(
 			Func<CatRepositoriesDescriptor, ICatRepositoriesRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatRepositoriesAsync(selector.InvokeOrDefault(new CatRepositoriesDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatRepositoriesRecord>> CatRepositoriesAsync(ICatRepositoriesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatRepositoriesRequest, CatRepositoriesRequestParameters, CatRepositoriesRecord>(request, cancellationToken, this.LowLevelDispatch.CatRepositoriesDispatchAsync<CatResponse<CatRepositoriesRecord>>);
+		) => CatRepositoriesAsync(selector.InvokeOrDefault(new CatRepositoriesDescriptor()), cancellationToken);
 
+		/// <inheritdoc />
+		public Task<ICatResponse<CatRepositoriesRecord>> CatRepositoriesAsync(ICatRepositoriesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatRepositoriesRequest, CatRepositoriesRequestParameters, CatRepositoriesRecord>(request, cancellationToken,
+				LowLevelDispatch.CatRepositoriesDispatchAsync<CatResponse<CatRepositoriesRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatResponse.cs b/src/Nest/Cat/CatResponse.cs
index dbbda524a89..195bf8c1293 100644
--- a/src/Nest/Cat/CatResponse.cs
+++ b/src/Nest/Cat/CatResponse.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Cat/CatSegments/CatSegmentsRecord.cs b/src/Nest/Cat/CatSegments/CatSegmentsRecord.cs
index 1fd09d04e2a..c1c0bbb0451 100644
--- a/src/Nest/Cat/CatSegments/CatSegmentsRecord.cs
+++ b/src/Nest/Cat/CatSegments/CatSegmentsRecord.cs
@@ -5,32 +5,41 @@ namespace Nest
 	[JsonObject]
 	public class CatSegmentsRecord : ICatRecord
 	{
+		[JsonProperty("committed")]
+		public string Committed { get; set; }
+
+		[JsonProperty("compound")]
+		public string Compound { get; set; }
+
+		[JsonProperty("docs.count")]
+		public string DocsCount { get; set; }
+
+		[JsonProperty("docs.deleted")]
+		public string DocsDeleted { get; set; }
+
+		[JsonProperty("generation")]
+		public string Generation { get; set; }
+
+		[JsonProperty("id")]
+		public string Id { get; set; }
+
 		[JsonProperty("index")]
 		public string Index { get; set; }
 
-		[JsonProperty("shard")]
-		public string Shard { get; set; }
-		
-		[JsonProperty("prirep")]
-		public string PrimaryReplica { get; set; }
-
 		[JsonProperty("ip")]
 		public string Ip { get; set; }
 
-		[JsonProperty("id")]
-		public string Id { get; set; }
+		[JsonProperty("prirep")]
+		public string PrimaryReplica { get; set; }
+
+		[JsonProperty("searchable")]
+		public string Searchable { get; set; }
 
 		[JsonProperty("segment")]
 		public string Segment { get; set; }
 
-		[JsonProperty("generation")]
-		public string Generation { get; set; }
-
-		[JsonProperty("docs.count")]
-		public string DocsCount { get; set; }
-
-		[JsonProperty("docs.deleted")]
-		public string DocsDeleted { get; set; }
+		[JsonProperty("shard")]
+		public string Shard { get; set; }
 
 		[JsonProperty("size")]
 		public string Size { get; set; }
@@ -38,16 +47,7 @@ public class CatSegmentsRecord : ICatRecord
 		[JsonProperty("size.memory")]
 		public string SizeMemory { get; set; }
 
-		[JsonProperty("committed")]
-		public string Committed { get; set; }
-
-		[JsonProperty("searchable")]
-		public string Searchable { get; set; }
-
 		[JsonProperty("version")]
 		public string Version { get; set; }
-
-		[JsonProperty("compound")]
-		public string Compound { get; set; }
 	}
 }
diff --git a/src/Nest/Cat/CatSegments/ElasticClient-CatSegments.cs b/src/Nest/Cat/CatSegments/ElasticClient-CatSegments.cs
index 4f4d9088c20..01b392b51a5 100644
--- a/src/Nest/Cat/CatSegments/ElasticClient-CatSegments.cs
+++ b/src/Nest/Cat/CatSegments/ElasticClient-CatSegments.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatSegmentsRecord> CatSegments(Func<CatSegmentsDescriptor, ICatSegmentsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatSegmentsRecord> CatSegments(ICatSegmentsRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatSegmentsRecord>> CatSegmentsAsync(
 			Func<CatSegmentsDescriptor, ICatSegmentsRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatSegmentsRecord>> CatSegmentsAsync(ICatSegmentsRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatSegmentsRecord>> CatSegmentsAsync(ICatSegmentsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatSegmentsRecord> CatSegments(Func<CatSegmentsDescriptor, ICatSegmentsRequest> selector = null) =>
-			this.CatSegments(selector.InvokeOrDefault(new CatSegmentsDescriptor()));
+			CatSegments(selector.InvokeOrDefault(new CatSegmentsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatSegmentsRecord> CatSegments(ICatSegmentsRequest request) =>
-			this.DoCat<ICatSegmentsRequest, CatSegmentsRequestParameters, CatSegmentsRecord>(request, this.LowLevelDispatch.CatSegmentsDispatch<CatResponse<CatSegmentsRecord>>);
+			DoCat<ICatSegmentsRequest, CatSegmentsRequestParameters, CatSegmentsRecord>(request,
+				LowLevelDispatch.CatSegmentsDispatch<CatResponse<CatSegmentsRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatSegmentsRecord>> CatSegmentsAsync(
 			Func<CatSegmentsDescriptor, ICatSegmentsRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatSegmentsAsync(selector.InvokeOrDefault(new CatSegmentsDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatSegmentsRecord>> CatSegmentsAsync(ICatSegmentsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatSegmentsRequest, CatSegmentsRequestParameters, CatSegmentsRecord>(request, cancellationToken, this.LowLevelDispatch.CatSegmentsDispatchAsync<CatResponse<CatSegmentsRecord>>);
+		) => CatSegmentsAsync(selector.InvokeOrDefault(new CatSegmentsDescriptor()), cancellationToken);
 
+		/// <inheritdoc />
+		public Task<ICatResponse<CatSegmentsRecord>> CatSegmentsAsync(ICatSegmentsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatSegmentsRequest, CatSegmentsRequestParameters, CatSegmentsRecord>(request, cancellationToken,
+				LowLevelDispatch.CatSegmentsDispatchAsync<CatResponse<CatSegmentsRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatShards/CatShardsRecord.cs b/src/Nest/Cat/CatShards/CatShardsRecord.cs
index ae6b2862264..404a157d113 100644
--- a/src/Nest/Cat/CatShards/CatShardsRecord.cs
+++ b/src/Nest/Cat/CatShards/CatShardsRecord.cs
@@ -5,45 +5,21 @@ namespace Nest
 	[JsonObject]
 	public class CatShardsRecord : ICatRecord
 	{
-		[JsonProperty("index")]
-		public string Index { get; set; }
-
-		[JsonProperty("shard")]
-		public string Shard { get; set; }
-
-		[JsonProperty("prirep")]
-		public string PrimaryOrReplica { get; set; }
-
-		[JsonProperty("state")]
-		public string State { get; set; }
+		[JsonProperty("completion.size")]
+		public string CompletionSize { get; set; }
 
 		[JsonProperty("docs")]
 		public string Docs { get; set; }
 
-		[JsonProperty("store")]
-		public string Store { get; set; }
-
-		[JsonProperty("ip")]
-		public string Ip { get; set; }
-
-		[JsonProperty("id")]
-		public string Id { get; set; }
-
-		[JsonProperty("node")]
-		public string Node { get; set; }
-
-		[JsonProperty("completion.size")]
-		public string CompletionSize { get; set; }
+		[JsonProperty("fielddata.evictions")]
+		public string FielddataEvictions { get; set; }
 
 		[JsonProperty("fielddata.memory_size")]
 		public string FielddataMemorySize { get; set; }
 
-		[JsonProperty("fielddata.evictions")]
-		public string FielddataEvictions { get; set; }
-
 		[JsonProperty("filter_cache.memory_size")]
 		public string FilterCacheMemorySize { get; set; }
-		
+
 		[JsonProperty("flush.total")]
 		public string FlushTotal { get; set; }
 
@@ -53,12 +29,6 @@ public class CatShardsRecord : ICatRecord
 		[JsonProperty("get.current")]
 		public string GetCurrent { get; set; }
 
-		[JsonProperty("get.time")]
-		public string GetTime { get; set; }
-
-		[JsonProperty("get.total")]
-		public string GetTotal { get; set; }
-
 		[JsonProperty("get.exists_time")]
 		public string GetExistsTime { get; set; }
 
@@ -71,9 +41,21 @@ public class CatShardsRecord : ICatRecord
 		[JsonProperty("get.missing_total")]
 		public string GetMissingTotal { get; set; }
 
+		[JsonProperty("get.time")]
+		public string GetTime { get; set; }
+
+		[JsonProperty("get.total")]
+		public string GetTotal { get; set; }
+
+		[JsonProperty("id")]
+		public string Id { get; set; }
+
 		[JsonProperty("id_cache.memory_size")]
 		public string IdCacheMemorySize { get; set; }
 
+		[JsonProperty("index")]
+		public string Index { get; set; }
+
 		[JsonProperty("indexing.delete_current")]
 		public string IndexingDeleteCurrent { get; set; }
 
@@ -92,6 +74,9 @@ public class CatShardsRecord : ICatRecord
 		[JsonProperty("indexing.index_total")]
 		public string IndexingIndexTotal { get; set; }
 
+		[JsonProperty("ip")]
+		public string Ip { get; set; }
+
 		[JsonProperty("merges.current")]
 		public string MergesCurrent { get; set; }
 
@@ -100,83 +85,98 @@ public class CatShardsRecord : ICatRecord
 
 		[JsonProperty("merges.current_size")]
 		public string MergesCurrentSize { get; set; }
-		
+
 		[JsonProperty("merges.total_docs")]
 		public string MergesTotalDocs { get; set; }
-		
+
 		[JsonProperty("merges.total_size")]
 		public string MergesTotalSize { get; set; }
-	
+
 		[JsonProperty("merges.total_time")]
 		public string MergesTotalTime { get; set; }
-	
+
+		[JsonProperty("node")]
+		public string Node { get; set; }
+
 		[JsonProperty("percolate.current")]
 		public string PercolateCurrent { get; set; }
-		
+
 		[JsonProperty("percolate.memory_size")]
 		public string PercolateMemorySize { get; set; }
-		
+
 		[JsonProperty("percolate.queries")]
 		public string PercolateQueries { get; set; }
-	
+
 		[JsonProperty("percolate.time")]
 		public string PercolateTime { get; set; }
-		
+
 		[JsonProperty("percolate.total")]
 		public string PercolateTotal { get; set; }
-		
-		[JsonProperty("refresh.total")]
-		public string RefreshTotal { get; set; }
-		
+
+		[JsonProperty("prirep")]
+		public string PrimaryOrReplica { get; set; }
+
 		[JsonProperty("refresh.time")]
 		public string RefreshTime { get; set; }
-		
+
+		[JsonProperty("refresh.total")]
+		public string RefreshTotal { get; set; }
+
 		[JsonProperty("search.fetch_current")]
 		public string SearchFetchCurrent { get; set; }
-		
+
 		[JsonProperty("search.fetch_time")]
 		public string SearchFetchTime { get; set; }
-		
+
 		[JsonProperty("search.fetch_total")]
 		public string SearchFetchTotal { get; set; }
-		
+
 		[JsonProperty("search.open_contexts")]
 		public string SearchOpenContexts { get; set; }
-		
+
 		[JsonProperty("search.query_current")]
 		public string SearchQueryCurrent { get; set; }
-		
+
 		[JsonProperty("search.query_time")]
 		public string SearchQueryTime { get; set; }
-		
+
 		[JsonProperty("search.query_total")]
 		public string SearchQueryTotal { get; set; }
-		
+
 		[JsonProperty("segments.count")]
 		public string SegmentsCount { get; set; }
-		
-		[JsonProperty("segments.memory")]
-		public string SegmentsMemory { get; set; }
-		
-		[JsonProperty("segments.index_writer_memory")]
-		public string SegmentsIndexWriterMemory { get; set; }
-		
+
+		[JsonProperty("segments.fixed_bitset_memory")]
+		public string SegmentsFixedBitsetMemory { get; set; }
+
 		[JsonProperty("segments.index_writer_max_memory")]
 		public string SegmentsIndexWriterMaxMemory { get; set; }
-		
+
+		[JsonProperty("segments.index_writer_memory")]
+		public string SegmentsIndexWriterMemory { get; set; }
+
+		[JsonProperty("segments.memory")]
+		public string SegmentsMemory { get; set; }
+
 		[JsonProperty("segments.version_map_memory")]
 		public string SegmentsVersionMapMemory { get; set; }
-		
-		[JsonProperty("segments.fixed_bitset_memory")]
-		public string SegmentsFixedBitsetMemory { get; set; }
-		
+
+		[JsonProperty("shard")]
+		public string Shard { get; set; }
+
+		[JsonProperty("state")]
+		public string State { get; set; }
+
+		[JsonProperty("store")]
+		public string Store { get; set; }
+
 		[JsonProperty("warmer.current")]
 		public string WarmerCurrent { get; set; }
-		
+
 		[JsonProperty("warmer.total")]
 		public string WarmerTotal { get; set; }
-		
+
 		[JsonProperty("warmer.total_time")]
 		public string WarmerTotalTime { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cat/CatShards/CatShardsRequest.cs b/src/Nest/Cat/CatShards/CatShardsRequest.cs
index 9e1ac58ac4d..6de13678b04 100644
--- a/src/Nest/Cat/CatShards/CatShardsRequest.cs
+++ b/src/Nest/Cat/CatShards/CatShardsRequest.cs
@@ -1,7 +1,7 @@
 namespace Nest
 {
 	public partial interface ICatShardsRequest { }
-	 
+
 	public partial class CatShardsRequest { }
 
 	public partial class CatShardsDescriptor { }
diff --git a/src/Nest/Cat/CatShards/ElasticClient-CatShards.cs b/src/Nest/Cat/CatShards/ElasticClient-CatShards.cs
index c60224da132..485ecd6e6e9 100644
--- a/src/Nest/Cat/CatShards/ElasticClient-CatShards.cs
+++ b/src/Nest/Cat/CatShards/ElasticClient-CatShards.cs
@@ -1,41 +1,49 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatShardsRecord> CatShards(Func<CatShardsDescriptor, ICatShardsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatShardsRecord> CatShards(ICatShardsRequest request);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatShardsRecord>> CatShardsAsync(Func<CatShardsDescriptor, ICatShardsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatShardsRecord>> CatShardsAsync(Func<CatShardsDescriptor, ICatShardsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatShardsRecord>> CatShardsAsync(ICatShardsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatShardsRecord>> CatShardsAsync(ICatShardsRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatShardsRecord> CatShards(Func<CatShardsDescriptor, ICatShardsRequest> selector = null) =>
-			this.CatShards(selector.InvokeOrDefault(new CatShardsDescriptor()));
+			CatShards(selector.InvokeOrDefault(new CatShardsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatShardsRecord> CatShards(ICatShardsRequest request) =>
-			this.DoCat<ICatShardsRequest, CatShardsRequestParameters, CatShardsRecord>(request, this.LowLevelDispatch.CatShardsDispatch<CatResponse<CatShardsRecord>>);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatShardsRecord>> CatShardsAsync(Func<CatShardsDescriptor, ICatShardsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CatShardsAsync(selector.InvokeOrDefault(new CatShardsDescriptor()), cancellationToken);
-
-		public Task<ICatResponse<CatShardsRecord>> CatShardsAsync(ICatShardsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatShardsRequest, CatShardsRequestParameters, CatShardsRecord>(request, cancellationToken, this.LowLevelDispatch.CatShardsDispatchAsync<CatResponse<CatShardsRecord>>);
-
+			DoCat<ICatShardsRequest, CatShardsRequestParameters, CatShardsRecord>(request,
+				LowLevelDispatch.CatShardsDispatch<CatResponse<CatShardsRecord>>);
+
+		/// <inheritdoc />
+		public Task<ICatResponse<CatShardsRecord>> CatShardsAsync(Func<CatShardsDescriptor, ICatShardsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CatShardsAsync(selector.InvokeOrDefault(new CatShardsDescriptor()), cancellationToken);
+
+		public Task<ICatResponse<CatShardsRecord>> CatShardsAsync(ICatShardsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatShardsRequest, CatShardsRequestParameters, CatShardsRecord>(request, cancellationToken,
+				LowLevelDispatch.CatShardsDispatchAsync<CatResponse<CatShardsRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatSnapshots/CatSnapshotsRecord.cs b/src/Nest/Cat/CatSnapshots/CatSnapshotsRecord.cs
index 38ab9ea16b9..b2ef9fb82fe 100644
--- a/src/Nest/Cat/CatSnapshots/CatSnapshotsRecord.cs
+++ b/src/Nest/Cat/CatSnapshots/CatSnapshotsRecord.cs
@@ -5,12 +5,24 @@ namespace Nest
 	[JsonObject]
 	public class CatSnapshotsRecord : ICatRecord
 	{
+		[JsonProperty("duration")]
+		public Time Duration { get; set; }
+
+		[JsonProperty("end_epoch")]
+		public long EndEpoch { get; set; }
+
+		[JsonProperty("end_time")]
+		public string EndTime { get; set; }
+
+		[JsonProperty("failed_shards")]
+		public long FailedShards { get; set; }
+
 		// duration indices successful_shards failed_shards total_shards
 		[JsonProperty("id")]
 		public string Id { get; set; }
 
-		[JsonProperty("status")]
-		public string Status { get; set; }
+		[JsonProperty("indices")]
+		public long Indices { get; set; }
 
 		[JsonProperty("start_epoch")]
 		public long StartEpoch { get; set; }
@@ -18,26 +30,13 @@ public class CatSnapshotsRecord : ICatRecord
 		[JsonProperty("start_time")]
 		public string StartTime { get; set; }
 
-		[JsonProperty("end_epoch")]
-		public long EndEpoch { get; set; }
-
-		[JsonProperty("end_time")]
-		public string EndTime { get; set; }
-
-		[JsonProperty("duration")]
-		public Time Duration { get; set; }
-
-		[JsonProperty("indices")]
-		public long Indices { get; set; }
+		[JsonProperty("status")]
+		public string Status { get; set; }
 
 		[JsonProperty("succesful_shards")]
 		public long SuccesfulShards { get; set; }
 
-		[JsonProperty("failed_shards")]
-		public long FailedShards { get; set; }
-
 		[JsonProperty("total_shards")]
 		public long TotalShards { get; set; }
-
 	}
 }
diff --git a/src/Nest/Cat/CatSnapshots/ElasticClient-CatSnapshots.cs b/src/Nest/Cat/CatSnapshots/ElasticClient-CatSnapshots.cs
index d774744bc81..d3833fe7f6b 100644
--- a/src/Nest/Cat/CatSnapshots/ElasticClient-CatSnapshots.cs
+++ b/src/Nest/Cat/CatSnapshots/ElasticClient-CatSnapshots.cs
@@ -1,50 +1,55 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatSnapshotsRecord> CatSnapshots(Names repositories, Func<CatSnapshotsDescriptor, ICatSnapshotsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatSnapshotsRecord> CatSnapshots(ICatSnapshotsRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatSnapshotsRecord>> CatSnapshotsAsync(
 			Names repositories,
 			Func<CatSnapshotsDescriptor, ICatSnapshotsRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatSnapshotsRecord>> CatSnapshotsAsync(ICatSnapshotsRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatSnapshotsRecord>> CatSnapshotsAsync(ICatSnapshotsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public ICatResponse<CatSnapshotsRecord> CatSnapshots(Names repositories, Func<CatSnapshotsDescriptor, ICatSnapshotsRequest> selector = null) =>
-			this.CatSnapshots(selector.InvokeOrDefault(new CatSnapshotsDescriptor().RepositoryName(repositories)));
+		/// <inheritdoc />
+		public ICatResponse<CatSnapshotsRecord>
+			CatSnapshots(Names repositories, Func<CatSnapshotsDescriptor, ICatSnapshotsRequest> selector = null) =>
+			CatSnapshots(selector.InvokeOrDefault(new CatSnapshotsDescriptor().RepositoryName(repositories)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatSnapshotsRecord> CatSnapshots(ICatSnapshotsRequest request) =>
-			this.DoCat<ICatSnapshotsRequest, CatSnapshotsRequestParameters, CatSnapshotsRecord>(request, this.LowLevelDispatch.CatSnapshotsDispatch<CatResponse<CatSnapshotsRecord>>);
+			DoCat<ICatSnapshotsRequest, CatSnapshotsRequestParameters, CatSnapshotsRecord>(request,
+				LowLevelDispatch.CatSnapshotsDispatch<CatResponse<CatSnapshotsRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatSnapshotsRecord>> CatSnapshotsAsync(
 			Names repositories,
 			Func<CatSnapshotsDescriptor, ICatSnapshotsRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatSnapshotsAsync(selector.InvokeOrDefault(new CatSnapshotsDescriptor().RepositoryName(repositories)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatSnapshotsRecord>> CatSnapshotsAsync(ICatSnapshotsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatSnapshotsRequest, CatSnapshotsRequestParameters, CatSnapshotsRecord>(request, cancellationToken, this.LowLevelDispatch.CatSnapshotsDispatchAsync<CatResponse<CatSnapshotsRecord>>);
+		) => CatSnapshotsAsync(selector.InvokeOrDefault(new CatSnapshotsDescriptor().RepositoryName(repositories)), cancellationToken);
 
+		/// <inheritdoc />
+		public Task<ICatResponse<CatSnapshotsRecord>> CatSnapshotsAsync(ICatSnapshotsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatSnapshotsRequest, CatSnapshotsRequestParameters, CatSnapshotsRecord>(request, cancellationToken,
+				LowLevelDispatch.CatSnapshotsDispatchAsync<CatResponse<CatSnapshotsRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatTasks/CatTasksRequest.cs b/src/Nest/Cat/CatTasks/CatTasksRequest.cs
index 5d349e0669a..2189178c1c0 100644
--- a/src/Nest/Cat/CatTasks/CatTasksRequest.cs
+++ b/src/Nest/Cat/CatTasks/CatTasksRequest.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface ICatTasksRequest { }
 
diff --git a/src/Nest/Cat/CatTasks/ElasticClient-CatTasks.cs b/src/Nest/Cat/CatTasks/ElasticClient-CatTasks.cs
index d7f9c82eac4..112dcd55643 100644
--- a/src/Nest/Cat/CatTasks/ElasticClient-CatTasks.cs
+++ b/src/Nest/Cat/CatTasks/ElasticClient-CatTasks.cs
@@ -1,53 +1,54 @@
 using System;
-using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatTasksRecord> CatTasks(Func<CatTasksDescriptor, ICatTasksRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatTasksRecord> CatTasks(ICatTasksRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatTasksRecord>> CatTasksAsync(
 			Func<CatTasksDescriptor, ICatTasksRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatTasksRecord>> CatTasksAsync(ICatTasksRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatTasksRecord> CatTasks(Func<CatTasksDescriptor, ICatTasksRequest> selector = null) =>
-			this.CatTasks(selector.InvokeOrDefault(new CatTasksDescriptor()));
+			CatTasks(selector.InvokeOrDefault(new CatTasksDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatTasksRecord> CatTasks(ICatTasksRequest request) =>
-			this.DoCat<ICatTasksRequest, CatTasksRequestParameters, CatTasksRecord>(
+			DoCat<ICatTasksRequest, CatTasksRequestParameters, CatTasksRecord>(
 				request,
-				this.LowLevelDispatch.CatTasksDispatch<CatResponse<CatTasksRecord>>);
+				LowLevelDispatch.CatTasksDispatch<CatResponse<CatTasksRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatTasksRecord>> CatTasksAsync(
 			Func<CatTasksDescriptor, ICatTasksRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatTasksAsync(selector.InvokeOrDefault(new CatTasksDescriptor()));
+		) => CatTasksAsync(selector.InvokeOrDefault(new CatTasksDescriptor()));
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatTasksRecord>> CatTasksAsync(ICatTasksRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatTasksRequest, CatTasksRequestParameters, CatTasksRecord>(
+		/// <inheritdoc />
+		public Task<ICatResponse<CatTasksRecord>> CatTasksAsync(ICatTasksRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatTasksRequest, CatTasksRequestParameters, CatTasksRecord>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.CatTasksDispatchAsync<CatResponse<CatTasksRecord>>
+				LowLevelDispatch.CatTasksDispatchAsync<CatResponse<CatTasksRecord>>
 			);
 	}
 }
diff --git a/src/Nest/Cat/CatTemplates/CatTemplatesRecord.cs b/src/Nest/Cat/CatTemplates/CatTemplatesRecord.cs
index c8bfcbcc38d..09618ee4925 100644
--- a/src/Nest/Cat/CatTemplates/CatTemplatesRecord.cs
+++ b/src/Nest/Cat/CatTemplates/CatTemplatesRecord.cs
@@ -1,18 +1,16 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject]
 	public class CatTemplatesRecord : ICatRecord
 	{
-		[JsonProperty("name")]
-		public string Name { get; set; }
-
 		[JsonProperty("index_patterns")]
 		public string IndexPatterns { get; set; }
 
+		[JsonProperty("name")]
+		public string Name { get; set; }
+
 		[JsonProperty("order")]
 		public long Order { get; set; }
 
diff --git a/src/Nest/Cat/CatTemplates/CatTemplatesRequest.cs b/src/Nest/Cat/CatTemplates/CatTemplatesRequest.cs
index e9fcf6b00fc..3a86910d268 100644
--- a/src/Nest/Cat/CatTemplates/CatTemplatesRequest.cs
+++ b/src/Nest/Cat/CatTemplates/CatTemplatesRequest.cs
@@ -1,5 +1,4 @@
-using System;
-#pragma warning disable 612, 618
+#pragma warning disable 612, 618
 
 namespace Nest
 {
diff --git a/src/Nest/Cat/CatTemplates/ElasticClient-CatTemplates.cs b/src/Nest/Cat/CatTemplates/ElasticClient-CatTemplates.cs
index f391e8d1164..74ecfe2e3b3 100644
--- a/src/Nest/Cat/CatTemplates/ElasticClient-CatTemplates.cs
+++ b/src/Nest/Cat/CatTemplates/ElasticClient-CatTemplates.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatTemplatesRecord> CatTemplates(Func<CatTemplatesDescriptor, ICatTemplatesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatTemplatesRecord> CatTemplates(ICatTemplatesRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatTemplatesRecord>> CatTemplatesAsync(
 			Func<CatTemplatesDescriptor, ICatTemplatesRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatTemplatesRecord>> CatTemplatesAsync(ICatTemplatesRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<ICatResponse<CatTemplatesRecord>> CatTemplatesAsync(ICatTemplatesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatTemplatesRecord> CatTemplates(Func<CatTemplatesDescriptor, ICatTemplatesRequest> selector = null) =>
-			this.CatTemplates(selector.InvokeOrDefault(new CatTemplatesDescriptor()));
+			CatTemplates(selector.InvokeOrDefault(new CatTemplatesDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatTemplatesRecord> CatTemplates(ICatTemplatesRequest request) =>
-			this.DoCat<ICatTemplatesRequest, CatTemplatesRequestParameters, CatTemplatesRecord>(request, this.LowLevelDispatch.CatTemplatesDispatch<CatResponse<CatTemplatesRecord>>);
+			DoCat<ICatTemplatesRequest, CatTemplatesRequestParameters, CatTemplatesRecord>(request,
+				LowLevelDispatch.CatTemplatesDispatch<CatResponse<CatTemplatesRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatTemplatesRecord>> CatTemplatesAsync(
 			Func<CatTemplatesDescriptor, ICatTemplatesRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatTemplatesAsync(selector.InvokeOrDefault(new CatTemplatesDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatTemplatesRecord>> CatTemplatesAsync(ICatTemplatesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatTemplatesRequest, CatTemplatesRequestParameters, CatTemplatesRecord>(request, cancellationToken, this.LowLevelDispatch.CatTemplatesDispatchAsync<CatResponse<CatTemplatesRecord>>);
+		) => CatTemplatesAsync(selector.InvokeOrDefault(new CatTemplatesDescriptor()), cancellationToken);
 
+		/// <inheritdoc />
+		public Task<ICatResponse<CatTemplatesRecord>> CatTemplatesAsync(ICatTemplatesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatTemplatesRequest, CatTemplatesRequestParameters, CatTemplatesRecord>(request, cancellationToken,
+				LowLevelDispatch.CatTemplatesDispatchAsync<CatResponse<CatTemplatesRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/CatThreadPool/CatThreadPoolRecord.cs b/src/Nest/Cat/CatThreadPool/CatThreadPoolRecord.cs
index 881ebc68187..99bf750ad34 100644
--- a/src/Nest/Cat/CatThreadPool/CatThreadPoolRecord.cs
+++ b/src/Nest/Cat/CatThreadPool/CatThreadPoolRecord.cs
@@ -5,44 +5,61 @@ namespace Nest
 	[JsonObject]
 	public class CatThreadPoolRecord : ICatRecord
 	{
-		[JsonProperty("node_name")]
-		public string NodeName { get; set; }
-		[JsonProperty("node_id")]
-		public string NodeId { get; set; }
+		[JsonProperty("active")]
+		public int Active { get; set; }
+
+		[JsonProperty("completed")]
+		public long Completed { get; set; }
+
 		[JsonProperty("ephemeral_node_id")]
 		public string EphemeralNodeId { get; set; }
-		[JsonProperty("pid")]
-		public int ProcessId { get; set; }
+
 		[JsonProperty("host")]
 		public string Host { get; set; }
+
 		[JsonProperty("ip")]
 		public string Ip { get; set; }
-		[JsonProperty("port")]
-		public int Port { get; set; }
+
+		[JsonProperty("keep_alive")]
+		public Time KeepAlive { get; set; }
+
+		[JsonProperty("largest")]
+		public int Largest { get; set; }
+
+		[JsonProperty("max")]
+		public int Maximum { get; set; }
+
+		[JsonProperty("min")]
+		public int Minimum { get; set; }
+
 		[JsonProperty("name")]
 		public string Name { get; set; }
-		[JsonProperty("type")]
-		public string Type { get; set; }
-		[JsonProperty("active")]
-		public int Active { get; set; }
-		[JsonProperty("size")]
-		public int Size { get; set; }
+
+		[JsonProperty("node_id")]
+		public string NodeId { get; set; }
+
+		[JsonProperty("node_name")]
+		public string NodeName { get; set; }
+
+		[JsonProperty("port")]
+		public int Port { get; set; }
+
+		[JsonProperty("pid")]
+		public int ProcessId { get; set; }
+
 		[JsonProperty("queue")]
 		public int Queue { get; set; }
+
 		[JsonProperty("queue_size")]
 		public int? QueueSize { get; set; }
+
 		[JsonProperty("rejected")]
 		public long Rejected { get; set; }
-		[JsonProperty("largest")]
-		public int Largest { get; set; }
-		[JsonProperty("completed")]
-		public long Completed { get; set; }
-		[JsonProperty("min")]
-		public int Minimum { get; set; }
-		[JsonProperty("max")]
-		public int Maximum { get; set; }
-		[JsonProperty("keep_alive")]
-		public Time KeepAlive { get; set; }
 
+		[JsonProperty("size")]
+		public int Size { get; set; }
+
+		[JsonProperty("type")]
+		public string Type { get; set; }
 	}
 }
diff --git a/src/Nest/Cat/CatThreadPool/ElasticClient-CatThreadpool.cs b/src/Nest/Cat/CatThreadPool/ElasticClient-CatThreadpool.cs
index f97647e654c..ccd79cfb44b 100644
--- a/src/Nest/Cat/CatThreadPool/ElasticClient-CatThreadpool.cs
+++ b/src/Nest/Cat/CatThreadPool/ElasticClient-CatThreadpool.cs
@@ -1,46 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatThreadPoolRecord> CatThreadPool(Func<CatThreadPoolDescriptor, ICatThreadPoolRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICatResponse<CatThreadPoolRecord> CatThreadPool(ICatThreadPoolRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICatResponse<CatThreadPoolRecord>> CatThreadPoolAsync(
 			Func<CatThreadPoolDescriptor, ICatThreadPoolRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<ICatResponse<CatThreadPoolRecord>> CatThreadPoolAsync(ICatThreadPoolRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICatResponse<CatThreadPoolRecord>> CatThreadPoolAsync(ICatThreadPoolRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatThreadPoolRecord> CatThreadPool(Func<CatThreadPoolDescriptor, ICatThreadPoolRequest> selector = null) =>
-			this.CatThreadPool(selector.InvokeOrDefault(new CatThreadPoolDescriptor()));
+			CatThreadPool(selector.InvokeOrDefault(new CatThreadPoolDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICatResponse<CatThreadPoolRecord> CatThreadPool(ICatThreadPoolRequest request) =>
-			this.DoCat<ICatThreadPoolRequest, CatThreadPoolRequestParameters, CatThreadPoolRecord>(request, this.LowLevelDispatch.CatThreadPoolDispatch<CatResponse<CatThreadPoolRecord>>);
+			DoCat<ICatThreadPoolRequest, CatThreadPoolRequestParameters, CatThreadPoolRecord>(request,
+				LowLevelDispatch.CatThreadPoolDispatch<CatResponse<CatThreadPoolRecord>>);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICatResponse<CatThreadPoolRecord>> CatThreadPoolAsync(
 			Func<CatThreadPoolDescriptor, ICatThreadPoolRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CatThreadPoolAsync(selector.InvokeOrDefault(new CatThreadPoolDescriptor()), cancellationToken);
+		) => CatThreadPoolAsync(selector.InvokeOrDefault(new CatThreadPoolDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICatResponse<CatThreadPoolRecord>> CatThreadPoolAsync(ICatThreadPoolRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DoCatAsync<ICatThreadPoolRequest, CatThreadPoolRequestParameters, CatThreadPoolRecord>(request, cancellationToken, this.LowLevelDispatch.CatThreadPoolDispatchAsync<CatResponse<CatThreadPoolRecord>>);
+		/// <inheritdoc />
+		public Task<ICatResponse<CatThreadPoolRecord>> CatThreadPoolAsync(ICatThreadPoolRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DoCatAsync<ICatThreadPoolRequest, CatThreadPoolRequestParameters, CatThreadPoolRecord>(request, cancellationToken,
+				LowLevelDispatch.CatThreadPoolDispatchAsync<CatResponse<CatThreadPoolRecord>>);
 	}
 }
diff --git a/src/Nest/Cat/ElasticClient-Cat.cs b/src/Nest/Cat/ElasticClient-Cat.cs
index fb22341d278..ed85a19c756 100644
--- a/src/Nest/Cat/ElasticClient-Cat.cs
+++ b/src/Nest/Cat/ElasticClient-Cat.cs
@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial class ElasticClient
 	{
-
 		private CatResponse<TCatRecord> DeserializeCatResponse<TCatRecord>(IApiCallDetails response, Stream stream)
 			where TCatRecord : ICatRecord
 		{
@@ -17,7 +16,7 @@ private CatResponse<TCatRecord> DeserializeCatResponse<TCatRecord>(IApiCallDetai
 
 			if (!response.Success) return catResponse;
 
-			var records = this.RequestResponseSerializer.Deserialize<IReadOnlyCollection<TCatRecord>>(stream);
+			var records = RequestResponseSerializer.Deserialize<IReadOnlyCollection<TCatRecord>>(stream);
 			catResponse.Records = records;
 
 			return catResponse;
@@ -26,16 +25,17 @@ private CatResponse<TCatRecord> DeserializeCatResponse<TCatRecord>(IApiCallDetai
 		private ICatResponse<TCatRecord> DoCat<TRequest, TParams, TCatRecord>(
 			TRequest request,
 			Func<IRequest<TParams>, CatResponse<TCatRecord>> dispatch
-			)
+		)
 			where TCatRecord : ICatRecord
 			where TParams : RequestParameters<TParams>, new()
 			where TRequest : IRequest<TParams> =>
-			this.Dispatcher.Dispatch<TRequest, TParams, CatResponse<TCatRecord>>(
-				ForceConfiguration<TRequest, TParams>(request, c => {
+			Dispatcher.Dispatch<TRequest, TParams, CatResponse<TCatRecord>>(
+				ForceConfiguration<TRequest, TParams>(request, c =>
+				{
 					c.Accept = RequestData.MimeType;
 					c.ContentType = RequestData.MimeType;
 				}),
-				new Func<IApiCallDetails, Stream, CatResponse<TCatRecord>>(this.DeserializeCatResponse<TCatRecord>),
+				new Func<IApiCallDetails, Stream, CatResponse<TCatRecord>>(DeserializeCatResponse<TCatRecord>),
 				(p, d) => dispatch(p)
 			);
 
@@ -43,20 +43,19 @@ private Task<ICatResponse<TCatRecord>> DoCatAsync<TRequest, TParams, TCatRecord>
 			TRequest request,
 			CancellationToken cancellationToken,
 			Func<IRequest<TParams>, CancellationToken, Task<CatResponse<TCatRecord>>> dispatch
-			)
+		)
 			where TCatRecord : ICatRecord
 			where TParams : RequestParameters<TParams>, new()
 			where TRequest : IRequest<TParams> =>
-			this.Dispatcher.DispatchAsync<TRequest, TParams, CatResponse<TCatRecord>, ICatResponse<TCatRecord>>(
+			Dispatcher.DispatchAsync<TRequest, TParams, CatResponse<TCatRecord>, ICatResponse<TCatRecord>>(
 				ForceConfiguration<TRequest, TParams>(request, c =>
 				{
 					c.Accept = RequestData.MimeType;
 					c.ContentType = RequestData.MimeType;
 				}),
 				cancellationToken,
-				new Func<IApiCallDetails, Stream, CatResponse<TCatRecord>>(this.DeserializeCatResponse<TCatRecord>),
+				new Func<IApiCallDetails, Stream, CatResponse<TCatRecord>>(DeserializeCatResponse<TCatRecord>),
 				(p, d, c) => dispatch(p, c)
 			);
-
 	}
 }
diff --git a/src/Nest/Cat/ICatRecord.cs b/src/Nest/Cat/ICatRecord.cs
index 3dee65cc781..ea4cdea7606 100644
--- a/src/Nest/Cat/ICatRecord.cs
+++ b/src/Nest/Cat/ICatRecord.cs
@@ -1,4 +1,4 @@
 namespace Nest
 {
-	public interface ICatRecord {}
-}
\ No newline at end of file
+	public interface ICatRecord { }
+}
diff --git a/src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainRequest.cs b/src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainRequest.cs
index 3a343bca12e..453a497550c 100644
--- a/src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainRequest.cs
+++ b/src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainRequest.cs
@@ -11,17 +11,17 @@ public partial interface IClusterAllocationExplainRequest
 		[JsonProperty("index")]
 		IndexName Index { get; set; }
 
-		/// <summary>
-		/// The shard id to provide an explanation for
-		/// </summary>
-		[JsonProperty("shard")]
-		int? Shard { get; set; }
-
 		/// <summary>
 		/// Whether to explain a primary or replica shard
 		/// </summary>
 		[JsonProperty("primary")]
 		bool? Primary { get; set; }
+
+		/// <summary>
+		/// The shard id to provide an explanation for
+		/// </summary>
+		[JsonProperty("shard")]
+		int? Shard { get; set; }
 	}
 
 	public partial class ClusterAllocationExplainRequest
@@ -32,21 +32,21 @@ public partial class ClusterAllocationExplainRequest
 		public IndexName Index { get; set; }
 
 		/// <summary>
-		/// The shard id to provide an explanation for
+		/// Whether to explain a primary or replica shard
 		/// </summary>
-		public int? Shard { get; set; }
+		public bool? Primary { get; set; }
 
 		/// <summary>
-		/// Whether to explain a primary or replica shard
+		/// The shard id to provide an explanation for
 		/// </summary>
-		public bool? Primary { get; set; }
+		public int? Shard { get; set; }
 	}
 
 	public partial class ClusterAllocationExplainDescriptor
 	{
 		IndexName IClusterAllocationExplainRequest.Index { get; set; }
-		int? IClusterAllocationExplainRequest.Shard { get; set; }
 		bool? IClusterAllocationExplainRequest.Primary { get; set; }
+		int? IClusterAllocationExplainRequest.Shard { get; set; }
 
 		/// <summary>
 		/// The name of the index to provide an explanation for
diff --git a/src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs b/src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs
index a6bdd539283..e162e874b3b 100644
--- a/src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs
+++ b/src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs
@@ -9,123 +9,123 @@ namespace Nest
 	[JsonObject]
 	public interface IClusterAllocationExplainResponse : IResponse
 	{
-		[JsonProperty("index")]
-		string Index { get; }
-
-		[JsonProperty("shard")]
-		int Shard { get; }
-
-		[JsonProperty("primary")]
-		bool Primary { get; }
+		[JsonProperty("allocate_explanation")]
+		string AllocateExplanation { get; }
 
-		[JsonProperty("current_state")]
-		string CurrentState { get; }
+		[JsonProperty("allocation_delay")]
+		string AllocationDelay { get; }
 
-		[JsonProperty("unassigned_info")]
-		UnassignedInformation UnassignedInformation { get; }
+		[JsonProperty("allocation_delay_in_millis")]
+		long AllocationDelayInMilliseconds { get; }
 
 		[JsonProperty("can_allocate")]
 		Decision? CanAllocate { get; }
 
-		[JsonProperty("allocate_explanation")]
-		string AllocateExplanation { get; }
-
-		[JsonProperty("configured_delay")]
-		string ConfiguredDelay { get; }
+		[JsonProperty("can_move_to_other_node")]
+		Decision? CanMoveToOtherNode { get; }
 
-		[JsonProperty("configured_delay_in_mills")]
-		long ConfiguredDelayInMilliseconds { get; }
+		[JsonProperty("can_rebalance_cluster")]
+		Decision? CanRebalanceCluster { get; }
 
-		[JsonProperty("current_node")]
-		CurrentNode CurrentNode { get; }
+		[JsonProperty("can_rebalance_cluster_decisions")]
+		IReadOnlyCollection<AllocationDecision> CanRebalanceClusterDecisions { get; }
 
-		[JsonProperty("can_remain_on_current_node")]
-		Decision? CanRemainOnCurrentNode { get; }
+		[JsonProperty("can_rebalance_to_other_node")]
+		Decision? CanRebalanceToOtherNode { get; }
 
 		[JsonProperty("can_remain_decisions")]
 		IReadOnlyCollection<AllocationDecision> CanRemainDecisions { get; }
 
-		[JsonProperty("can_rebalance_cluster")]
-		Decision? CanRebalanceCluster { get; }
+		[JsonProperty("can_remain_on_current_node")]
+		Decision? CanRemainOnCurrentNode { get; }
 
-		[JsonProperty("can_rebalance_to_other_node")]
-		Decision? CanRebalanceToOtherNode { get; }
+		[JsonProperty("configured_delay")]
+		string ConfiguredDelay { get; }
 
-		[JsonProperty("can_rebalance_cluster_decisions")]
-		IReadOnlyCollection<AllocationDecision> CanRebalanceClusterDecisions { get; }
+		[JsonProperty("configured_delay_in_mills")]
+		long ConfiguredDelayInMilliseconds { get; }
 
-		[JsonProperty("rebalance_explanation")]
-		string RebalanceExplanation { get; }
+		[JsonProperty("current_node")]
+		CurrentNode CurrentNode { get; }
 
-		[JsonProperty("node_allocation_decisions")]
-		IReadOnlyCollection<NodeAllocationExplanation> NodeAllocationDecisions { get; }
+		[JsonProperty("current_state")]
+		string CurrentState { get; }
 
-		[JsonProperty("can_move_to_other_node")]
-		Decision? CanMoveToOtherNode { get; }
+		[JsonProperty("index")]
+		string Index { get; }
 
 		[JsonProperty("move_explanation")]
 		string MoveExplanation { get; }
 
-		[JsonProperty("allocation_delay")]
-		string AllocationDelay { get; }
+		[JsonProperty("node_allocation_decisions")]
+		IReadOnlyCollection<NodeAllocationExplanation> NodeAllocationDecisions { get; }
 
-		[JsonProperty("allocation_delay_in_millis")]
-		long AllocationDelayInMilliseconds { get; }
+		[JsonProperty("primary")]
+		bool Primary { get; }
+
+		[JsonProperty("rebalance_explanation")]
+		string RebalanceExplanation { get; }
 
 		[JsonProperty("remaining_delay")]
 		string RemainingDelay { get; }
 
 		[JsonProperty("remaining_delay_in_millis")]
 		long RemainingDelayInMilliseconds { get; }
+
+		[JsonProperty("shard")]
+		int Shard { get; }
+
+		[JsonProperty("unassigned_info")]
+		UnassignedInformation UnassignedInformation { get; }
 	}
 
 	public class ClusterAllocationExplainResponse : ResponseBase, IClusterAllocationExplainResponse
 	{
-		public string Index { get; internal set; }
-
-		public int Shard { get; internal set; }
-
-		public bool Primary { get; internal set; }
+		public string AllocateExplanation { get; internal set; }
 
-		public string CurrentState { get; internal set; }
+		public string AllocationDelay { get; internal set; }
 
-		public UnassignedInformation UnassignedInformation { get; internal set; }
+		public long AllocationDelayInMilliseconds { get; internal set; }
 
 		public Decision? CanAllocate { get; internal set; }
 
-		public string AllocateExplanation { get; internal set; }
-
-		public string ConfiguredDelay { get; internal set; }
+		public Decision? CanMoveToOtherNode { get; internal set; }
 
-		public long ConfiguredDelayInMilliseconds { get; internal set; }
+		public Decision? CanRebalanceCluster { get; internal set; }
 
-		public CurrentNode CurrentNode { get; internal set; }
+		public IReadOnlyCollection<AllocationDecision> CanRebalanceClusterDecisions { get; internal set; } =
+			EmptyReadOnly<AllocationDecision>.Collection;
 
-		public Decision? CanRemainOnCurrentNode { get; internal set; }
+		public Decision? CanRebalanceToOtherNode { get; internal set; }
 
 		public IReadOnlyCollection<AllocationDecision> CanRemainDecisions { get; internal set; }
 
-		public Decision? CanRebalanceCluster { get; internal set; }
-
-		public Decision? CanRebalanceToOtherNode { get; internal set; }
+		public Decision? CanRemainOnCurrentNode { get; internal set; }
 
-		public IReadOnlyCollection<AllocationDecision> CanRebalanceClusterDecisions { get; internal set; } = EmptyReadOnly<AllocationDecision>.Collection;
+		public string ConfiguredDelay { get; internal set; }
 
-		public string RebalanceExplanation { get; internal set; }
+		public long ConfiguredDelayInMilliseconds { get; internal set; }
 
-		public IReadOnlyCollection<NodeAllocationExplanation> NodeAllocationDecisions { get; internal set; }
+		public CurrentNode CurrentNode { get; internal set; }
 
-		public Decision? CanMoveToOtherNode { get; internal set; }
+		public string CurrentState { get; internal set; }
+		public string Index { get; internal set; }
 
 		public string MoveExplanation { get; internal set; }
 
-		public string AllocationDelay { get; internal set; }
+		public IReadOnlyCollection<NodeAllocationExplanation> NodeAllocationDecisions { get; internal set; }
 
-		public long AllocationDelayInMilliseconds { get; internal set; }
+		public bool Primary { get; internal set; }
+
+		public string RebalanceExplanation { get; internal set; }
 
 		public string RemainingDelay { get; internal set; }
 
 		public long RemainingDelayInMilliseconds { get; internal set; }
+
+		public int Shard { get; internal set; }
+
+		public UnassignedInformation UnassignedInformation { get; internal set; }
 	}
 
 	[JsonObject]
@@ -137,14 +137,14 @@ public class CurrentNode
 		[JsonProperty("name")]
 		public string Name { get; internal set; }
 
+		[JsonProperty("attributes")]
+		public IReadOnlyDictionary<string, string> NodeAttributes { get; set; } = EmptyReadOnly<string, string>.Dictionary;
+
 		[JsonProperty("transport_address")]
 		public string TransportAddress { get; internal set; }
 
 		[JsonProperty("weight_ranking")]
 		public string WeightRanking { get; internal set; }
-
-		[JsonProperty("attributes")]
-		public IReadOnlyDictionary<string, string> NodeAttributes { get; set; } = EmptyReadOnly<string, string>.Dictionary;
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
@@ -166,29 +166,29 @@ public enum AllocationExplainDecision
 	[JsonObject]
 	public class NodeAllocationExplanation
 	{
-		[JsonProperty("node_id")]
-		public string NodeId { get; set; }
-
-		[JsonProperty("node_name")]
-		public string NodeName { get; set; }
+		[JsonProperty("deciders")]
+		public IReadOnlyCollection<AllocationDecision> Deciders { get; set; } = EmptyReadOnly<AllocationDecision>.Collection;
 
-		[JsonProperty("transport_address")]
-		public string TransportAddress { get; set; }
+		[JsonProperty("node_attributes")]
+		public IReadOnlyDictionary<string, string> NodeAttributes { get; set; } = EmptyReadOnly<string, string>.Dictionary;
 
 		[JsonProperty("node_decision")]
 		public Decision? NodeDecision { get; set; }
 
-		[JsonProperty("node_attributes")]
-		public IReadOnlyDictionary<string, string> NodeAttributes { get; set; } = EmptyReadOnly<string, string>.Dictionary;
+		[JsonProperty("node_id")]
+		public string NodeId { get; set; }
+
+		[JsonProperty("node_name")]
+		public string NodeName { get; set; }
 
 		[JsonProperty("store")]
 		public AllocationStore Store { get; set; }
 
+		[JsonProperty("transport_address")]
+		public string TransportAddress { get; set; }
+
 		[JsonProperty("weight_ranking")]
 		public int? WeightRanking { get; set; }
-
-		[JsonProperty("deciders")]
-		public IReadOnlyCollection<AllocationDecision> Deciders { get; set; } = EmptyReadOnly<AllocationDecision>.Collection;
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
@@ -244,21 +244,21 @@ public enum StoreCopy
 	[JsonObject]
 	public class AllocationStore
 	{
+		[JsonProperty("allocation_id")]
+		public string AllocationId { get; set; }
+
 		[JsonProperty("found")]
 		public bool? Found { get; set; }
 
 		[JsonProperty("in_sync")]
 		public bool? InSync { get; set; }
 
-		[JsonProperty("allocation_id")]
-		public string AllocationId { get; set; }
+		[JsonProperty("matching_size_in_bytes")]
+		public long? MatchingSizeInBytes { get; set; }
 
 		[JsonProperty("matching_sync_id")]
 		public bool? MatchingSyncId { get; set; }
 
-		[JsonProperty("matching_size_in_bytes")]
-		public long? MatchingSizeInBytes { get; set; }
-
 		[JsonProperty("store_exception")]
 		public string StoreException { get; set; }
 	}
@@ -278,27 +278,27 @@ public class AllocationDecision
 
 	public class UnassignedInformation
 	{
-		[JsonProperty("reason")]
-		public UnassignedInformationReason Reason { get; set; }
-
 		[JsonProperty("at")]
 		public DateTime At { get; set; }
 
 		[JsonProperty("last_allocation_status")]
 		public string LastAllocationStatus { get; set; }
+
+		[JsonProperty("reason")]
+		public UnassignedInformationReason Reason { get; set; }
 	}
 
 	public class ShardAllocationExplanation
 	{
+		[JsonProperty("id")]
+		public int Id { get; set; }
+
 		[JsonProperty("index")]
 		public IndexName Index { get; set; }
 
 		[JsonProperty("index_uuid")]
 		public string IndexUniqueId { get; set; }
 
-		[JsonProperty("id")]
-		public int Id { get; set; }
-
 		[JsonProperty("primary")]
 		public bool Primary { get; set; }
 	}
@@ -306,93 +306,93 @@ public class ShardAllocationExplanation
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum UnassignedInformationReason
 	{
-		///<summary>
-		/// Unassigned as a result of an API creation of an index.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of an API creation of an index.
+		/// </summary>
 		[EnumMember(Value = "INDEX_CREATED")]
 		IndexCreated,
 
-		///<summary>
-		/// Unassigned as a result of a full cluster recovery.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of a full cluster recovery.
+		/// </summary>
 		[EnumMember(Value = "CLUSTER_RECOVERED")]
 		ClusterRecovered,
 
-		///<summary>
-		/// Unassigned as a result of opening a closed index.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of opening a closed index.
+		/// </summary>
 		[EnumMember(Value = "INDEX_REOPENED")]
 		IndexReopened,
 
-		///<summary>
-		/// Unassigned as a result of importing a dangling index.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of importing a dangling index.
+		/// </summary>
 		[EnumMember(Value = "DANGLING_INDEX_IMPORTED")]
 		DanglingIndexImported,
 
-		///<summary>
-		/// Unassigned as a result of restoring into a new index.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of restoring into a new index.
+		/// </summary>
 		[EnumMember(Value = "NEW_INDEX_RESTORED")]
 		NewIndexRestored,
 
-		///<summary>
-		/// Unassigned as a result of restoring into a closed index.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of restoring into a closed index.
+		/// </summary>
 		[EnumMember(Value = "EXISTING_INDEX_RESTORED")]
 		ExistingIndexRestored,
 
-		///<summary>
-		/// Unassigned as a result of explicit addition of a replica.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of explicit addition of a replica.
+		/// </summary>
 		[EnumMember(Value = "REPLICA_ADDED")]
 		ReplicaAdded,
 
-		///<summary>
-		/// Unassigned as a result of a failed allocation of the shard.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of a failed allocation of the shard.
+		/// </summary>
 		[EnumMember(Value = "ALLOCATION_FAILED")]
 		AllocationFailed,
 
-		///<summary>
-		/// Unassigned as a result of the node hosting it leaving the cluster.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of the node hosting it leaving the cluster.
+		/// </summary>
 		[EnumMember(Value = "NODE_LEFT")]
 		NodeLeft,
 
-		///<summary>
-		/// Unassigned as a result of explicit cancel reroute command.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of explicit cancel reroute command.
+		/// </summary>
 		[EnumMember(Value = "REROUTE_CANCELLED")]
 		RerouteCancelled,
 
-		///<summary>
-		/// When a shard moves from started back to initializing, for example, during shadow replica
-		///</summary>
+		/// <summary>
+		///  When a shard moves from started back to initializing, for example, during shadow replica
+		/// </summary>
 		[EnumMember(Value = "REINITIALIZED")]
 		Reinitialized,
 
-		///<summary>
-		/// A better replica location is identified and causes the existing replica allocation to be cancelled.
-		///</summary>
+		/// <summary>
+		///  A better replica location is identified and causes the existing replica allocation to be cancelled.
+		/// </summary>
 		[EnumMember(Value = "REALLOCATED_REPLICA")]
 		ReallocatedReplica,
 
-		///<summary>
-		/// Unassigned as a result of a failed primary while the replica was initializing.
-		///</summary>
+		/// <summary>
+		///  Unassigned as a result of a failed primary while the replica was initializing.
+		/// </summary>
 		[EnumMember(Value = "PRIMARY_FAILED")]
 		PrimaryFailed,
 
-		///<summary>
-		/// Unassigned after forcing an empty primary
-		///</summary>
+		/// <summary>
+		///  Unassigned after forcing an empty primary
+		/// </summary>
 		[EnumMember(Value = "FORCED_EMPTY_PRIMARY")]
 		ForcedEmptyPrimary,
 
-		///<summary>
-		/// Forced manually to allocate
-		///</summary>
+		/// <summary>
+		///  Forced manually to allocate
+		/// </summary>
 		[EnumMember(Value = "MANUAL_ALLOCATION")]
 		ManualAllocation
 	}
diff --git a/src/Nest/Cluster/ClusterAllocationExplain/ElasticClient-ClusterAllocationExplain.cs b/src/Nest/Cluster/ClusterAllocationExplain/ElasticClient-ClusterAllocationExplain.cs
index 9ee676ab92b..f39824a2b38 100644
--- a/src/Nest/Cluster/ClusterAllocationExplain/ElasticClient-ClusterAllocationExplain.cs
+++ b/src/Nest/Cluster/ClusterAllocationExplain/ElasticClient-ClusterAllocationExplain.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -12,44 +9,61 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The cluster allocation explanation API is designed to assist in answering the question "why is this shard unassigned?"
-		/// <para> </para><a href="https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html</a>
+		/// <para> </para>
+		/// <a href="https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html</a>
 		/// </summary>
 		/// <param name="selector">An optional descriptor to further describe the cluster allocation explain operation</param>
-		IClusterAllocationExplainResponse ClusterAllocationExplain(Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> selector = null);
+		IClusterAllocationExplainResponse ClusterAllocationExplain(
+			Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClusterAllocationExplainResponse ClusterAllocationExplain(IClusterAllocationExplainRequest request);
 
-		/// <inheritdoc/>
-		Task<IClusterAllocationExplainResponse> ClusterAllocationExplainAsync(Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterAllocationExplainResponse> ClusterAllocationExplainAsync(
+			Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IClusterAllocationExplainResponse> ClusterAllocationExplainAsync(IClusterAllocationExplainRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterAllocationExplainResponse> ClusterAllocationExplainAsync(IClusterAllocationExplainRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IClusterAllocationExplainResponse ClusterAllocationExplain(Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> selector = null) =>
-			this.ClusterAllocationExplain(selector.InvokeOrDefault(new ClusterAllocationExplainDescriptor()));
+		/// <inheritdoc />
+		public IClusterAllocationExplainResponse ClusterAllocationExplain(
+			Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> selector = null
+		) =>
+			ClusterAllocationExplain(selector.InvokeOrDefault(new ClusterAllocationExplainDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterAllocationExplainResponse ClusterAllocationExplain(IClusterAllocationExplainRequest request) =>
-			this.Dispatcher.Dispatch<IClusterAllocationExplainRequest, ClusterAllocationExplainRequestParameters, ClusterAllocationExplainResponse>(
+			Dispatcher.Dispatch<IClusterAllocationExplainRequest, ClusterAllocationExplainRequestParameters, ClusterAllocationExplainResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ClusterAllocationExplainDispatch<ClusterAllocationExplainResponse>(p, d)
+				(p, d) => LowLevelDispatch.ClusterAllocationExplainDispatch<ClusterAllocationExplainResponse>(p, d)
 			);
 
-		/// <inheritdoc/>
-		public Task<IClusterAllocationExplainResponse> ClusterAllocationExplainAsync(Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClusterAllocationExplainAsync(selector.InvokeOrDefault(new ClusterAllocationExplainDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IClusterAllocationExplainResponse> ClusterAllocationExplainAsync(
+			Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClusterAllocationExplainAsync(selector.InvokeOrDefault(new ClusterAllocationExplainDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IClusterAllocationExplainResponse> ClusterAllocationExplainAsync(IClusterAllocationExplainRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClusterAllocationExplainRequest, ClusterAllocationExplainRequestParameters, ClusterAllocationExplainResponse, IClusterAllocationExplainResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ClusterAllocationExplainDispatchAsync<ClusterAllocationExplainResponse>(p, d, c)
-			);
+		/// <inheritdoc />
+		public Task<IClusterAllocationExplainResponse> ClusterAllocationExplainAsync(IClusterAllocationExplainRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IClusterAllocationExplainRequest, ClusterAllocationExplainRequestParameters, ClusterAllocationExplainResponse,
+					IClusterAllocationExplainResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.ClusterAllocationExplainDispatchAsync<ClusterAllocationExplainResponse>(p, d, c)
+				);
 	}
 }
diff --git a/src/Nest/Cluster/ClusterHealth.cs b/src/Nest/Cluster/ClusterHealth.cs
index ea98a05e657..29dc6a28999 100644
--- a/src/Nest/Cluster/ClusterHealth.cs
+++ b/src/Nest/Cluster/ClusterHealth.cs
@@ -5,12 +5,14 @@
 namespace Nest
 {
 	[JsonConverter(typeof(StringEnumConverter))]
-	public enum ClusterStatus 
+	public enum ClusterStatus
 	{
 		[EnumMember(Value = "green")]
 		Green,
+
 		[EnumMember(Value = "yellow")]
 		Yellow,
+
 		[EnumMember(Value = "red")]
 		Red
 	}
diff --git a/src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs b/src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs
index 28d9625b42f..3b936bbcc44 100644
--- a/src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs
+++ b/src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs
@@ -6,49 +6,59 @@ namespace Nest
 {
 	public interface IClusterHealthResponse : IResponse
 	{
-		string ClusterName { get; }
-		Health Status { get; }
-		bool TimedOut { get; }
-		int NumberOfNodes { get; }
-		int NumberOfDataNodes { get; }
 		int ActivePrimaryShards { get; }
 		int ActiveShards { get; }
-		int RelocatingShards { get; }
+		string ClusterName { get; }
+		IReadOnlyDictionary<IndexName, IndexHealthStats> Indices { get; }
 		int InitializingShards { get; }
-		int UnassignedShards { get; }
+		int NumberOfDataNodes { get; }
+		int NumberOfNodes { get; }
 		int NumberOfPendingTasks { get; }
-		IReadOnlyDictionary<IndexName, IndexHealthStats> Indices { get; }
+		int RelocatingShards { get; }
+		Health Status { get; }
+		bool TimedOut { get; }
+		int UnassignedShards { get; }
 	}
 
 	[JsonObject]
 	public class ClusterHealthResponse : ResponseBase, IClusterHealthResponse
 	{
+		[JsonProperty("active_primary_shards")]
+		public int ActivePrimaryShards { get; internal set; }
+
+		[JsonProperty("active_shards")]
+		public int ActiveShards { get; internal set; }
+
 		[JsonProperty("cluster_name")]
 		public string ClusterName { get; internal set; }
-		[JsonProperty("status")]
-		public Health Status { get; internal set; }
-		[JsonProperty("timed_out")]
-		public bool TimedOut { get; internal set; }
 
-		[JsonProperty("number_of_nodes")]
-		public int NumberOfNodes { get; internal set; }
+		[JsonProperty("indices")]
+		[JsonConverter(typeof(ResolvableDictionaryJsonConverter<IndexName, IndexHealthStats>))]
+		public IReadOnlyDictionary<IndexName, IndexHealthStats> Indices { get; internal set; } =
+			EmptyReadOnly<IndexName, IndexHealthStats>.Dictionary;
+
+		[JsonProperty("initializing_shards")]
+		public int InitializingShards { get; internal set; }
+
 		[JsonProperty("number_of_data_nodes")]
 		public int NumberOfDataNodes { get; internal set; }
 
-		[JsonProperty("active_primary_shards")]
-		public int ActivePrimaryShards { get; internal set; }
-		[JsonProperty("active_shards")]
-		public int ActiveShards { get; internal set; }
+		[JsonProperty("number_of_nodes")]
+		public int NumberOfNodes { get; internal set; }
+
+		[JsonProperty(PropertyName = "number_of_pending_tasks")]
+		public int NumberOfPendingTasks { get; internal set; }
+
 		[JsonProperty("relocating_shards")]
 		public int RelocatingShards { get; internal set; }
-		[JsonProperty("initializing_shards")]
-		public int InitializingShards { get; internal set; }
+
+		[JsonProperty("status")]
+		public Health Status { get; internal set; }
+
+		[JsonProperty("timed_out")]
+		public bool TimedOut { get; internal set; }
+
 		[JsonProperty("unassigned_shards")]
 		public int UnassignedShards { get; internal set; }
-		[JsonProperty(PropertyName="number_of_pending_tasks")]
-		public int NumberOfPendingTasks { get; internal set; }
-		[JsonProperty("indices")]
-		[JsonConverter(typeof(ResolvableDictionaryJsonConverter<IndexName, IndexHealthStats>))]
-		public IReadOnlyDictionary<IndexName, IndexHealthStats> Indices { get; internal set; } = EmptyReadOnly<IndexName, IndexHealthStats>.Dictionary;
 	}
 }
diff --git a/src/Nest/Cluster/ClusterHealth/ElasticClient-ClusterHealth.cs b/src/Nest/Cluster/ClusterHealth/ElasticClient-ClusterHealth.cs
index 8d1c92aa1e7..7e4eddca5af 100644
--- a/src/Nest/Cluster/ClusterHealth/ElasticClient-ClusterHealth.cs
+++ b/src/Nest/Cluster/ClusterHealth/ElasticClient-ClusterHealth.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,44 +9,53 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The cluster health API allows to get a very simple status on the health of the cluster.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-health.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-health.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-health.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-health.html</a>
 		/// </summary>
 		/// <param name="selector">An optional descriptor to further describe the cluster health operation</param>
 		IClusterHealthResponse ClusterHealth(Func<ClusterHealthDescriptor, IClusterHealthRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClusterHealthResponse ClusterHealth(IClusterHealthRequest request);
 
-		/// <inheritdoc/>
-		Task<IClusterHealthResponse> ClusterHealthAsync(Func<ClusterHealthDescriptor, IClusterHealthRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterHealthResponse> ClusterHealthAsync(Func<ClusterHealthDescriptor, IClusterHealthRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IClusterHealthResponse> ClusterHealthAsync(IClusterHealthRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterHealthResponse> ClusterHealthAsync(IClusterHealthRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterHealthResponse ClusterHealth(Func<ClusterHealthDescriptor, IClusterHealthRequest> selector = null) =>
-			this.ClusterHealth(selector.InvokeOrDefault(new ClusterHealthDescriptor()));
+			ClusterHealth(selector.InvokeOrDefault(new ClusterHealthDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterHealthResponse ClusterHealth(IClusterHealthRequest request) =>
-			this.Dispatcher.Dispatch<IClusterHealthRequest, ClusterHealthRequestParameters, ClusterHealthResponse>(
+			Dispatcher.Dispatch<IClusterHealthRequest, ClusterHealthRequestParameters, ClusterHealthResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ClusterHealthDispatch<ClusterHealthResponse>(p)
+				(p, d) => LowLevelDispatch.ClusterHealthDispatch<ClusterHealthResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IClusterHealthResponse> ClusterHealthAsync(Func<ClusterHealthDescriptor, IClusterHealthRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClusterHealthAsync(selector.InvokeOrDefault(new ClusterHealthDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IClusterHealthResponse> ClusterHealthAsync(IClusterHealthRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClusterHealthRequest, ClusterHealthRequestParameters, ClusterHealthResponse, IClusterHealthResponse>(
+		/// <inheritdoc />
+		public Task<IClusterHealthResponse> ClusterHealthAsync(Func<ClusterHealthDescriptor, IClusterHealthRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClusterHealthAsync(selector.InvokeOrDefault(new ClusterHealthDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClusterHealthResponse> ClusterHealthAsync(IClusterHealthRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IClusterHealthRequest, ClusterHealthRequestParameters, ClusterHealthResponse, IClusterHealthResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ClusterHealthDispatchAsync<ClusterHealthResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.ClusterHealthDispatchAsync<ClusterHealthResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs b/src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs
index 0ef74207990..e57925fe13b 100644
--- a/src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs
+++ b/src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs
@@ -7,27 +7,32 @@ namespace Nest
 	[JsonObject]
 	public class IndexHealthStats
 	{
-		[JsonProperty("status")]
-		public Health Status { get; internal set; }
-
-		[JsonProperty("number_of_shards")]
-		public int NumberOfShards { get; internal set; }
-		[JsonProperty("number_of_replicas")]
-		public int NumberOfReplicas { get; internal set; }
-
 		[JsonProperty("active_primary_shards")]
 		public int ActivePrimaryShards { get; internal set; }
+
 		[JsonProperty("active_shards")]
 		public int ActiveShards { get; internal set; }
-		[JsonProperty("relocating_shards")]
-		public int RelocatingShards { get; internal set; }
+
 		[JsonProperty("initializing_shards")]
 		public int InitializingShards { get; internal set; }
-		[JsonProperty("unassigned_shards")]
-		public int UnassignedShards { get; internal set; }
+
+		[JsonProperty("number_of_replicas")]
+		public int NumberOfReplicas { get; internal set; }
+
+		[JsonProperty("number_of_shards")]
+		public int NumberOfShards { get; internal set; }
+
+		[JsonProperty("relocating_shards")]
+		public int RelocatingShards { get; internal set; }
 
 		[JsonProperty("shards")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, ShardHealthStats>))]
 		public IReadOnlyDictionary<string, ShardHealthStats> Shards { get; internal set; } = EmptyReadOnly<string, ShardHealthStats>.Dictionary;
+
+		[JsonProperty("status")]
+		public Health Status { get; internal set; }
+
+		[JsonProperty("unassigned_shards")]
+		public int UnassignedShards { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs b/src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs
index 94c172ad8f6..4755b8671a8 100644
--- a/src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs
+++ b/src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs
@@ -6,16 +6,21 @@ namespace Nest
 	[JsonObject]
 	public class ShardHealthStats
 	{
-		[JsonProperty("status")]
-		public Health Status { get; internal set; }
-		[JsonProperty("primary_active")]
-		public bool PrimaryActive { get; internal set; }
 		[JsonProperty("active_shards")]
 		public int ActiveShards { get; internal set; }
-		[JsonProperty("relocating_shards")]
-		public int RelocatingShards { get; internal set; }
+
 		[JsonProperty("initializing_shards")]
 		public int InitializingShards { get; internal set; }
+
+		[JsonProperty("primary_active")]
+		public bool PrimaryActive { get; internal set; }
+
+		[JsonProperty("relocating_shards")]
+		public int RelocatingShards { get; internal set; }
+
+		[JsonProperty("status")]
+		public Health Status { get; internal set; }
+
 		[JsonProperty("unassigned_shards")]
 		public int UnassignedShards { get; internal set; }
 	}
diff --git a/src/Nest/Cluster/ClusterPendingTasks/ClusterPendingTasksResponse.cs b/src/Nest/Cluster/ClusterPendingTasks/ClusterPendingTasksResponse.cs
index 867f7324883..b3593ecc96b 100644
--- a/src/Nest/Cluster/ClusterPendingTasks/ClusterPendingTasksResponse.cs
+++ b/src/Nest/Cluster/ClusterPendingTasks/ClusterPendingTasksResponse.cs
@@ -27,10 +27,10 @@ public class PendingTask
 		[JsonProperty("source")]
 		public string Source { get; internal set; }
 
-		[JsonProperty("time_in_queue_millis")]
-		public int TimeInQueueMilliseconds { get; internal set; }
-
 		[JsonProperty("time_in_queue")]
 		public string TimeInQueue { get; internal set; }
+
+		[JsonProperty("time_in_queue_millis")]
+		public int TimeInQueueMilliseconds { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterPendingTasks/ElasticClient-ClusterPendingTasks.cs b/src/Nest/Cluster/ClusterPendingTasks/ElasticClient-ClusterPendingTasks.cs
index b3a2b3db54c..2f8a000143f 100644
--- a/src/Nest/Cluster/ClusterPendingTasks/ElasticClient-ClusterPendingTasks.cs
+++ b/src/Nest/Cluster/ClusterPendingTasks/ElasticClient-ClusterPendingTasks.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,43 +9,55 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Returns a list of any cluster-level changes (e.g. create index, update mapping, allocate or fail shard) which have not yet been executed.
-		/// <para> </para><a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-pending.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-pending.html</a>
+		/// <para> </para>
+		/// <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-pending.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-pending.html</a>
 		/// </summary>
 		IClusterPendingTasksResponse ClusterPendingTasks(Func<ClusterPendingTasksDescriptor, IClusterPendingTasksRequest> selector = null);
 
-		/// <inheritdoc/>
-		Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(Func<ClusterPendingTasksDescriptor, IClusterPendingTasksRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(Func<ClusterPendingTasksDescriptor, IClusterPendingTasksRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClusterPendingTasksResponse ClusterPendingTasks(IClusterPendingTasksRequest request);
 
-		/// <inheritdoc/>
-		Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(IClusterPendingTasksRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(IClusterPendingTasksRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterPendingTasksResponse ClusterPendingTasks(Func<ClusterPendingTasksDescriptor, IClusterPendingTasksRequest> selector = null) =>
-			this.ClusterPendingTasks(selector.InvokeOrDefault(new ClusterPendingTasksDescriptor()));
-
-		/// <inheritdoc/>
-		public Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(Func<ClusterPendingTasksDescriptor, IClusterPendingTasksRequest> selector = null,  CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClusterPendingTasksAsync(selector.InvokeOrDefault(new ClusterPendingTasksDescriptor()), cancellationToken);
+			ClusterPendingTasks(selector.InvokeOrDefault(new ClusterPendingTasksDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterPendingTasksResponse ClusterPendingTasks(IClusterPendingTasksRequest request) =>
-			this.Dispatcher.Dispatch<IClusterPendingTasksRequest, ClusterPendingTasksRequestParameters, ClusterPendingTasksResponse>(
+			Dispatcher.Dispatch<IClusterPendingTasksRequest, ClusterPendingTasksRequestParameters, ClusterPendingTasksResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ClusterPendingTasksDispatch<ClusterPendingTasksResponse>(p)
+				(p, d) => LowLevelDispatch.ClusterPendingTasksDispatch<ClusterPendingTasksResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(IClusterPendingTasksRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClusterPendingTasksRequest, ClusterPendingTasksRequestParameters, ClusterPendingTasksResponse, IClusterPendingTasksResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ClusterPendingTasksDispatchAsync<ClusterPendingTasksResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(
+			Func<ClusterPendingTasksDescriptor, IClusterPendingTasksRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClusterPendingTasksAsync(selector.InvokeOrDefault(new ClusterPendingTasksDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(IClusterPendingTasksRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IClusterPendingTasksRequest, ClusterPendingTasksRequestParameters, ClusterPendingTasksResponse,
+					IClusterPendingTasksResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.ClusterPendingTasksDispatchAsync<ClusterPendingTasksResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Cluster/ClusterReroute/ClusterRerouteExplanation.cs b/src/Nest/Cluster/ClusterReroute/ClusterRerouteExplanation.cs
index 04966e70963..d84291c9a8c 100644
--- a/src/Nest/Cluster/ClusterReroute/ClusterRerouteExplanation.cs
+++ b/src/Nest/Cluster/ClusterReroute/ClusterRerouteExplanation.cs
@@ -8,11 +8,11 @@ public class ClusterRerouteExplanation
 	{
 		[JsonProperty("command")]
 		public string Command { get; set; }
-		
-		[JsonProperty("parameters")]
-		public ClusterRerouteParameters Parameters { get; set; }
 
 		[JsonProperty("decisions")]
 		public IEnumerable<ClusterRerouteDecision> Decisions { get; set; }
+
+		[JsonProperty("parameters")]
+		public ClusterRerouteParameters Parameters { get; set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterReroute/ClusterRerouteParameters.cs b/src/Nest/Cluster/ClusterReroute/ClusterRerouteParameters.cs
index 625d6e84eba..fbfc9fe8c56 100644
--- a/src/Nest/Cluster/ClusterReroute/ClusterRerouteParameters.cs
+++ b/src/Nest/Cluster/ClusterReroute/ClusterRerouteParameters.cs
@@ -5,22 +5,22 @@ namespace Nest
 	[JsonObject]
 	public class ClusterRerouteParameters
 	{
-		[JsonProperty("index")]
-		public string Index { get; set; }
-
-		[JsonProperty("shard")]
-		public int Shard { get; set; }
+		[JsonProperty("allow_primary")]
+		public bool? AllowPrimary { get; set; }
 
 		[JsonProperty("from_node")]
 		public string FromNode { get; set; }
 
-		[JsonProperty("to_node")]
-		public string ToNode { get; set; }
+		[JsonProperty("index")]
+		public string Index { get; set; }
 
 		[JsonProperty("node")]
 		public string Node { get; set; }
 
-		[JsonProperty("allow_primary")]
-		public bool? AllowPrimary { get; set; }
+		[JsonProperty("shard")]
+		public int Shard { get; set; }
+
+		[JsonProperty("to_node")]
+		public string ToNode { get; set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterReroute/ClusterRerouteRequest.cs b/src/Nest/Cluster/ClusterReroute/ClusterRerouteRequest.cs
index db9a3f84db0..d7a123ad3cb 100644
--- a/src/Nest/Cluster/ClusterReroute/ClusterRerouteRequest.cs
+++ b/src/Nest/Cluster/ClusterReroute/ClusterRerouteRequest.cs
@@ -23,16 +23,21 @@ public partial class ClusterRerouteDescriptor
 		public ClusterRerouteDescriptor Move(Func<MoveClusterRerouteCommandDescriptor, IMoveClusterRerouteCommand> selector) =>
 			AddCommand(selector?.Invoke(new MoveClusterRerouteCommandDescriptor()));
 
-		public ClusterRerouteDescriptor Cancel(Func<CancelClusterRerouteCommandDescriptor, ICancelClusterRerouteCommand> selector)=>
+		public ClusterRerouteDescriptor Cancel(Func<CancelClusterRerouteCommandDescriptor, ICancelClusterRerouteCommand> selector) =>
 			AddCommand(selector?.Invoke(new CancelClusterRerouteCommandDescriptor()));
 
-		public ClusterRerouteDescriptor AllocateReplica(Func<AllocateReplicaClusterRerouteCommandDescriptor, IAllocateClusterRerouteCommand> selector) =>
+		public ClusterRerouteDescriptor AllocateReplica(Func<AllocateReplicaClusterRerouteCommandDescriptor, IAllocateClusterRerouteCommand> selector
+		) =>
 			AddCommand(selector?.Invoke(new AllocateReplicaClusterRerouteCommandDescriptor()));
 
-		public ClusterRerouteDescriptor AllocateEmptyPrimary(Func<AllocateEmptyPrimaryRerouteCommandDescriptor, IAllocateEmptyPrimaryRerouteCommand> selector) =>
+		public ClusterRerouteDescriptor AllocateEmptyPrimary(
+			Func<AllocateEmptyPrimaryRerouteCommandDescriptor, IAllocateEmptyPrimaryRerouteCommand> selector
+		) =>
 			AddCommand(selector?.Invoke(new AllocateEmptyPrimaryRerouteCommandDescriptor()));
 
-		public ClusterRerouteDescriptor AllocateStalePrimary(Func<AllocateStalePrimaryRerouteCommandDescriptor, IAllocateStalePrimaryRerouteCommand> selector) =>
+		public ClusterRerouteDescriptor AllocateStalePrimary(
+			Func<AllocateStalePrimaryRerouteCommandDescriptor, IAllocateStalePrimaryRerouteCommand> selector
+		) =>
 			AddCommand(selector?.Invoke(new AllocateStalePrimaryRerouteCommandDescriptor()));
 
 		private ClusterRerouteDescriptor AddCommand(IClusterRerouteCommand rerouteCommand) => Assign(a => a.Commands?.AddIfNotNull(rerouteCommand));
diff --git a/src/Nest/Cluster/ClusterReroute/ClusterRerouteResponse.cs b/src/Nest/Cluster/ClusterReroute/ClusterRerouteResponse.cs
index 18bc3e05b01..c950f5b1f6a 100644
--- a/src/Nest/Cluster/ClusterReroute/ClusterRerouteResponse.cs
+++ b/src/Nest/Cluster/ClusterReroute/ClusterRerouteResponse.cs
@@ -5,16 +5,18 @@ namespace Nest
 {
 	public interface IClusterRerouteResponse : IResponse
 	{
-		[JsonProperty("state")]
-		ClusterRerouteState State { get; }
-
 		[JsonProperty("explanations")]
 		IReadOnlyCollection<ClusterRerouteExplanation> Explanations { get; }
+
+		[JsonProperty("state")]
+		ClusterRerouteState State { get; }
 	}
 
 	public class ClusterRerouteResponse : ResponseBase, IClusterRerouteResponse
 	{
+		public IReadOnlyCollection<ClusterRerouteExplanation> Explanations { get; internal set; } =
+			EmptyReadOnly<ClusterRerouteExplanation>.Collection;
+
 		public ClusterRerouteState State { get; internal set; }
-		public IReadOnlyCollection<ClusterRerouteExplanation> Explanations { get; internal set; } = EmptyReadOnly<ClusterRerouteExplanation>.Collection;
 	}
 }
diff --git a/src/Nest/Cluster/ClusterReroute/ClusterRerouteState.cs b/src/Nest/Cluster/ClusterReroute/ClusterRerouteState.cs
index 39674c6333c..bbdc2b04422 100644
--- a/src/Nest/Cluster/ClusterReroute/ClusterRerouteState.cs
+++ b/src/Nest/Cluster/ClusterReroute/ClusterRerouteState.cs
@@ -6,23 +6,23 @@ namespace Nest
 	[JsonObject]
 	public class ClusterRerouteState
 	{
-		[JsonProperty("version")]
-		public int Version { get; internal set; }
+		[JsonProperty("blocks")]
+		public BlockState Blocks { get; internal set; }
 
 		[JsonProperty("master_node")]
 		public string MasterNode { get; internal set; }
 
-		[JsonProperty("blocks")]
-		public BlockState Blocks { get; internal set; }
-
 		[JsonProperty("nodes")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, NodeState>))]
 		public IReadOnlyDictionary<string, NodeState> Nodes { get; internal set; }
 
+		[JsonProperty("routing_nodes")]
+		public RoutingNodesState RoutingNodes { get; internal set; }
+
 		[JsonProperty("routing_table")]
 		public RoutingTableState RoutingTable { get; internal set; }
 
-		[JsonProperty("routing_nodes")]
-		public RoutingNodesState RoutingNodes { get; internal set; }
+		[JsonProperty("version")]
+		public int Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterReroute/Commands/AllocateClusterRerouteCommandBase.cs b/src/Nest/Cluster/ClusterReroute/Commands/AllocateClusterRerouteCommandBase.cs
index fd4bd7162b2..d2092636816 100644
--- a/src/Nest/Cluster/ClusterReroute/Commands/AllocateClusterRerouteCommandBase.cs
+++ b/src/Nest/Cluster/ClusterReroute/Commands/AllocateClusterRerouteCommandBase.cs
@@ -7,17 +7,15 @@ public interface IAllocateClusterRerouteCommand : IClusterRerouteCommand
 		[JsonProperty("index")]
 		IndexName Index { get; set; }
 
-		[JsonProperty("shard")]
-		int? Shard { get; set; }
-
 		[JsonProperty("node")]
 		string Node { get; set; }
-	}
 
-	public interface IAllocateReplicaClusterRerouteCommand : IAllocateClusterRerouteCommand
-	{
+		[JsonProperty("shard")]
+		int? Shard { get; set; }
 	}
 
+	public interface IAllocateReplicaClusterRerouteCommand : IAllocateClusterRerouteCommand { }
+
 	public interface IAllocateEmptyPrimaryRerouteCommand : IAllocateClusterRerouteCommand
 	{
 		[JsonProperty("accept_data_loss")]
@@ -32,13 +30,12 @@ public interface IAllocateStalePrimaryRerouteCommand : IAllocateClusterRerouteCo
 
 	public abstract class AllocateClusterRerouteCommandBase : IAllocateClusterRerouteCommand
 	{
+		public IndexName Index { get; set; }
 		public abstract string Name { get; }
 
-		public IndexName Index { get; set; }
+		public string Node { get; set; }
 
 		public int? Shard { get; set; }
-
-		public string Node { get; set; }
 	}
 
 	public class AllocateReplicaClusterRerouteCommand : AllocateClusterRerouteCommandBase, IAllocateReplicaClusterRerouteCommand
@@ -48,16 +45,14 @@ public class AllocateReplicaClusterRerouteCommand : AllocateClusterRerouteComman
 
 	public class AllocateEmptyPrimaryRerouteCommand : AllocateClusterRerouteCommandBase, IAllocateEmptyPrimaryRerouteCommand
 	{
-		public override string Name => "allocate_empty_primary";
-
 		public bool? AcceptDataLoss { get; set; }
+		public override string Name => "allocate_empty_primary";
 	}
 
 	public class AllocateStalePrimaryRerouteCommand : AllocateClusterRerouteCommandBase, IAllocateStalePrimaryRerouteCommand
 	{
-		public override string Name => "allocate_stale_primary";
-
 		public bool? AcceptDataLoss { get; set; }
+		public override string Name => "allocate_stale_primary";
 	}
 
 	public abstract class AllocateClusterRerouteCommandDescriptorBase<TDescriptor, TInterface>
@@ -65,16 +60,15 @@ public abstract class AllocateClusterRerouteCommandDescriptorBase<TDescriptor, T
 		where TDescriptor : AllocateClusterRerouteCommandDescriptorBase<TDescriptor, TInterface>, TInterface, IAllocateClusterRerouteCommand
 		where TInterface : class, IAllocateClusterRerouteCommand
 	{
-		string IClusterRerouteCommand.Name => Name;
-
 		public abstract string Name { get; }
 
 		IndexName IAllocateClusterRerouteCommand.Index { get; set; }
-
-		int? IAllocateClusterRerouteCommand.Shard { get; set; }
+		string IClusterRerouteCommand.Name => Name;
 
 		string IAllocateClusterRerouteCommand.Node { get; set; }
 
+		int? IAllocateClusterRerouteCommand.Shard { get; set; }
+
 		public TDescriptor Index(IndexName index) => Assign(a => a.Index = index);
 
 		public TDescriptor Index<T>() where T : class => Assign(a => a.Index = typeof(T));
@@ -85,28 +79,33 @@ public abstract class AllocateClusterRerouteCommandDescriptorBase<TDescriptor, T
 	}
 
 	public class AllocateReplicaClusterRerouteCommandDescriptor
-		: AllocateClusterRerouteCommandDescriptorBase<AllocateReplicaClusterRerouteCommandDescriptor, IAllocateReplicaClusterRerouteCommand>, IAllocateReplicaClusterRerouteCommand
+		: AllocateClusterRerouteCommandDescriptorBase<AllocateReplicaClusterRerouteCommandDescriptor, IAllocateReplicaClusterRerouteCommand>,
+			IAllocateReplicaClusterRerouteCommand
 	{
 		public override string Name => "allocate_replica";
 	}
 
 	public class AllocateEmptyPrimaryRerouteCommandDescriptor
-		: AllocateClusterRerouteCommandDescriptorBase<AllocateEmptyPrimaryRerouteCommandDescriptor, IAllocateEmptyPrimaryRerouteCommand>, IAllocateEmptyPrimaryRerouteCommand
+		: AllocateClusterRerouteCommandDescriptorBase<AllocateEmptyPrimaryRerouteCommandDescriptor, IAllocateEmptyPrimaryRerouteCommand>,
+			IAllocateEmptyPrimaryRerouteCommand
 	{
 		public override string Name => "allocate_empty_primary";
 
 		bool? IAllocateEmptyPrimaryRerouteCommand.AcceptDataLoss { get; set; }
 
-		public AllocateEmptyPrimaryRerouteCommandDescriptor AcceptDataLoss(bool? acceptDataLoss = true) => Assign(a => a.AcceptDataLoss = acceptDataLoss);
+		public AllocateEmptyPrimaryRerouteCommandDescriptor AcceptDataLoss(bool? acceptDataLoss = true) =>
+			Assign(a => a.AcceptDataLoss = acceptDataLoss);
 	}
 
 	public class AllocateStalePrimaryRerouteCommandDescriptor
-		: AllocateClusterRerouteCommandDescriptorBase<AllocateStalePrimaryRerouteCommandDescriptor, IAllocateStalePrimaryRerouteCommand>, IAllocateStalePrimaryRerouteCommand
+		: AllocateClusterRerouteCommandDescriptorBase<AllocateStalePrimaryRerouteCommandDescriptor, IAllocateStalePrimaryRerouteCommand>,
+			IAllocateStalePrimaryRerouteCommand
 	{
 		public override string Name => "allocate_stale_primary";
 
 		bool? IAllocateStalePrimaryRerouteCommand.AcceptDataLoss { get; set; }
 
-		public AllocateStalePrimaryRerouteCommandDescriptor AcceptDataLoss(bool? acceptDataLoss = true) => Assign(a => a.AcceptDataLoss = acceptDataLoss);
+		public AllocateStalePrimaryRerouteCommandDescriptor AcceptDataLoss(bool? acceptDataLoss = true) =>
+			Assign(a => a.AcceptDataLoss = acceptDataLoss);
 	}
 }
diff --git a/src/Nest/Cluster/ClusterReroute/Commands/CancelClusterRerouteCommand.cs b/src/Nest/Cluster/ClusterReroute/Commands/CancelClusterRerouteCommand.cs
index c150a5624c7..e414c02e3b8 100644
--- a/src/Nest/Cluster/ClusterReroute/Commands/CancelClusterRerouteCommand.cs
+++ b/src/Nest/Cluster/ClusterReroute/Commands/CancelClusterRerouteCommand.cs
@@ -2,46 +2,44 @@
 
 namespace Nest
 {
-
 	public interface ICancelClusterRerouteCommand : IClusterRerouteCommand
 	{
+		[JsonProperty("allow_primary")]
+		bool? AllowPrimary { get; set; }
+
 		[JsonProperty("index")]
 		IndexName Index { get; set; }
 
-		[JsonProperty("shard")]
-		int? Shard { get; set; }
-
 		[JsonProperty("node")]
 		string Node { get; set; }
 
-		[JsonProperty("allow_primary")]
-		bool? AllowPrimary { get; set; }
+		[JsonProperty("shard")]
+		int? Shard { get; set; }
 	}
+
 	public class CancelClusterRerouteCommand : ICancelClusterRerouteCommand
 	{
-		public string Name => "cancel";
+		public bool? AllowPrimary { get; set; }
 
 		public IndexName Index { get; set; }
-
-		public int? Shard { get; set; }
+		public string Name => "cancel";
 
 		public string Node { get; set; }
 
-		public bool? AllowPrimary { get; set; }
+		public int? Shard { get; set; }
 	}
 
 	public class CancelClusterRerouteCommandDescriptor
 		: DescriptorBase<CancelClusterRerouteCommandDescriptor, ICancelClusterRerouteCommand>, ICancelClusterRerouteCommand
 	{
-		string IClusterRerouteCommand.Name => "cancel";
+		bool? ICancelClusterRerouteCommand.AllowPrimary { get; set; }
 
 		IndexName ICancelClusterRerouteCommand.Index { get; set; }
-
-		int? ICancelClusterRerouteCommand.Shard { get; set; }
+		string IClusterRerouteCommand.Name => "cancel";
 
 		string ICancelClusterRerouteCommand.Node { get; set; }
 
-		bool? ICancelClusterRerouteCommand.AllowPrimary { get; set; }
+		int? ICancelClusterRerouteCommand.Shard { get; set; }
 
 		public CancelClusterRerouteCommandDescriptor Index(IndexName index) => Assign(a => a.Index = index);
 
diff --git a/src/Nest/Cluster/ClusterReroute/Commands/ClusterRerouteCommandJsonConverter.cs b/src/Nest/Cluster/ClusterReroute/Commands/ClusterRerouteCommandJsonConverter.cs
index 34208ca7446..d6d88099816 100644
--- a/src/Nest/Cluster/ClusterReroute/Commands/ClusterRerouteCommandJsonConverter.cs
+++ b/src/Nest/Cluster/ClusterReroute/Commands/ClusterRerouteCommandJsonConverter.cs
@@ -7,8 +7,9 @@ namespace Nest
 {
 	internal class ClusterRerouteCommandJsonConverter : JsonConverter
 	{
-		public override bool CanWrite => true;
 		public override bool CanRead => true;
+		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -18,6 +19,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var child = o.Children<JProperty>().FirstOrDefault();
 			var v = child?.Children<JObject>().FirstOrDefault();
 			if (v == null) return null;
+
 			switch (child.Name)
 			{
 				case "allocate_replica":
@@ -37,8 +39,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 					break;
 			}
 			return command;
-
-
 		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
@@ -48,14 +48,17 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 			var properties = value.GetType().GetCachedObjectProperties();
 			if (properties.Count == 0) return;
+
 			writer.WriteStartObject();
 			writer.WritePropertyName(c.Name);
 			writer.WriteStartObject();
 			foreach (var p in properties)
 			{
 				if (p.Ignored) continue;
+
 				var vv = p.ValueProvider.GetValue(value);
 				if (vv == null) continue;
+
 				writer.WritePropertyName(p.PropertyName);
 				serializer.Serialize(writer, vv);
 			}
diff --git a/src/Nest/Cluster/ClusterReroute/Commands/IClusterRerouteCommand.cs b/src/Nest/Cluster/ClusterReroute/Commands/IClusterRerouteCommand.cs
index 37926de5f2a..bd860c943a2 100644
--- a/src/Nest/Cluster/ClusterReroute/Commands/IClusterRerouteCommand.cs
+++ b/src/Nest/Cluster/ClusterReroute/Commands/IClusterRerouteCommand.cs
@@ -8,4 +8,4 @@ public interface IClusterRerouteCommand
 		[JsonIgnore]
 		string Name { get; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cluster/ClusterReroute/Commands/MoveClusterRerouteCommand.cs b/src/Nest/Cluster/ClusterReroute/Commands/MoveClusterRerouteCommand.cs
index f93d7ca3a0a..9d712e8d9c1 100644
--- a/src/Nest/Cluster/ClusterReroute/Commands/MoveClusterRerouteCommand.cs
+++ b/src/Nest/Cluster/ClusterReroute/Commands/MoveClusterRerouteCommand.cs
@@ -2,8 +2,7 @@
 
 namespace Nest
 {
-
-	public interface IMoveClusterRerouteCommand: IClusterRerouteCommand
+	public interface IMoveClusterRerouteCommand : IClusterRerouteCommand
 	{
 		[JsonProperty("from_node")]
 		string FromNode { get; set; }
@@ -17,30 +16,29 @@ public interface IMoveClusterRerouteCommand: IClusterRerouteCommand
 		[JsonProperty("to_node")]
 		string ToNode { get; set; }
 	}
+
 	public class MoveClusterRerouteCommand : IMoveClusterRerouteCommand
 	{
-		public string Name => "move";
+		public string FromNode { get; set; }
 
 		public IndexName Index { get; set; }
+		public string Name => "move";
 
 		public int? Shard { get; set; }
 
-		public string FromNode { get; set; }
-
 		public string ToNode { get; set; }
 	}
 
 	public class MoveClusterRerouteCommandDescriptor
 		: DescriptorBase<MoveClusterRerouteCommandDescriptor, IMoveClusterRerouteCommand>, IMoveClusterRerouteCommand
 	{
-		string IClusterRerouteCommand.Name => "move";
+		string IMoveClusterRerouteCommand.FromNode { get; set; }
 
 		IndexName IMoveClusterRerouteCommand.Index { get; set; }
+		string IClusterRerouteCommand.Name => "move";
 
 		int? IMoveClusterRerouteCommand.Shard { get; set; }
 
-		string IMoveClusterRerouteCommand.FromNode { get; set; }
-
 		string IMoveClusterRerouteCommand.ToNode { get; set; }
 
 		public MoveClusterRerouteCommandDescriptor Index(IndexName index) => Assign(a => a.Index = index);
diff --git a/src/Nest/Cluster/ClusterReroute/ElasticClient-ClusterReroute.cs b/src/Nest/Cluster/ClusterReroute/ElasticClient-ClusterReroute.cs
index 306f761547a..e3d5c107987 100644
--- a/src/Nest/Cluster/ClusterReroute/ElasticClient-ClusterReroute.cs
+++ b/src/Nest/Cluster/ClusterReroute/ElasticClient-ClusterReroute.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -14,40 +14,47 @@ public partial interface IElasticClient
 		/// </summary>
 		IClusterRerouteResponse ClusterReroute(Func<ClusterRerouteDescriptor, IClusterRerouteRequest> selector);
 
-		/// <inheritdoc/>
-		Task<IClusterRerouteResponse> ClusterRerouteAsync(Func<ClusterRerouteDescriptor, IClusterRerouteRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterRerouteResponse> ClusterRerouteAsync(Func<ClusterRerouteDescriptor, IClusterRerouteRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClusterRerouteResponse ClusterReroute(IClusterRerouteRequest request);
 
-		/// <inheritdoc/>
-		Task<IClusterRerouteResponse> ClusterRerouteAsync(IClusterRerouteRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<IClusterRerouteResponse> ClusterRerouteAsync(IClusterRerouteRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterRerouteResponse ClusterReroute(Func<ClusterRerouteDescriptor, IClusterRerouteRequest> selector) =>
-			this.ClusterReroute(selector?.Invoke(new ClusterRerouteDescriptor()));
-
-		/// <inheritdoc/>
-		public Task<IClusterRerouteResponse> ClusterRerouteAsync(Func<ClusterRerouteDescriptor, IClusterRerouteRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClusterRerouteAsync(selector?.Invoke(new ClusterRerouteDescriptor()), cancellationToken);
+			ClusterReroute(selector?.Invoke(new ClusterRerouteDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterRerouteResponse ClusterReroute(IClusterRerouteRequest request) =>
-			this.Dispatcher.Dispatch<IClusterRerouteRequest, ClusterRerouteRequestParameters, ClusterRerouteResponse>(
+			Dispatcher.Dispatch<IClusterRerouteRequest, ClusterRerouteRequestParameters, ClusterRerouteResponse>(
 				request,
-				this.LowLevelDispatch.ClusterRerouteDispatch<ClusterRerouteResponse>
+				LowLevelDispatch.ClusterRerouteDispatch<ClusterRerouteResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IClusterRerouteResponse> ClusterRerouteAsync(IClusterRerouteRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClusterRerouteRequest, ClusterRerouteRequestParameters, ClusterRerouteResponse, IClusterRerouteResponse>(
+		/// <inheritdoc />
+		public Task<IClusterRerouteResponse> ClusterRerouteAsync(Func<ClusterRerouteDescriptor, IClusterRerouteRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClusterRerouteAsync(selector?.Invoke(new ClusterRerouteDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClusterRerouteResponse> ClusterRerouteAsync(IClusterRerouteRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IClusterRerouteRequest, ClusterRerouteRequestParameters, ClusterRerouteResponse, IClusterRerouteResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.ClusterRerouteDispatchAsync<ClusterRerouteResponse>
+				LowLevelDispatch.ClusterRerouteDispatchAsync<ClusterRerouteResponse>
 			);
 	}
 }
diff --git a/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsRequest.cs b/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsRequest.cs
index d0d8913b0b9..7706c40cb5f 100644
--- a/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsRequest.cs
+++ b/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsRequest.cs
@@ -1,7 +1,7 @@
 namespace Nest
 {
 	public partial interface IClusterGetSettingsRequest { }
-	
+
 	public partial class ClusterGetSettingsRequest { }
 
 	public partial class ClusterGetSettingsDescriptor { }
diff --git a/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ElasticClient-ClusterGetSettings.cs b/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ElasticClient-ClusterGetSettings.cs
index e40a556d1da..a8a75014342 100644
--- a/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ElasticClient-ClusterGetSettings.cs
+++ b/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ElasticClient-ClusterGetSettings.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,43 +10,55 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Gets cluster wide specific settings. Settings updated can either be persistent
 		/// (applied cross restarts) or transient (will not survive a full cluster restart).
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-update-settings.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-update-settings.html
 		/// </summary>
 		IClusterGetSettingsResponse ClusterGetSettings(Func<ClusterGetSettingsDescriptor, IClusterGetSettingsRequest> selector = null);
 
-		/// <inheritdoc/>
-		Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(Func<ClusterGetSettingsDescriptor, IClusterGetSettingsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(Func<ClusterGetSettingsDescriptor, IClusterGetSettingsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClusterGetSettingsResponse ClusterGetSettings(IClusterGetSettingsRequest request);
 
-		/// <inheritdoc/>
-		Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(IClusterGetSettingsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(IClusterGetSettingsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterGetSettingsResponse ClusterGetSettings(Func<ClusterGetSettingsDescriptor, IClusterGetSettingsRequest> selector = null) =>
-			this.ClusterGetSettings(selector.InvokeOrDefault(new ClusterGetSettingsDescriptor()));
-
-		/// <inheritdoc/>
-		public Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(Func<ClusterGetSettingsDescriptor, IClusterGetSettingsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClusterGetSettingsAsync(selector.InvokeOrDefault(new ClusterGetSettingsDescriptor()), cancellationToken);
+			ClusterGetSettings(selector.InvokeOrDefault(new ClusterGetSettingsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterGetSettingsResponse ClusterGetSettings(IClusterGetSettingsRequest request) =>
-			this.Dispatcher.Dispatch<IClusterGetSettingsRequest, ClusterGetSettingsRequestParameters, ClusterGetSettingsResponse>(
+			Dispatcher.Dispatch<IClusterGetSettingsRequest, ClusterGetSettingsRequestParameters, ClusterGetSettingsResponse>(
 				request ?? new ClusterGetSettingsRequest(),
-				(p, d) => this.LowLevelDispatch.ClusterGetSettingsDispatch<ClusterGetSettingsResponse>(p)
+				(p, d) => LowLevelDispatch.ClusterGetSettingsDispatch<ClusterGetSettingsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(IClusterGetSettingsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClusterGetSettingsRequest, ClusterGetSettingsRequestParameters, ClusterGetSettingsResponse, IClusterGetSettingsResponse>(
-				request ?? new ClusterGetSettingsRequest(),
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ClusterGetSettingsDispatchAsync<ClusterGetSettingsResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(
+			Func<ClusterGetSettingsDescriptor, IClusterGetSettingsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClusterGetSettingsAsync(selector.InvokeOrDefault(new ClusterGetSettingsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(IClusterGetSettingsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IClusterGetSettingsRequest, ClusterGetSettingsRequestParameters, ClusterGetSettingsResponse,
+					IClusterGetSettingsResponse>(
+					request ?? new ClusterGetSettingsRequest(),
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.ClusterGetSettingsDispatchAsync<ClusterGetSettingsResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs b/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs
index 825c460ddb9..8a83d68669e 100644
--- a/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs
+++ b/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs
@@ -11,7 +11,6 @@ public partial interface IClusterPutSettingsRequest
 
 		[JsonProperty("transient")]
 		IDictionary<string, object> Transient { get; set; }
-
 	}
 
 	public partial class ClusterPutSettingsRequest
diff --git a/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ElasticClient-ClusterPutSettings.cs b/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ElasticClient-ClusterPutSettings.cs
index d401d91826c..81af835f29c 100644
--- a/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ElasticClient-ClusterPutSettings.cs
+++ b/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ElasticClient-ClusterPutSettings.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,42 +10,54 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Allows to update cluster wide specific settings. Settings updated can either be persistent
 		/// (applied cross restarts) or transient (will not survive a full cluster restart).
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-update-settings.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-update-settings.html
 		/// </summary>
 		IClusterPutSettingsResponse ClusterPutSettings(Func<ClusterPutSettingsDescriptor, IClusterPutSettingsRequest> selector);
 
-		/// <inheritdoc/>
-		Task<IClusterPutSettingsResponse> ClusterPutSettingsAsync(Func<ClusterPutSettingsDescriptor, IClusterPutSettingsRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterPutSettingsResponse> ClusterPutSettingsAsync(Func<ClusterPutSettingsDescriptor, IClusterPutSettingsRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClusterPutSettingsResponse ClusterPutSettings(IClusterPutSettingsRequest request);
 
-		/// <inheritdoc/>
-		Task<IClusterPutSettingsResponse> ClusterPutSettingsAsync(IClusterPutSettingsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterPutSettingsResponse> ClusterPutSettingsAsync(IClusterPutSettingsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterPutSettingsResponse ClusterPutSettings(Func<ClusterPutSettingsDescriptor, IClusterPutSettingsRequest> selector) =>
-			this.ClusterPutSettings(selector.InvokeOrDefault(new ClusterPutSettingsDescriptor()));
-
-		/// <inheritdoc/>
-		public Task<IClusterPutSettingsResponse> ClusterPutSettingsAsync(Func<ClusterPutSettingsDescriptor, IClusterPutSettingsRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClusterPutSettingsAsync(selector.InvokeOrDefault(new ClusterPutSettingsDescriptor()), cancellationToken);
+			ClusterPutSettings(selector.InvokeOrDefault(new ClusterPutSettingsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterPutSettingsResponse ClusterPutSettings(IClusterPutSettingsRequest request) =>
-			this.Dispatcher.Dispatch<IClusterPutSettingsRequest, ClusterPutSettingsRequestParameters, ClusterPutSettingsResponse>(
+			Dispatcher.Dispatch<IClusterPutSettingsRequest, ClusterPutSettingsRequestParameters, ClusterPutSettingsResponse>(
 				request,
-				this.LowLevelDispatch.ClusterPutSettingsDispatch<ClusterPutSettingsResponse>
+				LowLevelDispatch.ClusterPutSettingsDispatch<ClusterPutSettingsResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IClusterPutSettingsResponse> ClusterPutSettingsAsync(IClusterPutSettingsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClusterPutSettingsRequest, ClusterPutSettingsRequestParameters, ClusterPutSettingsResponse, IClusterPutSettingsResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.ClusterPutSettingsDispatchAsync<ClusterPutSettingsResponse>
-			);
+		/// <inheritdoc />
+		public Task<IClusterPutSettingsResponse> ClusterPutSettingsAsync(Func<ClusterPutSettingsDescriptor, IClusterPutSettingsRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClusterPutSettingsAsync(selector.InvokeOrDefault(new ClusterPutSettingsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClusterPutSettingsResponse> ClusterPutSettingsAsync(IClusterPutSettingsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IClusterPutSettingsRequest, ClusterPutSettingsRequestParameters, ClusterPutSettingsResponse,
+					IClusterPutSettingsResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.ClusterPutSettingsDispatchAsync<ClusterPutSettingsResponse>
+				);
 	}
 }
diff --git a/src/Nest/Cluster/ClusterState/AllocationId.cs b/src/Nest/Cluster/ClusterState/AllocationId.cs
index dd7b7dc9fab..12d9e8b8af5 100644
--- a/src/Nest/Cluster/ClusterState/AllocationId.cs
+++ b/src/Nest/Cluster/ClusterState/AllocationId.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -10,4 +7,4 @@ public class AllocationId
 		[JsonProperty("id")]
 		public string Id { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cluster/ClusterState/BlockState.cs b/src/Nest/Cluster/ClusterState/BlockState.cs
index 6157f665b0e..a7ce273c0ff 100644
--- a/src/Nest/Cluster/ClusterState/BlockState.cs
+++ b/src/Nest/Cluster/ClusterState/BlockState.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -10,4 +7,4 @@ public class BlockState
 		[JsonProperty("read_only")]
 		public bool ReadOnly { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cluster/ClusterState/ClusterStateResponse.cs b/src/Nest/Cluster/ClusterState/ClusterStateResponse.cs
index ea640c12623..7612334ddd5 100644
--- a/src/Nest/Cluster/ClusterState/ClusterStateResponse.cs
+++ b/src/Nest/Cluster/ClusterState/ClusterStateResponse.cs
@@ -5,61 +5,60 @@ namespace Nest
 {
 	public interface IClusterStateResponse : IResponse
 	{
+		[JsonProperty("blocks")]
+		BlockState Blocks { get; }
+
 		[JsonProperty("cluster_name")]
 		string ClusterName { get; }
 
-		[JsonProperty("master_node")]
-		string MasterNode { get; }
-
-		[JsonProperty("state_uuid")]
-		string StateUUID { get; }
-
 		/// <summary>The Universally Unique Identifier for the cluster.</summary>
 		/// <remarks>While the cluster is still forming, it is possible for the `cluster_uuid` to be `_na_`.</remarks>
 		[JsonProperty("cluster_uuid")]
 		string ClusterUUID { get; }
 
-		[JsonProperty("version")]
-		long Version { get; }
+		[JsonProperty("master_node")]
+		string MasterNode { get; }
+
+		[JsonProperty("metadata")]
+		MetadataState Metadata { get; }
 
 		[JsonProperty("nodes")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, NodeState>))]
 		IReadOnlyDictionary<string, NodeState> Nodes { get; }
 
-		[JsonProperty("metadata")]
-		MetadataState Metadata { get; }
+		[JsonProperty("routing_nodes")]
+		RoutingNodesState RoutingNodes { get; }
 
 		[JsonProperty("routing_table")]
 		RoutingTableState RoutingTable { get; }
 
-		[JsonProperty("routing_nodes")]
-		RoutingNodesState RoutingNodes { get; }
+		[JsonProperty("state_uuid")]
+		string StateUUID { get; }
 
-		[JsonProperty("blocks")]
-		BlockState Blocks { get; }
+		[JsonProperty("version")]
+		long Version { get; }
 	}
 
 	public class ClusterStateResponse : ResponseBase, IClusterStateResponse
 	{
+		public BlockState Blocks { get; internal set; }
 		public string ClusterName { get; internal set; }
 
-		public string MasterNode { get; internal set; }
-
-		public string StateUUID { get; internal set; }
-
-		/// <inheritdoc cref="IClusterStateResponse.ClusterUUID"/>
+		/// <inheritdoc cref="IClusterStateResponse.ClusterUUID" />
 		public string ClusterUUID { get; internal set; }
 
-		public long Version { get; internal set; }
+		public string MasterNode { get; internal set; }
+
+		public MetadataState Metadata { get; internal set; }
 
 		public IReadOnlyDictionary<string, NodeState> Nodes { get; internal set; } = EmptyReadOnly<string, NodeState>.Dictionary;
 
-		public MetadataState Metadata { get; internal set; }
+		public RoutingNodesState RoutingNodes { get; internal set; }
 
 		public RoutingTableState RoutingTable { get; internal set; }
 
-		public RoutingNodesState RoutingNodes { get; internal set; }
+		public string StateUUID { get; internal set; }
 
-		public BlockState Blocks { get; internal set; }
+		public long Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterState/ElasticClient-ClusterState.cs b/src/Nest/Cluster/ClusterState/ElasticClient-ClusterState.cs
index 6b3016757e9..fb504457071 100644
--- a/src/Nest/Cluster/ClusterState/ElasticClient-ClusterState.cs
+++ b/src/Nest/Cluster/ClusterState/ElasticClient-ClusterState.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,44 +9,51 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The cluster state API allows to get a comprehensive state information of the whole cluster.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-state.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-state.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-state.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-state.html</a>
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the cluster state operation</param>
 		IClusterStateResponse ClusterState(Func<ClusterStateDescriptor, IClusterStateRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClusterStateResponse ClusterState(IClusterStateRequest request);
 
-		/// <inheritdoc/>
-		Task<IClusterStateResponse> ClusterStateAsync(Func<ClusterStateDescriptor, IClusterStateRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterStateResponse> ClusterStateAsync(Func<ClusterStateDescriptor, IClusterStateRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IClusterStateResponse> ClusterStateAsync(IClusterStateRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterStateResponse ClusterState(Func<ClusterStateDescriptor, IClusterStateRequest> selector = null) =>
-			this.ClusterState(selector.InvokeOrDefault(new ClusterStateDescriptor()));
+			ClusterState(selector.InvokeOrDefault(new ClusterStateDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterStateResponse ClusterState(IClusterStateRequest request) =>
-			this.Dispatcher.Dispatch<IClusterStateRequest, ClusterStateRequestParameters, ClusterStateResponse>(
+			Dispatcher.Dispatch<IClusterStateRequest, ClusterStateRequestParameters, ClusterStateResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ClusterStateDispatch<ClusterStateResponse>(p)
+				(p, d) => LowLevelDispatch.ClusterStateDispatch<ClusterStateResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IClusterStateResponse> ClusterStateAsync(Func<ClusterStateDescriptor, IClusterStateRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClusterStateAsync(selector.InvokeOrDefault(new ClusterStateDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IClusterStateResponse> ClusterStateAsync(IClusterStateRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClusterStateRequest, ClusterStateRequestParameters, ClusterStateResponse, IClusterStateResponse>(
+		/// <inheritdoc />
+		public Task<IClusterStateResponse> ClusterStateAsync(Func<ClusterStateDescriptor, IClusterStateRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClusterStateAsync(selector.InvokeOrDefault(new ClusterStateDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClusterStateResponse> ClusterStateAsync(IClusterStateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IClusterStateRequest, ClusterStateRequestParameters, ClusterStateResponse, IClusterStateResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ClusterStateDispatchAsync<ClusterStateResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.ClusterStateDispatchAsync<ClusterStateResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/ClusterState/MetadataIndexState.cs b/src/Nest/Cluster/ClusterState/MetadataIndexState.cs
index 0b33ebcba80..8897b8f5be5 100644
--- a/src/Nest/Cluster/ClusterState/MetadataIndexState.cs
+++ b/src/Nest/Cluster/ClusterState/MetadataIndexState.cs
@@ -6,17 +6,17 @@ namespace Nest
 {
 	public class MetadataIndexState
 	{
-		[JsonProperty("state")]
-		public string State { get; internal set; }
+		[JsonProperty("aliases")]
+		public IEnumerable<string> Aliases { get; internal set; }
+
+		[JsonProperty("mappings")]
+		public IMappings Mappings { get; internal set; }
 
 		[JsonProperty("settings")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		public DynamicBody Settings { get; internal set; }
 
-		[JsonProperty("mappings")]
-		public IMappings Mappings { get; internal set; }
-
-		[JsonProperty("aliases")]
-		public IEnumerable<string> Aliases { get; internal set; }
+		[JsonProperty("state")]
+		public string State { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterState/MetadataState.cs b/src/Nest/Cluster/ClusterState/MetadataState.cs
index 2a706e83af2..a905566fd26 100644
--- a/src/Nest/Cluster/ClusterState/MetadataState.cs
+++ b/src/Nest/Cluster/ClusterState/MetadataState.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
@@ -7,15 +5,15 @@ namespace Nest
 {
 	public class MetadataState
 	{
-		[JsonProperty("templates")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, TemplateMapping>))]
-		public IReadOnlyDictionary<string, TemplateMapping> Templates { get; internal set; }
-
 		[JsonProperty("cluster_uuid")]
 		public string ClusterUUID { get; internal set; }
 
 		[JsonProperty("indices")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, MetadataIndexState>))]
 		public IReadOnlyDictionary<string, MetadataIndexState> Indices { get; internal set; }
+
+		[JsonProperty("templates")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, TemplateMapping>))]
+		public IReadOnlyDictionary<string, TemplateMapping> Templates { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterState/NodeState.cs b/src/Nest/Cluster/ClusterState/NodeState.cs
index 15f6972f7d3..42e0f58ed7f 100644
--- a/src/Nest/Cluster/ClusterState/NodeState.cs
+++ b/src/Nest/Cluster/ClusterState/NodeState.cs
@@ -5,14 +5,14 @@ namespace Nest
 {
 	public class NodeState
 	{
+		[JsonProperty("attributes")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, string>))]
+		public Dictionary<string, string> Attributes { get; internal set; }
+
 		[JsonProperty("name")]
 		public string Name { get; internal set; }
 
 		[JsonProperty("transport_address")]
 		public string TransportAddress { get; internal set; }
-
-		[JsonProperty("attributes")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, string>))]
-		public Dictionary<string, string> Attributes { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterState/RoutingNodesState.cs b/src/Nest/Cluster/ClusterState/RoutingNodesState.cs
index 46ae4b9cd0c..3c2a6d6e619 100644
--- a/src/Nest/Cluster/ClusterState/RoutingNodesState.cs
+++ b/src/Nest/Cluster/ClusterState/RoutingNodesState.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
@@ -7,10 +5,10 @@ namespace Nest
 {
 	public class RoutingNodesState
 	{
-		[JsonProperty("unassigned")]
-		public IReadOnlyCollection<RoutingShard> Unassigned { get; internal set; }
-
 		[JsonProperty("nodes")]
 		public IReadOnlyDictionary<string, List<RoutingShard>> Nodes { get; internal set; }
+
+		[JsonProperty("unassigned")]
+		public IReadOnlyCollection<RoutingShard> Unassigned { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterState/RoutingShard.cs b/src/Nest/Cluster/ClusterState/RoutingShard.cs
index 0e2f18a164e..11289da98b3 100644
--- a/src/Nest/Cluster/ClusterState/RoutingShard.cs
+++ b/src/Nest/Cluster/ClusterState/RoutingShard.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -10,22 +7,22 @@ public class RoutingShard
 		[JsonProperty("allocation_id")]
 		public AllocationId AllocationId { get; internal set; }
 
-		[JsonProperty("state")]
-		public string State { get; internal set; }
-
-		[JsonProperty("primary")]
-		public bool Primary { get; internal set; }
+		[JsonProperty("index")]
+		public string Index { get; internal set; }
 
 		[JsonProperty("node")]
 		public string Node { get; internal set; }
 
+		[JsonProperty("primary")]
+		public bool Primary { get; internal set; }
+
 		[JsonProperty("relocating_node")]
 		public string RelocatingNode { get; internal set; }
 
 		[JsonProperty("shard")]
 		public int Shard { get; internal set; }
 
-		[JsonProperty("index")]
-		public string Index { get; internal set; }
+		[JsonProperty("state")]
+		public string State { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterState/RoutingTableState.cs b/src/Nest/Cluster/ClusterState/RoutingTableState.cs
index 2276ab4ce49..7a321497ecb 100644
--- a/src/Nest/Cluster/ClusterState/RoutingTableState.cs
+++ b/src/Nest/Cluster/ClusterState/RoutingTableState.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/Cluster/ClusterStats/ClusterIndicesStats.cs b/src/Nest/Cluster/ClusterStats/ClusterIndicesStats.cs
index b5092c1dbb1..38706c8536f 100644
--- a/src/Nest/Cluster/ClusterStats/ClusterIndicesStats.cs
+++ b/src/Nest/Cluster/ClusterStats/ClusterIndicesStats.cs
@@ -1,5 +1,4 @@
-
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -29,14 +28,13 @@ public class ClusterIndicesStats
 
 		[JsonProperty("store")]
 		public StoreStats Store { get; internal set; }
-
 	}
 
 	[JsonObject]
 	public class ClusterIndicesShardsStats
 	{
-		[JsonProperty("total")]
-		public double Total { get; internal set; }
+		[JsonProperty("index")]
+		public ClusterIndicesShardsIndexStats Index { get; internal set; }
 
 		[JsonProperty("primaries")]
 		public double Primaries { get; internal set; }
@@ -44,33 +42,33 @@ public class ClusterIndicesShardsStats
 		[JsonProperty("replication")]
 		public double Replication { get; internal set; }
 
-		[JsonProperty("index")]
-		public ClusterIndicesShardsIndexStats Index { get; internal set; }
+		[JsonProperty("total")]
+		public double Total { get; internal set; }
 	}
 
 	[JsonObject]
 	public class ClusterIndicesShardsIndexStats
 	{
-		[JsonProperty("shards")]
-		public ClusterShardMetrics Shards { get; internal set; }
-
 		[JsonProperty("primaries")]
 		public ClusterShardMetrics Primaries { get; internal set; }
 
 		[JsonProperty("replication")]
 		public ClusterShardMetrics Replication { get; internal set; }
+
+		[JsonProperty("shards")]
+		public ClusterShardMetrics Shards { get; internal set; }
 	}
 
 	[JsonObject]
 	public class ClusterShardMetrics
 	{
-		[JsonProperty("min")]
-		public double Min { get; internal set; }
+		[JsonProperty("avg")]
+		public double Avg { get; internal set; }
 
 		[JsonProperty("max")]
 		public double Max { get; internal set; }
 
-		[JsonProperty("avg")]
-		public double Avg { get; internal set; }
+		[JsonProperty("min")]
+		public double Min { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs b/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs
index 15a77a271c5..b8cda13c4e8 100644
--- a/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs
+++ b/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs
@@ -9,40 +9,45 @@ public class ClusterNodesStats
 		[JsonProperty("count")]
 		public ClusterNodeCount Count { get; internal set; }
 
-		[JsonProperty("versions")]
-		public IReadOnlyCollection<string> Versions { get; internal set; }
-
-		[JsonProperty("os")]
-		public ClusterOperatingSystemStats OperatingSystem { get; internal set; }
-
-		[JsonProperty("process")]
-		public ClusterProcess Process { get; internal set; }
+		[JsonProperty("fs")]
+		public ClusterFileSystem FileSystem { get; internal set; }
 
 		[JsonProperty("jvm")]
 		public ClusterJvm Jvm { get; internal set; }
 
-		[JsonProperty("fs")]
-		public ClusterFileSystem FileSystem { get; internal set; }
+		[JsonProperty("os")]
+		public ClusterOperatingSystemStats OperatingSystem { get; internal set; }
 
 		[JsonProperty("plugins")]
 		public IReadOnlyCollection<PluginStats> Plugins { get; internal set; }
+
+		[JsonProperty("process")]
+		public ClusterProcess Process { get; internal set; }
+
+		[JsonProperty("versions")]
+		public IReadOnlyCollection<string> Versions { get; internal set; }
 	}
 
 	[JsonObject]
 	public class ClusterFileSystem
 	{
-		[JsonProperty("total")]
-		public string Total { get; internal set; }
-		[JsonProperty("total_in_bytes")]
-		public long TotalInBytes { get; internal set; }
-		[JsonProperty("free")]
-		public string Free { get; internal set; }
-		[JsonProperty("free_in_bytes")]
-		public long FreeInBytes { get; internal set; }
 		[JsonProperty("available")]
 		public string Available { get; internal set; }
+
 		[JsonProperty("available_in_bytes")]
 		public long AvailableInBytes { get; internal set; }
+
+		[JsonProperty("free")]
+		public string Free { get; internal set; }
+
+		[JsonProperty("free_in_bytes")]
+		public long FreeInBytes { get; internal set; }
+
+		[JsonProperty("total")]
+		public string Total { get; internal set; }
+
+		[JsonProperty("total_in_bytes")]
+		public long TotalInBytes { get; internal set; }
 	}
 
 	[JsonObject]
@@ -54,49 +59,49 @@ public class ClusterJvm
 		[JsonProperty("max_uptime_in_millis")]
 		public long MaxUptimeInMilliseconds { get; internal set; }
 
-		[JsonProperty("versions")]
-		public IReadOnlyCollection<ClusterJvmVersion> Versions { get; internal set; }
-
 		[JsonProperty("mem")]
 		public ClusterJvmMemory Memory { get; internal set; }
 
 		[JsonProperty("threads")]
 		public long Threads { get; internal set; }
+
+		[JsonProperty("versions")]
+		public IReadOnlyCollection<ClusterJvmVersion> Versions { get; internal set; }
 	}
 
 	[JsonObject]
 	public class ClusterJvmVersion
 	{
+		[JsonProperty("count")]
+		public int Count { get; internal set; }
+
 		[JsonProperty("version")]
 		public string Version { get; internal set; }
 
 		[JsonProperty("vm_name")]
 		public string VmName { get; internal set; }
 
-		[JsonProperty("vm_version")]
-		public string VmVersion { get; internal set; }
-
 		[JsonProperty("vm_vendor")]
 		public string VmVendor { get; internal set; }
 
-		[JsonProperty("count")]
-		public int Count { get; internal set; }
+		[JsonProperty("vm_version")]
+		public string VmVersion { get; internal set; }
 	}
 
 	[JsonObject]
 	public class ClusterJvmMemory
 	{
-		[JsonProperty("heap_used")]
-		public string HeapUsed { get ;set;}
-
-		[JsonProperty("heap_used_in_bytes")]
-		public long HeapUsedInBytes { get; internal set; }
-
 		[JsonProperty("heap_max")]
 		public string HeapMax { get; internal set; }
 
 		[JsonProperty("heap_max_in_bytes")]
 		public long HeapMaxInBytes { get; internal set; }
+
+		[JsonProperty("heap_used")]
+		public string HeapUsed { get; set; }
+
+		[JsonProperty("heap_used_in_bytes")]
+		public long HeapUsedInBytes { get; internal set; }
 	}
 
 	[JsonObject]
@@ -119,25 +124,25 @@ public class ClusterProcessCpu
 	[JsonObject]
 	public class ClusterProcessOpenFileDescriptors
 	{
-		[JsonProperty("min")]
-		public long Min { get; internal set; }
+		[JsonProperty("avg")]
+		public long Avg { get; internal set; }
 
 		[JsonProperty("max")]
 		public long Max { get; internal set; }
 
-		[JsonProperty("avg")]
-		public long Avg { get; internal set; }
+		[JsonProperty("min")]
+		public long Min { get; internal set; }
 	}
 
 	[JsonObject]
 	public class ClusterOperatingSystemStats
 	{
-		[JsonProperty("available_processors")]
-		public int AvailableProcessors { get; internal set; }
-
 		[JsonProperty("allocated_processors")]
 		public int AllocatedProcessors { get; internal set; }
 
+		[JsonProperty("available_processors")]
+		public int AvailableProcessors { get; internal set; }
+
 		[JsonProperty("names")]
 		public IReadOnlyCollection<ClusterOperatingSystemName> Names { get; internal set; }
 	}
@@ -155,19 +160,19 @@ public class ClusterOperatingSystemName
 	[JsonObject]
 	public class ClusterNodeCount
 	{
-		[JsonProperty("total")]
-		public int Total { get; internal set; }
-
 		[JsonProperty("coordinating_only")]
 		public int CoordinatingOnly { get; internal set; }
 
-		[JsonProperty("master")]
-		public int Master { get; internal set; }
-
 		[JsonProperty("data")]
 		public int Data { get; internal set; }
 
 		[JsonProperty("ingest")]
 		public int Ingest { get; internal set; }
+
+		[JsonProperty("master")]
+		public int Master { get; internal set; }
+
+		[JsonProperty("total")]
+		public int Total { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterStats/ClusterStatsResponse.cs b/src/Nest/Cluster/ClusterStats/ClusterStatsResponse.cs
index 42453e439e8..671e7eb05d5 100644
--- a/src/Nest/Cluster/ClusterStats/ClusterStatsResponse.cs
+++ b/src/Nest/Cluster/ClusterStats/ClusterStatsResponse.cs
@@ -7,29 +7,29 @@ public interface IClusterStatsResponse : INodesResponse
 		[JsonProperty("cluster_name")]
 		string ClusterName { get; }
 
-		[JsonProperty("timestamp")]
-		long Timestamp { get; }
-
-		[JsonProperty("status")]
-		ClusterStatus Status { get; }
-
 		[JsonProperty("indices")]
 		ClusterIndicesStats Indices { get; }
 
 		[JsonProperty("nodes")]
 		ClusterNodesStats Nodes { get; }
+
+		[JsonProperty("status")]
+		ClusterStatus Status { get; }
+
+		[JsonProperty("timestamp")]
+		long Timestamp { get; }
 	}
 
 	public class ClusterStatsResponse : NodesResponseBase, IClusterStatsResponse
 	{
 		public string ClusterName { get; internal set; }
 
-		public long Timestamp { get; internal set; }
-
-		public ClusterStatus Status { get; internal set; }
-
 		public ClusterIndicesStats Indices { get; internal set; }
 
 		public ClusterNodesStats Nodes { get; internal set; }
+
+		public ClusterStatus Status { get; internal set; }
+
+		public long Timestamp { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/ClusterStats/ElasticClient-ClusterStats.cs b/src/Nest/Cluster/ClusterStats/ElasticClient-ClusterStats.cs
index bb53bb096a6..3599615a4eb 100644
--- a/src/Nest/Cluster/ClusterStats/ElasticClient-ClusterStats.cs
+++ b/src/Nest/Cluster/ClusterStats/ElasticClient-ClusterStats.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -12,43 +12,50 @@ public partial interface IElasticClient
 		/// (shard numbers, store size, memory usage) and information about the current nodes that form the
 		/// cluster (number, roles, os, jvm versions, memory usage, cpu and installed plugins).
 		/// </summary>
-		/// <para> </para><a href="https://www.elastic.co/guide/en/elasticsearch/guide/current/_cluster_stats.html">https://www.elastic.co/guide/en/elasticsearch/guide/current/_cluster_stats.html</a>
+		/// <para> </para>
+		/// <a href="https://www.elastic.co/guide/en/elasticsearch/guide/current/_cluster_stats.html">https://www.elastic.co/guide/en/elasticsearch/guide/current/_cluster_stats.html</a>
 		/// <param name="selector">A descriptor that describes the cluster stats operation</param>
 		IClusterStatsResponse ClusterStats(Func<ClusterStatsDescriptor, IClusterStatsRequest> selector = null);
 
-		/// <inheritdoc/>
-		Task<IClusterStatsResponse> ClusterStatsAsync(Func<ClusterStatsDescriptor, IClusterStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClusterStatsResponse> ClusterStatsAsync(Func<ClusterStatsDescriptor, IClusterStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClusterStatsResponse ClusterStats(IClusterStatsRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IClusterStatsResponse> ClusterStatsAsync(IClusterStatsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterStatsResponse ClusterStats(Func<ClusterStatsDescriptor, IClusterStatsRequest> selector = null) =>
-			this.ClusterStats(selector.InvokeOrDefault(new ClusterStatsDescriptor()));
-
-		/// <inheritdoc/>
-		public Task<IClusterStatsResponse> ClusterStatsAsync(Func<ClusterStatsDescriptor, IClusterStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClusterStatsAsync(selector.InvokeOrDefault(new ClusterStatsDescriptor()), cancellationToken);
+			ClusterStats(selector.InvokeOrDefault(new ClusterStatsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClusterStatsResponse ClusterStats(IClusterStatsRequest request) =>
-			this.Dispatcher.Dispatch<IClusterStatsRequest, ClusterStatsRequestParameters, ClusterStatsResponse>(
+			Dispatcher.Dispatch<IClusterStatsRequest, ClusterStatsRequestParameters, ClusterStatsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ClusterStatsDispatch<ClusterStatsResponse>(p)
+				(p, d) => LowLevelDispatch.ClusterStatsDispatch<ClusterStatsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IClusterStatsResponse> ClusterStatsAsync(IClusterStatsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClusterStatsRequest, ClusterStatsRequestParameters, ClusterStatsResponse, IClusterStatsResponse>(
+		/// <inheritdoc />
+		public Task<IClusterStatsResponse> ClusterStatsAsync(Func<ClusterStatsDescriptor, IClusterStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClusterStatsAsync(selector.InvokeOrDefault(new ClusterStatsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClusterStatsResponse> ClusterStatsAsync(IClusterStatsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IClusterStatsRequest, ClusterStatsRequestParameters, ClusterStatsResponse, IClusterStatsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ClusterStatsDispatchAsync<ClusterStatsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.ClusterStatsDispatchAsync<ClusterStatsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/NodesHotThreads/ElasticClient-NodesHotThreads.cs b/src/Nest/Cluster/NodesHotThreads/ElasticClient-NodesHotThreads.cs
index 0f47ba9dcf9..cdc2b4d1186 100644
--- a/src/Nest/Cluster/NodesHotThreads/ElasticClient-NodesHotThreads.cs
+++ b/src/Nest/Cluster/NodesHotThreads/ElasticClient-NodesHotThreads.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -20,48 +20,55 @@ public partial interface IElasticClient
 		/// <returns>An optional descriptor to further describe the nodes hot threads operation</returns>
 		INodesHotThreadsResponse NodesHotThreads(Func<NodesHotThreadsDescriptor, INodesHotThreadsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		INodesHotThreadsResponse NodesHotThreads(INodesHotThreadsRequest request);
 
-		/// <inheritdoc/>
-		Task<INodesHotThreadsResponse> NodesHotThreadsAsync(Func<NodesHotThreadsDescriptor, INodesHotThreadsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<INodesHotThreadsResponse> NodesHotThreadsAsync(Func<NodesHotThreadsDescriptor, INodesHotThreadsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<INodesHotThreadsResponse> NodesHotThreadsAsync(INodesHotThreadsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<INodesHotThreadsResponse> NodesHotThreadsAsync(INodesHotThreadsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		//::: {Dragonfly}{lvtIV72sRIWBGik7ulbuaw}{127.0.0.1}{127.0.0.1:9300}
+		private static readonly Regex NodeRegex = new Regex(@"^\s\{(?<name>.+?)\}\{(?<id>.+?)\}(?<hosts>.+)\n");
+
+		/// <inheritdoc />
 		public INodesHotThreadsResponse NodesHotThreads(Func<NodesHotThreadsDescriptor, INodesHotThreadsRequest> selector = null) =>
-			this.NodesHotThreads(selector.InvokeOrDefault(new NodesHotThreadsDescriptor()));
+			NodesHotThreads(selector.InvokeOrDefault(new NodesHotThreadsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public INodesHotThreadsResponse NodesHotThreads(INodesHotThreadsRequest request) =>
-			this.Dispatcher.Dispatch<INodesHotThreadsRequest, NodesHotThreadsRequestParameters, NodesHotThreadsResponse>(
+			Dispatcher.Dispatch<INodesHotThreadsRequest, NodesHotThreadsRequestParameters, NodesHotThreadsResponse>(
 				request,
 				new NodesHotThreadConverter(DeserializeNodesHotThreadResponse),
-				(p, d) => this.LowLevelDispatch.NodesHotThreadsDispatch<NodesHotThreadsResponse>(p)
+				(p, d) => LowLevelDispatch.NodesHotThreadsDispatch<NodesHotThreadsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<INodesHotThreadsResponse> NodesHotThreadsAsync(Func<NodesHotThreadsDescriptor, INodesHotThreadsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.NodesHotThreadsAsync(selector.InvokeOrDefault(new NodesHotThreadsDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<INodesHotThreadsResponse> NodesHotThreadsAsync(INodesHotThreadsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<INodesHotThreadsRequest, NodesHotThreadsRequestParameters, NodesHotThreadsResponse, INodesHotThreadsResponse>(
+		/// <inheritdoc />
+		public Task<INodesHotThreadsResponse> NodesHotThreadsAsync(Func<NodesHotThreadsDescriptor, INodesHotThreadsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			NodesHotThreadsAsync(selector.InvokeOrDefault(new NodesHotThreadsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<INodesHotThreadsResponse> NodesHotThreadsAsync(INodesHotThreadsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<INodesHotThreadsRequest, NodesHotThreadsRequestParameters, NodesHotThreadsResponse, INodesHotThreadsResponse>(
 				request,
 				cancellationToken,
 				new NodesHotThreadConverter(DeserializeNodesHotThreadResponse),
-				(p, d, c) => this.LowLevelDispatch.NodesHotThreadsDispatchAsync<NodesHotThreadsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.NodesHotThreadsDispatchAsync<NodesHotThreadsResponse>(p, c)
 			);
 
 
-		//::: {Dragonfly}{lvtIV72sRIWBGik7ulbuaw}{127.0.0.1}{127.0.0.1:9300}
-		private static Regex NodeRegex = new Regex(@"^\s\{(?<name>.+?)\}\{(?<id>.+?)\}(?<hosts>.+)\n");
-
-
 		/// <summary>
 		/// Because the nodes.hot_threads endpoint returns plain text instead of JSON, we have to
 		/// manually parse the response text into a typed response object.
@@ -104,6 +111,5 @@ where matches.Success
 				return new NodesHotThreadsResponse(info.ToList());
 			}
 		}
-
 	}
 }
diff --git a/src/Nest/Cluster/NodesHotThreads/NodesHotThreadsRequest.cs b/src/Nest/Cluster/NodesHotThreads/NodesHotThreadsRequest.cs
index 602e0e07d4e..3bd21765196 100644
--- a/src/Nest/Cluster/NodesHotThreads/NodesHotThreadsRequest.cs
+++ b/src/Nest/Cluster/NodesHotThreads/NodesHotThreadsRequest.cs
@@ -1,8 +1,7 @@
-
-namespace Nest
+namespace Nest
 {
 	public partial interface INodesHotThreadsRequest { }
-	 
+
 	public partial class NodesHotThreadsRequest { }
 
 	public partial class NodesHotThreadsDescriptor { }
diff --git a/src/Nest/Cluster/NodesHotThreads/NodesHotThreadsResponse.cs b/src/Nest/Cluster/NodesHotThreads/NodesHotThreadsResponse.cs
index b99b6deae4b..f1190e9b000 100644
--- a/src/Nest/Cluster/NodesHotThreads/NodesHotThreadsResponse.cs
+++ b/src/Nest/Cluster/NodesHotThreads/NodesHotThreadsResponse.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Nest
 {
 	public class HotThreadInformation
 	{
-		public string NodeName { get; internal set; }
+		public IReadOnlyCollection<string> Hosts { get; internal set; } = EmptyReadOnly<string>.Collection;
 		public string NodeId { get; internal set; }
+		public string NodeName { get; internal set; }
 		public IReadOnlyCollection<string> Threads { get; internal set; } = EmptyReadOnly<string>.Collection;
-		public IReadOnlyCollection<string> Hosts { get; internal set; } = EmptyReadOnly<string>.Collection;
 	}
 
 	public interface INodesHotThreadsResponse : IResponse
@@ -20,10 +19,7 @@ public class NodesHotThreadsResponse : ResponseBase, INodesHotThreadsResponse
 	{
 		public NodesHotThreadsResponse() { }
 
-		internal NodesHotThreadsResponse(IReadOnlyCollection<HotThreadInformation> threadInfo)
-		{
-			this.HotThreads = threadInfo;
-		}
+		internal NodesHotThreadsResponse(IReadOnlyCollection<HotThreadInformation> threadInfo) => HotThreads = threadInfo;
 
 		public IReadOnlyCollection<HotThreadInformation> HotThreads { get; internal set; } = EmptyReadOnly<HotThreadInformation>.Collection;
 	}
diff --git a/src/Nest/Cluster/NodesInfo/ElasticClient-NodesInfo.cs b/src/Nest/Cluster/NodesInfo/ElasticClient-NodesInfo.cs
index 07744a5b554..219ac4ee258 100644
--- a/src/Nest/Cluster/NodesInfo/ElasticClient-NodesInfo.cs
+++ b/src/Nest/Cluster/NodesInfo/ElasticClient-NodesInfo.cs
@@ -1,56 +1,60 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using NodesHotThreadConverter = Func<IApiCallDetails, Stream, NodesHotThreadsResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The cluster nodes info API allows to retrieve one or more (or all) of the cluster nodes information.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-info.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-info.html
 		/// </summary>
 		/// <param name="selector">An optional descriptor to further describe the nodes info operation</param>
 		INodesInfoResponse NodesInfo(Func<NodesInfoDescriptor, INodesInfoRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		INodesInfoResponse NodesInfo(INodesInfoRequest request);
 
-		/// <inheritdoc/>
-		Task<INodesInfoResponse> NodesInfoAsync(Func<NodesInfoDescriptor, INodesInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<INodesInfoResponse> NodesInfoAsync(Func<NodesInfoDescriptor, INodesInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<INodesInfoResponse> NodesInfoAsync(INodesInfoRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public INodesInfoResponse NodesInfo(Func<NodesInfoDescriptor, INodesInfoRequest> selector = null) =>
-			this.NodesInfo(selector.InvokeOrDefault(new NodesInfoDescriptor()));
+			NodesInfo(selector.InvokeOrDefault(new NodesInfoDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public INodesInfoResponse NodesInfo(INodesInfoRequest request) =>
-			this.Dispatcher.Dispatch<INodesInfoRequest, NodesInfoRequestParameters, NodesInfoResponse>(
+			Dispatcher.Dispatch<INodesInfoRequest, NodesInfoRequestParameters, NodesInfoResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.NodesInfoDispatch<NodesInfoResponse>(p)
+				(p, d) => LowLevelDispatch.NodesInfoDispatch<NodesInfoResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<INodesInfoResponse> NodesInfoAsync(Func<NodesInfoDescriptor, INodesInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.NodesInfoAsync(selector.InvokeOrDefault(new NodesInfoDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<INodesInfoResponse> NodesInfoAsync(Func<NodesInfoDescriptor, INodesInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			NodesInfoAsync(selector.InvokeOrDefault(new NodesInfoDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<INodesInfoResponse> NodesInfoAsync(INodesInfoRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<INodesInfoRequest, NodesInfoRequestParameters, NodesInfoResponse, INodesInfoResponse>(
+			Dispatcher.DispatchAsync<INodesInfoRequest, NodesInfoRequestParameters, NodesInfoResponse, INodesInfoResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.NodesInfoDispatchAsync<NodesInfoResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.NodesInfoDispatchAsync<NodesInfoResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/NodesInfo/NodeInfo.cs b/src/Nest/Cluster/NodesInfo/NodeInfo.cs
index afe0db5db80..d9ae3c7ae5b 100644
--- a/src/Nest/Cluster/NodesInfo/NodeInfo.cs
+++ b/src/Nest/Cluster/NodesInfo/NodeInfo.cs
@@ -7,23 +7,35 @@ namespace Nest
 	[JsonObject]
 	public class NodeInfo
 	{
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
-
-		[JsonProperty("transport_address")]
-		public string TransportAddress { get; internal set; }
+		[JsonProperty("build_hash")]
+		public string BuildHash { get; internal set; }
 
 		[JsonProperty("host")]
 		public string Host { get; internal set; }
 
+		[JsonProperty("http")]
+		public NodeInfoHttp Http { get; internal set; }
+
 		[JsonProperty("ip")]
 		public string Ip { get; internal set; }
 
-		[JsonProperty("version")]
-		public string Version { get; internal set; }
+		[JsonProperty("jvm")]
+		public NodeJvmInfo Jvm { get; internal set; }
 
-		[JsonProperty("build_hash")]
-		public string BuildHash { get; internal set; }
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
+
+		[JsonProperty("network")]
+		public NodeInfoNetwork Network { get; internal set; }
+
+		[JsonProperty("os")]
+		public NodeOperatingSystemInfo OperatingSystem { get; internal set; }
+
+		[JsonProperty("plugins")]
+		public List<PluginStats> Plugins { get; internal set; }
+
+		[JsonProperty("process")]
+		public NodeProcessInfo Process { get; internal set; }
 
 		/// <summary>
 		/// All of the different roles that the node fulfills. An empty
@@ -37,47 +49,26 @@ public class NodeInfo
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		public DynamicBody Settings { get; internal set; }
 
-		[JsonProperty("os")]
-		public NodeOperatingSystemInfo OperatingSystem { get; internal set; }
-
-		[JsonProperty("process")]
-		public NodeProcessInfo Process { get; internal set; }
-
-		[JsonProperty("jvm")]
-		public NodeJvmInfo Jvm { get; internal set; }
-
 		[JsonProperty("thread_pool")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, NodeThreadPoolInfo>))]
 		public Dictionary<string, NodeThreadPoolInfo> ThreadPool { get; internal set; }
 
-		[JsonProperty("network")]
-		public NodeInfoNetwork Network { get; internal set; }
-
 		[JsonProperty("transport")]
 		public NodeInfoTransport Transport { get; internal set; }
 
-		[JsonProperty("http")]
-		public NodeInfoHttp Http { get; internal set; }
+		[JsonProperty("transport_address")]
+		public string TransportAddress { get; internal set; }
 
-		[JsonProperty("plugins")]
-		public List<PluginStats> Plugins { get; internal set; }
+		[JsonProperty("version")]
+		public string Version { get; internal set; }
 	}
 
 	[JsonObject]
 	public class NodeOperatingSystemInfo
 	{
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
-
 		[JsonProperty("arch")]
 		public string Architecture { get; internal set; }
 
-		[JsonProperty("version")]
-		public string Version { get; internal set; }
-
-		[JsonProperty("refresh_interval_in_millis")]
-		public int RefreshInterval { get; internal set; }
-
 		[JsonProperty("available_processors")]
 		public int AvailableProcessors { get; internal set; }
 
@@ -87,29 +78,45 @@ public class NodeOperatingSystemInfo
 		[JsonProperty("mem")]
 		public NodeInfoMemory Mem { get; internal set; }
 
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
+
+		[JsonProperty("refresh_interval_in_millis")]
+		public int RefreshInterval { get; internal set; }
+
 		[JsonProperty("swap")]
 		public NodeInfoMemory Swap { get; internal set; }
+
+		[JsonProperty("version")]
+		public string Version { get; internal set; }
 	}
 
 	[JsonObject]
 	public class NodeInfoOSCPU
 	{
-		[JsonProperty("vendor")]
-		public string Vendor { get; internal set; }
-		[JsonProperty("model")]
-		public string Model { get; internal set; }
+		[JsonProperty("cache_size")]
+		public string CacheSize { get; internal set; }
+
+		[JsonProperty("cache_size_in_bytes")]
+		public int CacheSizeInBytes { get; internal set; }
+
+		[JsonProperty("cores_per_socket")]
+		public int CoresPerSocket { get; internal set; }
+
 		[JsonProperty("mhz")]
 		public int Mhz { get; internal set; }
+
+		[JsonProperty("model")]
+		public string Model { get; internal set; }
+
 		[JsonProperty("total_cores")]
 		public int TotalCores { get; internal set; }
+
 		[JsonProperty("total_sockets")]
 		public int TotalSockets { get; internal set; }
-		[JsonProperty("cores_per_socket")]
-		public int CoresPerSocket { get; internal set; }
-		[JsonProperty("cache_size")]
-		public string CacheSize { get; internal set; }
-		[JsonProperty("cache_size_in_bytes")]
-		public int CacheSizeInBytes { get; internal set; }
+
+		[JsonProperty("vendor")]
+		public string Vendor { get; internal set; }
 	}
 
 	[JsonObject]
@@ -117,6 +124,7 @@ public class NodeInfoMemory
 	{
 		[JsonProperty("total")]
 		public string Total { get; internal set; }
+
 		[JsonProperty("total_in_bytes")]
 		public long TotalInBytes { get; internal set; }
 	}
@@ -124,86 +132,108 @@ public class NodeInfoMemory
 	[JsonObject]
 	public class NodeProcessInfo
 	{
-		[JsonProperty("refresh_interval_in_millis")]
-		public long RefreshIntervalInMilliseconds { get; internal set; }
-
 		[JsonProperty("id")]
 		public long Id { get; internal set; }
 
 		[JsonProperty("mlockall")]
 		public bool MlockAll { get; internal set; }
+
+		[JsonProperty("refresh_interval_in_millis")]
+		public long RefreshIntervalInMilliseconds { get; internal set; }
 	}
 
 	[JsonObject]
 	public class NodeJvmInfo
 	{
+		[JsonProperty("gc_collectors")]
+		public IEnumerable<string> GCCollectors { get; internal set; }
+
+		[JsonProperty("mem")]
+		public NodeInfoJVMMemory Memory { get; internal set; }
+
+		[JsonProperty("memory_pools")]
+		public IEnumerable<string> MemoryPools { get; internal set; }
+
 		[JsonProperty("pid")]
 		public int PID { get; internal set; }
+
+		[JsonProperty("start_time_in_millis")]
+		public long StartTime { get; internal set; }
+
 		[JsonProperty("version")]
 		public string Version { get; internal set; }
+
 		[JsonProperty("vm_name")]
 		public string VMName { get; internal set; }
-		[JsonProperty("vm_version")]
-		public string VMVersion { get; internal set; }
+
 		[JsonProperty("vm_vendor")]
 		public string VMVendor { get; internal set; }
-		[JsonProperty("memory_pools")]
-		public IEnumerable<string> MemoryPools { get; internal set; }
-		[JsonProperty("gc_collectors")]
-		public IEnumerable<string> GCCollectors { get; internal set; }
-		[JsonProperty("start_time_in_millis")]
-		public long StartTime { get; internal set; }
-		[JsonProperty("mem")]
-		public NodeInfoJVMMemory Memory { get; internal set; }
+
+		[JsonProperty("vm_version")]
+		public string VMVersion { get; internal set; }
 	}
 
 	[JsonObject]
 	public class NodeInfoJVMMemory
 	{
+		[JsonProperty("direct_max")]
+		public string DirectMax { get; internal set; }
+
+		[JsonProperty("direct_max_in_bytes")]
+		public long DirectMaxInBytes { get; internal set; }
+
 		[JsonProperty("heap_init")]
 		public string HeapInit { get; internal set; }
+
 		[JsonProperty("heap_init_in_bytes")]
 		public long HeapInitInBytes { get; internal set; }
+
 		[JsonProperty("heap_max")]
 		public string HeapMax { get; internal set; }
+
 		[JsonProperty("heap_max_in_bytes")]
 		public long HeapMaxInBytes { get; internal set; }
+
 		[JsonProperty("non_heap_init")]
 		public string NonHeapInit { get; internal set; }
+
 		[JsonProperty("non_heap_init_in_bytes")]
 		public long NonHeapInitInBytes { get; internal set; }
+
 		[JsonProperty("non_heap_max")]
 		public string NonHeapMax { get; internal set; }
+
 		[JsonProperty("non_heap_max_in_bytes")]
 		public long NonHeapMaxInBytes { get; internal set; }
-		[JsonProperty("direct_max")]
-		public string DirectMax { get; internal set; }
-		[JsonProperty("direct_max_in_bytes")]
-		public long DirectMaxInBytes { get; internal set; }
 	}
 
 	[JsonObject]
 	public class NodeThreadPoolInfo
 	{
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
-		[JsonProperty("min")]
-		public int? Min { get; internal set; }
+		[JsonProperty("keep_alive")]
+		public string KeepAlive { get; internal set; }
+
 		[JsonProperty("max")]
 		public int? Max { get; internal set; }
+
+		[JsonProperty("min")]
+		public int? Min { get; internal set; }
+
 		[JsonProperty("queue_size")]
 		public int? QueueSize { get; internal set; }
-		[JsonProperty("keep_alive")]
-		public string KeepAlive { get; internal set; }
+
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 
 	[JsonObject]
 	public class NodeInfoNetwork
 	{
-		[JsonProperty("refresh_interval")]
-		public int RefreshInterval { get; internal set; }
 		[JsonProperty("primary_interface")]
 		public NodeInfoNetworkInterface PrimaryInterface { get; internal set; }
+
+		[JsonProperty("refresh_interval")]
+		public int RefreshInterval { get; internal set; }
 	}
 
 	[JsonObject]
@@ -211,10 +241,12 @@ public class NodeInfoNetworkInterface
 	{
 		[JsonProperty("address")]
 		public string Address { get; internal set; }
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
+
 		[JsonProperty("mac_address")]
 		public string MacAddress { get; internal set; }
+
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
 	}
 
 	[JsonObject]
@@ -222,6 +254,7 @@ public class NodeInfoTransport
 	{
 		[JsonProperty("bound_address")]
 		public IEnumerable<string> BoundAddress { get; internal set; }
+
 		[JsonProperty("publish_address")]
 		public string PublishAddress { get; internal set; }
 	}
@@ -231,11 +264,14 @@ public class NodeInfoHttp
 	{
 		[JsonProperty("bound_address")]
 		public IEnumerable<string> BoundAddress { get; internal set; }
-		[JsonProperty("publish_address")]
-		public string PublishAddress { get; internal set; }
+
 		[JsonProperty("max_content_length")]
 		public string MaxContentLength { get; internal set; }
+
 		[JsonProperty("max_content_length_in_bytes")]
 		public long MaxContentLengthInBytes { get; internal set; }
+
+		[JsonProperty("publish_address")]
+		public string PublishAddress { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/NodesInfo/NodeRole.cs b/src/Nest/Cluster/NodesInfo/NodeRole.cs
index f97fcd4e2b6..78055a39d91 100644
--- a/src/Nest/Cluster/NodesInfo/NodeRole.cs
+++ b/src/Nest/Cluster/NodesInfo/NodeRole.cs
@@ -1,11 +1,6 @@
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -14,10 +9,13 @@ public enum NodeRole
 	{
 		[EnumMember(Value = "master")]
 		Master,
+
 		[EnumMember(Value = "data")]
 		Data,
+
 		[EnumMember(Value = "client")]
 		Client,
+
 		[EnumMember(Value = "ingest")]
 		Ingest
 	}
diff --git a/src/Nest/Cluster/NodesInfo/NodesInfoResponse.cs b/src/Nest/Cluster/NodesInfo/NodesInfoResponse.cs
index 501a6ace95c..a199f187431 100644
--- a/src/Nest/Cluster/NodesInfo/NodesInfoResponse.cs
+++ b/src/Nest/Cluster/NodesInfo/NodesInfoResponse.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -20,6 +19,4 @@ public class NodesInfoResponse : NodesResponseBase, INodesInfoResponse
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, NodeInfo>))]
 		public IReadOnlyDictionary<string, NodeInfo> Nodes { get; internal set; } = EmptyReadOnly<string, NodeInfo>.Dictionary;
 	}
-
-
 }
diff --git a/src/Nest/Cluster/NodesResponseBase.cs b/src/Nest/Cluster/NodesResponseBase.cs
index 89450aaa74c..c52a27454c1 100644
--- a/src/Nest/Cluster/NodesResponseBase.cs
+++ b/src/Nest/Cluster/NodesResponseBase.cs
@@ -6,6 +6,7 @@ public abstract class NodesResponseBase : ResponseBase, INodesResponse
 	{
 		public NodeStatistics NodeStatistics { get; internal set; }
 	}
+
 	public interface INodesResponse : IResponse
 	{
 		[JsonProperty("_nodes")]
@@ -16,15 +17,14 @@ public interface INodesResponse : IResponse
 	public class NodeStatistics
 	{
 		[JsonProperty]
-		public int Total { get; internal set; }
+		public int Failed { get; internal set; }
 
 		[JsonProperty]
 		public int Successful { get; internal set; }
 
 		[JsonProperty]
-		public int Failed { get; internal set; }
+		public int Total { get; internal set; }
 
 		//TODO map failures
-
 	}
 }
diff --git a/src/Nest/Cluster/NodesStats/AdaptiveSelectionStats.cs b/src/Nest/Cluster/NodesStats/AdaptiveSelectionStats.cs
index 20bd34133d4..67bfa972826 100644
--- a/src/Nest/Cluster/NodesStats/AdaptiveSelectionStats.cs
+++ b/src/Nest/Cluster/NodesStats/AdaptiveSelectionStats.cs
@@ -5,18 +5,25 @@ namespace Nest
 	[JsonObject]
 	public class AdaptiveSelectionStats
 	{
-		/// <summary>
-		/// The number of outstanding search requests from the node these stats are for to the keyed node.
-		/// </summary>
-		[JsonProperty("outgoing_searches")]
-		public long OutgoingSearches { get; internal set; }
-
 		/// <summary>
 		/// The exponentially weighted moving average queue size of search requests on the keyed node.
 		/// </summary>
 		[JsonProperty("avg_queue_size")]
 		public long AverageQueueSize { get; internal set; }
 
+		/// <summary>
+		/// The exponentially weighted moving average response time of search requests on the keyed node.
+		/// </summary>
+		/// <remarks>only set when requesting human readable response</remarks>
+		[JsonProperty("avg_response_time")]
+		public long AverageResponseTime { get; internal set; }
+
+		/// <summary>
+		/// The exponentially weighted moving average response time of search requests on the keyed node.
+		/// </summary>
+		[JsonProperty("avg_response_time_ns")]
+		public long AverageResponseTimeInNanoseconds { get; internal set; }
+
 		/// <summary>
 		/// The exponentially weighted moving average service time of search requests on the keyed node.
 		/// </summary>
@@ -31,17 +38,10 @@ public class AdaptiveSelectionStats
 		public long AverageServiceTimeInNanoseconds { get; internal set; }
 
 		/// <summary>
-		/// The exponentially weighted moving average response time of search requests on the keyed node.
-		/// </summary>
-		/// <remarks>only set when requesting human readable response</remarks>
-		[JsonProperty("avg_response_time")]
-		public long AverageResponseTime { get; internal set; }
-		
-		/// <summary>
-		/// The exponentially weighted moving average response time of search requests on the keyed node.
+		/// The number of outstanding search requests from the node these stats are for to the keyed node.
 		/// </summary>
-		[JsonProperty("avg_response_time_ns")]
-		public long AverageResponseTimeInNanoseconds { get; internal set; }
+		[JsonProperty("outgoing_searches")]
+		public long OutgoingSearches { get; internal set; }
 
 		/// <summary>
 		/// The rank of this node; used for shard selection when routing search requests.
@@ -49,4 +49,4 @@ public class AdaptiveSelectionStats
 		[JsonProperty("rank")]
 		public string Rank { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cluster/NodesStats/ElasticClient-NodesStats.cs b/src/Nest/Cluster/NodesStats/ElasticClient-NodesStats.cs
index 439782f631f..90bbb961b38 100644
--- a/src/Nest/Cluster/NodesStats/ElasticClient-NodesStats.cs
+++ b/src/Nest/Cluster/NodesStats/ElasticClient-NodesStats.cs
@@ -1,55 +1,61 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using NodesHotThreadConverter = Func<IApiCallDetails, Stream, NodesHotThreadsResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The cluster nodes stats API allows to retrieve one or more (or all) of the cluster nodes statistics.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html
 		/// </summary>
 		/// <param name="selector">An optional descriptor to further describe the nodes stats operation</param>
 		INodesStatsResponse NodesStats(Func<NodesStatsDescriptor, INodesStatsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		INodesStatsResponse NodesStats(INodesStatsRequest request);
 
-		/// <inheritdoc/>
-		Task<INodesStatsResponse> NodesStatsAsync(Func<NodesStatsDescriptor, INodesStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<INodesStatsResponse> NodesStatsAsync(Func<NodesStatsDescriptor, INodesStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<INodesStatsResponse> NodesStatsAsync(INodesStatsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public INodesStatsResponse NodesStats(Func<NodesStatsDescriptor, INodesStatsRequest> selector = null) =>
-			this.NodesStats(selector.InvokeOrDefault(new NodesStatsDescriptor()));
+			NodesStats(selector.InvokeOrDefault(new NodesStatsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public INodesStatsResponse NodesStats(INodesStatsRequest request) =>
-			this.Dispatcher.Dispatch<INodesStatsRequest, NodesStatsRequestParameters, NodesStatsResponse>(
+			Dispatcher.Dispatch<INodesStatsRequest, NodesStatsRequestParameters, NodesStatsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.NodesStatsDispatch<NodesStatsResponse>(p)
+				(p, d) => LowLevelDispatch.NodesStatsDispatch<NodesStatsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<INodesStatsResponse> NodesStatsAsync(Func<NodesStatsDescriptor, INodesStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.NodesStatsAsync(selector.InvokeOrDefault(new NodesStatsDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<INodesStatsResponse> NodesStatsAsync(Func<NodesStatsDescriptor, INodesStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			NodesStatsAsync(selector.InvokeOrDefault(new NodesStatsDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<INodesStatsResponse> NodesStatsAsync(INodesStatsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<INodesStatsRequest, NodesStatsRequestParameters, NodesStatsResponse, INodesStatsResponse>(
+		/// <inheritdoc />
+		public Task<INodesStatsResponse> NodesStatsAsync(INodesStatsRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<INodesStatsRequest, NodesStatsRequestParameters, NodesStatsResponse, INodesStatsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.NodesStatsDispatchAsync<NodesStatsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.NodesStatsDispatchAsync<NodesStatsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/NodesStats/NodeStats.cs b/src/Nest/Cluster/NodesStats/NodeStats.cs
index c3155ab06a5..9c505954cf8 100644
--- a/src/Nest/Cluster/NodesStats/NodeStats.cs
+++ b/src/Nest/Cluster/NodesStats/NodeStats.cs
@@ -6,31 +6,39 @@ namespace Nest
 	[JsonObject]
 	public class NodeStats
 	{
-		[JsonProperty("timestamp")]
-		public long Timestamp { get; internal set; }
+		[JsonProperty("adaptive_selection")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, AdaptiveSelectionStats>))]
+		public IReadOnlyDictionary<string, AdaptiveSelectionStats> AdaptiveSelection { get; internal set; }
+			= EmptyReadOnly<string, AdaptiveSelectionStats>.Dictionary;
 
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
+		[JsonProperty("breakers")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, BreakerStats>))]
+		public Dictionary<string, BreakerStats> Breakers { get; internal set; }
 
-		[JsonProperty("transport_address")]
-		public string TransportAddress { get; internal set; }
+		[JsonProperty("fs")]
+		public FileSystemStats FileSystem { get; internal set; }
 
 		[JsonProperty("host")]
 		public string Host { get; internal set; }
 
+		[JsonProperty("http")]
+		public HttpStats Http { get; internal set; }
+
+		[JsonProperty("indices")]
+		public IndexStats Indices { get; internal set; }
+
+		[JsonProperty("ingest")]
+		public NodeIngestStats Ingest { get; internal set; }
+
 		[JsonProperty("ip")]
 		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<string>))]
 		public IEnumerable<string> Ip { get; internal set; }
 
-		/// <summary>
-		/// All of the different roles that the node fulfills. An empty
-		/// collection means that the node is a coordinating only node.
-		/// </summary>
-		[JsonProperty("roles")]
-		public IEnumerable<NodeRole> Roles { get; internal set; }
+		[JsonProperty("jvm")]
+		public NodeJvmStats Jvm { get; internal set; }
 
-		[JsonProperty("indices")]
-		public IndexStats Indices { get; internal set; }
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
 
 		[JsonProperty("os")]
 		public OperatingSystemStats OperatingSystem { get; internal set; }
@@ -38,36 +46,28 @@ public class NodeStats
 		[JsonProperty("process")]
 		public ProcessStats Process { get; internal set; }
 
+		/// <summary>
+		/// All of the different roles that the node fulfills. An empty
+		/// collection means that the node is a coordinating only node.
+		/// </summary>
+		[JsonProperty("roles")]
+		public IEnumerable<NodeRole> Roles { get; internal set; }
+
 		[JsonProperty("script")]
 		public ScriptStats Script { get; internal set; }
 
-		[JsonProperty("jvm")]
-		public NodeJvmStats Jvm { get; internal set; }
-
 		[JsonProperty("thread_pool")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, ThreadCountStats>))]
 		public Dictionary<string, ThreadCountStats> ThreadPool { get; internal set; }
 
-		[JsonProperty("breakers")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, BreakerStats>))]
-		public Dictionary<string, BreakerStats> Breakers { get; internal set; }
-
-		[JsonProperty("fs")]
-		public FileSystemStats FileSystem { get; internal set; }
+		[JsonProperty("timestamp")]
+		public long Timestamp { get; internal set; }
 
 		[JsonProperty("transport")]
 		public TransportStats Transport { get; internal set; }
 
-		[JsonProperty("http")]
-		public HttpStats Http { get; internal set; }
-
-		[JsonProperty("ingest")]
-		public NodeIngestStats Ingest { get; internal set; }
-
-		[JsonProperty("adaptive_selection")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, AdaptiveSelectionStats>))]
-		public IReadOnlyDictionary<string, AdaptiveSelectionStats> AdaptiveSelection { get; internal set; }
-			= EmptyReadOnly<string, AdaptiveSelectionStats>.Dictionary;
+		[JsonProperty("transport_address")]
+		public string TransportAddress { get; internal set; }
 	}
 
 
@@ -76,6 +76,7 @@ public class ScriptStats
 	{
 		[JsonProperty("cache_evictions")]
 		public long CacheEvictions { get; internal set; }
+
 		[JsonProperty("compilations")]
 		public long Compilations { get; internal set; }
 	}
@@ -85,14 +86,19 @@ public class BreakerStats
 	{
 		[JsonProperty("estimated_size")]
 		public string EstimatedSize { get; internal set; }
+
 		[JsonProperty("estimated_size_in_bytes")]
 		public long EstimatedSizeInBytes { get; internal set; }
+
 		[JsonProperty("limit_size")]
 		public string LimitSize { get; internal set; }
+
 		[JsonProperty("limit_size_in_bytes")]
 		public long LimitSizeInBytes { get; internal set; }
+
 		[JsonProperty("overhead")]
 		public float Overhead { get; internal set; }
+
 		[JsonProperty("tripped")]
 		public float Tripped { get; internal set; }
 	}
@@ -100,16 +106,17 @@ public class BreakerStats
 	[JsonObject]
 	public class OperatingSystemStats
 	{
-		[JsonProperty("timestamp")]
-		public long Timestamp { get; internal set; }
+		[JsonProperty("cpu")]
+		public CPUStats Cpu { get; internal set; }
 
 		[JsonProperty("mem")]
 		public ExtendedMemoryStats Memory { get; internal set; }
+
 		[JsonProperty("swap")]
 		public MemoryStats Swap { get; internal set; }
 
-		[JsonProperty("cpu")]
-		public CPUStats Cpu { get; internal set; }
+		[JsonProperty("timestamp")]
+		public long Timestamp { get; internal set; }
 
 		[JsonObject]
 		public class CPUStats
@@ -123,32 +130,32 @@ public class CPUStats
 			[JsonObject]
 			public class LoadAverageStats
 			{
-				[JsonProperty("1m")]
-				public float? OneMinute { get; internal set; }
+				[JsonProperty("15m")]
+				public float? FifteenMinute { get; internal set; }
 
 				[JsonProperty("5m")]
 				public float? FiveMinute { get; internal set; }
 
-				[JsonProperty("15m")]
-				public float? FifteenMinute { get; internal set; }
+				[JsonProperty("1m")]
+				public float? OneMinute { get; internal set; }
 			}
 		}
 
 		[JsonObject]
 		public class MemoryStats
 		{
-			[JsonProperty("total")]
-			public string Total { get; internal set; }
-
-			[JsonProperty("total_in_bytes")]
-			public long TotalInBytes { get; internal set; }
-
 			[JsonProperty("free")]
 			public string Free { get; internal set; }
 
 			[JsonProperty("free_in_bytes")]
 			public long FreeInBytes { get; internal set; }
 
+			[JsonProperty("total")]
+			public string Total { get; internal set; }
+
+			[JsonProperty("total_in_bytes")]
+			public long TotalInBytes { get; internal set; }
+
 			[JsonProperty("used")]
 			public string Used { get; internal set; }
 
@@ -161,6 +168,7 @@ public class ExtendedMemoryStats : MemoryStats
 		{
 			[JsonProperty("free_percent")]
 			public int FreePercent { get; internal set; }
+
 			[JsonProperty("used_percent")]
 			public int UsedPercent { get; internal set; }
 		}
@@ -169,33 +177,41 @@ public class ExtendedMemoryStats : MemoryStats
 	[JsonObject]
 	public class ProcessStats
 	{
-		[JsonProperty("timestamp")]
-		public long Timestamp { get; internal set; }
-		[JsonProperty("open_file_descriptors")]
-		public int OpenFileDescriptors { get; internal set; }
-
 		[JsonProperty("cpu")]
 		public CPUStats CPU { get; internal set; }
+
 		[JsonProperty("mem")]
 		public MemoryStats Memory { get; internal set; }
 
+		[JsonProperty("open_file_descriptors")]
+		public int OpenFileDescriptors { get; internal set; }
+
+		[JsonProperty("timestamp")]
+		public long Timestamp { get; internal set; }
+
 		[JsonObject]
 		public class CPUStats
 		{
 			[JsonProperty("percent")]
 			public int Percent { get; internal set; }
+
 			[JsonProperty("sys")]
 			public string System { get; internal set; }
+
 			[JsonProperty("sys_in_millis")]
 			public long SystemInMilliseconds { get; internal set; }
-			[JsonProperty("user")]
-			public string User { get; internal set; }
-			[JsonProperty("user_in_millis")]
-			public long UserInMilliseconds { get; internal set; }
+
 			[JsonProperty("total")]
 			public string Total { get; internal set; }
+
 			[JsonProperty("total_in_millis")]
 			public long TotalInMilliseconds { get; internal set; }
+
+			[JsonProperty("user")]
+			public string User { get; internal set; }
+
+			[JsonProperty("user_in_millis")]
+			public long UserInMilliseconds { get; internal set; }
 		}
 
 		[JsonObject]
@@ -203,14 +219,19 @@ public class MemoryStats
 		{
 			[JsonProperty("resident")]
 			public string Resident { get; internal set; }
+
 			[JsonProperty("resident_in_bytes")]
 			public long ResidentInBytes { get; internal set; }
+
 			[JsonProperty("share")]
 			public string Share { get; internal set; }
+
 			[JsonProperty("share_in_bytes")]
 			public long ShareInBytes { get; internal set; }
+
 			[JsonProperty("total_virtual")]
 			public string TotalVirtual { get; internal set; }
+
 			[JsonProperty("total_virtual_in_bytes")]
 			public long TotalVirtualInBytes { get; internal set; }
 		}
@@ -219,19 +240,6 @@ public class MemoryStats
 	[JsonObject]
 	public class NodeJvmStats
 	{
-		[JsonProperty("timestamp")]
-		public long Timestamp { get; internal set; }
-		[JsonProperty("uptime")]
-		public string Uptime { get; internal set; }
-		[JsonProperty("uptime_in_millis")]
-		public long UptimeInMilliseconds { get; internal set; }
-		[JsonProperty("mem")]
-		public MemoryStats Memory { get; internal set; }
-		[JsonProperty("threads")]
-		public ThreadStats Threads { get; internal set; }
-		[JsonProperty("gc")]
-		public GarbageCollectionStats GarbageCollection { get; internal set; }
-
 		[JsonProperty("buffer_pools")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, NodeBufferPool>))]
 		public Dictionary<string, NodeBufferPool> BufferPools { get; internal set; }
@@ -239,13 +247,33 @@ public class NodeJvmStats
 		[JsonProperty("classes")]
 		public JvmClassesStats Classes { get; internal set; }
 
+		[JsonProperty("gc")]
+		public GarbageCollectionStats GarbageCollection { get; internal set; }
+
+		[JsonProperty("mem")]
+		public MemoryStats Memory { get; internal set; }
+
+		[JsonProperty("threads")]
+		public ThreadStats Threads { get; internal set; }
+
+		[JsonProperty("timestamp")]
+		public long Timestamp { get; internal set; }
+
+		[JsonProperty("uptime")]
+		public string Uptime { get; internal set; }
+
+		[JsonProperty("uptime_in_millis")]
+		public long UptimeInMilliseconds { get; internal set; }
+
 		[JsonObject]
 		public class JvmClassesStats
 		{
 			[JsonProperty("current_loaded_count")]
 			public long CurrentLoadedCount { get; internal set; }
+
 			[JsonProperty("total_loaded_count")]
 			public long TotalLoadedCount { get; internal set; }
+
 			[JsonProperty("total_unloaded_count")]
 			public long TotalUnloadedCount { get; internal set; }
 		}
@@ -253,28 +281,39 @@ public class JvmClassesStats
 		[JsonObject]
 		public class MemoryStats
 		{
-			[JsonProperty("heap_used")]
-			public string HeapUsed { get; internal set; }
-			[JsonProperty("heap_used_in_bytes")]
-			public long HeapUsedInBytes { get; internal set; }
-			[JsonProperty("heap_used_percent")]
-			public long HeapUsedPercent { get; internal set; }
 			[JsonProperty("heap_committed")]
 			public string HeapCommitted { get; internal set; }
+
 			[JsonProperty("heap_committed_in_bytes")]
 			public long HeapCommittedInBytes { get; internal set; }
+
 			[JsonProperty("heap_max")]
 			public string HeapMax { get; internal set; }
+
 			[JsonProperty("heap_max_in_bytes")]
 			public long HeapMaxInBytes { get; internal set; }
-			[JsonProperty("non_heap_used")]
-			public string NonHeapUsed { get; internal set; }
-			[JsonProperty("non_heap_used_in_bytes")]
-			public long NonHeapUsedInBytes { get; internal set; }
+
+			[JsonProperty("heap_used")]
+			public string HeapUsed { get; internal set; }
+
+			[JsonProperty("heap_used_in_bytes")]
+			public long HeapUsedInBytes { get; internal set; }
+
+			[JsonProperty("heap_used_percent")]
+			public long HeapUsedPercent { get; internal set; }
+
 			[JsonProperty("non_heap_committed")]
 			public string NonHeapCommitted { get; internal set; }
+
 			[JsonProperty("non_heap_committed_in_bytes")]
 			public long NonHeapCommittedInBytes { get; internal set; }
+
+			[JsonProperty("non_heap_used")]
+			public string NonHeapUsed { get; internal set; }
+
+			[JsonProperty("non_heap_used_in_bytes")]
+			public long NonHeapUsedInBytes { get; internal set; }
+
 			[JsonProperty("pools")]
 			[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, JVMPool>))]
 			public Dictionary<string, JVMPool> Pools { get; internal set; }
@@ -282,22 +321,29 @@ public class MemoryStats
 			[JsonObject]
 			public class JVMPool
 			{
-				[JsonProperty("used")]
-				public string Used { get; internal set; }
-				[JsonProperty("used_in_bytes")]
-				public long UsedInBytes { get; internal set; }
 				[JsonProperty("max")]
 				public string Max { get; internal set; }
+
 				[JsonProperty("max_in_bytes")]
 				public long MaxInBytes { get; internal set; }
-				[JsonProperty("peak_used")]
-				public string PeakUsed { get; internal set; }
-				[JsonProperty("peak_used_in_bytes")]
-				public long PeakUsedInBytes { get; internal set; }
+
 				[JsonProperty("peak_max")]
 				public string PeakMax { get; internal set; }
+
 				[JsonProperty("peak_max_in_bytes")]
 				public long PeakMaxInBytes { get; internal set; }
+
+				[JsonProperty("peak_used")]
+				public string PeakUsed { get; internal set; }
+
+				[JsonProperty("peak_used_in_bytes")]
+				public long PeakUsedInBytes { get; internal set; }
+
+				[JsonProperty("used")]
+				public string Used { get; internal set; }
+
+				[JsonProperty("used_in_bytes")]
+				public long UsedInBytes { get; internal set; }
 			}
 		}
 
@@ -306,6 +352,7 @@ public class ThreadStats
 		{
 			[JsonProperty("count")]
 			public long Count { get; internal set; }
+
 			[JsonProperty("peak_count")]
 			public long PeakCount { get; internal set; }
 		}
@@ -323,8 +370,10 @@ public class GarbageCollectionGenerationStats
 		{
 			[JsonProperty("collection_count")]
 			public long CollectionCount { get; internal set; }
+
 			[JsonProperty("collection_time")]
 			public string CollectionTime { get; internal set; }
+
 			[JsonProperty("collection_time_in_millis")]
 			public long CollectionTimeInMilliseconds { get; internal set; }
 		}
@@ -334,58 +383,72 @@ public class NodeBufferPool
 		{
 			[JsonProperty("count")]
 			public long Count { get; internal set; }
-			[JsonProperty("used")]
-			public string Used { get; internal set; }
-			[JsonProperty("used_in_bytes")]
-			public long UsedInBytes { get; internal set; }
+
 			[JsonProperty("total_capacity")]
 			public string TotalCapacity { get; internal set; }
+
 			[JsonProperty("total_capacity_in_bytes")]
 			public long TotalCapacityInBytes { get; internal set; }
+
+			[JsonProperty("used")]
+			public string Used { get; internal set; }
+
+			[JsonProperty("used_in_bytes")]
+			public long UsedInBytes { get; internal set; }
 		}
 	}
 
 	[JsonObject]
 	public class ThreadCountStats
 	{
-		[JsonProperty("threads")]
-		public long Threads { get; internal set; }
-		[JsonProperty("queue")]
-		public long Queue { get; internal set; }
 		[JsonProperty("active")]
 		public long Active { get; internal set; }
-		[JsonProperty("rejected")]
-		public long Rejected { get; internal set; }
-		[JsonProperty("largest")]
-		public long Largest { get; internal set; }
+
 		[JsonProperty("completed")]
 		public long Completed { get; internal set; }
+
+		[JsonProperty("largest")]
+		public long Largest { get; internal set; }
+
+		[JsonProperty("queue")]
+		public long Queue { get; internal set; }
+
+		[JsonProperty("rejected")]
+		public long Rejected { get; internal set; }
+
+		[JsonProperty("threads")]
+		public long Threads { get; internal set; }
 	}
 
 	[JsonObject]
 	public class FileSystemStats
 	{
+		[JsonProperty("data")]
+		public IEnumerable<DataPathStats> Data { get; internal set; }
+
 		[JsonProperty("timestamp")]
 		public long Timestamp { get; internal set; }
+
 		[JsonProperty("total")]
 		public TotalFileSystemStats Total { get; internal set; }
-		[JsonProperty("data")]
-		public IEnumerable<DataPathStats> Data { get; internal set; }
 
 		public class TotalFileSystemStats
 		{
 			[JsonProperty("available")]
 			public string Available { get; internal set; }
+
 			[JsonProperty("available_in_bytes")]
 			public long AvailableInBytes { get; internal set; }
 
 			[JsonProperty("free")]
 			public string Free { get; internal set; }
+
 			[JsonProperty("free_in_bytes")]
 			public long FreeInBytes { get; internal set; }
 
 			[JsonProperty("total")]
 			public string Total { get; internal set; }
+
 			[JsonProperty("total_in_bytes")]
 			public long TotalInBytes { get; internal set; }
 		}
@@ -393,56 +456,77 @@ public class TotalFileSystemStats
 		[JsonObject]
 		public class DataPathStats
 		{
-			[JsonProperty("path")]
-			public string Path { get; internal set; }
-			[JsonProperty("mount")]
-			public string Mount { get; internal set; }
-			[JsonProperty("type")]
-			public string Type { get; internal set; }
-			[JsonProperty("total")]
-			public string Total { get; internal set; }
-			[JsonProperty("total_in_bytes")]
-			public long TotalInBytes { get; internal set; }
-			[JsonProperty("free")]
-			public string Free { get; internal set; }
-			[JsonProperty("free_in_bytes")]
-			public long FreeInBytes { get; internal set; }
 			[JsonProperty("available")]
 			public string Available { get; internal set; }
+
 			[JsonProperty("available_in_bytes")]
 			public long AvailableInBytes { get; internal set; }
+
+			[JsonProperty("disk_queue")]
+			public string DiskQueue { get; internal set; }
+
 			[JsonProperty("disk_reads")]
 			public long DiskReads { get; internal set; }
-			[JsonProperty("disk_writes")]
-			public long DiskWrites { get; internal set; }
+
 			[JsonProperty("disk_read_size")]
 			public string DiskReadSize { get; internal set; }
+
 			[JsonProperty("disk_read_size_in_bytes")]
 			public long DiskReadSizeInBytes { get; internal set; }
+
+			[JsonProperty("disk_writes")]
+			public long DiskWrites { get; internal set; }
+
 			[JsonProperty("disk_write_size")]
 			public string DiskWriteSize { get; internal set; }
+
 			[JsonProperty("disk_write_size_in_bytes")]
 			public long DiskWriteSizeInBytes { get; internal set; }
-			[JsonProperty("disk_queue")]
-			public string DiskQueue { get; internal set; }
+
+			[JsonProperty("free")]
+			public string Free { get; internal set; }
+
+			[JsonProperty("free_in_bytes")]
+			public long FreeInBytes { get; internal set; }
+
+			[JsonProperty("mount")]
+			public string Mount { get; internal set; }
+
+			[JsonProperty("path")]
+			public string Path { get; internal set; }
+
+			[JsonProperty("total")]
+			public string Total { get; internal set; }
+
+			[JsonProperty("total_in_bytes")]
+			public long TotalInBytes { get; internal set; }
+
+			[JsonProperty("type")]
+			public string Type { get; internal set; }
 		}
 	}
 
 	[JsonObject]
 	public class TransportStats
 	{
-		[JsonProperty("server_open")]
-		public int ServerOpen { get; internal set; }
 		[JsonProperty("rx_count")]
 		public long RXCount { get; internal set; }
+
 		[JsonProperty("rx_size")]
 		public string RXSize { get; internal set; }
+
 		[JsonProperty("rx_size_in_bytes")]
 		public long RXSizeInBytes { get; internal set; }
+
+		[JsonProperty("server_open")]
+		public int ServerOpen { get; internal set; }
+
 		[JsonProperty("tx_count")]
 		public long TXCount { get; internal set; }
+
 		[JsonProperty("tx_size")]
 		public string TXSize { get; internal set; }
+
 		[JsonProperty("tx_size_in_bytes")]
 		public long TXSizeInBytes { get; internal set; }
 	}
@@ -452,6 +536,7 @@ public class HttpStats
 	{
 		[JsonProperty("current_open")]
 		public int CurrentOpen { get; internal set; }
+
 		[JsonProperty("total_opened")]
 		public long TotalOpened { get; internal set; }
 	}
diff --git a/src/Nest/Cluster/NodesStats/NodeStatsResponse.cs b/src/Nest/Cluster/NodesStats/NodeStatsResponse.cs
index d934a39c0b4..38b62fe687d 100644
--- a/src/Nest/Cluster/NodesStats/NodeStatsResponse.cs
+++ b/src/Nest/Cluster/NodesStats/NodeStatsResponse.cs
@@ -18,6 +18,5 @@ public class NodesStatsResponse : NodesResponseBase, INodesStatsResponse
 		public string ClusterName { get; internal set; }
 
 		public IReadOnlyDictionary<string, NodeStats> Nodes { get; internal set; } = EmptyReadOnly<string, NodeStats>.Dictionary;
-
 	}
 }
diff --git a/src/Nest/Cluster/NodesStats/Statistics/IngestStats.cs b/src/Nest/Cluster/NodesStats/Statistics/IngestStats.cs
index 30683ca9ce2..46afb481de6 100644
--- a/src/Nest/Cluster/NodesStats/Statistics/IngestStats.cs
+++ b/src/Nest/Cluster/NodesStats/Statistics/IngestStats.cs
@@ -11,12 +11,6 @@ public class IngestStats
 		[JsonProperty("count")]
 		public long Count { get; set; }
 
-		/// <summary>
-		/// The total time spent on ingest preprocessing documents during the lifetime of this node
-		/// </summary>
-		[JsonProperty("time_in_millis")]
-		public long TimeInMilliseconds { get; set; }
-
 		/// <summary>
 		/// The total number of documents currently being ingested.
 		/// </summary>
@@ -28,5 +22,11 @@ public class IngestStats
 		/// </summary>
 		[JsonProperty("failed")]
 		public long Failed { get; set; }
+
+		/// <summary>
+		/// The total time spent on ingest preprocessing documents during the lifetime of this node
+		/// </summary>
+		[JsonProperty("time_in_millis")]
+		public long TimeInMilliseconds { get; set; }
 	}
 }
diff --git a/src/Nest/Cluster/NodesStats/Statistics/NodeIngestStats.cs b/src/Nest/Cluster/NodesStats/Statistics/NodeIngestStats.cs
index 3fac482f7dd..ac076625019 100644
--- a/src/Nest/Cluster/NodesStats/Statistics/NodeIngestStats.cs
+++ b/src/Nest/Cluster/NodesStats/Statistics/NodeIngestStats.cs
@@ -5,14 +5,14 @@ namespace Nest
 {
 	public class NodeIngestStats
 	{
-		/// <summary> Overal global ingest statistics </summary>
-		[JsonProperty("total")]
-		public IngestStats Total { get; set; }
-
 		/// <summary> Per pipeline ingest statistics </summary>
 		[JsonProperty("pipelines")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, IngestStats>))]
 		public IReadOnlyDictionary<string, IngestStats> Pipelines { get; internal set; }
 			= EmptyReadOnly<string, IngestStats>.Dictionary;
+
+		/// <summary> Overal global ingest statistics </summary>
+		[JsonProperty("total")]
+		public IngestStats Total { get; set; }
 	}
 }
diff --git a/src/Nest/Cluster/NodesUsage/ElasticClient-NodesUsage.cs b/src/Nest/Cluster/NodesUsage/ElasticClient-NodesUsage.cs
index 8c75b05cf8f..b51741e15f7 100644
--- a/src/Nest/Cluster/NodesUsage/ElasticClient-NodesUsage.cs
+++ b/src/Nest/Cluster/NodesUsage/ElasticClient-NodesUsage.cs
@@ -1,55 +1,61 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using NodesHotThreadConverter = Func<IApiCallDetails, Stream, NodesHotThreadsResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The cluster nodes usage API allows to retrieve information on the usage of features for each node.
-		/// <para> </para>https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-usage.html
+		/// <para> </para>
+		/// https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-usage.html
 		/// </summary>
 		/// <param name="selector">An optional descriptor to further describe the nodes usage operation</param>
 		INodesUsageResponse NodesUsage(Func<NodesUsageDescriptor, INodesUsageRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		INodesUsageResponse NodesUsage(INodesUsageRequest request);
 
-		/// <inheritdoc/>
-		Task<INodesUsageResponse> NodesUsageAsync(Func<NodesUsageDescriptor, INodesUsageRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<INodesUsageResponse> NodesUsageAsync(Func<NodesUsageDescriptor, INodesUsageRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<INodesUsageResponse> NodesUsageAsync(INodesUsageRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public INodesUsageResponse NodesUsage(Func<NodesUsageDescriptor, INodesUsageRequest> selector = null) =>
-			this.NodesUsage(selector.InvokeOrDefault(new NodesUsageDescriptor()));
+			NodesUsage(selector.InvokeOrDefault(new NodesUsageDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public INodesUsageResponse NodesUsage(INodesUsageRequest request) =>
-			this.Dispatcher.Dispatch<INodesUsageRequest, NodesUsageRequestParameters, NodesUsageResponse>(
+			Dispatcher.Dispatch<INodesUsageRequest, NodesUsageRequestParameters, NodesUsageResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.NodesUsageDispatch<NodesUsageResponse>(p)
+				(p, d) => LowLevelDispatch.NodesUsageDispatch<NodesUsageResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<INodesUsageResponse> NodesUsageAsync(Func<NodesUsageDescriptor, INodesUsageRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.NodesUsageAsync(selector.InvokeOrDefault(new NodesUsageDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<INodesUsageResponse> NodesUsageAsync(Func<NodesUsageDescriptor, INodesUsageRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			NodesUsageAsync(selector.InvokeOrDefault(new NodesUsageDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<INodesUsageResponse> NodesUsageAsync(INodesUsageRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<INodesUsageRequest, NodesUsageRequestParameters, NodesUsageResponse, INodesUsageResponse>(
+		/// <inheritdoc />
+		public Task<INodesUsageResponse> NodesUsageAsync(INodesUsageRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<INodesUsageRequest, NodesUsageRequestParameters, NodesUsageResponse, INodesUsageResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.NodesUsageDispatchAsync<NodesUsageResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.NodesUsageDispatchAsync<NodesUsageResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/NodesUsage/NodeUsageInformation.cs b/src/Nest/Cluster/NodesUsage/NodeUsageInformation.cs
index 4fc69e47dda..0c8da6e12df 100644
--- a/src/Nest/Cluster/NodesUsage/NodeUsageInformation.cs
+++ b/src/Nest/Cluster/NodesUsage/NodeUsageInformation.cs
@@ -6,15 +6,15 @@ namespace Nest
 {
 	public class NodeUsageInformation
 	{
-		[JsonProperty("timestamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset Timestamp { get; internal set; }
+		[JsonProperty("rest_actions")]
+		public IReadOnlyDictionary<string, int> RestActions { get; internal set; }
 
 		[JsonProperty("since")]
 		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset Since { get;  internal set; }
+		public DateTimeOffset Since { get; internal set; }
 
-		[JsonProperty("rest_actions")]
-		public IReadOnlyDictionary<string, int> RestActions { get;  internal set; }
+		[JsonProperty("timestamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset Timestamp { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Cluster/NodesUsage/NodeUsageResponse.cs b/src/Nest/Cluster/NodesUsage/NodeUsageResponse.cs
index 0684bbc9487..0ca6dfdd9b4 100644
--- a/src/Nest/Cluster/NodesUsage/NodeUsageResponse.cs
+++ b/src/Nest/Cluster/NodesUsage/NodeUsageResponse.cs
@@ -16,6 +16,7 @@ public class NodesUsageResponse : NodesResponseBase, INodesUsageResponse
 		public string ClusterName { get; internal set; }
 
 		[JsonProperty("nodes")]
-		public IReadOnlyDictionary<string, NodeUsageInformation> Nodes { get; internal set; } = EmptyReadOnly<string, NodeUsageInformation>.Dictionary;
+		public IReadOnlyDictionary<string, NodeUsageInformation> Nodes { get; internal set; } =
+			EmptyReadOnly<string, NodeUsageInformation>.Dictionary;
 	}
 }
diff --git a/src/Nest/Cluster/Ping/ElasticClient-Ping.cs b/src/Nest/Cluster/Ping/ElasticClient-Ping.cs
index 18112bcf3d0..42bdefb4f2c 100644
--- a/src/Nest/Cluster/Ping/ElasticClient-Ping.cs
+++ b/src/Nest/Cluster/Ping/ElasticClient-Ping.cs
@@ -1,11 +1,11 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using PingConverter = Func<IApiCallDetails, Stream, PingResponse>;
 
 	public partial interface IElasticClient
@@ -15,45 +15,50 @@ public partial interface IElasticClient
 		/// </summary>
 		IPingResponse Ping(Func<PingDescriptor, IPingRequest> selector = null);
 
-		/// <inheritdoc/>
-		Task<IPingResponse> PingAsync(Func<PingDescriptor, IPingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPingResponse> PingAsync(Func<PingDescriptor, IPingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPingResponse Ping(IPingRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPingResponse> PingAsync(IPingRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPingResponse Ping(Func<PingDescriptor, IPingRequest> selector = null) =>
-			this.Ping(selector.InvokeOrDefault(new PingDescriptor()));
+			Ping(selector.InvokeOrDefault(new PingDescriptor()));
 
-		/// <inheritdoc/>
-		public Task<IPingResponse> PingAsync(Func<PingDescriptor, IPingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PingAsync(selector.InvokeOrDefault(new PingDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPingResponse Ping(IPingRequest request) =>
-			this.Dispatcher.Dispatch<IPingRequest, PingRequestParameters, PingResponse>(
+			Dispatcher.Dispatch<IPingRequest, PingRequestParameters, PingResponse>(
 				SetPingTimeout(request),
-				(p, d) => this.LowLevelDispatch.PingDispatch<PingResponse>(p)
+				(p, d) => LowLevelDispatch.PingDispatch<PingResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public Task<IPingResponse> PingAsync(Func<PingDescriptor, IPingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PingAsync(selector.InvokeOrDefault(new PingDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
 		public Task<IPingResponse> PingAsync(IPingRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPingRequest, PingRequestParameters, PingResponse, IPingResponse>(
+			Dispatcher.DispatchAsync<IPingRequest, PingRequestParameters, PingResponse, IPingResponse>(
 				SetPingTimeout(request),
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.PingDispatchAsync<PingResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.PingDispatchAsync<PingResponse>(p, c)
 			);
 
 		private IPingRequest SetPingTimeout(IPingRequest pingRequest)
 		{
-			if (!this.ConnectionSettings.PingTimeout.HasValue) return pingRequest;
-			var timeout = this.ConnectionSettings.PingTimeout.Value;
+			if (!ConnectionSettings.PingTimeout.HasValue) return pingRequest;
+
+			var timeout = ConnectionSettings.PingTimeout.Value;
 			return ForceConfiguration<IPingRequest, PingRequestParameters>(pingRequest, r => r.RequestTimeout = timeout);
 		}
 	}
diff --git a/src/Nest/Cluster/Ping/PingResponse.cs b/src/Nest/Cluster/Ping/PingResponse.cs
index dc8c58b67d6..dd19ae33854 100644
--- a/src/Nest/Cluster/Ping/PingResponse.cs
+++ b/src/Nest/Cluster/Ping/PingResponse.cs
@@ -2,12 +2,8 @@
 
 namespace Nest
 {
-	public interface IPingResponse : IResponse
-	{
-	}
+	public interface IPingResponse : IResponse { }
 
 	[JsonObject]
-	public class PingResponse : ResponseBase, IPingResponse
-	{
-	}
+	public class PingResponse : ResponseBase, IPingResponse { }
 }
diff --git a/src/Nest/Cluster/RemoteInfo/ElasticClient-RemoteInfo.cs b/src/Nest/Cluster/RemoteInfo/ElasticClient-RemoteInfo.cs
index cb85115088e..4c938e7addd 100644
--- a/src/Nest/Cluster/RemoteInfo/ElasticClient-RemoteInfo.cs
+++ b/src/Nest/Cluster/RemoteInfo/ElasticClient-RemoteInfo.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,44 +9,50 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The cluster remote info API allows to retrieve all of the configured remote cluster information.
-		/// <para> </para><a href="http://www.elastic.co/guide/en/elasticsearch/reference/master/remote-info.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/remote-info.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elastic.co/guide/en/elasticsearch/reference/master/remote-info.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/remote-info.html</a>
 		/// </summary>
 		/// <param name="selector">An optional descriptor to further describe the remote info operation</param>
 		IRemoteInfoResponse RemoteInfo(Func<RemoteInfoDescriptor, IRemoteInfoRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRemoteInfoResponse RemoteInfo(IRemoteInfoRequest request);
 
-		/// <inheritdoc/>
-		Task<IRemoteInfoResponse> RemoteInfoAsync(Func<RemoteInfoDescriptor, IRemoteInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRemoteInfoResponse> RemoteInfoAsync(Func<RemoteInfoDescriptor, IRemoteInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IRemoteInfoResponse> RemoteInfoAsync(IRemoteInfoRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRemoteInfoResponse RemoteInfo(Func<RemoteInfoDescriptor, IRemoteInfoRequest> selector = null) =>
-			this.RemoteInfo(selector.InvokeOrDefault(new RemoteInfoDescriptor()));
+			RemoteInfo(selector.InvokeOrDefault(new RemoteInfoDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRemoteInfoResponse RemoteInfo(IRemoteInfoRequest request) =>
-			this.Dispatcher.Dispatch<IRemoteInfoRequest, RemoteInfoRequestParameters, RemoteInfoResponse>(
+			Dispatcher.Dispatch<IRemoteInfoRequest, RemoteInfoRequestParameters, RemoteInfoResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ClusterRemoteInfoDispatch<RemoteInfoResponse>(p)
+				(p, d) => LowLevelDispatch.ClusterRemoteInfoDispatch<RemoteInfoResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IRemoteInfoResponse> RemoteInfoAsync(Func<RemoteInfoDescriptor, IRemoteInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RemoteInfoAsync(selector.InvokeOrDefault(new RemoteInfoDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IRemoteInfoResponse> RemoteInfoAsync(Func<RemoteInfoDescriptor, IRemoteInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RemoteInfoAsync(selector.InvokeOrDefault(new RemoteInfoDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IRemoteInfoResponse> RemoteInfoAsync(IRemoteInfoRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRemoteInfoRequest, RemoteInfoRequestParameters, RemoteInfoResponse, IRemoteInfoResponse>(
+		/// <inheritdoc />
+		public Task<IRemoteInfoResponse> RemoteInfoAsync(IRemoteInfoRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IRemoteInfoRequest, RemoteInfoRequestParameters, RemoteInfoResponse, IRemoteInfoResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ClusterRemoteInfoDispatchAsync<RemoteInfoResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.ClusterRemoteInfoDispatchAsync<RemoteInfoResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/RemoteInfo/RemoteInfoResponse.cs b/src/Nest/Cluster/RemoteInfo/RemoteInfoResponse.cs
index 66acf43a99b..156859e6f67 100644
--- a/src/Nest/Cluster/RemoteInfo/RemoteInfoResponse.cs
+++ b/src/Nest/Cluster/RemoteInfo/RemoteInfoResponse.cs
@@ -5,7 +5,7 @@ namespace Nest
 {
 	public interface IRemoteInfoResponse : IResponse
 	{
-		IReadOnlyDictionary<string, RemoteInfo> Remotes	{ get; }
+		IReadOnlyDictionary<string, RemoteInfo> Remotes { get; }
 	}
 
 	[JsonObject]
@@ -20,17 +20,20 @@ public class RemoteInfo
 	{
 		[JsonProperty("connected")]
 		public bool Connected { get; internal set; }
-		[JsonProperty("num_nodes_connected")]
-		public long NumNodesConnected { get; internal set; }
-		[JsonProperty("max_connections_per_cluster")]
-		public int MaxConnectionsPerCluster { get; internal set; }
+
+		[JsonProperty("http_addresses")]
+		public IReadOnlyCollection<string> HttpAddresses { get; internal set; } = EmptyReadOnly<string>.Collection;
+
 		[JsonProperty("initial_connect_timeout")]
 		public Time InitialConnectTimeout { get; internal set; }
 
-		[JsonProperty("seeds")]
-		public IReadOnlyCollection<string> Seeds { get; internal set; }= EmptyReadOnly<string>.Collection;
+		[JsonProperty("max_connections_per_cluster")]
+		public int MaxConnectionsPerCluster { get; internal set; }
 
-		[JsonProperty("http_addresses")]
-		public IReadOnlyCollection<string> HttpAddresses { get; internal set; }= EmptyReadOnly<string>.Collection;
+		[JsonProperty("num_nodes_connected")]
+		public long NumNodesConnected { get; internal set; }
+
+		[JsonProperty("seeds")]
+		public IReadOnlyCollection<string> Seeds { get; internal set; } = EmptyReadOnly<string>.Collection;
 	}
 }
diff --git a/src/Nest/Cluster/RootNodeInfo/ElasticClient-RootNodeInfo.cs b/src/Nest/Cluster/RootNodeInfo/ElasticClient-RootNodeInfo.cs
index b0409717f47..d27d9a238d7 100644
--- a/src/Nest/Cluster/RootNodeInfo/ElasticClient-RootNodeInfo.cs
+++ b/src/Nest/Cluster/RootNodeInfo/ElasticClient-RootNodeInfo.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -13,39 +13,45 @@ public partial interface IElasticClient
 		/// <param name="selector">A descriptor to further describe the root operation</param>
 		IRootNodeInfoResponse RootNodeInfo(Func<RootNodeInfoDescriptor, IRootNodeInfoRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRootNodeInfoResponse RootNodeInfo(IRootNodeInfoRequest request);
 
-		/// <inheritdoc/>
-		Task<IRootNodeInfoResponse> RootNodeInfoAsync(Func<RootNodeInfoDescriptor, IRootNodeInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRootNodeInfoResponse> RootNodeInfoAsync(Func<RootNodeInfoDescriptor, IRootNodeInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IRootNodeInfoResponse> RootNodeInfoAsync(IRootNodeInfoRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRootNodeInfoResponse RootNodeInfo(Func<RootNodeInfoDescriptor, IRootNodeInfoRequest> selector = null) =>
-			this.RootNodeInfo(selector.InvokeOrDefault(new RootNodeInfoDescriptor()));
+			RootNodeInfo(selector.InvokeOrDefault(new RootNodeInfoDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRootNodeInfoResponse RootNodeInfo(IRootNodeInfoRequest request) =>
-			this.Dispatcher.Dispatch<IRootNodeInfoRequest, RootNodeInfoRequestParameters, RootNodeInfoResponse>(
+			Dispatcher.Dispatch<IRootNodeInfoRequest, RootNodeInfoRequestParameters, RootNodeInfoResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.InfoDispatch<RootNodeInfoResponse>(p)
+				(p, d) => LowLevelDispatch.InfoDispatch<RootNodeInfoResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IRootNodeInfoResponse> RootNodeInfoAsync(Func<RootNodeInfoDescriptor, IRootNodeInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RootNodeInfoAsync(selector.InvokeOrDefault(new RootNodeInfoDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IRootNodeInfoResponse> RootNodeInfoAsync(IRootNodeInfoRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRootNodeInfoRequest, RootNodeInfoRequestParameters, RootNodeInfoResponse, IRootNodeInfoResponse>(
+		/// <inheritdoc />
+		public Task<IRootNodeInfoResponse> RootNodeInfoAsync(Func<RootNodeInfoDescriptor, IRootNodeInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RootNodeInfoAsync(selector.InvokeOrDefault(new RootNodeInfoDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IRootNodeInfoResponse> RootNodeInfoAsync(IRootNodeInfoRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IRootNodeInfoRequest, RootNodeInfoRequestParameters, RootNodeInfoResponse, IRootNodeInfoResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.InfoDispatchAsync<RootNodeInfoResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.InfoDispatchAsync<RootNodeInfoResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/RootNodeInfo/RootVersionInfoResponse.cs b/src/Nest/Cluster/RootNodeInfo/RootVersionInfoResponse.cs
index c0999df2f05..3b7de83a6f9 100644
--- a/src/Nest/Cluster/RootNodeInfo/RootVersionInfoResponse.cs
+++ b/src/Nest/Cluster/RootNodeInfo/RootVersionInfoResponse.cs
@@ -5,8 +5,8 @@ namespace Nest
 	public interface IRootNodeInfoResponse : IResponse
 	{
 		string Name { get; }
-		string Tagline { get;  }
-		ElasticsearchVersionInfo Version { get;  }
+		string Tagline { get; }
+		ElasticsearchVersionInfo Version { get; }
 	}
 
 	[JsonObject]
@@ -20,6 +20,5 @@ public class RootNodeInfoResponse : ResponseBase, IRootNodeInfoResponse
 
 		[JsonProperty("version")]
 		public ElasticsearchVersionInfo Version { get; internal set; }
-
 	}
 }
diff --git a/src/Nest/Cluster/TaskManagement/CancelTasks/CancelTasksResponse.cs b/src/Nest/Cluster/TaskManagement/CancelTasks/CancelTasksResponse.cs
index a90075fe38b..2dbce5b2758 100644
--- a/src/Nest/Cluster/TaskManagement/CancelTasks/CancelTasksResponse.cs
+++ b/src/Nest/Cluster/TaskManagement/CancelTasks/CancelTasksResponse.cs
@@ -1,27 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using Newtonsoft.Json;
-using System.Linq;
+using System.Collections.Generic;
 using Elasticsearch.Net;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
-	public interface ICancelTasksResponse: IResponse
+	public interface ICancelTasksResponse : IResponse
 	{
-		[JsonProperty("nodes")]
-		IReadOnlyDictionary<string, TaskExecutingNode> Nodes { get; }
-
 		[JsonProperty("node_failures")]
 		IReadOnlyCollection<ErrorCause> NodeFailures { get; }
+
+		[JsonProperty("nodes")]
+		IReadOnlyDictionary<string, TaskExecutingNode> Nodes { get; }
 	}
 
 	public class CancelTasksResponse : ResponseBase, ICancelTasksResponse
 	{
-		public override bool IsValid => base.IsValid && !this.NodeFailures.HasAny();
+		public override bool IsValid => base.IsValid && !NodeFailures.HasAny();
+		public IReadOnlyCollection<ErrorCause> NodeFailures { get; internal set; } = EmptyReadOnly<ErrorCause>.Collection;
 
 		public IReadOnlyDictionary<string, TaskExecutingNode> Nodes { get; internal set; } = EmptyReadOnly<string, TaskExecutingNode>.Dictionary;
-		public IReadOnlyCollection<ErrorCause> NodeFailures { get; internal set; } = EmptyReadOnly<ErrorCause>.Collection;
 	}
 }
diff --git a/src/Nest/Cluster/TaskManagement/CancelTasks/ElasticClient-CancelTasks.cs b/src/Nest/Cluster/TaskManagement/CancelTasks/ElasticClient-CancelTasks.cs
index 0e975cc4376..755421f135a 100644
--- a/src/Nest/Cluster/TaskManagement/CancelTasks/ElasticClient-CancelTasks.cs
+++ b/src/Nest/Cluster/TaskManagement/CancelTasks/ElasticClient-CancelTasks.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -13,39 +13,45 @@ public partial interface IElasticClient
 		/// <param name="selector">A descriptor to further describe the root operation</param>
 		ICancelTasksResponse CancelTasks(Func<CancelTasksDescriptor, ICancelTasksRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICancelTasksResponse CancelTasks(ICancelTasksRequest request);
 
-		/// <inheritdoc/>
-		Task<ICancelTasksResponse> CancelTasksAsync(Func<CancelTasksDescriptor, ICancelTasksRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICancelTasksResponse> CancelTasksAsync(Func<CancelTasksDescriptor, ICancelTasksRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICancelTasksResponse> CancelTasksAsync(ICancelTasksRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICancelTasksResponse CancelTasks(Func<CancelTasksDescriptor, ICancelTasksRequest> selector = null) =>
-			this.CancelTasks(selector.InvokeOrDefault(new CancelTasksDescriptor()));
+			CancelTasks(selector.InvokeOrDefault(new CancelTasksDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICancelTasksResponse CancelTasks(ICancelTasksRequest request) =>
-			this.Dispatcher.Dispatch<ICancelTasksRequest, CancelTasksRequestParameters, CancelTasksResponse>(
+			Dispatcher.Dispatch<ICancelTasksRequest, CancelTasksRequestParameters, CancelTasksResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.TasksCancelDispatch<CancelTasksResponse>(p)
+				(p, d) => LowLevelDispatch.TasksCancelDispatch<CancelTasksResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<ICancelTasksResponse> CancelTasksAsync(Func<CancelTasksDescriptor, ICancelTasksRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CancelTasksAsync(selector.InvokeOrDefault(new CancelTasksDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICancelTasksResponse> CancelTasksAsync(ICancelTasksRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ICancelTasksRequest, CancelTasksRequestParameters, CancelTasksResponse, ICancelTasksResponse>(
+		/// <inheritdoc />
+		public Task<ICancelTasksResponse> CancelTasksAsync(Func<CancelTasksDescriptor, ICancelTasksRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CancelTasksAsync(selector.InvokeOrDefault(new CancelTasksDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<ICancelTasksResponse> CancelTasksAsync(ICancelTasksRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ICancelTasksRequest, CancelTasksRequestParameters, CancelTasksResponse, ICancelTasksResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.TasksCancelDispatchAsync<CancelTasksResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.TasksCancelDispatchAsync<CancelTasksResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/TaskManagement/GetTask/ElasticClient-GetTask.cs b/src/Nest/Cluster/TaskManagement/GetTask/ElasticClient-GetTask.cs
index 2e67a117148..4e5346b0482 100644
--- a/src/Nest/Cluster/TaskManagement/GetTask/ElasticClient-GetTask.cs
+++ b/src/Nest/Cluster/TaskManagement/GetTask/ElasticClient-GetTask.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -11,7 +11,9 @@ public partial interface IElasticClient
 
 		IGetTaskResponse GetTask(IGetTaskRequest request);
 
-		Task<IGetTaskResponse> GetTaskAsync(TaskId id, Func<GetTaskDescriptor, IGetTaskRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IGetTaskResponse> GetTaskAsync(TaskId id, Func<GetTaskDescriptor, IGetTaskRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		Task<IGetTaskResponse> GetTaskAsync(IGetTaskRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
@@ -19,22 +21,24 @@ public partial interface IElasticClient
 	public partial class ElasticClient
 	{
 		public IGetTaskResponse GetTask(TaskId id, Func<GetTaskDescriptor, IGetTaskRequest> selector = null) =>
-			this.GetTask(selector.InvokeOrDefault(new GetTaskDescriptor(id)));
+			GetTask(selector.InvokeOrDefault(new GetTaskDescriptor(id)));
 
 		public IGetTaskResponse GetTask(IGetTaskRequest request) =>
-			this.Dispatcher.Dispatch<IGetTaskRequest, GetTaskRequestParameters, GetTaskResponse>(
+			Dispatcher.Dispatch<IGetTaskRequest, GetTaskRequestParameters, GetTaskResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.TasksGetDispatch<GetTaskResponse>(p)
+				(p, d) => LowLevelDispatch.TasksGetDispatch<GetTaskResponse>(p)
 			);
 
-		public Task<IGetTaskResponse> GetTaskAsync(TaskId id, Func<GetTaskDescriptor, IGetTaskRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetTaskAsync(selector.InvokeOrDefault(new GetTaskDescriptor(id)), cancellationToken);
+		public Task<IGetTaskResponse> GetTaskAsync(TaskId id, Func<GetTaskDescriptor, IGetTaskRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetTaskAsync(selector.InvokeOrDefault(new GetTaskDescriptor(id)), cancellationToken);
 
 		public Task<IGetTaskResponse> GetTaskAsync(IGetTaskRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetTaskRequest, GetTaskRequestParameters, GetTaskResponse, IGetTaskResponse>(
+			Dispatcher.DispatchAsync<IGetTaskRequest, GetTaskRequestParameters, GetTaskResponse, IGetTaskResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.TasksGetDispatchAsync<GetTaskResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.TasksGetDispatchAsync<GetTaskResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/TaskManagement/GetTask/GetTaskRequest.cs b/src/Nest/Cluster/TaskManagement/GetTask/GetTaskRequest.cs
index ba7d5d089f0..098da689d9b 100644
--- a/src/Nest/Cluster/TaskManagement/GetTask/GetTaskRequest.cs
+++ b/src/Nest/Cluster/TaskManagement/GetTask/GetTaskRequest.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -17,6 +13,6 @@ public partial class GetTaskDescriptor
 		public GetTaskDescriptor() { }
 
 		[Obsolete("Maintained for binary compatibility. Use the constructor that accepts a task id. Will be removed in 7.0")]
-		public GetTaskDescriptor TaskId(TaskId taskId) => this.Assign(a => a.RouteValues.Required("task_id", taskId));
+		public GetTaskDescriptor TaskId(TaskId taskId) => Assign(a => a.RouteValues.Required("task_id", taskId));
 	}
 }
diff --git a/src/Nest/Cluster/TaskManagement/GetTask/GetTaskResponse.cs b/src/Nest/Cluster/TaskManagement/GetTask/GetTaskResponse.cs
index 88ff856e120..e16c6efe2e2 100644
--- a/src/Nest/Cluster/TaskManagement/GetTask/GetTaskResponse.cs
+++ b/src/Nest/Cluster/TaskManagement/GetTask/GetTaskResponse.cs
@@ -1,9 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
diff --git a/src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs b/src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs
index d400c7618bd..6b7fa92ed8c 100644
--- a/src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs
+++ b/src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs
@@ -1,46 +1,42 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
 	public class TaskInfo
 	{
-		[JsonProperty("node")]
-		public string Node { get; internal set; }
-
-		[JsonProperty("id")]
-		public long Id { get; internal set; }
-
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
-
 		[JsonProperty("action")]
 		public string Action { get; internal set; }
 
-		[JsonProperty("status")]
-		public TaskStatus Status { get; internal set; }
+		[JsonProperty("cancellable")]
+		public bool Cancellable { get; internal set; }
+
+		[JsonProperty("children")]
+		public IReadOnlyCollection<TaskInfo> Children { get; internal set; } = EmptyReadOnly<TaskInfo>.Collection;
 
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
 
-		[JsonProperty("start_time_in_millis")]
-		public long StartTimeInMilliseconds  { get; internal set; }
+		[JsonProperty("headers")]
+		public IReadOnlyDictionary<string, string> Headers { get; internal set; } = EmptyReadOnly<string, string>.Dictionary;
+
+		[JsonProperty("id")]
+		public long Id { get; internal set; }
+
+		[JsonProperty("node")]
+		public string Node { get; internal set; }
 
 		[JsonProperty("running_time_in_nanos")]
 		public long RunningTimeInNanoseconds { get; internal set; }
 
-		[JsonProperty("cancellable")]
-		public bool Cancellable { get; internal set; }
+		[JsonProperty("start_time_in_millis")]
+		public long StartTimeInMilliseconds { get; internal set; }
 
-		[JsonProperty("headers")]
-		public IReadOnlyDictionary<string, string> Headers { get; internal set; } = EmptyReadOnly<string, string>.Dictionary;
+		[JsonProperty("status")]
+		public TaskStatus Status { get; internal set; }
 
-		[JsonProperty("children")]
-		public IReadOnlyCollection<TaskInfo> Children { get; internal set; } = EmptyReadOnly<TaskInfo>.Collection;
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 }
diff --git a/src/Nest/Cluster/TaskManagement/ListTasks/ElasticClient-ListTasks.cs b/src/Nest/Cluster/TaskManagement/ListTasks/ElasticClient-ListTasks.cs
index fa221324674..1d6bd726807 100644
--- a/src/Nest/Cluster/TaskManagement/ListTasks/ElasticClient-ListTasks.cs
+++ b/src/Nest/Cluster/TaskManagement/ListTasks/ElasticClient-ListTasks.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -13,39 +13,43 @@ public partial interface IElasticClient
 		/// <param name="selector">A descriptor to further describe the tasks to retrieve information for</param>
 		IListTasksResponse ListTasks(Func<ListTasksDescriptor, IListTasksRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IListTasksResponse ListTasks(IListTasksRequest request);
 
-		/// <inheritdoc/>
-		Task<IListTasksResponse> ListTasksAsync(Func<ListTasksDescriptor, IListTasksRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IListTasksResponse> ListTasksAsync(Func<ListTasksDescriptor, IListTasksRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IListTasksResponse> ListTasksAsync(IListTasksRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IListTasksResponse ListTasks(Func<ListTasksDescriptor, IListTasksRequest> selector = null) =>
-			this.ListTasks(selector.InvokeOrDefault(new ListTasksDescriptor()));
+			ListTasks(selector.InvokeOrDefault(new ListTasksDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IListTasksResponse ListTasks(IListTasksRequest request) =>
-			this.Dispatcher.Dispatch<IListTasksRequest, ListTasksRequestParameters, ListTasksResponse>(
+			Dispatcher.Dispatch<IListTasksRequest, ListTasksRequestParameters, ListTasksResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.TasksListDispatch<ListTasksResponse>(p)
+				(p, d) => LowLevelDispatch.TasksListDispatch<ListTasksResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IListTasksResponse> ListTasksAsync(Func<ListTasksDescriptor, IListTasksRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ListTasksAsync(selector.InvokeOrDefault(new ListTasksDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IListTasksResponse> ListTasksAsync(Func<ListTasksDescriptor, IListTasksRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ListTasksAsync(selector.InvokeOrDefault(new ListTasksDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IListTasksResponse> ListTasksAsync(IListTasksRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IListTasksRequest, ListTasksRequestParameters, ListTasksResponse, IListTasksResponse>(
+			Dispatcher.DispatchAsync<IListTasksRequest, ListTasksRequestParameters, ListTasksResponse, IListTasksResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.TasksListDispatchAsync<ListTasksResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.TasksListDispatchAsync<ListTasksResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Cluster/TaskManagement/ListTasks/ListTasksResponse.cs b/src/Nest/Cluster/TaskManagement/ListTasks/ListTasksResponse.cs
index bf5b8ff7e6b..4cfd59c7e94 100644
--- a/src/Nest/Cluster/TaskManagement/ListTasks/ListTasksResponse.cs
+++ b/src/Nest/Cluster/TaskManagement/ListTasks/ListTasksResponse.cs
@@ -1,93 +1,85 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using Newtonsoft.Json;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Elasticsearch.Net;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
-	public interface IListTasksResponse: IResponse
+	public interface IListTasksResponse : IResponse
 	{
-		[JsonProperty("nodes")]
-		IReadOnlyDictionary<string, TaskExecutingNode> Nodes { get; }
-
 		[JsonProperty("node_failures")]
 		IReadOnlyCollection<ErrorCause> NodeFailures { get; }
 
+		[JsonProperty("nodes")]
+		IReadOnlyDictionary<string, TaskExecutingNode> Nodes { get; }
 	}
 
 	public class ListTasksResponse : ResponseBase, IListTasksResponse
 	{
-		public override bool IsValid => base.IsValid && !this.NodeFailures.HasAny();
+		public override bool IsValid => base.IsValid && !NodeFailures.HasAny();
+		public IReadOnlyCollection<ErrorCause> NodeFailures { get; internal set; } = EmptyReadOnly<ErrorCause>.Collection;
 
 		public IReadOnlyDictionary<string, TaskExecutingNode> Nodes { get; internal set; } = EmptyReadOnly<string, TaskExecutingNode>.Dictionary;
-		public IReadOnlyCollection<ErrorCause> NodeFailures { get; internal set; } = EmptyReadOnly<ErrorCause>.Collection;
 	}
 
 	public class TaskExecutingNode
 	{
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
-
-		[JsonProperty("transport_address")]
-		public string TransportAddress { get; internal set; }
-
 		[JsonProperty("host")]
 		public string Host { get; internal set; }
 
 		[JsonProperty("ip")]
 		public string Ip { get; internal set; }
 
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
+
 		[JsonProperty("tasks")]
 		public IReadOnlyDictionary<TaskId, TaskState> Tasks { get; internal set; } = EmptyReadOnly<TaskId, TaskState>.Dictionary;
+
+		[JsonProperty("transport_address")]
+		public string TransportAddress { get; internal set; }
 	}
 
 	public class TaskState
 	{
-		[JsonProperty("node")]
-		public string Node { get; internal set; }
-
-		[JsonProperty("id")]
-		public long Id { get; internal set; }
-
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
-
 		[JsonProperty("action")]
 		public string Action { get; internal set; }
 
-		[JsonProperty("status")]
-		public TaskStatus Status { get; internal set; }
+		[JsonProperty("cancellable")]
+		public bool Cancellable { get; internal set; }
 
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
 
-		[JsonProperty("start_time_in_millis")]
-		public long StartTimeInMilliseconds { get; internal set; }
+		[JsonProperty("headers")]
+		public IReadOnlyDictionary<string, string> Headers { get; internal set; } = EmptyReadOnly<string, string>.Dictionary;
 
-		[JsonProperty("running_time_in_nanos")]
-		public long RunningTimeInNanoSeconds { get; internal set; }
+		[JsonProperty("id")]
+		public long Id { get; internal set; }
+
+		[JsonProperty("node")]
+		public string Node { get; internal set; }
 
 		[JsonProperty("parent_task_id")]
 		public TaskId ParentTaskId { get; internal set; }
 
-		[JsonProperty("cancellable")]
-		public bool Cancellable { get; internal set; }
+		[JsonProperty("running_time_in_nanos")]
+		public long RunningTimeInNanoSeconds { get; internal set; }
 
-		[JsonProperty("headers")]
-		public IReadOnlyDictionary<string, string> Headers { get; internal set; } = EmptyReadOnly<string, string>.Dictionary;
+		[JsonProperty("start_time_in_millis")]
+		public long StartTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("status")]
+		public TaskStatus Status { get; internal set; }
+
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 
 	public class TaskStatus
 	{
-		[JsonProperty("total")]
-		public long Total { get; internal set; }
-
-		[JsonProperty("updated")]
-		public long Updated { get; internal set; }
+		[JsonProperty("batches")]
+		public long Batches { get; internal set; }
 
 		[JsonProperty("created")]
 		public long Created { get; internal set; }
@@ -95,26 +87,29 @@ public class TaskStatus
 		[JsonProperty("deleted")]
 		public long Deleted { get; internal set; }
 
-		[JsonProperty("batches")]
-		public long Batches { get; internal set; }
-
-		[JsonProperty("version_conflicts")]
-		public long VersionConflicts { get; internal set; }
-
 		[JsonProperty("noops")]
 		public long Noops { get; internal set; }
 
+		[JsonProperty("requests_per_second")]
+		public long RequestsPerSecond { get; internal set; }
+
 		[JsonProperty("retries")]
 		public TaskRetries Retries { get; internal set; }
 
 		[JsonProperty("throttled_millis")]
 		public long ThrottledMilliseconds { get; internal set; }
 
-		[JsonProperty("requests_per_second")]
-		public long RequestsPerSecond { get; internal set; }
-
 		[JsonProperty("throttled_until_millis")]
 		public long ThrottledUntilMilliseconds { get; internal set; }
+
+		[JsonProperty("total")]
+		public long Total { get; internal set; }
+
+		[JsonProperty("updated")]
+		public long Updated { get; internal set; }
+
+		[JsonProperty("version_conflicts")]
+		public long VersionConflicts { get; internal set; }
 	}
 
 	public class TaskRetries
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ClrPropertyMapping.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ClrPropertyMapping.cs
index 4db5de2a669..2296428db60 100644
--- a/src/Nest/CommonAbstractions/ConnectionSettings/ClrPropertyMapping.cs
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/ClrPropertyMapping.cs
@@ -6,24 +6,24 @@ namespace Nest
 	public abstract class ClrPropertyMappingBase<TDocument> : IClrPropertyMapping<TDocument>
 		where TDocument : class
 	{
-		Expression<Func<TDocument, object>> IClrPropertyMapping<TDocument>.Property { get; set; }
-		bool IClrPropertyMapping<TDocument>.Ignore { get; set; }
-		string IClrPropertyMapping<TDocument>.NewName { get; set; }
+		protected ClrPropertyMappingBase(Expression<Func<TDocument, object>> property) => Self.Property = property;
 
 		protected IClrPropertyMapping<TDocument> Self => this;
-
-		protected ClrPropertyMappingBase(Expression<Func<TDocument, object>> property) => Self.Property = property;
+		bool IClrPropertyMapping<TDocument>.Ignore { get; set; }
+		string IClrPropertyMapping<TDocument>.NewName { get; set; }
+		Expression<Func<TDocument, object>> IClrPropertyMapping<TDocument>.Property { get; set; }
 
 		IPropertyMapping IClrPropertyMapping<TDocument>.ToPropertyMapping() => Self.Ignore
 			? PropertyMapping.Ignored
-			: new PropertyMapping {Name = Self.NewName};
+			: new PropertyMapping { Name = Self.NewName };
 	}
 
 	public interface IClrPropertyMapping<TDocument> where TDocument : class
 	{
-		Expression<Func<TDocument, object>> Property { get; set; }
 		bool Ignore { get; set; }
 		string NewName { get; set; }
+		Expression<Func<TDocument, object>> Property { get; set; }
+
 		IPropertyMapping ToPropertyMapping();
 	}
 
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeDefaults.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeDefaults.cs
index e0d72d786fe..52af7481964 100644
--- a/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeDefaults.cs
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeDefaults.cs
@@ -12,25 +12,24 @@ public interface IClrTypeMapping
 		Type ClrType { get; }
 
 		/// <summary>
-		/// The default Elasticsearch index name for <see cref="ClrType"/>
+		/// The property for <see cref="ClrType" /> to resolve ids from.
 		/// </summary>
-		string IndexName { get; set; }
+		string IdPropertyName { get; set; }
 
 		/// <summary>
-		/// The default Elasticsearch type name for <see cref="ClrType"/>
+		/// The default Elasticsearch index name for <see cref="ClrType" />
 		/// </summary>
-		string TypeName { get; set; }
+		string IndexName { get; set; }
 
 		/// <summary>
-		/// The relation name for <see cref="ClrType"/> to resolve to.
+		/// The relation name for <see cref="ClrType" /> to resolve to.
 		/// </summary>
 		string RelationName { get; set; }
 
 		/// <summary>
-		/// The property for <see cref="ClrType"/> to resolve ids from.
+		/// The default Elasticsearch type name for <see cref="ClrType" />
 		/// </summary>
-		string IdPropertyName { get; set; }
-
+		string TypeName { get; set; }
 	}
 
 	public interface IClrTypeMapping<TDocument> : IClrTypeMapping where TDocument : class
@@ -38,19 +37,19 @@ public interface IClrTypeMapping<TDocument> : IClrTypeMapping where TDocument :
 		/// <summary> Set a default Id property on CLR type <typeparamref name="TDocument" /> that NEST will evaluate </summary>
 		Expression<Func<TDocument, object>> IdProperty { get; set; }
 
-		/// <summary> Provide a default routing parameter lookup based on <typeparamref name="TDocument" /> </summary>
-		Expression<Func<TDocument, object>> RoutingProperty { get; set; }
-
 		/// <summary>
 		/// Ignore or rename certain properties of CLR type <typeparamref name="TDocument" />
 		/// </summary>
 		IList<IClrPropertyMapping<TDocument>> Properties { get; set; }
+
+		/// <summary> Provide a default routing parameter lookup based on <typeparamref name="TDocument" /> </summary>
+		Expression<Func<TDocument, object>> RoutingProperty { get; set; }
 	}
 
 	public class ClrTypeMapping : IClrTypeMapping
 	{
 		/// <summary>
-		/// Initializes a new instance of <see cref="ClrTypeMapping"/>
+		/// Initializes a new instance of <see cref="ClrTypeMapping" />
 		/// </summary>
 		public ClrTypeMapping(Type type) => ClrType = type;
 
@@ -58,17 +57,18 @@ public class ClrTypeMapping : IClrTypeMapping
 		public Type ClrType { get; }
 
 		/// <inheritdoc />
-		public string IndexName { get; set; }
+		public string IdPropertyName { get; set; }
 
 		/// <inheritdoc />
-		public string TypeName { get; set; }
+		public string IndexName { get; set; }
 
 		/// <inheritdoc />
 		public string RelationName { get; set; }
 
 		/// <inheritdoc />
-		public string IdPropertyName { get; set; }
+		public string TypeName { get; set; }
 	}
+
 	public class ClrTypeMapping<TDocument> : ClrTypeMapping, IClrTypeMapping<TDocument> where TDocument : class
 	{
 		public ClrTypeMapping() : base(typeof(TDocument)) { }
@@ -77,27 +77,27 @@ public ClrTypeMapping() : base(typeof(TDocument)) { }
 		public Expression<Func<TDocument, object>> IdProperty { get; set; }
 
 		/// <inheritdoc />
-		public Expression<Func<TDocument, object>> RoutingProperty { get; set; }
+		public IList<IClrPropertyMapping<TDocument>> Properties { get; set; }
 
 		/// <inheritdoc />
-		public IList<IClrPropertyMapping<TDocument>> Properties { get; set; }
+		public Expression<Func<TDocument, object>> RoutingProperty { get; set; }
 	}
 
-	public class ClrTypeMappingDescriptor : DescriptorBase<ClrTypeMappingDescriptor,IClrTypeMapping> , IClrTypeMapping
+	public class ClrTypeMappingDescriptor : DescriptorBase<ClrTypeMappingDescriptor, IClrTypeMapping>, IClrTypeMapping
 	{
 		private readonly Type _type;
 
 		/// <summary>
-		/// Instantiates a new instance of <see cref="ClrTypeMappingDescriptor"/>
+		/// Instantiates a new instance of <see cref="ClrTypeMappingDescriptor" />
 		/// </summary>
 		/// <param name="type">The CLR type to map</param>
 		public ClrTypeMappingDescriptor(Type type) => _type = type;
 
 		Type IClrTypeMapping.ClrType => _type;
+		string IClrTypeMapping.IdPropertyName { get; set; }
 		string IClrTypeMapping.IndexName { get; set; }
-		string IClrTypeMapping.TypeName { get; set; }
 		string IClrTypeMapping.RelationName { get; set; }
-		string IClrTypeMapping.IdPropertyName { get; set; }
+		string IClrTypeMapping.TypeName { get; set; }
 
 		/// <summary>
 		/// The default Elasticsearch index name for the CLR type
@@ -121,20 +121,20 @@ public class ClrTypeMappingDescriptor : DescriptorBase<ClrTypeMappingDescriptor,
 	}
 
 	public class ClrTypeMappingDescriptor<TDocument>
-		: DescriptorBase<ClrTypeMappingDescriptor<TDocument>,IClrTypeMapping<TDocument>>, IClrTypeMapping<TDocument>
+		: DescriptorBase<ClrTypeMappingDescriptor<TDocument>, IClrTypeMapping<TDocument>>, IClrTypeMapping<TDocument>
 		where TDocument : class
 	{
-		Type IClrTypeMapping.ClrType { get; } = typeof (TDocument);
+		Type IClrTypeMapping.ClrType { get; } = typeof(TDocument);
+		Expression<Func<TDocument, object>> IClrTypeMapping<TDocument>.IdProperty { get; set; }
+		string IClrTypeMapping.IdPropertyName { get; set; }
 		string IClrTypeMapping.IndexName { get; set; }
-		string IClrTypeMapping.TypeName { get; set; }
+		IList<IClrPropertyMapping<TDocument>> IClrTypeMapping<TDocument>.Properties { get; set; } = new List<IClrPropertyMapping<TDocument>>();
 		string IClrTypeMapping.RelationName { get; set; }
-		string IClrTypeMapping.IdPropertyName { get; set; }
-		Expression<Func<TDocument, object>> IClrTypeMapping<TDocument>.IdProperty { get; set; }
 		Expression<Func<TDocument, object>> IClrTypeMapping<TDocument>.RoutingProperty { get; set; }
-		IList<IClrPropertyMapping<TDocument>> IClrTypeMapping<TDocument>.Properties { get; set; } = new List<IClrPropertyMapping<TDocument>>();
+		string IClrTypeMapping.TypeName { get; set; }
 
 		/// <summary>
-		/// The default Elasticsearch index name for <typeparamref name="TDocument"/>
+		/// The default Elasticsearch index name for <typeparamref name="TDocument" />
 		/// </summary>
 		public ClrTypeMappingDescriptor<TDocument> IndexName(string indexName) => Assign(a => a.IndexName = indexName);
 
@@ -159,7 +159,8 @@ public class ClrTypeMappingDescriptor<TDocument>
 		public ClrTypeMappingDescriptor<TDocument> IdProperty(string property) => Assign(a => a.IdPropertyName = property);
 
 		/// <summary> Provide a default routing parameter lookup based on <typeparamref name="TDocument" /> </summary>
-		public ClrTypeMappingDescriptor<TDocument> RoutingProperty(Expression<Func<TDocument, object>> property) => Assign(a => a.RoutingProperty = property);
+		public ClrTypeMappingDescriptor<TDocument> RoutingProperty(Expression<Func<TDocument, object>> property) =>
+			Assign(a => a.RoutingProperty = property);
 
 		/// <summary>
 		/// Ignore <paramref name="property" /> on CLR type <typeparamref name="TDocument" />
@@ -172,6 +173,5 @@ public ClrTypeMappingDescriptor<TDocument> Ignore(Expression<Func<TDocument, obj
 		/// </summary>
 		public ClrTypeMappingDescriptor<TDocument> PropertyName(Expression<Func<TDocument, object>> property, string newName) =>
 			Assign(a => a.Properties.Add(new RenameClrPropertyMapping<TDocument>(property, newName)));
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
index 212a52299ab..0925d70993f 100644
--- a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
@@ -10,7 +9,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// Provides the connection settings for NEST's <see cref="ElasticClient"/>
+	/// Provides the connection settings for NEST's <see cref="ElasticClient" />
 	/// </summary>
 	public class ConnectionSettings : ConnectionSettingsBase<ConnectionSettings>
 	{
@@ -20,8 +19,8 @@ public ConnectionSettings(Uri uri = null)
 			: this(new SingleNodeConnectionPool(uri ?? new Uri("http://localhost:9200"))) { }
 
 		/// <summary>
-		/// Instantiate connection settings using a <see cref="SingleNodeConnectionPool"/> using the provided
-		/// <see cref="InMemoryConnection"/> that never uses any IO.
+		/// Instantiate connection settings using a <see cref="SingleNodeConnectionPool" /> using the provided
+		/// <see cref="InMemoryConnection" /> that never uses any IO.
 		/// </summary>
 		public ConnectionSettings(InMemoryConnection connection)
 			: this(new SingleNodeConnectionPool(new Uri("http://localhost:9200")), connection) { }
@@ -40,56 +39,43 @@ public ConnectionSettings(
 			IConnectionPool connectionPool,
 			IConnection connection,
 			SourceSerializerFactory sourceSerializer,
-			IPropertyMappingProvider propertyMappingProvider)
+			IPropertyMappingProvider propertyMappingProvider
+		)
 			: base(connectionPool, connection, sourceSerializer, propertyMappingProvider) { }
 	}
 
 	/// <summary>
-	/// Provides the connection settings for NEST's <see cref="ElasticClient"/>
+	/// Provides the connection settings for NEST's <see cref="ElasticClient" />
 	/// </summary>
 	[Browsable(false)]
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class ConnectionSettingsBase<TConnectionSettings> : ConnectionConfiguration<TConnectionSettings>, IConnectionSettingsValues
 		where TConnectionSettings : ConnectionSettingsBase<TConnectionSettings>, IConnectionSettingsValues
 	{
-		private string _defaultIndex;
-		string IConnectionSettingsValues.DefaultIndex => this._defaultIndex;
-
-		private string _defaultTypeName;
-		string IConnectionSettingsValues.DefaultTypeName => this._defaultTypeName;
-
-		private readonly Inferrer _inferrer;
-		Inferrer IConnectionSettingsValues.Inferrer => _inferrer;
-
-		private Func<Type, string> _defaultTypeNameInferrer;
-		Func<Type, string> IConnectionSettingsValues.DefaultTypeNameInferrer => _defaultTypeNameInferrer;
-
 		private readonly FluentDictionary<Type, string> _defaultIndices;
-		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultIndices => _defaultIndices;
-
-		private readonly FluentDictionary<Type, string> _defaultTypeNames;
-		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultTypeNames => _defaultTypeNames;
 
 		private readonly FluentDictionary<Type, string> _defaultRelationNames;
-		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultRelationNames => _defaultRelationNames;
 
-		private Func<string, string> _defaultFieldNameInferrer;
-		Func<string, string> IConnectionSettingsValues.DefaultFieldNameInferrer => _defaultFieldNameInferrer;
+		private readonly FluentDictionary<Type, string> _defaultTypeNames;
 
 		private readonly FluentDictionary<Type, string> _idProperties = new FluentDictionary<Type, string>();
-		FluentDictionary<Type, string> IConnectionSettingsValues.IdProperties => _idProperties;
 
-		private readonly FluentDictionary<Type, string> _routeProperties = new FluentDictionary<Type, string>();
-		FluentDictionary<Type, string> IConnectionSettingsValues.RouteProperties => _routeProperties;
+		private readonly Inferrer _inferrer;
+
+		private readonly IPropertyMappingProvider _propertyMappingProvider;
 
 		private readonly FluentDictionary<MemberInfo, IPropertyMapping> _propertyMappings = new FluentDictionary<MemberInfo, IPropertyMapping>();
-		FluentDictionary<MemberInfo, IPropertyMapping> IConnectionSettingsValues.PropertyMappings => _propertyMappings;
+
+		private readonly FluentDictionary<Type, string> _routeProperties = new FluentDictionary<Type, string>();
 
 		private readonly IElasticsearchSerializer _sourceSerializer;
-		IElasticsearchSerializer IConnectionSettingsValues.SourceSerializer => _sourceSerializer;
 
-		private readonly IPropertyMappingProvider _propertyMappingProvider;
-		IPropertyMappingProvider IConnectionSettingsValues.PropertyMappingProvider => _propertyMappingProvider;
+		private Func<string, string> _defaultFieldNameInferrer;
+		private string _defaultIndex;
+
+		private string _defaultTypeName;
+
+		private Func<Type, string> _defaultTypeNameInferrer;
 
 		protected ConnectionSettingsBase(
 			IConnectionPool connectionPool,
@@ -100,40 +86,55 @@ IPropertyMappingProvider propertyMappingProvider
 			: base(connectionPool, connection, null)
 		{
 			var defaultSerializer = new InternalSerializer(this);
-			this._sourceSerializer = sourceSerializerFactory?.Invoke(defaultSerializer, this) ?? defaultSerializer;
-			this.UseThisRequestResponseSerializer = defaultSerializer;
-			this._propertyMappingProvider = propertyMappingProvider ?? new PropertyMappingProvider();
+			_sourceSerializer = sourceSerializerFactory?.Invoke(defaultSerializer, this) ?? defaultSerializer;
+			UseThisRequestResponseSerializer = defaultSerializer;
+			_propertyMappingProvider = propertyMappingProvider ?? new PropertyMappingProvider();
 
-			this._defaultTypeNameInferrer = (t => !this._defaultTypeName.IsNullOrEmpty() ? this._defaultTypeName : t.Name.ToLowerInvariant());
-			this._defaultFieldNameInferrer = (p => p.ToCamelCase());
-			this._defaultIndices = new FluentDictionary<Type, string>();
-			this._defaultTypeNames = new FluentDictionary<Type, string>();
-			this._defaultRelationNames = new FluentDictionary<Type, string>();
+			_defaultTypeNameInferrer = t => !_defaultTypeName.IsNullOrEmpty() ? _defaultTypeName : t.Name.ToLowerInvariant();
+			_defaultFieldNameInferrer = p => p.ToCamelCase();
+			_defaultIndices = new FluentDictionary<Type, string>();
+			_defaultTypeNames = new FluentDictionary<Type, string>();
+			_defaultRelationNames = new FluentDictionary<Type, string>();
 
-			this._inferrer = new Inferrer(this);
+			_inferrer = new Inferrer(this);
 		}
 
+		Func<string, string> IConnectionSettingsValues.DefaultFieldNameInferrer => _defaultFieldNameInferrer;
+		string IConnectionSettingsValues.DefaultIndex => _defaultIndex;
+		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultIndices => _defaultIndices;
+		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultRelationNames => _defaultRelationNames;
+		string IConnectionSettingsValues.DefaultTypeName => _defaultTypeName;
+		Func<Type, string> IConnectionSettingsValues.DefaultTypeNameInferrer => _defaultTypeNameInferrer;
+		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultTypeNames => _defaultTypeNames;
+		FluentDictionary<Type, string> IConnectionSettingsValues.IdProperties => _idProperties;
+		Inferrer IConnectionSettingsValues.Inferrer => _inferrer;
+		IPropertyMappingProvider IConnectionSettingsValues.PropertyMappingProvider => _propertyMappingProvider;
+		FluentDictionary<MemberInfo, IPropertyMapping> IConnectionSettingsValues.PropertyMappings => _propertyMappings;
+		FluentDictionary<Type, string> IConnectionSettingsValues.RouteProperties => _routeProperties;
+		IElasticsearchSerializer IConnectionSettingsValues.SourceSerializer => _sourceSerializer;
+
 		/// <summary>
 		/// The default index to use when no index is specified.
 		/// </summary>
-		/// <param name="defaultIndex">When null/empty/not set might throw
-		/// <see cref="NullReferenceException"/> later on when not specifying index explicitly while indexing.
+		/// <param name="defaultIndex">
+		/// When null/empty/not set might throw
+		/// <see cref="NullReferenceException" /> later on when not specifying index explicitly while indexing.
 		/// </param>
 		public TConnectionSettings DefaultIndex(string defaultIndex)
 		{
-			this._defaultIndex = defaultIndex;
-			return (TConnectionSettings) this;
+			_defaultIndex = defaultIndex;
+			return (TConnectionSettings)this;
 		}
 
 		/// <summary>
-		/// Sets a default type name to use within Elasticsearch for all CLR types. If <see cref="DefaultTypeNameInferrer"/> is also set, a configured
-		/// default type name will only be used when <see cref="DefaultTypeNameInferrer"/>returns null or empty. If unset, the default type
+		/// Sets a default type name to use within Elasticsearch for all CLR types. If <see cref="DefaultTypeNameInferrer" /> is also set, a configured
+		/// default type name will only be used when <see cref="DefaultTypeNameInferrer" />returns null or empty. If unset, the default type
 		/// name for types will be the lowercased CLR type name.
 		/// </summary>
 		public TConnectionSettings DefaultTypeName(string defaultTypeName)
 		{
-			this._defaultTypeName = defaultTypeName;
-			return (TConnectionSettings) this;
+			_defaultTypeName = defaultTypeName;
+			return (TConnectionSettings)this;
 		}
 
 		/// <summary>
@@ -144,20 +145,20 @@ public TConnectionSettings DefaultTypeName(string defaultTypeName)
 		/// </summary>
 		public TConnectionSettings DefaultFieldNameInferrer(Func<string, string> fieldNameInferrer)
 		{
-			this._defaultFieldNameInferrer = fieldNameInferrer;
-			return (TConnectionSettings) this;
+			_defaultFieldNameInferrer = fieldNameInferrer;
+			return (TConnectionSettings)this;
 		}
 
 		/// <summary>
 		/// Specify how type names are inferred from POCO types.
-		/// By default, type names are inferred by calling <see cref="string.ToLowerInvariant"/>
-		///  on the type's name.
+		/// By default, type names are inferred by calling <see cref="string.ToLowerInvariant" />
+		/// on the type's name.
 		/// </summary>
 		public TConnectionSettings DefaultTypeNameInferrer(Func<Type, string> typeNameInferrer)
 		{
 			typeNameInferrer.ThrowIfNull(nameof(typeNameInferrer));
-			this._defaultTypeNameInferrer = typeNameInferrer;
-			return (TConnectionSettings) this;
+			_defaultTypeNameInferrer = typeNameInferrer;
+			return (TConnectionSettings)this;
 		}
 
 		/// <summary>
@@ -171,15 +172,15 @@ private void MapIdPropertyFor<TDocument>(Expression<Func<TDocument, object>> obj
 			var memberInfo = new MemberInfoResolver(objectPath);
 			var fieldName = memberInfo.Members.Single().Name;
 
-			if (this._idProperties.ContainsKey(typeof(TDocument)))
+			if (_idProperties.ContainsKey(typeof(TDocument)))
 			{
-				if (this._idProperties[typeof(TDocument)].Equals(fieldName)) return;
+				if (_idProperties[typeof(TDocument)].Equals(fieldName)) return;
 
 				throw new ArgumentException(
-					$"Cannot map '{fieldName}' as the id property for type '{typeof(TDocument).Name}': it already has '{this._idProperties[typeof(TDocument)]}' mapped.");
+					$"Cannot map '{fieldName}' as the id property for type '{typeof(TDocument).Name}': it already has '{_idProperties[typeof(TDocument)]}' mapped.");
 			}
 
-			this._idProperties.Add(typeof(TDocument), fieldName);
+			_idProperties.Add(typeof(TDocument), fieldName);
 		}
 
 		private void MapRoutePropertyFor<TDocument>(Expression<Func<TDocument, object>> objectPath)
@@ -189,15 +190,15 @@ private void MapRoutePropertyFor<TDocument>(Expression<Func<TDocument, object>>
 			var memberInfo = new MemberInfoResolver(objectPath);
 			var fieldName = memberInfo.Members.Single().Name;
 
-			if (this._routeProperties.ContainsKey(typeof(TDocument)))
+			if (_routeProperties.ContainsKey(typeof(TDocument)))
 			{
-				if (this._routeProperties[typeof(TDocument)].Equals(fieldName)) return;
+				if (_routeProperties[typeof(TDocument)].Equals(fieldName)) return;
 
 				throw new ArgumentException(
-					$"Cannot map '{fieldName}' as the route property for type '{typeof(TDocument).Name}': it already has '{this._routeProperties[typeof(TDocument)]}' mapped.");
+					$"Cannot map '{fieldName}' as the route property for type '{typeof(TDocument).Name}': it already has '{_routeProperties[typeof(TDocument)]}' mapped.");
 			}
 
-			this._routeProperties.Add(typeof(TDocument), fieldName);
+			_routeProperties.Add(typeof(TDocument), fieldName);
 		}
 
 		private void ApplyPropertyMappings<TDocument>(IList<IClrPropertyMapping<TDocument>> mappings)
@@ -225,7 +226,9 @@ private void ApplyPropertyMappings<TDocument>(IList<IClrPropertyMapping<TDocumen
 						throw new ArgumentException(
 							$"Property mapping '{e}' on type {typeName} can not be mapped to '{newName}' it already has an ignore mapping");
 					if (newName.IsNullOrEmpty())
-						throw new ArgumentException($"Property mapping '{e}' on type {typeName} can not be ignored it already has a mapping to '{mappedAs}'");
+						throw new ArgumentException(
+							$"Property mapping '{e}' on type {typeName} can not be ignored it already has a mapping to '{mappedAs}'");
+
 					throw new ArgumentException(
 						$"Property mapping '{e}' on type {typeName} can not be mapped to '{newName}' already mapped as '{mappedAs}'");
 				}
@@ -249,27 +252,27 @@ public TConnectionSettings DefaultMappingFor<TDocument>(Func<ClrTypeMappingDescr
 		{
 			var inferMapping = selector(new ClrTypeMappingDescriptor<TDocument>());
 			if (!inferMapping.IndexName.IsNullOrEmpty())
-				this._defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
+				_defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
 
 			if (!inferMapping.TypeName.IsNullOrEmpty())
-				this._defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
+				_defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
 
 			if (!inferMapping.RelationName.IsNullOrEmpty())
-				this._defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
+				_defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
 
 			if (!string.IsNullOrWhiteSpace(inferMapping.IdPropertyName))
-				this._idProperties[inferMapping.ClrType] = inferMapping.IdPropertyName;
+				_idProperties[inferMapping.ClrType] = inferMapping.IdPropertyName;
 
 			if (inferMapping.IdProperty != null)
-				this.MapIdPropertyFor<TDocument>(inferMapping.IdProperty);
+				MapIdPropertyFor<TDocument>(inferMapping.IdProperty);
 
 			if (inferMapping.RoutingProperty != null)
-				this.MapRoutePropertyFor<TDocument>(inferMapping.RoutingProperty);
+				MapRoutePropertyFor<TDocument>(inferMapping.RoutingProperty);
 
 			if (inferMapping.Properties != null)
-				this.ApplyPropertyMappings<TDocument>(inferMapping.Properties);
+				ApplyPropertyMappings<TDocument>(inferMapping.Properties);
 
-			return (TConnectionSettings) this;
+			return (TConnectionSettings)this;
 		}
 
 		/// <summary>
@@ -281,18 +284,18 @@ public TConnectionSettings DefaultMappingFor(Type documentType, Func<ClrTypeMapp
 		{
 			var inferMapping = selector(new ClrTypeMappingDescriptor(documentType));
 			if (!inferMapping.IndexName.IsNullOrEmpty())
-				this._defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
+				_defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
 
 			if (!inferMapping.TypeName.IsNullOrEmpty())
-				this._defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
+				_defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
 
 			if (!inferMapping.RelationName.IsNullOrEmpty())
-				this._defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
+				_defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
 
 			if (!string.IsNullOrWhiteSpace(inferMapping.IdPropertyName))
-				this._idProperties[inferMapping.ClrType] = inferMapping.IdPropertyName;
+				_idProperties[inferMapping.ClrType] = inferMapping.IdPropertyName;
 
-			return (TConnectionSettings) this;
+			return (TConnectionSettings)this;
 		}
 
 		/// <summary>
@@ -301,20 +304,21 @@ public TConnectionSettings DefaultMappingFor(Type documentType, Func<ClrTypeMapp
 		/// <param name="typeMappings">The mappings for the POCO types you wish to configure</param>
 		public TConnectionSettings DefaultMappingFor(IEnumerable<IClrTypeMapping> typeMappings)
 		{
-			if (typeMappings == null) return (TConnectionSettings) this;
+			if (typeMappings == null) return (TConnectionSettings)this;
+
 			foreach (var inferMapping in typeMappings)
 			{
 				if (!inferMapping.IndexName.IsNullOrEmpty())
-					this._defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
+					_defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
 
 				if (!inferMapping.TypeName.IsNullOrEmpty())
-					this._defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
+					_defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
 
 				if (!inferMapping.RelationName.IsNullOrEmpty())
-					this._defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
+					_defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
 			}
 
-			return (TConnectionSettings) this;
+			return (TConnectionSettings)this;
 		}
 	}
 }
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsValuesExtensions.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsValuesExtensions.cs
index a23677b2458..9124f846253 100644
--- a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsValuesExtensions.cs
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsValuesExtensions.cs
@@ -1,5 +1,4 @@
 using System;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -8,8 +7,9 @@ internal static class ConnectionSettingsValuesExtensions
 	{
 		public static InternalSerializer CreateStateful(this IConnectionSettingsValues settings, JsonConverter converter)
 		{
-			var s = (settings as ConnectionSettings)
-				?? throw new NullReferenceException($"Stateful serializer expected {nameof(IConnectionSettingsValues)} to be {nameof(ConnectionSettings)}");
+			var s = settings as ConnectionSettings
+				?? throw new NullReferenceException(
+					$"Stateful serializer expected {nameof(IConnectionSettingsValues)} to be {nameof(ConnectionSettings)}");
 
 			return StatefulSerializerFactory.CreateStateful(s, converter);
 		}
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/IConnectionSettingsValues.cs b/src/Nest/CommonAbstractions/ConnectionSettings/IConnectionSettingsValues.cs
index 454ce57cd59..f1fbb261a6b 100644
--- a/src/Nest/CommonAbstractions/ConnectionSettings/IConnectionSettingsValues.cs
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/IConnectionSettingsValues.cs
@@ -1,28 +1,26 @@
 using System;
-using System.Collections.ObjectModel;
 using System.Reflection;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
 
 namespace Nest
 {
 	public interface IConnectionSettingsValues : IConnectionConfigurationValues
 	{
-		Inferrer Inferrer { get; }
-		FluentDictionary<Type, string> DefaultIndices { get; }
-		FluentDictionary<Type, string> DefaultTypeNames { get; }
-		FluentDictionary<Type, string> DefaultRelationNames { get; }
-		FluentDictionary<Type, string> IdProperties { get; }
-		FluentDictionary<Type, string> RouteProperties { get; }
-		FluentDictionary<MemberInfo, IPropertyMapping> PropertyMappings { get; }
+		Func<string, string> DefaultFieldNameInferrer { get; }
 
 		string DefaultIndex { get; }
+		FluentDictionary<Type, string> DefaultIndices { get; }
+		FluentDictionary<Type, string> DefaultRelationNames { get; }
 		string DefaultTypeName { get; }
 
 		Func<Type, string> DefaultTypeNameInferrer { get; }
-		Func<string, string> DefaultFieldNameInferrer { get; }
+		FluentDictionary<Type, string> DefaultTypeNames { get; }
+		FluentDictionary<Type, string> IdProperties { get; }
+		Inferrer Inferrer { get; }
+		IPropertyMappingProvider PropertyMappingProvider { get; }
+		FluentDictionary<MemberInfo, IPropertyMapping> PropertyMappings { get; }
+		FluentDictionary<Type, string> RouteProperties { get; }
 
 		IElasticsearchSerializer SourceSerializer { get; }
-		IPropertyMappingProvider PropertyMappingProvider { get; }
 	}
 }
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/MemberInfoResolver.cs b/src/Nest/CommonAbstractions/ConnectionSettings/MemberInfoResolver.cs
index 54bd1d60406..51ef47da4b8 100644
--- a/src/Nest/CommonAbstractions/ConnectionSettings/MemberInfoResolver.cs
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/MemberInfoResolver.cs
@@ -9,18 +9,14 @@ namespace Nest
 	/// </summary>
 	public class MemberInfoResolver : ExpressionVisitor
 	{
-		private readonly IList<MemberInfo> _members = new List<MemberInfo>();
-		public IList<MemberInfo> Members { get { return _members; } }
+		public MemberInfoResolver(Expression expression) => Visit(expression);
 
-		public MemberInfoResolver(Expression expression)
-		{
-			base.Visit(expression);
-		}
+		public IList<MemberInfo> Members { get; } = new List<MemberInfo>();
 
 		protected override Expression VisitMember(MemberExpression expression)
 		{
-			this._members.Add(expression.Member);
+			Members.Add(expression.Member);
 			return base.VisitMember(expression);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IIsADictionary.cs b/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IIsADictionary.cs
index de9424ae5ae..c0856b15774 100644
--- a/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IIsADictionary.cs
+++ b/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IIsADictionary.cs
@@ -2,7 +2,7 @@
 
 namespace Nest
 {
-	public interface IIsADictionary {}
-	public interface IIsADictionary<TKey, TValue> : IDictionary<TKey, TValue>, IIsADictionary {}
+	public interface IIsADictionary { }
 
+	public interface IIsADictionary<TKey, TValue> : IDictionary<TKey, TValue>, IIsADictionary { }
 }
diff --git a/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IsADictionaryBase.cs b/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IsADictionaryBase.cs
index 75e77f23cf4..9c3154ac0f3 100644
--- a/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IsADictionaryBase.cs
+++ b/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IsADictionaryBase.cs
@@ -1,66 +1,74 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 
 namespace Nest
 {
 	public abstract class IsADictionaryBase<TKey, TValue> : IIsADictionary<TKey, TValue>
 	{
-		protected Dictionary<TKey, TValue> BackingDictionary { get; }
-		private ICollection<KeyValuePair<TKey, TValue>> Self => BackingDictionary;
-
-		protected IsADictionaryBase() => this.BackingDictionary = new Dictionary<TKey, TValue>();
+		protected IsADictionaryBase() => BackingDictionary = new Dictionary<TKey, TValue>();
 
 		protected IsADictionaryBase(IDictionary<TKey, TValue> backingDictionary)
 		{
 			if (backingDictionary != null)
-				foreach (var key in backingDictionary.Keys) ValidateKey(Sanitize(key));
+				foreach (var key in backingDictionary.Keys)
+					ValidateKey(Sanitize(key));
 
-			this.BackingDictionary = backingDictionary != null
+			BackingDictionary = backingDictionary != null
 				? new Dictionary<TKey, TValue>(backingDictionary)
 				: new Dictionary<TKey, TValue>();
 		}
 
-		IEnumerator IEnumerable.GetEnumerator() => this.BackingDictionary.GetEnumerator();
-
-		IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() => this.BackingDictionary.GetEnumerator();
+		public TValue this[TKey key]
+		{
+			get => BackingDictionary[Sanitize(key)];
+			set => BackingDictionary[ValidateKey(Sanitize(key))] = value;
+		}
 
-		void ICollection<KeyValuePair<TKey, TValue>>.Clear() => this.BackingDictionary.Clear();
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item) => Self.Contains(item);
-		void ICollection<KeyValuePair<TKey, TValue>>.CopyTo( KeyValuePair<TKey, TValue>[] array, int arrayIndex) => Self.CopyTo(array, arrayIndex);
-		int ICollection<KeyValuePair<TKey, TValue>>.Count => this.BackingDictionary.Count;
+		protected Dictionary<TKey, TValue> BackingDictionary { get; }
+		int ICollection<KeyValuePair<TKey, TValue>>.Count => BackingDictionary.Count;
 		bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly => Self.IsReadOnly;
-		bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item) => Self.Remove(item);
+
+		TValue IDictionary<TKey, TValue>.this[TKey key]
+		{
+			get => BackingDictionary[Sanitize(key)];
+			set => BackingDictionary[ValidateKey(Sanitize(key))] = value;
+		}
+
+		ICollection<TKey> IDictionary<TKey, TValue>.Keys => BackingDictionary.Keys;
+		private ICollection<KeyValuePair<TKey, TValue>> Self => BackingDictionary;
+		ICollection<TValue> IDictionary<TKey, TValue>.Values => BackingDictionary.Values;
+
 		void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item)
 		{
 			ValidateKey(Sanitize(item.Key));
 			Self.Add(item);
 		}
 
-		ICollection<TKey> IDictionary<TKey, TValue>.Keys => this.BackingDictionary.Keys;
-		ICollection<TValue> IDictionary<TKey, TValue>.Values => this.BackingDictionary.Values;
+		void ICollection<KeyValuePair<TKey, TValue>>.Clear() => BackingDictionary.Clear();
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item) => Self.Contains(item);
+
+		void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex) => Self.CopyTo(array, arrayIndex);
+
+		bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item) => Self.Remove(item);
+
+		void IDictionary<TKey, TValue>.Add(TKey key, TValue value) => BackingDictionary.Add(ValidateKey(Sanitize(key)), value);
 
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		bool IDictionary<TKey, TValue>.ContainsKey(TKey key) => this.BackingDictionary.ContainsKey(Sanitize(key));
-		void IDictionary<TKey, TValue>.Add(TKey key, TValue value) => this.BackingDictionary.Add(ValidateKey(Sanitize(key)), value);
-		bool IDictionary<TKey, TValue>.Remove(TKey key) => this.BackingDictionary.Remove(Sanitize(key));
-		bool IDictionary<TKey, TValue>.TryGetValue(TKey key, out TValue value) => this.BackingDictionary.TryGetValue(Sanitize(key), out value);
+		bool IDictionary<TKey, TValue>.ContainsKey(TKey key) => BackingDictionary.ContainsKey(Sanitize(key));
 
-		protected virtual TKey ValidateKey(TKey key) => key;
-		protected virtual TKey Sanitize(TKey key) => key;
+		bool IDictionary<TKey, TValue>.Remove(TKey key) => BackingDictionary.Remove(Sanitize(key));
 
-		TValue IDictionary<TKey, TValue>.this[TKey key]
-		{
-			get => this.BackingDictionary[Sanitize(key)];
-			set => this.BackingDictionary[ValidateKey(Sanitize(key))] = value;
-		}
+		bool IDictionary<TKey, TValue>.TryGetValue(TKey key, out TValue value) => BackingDictionary.TryGetValue(Sanitize(key), out value);
 
-		public TValue this[TKey key]
-		{
-			get => this.BackingDictionary[Sanitize(key)];
-			set => this.BackingDictionary[ValidateKey(Sanitize(key))] = value;
-		}
+		IEnumerator IEnumerable.GetEnumerator() => BackingDictionary.GetEnumerator();
+
+		IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() => BackingDictionary.GetEnumerator();
+
+		protected virtual TKey ValidateKey(TKey key) => key;
+
+		protected virtual TKey Sanitize(TKey key) => key;
 	}
 }
diff --git a/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IsADictionaryDescriptorBase.cs b/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IsADictionaryDescriptorBase.cs
index f750420010e..f245cc7a0fc 100644
--- a/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IsADictionaryDescriptorBase.cs
+++ b/src/Nest/CommonAbstractions/DictionaryLike/IsADictionary/IsADictionaryDescriptorBase.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Nest
 {
 	public abstract class IsADictionaryDescriptorBase<TDescriptor, TInterface, TKey, TValue>
@@ -7,7 +5,7 @@ public abstract class IsADictionaryDescriptorBase<TDescriptor, TInterface, TKey,
 		where TDescriptor : IsADictionaryDescriptorBase<TDescriptor, TInterface, TKey, TValue>
 		where TInterface : class, IIsADictionary<TKey, TValue>
 	{
-		protected IsADictionaryDescriptorBase(TInterface instance) : base(instance) {}
+		protected IsADictionaryDescriptorBase(TInterface instance) : base(instance) { }
 
 		protected TDescriptor Assign(TKey key, TValue value) => Assign(a => a.Add(key, value));
 	}
diff --git a/src/Nest/CommonAbstractions/DictionaryLike/IsAReadOnlyDictionary/IIsAReadOnlyDictionary.cs b/src/Nest/CommonAbstractions/DictionaryLike/IsAReadOnlyDictionary/IIsAReadOnlyDictionary.cs
index 7bd3d87be96..02828760442 100644
--- a/src/Nest/CommonAbstractions/DictionaryLike/IsAReadOnlyDictionary/IIsAReadOnlyDictionary.cs
+++ b/src/Nest/CommonAbstractions/DictionaryLike/IsAReadOnlyDictionary/IIsAReadOnlyDictionary.cs
@@ -2,7 +2,7 @@
 
 namespace Nest
 {
-	public interface IIsAReadOnlyDictionary {}
-	public interface IIsAReadOnlyDictionary<TKey, TValue> : IReadOnlyDictionary<TKey, TValue>, IIsAReadOnlyDictionary {}
+	public interface IIsAReadOnlyDictionary { }
 
+	public interface IIsAReadOnlyDictionary<TKey, TValue> : IReadOnlyDictionary<TKey, TValue>, IIsAReadOnlyDictionary { }
 }
diff --git a/src/Nest/CommonAbstractions/DictionaryLike/IsAReadOnlyDictionary/IsADictionaryBase.cs b/src/Nest/CommonAbstractions/DictionaryLike/IsAReadOnlyDictionary/IsADictionaryBase.cs
index 9f41d61a755..f8b79653ade 100644
--- a/src/Nest/CommonAbstractions/DictionaryLike/IsAReadOnlyDictionary/IsADictionaryBase.cs
+++ b/src/Nest/CommonAbstractions/DictionaryLike/IsAReadOnlyDictionary/IsADictionaryBase.cs
@@ -1,13 +1,10 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 
 namespace Nest
 {
 	public abstract class IsAReadOnlyDictionaryBase<TKey, TValue> : IIsAReadOnlyDictionary<TKey, TValue>
 	{
-		protected internal IReadOnlyDictionary<TKey, TValue> BackingDictionary { get; } = EmptyReadOnly<TKey, TValue>.Dictionary;
-
 		protected IsAReadOnlyDictionaryBase(IReadOnlyDictionary<TKey, TValue> backingDictionary)
 		{
 			if (backingDictionary == null) return;
@@ -18,27 +15,28 @@ protected IsAReadOnlyDictionaryBase(IReadOnlyDictionary<TKey, TValue> backingDic
 				// expect all implementations of Sanitize to be pure
 				dictionary[Sanitize(key)] = backingDictionary[key];
 
-			this.BackingDictionary = dictionary;
+			BackingDictionary = dictionary;
 		}
 
-		protected virtual TKey Sanitize(TKey key) => key;
+		public int Count => BackingDictionary.Count;
 
-		IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() =>
-			this.BackingDictionary.GetEnumerator();
+		public TValue this[TKey key] => BackingDictionary[key];
 
-		IEnumerator IEnumerable.GetEnumerator() => this.BackingDictionary.GetEnumerator();
+		public IEnumerable<TKey> Keys => BackingDictionary.Keys;
 
-		public int Count => this.BackingDictionary.Count;
+		public IEnumerable<TValue> Values => BackingDictionary.Values;
+		protected internal IReadOnlyDictionary<TKey, TValue> BackingDictionary { get; } = EmptyReadOnly<TKey, TValue>.Dictionary;
 
-		public bool ContainsKey(TKey key) => this.BackingDictionary.ContainsKey(key);
+		IEnumerator IEnumerable.GetEnumerator() => BackingDictionary.GetEnumerator();
 
-		public bool TryGetValue(TKey key, out TValue value) =>
-			this.BackingDictionary.TryGetValue(key, out value);
+		IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() =>
+			BackingDictionary.GetEnumerator();
 
-		public TValue this[TKey key] => this.BackingDictionary[key];
+		public bool ContainsKey(TKey key) => BackingDictionary.ContainsKey(key);
 
-		public IEnumerable<TKey> Keys => this.BackingDictionary.Keys;
+		public bool TryGetValue(TKey key, out TValue value) =>
+			BackingDictionary.TryGetValue(key, out value);
 
-		public IEnumerable<TValue> Values => this.BackingDictionary.Values;
+		protected virtual TKey Sanitize(TKey key) => key;
 	}
 }
diff --git a/src/Nest/CommonAbstractions/DictionaryLike/PerFieldAnalyzer/PerFieldAnalyzer.cs b/src/Nest/CommonAbstractions/DictionaryLike/PerFieldAnalyzer/PerFieldAnalyzer.cs
index 197667e0425..c260f3e78d5 100644
--- a/src/Nest/CommonAbstractions/DictionaryLike/PerFieldAnalyzer/PerFieldAnalyzer.cs
+++ b/src/Nest/CommonAbstractions/DictionaryLike/PerFieldAnalyzer/PerFieldAnalyzer.cs
@@ -11,18 +11,19 @@ public interface IPerFieldAnalyzer : IIsADictionary<Field, string> { }
 
 	public class PerFieldAnalyzer : IsADictionaryBase<Field, string>, IPerFieldAnalyzer
 	{
-		public PerFieldAnalyzer() {}
+		public PerFieldAnalyzer() { }
+
 		public PerFieldAnalyzer(IDictionary<Field, string> container) : base(container) { }
+
 		public PerFieldAnalyzer(Dictionary<Field, string> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{}
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		public void Add(Field field, string analyzer) => BackingDictionary.Add(field, analyzer);
 	}
 
 	public class PerFieldAnalyzer<T> : PerFieldAnalyzer where T : class
 	{
-		public void Add(Expression<Func<T, object>>  field, string analyzer) => BackingDictionary.Add(field, analyzer);
+		public void Add(Expression<Func<T, object>> field, string analyzer) => BackingDictionary.Add(field, analyzer);
 	}
 
 	public class PerFieldAnalyzerDescriptor<T> : IsADictionaryDescriptorBase<PerFieldAnalyzerDescriptor<T>, IPerFieldAnalyzer, Field, string>
diff --git a/src/Nest/CommonAbstractions/Extensions/ExceptionExtensions.cs b/src/Nest/CommonAbstractions/Extensions/ExceptionExtensions.cs
index 7dafef7de39..5e08562c9b2 100644
--- a/src/Nest/CommonAbstractions/Extensions/ExceptionExtensions.cs
+++ b/src/Nest/CommonAbstractions/Extensions/ExceptionExtensions.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 
@@ -27,6 +25,5 @@ internal static T ThrowWhen<T>(this T @object, Func<T, bool> predicate, string e
 
 			return @object;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Extensions/ExpressionExtensions.cs b/src/Nest/CommonAbstractions/Extensions/ExpressionExtensions.cs
index bead4b1151e..f1b3be2e511 100644
--- a/src/Nest/CommonAbstractions/Extensions/ExpressionExtensions.cs
+++ b/src/Nest/CommonAbstractions/Extensions/ExpressionExtensions.cs
@@ -7,8 +7,11 @@ namespace Nest
 {
 	public static class ExpressionExtensions
 	{
+		private static readonly Regex ExpressionRegex = new Regex(@"^\s*(.*)\s*\=\>\s*\1\.");
+		private static readonly Regex MemberExpressionRegex = new Regex(@"^[^\.]*\.");
+
 		/// <summary>
-		/// Appends <paramref name="suffix"/> to the path separating it with a dot.
+		/// Appends <paramref name="suffix" /> to the path separating it with a dot.
 		/// This is especially useful with multi fields.
 		/// </summary>
 		/// <param name="expression">the expression to which the suffix should be applied</param>
@@ -19,34 +22,6 @@ public static Expression<Func<T, object>> AppendSuffix<T>(this Expression<Func<T
 			return Expression.Lambda<Func<T, object>>(newBody, expression.Parameters[0]);
 		}
 
-		/// <summary>
-		/// Calls <see cref="SuffixExtensions.Suffix"/> on a member expression.
-		/// </summary>
-		private class SuffixExpressionVisitor : ExpressionVisitor
-		{
-			private readonly string _suffix;
-
-			public SuffixExpressionVisitor(string suffix)
-			{
-				this._suffix = suffix;
-			}
-
-			public override Expression Visit(Expression node)
-			{
-				return Expression.Call(
-					typeof(SuffixExtensions),
-					nameof(SuffixExtensions.Suffix),
-					null,
-					node,
-					Expression.Constant(_suffix));
-			}
-
-			protected override Expression VisitUnary(UnaryExpression node) => node;
-		}
-
-		private static readonly Regex ExpressionRegex = new Regex(@"^\s*(.*)\s*\=\>\s*\1\.");
-		private static readonly Regex MemberExpressionRegex = new Regex(@"^[^\.]*\.");
-
 		internal static object ComparisonValueFromExpression(this Expression expression, out Type type)
 		{
 			type = null;
@@ -62,5 +37,24 @@ internal static object ComparisonValueFromExpression(this Expression expression,
 				? MemberExpressionRegex.Replace(memberExpression.ToString(), string.Empty)
 				: ExpressionRegex.Replace(expression.ToString(), string.Empty);
 		}
+
+		/// <summary>
+		/// Calls <see cref="SuffixExtensions.Suffix" /> on a member expression.
+		/// </summary>
+		private class SuffixExpressionVisitor : ExpressionVisitor
+		{
+			private readonly string _suffix;
+
+			public SuffixExpressionVisitor(string suffix) => _suffix = suffix;
+
+			public override Expression Visit(Expression node) => Expression.Call(
+				typeof(SuffixExtensions),
+				nameof(SuffixExtensions.Suffix),
+				null,
+				node,
+				Expression.Constant(_suffix));
+
+			protected override Expression VisitUnary(UnaryExpression node) => node;
+		}
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Extensions/Extensions.cs b/src/Nest/CommonAbstractions/Extensions/Extensions.cs
index 7a71c60f316..2489f946771 100644
--- a/src/Nest/CommonAbstractions/Extensions/Extensions.cs
+++ b/src/Nest/CommonAbstractions/Extensions/Extensions.cs
@@ -7,12 +7,11 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text;
-using Elasticsearch.Net;
+using System.Threading;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
-using System.Threading.Tasks;
-using System.Threading;
 
 namespace Nest
 {
@@ -20,6 +19,7 @@ internal static class EmptyReadOnly<TElement>
 	{
 		public static readonly IReadOnlyCollection<TElement> Collection = new ReadOnlyCollection<TElement>(new TElement[0]);
 	}
+
 	internal static class EmptyReadOnly<TKey, TValue>
 	{
 		public static readonly IReadOnlyDictionary<TKey, TValue> Dictionary = new ReadOnlyDictionary<TKey, TValue>(new Dictionary<TKey, TValue>(0));
@@ -41,6 +41,7 @@ internal static TReturn InvokeOrDefault<T1, T2, TReturn>(this Func<T1, T2, TRetu
 
 		internal static readonly JsonConverter dateConverter = new IsoDateTimeConverter { Culture = CultureInfo.InvariantCulture };
 		internal static readonly JsonSerializer serializer = new JsonSerializer();
+
 		internal static string ToJsonNetString(this DateTime date)
 		{
 			using (var writer = new JTokenWriter())
@@ -50,10 +51,8 @@ internal static string ToJsonNetString(this DateTime date)
 			}
 		}
 
-		internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Func<T, TKey> property)
-		{
-			return items.GroupBy(property).Select(x => x.First());
-		}
+		internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Func<T, TKey> property) =>
+			items.GroupBy(property).Select(x => x.First());
 
 		internal static ConcurrentDictionary<string, object> _enumCache = new ConcurrentDictionary<string, object>();
 
@@ -95,7 +94,7 @@ internal static string ToEnumValue<T>(this T enumValue) where T : struct
 				var enumMemberAttribute = enumFieldInfo.GetCustomAttribute<EnumMemberAttribute>();
 				if (enumMemberAttribute?.Value.Equals(str, comparison) ?? false)
 				{
-					var v = (T) Enum.Parse(enumType, name);
+					var v = (T)Enum.Parse(enumType, name);
 					_enumCache.TryAdd(key, v);
 					return v;
 				}
@@ -103,7 +102,7 @@ internal static string ToEnumValue<T>(this T enumValue) where T : struct
 				var alternativeEnumMemberAttribute = enumFieldInfo.GetCustomAttribute<AlternativeEnumMemberAttribute>();
 				if (alternativeEnumMemberAttribute?.Value.Equals(str, comparison) ?? false)
 				{
-					var v = (T) Enum.Parse(enumType, name);
+					var v = (T)Enum.Parse(enumType, name);
 					_enumCache.TryAdd(key, v);
 					return v;
 				}
@@ -118,19 +117,12 @@ internal static string ToEnumValue<T>(this T enumValue) where T : struct
 		internal static string Utf8String(this byte[] bytes) => bytes == null ? null : Encoding.UTF8.GetString(bytes, 0, bytes.Length);
 #endif
 
-		internal static byte[] Utf8Bytes(this string s)
-		{
-			return s.IsNullOrEmpty() ? null : Encoding.UTF8.GetBytes(s);
-		}
+		internal static byte[] Utf8Bytes(this string s) => s.IsNullOrEmpty() ? null : Encoding.UTF8.GetBytes(s);
+
+		internal static bool IsNullOrEmpty(this TypeName value) => value == null || value.GetHashCode() == 0;
+
+		internal static bool IsNullOrEmpty(this IndexName value) => value == null || value.GetHashCode() == 0;
 
-		internal static bool IsNullOrEmpty(this TypeName value)
-		{
-			return value == null || value.GetHashCode() == 0;
-		}
-		internal static bool IsNullOrEmpty(this IndexName value)
-		{
-			return value == null || value.GetHashCode() == 0;
-		}
 		internal static bool IsValueType(this Type type)
 		{
 #if DOTNETCORE
@@ -154,46 +146,39 @@ internal static void ThrowIfEmpty<T>(this IEnumerable<T> @object, string paramet
 				throw new ArgumentException("Argument can not be an empty collection", parameterName);
 		}
 
-		internal static List<T> AsInstanceOrToListOrDefault<T>(this IEnumerable<T> list)
-		{
-			return list as List<T> ?? list?.ToList<T>() ?? new List<T>();
-		}
-		internal static List<T> AsInstanceOrToListOrNull<T>(this IEnumerable<T> list)
-		{
-			return list as List<T> ?? list?.ToList<T>();
-		}
+		internal static List<T> AsInstanceOrToListOrDefault<T>(this IEnumerable<T> list) => list as List<T> ?? list?.ToList<T>() ?? new List<T>();
+
+		internal static List<T> AsInstanceOrToListOrNull<T>(this IEnumerable<T> list) => list as List<T> ?? list?.ToList<T>();
 
 		internal static List<T> EagerConcat<T>(this IEnumerable<T> list, IEnumerable<T> other)
 		{
 			var first = list.AsInstanceOrToListOrDefault();
 			if (other == null) return first;
+
 			var second = other.AsInstanceOrToListOrDefault();
 			var newList = new List<T>(first.Count + second.Count);
 			newList.AddRange(first);
 			newList.AddRange(second);
 			return newList;
 		}
+
 		internal static IEnumerable<T> AddIfNotNull<T>(this IEnumerable<T> list, T other)
 		{
 			if (other == null) return list;
+
 			var l = list.AsInstanceOrToListOrDefault();
 			l.Add(other);
 			return l;
 		}
 
-		internal static bool HasAny<T>(this IEnumerable<T> list, Func<T, bool> predicate)
-		{
-			return list != null && list.Any(predicate);
-		}
+		internal static bool HasAny<T>(this IEnumerable<T> list, Func<T, bool> predicate) => list != null && list.Any(predicate);
 
-		internal static bool HasAny<T>(this IEnumerable<T> list)
-		{
-			return list != null && list.Any();
-		}
+		internal static bool HasAny<T>(this IEnumerable<T> list) => list != null && list.Any();
 
 		internal static bool IsEmpty<T>(this IEnumerable<T> list)
 		{
 			if (list == null) return true;
+
 			var enumerable = list as T[] ?? list.ToArray();
 			return !enumerable.Any() || enumerable.All(t => t == null);
 		}
@@ -204,24 +189,23 @@ internal static void ThrowIfNull<T>(this T value, string name, string message =
 			else if (value == null) throw new ArgumentNullException(name, "Argument can not be null when " + message);
 		}
 
-		internal static bool IsNullOrEmpty(this string value)
-		{
-			return string.IsNullOrWhiteSpace(value);
-		}
+		internal static bool IsNullOrEmpty(this string value) => string.IsNullOrWhiteSpace(value);
+
 		internal static bool IsNullOrEmptyCommaSeparatedList(this string value, out string[] split)
 		{
 			split = null;
 			if (string.IsNullOrWhiteSpace(value)) return true;
-			split = value.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries)
-				.Where(t=>!t.IsNullOrEmpty())
-				.Select(t=>t.Trim())
+
+			split = value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+				.Where(t => !t.IsNullOrEmpty())
+				.Select(t => t.Trim())
 				.ToArray();
 			return split.Length == 0;
 		}
 
 		internal static void ForEach<T>(this IEnumerable<T> enumerable, Action<T> handler)
 		{
-			foreach (T item in enumerable) handler(item);
+			foreach (var item in enumerable) handler(item);
 		}
 
 		internal static List<T> ToListOrNullIfEmpty<T>(this IEnumerable<T> enumerable)
@@ -233,12 +217,15 @@ internal static List<T> ToListOrNullIfEmpty<T>(this IEnumerable<T> enumerable)
 		internal static void AddIfNotNull<T>(this IList<T> list, T item) where T : class
 		{
 			if (item == null) return;
+
 			list.Add(item);
 		}
+
 		internal static void AddRangeIfNotNull<T>(this List<T> list, IEnumerable<T> item) where T : class
 		{
 			if (item == null) return;
-			list.AddRange(item.Where(x=>x!=null));
+
+			list.AddRange(item.Where(x => x != null));
 		}
 
 		internal static Dictionary<TKey, TValue> NullIfNoKeys<TKey, TValue>(this Dictionary<TKey, TValue> dictionary)
@@ -258,13 +245,13 @@ internal static async Task ForEachAsync<TSource, TResult>(
 			SemaphoreSlim additionalRateLimitter = null
 		)
 		{
-			var semaphore = new SemaphoreSlim(initialCount: maxDegreeOfParallelism, maxCount: maxDegreeOfParallelism);
+			var semaphore = new SemaphoreSlim(maxDegreeOfParallelism, maxDegreeOfParallelism);
 			long page = 0;
 
 			try
 			{
 				var tasks = new List<Task>(maxDegreeOfParallelism);
-				int i = 0;
+				var i = 0;
 				foreach (var item in lazyList)
 				{
 					tasks.Add(ProcessAsync(item, taskSelector, resultProcessor, semaphore, additionalRateLimitter, page++));
@@ -292,7 +279,8 @@ private static async Task ProcessAsync<TSource, TResult>(
 			Action<TSource, TResult> resultProcessor,
 			SemaphoreSlim localRateLimiter,
 			SemaphoreSlim additionalRateLimiter,
-			long page)
+			long page
+		)
 		{
 			if (localRateLimiter != null) await localRateLimiter.WaitAsync().ConfigureAwait(false);
 			if (additionalRateLimiter != null) await additionalRateLimiter.WaitAsync().ConfigureAwait(false);
@@ -312,8 +300,8 @@ internal static bool NullOrEquals<T>(this T o, T other)
 		{
 			if (o == null && other == null) return true;
 			if (o == null || other == null) return false;
+
 			return o.Equals(other);
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Extensions/JsonExtensions.cs b/src/Nest/CommonAbstractions/Extensions/JsonExtensions.cs
index e80e310f5e8..21a2801b2a9 100644
--- a/src/Nest/CommonAbstractions/Extensions/JsonExtensions.cs
+++ b/src/Nest/CommonAbstractions/Extensions/JsonExtensions.cs
@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -15,6 +10,7 @@ public static IConnectionSettingsValues GetConnectionSettings(this JsonSerialize
 			var contract = serializer.ContractResolver as ElasticContractResolver;
 			if (contract?.ConnectionSettings == null)
 				throw new Exception("If you use a custom contract resolver be sure to subclass from " + nameof(ElasticContractResolver));
+
 			return contract.ConnectionSettings;
 		}
 
@@ -29,6 +25,7 @@ public static TConverter GetStatefulConverter<TConverter>(this JsonSerializer se
 		public static void WriteProperty(this JsonWriter writer, JsonSerializer serializer, string propertyName, object value)
 		{
 			if (value == null) return;
+
 			writer.WritePropertyName(propertyName);
 			serializer.Serialize(writer, value);
 		}
diff --git a/src/Nest/CommonAbstractions/Extensions/StringExtensions.cs b/src/Nest/CommonAbstractions/Extensions/StringExtensions.cs
index 489c798ea98..9e7d749e159 100644
--- a/src/Nest/CommonAbstractions/Extensions/StringExtensions.cs
+++ b/src/Nest/CommonAbstractions/Extensions/StringExtensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Specialized;
-using System.Globalization;
 
 namespace Nest
 {
@@ -26,6 +25,7 @@ internal static NameValueCollection ToNameValueCollection(this string queryStrin
 
 			return queryParameters;
 		}
+
 		internal static string ToCamelCase(this string s)
 		{
 			if (string.IsNullOrEmpty(s))
@@ -34,13 +34,11 @@ internal static string ToCamelCase(this string s)
 			if (!char.IsUpper(s[0]))
 				return s;
 
-			string camelCase = char.ToLowerInvariant(s[0]).ToString();
+			var camelCase = char.ToLowerInvariant(s[0]).ToString();
 			if (s.Length > 1)
 				camelCase += s.Substring(1);
 
 			return camelCase;
 		}
-
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Extensions/SuffixExtensions.cs b/src/Nest/CommonAbstractions/Extensions/SuffixExtensions.cs
index b39b95a2a18..cd34959b9d1 100644
--- a/src/Nest/CommonAbstractions/Extensions/SuffixExtensions.cs
+++ b/src/Nest/CommonAbstractions/Extensions/SuffixExtensions.cs
@@ -4,12 +4,9 @@ public static class SuffixExtensions
 	{
 		/// <summary>
 		/// This extension method should only be used in expressions which are analysed by Nest.
-		/// When analysed it will append <paramref name="suffix"/> to the path separating it with a dot.
+		/// When analysed it will append <paramref name="suffix" /> to the path separating it with a dot.
 		/// This is especially useful with multi fields.
 		/// </summary>
-		public static object Suffix(this object @object, string suffix)
-		{
-			return @object;
-		}
+		public static object Suffix(this object @object, string suffix) => @object;
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Extensions/TypeExtensions.cs b/src/Nest/CommonAbstractions/Extensions/TypeExtensions.cs
index 1a96cb82f1f..23861f68120 100644
--- a/src/Nest/CommonAbstractions/Extensions/TypeExtensions.cs
+++ b/src/Nest/CommonAbstractions/Extensions/TypeExtensions.cs
@@ -15,12 +15,12 @@ internal static class TypeExtensions
 		private static readonly MethodInfo GetActivatorMethodInfo =
 			typeof(TypeExtensions).GetMethod(nameof(GetActivator), BindingFlags.Static | BindingFlags.NonPublic);
 
-		private static readonly ConcurrentDictionary<Type, Func<object>> CachedDefaultValues =
-			new ConcurrentDictionary<Type, Func<object>>();
-
 		private static readonly ConcurrentDictionary<string, ObjectActivator<object>> CachedActivators =
 			new ConcurrentDictionary<string, ObjectActivator<object>>();
 
+		private static readonly ConcurrentDictionary<Type, Func<object>> CachedDefaultValues =
+			new ConcurrentDictionary<Type, Func<object>>();
+
 		private static readonly ConcurrentDictionary<string, Type> CachedGenericClosedTypes =
 			new ConcurrentDictionary<string, Type>();
 
@@ -30,10 +30,13 @@ internal static class TypeExtensions
 		private static readonly ConcurrentDictionary<Type, IList<PropertyInfo>> CachedTypePropertyInfos =
 			new ConcurrentDictionary<Type, IList<PropertyInfo>>();
 
-		private delegate T ObjectActivator<out T>(params object[] args);
+
+		//this contract is only used to resolve properties in class WE OWN.
+		//these are not subject to change depending on what the user passes as connectionsettings
+		private static readonly ElasticContractResolver JsonContract = new ElasticContractResolver(new ConnectionSettings());
 
 		internal static object CreateGenericInstance(this Type t, Type closeOver, params object[] args) =>
-			t.CreateGenericInstance(new[] {closeOver}, args);
+			t.CreateGenericInstance(new[] { closeOver }, args);
 
 		internal static object CreateGenericInstance(this Type t, Type[] closeOver, params object[] args)
 		{
@@ -47,7 +50,7 @@ internal static object CreateGenericInstance(this Type t, Type[] closeOver, para
 			return closedType.CreateInstance(args);
 		}
 
-		internal static T CreateInstance<T>(this Type t, params object[] args) => (T) t.CreateInstance(args);
+		internal static T CreateInstance<T>(this Type t, params object[] args) => (T)t.CreateInstance(args);
 
 		internal static object CreateInstance(this Type t, params object[] args)
 		{
@@ -58,15 +61,16 @@ internal static object CreateInstance(this Type t, params object[] args)
 
 			var generic = GetActivatorMethodInfo.MakeGenericMethod(t);
 			var constructors = from c in t.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
-							   let p = c.GetParameters()
-							   let k = string.Join(",", p.Select(a => a.ParameterType.Name))
-							   where p.Length == args.Length
-							   select c;
+				let p = c.GetParameters()
+				let k = string.Join(",", p.Select(a => a.ParameterType.Name))
+				where p.Length == args.Length
+				select c;
 
 			var ctor = constructors.FirstOrDefault();
 			if (ctor == null)
 				throw new Exception($"Cannot create an instance of {t.FullName} because it has no constructor taking {args.Length} arguments");
-			activator = (ObjectActivator<object>) generic.Invoke(null, new object[] {ctor});
+
+			activator = (ObjectActivator<object>)generic.Invoke(null, new object[] { ctor });
 			CachedActivators.TryAdd(key, activator);
 			return activator(args);
 		}
@@ -74,10 +78,12 @@ internal static object CreateInstance(this Type t, params object[] args)
 		internal static object DefaultValue(this Type type) =>
 			type.IsValueType()
 				? CachedDefaultValues.GetOrAdd(type, t =>
-					Expression.Lambda<Func<object>>(
-						Expression.Convert(Expression.Default(type), typeof(object))
-					).Compile()
-				).Invoke()
+						Expression.Lambda<Func<object>>(
+								Expression.Convert(Expression.Default(type), typeof(object))
+							)
+							.Compile()
+					)
+					.Invoke()
 				: null;
 
 		//do not remove this is referenced through GetActivatorMethod
@@ -111,19 +117,17 @@ private static ObjectActivator<T> GetActivator<T>(ConstructorInfo ctor)
 			var lambda = Expression.Lambda(typeof(ObjectActivator<T>), newExp, param);
 
 			//compile it
-			var compiled = (ObjectActivator<T>) lambda.Compile();
+			var compiled = (ObjectActivator<T>)lambda.Compile();
 			return compiled;
 		}
 
-		//this contract is only used to resolve properties in class WE OWN.
-		//these are not subject to change depending on what the user passes as connectionsettings
-		private static readonly ElasticContractResolver JsonContract = new ElasticContractResolver(new ConnectionSettings());
-
 		internal static IList<JsonProperty> GetCachedObjectProperties(this Type t,
-			MemberSerialization memberSerialization = MemberSerialization.OptIn)
+			MemberSerialization memberSerialization = MemberSerialization.OptIn
+		)
 		{
 			if (CachedTypeProperties.TryGetValue(t, out var propertyDictionary))
 				return propertyDictionary;
+
 			propertyDictionary = JsonContract.PropertiesOfAll(t, memberSerialization);
 			CachedTypeProperties.TryAdd(t, propertyDictionary);
 			return propertyDictionary;
@@ -133,6 +137,7 @@ internal static IList<PropertyInfo> AllPropertiesCached(this Type t)
 		{
 			if (CachedTypePropertyInfos.TryGetValue(t, out var propertyInfos))
 				return propertyInfos;
+
 			propertyInfos = t.AllPropertiesNotCached().ToList();
 			CachedTypePropertyInfos.TryAdd(t, propertyInfos);
 			return propertyInfos;
@@ -150,15 +155,10 @@ private static IEnumerable<PropertyInfo> AllPropertiesNotCached(this Type type)
 				{
 					if (propertiesByName.ContainsKey(propertyInfo.Name))
 					{
-						if (IsHidingMember(propertyInfo))
-						{
-							propertiesByName[propertyInfo.Name] = propertyInfo;
-						}
+						if (IsHidingMember(propertyInfo)) propertiesByName[propertyInfo.Name] = propertyInfo;
 					}
 					else
-					{
 						propertiesByName.Add(propertyInfo.Name, propertyInfo);
-					}
 				}
 #if DOTNETCORE
 				type = type.GetTypeInfo()?.BaseType;
@@ -182,9 +182,11 @@ private static bool IsHidingMember(PropertyInfo propertyInfo)
 #endif
 			var baseProperty = baseType?.GetProperty(propertyInfo.Name);
 			if (baseProperty == null) return false;
+
 			var derivedGetMethod = propertyInfo.GetGetMethod().GetBaseDefinition();
 			return derivedGetMethod?.ReturnType != propertyInfo.PropertyType;
 		}
+
+		private delegate T ObjectActivator<out T>(params object[] args);
 	}
 }
-
diff --git a/src/Nest/CommonAbstractions/Fields/FieldValues.cs b/src/Nest/CommonAbstractions/Fields/FieldValues.cs
index c8de281d885..4f88f8a8554 100644
--- a/src/Nest/CommonAbstractions/Fields/FieldValues.cs
+++ b/src/Nest/CommonAbstractions/Fields/FieldValues.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -14,15 +11,20 @@ public class FieldValues : IsADictionaryBase<string, LazyDocument>
 	{
 		public static readonly FieldValues Empty = new FieldValues();
 
+		private static readonly HashSet<Type> NumericTypes = new HashSet<Type>
+		{
+			typeof(int), typeof(double), typeof(decimal),
+			typeof(long), typeof(short), typeof(sbyte),
+			typeof(byte), typeof(ulong), typeof(ushort),
+			typeof(uint), typeof(float)
+		};
+
 		private readonly Inferrer _inferrer;
 
 		protected FieldValues() : base() { }
 
 		internal FieldValues(Inferrer inferrer, IDictionary<string, LazyDocument> container)
-			: base(container)
-		{
-			_inferrer = inferrer;
-		}
+			: base(container) => _inferrer = inferrer;
 
 		public TValue Value<TValue>(Field field)
 		{
@@ -43,34 +45,29 @@ public TValue ValueOf<T, TValue>(Expression<Func<T, TValue>> objectPath)
 
 		public TValue[] ValuesOf<TValue>(Field field)
 		{
-			if (this._inferrer == null) return new TValue[0];
-			var path = this._inferrer.Field(field);
-			return this.FieldArray<TValue>(path);
+			if (_inferrer == null) return new TValue[0];
+
+			var path = _inferrer.Field(field);
+			return FieldArray<TValue>(path);
 		}
 
 		public TValue[] Values<T, TValue>(Expression<Func<T, TValue>> objectPath)
 			where T : class
 		{
-			if (this._inferrer == null) return new TValue[0];
-			var field = this._inferrer.Field(objectPath);
-			return this.FieldArray<TValue>(field);
-		}
+			if (_inferrer == null) return new TValue[0];
 
-		private static readonly HashSet<Type> NumericTypes = new HashSet<Type>
-		{
-			typeof(int),  typeof(double),  typeof(decimal),
-			typeof(long), typeof(short),   typeof(sbyte),
-			typeof(byte), typeof(ulong),   typeof(ushort),
-			typeof(uint), typeof(float)
-		};
+			var field = _inferrer.Field(objectPath);
+			return FieldArray<TValue>(field);
+		}
 
 		public static bool IsNumeric(Type myType) => NumericTypes.Contains(Nullable.GetUnderlyingType(myType) ?? myType);
+
 		public static bool IsNullable(Type type) => type.IsGeneric() && type.GetGenericTypeDefinition() == typeof(Nullable<>);
 
 		private TValue[] FieldArray<TValue>(string field)
 		{
 			//unknown field
-			if (this.BackingDictionary == null || !this.BackingDictionary.TryGetValue(field, out var o))
+			if (BackingDictionary == null || !BackingDictionary.TryGetValue(field, out var o))
 				return null;
 
 			//numerics are always returned as doubles by elasticsearch.
@@ -79,15 +76,17 @@ private TValue[] FieldArray<TValue>(string field)
 
 			//here we support casting to the desired numeric type whether its nullable or not.
 			if (!IsNullable(typeof(TValue)))
-				return o.As<double[]>().Select(d => (TValue) Convert.ChangeType(d, typeof(TValue))).ToArray();
+				return o.As<double[]>().Select(d => (TValue)Convert.ChangeType(d, typeof(TValue))).ToArray();
 
 			var underlyingType = Nullable.GetUnderlyingType(typeof(TValue));
-			return o.As<double?[]>().Select(d=>
-			{
-				if (d == null) return default(TValue);
-				return (TValue) Convert.ChangeType(d, underlyingType);
-			}).ToArray();
+			return o.As<double?[]>()
+				.Select(d =>
+				{
+					if (d == null) return default(TValue);
 
+					return (TValue)Convert.ChangeType(d, underlyingType);
+				})
+				.ToArray();
 		}
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Fields/FieldValuesJsonConverter.cs b/src/Nest/CommonAbstractions/Fields/FieldValuesJsonConverter.cs
index 262b5ec8e6c..faf28b96d06 100644
--- a/src/Nest/CommonAbstractions/Fields/FieldValuesJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Fields/FieldValuesJsonConverter.cs
@@ -1,10 +1,7 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -12,10 +9,7 @@ internal class FieldValuesJsonConverter : JsonConverter
 	{
 		public override bool CanWrite => false;
 
-		public override bool CanConvert(Type objectType)
-		{
-			throw new NotSupportedException();
-		}
+		public override bool CanConvert(Type objectType) => throw new NotSupportedException();
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
@@ -27,9 +21,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return fieldValues;
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Fluent/DescriptorBase.cs b/src/Nest/CommonAbstractions/Fluent/DescriptorBase.cs
index 86b717f5dae..d55a0646182 100644
--- a/src/Nest/CommonAbstractions/Fluent/DescriptorBase.cs
+++ b/src/Nest/CommonAbstractions/Fluent/DescriptorBase.cs
@@ -11,17 +11,14 @@ public abstract class DescriptorBase<TDescriptor, TInterface> : IDescriptor
 	{
 		private readonly TDescriptor _self;
 
-		protected DescriptorBase()
-		{
-			_self = (TDescriptor)this;
-		}
+		protected DescriptorBase() => _self = (TDescriptor)this;
 
 		protected TInterface Self => _self;
 
 		protected TDescriptor Assign(Action<TInterface> assigner) => Fluent.Assign(_self, assigner);
 
 		/// <summary>
-		/// Hides the <see cref="Equals"/> method.
+		/// Hides the <see cref="Equals" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
@@ -30,7 +27,7 @@ protected DescriptorBase()
 		public override bool Equals(object obj) => base.Equals(obj);
 
 		/// <summary>
-		/// Hides the <see cref="GetHashCode"/> method.
+		/// Hides the <see cref="GetHashCode" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
@@ -39,7 +36,7 @@ protected DescriptorBase()
 		public override int GetHashCode() => base.GetHashCode();
 
 		/// <summary>
-		/// Hides the <see cref="ToString"/> method.
+		/// Hides the <see cref="ToString" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/src/Nest/CommonAbstractions/Fluent/Fluent.cs b/src/Nest/CommonAbstractions/Fluent/Fluent.cs
index 77006c555a5..2b58e0783b2 100644
--- a/src/Nest/CommonAbstractions/Fluent/Fluent.cs
+++ b/src/Nest/CommonAbstractions/Fluent/Fluent.cs
@@ -11,5 +11,4 @@ internal static TDescriptor Assign<TDescriptor, TInterface>(TDescriptor self, Ac
 			return self;
 		}
 	}
-
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/Fluent/FluentDictionary.cs b/src/Nest/CommonAbstractions/Fluent/FluentDictionary.cs
index 01a52b6dbf1..fe6ec9099ab 100644
--- a/src/Nest/CommonAbstractions/Fluent/FluentDictionary.cs
+++ b/src/Nest/CommonAbstractions/Fluent/FluentDictionary.cs
@@ -4,9 +4,7 @@ namespace Nest
 {
 	public class FluentDictionary<TKey, TValue> : Dictionary<TKey, TValue>
 	{
-		public FluentDictionary()
-		{
-		}
+		public FluentDictionary() { }
 
 		public FluentDictionary(IDictionary<TKey, TValue> copy)
 		{
@@ -29,4 +27,4 @@ public FluentDictionary(IDictionary<TKey, TValue> copy)
 			return this;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/Fluent/Promise/DescriptorPromiseBase.cs b/src/Nest/CommonAbstractions/Fluent/Promise/DescriptorPromiseBase.cs
index f8364d1c024..276bf801d77 100644
--- a/src/Nest/CommonAbstractions/Fluent/Promise/DescriptorPromiseBase.cs
+++ b/src/Nest/CommonAbstractions/Fluent/Promise/DescriptorPromiseBase.cs
@@ -8,40 +8,41 @@ public interface IPromise<out TValue> where TValue : class
 		TValue Value { get; }
 	}
 
-	public abstract class DescriptorPromiseBase<TDescriptor, TValue> : IDescriptor, IPromise<TValue> 
+	public abstract class DescriptorPromiseBase<TDescriptor, TValue> : IDescriptor, IPromise<TValue>
 		where TDescriptor : DescriptorPromiseBase<TDescriptor, TValue>
 		where TValue : class
 	{
 		internal readonly TValue PromisedValue;
-		TValue IPromise<TValue>.Value => PromisedValue;
 
-		protected DescriptorPromiseBase(TValue instance) { this.PromisedValue = instance; }
+		protected DescriptorPromiseBase(TValue instance) => PromisedValue = instance;
+
+		TValue IPromise<TValue>.Value => PromisedValue;
 
 		protected TDescriptor Assign(Action<TValue> assigner)
 		{
-			assigner(this.PromisedValue);
-			return (TDescriptor) this;
+			assigner(PromisedValue);
+			return (TDescriptor)this;
 		}
 
 		/// <summary>
-		/// Hides the <see cref="Equals"/> method.
+		/// Hides the <see cref="Equals" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public override bool Equals(object obj) => base.Equals(obj);
 
 		/// <summary>
-		/// Hides the <see cref="GetHashCode"/> method.
+		/// Hides the <see cref="GetHashCode" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public override int GetHashCode() => base.GetHashCode();
 
 		/// <summary>
-		/// Hides the <see cref="ToString"/> method.
+		/// Hides the <see cref="ToString" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public override string ToString() => base.ToString();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/Fluent/SelectorBase.cs b/src/Nest/CommonAbstractions/Fluent/SelectorBase.cs
index f3357b270f7..f645e920f96 100644
--- a/src/Nest/CommonAbstractions/Fluent/SelectorBase.cs
+++ b/src/Nest/CommonAbstractions/Fluent/SelectorBase.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace Nest
 {
@@ -8,7 +7,7 @@ public interface ISelector { }
 	public abstract class SelectorBase<TInterface> : ISelector where TInterface : class
 	{
 		/// <summary>
-		/// Hides the <see cref="Equals"/> method.
+		/// Hides the <see cref="Equals" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
@@ -17,7 +16,7 @@ public abstract class SelectorBase<TInterface> : ISelector where TInterface : cl
 		public override bool Equals(object obj) => base.Equals(obj);
 
 		/// <summary>
-		/// Hides the <see cref="GetHashCode"/> method.
+		/// Hides the <see cref="GetHashCode" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
@@ -26,7 +25,7 @@ public abstract class SelectorBase<TInterface> : ISelector where TInterface : cl
 		public override int GetHashCode() => base.GetHashCode();
 
 		/// <summary>
-		/// Hides the <see cref="ToString"/> method.
+		/// Hides the <see cref="ToString" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/src/Nest/CommonAbstractions/ForAttribute.cs b/src/Nest/CommonAbstractions/ForAttribute.cs
index eca5770260b..184f81876b0 100644
--- a/src/Nest/CommonAbstractions/ForAttribute.cs
+++ b/src/Nest/CommonAbstractions/ForAttribute.cs
@@ -7,25 +7,22 @@ namespace Nest
 	/// This is used by the code generator and is only meant for internal use to map our more aptly named requests to
 	/// the original elasticsearch rest spec
 	/// </summary>
-	[AttributeUsage(System.AttributeTargets.Class, AllowMultiple = false)]
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
 	internal class DescriptorForAttribute : Attribute
 	{
-
 // ReSharper disable once UnusedParameter.Local
-		public DescriptorForAttribute (string operation) { }
-
+		public DescriptorForAttribute(string operation) { }
 	}
+
 	/// <summary>
 	/// DescriptorFor is a marker to rename unintuitive generated elasticsearch operation names
 	/// This is used by the code generator and is only meant for internal use to map our more aptly named requests to
 	/// the original elasticsearch rest spec
 	/// </summary>
-	[AttributeUsage(System.AttributeTargets.Interface, AllowMultiple = false)]
+	[AttributeUsage(AttributeTargets.Interface, AllowMultiple = false)]
 	internal class MapsApiAttribute : Attribute
 	{
-
 // ReSharper disable once UnusedParameter.Local
-		public MapsApiAttribute (string restSpecName) { }
-
+		public MapsApiAttribute(string restSpecName) { }
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/ActionIds/ActionIds.cs b/src/Nest/CommonAbstractions/Infer/ActionIds/ActionIds.cs
index 72a8489068a..478ad5a865e 100644
--- a/src/Nest/CommonAbstractions/Infer/ActionIds/ActionIds.cs
+++ b/src/Nest/CommonAbstractions/Infer/ActionIds/ActionIds.cs
@@ -10,40 +10,37 @@ namespace Nest
 	public class ActionIds : IUrlParameter, IEquatable<ActionIds>
 	{
 		private readonly List<string> _actionIds;
-		internal IReadOnlyList<string> Ids => _actionIds;
-
-		public ActionIds(IEnumerable<string> actionIds)
-		{
-			this._actionIds = actionIds?.ToList() ?? new List<string>();
-		}
-
-		public ActionIds(string actionIds)
-		{
-			this._actionIds = actionIds.IsNullOrEmpty()
-				? new List<string>()
-				: actionIds.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
-						   .Select(s => s.Trim())
-						   .ToList();
-		}
 
-		private string DebugDisplay => ((IUrlParameter)this).GetString(null);
+		public ActionIds(IEnumerable<string> actionIds) => _actionIds = actionIds?.ToList() ?? new List<string>();
 
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => string.Join(",", this._actionIds);
+		public ActionIds(string actionIds) => _actionIds = actionIds.IsNullOrEmpty()
+			? new List<string>()
+			: actionIds.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
+				.Select(s => s.Trim())
+				.ToList();
 
-		public static implicit operator ActionIds(string actionIds) => actionIds.IsNullOrEmptyCommaSeparatedList(out var list) ? null : new ActionIds(list);
+		internal IReadOnlyList<string> Ids => _actionIds;
 
-		public static implicit operator ActionIds(string[] actionIds) => actionIds.IsEmpty()  ? null : new ActionIds(actionIds);
+		private string DebugDisplay => ((IUrlParameter)this).GetString(null);
 
 		public bool Equals(ActionIds other)
 		{
-			if (this.Ids == null && other.Ids == null) return true;
-			if (this.Ids == null || other.Ids == null) return false;
-			return this.Ids.Count == other.Ids.Count && !this.Ids.Except(other.Ids).Any();
+			if (Ids == null && other.Ids == null) return true;
+			if (Ids == null || other.Ids == null) return false;
+
+			return Ids.Count == other.Ids.Count && !Ids.Except(other.Ids).Any();
 		}
 
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => string.Join(",", _actionIds);
+
+		public static implicit operator ActionIds(string actionIds) =>
+			actionIds.IsNullOrEmptyCommaSeparatedList(out var list) ? null : new ActionIds(list);
+
+		public static implicit operator ActionIds(string[] actionIds) => actionIds.IsEmpty() ? null : new ActionIds(actionIds);
+
 		public override bool Equals(object obj) => obj is ActionIds other && Equals(other);
 
-		public override int GetHashCode() => this._actionIds.GetHashCode();
+		public override int GetHashCode() => _actionIds.GetHashCode();
 
 		public static bool operator ==(ActionIds left, ActionIds right) => Equals(left, right);
 
diff --git a/src/Nest/CommonAbstractions/Infer/CategoryId/CategoryId.cs b/src/Nest/CommonAbstractions/Infer/CategoryId/CategoryId.cs
index df4e1801e22..f00a8437140 100644
--- a/src/Nest/CommonAbstractions/Infer/CategoryId/CategoryId.cs
+++ b/src/Nest/CommonAbstractions/Infer/CategoryId/CategoryId.cs
@@ -10,26 +10,27 @@ public class CategoryId : IUrlParameter, IEquatable<CategoryId>
 
 		public CategoryId(long value) => Value = value;
 
-		public static implicit operator CategoryId(long categoryId) => new CategoryId(categoryId);
-		public static implicit operator long(CategoryId categoryId) => categoryId.Value;
+		public bool Equals(CategoryId other) => Value == other.Value;
 
 		// ReSharper disable once ImpureMethodCallOnReadonlyValueField
 		public string GetString(IConnectionConfigurationValues settings) => Value.ToString(CultureInfo.InvariantCulture);
 
-		public bool Equals(CategoryId other) => this.Value == other.Value;
+		public static implicit operator CategoryId(long categoryId) => new CategoryId(categoryId);
+
+		public static implicit operator long(CategoryId categoryId) => categoryId.Value;
 
 		public override bool Equals(object obj)
 		{
 			switch (obj)
 			{
-				case int l: return this.Value == l;
-				case long l: return this.Value == l;
-				case CategoryId i: return this.Value == i.Value;
+				case int l: return Value == l;
+				case long l: return Value == l;
+				case CategoryId i: return Value == i.Value;
 				default: return false;
 			}
 		}
 
-		public override int GetHashCode() => this.Value.GetHashCode();
+		public override int GetHashCode() => Value.GetHashCode();
 
 		public static bool operator ==(CategoryId left, CategoryId right) => Equals(left, right);
 
diff --git a/src/Nest/CommonAbstractions/Infer/DocumentPath/DocumentPath.cs b/src/Nest/CommonAbstractions/Infer/DocumentPath/DocumentPath.cs
index cf49fdb5c86..5297dda181b 100644
--- a/src/Nest/CommonAbstractions/Infer/DocumentPath/DocumentPath.cs
+++ b/src/Nest/CommonAbstractions/Infer/DocumentPath/DocumentPath.cs
@@ -11,13 +11,8 @@ public interface IDocumentPath
 
 	public class DocumentPath<T> : IEquatable<DocumentPath<T>>, IDocumentPath where T : class
 	{
-		internal IDocumentPath Self => this;
-		internal T Document { get; set; }
-		Id IDocumentPath.Id { get; set; }
-		IndexName IDocumentPath.Index { get; set; }
-		TypeName IDocumentPath.Type { get; set; }
+		public DocumentPath(T document) : this(Nest.Id.From(document)) => Document = document;
 
-		public DocumentPath(T document) : this(Nest.Id.From(document)) { this.Document = document; }
 		public DocumentPath(Id id)
 		{
 			Self.Id = id;
@@ -25,24 +20,45 @@ public DocumentPath(Id id)
 			Self.Type = typeof(T);
 		}
 
+		internal T Document { get; set; }
+		internal IDocumentPath Self => this;
+		Id IDocumentPath.Id { get; set; }
+		IndexName IDocumentPath.Index { get; set; }
+		TypeName IDocumentPath.Type { get; set; }
+
+		public bool Equals(DocumentPath<T> other)
+		{
+			IDocumentPath o = other, s = Self;
+			return s.Index.NullOrEquals(o.Index) && s.Type.NullOrEquals(o.Type) && s.Id.NullOrEquals(o.Id)
+				&& (Document?.Equals(other.Document) ?? true);
+		}
+
 		public static DocumentPath<T> Id(Id id) => new DocumentPath<T>(id);
+
 		public static DocumentPath<T> Id(T @object) => new DocumentPath<T>(@object);
 
 		public static implicit operator DocumentPath<T>(T @object) => @object == null ? null : new DocumentPath<T>(@object);
+
 		public static implicit operator DocumentPath<T>(Id id) => id == null ? null : new DocumentPath<T>(id);
+
 		public static implicit operator DocumentPath<T>(long id) => new DocumentPath<T>(id);
+
 		public static implicit operator DocumentPath<T>(string id) => id.IsNullOrEmpty() ? null : new DocumentPath<T>(id);
+
 		public static implicit operator DocumentPath<T>(Guid id) => new DocumentPath<T>(id);
 
 		public DocumentPath<T> Index(IndexName index)
 		{
 			if (index == null) return this;
+
 			Self.Index = index;
 			return this;
 		}
+
 		public DocumentPath<T> Type(TypeName type)
 		{
 			if (type == null) return this;
+
 			Self.Type = type;
 			return this;
 		}
@@ -58,24 +74,17 @@ public override int GetHashCode()
 			}
 		}
 
-		public bool Equals(DocumentPath<T> other)
-		{
-			IDocumentPath o = other, s = Self;
-			return s.Index.NullOrEquals(o.Index) && s.Type.NullOrEquals(o.Type) && s.Id.NullOrEquals(o.Id)
-			       && (this.Document?.Equals(other.Document) ?? true);
-		}
-
 		public override bool Equals(object obj)
 		{
 			switch (obj)
 			{
-				case DocumentPath<T> d: return this.Equals(d);
+				case DocumentPath<T> d: return Equals(d);
 				default: return false;
 			}
 		}
 
 		public static bool operator ==(DocumentPath<T> x, DocumentPath<T> y) => Equals(x, y);
 
-		public static bool operator !=(DocumentPath<T> x, DocumentPath<T> y)=> !Equals(x, y);
+		public static bool operator !=(DocumentPath<T> x, DocumentPath<T> y) => !Equals(x, y);
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Field/Field.cs b/src/Nest/CommonAbstractions/Infer/Field/Field.cs
index a2e1715dc8c..5018be3bb51 100644
--- a/src/Nest/CommonAbstractions/Infer/Field/Field.cs
+++ b/src/Nest/CommonAbstractions/Infer/Field/Field.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using Elasticsearch.Net;
@@ -15,30 +14,6 @@ public class Field : IEquatable<Field>, IUrlParameter
 		private readonly object _comparisonValue;
 		private readonly Type _type;
 
-		public string Name { get; }
-
-		public Expression Expression { get; }
-
-		public PropertyInfo Property { get; }
-
-		public double? Boost { get; set; }
-
-		public bool CachableExpression { get; }
-
-		internal string DebugDisplay =>
-			$"{Expression?.ToString() ?? PropertyDebug ?? Name}{(Boost.HasValue ? "^" + Boost.Value: "")}{(_type == null ? "" : " typeof: " + _type.Name)}";
-
-		private string PropertyDebug => Property == null ? null : $"PropertyInfo: {Property.Name}";
-
-		public Fields And(Field field) => new Fields(new [] { this, field });
-
-		public Fields And<T>(Expression<Func<T, object>> field, double? boost = null) where T : class =>
-			new Fields(new [] { this, new Field(field, boost) });
-
-		public Fields And(string field, double? boost = null) => new Fields(new [] { this, new Field(field, boost) });
-
-		public Fields And(PropertyInfo property, double? boost = null) => new Fields(new [] { this, new Field(property, boost) });
-
 		public Field(string name, double? boost = null)
 		{
 			name.ThrowIfNullOrEmpty(nameof(name));
@@ -65,13 +40,51 @@ public Field(PropertyInfo property, double? boost = null)
 			_type = property.DeclaringType;
 		}
 
+		public double? Boost { get; set; }
+
+		public bool CachableExpression { get; }
+
+		public Expression Expression { get; }
+
+		public string Name { get; }
+
+		public PropertyInfo Property { get; }
+
+		internal string DebugDisplay =>
+			$"{Expression?.ToString() ?? PropertyDebug ?? Name}{(Boost.HasValue ? "^" + Boost.Value : "")}{(_type == null ? "" : " typeof: " + _type.Name)}";
+
+		private string PropertyDebug => Property == null ? null : $"PropertyInfo: {Property.Name}";
+
+		public bool Equals(Field other) => _type != null
+			? other != null && _type == other._type && _comparisonValue.Equals(other._comparisonValue)
+			: other != null && _comparisonValue.Equals(other._comparisonValue);
+
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
+		{
+			if (!(settings is IConnectionSettingsValues nestSettings))
+				throw new ArgumentNullException(nameof(settings),
+					$"Can not resolve {nameof(Field)} if no {nameof(IConnectionSettingsValues)} is provided");
+
+			return nestSettings.Inferrer.Field(this);
+		}
+
+		public Fields And(Field field) => new Fields(new[] { this, field });
+
+		public Fields And<T>(Expression<Func<T, object>> field, double? boost = null) where T : class =>
+			new Fields(new[] { this, new Field(field, boost) });
+
+		public Fields And(string field, double? boost = null) => new Fields(new[] { this, new Field(field, boost) });
+
+		public Fields And(PropertyInfo property, double? boost = null) => new Fields(new[] { this, new Field(property, boost) });
+
 		private static string ParseFieldName(string name, out double? boost)
 		{
 			boost = null;
 			if (name == null) return null;
 
-			var parts = name.Split(new [] { '^' }, StringSplitOptions.RemoveEmptyEntries);
+			var parts = name.Split(new[] { '^' }, StringSplitOptions.RemoveEmptyEntries);
 			if (parts.Length <= 1) return name;
+
 			name = parts[0];
 			boost = double.Parse(parts[1], CultureInfo.InvariantCulture);
 			return name;
@@ -93,35 +106,19 @@ public override int GetHashCode()
 			}
 		}
 
-		public bool Equals(Field other)
-		{
-			return _type != null
-				? other != null && _type == other._type && _comparisonValue.Equals(other._comparisonValue)
-				: other != null && _comparisonValue.Equals(other._comparisonValue);
-		}
-
 		public override bool Equals(object obj)
 		{
 			switch (obj)
 			{
-				case string s: return this.Equals(s);
-				case PropertyInfo p: return this.Equals(p);
-				case Field f: return this.Equals(f);
+				case string s: return Equals(s);
+				case PropertyInfo p: return Equals(p);
+				case Field f: return Equals(f);
 				default: return false;
 			}
 		}
 
 		public static bool operator ==(Field x, Field y) => Equals(x, y);
 
-		public static bool operator !=(Field x, Field y)=> !Equals(x, y);
-
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
-		{
-			if (!(settings is IConnectionSettingsValues nestSettings))
-				throw new ArgumentNullException(nameof(settings), $"Can not resolve {nameof(Field)} if no {nameof(IConnectionSettingsValues)} is provided");
-
-			return nestSettings.Inferrer.Field(this);
-		}
-
+		public static bool operator !=(Field x, Field y) => !Equals(x, y);
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Field/FieldExpressionVisitor.cs b/src/Nest/CommonAbstractions/Infer/Field/FieldExpressionVisitor.cs
index e937d5115ba..72c0e241367 100644
--- a/src/Nest/CommonAbstractions/Infer/Field/FieldExpressionVisitor.cs
+++ b/src/Nest/CommonAbstractions/Infer/Field/FieldExpressionVisitor.cs
@@ -1,6 +1,4 @@
-using Elasticsearch.Net;
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -8,29 +6,30 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
 	internal class HasVariableExpressionVisitor : ExpressionVisitor
 	{
 		private bool _found;
+
+		public HasVariableExpressionVisitor(Expression e) => Visit(e);
+
 		public bool Found
 		{
 			get => _found;
 			// This is only set to true once to prevent clobbering from subsequent node visits
-			private set { if (!_found) _found = value; }
-		}
-
-		public HasVariableExpressionVisitor(Expression e)
-		{
-			this.Visit(e);
+			private set
+			{
+				if (!_found) _found = value;
+			}
 		}
 
 		public override Expression Visit(Expression node)
 		{
-			if (!this.Found)
+			if (!Found)
 				return base.Visit(node);
+
 			return node;
 		}
 
@@ -39,7 +38,7 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
 			if (node.Method.Name == nameof(SuffixExtensions.Suffix) && node.Arguments.Any())
 			{
 				var lastArg = node.Arguments.Last();
-				this.Found = !(lastArg is ConstantExpression);
+				Found = !(lastArg is ConstantExpression);
 			}
 			else if (node.Method.Name == "get_Item" && node.Arguments.Any())
 			{
@@ -47,12 +46,13 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
 				var isDict =
 					typeof(IDictionary).IsAssignableFrom(t)
 					|| typeof(IDictionary<,>).IsAssignableFrom(t)
-					|| (t.IsGeneric() && t.GetGenericTypeDefinition() == typeof(IDictionary<,>));
+					|| t.IsGeneric() && t.GetGenericTypeDefinition() == typeof(IDictionary<,>);
 
 				if (!isDict)
 					return base.VisitMethodCall(node);
+
 				var lastArg = node.Arguments.Last();
-				this.Found = !(lastArg is ConstantExpression);
+				Found = !(lastArg is ConstantExpression);
 			}
 			return base.VisitMethodCall(node);
 		}
@@ -60,24 +60,21 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
 
 	internal class FieldExpressionVisitor : ExpressionVisitor
 	{
-		private readonly Stack<string> _stack = new Stack<string>();
-
 		private readonly IConnectionSettingsValues _settings;
+		private readonly Stack<string> _stack = new Stack<string>();
 
-		public FieldExpressionVisitor(IConnectionSettingsValues settings)
-		{
-			_settings = settings;
-		}
+		public FieldExpressionVisitor(IConnectionSettingsValues settings) => _settings = settings;
 
 		public string Resolve(Expression expression, bool toLastToken = false)
 		{
 			Visit(expression);
 			if (toLastToken) return _stack.Last();
+
 			return _stack
 				.Aggregate(
 					new StringBuilder(),
 					(sb, name) =>
-					(sb.Length > 0 ? sb.Append(".") : sb).Append(name))
+						(sb.Length > 0 ? sb.Append(".") : sb).Append(name))
 				.ToString();
 		}
 
@@ -88,7 +85,7 @@ public string Resolve(MemberInfo info)
 
 			var name = info.Name;
 
-			if (this._settings.PropertyMappings.TryGetValue(info, out var propertyMapping))
+			if (_settings.PropertyMappings.TryGetValue(info, out var propertyMapping))
 				return propertyMapping.Name;
 
 			var att = ElasticsearchPropertyAttributeBase.From(info);
@@ -101,7 +98,8 @@ public string Resolve(MemberInfo info)
 		protected override Expression VisitMember(MemberExpression expression)
 		{
 			if (_stack == null) return base.VisitMember(expression);
-			var name = this.Resolve(expression.Member);
+
+			var name = Resolve(expression.Member);
 			_stack.Push(name);
 			return base.VisitMember(expression);
 		}
@@ -114,7 +112,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCall)
 				var callingMember = new ReadOnlyCollection<Expression>(
 					new List<Expression> { { methodCall.Arguments.First() } }
 				);
-				base.Visit(callingMember);
+				Visit(callingMember);
 				return methodCall;
 			}
 			else if (methodCall.Method.Name == "get_Item" && methodCall.Arguments.Any())
@@ -123,22 +121,17 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCall)
 				var isDict =
 					typeof(IDictionary).IsAssignableFrom(t)
 					|| typeof(IDictionary<,>).IsAssignableFrom(t)
-					|| (t.IsGeneric() && t.GetGenericTypeDefinition() == typeof(IDictionary<,>));
+					|| t.IsGeneric() && t.GetGenericTypeDefinition() == typeof(IDictionary<,>);
+
+				if (!isDict) return base.VisitMethodCall(methodCall);
 
-				if (!isDict)
-				{
-					return base.VisitMethodCall(methodCall);
-				}
 				VisitConstantOrVariable(methodCall, _stack);
 				Visit(methodCall.Object);
 				return methodCall;
 			}
 			else if (IsLinqOperator(methodCall.Method))
 			{
-				for (int i = 1; i < methodCall.Arguments.Count; i++)
-				{
-					Visit(methodCall.Arguments[i]);
-				}
+				for (var i = 1; i < methodCall.Arguments.Count; i++) Visit(methodCall.Arguments[i]);
 				Visit(methodCall.Arguments[0]);
 				return methodCall;
 			}
diff --git a/src/Nest/CommonAbstractions/Infer/Field/FieldExtensions.cs b/src/Nest/CommonAbstractions/Infer/Field/FieldExtensions.cs
index ae58e6e36cd..cec777345fb 100644
--- a/src/Nest/CommonAbstractions/Infer/Field/FieldExtensions.cs
+++ b/src/Nest/CommonAbstractions/Infer/Field/FieldExtensions.cs
@@ -4,10 +4,9 @@ namespace Nest
 {
 	internal static class FieldExtensions
 	{
-		internal static bool IsConditionless(this Field field)
-		{
-			return field == null || (field.Name.IsNullOrEmpty() && field.Expression == null && field.Property == null);
-		}
+		internal static bool IsConditionless(this Field field) =>
+			field == null || field.Name.IsNullOrEmpty() && field.Expression == null && field.Property == null;
+
 		internal static bool IsConditionless(this Fields field) => field?.ListOfFields == null || field.ListOfFields.All(l => l.IsConditionless());
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Field/FieldJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/Field/FieldJsonConverter.cs
index dee9b6291c1..1cdfdc8da47 100644
--- a/src/Nest/CommonAbstractions/Infer/Field/FieldJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/Field/FieldJsonConverter.cs
@@ -22,12 +22,13 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var settings = serializer.GetConnectionSettings();
 			writer.WriteValue(settings.Inferrer.Field(field));
 		}
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.String) return null;
+
 			var field = reader.Value.ToString();
 			return (Field)field;
 		}
 	}
 }
-
diff --git a/src/Nest/CommonAbstractions/Infer/Field/FieldResolver.cs b/src/Nest/CommonAbstractions/Infer/Field/FieldResolver.cs
index b258d5fb31c..3e70e01dc83 100644
--- a/src/Nest/CommonAbstractions/Infer/Field/FieldResolver.cs
+++ b/src/Nest/CommonAbstractions/Infer/Field/FieldResolver.cs
@@ -1,29 +1,21 @@
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Globalization;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text;
-using Elasticsearch.Net;
 
 namespace Nest
 {
 	public class FieldResolver
 	{
-		private readonly IConnectionSettingsValues _settings;
-
 		protected readonly ConcurrentDictionary<Field, string> Fields = new ConcurrentDictionary<Field, string>();
 		protected readonly ConcurrentDictionary<PropertyName, string> Properties = new ConcurrentDictionary<PropertyName, string>();
+		private readonly IConnectionSettingsValues _settings;
 
 		public FieldResolver(IConnectionSettingsValues settings)
 		{
 			settings.ThrowIfNull(nameof(settings));
-			this._settings = settings;
+			_settings = settings;
 		}
 
 		public string Resolve(Field field)
@@ -37,16 +29,13 @@ private string ResolveFieldName(Field field)
 		{
 			if (field.IsConditionless()) return null;
 			if (!field.Name.IsNullOrEmpty()) return field.Name;
-			if (field.Expression != null && !field.CachableExpression)
-			{
-				return this.Resolve(field.Expression, field.Property);
-			}
+			if (field.Expression != null && !field.CachableExpression) return Resolve(field.Expression, field.Property);
 
-			if (this.Fields.TryGetValue(field, out var fieldName))
+			if (Fields.TryGetValue(field, out var fieldName))
 				return fieldName;
 
-			fieldName = this.Resolve(field.Expression, field.Property);
-			this.Fields.TryAdd(field, fieldName);
+			fieldName = Resolve(field.Expression, field.Property);
+			Fields.TryAdd(field, fieldName);
 			return fieldName;
 		}
 
@@ -55,16 +44,13 @@ public string Resolve(PropertyName property)
 			if (property.IsConditionless()) return null;
 			if (!property.Name.IsNullOrEmpty()) return property.Name;
 
-			if (property.Expression != null && !property.CacheableExpression)
-			{
-				return this.Resolve(property.Expression, property.Property);
-			}
+			if (property.Expression != null && !property.CacheableExpression) return Resolve(property.Expression, property.Property);
 
-			if (this.Properties.TryGetValue(property, out var propertyName))
+			if (Properties.TryGetValue(property, out var propertyName))
 				return propertyName;
 
-			propertyName = this.Resolve(property.Expression, property.Property, true);
-			this.Properties.TryAdd(property, propertyName);
+			propertyName = Resolve(property.Expression, property.Property, true);
+			Properties.TryAdd(property, propertyName);
 			return propertyName;
 		}
 
diff --git a/src/Nest/CommonAbstractions/Infer/Fields/Fields.cs b/src/Nest/CommonAbstractions/Infer/Fields/Fields.cs
index e25d80bdccd..357a819e756 100644
--- a/src/Nest/CommonAbstractions/Infer/Fields/Fields.cs
+++ b/src/Nest/CommonAbstractions/Infer/Fields/Fields.cs
@@ -15,89 +15,92 @@ public class Fields : IUrlParameter, IEnumerable<Field>, IEquatable<Fields>
 	{
 		internal readonly List<Field> ListOfFields;
 
+		internal Fields() => ListOfFields = new List<Field>();
+
+		internal Fields(IEnumerable<Field> fieldNames) => ListOfFields = fieldNames.ToList();
+
+		private string DebugDisplay =>
+			$"Count: {ListOfFields.Count} [" + string.Join(",", ListOfFields.Select((t, i) => $"({i + 1}: {t?.DebugDisplay ?? "NULL"})")) + "]";
+
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+		public IEnumerator<Field> GetEnumerator() => ListOfFields.GetEnumerator();
+
+		public bool Equals(Fields other) => EqualsAllFields(ListOfFields, other.ListOfFields);
+
 		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 		{
 			if (!(settings is IConnectionSettingsValues nestSettings))
-				throw new ArgumentNullException(nameof(settings), $"Can not resolve {nameof(Fields)} if no {nameof(IConnectionSettingsValues)} is provided");
+				throw new ArgumentNullException(nameof(settings),
+					$"Can not resolve {nameof(Fields)} if no {nameof(IConnectionSettingsValues)} is provided");
 
 			return string.Join(",", ListOfFields.Where(f => f != null).Select(f => ((IUrlParameter)f).GetString(nestSettings)));
 		}
 
-		private string DebugDisplay =>
-			$"Count: {ListOfFields.Count} [" + string.Join(",", ListOfFields.Select((t, i) => $"({i + 1}: {t?.DebugDisplay ?? "NULL"})")) + "]";
-
-		internal Fields() { this.ListOfFields = new List<Field>(); }
-		internal Fields(IEnumerable<Field> fieldNames) { this.ListOfFields = fieldNames.ToList(); }
-
 		public static implicit operator Fields(string[] fields) => fields.IsEmpty() ? null : new Fields(fields.Select(f => (Field)f));
 
 		public static implicit operator Fields(string field) => field.IsNullOrEmptyCommaSeparatedList(out var split)
-			? null : new Fields(split.Select(f=>(Field)f));
+			? null
+			: new Fields(split.Select(f => (Field)f));
 
 		public static implicit operator Fields(Expression[] fields) => fields.IsEmpty() ? null : new Fields(fields.Select(f => (Field)f));
 
-		public static implicit operator Fields(Expression field) => field == null ? null : new Fields(new [] { (Field)field });
+		public static implicit operator Fields(Expression field) => field == null ? null : new Fields(new[] { (Field)field });
 
 		public static implicit operator Fields(Field field) => field == null ? null : new Fields(new[] { field });
 
 		public static implicit operator Fields(PropertyInfo field) => field == null ? null : new Fields(new Field[] { field });
 
-		public static implicit operator Fields(PropertyInfo[] fields) => fields.IsEmpty() ? null : new Fields(fields.Select(f=>(Field)f));
+		public static implicit operator Fields(PropertyInfo[] fields) => fields.IsEmpty() ? null : new Fields(fields.Select(f => (Field)f));
 
 		public static implicit operator Fields(Field[] fields) => fields.IsEmpty() ? null : new Fields(fields);
 
 		public Fields And<T>(Expression<Func<T, object>> field, double? boost = null) where T : class
 		{
-			this.ListOfFields.Add(new Field(field, boost));
+			ListOfFields.Add(new Field(field, boost));
 			return this;
 		}
 
 		public Fields And(string field, double? boost = null)
 		{
-			this.ListOfFields.Add(new Field(field, boost));
+			ListOfFields.Add(new Field(field, boost));
 			return this;
 		}
 
 		public Fields And(PropertyInfo property, double? boost = null)
 		{
-			this.ListOfFields.Add(new Field(property, boost));
+			ListOfFields.Add(new Field(property, boost));
 			return this;
 		}
 
 		public Fields And<T>(params Expression<Func<T, object>>[] fields) where T : class
 		{
-			this.ListOfFields.AddRange(fields.Select(f => (Field)f));
+			ListOfFields.AddRange(fields.Select(f => (Field)f));
 			return this;
 		}
 
 		public Fields And(params string[] fields)
 		{
-			this.ListOfFields.AddRange(fields.Select(f => (Field)f));
+			ListOfFields.AddRange(fields.Select(f => (Field)f));
 			return this;
 		}
 
 		public Fields And(params PropertyInfo[] properties)
 		{
-			this.ListOfFields.AddRange(properties.Select(f => (Field)f));
+			ListOfFields.AddRange(properties.Select(f => (Field)f));
 			return this;
 		}
 
 		public Fields And(params Field[] fields)
 		{
-			this.ListOfFields.AddRange(fields);
+			ListOfFields.AddRange(fields);
 			return this;
 		}
 
-		public IEnumerator<Field> GetEnumerator() => this.ListOfFields.GetEnumerator();
-
-		IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
-
 		public static bool operator ==(Fields left, Fields right) => Equals(left, right);
 
 		public static bool operator !=(Fields left, Fields right) => !Equals(left, right);
 
-		public bool Equals(Fields other) => EqualsAllFields(this.ListOfFields, other.ListOfFields);
-
 		public override bool Equals(object obj)
 		{
 			switch (obj)
@@ -117,9 +120,10 @@ private static bool EqualsAllFields(IReadOnlyList<Field> thisTypes, IReadOnlyLis
 			if (thisTypes == null && otherTypes == null) return true;
 			if (thisTypes == null || otherTypes == null) return false;
 			if (thisTypes.Count != otherTypes.Count) return false;
+
 			return thisTypes.Count == otherTypes.Count && !thisTypes.Except(otherTypes).Any();
 		}
 
-		public override int GetHashCode() => this.ListOfFields.GetHashCode();
+		public override int GetHashCode() => ListOfFields.GetHashCode();
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Fields/FieldsDescriptor.cs b/src/Nest/CommonAbstractions/Infer/Fields/FieldsDescriptor.cs
index 73c7391b38e..64723a8caec 100644
--- a/src/Nest/CommonAbstractions/Infer/Fields/FieldsDescriptor.cs
+++ b/src/Nest/CommonAbstractions/Infer/Fields/FieldsDescriptor.cs
@@ -10,11 +10,15 @@ public class FieldsDescriptor<T> : DescriptorPromiseBase<FieldsDescriptor<T>, Fi
 		public FieldsDescriptor() : base(new Fields()) { }
 
 		public FieldsDescriptor<T> Fields(params Expression<Func<T, object>>[] fields) => Assign(f => f.And(fields));
+
 		public FieldsDescriptor<T> Fields(params string[] fields) => Assign(f => f.And(fields));
+
 		public FieldsDescriptor<T> Fields(IEnumerable<Field> fields) => Assign(f => f.ListOfFields.AddRange(fields));
 
 		public FieldsDescriptor<T> Field(Expression<Func<T, object>> field, double? boost = null) => Assign(f => f.And(field, boost));
+
 		public FieldsDescriptor<T> Field(string field, double? boost = null) => Assign(f => f.And(field, boost));
+
 		public FieldsDescriptor<T> Field(Field field) => Assign(f => f.And(field));
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Fields/FieldsJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/Fields/FieldsJsonConverter.cs
index 144b044548b..630aa1fddeb 100644
--- a/src/Nest/CommonAbstractions/Infer/Fields/FieldsJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/Fields/FieldsJsonConverter.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Linq;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -20,10 +18,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			if (fields != null)
 			{
 				var infer = serializer.GetConnectionSettings().Inferrer;
-				foreach (var f in fields.ListOfFields)
-				{
-					writer.WriteValue(infer.Field(f));
-				}
+				foreach (var f in fields.ListOfFields) writer.WriteValue(infer.Field(f));
 			}
 			writer.WriteEndArray();
 		}
@@ -31,6 +26,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartArray) return null;
+
 			var fields = new Fields();
 			while (reader.TokenType != JsonToken.EndArray)
 			{
@@ -46,10 +42,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 						reader.Read(); // "field";
 						var field = reader.ReadAsString();
 						fields.And(field);
-						while (reader.TokenType != JsonToken.EndObject)
-						{
-							reader.Read();
-						}
+						while (reader.TokenType != JsonToken.EndObject) reader.Read();
 						reader.Read(); // "}";
 						break;
 				}
@@ -58,4 +51,3 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		}
 	}
 }
-
diff --git a/src/Nest/CommonAbstractions/Infer/Id/Id.cs b/src/Nest/CommonAbstractions/Infer/Id/Id.cs
index afb2e259e11..092d7a68fee 100644
--- a/src/Nest/CommonAbstractions/Infer/Id/Id.cs
+++ b/src/Nest/CommonAbstractions/Infer/Id/Id.cs
@@ -10,47 +10,66 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class Id : IEquatable<Id>, IUrlParameter
 	{
-		internal string StringValue { get; }
-		internal long? LongValue { get; }
-		internal string StringOrLongValue => this.StringValue ?? this.LongValue?.ToString(CultureInfo.InvariantCulture);
-		internal object Document { get; }
-		internal int Tag { get; }
+		public Id(string id)
+		{
+			Tag = 0;
+			StringValue = id;
+		}
 
-		public Id(string id) { Tag = 0; StringValue = id; }
-		public Id(long id) { Tag = 1; LongValue = id; }
-		public Id(object document) { Tag = 2; Document = document; }
+		public Id(long id)
+		{
+			Tag = 1;
+			LongValue = id;
+		}
 
-		public static implicit operator Id(string id) => id.IsNullOrEmpty() ? null : new Id(id);
-		public static implicit operator Id(long id) => new Id(id);
-		public static implicit operator Id(Guid id) => new Id(id.ToString("D"));
+		public Id(object document)
+		{
+			Tag = 2;
+			Document = document;
+		}
 
-		public static Id From<T>(T document) where T : class => new Id(document);
+		internal object Document { get; }
+		internal long? LongValue { get; }
+		internal string StringOrLongValue => StringValue ?? LongValue?.ToString(CultureInfo.InvariantCulture);
+		internal string StringValue { get; }
+		internal int Tag { get; }
 
 		private string DebugDisplay => StringOrLongValue ?? "Id from instance typeof: " + Document?.GetType().Name;
 
-		public override string ToString() => StringOrLongValue;
-
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
-		{
-			var nestSettings = (IConnectionSettingsValues)settings;
-			return nestSettings.Inferrer.Id(this.Document) ?? this.StringOrLongValue;
-		}
+		private static int TypeHashCode { get; } = typeof(Id).GetHashCode();
 
 		public bool Equals(Id other)
 		{
-			if (this.Tag + other.Tag == 1)
-				return this.StringOrLongValue == other.StringOrLongValue;
-			else if (this.Tag != other.Tag) return false;
-			switch (this.Tag)
+			if (Tag + other.Tag == 1)
+				return StringOrLongValue == other.StringOrLongValue;
+			else if (Tag != other.Tag) return false;
+
+			switch (Tag)
 			{
 				case 0:
 				case 1:
-					return this.StringOrLongValue == other.StringOrLongValue;
+					return StringOrLongValue == other.StringOrLongValue;
 				default:
-					return this.Document?.Equals(other.Document) ?? false;
+					return Document?.Equals(other.Document) ?? false;
 			}
 		}
 
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
+		{
+			var nestSettings = (IConnectionSettingsValues)settings;
+			return nestSettings.Inferrer.Id(Document) ?? StringOrLongValue;
+		}
+
+		public static implicit operator Id(string id) => id.IsNullOrEmpty() ? null : new Id(id);
+
+		public static implicit operator Id(long id) => new Id(id);
+
+		public static implicit operator Id(Guid id) => new Id(id.ToString("D"));
+
+		public static Id From<T>(T document) where T : class => new Id(document);
+
+		public override string ToString() => StringOrLongValue;
+
 		public override bool Equals(object obj)
 		{
 			switch (obj)
@@ -64,15 +83,14 @@ public override bool Equals(object obj)
 			return Equals(new Id(obj));
 		}
 
-		private static int TypeHashCode { get; } = typeof(Id).GetHashCode();
 		public override int GetHashCode()
 		{
 			unchecked
 			{
 				var result = TypeHashCode;
-				result = (result * 397) ^ (this.StringValue?.GetHashCode() ?? 0);
-				result = (result * 397) ^ (this.LongValue?.GetHashCode() ?? 0);
-				result = (result * 397) ^ (this.Document?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (StringValue?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (LongValue?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (Document?.GetHashCode() ?? 0);
 				return result;
 			}
 		}
diff --git a/src/Nest/CommonAbstractions/Infer/Id/IdExtensions.cs b/src/Nest/CommonAbstractions/Infer/Id/IdExtensions.cs
index 70853750430..793ac155024 100644
--- a/src/Nest/CommonAbstractions/Infer/Id/IdExtensions.cs
+++ b/src/Nest/CommonAbstractions/Infer/Id/IdExtensions.cs
@@ -1,15 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	internal static class IdExtensions
-    {
-		internal static bool IsConditionless(this Id id)
-		{
-			return id == null || (id.StringOrLongValue == null && id.Document == null);
-		}
+	{
+		internal static bool IsConditionless(this Id id) => id == null || id.StringOrLongValue == null && id.Document == null;
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Id/IdResolver.cs b/src/Nest/CommonAbstractions/Infer/Id/IdResolver.cs
index 7bc0ccdca7d..0ba12d3cc66 100644
--- a/src/Nest/CommonAbstractions/Infer/Id/IdResolver.cs
+++ b/src/Nest/CommonAbstractions/Infer/Id/IdResolver.cs
@@ -6,22 +6,22 @@ namespace Nest
 {
 	public class IdResolver
 	{
+		private static readonly ConcurrentDictionary<Type, Func<object, string>> IdDelegates = new ConcurrentDictionary<Type, Func<object, string>>();
+
+		private static readonly MethodInfo MakeDelegateMethodInfo =
+			typeof(IdResolver).GetMethod(nameof(MakeDelegate), BindingFlags.Static | BindingFlags.NonPublic);
+
 		private readonly IConnectionSettingsValues _connectionSettings;
 		private readonly ConcurrentDictionary<Type, Func<object, string>> LocalIdDelegates = new ConcurrentDictionary<Type, Func<object, string>>();
-		private static readonly ConcurrentDictionary<Type, Func<object, string>> IdDelegates = new ConcurrentDictionary<Type, Func<object, string>>();
-		private static readonly MethodInfo MakeDelegateMethodInfo = typeof(IdResolver).GetMethod(nameof(IdResolver.MakeDelegate), BindingFlags.Static | BindingFlags.NonPublic);
 
-		PropertyInfo GetPropertyCaseInsensitive(Type type, string fieldName)
-			=> type.GetProperty(fieldName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
+		public IdResolver(IConnectionSettingsValues connectionSettings) => _connectionSettings = connectionSettings;
 
-		public IdResolver(IConnectionSettingsValues connectionSettings)
-		{
-			_connectionSettings = connectionSettings;
-		}
+		private PropertyInfo GetPropertyCaseInsensitive(Type type, string fieldName)
+			=> type.GetProperty(fieldName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
 
 		internal Func<T, string> CreateIdSelector<T>() where T : class
 		{
-			Func<T, string> idSelector = this.Resolve;
+			Func<T, string> idSelector = Resolve;
 			return idSelector;
 		}
 
@@ -37,7 +37,7 @@ public string Resolve(Type type, object @object)
 		{
 			if (type == null || @object == null) return null;
 
-			var preferLocal = this._connectionSettings.IdProperties.TryGetValue(type, out _);
+			var preferLocal = _connectionSettings.IdProperties.TryGetValue(type, out _);
 
 			if (LocalIdDelegates.TryGetValue(type, out var cachedLookup))
 				return cachedLookup(@object);
@@ -46,10 +46,8 @@ public string Resolve(Type type, object @object)
 				return cachedLookup(@object);
 
 			var idProperty = GetInferredId(type);
-			if (idProperty == null)
-			{
-				return null;
-			}
+			if (idProperty == null) return null;
+
 			var getMethod = idProperty.GetGetMethod();
 			var generic = MakeDelegateMethodInfo.MakeGenericMethod(type, getMethod.ReturnType);
 			var func = (Func<object, object>)generic.Invoke(null, new object[] { getMethod });
@@ -71,12 +69,12 @@ private PropertyInfo GetInferredId(Type type)
 			// if the type specifies through ElasticAttribute what the id prop is
 			// use that no matter what
 
-			this._connectionSettings.IdProperties.TryGetValue(type, out var propertyName);
+			_connectionSettings.IdProperties.TryGetValue(type, out var propertyName);
 			if (!propertyName.IsNullOrEmpty())
 				return GetPropertyCaseInsensitive(type, propertyName);
 
 			var esTypeAtt = ElasticsearchTypeAttribute.From(type);
-			propertyName = (esTypeAtt?.IdProperty.IsNullOrEmpty() ?? true) ? "Id" : esTypeAtt?.IdProperty;
+			propertyName = esTypeAtt?.IdProperty.IsNullOrEmpty() ?? true ? "Id" : esTypeAtt?.IdProperty;
 
 			return GetPropertyCaseInsensitive(type, propertyName);
 		}
diff --git a/src/Nest/CommonAbstractions/Infer/IndexName/IndexName.cs b/src/Nest/CommonAbstractions/Infer/IndexName/IndexName.cs
index 5a1f28f7590..82bf251e4a0 100644
--- a/src/Nest/CommonAbstractions/Infer/IndexName/IndexName.cs
+++ b/src/Nest/CommonAbstractions/Infer/IndexName/IndexName.cs
@@ -10,39 +10,56 @@ public class IndexName : IEquatable<IndexName>, IUrlParameter
 	{
 		private const char ClusterSeparator = ':';
 
-		private static int TypeHashCode { get; } = typeof(IndexName).GetHashCode();
-
-		internal string DebugDisplay => Type == null ? Name : $"{nameof(IndexName)} for typeof: {Type?.Name}";
-
-		public string Cluster { get; }
-		public string Name { get; }
-		public Type Type { get; }
-
 		private IndexName(string index, string cluster = null)
 		{
-			this.Name = index;
-			this.Cluster = cluster;
+			Name = index;
+			Cluster = cluster;
 		}
+
 		private IndexName(Type type, string cluster = null)
 		{
-			this.Type = type;
-			this.Cluster = cluster;
+			Type = type;
+			Cluster = cluster;
 		}
+
 		private IndexName(string index, Type type, string cluster = null)
 		{
-			this.Name = index;
-			this.Type = type;
-			this.Cluster = cluster;
+			Name = index;
+			Type = type;
+			Cluster = cluster;
+		}
+
+		public string Cluster { get; }
+		public string Name { get; }
+		public Type Type { get; }
+
+		internal string DebugDisplay => Type == null ? Name : $"{nameof(IndexName)} for typeof: {Type?.Name}";
+
+		private static int TypeHashCode { get; } = typeof(IndexName).GetHashCode();
+
+		bool IEquatable<IndexName>.Equals(IndexName other) => EqualsMarker(other);
+
+		public string GetString(IConnectionConfigurationValues settings)
+		{
+			if (!(settings is IConnectionSettingsValues nestSettings))
+				throw new Exception("Tried to pass index name on querystring but it could not be resolved because no nest settings are available");
+
+			return nestSettings.Inferrer.IndexName(this);
 		}
 
 		public static IndexName From<T>() => typeof(T);
+
 		public static IndexName From<T>(string clusterName) => From(typeof(T), clusterName);
+
 		private static IndexName From(Type t, string clusterName) => new IndexName(t, clusterName);
+
 		// TODO private?
 		public static IndexName Rebuild(string index, Type t, string clusterName = null) => new IndexName(index, t, clusterName);
 
 		public Indices And<T>() => new Indices(new[] { this, typeof(T) });
+
 		public Indices And<T>(string clusterName) => new Indices(new[] { this, From(typeof(T), clusterName) });
+
 		public Indices And(IndexName index) => new Indices(new[] { this, index });
 
 		private static IndexName Parse(string indexName)
@@ -62,19 +79,18 @@ private static IndexName Parse(string indexName)
 		}
 
 		public static implicit operator IndexName(string indexName) => Parse(indexName);
-		public static implicit operator IndexName(Type type) => type == null ? null : new IndexName(type);
 
-		bool IEquatable<IndexName>.Equals(IndexName other) => EqualsMarker(other);
+		public static implicit operator IndexName(Type type) => type == null ? null : new IndexName(type);
 
-		public override bool Equals(object obj) => obj is string s ? this.EqualsString(s) : obj is IndexName i && EqualsMarker(i);
+		public override bool Equals(object obj) => obj is string s ? EqualsString(s) : obj is IndexName i && EqualsMarker(i);
 
 		public override int GetHashCode()
 		{
 			unchecked
 			{
 				var result = TypeHashCode;
-				result = (result * 397) ^ (this.Name?.GetHashCode() ?? this.Type?.GetHashCode() ?? 0);
-				result = (result * 397) ^ (this.Cluster?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (Name?.GetHashCode() ?? Type?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (Cluster?.GetHashCode() ?? 0);
 				return result;
 			}
 		}
@@ -85,33 +101,27 @@ public override int GetHashCode()
 
 		public override string ToString()
 		{
-			if (!this.Name.IsNullOrEmpty())
-				return PrefixClusterName(this.Name);
-			return this.Type != null ? PrefixClusterName(this.Type.Name) : string.Empty;
+			if (!Name.IsNullOrEmpty())
+				return PrefixClusterName(Name);
+
+			return Type != null ? PrefixClusterName(Type.Name) : string.Empty;
 		}
+
 		private string PrefixClusterName(string name) => PrefixClusterName(this, name);
+
 		private static string PrefixClusterName(IndexName i, string name) => i.Cluster.IsNullOrEmpty() ? name : $"{i.Cluster}:{name}";
 
-		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other == PrefixClusterName(this.Name);
+		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other == PrefixClusterName(Name);
 
 		private bool EqualsMarker(IndexName other)
 		{
 			if (other == null) return false;
-			if (!this.Name.IsNullOrEmpty() && !other.Name.IsNullOrEmpty())
-				return EqualsString(PrefixClusterName(other,other.Name));
-
-			if ((!this.Cluster.IsNullOrEmpty() || !other.Cluster.IsNullOrEmpty()) && this.Cluster != other.Cluster) return false;
-
-			return this.Type != null && other?.Type != null && this.Type == other.Type;
-		}
+			if (!Name.IsNullOrEmpty() && !other.Name.IsNullOrEmpty())
+				return EqualsString(PrefixClusterName(other, other.Name));
 
-		public string GetString(IConnectionConfigurationValues settings)
-		{
-			if (!(settings is IConnectionSettingsValues nestSettings))
-				throw new Exception("Tried to pass index name on querystring but it could not be resolved because no nest settings are available");
+			if ((!Cluster.IsNullOrEmpty() || !other.Cluster.IsNullOrEmpty()) && Cluster != other.Cluster) return false;
 
-			return nestSettings.Inferrer.IndexName(this);
+			return Type != null && other?.Type != null && Type == other.Type;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameExtensions.cs b/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameExtensions.cs
index c962b49bc36..97f0f7a4f12 100644
--- a/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameExtensions.cs
+++ b/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameExtensions.cs
@@ -6,11 +6,13 @@ public static string Resolve(this IndexName marker, IConnectionSettingsValues co
 		{
 			if (marker == null)
 				return null;
+
 			connectionSettings.ThrowIfNull(nameof(connectionSettings));
 
 			if (marker.Type == null)
 				return marker.Name;
+
 			return new IndexNameResolver(connectionSettings).Resolve(marker.Type);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameJsonConverter.cs
index f1ff0f64b9c..653d882b20f 100644
--- a/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameJsonConverter.cs
@@ -23,9 +23,9 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.String) return null;
+
 			var typeName = reader.Value.ToString();
 			return (IndexName)typeName;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameResolver.cs b/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameResolver.cs
index 4e02917f73a..0b25e09f064 100644
--- a/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameResolver.cs
+++ b/src/Nest/CommonAbstractions/Infer/IndexName/IndexNameResolver.cs
@@ -1,5 +1,4 @@
-using Elasticsearch.Net;
-using System;
+using System;
 
 namespace Nest
 {
@@ -10,22 +9,24 @@ public class IndexNameResolver
 		public IndexNameResolver(IConnectionSettingsValues connectionSettings)
 		{
 			connectionSettings.ThrowIfNull(nameof(connectionSettings));
-			this._connectionSettings = connectionSettings;
+			_connectionSettings = connectionSettings;
 		}
-		public string Resolve<T>() where T : class => this.Resolve(typeof(T));
+
+		public string Resolve<T>() where T : class => Resolve(typeof(T));
 
 		public string Resolve(IndexName i)
 		{
 			if (string.IsNullOrEmpty(i?.Name))
-				return PrefixClusterName(i,this.Resolve(i?.Type));
+				return PrefixClusterName(i, Resolve(i?.Type));
+
 			ValidateIndexName(i.Name);
 			return PrefixClusterName(i, i.Name);
 		}
 
 		public string Resolve(Type type)
 		{
-			var indexName = this._connectionSettings.DefaultIndex;
-			var defaultIndices = this._connectionSettings.DefaultIndices;
+			var indexName = _connectionSettings.DefaultIndex;
+			var defaultIndices = _connectionSettings.DefaultIndices;
 			if (defaultIndices != null && type != null)
 			{
 				if (defaultIndices.TryGetValue(type, out var value) && !string.IsNullOrEmpty(value))
@@ -34,6 +35,7 @@ public string Resolve(Type type)
 			ValidateIndexName(indexName);
 			return indexName;
 		}
+
 		private static string PrefixClusterName(IndexName i, string name) => i.Cluster.IsNullOrEmpty() ? name : $"{i.Cluster}:{name}";
 
 		private static void ValidateIndexName(string indexName)
diff --git a/src/Nest/CommonAbstractions/Infer/Indices/Indices.cs b/src/Nest/CommonAbstractions/Infer/Indices/Indices.cs
index f893aaf4aab..73387397a31 100644
--- a/src/Nest/CommonAbstractions/Infer/Indices/Indices.cs
+++ b/src/Nest/CommonAbstractions/Infer/Indices/Indices.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Linq;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -11,76 +10,64 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class Indices : Union<Indices.AllIndicesMarker, Indices.ManyIndices>, IUrlParameter
 	{
-		public class AllIndicesMarker { internal AllIndicesMarker() { } }
+		internal Indices(AllIndicesMarker all) : base(all) { }
+
+		internal Indices(ManyIndices indices) : base(indices) { }
+
+		internal Indices(IEnumerable<IndexName> indices) : base(new ManyIndices(indices)) { }
+
 		public static Indices All { get; } = new Indices(new AllIndicesMarker());
 		public static Indices AllIndices { get; } = new Indices(new AllIndicesMarker());
-		public class ManyIndices
-		{
-			private readonly List<IndexName> _indices = new List<IndexName>();
-			public IReadOnlyList<IndexName> Indices => _indices;
-			internal ManyIndices(IEnumerable<IndexName> indices)
-			{
-				indices.ThrowIfEmpty(nameof(indices));
-				this._indices.AddRange(indices);
-			}
-			internal ManyIndices(IEnumerable<string> indices)
-			{
-				indices.ThrowIfEmpty(nameof(indices));
-				this._indices.AddRange(indices.Select(s=>(IndexName)s));
-			}
 
-			public ManyIndices And<T>()
+		private string DebugDisplay => Match(
+			all => "_all",
+			types => $"Count: {types.Indices.Count} [" + string.Join(",", types.Indices.Select((t, i) => $"({i + 1}: {t.DebugDisplay})")) + "]"
+		);
+
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => Match(
+			all => "_all",
+			many =>
 			{
-				this._indices.Add(typeof(T));
-				return this;
-			}
-		}
+				if (!(settings is IConnectionSettingsValues nestSettings))
+					throw new Exception(
+						"Tried to pass index names on querysting but it could not be resolved because no nest settings are available");
 
-		internal Indices(Indices.AllIndicesMarker all) : base(all) { }
-		internal Indices(Indices.ManyIndices indices) : base(indices) { }
-		internal Indices(IEnumerable<IndexName> indices) : base(new ManyIndices(indices)) { }
+				var infer = nestSettings.Inferrer;
+				var indices = many.Indices.Select(i => infer.IndexName(i)).Distinct();
+				return string.Join(",", indices);
+			}
+		);
 
 		public static IndexName Index(IndexName index) => index;
+
 		public static IndexName Index<T>() => typeof(T);
+
 		public static ManyIndices Index(IEnumerable<IndexName> indices) => new ManyIndices(indices);
+
 		public static ManyIndices Index(params IndexName[] indices) => new ManyIndices(indices);
 
 		public static ManyIndices Index(IEnumerable<string> indices) => new ManyIndices(indices);
+
 		public static ManyIndices Index(params string[] indices) => new ManyIndices(indices);
 
 		public static Indices Parse(string indicesString)
 		{
 			if (indicesString.IsNullOrEmptyCommaSeparatedList(out var indices)) return null;
+
 			return indices.Contains("_all") ? All : Index(indices.Select(i => (IndexName)i));
 		}
 
 		public static implicit operator Indices(string indicesString) => Parse(indicesString);
+
 		public static implicit operator Indices(ManyIndices many) => many == null ? null : new Indices(many);
+
 		public static implicit operator Indices(string[] many) => many.IsEmpty() ? null : new ManyIndices(many);
-		public static implicit operator Indices(IndexName[] many) => many.IsEmpty()? null : new ManyIndices(many);
-		public static implicit operator Indices(IndexName index) => index == null ? null : new ManyIndices(new[] { index });
-		public static implicit operator Indices(Type type) => type == null ? null : new ManyIndices(new IndexName[] { type });
 
-		private string DebugDisplay => this.Match(
-			all => "_all",
-			types => $"Count: {types.Indices.Count} [" + string.Join(",", types.Indices.Select((t, i) => $"({i+1}: {t.DebugDisplay})")) + "]"
-		);
+		public static implicit operator Indices(IndexName[] many) => many.IsEmpty() ? null : new ManyIndices(many);
 
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
-		{
-			return this.Match(
-				all => "_all",
-				many =>
-				{
-					if (!(settings is IConnectionSettingsValues nestSettings))
-						throw new Exception("Tried to pass index names on querysting but it could not be resolved because no nest settings are available");
-
-					var infer = nestSettings.Inferrer;
-					var indices = many.Indices.Select(i => infer.IndexName(i)).Distinct();
-					return string.Join(",", indices);
-				}
-			);
-		}
+		public static implicit operator Indices(IndexName index) => index == null ? null : new ManyIndices(new[] { index });
+
+		public static implicit operator Indices(Type type) => type == null ? null : new ManyIndices(new IndexName[] { type });
 
 		public static bool operator ==(Indices left, Indices right) => Equals(left, right);
 
@@ -89,7 +76,8 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 		public override bool Equals(object obj)
 		{
 			if (!(obj is Indices other)) return false;
-			return this.Match(
+
+			return Match(
 				all => other.Match(a => true, m => false),
 				many => other.Match(
 					a => false,
@@ -102,15 +90,43 @@ private static bool EqualsAllIndices(IReadOnlyList<IndexName> thisIndices, IRead
 		{
 			if (thisIndices == null && otherIndices == null) return true;
 			if (thisIndices == null || otherIndices == null) return false;
+
 			return thisIndices.Count == otherIndices.Count && !thisIndices.Except(otherIndices).Any();
 		}
 
-		public override int GetHashCode()
+		public override int GetHashCode() => Match(
+			all => "_all".GetHashCode(),
+			many => string.Concat(many.Indices.OrderBy(i => i.ToString())).GetHashCode()
+		);
+
+		public class AllIndicesMarker
 		{
-			return this.Match(
-				all => "_all".GetHashCode(),
-				many => string.Concat(many.Indices.OrderBy(i => i.ToString())).GetHashCode()
-			);
+			internal AllIndicesMarker() { }
+		}
+
+		public class ManyIndices
+		{
+			private readonly List<IndexName> _indices = new List<IndexName>();
+
+			internal ManyIndices(IEnumerable<IndexName> indices)
+			{
+				indices.ThrowIfEmpty(nameof(indices));
+				_indices.AddRange(indices);
+			}
+
+			internal ManyIndices(IEnumerable<string> indices)
+			{
+				indices.ThrowIfEmpty(nameof(indices));
+				_indices.AddRange(indices.Select(s => (IndexName)s));
+			}
+
+			public IReadOnlyList<IndexName> Indices => _indices;
+
+			public ManyIndices And<T>()
+			{
+				_indices.Add(typeof(T));
+				return this;
+			}
 		}
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Indices/IndicesExtensions.cs b/src/Nest/CommonAbstractions/Infer/Indices/IndicesExtensions.cs
index 6c042edd153..d8b1a6d9154 100644
--- a/src/Nest/CommonAbstractions/Infer/Indices/IndicesExtensions.cs
+++ b/src/Nest/CommonAbstractions/Infer/Indices/IndicesExtensions.cs
@@ -5,6 +5,7 @@ public static class IndicesExtensions
 		public static string Resolve(this Indices marker, IConnectionSettingsValues connectionSettings)
 		{
 			if (marker == null) return null;
+
 			connectionSettings.ThrowIfNull(nameof(connectionSettings));
 			return connectionSettings.Inferrer.Resolve(marker);
 		}
diff --git a/src/Nest/CommonAbstractions/Infer/Indices/IndicesJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/Indices/IndicesJsonConverter.cs
index 0d78167febb..1199c1d4036 100644
--- a/src/Nest/CommonAbstractions/Infer/Indices/IndicesJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/Indices/IndicesJsonConverter.cs
@@ -38,6 +38,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartArray) return null;
+
 			var indices = new List<IndexName>();
 			while (reader.TokenType != JsonToken.EndArray)
 			{
@@ -47,6 +48,5 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			}
 			return new Indices(indices);
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Indices/IndicesMultiSyntaxJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/Indices/IndicesMultiSyntaxJsonConverter.cs
index 5ed9167d160..3df5e27c75d 100644
--- a/src/Nest/CommonAbstractions/Infer/Indices/IndicesMultiSyntaxJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/Indices/IndicesMultiSyntaxJsonConverter.cs
@@ -4,7 +4,6 @@
 
 namespace Nest
 {
-
 	internal class IndicesMultiSyntaxJsonConverter : JsonConverter
 	{
 		public override bool CanConvert(Type objectType) => typeof(Indices) == objectType;
@@ -18,7 +17,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				return;
 			}
 			marker.Match(
-				all=> writer.WriteValue("_all"),
+				all => writer.WriteValue("_all"),
 				many => writer.WriteValue(((IUrlParameter)marker).GetString(serializer.GetConnectionSettings()))
 			);
 		}
@@ -27,11 +26,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		{
 			if (reader.TokenType == JsonToken.String)
 			{
-				string indices = reader.Value.ToString();
+				var indices = reader.Value.ToString();
 				return (Indices)indices;
 			}
 			return null;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Inferrer.cs b/src/Nest/CommonAbstractions/Infer/Inferrer.cs
index 8aa5878518c..a7cbe8cc99d 100644
--- a/src/Nest/CommonAbstractions/Infer/Inferrer.cs
+++ b/src/Nest/CommonAbstractions/Infer/Inferrer.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
@@ -12,57 +10,65 @@ namespace Nest
 	public class Inferrer
 	{
 		private readonly IConnectionSettingsValues _connectionSettings;
-		private IdResolver IdResolver { get; }
-		private IndexNameResolver IndexNameResolver { get; }
-		private TypeNameResolver TypeNameResolver { get; }
-		private RelationNameResolver RelationNameResolver { get; }
-		private FieldResolver FieldResolver { get; }
-		private RoutingResolver RoutingResolver { get; }
-
-		internal ConcurrentDictionary<Type, JsonContract> Contracts { get; }
-		internal ConcurrentDictionary<Type, Action<MultiGetHitJsonConverter.MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>> CreateMultiHitDelegates { get; }
-		internal ConcurrentDictionary<Type, Action<MultiSearchResponseJsonConverter.SearchHitTuple, JsonSerializer, IDictionary<string, object>>> CreateSearchResponseDelegates { get; }
 
 		public Inferrer(IConnectionSettingsValues connectionSettings)
 		{
 			connectionSettings.ThrowIfNull(nameof(connectionSettings));
-			this._connectionSettings = connectionSettings;
-			this.IdResolver = new IdResolver(connectionSettings);
-			this.IndexNameResolver = new IndexNameResolver(connectionSettings);
-			this.TypeNameResolver = new TypeNameResolver(connectionSettings);
-			this.RelationNameResolver = new RelationNameResolver(connectionSettings);
-			this.FieldResolver = new FieldResolver(connectionSettings);
-			this.RoutingResolver = new RoutingResolver(connectionSettings, this.IdResolver);
-
-			this.Contracts = new ConcurrentDictionary<Type, JsonContract>();
-			this.CreateMultiHitDelegates = new ConcurrentDictionary<Type, Action<MultiGetHitJsonConverter.MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>>();
-			this.CreateSearchResponseDelegates = new ConcurrentDictionary<Type, Action<MultiSearchResponseJsonConverter.SearchHitTuple, JsonSerializer, IDictionary<string, object>>>();
+			_connectionSettings = connectionSettings;
+			IdResolver = new IdResolver(connectionSettings);
+			IndexNameResolver = new IndexNameResolver(connectionSettings);
+			TypeNameResolver = new TypeNameResolver(connectionSettings);
+			RelationNameResolver = new RelationNameResolver(connectionSettings);
+			FieldResolver = new FieldResolver(connectionSettings);
+			RoutingResolver = new RoutingResolver(connectionSettings, IdResolver);
+
+			Contracts = new ConcurrentDictionary<Type, JsonContract>();
+			CreateMultiHitDelegates =
+				new ConcurrentDictionary<Type, Action<MultiGetHitJsonConverter.MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>>();
+			CreateSearchResponseDelegates =
+				new ConcurrentDictionary<Type, Action<MultiSearchResponseJsonConverter.SearchHitTuple, JsonSerializer, IDictionary<string, object>>
+				>();
 		}
 
-		public string Resolve(IUrlParameter urlParameter) => urlParameter.GetString(this._connectionSettings);
+		internal ConcurrentDictionary<Type, JsonContract> Contracts { get; }
+
+		internal ConcurrentDictionary<Type, Action<MultiGetHitJsonConverter.MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>>
+			CreateMultiHitDelegates { get; }
+
+		internal ConcurrentDictionary<Type, Action<MultiSearchResponseJsonConverter.SearchHitTuple, JsonSerializer, IDictionary<string, object>>>
+			CreateSearchResponseDelegates { get; }
+
+		private FieldResolver FieldResolver { get; }
+		private IdResolver IdResolver { get; }
+		private IndexNameResolver IndexNameResolver { get; }
+		private RelationNameResolver RelationNameResolver { get; }
+		private RoutingResolver RoutingResolver { get; }
+		private TypeNameResolver TypeNameResolver { get; }
+
+		public string Resolve(IUrlParameter urlParameter) => urlParameter.GetString(_connectionSettings);
+
+		public string Field(Field field) => FieldResolver.Resolve(field);
 
-		public string Field(Field field) => this.FieldResolver.Resolve(field);
+		public string PropertyName(PropertyName property) => FieldResolver.Resolve(property);
 
-		public string PropertyName(PropertyName property) => this.FieldResolver.Resolve(property);
+		public string IndexName<T>() where T : class => IndexNameResolver.Resolve<T>();
 
-		public string IndexName<T>() where T : class => this.IndexNameResolver.Resolve<T>();
+		public string IndexName(IndexName index) => IndexNameResolver.Resolve(index);
 
-		public string IndexName(IndexName index) => this.IndexNameResolver.Resolve(index);
+		public string Id<T>(T instance) where T : class => IdResolver.Resolve(instance);
 
-		public string Id<T>(T instance) where T : class => this.IdResolver.Resolve(instance);
+		public string Id(Type type, object instance) => IdResolver.Resolve(type, instance);
 
-		public string Id(Type type, object instance) => this.IdResolver.Resolve(type, instance);
+		public string TypeName<T>() where T : class => TypeNameResolver.Resolve<T>();
 
-		public string TypeName<T>() where T : class => this.TypeNameResolver.Resolve<T>();
+		public string TypeName(TypeName type) => TypeNameResolver.Resolve(type);
 
-		public string TypeName(TypeName type) => this.TypeNameResolver.Resolve(type);
+		public string RelationName<T>() where T : class => RelationNameResolver.Resolve<T>();
 
-		public string RelationName<T>() where T : class => this.RelationNameResolver.Resolve<T>();
+		public string RelationName(RelationName type) => RelationNameResolver.Resolve(type);
 
-		public string RelationName(RelationName type) => this.RelationNameResolver.Resolve(type);
+		public string Routing<T>(T document) => RoutingResolver.Resolve(document);
 
-		public string Routing<T>(T document) => this.RoutingResolver.Resolve(document);
-		
-		public string Routing(Type type, object instance) => this.RoutingResolver.Resolve(type, instance);
+		public string Routing(Type type, object instance) => RoutingResolver.Resolve(type, instance);
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/JoinFieldRouting/Routing.cs b/src/Nest/CommonAbstractions/Infer/JoinFieldRouting/Routing.cs
index b3104b698e1..e5e3eaa35d5 100644
--- a/src/Nest/CommonAbstractions/Infer/JoinFieldRouting/Routing.cs
+++ b/src/Nest/CommonAbstractions/Infer/JoinFieldRouting/Routing.cs
@@ -11,14 +11,7 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class Routing : IEquatable<Routing>, IUrlParameter
 	{
-		internal string StringValue { get; }
-		internal long? LongValue { get; }
-		internal string StringOrLongValue => this.StringValue ?? this.LongValue?.ToString(CultureInfo.InvariantCulture);
-
-		internal object Document { get; }
-		internal Func<object> DocumentGetter { get; }
-
-		internal int Tag { get; }
+		private static readonly char[] Separator = { ',' };
 
 		internal Routing(Func<object> documentGetter)
 		{
@@ -44,15 +37,38 @@ public Routing(object document)
 			Document = document;
 		}
 
-		public static implicit operator Routing(string routing) => routing.IsNullOrEmptyCommaSeparatedList(out _) ? null : new Routing(routing);
-		public static implicit operator Routing(string[] routing) => routing.IsEmpty() ? null : new Routing(string.Join(",", routing));
-		public static implicit operator Routing(long routing) => new Routing(routing);
-		public static implicit operator Routing(Guid routing) => new Routing(routing.ToString("D"));
+		internal object Document { get; }
+		internal Func<object> DocumentGetter { get; }
+		internal long? LongValue { get; }
+		internal string StringOrLongValue => StringValue ?? LongValue?.ToString(CultureInfo.InvariantCulture);
+		internal string StringValue { get; }
 
-		/// <summary> Use the inferred routing from <paramref name="document"/> </summary>
-		public static Routing From<T>(T document) where T : class => new Routing(document);
+		internal int Tag { get; }
+
+		private string DebugDisplay => StringOrLongValue ?? "Routing from instance typeof: " + Document?.GetType().Name;
+
+		private static int TypeHashCode { get; } = typeof(Routing).GetHashCode();
 
-		private string DebugDisplay => this.StringOrLongValue ?? "Routing from instance typeof: " + Document?.GetType().Name;
+		public bool Equals(Routing other)
+		{
+			if (Tag == other.Tag)
+			{
+				switch (Tag)
+				{
+					case 0:
+						var t = DocumentGetter();
+						var o = other.DocumentGetter();
+						return t?.Equals(o) ?? false;
+					case 4: return Document?.Equals(other.Document) ?? false;
+					default:
+						return StringEquals(StringOrLongValue, other.StringOrLongValue);
+				}
+			}
+			else if (Tag + other.Tag == 3)
+				return StringEquals(StringOrLongValue, other.StringOrLongValue);
+			else
+				return false;
+		}
 
 		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 		{
@@ -60,59 +76,48 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 			return GetString(nestSettings);
 		}
 
+		public static implicit operator Routing(string routing) => routing.IsNullOrEmptyCommaSeparatedList(out _) ? null : new Routing(routing);
+
+		public static implicit operator Routing(string[] routing) => routing.IsEmpty() ? null : new Routing(string.Join(",", routing));
+
+		public static implicit operator Routing(long routing) => new Routing(routing);
+
+		public static implicit operator Routing(Guid routing) => new Routing(routing.ToString("D"));
+
+		/// <summary> Use the inferred routing from <paramref name="document" /> </summary>
+		public static Routing From<T>(T document) where T : class => new Routing(document);
+
 		private string GetString(IConnectionSettingsValues nestSettings)
 		{
 			string value = null;
-			if (this.DocumentGetter != null)
+			if (DocumentGetter != null)
 			{
-				var doc = this.DocumentGetter();
+				var doc = DocumentGetter();
 				value = nestSettings.Inferrer.Routing(doc);
 			}
-			else if (this.Document != null)
-				value = nestSettings.Inferrer.Routing(this.Document);
+			else if (Document != null)
+				value = nestSettings.Inferrer.Routing(Document);
 
-			return value ?? this.StringOrLongValue;
+			return value ?? StringOrLongValue;
 		}
 
 		public static bool operator ==(Routing left, Routing right) => Equals(left, right);
 
 		public static bool operator !=(Routing left, Routing right) => !Equals(left, right);
 
-		public bool Equals(Routing other)
-		{
-			if (this.Tag == other.Tag)
-			{
-				switch (this.Tag)
-				{
-					case 0:
-						var t = this.DocumentGetter();
-						var o = other.DocumentGetter();
-						return t?.Equals(o) ?? false;
-					case 4: return this.Document?.Equals(other.Document) ?? false;
-					default:
-						return StringEquals(this.StringOrLongValue, other.StringOrLongValue);
-				}
-			}
-			else if (this.Tag + other.Tag == 3)
-				return StringEquals(this.StringOrLongValue, other.StringOrLongValue);
-			else
-				return false;
-		}
-
-		private static readonly char[] Separator = {','};
-
 		private static bool StringEquals(string left, string right)
 		{
 			if (left == null && right == null) return true;
 			else if (left == null || right == null)
 				return false;
+
 			if (!left.Contains(",") || !right.Contains(",")) return left == right;
 
-			var l1 = left.Split(Separator, StringSplitOptions.RemoveEmptyEntries).Select(v=>v.Trim()).ToList();
-			var l2 = right.Split(Separator, StringSplitOptions.RemoveEmptyEntries).Select(v=>v.Trim()).ToList();
+			var l1 = left.Split(Separator, StringSplitOptions.RemoveEmptyEntries).Select(v => v.Trim()).ToList();
+			var l2 = right.Split(Separator, StringSplitOptions.RemoveEmptyEntries).Select(v => v.Trim()).ToList();
 			if (l1.Count != l2.Count) return false;
-			return l1.Count == l2.Count && !l1.Except(l2).Any();
 
+			return l1.Count == l2.Count && !l1.Except(l2).Any();
 		}
 
 		public override bool Equals(object obj)
@@ -129,16 +134,15 @@ public override bool Equals(object obj)
 			return Equals(new Routing(obj));
 		}
 
-		private static int TypeHashCode { get; } = typeof(Routing).GetHashCode();
 		public override int GetHashCode()
 		{
 			unchecked
 			{
 				var result = TypeHashCode;
-				result = (result * 397) ^ (this.StringValue?.GetHashCode() ?? 0);
-				result = (result * 397) ^ (this.LongValue?.GetHashCode() ?? 0);
-				result = (result * 397) ^ (this.DocumentGetter?.GetHashCode() ?? 0);
-				result = (result * 397) ^ (this.Document?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (StringValue?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (LongValue?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (DocumentGetter?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (Document?.GetHashCode() ?? 0);
 				return result;
 			}
 		}
diff --git a/src/Nest/CommonAbstractions/Infer/JoinFieldRouting/RoutingResolver.cs b/src/Nest/CommonAbstractions/Infer/JoinFieldRouting/RoutingResolver.cs
index 1008f2816b3..84cdc3b9f57 100644
--- a/src/Nest/CommonAbstractions/Infer/JoinFieldRouting/RoutingResolver.cs
+++ b/src/Nest/CommonAbstractions/Infer/JoinFieldRouting/RoutingResolver.cs
@@ -7,21 +7,26 @@ namespace Nest
 {
 	public class RoutingResolver
 	{
-		private static readonly ConcurrentDictionary<Type, Func<object, JoinField>> PropertyGetDelegates = new ConcurrentDictionary<Type, Func<object, JoinField>>();
-		private readonly ConcurrentDictionary<Type, Func<object, string>> LocalRouteDelegates = new ConcurrentDictionary<Type, Func<object, string>>();
+		private static readonly ConcurrentDictionary<Type, Func<object, JoinField>> PropertyGetDelegates =
+			new ConcurrentDictionary<Type, Func<object, JoinField>>();
+
 		private static readonly MethodInfo MakeDelegateMethodInfo =
 			typeof(RoutingResolver).GetMethod(nameof(MakeDelegate), BindingFlags.Static | BindingFlags.NonPublic);
 
+
 		private readonly IConnectionSettingsValues _connectionSettings;
 		private readonly IdResolver _idResolver;
 
+		private readonly ConcurrentDictionary<Type, Func<object, string>>
+			LocalRouteDelegates = new ConcurrentDictionary<Type, Func<object, string>>();
+
 		public RoutingResolver(IConnectionSettingsValues connectionSettings, IdResolver idResolver)
 		{
 			_connectionSettings = connectionSettings;
 			_idResolver = idResolver;
 		}
 
-		PropertyInfo GetPropertyCaseInsensitive(Type type, string fieldName) =>
+		private PropertyInfo GetPropertyCaseInsensitive(Type type, string fieldName) =>
 			type.GetProperty(fieldName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
 
 		internal static Func<object, object> MakeDelegate<T, TReturn>(MethodInfo @get)
@@ -35,6 +40,7 @@ internal static Func<object, object> MakeDelegate<T, TReturn>(MethodInfo @get)
 		public string Resolve(Type type, object @object)
 		{
 			if (TryConnectionSettingsRoute(type, @object, out var route)) return route;
+
 			var joinField = GetJoinFieldFromObject(type, @object);
 			return joinField?.Match(p => _idResolver.Resolve(@object), c => ResolveId(c.Parent, _connectionSettings));
 		}
@@ -42,7 +48,7 @@ public string Resolve(Type type, object @object)
 		private bool TryConnectionSettingsRoute(Type type, object @object, out string route)
 		{
 			route = null;
-			if (!this._connectionSettings.RouteProperties.TryGetValue(type, out var propertyName))
+			if (!_connectionSettings.RouteProperties.TryGetValue(type, out var propertyName))
 				return false;
 
 			if (LocalRouteDelegates.TryGetValue(type, out var cachedLookup))
@@ -92,7 +98,7 @@ private static Func<object, object> CreateGetterFunc(Type type, PropertyInfo joi
 		{
 			var getMethod = joinProperty.GetGetMethod();
 			var generic = MakeDelegateMethodInfo.MakeGenericMethod(type, getMethod.ReturnType);
-			var func = (Func<object, object>) generic.Invoke(null, new object[] {getMethod});
+			var func = (Func<object, object>)generic.Invoke(null, new object[] { getMethod });
 			return func;
 		}
 
@@ -101,8 +107,8 @@ private static PropertyInfo GetJoinFieldProperty(Type type)
 			var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public);
 			try
 			{
-                var joinField = properties.SingleOrDefault(p => p.PropertyType == typeof(JoinField));
-                return joinField;
+				var joinField = properties.SingleOrDefault(p => p.PropertyType == typeof(JoinField));
+				return joinField;
 			}
 			catch (InvalidOperationException e)
 			{
diff --git a/src/Nest/CommonAbstractions/Infer/Metrics/IndexMetrics.cs b/src/Nest/CommonAbstractions/Infer/Metrics/IndexMetrics.cs
index 240b15e6ece..614f5b1b00b 100644
--- a/src/Nest/CommonAbstractions/Infer/Metrics/IndexMetrics.cs
+++ b/src/Nest/CommonAbstractions/Infer/Metrics/IndexMetrics.cs
@@ -6,19 +6,22 @@ namespace Nest
 	public class IndexMetrics : IEquatable<IndexMetrics>, IUrlParameter
 	{
 		private readonly NodesStatsIndexMetric _enumValue;
+
+		internal IndexMetrics(NodesStatsIndexMetric metric) => _enumValue = metric;
+
 		internal Enum Value => _enumValue;
 
-		public string GetString(IConnectionConfigurationValues settings) => this._enumValue.GetStringValue();
-		internal IndexMetrics(NodesStatsIndexMetric metric) { _enumValue = metric; }
+		public bool Equals(IndexMetrics other) => Value.Equals(other.Value);
+
+		public string GetString(IConnectionConfigurationValues settings) => _enumValue.GetStringValue();
 
 		public static implicit operator IndexMetrics(NodesStatsIndexMetric metric) => new IndexMetrics(metric);
 
-		public bool Equals(Enum other) => this.Value.Equals(other);
-		public bool Equals(IndexMetrics other) => this.Value.Equals(other.Value);
+		public bool Equals(Enum other) => Value.Equals(other);
 
 		public override bool Equals(object obj) => obj is Enum e ? Equals(e) : obj is IndexMetrics m && Equals(m.Value);
 
-		public override int GetHashCode() => (_enumValue.GetHashCode());
+		public override int GetHashCode() => _enumValue.GetHashCode();
 
 		public static bool operator ==(IndexMetrics left, IndexMetrics right) => Equals(left, right);
 
diff --git a/src/Nest/CommonAbstractions/Infer/Metrics/Metrics.cs b/src/Nest/CommonAbstractions/Infer/Metrics/Metrics.cs
index 458f720e23f..4e72fd8828e 100644
--- a/src/Nest/CommonAbstractions/Infer/Metrics/Metrics.cs
+++ b/src/Nest/CommonAbstractions/Infer/Metrics/Metrics.cs
@@ -5,30 +5,41 @@ namespace Nest
 {
 	public class Metrics : IEquatable<Metrics>, IUrlParameter
 	{
-		private readonly Enum _enumValue;
-		internal Enum Value => _enumValue;
+		internal Metrics(IndicesStatsMetric metric) => Value = metric;
 
-		public string GetString(IConnectionConfigurationValues settings) => this._enumValue.GetStringValue();
-		internal Metrics(IndicesStatsMetric metric) { _enumValue = metric; }
-		internal Metrics(NodesStatsMetric metric){ _enumValue = metric; }
-		internal Metrics(NodesInfoMetric metric){ _enumValue = metric; }
-		internal Metrics(ClusterStateMetric metric){ _enumValue = metric; }
-		internal Metrics(WatcherStatsMetric metric){ _enumValue = metric; }
-		internal Metrics(NodesUsageMetric metric){ _enumValue = metric; }
+		internal Metrics(NodesStatsMetric metric) => Value = metric;
+
+		internal Metrics(NodesInfoMetric metric) => Value = metric;
+
+		internal Metrics(ClusterStateMetric metric) => Value = metric;
+
+		internal Metrics(WatcherStatsMetric metric) => Value = metric;
+
+		internal Metrics(NodesUsageMetric metric) => Value = metric;
+
+		internal Enum Value { get; }
+
+		public bool Equals(Metrics other) => Value.Equals(other.Value);
+
+		public string GetString(IConnectionConfigurationValues settings) => Value.GetStringValue();
 
 		public static implicit operator Metrics(IndicesStatsMetric metric) => new Metrics(metric);
+
 		public static implicit operator Metrics(NodesStatsMetric metric) => new Metrics(metric);
+
 		public static implicit operator Metrics(NodesInfoMetric metric) => new Metrics(metric);
+
 		public static implicit operator Metrics(ClusterStateMetric metric) => new Metrics(metric);
+
 		public static implicit operator Metrics(WatcherStatsMetric metric) => new Metrics(metric);
+
 		public static implicit operator Metrics(NodesUsageMetric metric) => new Metrics(metric);
 
-		public bool Equals(Enum other) => this.Value.Equals(other);
-		public bool Equals(Metrics other) => this.Value.Equals(other.Value);
+		public bool Equals(Enum other) => Value.Equals(other);
 
 		public override bool Equals(object obj) => obj is Enum e ? Equals(e) : obj is Metrics m && Equals(m.Value);
 
-		public override int GetHashCode() => (_enumValue != null ? _enumValue.GetHashCode() : 0);
+		public override int GetHashCode() => Value != null ? Value.GetHashCode() : 0;
 
 		public static bool operator ==(Metrics left, Metrics right) => Equals(left, right);
 
diff --git a/src/Nest/CommonAbstractions/Infer/Name/Name.cs b/src/Nest/CommonAbstractions/Infer/Name/Name.cs
index 5d9bd54915d..40c95a62171 100644
--- a/src/Nest/CommonAbstractions/Infer/Name/Name.cs
+++ b/src/Nest/CommonAbstractions/Infer/Name/Name.cs
@@ -7,13 +7,17 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class Name : IEquatable<Name>, IUrlParameter
 	{
-		private readonly string _name;
-		internal string Value => _name;
-		private string DebugDisplay => _name;
+		public Name(string name) => Value = name?.Trim();
 
-		public Name(string name) => this._name = name?.Trim();
+		internal string Value { get; }
 
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => _name;
+		private string DebugDisplay => Value;
+
+		private static int TypeHashCode { get; } = typeof(Name).GetHashCode();
+
+		public bool Equals(Name other) => EqualsString(other?.Value);
+
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => Value;
 
 		public static implicit operator Name(string name) => name.IsNullOrEmpty() ? null : new Name(name);
 
@@ -21,20 +25,17 @@ public class Name : IEquatable<Name>, IUrlParameter
 
 		public static bool operator !=(Name left, Name right) => !Equals(left, right);
 
-		public bool Equals(Name other) => EqualsString(other?.Value);
-
 		public override bool Equals(object obj) =>
-			obj is string s ? this.EqualsString(s) : (obj is Name i) && this.EqualsString(i.Value);
+			obj is string s ? EqualsString(s) : obj is Name i && EqualsString(i.Value);
 
-		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other.Trim() == this.Value;
+		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other.Trim() == Value;
 
-		private static int TypeHashCode { get; } = typeof(Name).GetHashCode();
 		public override int GetHashCode()
 		{
 			unchecked
 			{
 				var result = TypeHashCode;
-				result = (result * 397) ^ (this.Value?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (Value?.GetHashCode() ?? 0);
 				return result;
 			}
 		}
diff --git a/src/Nest/CommonAbstractions/Infer/Name/Names.cs b/src/Nest/CommonAbstractions/Infer/Name/Names.cs
index b8b57032a8f..293d74d0f32 100644
--- a/src/Nest/CommonAbstractions/Infer/Name/Names.cs
+++ b/src/Nest/CommonAbstractions/Infer/Name/Names.cs
@@ -9,24 +9,25 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class Names : IEquatable<Names>, IUrlParameter
 	{
-		private readonly IList<Name> _names;
-		internal IList<Name> Value => _names;
-
-		public Names(IEnumerable<string> names) : this(names?.Select(n=>(Name)n).ToList()) { }
+		public Names(IEnumerable<string> names) : this(names?.Select(n => (Name)n).ToList()) { }
 
 		public Names(IEnumerable<Name> names)
 		{
-			this._names = names?.ToList();
-			if (!this._names.HasAny())
+			Value = names?.ToList();
+			if (!Value.HasAny())
 				throw new ArgumentException($"can not create {nameof(Names)} on an empty enumerable of ", nameof(names));
 		}
 
-		public static Names Parse(string names) => names.IsNullOrEmptyCommaSeparatedList(out var list) ? null : new Names(list);
+		internal IList<Name> Value { get; }
+
+		private string DebugDisplay => ((IUrlParameter)this).GetString(null);
+
+		public bool Equals(Names other) => EqualsAllIds(Value, other.Value);
 
 		string IUrlParameter.GetString(IConnectionConfigurationValues settings) =>
-			string.Join(",", this._names.Cast<IUrlParameter>().Select(n => n.GetString(settings)));
+			string.Join(",", Value.Cast<IUrlParameter>().Select(n => n.GetString(settings)));
 
-		private string DebugDisplay => ((IUrlParameter)this).GetString(null);
+		public static Names Parse(string names) => names.IsNullOrEmptyCommaSeparatedList(out var list) ? null : new Names(list);
 
 		public static implicit operator Names(Name name) => name == null ? null : new Names(new[] { name });
 
@@ -38,18 +39,17 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings) =>
 
 		public static bool operator !=(Names left, Names right) => !Equals(left, right);
 
-		public bool Equals(Names other) => EqualsAllIds(this.Value, other.Value);
-
 		private static bool EqualsAllIds(ICollection<Name> thisIds, ICollection<Name> otherIds)
 		{
 			if (thisIds == null && otherIds == null) return true;
 			if (thisIds == null || otherIds == null) return false;
 			if (thisIds.Count != otherIds.Count) return false;
+
 			return thisIds.Count == otherIds.Count && !thisIds.Except(otherIds).Any();
 		}
 
-		public override bool Equals(object obj) => obj is string s ? this.Equals(Parse(s)) : (obj is Names i) && this.Equals(i);
+		public override bool Equals(object obj) => obj is string s ? Equals(Parse(s)) : obj is Names i && Equals(i);
 
-		public override int GetHashCode() => this._names.GetHashCode();
+		public override int GetHashCode() => Value.GetHashCode();
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/NodeId/NodeIds.cs b/src/Nest/CommonAbstractions/Infer/NodeId/NodeIds.cs
index 62649c870a7..86e0e217ebb 100644
--- a/src/Nest/CommonAbstractions/Infer/NodeId/NodeIds.cs
+++ b/src/Nest/CommonAbstractions/Infer/NodeId/NodeIds.cs
@@ -9,41 +9,42 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class NodeIds : IEquatable<NodeIds>, IUrlParameter
 	{
-		private readonly IList<string> _nodeIds;
-		internal IList<string> Value => _nodeIds;
-
 		public NodeIds(IEnumerable<string> nodeIds)
 		{
-			this._nodeIds = nodeIds?.ToList();
-			if (!this._nodeIds.HasAny())
-				throw new ArgumentException($"can not create {nameof(NodeIds )} on an empty enumerable of ", nameof(nodeIds));
+			Value = nodeIds?.ToList();
+			if (!Value.HasAny())
+				throw new ArgumentException($"can not create {nameof(NodeIds)} on an empty enumerable of ", nameof(nodeIds));
 		}
 
+		internal IList<string> Value { get; }
+
 		private string DebugDisplay => ((IUrlParameter)this).GetString(null);
 
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => string.Join(",", this._nodeIds);
+		public bool Equals(NodeIds other) => EqualsAllIds(Value, other.Value);
+
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => string.Join(",", Value);
 
 		public static NodeIds Parse(string nodeIds) => nodeIds.IsNullOrEmptyCommaSeparatedList(out var nodes) ? null : new NodeIds(nodes);
 
 		public static implicit operator NodeIds(string nodes) => Parse(nodes);
+
 		public static implicit operator NodeIds(string[] nodes) => nodes.IsEmpty() ? null : new NodeIds(nodes);
 
 		public static bool operator ==(NodeIds left, NodeIds right) => Equals(left, right);
 
 		public static bool operator !=(NodeIds left, NodeIds right) => !Equals(left, right);
 
-		public bool Equals(NodeIds other) => EqualsAllIds(this.Value, other.Value);
-
 		private static bool EqualsAllIds(ICollection<string> thisIds, ICollection<string> otherIds)
 		{
 			if (thisIds == null && otherIds == null) return true;
 			if (thisIds == null || otherIds == null) return false;
 			if (thisIds.Count != otherIds.Count) return false;
+
 			return thisIds.Count == otherIds.Count && !thisIds.Except(otherIds).Any();
 		}
 
-		public override bool Equals(object obj) => obj is string s ? this.Equals(Parse(s)) : (obj is NodeIds i) && this.Equals(i);
+		public override bool Equals(object obj) => obj is string s ? Equals(Parse(s)) : obj is NodeIds i && Equals(i);
 
-		public override int GetHashCode() => this._nodeIds.GetHashCode();
+		public override int GetHashCode() => Value.GetHashCode();
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyName.cs b/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyName.cs
index 1f4a7ef6ea3..d902d6a28bb 100644
--- a/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyName.cs
+++ b/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyName.cs
@@ -10,21 +10,9 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class PropertyName : IEquatable<PropertyName>, IUrlParameter
 	{
-		private static int TypeHashCode { get; } = typeof(PropertyName).GetHashCode();
-
-		public string Name { get; }
-		public Expression Expression { get; }
-		public PropertyInfo Property { get; }
-		public bool CacheableExpression { get; }
-
 		private readonly object _comparisonValue;
 		private readonly Type _type;
 
-		internal string DebugDisplay =>
-			$"{Expression?.ToString() ?? PropertyDebug ?? Name}{(_type == null ? "" : " typeof: " + _type.Name)}";
-
-		private string PropertyDebug => Property == null ? null : $"PropertyInfo: {Property.Name}";
-
 		public PropertyName(string name)
 		{
 			Name = name;
@@ -46,6 +34,29 @@ public PropertyName(PropertyInfo property)
 			_type = property.DeclaringType;
 		}
 
+		public bool CacheableExpression { get; }
+		public Expression Expression { get; }
+
+		public string Name { get; }
+		public PropertyInfo Property { get; }
+
+		internal string DebugDisplay =>
+			$"{Expression?.ToString() ?? PropertyDebug ?? Name}{(_type == null ? "" : " typeof: " + _type.Name)}";
+
+		private string PropertyDebug => Property == null ? null : $"PropertyInfo: {Property.Name}";
+		private static int TypeHashCode { get; } = typeof(PropertyName).GetHashCode();
+
+		public bool Equals(PropertyName other) => EqualsMarker(other);
+
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
+		{
+			if (!(settings is IConnectionSettingsValues nestSettings))
+				throw new ArgumentNullException(nameof(settings),
+					$"Can not resolve {nameof(PropertyName)} if no {nameof(IConnectionSettingsValues)} is provided");
+
+			return nestSettings.Inferrer.PropertyName(this);
+		}
+
 		public static implicit operator PropertyName(string name) => name.IsNullOrEmpty() ? null : new PropertyName(name);
 
 		public static implicit operator PropertyName(Expression expression) => expression == null ? null : new PropertyName(expression);
@@ -63,30 +74,17 @@ public override int GetHashCode()
 			}
 		}
 
-		public bool Equals(PropertyName other) => EqualsMarker(other);
-
 		public override bool Equals(object obj) =>
-			obj is string s ? this.EqualsString(s) : (obj is PropertyName r) && this.EqualsMarker(r);
+			obj is string s ? EqualsString(s) : obj is PropertyName r && EqualsMarker(r);
 
-		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other == this.Name;
+		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other == Name;
 
-		public bool EqualsMarker(PropertyName other)
-		{
-			return _type != null
-				? other != null && _type == other._type && _comparisonValue.Equals(other._comparisonValue)
-				: other != null && _comparisonValue.Equals(other._comparisonValue);
-		}
+		public bool EqualsMarker(PropertyName other) => _type != null
+			? other != null && _type == other._type && _comparisonValue.Equals(other._comparisonValue)
+			: other != null && _comparisonValue.Equals(other._comparisonValue);
 
 		public static bool operator ==(PropertyName left, PropertyName right) => Equals(left, right);
 
 		public static bool operator !=(PropertyName left, PropertyName right) => !Equals(left, right);
-
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
-		{
-			if (!(settings is IConnectionSettingsValues nestSettings))
-				throw new ArgumentNullException(nameof(settings), $"Can not resolve {nameof(PropertyName)} if no {nameof(IConnectionSettingsValues)} is provided");
-
-			return nestSettings.Inferrer.PropertyName(this);
-		}
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameExtensions.cs b/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameExtensions.cs
index 7965692fe70..bb89ca4648a 100644
--- a/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameExtensions.cs
+++ b/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameExtensions.cs
@@ -2,9 +2,7 @@
 {
 	internal static class PropertyNameExtensions
 	{
-		internal static bool IsConditionless(this PropertyName property)
-		{
-			return property == null || (property.Name.IsNullOrEmpty() && property.Expression == null && property.Property == null);
-		}
+		internal static bool IsConditionless(this PropertyName property) =>
+			property == null || property.Name.IsNullOrEmpty() && property.Expression == null && property.Property == null;
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameJsonConverter.cs
index 96d954582e7..061979dd249 100644
--- a/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameJsonConverter.cs
@@ -22,12 +22,13 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var infer = serializer.GetConnectionSettings().Inferrer;
 			writer.WriteValue(infer.PropertyName(property));
 		}
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.String) return null;
+
 			var property = reader.Value.ToString();
 			return (PropertyName)property;
 		}
 	}
 }
-
diff --git a/src/Nest/CommonAbstractions/Infer/RelationName/RelationName.cs b/src/Nest/CommonAbstractions/Infer/RelationName/RelationName.cs
index 1ad349e87fe..dcd603130a8 100644
--- a/src/Nest/CommonAbstractions/Infer/RelationName/RelationName.cs
+++ b/src/Nest/CommonAbstractions/Infer/RelationName/RelationName.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Linq;
 using Elasticsearch.Net;
 
 namespace Nest
@@ -9,14 +8,28 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class RelationName : IEquatable<RelationName>, IUrlParameter
 	{
+		private RelationName(string type) => Name = type;
+
+		private RelationName(Type type) => Type = type;
+
 		public string Name { get; }
 		public Type Type { get; }
 
-		private RelationName(string type) => this.Name = type;
-		private RelationName(Type type) => this.Type = type;
-
 		internal string DebugDisplay => Type == null ? Name : $"{nameof(RelationName)} for typeof: {Type?.Name}";
 
+		private static int TypeHashCode { get; } = typeof(RelationName).GetHashCode();
+
+		public bool Equals(RelationName other) => EqualsMarker(other);
+
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
+		{
+			if (!(settings is IConnectionSettingsValues nestSettings))
+				throw new ArgumentNullException(nameof(settings),
+					$"Can not resolve {nameof(RelationName)} if no {nameof(IConnectionSettingsValues)} is provided");
+
+			return nestSettings.Inferrer.RelationName(this);
+		}
+
 		public static RelationName From<T>() => typeof(T);
 
 		public static RelationName Create(Type type) => GetRelationNameForType(type);
@@ -29,13 +42,12 @@ public class RelationName : IEquatable<RelationName>, IUrlParameter
 
 		public static implicit operator RelationName(Type type) => type == null ? null : new RelationName(type);
 
-		private static int TypeHashCode { get; } = typeof(RelationName).GetHashCode();
 		public override int GetHashCode()
 		{
 			unchecked
 			{
 				var result = TypeHashCode;
-				result = (result * 397) ^ (this.Name?.GetHashCode() ?? this.Type?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (Name?.GetHashCode() ?? Type?.GetHashCode() ?? 0);
 				return result;
 			}
 		}
@@ -44,35 +56,27 @@ public override int GetHashCode()
 
 		public static bool operator !=(RelationName left, RelationName right) => !Equals(left, right);
 
-		public bool Equals(RelationName other) => EqualsMarker(other);
-
 		public override bool Equals(object obj) =>
-			obj is string s ? this.EqualsString(s) : (obj is RelationName r) && this.EqualsMarker(r);
+			obj is string s ? EqualsString(s) : obj is RelationName r && EqualsMarker(r);
 
 		public bool EqualsMarker(RelationName other)
 		{
-			if (!this.Name.IsNullOrEmpty() && other != null && !other.Name.IsNullOrEmpty())
+			if (!Name.IsNullOrEmpty() && other != null && !other.Name.IsNullOrEmpty())
 				return EqualsString(other.Name);
-			if (this.Type != null && other?.Type != null)
-				return this.Type == other.Type;
+			if (Type != null && other?.Type != null)
+				return Type == other.Type;
+
 			return false;
 		}
+
 		//already private in master, breaking change to change in 6.x
-		public bool EqualsString(string other) => !other.IsNullOrEmpty() && other == this.Name;
+		public bool EqualsString(string other) => !other.IsNullOrEmpty() && other == Name;
 
 		public override string ToString()
 		{
-			if (!this.Name.IsNullOrEmpty()) return this.Name;
-			return this.Type != null ? this.Type.Name : string.Empty;
-		}
+			if (!Name.IsNullOrEmpty()) return Name;
 
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
-		{
-			if (!(settings is IConnectionSettingsValues nestSettings))
-				throw new ArgumentNullException(nameof(settings), $"Can not resolve {nameof(RelationName)} if no {nameof(IConnectionSettingsValues)} is provided");
-
-			return nestSettings.Inferrer.RelationName(this);
+			return Type != null ? Type.Name : string.Empty;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameExtensions.cs b/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameExtensions.cs
index d44ab306484..c5e5b9ed373 100644
--- a/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameExtensions.cs
+++ b/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameExtensions.cs
@@ -2,9 +2,6 @@
 {
 	internal static class RelationNameExtensions
 	{
-		internal static bool IsConditionless(this RelationName marker)
-		{
-			return marker == null || marker.Name.IsNullOrEmpty() && marker.Type == null;
-		}
+		internal static bool IsConditionless(this RelationName marker) => marker == null || marker.Name.IsNullOrEmpty() && marker.Type == null;
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameJsonConverter.cs
index eda005474b8..5e77f2a8562 100644
--- a/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameJsonConverter.cs
@@ -5,10 +5,7 @@ namespace Nest
 {
 	internal class RelationNameJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType)
-		{
-			return typeof(RelationName) == objectType;
-		}
+		public override bool CanConvert(Type objectType) => typeof(RelationName) == objectType;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
@@ -28,8 +25,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		{
 			if (reader.TokenType == JsonToken.String)
 			{
-				string typeName = reader.Value.ToString();
-				return (RelationName) typeName;
+				var typeName = reader.Value.ToString();
+				return (RelationName)typeName;
 			}
 			return null;
 		}
diff --git a/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameResolver.cs b/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameResolver.cs
index a931f0d1330..a9c28e45667 100644
--- a/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameResolver.cs
+++ b/src/Nest/CommonAbstractions/Infer/RelationName/RelationNameResolver.cs
@@ -11,16 +11,17 @@ public class RelationNameResolver
 		public RelationNameResolver(IConnectionSettingsValues connectionSettings)
 		{
 			connectionSettings.ThrowIfNull(nameof(connectionSettings));
-			this._connectionSettings = connectionSettings;
+			_connectionSettings = connectionSettings;
 		}
 
-		public string Resolve<T>() where T : class => this.Resolve(typeof(T));
+		public string Resolve<T>() where T : class => Resolve(typeof(T));
 
-		public string Resolve(RelationName t) => t?.Name ?? this.ResolveType(t?.Type);
+		public string Resolve(RelationName t) => t?.Name ?? ResolveType(t?.Type);
 
 		private string ResolveType(Type type)
 		{
 			if (type == null) return null;
+
 			string typeName;
 
 			if (RelationNames.TryGetValue(type, out typeName))
@@ -41,6 +42,5 @@ private string ResolveType(Type type)
 			RelationNames.TryAdd(type, typeName);
 			return typeName;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/TaskId/TaskId.cs b/src/Nest/CommonAbstractions/Infer/TaskId/TaskId.cs
index 80f52d4f409..2d4bd1e9b20 100644
--- a/src/Nest/CommonAbstractions/Infer/TaskId/TaskId.cs
+++ b/src/Nest/CommonAbstractions/Infer/TaskId/TaskId.cs
@@ -8,12 +8,6 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class TaskId : IUrlParameter, IEquatable<TaskId>
 	{
-		public string NodeId { get; }
-		public long TaskNumber { get; }
-		public string FullyQualifiedId { get; }
-
-		private string DebugDisplay => FullyQualifiedId;
-
 		/// <summary>
 		/// A task id exists in the form [node_id]:[task_id]
 		/// </summary>
@@ -27,37 +21,43 @@ public TaskId(string taskId)
 			if (tokens.Length != 2)
 				throw new ArgumentException($"TaskId:{taskId} not in expected format of <node_id>:<task_id>", nameof(taskId));
 
-			this.NodeId = tokens[0];
-			this.FullyQualifiedId = taskId;
+			NodeId = tokens[0];
+			FullyQualifiedId = taskId;
 
 			if (!long.TryParse(tokens[1].Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out var t) || t < -1 || t == 0)
 				throw new ArgumentException($"TaskId task component:{tokens[1]} could not be parsed to long or is out of range", nameof(taskId));
 
-			this.TaskNumber = t;
+			TaskNumber = t;
 		}
 
-		public override string ToString() => FullyQualifiedId;
+		public string FullyQualifiedId { get; }
+		public string NodeId { get; }
+		public long TaskNumber { get; }
+
+		private string DebugDisplay => FullyQualifiedId;
+
+		public bool Equals(TaskId other) => EqualsString(other?.FullyQualifiedId);
 
 		public string GetString(IConnectionConfigurationValues settings) => FullyQualifiedId;
 
+		public override string ToString() => FullyQualifiedId;
+
 		public static implicit operator TaskId(string taskId) => taskId.IsNullOrEmpty() ? null : new TaskId(taskId);
 
 		public static bool operator ==(TaskId left, TaskId right) => Equals(left, right);
 
 		public static bool operator !=(TaskId left, TaskId right) => !Equals(left, right);
 
-		public bool Equals(TaskId other) => EqualsString(other?.FullyQualifiedId);
-
 		public override bool Equals(object obj) =>
-			obj != null && obj is string s ? this.EqualsString(s) : (obj is TaskId i) && this.EqualsString(i.FullyQualifiedId);
+			obj != null && obj is string s ? EqualsString(s) : obj is TaskId i && EqualsString(i.FullyQualifiedId);
 
-		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other == this.FullyQualifiedId;
+		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other == FullyQualifiedId;
 
 		public override int GetHashCode()
 		{
 			unchecked
 			{
-				return (NodeId.GetHashCode()*397) ^ TaskNumber.GetHashCode();
+				return (NodeId.GetHashCode() * 397) ^ TaskNumber.GetHashCode();
 			}
 		}
 	}
diff --git a/src/Nest/CommonAbstractions/Infer/TypeName/TypeName.cs b/src/Nest/CommonAbstractions/Infer/TypeName/TypeName.cs
index 9fec2f045d8..35c92591800 100644
--- a/src/Nest/CommonAbstractions/Infer/TypeName/TypeName.cs
+++ b/src/Nest/CommonAbstractions/Infer/TypeName/TypeName.cs
@@ -9,16 +9,26 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class TypeName : IEquatable<TypeName>, IUrlParameter
 	{
-		private static int TypeHashCode { get; } = typeof(TypeName).GetHashCode();
+		private TypeName(string type) => Name = type;
+
+		private TypeName(Type type) => Type = type;
 
 		public string Name { get; }
 		public Type Type { get; }
 
-		private TypeName(string type) => this.Name = type;
+		internal string DebugDisplay => Type == null ? Name : $"{nameof(TypeName)} for typeof: {Type?.Name}";
+		private static int TypeHashCode { get; } = typeof(TypeName).GetHashCode();
 
-		private TypeName(Type type) => this.Type = type;
+		public bool Equals(TypeName other) => EqualsMarker(other);
 
-		internal string DebugDisplay => Type == null ? Name : $"{nameof(TypeName)} for typeof: {Type?.Name}";
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
+		{
+			if (!(settings is IConnectionSettingsValues nestSettings))
+				throw new ArgumentNullException(nameof(settings),
+					$"Can not resolve {nameof(TypeName)} if no {nameof(IConnectionSettingsValues)} is provided");
+
+			return nestSettings.Inferrer.TypeName(this);
+		}
 
 		public static TypeName Create(Type type) => GetTypeNameForType(type);
 
@@ -35,57 +45,50 @@ public override int GetHashCode()
 			unchecked
 			{
 				var result = TypeHashCode;
-				result = (result * 397) ^ (this.Name?.GetHashCode() ?? this.Type?.GetHashCode() ?? 0);
+				result = (result * 397) ^ (Name?.GetHashCode() ?? Type?.GetHashCode() ?? 0);
 				return result;
 			}
 		}
+
 		public static bool operator ==(TypeName left, TypeName right) => Equals(left, right);
 
 		public static bool operator !=(TypeName left, TypeName right) => !Equals(left, right);
 
-		public bool Equals(TypeName other) => EqualsMarker(other);
-
 		public override bool Equals(object obj)
 		{
 			var s = obj as string;
-			if (!s.IsNullOrEmpty()) return this.EqualsString(s);
+			if (!s.IsNullOrEmpty()) return EqualsString(s);
+
 			var pp = obj as TypeName;
-			return this.EqualsMarker(pp);
+			return EqualsMarker(pp);
 		}
 
 		public override string ToString()
 		{
-			if (!this.Name.IsNullOrEmpty())
-				return this.Name;
-			return this.Type != null ? this.Type.Name : string.Empty;
+			if (!Name.IsNullOrEmpty())
+				return Name;
+
+			return Type != null ? Type.Name : string.Empty;
 		}
 
 		private bool EqualsMarker(TypeName other)
 		{
-			if (!this.Name.IsNullOrEmpty() && other != null && !other.Name.IsNullOrEmpty())
+			if (!Name.IsNullOrEmpty() && other != null && !other.Name.IsNullOrEmpty())
 				return EqualsString(other.Name);
-			if (this.Type != null && other?.Type != null)
-				return this.Type == other.Type;
-			return false;
-		}
+			if (Type != null && other?.Type != null)
+				return Type == other.Type;
 
-		private bool EqualsString(string other)
-		{
-			return !other.IsNullOrEmpty() && other == this.Name;
+			return false;
 		}
 
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
-		{
-			if (!(settings is IConnectionSettingsValues nestSettings))
-				throw new ArgumentNullException(nameof(settings), $"Can not resolve {nameof(TypeName)} if no {nameof(IConnectionSettingsValues)} is provided");
-
-			return nestSettings.Inferrer.TypeName(this);
-		}
+		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other == Name;
 
 		public static TypeName From<T>() => typeof(T);
 
-		public Types And<T>() => new Types(new TypeName[] { this, typeof(T)});
+		public Types And<T>() => new Types(new TypeName[] { this, typeof(T) });
+
 		public Types And(TypeName type) => new Types(new TypeName[] { this, type });
+
 		public Types And(TypeName[] types) => new Types(new TypeName[] { this }.Concat(types));
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameExtensions.cs b/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameExtensions.cs
index b61707ba4e8..8a04c7dbf8c 100644
--- a/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameExtensions.cs
+++ b/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameExtensions.cs
@@ -2,9 +2,6 @@
 {
 	internal static class TypeNameExtensions
 	{
-		internal static bool IsConditionless(this TypeName marker)
-		{
-			return marker == null || marker.Name.IsNullOrEmpty() && marker.Type == null;
-		}
+		internal static bool IsConditionless(this TypeName marker) => marker == null || marker.Name.IsNullOrEmpty() && marker.Type == null;
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameJsonConverter.cs
index 7f14d21bc9d..8992a89cb17 100644
--- a/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameJsonConverter.cs
@@ -5,10 +5,7 @@ namespace Nest
 {
 	internal class TypeNameJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType)
-		{
-			return typeof(TypeName) == objectType;
-		}
+		public override bool CanConvert(Type objectType) => typeof(TypeName) == objectType;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
@@ -28,11 +25,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		{
 			if (reader.TokenType == JsonToken.String)
 			{
-				string typeName = reader.Value.ToString();
-				return (TypeName) typeName;
+				var typeName = reader.Value.ToString();
+				return (TypeName)typeName;
 			}
 			return null;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameResolver.cs b/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameResolver.cs
index 6cd13ed68fa..1e0b25a6175 100644
--- a/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameResolver.cs
+++ b/src/Nest/CommonAbstractions/Infer/TypeName/TypeNameResolver.cs
@@ -13,12 +13,12 @@ public class TypeNameResolver
 		public TypeNameResolver(IConnectionSettingsValues connectionSettings)
 		{
 			connectionSettings.ThrowIfNull(nameof(connectionSettings));
-			this._connectionSettings = connectionSettings;
+			_connectionSettings = connectionSettings;
 		}
 
-		public string Resolve<T>() where T : class => this.Resolve(typeof(T));
+		public string Resolve<T>() where T : class => Resolve(typeof(T));
 
-		public string Resolve(TypeName t) => t?.Name ?? this.ResolveType(t?.Type);
+		public string Resolve(TypeName t) => t?.Name ?? ResolveType(t?.Type);
 
 		private string ResolveType(Type type)
 		{
@@ -41,7 +41,7 @@ private string ResolveType(Type type)
 				if (dataContract?.Name != null) typeName = dataContract.Name;
 				else
 				{
-					var inferredType =_connectionSettings.DefaultTypeNameInferrer(type);
+					var inferredType = _connectionSettings.DefaultTypeNameInferrer(type);
 					typeName = !inferredType.IsNullOrEmpty() ? inferredType : _connectionSettings.DefaultTypeName;
 				}
 			}
diff --git a/src/Nest/CommonAbstractions/Infer/Types/Types.cs b/src/Nest/CommonAbstractions/Infer/Types/Types.cs
index b2e4a4ecd25..2d562d60a65 100644
--- a/src/Nest/CommonAbstractions/Infer/Types/Types.cs
+++ b/src/Nest/CommonAbstractions/Infer/Types/Types.cs
@@ -10,86 +10,78 @@ namespace Nest
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public class Types : Union<Types.AllTypesMarker, Types.ManyTypes>, IUrlParameter, IEquatable<Types>
 	{
-		public class AllTypesMarker { internal AllTypesMarker() { } }
+		internal Types(AllTypesMarker all) : base(all) { }
+
+		internal Types(ManyTypes types) : base(types) { }
+
+		internal Types(IEnumerable<TypeName> types) : base(new ManyTypes(types)) { }
+
 		public static AllTypesMarker All { get; } = new AllTypesMarker();
 		public static AllTypesMarker AllTypes { get; } = new AllTypesMarker();
-		public class ManyTypes
+
+		private string DebugDisplay => Match(
+			all => "_all",
+			types => $"Count: {types.Types.Count} [" + string.Join(",", types.Types.Select((t, i) => $"({i + 1}: {t.DebugDisplay})")) + "]"
+		);
+
+		public bool Equals(Types other)
 		{
-			private readonly List<TypeName> _types = new List<TypeName>();
-			public IReadOnlyList<TypeName> Types => _types;
-			internal ManyTypes(IEnumerable<TypeName> types)
-			{
-				types.ThrowIfEmpty(nameof(types));
-				this._types.AddRange(types);
-			}
+			if (other == null) return false;
 
-			internal ManyTypes(IEnumerable<string> types)
-			{
-				types.ThrowIfEmpty(nameof(types));
-				this._types.AddRange(types.Select(s=>(TypeName)s));
-			}
+			return Match(
+				all => other.Match(a => true, m => false),
+				many => other.Match(
+					a => false,
+					m => EqualsAllTypes(m.Types, many.Types)
+				)
+			);
+		}
 
-			public ManyTypes And<T>()
+		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => Match(
+			all => null,
+			many =>
 			{
-				this._types.Add(typeof(T));
-				return this;
-			}
-		}
+				if (!(settings is IConnectionSettingsValues nestSettings))
+					throw new ArgumentNullException(nameof(settings), $"Can not resolve Types if no {nameof(IConnectionSettingsValues)} is provided");
 
-		internal Types(AllTypesMarker all) : base(all) { }
-		internal Types(ManyTypes types) : base(types) { }
-		internal Types(IEnumerable<TypeName> types) : base(new ManyTypes(types)) { }
+				var types = many.Types.Select(t => nestSettings.Inferrer.TypeName(t)).Distinct();
+				return string.Join(",", types);
+			}
+		);
 
 		public static TypeName Type(TypeName type) => type;
+
 		public static TypeName Type<T>() => typeof(T);
+
 		public static ManyTypes Type(IEnumerable<TypeName> types) => new ManyTypes(types);
+
 		public static ManyTypes Type(params TypeName[] types) => new ManyTypes(types);
+
 		public static ManyTypes Type(IEnumerable<string> indices) => new ManyTypes(indices);
+
 		public static ManyTypes Type(params string[] indices) => new ManyTypes(indices);
 
-		public static Types Parse(string typesString) => typesString.IsNullOrEmptyCommaSeparatedList(out var types) ? null : Type(types.Select(i => (TypeName)i));
+		public static Types Parse(string typesString) =>
+			typesString.IsNullOrEmptyCommaSeparatedList(out var types) ? null : Type(types.Select(i => (TypeName)i));
 
 		public static implicit operator Types(string typesString) => Parse(typesString);
+
 		public static implicit operator Types(AllTypesMarker all) => all == null ? null : new Types(all);
+
 		public static implicit operator Types(ManyTypes many) => many == null ? null : new Types(many);
+
 		public static implicit operator Types(TypeName type) => type == null ? null : new ManyTypes(new[] { type });
-		public static implicit operator Types(TypeName[] type) => type.IsEmpty() ? null : new ManyTypes(type);
-		public static implicit operator Types(string[] many) => many.IsEmpty() ? null : new ManyTypes(many);
-		public static implicit operator Types(Type type) => type == null ? null : new ManyTypes(new TypeName[] { type });
 
-		private string DebugDisplay => this.Match(
-			all => "_all",
-			types => $"Count: {types.Types.Count} [" + string.Join(",", types.Types.Select((t, i) => $"({i+1}: {t.DebugDisplay})")) + "]"
-		);
+		public static implicit operator Types(TypeName[] type) => type.IsEmpty() ? null : new ManyTypes(type);
 
-		string IUrlParameter.GetString(IConnectionConfigurationValues settings) => this.Match(
-			all => null,
-			many =>
-			{
-				if (!(settings is IConnectionSettingsValues nestSettings))
-					throw new ArgumentNullException(nameof(settings), $"Can not resolve Types if no {nameof(IConnectionSettingsValues)} is provided");
+		public static implicit operator Types(string[] many) => many.IsEmpty() ? null : new ManyTypes(many);
 
-				var types = many.Types.Select(t => nestSettings.Inferrer.TypeName(t)).Distinct();
-				return string.Join(",", types);
-			}
-		);
+		public static implicit operator Types(Type type) => type == null ? null : new ManyTypes(new TypeName[] { type });
 
 		public static bool operator ==(Types left, Types right) => Equals(left, right);
 
 		public static bool operator !=(Types left, Types right) => !Equals(left, right);
 
-		public bool Equals(Types other)
-		{
-			if (other == null) return false;
-			return this.Match(
-				all => other.Match(a => true, m => false),
-				many => other.Match(
-					a => false,
-					m => EqualsAllTypes(m.Types, many.Types)
-				)
-			);
-		}
-
 		public override bool Equals(object obj)
 		{
 			Types other = null;
@@ -104,15 +96,43 @@ private static bool EqualsAllTypes(IReadOnlyList<TypeName> thisTypes, IReadOnlyL
 			if (thisTypes == null && otherTypes == null) return true;
 			if (thisTypes == null || otherTypes == null) return false;
 			if (thisTypes.Count != otherTypes.Count) return false;
+
 			return thisTypes.Count == otherTypes.Count && !thisTypes.Except(otherTypes).Any();
 		}
 
-		public override int GetHashCode()
+		public override int GetHashCode() => Match(
+			all => "_all".GetHashCode(),
+			many => string.Concat(many.Types).GetHashCode()
+		);
+
+		public class AllTypesMarker
 		{
-			return this.Match(
-				all => "_all".GetHashCode(),
-				many => string.Concat(many.Types).GetHashCode()
-			);
+			internal AllTypesMarker() { }
+		}
+
+		public class ManyTypes
+		{
+			private readonly List<TypeName> _types = new List<TypeName>();
+
+			internal ManyTypes(IEnumerable<TypeName> types)
+			{
+				types.ThrowIfEmpty(nameof(types));
+				_types.AddRange(types);
+			}
+
+			internal ManyTypes(IEnumerable<string> types)
+			{
+				types.ThrowIfEmpty(nameof(types));
+				_types.AddRange(types.Select(s => (TypeName)s));
+			}
+
+			public IReadOnlyList<TypeName> Types => _types;
+
+			public ManyTypes And<T>()
+			{
+				_types.Add(typeof(T));
+				return this;
+			}
 		}
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Types/TypesJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/Types/TypesJsonConverter.cs
index fa8cd203d1b..bf540d07b00 100644
--- a/src/Nest/CommonAbstractions/Infer/Types/TypesJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/Types/TypesJsonConverter.cs
@@ -19,12 +19,12 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				return;
 			}
 			marker.Match(
-				all=> writer.WriteNull(),
+				all => writer.WriteNull(),
 				many =>
 				{
 					var settings = serializer.GetConnectionSettings();
 					writer.WriteStartArray();
-					foreach(var m in many.Types.Cast<IUrlParameter>())
+					foreach (var m in many.Types.Cast<IUrlParameter>())
 						writer.WriteValue(m.GetString(settings));
 					writer.WriteEndArray();
 				}
@@ -33,8 +33,8 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-
 			if (reader.TokenType != JsonToken.StartArray) return null;
+
 			var types = new List<TypeName>();
 			while (reader.TokenType != JsonToken.EndArray)
 			{
@@ -44,6 +44,5 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			}
 			return new Types(types);
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Infer/Types/TypesMultiSyntaxJsonConverter.cs b/src/Nest/CommonAbstractions/Infer/Types/TypesMultiSyntaxJsonConverter.cs
index 9667af1330d..b4266e48aad 100644
--- a/src/Nest/CommonAbstractions/Infer/Types/TypesMultiSyntaxJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Infer/Types/TypesMultiSyntaxJsonConverter.cs
@@ -17,7 +17,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				return;
 			}
 			marker.Match(
-				all=> writer.WriteNull(),
+				all => writer.WriteNull(),
 				many => writer.WriteValue(((IUrlParameter)marker).GetString(serializer.GetConnectionSettings()))
 			);
 		}
@@ -26,11 +26,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		{
 			if (reader.TokenType == JsonToken.String)
 			{
-				string types = reader.Value.ToString();
+				var types = reader.Value.ToString();
 				return (Types)types;
 			}
 			return null;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/LazyDocument/LazyDocument.cs b/src/Nest/CommonAbstractions/LazyDocument/LazyDocument.cs
index 90809e23d1d..59e503061a3 100644
--- a/src/Nest/CommonAbstractions/LazyDocument/LazyDocument.cs
+++ b/src/Nest/CommonAbstractions/LazyDocument/LazyDocument.cs
@@ -1,8 +1,5 @@
 using System;
-using System.IO;
-using System.Text;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Nest
@@ -14,15 +11,15 @@ namespace Nest
 	public interface ILazyDocument
 	{
 		/// <summary>
-		/// Creates an instance of <typeparamref name="T"/> from this
-		/// <see cref="ILazyDocument"/> instance
+		/// Creates an instance of <typeparamref name="T" /> from this
+		/// <see cref="ILazyDocument" /> instance
 		/// </summary>
 		/// <typeparam name="T">The type</typeparam>
 		T As<T>();
 
 		/// <summary>
-		/// Creates an instance of <paramref name="objectType"/> from this
-		/// <see cref="ILazyDocument"/> instance
+		/// Creates an instance of <paramref name="objectType" /> from this
+		/// <see cref="ILazyDocument" /> instance
 		/// </summary>
 		/// <param name="objectType">The type</param>
 		object As(Type objectType);
@@ -31,8 +28,6 @@ public interface ILazyDocument
 	/// <inheritdoc />
 	public class LazyDocument : ILazyDocument
 	{
-		internal JToken Token { get; }
-
 		private readonly IElasticsearchSerializer _serializer;
 
 		internal LazyDocument(JToken token, IElasticsearchSerializer serializer)
@@ -41,6 +36,8 @@ internal LazyDocument(JToken token, IElasticsearchSerializer serializer)
 			_serializer = serializer;
 		}
 
+		internal JToken Token { get; }
+
 		/// <inheritdoc />
 		public T As<T>()
 		{
diff --git a/src/Nest/CommonAbstractions/LazyDocument/LazyDocumentJsonConverter.cs b/src/Nest/CommonAbstractions/LazyDocument/LazyDocumentJsonConverter.cs
index 79c30fe2d71..d8d19d6e1c4 100644
--- a/src/Nest/CommonAbstractions/LazyDocument/LazyDocumentJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/LazyDocument/LazyDocumentJsonConverter.cs
@@ -1,6 +1,5 @@
 using System;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -27,5 +26,4 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 		public override bool CanConvert(Type objectType) => true;
 	}
-
 }
diff --git a/src/Nest/CommonAbstractions/LowLevelDispatch/IHighLevelToLowLevelDispatcher.cs b/src/Nest/CommonAbstractions/LowLevelDispatch/IHighLevelToLowLevelDispatcher.cs
index d7a851df5c0..2aee3a85a75 100644
--- a/src/Nest/CommonAbstractions/LowLevelDispatch/IHighLevelToLowLevelDispatcher.cs
+++ b/src/Nest/CommonAbstractions/LowLevelDispatch/IHighLevelToLowLevelDispatcher.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -20,7 +20,7 @@ TResponse Dispatch<TRequest, TQueryString, TResponse>(
 			TRequest descriptor,
 			Func<IApiCallDetails, Stream, TResponse> responseGenerator,
 			Func<TRequest, SerializableData<TRequest>, TResponse> dispatch
-			)
+		)
 			where TQueryString : RequestParameters<TQueryString>, new()
 			where TRequest : IRequest<TQueryString>
 			where TResponse : ResponseBase;
@@ -29,7 +29,7 @@ Task<TResponseInterface> DispatchAsync<TRequest, TQueryString, TResponse, TRespo
 			TRequest descriptor,
 			CancellationToken cancellationToken,
 			Func<TRequest, SerializableData<TRequest>, CancellationToken, Task<TResponse>> dispatch
-			)
+		)
 			where TQueryString : RequestParameters<TQueryString>, new()
 			where TRequest : IRequest<TQueryString>
 			where TResponse : ResponseBase, TResponseInterface
diff --git a/src/Nest/CommonAbstractions/LowLevelDispatch/LowLevelDispatch.cs b/src/Nest/CommonAbstractions/LowLevelDispatch/LowLevelDispatch.cs
index 785f33c37bf..9b8044799a0 100644
--- a/src/Nest/CommonAbstractions/LowLevelDispatch/LowLevelDispatch.cs
+++ b/src/Nest/CommonAbstractions/LowLevelDispatch/LowLevelDispatch.cs
@@ -8,12 +8,10 @@ namespace Nest
 {
 	internal partial class LowLevelDispatch
 	{
+		private static readonly Regex ReplaceParams = new Regex(@"\{(.+?)\}");
 		protected IElasticLowLevelClient _lowLevel;
 
-		public LowLevelDispatch(IElasticLowLevelClient rawElasticClient)
-		{
-			this._lowLevel = rawElasticClient;
-		}
+		public LowLevelDispatch(IElasticLowLevelClient rawElasticClient) => _lowLevel = rawElasticClient;
 
 		internal bool AllSetNoFallback(params string[] pathVariables) => pathVariables.All(p => !p.IsNullOrEmpty());
 
@@ -26,7 +24,7 @@ internal static Exception InvalidDispatch(string apiCall, IRequest provided, Htt
 			var sb = new StringBuilder();
 			sb.AppendLine($"Dispatching {apiCall}() from NEST into to Elasticsearch.NET failed");
 			sb.AppendLine($"Received a request marked as {provided.HttpMethod.GetStringValue()}");
-			sb.AppendLine($"This endpoint accepts {string.Join(",", methods.Select(p=>p.GetStringValue()))}");
+			sb.AppendLine($"This endpoint accepts {string.Join(",", methods.Select(p => p.GetStringValue()))}");
 			sb.AppendLine($"The request might not have enough information provided to make any of these endpoints:");
 			foreach (var endpoint in endpoints)
 				sb.AppendLine($"  - {PrettyPrintEndpoint(provided, endpoint)}");
@@ -34,37 +32,34 @@ internal static Exception InvalidDispatch(string apiCall, IRequest provided, Htt
 			return new ArgumentException(sb.ToString());
 		}
 
-		private static readonly Regex ReplaceParams = new Regex(@"\{(.+?)\}");
-
 		internal static string PrettyPrintEndpoint(IRequest request, string endpoint)
 		{
 			var pretty = ReplaceParams.Replace(endpoint, (m) =>
 			{
 				var key = m.Groups[1].Value.ToLowerInvariant();
-				switch(key)
+				switch (key)
 				{
-					case "index" :  return PrettyParam(key, request.RouteValues.Index);
-					case "name" :  return PrettyParam(key, request.RouteValues.Name);
-					case "feature" :  return PrettyParam(key, request.RouteValues.Feature);
-					case "field" :  return PrettyParam(key, request.RouteValues.Field);
-					case "fields" :  return PrettyParam(key, request.RouteValues.Fields);
-					case "id" :  return PrettyParam(key, request.RouteValues.Id);
-					case "index_metric" :  return PrettyParam(key, request.RouteValues.IndexMetric);
-					case "lang" :  return PrettyParam(key, request.RouteValues.Lang);
-					case "metric" :  return PrettyParam(key, request.RouteValues.Metric);
-					case "nodes" :  return PrettyParam(key, request.RouteValues.NodeId);
-					case "node_id" :  return PrettyParam(key, request.RouteValues.NodeId);
-					case "repository" :  return PrettyParam(key, request.RouteValues.Repository);
-					case "scroll_id" :  return PrettyParam(key, request.RouteValues.ScrollId);
-					case "snapshot" :  return PrettyParam(key, request.RouteValues.Snapshot);
-					case "type" :  return PrettyParam(key, request.RouteValues.Type);
-					default:  return PrettyParam(key, "<Unknown route variable>");
+					case "index": return PrettyParam(key, request.RouteValues.Index);
+					case "name": return PrettyParam(key, request.RouteValues.Name);
+					case "feature": return PrettyParam(key, request.RouteValues.Feature);
+					case "field": return PrettyParam(key, request.RouteValues.Field);
+					case "fields": return PrettyParam(key, request.RouteValues.Fields);
+					case "id": return PrettyParam(key, request.RouteValues.Id);
+					case "index_metric": return PrettyParam(key, request.RouteValues.IndexMetric);
+					case "lang": return PrettyParam(key, request.RouteValues.Lang);
+					case "metric": return PrettyParam(key, request.RouteValues.Metric);
+					case "nodes": return PrettyParam(key, request.RouteValues.NodeId);
+					case "node_id": return PrettyParam(key, request.RouteValues.NodeId);
+					case "repository": return PrettyParam(key, request.RouteValues.Repository);
+					case "scroll_id": return PrettyParam(key, request.RouteValues.ScrollId);
+					case "snapshot": return PrettyParam(key, request.RouteValues.Snapshot);
+					case "type": return PrettyParam(key, request.RouteValues.Type);
+					default: return PrettyParam(key, "<Unknown route variable>");
 				}
 			});
 			return pretty;
 		}
 
 		private static string PrettyParam(string key, string value) => $"{{{key}={(value.IsNullOrEmpty() ? "<NULL>" : value)}}}";
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/RawJson/RawJson.cs b/src/Nest/CommonAbstractions/RawJson/RawJson.cs
index c968670982c..3cd5c2503de 100644
--- a/src/Nest/CommonAbstractions/RawJson/RawJson.cs
+++ b/src/Nest/CommonAbstractions/RawJson/RawJson.cs
@@ -5,11 +5,8 @@
 	/// </summary>
 	internal class RawJson
 	{
-		public string Data { get; set; }
+		public RawJson(string rawJsonData) => Data = rawJsonData;
 
-		public RawJson(string rawJsonData)
-		{
-			Data = rawJsonData;
-		}
+		public string Data { get; set; }
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Reactive/BlockingSubscribeExtensions.cs b/src/Nest/CommonAbstractions/Reactive/BlockingSubscribeExtensions.cs
index 764e363a3ff..72acf9a3647 100644
--- a/src/Nest/CommonAbstractions/Reactive/BlockingSubscribeExtensions.cs
+++ b/src/Nest/CommonAbstractions/Reactive/BlockingSubscribeExtensions.cs
@@ -10,7 +10,9 @@ public static BulkAllObserver Wait<T>(this BulkAllObservable<T> observable, Time
 			WaitOnObservable<BulkAllObservable<T>, IBulkAllResponse, BulkAllObserver>(
 				observable, maximumRunTime, (e, c) => new BulkAllObserver(onNext, e, c));
 
-		public static ScrollAllObserver<T> Wait<T>(this IObservable<IScrollAllResponse<T>> observable, TimeSpan maximumRunTime, Action<IScrollAllResponse<T>> onNext)
+		public static ScrollAllObserver<T> Wait<T>(this IObservable<IScrollAllResponse<T>> observable, TimeSpan maximumRunTime,
+			Action<IScrollAllResponse<T>> onNext
+		)
 			where T : class =>
 			WaitOnObservable<IObservable<IScrollAllResponse<T>>, IScrollAllResponse<T>, ScrollAllObserver<T>>(
 				observable, maximumRunTime, (e, c) => new ScrollAllObserver<T>(onNext, e, c));
@@ -42,7 +44,8 @@ Func<Action<Exception>, Action, TObserver> factory
 			observable.Subscribe(observer);
 			handle.WaitOne(maximumRunTime);
 			if (ex != null) throw ex;
+
 			return observer;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/Reactive/CoordinatedRequestObserverBase.cs b/src/Nest/CommonAbstractions/Reactive/CoordinatedRequestObserverBase.cs
index 3ce0c8e00b3..72d303dde4e 100644
--- a/src/Nest/CommonAbstractions/Reactive/CoordinatedRequestObserverBase.cs
+++ b/src/Nest/CommonAbstractions/Reactive/CoordinatedRequestObserverBase.cs
@@ -4,9 +4,9 @@ namespace Nest
 {
 	internal static class CoordinatedRequestDefaults
 	{
-		public static int BulkAllMaxDegreeOfParallelismDefault = 4;
-		public static TimeSpan BulkAllBackOffTimeDefault = TimeSpan.FromMinutes(1);
 		public static int BulkAllBackOffRetriesDefault = 0;
+		public static TimeSpan BulkAllBackOffTimeDefault = TimeSpan.FromMinutes(1);
+		public static int BulkAllMaxDegreeOfParallelismDefault = 4;
 		public static int BulkAllSizeDefault = 1000;
 		public static int ReindexBackPressureFactor = 4;
 		public static int ReindexScrollSize = 500;
@@ -14,30 +14,21 @@ internal static class CoordinatedRequestDefaults
 
 	public abstract class CoordinatedRequestObserverBase<T> : IObserver<T>
 	{
-		private readonly Action<T> _onNext;
-		private readonly Action<Exception> _onError;
 		private readonly Action _completed;
+		private readonly Action<Exception> _onError;
+		private readonly Action<T> _onNext;
 
-		protected CoordinatedRequestObserverBase(Action<T> onNext = null, Action<Exception> onError = null, System.Action completed = null)
+		protected CoordinatedRequestObserverBase(Action<T> onNext = null, Action<Exception> onError = null, Action completed = null)
 		{
 			_onNext = onNext;
 			_onError = onError;
 			_completed = completed;
 		}
 
-		public void OnNext(T value)
-		{
-			this._onNext?.Invoke(value);
-		}
+		public void OnCompleted() => _completed?.Invoke();
 
-		public void OnError(Exception error)
-		{
-			this._onError?.Invoke(error);
-		}
+		public void OnError(Exception error) => _onError?.Invoke(error);
 
-		public void OnCompleted()
-		{
-			this._completed?.Invoke();
-		}
+		public void OnNext(T value) => _onNext?.Invoke(value);
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Reactive/GetEnumerator.cs b/src/Nest/CommonAbstractions/Reactive/GetEnumerator.cs
index d7a08f6e77d..a6b48c1e046 100644
--- a/src/Nest/CommonAbstractions/Reactive/GetEnumerator.cs
+++ b/src/Nest/CommonAbstractions/Reactive/GetEnumerator.cs
@@ -8,12 +8,11 @@ namespace Nest
 {
 	internal class GetEnumerator<TSource> : IEnumerator<TSource>, IObserver<TSource>
 	{
+		private readonly SemaphoreSlim _gate;
 		private readonly ConcurrentQueue<TSource> _queue;
 		private TSource _current;
-		private Exception _error;
 		private bool _disposed;
-
-		private readonly SemaphoreSlim _gate;
+		private Exception _error;
 		private IDisposable _subscription;
 
 		public GetEnumerator()
@@ -22,33 +21,15 @@ public GetEnumerator()
 			_gate = new SemaphoreSlim(0);
 		}
 
-		private IEnumerator<TSource> Run(IObservable<TSource> source)
-		{
-			//
-			// [OK] Use of unsafe Subscribe: non-pretentious exact mirror with the dual GetEnumerator method.
-			//
-			_subscription = source.Subscribe/*Unsafe*/(this);
-			return this;
-		}
-		public IEnumerable<TSource> ToEnumerable(IObservable<TSource> source) =>
-			new AnonymousEnumerable<TSource>(() => this.Run(source));
+		public TSource Current => _current;
 
-		public virtual void OnNext(TSource value)
-		{
-			_queue.Enqueue(value);
-			_gate.Release();
-		}
+		object IEnumerator.Current => _current;
 
-		public void OnError(Exception error)
+		public void Dispose()
 		{
-			_error = error;
 			_subscription.Dispose();
-			_gate.Release();
-		}
 
-		public void OnCompleted()
-		{
-			_subscription.Dispose();
+			_disposed = true;
 			_gate.Release();
 		}
 
@@ -68,41 +49,48 @@ public bool MoveNext()
 			return false;
 		}
 
-		public TSource Current => _current;
+		public void Reset() => throw new NotSupportedException();
 
-		object IEnumerator.Current => _current;
+		public void OnCompleted()
+		{
+			_subscription.Dispose();
+			_gate.Release();
+		}
 
-		public void Dispose()
+		public void OnError(Exception error)
 		{
+			_error = error;
 			_subscription.Dispose();
+			_gate.Release();
+		}
 
-			_disposed = true;
+		public virtual void OnNext(TSource value)
+		{
+			_queue.Enqueue(value);
 			_gate.Release();
 		}
 
-		public void Reset()
+		private IEnumerator<TSource> Run(IObservable<TSource> source)
 		{
-			throw new NotSupportedException();
+			//
+			// [OK] Use of unsafe Subscribe: non-pretentious exact mirror with the dual GetEnumerator method.
+			//
+			_subscription = source.Subscribe /*Unsafe*/(this);
+			return this;
 		}
 
+		public IEnumerable<TSource> ToEnumerable(IObservable<TSource> source) =>
+			new AnonymousEnumerable<TSource>(() => Run(source));
+
 		internal sealed class AnonymousEnumerable<T> : IEnumerable<T>
 		{
 			private readonly Func<IEnumerator<T>> _getEnumerator;
 
-			public AnonymousEnumerable(Func<IEnumerator<T>> getEnumerator)
-			{
-				this._getEnumerator = getEnumerator;
-			}
+			public AnonymousEnumerable(Func<IEnumerator<T>> getEnumerator) => _getEnumerator = getEnumerator;
 
-			public IEnumerator<T> GetEnumerator()
-			{
-				return _getEnumerator();
-			}
+			IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-			System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-			{
-				return this.GetEnumerator();
-			}
+			public IEnumerator<T> GetEnumerator() => _getEnumerator();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/Reactive/PartitionHelper.cs b/src/Nest/CommonAbstractions/Reactive/PartitionHelper.cs
index 6e3b2c6a5ae..1c9d4299fdd 100644
--- a/src/Nest/CommonAbstractions/Reactive/PartitionHelper.cs
+++ b/src/Nest/CommonAbstractions/Reactive/PartitionHelper.cs
@@ -16,7 +16,8 @@ internal PartitionHelper(IEnumerable<TDocument> i, int ps)
 			_partitionSize = ps;
 		}
 
-		IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
 		public IEnumerator<IList<TDocument>> GetEnumerator()
 		{
 			using (var enumerator = _items.GetEnumerator())
@@ -32,9 +33,10 @@ private IEnumerable<TDocument> GetNextBatch(IEnumerator<TDocument> enumerator)
 			for (var i = 0; i < _partitionSize; ++i)
 			{
 				yield return enumerator.Current;
+
 				_hasMoreItems = enumerator.MoveNext();
 				if (!_hasMoreItems) yield break;
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/Reactive/ProducerConsumerBackPressure.cs b/src/Nest/CommonAbstractions/Reactive/ProducerConsumerBackPressure.cs
index 141835016fb..ddfcd375795 100644
--- a/src/Nest/CommonAbstractions/Reactive/ProducerConsumerBackPressure.cs
+++ b/src/Nest/CommonAbstractions/Reactive/ProducerConsumerBackPressure.cs
@@ -10,32 +10,35 @@ namespace Nest
 	/// </summary>
 	public class ProducerConsumerBackPressure
 	{
-		private readonly SemaphoreSlim _consumerLimiter;
 		private readonly int _backPressureFactor;
+		private readonly SemaphoreSlim _consumerLimiter;
 		private readonly int _slots;
 
 		/// <summary>
 		/// Simple back pressure implementation that makes sure the minimum max concurrency between producer and consumer
 		/// is not amplified by the greedier of the two by more then the backPressureFactor
 		/// </summary>
-		/// <param name="backPressureFactor">The maximum amplification back pressure of the greedier part of the producer consumer pipeline, if null defaults to 4</param>
+		/// <param name="backPressureFactor">
+		/// The maximum amplification back pressure of the greedier part of the producer consumer pipeline, if null
+		/// defaults to 4
+		/// </param>
 		/// <param name="maxConcurrency">The minimum maximum concurrency which would be the bottleneck of the producer consumer pipeline</param>
 		internal ProducerConsumerBackPressure(int? backPressureFactor, int maxConcurrency)
 		{
-			this._backPressureFactor = backPressureFactor.GetValueOrDefault(4);
-			this._slots = maxConcurrency * this._backPressureFactor;
-			this._consumerLimiter = new SemaphoreSlim(_slots, _slots);
+			_backPressureFactor = backPressureFactor.GetValueOrDefault(4);
+			_slots = maxConcurrency * _backPressureFactor;
+			_consumerLimiter = new SemaphoreSlim(_slots, _slots);
 		}
 
 		public Task WaitAsync(CancellationToken token = default(CancellationToken)) =>
-			this._consumerLimiter.WaitAsync(token);
+			_consumerLimiter.WaitAsync(token);
 
 		public void Release()
 		{
-			var minimumRelease = _slots - this._consumerLimiter.CurrentCount;
-			var release = Math.Min(minimumRelease, this._backPressureFactor);
+			var minimumRelease = _slots - _consumerLimiter.CurrentCount;
+			var release = Math.Min(minimumRelease, _backPressureFactor);
 			if (release > 0)
-				this._consumerLimiter.Release(release);
+				_consumerLimiter.Release(release);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/Request/RequestBase.cs b/src/Nest/CommonAbstractions/Request/RequestBase.cs
index 182f8d21c2d..34610417896 100644
--- a/src/Nest/CommonAbstractions/Request/RequestBase.cs
+++ b/src/Nest/CommonAbstractions/Request/RequestBase.cs
@@ -33,42 +33,40 @@ public interface IProxyRequest : IRequest
 
 	public abstract class RequestBase<TParameters> : IRequest<TParameters> where TParameters : IRequestParameters, new()
 	{
-		[JsonIgnore]
-		protected IRequest<TParameters> RequestState => this;
+		protected RequestBase() => Initialize();
 
-		protected RequestBase()
-		{
-			Initialize();
-		}
 		protected RequestBase(Func<RouteValues, RouteValues> pathSelector)
 		{
 			pathSelector(RequestState.RouteValues);
 			Initialize();
 		}
 
-		protected virtual void Initialize() { }
-
 		protected virtual HttpMethod HttpMethod => RequestState.RequestParameters.DefaultHttpMethod;
 
 		[JsonIgnore]
-		HttpMethod IRequest.HttpMethod => this.HttpMethod;
+		protected IRequest<TParameters> RequestState => this;
 
 		[JsonIgnore]
-		RouteValues IRequest.RouteValues { get; } = new RouteValues();
+		HttpMethod IRequest.HttpMethod => HttpMethod;
 
 		[JsonIgnore]
 		TParameters IRequest<TParameters>.RequestParameters { get; set; } = new TParameters();
 
+		[JsonIgnore]
+		RouteValues IRequest.RouteValues { get; } = new RouteValues();
+
+		protected virtual void Initialize() { }
+
 		protected TOut Q<TOut>(string name) => RequestState.RequestParameters.GetQueryStringValue<TOut>(name);
 
 		protected void Q(string name, object value) => RequestState.RequestParameters.SetQueryString(name, value);
-
 	}
 
 	public abstract partial class PlainRequestBase<TParameters> : RequestBase<TParameters>
 		where TParameters : IRequestParameters, new()
 	{
 		protected PlainRequestBase() { }
+
 		protected PlainRequestBase(Func<RouteValues, RouteValues> pathSelector) : base(pathSelector) { }
 
 		/// <summary>
@@ -81,31 +79,34 @@ public IRequestConfiguration RequestConfiguration
 		}
 	}
 
-	///<summary>
-	/// Base class for all Request descriptor types
-	///</summary>
+	/// <summary>
+	///  Base class for all Request descriptor types
+	/// </summary>
 	public abstract partial class RequestDescriptorBase<TDescriptor, TParameters, TInterface> : RequestBase<TParameters>, IDescriptor
 		where TDescriptor : RequestDescriptorBase<TDescriptor, TParameters, TInterface>, TInterface
 		where TParameters : RequestParameters<TParameters>, new()
 	{
 		private readonly TDescriptor _descriptor;
 
-		protected RequestDescriptorBase() { _descriptor = (TDescriptor)this; }
-		protected RequestDescriptorBase(Func<RouteValues, RouteValues> pathSelector) : base(pathSelector) { _descriptor = (TDescriptor)this;  }
+		protected RequestDescriptorBase() => _descriptor = (TDescriptor)this;
+
+		protected RequestDescriptorBase(Func<RouteValues, RouteValues> pathSelector) : base(pathSelector) => _descriptor = (TDescriptor)this;
 
-		protected TInterface Self => _descriptor;
 		protected IRequestConfiguration RequestConfig => ((IRequestParameters)RequestState.RequestParameters).RequestConfiguration;
 
+		protected TInterface Self => _descriptor;
+
 		protected TDescriptor Assign(Action<TInterface> assign) => Fluent.Assign(_descriptor, assign);
 
 		protected TDescriptor AssignParam(Action<TParameters> assigner)
 		{
-			assigner?.Invoke(this.RequestState.RequestParameters);
+			assigner?.Invoke(RequestState.RequestParameters);
 			return _descriptor;
 		}
+
 		protected TDescriptor Qs(Action<TParameters> assigner)
 		{
-			assigner?.Invoke(this.RequestState.RequestParameters);
+			assigner?.Invoke(RequestState.RequestParameters);
 			return _descriptor;
 		}
 
@@ -126,21 +127,21 @@ public TDescriptor RequestConfiguration(Func<RequestConfigurationDescriptor, IRe
 		}
 
 		/// <summary>
-		/// Hides the <see cref="Equals"/> method.
+		/// Hides the <see cref="Equals" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public override bool Equals(object obj) => base.Equals(obj);
 
 		/// <summary>
-		/// Hides the <see cref="GetHashCode"/> method.
+		/// Hides the <see cref="GetHashCode" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public override int GetHashCode() => base.GetHashCode();
 
 		/// <summary>
-		/// Hides the <see cref="ToString"/> method.
+		/// Hides the <see cref="ToString" /> method.
 		/// </summary>
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/src/Nest/CommonAbstractions/Request/RouteValues.cs b/src/Nest/CommonAbstractions/Request/RouteValues.cs
index e77660c988b..93821e94cbd 100644
--- a/src/Nest/CommonAbstractions/Request/RouteValues.cs
+++ b/src/Nest/CommonAbstractions/Request/RouteValues.cs
@@ -1,59 +1,58 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Elasticsearch.Net;
 
 namespace Nest
 {
 	public class RouteValues
 	{
-		private readonly Dictionary<string, IUrlParameter> _routeValues = new Dictionary<string, IUrlParameter>();
 		private readonly Dictionary<string, string> _resolved = new Dictionary<string, string>();
+		private readonly Dictionary<string, IUrlParameter> _routeValues = new Dictionary<string, IUrlParameter>();
+		public string ActionId => GetResolved("action_id");
+		public string Alias => GetResolved("alias");
+		public string CategoryId => GetResolved("category_id");
+		public string Context => GetResolved("context");
+		public string DatafeedId => GetResolved("datafeed_id");
+		public string Feature => GetResolved("feature");
+		public string Field => GetResolved("field");
+		public string Fields => GetResolved("fields");
+		public string FilterId => GetResolved("filter_id");
+		public string Id => GetResolved("id");
 
 		public string Index => GetResolved("index");
-		public string Type => GetResolved("type");
-		public string Id => GetResolved("id");
+		public string IndexMetric => GetResolved("index_metric");
+		public string JobId => GetResolved("job_id");
+		public string Lang => GetResolved("lang");
+		public string Metric => GetResolved("metric");
 		public string Name => GetResolved("name");
-		public string Field => GetResolved("field");
-		public string ScrollId => GetResolved("scroll_id");
+		public string NewIndex => GetResolved("new_index");
 		public string NodeId => GetResolved("node_id");
-		public string Fields => GetResolved("fields");
+		public string Realms => GetResolved("realms");
 		public string Repository => GetResolved("repository");
+		public string ScrollId => GetResolved("scroll_id");
 		public string Snapshot => GetResolved("snapshot");
-		public string Feature => GetResolved("feature");
-		public string Metric => GetResolved("metric");
-		public string IndexMetric => GetResolved("index_metric");
-		public string Lang => GetResolved("lang");
-		public string TaskId => GetResolved("task_id");
-		public string Realms => GetResolved("realms");
-		public string Username => GetResolved("username");
+		public string SnapshotId => GetResolved("snapshot_id");
 		public string Target => GetResolved("target");
-		public string NewIndex => GetResolved("new_index");
-		public string Alias => GetResolved("alias");
-		public string WatchId => GetResolved("watch_id");
+		public string TaskId => GetResolved("task_id");
 		public string ThreadPoolPatterns => GetResolved("thread_pool_patterns");
-		public string ActionId => GetResolved("action_id");
-		public string JobId => GetResolved("job_id");
-		public string DatafeedId => GetResolved("datafeed_id");
-		public string FilterId => GetResolved("filter_id");
-		public string SnapshotId => GetResolved("snapshot_id");
-		public string CategoryId => GetResolved("category_id");
 		public string Timestamp => GetResolved("timestamp");
-		public string Context => GetResolved("context");
+		public string Type => GetResolved("type");
+		public string Username => GetResolved("username");
 		public WatcherStatsMetric? WatcherStatsMetric => GetResolved("watcher_stats_metric").ToEnum<WatcherStatsMetric>();
+		public string WatchId => GetResolved("watch_id");
 
-		private string GetResolved(string route) => this._resolved.TryGetValue(route, out var resolved) ? resolved : null;
+		private string GetResolved(string route) => _resolved.TryGetValue(route, out var resolved) ? resolved : null;
 
 		private RouteValues Route(string name, IUrlParameter routeValue, bool required = true)
 		{
 			if (routeValue == null && !required)
 			{
-				if (this._routeValues.ContainsKey(name))
-					this._routeValues.Remove(name);
+				if (_routeValues.ContainsKey(name))
+					_routeValues.Remove(name);
 				return this;
 			}
 			if (routeValue == null) return this;
 
-			this._routeValues[name] = routeValue;
+			_routeValues[name] = routeValue;
 			return this;
 		}
 
@@ -62,25 +61,27 @@ public void Resolve(IConnectionSettingsValues settings)
 			foreach (var kv in _routeValues)
 			{
 				var key = kv.Value.GetString(settings);
-				this._resolved[kv.Key] = key.IsNullOrEmpty() ? key : key;
+				_resolved[kv.Key] = key.IsNullOrEmpty() ? key : key;
 			}
 		}
 
 		internal RouteValues Required(string route, IUrlParameter value) => Route(route, value);
+
 		internal RouteValues Optional(string route, IUrlParameter value) => Route(route, value, false);
 
 		internal TActual Get<TActual>(string route) where TActual : class, IUrlParameter
 		{
 			IUrlParameter actual;
-			if (this._routeValues.TryGetValue(route, out actual) && actual != null)
+			if (_routeValues.TryGetValue(route, out actual) && actual != null)
 				return (TActual)actual;
+
 			return null;
 		}
 
 		public void Remove(string route)
 		{
-			this._resolved.Remove(route);
-			this._routeValues.Remove(route);
+			_resolved.Remove(route);
+			_routeValues.Remove(route);
 		}
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Response/DictionaryResponseBase.cs b/src/Nest/CommonAbstractions/Response/DictionaryResponseBase.cs
index b8af6a47120..65b020264cc 100644
--- a/src/Nest/CommonAbstractions/Response/DictionaryResponseBase.cs
+++ b/src/Nest/CommonAbstractions/Response/DictionaryResponseBase.cs
@@ -29,10 +29,10 @@ public static JObject ReadServerErrorFirst(JsonReader reader, out Error error, o
 			if (errorProperty?.Value?.Type == JTokenType.String)
 			{
 				var reason = errorProperty.Value.Value<string>();
-				error = new Error {Reason = reason};
+				error = new Error { Reason = reason };
 				errorProperty.Remove();
 			}
-			else if (errorProperty?.Value?.Type == JTokenType.Object && ((JObject) errorProperty.Value)["reason"] != null)
+			else if (errorProperty?.Value?.Type == JTokenType.Object && ((JObject)errorProperty.Value)["reason"] != null)
 			{
 				error = errorProperty.Value.ToObject<Error>();
 				errorProperty.Remove();
@@ -51,10 +51,11 @@ public static JObject ReadServerErrorFirst(JsonReader reader, out Error error, o
 	internal class DictionaryResponseJsonConverter<TResponse, TKey, TValue> : JsonConverter
 		where TResponse : ResponseBase, IDictionaryResponse<TKey, TValue>, new()
 	{
-		public override bool CanConvert(Type objectType) => true;
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var j = DictionaryResponseJsonConverterHelpers.ReadServerErrorFirst(reader, out var error, out var statusCode);
@@ -68,6 +69,5 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { }
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Response/ElasticsearchVersionInfo.cs b/src/Nest/CommonAbstractions/Response/ElasticsearchVersionInfo.cs
index 97bd7578018..c1d5bd4d802 100644
--- a/src/Nest/CommonAbstractions/Response/ElasticsearchVersionInfo.cs
+++ b/src/Nest/CommonAbstractions/Response/ElasticsearchVersionInfo.cs
@@ -2,15 +2,14 @@
 
 namespace Nest
 {
-
 	public class ElasticsearchVersionInfo
 	{
-		public string Number { get; set; }
-
 		[JsonProperty("snapshot_build")]
 		public bool IsSnapShotBuild { get; set; }
 
 		[JsonProperty("lucene_version")]
 		public string LuceneVersion { get; set; }
+
+		public string Number { get; set; }
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Response/ResolvableDictionaryProxy.cs b/src/Nest/CommonAbstractions/Response/ResolvableDictionaryProxy.cs
index 0dff88b0263..7e1c0dadc9c 100644
--- a/src/Nest/CommonAbstractions/Response/ResolvableDictionaryProxy.cs
+++ b/src/Nest/CommonAbstractions/Response/ResolvableDictionaryProxy.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -11,54 +10,55 @@ public class ResolvableDictionaryProxy<TKey, TValue> : IIsAReadOnlyDictionary<TK
 		where TKey : IUrlParameter
 	{
 		private readonly IConnectionConfigurationValues _connectionSettings;
-		private IReadOnlyDictionary<TKey, TValue> Original { get; } = EmptyReadOnly<TKey, TValue>.Dictionary;
-		protected internal IReadOnlyDictionary<string, TValue> BackingDictionary { get; } = EmptyReadOnly<string, TValue>.Dictionary;
 
 		internal ResolvableDictionaryProxy(IConnectionConfigurationValues connectionSettings, IReadOnlyDictionary<TKey, TValue> backingDictionary)
 		{
-			this._connectionSettings = connectionSettings;
+			_connectionSettings = connectionSettings;
 			if (backingDictionary == null) return;
 
-			this.Original = backingDictionary;
+			Original = backingDictionary;
 
 			var dictionary = new Dictionary<string, TValue>();
 			foreach (var key in backingDictionary.Keys)
 				dictionary[Sanitize(key)] = backingDictionary[key];
 
-			this.BackingDictionary = dictionary;
+			BackingDictionary = dictionary;
 		}
 
-		private string Sanitize(TKey key) => key?.GetString(_connectionSettings);
+		public int Count => BackingDictionary.Count;
 
-		IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() =>
-			this.Original.GetEnumerator();
+		public TValue this[TKey key] => BackingDictionary.TryGetValue(Sanitize(key), out var v) ? v : default(TValue);
+		public TValue this[string key] => BackingDictionary.TryGetValue(key, out var v) ? v : default(TValue);
 
-		IEnumerator IEnumerable.GetEnumerator() => this.Original.GetEnumerator();
+		public IEnumerable<TKey> Keys => Original.Keys;
+		public IEnumerable<string> ResolvedKeys => BackingDictionary.Keys;
 
-		public int Count => this.BackingDictionary.Count;
+		public IEnumerable<TValue> Values => BackingDictionary.Values;
+		protected internal IReadOnlyDictionary<string, TValue> BackingDictionary { get; } = EmptyReadOnly<string, TValue>.Dictionary;
+		private IReadOnlyDictionary<TKey, TValue> Original { get; } = EmptyReadOnly<TKey, TValue>.Dictionary;
 
-		public bool ContainsKey(TKey key) => this.BackingDictionary.ContainsKey(Sanitize(key));
+		IEnumerator IEnumerable.GetEnumerator() => Original.GetEnumerator();
 
-		public bool TryGetValue(TKey key, out TValue value) =>
-			this.BackingDictionary.TryGetValue(Sanitize(key), out value);
+		IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() =>
+			Original.GetEnumerator();
 
-		public TValue this[TKey key] => this.BackingDictionary.TryGetValue(Sanitize(key), out var v) ? v : default(TValue);
-		public TValue this[string key] => this.BackingDictionary.TryGetValue(key, out var v) ? v : default(TValue);
+		public bool ContainsKey(TKey key) => BackingDictionary.ContainsKey(Sanitize(key));
 
-		public IEnumerable<TKey> Keys => this.Original.Keys;
-		public IEnumerable<string> ResolvedKeys => this.BackingDictionary.Keys;
+		public bool TryGetValue(TKey key, out TValue value) =>
+			BackingDictionary.TryGetValue(Sanitize(key), out value);
 
-		public IEnumerable<TValue> Values => this.BackingDictionary.Values;
+		private string Sanitize(TKey key) => key?.GetString(_connectionSettings);
 	}
 
 	internal abstract class ResolvableDictionaryJsonConverterBase<TDictionary, TKey, TValue> : JsonConverter
 		where TDictionary : ResolvableDictionaryProxy<TKey, TValue>
 		where TKey : IUrlParameter
 	{
-		public override bool CanConvert(Type objectType) => true;
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { }
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -71,11 +71,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		}
 
 		protected abstract TDictionary Create(IConnectionSettingsValues settings, Dictionary<TKey, TValue> dictionary);
-
 	}
 
 	internal class ResolvableDictionaryJsonConverter<TKey, TValue>
-		: ResolvableDictionaryJsonConverterBase<ResolvableDictionaryProxy<TKey, TValue>,TKey, TValue>
+		: ResolvableDictionaryJsonConverterBase<ResolvableDictionaryProxy<TKey, TValue>, TKey, TValue>
 		where TKey : IUrlParameter
 	{
 		protected override ResolvableDictionaryProxy<TKey, TValue> Create(IConnectionSettingsValues s, Dictionary<TKey, TValue> d) =>
@@ -83,12 +82,13 @@ protected override ResolvableDictionaryProxy<TKey, TValue> Create(IConnectionSet
 	}
 
 	internal class ResolvableDictionaryResponseJsonConverter<TResponse, TKey, TValue> : JsonConverter
-		where TResponse : ResponseBase, IDictionaryResponse<TKey, TValue> , new() where TKey : IUrlParameter
+		where TResponse : ResponseBase, IDictionaryResponse<TKey, TValue>, new() where TKey : IUrlParameter
 	{
-		public override bool CanConvert(Type objectType) => true;
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var j = DictionaryResponseJsonConverterHelpers.ReadServerErrorFirst(reader, out var error, out var statusCode);
diff --git a/src/Nest/CommonAbstractions/Response/ResponseBase.cs b/src/Nest/CommonAbstractions/Response/ResponseBase.cs
index 115c2f62b48..ce8bd6a588a 100644
--- a/src/Nest/CommonAbstractions/Response/ResponseBase.cs
+++ b/src/Nest/CommonAbstractions/Response/ResponseBase.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Diagnostics;
-using System.Linq;
 using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
@@ -13,60 +11,92 @@ namespace Nest
 	public interface IResponse : IElasticsearchResponse
 	{
 		/// <summary>
-		/// This property can be used to check if a response is functionally valid or not.
-		/// This is a NEST abstraction to have a single point to check whether something wrong happened with the request.
-		/// <para>For instance an elasticsearch bulk response always returns 200 and individual bulk items may fail, <see cref="IsValid"/> will be false in that case</para>
-		/// <para>You can also configure the client to always throw an <see cref="ElasticsearchClientException"/> using <see cref="IConnectionConfigurationValues.ThrowExceptions"/> if the response is not valid</para>
+		/// A lazy human readable string representation of what happened during this request for both successful and
+		/// failed requests, very useful while developing or to log when <see cref="IsValid" /> is false on responses.
 		/// </summary>
 		[JsonIgnore]
-		bool IsValid { get; }
+		string DebugInformation { get; }
 
 		/// <summary>
-		/// If the response results in an error on elasticsearch's side an <pre>error</pre> element will be returned, this is mapped to <see cref="ServerError"/> in NEST.
-		/// <para>Possibly set when <see cref="IsValid"/> is false, depending on the cause of the error</para>
-		/// <para>You can also configure the client to always throw an <see cref="ElasticsearchClientException"/> using <see cref="IConnectionConfigurationValues.ThrowExceptions"/> if the response is not valid</para>
+		/// This property can be used to check if a response is functionally valid or not.
+		/// This is a NEST abstraction to have a single point to check whether something wrong happened with the request.
+		/// <para>
+		/// For instance an elasticsearch bulk response always returns 200 and individual bulk items may fail, <see cref="IsValid" /> will be
+		/// false in that case
+		/// </para>
+		/// <para>
+		/// You can also configure the client to always throw an <see cref="ElasticsearchClientException" /> using
+		/// <see cref="IConnectionConfigurationValues.ThrowExceptions" /> if the response is not valid
+		/// </para>
 		/// </summary>
 		[JsonIgnore]
-		ServerError ServerError { get; }
+		bool IsValid { get; }
 
 		/// <summary>
 		/// If the request resulted in an exception on the client side this will hold the exception that was thrown.
-		/// <para>This property is a shortcut to <see cref="IElasticsearchResponse.ApiCall"/>'s <see cref="IApiCallDetails.OriginalException"/> and is possibly set when <see cref="IsValid"/> is false depending on the cause of the error</para>
-		/// <para>You can also configure the client to always throw an <see cref="ElasticsearchClientException"/> using <see cref="IConnectionConfigurationValues.ThrowExceptions"/> if the response is not valid</para>
+		/// <para>
+		/// This property is a shortcut to <see cref="IElasticsearchResponse.ApiCall" />'s <see cref="IApiCallDetails.OriginalException" /> and
+		/// is possibly set when <see cref="IsValid" /> is false depending on the cause of the error
+		/// </para>
+		/// <para>
+		/// You can also configure the client to always throw an <see cref="ElasticsearchClientException" /> using
+		/// <see cref="IConnectionConfigurationValues.ThrowExceptions" /> if the response is not valid
+		/// </para>
 		/// </summary>
 		[JsonIgnore]
 		Exception OriginalException { get; }
 
-        /// <summary>
-        /// A lazy human readable string representation of what happened during this request for both successful and
-        /// failed requests, very useful while developing or to log when <see cref="IsValid"/> is false on responses.
-        /// </summary>
-        [JsonIgnore]
-		string DebugInformation { get; }
+		/// <summary>
+		/// If the response results in an error on elasticsearch's side an <pre>error</pre> element will be returned, this is mapped to
+		/// <see cref="ServerError" /> in NEST.
+		/// <para>Possibly set when <see cref="IsValid" /> is false, depending on the cause of the error</para>
+		/// <para>
+		/// You can also configure the client to always throw an <see cref="ElasticsearchClientException" /> using
+		/// <see cref="IConnectionConfigurationValues.ThrowExceptions" /> if the response is not valid
+		/// </para>
+		/// </summary>
+		[JsonIgnore]
+		ServerError ServerError { get; }
 	}
 
 	public abstract class ResponseBase : IResponse
 	{
+		private Error _error;
 		private IApiCallDetails _originalApiCall;
 		private ServerError _serverError;
-		private Error _error;
 		private int? _statusCode;
 
-        [JsonIgnore]
-		IApiCallDetails IElasticsearchResponse.ApiCall { get => _originalApiCall; set => _originalApiCall = value; }
+		/// <summary> Returns useful information about the request(s) that were part of this API call. </summary>
+		public virtual IApiCallDetails ApiCall => _originalApiCall;
 
-		bool IElasticsearchResponse.TryGetServerErrorReason(out string reason)
+		/// <inheritdoc />
+		public string DebugInformation
 		{
-			reason = this.ServerError?.Error?.ToString();
-			return !reason.IsNullOrEmpty();
+			get
+			{
+				var sb = new StringBuilder();
+				sb.Append($"{(!IsValid ? "Inv" : "V")}alid NEST response built from a ");
+				sb.AppendLine(ApiCall?.ToString().ToCamelCase() ?? "null ApiCall which is highly exceptional, please open a bug if you see this");
+				if (!IsValid) DebugIsValid(sb);
+				if (ApiCall != null) ResponseStatics.DebugInformationBuilder(ApiCall, sb);
+				return sb.ToString();
+			}
 		}
 
+		/// <inheritdoc />
+		public virtual bool IsValid => (ApiCall?.Success ?? false) && ServerError == null;
+
+
+		/// <inheritdoc />
+		public Exception OriginalException => ApiCall?.OriginalException;
+
 		public ServerError ServerError
 		{
 			get
 			{
 				if (_serverError != null) return _serverError;
 				if (_error == null) return null;
+
 				_serverError = new ServerError(_error, _statusCode);
 				return _serverError;
 			}
@@ -94,32 +124,22 @@ internal int? StatusCode
 			}
 		}
 
-		/// <inheritdoc/>
-		public virtual bool IsValid => (this.ApiCall?.Success ?? false) && (this.ServerError == null);
-
-		/// <summary> Returns useful information about the request(s) that were part of this API call. </summary>
-		public virtual IApiCallDetails ApiCall => _originalApiCall;
-
-
-		/// <inheritdoc/>
-		public Exception OriginalException => this.ApiCall?.OriginalException;
+		[JsonIgnore]
+		IApiCallDetails IElasticsearchResponse.ApiCall
+		{
+			get => _originalApiCall;
+			set => _originalApiCall = value;
+		}
 
-		/// <inheritdoc/>
-		public string DebugInformation
+		bool IElasticsearchResponse.TryGetServerErrorReason(out string reason)
 		{
-			get
-			{
-				var sb = new StringBuilder();
-				sb.Append($"{(!this.IsValid ? "Inv" : "V")}alid NEST response built from a ");
-				sb.AppendLine(this.ApiCall?.ToString().ToCamelCase() ?? "null ApiCall which is highly exceptional, please open a bug if you see this");
-				if (!this.IsValid) this.DebugIsValid(sb);
-				if (this.ApiCall != null) ResponseStatics.DebugInformationBuilder(ApiCall, sb);
-				return sb.ToString();
-			}
+			reason = ServerError?.Error?.ToString();
+			return !reason.IsNullOrEmpty();
 		}
+
 		/// <summary>Subclasses can override this to provide more information on why a call is not valid.</summary>
 		protected virtual void DebugIsValid(StringBuilder sb) { }
 
-		public override string ToString() =>  $"{(!this.IsValid ? "Inv" : "V")}alid NEST response built from a {this.ApiCall?.ToString().ToCamelCase()}";
+		public override string ToString() => $"{(!IsValid ? "Inv" : "V")}alid NEST response built from a {ApiCall?.ToString().ToCamelCase()}";
 	}
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/IgnoreAttribute.cs b/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/IgnoreAttribute.cs
index 1c2059e0e69..24d2cb09215 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/IgnoreAttribute.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/IgnoreAttribute.cs
@@ -4,4 +4,4 @@ namespace Nest
 {
 	[AttributeUsage(AttributeTargets.Property)]
 	public class IgnoreAttribute : Attribute { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/PropertyNameAttribute.cs b/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/PropertyNameAttribute.cs
index ef28549ee45..cf38fa2c110 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/PropertyNameAttribute.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/PropertyNameAttribute.cs
@@ -5,7 +5,8 @@ namespace Nest
 	[AttributeUsage(AttributeTargets.Property)]
 	public class PropertyNameAttribute : Attribute
 	{
-		public string Name { get; set; }
 		public PropertyNameAttribute(string name) => Name = name;
+
+		public string Name { get; set; }
 	}
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/StringTimeSpanAttribute.cs b/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/StringTimeSpanAttribute.cs
index b3b6c9f6ac5..2ffcf994020 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/StringTimeSpanAttribute.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/Attributes/StringTimeSpanAttribute.cs
@@ -4,4 +4,4 @@ namespace Nest
 {
 	[AttributeUsage(AttributeTargets.Property)]
 	public class StringTimeSpanAttribute : Attribute { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/ContractJsonConverterAttribute.cs b/src/Nest/CommonAbstractions/SerializationBehavior/ContractJsonConverterAttribute.cs
index 905158e50fe..4d5c98e28f9 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/ContractJsonConverterAttribute.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/ContractJsonConverterAttribute.cs
@@ -3,29 +3,23 @@
 
 namespace Nest
 {
-
 	internal class ContractJsonConverterAttribute : Attribute
 	{
-		public JsonConverter Converter { get; }
-
 		public ContractJsonConverterAttribute(Type jsonConverter)
 		{
-			if (typeof(JsonConverter).IsAssignableFrom(jsonConverter))
-			{
-				Converter = jsonConverter.CreateInstance<JsonConverter>();
-			}
+			if (typeof(JsonConverter).IsAssignableFrom(jsonConverter)) Converter = jsonConverter.CreateInstance<JsonConverter>();
 		}
+
+		public JsonConverter Converter { get; }
 	}
+
 	internal class ExactContractJsonConverterAttribute : Attribute
 	{
-		public JsonConverter Converter { get; }
-
 		public ExactContractJsonConverterAttribute(Type jsonConverter)
 		{
-			if (typeof(JsonConverter).IsAssignableFrom(jsonConverter))
-			{
-				Converter = jsonConverter.CreateInstance<JsonConverter>();
-			}
+			if (typeof(JsonConverter).IsAssignableFrom(jsonConverter)) Converter = jsonConverter.CreateInstance<JsonConverter>();
 		}
+
+		public JsonConverter Converter { get; }
 	}
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/ElasticContractResolver.cs b/src/Nest/CommonAbstractions/SerializationBehavior/ElasticContractResolver.cs
index 3e490d7d473..9d4c99e2b8b 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/ElasticContractResolver.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/ElasticContractResolver.cs
@@ -13,15 +13,29 @@ namespace Nest
 {
 	internal class ElasticContractResolver : DefaultContractResolver
 	{
+		private static readonly Type _readAsType = typeof(ReadAsTypeJsonConverter<>);
+		private static readonly MachineLearningDateTimeConverter MachineLearningDateTimeConverter = new MachineLearningDateTimeConverter();
+
+		private static readonly StringEnumConverter StringEnumConverter = new StringEnumConverter();
+		private static readonly Type[] StringSignalTypes = { typeof(KeywordAttribute), typeof(TextAttribute) };
+		private static readonly StringTimeSpanConverter StringTimeSpanConverter = new StringTimeSpanConverter();
+
+		private static readonly Assembly ThisAssembly = typeof(ElasticContractResolver).Assembly();
 		private readonly Lazy<bool> _usingSourceSerializer;
 
-		public static JsonSerializer Empty { get; } = new JsonSerializer();
+		public ElasticContractResolver(IConnectionSettingsValues connectionSettings)
+		{
+			ConnectionSettings = connectionSettings;
+			_usingSourceSerializer = new Lazy<bool>(() => connectionSettings.RequestResponseSerializer != connectionSettings.SourceSerializer);
+		}
 
 		/// <summary>
 		/// ConnectionSettings can be requested by JsonConverters.
 		/// </summary>
 		public IConnectionSettingsValues ConnectionSettings { get; }
 
+		public static JsonSerializer Empty { get; } = new JsonSerializer();
+
 		public bool UsingSourceSerializer => _usingSourceSerializer.Value;
 
 		/// <summary>
@@ -29,60 +43,50 @@ internal class ElasticContractResolver : DefaultContractResolver
 		/// </summary>
 		internal JsonConverterPiggyBackState PiggyBackState { get; set; }
 
-		public ElasticContractResolver(IConnectionSettingsValues connectionSettings)
-		{
-			this.ConnectionSettings = connectionSettings;
-			_usingSourceSerializer = new Lazy<bool>(() => connectionSettings.RequestResponseSerializer != connectionSettings.SourceSerializer);
-		}
-
 		protected bool CanRemoveSourceConverter(JsonConverter converter)
 		{
 			if (UsingSourceSerializer || converter == null) return false;
+
 			return converter is SourceConverter;
 		}
 
-		protected override JsonContract CreateContract(Type objectType)
+		protected override JsonContract CreateContract(Type objectType) => ConnectionSettings.Inferrer.Contracts.GetOrAdd(objectType, o =>
 		{
-			// cache contracts per connection settings
-			return this.ConnectionSettings.Inferrer.Contracts.GetOrAdd(objectType, o =>
-			{
-				var contract = base.CreateContract(o);
+			var contract = base.CreateContract(o);
 
-				if (o == typeof(Error)) contract.Converter = new ErrorJsonConverter();
-				else if (o == typeof(ErrorCause)) contract.Converter = new ErrorCauseJsonConverter();
-				else if (CanRemoveSourceConverter(contract.Converter)) contract.Converter = null; //rely on defaults
-				else if (o.IsGeneric() && o.GetGenericTypeDefinition() == typeof(SuggestDictionary<>))
-					contract.Converter =
-						(JsonConverter)typeof(SuggestDictionaryConverter<>).CreateGenericInstance(o.GetGenericArguments());
+			if (o == typeof(Error)) contract.Converter = new ErrorJsonConverter();
+			else if (o == typeof(ErrorCause)) contract.Converter = new ErrorCauseJsonConverter();
+			else if (CanRemoveSourceConverter(contract.Converter)) contract.Converter = null; //rely on defaults
+			else if (o.IsGeneric() && o.GetGenericTypeDefinition() == typeof(SuggestDictionary<>))
+				contract.Converter =
+					(JsonConverter)typeof(SuggestDictionaryConverter<>).CreateGenericInstance(o.GetGenericArguments());
 
-				else if (contract.Converter == null &&
-					(typeof(IDictionary).IsAssignableFrom(o) || o.IsGenericDictionary()) && !typeof(IIsADictionary).IsAssignableFrom(o))
-				{
-					if (!o.TryGetGenericDictionaryArguments(out var genericArguments))
-						contract.Converter = new VerbatimDictionaryKeysJsonConverter();
-					else
-						contract.Converter =
-							(JsonConverter)typeof(VerbatimDictionaryKeysJsonConverter<,>).CreateGenericInstance(genericArguments);
-				}
+			else if (contract.Converter == null &&
+				(typeof(IDictionary).IsAssignableFrom(o) || o.IsGenericDictionary()) && !typeof(IIsADictionary).IsAssignableFrom(o))
+			{
+				if (!o.TryGetGenericDictionaryArguments(out var genericArguments))
+					contract.Converter = new VerbatimDictionaryKeysJsonConverter();
+				else
+					contract.Converter =
+						(JsonConverter)typeof(VerbatimDictionaryKeysJsonConverter<,>).CreateGenericInstance(genericArguments);
+			}
 
-				else if (o == typeof(DateTime) || o == typeof(DateTime?))
-					contract.Converter = new IsoDateTimeConverter { Culture = CultureInfo.InvariantCulture };
-				else if (o == typeof(TimeSpan) || o == typeof(TimeSpan?))
-					contract.Converter = new TimeSpanToStringConverter();
-				else if (typeof(IEnumerable<QueryContainer>).IsAssignableFrom(o))
-					contract.Converter = new QueryContainerCollectionJsonConverter();
+			else if (o == typeof(DateTime) || o == typeof(DateTime?))
+				contract.Converter = new IsoDateTimeConverter { Culture = CultureInfo.InvariantCulture };
+			else if (o == typeof(TimeSpan) || o == typeof(TimeSpan?))
+				contract.Converter = new TimeSpanToStringConverter();
+			else if (typeof(IEnumerable<QueryContainer>).IsAssignableFrom(o))
+				contract.Converter = new QueryContainerCollectionJsonConverter();
 
-				ApplyBuildInSerializersForType(o, contract);
+			ApplyBuildInSerializersForType(o, contract);
 
-				if (!o.FullName.StartsWith("Nest.", StringComparison.OrdinalIgnoreCase)) return contract;
-				if (ApplyExactContractJsonAttribute(o, contract)) return contract;
-				if (ApplyContractJsonAttribute(o, contract)) return contract;
+			if (!o.FullName.StartsWith("Nest.", StringComparison.OrdinalIgnoreCase)) return contract;
+			if (ApplyExactContractJsonAttribute(o, contract)) return contract;
+			if (ApplyContractJsonAttribute(o, contract)) return contract;
 
-				return contract;
-			});
-		}
+			return contract;
+		});
 
-		private static Type _readAsType = typeof(ReadAsTypeJsonConverter<>);
 		protected override JsonConverter ResolveContractConverter(Type objectType)
 		{
 			var info = objectType.GetTypeInfo();
@@ -93,20 +97,22 @@ protected override JsonConverter ResolveContractConverter(Type objectType)
 			var readAsType = attribute.Type;
 			var readAsTypeInfo = readAsType.GetTypeInfo();
 			if (!readAsTypeInfo.IsGenericType || !readAsTypeInfo.IsGenericTypeDefinition)
-				return (JsonConverter) _readAsType.CreateGenericInstance(objectType);
+				return (JsonConverter)_readAsType.CreateGenericInstance(objectType);
 
 			var targetType = objectType;
 			if (info.IsGenericType) targetType = targetType.GetGenericArguments().First();
 
 			var concreteType = readAsType.MakeGenericType(targetType);
-			return (JsonConverter) _readAsType.CreateGenericInstance(concreteType);
-
+			return (JsonConverter)_readAsType.CreateGenericInstance(concreteType);
 		}
 
 		private static bool ApplyExactContractJsonAttribute(Type objectType, JsonContract contract)
 		{
-			var attribute = (ExactContractJsonConverterAttribute)objectType.GetTypeInfo().GetCustomAttributes(typeof(ExactContractJsonConverterAttribute)).FirstOrDefault();
+			var attribute = (ExactContractJsonConverterAttribute)objectType.GetTypeInfo()
+				.GetCustomAttributes(typeof(ExactContractJsonConverterAttribute))
+				.FirstOrDefault();
 			if (attribute?.Converter == null) return false;
+
 			contract.Converter = attribute.Converter;
 			return true;
 		}
@@ -115,8 +121,12 @@ private static bool ApplyContractJsonAttribute(Type objectType, JsonContract con
 		{
 			foreach (var t in TypeWithInterfaces(objectType))
 			{
-				var attribute = (ContractJsonConverterAttribute)t.GetTypeInfo().GetCustomAttributes(typeof(ContractJsonConverterAttribute), true).FirstOrDefault();
+				var attribute =
+					(ContractJsonConverterAttribute)t.GetTypeInfo()
+						.GetCustomAttributes(typeof(ContractJsonConverterAttribute), true)
+						.FirstOrDefault();
 				if (attribute?.Converter == null) continue;
+
 				contract.Converter = attribute.Converter;
 				return true;
 			}
@@ -126,11 +136,10 @@ private static bool ApplyContractJsonAttribute(Type objectType, JsonContract con
 		private static IEnumerable<Type> TypeWithInterfaces(Type objectType)
 		{
 			yield return objectType;
+
 			foreach (var i in objectType.GetInterfaces()) yield return i;
 		}
 
-		private static readonly Assembly ThisAssembly = typeof(ElasticContractResolver).Assembly();
-
 		protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
 		{
 			var property = base.CreateProperty(member, memberSerialization);
@@ -165,41 +174,32 @@ protected override IList<JsonProperty> CreateProperties(Type type, MemberSeriali
 			return base.CreateProperties(type, memberSerialization);
 		}
 
-		public IList<JsonProperty> PropertiesOfAllInterfaces(Type t, MemberSerialization memberSerialization)
-		{
-			return (
+		public IList<JsonProperty> PropertiesOfAllInterfaces(Type t, MemberSerialization memberSerialization) => (
 				from i in t.GetInterfaces()
 				select base.CreateProperties(i, memberSerialization)
-				)
-				.SelectMany(interfaceProps => interfaceProps)
-				.DistinctBy(p => p.PropertyName)
-				.ToList();
-		}
+			)
+			.SelectMany(interfaceProps => interfaceProps)
+			.DistinctBy(p => p.PropertyName)
+			.ToList();
 
 		public IList<JsonProperty> PropertiesOfInterface<TInterface>(Type t, MemberSerialization memberSerialization)
-			where TInterface : class
-		{
-			return (
+			where TInterface : class => (
 				from i in t.GetInterfaces().Where(i => typeof(TInterface).IsAssignableFrom(i))
 				select base.CreateProperties(i, memberSerialization)
-				)
-				.SelectMany(interfaceProps => interfaceProps)
-				.DistinctBy(p => p.PropertyName)
-				.ToList();
-		}
+			)
+			.SelectMany(interfaceProps => interfaceProps)
+			.DistinctBy(p => p.PropertyName)
+			.ToList();
 
-		public IList<JsonProperty> PropertiesOfAll(Type t, MemberSerialization memberSerialization)
-		{
-			return base.CreateProperties(t, memberSerialization)
-				.Concat(PropertiesOfAllInterfaces(t, memberSerialization))
-				.DistinctBy(p => p.PropertyName)
-				.ToList();
-		}
+		public IList<JsonProperty> PropertiesOfAll(Type t, MemberSerialization memberSerialization) => base.CreateProperties(t, memberSerialization)
+			.Concat(PropertiesOfAllInterfaces(t, memberSerialization))
+			.DistinctBy(p => p.PropertyName)
+			.ToList();
 
 		protected override string ResolvePropertyName(string fieldName)
 		{
-			if (this.ConnectionSettings.DefaultFieldNameInferrer != null)
-				return this.ConnectionSettings.DefaultFieldNameInferrer(fieldName);
+			if (ConnectionSettings.DefaultFieldNameInferrer != null)
+				return ConnectionSettings.DefaultFieldNameInferrer(fieldName);
 
 			return fieldName.ToCamelCase();
 		}
@@ -208,42 +208,43 @@ protected static bool ShouldSerializeQueryContainer(object o, JsonProperty prop)
 		{
 			if (o == null) return false;
 			if (!(prop.ValueProvider.GetValue(o) is QueryContainer q)) return false;
+
 			return q.IsWritable;
 		}
 
 		protected static bool ShouldSerializeQueryContainers(object o, JsonProperty prop)
 		{
 			if (o == null) return false;
+
 			var q = prop.ValueProvider.GetValue(o) as IEnumerable<QueryContainer>;
-			return (q.AsInstanceOrToListOrNull()?.Any(qq=>qq != null && qq.IsWritable)).GetValueOrDefault(false);
+			return (q.AsInstanceOrToListOrNull()?.Any(qq => qq != null && qq.IsWritable)).GetValueOrDefault(false);
 		}
+
 		protected bool ShouldSerializeRouting(object o, JsonProperty prop)
 		{
 			if (o == null) return false;
+
 			var q = prop.ValueProvider.GetValue(o) as Routing;
 			if (q == null) return false;
+
 			//not ideal to resolve twice but for now the only way not to send routing: null
-			var resolved = this.ConnectionSettings.Inferrer.Resolve(q);
+			var resolved = ConnectionSettings.Inferrer.Resolve(q);
 			return !resolved.IsNullOrEmpty();
 		}
 
-		private static readonly StringEnumConverter StringEnumConverter = new StringEnumConverter();
-		private static readonly StringTimeSpanConverter StringTimeSpanConverter = new StringTimeSpanConverter();
-		private static readonly MachineLearningDateTimeConverter MachineLearningDateTimeConverter = new MachineLearningDateTimeConverter();
-		private static readonly Type[] StringSignalTypes = {typeof(KeywordAttribute), typeof(TextAttribute)};
 		private static void ApplyBuildInSerializers(MemberInfo member, JsonProperty property)
 		{
 			var attributes = member.GetCustomAttributes().ToList();
 			var stringy = attributes.Any(a => StringSignalTypes.Contains(a.GetType()));
-			if (attributes.OfType<StringEnumAttribute>().Any() || (property.PropertyType.IsEnumType() && stringy))
+			if (attributes.OfType<StringEnumAttribute>().Any() || property.PropertyType.IsEnumType() && stringy)
 				property.Converter = StringEnumConverter;
 
 			if ((property.PropertyType == typeof(TimeSpan) || property.PropertyType == typeof(TimeSpan?))
-			    && (attributes.OfType<StringTimeSpanAttribute>().Any() || stringy))
+				&& (attributes.OfType<StringTimeSpanAttribute>().Any() || stringy))
 				property.Converter = StringTimeSpanConverter;
 
 			if ((property.PropertyType == typeof(DateTime) || property.PropertyType == typeof(DateTime?))
-			    && (attributes.OfType<MachineLearningDateTimeAttribute>().Any()))
+				&& attributes.OfType<MachineLearningDateTimeAttribute>().Any())
 				property.Converter = MachineLearningDateTimeConverter;
 		}
 
@@ -256,10 +257,10 @@ private static void ApplyBuildInSerializersForType(Type type, JsonContract contr
 		/// <summary> Renames/Ignores a property based on the connection settings mapping or custom attributes for the property </summary>
 		private void ApplyPropertyOverrides(MemberInfo member, JsonProperty property)
 		{
-			if (!this.ConnectionSettings.PropertyMappings.TryGetValue(member, out var propertyMapping))
+			if (!ConnectionSettings.PropertyMappings.TryGetValue(member, out var propertyMapping))
 				propertyMapping = ElasticsearchPropertyAttributeBase.From(member);
 
-			var serializerMapping = this.ConnectionSettings.PropertyMappingProvider?.CreatePropertyMapping(member);
+			var serializerMapping = ConnectionSettings.PropertyMappingProvider?.CreatePropertyMapping(member);
 
 			var nameOverride = propertyMapping?.Name ?? serializerMapping?.Name;
 			if (!nameOverride.IsNullOrEmpty()) property.PropertyName = nameOverride;
@@ -280,20 +281,21 @@ private void ApplyShouldSerializer(JsonProperty property)
 
 			// Skip serialization of empty collections that have DefaultValueHandling set to Ignore.
 			else if (property.DefaultValueHandling.HasValue
-			         && property.DefaultValueHandling.Value == DefaultValueHandling.Ignore
-			         && !typeof(string).IsAssignableFrom(property.PropertyType)
-			         && typeof(IEnumerable).IsAssignableFrom(property.PropertyType))
+				&& property.DefaultValueHandling.Value == DefaultValueHandling.Ignore
+				&& !typeof(string).IsAssignableFrom(property.PropertyType)
+				&& typeof(IEnumerable).IsAssignableFrom(property.PropertyType))
 			{
 				bool ShouldSerialize(object obj)
 				{
 					if (!(property.ValueProvider.GetValue(obj) is ICollection collection))
 						return true;
+
 					return collection.Count != 0 && collection.Cast<object>().Any(item => item != null);
 				}
 
 				property.ShouldSerialize = property.ShouldSerialize == null
-					? (Predicate<object>) ShouldSerialize
-					: (o => property.ShouldSerialize(o) && ShouldSerialize(o));
+					? (Predicate<object>)ShouldSerialize
+					: o => property.ShouldSerialize(o) && ShouldSerialize(o);
 			}
 		}
 	}
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/CompositeJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/CompositeJsonConverter.cs
index 51da6df74d0..179c728f081 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/CompositeJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/CompositeJsonConverter.cs
@@ -7,31 +7,22 @@ internal class CompositeJsonConverter<TRead, TWrite> : JsonConverter
 		where TRead : JsonConverter, new()
 		where TWrite : JsonConverter, new()
 	{
-		private TRead Read { get; set; }
-		private TWrite Write { get; set; }
-
-		public override bool CanRead => true;
-		public override bool CanWrite => true;
-
 		public CompositeJsonConverter()
 		{
-			this.Read = new TRead();
-			this.Write = new TWrite();
+			Read = new TRead();
+			Write = new TWrite();
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			this.Write.WriteJson(writer, value, serializer);
-		}
+		public override bool CanRead => true;
+		public override bool CanWrite => true;
+		private TRead Read { get; set; }
+		private TWrite Write { get; set; }
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
-			return this.Read.ReadJson(reader, objectType, existingValue, serializer);
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => Write.WriteJson(writer, value, serializer);
 
-		public override bool CanConvert(Type objectType)
-		{
-			return true;
-		}
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
+			Read.ReadJson(reader, objectType, existingValue, serializer);
+
+		public override bool CanConvert(Type objectType) => true;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/EnumMemberValueCasingJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/EnumMemberValueCasingJsonConverter.cs
index 58268ab53b0..2d19d4edd22 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/EnumMemberValueCasingJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/EnumMemberValueCasingJsonConverter.cs
@@ -5,13 +5,14 @@
 using Newtonsoft.Json;
 #if DOTNETCORE
 using System.Reflection;
+
 #endif
 
 namespace Nest
 {
 	/// <summary>
 	/// A Json converter that can serialize enums to strings where the string values
-	/// are specified using <see cref="EnumMemberAttribute.Value"/> and where values
+	/// are specified using <see cref="EnumMemberAttribute.Value" /> and where values
 	/// differ in casing.
 	/// </summary>
 	/// <remarks>
@@ -81,9 +82,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return Enum.TryParse(value, true, out enumValue) ? enumValue : default(TEnum);
 		}
 
-		public override bool CanConvert(Type objectType)
-		{
-			return objectType == typeof(TEnum);
-		}
+		public override bool CanConvert(Type objectType) => objectType == typeof(TEnum);
 	}
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ErrorCauseJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ErrorCauseJsonConverter.cs
index a3c25abae51..27def9ffedf 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ErrorCauseJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ErrorCauseJsonConverter.cs
@@ -14,6 +14,7 @@ internal class ErrorCauseJsonConverter<TErrorCause> : JsonConverter
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
+
 		public override bool CanConvert(Type objectType) => objectType == typeof(Error);
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { }
@@ -21,7 +22,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			ReadError<TErrorCause>(reader, serializer, (e, prop) =>
 			{
-				if (!this.ReadProperty(e, prop, reader, serializer))
+				if (!ReadProperty(e, prop, reader, serializer))
 					reader.Skip();
 			});
 
@@ -35,7 +36,7 @@ private TInnerError ReadError<TInnerError>(JsonReader reader, JsonSerializer ser
 		{
 			if (reader.TokenType == JsonToken.String)
 			{
-				var reason = (string) reader.Value;
+				var reason = (string)reader.Value;
 				return new TInnerError { Reason = reason };
 			}
 			if (reader.TokenType != JsonToken.StartObject)
@@ -49,7 +50,7 @@ private TInnerError ReadError<TInnerError>(JsonReader reader, JsonSerializer ser
 			reader.Read();
 			do
 			{
-				var propertyName = (string) reader.Value;
+				var propertyName = (string)reader.Value;
 				switch (propertyName)
 				{
 					case "type":
@@ -139,6 +140,7 @@ protected static IReadOnlyCollection<ShardFailure> ExtractFailedShards(JsonReade
 		{
 			reader.Read();
 			if (reader.TokenType != JsonToken.StartArray) return EmptyReadOnly<ShardFailure>.Collection;
+
 			var shardFailures = serializer.Deserialize<List<ShardFailure>>(reader);
 			return new ReadOnlyCollection<ShardFailure>(shardFailures);
 		}
@@ -148,7 +150,7 @@ private static IReadOnlyCollection<string> ReadArray(JsonReader reader)
 			var a = new string[0] { };
 			reader.Read();
 			if (reader.TokenType == JsonToken.String)
-				a = new[] {(reader.Value as string)};
+				a = new[] { reader.Value as string };
 			else if (reader.TokenType == JsonToken.StartArray)
 				a = JArray.Load(reader).ToObject<List<string>>().ToArray();
 			return new ReadOnlyCollection<string>(a);
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ErrorJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ErrorJsonConverter.cs
index a9c7fcce0ea..3473bc8c7a7 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ErrorJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ErrorJsonConverter.cs
@@ -23,8 +23,10 @@ private static bool ExtractHeaders(Error error, JsonReader reader, JsonSerialize
 			reader.Read();
 			if (reader.TokenType != JsonToken.StartObject)
 				return false;
+
 			var dict = serializer.Deserialize<Dictionary<string, string>>(reader);
 			if (dict == null) return false;
+
 			error.Headers = new ReadOnlyDictionary<string, string>(dict);
 			return true;
 		}
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/FromJson.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/FromJson.cs
index 14d14a5688a..b26dadc0853 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/FromJson.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/FromJson.cs
@@ -16,7 +16,8 @@ public static T ReadAs<T>(JsonReader reader, JsonSerializer serializer)
 		}
 
 		/// <summary>
-		/// Read the json as an instance of <para name="objectType"></para>
+		/// Read the json as an instance of
+		/// <para name="objectType"></para>
 		/// </summary>
 		public static object Read(JsonReader reader, Type objectType, JsonSerializer serializer)
 		{
@@ -24,6 +25,5 @@ public static object Read(JsonReader reader, Type objectType, JsonSerializer ser
 			serializer.Populate(reader, t);
 			return t;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/GenericProxyRequestConverterBase.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/GenericProxyRequestConverterBase.cs
index e4c974b7d0e..9899465bb3e 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/GenericProxyRequestConverterBase.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/GenericProxyRequestConverterBase.cs
@@ -3,7 +3,6 @@
 using System.Reflection;
 using System.Text;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using static Elasticsearch.Net.SerializationFormatting;
 
 namespace Nest
@@ -17,6 +16,7 @@ protected GenericProxyRequestConverterBase(Type genericRequestType) =>
 
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -24,13 +24,13 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var token = reader.ReadTokenWithDateParseHandlingNone();
 			using (var ms = token.ToStream(serializer.GetConnectionSettings().MemoryStreamFactory))
 			{
-                //not optimized but deserializing create requests is far from common practice
-                var genericType = objectType.GetTypeInfo().GenericTypeArguments[0];
+				//not optimized but deserializing create requests is far from common practice
+				var genericType = objectType.GetTypeInfo().GenericTypeArguments[0];
 				var o = serializer.GetConnectionSettings().SourceSerializer.Deserialize(genericType, ms);
 				var path = typeof(DocumentPath<>).CreateGenericInstance(genericType, o);
-                // index, type and id are optional parameters on _genericRequestType but need to be passed to construct through reflection
-                var x = _genericRequestType.CreateGenericInstance(genericType, path, null, null, null);
-                return x;
+				// index, type and id are optional parameters on _genericRequestType but need to be passed to construct through reflection
+				var x = _genericRequestType.CreateGenericInstance(genericType, path, null, null, null);
+				return x;
 			}
 		}
 
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/IndicesBoostJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/IndicesBoostJsonConverter.cs
index 6f0c6fb3011..e4e5199b605 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/IndicesBoostJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/IndicesBoostJsonConverter.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -18,7 +17,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 			var settings = serializer.GetConnectionSettings();
 			writer.WriteStartArray();
-			foreach(var entry in dictionary)
+			foreach (var entry in dictionary)
 			{
 				writer.WriteStartObject();
 				var indexName = settings.Inferrer.IndexName(entry.Key);
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/JsonConverterBase.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/JsonConverterBase.cs
index 304e84d59be..937125e5c1f 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/JsonConverterBase.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/JsonConverterBase.cs
@@ -5,14 +5,16 @@ namespace Nest
 {
 	internal abstract class JsonConverterBase<T> : JsonConverter where T : class
 	{
-		public override bool CanConvert(Type objectType) => true;
-		public override bool CanWrite => true;
 		public override bool CanRead => true;
+		public override bool CanWrite => true;
+
+		public override bool CanConvert(Type objectType) => true;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			if (!(value is T v)) return;
-			this.WriteJson(writer, v, serializer);
+
+			WriteJson(writer, v, serializer);
 		}
 
 		public abstract void WriteJson(JsonWriter writer, T value, JsonSerializer serializer);
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/KeyValueJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/KeyValueJsonConverter.cs
index addb0aa99a2..0ac1b39cd3e 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/KeyValueJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/KeyValueJsonConverter.cs
@@ -6,11 +6,13 @@
 
 namespace Nest
 {
-
 	internal class KeyValueConversion
 	{
 		private static readonly ConcurrentDictionary<Type, KeyValueConversion> KnownTypes = new ConcurrentDictionary<Type, KeyValueConversion>();
 
+		public JsonProperty KeyProperty { get; set; }
+		public JsonProperty ValueProperty { get; set; }
+
 		public static KeyValueConversion Create<TContainer, TValue>() where TContainer : class, new()
 		{
 			var t = typeof(TContainer);
@@ -22,23 +24,21 @@ internal class KeyValueConversion
 			var valueProp = properties.FirstOrDefault(p => p.PropertyType == typeof(TValue));
 			if (keyProp == null) throw new Exception($"No key property found on type {t.Name}");
 			if (valueProp == null) throw new Exception($"No value property found on type {t.Name}");
-			conversion = new KeyValueConversion { KeyProperty = keyProp, ValueProperty = valueProp};
+
+			conversion = new KeyValueConversion { KeyProperty = keyProp, ValueProperty = valueProp };
 			KnownTypes.TryAdd(t, conversion);
 			return conversion;
 		}
-
-		public JsonProperty KeyProperty { get; set; }
-		public JsonProperty ValueProperty { get; set; }
 	}
 
 	internal class KeyValueJsonConverter<TContainer, TValue> : JsonConverter
 		where TContainer : class, new()
 	{
-
-		public override bool CanConvert(Type objectType) => true;
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override void WriteJson(JsonWriter writer, object v, JsonSerializer serializer)
 		{
 			var conversion = KeyValueConversion.Create<TContainer, TValue>();
@@ -46,7 +46,8 @@ public override void WriteJson(JsonWriter writer, object v, JsonSerializer seria
 			{
 				writer.WriteNull();
 				return;
-			};
+			}
+			;
 
 			var key = conversion.KeyProperty.ValueProvider.GetValue(v).ToString();
 			var value = conversion.ValueProperty.ValueProvider.GetValue(v);
@@ -54,7 +55,8 @@ public override void WriteJson(JsonWriter writer, object v, JsonSerializer seria
 			{
 				writer.WriteNull();
 				return;
-			};
+			}
+			;
 
 			writer.WriteStartObject();
 			writer.WritePropertyName(key);
@@ -66,6 +68,7 @@ public override void WriteJson(JsonWriter writer, object v, JsonSerializer seria
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject) return null;
+
 			var depth = reader.Depth;
 
 			reader.Read(); //property name
@@ -76,9 +79,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			if (reader.Depth > depth)
 			{
 				do
-				{
 					reader.Read();
-				} while (reader.Depth >= depth && reader.TokenType != JsonToken.EndObject);
+				while (reader.Depth >= depth && reader.TokenType != JsonToken.EndObject);
 			}
 
 			var conversion = KeyValueConversion.Create<TContainer, TValue>();
@@ -89,6 +91,5 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			conversion.ValueProperty.ValueProvider.SetValue(o, value);
 			return o;
 		}
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadAsTypeJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadAsTypeJsonConverter.cs
index 240036c83e2..77c4d9d0f49 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadAsTypeJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadAsTypeJsonConverter.cs
@@ -19,11 +19,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 	internal class ReadAsAttribute : Attribute
 	{
-		public Type Type { get; }
+		public ReadAsAttribute(Type readAs) => Type = readAs;
 
-		public ReadAsAttribute(Type readAs)
-		{
-			this.Type = readAs;
-		}
+		public Type Type { get; }
 	}
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadOnlyCollectionJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadOnlyCollectionJsonConverter.cs
index cec6bc92bb4..724a1aeacf4 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadOnlyCollectionJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadOnlyCollectionJsonConverter.cs
@@ -6,12 +6,12 @@
 namespace Nest
 {
 	/// <summary>
-	/// Json converter that deserializes into an <see cref="ReadOnlyCollection{TInterface}"/> or <see cref="IReadOnlyCollection{TInterface}"/>
-	/// where <typeparamref name="TInterface"/> does not have a custom deserializer and should be deserialized
-	/// into concrete types of <typeparamref name="TDocument"/>
+	/// Json converter that deserializes into an <see cref="ReadOnlyCollection{T}" /> or <see cref="IReadOnlyCollection{T}" />
+	/// where <typeparamref name="TInterface" /> does not have a custom deserializer and should be deserialized
+	/// into concrete types of <typeparamref name="TDocument" />
 	/// </summary>
 	/// <remarks>
-	/// <typeparamref name="TInterface"/> may not have a deserializer for valid reasons, for example, an interface may be implemented by two
+	/// <typeparamref name="TInterface" /> may not have a deserializer for valid reasons, for example, an interface may be implemented by two
 	/// concrete types that need to be deserialized. In this case, a deserializer would not know which concrete type to deserialize to in
 	/// a given context.
 	/// </remarks>
@@ -21,13 +21,10 @@ internal class ReadOnlyCollectionJsonConverter<TDocument, TInterface> : JsonConv
 		where TDocument : TInterface
 		where TInterface : class
 	{
-		public override bool CanWrite => false;
 		public override bool CanRead => true;
+		public override bool CanWrite => false;
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadSingleOrEnumerableJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadSingleOrEnumerableJsonConverter.cs
index ed414f96137..3ce69043b10 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadSingleOrEnumerableJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadSingleOrEnumerableJsonConverter.cs
@@ -5,16 +5,14 @@ namespace Nest
 {
 	internal class ReadSingleOrEnumerableJsonConverter<T> : JsonConverter
 	{
+		public override bool CanWrite => false;
+
 		public override bool CanConvert(Type objectType) => true;
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
-			return reader.TokenType == JsonToken.StartArray
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
+			reader.TokenType == JsonToken.StartArray
 				? serializer.Deserialize<T[]>(reader)
 				: new[] { serializer.Deserialize<T>(reader) };
-		}
-
-		public override bool CanWrite => false;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
 			throw new NotSupportedException();
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReserializeJsonConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReserializeJsonConverter.cs
index 12f0233a1f6..6bee77714c3 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReserializeJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReserializeJsonConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -8,54 +7,54 @@ internal class ReserializeJsonConverter<TReadAs, TInterface> : JsonConverter
 		where TReadAs : class, TInterface
 		where TInterface : class
 	{
-		protected ReadAsTypeJsonConverter<TReadAs> Reader { get; } = new ReadAsTypeJsonConverter<TReadAs>();
-
 		public override bool CanRead => true;
 
 		public override bool CanWrite => true;
+		protected ReadAsTypeJsonConverter<TReadAs> Reader { get; } = new ReadAsTypeJsonConverter<TReadAs>();
 
 		public override bool CanConvert(Type objectType) => typeof(TInterface).IsAssignableFrom(objectType);
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject) return null;
+
 			var depth = reader.Depth;
-			var deserialized = this.DeserializeJson(reader, objectType, existingValue, serializer);
+			var deserialized = DeserializeJson(reader, objectType, existingValue, serializer);
 			return reader.ReadToEnd(depth, deserialized);
 		}
 
-		protected TReadAs ReadAs(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
-			return this.Reader.ReadJson(reader, objectType, existingValue, serializer) as TReadAs;
-		}
+		protected TReadAs ReadAs(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
+			Reader.ReadJson(reader, objectType, existingValue, serializer) as TReadAs;
 
 		protected virtual object DeserializeJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
-			this.ReadAs(reader, objectType, existingValue, serializer);
+			ReadAs(reader, objectType, existingValue, serializer);
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			if (!(value is TInterface v)) return;
-			this.SerializeJson(writer, value, v, serializer);
-		}
 
-		protected virtual void SerializeJson(JsonWriter writer, object value, TInterface castValue, JsonSerializer serializer)
-		{
-			this.Reserialize(writer, value, serializer);
+			SerializeJson(writer, value, v, serializer);
 		}
 
+		protected virtual void SerializeJson(JsonWriter writer, object value, TInterface castValue, JsonSerializer serializer) =>
+			Reserialize(writer, value, serializer);
+
 		protected virtual bool SkipWriteProperty(string propertyName) => false;
 
 		protected void Reserialize(JsonWriter writer, object value, JsonSerializer serializer, Action<JsonWriter> inlineWriter = null)
 		{
 			var properties = value.GetType().GetCachedObjectProperties();
 			if (properties.Count == 0) return;
+
 			writer.WriteStartObject();
 			inlineWriter?.Invoke(writer);
 			foreach (var p in properties)
 			{
 				if (p.Ignored || SkipWriteProperty(p.PropertyName)) continue;
+
 				var vv = p.ValueProvider.GetValue(value);
 				if (vv == null) continue;
+
 				writer.WritePropertyName(p.PropertyName);
 				if (p.Converter?.GetType() == typeof(SourceValueWriteConverter))
 					SourceValueWriteConverter.Write(writer, vv, serializer);
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/TimeSpanToStringConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/TimeSpanToStringConverter.cs
index a66c2d2d871..21265fde70c 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/TimeSpanToStringConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/TimeSpanToStringConverter.cs
@@ -11,7 +11,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				writer.WriteNull();
 			else
 			{
-				var timeSpan = (TimeSpan) value;
+				var timeSpan = (TimeSpan)value;
 				writer.WriteValue(timeSpan.Ticks);
 			}
 		}
@@ -21,12 +21,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			switch (reader.TokenType)
 			{
 				case JsonToken.Null: return null;
-				case JsonToken.String: return TimeSpan.Parse((string) reader.Value);
-				case JsonToken.Integer: return new TimeSpan((long) reader.Value);
+				case JsonToken.String: return TimeSpan.Parse((string)reader.Value);
+				case JsonToken.Integer: return new TimeSpan((long)reader.Value);
 			}
 			throw new JsonSerializationException($"Cannot convert token of type {reader.TokenType} to {objectType}.");
 		}
 
-		public override bool CanConvert(Type objectType) => objectType == typeof (TimeSpan) || objectType == typeof (TimeSpan?);
+		public override bool CanConvert(Type objectType) => objectType == typeof(TimeSpan) || objectType == typeof(TimeSpan?);
 	}
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/VerbatimDictionaryKeysConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/VerbatimDictionaryKeysConverter.cs
index d8c207d81f5..1855783b398 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/VerbatimDictionaryKeysConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/VerbatimDictionaryKeysConverter.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -13,14 +13,12 @@ namespace Nest
 	/// </summary>
 	internal class VerbatimDictionaryKeysJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type t) => typeof(IDictionary).IsAssignableFrom(t);
-
 		public override bool CanRead => false;
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
+		public override bool CanConvert(Type t) => typeof(IDictionary).IsAssignableFrom(t);
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			throw new NotSupportedException();
-		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
@@ -38,37 +36,30 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			{
 				if (entry.Value == null && serializer.NullValueHandling == NullValueHandling.Ignore)
 					continue;
+
 				string key;
 				if (settings == null)
 					key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);
 				else
 				{
 					if (AsType(entry.Key, out Field fieldName))
-					{
 						key = settings.Inferrer.Field(fieldName);
-					}
 					else
 					{
 						if (AsType(entry.Key, out PropertyName propertyName))
 						{
-							if (propertyName?.Property != null &&
-							    (settings.PropertyMappings.TryGetValue(propertyName.Property, out var mapping) && mapping.Ignore))
+							if (propertyName?.Property != null && settings.PropertyMappings.TryGetValue(propertyName.Property, out var mapping)
+								&& mapping.Ignore)
 								continue;
 
 							key = settings.Inferrer.PropertyName(propertyName);
 						}
 						else if (AsType(entry.Key, out IndexName indexName))
-						{
 							key = settings.Inferrer.IndexName(indexName);
-						}
 						else if (AsType(entry.Key, out TypeName typeName))
-						{
 							key = settings.Inferrer.TypeName(typeName);
-						}
 						else if (AsType(entry.Key, out RelationName relationName))
-						{
 							key = settings.Inferrer.RelationName(relationName);
-						}
 						else
 							key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);
 					}
@@ -101,19 +92,19 @@ private static bool AsType<T>(object value, out T convertedValue) where T : clas
 	/// </summary>
 	internal class VerbatimDictionaryKeysJsonConverter<TKey, TValue> : JsonConverter
 	{
-		private readonly bool _keyIsString = typeof(TKey) == typeof(string);
 		private readonly bool _keyIsField = typeof(TKey) == typeof(Field);
-		private readonly bool _keyIsPropertyName = typeof(TKey) == typeof(PropertyName);
 		private readonly bool _keyIsIndexName = typeof(TKey) == typeof(IndexName);
-		private readonly bool _keyIsTypeName = typeof(TKey) == typeof(TypeName);
+		private readonly bool _keyIsPropertyName = typeof(TKey) == typeof(PropertyName);
 		private readonly bool _keyIsRelationName = typeof(TKey) == typeof(RelationName);
+		private readonly bool _keyIsString = typeof(TKey) == typeof(string);
+		private readonly bool _keyIsTypeName = typeof(TKey) == typeof(TypeName);
+
+		public override bool CanRead => false;
 
 		public override bool CanConvert(Type t) =>
 			typeof(IDictionary<TKey, TValue>).IsAssignableFrom(t) ||
 			typeof(IReadOnlyDictionary<TKey, TValue>).IsAssignableFrom(t);
 
-		public override bool CanRead => false;
-
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			throw new NotSupportedException();
 
@@ -133,6 +124,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			{
 				if (SkipValue(serializer, entry))
 					continue;
+
 				string key;
 				if (_keyIsString)
 					key = entry.Key?.ToString();
@@ -146,8 +138,8 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				else if (_keyIsPropertyName)
 				{
 					var propertyName = entry.Key as PropertyName;
-					if (propertyName?.Property != null &&
-					    (settings.PropertyMappings.TryGetValue(propertyName.Property, out var mapping) && mapping.Ignore))
+					if (propertyName?.Property != null && settings.PropertyMappings.TryGetValue(propertyName.Property, out var mapping)
+						&& mapping.Ignore)
 						continue;
 
 					key = settings.Inferrer.PropertyName(propertyName);
@@ -175,7 +167,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			}
 
 			writer.WriteStartObject();
-			foreach(var entry in seenEntries)
+			foreach (var entry in seenEntries)
 			{
 				writer.WritePropertyName(entry.Key);
 				serializer.Serialize(writer, entry.Value);
@@ -183,19 +175,17 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			writer.WriteEndObject();
 		}
 
-		protected virtual bool SkipValue(JsonSerializer serializer, KeyValuePair<TKey, TValue> entry)
-		{
-			return entry.Value == null && serializer.NullValueHandling == NullValueHandling.Ignore;
-		}
+		protected virtual bool SkipValue(JsonSerializer serializer, KeyValuePair<TKey, TValue> entry) =>
+			entry.Value == null && serializer.NullValueHandling == NullValueHandling.Ignore;
 	}
 
 	internal class VerbatimDictionaryKeysJsonConverter<TIsADictionary, TKey, TValue> : VerbatimDictionaryKeysJsonConverter<TKey, TValue>
 		where TIsADictionary : IIsADictionary
 	{
-		public override bool CanConvert(Type t) => true;
-
 		public override bool CanRead => true;
 
+		public override bool CanConvert(Type t) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var dictionary = serializer.Deserialize<Dictionary<TKey, TValue>>(reader);
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/InternalSerializer.cs b/src/Nest/CommonAbstractions/SerializationBehavior/InternalSerializer.cs
index ae7c5551ab8..7f28a6a9d06 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/InternalSerializer.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/InternalSerializer.cs
@@ -11,20 +11,28 @@ namespace Nest
 	/// <summary>The built in internal serializer that the high level client NEST uses.</summary>
 	internal class InternalSerializer : IElasticsearchSerializer
 	{
-		// Default buffer size of StreamWriter, which is private :(
 		internal const int DefaultBufferSize = 1024;
-
+		private static readonly Task CompletedTask = Task.CompletedTask;
 		internal static readonly Encoding ExpectedEncoding = new UTF8Encoding(false);
+		private readonly JsonSerializer _indentedSerializer;
 
-		private static readonly Task CompletedTask = Task.CompletedTask;
+		public InternalSerializer(IConnectionSettingsValues settings) : this(settings, null) { }
 
-		private readonly JsonSerializer _indentedSerializer;
-		internal JsonSerializer Serializer { get; }
+		/// <summary>
+		/// this constructor is only here for stateful (de)serialization
+		/// </summary>
+		protected internal InternalSerializer(IConnectionSettingsValues settings, JsonConverter statefulConverter)
+		{
+			Settings = settings;
+			var piggyBackState = statefulConverter == null ? null : new JsonConverterPiggyBackState { ActualJsonConverter = statefulConverter };
+			ContractResolver = new ElasticContractResolver(Settings) { PiggyBackState = piggyBackState };
 
-		protected IConnectionSettingsValues Settings { get; }
+			var collapsed = CreateSettings(SerializationFormatting.None);
+			var indented = CreateSettings(SerializationFormatting.Indented);
 
-		/// <summary> Resolves JsonContracts for types </summary>
-		private ElasticContractResolver ContractResolver { get; }
+			Serializer = JsonSerializer.Create(collapsed);
+			_indentedSerializer = JsonSerializer.Create(indented);
+		}
 
 		/// <summary>
 		/// The size of the buffer to use when writing the serialized request
@@ -34,22 +42,28 @@ internal class InternalSerializer : IElasticsearchSerializer
 		// to be a good compromise buffer size for performance throughput and bytes allocated.
 		protected virtual int BufferSize => DefaultBufferSize;
 
-		public InternalSerializer(IConnectionSettingsValues settings) : this(settings, null) { }
+		protected IConnectionSettingsValues Settings { get; }
+		internal JsonSerializer Serializer { get; }
 
-		/// <summary>
-		/// this constructor is only here for stateful (de)serialization
-		/// </summary>
-		protected internal InternalSerializer(IConnectionSettingsValues settings, JsonConverter statefulConverter)
+		/// <summary> Resolves JsonContracts for types </summary>
+		private ElasticContractResolver ContractResolver { get; }
+
+		public T Deserialize<T>(Stream stream)
 		{
-			this.Settings = settings;
-			var piggyBackState = statefulConverter == null ? null : new JsonConverterPiggyBackState { ActualJsonConverter = statefulConverter };
-			this.ContractResolver = new ElasticContractResolver(this.Settings) { PiggyBackState = piggyBackState };
+			if (stream == null || stream.CanSeek && stream.Length == 0) return default(T);
 
-			var collapsed = this.CreateSettings(SerializationFormatting.None);
-			var indented = this.CreateSettings(SerializationFormatting.Indented);
+			using (var streamReader = new StreamReader(stream))
+			using (var jsonTextReader = new JsonTextReader(streamReader))
+				return Serializer.Deserialize<T>(jsonTextReader);
+		}
 
-			this.Serializer = JsonSerializer.Create(collapsed);
-			this._indentedSerializer = JsonSerializer.Create(indented);
+		public object Deserialize(Type type, Stream stream)
+		{
+			if (stream == null || stream.CanSeek && stream.Length == 0) return type.DefaultValue();
+
+			using (var streamReader = new StreamReader(stream))
+			using (var jsonTextReader = new JsonTextReader(streamReader))
+				return Serializer.Deserialize(jsonTextReader, type);
 		}
 
 		public virtual void Serialize<T>(T data, Stream writableStream, SerializationFormatting formatting = SerializationFormatting.Indented)
@@ -61,7 +75,7 @@ public virtual void Serialize<T>(T data, Stream writableStream, SerializationFor
 			//this leaveOpen is most likely here because in PostData when we serialize IEnumerable<object> as multi json
 			//we call this multiple times, it would be better to have a dedicated Serialize(IEnumerable<object>) on the
 			//IElasticsearchSerializer interface more explicitly
-			using (var writer = new StreamWriter(writableStream, ExpectedEncoding, BufferSize, leaveOpen: true))
+			using (var writer = new StreamWriter(writableStream, ExpectedEncoding, BufferSize, true))
 			using (var jsonWriter = new JsonTextWriter(writer))
 			{
 				serializer.Serialize(jsonWriter, data);
@@ -71,42 +85,28 @@ public virtual void Serialize<T>(T data, Stream writableStream, SerializationFor
 		}
 
 		public Task SerializeAsync<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented,
-			CancellationToken cancellationToken = default(CancellationToken))
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 		{
 			//This makes no sense now but we need the async method on the interface in 6.x so we can start swapping this out
 			//for an implementation that does make sense without having to wait for 7.x
-			this.Serialize(data, stream, formatting);
+			Serialize(data, stream, formatting);
 			return CompletedTask;
 		}
 
-		public T Deserialize<T>(JsonReader reader) => this.Serializer.Deserialize<T>(reader);
-
-		public object Deserialize(JsonReader reader, Type objectType) => this.Serializer.Deserialize(reader, objectType);
-
-		public T Deserialize<T>(Stream stream)
-		{
-			if (stream == null || stream.CanSeek && stream.Length == 0) return default(T);
-			using (var streamReader = new StreamReader(stream))
-			using (var jsonTextReader = new JsonTextReader(streamReader))
-				return this.Serializer.Deserialize<T>(jsonTextReader);
-		}
-
-		public object Deserialize(Type type, Stream stream)
-		{
-			if (stream == null || stream.CanSeek && stream.Length == 0) return type.DefaultValue();
-			using (var streamReader = new StreamReader(stream))
-			using (var jsonTextReader = new JsonTextReader(streamReader))
-				return this.Serializer.Deserialize(jsonTextReader, type);
-		}
+		public T Deserialize<T>(JsonReader reader) => Serializer.Deserialize<T>(reader);
 
+		public object Deserialize(JsonReader reader, Type objectType) => Serializer.Deserialize(reader, objectType);
+		// Default buffer size of StreamWriter, which is private :(
 #pragma warning disable 1998 // we know this is not an async operation
 		public async Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
 #pragma warning restore 1998
 		{
 			if (stream == null || stream.CanSeek && stream.Length == 0) return default(T);
-            using (var sr = new StreamReader(stream))
-            using (var jtr = new JsonTextReader(sr))
-				return this.Serializer.Deserialize<T>(jtr);
+
+			using (var sr = new StreamReader(stream))
+			using (var jtr = new JsonTextReader(sr))
+				return Serializer.Deserialize<T>(jtr);
 		}
 
 #pragma warning disable 1998 // we know this is not an async operation
@@ -114,9 +114,10 @@ public object Deserialize(Type type, Stream stream)
 #pragma warning restore 1998
 		{
 			if (stream == null || stream.CanSeek && stream.Length == 0) return type.DefaultValue();
-            using (var sr = new StreamReader(stream))
-            using (var jtr = new JsonTextReader(sr))
-				return this.Serializer.Deserialize(jtr, type);
+
+			using (var sr = new StreamReader(stream))
+			using (var jtr = new JsonTextReader(sr))
+				return Serializer.Deserialize(jtr, type);
 		}
 
 		private JsonSerializerSettings CreateSettings(SerializationFormatting formatting)
@@ -124,7 +125,7 @@ private JsonSerializerSettings CreateSettings(SerializationFormatting formatting
 			var settings = new JsonSerializerSettings
 			{
 				Formatting = formatting == SerializationFormatting.Indented ? Formatting.Indented : Formatting.None,
-				ContractResolver = this.ContractResolver,
+				ContractResolver = ContractResolver,
 				DefaultValueHandling = DefaultValueHandling.Include,
 				NullValueHandling = NullValueHandling.Ignore
 			};
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/JTokenExtensions.cs b/src/Nest/CommonAbstractions/SerializationBehavior/JTokenExtensions.cs
index 0e993ec17fc..7ce15551638 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/JTokenExtensions.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/JTokenExtensions.cs
@@ -1,7 +1,5 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
@@ -13,15 +11,16 @@ namespace Nest
 	internal static class JTokenExtensions
 	{
 		/// <summary>
-		/// Writes a <see cref="JToken"/> to a <see cref="MemoryStream"/> using <see cref="InternalSerializer.ExpectedEncoding"/>
+		/// Writes a <see cref="JToken" /> to a <see cref="MemoryStream" /> using <see cref="InternalSerializer.ExpectedEncoding" />
 		/// </summary>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static MemoryStream ToStream(
 			this JToken token,
-			IMemoryStreamFactory memoryStreamFactory = null)
+			IMemoryStreamFactory memoryStreamFactory = null
+		)
 		{
 			var ms = memoryStreamFactory?.Create() ?? new MemoryStream();
-			using (var streamWriter = new StreamWriter(ms, InternalSerializer.ExpectedEncoding, InternalSerializer.DefaultBufferSize, leaveOpen: true))
+			using (var streamWriter = new StreamWriter(ms, InternalSerializer.ExpectedEncoding, InternalSerializer.DefaultBufferSize, true))
 			using (var writer = new JsonTextWriter(streamWriter))
 			{
 				token.WriteTo(writer);
@@ -32,16 +31,17 @@ public static MemoryStream ToStream(
 		}
 
 		/// <summary>
-		/// Writes a <see cref="JToken"/> asynchronously to a <see cref="MemoryStream"/> using <see cref="InternalSerializer.ExpectedEncoding"/>
+		/// Writes a <see cref="JToken" /> asynchronously to a <see cref="MemoryStream" /> using <see cref="InternalSerializer.ExpectedEncoding" />
 		/// </summary>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static async Task<MemoryStream> ToStreamAsync(
 			this JToken token,
 			IMemoryStreamFactory memoryStreamFactory = null,
-			CancellationToken cancellationToken = default(CancellationToken))
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 		{
 			var ms = memoryStreamFactory?.Create() ?? new MemoryStream();
-			using (var streamWriter = new StreamWriter(ms, InternalSerializer.ExpectedEncoding, InternalSerializer.DefaultBufferSize, leaveOpen: true))
+			using (var streamWriter = new StreamWriter(ms, InternalSerializer.ExpectedEncoding, InternalSerializer.DefaultBufferSize, true))
 			using (var writer = new JsonTextWriter(streamWriter))
 			{
 				await token.WriteToAsync(writer, cancellationToken).ConfigureAwait(false);
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/JsonReaderExtensions.cs b/src/Nest/CommonAbstractions/SerializationBehavior/JsonReaderExtensions.cs
index 2536de619ca..ebe592661d3 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/JsonReaderExtensions.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/JsonReaderExtensions.cs
@@ -21,10 +21,10 @@ public static T ReadToEnd<T>(this JsonReader reader, int depth, T r = null)
 			where T : class
 		{
 			if (reader.Depth <= depth) return r;
+
 			do
-			{
 				reader.Read();
-			} while (reader.Depth >= depth && reader.TokenType != JsonToken.EndObject);
+			while (reader.Depth >= depth && reader.TokenType != JsonToken.EndObject);
 			return r;
 		}
 
@@ -32,18 +32,18 @@ public static T ExhaustTo<T>(this JsonReader reader, int depth, T r = null, Json
 			where T : class
 		{
 			if (reader.Depth < depth) return r;
+
 			while (reader.Depth >= depth)
 			{
-				if (reader.Depth == depth && reader.TokenType == endType)
-				{
-					break;
-				}
+				if (reader.Depth == depth && reader.TokenType == endType) break;
+
 				var readAnything = reader.Read();
 				if (!readAnything || reader.Depth < depth) break;
 			}
 			return r;
 		}
 
-		public static object ExhaustTo(this JsonReader reader, int depth, JsonToken endType = JsonToken.EndObject) => reader.ExhaustTo<object>(depth, null, endType);
+		public static object ExhaustTo(this JsonReader reader, int depth, JsonToken endType = JsonToken.EndObject) =>
+			reader.ExhaustTo<object>(depth, null, endType);
 	}
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/PropertyMapping.cs b/src/Nest/CommonAbstractions/SerializationBehavior/PropertyMapping.cs
index b72febddd4e..cea17eab878 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/PropertyMapping.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/PropertyMapping.cs
@@ -8,26 +8,27 @@ namespace Nest
 	/// <summary>Determines how a POCO property maps to the property on a JSON object when serialized</summary>
 	public interface IPropertyMapping
 	{
-		/// <summary> Override the property name serialized to JSON for this property</summary>
-		string Name { get; set; }
 		/// <summary>
 		/// Ignore this property completely
-		/// <para>- When mapping automatically using <see cref="TypeMappingDescriptor{T}.AutoMap{TDocument}"/></para>
+		/// <para>- When mapping automatically using <see cref="TypeMappingDescriptor{T}.AutoMap{TDocument}" /></para>
 		/// <para>- When Indexing this type do not serialize this property and its value</para>
 		/// </summary>
 		bool Ignore { get; set; }
+
+		/// <summary> Override the property name serialized to JSON for this property</summary>
+		string Name { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class PropertyMapping : IPropertyMapping
 	{
 		public static PropertyMapping Ignored = new PropertyMapping { Ignore = true };
 
 		/// <inheritdoc />
-		public string Name { get; set; }
+		public bool Ignore { get; set; }
 
 		/// <inheritdoc />
-		public bool Ignore { get; set; }
+		public string Name { get; set; }
 	}
 
 	/// <summary>
@@ -36,24 +37,24 @@ public class PropertyMapping : IPropertyMapping
 	public interface IPropertyMappingProvider
 	{
 		/// <summary>
-		/// Creates an <see cref="IPropertyMapping"/> for a <see cref="MemberInfo"/>
+		/// Creates an <see cref="IPropertyMapping" /> for a <see cref="MemberInfo" />
 		/// </summary>
 		IPropertyMapping CreatePropertyMapping(MemberInfo memberInfo);
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class PropertyMappingProvider : IPropertyMappingProvider
 	{
 		protected readonly ConcurrentDictionary<string, IPropertyMapping> Properties = new ConcurrentDictionary<string, IPropertyMapping>();
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public virtual IPropertyMapping CreatePropertyMapping(MemberInfo memberInfo)
 		{
 			var memberInfoString = $"{memberInfo.DeclaringType?.FullName}.{memberInfo.Name}";
 			if (Properties.TryGetValue(memberInfoString, out var mapping)) return mapping;
 
 			mapping = PropertyMappingFromAttributes(memberInfo);
-			this.Properties.TryAdd(memberInfoString, mapping);
+			Properties.TryAdd(memberInfoString, mapping);
 			return mapping;
 		}
 
@@ -64,9 +65,9 @@ private static IPropertyMapping PropertyMappingFromAttributes(MemberInfo memberI
 			var propertyName = memberInfo.GetCustomAttribute<PropertyNameAttribute>(true);
 			var ignore = memberInfo.GetCustomAttribute<IgnoreAttribute>(true);
 			if (jsonProperty == null && ignore == null && propertyName == null && dataMemberProperty == null) return null;
-			return new PropertyMapping {Name = propertyName?.Name ?? jsonProperty?.PropertyName ?? dataMemberProperty?.Name, Ignore = ignore != null};
+
+			return new PropertyMapping
+				{ Name = propertyName?.Name ?? jsonProperty?.PropertyName ?? dataMemberProperty?.Name, Ignore = ignore != null };
 		}
 	}
-
-
 }
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/SourceConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/SourceConverter.cs
index e789c4fb0aa..5fb4f1838a6 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/SourceConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/SourceConverter.cs
@@ -1,9 +1,6 @@
 using System;
-using System.IO;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using static Elasticsearch.Net.SerializationFormatting;
 
 namespace Nest
@@ -12,10 +9,11 @@ internal class SourceConverter : JsonConverter
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
-		public override bool CanConvert(Type objectType) => true;
 
 		public virtual SerializationFormatting? ForceFormatting { get; } = null;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var sourceSerializer = serializer.GetConnectionSettings().SourceSerializer;
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/SourceValueWriteConverter.cs b/src/Nest/CommonAbstractions/SerializationBehavior/SourceValueWriteConverter.cs
index 32256e5d365..a69b879409b 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/SourceValueWriteConverter.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/SourceValueWriteConverter.cs
@@ -8,12 +8,10 @@ internal class SourceValueWriteConverter : JsonConverter
 	{
 		public override bool CanRead => false;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			Write(writer, value, serializer);
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => Write(writer, value, serializer);
 
 		public static void Write(JsonWriter writer, object value, JsonSerializer serializer)
 		{
diff --git a/src/Nest/CommonAbstractions/Static/Infer.cs b/src/Nest/CommonAbstractions/Static/Infer.cs
index 1f45a7c0a94..f123460d473 100644
--- a/src/Nest/CommonAbstractions/Static/Infer.cs
+++ b/src/Nest/CommonAbstractions/Static/Infer.cs
@@ -8,38 +8,49 @@ namespace Nest
 {
 	public static class Infer
 	{
+		public static Indices AllIndices = Nest.Indices.All;
+		public static Types AllTypes = Types.All;
+
 		public static IndexName Index(IndexName index) => index;
+
 		public static IndexName Index<T>() => typeof(T);
+
 		public static IndexName Index<T>(string clusterName) => IndexName.From<T>(clusterName);
 
 		public static Indices Indices<T>() => typeof(T);
+
 		public static Indices Indices(params IndexName[] indices) => indices;
+
 		public static Indices Indices(IEnumerable<IndexName> indices) => indices.ToArray();
-		public static Indices AllIndices = Nest.Indices.All;
 
 		public static TypeName Type(TypeName type) => type;
+
 		public static TypeName Type<T>() => typeof(T);
+
 		public static Types Type(IEnumerable<TypeName> types) => new Types.ManyTypes(types);
+
 		public static Types Type(params TypeName[] types) => new Types.ManyTypes(types);
-		public static Types AllTypes = Nest.Types.All;
 
 		public static RelationName Relation(string type) => type;
+
 		public static RelationName Relation(Type type) => type;
+
 		public static RelationName Relation<T>() => typeof(T);
 
-		public static Routing Route<T>(T instance) where T : class => Nest.Routing.From<T>(instance);
+		public static Routing Route<T>(T instance) where T : class => Routing.From<T>(instance);
 
 		public static Names Names(params string[] names) => string.Join(",", names);
+
 		public static Names Names(IEnumerable<string> names) => string.Join(",", names);
 
 		public static Id Id<T>(T document) where T : class => Nest.Id.From(document);
 
 		public static Fields Fields<T>(params Expression<Func<T, object>>[] fields) where T : class =>
-			new Fields(fields.Select(f=>(Field)f));
+			new Fields(fields.Select(f => (Field)f));
 
-		public static Fields Fields(params string[] fields) => new Fields(fields.Select(f=>(Field)f));
+		public static Fields Fields(params string[] fields) => new Fields(fields.Select(f => (Field)f));
 
-		public static Fields Fields(params PropertyInfo[] properties) => new Fields(properties.Select(f=>(Field)f));
+		public static Fields Fields(params PropertyInfo[] properties) => new Fields(properties.Select(f => (Field)f));
 
 		/// <summary>
 		/// Create a strongly typed string field name representation of the path to a property
diff --git a/src/Nest/CommonAbstractions/Union/Union.cs b/src/Nest/CommonAbstractions/Union/Union.cs
index de74bcda625..dfa196c6534 100644
--- a/src/Nest/CommonAbstractions/Union/Union.cs
+++ b/src/Nest/CommonAbstractions/Union/Union.cs
@@ -4,7 +4,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// Represents the union of two types, <typeparamref name="TFirst"/> and <typeparamref name="TSecond"/>. Used
+	/// Represents the union of two types, <typeparamref name="TFirst" /> and <typeparamref name="TSecond" />. Used
 	/// in scenarios where an Elasticsearch API may accept more than one different input data structure.
 	/// </summary>
 	/// <typeparam name="TFirst">The first type</typeparam>
@@ -12,27 +12,35 @@ namespace Nest
 	[JsonConverter(typeof(UnionJsonConverter))]
 	public class Union<TFirst, TSecond>
 	{
+		internal readonly int _tag;
 		internal readonly TFirst Item1;
 		internal readonly TSecond Item2;
-		internal readonly int _tag;
 
 		/// <summary>
-		/// Creates an new instance of <see cref="Union{TFirst,TSecond}"/> that encapsulates <paramref name="item"/> value
+		/// Creates an new instance of <see cref="Union{TFirst,TSecond}" /> that encapsulates <paramref name="item" /> value
 		/// </summary>
 		/// <param name="item">The value to encapsulate</param>
-		public Union(TFirst item) { Item1 = item; _tag = 0; }
+		public Union(TFirst item)
+		{
+			Item1 = item;
+			_tag = 0;
+		}
 
 		/// <summary>
-		/// Creates an new instance of <see cref="Union{TFirst,TSecond}"/> that encapsulates <paramref name="item"/> value
+		/// Creates an new instance of <see cref="Union{TFirst,TSecond}" /> that encapsulates <paramref name="item" /> value
 		/// </summary>
 		/// <param name="item">The value to encapsulate</param>
-		public Union(TSecond item) { Item2 = item; _tag = 1; }
+		public Union(TSecond item)
+		{
+			Item2 = item;
+			_tag = 1;
+		}
 
 		/// <summary>
-		/// Runs an <see cref="Action{T}"/> delegate against the encapsulated value
+		/// Runs an <see cref="Action{T}" /> delegate against the encapsulated value
 		/// </summary>
-		/// <param name="first">The delegate to run when this instance encapsulates an instance of <typeparamref name="TFirst"/></param>
-		/// <param name="second">The delegate to run when this instance encapsulates an instance of <typeparamref name="TSecond"/></param>
+		/// <param name="first">The delegate to run when this instance encapsulates an instance of <typeparamref name="TFirst" /></param>
+		/// <param name="second">The delegate to run when this instance encapsulates an instance of <typeparamref name="TSecond" /></param>
 		public void Match(Action<TFirst> first, Action<TSecond> second)
 		{
 			switch (_tag)
@@ -48,10 +56,10 @@ public void Match(Action<TFirst> first, Action<TSecond> second)
 		}
 
 		/// <summary>
-		/// Runs a <see cref="Func{T,TResult}"/> delegate against the encapsulated value
+		/// Runs a <see cref="Func{T,TResult}" /> delegate against the encapsulated value
 		/// </summary>
-		/// <param name="first">The delegate to run when this instance encapsulates an instance of <typeparamref name="TFirst"/></param>
-		/// <param name="second">The delegate to run when this instance encapsulates an instance of <typeparamref name="TSecond"/></param>
+		/// <param name="first">The delegate to run when this instance encapsulates an instance of <typeparamref name="TFirst" /></param>
+		/// <param name="second">The delegate to run when this instance encapsulates an instance of <typeparamref name="TSecond" /></param>
 		public T Match<T>(Func<TFirst, T> first, Func<TSecond, T> second)
 		{
 			switch (_tag)
@@ -63,6 +71,7 @@ public T Match<T>(Func<TFirst, T> first, Func<TSecond, T> second)
 		}
 
 		public static implicit operator Union<TFirst, TSecond>(TFirst first) => new Union<TFirst, TSecond>(first);
+
 		public static implicit operator Union<TFirst, TSecond>(TSecond second) => new Union<TFirst, TSecond>(second);
 	}
 }
diff --git a/src/Nest/CommonAbstractions/Union/UnionJsonConverter.cs b/src/Nest/CommonAbstractions/Union/UnionJsonConverter.cs
index 38d46c576ba..77abef76bf7 100644
--- a/src/Nest/CommonAbstractions/Union/UnionJsonConverter.cs
+++ b/src/Nest/CommonAbstractions/Union/UnionJsonConverter.cs
@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Concurrent;
-using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
 	internal class UnionJsonConverter : JsonConverter
 	{
-		private static readonly ConcurrentDictionary<Type, UnionJsonConverterBase> KnownTypes = new ConcurrentDictionary<Type, UnionJsonConverterBase>();
+		private static readonly ConcurrentDictionary<Type, UnionJsonConverterBase> KnownTypes =
+			new ConcurrentDictionary<Type, UnionJsonConverterBase>();
 
 		public override bool CanConvert(Type objectType) => true;
 
@@ -22,11 +21,10 @@ public static UnionJsonConverterBase CreateConverter(Type t)
 			switch (genericArguments.Length)
 			{
 				case 2:
-					conversion = typeof (UnionJsonConverter<,>).CreateGenericInstance(genericArguments) as UnionJsonConverterBase;
+					conversion = typeof(UnionJsonConverter<,>).CreateGenericInstance(genericArguments) as UnionJsonConverterBase;
 					break;
 				default:
 					throw new Exception($"No union converter registered that takes {genericArguments.Length} type arguments for {t.Name}");
-
 			}
 			KnownTypes.TryAdd(t, conversion);
 			return conversion;
@@ -62,6 +60,7 @@ public bool TryRead<T>(JsonReader reader, JsonSerializer serializer, out T v)
 		}
 
 		public abstract void WriteJson(JsonWriter writer, object v, JsonSerializer serializer);
+
 		public abstract object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer);
 	}
 
@@ -86,11 +85,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			Union<TFirst, TSecond> u = null;
 			using (var r = reader.ReadTokenWithDateParseHandlingNone().CreateReader())
 			{
-				if (this.TryRead(r, serializer, out TFirst first)) u = first;
-				else if (this.TryRead(r, serializer, out TSecond second)) u = second;
+				if (TryRead(r, serializer, out TFirst first)) u = first;
+				else if (TryRead(r, serializer, out TSecond second)) u = second;
 			}
 			return u;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonOptions/Attributes/AlternativeEnumMemberAttribute.cs b/src/Nest/CommonOptions/Attributes/AlternativeEnumMemberAttribute.cs
index 5516d9f0732..1e552b67a9c 100644
--- a/src/Nest/CommonOptions/Attributes/AlternativeEnumMemberAttribute.cs
+++ b/src/Nest/CommonOptions/Attributes/AlternativeEnumMemberAttribute.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// Similar to <see cref="System.Runtime.Serialization.EnumMemberAttribute"/>, but allows an alternative string
+	/// Similar to <see cref="System.Runtime.Serialization.EnumMemberAttribute" />, but allows an alternative string
 	/// value to be specified for an enum field value.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Field, AllowMultiple = true)]
diff --git a/src/Nest/CommonOptions/DateFormat/DateFormat.cs b/src/Nest/CommonOptions/DateFormat/DateFormat.cs
index 50da3c61a06..ebfa10ddf06 100644
--- a/src/Nest/CommonOptions/DateFormat/DateFormat.cs
+++ b/src/Nest/CommonOptions/DateFormat/DateFormat.cs
@@ -4,159 +4,307 @@
 	//these const reflect their output on purpose
 	public static class DateFormat
 	{
-		///<summary>A formatter for the number of milliseconds since the epoch. Note, that this timestamp is subject to the limits of a Java Long.MIN_VALUE and Long.MAX_VALUE.</summary>
-		public const string epoch_millis = "epoch_millis";
-		///<summary>A formatter for the number of seconds since the epoch. Note, that this timestamp is subject to the limits of a Java Long.MIN_VALUE and Long. MAX_VALUE divided by 1000 (the number of milliseconds in a second).</summary>
-		public const string epoch_second = "epoch_second";
-		///<summary>A basic formatter for a full date as four digit year, two digit month of year, and two digit day of month: yyyyMMdd.</summary>
-		public const string date_optional_time = "date_optional_time";
 		///<summary>A basic formatter that combines a basic date and time, separated by a T: yyyyMMdd'T'HHmmss.SSSZ.</summary>
 		public const string basic_date = "basic_date";
+
 		///<summary>A basic formatter that combines a basic date and time, separated by a T: yyyyMMdd'T'HHmmss.SSSZ.</summary>
 		public const string basic_date_time = "basic_date_time";
+
 		///<summary>A basic formatter that combines a basic date and time without millis, separated by a T: yyyyMMdd'T'HHmmssZ.</summary>
 		public const string basic_date_time_no_millis = "basic_date_time_no_millis";
+
 		///<summary>A formatter for a full ordinal date, using a four digit year and three digit dayOfYear: yyyyDDD.</summary>
 		public const string basic_ordinal_date = "basic_ordinal_date";
+
 		///<summary>A formatter for a full ordinal date and time, using a four digit year and three digit dayOfYear: yyyyDDD'T'HHmmss.SSSZ.</summary>
 		public const string basic_ordinal_date_time = "basic_ordinal_date_time";
+
 		///<summary>A formatter for a full ordinal date and time without millis, using a four digit year and three digit dayOfYear: yyyyDDD'T'HHmmssZ.</summary>
 		public const string basic_ordinal_date_time_no_millis = "basic_ordinal_date_time_no_millis";
-		///<summary>A basic formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit millis, and time zone offset: HHmmss.SSSZ.</summary>
-		public const string basic_time = "basic_time";
-		///<summary>A basic formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset: HHmmssZ.</summary>
-		public const string basic_time_no_millis = "basic_time_no_millis";
-		///<summary>A basic formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit millis, and time zone off set prefixed by T: 'T'HHmmss.SSSZ.</summary>
+
+		/// <summary>
+		/// A basic formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit millis, and time
+		/// zone off set prefixed by T: 'T'HHmmss.SSSZ.
+		/// </summary>
 		public const string basic_t_time = "basic_t_time";
-		///<summary>A basic formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset prefixed by T: 'T'HHmmssZ.</summary>
+
+		/// <summary>
+		/// A basic formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset prefixed
+		/// by T: 'T'HHmmssZ.
+		/// </summary>
 		public const string basic_t_time_no_millis = "basic_t_time_no_millis";
+
+		/// <summary>
+		/// A basic formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit millis, and time
+		/// zone offset: HHmmss.SSSZ.
+		/// </summary>
+		public const string basic_time = "basic_time";
+
+		/// <summary>
+		/// A basic formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset:
+		/// HHmmssZ.
+		/// </summary>
+		public const string basic_time_no_millis = "basic_time_no_millis";
+
 		///<summary>A basic formatter for a full date as four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx'W'wwe.</summary>
 		public const string basic_week_date = "basic_week_date";
-		///<summary>A basic formatter for a full date as four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx'W'wwe.</summary>
-		public const string strict_basic_week_date = "strict_basic_week_date";
+
 		///<summary>A basic formatter that combines a basic weekyear date and time, separated by a T: xxxx'W'wwe'T'HHmmss.SSSZ.</summary>
 		public const string basic_week_date_time = "basic_week_date_time";
-		///<summary>A basic formatter that combines a basic weekyear date and time, separated by a T: xxxx'W'wwe'T'HHmmss.SSSZ.</summary>
-		public const string strict_basic_week_date_time = "strict_basic_week_date_time";
+
 		///<summary>A basic formatter that combines a basic weekyear date and time without millis, separated by a T: xxxx'W'wwe'T'HHmmssZ.</summary>
 		public const string basic_week_date_time_no_millis = "basic_week_date_time_no_millis";
-		///<summary>A basic formatter that combines a basic weekyear date and time without millis, separated by a T: xxxx'W'wwe'T'HHmmssZ.</summary>
-		public const string strict_basic_week_date_time_no_millis = "strict_basic_week_date_time_no_millis";
+
 		///<summary>A formatter for a full date as four digit year, two digit month of year, and two digit day of month: yyyy-MM-dd.</summary>
 		public const string date = "date";
-		///<summary>A formatter for a full date as four digit year, two digit month of year, and two digit day of month: yyyy-MM-dd.</summary>
-		public const string strict_date = "strict_date";
+
 		///<summary>A formatter that combines a full date and two digit hour of day: yyyy-MM-dd'T'HH.</summary>
 		public const string date_hour = "date_hour";
-		///<summary>A formatter that combines a full date and two digit hour of day: yyyy-MM-dd'T'HH.</summary>
-		public const string strict_date_hour = "strict_date_hour";
+
 		///<summary>A formatter that combines a full date, two digit hour of day, and two digit minute of hour: yyyy-MM-dd'T'HH:mm.</summary>
 		public const string date_hour_minute = "date_hour_minute";
-		///<summary>A formatter that combines a full date, two digit hour of day, and two digit minute of hour: yyyy-MM-dd'T'HH:mm.</summary>
-		public const string strict_date_hour_minute = "strict_date_hour_minute";
-		///<summary>A formatter that combines a full date, two digit hour of day, two digit minute of hour, and two digit second of minute: yyyy-MM-dd'T'HH:mm:ss.</summary>
+
+		/// <summary>
+		/// A formatter that combines a full date, two digit hour of day, two digit minute of hour, and two digit second of minute:
+		/// yyyy-MM-dd'T'HH:mm:ss.
+		/// </summary>
 		public const string date_hour_minute_second = "date_hour_minute_second";
-		///<summary>A formatter that combines a full date, two digit hour of day, two digit minute of hour, and two digit second of minute: yyyy-MM-dd'T'HH:mm:ss.</summary>
-		public const string strict_date_hour_minute_second = "strict_date_hour_minute_second";
-		///<summary>A formatter that combines a full date, two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second: yyyy-MM-dd'T'HH:mm:ss.SSS.</summary>
+
+		/// <summary>
+		/// A formatter that combines a full date, two digit hour of day, two digit minute of hour, two digit second of minute, and three
+		/// digit fraction of second: yyyy-MM-dd'T'HH:mm:ss.SSS.
+		/// </summary>
 		public const string date_hour_minute_second_fraction = "date_hour_minute_second_fraction";
-		///<summary>A formatter that combines a full date, two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second: yyyy-MM-dd'T'HH:mm:ss.SSS.</summary>
-		public const string strict_date_hour_minute_second_fraction = "strict_date_hour_minute_second_fraction";
-		///<summary>A formatter that combines a full date, two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second: yyyy-MM-dd'T'HH:mm:ss.SSS.</summary>
+
+		/// <summary>
+		/// A formatter that combines a full date, two digit hour of day, two digit minute of hour, two digit second of minute, and three
+		/// digit fraction of second: yyyy-MM-dd'T'HH:mm:ss.SSS.
+		/// </summary>
 		public const string date_hour_minute_second_millis = "date_hour_minute_second_millis";
-		///<summary>A formatter that combines a full date, two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second: yyyy-MM-dd'T'HH:mm:ss.SSS.</summary>
-		public const string strict_date_hour_minute_second_millis = "strict_date_hour_minute_second_millis";
+
+		///<summary>A basic formatter for a full date as four digit year, two digit month of year, and two digit day of month: yyyyMMdd.</summary>
+		public const string date_optional_time = "date_optional_time";
+
 		///<summary>A formatter that combines a full date and time, separated by a T: yyyy-MM-dd'T'HH:mm:ss.SSSZZ.</summary>
 		public const string date_time = "date_time";
-		///<summary>A formatter that combines a full date and time, separated by a T: yyyy-MM-dd'T'HH:mm:ss.SSSZZ.</summary>
-		public const string strict_date_time = "strict_date_time";
+
 		///<summary>A formatter that combines a full date and time without millis, separated by a T: yyyy-MM-dd'T'HH:mm:ssZZ.</summary>
 		public const string date_time_no_millis = "date_time_no_millis";
-		///<summary>A formatter that combines a full date and time without millis, separated by a T: yyyy-MM-dd'T'HH:mm:ssZZ.</summary>
-		public const string strict_date_time_no_millis = "strict_date_time_no_millis";
+
+		/// <summary>
+		/// A formatter for the number of milliseconds since the epoch. Note, that this timestamp is subject to the limits of a Java
+		/// Long.MIN_VALUE and Long.MAX_VALUE.
+		/// </summary>
+		public const string epoch_millis = "epoch_millis";
+
+		/// <summary>
+		/// A formatter for the number of seconds since the epoch. Note, that this timestamp is subject to the limits of a Java Long.MIN_VALUE
+		/// and Long. MAX_VALUE divided by 1000 (the number of milliseconds in a second).
+		/// </summary>
+		public const string epoch_second = "epoch_second";
+
 		///<summary>A formatter for a two digit hour of day: HH</summary>
 		public const string hour = "hour";
-		///<summary>A formatter for a two digit hour of day: HH</summary>
-		public const string strict_hour = "strict_hour";
+
 		///<summary>A formatter for a two digit hour of day and two digit minute of hour: HH:mm.</summary>
 		public const string hour_minute = "hour_minute";
-		///<summary>A formatter for a two digit hour of day and two digit minute of hour: HH:mm.</summary>
-		public const string strict_hour_minute = "strict_hour_minute";
+
 		///<summary>A formatter for a two digit hour of day, two digit minute of hour, and two digit second of minute: HH:mm:ss.</summary>
 		public const string hour_minute_second = "hour_minute_second";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, and two digit second of minute: HH:mm:ss.</summary>
-		public const string strict_hour_minute_second = "strict_hour_minute_second";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second: HH:mm:ss.SSS.</summary>
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second:
+		/// HH:mm:ss.SSS.
+		/// </summary>
 		public const string hour_minute_second_fraction = "hour_minute_second_fraction";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second: HH:mm:ss.SSS.</summary>
-		public const string strict_hour_minute_second_fraction = "strict_hour_minute_second_fraction";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second: HH:mm:ss.SSS.</summary>
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second:
+		/// HH:mm:ss.SSS.
+		/// </summary>
 		public const string hour_minute_second_millis = "hour_minute_second_millis";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second: HH:mm:ss.SSS.</summary>
-		public const string strict_hour_minute_second_millis = "strict_hour_minute_second_millis";
+
 		///<summary>A formatter for a full ordinal date, using a four digit year and three digit dayOfYear: yyyy-DDD.</summary>
 		public const string ordinal_date = "ordinal_date";
-		///<summary>A formatter for a full ordinal date, using a four digit year and three digit dayOfYear: yyyy-DDD.</summary>
-		public const string strict_ordinal_date = "strict_ordinal_date";
+
 		///<summary>A formatter for a full ordinal date and time, using a four digit year and three digit dayOfYear: yyyy-DDD'T'HH:mm:ss.SSSZZ.</summary>
 		public const string ordinal_date_time = "ordinal_date_time";
+
+		/// <summary>
+		/// A formatter for a full ordinal date and time without millis, using a four digit year and three digit dayOfYear:
+		/// yyyy-DDD'T'HH:mm:ssZZ.
+		/// </summary>
+		public const string ordinal_date_time_no_millis = "ordinal_date_time_no_millis";
+
+		///<summary>A basic formatter for a full date as four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx'W'wwe.</summary>
+		public const string strict_basic_week_date = "strict_basic_week_date";
+
+		///<summary>A basic formatter that combines a basic weekyear date and time, separated by a T: xxxx'W'wwe'T'HHmmss.SSSZ.</summary>
+		public const string strict_basic_week_date_time = "strict_basic_week_date_time";
+
+		///<summary>A basic formatter that combines a basic weekyear date and time without millis, separated by a T: xxxx'W'wwe'T'HHmmssZ.</summary>
+		public const string strict_basic_week_date_time_no_millis = "strict_basic_week_date_time_no_millis";
+
+		///<summary>A formatter for a full date as four digit year, two digit month of year, and two digit day of month: yyyy-MM-dd.</summary>
+		public const string strict_date = "strict_date";
+
+		///<summary>A formatter that combines a full date and two digit hour of day: yyyy-MM-dd'T'HH.</summary>
+		public const string strict_date_hour = "strict_date_hour";
+
+		///<summary>A formatter that combines a full date, two digit hour of day, and two digit minute of hour: yyyy-MM-dd'T'HH:mm.</summary>
+		public const string strict_date_hour_minute = "strict_date_hour_minute";
+
+		/// <summary>
+		/// A formatter that combines a full date, two digit hour of day, two digit minute of hour, and two digit second of minute:
+		/// yyyy-MM-dd'T'HH:mm:ss.
+		/// </summary>
+		public const string strict_date_hour_minute_second = "strict_date_hour_minute_second";
+
+		/// <summary>
+		/// A formatter that combines a full date, two digit hour of day, two digit minute of hour, two digit second of minute, and three
+		/// digit fraction of second: yyyy-MM-dd'T'HH:mm:ss.SSS.
+		/// </summary>
+		public const string strict_date_hour_minute_second_fraction = "strict_date_hour_minute_second_fraction";
+
+		/// <summary>
+		/// A formatter that combines a full date, two digit hour of day, two digit minute of hour, two digit second of minute, and three
+		/// digit fraction of second: yyyy-MM-dd'T'HH:mm:ss.SSS.
+		/// </summary>
+		public const string strict_date_hour_minute_second_millis = "strict_date_hour_minute_second_millis";
+
+		///<summary>A formatter that combines a full date and time, separated by a T: yyyy-MM-dd'T'HH:mm:ss.SSSZZ.</summary>
+		public const string strict_date_time = "strict_date_time";
+
+		///<summary>A formatter that combines a full date and time without millis, separated by a T: yyyy-MM-dd'T'HH:mm:ssZZ.</summary>
+		public const string strict_date_time_no_millis = "strict_date_time_no_millis";
+
+		///<summary>A formatter for a two digit hour of day: HH</summary>
+		public const string strict_hour = "strict_hour";
+
+		///<summary>A formatter for a two digit hour of day and two digit minute of hour: HH:mm.</summary>
+		public const string strict_hour_minute = "strict_hour_minute";
+
+		///<summary>A formatter for a two digit hour of day, two digit minute of hour, and two digit second of minute: HH:mm:ss.</summary>
+		public const string strict_hour_minute_second = "strict_hour_minute_second";
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second:
+		/// HH:mm:ss.SSS.
+		/// </summary>
+		public const string strict_hour_minute_second_fraction = "strict_hour_minute_second_fraction";
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and three digit fraction of second:
+		/// HH:mm:ss.SSS.
+		/// </summary>
+		public const string strict_hour_minute_second_millis = "strict_hour_minute_second_millis";
+
+		///<summary>A formatter for a full ordinal date, using a four digit year and three digit dayOfYear: yyyy-DDD.</summary>
+		public const string strict_ordinal_date = "strict_ordinal_date";
+
 		///<summary>A formatter for a full ordinal date and time, using a four digit year and three digit dayOfYear: yyyy-DDD'T'HH:mm:ss.SSSZZ.</summary>
 		public const string strict_ordinal_date_time = "strict_ordinal_date_time";
-		///<summary>A formatter for a full ordinal date and time without millis, using a four digit year and three digit dayOfYear: yyyy-DDD'T'HH:mm:ssZZ.</summary>
-		public const string ordinal_date_time_no_millis = "ordinal_date_time_no_millis";
-		///<summary>A formatter for a full ordinal date and time without millis, using a four digit year and three digit dayOfYear: yyyy-DDD'T'HH:mm:ssZZ.</summary>
+
+		/// <summary>
+		/// A formatter for a full ordinal date and time without millis, using a four digit year and three digit dayOfYear:
+		/// yyyy-DDD'T'HH:mm:ssZZ.
+		/// </summary>
 		public const string strict_ordinal_date_time_no_millis = "strict_ordinal_date_time_no_millis";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit fraction of second, and time zone offset: HH:mm:ss.SSSZZ.</summary>
-		public const string time = "time";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit fraction of second, and time zone offset: HH:mm:ss.SSSZZ.</summary>
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit fraction of second, and
+		/// time zone offset prefixed by T: 'T'HH:mm:ss.SSSZZ.
+		/// </summary>
+		public const string strict_t_time = "strict_t_time";
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset prefixed by T:
+		/// 'T'HH:mm:ssZZ.
+		/// </summary>
+		public const string strict_t_time_no_millis = "strict_t_time_no_millis";
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit fraction of second, and
+		/// time zone offset: HH:mm:ss.SSSZZ.
+		/// </summary>
 		public const string strict_time = "strict_time";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset: HH:mm:ssZZ.</summary>
-		public const string time_no_millis = "time_no_millis";
+
 		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset: HH:mm:ssZZ.</summary>
 		public const string strict_time_no_millis = "strict_time_no_millis";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit fraction of second, and time zone offset prefixed by T: 'T'HH:mm:ss.SSSZZ.</summary>
+
+		///<summary>A formatter for a full date as four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx-'W'ww-e.</summary>
+		public const string strict_week_date = "strict_week_date";
+
+		///<summary>A formatter that combines a full weekyear date and time, separated by a T: xxxx-'W'ww-e'T'HH:mm:ss.SSSZZ.</summary>
+		public const string strict_week_date_time = "strict_week_date_time";
+
+		///<summary>A formatter that combines a full weekyear date and time without millis, separated by a T: xxxx-'W'ww-e'T'HH:mm:ssZZ.</summary>
+		public const string strict_week_date_time_no_millis = "strict_week_date_time_no_millis";
+
+		///<summary>A formatter for a four digit weekyear: xxxx.</summary>
+		public const string strict_weekyear = "strict_weekyear";
+
+		///<summary>A formatter for a four digit weekyear and two digit week of weekyear: xxxx-'W'ww.</summary>
+		public const string strict_weekyear_week = "strict_weekyear_week";
+
+		///<summary>A formatter for a four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx-'W'ww-e.</summary>
+		public const string strict_weekyear_week_day = "strict_weekyear_week_day";
+
+		///<summary>A formatter for a four digit year: yyyy.</summary>
+		public const string strict_year = "strict_year";
+
+		///<summary>A formatter for a four digit year and two digit month of year: yyyy-MM.</summary>
+		public const string strict_year_month = "strict_year_month";
+
+		///<summary>A formatter for a four digit year, two digit month of year, and two digit day of month: yyyy-MM-dd.</summary>
+		public const string strict_year_month_day = "strict_year_month_day";
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit fraction of second, and
+		/// time zone offset prefixed by T: 'T'HH:mm:ss.SSSZZ.
+		/// </summary>
 		public const string t_time = "t_time";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit fraction of second, and time zone offset prefixed by T: 'T'HH:mm:ss.SSSZZ.</summary>
-		public const string strict_t_time = "strict_t_time";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset prefixed by T: 'T'HH:mm:ssZZ.</summary>
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset prefixed by T:
+		/// 'T'HH:mm:ssZZ.
+		/// </summary>
 		public const string t_time_no_millis = "t_time_no_millis";
-		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset prefixed by T: 'T'HH:mm:ssZZ.</summary>
-		public const string strict_t_time_no_millis = "strict_t_time_no_millis";
+
+		/// <summary>
+		/// A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, three digit fraction of second, and
+		/// time zone offset: HH:mm:ss.SSSZZ.
+		/// </summary>
+		public const string time = "time";
+
+		///<summary>A formatter for a two digit hour of day, two digit minute of hour, two digit second of minute, and time zone offset: HH:mm:ssZZ.</summary>
+		public const string time_no_millis = "time_no_millis";
+
 		///<summary>A formatter for a full date as four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx-'W'ww-e.</summary>
 		public const string week_date = "week_date";
-		///<summary>A formatter for a full date as four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx-'W'ww-e.</summary>
-		public const string strict_week_date = "strict_week_date";
+
 		///<summary>A formatter that combines a full weekyear date and time, separated by a T: xxxx-'W'ww-e'T'HH:mm:ss.SSSZZ.</summary>
 		public const string week_date_time = "week_date_time";
-		///<summary>A formatter that combines a full weekyear date and time, separated by a T: xxxx-'W'ww-e'T'HH:mm:ss.SSSZZ.</summary>
-		public const string strict_week_date_time = "strict_week_date_time";
+
 		///<summary>A formatter that combines a full weekyear date and time without millis, separated by a T: xxxx-'W'ww-e'T'HH:mm:ssZZ.</summary>
 		public const string week_date_time_no_millis = "week_date_time_no_millis";
-		///<summary>A formatter that combines a full weekyear date and time without millis, separated by a T: xxxx-'W'ww-e'T'HH:mm:ssZZ.</summary>
-        public const string strict_week_date_time_no_millis = "strict_week_date_time_no_millis";
+
 		///<summary>A formatter for a four digit weekyear: xxxx.</summary>
 		public const string weekyear = "weekyear";
-		///<summary>A formatter for a four digit weekyear: xxxx.</summary>
-        public const string strict_weekyear = "strict_weekyear";
+
 		///<summary>A formatter for a four digit weekyear and two digit week of weekyear: xxxx-'W'ww.</summary>
 		public const string weekyear_week = "weekyear_week";
-		///<summary>A formatter for a four digit weekyear and two digit week of weekyear: xxxx-'W'ww.</summary>
-        public const string strict_weekyear_week = "strict_weekyear_week";
+
 		///<summary>A formatter for a four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx-'W'ww-e.</summary>
 		public const string weekyear_week_day = "weekyear_week_day";
-		///<summary>A formatter for a four digit weekyear, two digit week of weekyear, and one digit day of week: xxxx-'W'ww-e.</summary>
-        public const string strict_weekyear_week_day = "strict_weekyear_week_day";
+
 		///<summary>A formatter for a four digit year: yyyy.</summary>
 		public const string year = "year";
-		///<summary>A formatter for a four digit year: yyyy.</summary>
-        public const string strict_year = "strict_year";
+
 		///<summary>A formatter for a four digit year and two digit month of year: yyyy-MM.</summary>
 		public const string year_month = "year_month";
-		///<summary>A formatter for a four digit year and two digit month of year: yyyy-MM.</summary>
-        public const string strict_year_month = "strict_year_month";
+
 		///<summary>A formatter for a four digit year, two digit month of year, and two digit day of month: yyyy-MM-dd.</summary>
 		public const string year_month_day = "year_month_day";
-		///<summary>A formatter for a four digit year, two digit month of year, and two digit day of month: yyyy-MM-dd.</summary>
-        public const string strict_year_month_day = "strict_year_month_day";
 	}
 }
diff --git a/src/Nest/CommonOptions/DateMath/DateMath.cs b/src/Nest/CommonOptions/DateMath/DateMath.cs
index 08f9680afe7..8a2986f20e6 100644
--- a/src/Nest/CommonOptions/DateMath/DateMath.cs
+++ b/src/Nest/CommonOptions/DateMath/DateMath.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -14,30 +13,31 @@ public interface IDateMath
 		DateMathTimeUnit? Round { get; }
 	}
 
-	[JsonConverter(typeof(DateMath.Json))]
+	[JsonConverter(typeof(Json))]
 	public abstract class DateMath : IDateMath
 	{
 		private static readonly Regex DateMathRegex =
 			new Regex(@"^(?<anchor>now|.+(?:\|\||$))(?<ranges>(?:(?:\+|\-)[^\/]*))?(?<rounding>\/(?:y|M|w|d|h|m|s))?$");
 
-		Union<DateTime, string> IDateMath.Anchor => Anchor;
-		DateMathTimeUnit? IDateMath.Round => Round;
-		IList<Tuple<DateMathOperation, DateMathTime>> IDateMath.Ranges { get; } = new List<Tuple<DateMathOperation, DateMathTime>>();
-
-		protected IDateMath Self => this;
-
 		protected Union<DateTime, string> Anchor;
 
 		protected DateMathTimeUnit? Round;
 
 		public static DateMathExpression Now => new DateMathExpression("now");
 
+		protected IDateMath Self => this;
+
+		Union<DateTime, string> IDateMath.Anchor => Anchor;
+		IList<Tuple<DateMathOperation, DateMathTime>> IDateMath.Ranges { get; } = new List<Tuple<DateMathOperation, DateMathTime>>();
+		DateMathTimeUnit? IDateMath.Round => Round;
+
 		public static DateMathExpression Anchored(DateTime anchor) => new DateMathExpression(anchor);
 
 		public static DateMathExpression Anchored(string dateAnchor) => new DateMathExpression(dateAnchor);
 
-		public static implicit operator DateMath(DateTime dateTime) => DateMath.Anchored(dateTime);
-		public static implicit operator DateMath(string dateMath) => DateMath.FromString(dateMath);
+		public static implicit operator DateMath(DateTime dateTime) => Anchored(dateTime);
+
+		public static implicit operator DateMath(string dateMath) => FromString(dateMath);
 
 		public static DateMath FromString(string dateMath)
 		{
@@ -112,11 +112,12 @@ public override void WriteJson(JsonWriter writer, DateMath value, JsonSerializer
 			public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 			{
 				if (reader.TokenType == JsonToken.String)
-					return DateMath.FromString(reader.Value as string);
+					return FromString(reader.Value as string);
+
 				if (reader.TokenType == JsonToken.Date)
 				{
 					var d = reader.Value as DateTime?;
-					return d.HasValue ? DateMath.Anchored(d.Value) : null;
+					return d.HasValue ? Anchored(d.Value) : null;
 				}
 				return null;
 			}
diff --git a/src/Nest/CommonOptions/DateMath/DateMathExpression.cs b/src/Nest/CommonOptions/DateMath/DateMathExpression.cs
index f3057b37db8..daefa90e92f 100644
--- a/src/Nest/CommonOptions/DateMath/DateMathExpression.cs
+++ b/src/Nest/CommonOptions/DateMath/DateMathExpression.cs
@@ -4,15 +4,16 @@ namespace Nest
 {
 	public class DateMathExpression : DateMath
 	{
-		public DateMathExpression(string anchor) { this.Anchor = anchor; }
-		public DateMathExpression(DateTime anchor) { this.Anchor = anchor; }
+		public DateMathExpression(string anchor) => Anchor = anchor;
+
+		public DateMathExpression(DateTime anchor) => Anchor = anchor;
 
 		public DateMathExpression(Union<DateTime, string> anchor, DateMathTime range, DateMathOperation operation)
 		{
 			anchor.ThrowIfNull(nameof(anchor));
 			range.ThrowIfNull(nameof(range));
 			operation.ThrowIfNull(nameof(operation));
-			this.Anchor = anchor;
+			Anchor = anchor;
 			Self.Ranges.Add(Tuple.Create(operation, range));
 		}
 
@@ -36,7 +37,7 @@ public DateMathExpression Operation(DateMathTime expression, DateMathOperation o
 
 		public DateMath RoundTo(DateMathTimeUnit round)
 		{
-			this.Round = round;
+			Round = round;
 			return this;
 		}
 	}
diff --git a/src/Nest/CommonOptions/DateMath/DateMathOperation.cs b/src/Nest/CommonOptions/DateMath/DateMathOperation.cs
index 64ab47aa05e..e440720022e 100644
--- a/src/Nest/CommonOptions/DateMath/DateMathOperation.cs
+++ b/src/Nest/CommonOptions/DateMath/DateMathOperation.cs
@@ -10,6 +10,7 @@ public enum DateMathOperation
 	{
 		[EnumMember(Value = "+")]
 		Add,
+
 		[EnumMember(Value = "-")]
 		Subtract
 	}
@@ -27,7 +28,6 @@ public static string GetStringValue(this DateMathOperation value)
 				default:
 					throw new ArgumentOutOfRangeException(nameof(value), value, null);
 			}
-
 		}
 	}
 }
diff --git a/src/Nest/CommonOptions/DateMath/DateMathTime.cs b/src/Nest/CommonOptions/DateMath/DateMathTime.cs
index 6da281169f7..cfcb9398205 100644
--- a/src/Nest/CommonOptions/DateMath/DateMathTime.cs
+++ b/src/Nest/CommonOptions/DateMath/DateMathTime.cs
@@ -1,24 +1,22 @@
 using System;
-using System.Diagnostics;
 using System.Globalization;
 using System.Text.RegularExpressions;
-using Newtonsoft.Json;
 
 namespace Nest
 {
 	/// <summary>
-	/// A time representation for use within <see cref="DateMath"/> expressions.
+	/// A time representation for use within <see cref="DateMath" /> expressions.
 	/// </summary>
 	public class DateMathTime : IComparable<DateMathTime>, IEquatable<DateMathTime>
 	{
-		private const int MonthsInAYear = 12;
-		private const double MillisecondsInAYearApproximate = MillisecondsInADay * 365;
-		private const double MillisecondsInAMonthApproximate = MillisecondsInAYearApproximate / MonthsInAYear;
-		private const double MillisecondsInAWeek = MillisecondsInADay * 7;
 		private const double MillisecondsInADay = MillisecondsInAnHour * 24;
-		private const double MillisecondsInAnHour = MillisecondsInAMinute * 60;
 		private const double MillisecondsInAMinute = MillisecondsInASecond * 60;
+		private const double MillisecondsInAMonthApproximate = MillisecondsInAYearApproximate / MonthsInAYear;
+		private const double MillisecondsInAnHour = MillisecondsInAMinute * 60;
 		private const double MillisecondsInASecond = 1000;
+		private const double MillisecondsInAWeek = MillisecondsInADay * 7;
+		private const double MillisecondsInAYearApproximate = MillisecondsInADay * 365;
+		private const int MonthsInAYear = 12;
 
 		private static readonly Regex ExpressionRegex =
 			new Regex(@"^
@@ -34,41 +32,27 @@ public class DateMathTime : IComparable<DateMathTime>, IEquatable<DateMathTime>
 		private double _approximateSeconds;
 
 		/// <summary>
-		/// The numeric time factor
-		/// </summary>
-		public int Factor { get; private set; }
-
-		/// <summary>
-		/// The time units
-		/// </summary>
-		public DateMathTimeUnit Interval { get; private set; }
-
-		public static implicit operator DateMathTime(TimeSpan span) => new DateMathTime(span);
-		public static implicit operator DateMathTime(double milliseconds) => new DateMathTime(milliseconds);
-		public static implicit operator DateMathTime(string expression) => new DateMathTime(expression);
-
-		/// <summary>
-		/// Instantiates a new instance of <see cref="DateMathTime"/> from a TimeSpan.
+		/// Instantiates a new instance of <see cref="DateMathTime" /> from a TimeSpan.
 		/// Rounding can be specified to determine how fractional second values should be rounded.
 		/// </summary>
 		public DateMathTime(TimeSpan timeSpan, MidpointRounding rounding = MidpointRounding.AwayFromZero)
 			: this(timeSpan.TotalMilliseconds, rounding) { }
 
 		/// <summary>
-		/// Instantiates a new instance of <see cref="DateMathTime"/> from a milliseconds value.
+		/// Instantiates a new instance of <see cref="DateMathTime" /> from a milliseconds value.
 		/// Rounding can be specified to determine how fractional second values should be rounded.
 		/// </summary>
 		public DateMathTime(double milliseconds, MidpointRounding rounding = MidpointRounding.AwayFromZero) =>
 			SetWholeFactorIntervalAndSeconds(milliseconds, rounding);
 
 		/// <summary>
-		/// Instantiates a new instance of <see cref="DateMathTime"/> from a factor and interval.
+		/// Instantiates a new instance of <see cref="DateMathTime" /> from a factor and interval.
 		/// </summary>
 		public DateMathTime(int factor, DateMathTimeUnit interval) =>
 			SetWholeFactorIntervalAndSeconds(factor, interval, MidpointRounding.AwayFromZero);
 
 		/// <summary>
-		/// Instantiates a new instance of <see cref="DateMathTime"/> from the timeUnit string expression.
+		/// Instantiates a new instance of <see cref="DateMathTime" /> from the timeUnit string expression.
 		/// Rounding can be specified to determine how fractional second values should be rounded.
 		/// </summary>
 		public DateMathTime(string timeUnit, MidpointRounding rounding = MidpointRounding.AwayFromZero)
@@ -80,7 +64,7 @@ public DateMathTime(string timeUnit, MidpointRounding rounding = MidpointRoundin
 			if (!match.Success) throw new ArgumentException($"Expression '{timeUnit}' string is invalid", nameof(timeUnit));
 
 			var factor = match.Groups["factor"].Value;
-			if (!double.TryParse(factor, NumberStyles.Any ,CultureInfo.InvariantCulture, out double fraction))
+			if (!double.TryParse(factor, NumberStyles.Any, CultureInfo.InvariantCulture, out var fraction))
 				throw new ArgumentException($"Expression '{timeUnit}' contains invalid factor: {factor}", nameof(timeUnit));
 
 			var intervalValue = match.Groups["interval"].Value;
@@ -89,7 +73,7 @@ public DateMathTime(string timeUnit, MidpointRounding rounding = MidpointRoundin
 			switch (intervalValue)
 			{
 				case "M":
-					interval= DateMathTimeUnit.Month;
+					interval = DateMathTimeUnit.Month;
 					break;
 				case "m":
 					interval = DateMathTimeUnit.Minute;
@@ -102,6 +86,39 @@ public DateMathTime(string timeUnit, MidpointRounding rounding = MidpointRoundin
 			SetWholeFactorIntervalAndSeconds(fraction, interval, rounding);
 		}
 
+		/// <summary>
+		/// The numeric time factor
+		/// </summary>
+		public int Factor { get; private set; }
+
+		/// <summary>
+		/// The time units
+		/// </summary>
+		public DateMathTimeUnit Interval { get; private set; }
+
+		public int CompareTo(DateMathTime other)
+		{
+			if (other == null) return 1;
+			if (_approximateSeconds == other._approximateSeconds) return 0;
+			if (_approximateSeconds < other._approximateSeconds) return -1;
+
+			return 1;
+		}
+
+		public bool Equals(DateMathTime other)
+		{
+			if (ReferenceEquals(null, other)) return false;
+			if (ReferenceEquals(this, other)) return true;
+
+			return _approximateSeconds == other._approximateSeconds;
+		}
+
+		public static implicit operator DateMathTime(TimeSpan span) => new DateMathTime(span);
+
+		public static implicit operator DateMathTime(double milliseconds) => new DateMathTime(milliseconds);
+
+		public static implicit operator DateMathTime(string expression) => new DateMathTime(expression);
+
 		private void SetWholeFactorIntervalAndSeconds(double factor, DateMathTimeUnit interval, MidpointRounding rounding)
 		{
 			var fraction = factor;
@@ -110,30 +127,30 @@ private void SetWholeFactorIntervalAndSeconds(double factor, DateMathTimeUnit in
 			// if the factor is already a whole number then use it
 			if (TryGetIntegerGreaterThanZero(fraction, out var whole))
 			{
-				this.Factor = whole;
-				this.Interval = interval;
+				Factor = whole;
+				Interval = interval;
 				switch (interval)
 				{
 					case DateMathTimeUnit.Second:
-						this._approximateSeconds = whole;
+						_approximateSeconds = whole;
 						break;
 					case DateMathTimeUnit.Minute:
-						this._approximateSeconds = whole * (MillisecondsInAMinute / MillisecondsInASecond);
+						_approximateSeconds = whole * (MillisecondsInAMinute / MillisecondsInASecond);
 						break;
 					case DateMathTimeUnit.Hour:
-						this._approximateSeconds = whole * (MillisecondsInAnHour / MillisecondsInASecond);
+						_approximateSeconds = whole * (MillisecondsInAnHour / MillisecondsInASecond);
 						break;
 					case DateMathTimeUnit.Day:
-						this._approximateSeconds = whole * (MillisecondsInADay / MillisecondsInASecond);
+						_approximateSeconds = whole * (MillisecondsInADay / MillisecondsInASecond);
 						break;
 					case DateMathTimeUnit.Week:
-						this._approximateSeconds = whole * (MillisecondsInAWeek / MillisecondsInASecond);
+						_approximateSeconds = whole * (MillisecondsInAWeek / MillisecondsInASecond);
 						break;
 					case DateMathTimeUnit.Month:
-						this._approximateSeconds = whole * (MillisecondsInAMonthApproximate / MillisecondsInASecond);
+						_approximateSeconds = whole * (MillisecondsInAMonthApproximate / MillisecondsInASecond);
 						break;
 					case DateMathTimeUnit.Year:
-						this._approximateSeconds = whole * (MillisecondsInAYearApproximate / MillisecondsInASecond);
+						_approximateSeconds = whole * (MillisecondsInAYearApproximate / MillisecondsInASecond);
 						break;
 					default:
 						throw new ArgumentOutOfRangeException(nameof(interval), interval, null);
@@ -161,9 +178,9 @@ private void SetWholeFactorIntervalAndSeconds(double factor, DateMathTimeUnit in
 				case DateMathTimeUnit.Month:
 					if (TryGetIntegerGreaterThanZero(fraction, out whole))
 					{
-						this.Factor = whole;
-						this.Interval = interval;
-						this._approximateSeconds = whole * (MillisecondsInAMonthApproximate / MillisecondsInASecond);
+						Factor = whole;
+						Interval = interval;
+						_approximateSeconds = whole * (MillisecondsInAMonthApproximate / MillisecondsInASecond);
 						return;
 					}
 
@@ -172,18 +189,18 @@ private void SetWholeFactorIntervalAndSeconds(double factor, DateMathTimeUnit in
 				case DateMathTimeUnit.Year:
 					if (TryGetIntegerGreaterThanZero(fraction, out whole))
 					{
-						this.Factor = whole;
-						this.Interval = interval;
-						this._approximateSeconds = whole * (MillisecondsInAYearApproximate / MillisecondsInASecond);
+						Factor = whole;
+						Interval = interval;
+						_approximateSeconds = whole * (MillisecondsInAYearApproximate / MillisecondsInASecond);
 						return;
 					}
 
 					fraction = fraction * MonthsInAYear;
 					if (TryGetIntegerGreaterThanZero(fraction, out whole))
 					{
-						this.Factor = whole;
-						this.Interval = DateMathTimeUnit.Month;
-						this._approximateSeconds = whole * (MillisecondsInAMonthApproximate / MillisecondsInASecond);
+						Factor = whole;
+						Interval = DateMathTimeUnit.Month;
+						_approximateSeconds = whole * (MillisecondsInAMonthApproximate / MillisecondsInASecond);
 						return;
 					}
 					milliseconds = factor * MillisecondsInAYearApproximate;
@@ -205,9 +222,9 @@ private void SetWholeFactorIntervalAndSeconds(double milliseconds, MidpointRound
 				fraction = milliseconds / MillisecondsInAWeek;
 				if (TryGetIntegerGreaterThanZero(fraction, out whole))
 				{
-					this.Factor = whole;
-					this.Interval = DateMathTimeUnit.Week;
-					this._approximateSeconds = Factor * (MillisecondsInAWeek / MillisecondsInASecond);
+					Factor = whole;
+					Interval = DateMathTimeUnit.Week;
+					_approximateSeconds = Factor * (MillisecondsInAWeek / MillisecondsInASecond);
 					return;
 				}
 			}
@@ -216,9 +233,9 @@ private void SetWholeFactorIntervalAndSeconds(double milliseconds, MidpointRound
 				fraction = milliseconds / MillisecondsInADay;
 				if (TryGetIntegerGreaterThanZero(fraction, out whole))
 				{
-					this.Factor = whole;
-					this.Interval = DateMathTimeUnit.Day;
-					this._approximateSeconds = Factor * (MillisecondsInADay / MillisecondsInASecond);
+					Factor = whole;
+					Interval = DateMathTimeUnit.Day;
+					_approximateSeconds = Factor * (MillisecondsInADay / MillisecondsInASecond);
 					return;
 				}
 			}
@@ -227,9 +244,9 @@ private void SetWholeFactorIntervalAndSeconds(double milliseconds, MidpointRound
 				fraction = milliseconds / MillisecondsInAnHour;
 				if (TryGetIntegerGreaterThanZero(fraction, out whole))
 				{
-					this.Factor = whole;
-					this.Interval = DateMathTimeUnit.Hour;
-					this._approximateSeconds = Factor * (MillisecondsInAnHour / MillisecondsInASecond);
+					Factor = whole;
+					Interval = DateMathTimeUnit.Hour;
+					_approximateSeconds = Factor * (MillisecondsInAnHour / MillisecondsInASecond);
 					return;
 				}
 			}
@@ -238,9 +255,9 @@ private void SetWholeFactorIntervalAndSeconds(double milliseconds, MidpointRound
 				fraction = milliseconds / MillisecondsInAMinute;
 				if (TryGetIntegerGreaterThanZero(fraction, out whole))
 				{
-					this.Factor = whole;
-					this.Interval = DateMathTimeUnit.Minute;
-					this._approximateSeconds = Factor * (MillisecondsInAMinute / MillisecondsInASecond);
+					Factor = whole;
+					Interval = DateMathTimeUnit.Minute;
+					_approximateSeconds = Factor * (MillisecondsInAMinute / MillisecondsInASecond);
 					return;
 				}
 			}
@@ -249,25 +266,17 @@ private void SetWholeFactorIntervalAndSeconds(double milliseconds, MidpointRound
 				fraction = milliseconds / MillisecondsInASecond;
 				if (TryGetIntegerGreaterThanZero(fraction, out whole))
 				{
-					this.Factor = whole;
-					this.Interval = DateMathTimeUnit.Second;
-					this._approximateSeconds = Factor;
+					Factor = whole;
+					Interval = DateMathTimeUnit.Second;
+					_approximateSeconds = Factor;
 					return;
 				}
 			}
 
 			// round to nearest second, using specified rounding
-			this.Factor = Convert.ToInt32(Math.Round(milliseconds / MillisecondsInASecond, rounding));
-			this.Interval = DateMathTimeUnit.Second;
-			this._approximateSeconds = Factor;
-		}
-
-		public int CompareTo(DateMathTime other)
-		{
-			if (other == null) return 1;
-			if (this._approximateSeconds == other._approximateSeconds) return 0;
-			if (this._approximateSeconds < other._approximateSeconds) return -1;
-			return 1;
+			Factor = Convert.ToInt32(Math.Round(milliseconds / MillisecondsInASecond, rounding));
+			Interval = DateMathTimeUnit.Second;
+			_approximateSeconds = Factor;
 		}
 
 		private static bool TryGetIntegerGreaterThanZero(double d, out int value)
@@ -283,9 +292,11 @@ private static bool TryGetIntegerGreaterThanZero(double d, out int value)
 		}
 
 		public static bool operator <(DateMathTime left, DateMathTime right) => left.CompareTo(right) < 0;
+
 		public static bool operator <=(DateMathTime left, DateMathTime right) => left.CompareTo(right) < 0 || left.Equals(right);
 
 		public static bool operator >(DateMathTime left, DateMathTime right) => left.CompareTo(right) > 0;
+
 		public static bool operator >=(DateMathTime left, DateMathTime right) => left.CompareTo(right) > 0 || left.Equals(right);
 
 		public static bool operator ==(DateMathTime left, DateMathTime right) =>
@@ -293,23 +304,17 @@ private static bool TryGetIntegerGreaterThanZero(double d, out int value)
 
 		public static bool operator !=(DateMathTime left, DateMathTime right) => !(left == right);
 
-		public override string ToString() => this.Factor + this.Interval.GetStringValue();
-
-		public bool Equals(DateMathTime other)
-		{
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return this._approximateSeconds == other._approximateSeconds;
-		}
+		public override string ToString() => Factor + Interval.GetStringValue();
 
 		public override bool Equals(object obj)
 		{
 			if (ReferenceEquals(null, obj)) return false;
 			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != this.GetType()) return false;
-			return Equals((DateMathTime) obj);
+			if (obj.GetType() != GetType()) return false;
+
+			return Equals((DateMathTime)obj);
 		}
 
-		public override int GetHashCode() => this._approximateSeconds.GetHashCode();
+		public override int GetHashCode() => _approximateSeconds.GetHashCode();
 	}
 }
diff --git a/src/Nest/CommonOptions/DateMath/DateMathTimeUnit.cs b/src/Nest/CommonOptions/DateMath/DateMathTimeUnit.cs
index f3cba059615..b190b18600c 100644
--- a/src/Nest/CommonOptions/DateMath/DateMathTimeUnit.cs
+++ b/src/Nest/CommonOptions/DateMath/DateMathTimeUnit.cs
@@ -9,16 +9,22 @@ public enum DateMathTimeUnit
 	{
 		[EnumMember(Value = "s")]
 		Second,
+
 		[EnumMember(Value = "m")]
 		Minute,
+
 		[EnumMember(Value = "h")]
 		Hour,
+
 		[EnumMember(Value = "d")]
 		Day,
+
 		[EnumMember(Value = "w")]
 		Week,
+
 		[EnumMember(Value = "M")]
 		Month,
+
 		[EnumMember(Value = "y")]
 		Year
 	}
diff --git a/src/Nest/CommonOptions/Failures/BulkError.cs b/src/Nest/CommonOptions/Failures/BulkError.cs
index 09dee1933e9..0e7036dd71f 100644
--- a/src/Nest/CommonOptions/Failures/BulkError.cs
+++ b/src/Nest/CommonOptions/Failures/BulkError.cs
@@ -7,15 +7,13 @@ namespace Nest
 	[ContractJsonConverter(typeof(ErrorCauseJsonConverter<BulkError>))]
 	public class BulkError : Error
 	{
-		public string Index => this.Metadata?.Index;
+		public string Index => Metadata?.Index;
 
-		public int Shard => this.Metadata.Shard.GetValueOrDefault();
+		public int Shard => Metadata.Shard.GetValueOrDefault();
 
 		public override string ToString()
 		{
-			var cause = (CausedBy != null) ?
-				$" CausedBy:\n{CausedBy}" :
-				string.Empty;
+			var cause = CausedBy != null ? $" CausedBy:\n{CausedBy}" : string.Empty;
 
 			return $"Type: {Type} Reason: \"{Reason}\"{cause}";
 		}
diff --git a/src/Nest/CommonOptions/Fuzziness/Fuzziness.cs b/src/Nest/CommonOptions/Fuzziness/Fuzziness.cs
index b005701838d..1e38b0548c1 100644
--- a/src/Nest/CommonOptions/Fuzziness/Fuzziness.cs
+++ b/src/Nest/CommonOptions/Fuzziness/Fuzziness.cs
@@ -6,12 +6,12 @@ public class Fuzziness : IFuzziness
 		private int? _editDistance;
 		private double? _ratio;
 
-		bool IFuzziness.Auto => this._auto;
-		int? IFuzziness.EditDistance => this._editDistance;
-		double? IFuzziness.Ratio => this._ratio;
-
 		public static Fuzziness Auto => new Fuzziness { _auto = true };
 
+		bool IFuzziness.Auto => _auto;
+		int? IFuzziness.EditDistance => _editDistance;
+		double? IFuzziness.Ratio => _ratio;
+
 		public static Fuzziness EditDistance(int distance) => new Fuzziness { _editDistance = distance };
 
 		public static Fuzziness Ratio(double ratio) => new Fuzziness { _ratio = ratio };
diff --git a/src/Nest/CommonOptions/Fuzziness/FuzzinessJsonConverter.cs b/src/Nest/CommonOptions/Fuzziness/FuzzinessJsonConverter.cs
index a284bfae6f9..e0f2c9fa2dd 100644
--- a/src/Nest/CommonOptions/Fuzziness/FuzzinessJsonConverter.cs
+++ b/src/Nest/CommonOptions/Fuzziness/FuzzinessJsonConverter.cs
@@ -5,23 +5,25 @@ namespace Nest
 {
 	internal class FuzzinessJsonConverter : JsonConverter
 	{
+		public override bool CanRead => true;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
-		public override bool CanRead => true;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var v = value as IFuzziness;
-			if (v.Auto) writer.WriteValue("AUTO"); 
-			else if (v.EditDistance.HasValue) writer.WriteValue(v.EditDistance.Value); 
+			if (v.Auto) writer.WriteValue("AUTO");
+			else if (v.EditDistance.HasValue) writer.WriteValue(v.EditDistance.Value);
 			else if (v.Ratio.HasValue) writer.WriteValue(v.Ratio.Value);
-			else writer.WriteNull(); 
+			else writer.WriteNull();
 		}
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType == JsonToken.String)
 				return Fuzziness.Auto;
+
 			if (reader.TokenType == JsonToken.Integer)
 			{
 				var editDistance = Convert.ToInt32(reader.Value);
@@ -34,6 +36,5 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			}
 			return null;
 		}
-
 	}
 }
diff --git a/src/Nest/CommonOptions/Fuzziness/IFuzziness.cs b/src/Nest/CommonOptions/Fuzziness/IFuzziness.cs
index ab283986a76..61d7148e7f1 100644
--- a/src/Nest/CommonOptions/Fuzziness/IFuzziness.cs
+++ b/src/Nest/CommonOptions/Fuzziness/IFuzziness.cs
@@ -1,13 +1,12 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonConverter(typeof(FuzzinessJsonConverter))]
 	public interface IFuzziness
 	{
-		bool Auto { get;  }
-		int? EditDistance { get;  }
-		double? Ratio { get;  }
+		bool Auto { get; }
+		int? EditDistance { get; }
+		double? Ratio { get; }
 	}
 }
diff --git a/src/Nest/CommonOptions/Geo/Distance.cs b/src/Nest/CommonOptions/Geo/Distance.cs
index ed6edad5d38..5e8b61afde8 100644
--- a/src/Nest/CommonOptions/Geo/Distance.cs
+++ b/src/Nest/CommonOptions/Geo/Distance.cs
@@ -8,17 +8,15 @@ namespace Nest
 	[JsonConverter(typeof(DistanceJsonConverter))]
 	public class Distance
 	{
-		private static readonly Regex _distanceUnitRegex = new Regex(@"^(?<precision>\d+(?:\.\d+)?)(?<unit>\D+)?$", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-
-		public double Precision { get; private set; }
-		public DistanceUnit Unit { get; private set; }
+		private static readonly Regex _distanceUnitRegex =
+			new Regex(@"^(?<precision>\d+(?:\.\d+)?)(?<unit>\D+)?$", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
 
 		public Distance(double distance) : this(distance, DistanceUnit.Meters) { }
 
-		public Distance(double distance, DistanceUnit unit) 
+		public Distance(double distance, DistanceUnit unit)
 		{
-			this.Precision = distance;
-			this.Unit = unit;
+			Precision = distance;
+			Unit = unit;
 		}
 
 		public Distance(string distanceUnit)
@@ -32,35 +30,39 @@ public Distance(string distanceUnit)
 			var precision = double.Parse(match.Groups["precision"].Value, NumberStyles.Any, CultureInfo.InvariantCulture);
 			var unit = match.Groups["unit"].Value;
 
-			this.Precision = precision;
+			Precision = precision;
 
 			if (string.IsNullOrEmpty(unit))
 			{
-				this.Unit = DistanceUnit.Meters;
+				Unit = DistanceUnit.Meters;
 				return;
 			}
 
 			var unitMeasure = unit.ToEnum<DistanceUnit>();
-			if (unitMeasure == null)
-			{
-				throw new InvalidCastException($"cannot parse {typeof(DistanceUnit).Name} from string '{unit}'");
-			}
+			if (unitMeasure == null) throw new InvalidCastException($"cannot parse {typeof(DistanceUnit).Name} from string '{unit}'");
 
-			this.Unit = unitMeasure.Value;
+			Unit = unitMeasure.Value;
 		}
 
+		public double Precision { get; private set; }
+		public DistanceUnit Unit { get; private set; }
+
 		public static Distance Inches(double inches) => new Distance(inches, DistanceUnit.Inch);
+
 		public static Distance Yards(double yards) => new Distance(yards, DistanceUnit.Yards);
+
 		public static Distance Miles(double miles) => new Distance(miles, DistanceUnit.Miles);
+
 		public static Distance Kilometers(double kilometers) => new Distance(kilometers, DistanceUnit.Kilometers);
+
 		public static Distance Meters(double meters) => new Distance(meters, DistanceUnit.Meters);
+
 		public static Distance Centimeters(double centimeters) => new Distance(centimeters, DistanceUnit.Centimeters);
+
 		public static Distance Millimeters(double millimeter) => new Distance(millimeter, DistanceUnit.Millimeters);
+
 		public static Distance NauticalMiles(double nauticalMiles) => new Distance(nauticalMiles, DistanceUnit.NauticalMiles);
-		
-		public static implicit operator Distance(string distanceUnit)
-		{
-			return new Distance(distanceUnit);
-		}
+
+		public static implicit operator Distance(string distanceUnit) => new Distance(distanceUnit);
 	}
 }
diff --git a/src/Nest/CommonOptions/Geo/DistanceJsonConverter.cs b/src/Nest/CommonOptions/Geo/DistanceJsonConverter.cs
index 9aa43bb19e3..21b810fe131 100644
--- a/src/Nest/CommonOptions/Geo/DistanceJsonConverter.cs
+++ b/src/Nest/CommonOptions/Geo/DistanceJsonConverter.cs
@@ -29,15 +29,13 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.String) return null;
+
 			var v = reader.Value as string;
 			if (v == null) return null;
 
 			return new Distance(v);
 		}
 
-		public override bool CanConvert(Type objectType)
-		{
-			return true;
-		}
+		public override bool CanConvert(Type objectType) => true;
 	}
 }
diff --git a/src/Nest/CommonOptions/Geo/DistanceUnit.cs b/src/Nest/CommonOptions/Geo/DistanceUnit.cs
index 2a1113eaeb4..5d3d90147ed 100644
--- a/src/Nest/CommonOptions/Geo/DistanceUnit.cs
+++ b/src/Nest/CommonOptions/Geo/DistanceUnit.cs
@@ -9,21 +9,29 @@ public enum DistanceUnit
 	{
 		[EnumMember(Value = "in")]
 		Inch,
+
 		[EnumMember(Value = "ft")]
 		Feet,
+
 		[EnumMember(Value = "yd")]
 		Yards,
+
 		[EnumMember(Value = "mi")]
 		Miles,
+
 		[EnumMember(Value = "nmi")]
 		[AlternativeEnumMember("NM")]
 		NauticalMiles,
+
 		[EnumMember(Value = "km")]
 		Kilometers,
+
 		[EnumMember(Value = "m")]
 		Meters,
+
 		[EnumMember(Value = "cm")]
 		Centimeters,
+
 		[EnumMember(Value = "mm")]
 		Millimeters
 	}
diff --git a/src/Nest/CommonOptions/Geo/GeoDistanceType.cs b/src/Nest/CommonOptions/Geo/GeoDistanceType.cs
index fdd56c2ef57..0d31bb76ee8 100644
--- a/src/Nest/CommonOptions/Geo/GeoDistanceType.cs
+++ b/src/Nest/CommonOptions/Geo/GeoDistanceType.cs
@@ -9,6 +9,7 @@ public enum GeoDistanceType
 	{
 		[EnumMember(Value = "arc")]
 		Arc,
+
 		[EnumMember(Value = "plane")]
 		Plane
 	}
diff --git a/src/Nest/CommonOptions/Geo/GeoShapeRelation.cs b/src/Nest/CommonOptions/Geo/GeoShapeRelation.cs
index 7a6be8b61de..d109d943898 100644
--- a/src/Nest/CommonOptions/Geo/GeoShapeRelation.cs
+++ b/src/Nest/CommonOptions/Geo/GeoShapeRelation.cs
@@ -9,10 +9,13 @@ public enum GeoShapeRelation
 	{
 		[EnumMember(Value = "intersects")]
 		Intersects,
+
 		[EnumMember(Value = "disjoint")]
 		Disjoint,
+
 		[EnumMember(Value = "within")]
 		Within,
+
 		[EnumMember(Value = "contains")]
 		Contains
 	}
diff --git a/src/Nest/CommonOptions/Hit/ShardStatistics.cs b/src/Nest/CommonOptions/Hit/ShardStatistics.cs
index 3d5d034ffb1..43a14b165ac 100644
--- a/src/Nest/CommonOptions/Hit/ShardStatistics.cs
+++ b/src/Nest/CommonOptions/Hit/ShardStatistics.cs
@@ -7,17 +7,16 @@ namespace Nest
 	[JsonObject]
 	public class ShardStatistics
 	{
-		[JsonProperty]
-		public int Total { get; internal set; }
-
-		[JsonProperty]
-		public int Successful { get; internal set; }
-
 		[JsonProperty]
 		public int Failed { get; internal set; }
 
 		[JsonProperty("failures")]
 		public IReadOnlyCollection<ShardFailure> Failures { get; internal set; } = EmptyReadOnly<ShardFailure>.Collection;
 
+		[JsonProperty]
+		public int Successful { get; internal set; }
+
+		[JsonProperty]
+		public int Total { get; internal set; }
 	}
 }
diff --git a/src/Nest/CommonOptions/MinimumShouldMatch/MinimumShouldMatch.cs b/src/Nest/CommonOptions/MinimumShouldMatch/MinimumShouldMatch.cs
index 88ff4f01fe6..5523a9af4cb 100644
--- a/src/Nest/CommonOptions/MinimumShouldMatch/MinimumShouldMatch.cs
+++ b/src/Nest/CommonOptions/MinimumShouldMatch/MinimumShouldMatch.cs
@@ -11,31 +11,32 @@ public MinimumShouldMatch(int count) : base(count) { }
 		public MinimumShouldMatch(string percentage) : base(percentage) { }
 
 		public static MinimumShouldMatch Fixed(int count) => count;
+
 		public static MinimumShouldMatch Percentage(double percentage) => $"{percentage}%";
 
 		public static implicit operator MinimumShouldMatch(string first) => new MinimumShouldMatch(first);
+
 		public static implicit operator MinimumShouldMatch(int second) => new MinimumShouldMatch(second);
+
 		public static implicit operator MinimumShouldMatch(double second) => Percentage(second);
 	}
 
-	internal class MinimumShouldMatchJsonConverter :JsonConverter
+	internal class MinimumShouldMatchJsonConverter : JsonConverter
 	{
+		public static UnionJsonConverter<int?, string> Unionconverter = new UnionJsonConverter<int?, string>();
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
 
-		public static UnionJsonConverter<int?, string> Unionconverter = new UnionJsonConverter<int?, string>();
-
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var union = Unionconverter.ReadJson(reader, objectType, existingValue, serializer) as Union<int?, string>;
 			if (union.Item1.HasValue) return new MinimumShouldMatch(union.Item1.Value);
+
 			return new MinimumShouldMatch(union.Item2);
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
 			Unionconverter.WriteJson(writer, value, serializer);
-		}
 
 		public override bool CanConvert(Type objectType) => true;
 	}
diff --git a/src/Nest/CommonOptions/Range/AggregationRange.cs b/src/Nest/CommonOptions/Range/AggregationRange.cs
index e0a8adb08a2..ade6e0e16f3 100644
--- a/src/Nest/CommonOptions/Range/AggregationRange.cs
+++ b/src/Nest/CommonOptions/Range/AggregationRange.cs
@@ -1,11 +1,10 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	/// <summary>
-	/// Range that defines a bucket for either the <see cref="RangeAggregation"/> or
-	/// <see cref="GeoDistanceAggregation"/>. If you are looking to store ranges as
+	/// Range that defines a bucket for either the <see cref="RangeAggregation" /> or
+	/// <see cref="GeoDistanceAggregation" />. If you are looking to store ranges as
 	/// part of your document please use explicit range class e.g DateRange, FloatRange etc
 	/// </summary>
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
@@ -15,22 +14,22 @@ public interface IAggregationRange
 		[JsonProperty("from")]
 		double? From { get; set; }
 
-		[JsonProperty("to")]
-		double? To { get; set; }
-
 		[JsonProperty("key")]
 		string Key { get; set; }
+
+		[JsonProperty("to")]
+		double? To { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class AggregationRange : IAggregationRange
 	{
 		public double? From { get; set; }
-		public double? To { get; set; }
 		public string Key { get; set; }
+		public double? To { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class AggregationRangeDescriptor : DescriptorBase<AggregationRangeDescriptor, IAggregationRange>, IAggregationRange
 	{
 		double? IAggregationRange.From { get; set; }
@@ -38,7 +37,9 @@ public class AggregationRangeDescriptor : DescriptorBase<AggregationRangeDescrip
 		double? IAggregationRange.To { get; set; }
 
 		public AggregationRangeDescriptor Key(string key) => Assign(a => a.Key = key);
+
 		public AggregationRangeDescriptor From(double? from) => Assign(a => a.From = from);
+
 		public AggregationRangeDescriptor To(double? to) => Assign(a => a.To = to);
 	}
 }
diff --git a/src/Nest/CommonOptions/Range/Ranges.cs b/src/Nest/CommonOptions/Range/Ranges.cs
index d44d4edfad2..e023bdb0589 100644
--- a/src/Nest/CommonOptions/Range/Ranges.cs
+++ b/src/Nest/CommonOptions/Range/Ranges.cs
@@ -5,86 +5,91 @@ namespace Nest
 {
 	public class DateRange
 	{
-		[JsonProperty("gte")]
-		public DateTimeOffset? GreaterThanOrEqualTo { get; set; }
-
-		[JsonProperty("lte")]
-		public DateTimeOffset? LessThanOrEqualTo { get; set; }
-
 		[JsonProperty("gt")]
 		public DateTimeOffset? GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		public DateTimeOffset? GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		public DateTimeOffset? LessThan { get; set; }
-	}
-	public class DoubleRange
-	{
-		[JsonProperty("gte")]
-		public double? GreaterThanOrEqualTo { get; set; }
 
 		[JsonProperty("lte")]
-		public double? LessThanOrEqualTo { get; set; }
+		public DateTimeOffset? LessThanOrEqualTo { get; set; }
+	}
 
+	public class DoubleRange
+	{
 		[JsonProperty("gt")]
 		public double? GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		public double? GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		public double? LessThan { get; set; }
-	}
-	public class FloatRange
-	{
-		[JsonProperty("gte")]
-		public float? GreaterThanOrEqualTo { get; set; }
 
 		[JsonProperty("lte")]
-		public float? LessThanOrEqualTo { get; set; }
+		public double? LessThanOrEqualTo { get; set; }
+	}
 
+	public class FloatRange
+	{
 		[JsonProperty("gt")]
 		public float? GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		public float? GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		public float? LessThan { get; set; }
-	}
-	public class IntegerRange
-	{
-		[JsonProperty("gte")]
-		public int? GreaterThanOrEqualTo { get; set; }
 
 		[JsonProperty("lte")]
-		public int? LessThanOrEqualTo { get; set; }
+		public float? LessThanOrEqualTo { get; set; }
+	}
 
+	public class IntegerRange
+	{
 		[JsonProperty("gt")]
 		public int? GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		public int? GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		public int? LessThan { get; set; }
-	}
-	public class LongRange
-	{
-		[JsonProperty("gte")]
-		public long? GreaterThanOrEqualTo { get; set; }
 
 		[JsonProperty("lte")]
-		public long? LessThanOrEqualTo { get; set; }
+		public int? LessThanOrEqualTo { get; set; }
+	}
 
+	public class LongRange
+	{
 		[JsonProperty("gt")]
 		public long? GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		public long? GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		public long? LessThan { get; set; }
-	}
-	public class IpAddressRange
-	{
-		[JsonProperty("gte")]
-		public string GreaterThanOrEqualTo { get; set; }
 
 		[JsonProperty("lte")]
-		public string LessThanOrEqualTo { get; set; }
+		public long? LessThanOrEqualTo { get; set; }
+	}
 
+	public class IpAddressRange
+	{
 		[JsonProperty("gt")]
 		public string GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		public string GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		public string LessThan { get; set; }
+
+		[JsonProperty("lte")]
+		public string LessThanOrEqualTo { get; set; }
 	}
 }
diff --git a/src/Nest/CommonOptions/Scripting/IndexedScript.cs b/src/Nest/CommonOptions/Scripting/IndexedScript.cs
index d43d5e9b78d..0376790e25d 100644
--- a/src/Nest/CommonOptions/Scripting/IndexedScript.cs
+++ b/src/Nest/CommonOptions/Scripting/IndexedScript.cs
@@ -11,10 +11,7 @@ public interface IIndexedScript : IScript
 
 	public class IndexedScript : ScriptBase, IIndexedScript
 	{
-		public IndexedScript(string id)
-		{
-			this.Id = id;
-		}
+		public IndexedScript(string id) => Id = id;
 
 		public string Id { get; set; }
 	}
@@ -22,14 +19,11 @@ public IndexedScript(string id)
 	public class IndexedScriptDescriptor
 		: ScriptDescriptorBase<IndexedScriptDescriptor, IIndexedScript>, IIndexedScript
 	{
-		string IIndexedScript.Id { get; set; }
+		public IndexedScriptDescriptor() { }
 
-		public IndexedScriptDescriptor() {}
+		public IndexedScriptDescriptor(string id) => Self.Id = id;
 
-		public IndexedScriptDescriptor(string id)
-		{
-			Self.Id = id;
-		}
+		string IIndexedScript.Id { get; set; }
 
 		public IndexedScriptDescriptor Id(string id) => Assign(a => a.Id = id);
 	}
diff --git a/src/Nest/CommonOptions/Scripting/InlineScript.cs b/src/Nest/CommonOptions/Scripting/InlineScript.cs
index 663b2621e70..c37fdbe8262 100644
--- a/src/Nest/CommonOptions/Scripting/InlineScript.cs
+++ b/src/Nest/CommonOptions/Scripting/InlineScript.cs
@@ -6,20 +6,25 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IInlineScript : IScript
 	{
-		[JsonProperty("source")]
-		string Source { get; set; }
-
 		[Obsolete("Use Source. Inline is deprecated and scheduled to be removed in Elasticsearch 7.0")]
 		[JsonIgnore]
 		string Inline { get; set; }
+
+		[JsonProperty("source")]
+		string Source { get; set; }
 	}
 
 	public class InlineScript : ScriptBase, IInlineScript
 	{
-		public InlineScript(string script) => this.Source = script;
+		public InlineScript(string script) => Source = script;
+
+		public string Inline
+		{
+			get => Source;
+			set => Source = value;
+		}
 
 		public string Source { get; set; }
-		public string Inline { get => this.Source; set => this.Source = value; }
 
 		public static implicit operator InlineScript(string script) => new InlineScript(script);
 	}
@@ -27,13 +32,18 @@ public class InlineScript : ScriptBase, IInlineScript
 	public class InlineScriptDescriptor
 		: ScriptDescriptorBase<InlineScriptDescriptor, IInlineScript>, IInlineScript
 	{
-		string IInlineScript.Inline { get => Self.Source; set => Self.Source = value; }
-		string IInlineScript.Source { get; set; }
-
 		public InlineScriptDescriptor() { }
 
 		public InlineScriptDescriptor(string script) => Self.Source = script;
 
+		string IInlineScript.Inline
+		{
+			get => Self.Source;
+			set => Self.Source = value;
+		}
+
+		string IInlineScript.Source { get; set; }
+
 		[Obsolete("Use Source(). Inline() is deprecated and scheduled to be removed in Elasticsearch 7.0")]
 		public InlineScriptDescriptor Inline(string script) => Assign(a => a.Source = script);
 
diff --git a/src/Nest/CommonOptions/Scripting/ScriptBase.cs b/src/Nest/CommonOptions/Scripting/ScriptBase.cs
index d313511b229..afb5c8403e5 100644
--- a/src/Nest/CommonOptions/Scripting/ScriptBase.cs
+++ b/src/Nest/CommonOptions/Scripting/ScriptBase.cs
@@ -10,33 +10,31 @@ namespace Nest
 	public interface IScript
 	{
 		/// <summary>
-		/// Scripts are compiled and cached for faster execution.
-		/// If the same script can be used, just with different parameters provided,
-		/// it is preferable to use the ability to pass parameters to the script itself.
+		/// Language of script.
+		/// </summary>
+		/// <param name="lang">language</param>
+		/// <returns>this</returns>
+		[JsonProperty("lang")]
+		string Lang { get; set; }
+
+		/// <summary>
+		///  Scripts are compiled and cached for faster execution.
+		///  If the same script can be used, just with different parameters provided,
+		///  it is preferable to use the ability to pass parameters to the script itself.
 		/// </summary>
 		/// <example>
-		///	    script: "doc['num1'].value &gt; param1"
-		///		param: "param1" = 5
+		/// 	    script: "doc['num1'].value &gt; param1"
+		/// 		param: "param1" = 5
 		/// </example>
 		/// <param name="paramsDictionary">param</param>
 		/// <returns>this</returns>
 		[JsonProperty("params")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysPreservingNullJsonConverter<string, object>))]
 		Dictionary<string, object> Params { get; set; }
-
-		/// <summary>
-		/// Language of script.
-		/// </summary>
-		/// <param name="lang">language</param>
-		/// <returns>this</returns>
-		[JsonProperty("lang")]
-		string Lang { get; set; }
 	}
 
 	public abstract class ScriptBase : IScript
 	{
-		public Dictionary<string, object> Params { get; set; }
-
 		/// <summary>
 		/// Language of script.
 		/// </summary>
@@ -44,8 +42,10 @@ public abstract class ScriptBase : IScript
 		/// <returns>this</returns>
 		public string Lang { get; set; }
 
+		public Dictionary<string, object> Params { get; set; }
+
 		/// <summary>
-		/// Implicit conversion from <see cref="string"/> to <see cref="InlineScript"/>
+		/// Implicit conversion from <see cref="string" /> to <see cref="InlineScript" />
 		/// </summary>
 		public static implicit operator ScriptBase(string script) => new InlineScript(script);
 	}
@@ -54,30 +54,30 @@ public abstract class ScriptDescriptorBase<TDescriptor, TInterface> : Descriptor
 		where TDescriptor : ScriptDescriptorBase<TDescriptor, TInterface>, TInterface, IScript
 		where TInterface : class, IScript
 	{
-		Dictionary<string, object> IScript.Params { get; set; }
 		string IScript.Lang { get; set; }
+		Dictionary<string, object> IScript.Params { get; set; }
 
 		/// <summary>
-		/// Scripts are compiled and cached for faster execution.
-		/// If the same script can be used, just with different parameters provided,
-		/// it is preferable to use the ability to pass parameters to the script itself.
+		///  Scripts are compiled and cached for faster execution.
+		///  If the same script can be used, just with different parameters provided,
+		///  it is preferable to use the ability to pass parameters to the script itself.
 		/// </summary>
 		/// <example>
-		///	    script: "doc['num1'].value &gt; param1"
-		///		param: "param1" = 5
+		/// 	    script: "doc['num1'].value &gt; param1"
+		/// 		param: "param1" = 5
 		/// </example>
 		/// <param name="paramsDictionary">param</param>
 		/// <returns>this</returns>
 		public TDescriptor Params(Dictionary<string, object> scriptParams) => Assign(a => a.Params = scriptParams);
 
 		/// <summary>
-		/// Scripts are compiled and cached for faster execution.
-		/// If the same script can be used, just with different parameters provided,
-		/// it is preferable to use the ability to pass parameters to the script itself.
+		///  Scripts are compiled and cached for faster execution.
+		///  If the same script can be used, just with different parameters provided,
+		///  it is preferable to use the ability to pass parameters to the script itself.
 		/// </summary>
 		/// <example>
-		///	    script: "doc['num1'].value &gt; param1"
-		///		param: "param1" = 5
+		/// 	    script: "doc['num1'].value &gt; param1"
+		/// 		param: "param1" = 5
 		/// </example>
 		/// <param name="paramsDictionary">param</param>
 		/// <returns>this</returns>
diff --git a/src/Nest/CommonOptions/Scripting/ScriptFields.cs b/src/Nest/CommonOptions/Scripting/ScriptFields.cs
index 0b5a042eedf..55f16872c9c 100644
--- a/src/Nest/CommonOptions/Scripting/ScriptFields.cs
+++ b/src/Nest/CommonOptions/Scripting/ScriptFields.cs
@@ -32,14 +32,16 @@ public interface IScriptFields : IIsADictionary<string, IScriptField> { }
 
 	public class ScriptFields : IsADictionaryBase<string, IScriptField>, IScriptFields
 	{
-		public ScriptFields() {}
+		public ScriptFields() { }
+
 		public ScriptFields(IDictionary<string, IScriptField> container) : base(container) { }
+
 		public ScriptFields(Dictionary<string, IScriptField> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{}
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
+
+		public void Add(string name, IScriptField script) => BackingDictionary.Add(name, script);
 
-		public void Add(string name, IScriptField script) => this.BackingDictionary.Add(name, script);
-		public void Add(string name, IScript script) => this.BackingDictionary.Add(name, new ScriptField { Script = script });
+		public void Add(string name, IScript script) => BackingDictionary.Add(name, new ScriptField { Script = script });
 	}
 
 	public class ScriptFieldsDescriptor : IsADictionaryDescriptorBase<ScriptFieldsDescriptor, IScriptFields, string, IScriptField>
diff --git a/src/Nest/CommonOptions/Scripting/ScriptJsonConverter.cs b/src/Nest/CommonOptions/Scripting/ScriptJsonConverter.cs
index 5dc1cae788b..227ca471cf1 100644
--- a/src/Nest/CommonOptions/Scripting/ScriptJsonConverter.cs
+++ b/src/Nest/CommonOptions/Scripting/ScriptJsonConverter.cs
@@ -8,10 +8,11 @@ namespace Nest
 {
 	internal class ScriptJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => typeof(IScript).IsAssignableFrom(objectType);
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
 
+		public override bool CanConvert(Type objectType) => typeof(IScript).IsAssignableFrom(objectType);
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var o = JObject.Load(reader);
diff --git a/src/Nest/CommonOptions/Sorting/SortJsonConverter.cs b/src/Nest/CommonOptions/Sorting/SortJsonConverter.cs
index f1b8df00523..c964b28ae4b 100644
--- a/src/Nest/CommonOptions/Sorting/SortJsonConverter.cs
+++ b/src/Nest/CommonOptions/Sorting/SortJsonConverter.cs
@@ -10,6 +10,7 @@ internal class SortJsonConverter : ReserializeJsonConverter<SortField, ISort>
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => typeof(ISort).IsAssignableFrom(objectType);
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -28,7 +29,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 					var s = FromJson.ReadAs<GeoDistanceSort>(r, serializer);
 					s.Field = geoLocationProp.Name;
 					using (var rr = geoLocationProp.Value.CreateReader())
-						s.Points =FromJson.ReadAs<List<GeoLocation>>(rr, serializer);
+						s.Points = FromJson.ReadAs<List<GeoLocation>>(rr, serializer);
 					sort = s;
 				}
 			}
@@ -61,12 +62,12 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			{
 				case "_script":
 					writer.WritePropertyName("_script");
-					base.Reserialize(writer, s, serializer);
+					Reserialize(writer, s, serializer);
 					break;
 				case "_geo_distance":
 					var geo = s as IGeoDistanceSort;
 					writer.WritePropertyName(geo.SortKey.Name);
-					base.Reserialize(writer, s, serializer, w =>
+					Reserialize(writer, s, serializer, w =>
 					{
 						writer.WritePropertyName(settings.Inferrer.Field(geo.Field));
 						serializer.Serialize(writer, geo.Points);
@@ -74,7 +75,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 					break;
 				default:
 					writer.WritePropertyName(settings.Inferrer.Field(s.SortKey));
-					base.Reserialize(writer, s, serializer);
+					Reserialize(writer, s, serializer);
 					break;
 			}
 			writer.WriteEndObject();
diff --git a/src/Nest/CommonOptions/Stats/FieldDataStats.cs b/src/Nest/CommonOptions/Stats/FieldDataStats.cs
index 1ff2306ab1d..1bcb570c7b4 100644
--- a/src/Nest/CommonOptions/Stats/FieldDataStats.cs
+++ b/src/Nest/CommonOptions/Stats/FieldDataStats.cs
@@ -10,8 +10,8 @@ public class FielddataStats
 
 		[JsonProperty("memory_size")]
 		public string MemorySize { get; set; }
+
 		[JsonProperty("memory_size_in_bytes")]
 		public long MemorySizeInBytes { get; set; }
-
 	}
 }
diff --git a/src/Nest/CommonOptions/Stats/FlushStats.cs b/src/Nest/CommonOptions/Stats/FlushStats.cs
index f2527ff5d15..5e5f0b62db4 100644
--- a/src/Nest/CommonOptions/Stats/FlushStats.cs
+++ b/src/Nest/CommonOptions/Stats/FlushStats.cs
@@ -5,16 +5,15 @@ namespace Nest
 	[JsonObject]
 	public class FlushStats
 	{
-
-		[JsonProperty("total")]
-		public long Total { get; set; }
-
 		/// <summary>
 		/// The number of flushes that were periodically triggered when translog exceeded the flush threshold.
 		/// </summary>
 		[JsonProperty("periodic")]
 		public long Periodic { get; set; }
 
+		[JsonProperty("total")]
+		public long Total { get; set; }
+
 		/// <summary>
 		/// The total time merges have been executed.
 		/// </summary>
@@ -26,6 +25,5 @@ public class FlushStats
 		/// </summary>
 		[JsonProperty("total_time_in_millis")]
 		public long TotalTimeInMilliseconds { get; set; }
-
 	}
 }
diff --git a/src/Nest/CommonOptions/Stats/GetStats.cs b/src/Nest/CommonOptions/Stats/GetStats.cs
index 4985a9f4036..19ecbcd3851 100644
--- a/src/Nest/CommonOptions/Stats/GetStats.cs
+++ b/src/Nest/CommonOptions/Stats/GetStats.cs
@@ -10,6 +10,7 @@ public class GetStats
 
 		[JsonProperty("exists_time")]
 		public string ExistsTime { get; set; }
+
 		[JsonProperty("exists_time_in_millis")]
 		public long ExistsTimeInMilliseconds { get; set; }
 
@@ -18,6 +19,7 @@ public class GetStats
 
 		[JsonProperty("missing_time")]
 		public string MissingTime { get; set; }
+
 		[JsonProperty("missing_time_in_millis")]
 		public long MissingTimeInMilliseconds { get; set; }
 
@@ -26,11 +28,11 @@ public class GetStats
 
 		[JsonProperty("time")]
 		public string Time { get; set; }
+
 		[JsonProperty("time_in_millis")]
 		public long TimeInMilliseconds { get; set; }
 
 		[JsonProperty("total")]
 		public long Total { get; set; }
-
 	}
 }
diff --git a/src/Nest/CommonOptions/Stats/IndexingStats.cs b/src/Nest/CommonOptions/Stats/IndexingStats.cs
index 9d6d8a22750..98134c7b6af 100644
--- a/src/Nest/CommonOptions/Stats/IndexingStats.cs
+++ b/src/Nest/CommonOptions/Stats/IndexingStats.cs
@@ -6,6 +6,9 @@ namespace Nest
 	[JsonObject]
 	public class IndexingStats
 	{
+		[JsonProperty("index_current")]
+		public long Current { get; set; }
+
 		[JsonProperty("delete_current")]
 		public long DeleteCurrent { get; set; }
 
@@ -18,18 +21,6 @@ public class IndexingStats
 		[JsonProperty("delete_total")]
 		public long DeleteTotal { get; set; }
 
-		[JsonProperty("index_current")]
-		public long Current { get; set; }
-
-		[JsonProperty("index_time")]
-		public string Time { get; set; }
-
-		[JsonProperty("index_time_in_millis")]
-		public long TimeInMilliseconds { get; set; }
-
-		[JsonProperty("index_total")]
-		public long Total { get; set; }
-
 		[JsonProperty("is_throttled")]
 		public bool IsThrottled { get; set; }
 
@@ -42,6 +33,15 @@ public class IndexingStats
 		[JsonProperty("throttle_time_in_millis")]
 		public long ThrottleTimeInMilliseconds { get; set; }
 
+		[JsonProperty("index_time")]
+		public string Time { get; set; }
+
+		[JsonProperty("index_time_in_millis")]
+		public long TimeInMilliseconds { get; set; }
+
+		[JsonProperty("index_total")]
+		public long Total { get; set; }
+
 		[JsonProperty("types")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, IndexingStats>))]
 		public IReadOnlyDictionary<string, IndexingStats> Types { get; set; }
diff --git a/src/Nest/CommonOptions/Stats/MergesStats.cs b/src/Nest/CommonOptions/Stats/MergesStats.cs
index 3cd6d182bc8..1e37d52fe23 100644
--- a/src/Nest/CommonOptions/Stats/MergesStats.cs
+++ b/src/Nest/CommonOptions/Stats/MergesStats.cs
@@ -5,7 +5,6 @@ namespace Nest
 	[JsonObject]
 	public class MergesStats
 	{
-
 		[JsonProperty("current")]
 		public long Current { get; set; }
 
@@ -14,6 +13,7 @@ public class MergesStats
 
 		[JsonProperty("current_size")]
 		public string CurrentSize { get; set; }
+
 		[JsonProperty("current_size_in_bytes")]
 		public long CurrentSizeInBytes { get; set; }
 
@@ -22,6 +22,7 @@ public class MergesStats
 
 		[JsonProperty("total_auto_throttle")]
 		public string TotalAutoThrottle { get; set; }
+
 		[JsonProperty("total_auto_throttle_in_bytes")]
 		public long TotalAutoThrottleInBytes { get; set; }
 
@@ -30,21 +31,25 @@ public class MergesStats
 
 		[JsonProperty("total_size")]
 		public string TotalSize { get; set; }
+
 		[JsonProperty("total_size_in_bytes")]
 		public string TotalSizeInBytes { get; set; }
 
 		[JsonProperty("total_stopped_time")]
 		public string TotalStoppedTime { get; set; }
+
 		[JsonProperty("total__stopped_time_in_millis")]
 		public long TotalStoppedTimeInMilliseconds { get; set; }
 
 		[JsonProperty("total_throttled_time")]
 		public string TotalThrottledTime { get; set; }
+
 		[JsonProperty("total_throttled_time_in_millis")]
 		public long TotalThrottledTimeInMilliseconds { get; set; }
 
 		[JsonProperty("total_time")]
 		public string TotalTime { get; set; }
+
 		[JsonProperty("total_time_in_millis")]
 		public long TotalTimeInMilliseconds { get; set; }
 	}
diff --git a/src/Nest/CommonOptions/Stats/PluginStats.cs b/src/Nest/CommonOptions/Stats/PluginStats.cs
index 0bbd718d1b9..388a47890d1 100644
--- a/src/Nest/CommonOptions/Stats/PluginStats.cs
+++ b/src/Nest/CommonOptions/Stats/PluginStats.cs
@@ -5,25 +5,25 @@ namespace Nest
 	[JsonObject]
 	public class PluginStats
 	{
-		[JsonProperty("name")]
-		public string Name { get; set; }
-
-		[JsonProperty("version")]
-		public string Version { get; set; }
+		[JsonProperty("classname")]
+		public string ClassName { get; set; }
 
 		[JsonProperty("description")]
 		public string Description { get; set; }
 
-		[JsonProperty("classname")]
-		public string ClassName { get; set; }
+		[JsonProperty("isolated")]
+		public bool Isolated { get; set; }
 
 		[JsonProperty("jvm")]
 		public bool Jvm { get; set; }
 
-		[JsonProperty("isolated")]
-		public bool Isolated { get; set; }
+		[JsonProperty("name")]
+		public string Name { get; set; }
 
 		[JsonProperty("site")]
 		public bool Site { get; set; }
+
+		[JsonProperty("version")]
+		public string Version { get; set; }
 	}
 }
diff --git a/src/Nest/CommonOptions/Stats/QueryCacheStats.cs b/src/Nest/CommonOptions/Stats/QueryCacheStats.cs
index 2c8037ed1d1..90e83128367 100644
--- a/src/Nest/CommonOptions/Stats/QueryCacheStats.cs
+++ b/src/Nest/CommonOptions/Stats/QueryCacheStats.cs
@@ -5,28 +5,28 @@ namespace Nest
 	[JsonObject]
 	public class QueryCacheStats
 	{
-		[JsonProperty("memory_size")]
-		public string MemorySize { get; set; }
-		[JsonProperty("memory_size_in_bytes")]
-		public long MemorySizeInBytes { get; set; }
+		[JsonProperty("cache_count")]
+		public long CacheCount { get; set; }
 
-		[JsonProperty("total_count")]
-		public long TotalCount { get; set; }
+		[JsonProperty("cache_size")]
+		public long CacheSize { get; set; }
+
+		[JsonProperty("evictions")]
+		public long Evictions { get; set; }
 
 		[JsonProperty("hit_count")]
 		public long HitCount { get; set; }
 
-		[JsonProperty("miss_count")]
-		public long MissCount { get; set; }
-
-		[JsonProperty("cache_size")]
-		public long CacheSize { get; set; }
+		[JsonProperty("memory_size")]
+		public string MemorySize { get; set; }
 
-		[JsonProperty("cache_count")]
-		public long CacheCount { get; set; }
+		[JsonProperty("memory_size_in_bytes")]
+		public long MemorySizeInBytes { get; set; }
 
-		[JsonProperty("evictions")]
-		public long Evictions { get; set; }
+		[JsonProperty("miss_count")]
+		public long MissCount { get; set; }
 
+		[JsonProperty("total_count")]
+		public long TotalCount { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonOptions/Stats/RecoveryStats.cs b/src/Nest/CommonOptions/Stats/RecoveryStats.cs
index db2ea812c46..62d82deedcc 100644
--- a/src/Nest/CommonOptions/Stats/RecoveryStats.cs
+++ b/src/Nest/CommonOptions/Stats/RecoveryStats.cs
@@ -16,6 +16,5 @@ public class RecoveryStats
 
 		[JsonProperty("throttle_time_in_millis")]
 		public long ThrottleTimeInMilliseconds { get; set; }
-
 	}
 }
diff --git a/src/Nest/CommonOptions/Stats/RefreshStats.cs b/src/Nest/CommonOptions/Stats/RefreshStats.cs
index 148a85982c6..f59a92d85d6 100644
--- a/src/Nest/CommonOptions/Stats/RefreshStats.cs
+++ b/src/Nest/CommonOptions/Stats/RefreshStats.cs
@@ -5,14 +5,13 @@ namespace Nest
 	[JsonObject]
 	public class RefreshStats
 	{
-
 		[JsonProperty("total")]
 		public long Total { get; set; }
 
 		[JsonProperty("total_time")]
 		public string TotalTime { get; set; }
+
 		[JsonProperty("total_time_in_millis")]
 		public long TotalTimeInMilliseconds { get; set; }
-
 	}
 }
diff --git a/src/Nest/CommonOptions/Stats/RequestCacheStats.cs b/src/Nest/CommonOptions/Stats/RequestCacheStats.cs
index 3e5f3a8907f..fcc606c6529 100644
--- a/src/Nest/CommonOptions/Stats/RequestCacheStats.cs
+++ b/src/Nest/CommonOptions/Stats/RequestCacheStats.cs
@@ -12,13 +12,12 @@ public class RequestCacheStats
 		public long HitCount { get; set; }
 
 		[JsonProperty("memory_size")]
-		public string MemorySize{ get; set; }
+		public string MemorySize { get; set; }
 
 		[JsonProperty("memory_size_in_bytes")]
 		public long MemorySizeInBytes { get; set; }
 
 		[JsonProperty("miss_count")]
 		public long MissCount { get; set; }
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonOptions/Stats/SearchStats.cs b/src/Nest/CommonOptions/Stats/SearchStats.cs
index 24dce92911b..92c8270ada0 100644
--- a/src/Nest/CommonOptions/Stats/SearchStats.cs
+++ b/src/Nest/CommonOptions/Stats/SearchStats.cs
@@ -5,9 +5,6 @@ namespace Nest
 	[JsonObject]
 	public class SearchStats
 	{
-		[JsonProperty("open_contexts")]
-		public long OpenContexts { get; set; }
-
 		[JsonProperty("fetch_current")]
 		public long FetchCurrent { get; set; }
 
@@ -17,6 +14,9 @@ public class SearchStats
 		[JsonProperty("fetch_total")]
 		public long FetchTotal { get; set; }
 
+		[JsonProperty("open_contexts")]
+		public long OpenContexts { get; set; }
+
 		[JsonProperty("query_current")]
 		public long QueryCurrent { get; set; }
 
diff --git a/src/Nest/CommonOptions/Stats/SegmentsStats.cs b/src/Nest/CommonOptions/Stats/SegmentsStats.cs
index b269e55a98c..6c954401e62 100644
--- a/src/Nest/CommonOptions/Stats/SegmentsStats.cs
+++ b/src/Nest/CommonOptions/Stats/SegmentsStats.cs
@@ -10,58 +10,68 @@ public class SegmentsStats
 
 		[JsonProperty("doc_values_memory")]
 		public string DocValuesMemory { get; set; }
+
 		[JsonProperty("doc_values_memory_in_bytes")]
 		public long DocValuesMemoryInBytes { get; set; }
 
 		[JsonProperty("fixed_bit_set_memory")]
 		public string FixedBitSetMemory { get; set; }
+
 		[JsonProperty("fixed_bit_set_memory_in_bytes")]
 		public long FixedBitSetMemoryInBytes { get; set; }
 
 		[JsonProperty("index_writer_max_memory")]
 		public string IndexWriterMaxMemory { get; set; }
+
 		[JsonProperty("index_writer_max_memory_in_bytes")]
 		public long IndexWriterMaxMemoryInBytes { get; set; }
 
 		[JsonProperty("index_writer_memory")]
 		public string IndexWriterMemory { get; set; }
+
 		[JsonProperty("index_writer_memory_in_bytes")]
 		public long IndexWriterMemoryInBytes { get; set; }
 
 		[JsonProperty("memory")]
 		public string Memory { get; set; }
+
 		[JsonProperty("memory_in_bytes")]
 		public long MemoryInBytes { get; set; }
 
 		[JsonProperty("norms_memory")]
 		public string NormsMemory { get; set; }
+
 		[JsonProperty("norms_memory_in_bytes")]
 		public long NormsMemoryInBytes { get; set; }
 
 		[JsonProperty("points_memory")]
 		public string PointsMemory { get; set; }
+
 		[JsonProperty("points_memory_in_bytes")]
 		public long PointsMemoryInBytes { get; set; }
 
 		[JsonProperty("stored_fields_memory")]
 		public string StoredFieldsMemory { get; set; }
+
 		[JsonProperty("stored_fields_memory_in_bytes")]
 		public long StoredFieldsMemoryInBytes { get; set; }
 
-		[JsonProperty("term_vectors_memory")]
-		public string TermVectorsMemory { get; set; }
-		[JsonProperty("term_vectors_memory_in_bytes")]
-		public long TermVectorsMemoryInBytes { get; set; }
-
 		[JsonProperty("terms_memory")]
 		public string TermsMemory { get; set; }
+
 		[JsonProperty("terms_memory_in_bytes")]
 		public long TermsMemoryInBytes { get; set; }
 
+		[JsonProperty("term_vectors_memory")]
+		public string TermVectorsMemory { get; set; }
+
+		[JsonProperty("term_vectors_memory_in_bytes")]
+		public long TermVectorsMemoryInBytes { get; set; }
+
 		[JsonProperty("version_map_memory")]
 		public string VersionMapMemory { get; set; }
+
 		[JsonProperty("version_map_memory_in_bytes")]
 		public long VersionMapMemoryInBytes { get; set; }
-
 	}
 }
diff --git a/src/Nest/CommonOptions/Stats/StoreStats.cs b/src/Nest/CommonOptions/Stats/StoreStats.cs
index e64bf2fae02..3df530d5ff4 100644
--- a/src/Nest/CommonOptions/Stats/StoreStats.cs
+++ b/src/Nest/CommonOptions/Stats/StoreStats.cs
@@ -10,7 +10,5 @@ public class StoreStats
 
 		[JsonProperty("size_in_bytes")]
 		public double SizeInBytes { get; set; }
-
 	}
-
 }
diff --git a/src/Nest/CommonOptions/Stats/TranslogStats.cs b/src/Nest/CommonOptions/Stats/TranslogStats.cs
index ebb4ee93f37..f941ead2e91 100644
--- a/src/Nest/CommonOptions/Stats/TranslogStats.cs
+++ b/src/Nest/CommonOptions/Stats/TranslogStats.cs
@@ -5,28 +5,28 @@ namespace Nest
 	[JsonObject]
 	public class TranslogStats
 	{
-		[JsonProperty("operations")]
-		public long Operations  { get; set; }
+		/// <remarks>
+		/// Valid only for Elasticsearch 6.3.0+
+		/// </remarks>
+		[JsonProperty("earliest_last_modified_age")]
+		public long EarliestLastModifiedAge { get; set; }
 
-		[JsonProperty("uncommitted_operations")]
-		public int UncommittedOperations  { get; set; }
+		[JsonProperty("operations")]
+		public long Operations { get; set; }
 
 		[JsonProperty("size")]
 		public string Size { get; set; }
 
 		[JsonProperty("size_in_bytes")]
-		public long SizeInBytes  { get; set; }
+		public long SizeInBytes { get; set; }
+
+		[JsonProperty("uncommitted_operations")]
+		public int UncommittedOperations { get; set; }
 
 		[JsonProperty("uncommitted_size")]
 		public string UncommittedSize { get; set; }
 
 		[JsonProperty("uncommitted_size_in_bytes")]
-		public long UncommittedSizeInBytes  { get; set; }
-
-		/// <remarks>
-		/// Valid only for Elasticsearch 6.3.0+
-		/// </remarks>
-		[JsonProperty("earliest_last_modified_age")]
-		public long EarliestLastModifiedAge  { get; set; }
+		public long UncommittedSizeInBytes { get; set; }
 	}
 }
diff --git a/src/Nest/CommonOptions/Stats/WarmerStats.cs b/src/Nest/CommonOptions/Stats/WarmerStats.cs
index 561ff91630a..3defd5a8546 100644
--- a/src/Nest/CommonOptions/Stats/WarmerStats.cs
+++ b/src/Nest/CommonOptions/Stats/WarmerStats.cs
@@ -17,4 +17,4 @@ public class WarmerStats
 		[JsonProperty("total_time_in_millis")]
 		public long TotalTimeInMilliseconds { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/CommonOptions/TimeUnit/Time.cs b/src/Nest/CommonOptions/TimeUnit/Time.cs
index 2d80a88156b..afded2dcfb4 100644
--- a/src/Nest/CommonOptions/TimeUnit/Time.cs
+++ b/src/Nest/CommonOptions/TimeUnit/Time.cs
@@ -12,18 +12,16 @@ namespace Nest
 	[JsonConverter(typeof(TimeJsonConverter))]
 	public class Time : IComparable<Time>, IEquatable<Time>, IUrlParameter
 	{
+		private const double MicrosecondsInATick = 0.1; // 10 ticks = 1 microsecond
 		private const double MillisecondsInADay = MillisecondsInAnHour * 24;
-		private const double MillisecondsInAnHour = MillisecondsInAMinute * 60;
-		private const double MillisecondsInAMinute = MillisecondsInASecond * 60;
-		private const double MillisecondsInASecond = 1000;
-		private const double MillisecondsInAMillisecond = 1;
 		private const double MillisecondsInAMicrosecond = MillisecondsInAMillisecond / 1000;
+		private const double MillisecondsInAMillisecond = 1;
+		private const double MillisecondsInAMinute = MillisecondsInASecond * 60;
 		private const double MillisecondsInANanosecond = MillisecondsInAMicrosecond / 1000;
-		private const double MicrosecondsInATick = 0.1; // 10 ticks = 1 microsecond
+		private const double MillisecondsInAnHour = MillisecondsInAMinute * 60;
+		private const double MillisecondsInASecond = 1000;
 		private const double NanosecondsInATick = 100; // 1 tick = 100 nanoseconds
 
-		private static double FLOAT_TOLERANCE = 1e-7; // less than 1 nanosecond
-
 		private static readonly Regex ExpressionRegex =
 			new Regex(@"^
 				(?<factor>[+\-]? # open factor capture, allowing optional +- signs
@@ -35,26 +33,13 @@ public class Time : IComparable<Time>, IEquatable<Time>, IUrlParameter
 				$",
 				RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
-		private int? StaticTimeValue { get; }
-
-		public double? Factor { get; private set; }
-
-		public TimeUnit? Interval { get; private set; }
-
-		public double? Milliseconds { get; private set; }
-
-		public static implicit operator Time(TimeSpan span) => new Time(span);
-		public static implicit operator Time(double milliseconds) => new Time(milliseconds);
-		public static implicit operator Time(string expression) => new Time(expression);
-
-		public static Time MinusOne { get; } = new Time(-1, true);
-
-		public static Time Zero { get; } = new Time(0, true);
+		private static readonly double FLOAT_TOLERANCE = 1e-7; // less than 1 nanosecond
 
 		private Time(int specialFactor, bool specialValue)
 		{
 			if (!specialValue) throw new ArgumentException("this constructor is only for static TimeValues");
-			this.StaticTimeValue = specialFactor;
+
+			StaticTimeValue = specialFactor;
 		}
 
 		public Time(TimeSpan timeSpan)
@@ -62,67 +47,94 @@ public Time(TimeSpan timeSpan)
 
 		public Time(double milliseconds)
 		{
-			if (Math.Abs(milliseconds - (-1)) < FLOAT_TOLERANCE) StaticTimeValue = -1;
+			if (Math.Abs(milliseconds - -1) < FLOAT_TOLERANCE) StaticTimeValue = -1;
 			else if (Math.Abs(milliseconds) < FLOAT_TOLERANCE) StaticTimeValue = 0;
 			else Reduce(milliseconds);
 		}
 
 		public Time(double factor, TimeUnit interval)
 		{
-			this.Factor = factor;
-			this.Interval = interval;
-			this.Milliseconds = GetExactMilliseconds(this.Factor.Value, this.Interval.Value);
+			Factor = factor;
+			Interval = interval;
+			Milliseconds = GetExactMilliseconds(Factor.Value, Interval.Value);
 		}
 
 		public Time(string timeUnit)
 		{
 			if (timeUnit.IsNullOrEmpty()) throw new ArgumentException("Expression string is empty", nameof(timeUnit));
-			if (timeUnit == "-1" || timeUnit == "0") this.StaticTimeValue = int.Parse(timeUnit);
+
+			if (timeUnit == "-1" || timeUnit == "0") StaticTimeValue = int.Parse(timeUnit);
 			else ParseExpression(timeUnit);
 		}
 
+		public double? Factor { get; private set; }
+
+		public TimeUnit? Interval { get; private set; }
+
+		public double? Milliseconds { get; private set; }
+
+		public static Time MinusOne { get; } = new Time(-1, true);
+
+		public static Time Zero { get; } = new Time(0, true);
+
+		private int? StaticTimeValue { get; }
+
+		public static implicit operator Time(TimeSpan span) => new Time(span);
+
+		public static implicit operator Time(double milliseconds) => new Time(milliseconds);
+
+		public static implicit operator Time(string expression) => new Time(expression);
+
 		private void ParseExpression(string timeUnit)
 		{
 			var match = ExpressionRegex.Match(timeUnit);
 			if (!match.Success) throw new ArgumentException($"Expression '{timeUnit}' is invalid", nameof(timeUnit));
+
 			var factor = match.Groups["factor"].Value;
-			if (!double.TryParse(factor, NumberStyles.Any ,CultureInfo.InvariantCulture, out double f))
+			if (!double.TryParse(factor, NumberStyles.Any, CultureInfo.InvariantCulture, out var f))
 				throw new ArgumentException($"Expression '{timeUnit}' contains invalid factor: {factor}", nameof(timeUnit));
 
-			this.Factor = f;
+			Factor = f;
 			var interval = match.Groups["interval"].Success ? match.Groups["interval"].Value : null;
-			this.Interval = interval.ToEnum<TimeUnit>(StringComparison.OrdinalIgnoreCase);
-			if (!this.Interval.HasValue)
+			Interval = interval.ToEnum<TimeUnit>(StringComparison.OrdinalIgnoreCase);
+			if (!Interval.HasValue)
 				throw new ArgumentException($"Expression '{interval}' cannot be parsed to an interval", nameof(timeUnit));
 
-			this.Milliseconds = GetExactMilliseconds(this.Factor.Value, this.Interval.Value);
+			Milliseconds = GetExactMilliseconds(Factor.Value, Interval.Value);
 		}
 
 		public int CompareTo(Time other)
 		{
 			if (other == null) return 1;
-			if (this.StaticTimeValue.HasValue && !other.StaticTimeValue.HasValue) return -1;
-			if (!this.StaticTimeValue.HasValue && other.StaticTimeValue.HasValue) return 1;
-			if (this.StaticTimeValue.HasValue && other.StaticTimeValue.HasValue)
+			if (StaticTimeValue.HasValue && !other.StaticTimeValue.HasValue) return -1;
+			if (!StaticTimeValue.HasValue && other.StaticTimeValue.HasValue) return 1;
+
+			if (StaticTimeValue.HasValue && other.StaticTimeValue.HasValue)
 			{
 				// ReSharper disable PossibleInvalidOperationException
-				if (this.StaticTimeValue.Value == other.StaticTimeValue.Value) return 0;
-				if (this.StaticTimeValue.Value < other.StaticTimeValue.Value) return -1;
+				if (StaticTimeValue.Value == other.StaticTimeValue.Value) return 0;
+				if (StaticTimeValue.Value < other.StaticTimeValue.Value) return -1;
+
 				return 1;
+
 				// ReSharper enable PossibleInvalidOperationException
-			};
+			}
+			;
+
+			if (Math.Abs(Milliseconds.Value - other.Milliseconds.Value) < FLOAT_TOLERANCE) return 0;
+			if (Milliseconds < other.Milliseconds) return -1;
 
-			if (Math.Abs(this.Milliseconds.Value - other.Milliseconds.Value) < FLOAT_TOLERANCE) return 0;
-			if (this.Milliseconds < other.Milliseconds) return -1;
 			return 1;
 		}
 
 		private static bool IsIntegerGreaterThanZero(double d) => Math.Abs(d % 1) < double.Epsilon;
 
 		public static bool operator <(Time left, Time right) => left.CompareTo(right) < 0;
+
 		public static bool operator <=(Time left, Time right) => left.CompareTo(right) < 0 || left.Equals(right);
 
 		public static bool operator >(Time left, Time right) => left.CompareTo(right) > 0;
+
 		public static bool operator >=(Time left, Time right) => left.CompareTo(right) > 0 || left.Equals(right);
 
 		public static bool operator ==(Time left, Time right) =>
@@ -131,78 +143,81 @@ public int CompareTo(Time other)
 		public static bool operator !=(Time left, Time right) => !(left == right);
 
 		/// <summary>
-		/// Converts this instance of <see cref="Time"/> to an instance of <see cref="TimeSpan"/>.
-		/// For values in <see cref="TimeUnit.Microseconds"/> and <see cref="TimeUnit.Nanoseconds"/>, value will be rounded to the nearest Tick.
+		/// Converts this instance of <see cref="Time" /> to an instance of <see cref="TimeSpan" />.
+		/// For values in <see cref="TimeUnit.Microseconds" /> and <see cref="TimeUnit.Nanoseconds" />, value will be rounded to the nearest Tick.
 		/// All other values will be rounded to the nearest Millisecond.
 		/// </summary>
 		/// <exception cref="InvalidOperationException">
-		/// <para>special time values <see cref="MinusOne"/> and <see cref="Zero"/> do not have a <see cref="TimeSpan"/> representation.</para>
-		/// <para>instance of <see cref="Time"/> has no value for <see cref="Interval"/></para>
+		/// <para>special time values <see cref="MinusOne" /> and <see cref="Zero" /> do not have a <see cref="TimeSpan" /> representation.</para>
+		/// <para>instance of <see cref="Time" /> has no value for <see cref="Interval" /></para>
 		/// </exception>
 		public TimeSpan ToTimeSpan()
 		{
-			if (this.StaticTimeValue.HasValue)
+			if (StaticTimeValue.HasValue)
 				throw new InvalidOperationException("Static time values like -1 or 0 have no logical TimeSpan representation");
-			if (!this.Interval.HasValue)
+			if (!Interval.HasValue)
 				throw new InvalidOperationException($"Time has no value for Interval so you can not call {nameof(ToTimeSpan)} on it");
 
-			switch (this.Interval.Value)
+			switch (Interval.Value)
 			{
 				case TimeUnit.Microseconds:
-					return TimeSpan.FromTicks((long)(this.Factor.Value / MicrosecondsInATick));
+					return TimeSpan.FromTicks((long)(Factor.Value / MicrosecondsInATick));
 				case TimeUnit.Nanoseconds:
-					return TimeSpan.FromTicks((long)(this.Factor.Value / NanosecondsInATick));
+					return TimeSpan.FromTicks((long)(Factor.Value / NanosecondsInATick));
 				default:
-					return TimeSpan.FromMilliseconds(this.Milliseconds.Value);
+					return TimeSpan.FromMilliseconds(Milliseconds.Value);
 			}
 		}
 
 		public override string ToString()
 		{
-			if (this.StaticTimeValue.HasValue)
-				return this.StaticTimeValue.Value.ToString();
-			if (!this.Factor.HasValue)
+			if (StaticTimeValue.HasValue)
+				return StaticTimeValue.Value.ToString();
+			if (!Factor.HasValue)
 				return "<bad Time object should not happen>";
 
-			var mantissa = ExponentFormat(this.Factor.Value);
-			var factor = this.Factor.Value.ToString("0." + mantissa, CultureInfo.InvariantCulture);
-			return this.Interval.HasValue ? factor + this.Interval.Value.GetStringValue() : factor;
+			var mantissa = ExponentFormat(Factor.Value);
+			var factor = Factor.Value.ToString("0." + mantissa, CultureInfo.InvariantCulture);
+			return Interval.HasValue ? factor + Interval.Value.GetStringValue() : factor;
 		}
 
 		string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 		{
-			if (this == Time.MinusOne) return "-1";
-			if (this == Time.Zero) return "0";
-			if (this.Factor.HasValue && this.Interval.HasValue) return this.ToString();
-			return this.Milliseconds.ToString();
+			if (this == MinusOne) return "-1";
+			if (this == Zero) return "0";
+			if (Factor.HasValue && Interval.HasValue) return ToString();
+
+			return Milliseconds.ToString();
 		}
 
 		public bool Equals(Time other)
 		{
 			if (ReferenceEquals(null, other)) return false;
 			if (ReferenceEquals(this, other)) return true;
-			if (this.StaticTimeValue.HasValue && !other.StaticTimeValue.HasValue) return false;
-			if (!this.StaticTimeValue.HasValue && other.StaticTimeValue.HasValue) return false;
-			if (this.StaticTimeValue.HasValue && other.StaticTimeValue.HasValue)
-				return this.StaticTimeValue == other.StaticTimeValue;
-			return Math.Abs(this.Milliseconds.Value - other.Milliseconds.Value) < FLOAT_TOLERANCE;
+			if (StaticTimeValue.HasValue && !other.StaticTimeValue.HasValue) return false;
+			if (!StaticTimeValue.HasValue && other.StaticTimeValue.HasValue) return false;
+			if (StaticTimeValue.HasValue && other.StaticTimeValue.HasValue)
+				return StaticTimeValue == other.StaticTimeValue;
+
+			return Math.Abs(Milliseconds.Value - other.Milliseconds.Value) < FLOAT_TOLERANCE;
 		}
 
 		public override bool Equals(object obj)
 		{
 			if (ReferenceEquals(null, obj)) return false;
 			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != this.GetType()) return false;
-			return Equals((Time) obj);
+			if (obj.GetType() != GetType()) return false;
+
+			return Equals((Time)obj);
 		}
 
-		public override int GetHashCode() => this.StaticTimeValue.HasValue
-			? this.StaticTimeValue.Value.GetHashCode()
-			: this.Milliseconds.GetHashCode();
+		public override int GetHashCode() => StaticTimeValue.HasValue
+			? StaticTimeValue.Value.GetHashCode()
+			: Milliseconds.GetHashCode();
 
 		private void Reduce(double ms)
 		{
-			this.Milliseconds = ms;
+			Milliseconds = ms;
 			double fraction;
 
 			if (ms >= MillisecondsInADay)
@@ -293,7 +308,7 @@ private static string ExponentFormat(double d)
 			// Translate the double into sign, exponent and mantissa.
 			var bits = BitConverter.DoubleToInt64Bits(d);
 			// Note that the shift is sign-extended, hence the test against -1 not 1
-			var exponent = (int) ((bits >> 52) & 0x7ffL);
+			var exponent = (int)((bits >> 52) & 0x7ffL);
 			return new string('#', Math.Max(2, exponent));
 		}
 	}
diff --git a/src/Nest/CommonOptions/TimeUnit/TimeJsonConverter.cs b/src/Nest/CommonOptions/TimeUnit/TimeJsonConverter.cs
index 555430ead8b..c3783df60f7 100644
--- a/src/Nest/CommonOptions/TimeUnit/TimeJsonConverter.cs
+++ b/src/Nest/CommonOptions/TimeUnit/TimeJsonConverter.cs
@@ -25,6 +25,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 					var milliseconds = Convert.ToInt64(reader.Value);
 					if (milliseconds == -1) return Time.MinusOne;
 					if (milliseconds == 0) return Time.Zero;
+
 					return new Time(milliseconds);
 			}
 			return null;
diff --git a/src/Nest/CommonOptions/TimeUnit/TimeUnit.cs b/src/Nest/CommonOptions/TimeUnit/TimeUnit.cs
index 58f2784604d..db69c4b3daa 100644
--- a/src/Nest/CommonOptions/TimeUnit/TimeUnit.cs
+++ b/src/Nest/CommonOptions/TimeUnit/TimeUnit.cs
@@ -10,16 +10,22 @@ public enum TimeUnit
 	{
 		[EnumMember(Value = "nanos")]
 		Nanoseconds,
+
 		[EnumMember(Value = "micros")]
 		Microseconds,
+
 		[EnumMember(Value = "ms")]
 		Millisecond,
+
 		[EnumMember(Value = "s")]
 		Second,
+
 		[EnumMember(Value = "m")]
 		Minute,
+
 		[EnumMember(Value = "h")]
 		Hour,
+
 		[EnumMember(Value = "d")]
 		Day
 	}
diff --git a/src/Nest/CrossPlatform/SynchronizedCollection.cs b/src/Nest/CrossPlatform/SynchronizedCollection.cs
index e17877b63b6..6afd6d4db38 100644
--- a/src/Nest/CrossPlatform/SynchronizedCollection.cs
+++ b/src/Nest/CrossPlatform/SynchronizedCollection.cs
@@ -1,18 +1,16 @@
-using Nest;
+using System.Runtime.InteropServices;
+using Nest;
 
 namespace System.Collections.Generic
 {
 	// TODO delete this, BulkRequest exposes this as IList preventing us to move to concurrentbag
-	[System.Runtime.InteropServices.ComVisible(false)]
+	[ComVisible(false)]
 	public class SynchronizedCollection<T> : IList<T>, IList
 	{
-		List<T> items;
-		object sync;
-
 		public SynchronizedCollection()
 		{
-			this.items = new List<T>();
-			this.sync = new Object();
+			Items = new List<T>();
+			SyncRoot = new Object();
 		}
 
 		public SynchronizedCollection(object syncRoot)
@@ -20,8 +18,8 @@ public SynchronizedCollection(object syncRoot)
 			if (syncRoot == null)
 				throw new ArgumentNullException("syncRoot");
 
-			this.items = new List<T>();
-			this.sync = syncRoot;
+			Items = new List<T>();
+			SyncRoot = syncRoot;
 		}
 
 		public SynchronizedCollection(object syncRoot, IEnumerable<T> list)
@@ -31,8 +29,8 @@ public SynchronizedCollection(object syncRoot, IEnumerable<T> list)
 			if (list == null)
 				throw new ArgumentNullException("list");
 
-			this.items = new List<T>(list);
-			this.sync = syncRoot;
+			Items = new List<T>(list);
+			SyncRoot = syncRoot;
 		}
 
 		public SynchronizedCollection(object syncRoot, params T[] list)
@@ -42,267 +40,202 @@ public SynchronizedCollection(object syncRoot, params T[] list)
 			if (list == null)
 				throw new ArgumentNullException("list");
 
-			this.items = new List<T>(list.Length);
-			for (int i = 0; i < list.Length; i++)
-				this.items.Add(list[i]);
+			Items = new List<T>(list.Length);
+			for (var i = 0; i < list.Length; i++)
+				Items.Add(list[i]);
 
-			this.sync = syncRoot;
+			SyncRoot = syncRoot;
 		}
 
 		public int Count
 		{
-			get { lock (this.sync) { return this.items.Count; } }
-		}
-
-		protected List<T> Items
-		{
-			get { return this.items; }
-		}
-
-		public object SyncRoot
-		{
-			get { return this.sync; }
+			get
+			{
+				lock (SyncRoot) return Items.Count;
+			}
 		}
 
 		public T this[int index]
 		{
 			get
 			{
-				lock (this.sync)
-				{
-					return this.items[index];
-				}
+				lock (SyncRoot) return Items[index];
 			}
 			set
 			{
-				lock (this.sync)
+				lock (SyncRoot)
 				{
-					if (index < 0 || index >= this.items.Count)
-						throw new ArgumentOutOfRangeException("index", index, $"value {index} must be in range of {this.Items.Count}");
+					if (index < 0 || index >= Items.Count)
+						throw new ArgumentOutOfRangeException("index", index, $"value {index} must be in range of {Items.Count}");
 
-					this.SetItem(index, value);
+					SetItem(index, value);
 				}
 			}
 		}
 
-		public void Add(T item)
-		{
-			lock (this.sync)
-			{
-				int index = this.items.Count;
-				this.InsertItem(index, item);
-			}
-		}
+		public object SyncRoot { get; }
 
-		public void Clear()
-		{
-			lock (this.sync)
-			{
-				this.ClearItems();
-			}
-		}
+		protected List<T> Items { get; }
 
-		public void CopyTo(T[] array, int index)
+		bool IList.IsFixedSize => false;
+
+		bool ICollection<T>.IsReadOnly => false;
+
+		bool IList.IsReadOnly => false;
+
+		bool ICollection.IsSynchronized => true;
+
+		object IList.this[int index]
 		{
-			lock (this.sync)
+			get => this[index];
+			set
 			{
-				this.items.CopyTo(array, index);
+				VerifyValueType(value);
+				this[index] = (T)value;
 			}
 		}
 
-		public bool Contains(T item)
+		object ICollection.SyncRoot => SyncRoot;
+
+		void ICollection.CopyTo(Array array, int index)
 		{
-			lock (this.sync)
-			{
-				return this.items.Contains(item);
-			}
+			lock (SyncRoot) ((IList)Items).CopyTo(array, index);
 		}
 
-		public IEnumerator<T> GetEnumerator()
+		public void Add(T item)
 		{
-			lock (this.sync)
+			lock (SyncRoot)
 			{
-				return this.items.GetEnumerator();
+				var index = Items.Count;
+				InsertItem(index, item);
 			}
 		}
 
-		public int IndexOf(T item)
+		public void Clear()
 		{
-			lock (this.sync)
-			{
-				return this.InternalIndexOf(item);
-			}
+			lock (SyncRoot) ClearItems();
 		}
 
-		public void Insert(int index, T item)
+		public bool Contains(T item)
 		{
-			lock (this.sync)
-			{
-				if (index < 0 || index > this.items.Count)
-						throw new ArgumentOutOfRangeException("index", index, $"value {index} must be in range of {this.Items.Count}");
-
-				this.InsertItem(index, item);
-			}
+			lock (SyncRoot) return Items.Contains(item);
 		}
 
-		int InternalIndexOf(T item)
+		public void CopyTo(T[] array, int index)
 		{
-			int count = items.Count;
-
-			for (int i = 0; i < count; i++)
-			{
-				if (object.Equals(items[i], item))
-				{
-					return i;
-				}
-			}
-			return -1;
+			lock (SyncRoot) Items.CopyTo(array, index);
 		}
 
 		public bool Remove(T item)
 		{
-			lock (this.sync)
+			lock (SyncRoot)
 			{
-				int index = this.InternalIndexOf(item);
+				var index = InternalIndexOf(item);
 				if (index < 0)
 					return false;
 
-				this.RemoveItem(index);
+				RemoveItem(index);
 				return true;
 			}
 		}
 
-		public void RemoveAt(int index)
-		{
-			lock (this.sync)
-			{
-				if (index < 0 || index >= this.items.Count)
-					throw new ArgumentOutOfRangeException("index", index, $"value {index} must be in range of {this.Items.Count}");
-
+		IEnumerator IEnumerable.GetEnumerator() => ((IList)Items).GetEnumerator();
 
-				this.RemoveItem(index);
-			}
-		}
-
-		protected virtual void ClearItems()
+		public IEnumerator<T> GetEnumerator()
 		{
-			this.items.Clear();
+			lock (SyncRoot) return Items.GetEnumerator();
 		}
 
-		protected virtual void InsertItem(int index, T item)
+		int IList.Add(object value)
 		{
-			this.items.Insert(index, item);
-		}
+			VerifyValueType(value);
 
-		protected virtual void RemoveItem(int index)
-		{
-			this.items.RemoveAt(index);
+			lock (SyncRoot)
+			{
+				Add((T)value);
+				return Count - 1;
+			}
 		}
 
-		protected virtual void SetItem(int index, T item)
+		bool IList.Contains(object value)
 		{
-			this.items[index] = item;
+			VerifyValueType(value);
+			return Contains((T)value);
 		}
 
-		bool ICollection<T>.IsReadOnly
+		int IList.IndexOf(object value)
 		{
-			get { return false; }
+			VerifyValueType(value);
+			return IndexOf((T)value);
 		}
 
-		IEnumerator IEnumerable.GetEnumerator()
+		void IList.Insert(int index, object value)
 		{
-			return ((IList)this.items).GetEnumerator();
+			VerifyValueType(value);
+			Insert(index, (T)value);
 		}
 
-		bool ICollection.IsSynchronized
+		void IList.Remove(object value)
 		{
-			get { return true; }
+			VerifyValueType(value);
+			Remove((T)value);
 		}
 
-		object ICollection.SyncRoot
+		public int IndexOf(T item)
 		{
-			get { return this.sync; }
+			lock (SyncRoot) return InternalIndexOf(item);
 		}
 
-		void ICollection.CopyTo(Array array, int index)
+		public void Insert(int index, T item)
 		{
-			lock (this.sync)
+			lock (SyncRoot)
 			{
-				((IList)this.items).CopyTo(array, index);
+				if (index < 0 || index > Items.Count)
+					throw new ArgumentOutOfRangeException("index", index, $"value {index} must be in range of {Items.Count}");
+
+				InsertItem(index, item);
 			}
 		}
 
-		object IList.this[int index]
+		public void RemoveAt(int index)
 		{
-			get
+			lock (SyncRoot)
 			{
-				return this[index];
-			}
-			set
-			{
-				VerifyValueType(value);
-				this[index] = (T)value;
-			}
-		}
+				if (index < 0 || index >= Items.Count)
+					throw new ArgumentOutOfRangeException("index", index, $"value {index} must be in range of {Items.Count}");
 
-		bool IList.IsReadOnly
-		{
-			get { return false; }
-		}
 
-		bool IList.IsFixedSize
-		{
-			get { return false; }
+				RemoveItem(index);
+			}
 		}
 
-		int IList.Add(object value)
+		private int InternalIndexOf(T item)
 		{
-			VerifyValueType(value);
+			var count = Items.Count;
 
-			lock (this.sync)
+			for (var i = 0; i < count; i++)
 			{
-				this.Add((T)value);
-				return this.Count - 1;
+				if (Equals(Items[i], item)) return i;
 			}
+			return -1;
 		}
 
-		bool IList.Contains(object value)
-		{
-			VerifyValueType(value);
-			return this.Contains((T)value);
-		}
+		protected virtual void ClearItems() => Items.Clear();
 
-		int IList.IndexOf(object value)
-		{
-			VerifyValueType(value);
-			return this.IndexOf((T)value);
-		}
+		protected virtual void InsertItem(int index, T item) => Items.Insert(index, item);
 
-		void IList.Insert(int index, object value)
-		{
-			VerifyValueType(value);
-			this.Insert(index, (T)value);
-		}
+		protected virtual void RemoveItem(int index) => Items.RemoveAt(index);
 
-		void IList.Remove(object value)
-		{
-			VerifyValueType(value);
-			this.Remove((T)value);
-		}
+		protected virtual void SetItem(int index, T item) => Items[index] = item;
 
-		static void VerifyValueType(object value)
+		private static void VerifyValueType(object value)
 		{
 			if (value == null)
 			{
-				if (typeof(T).IsValue())
-				{
-					throw new ArgumentException("value is null and a value type");
-				}
+				if (typeof(T).IsValue()) throw new ArgumentException("value is null and a value type");
 			}
 			else if (!(value is T))
-			{
 				throw new ArgumentException($"object is of type {value.GetType().FullName} but collection is of {typeof(T).FullName}");
-            }
 		}
 	}
 }
diff --git a/src/Nest/CrossPlatform/TypeExtensions.cs b/src/Nest/CrossPlatform/TypeExtensions.cs
index 4dc4c718ef7..67f5d70656c 100644
--- a/src/Nest/CrossPlatform/TypeExtensions.cs
+++ b/src/Nest/CrossPlatform/TypeExtensions.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -26,20 +25,19 @@ internal static Assembly Assembly(this Type type)
 #endif
 		}
 
-		internal static bool IsGenericDictionary(this Type type)
-		{
-			return type.GetInterfaces().Any(t =>
+		internal static bool IsGenericDictionary(this Type type) => type.GetInterfaces()
+			.Any(t =>
 				t.IsGeneric() && (
-				t.GetGenericTypeDefinition() == typeof(IDictionary<,>) ||
-				t.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>)));
-		}
+					t.GetGenericTypeDefinition() == typeof(IDictionary<,>) ||
+					t.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>)));
 
 		internal static bool TryGetGenericDictionaryArguments(this Type type, out Type[] genericArguments)
 		{
-			var genericDictionary = type.GetInterfaces().FirstOrDefault(t =>
-				t.IsGeneric() && (
-				t.GetGenericTypeDefinition() == typeof(IDictionary<,>) ||
-				t.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>)));
+			var genericDictionary = type.GetInterfaces()
+				.FirstOrDefault(t =>
+					t.IsGeneric() && (
+						t.GetGenericTypeDefinition() == typeof(IDictionary<,>) ||
+						t.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>)));
 
 			if (genericDictionary == null)
 			{
@@ -102,7 +100,7 @@ internal static TypeCode GetTypeCode(this Type type)
 				return TypeCode.Double;
 			else if (type == typeof(decimal))
 				return TypeCode.Decimal;
-			else if (type == typeof(System.DateTime))
+			else if (type == typeof(DateTime))
 				return TypeCode.DateTime;
 			else if (type == typeof(string))
 				return TypeCode.String;
@@ -127,10 +125,7 @@ internal static bool IsEnumType(this Type type)
 		}
 
 #if DOTNETCORE
-		internal static IEnumerable<Type> GetInterfaces(this Type type)
-		{
-			return type.GetTypeInfo().ImplementedInterfaces;
-		}
+		internal static IEnumerable<Type> GetInterfaces(this Type type) => type.GetTypeInfo().ImplementedInterfaces;
 #endif
 
 		internal static IEnumerable<TAttribute> GetAttributes<TAttribute>(this Type t)
@@ -139,7 +134,7 @@ internal static IEnumerable<TAttribute> GetAttributes<TAttribute>(this Type t)
 #if !DOTNETCORE
 			var attributes = Attribute.GetCustomAttributes(t, typeof(TAttribute), true);
 #else
-			var attributes =  t.GetTypeInfo().GetCustomAttributes(typeof(TAttribute), true);
+			var attributes = t.GetTypeInfo().GetCustomAttributes(typeof(TAttribute), true);
 #endif
 			return attributes.Cast<TAttribute>();
 		}
diff --git a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkCreate.cs b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkCreate.cs
index e3f476c47ed..e84c056a257 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkCreate.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkCreate.cs
@@ -15,40 +15,39 @@ public interface IBulkCreateOperation<T> : IBulkOperation
 	public class BulkCreateOperation<T> : BulkOperationBase, IBulkCreateOperation<T>
 		where T : class
 	{
+		public BulkCreateOperation(T document) => Document = document;
+
 		public T Document { get; set; }
 
 		public string Pipeline { get; set; }
 
-		public BulkCreateOperation(T document)
-		{
-			this.Document = document;
-		}
+		protected override Type ClrType => typeof(T);
 
 		protected override string Operation => "create";
 
-		protected override Type ClrType => typeof(T);
+		protected override object GetBody() => Document;
 
-		protected override object GetBody() => this.Document;
+		protected override Id GetIdForOperation(Inferrer inferrer) => Id ?? new Id(Document);
 
-		protected override Id GetIdForOperation(Inferrer inferrer) => this.Id ?? new Id(this.Document);
-		protected override Routing GetRoutingForOperation(Inferrer inferrer) => this.Routing ?? new Routing(this.Document);
+		protected override Routing GetRoutingForOperation(Inferrer inferrer) => Routing ?? new Routing(Document);
 	}
 
 
 	public class BulkCreateDescriptor<T> : BulkOperationDescriptorBase<BulkCreateDescriptor<T>, IBulkCreateOperation<T>>, IBulkCreateOperation<T>
 		where T : class
 	{
-		protected override string BulkOperationType => "create";
 		protected override Type BulkOperationClrType => typeof(T);
+		protected override string BulkOperationType => "create";
+
+		T IBulkCreateOperation<T>.Document { get; set; }
+
+		string IBulkCreateOperation<T>.Pipeline { get; set; }
 
 		protected override object GetBulkOperationBody() => Self.Document;
 
 		protected override Id GetIdForOperation(Inferrer inferrer) => Self.Id ?? new Id(Self.Document);
-		protected override Routing GetRoutingForOperation(Inferrer inferrer) => Self.Routing ?? new Routing(Self.Document);
 
-		T IBulkCreateOperation<T>.Document { get; set; }
-
-		string IBulkCreateOperation<T>.Pipeline { get; set; }
+		protected override Routing GetRoutingForOperation(Inferrer inferrer) => Self.Routing ?? new Routing(Self.Document);
 
 		/// <summary>
 		/// The object to update, if id is not manually set it will be inferred from the object
diff --git a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkDelete.cs b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkDelete.cs
index 27ef6416380..6e13774e0fd 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkDelete.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkDelete.cs
@@ -11,43 +11,40 @@ public interface IBulkDeleteOperation<T> : IBulkOperation
 	public class BulkDeleteOperation<T> : BulkOperationBase, IBulkDeleteOperation<T>
 		where T : class
 	{
-		public BulkDeleteOperation(T document)
-		{
-			this.Document = document;
-		}
+		public BulkDeleteOperation(T document) => Document = document;
 
-		public BulkDeleteOperation(Id id) { this.Id = id; }
+		public BulkDeleteOperation(Id id) => Id = id;
 
-		protected override string Operation => "delete";
+		public T Document { get; set; }
 
 		protected override Type ClrType => typeof(T);
 
+		protected override string Operation => "delete";
+
 		protected override object GetBody() => null;
 
-		protected override Id GetIdForOperation(Inferrer inferrer) => this.Id ?? new Id(this.Document);
-		protected override Routing GetRoutingForOperation(Inferrer inferrer) => this.Routing ?? new Routing(this.Document);
+		protected override Id GetIdForOperation(Inferrer inferrer) => Id ?? new Id(Document);
 
-		public T Document { get; set; }
+		protected override Routing GetRoutingForOperation(Inferrer inferrer) => Routing ?? new Routing(Document);
 	}
 
 	public class BulkDeleteDescriptor<T> : BulkOperationDescriptorBase<BulkDeleteDescriptor<T>, IBulkDeleteOperation<T>>, IBulkDeleteOperation<T>
 		where T : class
 	{
-		protected override string BulkOperationType => "delete";
 		protected override Type BulkOperationClrType => typeof(T);
+		protected override string BulkOperationType => "delete";
 
 		T IBulkDeleteOperation<T>.Document { get; set; }
 
 		protected override object GetBulkOperationBody() => null;
 
 		protected override Id GetIdForOperation(Inferrer inferrer) => Self.Id ?? new Id(Self.Document);
+
 		protected override Routing GetRoutingForOperation(Inferrer inferrer) => Self.Routing ?? new Routing(Self.Document);
 
 		/// <summary>
 		/// The object to infer the id off, (if id is not passed using Id())
 		/// </summary>
 		public BulkDeleteDescriptor<T> Document(T @object) => Assign(a => a.Document = @object);
-
-
 	}
 }
diff --git a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkIndex.cs b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkIndex.cs
index e33ef82d0d2..8dda5afaf35 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkIndex.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkIndex.cs
@@ -5,53 +5,52 @@ namespace Nest
 {
 	public interface IBulkIndexOperation<T> : IBulkOperation
 	{
+		[JsonConverter(typeof(SourceConverter))]
+		T Document { get; set; }
+
 		[JsonProperty("_percolate")]
 		string Percolate { get; set; }
 
 		[JsonProperty("pipeline")]
 		string Pipeline { get; set; }
-
-		[JsonConverter(typeof(SourceConverter))]
-		T Document { get; set; }
 	}
 
 	public class BulkIndexOperation<T> : BulkOperationBase, IBulkIndexOperation<T>
 		where T : class
 	{
-		public BulkIndexOperation(T document)
-		{
-			this.Document = document;
-		}
+		public BulkIndexOperation(T document) => Document = document;
 
-		protected override string Operation => "index";
+		public T Document { get; set; }
 
-		protected override Type ClrType => typeof(T);
+		public string Percolate { get; set; }
+
+		public string Pipeline { get; set; }
 
-		protected override object GetBody() => this.Document;
+		protected override Type ClrType => typeof(T);
 
-		protected override Id GetIdForOperation(Inferrer inferrer) => this.Id ?? new Id(this.Document);
-		protected override Routing GetRoutingForOperation(Inferrer inferrer) => this.Routing ?? new Routing(this.Document);
+		protected override string Operation => "index";
 
-		public string Percolate { get; set; }
+		protected override object GetBody() => Document;
 
-		public string Pipeline { get; set; }
+		protected override Id GetIdForOperation(Inferrer inferrer) => Id ?? new Id(Document);
 
-		public T Document { get; set; }
+		protected override Routing GetRoutingForOperation(Inferrer inferrer) => Routing ?? new Routing(Document);
 	}
 
 
 	public class BulkIndexDescriptor<T> : BulkOperationDescriptorBase<BulkIndexDescriptor<T>, IBulkIndexOperation<T>>, IBulkIndexOperation<T>
 		where T : class
 	{
-		protected override string BulkOperationType => "index";
 		protected override Type BulkOperationClrType => typeof(T);
+		protected override string BulkOperationType => "index";
+		T IBulkIndexOperation<T>.Document { get; set; }
 		string IBulkIndexOperation<T>.Percolate { get; set; }
 		string IBulkIndexOperation<T>.Pipeline { get; set; }
-		T IBulkIndexOperation<T>.Document { get; set; }
 
 		protected override object GetBulkOperationBody() => Self.Document;
 
 		protected override Id GetIdForOperation(Inferrer inferrer) => Self.Id ?? new Id(Self.Document);
+
 		protected override Routing GetRoutingForOperation(Inferrer inferrer) => Self.Routing ?? new Routing(Self.Document);
 
 		/// <summary>
diff --git a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkOperationBase.cs b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkOperationBase.cs
index 0028739e290..440c54888e1 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkOperationBase.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkOperationBase.cs
@@ -5,30 +5,35 @@ namespace Nest
 {
 	public abstract class BulkOperationBase : IBulkOperation
 	{
-		public IndexName Index { get; set; }
-		public TypeName Type { get; set; }
 		public Id Id { get; set; }
-		public long? Version { get; set; }
-		public VersionType? VersionType { get; set; }
-		public Routing Routing { get; set; }
+		public IndexName Index { get; set; }
+
 		[Obsolete("This property is no longer available in indices created in Elasticsearch 6.x and up")]
 		public Id Parent { get; set; }
-		public int? RetriesOnConflict { get; set; }
 
-		string IBulkOperation.Operation => this.Operation;
+		public int? RetriesOnConflict { get; set; }
+		public Routing Routing { get; set; }
+		public TypeName Type { get; set; }
+		public long? Version { get; set; }
+		public VersionType? VersionType { get; set; }
+		protected abstract Type ClrType { get; }
 		protected abstract string Operation { get; }
 
-		Type IBulkOperation.ClrType => this.ClrType;
-		protected abstract Type ClrType { get; }
+		Type IBulkOperation.ClrType => ClrType;
+
+		string IBulkOperation.Operation => Operation;
+
+		object IBulkOperation.GetBody() => GetBody();
+
+		Id IBulkOperation.GetIdForOperation(Inferrer inferrer) => GetIdForOperation(inferrer);
+
+		Routing IBulkOperation.GetRoutingForOperation(Inferrer inferrer) => GetRoutingForOperation(inferrer);
 
-		object IBulkOperation.GetBody() => this.GetBody();
 		protected abstract object GetBody();
 
-		Id IBulkOperation.GetIdForOperation(Inferrer inferrer) => this.GetIdForOperation(inferrer);
-		Routing IBulkOperation.GetRoutingForOperation(Inferrer inferrer) => this.GetRoutingForOperation(inferrer);
+		protected virtual Id GetIdForOperation(Inferrer inferrer) => Id ?? new Id(GetBody());
 
-		protected virtual Id GetIdForOperation(Inferrer inferrer) => this.Id ?? new Id(this.GetBody());
-		protected virtual Routing GetRoutingForOperation(Inferrer inferrer) => this.Routing ?? new Routing(this.GetBody());
+		protected virtual Routing GetRoutingForOperation(Inferrer inferrer) => Routing ?? new Routing(GetBody());
 	}
 
 	public abstract class BulkOperationDescriptorBase<TDescriptor, TInterface>
@@ -36,40 +41,45 @@ public abstract class BulkOperationDescriptorBase<TDescriptor, TInterface>
 		where TDescriptor : BulkOperationDescriptorBase<TDescriptor, TInterface>, TInterface, IBulkOperation
 		where TInterface : class, IBulkOperation
 	{
-		string IBulkOperation.Operation => this.BulkOperationType;
+		protected abstract Type BulkOperationClrType { get; }
 		protected abstract string BulkOperationType { get; }
 
-		Type IBulkOperation.ClrType => this.BulkOperationClrType;
-		protected abstract Type BulkOperationClrType { get; }
+		Type IBulkOperation.ClrType => BulkOperationClrType;
+		Id IBulkOperation.Id { get; set; }
 
-		protected abstract object GetBulkOperationBody();
+		IndexName IBulkOperation.Index { get; set; }
+		string IBulkOperation.Operation => BulkOperationType;
+
+		[Obsolete("This feature is no longer supported on indices created in Elasticsearch 6.x and up")]
+		Id IBulkOperation.Parent { get; set; }
+
+		int? IBulkOperation.RetriesOnConflict { get; set; }
+		Routing IBulkOperation.Routing { get; set; }
+		TypeName IBulkOperation.Type { get; set; }
+		long? IBulkOperation.Version { get; set; }
+		VersionType? IBulkOperation.VersionType { get; set; }
 
 		/// <summary>
 		/// Only used for bulk update operations but in the future might come in handy for other complex bulk ops.
 		/// </summary>
 		/// <returns></returns>
-		object IBulkOperation.GetBody() => this.GetBulkOperationBody();
+		object IBulkOperation.GetBody() => GetBulkOperationBody();
 
-		Id IBulkOperation.GetIdForOperation(Inferrer inferrer) => this.GetIdForOperation(inferrer);
-		Routing IBulkOperation.GetRoutingForOperation(Inferrer inferrer) => this.GetRoutingForOperation(inferrer);
+		Id IBulkOperation.GetIdForOperation(Inferrer inferrer) => GetIdForOperation(inferrer);
 
-		protected virtual Id GetIdForOperation(Inferrer inferrer) => Self.Id ?? new Id(this.GetBulkOperationBody());
-		protected virtual Routing GetRoutingForOperation(Inferrer inferrer) => Self.Routing ?? new Routing(this.GetBulkOperationBody());
+		Routing IBulkOperation.GetRoutingForOperation(Inferrer inferrer) => GetRoutingForOperation(inferrer);
 
-		IndexName IBulkOperation.Index { get; set; }
-		TypeName IBulkOperation.Type { get; set; }
-		Id IBulkOperation.Id { get; set; }
-		long? IBulkOperation.Version { get; set; }
-		VersionType? IBulkOperation.VersionType { get; set; }
-		Routing IBulkOperation.Routing { get; set; }
-		[Obsolete("This feature is no longer supported on indices created in Elasticsearch 6.x and up")]
-		Id IBulkOperation.Parent { get; set; }
-		int? IBulkOperation.RetriesOnConflict { get; set; }
+		protected abstract object GetBulkOperationBody();
+
+		protected virtual Id GetIdForOperation(Inferrer inferrer) => Self.Id ?? new Id(GetBulkOperationBody());
+
+		protected virtual Routing GetRoutingForOperation(Inferrer inferrer) => Self.Routing ?? new Routing(GetBulkOperationBody());
 
 		/// <summary>
 		/// Manually set the index, default to the default index or the fixed index set on the bulk operation
 		/// </summary>
 		public TDescriptor Index(IndexName index) => Assign(a => a.Index = index);
+
 		public TDescriptor Index<T>() => Assign(a => a.Index = typeof(T));
 
 		/// <summary>
@@ -77,6 +87,7 @@ public abstract class BulkOperationDescriptorBase<TDescriptor, TInterface>
 		/// T will be inferred to if not passed or the fixed type set on the parent bulk operation
 		/// </summary>
 		public TDescriptor Type(TypeName type) => Assign(a => a.Type = type);
+
 		public TDescriptor Type<T>() => Assign(a => a.Type = typeof(T));
 
 		/// <summary>
diff --git a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkUpdate.cs b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkUpdate.cs
index 3c425011186..f7e9dbcc4a2 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkUpdate.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkUpdate.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace Nest
@@ -9,27 +8,27 @@ public interface IBulkUpdateOperation<TDocument, TPartialDocument> : IBulkOperat
 		where TPartialDocument : class
 	{
 		/// <summary>
-		/// Infers the id of the object to update from the provided object.
-		/// See <see cref="Doc"/> to apply a partial object merge.
+		/// The partial update document to be merged on to the existing object.
 		/// </summary>
-		TDocument IdFrom { get; set; }
+		TPartialDocument Doc { get; set; }
 
 		/// <summary>
-		/// A document to upsert when the specified document to be updated is not found
+		/// Instead of sending a partial doc with <see cref="Doc" /> plus an upsert doc
+		/// with <see cref="Upsert" />, setting <see cref="DocAsUpsert" /> to <c>true</c> will
+		/// use the contents of doc as the upsert value.
 		/// </summary>
-		TDocument Upsert { get; set; }
+		bool? DocAsUpsert { get; set; }
 
 		/// <summary>
-		/// The partial update document to be merged on to the existing object.
+		/// Infers the id of the object to update from the provided object.
+		/// See <see cref="Doc" /> to apply a partial object merge.
 		/// </summary>
-		TPartialDocument Doc { get; set; }
+		TDocument IdFrom { get; set; }
 
 		/// <summary>
-		/// Instead of sending a partial doc with <see cref="Doc"/> plus an upsert doc
-		/// with <see cref="Upsert"/>, setting <see cref="DocAsUpsert"/> to <c>true</c> will
-		/// use the contents of doc as the upsert value.
+		/// A script to specify the update.
 		/// </summary>
-		bool? DocAsUpsert { get; set; }
+		IScript Script { get; set; }
 
 		/// <summary>
 		/// If you would like your script to run regardless of whether the document exists or not — i.e. the script handles
@@ -38,17 +37,16 @@ public interface IBulkUpdateOperation<TDocument, TPartialDocument> : IBulkOperat
 		bool? ScriptedUpsert { get; set; }
 
 		/// <summary>
-		/// A script to specify the update.
+		/// A document to upsert when the specified document to be updated is not found
 		/// </summary>
-		IScript Script { get; set; }
+		TDocument Upsert { get; set; }
 	}
 
 	public class BulkUpdateOperation<TDocument, TPartialDocument> : BulkOperationBase, IBulkUpdateOperation<TDocument, TPartialDocument>
 		where TDocument : class
 		where TPartialDocument : class
 	{
-
-		public BulkUpdateOperation(Id id) { this.Id = id; }
+		public BulkUpdateOperation(Id id) => Id = id;
 
 		/// <summary>
 		/// Create a new bulk operation
@@ -57,9 +55,9 @@ public class BulkUpdateOperation<TDocument, TPartialDocument> : BulkOperationBas
 		/// <param name="useIdFromAsUpsert">Use the document to infer on as the upsert document in this update operation</param>
 		public BulkUpdateOperation(TDocument idFrom, bool useIdFromAsUpsert = false)
 		{
-			this.IdFrom = idFrom;
+			IdFrom = idFrom;
 			if (useIdFromAsUpsert)
-				this.Upsert = idFrom;
+				Upsert = idFrom;
 		}
 
 		/// <summary>
@@ -70,54 +68,34 @@ public BulkUpdateOperation(TDocument idFrom, bool useIdFromAsUpsert = false)
 		/// <param name="useIdFromAsUpsert">Use the document to infer on as the upsert document in this update operation</param>
 		public BulkUpdateOperation(TDocument idFrom, TPartialDocument update, bool useIdFromAsUpsert = false)
 		{
-			this.IdFrom = idFrom;
+			IdFrom = idFrom;
 			if (useIdFromAsUpsert)
-				this.Upsert = idFrom;
-			this.Doc = update;
+				Upsert = idFrom;
+			Doc = update;
 		}
 
-		protected override string Operation => "update";
-
-		protected override Type ClrType => typeof(TDocument);
-
-		protected override Id GetIdForOperation(Inferrer inferrer) =>
-			this.Id ?? new Id(new[] { this.IdFrom, this.Upsert }.FirstOrDefault(o=>o != null));
-
-		protected override Routing GetRoutingForOperation(Inferrer inferrer) =>
-			this.Routing ?? new Routing(new[] { this.IdFrom, this.Upsert }.FirstOrDefault(o=>o != null));
-
-		protected override object GetBody() =>
-			new BulkUpdateBody<TDocument, TPartialDocument>
-		{
-			_PartialUpdate = this.Doc,
-			_Script = this.Script,
-			_Upsert = this.Upsert,
-			_DocAsUpsert = this.DocAsUpsert,
-			_ScriptedUpsert = this.ScriptedUpsert
-		};
-
 		/// <summary>
-		/// Infers the id of the object to update from the provided object.
-		/// See <see cref="Doc"/> to apply a partial object merge.
+		/// The partial update document to be merged on to the existing object.
 		/// </summary>
-		public TDocument IdFrom { get; set; }
+		public TPartialDocument Doc { get; set; }
 
 		/// <summary>
-		/// A document to upsert when the specified document to be updated is not found
+		/// Instead of sending a partial doc with <see cref="Doc" /> plus an upsert doc
+		/// with <see cref="Upsert" />, setting <see cref="DocAsUpsert" /> to <c>true</c> will
+		/// use the contents of doc as the upsert value.
 		/// </summary>
-		public TDocument Upsert { get; set; }
+		public bool? DocAsUpsert { get; set; }
 
 		/// <summary>
-		/// The partial update document to be merged on to the existing object.
+		/// Infers the id of the object to update from the provided object.
+		/// See <see cref="Doc" /> to apply a partial object merge.
 		/// </summary>
-		public TPartialDocument Doc { get; set; }
+		public TDocument IdFrom { get; set; }
 
 		/// <summary>
-		/// Instead of sending a partial doc with <see cref="Doc"/> plus an upsert doc
-		/// with <see cref="Upsert"/>, setting <see cref="DocAsUpsert"/> to <c>true</c> will
-		/// use the contents of doc as the upsert value.
+		/// A script to specify the update.
 		/// </summary>
-		public bool? DocAsUpsert { get; set; }
+		public IScript Script { get; set; }
 
 		/// <summary>
 		/// If you would like your script to run regardless of whether the document exists or not — i.e. the script handles
@@ -126,26 +104,46 @@ protected override object GetBody() =>
 		public bool? ScriptedUpsert { get; set; }
 
 		/// <summary>
-		/// A script to specify the update.
+		/// A document to upsert when the specified document to be updated is not found
 		/// </summary>
-		public IScript Script { get; set; }
+		public TDocument Upsert { get; set; }
+
+		protected override Type ClrType => typeof(TDocument);
+
+		protected override string Operation => "update";
+
+		protected override Id GetIdForOperation(Inferrer inferrer) =>
+			Id ?? new Id(new[] { IdFrom, Upsert }.FirstOrDefault(o => o != null));
+
+		protected override Routing GetRoutingForOperation(Inferrer inferrer) =>
+			Routing ?? new Routing(new[] { IdFrom, Upsert }.FirstOrDefault(o => o != null));
+
+		protected override object GetBody() =>
+			new BulkUpdateBody<TDocument, TPartialDocument>
+			{
+				_PartialUpdate = Doc,
+				_Script = Script,
+				_Upsert = Upsert,
+				_DocAsUpsert = DocAsUpsert,
+				_ScriptedUpsert = ScriptedUpsert
+			};
 	}
 
 	public class BulkUpdateDescriptor<TDocument, TPartialDocument>
 		: BulkOperationDescriptorBase<BulkUpdateDescriptor<TDocument, TPartialDocument>, IBulkUpdateOperation<TDocument, TPartialDocument>>
-		, IBulkUpdateOperation<TDocument, TPartialDocument>
+			, IBulkUpdateOperation<TDocument, TPartialDocument>
 		where TDocument : class
 		where TPartialDocument : class
 	{
-		protected override string BulkOperationType => "update";
 		protected override Type BulkOperationClrType => typeof(TDocument);
-
-		TDocument IBulkUpdateOperation<TDocument, TPartialDocument>.IdFrom { get; set; }
-		TDocument IBulkUpdateOperation<TDocument, TPartialDocument>.Upsert { get; set; }
+		protected override string BulkOperationType => "update";
 		TPartialDocument IBulkUpdateOperation<TDocument, TPartialDocument>.Doc { get; set; }
 		bool? IBulkUpdateOperation<TDocument, TPartialDocument>.DocAsUpsert { get; set; }
-		bool? IBulkUpdateOperation<TDocument, TPartialDocument>.ScriptedUpsert { get; set; }
+
+		TDocument IBulkUpdateOperation<TDocument, TPartialDocument>.IdFrom { get; set; }
 		IScript IBulkUpdateOperation<TDocument, TPartialDocument>.Script { get; set; }
+		bool? IBulkUpdateOperation<TDocument, TPartialDocument>.ScriptedUpsert { get; set; }
+		TDocument IBulkUpdateOperation<TDocument, TPartialDocument>.Upsert { get; set; }
 
 		protected override object GetBulkOperationBody() =>
 			new BulkUpdateBody<TDocument, TPartialDocument>
@@ -158,19 +156,21 @@ protected override object GetBulkOperationBody() =>
 			};
 
 		protected override Id GetIdForOperation(Inferrer inferrer) =>
-			Self.Id ?? new Id(new[] { Self.IdFrom, Self.Upsert }.FirstOrDefault(o=>o != null));
+			Self.Id ?? new Id(new[] { Self.IdFrom, Self.Upsert }.FirstOrDefault(o => o != null));
 
 		protected override Routing GetRoutingForOperation(Inferrer inferrer) =>
-			Self.Routing ?? new Routing(new[] { Self.IdFrom, Self.Upsert }.FirstOrDefault(o=>o != null));
+			Self.Routing ?? new Routing(new[] { Self.IdFrom, Self.Upsert }.FirstOrDefault(o => o != null));
 
 		/// <summary>
-		/// Infers the id of the object to update from the provided <param name="object">object</param>.
-		/// See <see cref="Doc(TPartialDocument)"/> to apply a partial object merge.
+		/// Infers the id of the object to update from the provided
+		/// <param name="object">object</param>
+		/// .
+		/// See <see cref="Doc(TPartialDocument)" /> to apply a partial object merge.
 		/// </summary>
 		public BulkUpdateDescriptor<TDocument, TPartialDocument> IdFrom(TDocument @object, bool useAsUpsert = false)
 		{
 			Self.IdFrom = @object;
-			return useAsUpsert ? this.Upsert(@object) : this;
+			return useAsUpsert ? Upsert(@object) : this;
 		}
 
 		/// <summary>
@@ -184,8 +184,8 @@ public BulkUpdateDescriptor<TDocument, TPartialDocument> IdFrom(TDocument @objec
 		public BulkUpdateDescriptor<TDocument, TPartialDocument> Doc(TPartialDocument @object) => Assign(a => a.Doc = @object);
 
 		/// <summary>
-		/// Instead of sending a partial doc with <see cref="Doc(TPartialDocument)"/> plus an upsert doc
-		/// with <see cref="Upsert(TDocument)"/>, setting <see cref="DocAsUpsert"/> to <c>true</c> will
+		/// Instead of sending a partial doc with <see cref="Doc(TPartialDocument)" /> plus an upsert doc
+		/// with <see cref="Upsert(TDocument)" />, setting <see cref="DocAsUpsert" /> to <c>true</c> will
 		/// use the contents of doc as the upsert value.
 		/// </summary>
 		public BulkUpdateDescriptor<TDocument, TPartialDocument> DocAsUpsert(bool? partialDocumentAsUpsert = true) =>
diff --git a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkUpdateBody.cs b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkUpdateBody.cs
index 64515cf3b7b..e2ef86c9a6e 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkUpdateBody.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkOperation/BulkUpdateBody.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -7,21 +6,21 @@ internal class BulkUpdateBody<TDocument, TPartialUpdate>
 		where TDocument : class
 		where TPartialUpdate : class
 	{
+		[JsonProperty("doc_as_upsert")]
+		public bool? _DocAsUpsert { get; set; }
+
 		[JsonProperty("doc")]
 		[JsonConverter(typeof(CollapsedSourceConverter))]
 		internal TPartialUpdate _PartialUpdate { get; set; }
 
-		[JsonProperty("upsert")]
-		[JsonConverter(typeof(CollapsedSourceConverter))]
-		internal TDocument _Upsert { get; set; }
-
-		[JsonProperty("doc_as_upsert")]
-		public bool? _DocAsUpsert { get; set; }
-
 		[JsonProperty("script")]
 		internal IScript _Script { get; set; }
 
 		[JsonProperty("scripted_upsert")]
 		internal bool? _ScriptedUpsert { get; set; }
+
+		[JsonProperty("upsert")]
+		[JsonConverter(typeof(CollapsedSourceConverter))]
+		internal TDocument _Upsert { get; set; }
 	}
 }
diff --git a/src/Nest/Document/Multiple/Bulk/BulkOperation/IBulkOperation.cs b/src/Nest/Document/Multiple/Bulk/BulkOperation/IBulkOperation.cs
index e0296e08045..f1fe06537bf 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkOperation/IBulkOperation.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkOperation/IBulkOperation.cs
@@ -8,18 +8,28 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IBulkOperation
 	{
-		string Operation { get; }
 		Type ClrType { get; }
 
+		[JsonProperty("_id")]
+		Id Id { get; set; }
+
 		[JsonProperty("_index")]
 		IndexName Index { get; set; }
 
+		string Operation { get; }
+
+		[JsonProperty("parent")]
+		Id Parent { get; set; }
+
+		[JsonProperty("retry_on_conflict")]
+		int? RetriesOnConflict { get; set; }
+
+		[JsonProperty("routing")]
+		Routing Routing { get; set; }
+
 		[JsonProperty("_type")]
 		TypeName Type { get; set; }
 
-		[JsonProperty("_id")]
-		Id Id { get; set; }
-
 		[JsonProperty("version")]
 		long? Version { get; set; }
 
@@ -27,18 +37,10 @@ public interface IBulkOperation
 		[JsonConverter(typeof(StringEnumConverter))]
 		VersionType? VersionType { get; set; }
 
-		[JsonProperty("routing")]
-		Routing Routing { get; set; }
-
-		[JsonProperty("parent")]
-		Id Parent { get; set; }
-
-		[JsonProperty("retry_on_conflict")]
-		int? RetriesOnConflict { get; set; }
-
 		object GetBody();
 
 		Id GetIdForOperation(Inferrer inferrer);
+
 		Routing GetRoutingForOperation(Inferrer settingsInferrer);
 	}
 }
diff --git a/src/Nest/Document/Multiple/Bulk/BulkRequest.cs b/src/Nest/Document/Multiple/Bulk/BulkRequest.cs
index db072f3ab6a..88b06146850 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkRequest.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkRequest.cs
@@ -30,7 +30,9 @@ public BulkDescriptor Create<T>(Func<BulkCreateDescriptor<T>, IBulkCreateOperati
 		/// </summary>
 		/// <param name="objects">the objects to create</param>
 		/// <param name="bulkCreateSelector">A func called on each object to describe the individual create operation</param>
-		public BulkDescriptor CreateMany<T>(IEnumerable<T> @objects, Func<BulkCreateDescriptor<T>, T, IBulkCreateOperation<T>> bulkCreateSelector = null) where T : class =>
+		public BulkDescriptor CreateMany<T>(IEnumerable<T> @objects,
+			Func<BulkCreateDescriptor<T>, T, IBulkCreateOperation<T>> bulkCreateSelector = null
+		) where T : class =>
 			Assign(a => @objects.ForEach(o => AddOperation(bulkCreateSelector.InvokeOrDefault(new BulkCreateDescriptor<T>().Document(o), o))));
 
 		public BulkDescriptor Index<T>(Func<BulkIndexDescriptor<T>, IBulkIndexOperation<T>> bulkIndexSelector) where T : class =>
@@ -41,7 +43,8 @@ public BulkDescriptor Index<T>(Func<BulkIndexDescriptor<T>, IBulkIndexOperation<
 		/// </summary>
 		/// <param name="objects">the objects to index</param>
 		/// <param name="bulkIndexSelector">A func called on each object to describe the individual index operation</param>
-		public BulkDescriptor IndexMany<T>(IEnumerable<T> @objects, Func<BulkIndexDescriptor<T>, T, IBulkIndexOperation<T>> bulkIndexSelector = null) where T : class =>
+		public BulkDescriptor IndexMany<T>(IEnumerable<T> @objects, Func<BulkIndexDescriptor<T>, T, IBulkIndexOperation<T>> bulkIndexSelector = null)
+			where T : class =>
 			Assign(a => @objects.ForEach(o => AddOperation(bulkIndexSelector.InvokeOrDefault(new BulkIndexDescriptor<T>().Document(o), o))));
 
 		public BulkDescriptor Delete<T>(T obj, Func<BulkDeleteDescriptor<T>, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
@@ -55,7 +58,9 @@ public BulkDescriptor Delete<T>(Func<BulkDeleteDescriptor<T>, IBulkDeleteOperati
 		/// </summary>
 		/// <param name="objects">the objects to delete</param>
 		/// <param name="bulkDeleteSelector">A func called on each object to describe the individual delete operation</param>
-		public BulkDescriptor DeleteMany<T>(IEnumerable<T> @objects, Func<BulkDeleteDescriptor<T>, T, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
+		public BulkDescriptor DeleteMany<T>(IEnumerable<T> @objects,
+			Func<BulkDeleteDescriptor<T>, T, IBulkDeleteOperation<T>> bulkDeleteSelector = null
+		) where T : class =>
 			Assign(a => @objects.ForEach(o => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Document(o), o))));
 
 		/// <summary>
@@ -63,7 +68,9 @@ public BulkDescriptor DeleteMany<T>(IEnumerable<T> @objects, Func<BulkDeleteDesc
 		/// </summary>
 		/// <param name="ids">Enumerable of string ids to delete</param>
 		/// <param name="bulkDeleteSelector">A func called on each ids to describe the individual delete operation</param>
-		public BulkDescriptor DeleteMany<T>(IEnumerable<string> ids, Func<BulkDeleteDescriptor<T>, string, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
+		public BulkDescriptor DeleteMany<T>(IEnumerable<string> ids,
+			Func<BulkDeleteDescriptor<T>, string, IBulkDeleteOperation<T>> bulkDeleteSelector = null
+		) where T : class =>
 			Assign(a => ids.ForEach(o => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Id(o), o))));
 
 		/// <summary>
@@ -71,7 +78,9 @@ public BulkDescriptor DeleteMany<T>(IEnumerable<string> ids, Func<BulkDeleteDesc
 		/// </summary>
 		/// <param name="ids">Enumerable of int ids to delete</param>
 		/// <param name="bulkDeleteSelector">A func called on each ids to describe the individual delete operation</param>
-		public BulkDescriptor DeleteMany<T>(IEnumerable<long> ids, Func<BulkDeleteDescriptor<T>, long, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
+		public BulkDescriptor DeleteMany<T>(IEnumerable<long> ids,
+			Func<BulkDeleteDescriptor<T>, long, IBulkDeleteOperation<T>> bulkDeleteSelector = null
+		) where T : class =>
 			Assign(a => ids.ForEach(o => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Id(o), o))));
 
 		/// <summary>
@@ -79,7 +88,9 @@ public BulkDescriptor DeleteMany<T>(IEnumerable<long> ids, Func<BulkDeleteDescri
 		/// </summary>
 		/// <param name="objects">the objects to update</param>
 		/// <param name="bulkUpdateSelector">An func called on each object to describe the individual update operation</param>
-		public BulkDescriptor UpdateMany<T>(IEnumerable<T> @objects, Func<BulkUpdateDescriptor<T, T>, T, IBulkUpdateOperation<T, T>> bulkUpdateSelector) where T : class =>
+		public BulkDescriptor UpdateMany<T>(IEnumerable<T> @objects,
+			Func<BulkUpdateDescriptor<T, T>, T, IBulkUpdateOperation<T, T>> bulkUpdateSelector
+		) where T : class =>
 			Assign(a => @objects.ForEach(o => AddOperation(bulkUpdateSelector.InvokeOrDefault(new BulkUpdateDescriptor<T, T>().IdFrom(o), o))));
 
 		/// <summary>
@@ -87,15 +98,20 @@ public BulkDescriptor UpdateMany<T>(IEnumerable<T> @objects, Func<BulkUpdateDesc
 		/// </summary>
 		/// <param name="objects">the objects to update</param>
 		/// <param name="bulkUpdateSelector">An func called on each object to describe the individual update operation</param>
-		public BulkDescriptor UpdateMany<T, TPartialDocument>(IEnumerable<T> @objects, Func<BulkUpdateDescriptor<T, TPartialDocument>, T, IBulkUpdateOperation<T, TPartialDocument>> bulkUpdateSelector)
+		public BulkDescriptor UpdateMany<T, TPartialDocument>(IEnumerable<T> @objects,
+			Func<BulkUpdateDescriptor<T, TPartialDocument>, T, IBulkUpdateOperation<T, TPartialDocument>> bulkUpdateSelector
+		)
 			where T : class
 			where TPartialDocument : class =>
-			Assign(a => @objects.ForEach(o => AddOperation(bulkUpdateSelector.InvokeOrDefault(new BulkUpdateDescriptor<T, TPartialDocument>().IdFrom(o), o))));
+			Assign(a => @objects.ForEach(o =>
+				AddOperation(bulkUpdateSelector.InvokeOrDefault(new BulkUpdateDescriptor<T, TPartialDocument>().IdFrom(o), o))));
 
 		public BulkDescriptor Update<T>(Func<BulkUpdateDescriptor<T, T>, IBulkUpdateOperation<T, T>> bulkUpdateSelector) where T : class =>
-			this.Update<T, T>(bulkUpdateSelector);
+			Update<T, T>(bulkUpdateSelector);
 
-		public BulkDescriptor Update<T, TPartialDocument>(Func<BulkUpdateDescriptor<T, TPartialDocument>, IBulkUpdateOperation<T, TPartialDocument>> bulkUpdateSelector)
+		public BulkDescriptor Update<T, TPartialDocument>(
+			Func<BulkUpdateDescriptor<T, TPartialDocument>, IBulkUpdateOperation<T, TPartialDocument>> bulkUpdateSelector
+		)
 			where T : class
 			where TPartialDocument : class =>
 			Assign(a => AddOperation(bulkUpdateSelector?.Invoke(new BulkUpdateDescriptor<T, TPartialDocument>())));
diff --git a/src/Nest/Document/Multiple/Bulk/BulkRequestJsonConverter.cs b/src/Nest/Document/Multiple/Bulk/BulkRequestJsonConverter.cs
index 3bc1f33beee..ac65bb699d5 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkRequestJsonConverter.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkRequestJsonConverter.cs
@@ -8,6 +8,7 @@ internal class BulkRequestJsonConverter : JsonConverter
 	{
 		public override bool CanRead => false;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
@@ -16,9 +17,9 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var settings = serializer?.GetConnectionSettings();
 			var requestResponseSerializer = settings?.RequestResponseSerializer;
 			var sourceSerializer = settings?.SourceSerializer;
-			if (requestResponseSerializer == null|| bulk?.Operations == null) return ;
+			if (requestResponseSerializer == null || bulk?.Operations == null) return;
 
-			foreach(var op in bulk.Operations)
+			foreach (var op in bulk.Operations)
 			{
 				op.Index = op.Index ?? bulk.Index ?? op.ClrType;
 				if (op.Index.Equals(bulk.Index)) op.Index = null;
@@ -31,10 +32,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				writer.WriteRaw($"{{\"{op.Operation}\":" + opJson + "}\n");
 				var body = op.GetBody();
 				if (body == null) continue;
+
 				var bodyJson = (
-					op.Operation == "update" || body is ILazyDocument
-						? requestResponseSerializer
-						: sourceSerializer
+						op.Operation == "update" || body is ILazyDocument
+							? requestResponseSerializer
+							: sourceSerializer
 					)
 					.SerializeToString(body, SerializationFormatting.None);
 
@@ -42,10 +44,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			}
 		}
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			throw new NotSupportedException();
-		}
-
 	}
 }
diff --git a/src/Nest/Document/Multiple/Bulk/BulkResponse.cs b/src/Nest/Document/Multiple/Bulk/BulkResponse.cs
index 641b128682f..ee9d68c38b7 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkResponse.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkResponse.cs
@@ -7,36 +7,38 @@ namespace Nest
 {
 	public interface IBulkResponse : IResponse
 	{
-		long Took { get; }
 		bool Errors { get; }
 		IReadOnlyCollection<IBulkResponseItem> Items { get; }
 		IEnumerable<IBulkResponseItem> ItemsWithErrors { get; }
+		long Took { get; }
 	}
 
 	[JsonObject]
 	public class BulkResponse : ResponseBase, IBulkResponse
 	{
-		public override bool IsValid => base.IsValid && !this.Errors && !this.ItemsWithErrors.HasAny();
-		protected override void DebugIsValid(StringBuilder sb)
-		{
-			if (this.Items == null) return;
-			sb.AppendLine($"# Invalid Bulk items:");
-			foreach(var i in Items.Select((item, i) => new { item, i}).Where(i=>!i.item.IsValid))
-				sb.AppendLine($"  operation[{i.i}]: {i.item}");
-		}
-
-		[JsonProperty("took")]
-		public long Took { get; internal set; }
-
 		[JsonProperty("errors")]
 		public bool Errors { get; internal set; }
 
+		public override bool IsValid => base.IsValid && !Errors && !ItemsWithErrors.HasAny();
+
 		[JsonProperty("items")]
 		public IReadOnlyCollection<IBulkResponseItem> Items { get; internal set; } = EmptyReadOnly<IBulkResponseItem>.Collection;
 
 		[JsonIgnore]
-		public IEnumerable<IBulkResponseItem> ItemsWithErrors => !this.Items.HasAny()
+		public IEnumerable<IBulkResponseItem> ItemsWithErrors => !Items.HasAny()
 			? Enumerable.Empty<IBulkResponseItem>()
-			: this.Items.Where(i => !i.IsValid);
+			: Items.Where(i => !i.IsValid);
+
+		[JsonProperty("took")]
+		public long Took { get; internal set; }
+
+		protected override void DebugIsValid(StringBuilder sb)
+		{
+			if (Items == null) return;
+
+			sb.AppendLine($"# Invalid Bulk items:");
+			foreach (var i in Items.Select((item, i) => new { item, i }).Where(i => !i.item.IsValid))
+				sb.AppendLine($"  operation[{i.i}]: {i.item}");
+		}
 	}
 }
diff --git a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkCreateResponseItem.cs b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkCreateResponseItem.cs
index 7d49d6e9cc4..ecd65b0090d 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkCreateResponseItem.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkCreateResponseItem.cs
@@ -8,4 +8,4 @@ public class BulkCreateResponseItem : BulkResponseItemBase
 	{
 		public override string Operation { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkIndexResponseItem.cs b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkIndexResponseItem.cs
index 78e2d9a1148..5902e466e54 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkIndexResponseItem.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkIndexResponseItem.cs
@@ -7,13 +7,13 @@ namespace Nest
 	[JsonConverter(typeof(BulkResponseItemJsonConverter))]
 	public class BulkIndexResponseItem : BulkResponseItemBase
 	{
-		public override string Operation { get; internal set; }
+		/// <summary>
+		/// The _ids that matched (if any) for the Percolate API.
+		/// Will be null if the operation is not in response to Percolate API.
+		/// </summary>
+		[JsonProperty("matches")]
+		public IEnumerable<string> Matches { get; internal set; }
 
-        /// <summary>
-        /// The _ids that matched (if any) for the Percolate API.
-        /// Will be null if the operation is not in response to Percolate API.
-        /// </summary>
-        [JsonProperty("matches")]
-        public IEnumerable<string> Matches { get; internal set; }
+		public override string Operation { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs
index f75d31209c8..a1781db6e15 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs
@@ -10,9 +10,16 @@ namespace Nest
 	public interface IBulkResponseItem
 	{
 		/// <summary>
-		/// The type of bulk operation
+		/// The error associated with the bulk operation
 		/// </summary>
-		string Operation { get; }
+		[JsonProperty("error")]
+		BulkError Error { get; }
+
+		/// <summary>
+		/// The id of the document for the bulk operation
+		/// </summary>
+		[JsonProperty("_id")]
+		string Id { get; }
 
 		/// <summary>
 		/// The index against which the bulk operation ran
@@ -21,22 +28,17 @@ public interface IBulkResponseItem
 		string Index { get; }
 
 		/// <summary>
-		/// The type against which the bulk operation ran
+		/// Specifies whether this particular bulk operation succeeded or not
 		/// </summary>
-		[JsonProperty("_type")]
-		string Type { get; }
+		bool IsValid { get; }
 
 		/// <summary>
-		/// The id of the document for the bulk operation
+		/// The type of bulk operation
 		/// </summary>
-		[JsonProperty("_id")]
-		string Id { get; }
+		string Operation { get; }
 
-		/// <summary>
-		/// The version of the document
-		/// </summary>
-		[JsonProperty("_version")]
-		long Version { get; }
+		[JsonProperty("_primary_term")]
+		long PrimaryTerm { get; }
 
 		/// <summary>
 		/// The result of the bulk operation
@@ -44,17 +46,8 @@ public interface IBulkResponseItem
 		[JsonProperty("result")]
 		string Result { get; }
 
-		/// <summary>
-		/// The status of the bulk operation
-		/// </summary>
-		[JsonProperty("status")]
-		int Status { get; }
-
-		/// <summary>
-		/// The error associated with the bulk operation
-		/// </summary>
-		[JsonProperty("error")]
-		BulkError Error { get; }
+		[JsonProperty("_seq_no")]
+		long SequenceNumber { get; }
 
 		/// <summary>
 		/// The shards associated with the bulk operation
@@ -62,72 +55,80 @@ public interface IBulkResponseItem
 		[JsonProperty("_shards")]
 		ShardStatistics Shards { get; }
 
-		[JsonProperty("_seq_no")]
-		long SequenceNumber { get; }
+		/// <summary>
+		/// The status of the bulk operation
+		/// </summary>
+		[JsonProperty("status")]
+		int Status { get; }
 
-		[JsonProperty("_primary_term")]
-		long PrimaryTerm { get; }
+		/// <summary>
+		/// The type against which the bulk operation ran
+		/// </summary>
+		[JsonProperty("_type")]
+		string Type { get; }
 
 		/// <summary>
-		/// Specifies whether this particular bulk operation succeeded or not
+		/// The version of the document
 		/// </summary>
-		bool IsValid { get; }
+		[JsonProperty("_version")]
+		long Version { get; }
 	}
 
 	/// <inheritdoc />
 	public abstract class BulkResponseItemBase : IBulkResponseItem
 	{
 		/// <inheritdoc />
-		public abstract string Operation { get; internal set; }
+		public BulkError Error { get; internal set; }
 
 		/// <inheritdoc />
-		public string Index { get; internal set; }
+		public string Id { get; internal set; }
 
 		/// <inheritdoc />
-		public string Type { get; internal set; }
+		public string Index { get; internal set; }
 
 		/// <inheritdoc />
-		public string Id { get; internal set; }
+		public bool IsValid
+		{
+			get
+			{
+				if (Error != null || Type.IsNullOrEmpty()) return false;
+
+				switch (Operation.ToLowerInvariant())
+				{
+					case "delete": return Status == 200 || Status == 404;
+					case "update":
+					case "index":
+					case "create":
+						return Status == 200 || Status == 201;
+					default:
+						return false;
+				}
+			}
+		}
 
 		/// <inheritdoc />
-		public long Version { get; internal set; }
+		public abstract string Operation { get; internal set; }
 
 		/// <inheritdoc />
-		public string Result { get; internal set; }
+		public long PrimaryTerm { get; internal set; }
 
 		/// <inheritdoc />
-		public int Status { get; internal set; }
+		public string Result { get; internal set; }
 
 		/// <inheritdoc />
-		public BulkError Error { get; internal set; }
+		public long SequenceNumber { get; internal set; }
 
 		/// <inheritdoc />
 		public ShardStatistics Shards { get; internal set; }
 
 		/// <inheritdoc />
-		public long SequenceNumber { get; internal set; }
+		public int Status { get; internal set; }
 
 		/// <inheritdoc />
-		public long PrimaryTerm { get; internal set; }
+		public string Type { get; internal set; }
 
 		/// <inheritdoc />
-		public bool IsValid
-		{
-			get
-			{
-				if (this.Error != null || this.Type.IsNullOrEmpty()) return false;
-				switch (this.Operation.ToLowerInvariant())
-				{
-					case "delete": return this.Status == 200 || this.Status == 404;
-					case "update":
-					case "index":
-					case "create":
-						return this.Status == 200 || this.Status == 201;
-					default:
-						return false;
-				}
-			}
-		}
+		public long Version { get; internal set; }
 
 		public override string ToString() =>
 			$"{Operation} returned {Status} _index: {Index} _type: {Type} _id: {Id} _version: {Version} error: {Error}";
diff --git a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemJsonConverter.cs b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemJsonConverter.cs
index 944831479a9..bda1f482942 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemJsonConverter.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemJsonConverter.cs
@@ -5,13 +5,14 @@ namespace Nest
 {
 	internal class BulkResponseItemJsonConverter : JsonConverter
 	{
-		public override bool CanWrite => false;
 		public override bool CanRead => true;
+		public override bool CanWrite => false;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
-										JsonSerializer serializer)
+			JsonSerializer serializer
+		)
 		{
 			reader.Read();
 			if (reader.TokenType != JsonToken.PropertyName)
diff --git a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkUpdateResponseItem.cs b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkUpdateResponseItem.cs
index 720b0e35cf2..ffa59ebca4c 100644
--- a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkUpdateResponseItem.cs
+++ b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkUpdateResponseItem.cs
@@ -8,4 +8,4 @@ public class BulkUpdateResponseItem : BulkResponseItemBase
 	{
 		public override string Operation { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Document/Multiple/Bulk/ElasticClient-Bulk.cs b/src/Nest/Document/Multiple/Bulk/ElasticClient-Bulk.cs
index 1485ec3b89f..d95c7f97aed 100644
--- a/src/Nest/Document/Multiple/Bulk/ElasticClient-Bulk.cs
+++ b/src/Nest/Document/Multiple/Bulk/ElasticClient-Bulk.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,42 +10,44 @@ public partial interface IElasticClient
 		/// <summary>
 		/// The bulk API makes it possible to perform many index/delete operations in a single API call.
 		/// This can greatly increase the indexing speed.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
 		/// </summary>
 		/// <param name="request">A descriptor the describe the index/create/delete operation for this bulk operation</param>
 		IBulkResponse Bulk(IBulkRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IBulkResponse Bulk(Func<BulkDescriptor, IBulkRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IBulkResponse> BulkAsync(IBulkRequest request, CancellationToken cancellationToken = default(CancellationToken));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IBulkResponse> BulkAsync(Func<BulkDescriptor, IBulkRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBulkResponse Bulk(IBulkRequest request) =>
-			this.Dispatcher.Dispatch<IBulkRequest, BulkRequestParameters, BulkResponse>(
-				request, this.LowLevelDispatch.BulkDispatch<BulkResponse>
+			Dispatcher.Dispatch<IBulkRequest, BulkRequestParameters, BulkResponse>(
+				request, LowLevelDispatch.BulkDispatch<BulkResponse>
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBulkResponse Bulk(Func<BulkDescriptor, IBulkRequest> selector) =>
-			this.Bulk(selector.InvokeOrDefault(new BulkDescriptor()));
+			Bulk(selector.InvokeOrDefault(new BulkDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IBulkResponse> BulkAsync(IBulkRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IBulkRequest, BulkRequestParameters, BulkResponse, IBulkResponse>(
-				request, cancellationToken, this.LowLevelDispatch.BulkDispatchAsync<BulkResponse>
+			Dispatcher.DispatchAsync<IBulkRequest, BulkRequestParameters, BulkResponse, IBulkResponse>(
+				request, cancellationToken, LowLevelDispatch.BulkDispatchAsync<BulkResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IBulkResponse> BulkAsync(Func<BulkDescriptor, IBulkRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.BulkAsync(selector.InvokeOrDefault(new BulkDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IBulkResponse> BulkAsync(Func<BulkDescriptor, IBulkRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			BulkAsync(selector.InvokeOrDefault(new BulkDescriptor()), cancellationToken);
 	}
 }
diff --git a/src/Nest/Document/Multiple/Bulk/ElasticClient-DeleteMany.cs b/src/Nest/Document/Multiple/Bulk/ElasticClient-DeleteMany.cs
index acf02cebb05..1dfa034fbfc 100644
--- a/src/Nest/Document/Multiple/Bulk/ElasticClient-DeleteMany.cs
+++ b/src/Nest/Document/Multiple/Bulk/ElasticClient-DeleteMany.cs
@@ -12,14 +12,16 @@ public static class DeleteManyExtensions
 	{
 		/// <summary>
 		/// Shortcut into the Bulk call that deletes the specified objects
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
 		/// </summary>
 		/// <param name="client"></param>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="objects">List of objects to delete</param>
 		/// <param name="index">Override the inferred indexname for T</param>
 		/// <param name="type">Override the inferred typename for T</param>
-		public static IBulkResponse DeleteMany<T>(this IElasticClient client, IEnumerable<T> @objects, IndexName index = null, TypeName type = null) where T : class
+		public static IBulkResponse DeleteMany<T>(this IElasticClient client, IEnumerable<T> @objects, IndexName index = null, TypeName type = null)
+			where T : class
 		{
 			var bulkRequest = CreateDeleteBulkRequest(objects, index, type);
 			return client.Bulk(bulkRequest);
@@ -28,14 +30,17 @@ public static IBulkResponse DeleteMany<T>(this IElasticClient client, IEnumerabl
 
 		/// <summary>
 		/// Shortcut into the Bulk call that deletes the specified objects
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
 		/// </summary>
 		/// <param name="client"></param>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="objects">List of objects to delete</param>
 		/// <param name="index">Override the inferred indexname for T</param>
 		/// <param name="type">Override the inferred typename for T</param>
-		public static Task<IBulkResponse> DeleteManyAsync<T>(this IElasticClient client, IEnumerable<T> objects, IndexName index = null, TypeName type = null, CancellationToken cancellationToken = default(CancellationToken))
+		public static Task<IBulkResponse> DeleteManyAsync<T>(this IElasticClient client, IEnumerable<T> objects, IndexName index = null,
+			TypeName type = null, CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 		{
 			var bulkRequest = CreateDeleteBulkRequest(objects, index, type);
diff --git a/src/Nest/Document/Multiple/Bulk/ElasticClient-IndexMany.cs b/src/Nest/Document/Multiple/Bulk/ElasticClient-IndexMany.cs
index 5cd7ae238c9..0276910bec8 100644
--- a/src/Nest/Document/Multiple/Bulk/ElasticClient-IndexMany.cs
+++ b/src/Nest/Document/Multiple/Bulk/ElasticClient-IndexMany.cs
@@ -12,14 +12,16 @@ public static class IndexManyExtensions
 	{
 		/// <summary>
 		/// Shortcut into the Bulk call that indexes the specified objects
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
 		/// </summary>
 		/// <param name="client"></param>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="objects">List of objects to index, Id will be inferred (Id property or IdProperty attribute on type)</param>
 		/// <param name="index">Override the inferred indexname for T</param>
 		/// <param name="type">Override the inferred typename for T</param>
-		public static IBulkResponse IndexMany<T>(this IElasticClient client, IEnumerable<T> @objects, IndexName index = null, TypeName type = null) where T : class
+		public static IBulkResponse IndexMany<T>(this IElasticClient client, IEnumerable<T> @objects, IndexName index = null, TypeName type = null)
+			where T : class
 		{
 			var bulkRequest = CreateIndexBulkRequest(objects, index, type);
 			return client.Bulk(bulkRequest);
@@ -27,14 +29,17 @@ public static IBulkResponse IndexMany<T>(this IElasticClient client, IEnumerable
 
 		/// <summary>
 		/// Shortcut into the Bulk call that indexes the specified objects
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
 		/// </summary>
 		/// <param name="client"></param>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="objects">List of objects to index, Id will be inferred (Id property or IdProperty attribute on type)</param>
 		/// <param name="index">Override the inferred indexname for T</param>
 		/// <param name="type">Override the inferred typename for T</param>
-		public static Task<IBulkResponse> IndexManyAsync<T>(this IElasticClient client, IEnumerable<T> objects, IndexName index = null, TypeName type = null, CancellationToken cancellationToken = default(CancellationToken))
+		public static Task<IBulkResponse> IndexManyAsync<T>(this IElasticClient client, IEnumerable<T> objects, IndexName index = null,
+			TypeName type = null, CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 		{
 			var bulkRequest = CreateIndexBulkRequest(objects, index, type);
diff --git a/src/Nest/Document/Multiple/BulkAll/BulkAllObservable.cs b/src/Nest/Document/Multiple/BulkAll/BulkAllObservable.cs
index 3d97564a326..498b374e8c9 100644
--- a/src/Nest/Document/Multiple/BulkAll/BulkAllObservable.cs
+++ b/src/Nest/Document/Multiple/BulkAll/BulkAllObservable.cs
@@ -9,19 +9,19 @@ namespace Nest
 {
 	public class BulkAllObservable<T> : IDisposable, IObservable<IBulkAllResponse> where T : class
 	{
-		private readonly IBulkAllRequest<T> _partitionedBulkRequest;
-		private readonly IElasticClient _client;
-		private readonly TimeSpan _backOffTime;
 		private readonly int _backOffRetries;
+		private readonly TimeSpan _backOffTime;
 		private readonly int _bulkSize;
-		private readonly int _maxDegreeOfParallelism;
-		private Action _incrementFailed = () => { };
-		private Action _incrementRetries = () => { };
+		private readonly IElasticClient _client;
 
 		private readonly CancellationToken _compositeCancelToken;
 		private readonly CancellationTokenSource _compositeCancelTokenSource;
-		private readonly Func<IBulkResponseItem, T, bool> _retryPredicate;
 		private readonly Action<IBulkResponseItem, T> _droppedDocumentCallBack;
+		private readonly int _maxDegreeOfParallelism;
+		private readonly IBulkAllRequest<T> _partitionedBulkRequest;
+		private readonly Func<IBulkResponseItem, T, bool> _retryPredicate;
+		private Action _incrementFailed = () => { };
+		private Action _incrementRetries = () => { };
 
 		public BulkAllObservable(
 			IElasticClient client,
@@ -29,43 +29,53 @@ public BulkAllObservable(
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 		{
-			this._client = client;
-			this._partitionedBulkRequest = partitionedBulkRequest;
-			this._backOffRetries = this._partitionedBulkRequest.BackOffRetries.GetValueOrDefault(CoordinatedRequestDefaults.BulkAllBackOffRetriesDefault);
-			this._backOffTime = (this._partitionedBulkRequest?.BackOffTime?.ToTimeSpan() ?? CoordinatedRequestDefaults.BulkAllBackOffTimeDefault);
-			this._bulkSize = this._partitionedBulkRequest.Size ?? CoordinatedRequestDefaults.BulkAllSizeDefault;
-			this._retryPredicate = this._partitionedBulkRequest.RetryDocumentPredicate ?? RetryBulkActionPredicate;
-			this._droppedDocumentCallBack = this._partitionedBulkRequest.DroppedDocumentCallback ?? DroppedDocumentCallbackDefault;
-			this._maxDegreeOfParallelism = _partitionedBulkRequest.MaxDegreeOfParallelism ?? CoordinatedRequestDefaults.BulkAllMaxDegreeOfParallelismDefault;
-			this._compositeCancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-			this._compositeCancelToken = this._compositeCancelTokenSource.Token;
+			_client = client;
+			_partitionedBulkRequest = partitionedBulkRequest;
+			_backOffRetries = _partitionedBulkRequest.BackOffRetries.GetValueOrDefault(CoordinatedRequestDefaults.BulkAllBackOffRetriesDefault);
+			_backOffTime = _partitionedBulkRequest?.BackOffTime?.ToTimeSpan() ?? CoordinatedRequestDefaults.BulkAllBackOffTimeDefault;
+			_bulkSize = _partitionedBulkRequest.Size ?? CoordinatedRequestDefaults.BulkAllSizeDefault;
+			_retryPredicate = _partitionedBulkRequest.RetryDocumentPredicate ?? RetryBulkActionPredicate;
+			_droppedDocumentCallBack = _partitionedBulkRequest.DroppedDocumentCallback ?? DroppedDocumentCallbackDefault;
+			_maxDegreeOfParallelism =
+				_partitionedBulkRequest.MaxDegreeOfParallelism ?? CoordinatedRequestDefaults.BulkAllMaxDegreeOfParallelismDefault;
+			_compositeCancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+			_compositeCancelToken = _compositeCancelTokenSource.Token;
 		}
 
-		public IDisposable Subscribe(BulkAllObserver observer)
+		public bool IsDisposed { get; private set; }
+
+		public void Dispose()
 		{
-			_incrementFailed = observer.IncrementTotalNumberOfFailedBuffers;
-			_incrementRetries = observer.IncrementTotalNumberOfRetries;
-			return this.Subscribe((IObserver<IBulkAllResponse>) observer);
+			IsDisposed = true;
+			_compositeCancelTokenSource?.Cancel();
+			_compositeCancelTokenSource?.Dispose();
 		}
 
 		public IDisposable Subscribe(IObserver<IBulkAllResponse> observer)
 		{
 			observer.ThrowIfNull(nameof(observer));
-			this.BulkAll(observer);
+			BulkAll(observer);
 			return this;
 		}
 
+		public IDisposable Subscribe(BulkAllObserver observer)
+		{
+			_incrementFailed = observer.IncrementTotalNumberOfFailedBuffers;
+			_incrementRetries = observer.IncrementTotalNumberOfRetries;
+			return Subscribe((IObserver<IBulkAllResponse>)observer);
+		}
+
 		private void BulkAll(IObserver<IBulkAllResponse> observer)
 		{
-			var documents = this._partitionedBulkRequest.Documents;
-			var partitioned = new PartitionHelper<T>(documents, this._bulkSize);
+			var documents = _partitionedBulkRequest.Documents;
+			var partitioned = new PartitionHelper<T>(documents, _bulkSize);
 #pragma warning disable 4014
 			partitioned.ForEachAsync(
 #pragma warning restore 4014
-				(buffer, page) => this.BulkAsync(buffer, page, 0),
+				(buffer, page) => BulkAsync(buffer, page, 0),
 				(buffer, response) => observer.OnNext(response),
 				ex => OnCompleted(ex, observer),
-				this._maxDegreeOfParallelism
+				_maxDegreeOfParallelism
 			);
 		}
 
@@ -89,19 +99,21 @@ private void OnCompleted(Exception exception, IObserver<IBulkAllResponse> observ
 
 		private void RefreshOnCompleted()
 		{
-			if (!this._partitionedBulkRequest.RefreshOnCompleted) return;
-			var indices = this._partitionedBulkRequest.RefreshIndices ?? this._partitionedBulkRequest.Index;
+			if (!_partitionedBulkRequest.RefreshOnCompleted) return;
+
+			var indices = _partitionedBulkRequest.RefreshIndices ?? _partitionedBulkRequest.Index;
 			if (indices == null) return;
-			var refresh = this._client.Refresh(indices);
+
+			var refresh = _client.Refresh(indices);
 			if (!refresh.IsValid) throw Throw($"Refreshing after all documents have indexed failed", refresh.ApiCall);
 		}
 
 		private async Task<IBulkAllResponse> BulkAsync(IList<T> buffer, long page, int backOffRetries)
 		{
-			this._compositeCancelToken.ThrowIfCancellationRequested();
+			_compositeCancelToken.ThrowIfCancellationRequested();
 
-			var r = this._partitionedBulkRequest;
-			var response = await this._client.BulkAsync(s =>
+			var r = _partitionedBulkRequest;
+			var response = await _client.BulkAsync(s =>
 				{
 					s.Index(r.Index).Type(r.Type);
 					if (r.BufferToBulk != null) r.BufferToBulk(s, buffer);
@@ -114,41 +126,42 @@ private async Task<IBulkAllResponse> BulkAsync(IList<T> buffer, long page, int b
 					if (r.WaitForActiveShards.HasValue) s.WaitForActiveShards(r.WaitForActiveShards.ToString());
 
 					return s;
-				}, this._compositeCancelToken)
+				}, _compositeCancelToken)
 				.ConfigureAwait(false);
 
-			this._compositeCancelToken.ThrowIfCancellationRequested();
+			_compositeCancelToken.ThrowIfCancellationRequested();
 
 			if (!response.ApiCall.Success)
-				return await this.HandleBulkRequest(buffer, page, backOffRetries, response);
+				return await HandleBulkRequest(buffer, page, backOffRetries, response);
 
 			var documentsWithResponse = response.Items.Zip(buffer, Tuple.Create).ToList();
 
-			this.HandleDroppedDocuments(documentsWithResponse, response);
+			HandleDroppedDocuments(documentsWithResponse, response);
 
 			var retryDocuments = documentsWithResponse
-				.Where(x=> !x.Item1.IsValid && this._retryPredicate(x.Item1, x.Item2))
+				.Where(x => !x.Item1.IsValid && _retryPredicate(x.Item1, x.Item2))
 				.Select(x => x.Item2)
 				.ToList();
 
-			if (retryDocuments.Count > 0 && backOffRetries < this._backOffRetries)
-				return await this.RetryDocuments(page, ++backOffRetries, retryDocuments);
+			if (retryDocuments.Count > 0 && backOffRetries < _backOffRetries)
+				return await RetryDocuments(page, ++backOffRetries, retryDocuments);
 			else if (retryDocuments.Count > 0)
-				throw this.ThrowOnBadBulk(response, $"Bulk indexing failed and after retrying {backOffRetries} times");
+				throw ThrowOnBadBulk(response, $"Bulk indexing failed and after retrying {backOffRetries} times");
 
-			this._partitionedBulkRequest.BackPressure?.Release();
+			_partitionedBulkRequest.BackPressure?.Release();
 			return new BulkAllResponse { Retries = backOffRetries, Page = page };
 		}
 
 		private void HandleDroppedDocuments(List<Tuple<IBulkResponseItem, T>> documentsWithResponse, IBulkResponse response)
 		{
 			var droppedDocuments = documentsWithResponse
-				.Where(x => !x.Item1.IsValid && !this._retryPredicate(x.Item1, x.Item2))
+				.Where(x => !x.Item1.IsValid && !_retryPredicate(x.Item1, x.Item2))
 				.ToList();
 			if (droppedDocuments.Count <= 0) return;
-			foreach (var dropped in droppedDocuments) this._droppedDocumentCallBack(dropped.Item1, dropped.Item2);
-			if (!this._partitionedBulkRequest.ContinueAfterDroppedDocuments)
-				throw this.ThrowOnBadBulk(response, $"BulkAll halted after receiving failures that can not be retried from _bulk");
+
+			foreach (var dropped in droppedDocuments) _droppedDocumentCallBack(dropped.Item1, dropped.Item2);
+			if (!_partitionedBulkRequest.ContinueAfterDroppedDocuments)
+				throw ThrowOnBadBulk(response, $"BulkAll halted after receiving failures that can not be retried from _bulk");
 		}
 
 		private async Task<IBulkAllResponse> HandleBulkRequest(IList<T> buffer, long page, int backOffRetries, IBulkResponse response)
@@ -161,33 +174,35 @@ private async Task<IBulkAllResponse> HandleBulkRequest(IList<T> buffer, long pag
 				case PipelineFailure.MaxRetriesReached:
 					//TODO move this to its own PipelineFailure classification in 7.0
 					if (response.ApiCall.AuditTrail.Last().Event == AuditEvent.FailedOverAllNodes)
-						throw this.ThrowOnBadBulk(response, $"BulkAll halted after attempted bulk failed over all the active nodes");
-					return await this.RetryDocuments(page, ++backOffRetries, buffer);
+						throw ThrowOnBadBulk(response, $"BulkAll halted after attempted bulk failed over all the active nodes");
+
+					return await RetryDocuments(page, ++backOffRetries, buffer);
 				case PipelineFailure.CouldNotStartSniffOnStartup:
 				case PipelineFailure.BadAuthentication:
 				case PipelineFailure.NoNodesAttempted:
 				case PipelineFailure.SniffFailure:
 				case PipelineFailure.Unexpected:
-					throw this.ThrowOnBadBulk(response,
+					throw ThrowOnBadBulk(response,
 						$"BulkAll halted after {nameof(PipelineFailure)}{failureReason.GetStringValue()} from _bulk");
 				default:
-					return await this.RetryDocuments(page, ++backOffRetries, buffer);
+					return await RetryDocuments(page, ++backOffRetries, buffer);
 			}
 		}
 
 		private async Task<IBulkAllResponse> RetryDocuments(long page, int backOffRetries, IList<T> retryDocuments)
 		{
-			this._incrementRetries();
-			await Task.Delay(this._backOffTime, this._compositeCancelToken).ConfigureAwait(false);
-			return await this.BulkAsync(retryDocuments, page, backOffRetries).ConfigureAwait(false);
+			_incrementRetries();
+			await Task.Delay(_backOffTime, _compositeCancelToken).ConfigureAwait(false);
+			return await BulkAsync(retryDocuments, page, backOffRetries).ConfigureAwait(false);
 		}
 
 		private Exception ThrowOnBadBulk(IElasticsearchResponse response, string message)
 		{
-			this._incrementFailed();
-			this._partitionedBulkRequest.BackPressure?.Release();
+			_incrementFailed();
+			_partitionedBulkRequest.BackPressure?.Release();
 			return Throw(message, response.ApiCall);
 		}
+
 		private static ElasticsearchClientException Throw(string message, IApiCallDetails details) =>
 			new ElasticsearchClientException(PipelineFailure.BadResponse, message, details);
 
@@ -195,14 +210,5 @@ private static ElasticsearchClientException Throw(string message, IApiCallDetail
 		private static bool RetryBulkActionPredicate(IBulkResponseItem bulkResponseItem, T d) => bulkResponseItem.Status == 429;
 
 		private static void DroppedDocumentCallbackDefault(IBulkResponseItem bulkResponseItem, T d) { }
-
-		public bool IsDisposed { get; private set; }
-
-		public void Dispose()
-		{
-			this.IsDisposed = true;
-			this._compositeCancelTokenSource?.Cancel();
-			this._compositeCancelTokenSource?.Dispose();
-		}
 	}
 }
diff --git a/src/Nest/Document/Multiple/BulkAll/BulkAllObserver.cs b/src/Nest/Document/Multiple/BulkAll/BulkAllObserver.cs
index 187a279ca7b..3af677656d9 100644
--- a/src/Nest/Document/Multiple/BulkAll/BulkAllObserver.cs
+++ b/src/Nest/Document/Multiple/BulkAll/BulkAllObserver.cs
@@ -8,20 +8,19 @@ public class BulkAllObserver : CoordinatedRequestObserverBase<IBulkAllResponse>
 		private long _totalNumberOfFailedBuffers;
 		private long _totalNumberOfRetries;
 
-		public long TotalNumberOfRetries => _totalNumberOfRetries;
-		public long TotalNumberOfFailedBuffers => _totalNumberOfFailedBuffers;
-
-		internal void IncrementTotalNumberOfRetries() => Interlocked.Increment(ref _totalNumberOfRetries);
-		internal void IncrementTotalNumberOfFailedBuffers() => Interlocked.Increment(ref _totalNumberOfFailedBuffers);
-
 		public BulkAllObserver(
 			Action<IBulkAllResponse> onNext = null,
 			Action<Exception> onError = null,
 			Action onCompleted = null
-			)
-			: base(onNext, onError, onCompleted)
-		{
-		}
+		)
+			: base(onNext, onError, onCompleted) { }
 
+		public long TotalNumberOfFailedBuffers => _totalNumberOfFailedBuffers;
+
+		public long TotalNumberOfRetries => _totalNumberOfRetries;
+
+		internal void IncrementTotalNumberOfRetries() => Interlocked.Increment(ref _totalNumberOfRetries);
+
+		internal void IncrementTotalNumberOfFailedBuffers() => Interlocked.Increment(ref _totalNumberOfFailedBuffers);
 	}
 }
diff --git a/src/Nest/Document/Multiple/BulkAll/BulkAllRequest.cs b/src/Nest/Document/Multiple/BulkAll/BulkAllRequest.cs
index f258f6dc38d..8aea2043fd9 100644
--- a/src/Nest/Document/Multiple/BulkAll/BulkAllRequest.cs
+++ b/src/Nest/Document/Multiple/BulkAll/BulkAllRequest.cs
@@ -1,79 +1,73 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using Elasticsearch.Net;
 
 namespace Nest
 {
 	public interface IBulkAllRequest<T> where T : class
 	{
+		/// <summary> In case of a HTTP 429 (Too Many Requests) response status code, how many times should we automatically back off before failing</summary>
+		int? BackOffRetries { get; set; }
+
 		/// <summary> In case of a HTTP 429 (Too Many Requests) response status code, how long should we wait before retrying</summary>
 		Time BackOffTime { get; set; }
 
-		/// <summary> In case of a HTTP 429 (Too Many Requests) response status code, how many times should we automatically back off before failing</summary>
-		int? BackOffRetries { get; set; }
+		/// <summary>
+		/// Simple back pressure implementation that makes sure the minimum max concurrency between producer and consumer
+		/// is not amplified by the greedier of the two by more then a given back pressure factor
+		/// When set each bulk request will call <see cref="ProducerConsumerBackPressure.Release" />
+		/// </summary>
+		ProducerConsumerBackPressure BackPressure { get; set; }
 
-		/// <summary> The number of documents to send per bulk</summary>
-		int? Size { get; set; }
+		/// <summary>
+		/// By default, <see cref="BulkAllObservable{T}" /> calls <see cref="BulkDescriptor.IndexMany{T}" /> on the buffer.
+		/// There might be case where you'd like more control over the bulk operation. By setting this callback, you are in complete control
+		/// of describing how the buffer should be translated to a bulk operation.
+		/// </summary>
+		Action<BulkDescriptor, IList<T>> BufferToBulk { get; set; }
+
+		/// <summary>
+		/// Halt the bulk all request if any of the documents returned is a failure that can not be retried.
+		/// When true, will feed dropped documents to <see cref="DroppedDocumentCallback" />
+		/// </summary>
+		bool ContinueAfterDroppedDocuments { get; set; }
 
-		///<summary>
-		/// The documents to send to Elasticsearch, ideally lazily evaluated by using <see langword="yield"/>
+		/// <summary>
+		///  The documents to send to Elasticsearch, ideally lazily evaluated by using <see langword="yield" />
 		/// return to provide each document.
-		/// <see cref="BulkAllObservable{T}"/> will eager evaluate each partitioned page when operating on it, using <see cref="Enumerable.ToList{T}"/>.
-		///</summary>
+		/// <see cref="BulkAllObservable{T}" /> will eager evaluate each partitioned page when operating on it, using
+		/// <see cref="Enumerable.ToList{T}" />.
+		/// </summary>
 		IEnumerable<T> Documents { get; }
 
-		///<summary>The maximum number of bulk operations we want to have in flight at a time</summary>
-		int? MaxDegreeOfParallelism { get; set; }
+		/// <summary>
+		/// If a bulk operation fails because it receives documents it can not retry they will be fed to this callback.
+		/// If <see cref="ContinueAfterDroppedDocuments" /> is set to <c>true</c> processing will continue, so this callback can be used
+		/// to feed into a dead letter queue. Otherwise bulk all indexing will be halted.
+		/// </summary>
+		Action<IBulkResponseItem, T> DroppedDocumentCallback { get; set; }
 
 		///<summary>Default index for items which don't provide one</summary>
 		IndexName Index { get; set; }
 
-		///<summary>Default document type for items which don't provide one</summary>
-		TypeName Type { get; set; }
+		///<summary>The maximum number of bulk operations we want to have in flight at a time</summary>
+		int? MaxDegreeOfParallelism { get; set; }
 
-		///<summary>
-		///Sets the number of shard copies that must be active before proceeding with the bulk operation.
-		///Defaults to <c>1</c>, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any
-		///non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
-		///</summary>
-		int? WaitForActiveShards { get; set; }
+		///<summary>The pipeline id to preprocess all the incoming documents with</summary>
+		string Pipeline { get; set; }
 
 		///<summary>Refresh the index after performing each operation (Elasticsearch will refresh locally)</summary>
 		[Obsolete("This option is scheduled for deletion in 7.0, refreshing on each _bulk makes little sense for BulkAll")]
 		Refresh? Refresh { get; set; }
 
-		///<summary>
-		/// Refresh the index after performing ALL the bulk operations (NOTE this is an additional request)
-		/// </summary>
-		bool RefreshOnCompleted { get; set; }
-
-		///<summary>The indices you wish to refresh after the bulk all completes, defaults to <see cref="Index"/> </summary>
+		/// <summary>The indices you wish to refresh after the bulk all completes, defaults to <see cref="Index" /> </summary>
 		Indices RefreshIndices { get; set; }
 
-		///<summary>Specific per bulk operation routing value</summary>
-		Routing Routing { get; set; }
-
-		///<summary>Explicit per operation timeout</summary>
-		Time Timeout { get; set; }
-
-		///<summary>The pipeline id to preprocess all the incoming documents with</summary>
-		string Pipeline { get; set; }
-
 		/// <summary>
-		/// By default, <see cref="BulkAllObservable{T}"/> calls <see cref="BulkDescriptor.IndexMany{T}"/> on the buffer.
-		/// There might be case where you'd like more control over the bulk operation. By setting this callback, you are in complete control
-		/// of describing how the buffer should be translated to a bulk operation.
+		///  Refresh the index after performing ALL the bulk operations (NOTE this is an additional request)
 		/// </summary>
-		Action<BulkDescriptor, IList<T>> BufferToBulk { get; set; }
-
-		/// <summary>
-		/// Simple back pressure implementation that makes sure the minimum max concurrency between producer and consumer
-		/// is not amplified by the greedier of the two by more then a given back pressure factor
-		/// When set each bulk request will call <see cref="ProducerConsumerBackPressure.Release"/>
-		/// </summary>
-		ProducerConsumerBackPressure BackPressure { get; set; }
+		bool RefreshOnCompleted { get; set; }
 
 		/// <summary>
 		/// A predicate to control which documents should be retried.
@@ -81,69 +75,92 @@ public interface IBulkAllRequest<T> where T : class
 		/// </summary>
 		Func<IBulkResponseItem, T, bool> RetryDocumentPredicate { get; set; }
 
-		/// <summary>
-		/// Halt the bulk all request if any of the documents returned is a failure that can not be retried.
-		/// When true, will feed dropped documents to <see cref="DroppedDocumentCallback"/>
-		/// </summary>
-		bool ContinueAfterDroppedDocuments { get; set; }
+		///<summary>Specific per bulk operation routing value</summary>
+		Routing Routing { get; set; }
+
+		/// <summary> The number of documents to send per bulk</summary>
+		int? Size { get; set; }
+
+		///<summary>Explicit per operation timeout</summary>
+		Time Timeout { get; set; }
+
+		///<summary>Default document type for items which don't provide one</summary>
+		TypeName Type { get; set; }
 
 		/// <summary>
-		/// If a bulk operation fails because it receives documents it can not retry they will be fed to this callback.
-		/// If <see cref="ContinueAfterDroppedDocuments"/> is set to <c>true</c> processing will continue, so this callback can be used
-		/// to feed into a dead letter queue. Otherwise bulk all indexing will be halted.
+		/// Sets the number of shard copies that must be active before proceeding with the bulk operation.
+		/// Defaults to <c>1</c>, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any
+		/// non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
 		/// </summary>
-		Action<IBulkResponseItem, T> DroppedDocumentCallback { get; set; }
-
+		int? WaitForActiveShards { get; set; }
 	}
 
-	public class BulkAllRequest<T>  : IBulkAllRequest<T>
+	public class BulkAllRequest<T> : IBulkAllRequest<T>
 		where T : class
 	{
+		public BulkAllRequest(IEnumerable<T> documents)
+		{
+			Documents = documents;
+			Index = typeof(T);
+			Type = typeof(T);
+		}
+
+		/// <inheritdoc />
+		public int? BackOffRetries { get; set; }
+
 		/// <inheritdoc />
 		public Time BackOffTime { get; set; }
+
 		/// <inheritdoc />
-		public int? Size { get; set; }
+		public ProducerConsumerBackPressure BackPressure { get; set; }
+
 		/// <inheritdoc />
-		public int? MaxDegreeOfParallelism { get; set; }
+		public Action<BulkDescriptor, IList<T>> BufferToBulk { get; set; }
+
 		/// <inheritdoc />
-		public int? BackOffRetries { get; set; }
+		public bool ContinueAfterDroppedDocuments { get; set; }
+
 		/// <inheritdoc />
 		public IEnumerable<T> Documents { get; }
+
+		/// <inheritdoc />
+		public Action<IBulkResponseItem, T> DroppedDocumentCallback { get; set; }
+
 		/// <inheritdoc />
 		public IndexName Index { get; set; }
+
 		/// <inheritdoc />
-		public TypeName Type { get; set; }
+		public int? MaxDegreeOfParallelism { get; set; }
+
 		/// <inheritdoc />
-		public int? WaitForActiveShards { get; set; }
+		public string Pipeline { get; set; }
+
 		/// <inheritdoc />
 		public Refresh? Refresh { get; set; }
+
 		/// <inheritdoc />
 		public Indices RefreshIndices { get; set; }
+
 		/// <inheritdoc />
 		public bool RefreshOnCompleted { get; set; }
+
 		/// <inheritdoc />
-		public Routing Routing { get; set; }
-		/// <inheritdoc />
-		public Time Timeout { get; set; }
-		/// <inheritdoc />
-		public string Pipeline { get; set; }
-		/// <inheritdoc />
-		public Action<BulkDescriptor, IList<T>> BufferToBulk { get; set; }
+		public Func<IBulkResponseItem, T, bool> RetryDocumentPredicate { get; set; }
+
 		/// <inheritdoc />
-		public ProducerConsumerBackPressure BackPressure { get; set; }
+		public Routing Routing { get; set; }
+
 		/// <inheritdoc />
-		public Func<IBulkResponseItem, T, bool> RetryDocumentPredicate { get; set; }
+		public int? Size { get; set; }
+
 		/// <inheritdoc />
-		public bool ContinueAfterDroppedDocuments { get; set; }
+		public Time Timeout { get; set; }
+
 		/// <inheritdoc />
-		public Action<IBulkResponseItem, T> DroppedDocumentCallback { get; set; }
+		public TypeName Type { get; set; }
 
-		public BulkAllRequest(IEnumerable<T> documents)
-		{
-			this.Documents = documents;
-			this.Index = typeof(T);
-			this.Type = typeof(T);
-		}
+		/// <inheritdoc />
+		public int? WaitForActiveShards { get; set; }
 	}
 
 	public class BulkAllDescriptor<T> : DescriptorBase<BulkAllDescriptor<T>, IBulkAllRequest<T>>, IBulkAllRequest<T>
@@ -151,32 +168,33 @@ public class BulkAllDescriptor<T> : DescriptorBase<BulkAllDescriptor<T>, IBulkAl
 	{
 		private readonly IEnumerable<T> _documents;
 
-		Time IBulkAllRequest<T>.BackOffTime { get; set; }
-		int? IBulkAllRequest<T>.Size { get; set; }
+		public BulkAllDescriptor(IEnumerable<T> documents)
+		{
+			_documents = documents;
+			((IBulkAllRequest<T>)this).Index = typeof(T);
+			((IBulkAllRequest<T>)this).Type = typeof(T);
+		}
+
 		int? IBulkAllRequest<T>.BackOffRetries { get; set; }
-		int? IBulkAllRequest<T>.MaxDegreeOfParallelism { get; set; }
-		IEnumerable<T> IBulkAllRequest<T>.Documents => this._documents;
+
+		Time IBulkAllRequest<T>.BackOffTime { get; set; }
+		ProducerConsumerBackPressure IBulkAllRequest<T>.BackPressure { get; set; }
+		Action<BulkDescriptor, IList<T>> IBulkAllRequest<T>.BufferToBulk { get; set; }
+		bool IBulkAllRequest<T>.ContinueAfterDroppedDocuments { get; set; }
+		IEnumerable<T> IBulkAllRequest<T>.Documents => _documents;
+		Action<IBulkResponseItem, T> IBulkAllRequest<T>.DroppedDocumentCallback { get; set; }
 		IndexName IBulkAllRequest<T>.Index { get; set; }
-		TypeName IBulkAllRequest<T>.Type { get; set; }
-		int? IBulkAllRequest<T>.WaitForActiveShards { get; set; }
+		int? IBulkAllRequest<T>.MaxDegreeOfParallelism { get; set; }
+		string IBulkAllRequest<T>.Pipeline { get; set; }
 		Refresh? IBulkAllRequest<T>.Refresh { get; set; }
 		Indices IBulkAllRequest<T>.RefreshIndices { get; set; }
 		bool IBulkAllRequest<T>.RefreshOnCompleted { get; set; }
+		Func<IBulkResponseItem, T, bool> IBulkAllRequest<T>.RetryDocumentPredicate { get; set; }
 		Routing IBulkAllRequest<T>.Routing { get; set; }
+		int? IBulkAllRequest<T>.Size { get; set; }
 		Time IBulkAllRequest<T>.Timeout { get; set; }
-		string IBulkAllRequest<T>.Pipeline { get; set; }
-		Action<BulkDescriptor, IList<T>>  IBulkAllRequest<T>.BufferToBulk { get; set; }
-		ProducerConsumerBackPressure IBulkAllRequest<T>.BackPressure { get; set; }
-		Func<IBulkResponseItem, T, bool> IBulkAllRequest<T>.RetryDocumentPredicate { get; set; }
-		bool IBulkAllRequest<T>.ContinueAfterDroppedDocuments { get; set; }
-		Action<IBulkResponseItem, T> IBulkAllRequest<T>.DroppedDocumentCallback { get; set; }
-
-		public BulkAllDescriptor(IEnumerable<T> documents)
-		{
-			this._documents = documents;
-			((IBulkAllRequest<T>)this).Index = typeof(T);
-			((IBulkAllRequest<T>)this).Type = typeof(T);
-		}
+		TypeName IBulkAllRequest<T>.Type { get; set; }
+		int? IBulkAllRequest<T>.WaitForActiveShards { get; set; }
 
 		/// <inheritdoc cref="IBulkAllRequest{T}.MaxDegreeOfParallelism" />
 		public BulkAllDescriptor<T> MaxDegreeOfParallelism(int? parallelism) =>
@@ -212,30 +230,30 @@ public BulkAllDescriptor<T> BackOffRetries(int? backoffs) =>
 		public BulkAllDescriptor<T> Refresh(Refresh? refresh) => Assign(p => p.Refresh = refresh);
 #pragma warning restore 618
 
-		/// <inheritdoc cref="IBulkAllRequest{T}.RefreshIndices"/>
+		/// <inheritdoc cref="IBulkAllRequest{T}.RefreshIndices" />
 		public BulkAllDescriptor<T> RefreshIndices(Indices indicesToRefresh) => Assign(a => a.RefreshIndices = indicesToRefresh);
 
-		/// <inheritdoc cref="IBulkAllRequest{T}.Routing"/>
+		/// <inheritdoc cref="IBulkAllRequest{T}.Routing" />
 		public BulkAllDescriptor<T> Routing(Routing routing) => Assign(p => p.Routing = routing);
 
-		/// <inheritdoc cref="IBulkAllRequest{T}.Timeout"/>
+		/// <inheritdoc cref="IBulkAllRequest{T}.Timeout" />
 		public BulkAllDescriptor<T> Timeout(Time timeout) => Assign(p => p.Timeout = timeout);
 
-		/// <inheritdoc cref="IBulkAllRequest{T}.Pipeline"/>
+		/// <inheritdoc cref="IBulkAllRequest{T}.Pipeline" />
 		public BulkAllDescriptor<T> Pipeline(string pipeline) => Assign(p => p.Pipeline = pipeline);
 
-		/// <inheritdoc cref="IBulkAllRequest{T}.BufferToBulk"/>
+		/// <inheritdoc cref="IBulkAllRequest{T}.BufferToBulk" />
 		public BulkAllDescriptor<T> BufferToBulk(Action<BulkDescriptor, IList<T>> modifier) => Assign(p => p.BufferToBulk = modifier);
 
-		/// <inheritdoc cref="IBulkAllRequest{T}.RetryDocumentPredicate"/>
+		/// <inheritdoc cref="IBulkAllRequest{T}.RetryDocumentPredicate" />
 		public BulkAllDescriptor<T> RetryDocumentPredicate(Func<IBulkResponseItem, T, bool> predicate) =>
 			Assign(p => p.RetryDocumentPredicate = predicate);
 
 		/// <summary>
 		/// Simple back pressure implementation that makes sure the minimum max concurrency between producer and consumer
 		/// is not amplified by the greedier of the two by more then a given back pressure factor
-		/// When set each scroll request will additionally wait on <see cref="ProducerConsumerBackPressure.WaitAsync"/> as well as
-		/// <see cref="MaxDegreeOfParallelism"/> if set. Not that the consumer has to call <see cref="ProducerConsumerBackPressure.Release"/>
+		/// When set each scroll request will additionally wait on <see cref="ProducerConsumerBackPressure.WaitAsync" /> as well as
+		/// <see cref="MaxDegreeOfParallelism" /> if set. Not that the consumer has to call <see cref="ProducerConsumerBackPressure.Release" />
 		/// on the same instance every time it is done.
 		/// </summary>
 		/// <param name="maxConcurrency">The minimum maximum concurrency which would be the bottleneck of the producer consumer pipeline</param>
@@ -246,9 +264,8 @@ public BulkAllDescriptor<T> BackPressure(int maxConcurrency, int? backPressureFa
 		/// <inheritdoc cref="IBulkAllRequest{T}.ContinueAfterDroppedDocuments" />
 		public BulkAllDescriptor<T> ContinueAfterDroppedDocuments(bool proceed = true) => Assign(p => p.ContinueAfterDroppedDocuments = proceed);
 
-		/// <inheritdoc cref="IBulkAllRequest{T}.DroppedDocumentCallback"/>
+		/// <inheritdoc cref="IBulkAllRequest{T}.DroppedDocumentCallback" />
 		public BulkAllDescriptor<T> DroppedDocumentCallback(Action<IBulkResponseItem, T> callback) =>
 			Assign(p => p.DroppedDocumentCallback = callback);
-
 	}
 }
diff --git a/src/Nest/Document/Multiple/BulkAll/BulkAllResponse.cs b/src/Nest/Document/Multiple/BulkAll/BulkAllResponse.cs
index b64352f4dae..b768847d466 100644
--- a/src/Nest/Document/Multiple/BulkAll/BulkAllResponse.cs
+++ b/src/Nest/Document/Multiple/BulkAll/BulkAllResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -14,7 +12,6 @@ public interface IBulkAllResponse
 
 		/// <summary>The number of back off retries were needed to store this document.</summary>
 		int Retries { get; }
-
 	}
 
 	/// <inheritdoc />
@@ -22,12 +19,12 @@ public interface IBulkAllResponse
 	public class BulkAllResponse : IBulkAllResponse
 	{
 		/// <inheritdoc />
-		public long Page { get; internal set; }
+		public bool IsValid => true;
 
 		/// <inheritdoc />
-		public int Retries { get; internal set; }
+		public long Page { get; internal set; }
 
 		/// <inheritdoc />
-		public bool IsValid => true;
+		public int Retries { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Multiple/BulkAll/ElasticClient-BulkAll.cs b/src/Nest/Document/Multiple/BulkAll/ElasticClient-BulkAll.cs
index 7e3c5557e85..12a1382c433 100644
--- a/src/Nest/Document/Multiple/BulkAll/ElasticClient-BulkAll.cs
+++ b/src/Nest/Document/Multiple/BulkAll/ElasticClient-BulkAll.cs
@@ -14,7 +14,7 @@ BulkAllObservable<T> BulkAll<T>(
 			IEnumerable<T> documents,
 			Func<BulkAllDescriptor<T>, IBulkAllRequest<T>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
-			)
+		)
 			where T : class;
 
 		/// <summary>
@@ -26,16 +26,16 @@ BulkAllObservable<T> BulkAll<T>(
 	public partial class ElasticClient
 	{
 		///<inheritdoc />
-		public BulkAllObservable<T>  BulkAll<T>(
+		public BulkAllObservable<T> BulkAll<T>(
 			IEnumerable<T> documents,
 			Func<BulkAllDescriptor<T>, IBulkAllRequest<T>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
-			)
+		)
 			where T : class =>
-			this.BulkAll<T>(selector.InvokeOrDefault(new BulkAllDescriptor<T>(documents)), cancellationToken);
+			BulkAll<T>(selector.InvokeOrDefault(new BulkAllDescriptor<T>(documents)), cancellationToken);
 
 		///<inheritdoc />
-		public BulkAllObservable<T>  BulkAll<T>(IBulkAllRequest<T> request, CancellationToken cancellationToken = default(CancellationToken))
+		public BulkAllObservable<T> BulkAll<T>(IBulkAllRequest<T> request, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class =>
 			new BulkAllObservable<T>(this, request, cancellationToken);
 	}
diff --git a/src/Nest/Document/Multiple/BulkIndexByScrollFailure.cs b/src/Nest/Document/Multiple/BulkIndexByScrollFailure.cs
index bbd358054c8..42bfdb1944a 100644
--- a/src/Nest/Document/Multiple/BulkIndexByScrollFailure.cs
+++ b/src/Nest/Document/Multiple/BulkIndexByScrollFailure.cs
@@ -6,28 +6,28 @@ namespace Nest
 	[JsonObject]
 	public class BulkIndexByScrollFailure
 	{
-		[JsonProperty("index")]
-		public string Index { get; set; }
-
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
+		[JsonProperty("cause")]
+		public BulkIndexFailureCause Cause { get; set; }
 
 		[JsonProperty("id")]
 		public string Id { get; internal set; }
 
-		[JsonProperty("cause")]
-		public BulkIndexFailureCause Cause { get; set; }
+		[JsonProperty("index")]
+		public string Index { get; set; }
 
 		[JsonProperty("status")]
 		public int Status { get; set; }
+
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 
 	[JsonObject]
 	[ContractJsonConverter(typeof(ErrorCauseJsonConverter<BulkIndexFailureCause>))]
 	public class BulkIndexFailureCause : Error
 	{
-		public string IndexUniqueId => this.Metadata?.IndexUUID;
-		public int? Shard => this.Metadata?.Shard;
-		public string Index => this.Metadata?.Index;
+		public string Index => Metadata?.Index;
+		public string IndexUniqueId => Metadata?.IndexUUID;
+		public int? Shard => Metadata?.Shard;
 	}
 }
diff --git a/src/Nest/Document/Multiple/DeleteByQuery/DeleteByQueryRequest.cs b/src/Nest/Document/Multiple/DeleteByQuery/DeleteByQueryRequest.cs
index 1aa9ea57cbb..96dba8da540 100644
--- a/src/Nest/Document/Multiple/DeleteByQuery/DeleteByQueryRequest.cs
+++ b/src/Nest/Document/Multiple/DeleteByQuery/DeleteByQueryRequest.cs
@@ -25,7 +25,7 @@ public partial interface IDeleteByQueryRequest
 	/// <inheritdoc />
 	public interface IDeleteByQueryRequest<T> : IDeleteByQueryRequest where T : class { }
 
-	/// <inheritdoc cref="IDeleteByQueryRequest"/>
+	/// <inheritdoc cref="IDeleteByQueryRequest" />
 	public partial class DeleteByQueryRequest
 	{
 		/// <inheritdoc />
@@ -35,11 +35,11 @@ public partial class DeleteByQueryRequest
 		public ISlicedScroll Slice { get; set; }
 	}
 
-	/// <inheritdoc cref="IDeleteByQueryRequest"/>
+	/// <inheritdoc cref="IDeleteByQueryRequest" />
 	public partial class DeleteByQueryRequest<T> : IDeleteByQueryRequest<T>
 		where T : class
 	{
-		public DeleteByQueryRequest() : this(typeof(T), typeof(T)){ }
+		public DeleteByQueryRequest() : this(typeof(T), typeof(T)) { }
 
 		/// <inheritdoc />
 		public QueryContainer Query { get; set; }
@@ -48,7 +48,7 @@ public DeleteByQueryRequest() : this(typeof(T), typeof(T)){ }
 		public ISlicedScroll Slice { get; set; }
 	}
 
-	/// <inheritdoc cref="IDeleteByQueryRequest"/>
+	/// <inheritdoc cref="IDeleteByQueryRequest" />
 	public partial class DeleteByQueryDescriptor<T> : IDeleteByQueryRequest<T>
 		where T : class
 	{
@@ -57,7 +57,7 @@ public partial class DeleteByQueryDescriptor<T> : IDeleteByQueryRequest<T>
 
 		/// <summary>
 		/// A match_all query to select all documents. Convenient shorthand for specifying
-		/// a match_all query using <see cref="Query"/>
+		/// a match_all query using <see cref="Query" />
 		/// </summary>
 		public DeleteByQueryDescriptor<T> MatchAll() => Assign(a => a.Query = new QueryContainerDescriptor<T>().MatchAll());
 
diff --git a/src/Nest/Document/Multiple/DeleteByQuery/DeleteByQueryResponse.cs b/src/Nest/Document/Multiple/DeleteByQuery/DeleteByQueryResponse.cs
index 4a398d53bd1..c08b27d01b7 100644
--- a/src/Nest/Document/Multiple/DeleteByQuery/DeleteByQueryResponse.cs
+++ b/src/Nest/Document/Multiple/DeleteByQuery/DeleteByQueryResponse.cs
@@ -5,82 +5,81 @@ namespace Nest
 {
 	public interface IDeleteByQueryResponse : IResponse
 	{
-		[JsonProperty("took")]
-		long Took { get; }
-
-		/// <summary>
-		/// Only has a value if WaitForCompletion is set to false on the request
-		/// </summary>
-		[JsonProperty("task")]
-		TaskId Task { get; }
-
-		[JsonProperty("timed_out")]
-		bool TimedOut { get; }
-
-		[JsonProperty("slice_id")]
-		int? SliceId { get; }
+		[JsonProperty("batches")]
+		long Batches { get; }
 
 		[JsonProperty("deleted")]
 		long Deleted { get; }
 
-		[JsonProperty("batches")]
-		long Batches { get; }
-
-		[JsonProperty("version_conflicts")]
-		long VersionConflicts { get; }
+		[JsonProperty("failures")]
+		IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; }
 
 		[JsonProperty("noops")]
 		long Noops { get; }
 
+		[JsonProperty("requests_per_second")]
+		float RequestsPerSecond { get; }
+
 		[JsonProperty("retries")]
 		Retries Retries { get; }
 
+		[JsonProperty("slice_id")]
+		int? SliceId { get; }
+
+		/// <summary>
+		/// Only has a value if WaitForCompletion is set to false on the request
+		/// </summary>
+		[JsonProperty("task")]
+		TaskId Task { get; }
+
 		[JsonProperty("throttled_millis")]
 		long ThrottledMilliseconds { get; }
 
-		[JsonProperty("requests_per_second")]
-		float RequestsPerSecond { get; }
-
 		[JsonProperty("throttled_until_millis")]
 		long ThrottledUntilMilliseconds { get; }
 
+		[JsonProperty("timed_out")]
+		bool TimedOut { get; }
+
+		[JsonProperty("took")]
+		long Took { get; }
+
 		[JsonProperty("total")]
 		long Total { get; }
 
-		[JsonProperty("failures")]
-		IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; }
+		[JsonProperty("version_conflicts")]
+		long VersionConflicts { get; }
 	}
 
 	public class DeleteByQueryResponse : ResponseBase, IDeleteByQueryResponse
 	{
-		public override bool IsValid => this.ApiCall?.HttpStatusCode == 200 || !this.Failures.HasAny();
-
-		public long Took { get; internal set; }
-
-		public TaskId Task { get; internal set; }
-
-		public bool TimedOut { get; internal set; }
-
-		public int? SliceId { get; internal set; }
+		public long Batches { get; internal set; }
 
 		public long Deleted { get; internal set; }
 
-		public long Batches { get; internal set; }
-
-		public long VersionConflicts { get; internal set; }
+		public IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; internal set; } = EmptyReadOnly<BulkIndexByScrollFailure>.Collection;
+		public override bool IsValid => ApiCall?.HttpStatusCode == 200 || !Failures.HasAny();
 
 		public long Noops { get; internal set; }
 
+		public float RequestsPerSecond { get; internal set; }
+
 		public Retries Retries { get; internal set; }
 
-		public long ThrottledMilliseconds { get; internal set; }
+		public int? SliceId { get; internal set; }
 
-		public float RequestsPerSecond { get; internal set; }
+		public TaskId Task { get; internal set; }
+
+		public long ThrottledMilliseconds { get; internal set; }
 
 		public long ThrottledUntilMilliseconds { get; internal set; }
 
+		public bool TimedOut { get; internal set; }
+
+		public long Took { get; internal set; }
+
 		public long Total { get; internal set; }
 
-		public IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; internal set; } = EmptyReadOnly<BulkIndexByScrollFailure>.Collection;
+		public long VersionConflicts { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Multiple/DeleteByQuery/ElasticClient-DeleteByQuery.cs b/src/Nest/Document/Multiple/DeleteByQuery/ElasticClient-DeleteByQuery.cs
index 8c2f6e0eb1d..8bfb9b2babe 100644
--- a/src/Nest/Document/Multiple/DeleteByQuery/ElasticClient-DeleteByQuery.cs
+++ b/src/Nest/Document/Multiple/DeleteByQuery/ElasticClient-DeleteByQuery.cs
@@ -1,8 +1,7 @@
 using System;
-using System.CodeDom;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,49 +9,59 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The delete by query API allows to delete documents from one or more indices and one or more types based on a query.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete-by-query.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete-by-query.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete-by-query.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete-by-query.html</a>
 		/// </summary>
-		/// <typeparam name="T">The type used to infer the default index and typename as well as describe the strongly
-		///  typed parts of the query</typeparam>
+		/// <typeparam name="T">
+		/// The type used to infer the default index and typename as well as describe the strongly
+		///  typed parts of the query
+		/// </typeparam>
 		/// <param name="selector">An optional descriptor to further describe the delete by query operation</param>
 		IDeleteByQueryResponse DeleteByQuery<T>(Func<DeleteByQueryDescriptor<T>, IDeleteByQueryRequest> selector)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteByQueryResponse DeleteByQuery(IDeleteByQueryRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteByQueryResponse> DeleteByQueryAsync<T>(Func<DeleteByQueryDescriptor<T>, IDeleteByQueryRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IDeleteByQueryResponse> DeleteByQueryAsync<T>(Func<DeleteByQueryDescriptor<T>, IDeleteByQueryRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
-		Task<IDeleteByQueryResponse> DeleteByQueryAsync(IDeleteByQueryRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<IDeleteByQueryResponse> DeleteByQueryAsync(IDeleteByQueryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteByQueryResponse DeleteByQuery<T>(Func<DeleteByQueryDescriptor<T>, IDeleteByQueryRequest> selector) where T : class =>
-			this.DeleteByQuery(selector?.Invoke(new DeleteByQueryDescriptor<T>(typeof(T))));
+			DeleteByQuery(selector?.Invoke(new DeleteByQueryDescriptor<T>(typeof(T))));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteByQueryResponse DeleteByQuery(IDeleteByQueryRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteByQueryRequest, DeleteByQueryRequestParameters, DeleteByQueryResponse>(
+			Dispatcher.Dispatch<IDeleteByQueryRequest, DeleteByQueryRequestParameters, DeleteByQueryResponse>(
 				ForceConfiguration<IDeleteByQueryRequest, DeleteByQueryRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
-				this.LowLevelDispatch.DeleteByQueryDispatch<DeleteByQueryResponse>
+				LowLevelDispatch.DeleteByQueryDispatch<DeleteByQueryResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteByQueryResponse> DeleteByQueryAsync<T>(Func<DeleteByQueryDescriptor<T>, IDeleteByQueryRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.DeleteByQueryAsync(selector?.Invoke(new DeleteByQueryDescriptor<T>(typeof(T))), cancellationToken);
+		/// <inheritdoc />
+		public Task<IDeleteByQueryResponse> DeleteByQueryAsync<T>(Func<DeleteByQueryDescriptor<T>, IDeleteByQueryRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			DeleteByQueryAsync(selector?.Invoke(new DeleteByQueryDescriptor<T>(typeof(T))), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeleteByQueryResponse> DeleteByQueryAsync(IDeleteByQueryRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteByQueryRequest, DeleteByQueryRequestParameters, DeleteByQueryResponse, IDeleteByQueryResponse>(
+		/// <inheritdoc />
+		public Task<IDeleteByQueryResponse> DeleteByQueryAsync(IDeleteByQueryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteByQueryRequest, DeleteByQueryRequestParameters, DeleteByQueryResponse, IDeleteByQueryResponse>(
 				ForceConfiguration<IDeleteByQueryRequest, DeleteByQueryRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
 				cancellationToken,
-				this.LowLevelDispatch.DeleteByQueryDispatchAsync<DeleteByQueryResponse>
+				LowLevelDispatch.DeleteByQueryDispatchAsync<DeleteByQueryResponse>
 			);
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/ElasticClient-GetMany.cs b/src/Nest/Document/Multiple/MultiGet/ElasticClient-GetMany.cs
index fda5444da3c..f45f8d0adbf 100644
--- a/src/Nest/Document/Multiple/MultiGet/ElasticClient-GetMany.cs
+++ b/src/Nest/Document/Multiple/MultiGet/ElasticClient-GetMany.cs
@@ -15,18 +15,21 @@ public static class GetManyExtensions
 		/// Multi GET API allows to get multiple documents based on an index, type (optional) and id (and possibly routing).
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
-		/// <para> </para>>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// >http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="client"></param>
 		/// <param name="ids">IEnumerable of ids as string for the documents to fetch</param>
 		/// <param name="index">Optionally override the default inferred index name for T</param>
 		/// <param name="type">Optionally overiide the default inferred typename for T</param>
-		public static IEnumerable<IMultiGetHit<T>> GetMany<T>(this IElasticClient client, IEnumerable<string> ids, IndexName index = null, TypeName type = null)
+		public static IEnumerable<IMultiGetHit<T>> GetMany<T>(this IElasticClient client, IEnumerable<string> ids, IndexName index = null,
+			TypeName type = null
+		)
 			where T : class
 		{
 			var result = client.MultiGet(s => s
-				.RequestConfiguration(r=>r.ThrowExceptions())
+				.RequestConfiguration(r => r.ThrowExceptions())
 				.GetMany<T>(ids)
 				.Index(index)
 				.Type(type)
@@ -38,24 +41,25 @@ public static IEnumerable<IMultiGetHit<T>> GetMany<T>(this IElasticClient client
 		/// Multi GET API allows to get multiple documents based on an index, type (optional) and id (and possibly routing).
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
-		/// <para> </para>>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// >http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="client"></param>
 		/// <param name="ids">IEnumerable of ids as ints for the documents to fetch</param>
 		/// <param name="index">Optionally override the default inferred index name for T</param>
 		/// <param name="type">Optionally overiide the default inferred typename for T</param>
-		public static IEnumerable<IMultiGetHit<T>> GetMany<T>(this IElasticClient client, IEnumerable<long> ids, IndexName index = null, TypeName type = null)
-			where T : class
-		{
-			return client.GetMany<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)), index, type);
-		}
+		public static IEnumerable<IMultiGetHit<T>> GetMany<T>(this IElasticClient client, IEnumerable<long> ids, IndexName index = null,
+			TypeName type = null
+		)
+			where T : class => client.GetMany<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)), index, type);
 
 		/// <summary>
 		/// Multi GET API allows to get multiple documents based on an index, type (optional) and id (and possibly routing).
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
-		/// <para> </para>>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// >http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="client"></param>
@@ -63,16 +67,19 @@ public static IEnumerable<IMultiGetHit<T>> GetMany<T>(this IElasticClient client
 		/// <param name="index">Optionally override the default inferred index name for T</param>
 		/// <param name="type">Optionally overiide the default inferred typename for T</param>
 		public static async Task<IEnumerable<IMultiGetHit<T>>> GetManyAsync<T>(
-			this IElasticClient client, IEnumerable<string> ids, IndexName index = null, TypeName type = null, CancellationToken cancellationToken = default(CancellationToken))
+			this IElasticClient client, IEnumerable<string> ids, IndexName index = null, TypeName type = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 		{
 			var response = await client.MultiGetAsync(s => s
-				.RequestConfiguration(r=>r.ThrowExceptions())
-				.GetMany<T>(ids)
-				.Index(index)
-				.Type(type),
-				cancellationToken
-			) .ConfigureAwait(false);
+						.RequestConfiguration(r => r.ThrowExceptions())
+						.GetMany<T>(ids)
+						.Index(index)
+						.Type(type),
+					cancellationToken
+				)
+				.ConfigureAwait(false);
 			return response.GetMany<T>(ids);
 		}
 
@@ -80,7 +87,8 @@ public static async Task<IEnumerable<IMultiGetHit<T>>> GetManyAsync<T>(
 		/// Multi GET API allows to get multiple documents based on an index, type (optional) and id (and possibly routing).
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
-		/// <para> </para>>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// >http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="client"></param>
@@ -88,10 +96,9 @@ public static async Task<IEnumerable<IMultiGetHit<T>>> GetManyAsync<T>(
 		/// <param name="index">Optionally override the default inferred index name for T</param>
 		/// <param name="type">Optionally overiide the default inferred typename for T</param>
 		public static Task<IEnumerable<IMultiGetHit<T>>> GetManyAsync<T>(
-			this IElasticClient client, IEnumerable<long> ids, IndexName index = null, TypeName type = null, CancellationToken cancellationToken = default(CancellationToken))
-			where T : class
-		{
-			return client.GetManyAsync<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)), index, type, cancellationToken);
-		}
+			this IElasticClient client, IEnumerable<long> ids, IndexName index = null, TypeName type = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
+			where T : class => client.GetManyAsync<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)), index, type, cancellationToken);
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/ElasticClient-MultiGet.cs b/src/Nest/Document/Multiple/MultiGet/ElasticClient-MultiGet.cs
index 04a4fd156ca..97f117bda68 100644
--- a/src/Nest/Document/Multiple/MultiGet/ElasticClient-MultiGet.cs
+++ b/src/Nest/Document/Multiple/MultiGet/ElasticClient-MultiGet.cs
@@ -1,12 +1,12 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
 {
-	using System.Threading;
 	using MultiGetConverter = Func<IApiCallDetails, Stream, MultiGetResponse>;
 
 	public partial interface IElasticClient
@@ -15,51 +15,56 @@ public partial interface IElasticClient
 		/// Multi GET API allows to get multiple documents based on an index, type (optional) and id (and possibly routing).
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <param name="selector">A descriptor describing which documents should be fetched</param>
 		IMultiGetResponse MultiGet(Func<MultiGetDescriptor, IMultiGetRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IMultiGetResponse MultiGet(IMultiGetRequest request);
 
-		/// <inheritdoc/>
-		Task<IMultiGetResponse> MultiGetAsync(Func<MultiGetDescriptor, IMultiGetRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IMultiGetResponse> MultiGetAsync(Func<MultiGetDescriptor, IMultiGetRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IMultiGetResponse> MultiGetAsync(IMultiGetRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IMultiGetResponse MultiGet(Func<MultiGetDescriptor, IMultiGetRequest> selector = null) =>
-			this.MultiGet(selector.InvokeOrDefault(new MultiGetDescriptor()));
+			MultiGet(selector.InvokeOrDefault(new MultiGetDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IMultiGetResponse MultiGet(IMultiGetRequest request) =>
-			this.Dispatcher.Dispatch<IMultiGetRequest, MultiGetRequestParameters, MultiGetResponse>(
+			Dispatcher.Dispatch<IMultiGetRequest, MultiGetRequestParameters, MultiGetResponse>(
 				request,
-				(r, s) => this.DeserializeMultiGetResponse(r, s, CreateCovariantMultiGetConverter(request)),
-				this.LowLevelDispatch.MgetDispatch<MultiGetResponse>
+				(r, s) => DeserializeMultiGetResponse(r, s, CreateCovariantMultiGetConverter(request)),
+				LowLevelDispatch.MgetDispatch<MultiGetResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IMultiGetResponse> MultiGetAsync(Func<MultiGetDescriptor, IMultiGetRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.MultiGetAsync(selector.InvokeOrDefault(new MultiGetDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IMultiGetResponse> MultiGetAsync(Func<MultiGetDescriptor, IMultiGetRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			MultiGetAsync(selector.InvokeOrDefault(new MultiGetDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IMultiGetResponse> MultiGetAsync(IMultiGetRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IMultiGetRequest, MultiGetRequestParameters, MultiGetResponse, IMultiGetResponse>(
+			Dispatcher.DispatchAsync<IMultiGetRequest, MultiGetRequestParameters, MultiGetResponse, IMultiGetResponse>(
 				request,
 				cancellationToken,
-				(r, s) => this.DeserializeMultiGetResponse(r, s, CreateCovariantMultiGetConverter(request)),
-				this.LowLevelDispatch.MgetDispatchAsync<MultiGetResponse>
+				(r, s) => DeserializeMultiGetResponse(r, s, CreateCovariantMultiGetConverter(request)),
+				LowLevelDispatch.MgetDispatchAsync<MultiGetResponse>
 			);
+
 		private MultiGetResponse DeserializeMultiGetResponse(IApiCallDetails response, Stream stream, JsonConverter converter) =>
-			this.ConnectionSettings.CreateStateful(converter).Deserialize<MultiGetResponse>(stream);
+			ConnectionSettings.CreateStateful(converter).Deserialize<MultiGetResponse>(stream);
 
 		private JsonConverter CreateCovariantMultiGetConverter(IMultiGetRequest descriptor) => new MultiGetHitJsonConverter(descriptor);
-
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/ElasticClient-SourceMany.cs b/src/Nest/Document/Multiple/MultiGet/ElasticClient-SourceMany.cs
index c91cfb2e75d..537077ec712 100644
--- a/src/Nest/Document/Multiple/MultiGet/ElasticClient-SourceMany.cs
+++ b/src/Nest/Document/Multiple/MultiGet/ElasticClient-SourceMany.cs
@@ -18,7 +18,8 @@ public static class SourceManyExtensions
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
 		/// </para>
-		/// <para> </para>>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// >http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="client"></param>
@@ -29,7 +30,7 @@ public static IEnumerable<T> SourceMany<T>(this IElasticClient client, IEnumerab
 			where T : class
 		{
 			var result = client.MultiGet(s => s
-				.RequestConfiguration(r=>r.ThrowExceptions())
+				.RequestConfiguration(r => r.ThrowExceptions())
 				.GetMany<T>(ids, (gs, i) => gs
 					.Index(index)
 					.Type(type)
@@ -45,7 +46,8 @@ public static IEnumerable<T> SourceMany<T>(this IElasticClient client, IEnumerab
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
 		/// </para>
-		/// <para> </para>>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// >http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="client"></param>
@@ -53,10 +55,7 @@ public static IEnumerable<T> SourceMany<T>(this IElasticClient client, IEnumerab
 		/// <param name="index">Optionally override the default inferred indexname for T</param>
 		/// <param name="type">Optionally override the default inferred indexname for T</param>
 		public static IEnumerable<T> SourceMany<T>(this IElasticClient client, IEnumerable<long> ids, string index = null, string type = null)
-			where T : class
-		{
-			return client.SourceMany<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)), index, type);
-		}
+			where T : class => client.SourceMany<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)), index, type);
 
 		/// <summary>
 		/// SourceMany allows you to get a list of T documents out of elasticsearch, internally it calls into MultiGet()
@@ -65,7 +64,8 @@ public static IEnumerable<T> SourceMany<T>(this IElasticClient client, IEnumerab
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
 		/// </para>
-		/// <para> </para>>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// >http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="client"></param>
@@ -73,15 +73,17 @@ public static IEnumerable<T> SourceMany<T>(this IElasticClient client, IEnumerab
 		/// <param name="index">Optionally override the default inferred indexname for T</param>
 		/// <param name="type">Optionally override the default inferred indexname for T</param>
 		public static async Task<IEnumerable<T>> SourceManyAsync<T>(
-			this IElasticClient client, IEnumerable<string> ids, string index = null, string type = null, CancellationToken cancellationToken = default(CancellationToken))
+			this IElasticClient client, IEnumerable<string> ids, string index = null, string type = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 		{
 			var response = await client.MultiGetAsync(s => s
-				.RequestConfiguration(r=>r.ThrowExceptions())
-				.GetMany<T>(ids, (gs, i) => gs
-					.Index(index)
-					.Type(type)
-				), cancellationToken)
+					.RequestConfiguration(r => r.ThrowExceptions())
+					.GetMany<T>(ids, (gs, i) => gs
+						.Index(index)
+						.Type(type)
+					), cancellationToken)
 				.ConfigureAwait(false);
 			return response.SourceMany<T>(ids);
 		}
@@ -93,7 +95,8 @@ public static async Task<IEnumerable<T>> SourceManyAsync<T>(
 		/// The response includes a docs array with all the fetched documents, each element similar in structure to a document
 		/// provided by the get API.
 		/// </para>
-		/// <para> </para>>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
+		/// <para> </para>
+		/// >http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="client"></param>
@@ -101,10 +104,9 @@ public static async Task<IEnumerable<T>> SourceManyAsync<T>(
 		/// <param name="index">Optionally override the default inferred indexname for T</param>
 		/// <param name="type">Optionally override the default inferred indexname for T</param>
 		public static Task<IEnumerable<T>> SourceManyAsync<T>(
-			this IElasticClient client, IEnumerable<long> ids, string index = null, string type = null, CancellationToken cancellationToken = default(CancellationToken))
-			where T : class
-		{
-			return client.SourceManyAsync<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)), index, type, cancellationToken);
-		}
+			this IElasticClient client, IEnumerable<long> ids, string index = null, string type = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
+			where T : class => client.SourceManyAsync<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)), index, type, cancellationToken);
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/Request/IMultiGetOperation.cs b/src/Nest/Document/Multiple/MultiGet/Request/IMultiGetOperation.cs
index 56b9a9f69ba..680c2457324 100644
--- a/src/Nest/Document/Multiple/MultiGet/Request/IMultiGetOperation.cs
+++ b/src/Nest/Document/Multiple/MultiGet/Request/IMultiGetOperation.cs
@@ -8,17 +8,15 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<MultiGetOperationDescriptor<object>>))]
 	public interface IMultiGetOperation
 	{
-		[JsonProperty("_index")]
-		IndexName Index { get; set; }
+		bool CanBeFlattened { get; }
 
-		[JsonProperty("_type")]
-		TypeName Type { get; set; }
+		Type ClrType { get; }
 
 		[JsonProperty("_id")]
 		Id Id { get; set; }
 
-		[JsonProperty("stored_fields")]
-		Fields StoredFields { get; set; }
+		[JsonProperty("_index")]
+		IndexName Index { get; set; }
 
 		[JsonProperty("routing")]
 		string Routing { get; set; }
@@ -26,14 +24,16 @@ public interface IMultiGetOperation
 		[JsonProperty("_source")]
 		Union<bool, ISourceFilter> Source { get; set; }
 
+		[JsonProperty("stored_fields")]
+		Fields StoredFields { get; set; }
+
+		[JsonProperty("_type")]
+		TypeName Type { get; set; }
+
 		[JsonProperty("version")]
 		long? Version { get; set; }
 
 		[JsonProperty("version_type")]
 		VersionType? VersionType { get; set; }
-
-		Type ClrType { get; }
-
-		bool CanBeFlattened { get; }
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/Request/MultiGetOperation.cs b/src/Nest/Document/Multiple/MultiGet/Request/MultiGetOperation.cs
index 4f1296febb4..7d5a0ee64b8 100644
--- a/src/Nest/Document/Multiple/MultiGet/Request/MultiGetOperation.cs
+++ b/src/Nest/Document/Multiple/MultiGet/Request/MultiGetOperation.cs
@@ -3,64 +3,47 @@
 
 namespace Nest
 {
-
 	public class MultiGetOperation<T> : IMultiGetOperation
 	{
 		public MultiGetOperation(Id id)
 		{
-			this.Id = id;
-			this.Index = typeof(T);
-			this.Type = typeof(T);
+			Id = id;
+			Index = typeof(T);
+			Type = typeof(T);
 		}
 
-		public VersionType? VersionType { get; set; }
-		Type IMultiGetOperation.ClrType => typeof(T);
+
+		public object Document { get; set; }
+
+		public Id Id { get; set; }
 
 		public IndexName Index { get; set; }
 
-		public TypeName Type { get; set; }
+		public string Routing { get; set; }
 
-		public Id Id { get; set; }
+		public Union<bool, ISourceFilter> Source { get; set; }
 
 		public Fields StoredFields { get; set; }
 
-		public Union<bool, ISourceFilter> Source { get; set; }
+		public TypeName Type { get; set; }
 
 		public long? Version { get; set; }
 
-		public string Routing { get; set; }
+		public VersionType? VersionType { get; set; }
 
 		bool IMultiGetOperation.CanBeFlattened =>
-			this.Index == null
-			&& this.Type == null
-			&& this.Routing == null
-			&& this.Source == null
-			&& this.StoredFields == null;
-
+			Index == null
+			&& Type == null
+			&& Routing == null
+			&& Source == null
+			&& StoredFields == null;
 
-		public object Document { get; set; }
+		Type IMultiGetOperation.ClrType => typeof(T);
 	}
 
 	public class MultiGetOperationDescriptor<T> : DescriptorBase<MultiGetOperationDescriptor<T>, IMultiGetOperation>, IMultiGetOperation
 		where T : class
 	{
-		IndexName IMultiGetOperation.Index { get; set; }
-		TypeName IMultiGetOperation.Type { get; set; }
-		Id IMultiGetOperation.Id { get; set; }
-		string IMultiGetOperation.Routing { get; set; }
-		Union<bool, ISourceFilter> IMultiGetOperation.Source { get; set; }
-		long? IMultiGetOperation.Version { get; set; }
-		VersionType? IMultiGetOperation.VersionType { get; set; }
-		Fields IMultiGetOperation.StoredFields { get; set; }
-		Type IMultiGetOperation.ClrType => typeof(T);
-
-		bool IMultiGetOperation.CanBeFlattened =>
-			Self.Index == null
-			&& Self.Type == null
-			&& Self.Routing == null
-			&& Self.Source == null
-			&& Self.StoredFields == null;
-
 		public MultiGetOperationDescriptor()
 		{
 			Self.Index = Self.ClrType;
@@ -78,9 +61,27 @@ public MultiGetOperationDescriptor(bool allowExplicitIndex)
 			: this()
 		{
 			if (allowExplicitIndex) return;
+
 			Self.Index = null;
 		}
 
+		bool IMultiGetOperation.CanBeFlattened =>
+			Self.Index == null
+			&& Self.Type == null
+			&& Self.Routing == null
+			&& Self.Source == null
+			&& Self.StoredFields == null;
+
+		Type IMultiGetOperation.ClrType => typeof(T);
+		Id IMultiGetOperation.Id { get; set; }
+		IndexName IMultiGetOperation.Index { get; set; }
+		string IMultiGetOperation.Routing { get; set; }
+		Union<bool, ISourceFilter> IMultiGetOperation.Source { get; set; }
+		Fields IMultiGetOperation.StoredFields { get; set; }
+		TypeName IMultiGetOperation.Type { get; set; }
+		long? IMultiGetOperation.Version { get; set; }
+		VersionType? IMultiGetOperation.VersionType { get; set; }
+
 		/// <summary>
 		/// Manually set the index, default to the default index or the index set for the type on the connectionsettings.
 		/// </summary>
@@ -90,7 +91,7 @@ public MultiGetOperationDescriptor(bool allowExplicitIndex)
 		/// Manualy set the type to get the object from, default to whatever
 		/// T will be inferred to if not passed.
 		/// </summary>
-		public MultiGetOperationDescriptor<T> Type(TypeName type) => Assign(a=> a.Type = type);
+		public MultiGetOperationDescriptor<T> Type(TypeName type) => Assign(a => a.Type = type);
 
 		public MultiGetOperationDescriptor<T> Id(Id id) => Assign(a => a.Id = id);
 
@@ -122,6 +123,5 @@ public MultiGetOperationDescriptor<T> StoredFields(Func<FieldsDescriptor<T>, IPr
 		public MultiGetOperationDescriptor<T> Version(long? version) => Assign(a => a.Version = version);
 
 		public MultiGetOperationDescriptor<T> VersionType(VersionType? versionType) => Assign(a => a.VersionType = versionType);
-
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/Request/MultiGetRequest.cs b/src/Nest/Document/Multiple/MultiGet/Request/MultiGetRequest.cs
index 3ba27417b0e..2c1cd832987 100644
--- a/src/Nest/Document/Multiple/MultiGet/Request/MultiGetRequest.cs
+++ b/src/Nest/Document/Multiple/MultiGet/Request/MultiGetRequest.cs
@@ -5,7 +5,6 @@
 
 namespace Nest
 {
-
 	[JsonConverter(typeof(MultiGetRequestJsonConverter))]
 	public partial interface IMultiGetRequest
 	{
@@ -15,8 +14,13 @@ public partial interface IMultiGetRequest
 
 	public partial class MultiGetRequest
 	{
-		public Fields StoredFields { get => Q<Fields>("stored_fields"); set => Q("stored_fields", value); }
 		public IEnumerable<IMultiGetOperation> Documents { get; set; }
+
+		public Fields StoredFields
+		{
+			get => Q<Fields>("stored_fields");
+			set => Q("stored_fields", value);
+		}
 	}
 
 	[DescriptorFor("Mget")]
@@ -24,25 +28,37 @@ public partial class MultiGetDescriptor
 	{
 		private List<IMultiGetOperation> _operations = new List<IMultiGetOperation>();
 
-		IEnumerable<IMultiGetOperation> IMultiGetRequest.Documents { get => this._operations; set => this._operations = value?.ToList(); }
-		Fields IMultiGetRequest.StoredFields { get => Q<Fields>("stored_fields"); set => Q("stored_fields", value); }
+		IEnumerable<IMultiGetOperation> IMultiGetRequest.Documents
+		{
+			get => _operations;
+			set => _operations = value?.ToList();
+		}
+
+		Fields IMultiGetRequest.StoredFields
+		{
+			get => Q<Fields>("stored_fields");
+			set => Q("stored_fields", value);
+		}
 
 		public MultiGetDescriptor Get<T>(Func<MultiGetOperationDescriptor<T>, IMultiGetOperation> getSelector)
 			where T : class =>
-			Assign(a => this._operations.AddIfNotNull(getSelector?.Invoke(new MultiGetOperationDescriptor<T>())));
+			Assign(a => _operations.AddIfNotNull(getSelector?.Invoke(new MultiGetOperationDescriptor<T>())));
 
 		public MultiGetDescriptor GetMany<T>(IEnumerable<long> ids,
-			Func<MultiGetOperationDescriptor<T>, long, IMultiGetOperation> getSelector = null)
+			Func<MultiGetOperationDescriptor<T>, long, IMultiGetOperation> getSelector = null
+		)
 			where T : class =>
-			Assign(a => this._operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiGetOperationDescriptor<T>().Id(id), id))));
+			Assign(a => _operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiGetOperationDescriptor<T>().Id(id), id))));
 
-		public MultiGetDescriptor GetMany<T>(IEnumerable<string> ids, Func<MultiGetOperationDescriptor<T>, string, IMultiGetOperation> getSelector = null)
+		public MultiGetDescriptor GetMany<T>(IEnumerable<string> ids,
+			Func<MultiGetOperationDescriptor<T>, string, IMultiGetOperation> getSelector = null
+		)
 			where T : class =>
-			Assign(a => this._operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiGetOperationDescriptor<T>().Id(id), id))));
+			Assign(a => _operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiGetOperationDescriptor<T>().Id(id), id))));
 
 		public MultiGetDescriptor GetMany<T>(IEnumerable<Id> ids, Func<MultiGetOperationDescriptor<T>, Id, IMultiGetOperation> getSelector = null)
 			where T : class =>
-			Assign(a => this._operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiGetOperationDescriptor<T>().Id(id), id))));
+			Assign(a => _operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiGetOperationDescriptor<T>().Id(id), id))));
 
 		/// <summary> Default stored fields to load for each document. </summary>
 		public MultiGetDescriptor StoredFields<T>(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) where T : class =>
diff --git a/src/Nest/Document/Multiple/MultiGet/Request/MultiGetRequestJsonConverter.cs b/src/Nest/Document/Multiple/MultiGet/Request/MultiGetRequestJsonConverter.cs
index 25e24359a80..ba7e632937a 100644
--- a/src/Nest/Document/Multiple/MultiGet/Request/MultiGetRequestJsonConverter.cs
+++ b/src/Nest/Document/Multiple/MultiGet/Request/MultiGetRequestJsonConverter.cs
@@ -8,6 +8,7 @@ internal class MultiGetRequestJsonConverter : JsonConverter
 	{
 		public override bool CanRead => false;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
@@ -20,11 +21,12 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				return;
 			}
 			var docs = request.Documents.Select(d =>
-			{
-				if (request.Index != null) d.Index = null;
-				if (request.Type != null) d.Type = null;
-				return d;
-			}).ToList();
+				{
+					if (request.Index != null) d.Index = null;
+					if (request.Type != null) d.Type = null;
+					return d;
+				})
+				.ToList();
 
 			var flatten = docs.All(p => p.CanBeFlattened);
 
@@ -41,9 +43,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			writer.WriteEndObject();
 		}
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			throw new NotSupportedException();
-		}
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/Response/MultiGetHit.cs b/src/Nest/Document/Multiple/MultiGet/Response/MultiGetHit.cs
index a67108ca5c6..55623859abf 100644
--- a/src/Nest/Document/Multiple/MultiGet/Response/MultiGetHit.cs
+++ b/src/Nest/Document/Multiple/MultiGet/Response/MultiGetHit.cs
@@ -6,58 +6,57 @@ namespace Nest
 {
 	public interface IMultiGetHit<out TDocument> where TDocument : class
 	{
-		TDocument Source { get; }
-
-		string Index { get; }
+		Error Error { get; }
 
 		bool Found { get; }
 
-		string Type { get; }
-
-		long Version { get; }
-
 		string Id { get; }
 
+		string Index { get; }
+
 		[Obsolete("This feature is no longer supported on indices created in Elasticsearch 6.x and up, use Routing instead.")]
 		string Parent { get; }
 
 		string Routing { get; }
+		TDocument Source { get; }
 
-		Error Error { get; }
+		string Type { get; }
+
+		long Version { get; }
 	}
 
 	[JsonObject]
 	public class MultiGetHit<TDocument> : IMultiGetHit<TDocument>
 		where TDocument : class
 	{
-		public FieldValues Fields { get; internal set; }
-
-		[JsonProperty("_source")]
-		[JsonConverter(typeof(SourceConverter))]
-		public TDocument Source { get; internal set; }
+		[JsonProperty("error")]
+		public Error Error { get; internal set; }
 
-		[JsonProperty("_index")]
-		public string Index { get; internal set; }
+		public FieldValues Fields { get; internal set; }
 
 		[JsonProperty("found")]
 		public bool Found { get; internal set; }
 
-		[JsonProperty("_type")]
-		public string Type { get; internal set; }
-
-		[JsonProperty("_version")]
-		public long Version { get; internal set; }
-
 		[JsonProperty("_id")]
 		public string Id { get; internal set; }
 
+		[JsonProperty("_index")]
+		public string Index { get; internal set; }
+
 		[JsonProperty("_parent")]
 		public string Parent { get; internal set; }
 
 		[JsonProperty("_routing")]
 		public string Routing { get; internal set; }
 
-		[JsonProperty("error")]
-		public Error Error { get; internal set; }
+		[JsonProperty("_source")]
+		[JsonConverter(typeof(SourceConverter))]
+		public TDocument Source { get; internal set; }
+
+		[JsonProperty("_type")]
+		public string Type { get; internal set; }
+
+		[JsonProperty("_version")]
+		public long Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/Response/MultiGetHitJsonConverter.cs b/src/Nest/Document/Multiple/MultiGet/Response/MultiGetHitJsonConverter.cs
index d0839474894..1c261136667 100644
--- a/src/Nest/Document/Multiple/MultiGet/Response/MultiGetHitJsonConverter.cs
+++ b/src/Nest/Document/Multiple/MultiGet/Response/MultiGetHitJsonConverter.cs
@@ -10,32 +10,19 @@ namespace Nest
 {
 	internal class MultiGetHitJsonConverter : JsonConverter
 	{
-		internal class MultiHitTuple
-		{
-			public JToken Hit { get; set; }
-			public IMultiGetOperation Descriptor { get; set; }
-		}
-
-		private readonly IMultiGetRequest _request;
-
 		private static readonly MethodInfo MakeDelegateMethodInfo =
 			typeof(MultiGetHitJsonConverter).GetMethod(nameof(CreateMultiHit), BindingFlags.Static | BindingFlags.NonPublic);
 
-		internal MultiGetHitJsonConverter()
-		{
-		}
+		private readonly IMultiGetRequest _request;
 
-		public MultiGetHitJsonConverter(IMultiGetRequest request)
-		{
-			_request = request;
-		}
+		internal MultiGetHitJsonConverter() { }
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public MultiGetHitJsonConverter(IMultiGetRequest request) => _request = request;
 
-		private static void CreateMultiHit<T>(MultiHitTuple tuple, JsonSerializer serializer, ICollection<IMultiGetHit<object>> collection) where T : class
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
+
+		private static void CreateMultiHit<T>(MultiHitTuple tuple, JsonSerializer serializer, ICollection<IMultiGetHit<object>> collection)
+			where T : class
 		{
 			var hit = tuple.Hit.ToObject<MultiGetHit<T>>(serializer);
 			var settings = serializer.GetConnectionSettings();
@@ -52,7 +39,7 @@ private static void CreateMultiHit<T>(MultiHitTuple tuple, JsonSerializer serial
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			if (this._request == null)
+			if (_request == null)
 			{
 				var realConverter = serializer.GetStatefulConverter<MultiGetHitJsonConverter>();
 				return realConverter.ReadJson(reader, objectType, existingValue, serializer);
@@ -61,24 +48,26 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var response = new MultiGetResponse();
 			var jsonObject = JObject.Load(reader);
 			var docsJarray = (JArray)jsonObject["docs"];
-			if (this._request == null || docsJarray == null)
+			if (_request == null || docsJarray == null)
 				return response;
 
-			var withMeta = docsJarray.Zip(this._request.Documents, (doc, desc) => new MultiHitTuple { Hit = doc, Descriptor = desc });
+			var withMeta = docsJarray.Zip(_request.Documents, (doc, desc) => new MultiHitTuple { Hit = doc, Descriptor = desc });
 			foreach (var m in withMeta)
 			{
-				var cachedDelegate = serializer.GetConnectionSettings().Inferrer.CreateMultiHitDelegates.GetOrAdd(m.Descriptor.ClrType, t =>
-				{
-					// Compile a delegate from an expression
-					var methodInfo = MakeDelegateMethodInfo.MakeGenericMethod(t);
-					var tupleParameter = Expression.Parameter(typeof(MultiHitTuple), "tuple");
-					var serializerParameter = Expression.Parameter(typeof(JsonSerializer), "serializer");
-					var multiHitCollection = Expression.Parameter(typeof(ICollection<IMultiGetHit<object>>), "collection");
-					var parameterExpressions = new[] { tupleParameter, serializerParameter, multiHitCollection };
-					var call = Expression.Call(null, methodInfo, parameterExpressions);
-					var lambda = Expression.Lambda<Action<MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>>(call, parameterExpressions);
-					return lambda.Compile();
-				});
+				var cachedDelegate = serializer.GetConnectionSettings()
+					.Inferrer.CreateMultiHitDelegates.GetOrAdd(m.Descriptor.ClrType, t =>
+					{
+						// Compile a delegate from an expression
+						var methodInfo = MakeDelegateMethodInfo.MakeGenericMethod(t);
+						var tupleParameter = Expression.Parameter(typeof(MultiHitTuple), "tuple");
+						var serializerParameter = Expression.Parameter(typeof(JsonSerializer), "serializer");
+						var multiHitCollection = Expression.Parameter(typeof(ICollection<IMultiGetHit<object>>), "collection");
+						var parameterExpressions = new[] { tupleParameter, serializerParameter, multiHitCollection };
+						var call = Expression.Call(null, methodInfo, parameterExpressions);
+						var lambda =
+							Expression.Lambda<Action<MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>>(call, parameterExpressions);
+						return lambda.Compile();
+					});
 
 				cachedDelegate(m, serializer, response.InternalHits);
 			}
@@ -86,9 +75,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return response;
 		}
 
-		public override bool CanConvert(Type objectType)
+		public override bool CanConvert(Type objectType) => true;
+
+		internal class MultiHitTuple
 		{
-			return true;
+			public IMultiGetOperation Descriptor { get; set; }
+			public JToken Hit { get; set; }
 		}
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiGet/Response/MultiGetResponse.cs b/src/Nest/Document/Multiple/MultiGet/Response/MultiGetResponse.cs
index 95eeb73be84..09936427cf9 100644
--- a/src/Nest/Document/Multiple/MultiGet/Response/MultiGetResponse.cs
+++ b/src/Nest/Document/Multiple/MultiGet/Response/MultiGetResponse.cs
@@ -8,15 +8,25 @@ namespace Nest
 	public interface IMultiGetResponse : IResponse
 	{
 		IReadOnlyCollection<IMultiGetHit<object>> Hits { get; }
+
 		MultiGetHit<T> Get<T>(string id) where T : class;
+
 		MultiGetHit<T> Get<T>(long id) where T : class;
+
 		T Source<T>(string id) where T : class;
+
 		T Source<T>(long id) where T : class;
+
 		FieldValues GetFieldValues<T>(string id) where T : class;
+
 		FieldValues GetFieldSelection<T>(long id) where T : class;
+
 		IEnumerable<T> SourceMany<T>(IEnumerable<string> ids) where T : class;
+
 		IEnumerable<T> SourceMany<T>(IEnumerable<long> ids) where T : class;
+
 		IEnumerable<IMultiGetHit<T>> GetMany<T>(IEnumerable<string> ids) where T : class;
+
 		IEnumerable<IMultiGetHit<T>> GetMany<T>(IEnumerable<long> ids) where T : class;
 	}
 
@@ -25,69 +35,52 @@ public interface IMultiGetResponse : IResponse
 	[ContractJsonConverter(typeof(MultiGetHitJsonConverter))]
 	public class MultiGetResponse : ResponseBase, IMultiGetResponse
 	{
-		public override bool IsValid => base.IsValid && !this.InternalHits.HasAny(d => d.Error != null);
+		public IReadOnlyCollection<IMultiGetHit<object>> Hits => InternalHits.ToList().AsReadOnly();
+		public override bool IsValid => base.IsValid && !InternalHits.HasAny(d => d.Error != null);
 
 		internal ICollection<IMultiGetHit<object>> InternalHits { get; set; } = new List<IMultiGetHit<object>>();
 
-		public IReadOnlyCollection<IMultiGetHit<object>> Hits => this.InternalHits.ToList().AsReadOnly();
+		public MultiGetHit<T> Get<T>(string id) where T : class => Hits.OfType<MultiGetHit<T>>().FirstOrDefault(m => m.Id == id);
 
-		public MultiGetHit<T> Get<T>(string id) where T : class
-		{
-			return this.Hits.OfType<MultiGetHit<T>>().FirstOrDefault(m => m.Id == id);
-		}
-
-		public MultiGetHit<T> Get<T>(long id) where T : class
-		{
-			return this.Get<T>(id.ToString(CultureInfo.InvariantCulture));
-		}
+		public MultiGetHit<T> Get<T>(long id) where T : class => Get<T>(id.ToString(CultureInfo.InvariantCulture));
 
-		public T Source<T>(string id) where T : class
-		{
-			var multiHit = this.Get<T>(id);
-			return multiHit?.Source;
-		}
+		public FieldValues GetFieldSelection<T>(long id) where T : class => GetFieldValues<T>(id.ToString(CultureInfo.InvariantCulture));
 
-		public T Source<T>(long id) where T : class
+		public FieldValues GetFieldValues<T>(string id) where T : class
 		{
-			return this.Source<T>(id.ToString(CultureInfo.InvariantCulture));
+			var multiHit = Get<T>(id);
+			return multiHit?.Fields ?? FieldValues.Empty;
 		}
 
-		public IEnumerable<T> SourceMany<T>(IEnumerable<string> ids) where T : class
+		public IEnumerable<IMultiGetHit<T>> GetMany<T>(IEnumerable<string> ids) where T : class
 		{
-			var docs = this.Hits.OfType<IMultiGetHit<T>>();
+			var docs = Hits.OfType<IMultiGetHit<T>>();
 			return from d in docs
-				   join id in ids on d.Id equals id
-				   where d.Found
-				   select d.Source;
+				join id in ids on d.Id equals id
+				select d;
 		}
 
-		public IEnumerable<T> SourceMany<T>(IEnumerable<long> ids) where T : class
-		{
-			return this.SourceMany<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)));
-		}
+		public IEnumerable<IMultiGetHit<T>> GetMany<T>(IEnumerable<long> ids) where T : class =>
+			GetMany<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)));
 
-		public IEnumerable<IMultiGetHit<T>> GetMany<T>(IEnumerable<string> ids) where T : class
+		public T Source<T>(string id) where T : class
 		{
-			var docs = this.Hits.OfType<IMultiGetHit<T>>();
-			return from d in docs
-				   join id in ids on d.Id equals id
-				   select d;
+			var multiHit = Get<T>(id);
+			return multiHit?.Source;
 		}
 
-		public IEnumerable<IMultiGetHit<T>> GetMany<T>(IEnumerable<long> ids) where T : class
-		{
-			return this.GetMany<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)));
-		}
+		public T Source<T>(long id) where T : class => Source<T>(id.ToString(CultureInfo.InvariantCulture));
 
-		public FieldValues GetFieldValues<T>(string id) where T : class
+		public IEnumerable<T> SourceMany<T>(IEnumerable<string> ids) where T : class
 		{
-			var multiHit = this.Get<T>(id);
-			return multiHit?.Fields ?? FieldValues.Empty;
+			var docs = Hits.OfType<IMultiGetHit<T>>();
+			return from d in docs
+				join id in ids on d.Id equals id
+				where d.Found
+				select d.Source;
 		}
 
-		public FieldValues GetFieldSelection<T>(long id) where T : class
-		{
-			return this.GetFieldValues<T>(id.ToString(CultureInfo.InvariantCulture));
-		}
+		public IEnumerable<T> SourceMany<T>(IEnumerable<long> ids) where T : class =>
+			SourceMany<T>(ids.Select(i => i.ToString(CultureInfo.InvariantCulture)));
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiTermVectors/ElasticClient-MultiTermVectors.cs b/src/Nest/Document/Multiple/MultiTermVectors/ElasticClient-MultiTermVectors.cs
index 889cda86a14..4677c7d7b3b 100644
--- a/src/Nest/Document/Multiple/MultiTermVectors/ElasticClient-MultiTermVectors.cs
+++ b/src/Nest/Document/Multiple/MultiTermVectors/ElasticClient-MultiTermVectors.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,44 +9,54 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Multi termvectors API allows to get multiple termvectors based on an index, type and id.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-termvectors.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-termvectors.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-termvectors.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-termvectors.html</a>
 		/// </summary>
 		/// <param name="selector">The descriptor describing the multi termvectors operation</param>
 		IMultiTermVectorsResponse MultiTermVectors(Func<MultiTermVectorsDescriptor, IMultiTermVectorsRequest> selector = null);
 
-		/// <inheritdoc cref="MultiTermVectors(System.Func{Nest.MultiTermVectorsDescriptor,Nest.IMultiTermVectorsRequest})"/>
+		/// <inheritdoc cref="MultiTermVectors(System.Func{Nest.MultiTermVectorsDescriptor,Nest.IMultiTermVectorsRequest})" />
 		IMultiTermVectorsResponse MultiTermVectors(IMultiTermVectorsRequest request);
 
-		/// <inheritdoc cref="MultiTermVectors(System.Func{Nest.MultiTermVectorsDescriptor,Nest.IMultiTermVectorsRequest})"/>
-		Task<IMultiTermVectorsResponse> MultiTermVectorsAsync(Func<MultiTermVectorsDescriptor, IMultiTermVectorsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="MultiTermVectors(System.Func{Nest.MultiTermVectorsDescriptor,Nest.IMultiTermVectorsRequest})" />
+		Task<IMultiTermVectorsResponse> MultiTermVectorsAsync(Func<MultiTermVectorsDescriptor, IMultiTermVectorsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc cref="MultiTermVectors(System.Func{Nest.MultiTermVectorsDescriptor,Nest.IMultiTermVectorsRequest})"/>
-		Task<IMultiTermVectorsResponse> MultiTermVectorsAsync(IMultiTermVectorsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="MultiTermVectors(System.Func{Nest.MultiTermVectorsDescriptor,Nest.IMultiTermVectorsRequest})" />
+		Task<IMultiTermVectorsResponse> MultiTermVectorsAsync(IMultiTermVectorsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IMultiTermVectorsResponse MultiTermVectors(Func<MultiTermVectorsDescriptor, IMultiTermVectorsRequest> selector = null) =>
-			this.MultiTermVectors(selector.InvokeOrDefault(new MultiTermVectorsDescriptor()));
+			MultiTermVectors(selector.InvokeOrDefault(new MultiTermVectorsDescriptor()));
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IMultiTermVectorsResponse MultiTermVectors(IMultiTermVectorsRequest request) =>
-			this.Dispatcher.Dispatch<IMultiTermVectorsRequest, MultiTermVectorsRequestParameters, MultiTermVectorsResponse>(
+			Dispatcher.Dispatch<IMultiTermVectorsRequest, MultiTermVectorsRequestParameters, MultiTermVectorsResponse>(
 				request,
-				this.LowLevelDispatch.MtermvectorsDispatch<MultiTermVectorsResponse>
+				LowLevelDispatch.MtermvectorsDispatch<MultiTermVectorsResponse>
 			);
 
-		///<inheritdoc/>
-		public Task<IMultiTermVectorsResponse> MultiTermVectorsAsync(Func<MultiTermVectorsDescriptor, IMultiTermVectorsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.MultiTermVectorsAsync(selector.InvokeOrDefault(new MultiTermVectorsDescriptor()), cancellationToken);
-
-		///<inheritdoc/>
-		public Task<IMultiTermVectorsResponse> MultiTermVectorsAsync(IMultiTermVectorsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IMultiTermVectorsRequest, MultiTermVectorsRequestParameters, MultiTermVectorsResponse, IMultiTermVectorsResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.MtermvectorsDispatchAsync<MultiTermVectorsResponse>
-			);
+		/// <inheritdoc />
+		public Task<IMultiTermVectorsResponse> MultiTermVectorsAsync(Func<MultiTermVectorsDescriptor, IMultiTermVectorsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			MultiTermVectorsAsync(selector.InvokeOrDefault(new MultiTermVectorsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IMultiTermVectorsResponse> MultiTermVectorsAsync(IMultiTermVectorsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IMultiTermVectorsRequest, MultiTermVectorsRequestParameters, MultiTermVectorsResponse, IMultiTermVectorsResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.MtermvectorsDispatchAsync<MultiTermVectorsResponse>
+				);
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorOperation.cs b/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorOperation.cs
index e5ca292d491..3ed546573f1 100644
--- a/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorOperation.cs
+++ b/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorOperation.cs
@@ -11,38 +11,46 @@ namespace Nest
 	public interface IMultiTermVectorOperation
 	{
 		/// <summary>
-		/// The index in which the document resides
+		/// A document not indexed in Elasticsearch,
+		/// to generate term vectors for
 		/// </summary>
-		[JsonProperty("_index")]
-		IndexName Index { get; set; }
+		[JsonProperty("doc")]
+		[JsonConverter(typeof(SourceConverter))]
+		object Document { get; set; }
 
 		/// <summary>
-		/// The type of the document
+		/// Whether to include field statistics. When set to <c>false</c>,
+		/// <para />
+		/// - document count (how many documents contain this field)
+		/// <para />
+		/// - sum of document frequencies (the sum of document frequencies for all terms in this field)
+		/// <para />
+		/// - sum of total term frequencies (the sum of total term frequencies of each term in this field)
+		/// <para />
+		/// will be omitted. Default is <c>true</c>.
 		/// </summary>
-		[JsonProperty("_type")]
-		TypeName Type { get; set; }
+		[JsonProperty("field_statistics")]
+		bool? FieldStatistics { get; set; }
 
 		/// <summary>
-		/// The id of the document
+		/// Filter terms based on their tf-idf scores.
+		/// This can be useful in order find out a good characteristic
+		/// vector of a document.
 		/// </summary>
-		[JsonProperty("_id")]
-		Id Id { get; set; }
+		[JsonProperty("filter")]
+		ITermVectorFilter Filter { get; set; }
 
 		/// <summary>
-		/// A document not indexed in Elasticsearch,
-		/// to generate term vectors for
+		/// The id of the document
 		/// </summary>
-		[JsonProperty("doc")]
-		[JsonConverter(typeof(SourceConverter))]
-		object Document { get; set; }
+		[JsonProperty("_id")]
+		Id Id { get; set; }
 
 		/// <summary>
-		/// The document field to generate term
-		/// vectors for
+		/// The index in which the document resides
 		/// </summary>
-		[JsonProperty("fields")]
-		// TODO: Rename to Fields in 7.x
-		Fields StoredFields { get; set; }
+		[JsonProperty("_index")]
+		IndexName Index { get; set; }
 
 		/// <summary>
 		/// Whether to include the start and end offsets.
@@ -65,33 +73,40 @@ public interface IMultiTermVectorOperation
 		[JsonProperty("positions")]
 		bool? Positions { get; set; }
 
+		/// <summary>
+		/// When requesting term vectors for <see cref="Document" />,
+		/// a shard to get the statistics from is randomly selected.
+		/// Use <see cref="Routing" /> only to hit a particular shard.
+		/// </summary>
+		[JsonProperty("routing")]
+		Routing Routing { get; set; }
+
+		/// <summary>
+		/// The document field to generate term
+		/// vectors for
+		/// </summary>
+		[JsonProperty("fields")]
+		// TODO: Rename to Fields in 7.x
+		Fields StoredFields { get; set; }
+
 		/// <summary>
 		/// Whether to include term statistics. When set to <c>true</c>,
-		/// <para />- total term frequency (how often a term occurs in all documents)
-		/// <para />- document frequency (the number of documents containing the current term)
-		/// <para />will be returned. Default is <c>false</c> since
+		/// <para />
+		/// - total term frequency (how often a term occurs in all documents)
+		/// <para />
+		/// - document frequency (the number of documents containing the current term)
+		/// <para />
+		/// will be returned. Default is <c>false</c> since
 		/// term statistics can have a large performance impact.
 		/// </summary>
 		[JsonProperty("term_statistics")]
 		bool? TermStatistics { get; set; }
 
 		/// <summary>
-		/// Whether to include field statistics. When set to <c>false</c>,
-		/// <para />- document count (how many documents contain this field)
-		/// <para />- sum of document frequencies (the sum of document frequencies for all terms in this field)
-		/// <para />- sum of total term frequencies (the sum of total term frequencies of each term in this field)
-		/// <para />will be omitted. Default is <c>true</c>.
-		/// </summary>
-		[JsonProperty("field_statistics")]
-		bool? FieldStatistics { get; set; }
-
-		/// <summary>
-		/// Filter terms based on their tf-idf scores.
-		/// This can be useful in order find out a good characteristic
-		/// vector of a document.
+		/// The type of the document
 		/// </summary>
-		[JsonProperty("filter")]
-		ITermVectorFilter Filter { get; set; }
+		[JsonProperty("_type")]
+		TypeName Type { get; set; }
 
 		/// <summary>
 		/// The version number
@@ -104,14 +119,6 @@ public interface IMultiTermVectorOperation
 		/// </summary>
 		[JsonProperty("version_type")]
 		VersionType? VersionType { get; set; }
-
-		/// <summary>
-		/// When requesting term vectors for <see cref="Document"/>,
-		/// a shard to get the statistics from is randomly selected.
-		/// Use <see cref="Routing"/> only to hit a particular shard.
-		/// </summary>
-		[JsonProperty("routing")]
-		Routing Routing { get; set; }
 	}
 
 	/// <inheritdoc />
@@ -122,117 +129,134 @@ public class MultiTermVectorOperation<T> : IMultiTermVectorOperation
 
 		public MultiTermVectorOperation(Id id)
 		{
-			this.Id = id;
-			this.Index = typeof (T);
-			this.Type = typeof (T);
+			Id = id;
+			Index = typeof(T);
+			Type = typeof(T);
 		}
 
 		/// <inheritdoc />
-		public IndexName Index { get; set; }
+		public object Document { get; set; }
+
 		/// <inheritdoc />
-		public TypeName Type { get; set; }
+		public bool? FieldStatistics { get; set; }
+
 		/// <inheritdoc />
-		public Id Id { get; set; }
+		public ITermVectorFilter Filter { get; set; }
+
 		/// <inheritdoc />
-		public object Document { get; set; }
+		public Id Id { get; set; }
+
 		/// <inheritdoc />
-		public Fields StoredFields { get; set; }
+		public IndexName Index { get; set; }
+
 		/// <inheritdoc />
 		public bool? Offsets { get; set; }
+
 		/// <inheritdoc />
 		public bool? Payloads { get; set; }
+
 		/// <inheritdoc />
 		public bool? Positions { get; set; }
+
 		/// <inheritdoc />
-		public bool? TermStatistics { get; set; }
+		public Routing Routing
+		{
+			get => _routing ?? (Document == null ? null : new Routing(Document));
+			set => _routing = value;
+		}
+
 		/// <inheritdoc />
-		public bool? FieldStatistics { get; set; }
+		public Fields StoredFields { get; set; }
+
 		/// <inheritdoc />
-		public ITermVectorFilter Filter { get; set; }
+		public bool? TermStatistics { get; set; }
+
+		/// <inheritdoc />
+		public TypeName Type { get; set; }
+
 		/// <inheritdoc />
 		public long? Version { get; set; }
+
 		/// <inheritdoc />
 		public VersionType? VersionType { get; set; }
-		/// <inheritdoc />
-		public Routing Routing
-		{
-			get => _routing ?? (Document == null ? null : new Routing(Document));
-			set => _routing = value;
-		}
 	}
 
-	/// <inheritdoc cref="IMultiTermVectorOperation"/>
-	public class MultiTermVectorOperationDescriptor<T> : DescriptorBase<MultiTermVectorOperationDescriptor<T>, IMultiTermVectorOperation>, IMultiTermVectorOperation
+	/// <inheritdoc cref="IMultiTermVectorOperation" />
+	public class MultiTermVectorOperationDescriptor<T>
+		: DescriptorBase<MultiTermVectorOperationDescriptor<T>, IMultiTermVectorOperation>, IMultiTermVectorOperation
 		where T : class
 	{
 		private Routing _routing;
-
-		IndexName IMultiTermVectorOperation.Index { get; set; } = typeof (T);
-		TypeName IMultiTermVectorOperation.Type { get; set; } = typeof (T);
-		Id IMultiTermVectorOperation.Id { get; set; }
 		object IMultiTermVectorOperation.Document { get; set; }
-		Fields IMultiTermVectorOperation.StoredFields { get; set; }
+		bool? IMultiTermVectorOperation.FieldStatistics { get; set; }
+		ITermVectorFilter IMultiTermVectorOperation.Filter { get; set; }
+		Id IMultiTermVectorOperation.Id { get; set; }
+
+		IndexName IMultiTermVectorOperation.Index { get; set; } = typeof(T);
 		bool? IMultiTermVectorOperation.Offsets { get; set; }
 		bool? IMultiTermVectorOperation.Payloads { get; set; }
 		bool? IMultiTermVectorOperation.Positions { get; set; }
-		bool? IMultiTermVectorOperation.TermStatistics { get; set; }
-		bool? IMultiTermVectorOperation.FieldStatistics { get; set; }
-		ITermVectorFilter IMultiTermVectorOperation.Filter { get; set; }
-		long? IMultiTermVectorOperation.Version { get; set; }
-		VersionType? IMultiTermVectorOperation.VersionType { get; set; }
+
 		Routing IMultiTermVectorOperation.Routing
 		{
 			get => _routing ?? (Self.Document == null ? null : new Routing(Self.Document));
 			set => _routing = value;
 		}
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.StoredFields"/>
+		Fields IMultiTermVectorOperation.StoredFields { get; set; }
+		bool? IMultiTermVectorOperation.TermStatistics { get; set; }
+		TypeName IMultiTermVectorOperation.Type { get; set; } = typeof(T);
+		long? IMultiTermVectorOperation.Version { get; set; }
+		VersionType? IMultiTermVectorOperation.VersionType { get; set; }
+
+		/// <inheritdoc cref="IMultiTermVectorOperation.StoredFields" />
 		// TODO: Rename to Fields in 7.x
 		public MultiTermVectorOperationDescriptor<T> StoredFields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.StoredFields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.StoredFields"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.StoredFields" />
 		// TODO: Rename to Fields in 7.x
 		public MultiTermVectorOperationDescriptor<T> StoredFields(Fields fields) => Assign(a => a.StoredFields = fields);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Id"/>
-		public MultiTermVectorOperationDescriptor<T> Id(Id id) => Assign(a=> a.Id = id);
+		/// <inheritdoc cref="IMultiTermVectorOperation.Id" />
+		public MultiTermVectorOperationDescriptor<T> Id(Id id) => Assign(a => a.Id = id);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Index"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.Index" />
 		public MultiTermVectorOperationDescriptor<T> Index(IndexName index) => Assign(a => a.Index = index);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Type"/>
-		public MultiTermVectorOperationDescriptor<T> Type(TypeName type) => Assign(a=> a.Type = type);
+		/// <inheritdoc cref="IMultiTermVectorOperation.Type" />
+		public MultiTermVectorOperationDescriptor<T> Type(TypeName type) => Assign(a => a.Type = type);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Document"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.Document" />
 		public MultiTermVectorOperationDescriptor<T> Document(T document) => Assign(a => a.Document = document);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Offsets"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.Offsets" />
 		public MultiTermVectorOperationDescriptor<T> Offsets(bool? offsets = true) => Assign(a => a.Offsets = offsets);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Payloads"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.Payloads" />
 		public MultiTermVectorOperationDescriptor<T> Payloads(bool? payloads = true) => Assign(a => a.Payloads = payloads);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Positions"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.Positions" />
 		public MultiTermVectorOperationDescriptor<T> Positions(bool? positions = true) => Assign(a => a.Positions = positions);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.TermStatistics"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.TermStatistics" />
 		public MultiTermVectorOperationDescriptor<T> TermStatistics(bool? termStatistics = true) => Assign(a => a.TermStatistics = termStatistics);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.FieldStatistics"/>
-		public MultiTermVectorOperationDescriptor<T> FieldStatistics(bool? fieldStatistics = true) => Assign(a => a.FieldStatistics = fieldStatistics);
+		/// <inheritdoc cref="IMultiTermVectorOperation.FieldStatistics" />
+		public MultiTermVectorOperationDescriptor<T> FieldStatistics(bool? fieldStatistics = true) =>
+			Assign(a => a.FieldStatistics = fieldStatistics);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Filter"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.Filter" />
 		public MultiTermVectorOperationDescriptor<T> Filter(Func<TermVectorFilterDescriptor, ITermVectorFilter> filterSelector) =>
 			Assign(a => a.Filter = filterSelector?.Invoke(new TermVectorFilterDescriptor()));
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Version"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.Version" />
 		public MultiTermVectorOperationDescriptor<T> Version(long? version) => Assign(a => a.Version = version);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.VersionType"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.VersionType" />
 		public MultiTermVectorOperationDescriptor<T> VersionType(VersionType? versionType) => Assign(a => a.VersionType = versionType);
 
-		/// <inheritdoc cref="IMultiTermVectorOperation.Routing"/>
+		/// <inheritdoc cref="IMultiTermVectorOperation.Routing" />
 		public MultiTermVectorOperationDescriptor<T> Routing(Routing routing) => Assign(a => a.Routing = routing);
 	}
 }
diff --git a/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorsRequest.cs b/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorsRequest.cs
index c385adb4d35..bb2b0f4bfe0 100644
--- a/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorsRequest.cs
+++ b/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorsRequest.cs
@@ -19,13 +19,13 @@ public partial interface IMultiTermVectorsRequest
 		/// <summary>
 		/// The ids of documents within the same index and type
 		/// for which to generate term vectors. Must be used in
-		/// conjunction with <see cref="Index"/> and <see cref="Type"/>
+		/// conjunction with <see cref="Index" /> and <see cref="Type" />
 		/// </summary>
 		[JsonProperty("ids")]
 		IEnumerable<Id> Ids { get; set; }
 	}
 
-	/// <inheritdoc cref="IMultiTermVectorsRequest"/>
+	/// <inheritdoc cref="IMultiTermVectorsRequest" />
 	public partial class MultiTermVectorsRequest
 	{
 		/// <inheritdoc />
@@ -35,54 +35,59 @@ public partial class MultiTermVectorsRequest
 		public IEnumerable<Id> Ids { get; set; }
 	}
 
-	/// <inheritdoc cref="IMultiTermVectorsRequest"/>
+	/// <inheritdoc cref="IMultiTermVectorsRequest" />
 	[DescriptorFor("Mtermvectors")]
 	public partial class MultiTermVectorsDescriptor
 	{
 		private List<IMultiTermVectorOperation> _operations;
 
-		private List<IMultiTermVectorOperation> Operations =>
-			this._operations ?? (this._operations = new List<IMultiTermVectorOperation>());
-
 		IEnumerable<IMultiTermVectorOperation> IMultiTermVectorsRequest.Documents
 		{
-			get => this._operations;
-			set => this._operations = value?.ToList();
+			get => _operations;
+			set => _operations = value?.ToList();
 		}
 
 		IEnumerable<Id> IMultiTermVectorsRequest.Ids { get; set; }
 
+		private List<IMultiTermVectorOperation> Operations =>
+			_operations ?? (_operations = new List<IMultiTermVectorOperation>());
+
 		// TODO: Rename to Documents in 7.x
 		/// <summary>
 		/// A document for which to generate term vectors
 		/// </summary>
 		public MultiTermVectorsDescriptor Get<T>(Func<MultiTermVectorOperationDescriptor<T>, IMultiTermVectorOperation> getSelector)
 			where T : class =>
-			Assign(a => this.Operations.AddIfNotNull(getSelector?.Invoke(new MultiTermVectorOperationDescriptor<T>())));
+			Assign(a => Operations.AddIfNotNull(getSelector?.Invoke(new MultiTermVectorOperationDescriptor<T>())));
 
 		// TODO: Rename to Documents in 7.x
-		/// <inheritdoc cref="IMultiTermVectorsRequest.Documents"/>
+		/// <inheritdoc cref="IMultiTermVectorsRequest.Documents" />
 		public MultiTermVectorsDescriptor GetMany<T>(IEnumerable<long> ids,
-			Func<MultiTermVectorOperationDescriptor<T>, long, IMultiTermVectorOperation> getSelector = null)
+			Func<MultiTermVectorOperationDescriptor<T>, long, IMultiTermVectorOperation> getSelector = null
+		)
 			where T : class =>
-			Assign(a => this.Operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiTermVectorOperationDescriptor<T>().Id(id), id))));
+			Assign(a => Operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiTermVectorOperationDescriptor<T>().Id(id), id))));
 
 		// TODO: Rename to Documents in 7.x
-		/// <inheritdoc cref="IMultiTermVectorsRequest.Documents"/>
-		public MultiTermVectorsDescriptor GetMany<T>(IEnumerable<string> ids, Func<MultiTermVectorOperationDescriptor<T>, string, IMultiTermVectorOperation> getSelector = null)
+		/// <inheritdoc cref="IMultiTermVectorsRequest.Documents" />
+		public MultiTermVectorsDescriptor GetMany<T>(IEnumerable<string> ids,
+			Func<MultiTermVectorOperationDescriptor<T>, string, IMultiTermVectorOperation> getSelector = null
+		)
 			where T : class =>
-			Assign(a => this.Operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiTermVectorOperationDescriptor<T>().Id(id), id))));
+			Assign(a => Operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiTermVectorOperationDescriptor<T>().Id(id), id))));
 
 		// TODO: Rename to Documents in 7.x
-		/// <inheritdoc cref="IMultiTermVectorsRequest.Documents"/>
-		public MultiTermVectorsDescriptor GetMany<T>(IEnumerable<Id> ids, Func<MultiTermVectorOperationDescriptor<T>, Id, IMultiTermVectorOperation> getSelector = null)
+		/// <inheritdoc cref="IMultiTermVectorsRequest.Documents" />
+		public MultiTermVectorsDescriptor GetMany<T>(IEnumerable<Id> ids,
+			Func<MultiTermVectorOperationDescriptor<T>, Id, IMultiTermVectorOperation> getSelector = null
+		)
 			where T : class =>
-			Assign(a => this.Operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiTermVectorOperationDescriptor<T>().Id(id), id))));
+			Assign(a => Operations.AddRange(ids.Select(id => getSelector.InvokeOrDefault(new MultiTermVectorOperationDescriptor<T>().Id(id), id))));
 
-		/// <inheritdoc cref="IMultiTermVectorsRequest.Ids"/>
+		/// <inheritdoc cref="IMultiTermVectorsRequest.Ids" />
 		public MultiTermVectorsDescriptor Ids(IEnumerable<Id> ids) => Assign(a => a.Ids = ids);
 
-		/// <inheritdoc cref="IMultiTermVectorsRequest.Ids"/>
+		/// <inheritdoc cref="IMultiTermVectorsRequest.Ids" />
 		public MultiTermVectorsDescriptor Ids(params Id[] ids) => Assign(a => a.Ids = ids);
 	}
 }
diff --git a/src/Nest/Document/Multiple/Reindex/ElasticClient-Reindex.cs b/src/Nest/Document/Multiple/Reindex/ElasticClient-Reindex.cs
index 39fb0014a5b..b60fa240811 100644
--- a/src/Nest/Document/Multiple/Reindex/ElasticClient-Reindex.cs
+++ b/src/Nest/Document/Multiple/Reindex/ElasticClient-Reindex.cs
@@ -9,9 +9,9 @@ public partial interface IElasticClient
 		/// Helper method that allows you to reindex from one index into another using ScrollAll and BulkAll.
 		/// </summary>
 		/// <returns>An IObservable&lt;IReindexResponse&lt;T&gt;$gt; you can subscribe to to listen to the progress of the reindex process</returns>
-		IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
+		IObservable<IBulkAllResponse> Reindex<TSource, TTarget>(
 			Func<TSource, TTarget> mapper,
-			Func<ReindexDescriptor<TSource,TTarget>, IReindexRequest<TSource,TTarget>> selector,
+			Func<ReindexDescriptor<TSource, TTarget>, IReindexRequest<TSource, TTarget>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 			where TSource : class
@@ -32,8 +32,8 @@ IObservable<IBulkAllResponse> Reindex<TSource>(
 		/// </summary>
 		/// <param name="request">a request object to describe the reindex operation</param>
 		/// <returns>An IObservable&lt;IReindexResponse&lt;T&gt;$gt; you can subscribe to to listen to the progress of the reindex process</returns>
-		IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
-			IReindexRequest<TSource,TTarget> request,
+		IObservable<IBulkAllResponse> Reindex<TSource, TTarget>(
+			IReindexRequest<TSource, TTarget> request,
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 			where TSource : class
@@ -51,13 +51,17 @@ IObservable<IBulkAllResponse> Reindex<TSource>(
 			where TSource : class;
 
 		/// <summary>
-		/// Simplified form for reindex which will cover 80% of its usecases. Allows you to index all documents of type T from <paramref name="fromIndex" /> to <paramref name="toIndex" />
-		/// optionally limiting the documents found in <paramref name="fromIndex" /> by using <paramref name="selector"/>.
+		/// Simplified form for reindex which will cover 80% of its usecases. Allows you to index all documents of type T from
+		/// <paramref name="fromIndex" /> to <paramref name="toIndex" />
+		/// optionally limiting the documents found in <paramref name="fromIndex" /> by using <paramref name="selector" />.
 		/// </summary>
 		/// <param name="fromIndex">The source index, from which all types will be returned</param>
-		/// <param name="toIndex">The target index, if it does not exist already will be created using the same settings of <paramref name="fromIndex"/></param>
-		/// <param name="selector">an optional query limiting the documents found in <paramref name="fromIndex"/></param>
-		IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
+		/// <param name="toIndex">
+		/// The target index, if it does not exist already will be created using the same settings of
+		/// <paramref name="fromIndex" />
+		/// </param>
+		/// <param name="selector">an optional query limiting the documents found in <paramref name="fromIndex" /></param>
+		IObservable<IBulkAllResponse> Reindex<TSource, TTarget>(
 			IndexName fromIndex,
 			IndexName toIndex,
 			Func<TSource, TTarget> mapper,
@@ -68,12 +72,16 @@ IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
 			where TTarget : class;
 
 		/// <summary>
-		/// Simplified form for reindex which will cover 80% of its use cases. Allows you to index all documents of type T from <paramref name="fromIndex" /> to <paramref name="toIndex" />
-		/// optionally limiting the documents found in <paramref name="fromIndex" /> by using <paramref name="selector"/>.
+		/// Simplified form for reindex which will cover 80% of its use cases. Allows you to index all documents of type T from
+		/// <paramref name="fromIndex" /> to <paramref name="toIndex" />
+		/// optionally limiting the documents found in <paramref name="fromIndex" /> by using <paramref name="selector" />.
 		/// </summary>
 		/// <param name="fromIndex">The source index, from which all types will be returned</param>
-		/// <param name="toIndex">The target index, if it does not exist already will be created using the same settings of <paramref name="fromIndex"/></param>
-		/// <param name="selector">an optional query limiting the documents found in <paramref name="fromIndex"/></param>
+		/// <param name="toIndex">
+		/// The target index, if it does not exist already will be created using the same settings of
+		/// <paramref name="fromIndex" />
+		/// </param>
+		/// <param name="selector">an optional query limiting the documents found in <paramref name="fromIndex" /></param>
 		IObservable<IBulkAllResponse> Reindex<TSource>(
 			IndexName fromIndex,
 			IndexName toIndex,
@@ -81,28 +89,27 @@ IObservable<IBulkAllResponse> Reindex<TSource>(
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 			where TSource : class;
-
 	}
 
 	public partial class ElasticClient
 	{
 		/// <inheritdoc />
 		public IObservable<IBulkAllResponse> Reindex<TSource>(
-			Func<ReindexDescriptor<TSource,TSource>, IReindexRequest<TSource,TSource>> selector,
+			Func<ReindexDescriptor<TSource, TSource>, IReindexRequest<TSource, TSource>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 			where TSource : class =>
-			this.Reindex(selector.InvokeOrDefault(new ReindexDescriptor<TSource,TSource>(s=>s)));
+			Reindex(selector.InvokeOrDefault(new ReindexDescriptor<TSource, TSource>(s => s)));
 
 		/// <inheritdoc />
-		public IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
+		public IObservable<IBulkAllResponse> Reindex<TSource, TTarget>(
 			Func<TSource, TTarget> mapper,
-			Func<ReindexDescriptor<TSource,TTarget>, IReindexRequest<TSource,TTarget>> selector,
+			Func<ReindexDescriptor<TSource, TTarget>, IReindexRequest<TSource, TTarget>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 			where TTarget : class
 			where TSource : class =>
-			this.Reindex(selector.InvokeOrDefault(new ReindexDescriptor<TSource,TTarget>(mapper)));
+			Reindex(selector.InvokeOrDefault(new ReindexDescriptor<TSource, TTarget>(mapper)));
 
 		/// <inheritdoc />
 		public IObservable<IBulkAllResponse> Reindex<TSource>(
@@ -110,12 +117,12 @@ public IObservable<IBulkAllResponse> Reindex<TSource>(
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 			where TSource : class =>
-			this.Reindex<TSource, TSource>(request, cancellationToken);
+			Reindex<TSource, TSource>(request, cancellationToken);
 
 
 		/// <inheritdoc />
-		public IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
-			IReindexRequest<TSource,TTarget> request,
+		public IObservable<IBulkAllResponse> Reindex<TSource, TTarget>(
+			IReindexRequest<TSource, TTarget> request,
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 			where TTarget : class
@@ -127,11 +134,12 @@ public IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
 			if (request.BulkAll == null)
 				throw new ArgumentException(
 					"BulkAll property must set in order to get the target of a Reindex operation");
-			return new ReindexObservable<TSource,TTarget>(this, ConnectionSettings, request, cancellationToken);
+
+			return new ReindexObservable<TSource, TTarget>(this, ConnectionSettings, request, cancellationToken);
 		}
 
 		/// <inheritdoc />
-		public IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
+		public IObservable<IBulkAllResponse> Reindex<TSource, TTarget>(
 			IndexName fromIndex,
 			IndexName toIndex,
 			Func<TSource, TTarget> mapper,
@@ -140,10 +148,10 @@ public IObservable<IBulkAllResponse> Reindex<TSource,TTarget>(
 		)
 			where TTarget : class
 			where TSource : class =>
-			this.Reindex(
+			Reindex(
 				mapper,
 				SimplifiedReindexer<TSource, TTarget>(fromIndex, toIndex, selector)
-			, cancellationToken);
+				, cancellationToken);
 
 		/// <inheritdoc />
 		public IObservable<IBulkAllResponse> Reindex<TSource>(
@@ -153,30 +161,25 @@ public IObservable<IBulkAllResponse> Reindex<TSource>(
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
 			where TSource : class =>
-			this.Reindex(
-				s=>s,
+			Reindex(
+				s => s,
 				SimplifiedReindexer<TSource, TSource>(fromIndex, toIndex, selector)
-			, cancellationToken);
+				, cancellationToken);
 
-		private static Func<ReindexDescriptor<TSource,TTarget>, IReindexRequest<TSource,TTarget>> SimplifiedReindexer<TSource, TTarget>(
+		private static Func<ReindexDescriptor<TSource, TTarget>, IReindexRequest<TSource, TTarget>> SimplifiedReindexer<TSource, TTarget>(
 			IndexName fromIndex,
 			IndexName toIndex,
 			Func<QueryContainerDescriptor<TSource>, QueryContainer> selector
 		)
 			where TTarget : class
-			where TSource : class
-		{
-			return r => r
-				.ScrollAll("1m", -1, search => search
-					.Search(ss => ss
-						.Size(CoordinatedRequestDefaults.ReindexScrollSize)
-						.Index(fromIndex)
-						.Query(selector)
-					)
+			where TSource : class => r => r
+			.ScrollAll("1m", -1, search => search
+				.Search(ss => ss
+					.Size(CoordinatedRequestDefaults.ReindexScrollSize)
+					.Index(fromIndex)
+					.Query(selector)
 				)
-				.BulkAll(b => b.Index(toIndex));
-		}
-
-
+			)
+			.BulkAll(b => b.Index(toIndex));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Document/Multiple/Reindex/ReindexObservable.cs b/src/Nest/Document/Multiple/Reindex/ReindexObservable.cs
index bf85a87314b..fc990aee6fc 100644
--- a/src/Nest/Document/Multiple/Reindex/ReindexObservable.cs
+++ b/src/Nest/Document/Multiple/Reindex/ReindexObservable.cs
@@ -10,43 +10,45 @@ namespace Nest
 	public class ReindexObservable<TSource> : ReindexObservable<TSource, TSource>
 		where TSource : class
 	{
-		public ReindexObservable(IElasticClient client, IConnectionSettingsValues connectionSettings, IReindexRequest<TSource, TSource> reindexRequest, CancellationToken cancellationToken)
-			: base(client, connectionSettings, reindexRequest, cancellationToken)
-		{
-		}
+		public ReindexObservable(IElasticClient client, IConnectionSettingsValues connectionSettings,
+			IReindexRequest<TSource, TSource> reindexRequest, CancellationToken cancellationToken
+		)
+			: base(client, connectionSettings, reindexRequest, cancellationToken) { }
 	}
 
 	public class ReindexObservable<TSource, TTarget> : IDisposable, IObservable<IBulkAllResponse>
 		where TSource : class
 		where TTarget : class
 	{
-		private readonly IReindexRequest<TSource, TTarget> _reindexRequest;
-		private readonly IConnectionSettingsValues _connectionSettings;
 		private readonly IElasticClient _client;
+		private readonly CancellationToken _compositeCancelToken;
+		private readonly CancellationTokenSource _compositeCancelTokenSource;
+		private readonly IConnectionSettingsValues _connectionSettings;
+		private readonly IReindexRequest<TSource, TTarget> _reindexRequest;
 
 		private Action<long> _incrementSeenDocuments = l => { };
 		private Action _incrementSeenScrollOperations = () => { };
-		private readonly CancellationTokenSource _compositeCancelTokenSource;
-		private readonly CancellationToken _compositeCancelToken;
 
 		public ReindexObservable(
 			IElasticClient client,
 			IConnectionSettingsValues connectionSettings,
 			IReindexRequest<TSource, TTarget> reindexRequest,
-			CancellationToken cancellationToken)
+			CancellationToken cancellationToken
+		)
 		{
-			this._connectionSettings = connectionSettings;
-			this._reindexRequest = reindexRequest;
-			this._client = client;
-			this._compositeCancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-			this._compositeCancelToken = this._compositeCancelTokenSource.Token;
+			_connectionSettings = connectionSettings;
+			_reindexRequest = reindexRequest;
+			_client = client;
+			_compositeCancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+			_compositeCancelToken = _compositeCancelTokenSource.Token;
 		}
 
-		public IDisposable Subscribe(ReindexObserver observer)
+		public bool IsDisposed { get; private set; }
+
+		public void Dispose()
 		{
-			this._incrementSeenDocuments = observer.IncrementSeenScrollDocuments;
-			this._incrementSeenScrollOperations = observer.IncrementSeenScrollOperations;
-			return this.Subscribe((IObserver<IBulkAllResponse>) observer);
+			IsDisposed = true;
+			_compositeCancelTokenSource?.Cancel();
 		}
 
 		public IDisposable Subscribe(IObserver<IBulkAllResponse> observer)
@@ -54,7 +56,7 @@ public IDisposable Subscribe(IObserver<IBulkAllResponse> observer)
 			observer.ThrowIfNull(nameof(observer));
 			try
 			{
-				this.Reindex(observer);
+				Reindex(observer);
 			}
 			catch (Exception e)
 			{
@@ -63,21 +65,28 @@ public IDisposable Subscribe(IObserver<IBulkAllResponse> observer)
 			return this;
 		}
 
+		public IDisposable Subscribe(ReindexObserver observer)
+		{
+			_incrementSeenDocuments = observer.IncrementSeenScrollDocuments;
+			_incrementSeenScrollOperations = observer.IncrementSeenScrollOperations;
+			return Subscribe((IObserver<IBulkAllResponse>)observer);
+		}
+
 		private void Reindex(IObserver<IBulkAllResponse> observer)
 		{
-			var bulkMeta = this._reindexRequest.BulkAll?.Invoke(Enumerable.Empty<IHitMetadata<TTarget>>());
-			var scrollAll = this._reindexRequest.ScrollAll;
-			var toIndex = bulkMeta?.Index.Resolve(this._connectionSettings);
+			var bulkMeta = _reindexRequest.BulkAll?.Invoke(Enumerable.Empty<IHitMetadata<TTarget>>());
+			var scrollAll = _reindexRequest.ScrollAll;
+			var toIndex = bulkMeta?.Index.Resolve(_connectionSettings);
 
-			var slices = this.CreateIndex(toIndex, scrollAll);
+			var slices = CreateIndex(toIndex, scrollAll);
 
-			var backPressure = this.CreateBackPressure(bulkMeta, scrollAll, slices);
+			var backPressure = CreateBackPressure(bulkMeta, scrollAll, slices);
 
-			var scrollDocuments = this.ScrollAll(slices, backPressure)
+			var scrollDocuments = ScrollAll(slices, backPressure)
 				.SelectMany(r => r.SearchResponse.Hits)
-				.Select(r=> r.Copy(this._reindexRequest.Map));
+				.Select(r => r.Copy(_reindexRequest.Map));
 
-			var observableBulk = this.BulkAll(scrollDocuments, backPressure, toIndex);
+			var observableBulk = BulkAll(scrollDocuments, backPressure, toIndex);
 
 			//by casting the observable can potentially store more meta data on the user provided observer
 			if (observer is BulkAllObserver moreInfoObserver)
@@ -85,9 +94,11 @@ private void Reindex(IObserver<IBulkAllResponse> observer)
 			else observableBulk.Subscribe(observer);
 		}
 
-		private BulkAllObservable<IHitMetadata<TTarget>> BulkAll(IEnumerable<IHitMetadata<TTarget>> scrollDocuments, ProducerConsumerBackPressure backPressure, string toIndex)
+		private BulkAllObservable<IHitMetadata<TTarget>> BulkAll(IEnumerable<IHitMetadata<TTarget>> scrollDocuments,
+			ProducerConsumerBackPressure backPressure, string toIndex
+		)
 		{
-			var bulkAllRequest = this._reindexRequest.BulkAll?.Invoke(scrollDocuments);
+			var bulkAllRequest = _reindexRequest.BulkAll?.Invoke(scrollDocuments);
 			if (bulkAllRequest == null)
 				throw new Exception("BulkAll must set on ReindexRequest in order to get the target of a Reindex operation");
 
@@ -113,13 +124,15 @@ private BulkAllObservable<IHitMetadata<TTarget>> BulkAll(IEnumerable<IHitMetadat
 				}
 			};
 
-			var observableBulk = this._client.BulkAll(bulkAllRequest, this._compositeCancelToken);
+			var observableBulk = _client.BulkAll(bulkAllRequest, _compositeCancelToken);
 			return observableBulk;
 		}
 
-		private ProducerConsumerBackPressure CreateBackPressure(IBulkAllRequest<IHitMetadata<TTarget>> bulkMeta, IScrollAllRequest scrollAll, int slices)
+		private ProducerConsumerBackPressure CreateBackPressure(IBulkAllRequest<IHitMetadata<TTarget>> bulkMeta, IScrollAllRequest scrollAll,
+			int slices
+		)
 		{
-			var backPressureFactor = this._reindexRequest.BackPressureFactor ?? CoordinatedRequestDefaults.ReindexBackPressureFactor;
+			var backPressureFactor = _reindexRequest.BackPressureFactor ?? CoordinatedRequestDefaults.ReindexBackPressureFactor;
 			var maxConcurrentConsumers = bulkMeta?.MaxDegreeOfParallelism ?? CoordinatedRequestDefaults.BulkAllMaxDegreeOfParallelismDefault;
 			var maxConcurrentProducers = scrollAll?.MaxDegreeOfParallelism ?? slices;
 			var maxConcurrency = Math.Min(maxConcurrentConsumers, maxConcurrentProducers);
@@ -127,7 +140,7 @@ private ProducerConsumerBackPressure CreateBackPressure(IBulkAllRequest<IHitMeta
 			var bulkSize = bulkMeta?.Size ?? CoordinatedRequestDefaults.BulkAllSizeDefault;
 			var searchSize = scrollAll?.Search?.Size ?? 10;
 			var producerBandwidth = searchSize * maxConcurrency * backPressureFactor;
-			var funnelTooSmall =  producerBandwidth < bulkSize;
+			var funnelTooSmall = producerBandwidth < bulkSize;
 			if (funnelTooSmall)
 				throw new Exception("The back pressure settings are too conservative in providing enough documents for a single bulk operation. "
 					+ $"searchSize:{searchSize} * maxConcurrency:{maxConcurrency} * backPressureFactor:{backPressureFactor} = {producerBandwidth}"
@@ -136,7 +149,8 @@ private ProducerConsumerBackPressure CreateBackPressure(IBulkAllRequest<IHitMeta
 
 			var funnelExact = producerBandwidth == bulkSize;
 			if (funnelExact)
-				throw new Exception("The back pressure settings are too conservative. They provide enough documents for a single bulk but not enough room to advance "
+				throw new Exception(
+					"The back pressure settings are too conservative. They provide enough documents for a single bulk but not enough room to advance "
 					+ $"searchSize:{searchSize} * maxConcurrency:{maxConcurrency} * backPressureFactor:{backPressureFactor} = {producerBandwidth}"
 					+ $" which is exactly the bulkSize:{bulkSize}. Increase the BulkAll max concurrency or the backPressureFactor"
 				);
@@ -147,8 +161,8 @@ private ProducerConsumerBackPressure CreateBackPressure(IBulkAllRequest<IHitMeta
 
 		private IEnumerable<IScrollAllResponse<TSource>> ScrollAll(int slices, ProducerConsumerBackPressure backPressure)
 		{
-			var scrollAll = this._reindexRequest.ScrollAll;
-			var scroll = this._reindexRequest.ScrollAll?.ScrollTime ?? TimeSpan.FromMinutes(2);
+			var scrollAll = _reindexRequest.ScrollAll;
+			var scroll = _reindexRequest.ScrollAll?.ScrollTime ?? TimeSpan.FromMinutes(2);
 
 			var scrollAllRequest = new ScrollAllRequest(scroll, slices)
 			{
@@ -158,7 +172,7 @@ private IEnumerable<IScrollAllResponse<TSource>> ScrollAll(int slices, ProducerC
 				BackPressure = backPressure
 			};
 
-			var scrollObservable = this._client.ScrollAll<TSource>(scrollAllRequest, this._compositeCancelToken);
+			var scrollObservable = _client.ScrollAll<TSource>(scrollAllRequest, _compositeCancelToken);
 			return new GetEnumerator<IScrollAllResponse<TSource>>()
 				.ToEnumerable(scrollObservable)
 				.Select(ObserveScrollAllResponse);
@@ -166,8 +180,8 @@ private IEnumerable<IScrollAllResponse<TSource>> ScrollAll(int slices, ProducerC
 
 		private IScrollAllResponse<TSource> ObserveScrollAllResponse(IScrollAllResponse<TSource> response)
 		{
-			this._incrementSeenScrollOperations();
-			this._incrementSeenDocuments(response.SearchResponse.Hits.Count);
+			_incrementSeenScrollOperations();
+			_incrementSeenDocuments(response.SearchResponse.Hits.Count);
 			return response;
 		}
 
@@ -176,21 +190,23 @@ private static ElasticsearchClientException Throw(string message, IApiCallDetail
 
 		private int CreateIndex(string toIndex, IScrollAllRequest scrollAll)
 		{
-			var fromIndices = this._reindexRequest.ScrollAll?.Search?.Index ?? Indices<TSource>();
+			var fromIndices = _reindexRequest.ScrollAll?.Search?.Index ?? Indices<TSource>();
 
 			if (string.IsNullOrEmpty(toIndex))
 				throw new Exception($"Could not resolve the target index name to reindex to make sure the bulk all operation describes one");
 
-			var numberOfShards = this.CreateIndexIfNeeded(fromIndices, toIndex);
+			var numberOfShards = CreateIndexIfNeeded(fromIndices, toIndex);
 
 			var slices = scrollAll?.Slices ?? numberOfShards;
 			if (scrollAll?.Slices < 0 && numberOfShards.HasValue)
 				slices = numberOfShards;
 			else if (scrollAll?.Slices < 0)
 				throw new Exception("Slices is a negative number and no sane default could be inferred from the origin index's number_of_shards");
+
 			if (!slices.HasValue)
 				throw new Exception("Slices is not specified and could not be inferred from the number of "
-				                    + "shards hint from the source. This could happen if the scroll all points to multiple indices and no slices have been set");
+					+ "shards hint from the source. This could happen if the scroll all points to multiple indices and no slices have been set");
+
 			return slices.Value;
 		}
 
@@ -201,42 +217,35 @@ private int CreateIndex(string toIndex, IScrollAllRequest scrollAll)
 		/// <returns>Either the number of shards from to source or the target as a slice hint to ScrollAll</returns>
 		private int? CreateIndexIfNeeded(Indices fromIndices, string resolvedTo)
 		{
-			if (this._reindexRequest.OmitIndexCreation) return null;
+			if (_reindexRequest.OmitIndexCreation) return null;
 
 			var pointsToSingleSourceIndex = fromIndices.Match((a) => false, (m) => m.Indices.Count == 1);
-			var targetExistsAlready = this._client.IndexExists(resolvedTo);
+			var targetExistsAlready = _client.IndexExists(resolvedTo);
 			if (targetExistsAlready.Exists) return null;
 
-			this._compositeCancelToken.ThrowIfCancellationRequested();
+			_compositeCancelToken.ThrowIfCancellationRequested();
 			IndexState originalIndexState = null;
-			var resolvedFrom = fromIndices.Resolve(this._connectionSettings);
+			var resolvedFrom = fromIndices.Resolve(_connectionSettings);
 
 			if (pointsToSingleSourceIndex)
 			{
-				var getIndexResponse = this._client.GetIndex(resolvedFrom);
-				this._compositeCancelToken.ThrowIfCancellationRequested();
+				var getIndexResponse = _client.GetIndex(resolvedFrom);
+				_compositeCancelToken.ThrowIfCancellationRequested();
 				originalIndexState = getIndexResponse.Indices[resolvedFrom];
-				if (this._reindexRequest.OmitIndexCreation)
+				if (_reindexRequest.OmitIndexCreation)
 					return originalIndexState.Settings.NumberOfShards;
 			}
 
-			var createIndexRequest = this._reindexRequest.CreateIndexRequest ??
-			                         (originalIndexState != null
-				                         ? new CreateIndexRequest(resolvedTo, originalIndexState)
-				                         : new CreateIndexRequest(resolvedTo));
-			var createIndexResponse = this._client.CreateIndex(createIndexRequest);
-			this._compositeCancelToken.ThrowIfCancellationRequested();
+			var createIndexRequest = _reindexRequest.CreateIndexRequest ??
+				(originalIndexState != null
+					? new CreateIndexRequest(resolvedTo, originalIndexState)
+					: new CreateIndexRequest(resolvedTo));
+			var createIndexResponse = _client.CreateIndex(createIndexRequest);
+			_compositeCancelToken.ThrowIfCancellationRequested();
 			if (!createIndexResponse.IsValid)
 				throw Throw($"Could not create destination index {resolvedTo}.", createIndexResponse.ApiCall);
 
 			return createIndexRequest.Settings?.NumberOfShards;
 		}
-
-		public bool IsDisposed { get; private set; }
-		public void Dispose()
-		{
-			this.IsDisposed = true;
-			this._compositeCancelTokenSource?.Cancel();
-		}
 	}
 }
diff --git a/src/Nest/Document/Multiple/Reindex/ReindexObserver.cs b/src/Nest/Document/Multiple/Reindex/ReindexObserver.cs
index 7c3f01aaf19..94afb1004c1 100644
--- a/src/Nest/Document/Multiple/Reindex/ReindexObserver.cs
+++ b/src/Nest/Document/Multiple/Reindex/ReindexObserver.cs
@@ -8,18 +8,18 @@ public class ReindexObserver : BulkAllObserver
 		private long _seenScrollDocuments;
 		private long _seenScrollOperations;
 
+		public ReindexObserver(
+			Action<IBulkAllResponse> onNext = null,
+			Action<Exception> onError = null,
+			Action onCompleted = null
+		)
+			: base(onNext, onError, onCompleted) { }
+
 		public long SeenScrollDocuments => _seenScrollDocuments;
 		public long SeenScrollOperations => _seenScrollOperations;
 
 		internal void IncrementSeenScrollDocuments(long documentCount) => Interlocked.Add(ref _seenScrollDocuments, documentCount);
-		internal void IncrementSeenScrollOperations() => Interlocked.Increment(ref _seenScrollOperations);
 
-		public ReindexObserver(
-			Action<IBulkAllResponse> onNext = null,
-			Action<Exception> onError = null,
-			Action onCompleted = null)
-			: base(onNext, onError, onCompleted)
-		{
-		}
+		internal void IncrementSeenScrollOperations() => Interlocked.Increment(ref _seenScrollOperations);
 	}
 }
diff --git a/src/Nest/Document/Multiple/Reindex/ReindexRequest.cs b/src/Nest/Document/Multiple/Reindex/ReindexRequest.cs
index e049bd3749b..4e6fc390b23 100644
--- a/src/Nest/Document/Multiple/Reindex/ReindexRequest.cs
+++ b/src/Nest/Document/Multiple/Reindex/ReindexRequest.cs
@@ -4,48 +4,46 @@
 namespace Nest
 {
 	/// <summary>
-	/// A reindex implementation that uses ScrollAll() BulkAll() to compose a reindex pipeline.
-	///
-	/// <para> This differs from ReindexOnServer() in that documents are fetched from Elasticsearch, transformed on the client side,
-	/// then sent back to Elasticsearch.
-	/// </para>
-	///
-	/// <para> This will create the target index if it doesn't exist already. If <see cref="CreateIndexRequest" /> is not specified
-	/// and the source of the reindex  points to a single index we try and reuse the settings from source.
-	/// You can completely opt out of all of this using <see cref="OmitIndexCreation"/>
-	/// </para>
-	///
+	///  A reindex implementation that uses ScrollAll() BulkAll() to compose a reindex pipeline.
+	/// <para>
+	/// This differs from ReindexOnServer() in that documents are fetched from Elasticsearch, transformed on the client side,
+	///  then sent back to Elasticsearch.
+	///  </para>
+	///  <para>
+	/// This will create the target index if it doesn't exist already. If <see cref="CreateIndexRequest" /> is not specified
+	///  and the source of the reindex  points to a single index we try and reuse the settings from source.
+	///  You can completely opt out of all of this using <see cref="OmitIndexCreation" />
+	///  </para>
 	/// </summary>
 	public interface IReindexRequest<TSource, TTarget>
 		where TSource : class
 		where TTarget : class
 	{
 		/// <summary>
-		/// The scroll typically outperforms the bulk operations by a long shot. If we'd leave things unbounded you'd quickly have way too many pending scroll
+		/// The scroll typically outperforms the bulk operations by a long shot. If we'd leave things unbounded you'd quickly have way too many pending
+		/// scroll
 		/// requests. What this property allows you to express is that for each bucket in the max concurrency of the minimum max concurrency between
-		/// producer and consumer amply the maximum overal pending of the other side by this factor. Typically the concurrency of the consumer (bulkall) will
+		/// producer and consumer amply the maximum overal pending of the other side by this factor. Typically the concurrency of the consumer
+		/// (bulkall) will
 		/// be lower and with this factor we can dampen the overall pending scroll requests while we are still processing bulk requests.
 		/// <para>defaults to 4 if not provided</para>
 		/// </summary>
 		int? BackPressureFactor { get; set; }
 
 		/// <summary>
-		/// Describes the scroll operation where we need to fetch the documents from.
+		/// Provide a factory for the bulk all request, the first argument is the lazy collection of scroll results which is a mandatory
+		/// argument to create <see cref="BulkAllRequest{T}" /> or <see cref="BulkAllDescriptor{T}" />
 		/// <para>
-		/// Note that <see cref="IScrollAllRequest.BackPressure"/> can be overriden by our own.
+		/// Note that <see cref="IBulkAllRequest{T}.BufferToBulk" /> is always overriden as well as
+		/// <see cref="IBulkAllRequest{T}.BackPressure" />
 		/// </para>
 		/// </summary>
-		IScrollAllRequest ScrollAll{ get; set; }
+		Func<IEnumerable<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> BulkAll { get; set; }
 
 		/// <summary>
-		/// Provide a factory for the bulk all request, the first argument is the lazy collection of scroll results which is a mandatory
-		/// argument to create <see cref="BulkAllRequest{T}" /> or <see cref="BulkAllDescriptor{T}"/>
-		/// <para>
-		/// Note that <see cref="IBulkAllRequest{T}.BufferToBulk"/> is always overriden as well as
-		/// <see cref="IBulkAllRequest{T}.BackPressure"/>
-		/// </para>
+		/// Describe how the newly created index should be created. Remember you can also register Index Templates for more dynamic usecases.
 		/// </summary>
-		Func<IEnumerable<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> BulkAll { get; set; }
+		ICreateIndexRequest CreateIndexRequest { get; set; }
 
 		Func<TSource, TTarget> Map { get; set; }
 
@@ -56,95 +54,109 @@ public interface IReindexRequest<TSource, TTarget>
 		bool OmitIndexCreation { get; set; }
 
 		/// <summary>
-		/// Describe how the newly created index should be created. Remember you can also register Index Templates for more dynamic usecases.
+		/// Describes the scroll operation where we need to fetch the documents from.
+		/// <para>
+		/// Note that <see cref="IScrollAllRequest.BackPressure" /> can be overriden by our own.
+		/// </para>
 		/// </summary>
-		ICreateIndexRequest CreateIndexRequest { get; set; }
+		IScrollAllRequest ScrollAll { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public interface IReindexRequest<TSource> : IReindexRequest<TSource, TSource> where TSource : class { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class ReindexRequest<TSource, TTarget> : IReindexRequest<TSource, TTarget>
 		where TSource : class
 		where TTarget : class
 	{
-		/// <inheritdoc/>
-		IScrollAllRequest IReindexRequest<TSource, TTarget>.ScrollAll { get; set; }
-		/// <inheritdoc/>
-		Func<IEnumerable<IHitMetadata<TTarget>>,IBulkAllRequest<IHitMetadata<TTarget>>> IReindexRequest<TSource, TTarget>.BulkAll { get; set; }
-		/// <inheritdoc/>
-		Func<TSource, TTarget> IReindexRequest<TSource, TTarget>.Map { get; set; }
-
-		/// <inheritdoc/>
-		public bool OmitIndexCreation { get; set; }
-		/// <inheritdoc/>
-		public ICreateIndexRequest CreateIndexRequest { get; set; }
-		/// <inheritdoc/>
-		public int? BackPressureFactor { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		/// <param name="scrollSource">The scroll operation yielding the source documents for the reindex operation</param>
 		/// <param name="map">A function that converts from a source document to a target document</param>
 		/// <param name="bulkAllTarget">A factory that instantiates the bulk all operation over the lazy stream of search result hits</param>
-		public ReindexRequest(IScrollAllRequest scrollSource, Func<TSource, TTarget> map, Func<IEnumerable<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> bulkAllTarget)
+		public ReindexRequest(IScrollAllRequest scrollSource, Func<TSource, TTarget> map,
+			Func<IEnumerable<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> bulkAllTarget
+		)
 		{
 			scrollSource.ThrowIfNull(nameof(scrollSource), "scrollSource must be set in order to get the source of a Reindex operation");
 			bulkAllTarget.ThrowIfNull(nameof(bulkAllTarget), "bulkAllTarget must set in order to get the target of a Reindex operation");
 			map.ThrowIfNull(nameof(map), "map must be set to know how to take TSource and transform it into TTarget");
 
-			var i = (IReindexRequest<TSource, TTarget>) this;
+			var i = (IReindexRequest<TSource, TTarget>)this;
 			i.ScrollAll = scrollSource;
 			i.BulkAll = bulkAllTarget;
 			i.Map = map;
 		}
+
+		/// <inheritdoc />
+		public int? BackPressureFactor { get; set; }
+
+		/// <inheritdoc />
+		public ICreateIndexRequest CreateIndexRequest { get; set; }
+
+		/// <inheritdoc />
+		public bool OmitIndexCreation { get; set; }
+
+		/// <inheritdoc />
+		Func<IEnumerable<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> IReindexRequest<TSource, TTarget>.BulkAll { get; set; }
+
+		/// <inheritdoc />
+		Func<TSource, TTarget> IReindexRequest<TSource, TTarget>.Map { get; set; }
+
+		/// <inheritdoc />
+		IScrollAllRequest IReindexRequest<TSource, TTarget>.ScrollAll { get; set; }
 	}
 
 	public class ReindexRequest<TSource> : ReindexRequest<TSource, TSource>
 		where TSource : class
 	{
-		public ReindexRequest(IScrollAllRequest scrollSource, Func<IEnumerable<IHitMetadata<TSource>>, IBulkAllRequest<IHitMetadata<TSource>>> bulkAllTarget)
-			: base(scrollSource, s=>s, bulkAllTarget)
-		{
-		}
+		public ReindexRequest(IScrollAllRequest scrollSource,
+			Func<IEnumerable<IHitMetadata<TSource>>, IBulkAllRequest<IHitMetadata<TSource>>> bulkAllTarget
+		)
+			: base(scrollSource, s => s, bulkAllTarget) { }
 	}
 
-	public class ReindexDescriptor<TSource, TTarget> : DescriptorBase<ReindexDescriptor<TSource, TTarget>, IReindexRequest<TSource, TTarget>>, IReindexRequest<TSource, TTarget>
+	public class ReindexDescriptor<TSource, TTarget>
+		: DescriptorBase<ReindexDescriptor<TSource, TTarget>, IReindexRequest<TSource, TTarget>>, IReindexRequest<TSource, TTarget>
 		where TSource : class
 		where TTarget : class
 	{
-		IScrollAllRequest IReindexRequest<TSource, TTarget>.ScrollAll{ get; set; }
-
 		private Func<BulkAllDescriptor<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> _createBulkAll;
-		Func<IEnumerable<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> IReindexRequest<TSource, TTarget>.BulkAll { get; set; }
-		bool IReindexRequest<TSource, TTarget>.OmitIndexCreation { get; set; }
-		ICreateIndexRequest IReindexRequest<TSource, TTarget>.CreateIndexRequest { get; set; }
-		int? IReindexRequest<TSource, TTarget>.BackPressureFactor { get; set; }
-		Func<TSource, TTarget> IReindexRequest<TSource, TTarget>.Map { get; set; }
 
 		public ReindexDescriptor(Func<TSource, TTarget> mapper)
 		{
-			var i = (IReindexRequest<TSource, TTarget>) this;
-			i.BulkAll = d => this._createBulkAll.InvokeOrDefault(new BulkAllDescriptor<IHitMetadata<TTarget>>(d));
+			var i = (IReindexRequest<TSource, TTarget>)this;
+			i.BulkAll = d => _createBulkAll.InvokeOrDefault(new BulkAllDescriptor<IHitMetadata<TTarget>>(d));
 			i.Map = mapper;
 		}
 
-		/// <inheritdoc/>
-		public ReindexDescriptor<TSource, TTarget> ScrollAll(Time scrollTime, int slices, Func<ScrollAllDescriptor<TSource>,IScrollAllRequest> selector = null) =>
+		int? IReindexRequest<TSource, TTarget>.BackPressureFactor { get; set; }
+		Func<IEnumerable<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> IReindexRequest<TSource, TTarget>.BulkAll { get; set; }
+		ICreateIndexRequest IReindexRequest<TSource, TTarget>.CreateIndexRequest { get; set; }
+		Func<TSource, TTarget> IReindexRequest<TSource, TTarget>.Map { get; set; }
+		bool IReindexRequest<TSource, TTarget>.OmitIndexCreation { get; set; }
+		IScrollAllRequest IReindexRequest<TSource, TTarget>.ScrollAll { get; set; }
+
+		/// <inheritdoc />
+		public ReindexDescriptor<TSource, TTarget> ScrollAll(Time scrollTime, int slices,
+			Func<ScrollAllDescriptor<TSource>, IScrollAllRequest> selector = null
+		) =>
 			Assign(a => a.ScrollAll = selector.InvokeOrDefault(new ScrollAllDescriptor<TSource>(scrollTime, slices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ReindexDescriptor<TSource, TTarget> BackPressureFactor(int? maximum) =>
 			Assign(a => a.BackPressureFactor = maximum);
 
-		/// <inheritdoc/>
-		public ReindexDescriptor<TSource, TTarget> BulkAll(Func<BulkAllDescriptor<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> selector) =>
-			Assign(a => this._createBulkAll = selector);
+		/// <inheritdoc />
+		public ReindexDescriptor<TSource, TTarget> BulkAll(
+			Func<BulkAllDescriptor<IHitMetadata<TTarget>>, IBulkAllRequest<IHitMetadata<TTarget>>> selector
+		) =>
+			Assign(a => _createBulkAll = selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ReindexDescriptor<TSource, TTarget> OmitIndexCreation(bool omit = true) => Assign(a => a.OmitIndexCreation = omit);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ReindexDescriptor<TSource, TTarget> CreateIndex(Func<CreateIndexDescriptor, ICreateIndexRequest> createIndexSelector) =>
 			Assign(a => a.CreateIndexRequest = createIndexSelector.InvokeOrDefault(new CreateIndexDescriptor("ignored")));
 	}
diff --git a/src/Nest/Document/Multiple/ReindexOnServer/ElasticClient-ReindexOnServer.cs b/src/Nest/Document/Multiple/ReindexOnServer/ElasticClient-ReindexOnServer.cs
index 27c053afef4..d9c3a20e221 100644
--- a/src/Nest/Document/Multiple/ReindexOnServer/ElasticClient-ReindexOnServer.cs
+++ b/src/Nest/Document/Multiple/ReindexOnServer/ElasticClient-ReindexOnServer.cs
@@ -1,8 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.IO;
-using System.Threading;
 
 namespace Nest
 {
@@ -24,38 +23,46 @@ public partial interface IElasticClient
 		/// Reindexes documents from one or more indices to another. the reindex operation takes place
 		/// within Elasticsearch
 		/// </summary>
-		Task<IReindexOnServerResponse> ReindexOnServerAsync(Func<ReindexOnServerDescriptor, IReindexOnServerRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IReindexOnServerResponse> ReindexOnServerAsync(Func<ReindexOnServerDescriptor, IReindexOnServerRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Reindexes documents from one or more indices to another. the reindex operation takes place
 		/// within Elasticsearch
 		/// </summary>
-		Task<IReindexOnServerResponse> ReindexOnServerAsync(IReindexOnServerRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IReindexOnServerResponse> ReindexOnServerAsync(IReindexOnServerRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IReindexOnServerResponse ReindexOnServer(Func<ReindexOnServerDescriptor, IReindexOnServerRequest> selector) =>
-			this.ReindexOnServer(selector.InvokeOrDefault(new ReindexOnServerDescriptor()));
+			ReindexOnServer(selector.InvokeOrDefault(new ReindexOnServerDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IReindexOnServerResponse ReindexOnServer(IReindexOnServerRequest request) =>
-			this.Dispatcher.Dispatch<IReindexOnServerRequest, ReindexOnServerRequestParameters, ReindexOnServerResponse>(
+			Dispatcher.Dispatch<IReindexOnServerRequest, ReindexOnServerRequestParameters, ReindexOnServerResponse>(
 				ForceConfiguration<IReindexOnServerRequest, ReindexOnServerRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
-				this.LowLevelDispatch.ReindexDispatch<ReindexOnServerResponse>
+				LowLevelDispatch.ReindexDispatch<ReindexOnServerResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IReindexOnServerResponse> ReindexOnServerAsync(Func<ReindexOnServerDescriptor, IReindexOnServerRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ReindexOnServerAsync(selector.InvokeOrDefault(new ReindexOnServerDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IReindexOnServerResponse> ReindexOnServerAsync(Func<ReindexOnServerDescriptor, IReindexOnServerRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ReindexOnServerAsync(selector.InvokeOrDefault(new ReindexOnServerDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IReindexOnServerResponse> ReindexOnServerAsync(IReindexOnServerRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IReindexOnServerRequest, ReindexOnServerRequestParameters, ReindexOnServerResponse, IReindexOnServerResponse>(
+		/// <inheritdoc />
+		public Task<IReindexOnServerResponse> ReindexOnServerAsync(IReindexOnServerRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IReindexOnServerRequest, ReindexOnServerRequestParameters, ReindexOnServerResponse, IReindexOnServerResponse>(
 				ForceConfiguration<IReindexOnServerRequest, ReindexOnServerRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
 				cancellationToken,
-				this.LowLevelDispatch.ReindexDispatchAsync<ReindexOnServerResponse>
+				LowLevelDispatch.ReindexDispatchAsync<ReindexOnServerResponse>
 			);
 	}
 }
diff --git a/src/Nest/Document/Multiple/ReindexOnServer/ReindexDestination.cs b/src/Nest/Document/Multiple/ReindexOnServer/ReindexDestination.cs
index b37f9162cdc..3959725e8a3 100644
--- a/src/Nest/Document/Multiple/ReindexOnServer/ReindexDestination.cs
+++ b/src/Nest/Document/Multiple/ReindexOnServer/ReindexDestination.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -18,10 +16,12 @@ public interface IReindexDestination
 		IndexName Index { get; set; }
 
 		/// <summary>
-		/// The type to reindex into
+		/// Setting to <see cref="Elasticsearch.Net.OpType.Create" /> will cause reindex to only
+		/// create missing documents in the destination index.
 		/// </summary>
-		[JsonProperty("type")]
-		TypeName Type { get; set; }
+		[JsonProperty("op_type")]
+		[JsonConverter(typeof(StringEnumConverter))]
+		OpType? OpType { get; set; }
 
 		/// <summary>
 		/// The routing to use when reindexing
@@ -30,15 +30,13 @@ public interface IReindexDestination
 		ReindexRouting Routing { get; set; }
 
 		/// <summary>
-		/// Setting to <see cref="Elasticsearch.Net.OpType.Create"/> will cause reindex to only
-		/// create missing documents in the destination index.
+		/// The type to reindex into
 		/// </summary>
-		[JsonProperty("op_type")]
-		[JsonConverter(typeof(StringEnumConverter))]
-		OpType? OpType { get; set; }
+		[JsonProperty("type")]
+		TypeName Type { get; set; }
 
 		/// <summary>
-		/// Setting to <see cref="Elasticsearch.Net.VersionType.External"/> will cause Elasticsearch
+		/// Setting to <see cref="Elasticsearch.Net.VersionType.External" /> will cause Elasticsearch
 		/// to preserve the version from the source, create any documents that are missing,
 		/// and update any documents that have an older version in the destination index
 		/// than they do in the source index
@@ -55,41 +53,40 @@ public class ReindexDestination : IReindexDestination
 		public IndexName Index { get; set; }
 
 		/// <inheritdoc />
-		public TypeName Type { get; set; }
+		public OpType? OpType { get; set; }
 
 		/// <inheritdoc />
 		public ReindexRouting Routing { get; set; }
 
 		/// <inheritdoc />
-		public OpType? OpType { get; set; }
+		public TypeName Type { get; set; }
 
 		/// <inheritdoc />
 		public VersionType? VersionType { get; set; }
 	}
 
-	/// <inheritdoc cref="IReindexDestination"/>
+	/// <inheritdoc cref="IReindexDestination" />
 	public class ReindexDestinationDescriptor : DescriptorBase<ReindexDestinationDescriptor, IReindexDestination>, IReindexDestination
 	{
 		IndexName IReindexDestination.Index { get; set; }
-		TypeName IReindexDestination.Type { get; set; }
-		ReindexRouting IReindexDestination.Routing { get; set; }
 		OpType? IReindexDestination.OpType { get; set; }
+		ReindexRouting IReindexDestination.Routing { get; set; }
+		TypeName IReindexDestination.Type { get; set; }
 		VersionType? IReindexDestination.VersionType { get; set; }
 
-		/// <inheritdoc cref="IReindexDestination.Routing"/>
+		/// <inheritdoc cref="IReindexDestination.Routing" />
 		public ReindexDestinationDescriptor Routing(ReindexRouting routing) => Assign(a => a.Routing = routing);
 
-		/// <inheritdoc cref="IReindexDestination.OpType"/>
+		/// <inheritdoc cref="IReindexDestination.OpType" />
 		public ReindexDestinationDescriptor OpType(OpType? opType) => Assign(a => a.OpType = opType);
 
-		/// <inheritdoc cref="IReindexDestination.VersionType"/>
+		/// <inheritdoc cref="IReindexDestination.VersionType" />
 		public ReindexDestinationDescriptor VersionType(VersionType? versionType) => Assign(a => a.VersionType = versionType);
 
-		/// <inheritdoc cref="IReindexDestination.Index"/>
+		/// <inheritdoc cref="IReindexDestination.Index" />
 		public ReindexDestinationDescriptor Index(IndexName index) => Assign(a => a.Index = index);
 
-		/// <inheritdoc cref="IReindexDestination.Type"/>
+		/// <inheritdoc cref="IReindexDestination.Type" />
 		public ReindexDestinationDescriptor Type(TypeName type) => Assign(a => a.Type = type);
-
 	}
 }
diff --git a/src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerRequest.cs b/src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerRequest.cs
index 2c77a125a17..b62de2a249c 100644
--- a/src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerRequest.cs
+++ b/src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerRequest.cs
@@ -1,5 +1,4 @@
 using System;
-using System.CodeDom;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -12,10 +11,12 @@ namespace Nest
 	public partial interface IReindexOnServerRequest
 	{
 		/// <summary>
-		/// The source for the reindex operation
+		/// Determine what to do in the event of version conflicts.
+		/// Defaults to <see cref="Elasticsearch.Net.Conflicts.Abort" />
 		/// </summary>
-		[JsonProperty("source")]
-		IReindexSource Source { get; set; }
+		[JsonProperty("conflicts")]
+		[JsonConverter(typeof(StringEnumConverter))]
+		Conflicts? Conflicts { get; set; }
 
 		/// <summary>
 		/// The destination for the reindex operation.
@@ -40,57 +41,59 @@ public partial interface IReindexOnServerRequest
 		long? Size { get; set; }
 
 		/// <summary>
-		/// Determine what to do in the event of version conflicts.
-		/// Defaults to <see cref="Elasticsearch.Net.Conflicts.Abort"/>
+		/// The source for the reindex operation
 		/// </summary>
-        [JsonProperty("conflicts")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        Conflicts?  Conflicts { get; set; }
-    }
+		[JsonProperty("source")]
+		IReindexSource Source { get; set; }
+	}
 
-	/// <inheritdoc cref="IReindexOnServerRequest"/>
+	/// <inheritdoc cref="IReindexOnServerRequest" />
 	public partial class ReindexOnServerRequest
 	{
-		/// <inheritdoc cref="IReindexOnServerRequest.Source"/>
-		public IReindexSource Source { get; set; }
-		/// <inheritdoc cref="IReindexOnServerRequest.Destination"/>
+		/// <inheritdoc cref="IReindexOnServerRequest.Conflicts" />
+		public Conflicts? Conflicts { get; set; }
+
+		/// <inheritdoc cref="IReindexOnServerRequest.Destination" />
 		public IReindexDestination Destination { get; set; }
-		/// <inheritdoc cref="IReindexOnServerRequest.Script"/>
+
+		/// <inheritdoc cref="IReindexOnServerRequest.Script" />
 		public IScript Script { get; set; }
-		/// <inheritdoc cref="IReindexOnServerRequest.Size"/>
+
+		/// <inheritdoc cref="IReindexOnServerRequest.Size" />
 		public long? Size { get; set; }
-		/// <inheritdoc cref="IReindexOnServerRequest.Conflicts"/>
-        public Conflicts? Conflicts { get; set; }
-    }
+
+		/// <inheritdoc cref="IReindexOnServerRequest.Source" />
+		public IReindexSource Source { get; set; }
+	}
 
 	[DescriptorFor("Reindex")]
 	public partial class ReindexOnServerDescriptor
 	{
-		IReindexSource IReindexOnServerRequest.Source { get; set; }
+		Conflicts? IReindexOnServerRequest.Conflicts { get; set; }
 		IReindexDestination IReindexOnServerRequest.Destination { get; set; }
 		IScript IReindexOnServerRequest.Script { get; set; }
 		long? IReindexOnServerRequest.Size { get; set; }
-        Conflicts? IReindexOnServerRequest.Conflicts { get; set; }
+		IReindexSource IReindexOnServerRequest.Source { get; set; }
 
-		/// <inheritdoc cref="IReindexOnServerRequest.Source"/>
+		/// <inheritdoc cref="IReindexOnServerRequest.Source" />
 		public ReindexOnServerDescriptor Source(Func<ReindexSourceDescriptor, IReindexSource> selector = null) =>
 			Assign(a => a.Source = selector.InvokeOrDefault(new ReindexSourceDescriptor()));
 
-		/// <inheritdoc cref="IReindexOnServerRequest.Destination"/>
+		/// <inheritdoc cref="IReindexOnServerRequest.Destination" />
 		public ReindexOnServerDescriptor Destination(Func<ReindexDestinationDescriptor, IReindexDestination> selector) =>
 			Assign(a => a.Destination = selector?.Invoke(new ReindexDestinationDescriptor()));
 
-		/// <inheritdoc cref="IReindexOnServerRequest.Script"/>
+		/// <inheritdoc cref="IReindexOnServerRequest.Script" />
 		public ReindexOnServerDescriptor Script(string script) => Assign(a => a.Script = (InlineScript)script);
 
-		/// <inheritdoc cref="IReindexOnServerRequest.Script"/>
+		/// <inheritdoc cref="IReindexOnServerRequest.Script" />
 		public ReindexOnServerDescriptor Script(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.Script = scriptSelector?.Invoke(new ScriptDescriptor()));
 
-		/// <inheritdoc cref="IReindexOnServerRequest.Size"/>
+		/// <inheritdoc cref="IReindexOnServerRequest.Size" />
 		public ReindexOnServerDescriptor Size(long? size) => Assign(a => a.Size = size);
 
-		/// <inheritdoc cref="IReindexOnServerRequest.Conflicts"/>
-        public ReindexOnServerDescriptor Conflicts(Conflicts? conflicts) => Assign(a => a.Conflicts = conflicts);
+		/// <inheritdoc cref="IReindexOnServerRequest.Conflicts" />
+		public ReindexOnServerDescriptor Conflicts(Conflicts? conflicts) => Assign(a => a.Conflicts = conflicts);
 	}
 }
diff --git a/src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerResponse.cs b/src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerResponse.cs
index 00bb80af9ec..c8c62d4b836 100644
--- a/src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerResponse.cs
+++ b/src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerResponse.cs
@@ -1,18 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
+using System.Collections.Generic;
 using Newtonsoft.Json;
-using System.Linq;
-using Elasticsearch.Net;
 
 namespace Nest
 {
 	public interface IReindexOnServerResponse : IResponse
 	{
-		//https://github.com/elastic/elasticsearch/commit/11f90bffda50f0acc8dc1409f3f33005e1249234
-		// 2.3 released this writing the time value's to string e.g 123.4ms instead of long as all the others took responses
-		[JsonProperty("took")]
-		Time Took { get; }
+		[JsonProperty("batches")]
+		long Batches { get; }
+
+		[JsonProperty("created")]
+		long Created { get; }
+
+		[JsonProperty("failures")]
+		IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; }
+
+		[JsonProperty("noops")]
+		long Noops { get; }
+
+		[JsonProperty("retries")]
+		Retries Retries { get; }
+
+		[JsonProperty("slice_id")]
+		int? SliceId { get; }
 
 		/// <summary>
 		/// Only has a value if WaitForCompletion is set to false on the request
@@ -23,40 +32,36 @@ public interface IReindexOnServerResponse : IResponse
 		[JsonProperty("timed_out")]
 		bool TimedOut { get; }
 
+		//https://github.com/elastic/elasticsearch/commit/11f90bffda50f0acc8dc1409f3f33005e1249234
+		// 2.3 released this writing the time value's to string e.g 123.4ms instead of long as all the others took responses
+		[JsonProperty("took")]
+		Time Took { get; }
+
 		[JsonProperty("total")]
 		long Total { get; }
 
-		[JsonProperty("created")]
-		long Created { get; }
-
 		[JsonProperty("updated")]
 		long Updated { get; }
 
-		[JsonProperty("batches")]
-		long Batches { get; }
-
 		[JsonProperty("version_conflicts")]
 		long VersionConflicts { get; }
-
-		[JsonProperty("noops")]
-		long Noops { get; }
-
-		[JsonProperty("retries")]
-		Retries Retries { get; }
-
-		[JsonProperty("failures")]
-		IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; }
-
-		[JsonProperty("slice_id")]
-		int? SliceId { get; }
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
 	public class ReindexOnServerResponse : ResponseBase, IReindexOnServerResponse
 	{
-		public override bool IsValid => base.IsValid && !this.Failures.HasAny();
+		public long Batches { get; internal set; }
 
-		public Time Took { get; internal set; }
+		public long Created { get; internal set; }
+
+		public IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; internal set; } = EmptyReadOnly<BulkIndexByScrollFailure>.Collection;
+		public override bool IsValid => base.IsValid && !Failures.HasAny();
+
+		public long Noops { get; internal set; }
+
+		public Retries Retries { get; internal set; }
+
+		public int? SliceId { get; internal set; }
 
 		/// <summary>
 		/// Only has a value if WaitForCompletion is set to <c>false</c> on the request
@@ -65,22 +70,12 @@ public class ReindexOnServerResponse : ResponseBase, IReindexOnServerResponse
 
 		public bool TimedOut { get; internal set; }
 
-		public long Total { get; internal set; }
+		public Time Took { get; internal set; }
 
-		public long Created { get; internal set; }
+		public long Total { get; internal set; }
 
 		public long Updated { get; internal set; }
 
-		public long Batches { get; internal set; }
-
 		public long VersionConflicts { get; internal set; }
-
-		public long Noops { get; internal set; }
-
-		public Retries Retries { get; internal set; }
-
-		public IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; internal set; } = EmptyReadOnly<BulkIndexByScrollFailure>.Collection;
-
-		public int? SliceId { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Multiple/ReindexOnServer/ReindexRouting.cs b/src/Nest/Document/Multiple/ReindexOnServer/ReindexRouting.cs
index d9cb8af5ad0..648d1b0d6a1 100644
--- a/src/Nest/Document/Multiple/ReindexOnServer/ReindexRouting.cs
+++ b/src/Nest/Document/Multiple/ReindexOnServer/ReindexRouting.cs
@@ -5,9 +5,9 @@ namespace Nest
 	[JsonConverter(typeof(ReindexRoutingJsonConverter))]
 	public class ReindexRouting
 	{
-		private readonly string _newRoutingValue;
-		public static ReindexRouting Keep = new ReindexRouting("keep", true);
 		public static ReindexRouting Discard = new ReindexRouting("discard", true);
+		public static ReindexRouting Keep = new ReindexRouting("keep", true);
+		private readonly string _newRoutingValue;
 
 		/// <summary>
 		/// Use ReindexRouting.Keep or ReindexRouting.Discard if you want to sent "keep" or "discard", this
diff --git a/src/Nest/Document/Multiple/ReindexOnServer/ReindexRoutingJsonConverter.cs b/src/Nest/Document/Multiple/ReindexOnServer/ReindexRoutingJsonConverter.cs
index 50bac219caf..0f09c8d3a92 100644
--- a/src/Nest/Document/Multiple/ReindexOnServer/ReindexRoutingJsonConverter.cs
+++ b/src/Nest/Document/Multiple/ReindexOnServer/ReindexRoutingJsonConverter.cs
@@ -15,7 +15,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var s = reader.ReadAsString();
-			switch(s)
+			switch (s)
 			{
 				case "keep": return ReindexRouting.Keep;
 				case "discard": return ReindexRouting.Discard;
@@ -25,4 +25,4 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 		public override bool CanConvert(Type objectType) => true;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs b/src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs
index 9deb33159de..6dcaa8944a2 100644
--- a/src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs
+++ b/src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs
@@ -9,20 +9,6 @@ namespace Nest
 	/// </summary>
 	public interface IReindexSource
 	{
-		/// <summary>
-		/// Search query to execute to match documents for reindexing
-		/// </summary>
-		[JsonProperty("query")]
-		QueryContainer Query { get; set; }
-
-		/// <summary>
-		/// Sort the documents to be reindexed. Sorting makes the operation less
-		/// efficient but allows targeting a specific set of documents when used
-		/// in conjunction with <see cref="Size"/>
-		/// </summary>
-		[JsonProperty("sort")]
-		IList<ISort> Sort { get; set; }
-
 		/// <summary>
 		/// The indices to target
 		/// </summary>
@@ -30,22 +16,22 @@ public interface IReindexSource
 		Indices Index { get; set; }
 
 		/// <summary>
-		/// The types of documents to target
+		/// Search query to execute to match documents for reindexing
 		/// </summary>
-		[JsonProperty("type")]
-		Types Type { get; set; }
+		[JsonProperty("query")]
+		QueryContainer Query { get; set; }
 
 		/// <summary>
-		/// Limit the number of processed documents
+		/// Reindex from a remote Elasticsearch cluster
 		/// </summary>
-        [JsonProperty("size")]
-        int? Size { get; set; }
+		[JsonProperty("remote")]
+		IRemoteSource Remote { get; set; }
 
 		/// <summary>
-		/// Reindex from a remote Elasticsearch cluster
+		/// Limit the number of processed documents
 		/// </summary>
-        [JsonProperty("remote")]
-        IRemoteSource Remote { get; set; }
+		[JsonProperty("size")]
+		int? Size { get; set; }
 
 		/// <summary>
 		/// Manually parallelize the reindexing process.
@@ -53,85 +39,99 @@ public interface IReindexSource
 		/// way to break the request down into smaller parts.
 		/// </summary>
 		/// <remarks>
-		/// Automatic slicing can be performed using <see cref="ReindexOnServerRequest.Slices"/>
+		/// Automatic slicing can be performed using <see cref="ReindexOnServerRequest.Slices" />
 		/// </remarks>
 		[JsonProperty("slice")]
 		ISlicedScroll Slice { get; set; }
 
+		/// <summary>
+		/// Sort the documents to be reindexed. Sorting makes the operation less
+		/// efficient but allows targeting a specific set of documents when used
+		/// in conjunction with <see cref="Size" />
+		/// </summary>
+		[JsonProperty("sort")]
+		IList<ISort> Sort { get; set; }
+
 		/// <summary>
 		/// Individual fields from _source to reindex
 		/// </summary>
 		[JsonProperty("_source")]
 		Fields Source { get; set; }
-    }
+
+		/// <summary>
+		/// The types of documents to target
+		/// </summary>
+		[JsonProperty("type")]
+		Types Type { get; set; }
+	}
 
 	/// <inheritdoc />
 	public class ReindexSource : IReindexSource
 	{
 		/// <inheritdoc />
-		public QueryContainer Query { get; set; }
+		public Indices Index { get; set; }
 
 		/// <inheritdoc />
-		public IList<ISort> Sort { get; set; }
+		public QueryContainer Query { get; set; }
 
 		/// <inheritdoc />
-		public Indices Index { get; set; }
+		public IRemoteSource Remote { get; set; }
 
 		/// <inheritdoc />
-		public Types Type { get; set; }
+		public int? Size { get; set; }
 
 		/// <inheritdoc />
-        public int? Size { get; set; }
+		public ISlicedScroll Slice { get; set; }
 
 		/// <inheritdoc />
-        public IRemoteSource Remote { get; set; }
+		public IList<ISort> Sort { get; set; }
 
 		/// <inheritdoc />
-		public ISlicedScroll Slice { get; set; }
+		public Fields Source { get; set; }
 
 		/// <inheritdoc />
-		public Fields Source { get; set; }
+		public Types Type { get; set; }
 	}
 
-	/// <inheritdoc cref="IReindexSource"/>
+	/// <inheritdoc cref="IReindexSource" />
 	public class ReindexSourceDescriptor : DescriptorBase<ReindexSourceDescriptor, IReindexSource>, IReindexSource
 	{
-		QueryContainer IReindexSource.Query { get; set; }
-		IList<ISort> IReindexSource.Sort { get; set; }
 		Indices IReindexSource.Index { get; set; }
-		Types IReindexSource.Type { get; set; }
-        int? IReindexSource.Size { get; set; }
-        IRemoteSource IReindexSource.Remote { get; set; }
+		QueryContainer IReindexSource.Query { get; set; }
+		IRemoteSource IReindexSource.Remote { get; set; }
+		int? IReindexSource.Size { get; set; }
 		ISlicedScroll IReindexSource.Slice { get; set; }
+		IList<ISort> IReindexSource.Sort { get; set; }
 		Fields IReindexSource.Source { get; set; }
+		Types IReindexSource.Type { get; set; }
 
-		/// <inheritdoc cref="IReindexSource.Query"/>
-        public ReindexSourceDescriptor Query<T>(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) where T : class =>
+		/// <inheritdoc cref="IReindexSource.Query" />
+		public ReindexSourceDescriptor Query<T>(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) where T : class =>
 			Assign(a => a.Query = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
 
-		/// <inheritdoc cref="IReindexSource.Sort"/>
+		/// <inheritdoc cref="IReindexSource.Sort" />
 		public ReindexSourceDescriptor Sort<T>(Func<SortDescriptor<T>, IPromise<IList<ISort>>> selector) where T : class =>
 			Assign(a => a.Sort = selector?.Invoke(new SortDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="IReindexSource.Remote"/>
+		/// <inheritdoc cref="IReindexSource.Remote" />
 		public ReindexSourceDescriptor Remote(Func<RemoteSourceDescriptor, IRemoteSource> selector) =>
 			Assign(a => a.Remote = selector?.Invoke(new RemoteSourceDescriptor()));
 
-		/// <inheritdoc cref="IReindexSource.Index"/>
+		/// <inheritdoc cref="IReindexSource.Index" />
 		public ReindexSourceDescriptor Index(Indices indices) => Assign(a => a.Index = indices);
 
-		/// <inheritdoc cref="IReindexSource.Type"/>
+		/// <inheritdoc cref="IReindexSource.Type" />
 		public ReindexSourceDescriptor Type(Types types) => Assign(a => a.Type = types);
 
-		/// <inheritdoc cref="IReindexSource.Size"/>
-        public ReindexSourceDescriptor Size(int? size) => Assign(a => a.Size = size);
+		/// <inheritdoc cref="IReindexSource.Size" />
+		public ReindexSourceDescriptor Size(int? size) => Assign(a => a.Size = size);
 
-		/// <inheritdoc cref="IReindexSource.Slice"/>
+		/// <inheritdoc cref="IReindexSource.Slice" />
 		public ReindexSourceDescriptor Slice<T>(Func<SlicedScrollDescriptor<T>, ISlicedScroll> selector) where T : class =>
 			Assign(a => a.Slice = selector?.Invoke(new SlicedScrollDescriptor<T>()));
 
-		/// <inheritdoc cref="IReindexSource.Source"/>
+		/// <inheritdoc cref="IReindexSource.Source" />
 		public ReindexSourceDescriptor Source<T>(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) where T : class =>
 			Assign(a => a.Source = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
-    }
+	}
 }
diff --git a/src/Nest/Document/Multiple/ReindexOnServer/RemoteSource.cs b/src/Nest/Document/Multiple/ReindexOnServer/RemoteSource.cs
index ea32f65e7eb..7c46699d7ec 100644
--- a/src/Nest/Document/Multiple/ReindexOnServer/RemoteSource.cs
+++ b/src/Nest/Document/Multiple/ReindexOnServer/RemoteSource.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -9,33 +8,32 @@ public interface IRemoteSource
 		[JsonProperty("host")]
 		Uri Host { get; set; }
 
-		[JsonProperty("username")]
-		string Username { get; set; }
-
 		[JsonProperty("password")]
 		string Password { get; set; }
 
-    }
+		[JsonProperty("username")]
+		string Username { get; set; }
+	}
 
 	public class RemoteSource : IRemoteSource
 	{
 		public Uri Host { get; set; }
 
-        public string Username { get; set; }
+		public string Password { get; set; }
 
-        public string Password { get; set; }
-    }
+		public string Username { get; set; }
+	}
 
 	public class RemoteSourceDescriptor : DescriptorBase<RemoteSourceDescriptor, IRemoteSource>, IRemoteSource
 	{
 		Uri IRemoteSource.Host { get; set; }
-		string IRemoteSource.Username { get; set; }
 		string IRemoteSource.Password { get; set; }
+		string IRemoteSource.Username { get; set; }
 
 		public RemoteSourceDescriptor Host(Uri host) => Assign(a => a.Host = host);
 
 		public RemoteSourceDescriptor Username(string username) => Assign(a => a.Username = username);
 
-        public RemoteSourceDescriptor Password(string password) => Assign(a => a.Password = password);
-    }
+		public RemoteSourceDescriptor Password(string password) => Assign(a => a.Password = password);
+	}
 }
diff --git a/src/Nest/Document/Multiple/ReindexRethrottle/ElasticClient-ReindexRethrottle.cs b/src/Nest/Document/Multiple/ReindexRethrottle/ElasticClient-ReindexRethrottle.cs
index dad735b701e..37968f274c9 100644
--- a/src/Nest/Document/Multiple/ReindexRethrottle/ElasticClient-ReindexRethrottle.cs
+++ b/src/Nest/Document/Multiple/ReindexRethrottle/ElasticClient-ReindexRethrottle.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -27,17 +27,23 @@ public partial interface IElasticClient
 		/// Rethrottle an existing reindex or update by query task
 		/// </summary>
 		[Obsolete("Maintained for binary compatibility. Use the overload that accepts TaskId. Will be removed in 7.0")]
-		Task<IReindexRethrottleResponse> RethrottleAsync(Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IReindexRethrottleResponse> RethrottleAsync(Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Rethrottle an existing reindex or update by query task
 		/// </summary>
-		Task<IReindexRethrottleResponse> RethrottleAsync(TaskId id, Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IReindexRethrottleResponse> RethrottleAsync(TaskId id, Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Rethrottle an existing reindex or update by query task
 		/// </summary>
-		Task<IReindexRethrottleResponse> RethrottleAsync(IReindexRethrottleRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IReindexRethrottleResponse> RethrottleAsync(IReindexRethrottleRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
@@ -48,47 +54,55 @@ public partial class ElasticClient
 		[Obsolete("Maintained for binary compatibility. Use the overload that accepts TaskId. Will be removed in 7.0")]
 		public IReindexRethrottleResponse Rethrottle(Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector) =>
 #pragma warning disable 618 // changing method signature would be binary breaking
-			this.Rethrottle(selector.InvokeOrDefault(new ReindexRethrottleDescriptor()));
+			Rethrottle(selector.InvokeOrDefault(new ReindexRethrottleDescriptor()));
 #pragma warning restore 618
 
 		/// <summary>
 		/// Rethrottle an existing reindex or update by query task
 		/// </summary>
 		public IReindexRethrottleResponse Rethrottle(TaskId id, Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector = null) =>
-			this.Rethrottle(selector.InvokeOrDefault(new ReindexRethrottleDescriptor(id)));
+			Rethrottle(selector.InvokeOrDefault(new ReindexRethrottleDescriptor(id)));
 
 		/// <summary>
 		/// Rethrottle an existing reindex or update by query task
 		/// </summary>
 		public IReindexRethrottleResponse Rethrottle(IReindexRethrottleRequest request) =>
-			this.Dispatcher.Dispatch<IReindexRethrottleRequest, ReindexRethrottleRequestParameters, ReindexRethrottleResponse>(
+			Dispatcher.Dispatch<IReindexRethrottleRequest, ReindexRethrottleRequestParameters, ReindexRethrottleResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ReindexRethrottleDispatch<ReindexRethrottleResponse>(p)
+				(p, d) => LowLevelDispatch.ReindexRethrottleDispatch<ReindexRethrottleResponse>(p)
 			);
 
 		/// <summary>
 		/// Rethrottle an existing reindex or update by query task
 		/// </summary>
 		[Obsolete("Maintained for binary compatibility. Use the overload that accepts TaskId. Will be removed in 7.0")]
-		public Task<IReindexRethrottleResponse> RethrottleAsync(Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
+		public Task<IReindexRethrottleResponse> RethrottleAsync(Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
 #pragma warning disable 618 // changing method signature would be binary breaking
-			this.RethrottleAsync(selector.InvokeOrDefault(new ReindexRethrottleDescriptor()), cancellationToken);
+			RethrottleAsync(selector.InvokeOrDefault(new ReindexRethrottleDescriptor()), cancellationToken);
 #pragma warning restore 618
 
 		/// <summary>
 		/// Rethrottle an existing reindex or update by query task
 		/// </summary>
-		public Task<IReindexRethrottleResponse> RethrottleAsync(TaskId id, Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RethrottleAsync(selector.InvokeOrDefault(new ReindexRethrottleDescriptor(id)), cancellationToken);
+		public Task<IReindexRethrottleResponse> RethrottleAsync(TaskId id,
+			Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RethrottleAsync(selector.InvokeOrDefault(new ReindexRethrottleDescriptor(id)), cancellationToken);
 
 		/// <summary>
 		/// Rethrottle an existing reindex or update by query task
 		/// </summary>
-		public Task<IReindexRethrottleResponse> RethrottleAsync(IReindexRethrottleRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IReindexRethrottleRequest, ReindexRethrottleRequestParameters, ReindexRethrottleResponse, IReindexRethrottleResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ReindexRethrottleDispatchAsync<ReindexRethrottleResponse>(p, c)
-			);
+		public Task<IReindexRethrottleResponse> RethrottleAsync(IReindexRethrottleRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IReindexRethrottleRequest, ReindexRethrottleRequestParameters, ReindexRethrottleResponse, IReindexRethrottleResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.ReindexRethrottleDispatchAsync<ReindexRethrottleResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Document/Multiple/ReindexRethrottle/ReindexNode.cs b/src/Nest/Document/Multiple/ReindexRethrottle/ReindexNode.cs
index fddb3a3a988..c8cc7a67bd7 100644
--- a/src/Nest/Document/Multiple/ReindexRethrottle/ReindexNode.cs
+++ b/src/Nest/Document/Multiple/ReindexRethrottle/ReindexNode.cs
@@ -5,11 +5,10 @@ namespace Nest
 {
 	public class ReindexNode
 	{
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
-
-		[JsonProperty("transport_address")]
-		public string TransportAddress { get; internal set; }
+		[JsonProperty("attributes")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, string>))]
+		public IReadOnlyDictionary<string, string> Attributes { get; internal set; } =
+			EmptyReadOnly<string, string>.Dictionary;
 
 		[JsonProperty("host")]
 		public string Host { get; internal set; }
@@ -17,58 +16,56 @@ public class ReindexNode
 		[JsonProperty("ip")]
 		public string Ip { get; internal set; }
 
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
+
 		[JsonProperty("roles")]
 		public IEnumerable<string> Roles { get; internal set; }
 
-		[JsonProperty("attributes")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, string>))]
-		public IReadOnlyDictionary<string, string> Attributes { get; internal set; } =
-			EmptyReadOnly<string, string>.Dictionary;
-
 		[JsonProperty("tasks")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<TaskId, ReindexTask>))]
 		public IReadOnlyDictionary<TaskId, ReindexTask> Tasks { get; internal set; } =
 			EmptyReadOnly<TaskId, ReindexTask>.Dictionary;
+
+		[JsonProperty("transport_address")]
+		public string TransportAddress { get; internal set; }
 	}
 
 
 	public class ReindexTask
 	{
-		[JsonProperty("node")]
-		public string Node { get; internal set; }
-
-		[JsonProperty("id")]
-		public long Id { get; internal set; }
-
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
-
 		[JsonProperty("action")]
 		public string Action { get; internal set; }
 
-		[JsonProperty("status")]
-		public ReindexStatus Status { get; internal set; }
+		[JsonProperty("cancellable")]
+		public bool Cancellable { get; internal set; }
 
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
 
-		[JsonProperty("start_time_in_millis")]
-		public long StartTimeInMilliseconds { get; internal set; }
+		[JsonProperty("id")]
+		public long Id { get; internal set; }
+
+		[JsonProperty("node")]
+		public string Node { get; internal set; }
 
 		[JsonProperty("running_time_in_nanos")]
 		public long RunningTimeInNanoseconds { get; internal set; }
 
-		[JsonProperty("cancellable")]
-		public bool Cancellable { get; internal set; }
+		[JsonProperty("start_time_in_millis")]
+		public long StartTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("status")]
+		public ReindexStatus Status { get; internal set; }
+
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 
 	public class ReindexStatus
 	{
-		[JsonProperty("total")]
-		public long Total { get; internal set; }
-
-		[JsonProperty("updated")]
-		public long Updated { get; internal set; }
+		[JsonProperty("batches")]
+		public long Batches { get; internal set; }
 
 		[JsonProperty("created")]
 		public long Created { get; internal set; }
@@ -76,26 +73,28 @@ public class ReindexStatus
 		[JsonProperty("deleted")]
 		public long Deleted { get; internal set; }
 
-		[JsonProperty("batches")]
-		public long Batches { get; internal set; }
-
-		[JsonProperty("version_conflicts")]
-		public long VersionConflicts { get; internal set; }
-
 		[JsonProperty("noops")]
 		public long Noops { get; internal set; }
 
+		[JsonProperty("requests_per_second")]
+		public float RequestsPerSecond { get; internal set; }
+
 		[JsonProperty("retries")]
 		public Retries Retries { get; internal set; }
 
 		[JsonProperty("throttled_millis")]
 		public long ThrottledInMilliseconds { get; internal set; }
 
-		[JsonProperty("requests_per_second")]
-		public float RequestsPerSecond { get; internal set; }
-
 		[JsonProperty("throttled_until_millis")]
 		public long ThrottledUntilInMilliseconds { get; internal set; }
+
+		[JsonProperty("total")]
+		public long Total { get; internal set; }
+
+		[JsonProperty("updated")]
+		public long Updated { get; internal set; }
+
+		[JsonProperty("version_conflicts")]
+		public long VersionConflicts { get; internal set; }
 	}
 }
-
diff --git a/src/Nest/Document/Multiple/ReindexRethrottle/ReindexRethrottleRequest.cs b/src/Nest/Document/Multiple/ReindexRethrottle/ReindexRethrottleRequest.cs
index e7cf42c1c81..10f3c0fff44 100644
--- a/src/Nest/Document/Multiple/ReindexRethrottle/ReindexRethrottleRequest.cs
+++ b/src/Nest/Document/Multiple/ReindexRethrottle/ReindexRethrottleRequest.cs
@@ -13,7 +13,7 @@ public ReindexRethrottleDescriptor() { }
 
 		public ReindexRethrottleDescriptor TaskId(TaskId id)
 		{
-			this.RequestState.RouteValues.Required("task_id", id);
+			RequestState.RouteValues.Required("task_id", id);
 			return this;
 		}
 	}
diff --git a/src/Nest/Document/Multiple/Retries.cs b/src/Nest/Document/Multiple/Retries.cs
index 0a493722a6d..b6b87c9551b 100644
--- a/src/Nest/Document/Multiple/Retries.cs
+++ b/src/Nest/Document/Multiple/Retries.cs
@@ -10,4 +10,4 @@ public class Retries
 		[JsonProperty("search")]
 		public long Search { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Document/Multiple/ScrollAll/ElasticClient-ScrollAll.cs b/src/Nest/Document/Multiple/ScrollAll/ElasticClient-ScrollAll.cs
index 435dd7be7c4..f24e286bb30 100644
--- a/src/Nest/Document/Multiple/ScrollAll/ElasticClient-ScrollAll.cs
+++ b/src/Nest/Document/Multiple/ScrollAll/ElasticClient-ScrollAll.cs
@@ -9,25 +9,35 @@ public partial interface IElasticClient
 		/// Helper method that can parallelize a scroll using the sliced scroll feature of elasticsearch and return the results as an IObservable.
 		/// </summary>
 		/// <param name="scrollTime">The time to keep the scroll active on the server until we send another scroll request</param>
-		/// <param name="numberOfSlices">The number of slices to chop the scroll into, typically the number of shards but can be higher and using a custom routing key</param>
-		IObservable<IScrollAllResponse<T>> ScrollAll<T>(Time scrollTime, int numberOfSlices, Func<ScrollAllDescriptor<T>, IScrollAllRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <param name="numberOfSlices">
+		/// The number of slices to chop the scroll into, typically the number of shards but can be higher and using a
+		/// custom routing key
+		/// </param>
+		IObservable<IScrollAllResponse<T>> ScrollAll<T>(Time scrollTime, int numberOfSlices,
+			Func<ScrollAllDescriptor<T>, IScrollAllRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
 		/// <summary>
 		/// Helper method that can parallelize a scroll using the sliced scroll feature of elasticsearch and return the results as an IObservable.
 		/// </summary>
-		IObservable<IScrollAllResponse<T>> ScrollAll<T>(IScrollAllRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		IObservable<IScrollAllResponse<T>> ScrollAll<T>(IScrollAllRequest request, CancellationToken cancellationToken = default(CancellationToken))
+			where T : class;
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IObservable<IScrollAllResponse<T>> ScrollAll<T>(Time scrollTime, int numberOfSlices, Func<ScrollAllDescriptor<T>, IScrollAllRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public IObservable<IScrollAllResponse<T>> ScrollAll<T>(Time scrollTime, int numberOfSlices,
+			Func<ScrollAllDescriptor<T>, IScrollAllRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.ScrollAll<T>(selector.InvokeOrDefault(new ScrollAllDescriptor<T>(scrollTime, numberOfSlices)), cancellationToken);
+			ScrollAll<T>(selector.InvokeOrDefault(new ScrollAllDescriptor<T>(scrollTime, numberOfSlices)), cancellationToken);
 
-		/// <inheritdoc/>
-		public IObservable<IScrollAllResponse<T>> ScrollAll<T>(IScrollAllRequest request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public IObservable<IScrollAllResponse<T>> ScrollAll<T>(IScrollAllRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
 			new ScrollAllObservable<T>(this, request, cancellationToken);
 	}
diff --git a/src/Nest/Document/Multiple/ScrollAll/ScrollAllObservable.cs b/src/Nest/Document/Multiple/ScrollAll/ScrollAllObservable.cs
index e71a80e6594..916d07bd394 100644
--- a/src/Nest/Document/Multiple/ScrollAll/ScrollAllObservable.cs
+++ b/src/Nest/Document/Multiple/ScrollAll/ScrollAllObservable.cs
@@ -1,69 +1,78 @@
 using System;
 using System.Linq;
-using Elasticsearch.Net;
-using System.Threading.Tasks;
 using System.Threading;
+using System.Threading.Tasks;
+using Elasticsearch.Net;
 
 namespace Nest
 {
 	public class ScrollAllObservable<T> : IDisposable, IObservable<IScrollAllResponse<T>> where T : class
 	{
-		private readonly IScrollAllRequest _scrollAllRequest;
-		private readonly ISearchRequest _searchRequest;
+		private readonly ProducerConsumerBackPressure _backPressure;
 		private readonly IElasticClient _client;
 
 		private readonly CancellationToken _compositeCancelToken;
 		private readonly CancellationTokenSource _compositeCancelTokenSource;
+		private readonly IScrollAllRequest _scrollAllRequest;
 
 		//since we modify the passed searchrequest during the setup phase we use a simple
 		//semaphore async await to make sure we do not mutate over multiple request during the initial
 		//sliced scroll setup
 		private readonly SemaphoreSlim _scrollInitiationLock = new SemaphoreSlim(1, 1);
-		private readonly ProducerConsumerBackPressure _backPressure;
+		private readonly ISearchRequest _searchRequest;
 
 		public ScrollAllObservable(
 			IElasticClient client,
 			IScrollAllRequest scrollAllRequest,
 			CancellationToken cancellationToken = default(CancellationToken)
-			)
+		)
 		{
-			this._scrollAllRequest = scrollAllRequest;
-			this._searchRequest = scrollAllRequest?.Search ?? new SearchRequest<T>();
-			if (this._searchRequest.Sort == null)
-				this._searchRequest.Sort = SortField.ByDocumentOrder;
-			this._searchRequest.RequestParameters.Scroll = this._scrollAllRequest.ScrollTime.ToTimeSpan();
-			this._client = client;
-			this._compositeCancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-			this._compositeCancelToken = this._compositeCancelTokenSource.Token;
-			this._backPressure = this._scrollAllRequest.BackPressure;
+			_scrollAllRequest = scrollAllRequest;
+			_searchRequest = scrollAllRequest?.Search ?? new SearchRequest<T>();
+			if (_searchRequest.Sort == null)
+				_searchRequest.Sort = SortField.ByDocumentOrder;
+			_searchRequest.RequestParameters.Scroll = _scrollAllRequest.ScrollTime.ToTimeSpan();
+			_client = client;
+			_compositeCancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+			_compositeCancelToken = _compositeCancelTokenSource.Token;
+			_backPressure = _scrollAllRequest.BackPressure;
+		}
+
+		public bool IsDisposed { get; private set; }
+
+		public void Dispose()
+		{
+			IsDisposed = true;
+			_compositeCancelTokenSource?.Cancel();
 		}
 
 		public IDisposable Subscribe(IObserver<IScrollAllResponse<T>> observer)
 		{
 			observer.ThrowIfNull(nameof(observer));
-			this.ScrollAll(observer);
+			ScrollAll(observer);
 			return this;
 		}
 
 		private void ScrollAll(IObserver<IScrollAllResponse<T>> observer)
 		{
-			var slices = this._scrollAllRequest.Slices;
-			var maxSlicesAtOnce = this._scrollAllRequest.MaxDegreeOfParallelism ?? this._scrollAllRequest.Slices;
+			var slices = _scrollAllRequest.Slices;
+			var maxSlicesAtOnce = _scrollAllRequest.MaxDegreeOfParallelism ?? _scrollAllRequest.Slices;
 
 #pragma warning disable 4014
-			Enumerable.Range(0, slices).ForEachAsync(
+			Enumerable.Range(0, slices)
+				.ForEachAsync(
 #pragma warning restore 4014
-				(slice, l) => this.ScrollSliceAsync(observer, slice),
-				(slice, r) => { },
-				t => OnCompleted(t, observer),
-				maxSlicesAtOnce
-			);
+					(slice, l) => ScrollSliceAsync(observer, slice),
+					(slice, r) => { },
+					t => OnCompleted(t, observer),
+					maxSlicesAtOnce
+				);
 		}
 
 		private async Task<bool> ScrollSliceAsync(IObserver<IScrollAllResponse<T>> observer, int slice)
 		{
-			var searchResult = await this.InitiateSearchAsync(slice).ConfigureAwait(false);
-			await this.ScrollToCompletionAsync(slice, observer, searchResult).ConfigureAwait(false);
+			var searchResult = await InitiateSearchAsync(slice).ConfigureAwait(false);
+			await ScrollToCompletionAsync(slice, observer, searchResult).ConfigureAwait(false);
 			return true;
 		}
 
@@ -77,18 +86,18 @@ private void ThrowOnBadSearchResult(ISearchResponse<T> result, int slice, int pa
 				var path = result?.ApiCall.Uri.PathAndQuery ?? "(unknown)";
 				throw Throw($"scrolling search on {path} with slice {slice} was not valid on scroll iteration {page}", result?.ApiCall);
 			}
-			this._compositeCancelToken.ThrowIfCancellationRequested();
+			_compositeCancelToken.ThrowIfCancellationRequested();
 		}
 
 		private async Task ScrollToCompletionAsync(int slice, IObserver<IScrollAllResponse<T>> observer, ISearchResponse<T> searchResult)
 		{
 			var page = 0;
 			ThrowOnBadSearchResult(searchResult, slice, page);
-			var scroll = this._scrollAllRequest.ScrollTime;
+			var scroll = _scrollAllRequest.ScrollTime;
 			while (searchResult.IsValid && searchResult.Documents.HasAny())
 			{
-				if (this._backPressure != null)
-					await this._backPressure.WaitAsync(_compositeCancelToken).ConfigureAwait(false);
+				if (_backPressure != null)
+					await _backPressure.WaitAsync(_compositeCancelToken).ConfigureAwait(false);
 
 				observer.OnNext(new ScrollAllResponse<T>()
 				{
@@ -98,7 +107,7 @@ private async Task ScrollToCompletionAsync(int slice, IObserver<IScrollAllRespon
 				});
 				page++;
 				var request = new ScrollRequest(searchResult.ScrollId, scroll);
-				searchResult = await this._client.ScrollAsync<T>(request, this._compositeCancelToken).ConfigureAwait(false);
+				searchResult = await _client.ScrollAsync<T>(request, _compositeCancelToken).ConfigureAwait(false);
 				ThrowOnBadSearchResult(searchResult, slice, page);
 			}
 		}
@@ -110,17 +119,20 @@ private async Task<ISearchResponse<T>> InitiateSearchAsync(int slice)
 			await _scrollInitiationLock.WaitAsync(_compositeCancelToken).ConfigureAwait(false);
 			try
 			{
-				this._searchRequest.Slice = new SlicedScroll
+				_searchRequest.Slice = new SlicedScroll
 				{
 					Id = slice,
-					Max = this._scrollAllRequest.Slices,
-					Field = this._scrollAllRequest.RoutingField
+					Max = _scrollAllRequest.Slices,
+					Field = _scrollAllRequest.RoutingField
 				};
-				var response = await this._client.SearchAsync<T>(this._searchRequest, this._compositeCancelToken).ConfigureAwait(false);
+				var response = await _client.SearchAsync<T>(_searchRequest, _compositeCancelToken).ConfigureAwait(false);
 				//response gets passed to ScrollToCompletionAsync which does validation already
 				return response;
 			}
-			finally { _scrollInitiationLock.Release(); }
+			finally
+			{
+				_scrollInitiationLock.Release();
+			}
 		}
 
 		private static void OnCompleted(Exception exception, IObserver<IScrollAllResponse<T>> observer)
@@ -130,12 +142,5 @@ private static void OnCompleted(Exception exception, IObserver<IScrollAllRespons
 			else
 				observer.OnError(exception);
 		}
-
-		public bool IsDisposed { get; private set; }
-		public void Dispose()
-		{
-			this.IsDisposed = true;
-			this._compositeCancelTokenSource?.Cancel();
-		}
 	}
 }
diff --git a/src/Nest/Document/Multiple/ScrollAll/ScrollAllObserver.cs b/src/Nest/Document/Multiple/ScrollAll/ScrollAllObserver.cs
index fcd86369085..06a01a4ae83 100644
--- a/src/Nest/Document/Multiple/ScrollAll/ScrollAllObserver.cs
+++ b/src/Nest/Document/Multiple/ScrollAll/ScrollAllObserver.cs
@@ -7,10 +7,8 @@ public class ScrollAllObserver<T> : CoordinatedRequestObserverBase<IScrollAllRes
 		public ScrollAllObserver(
 			Action<IScrollAllResponse<T>> onNext = null,
 			Action<Exception> onError = null,
-			Action onCompleted = null)
+			Action onCompleted = null
+		)
 			: base(onNext, onError, onCompleted) { }
-
 	}
-
-
 }
diff --git a/src/Nest/Document/Multiple/ScrollAll/ScrollAllRequest.cs b/src/Nest/Document/Multiple/ScrollAll/ScrollAllRequest.cs
index a92fa6798b6..9bf934f397c 100644
--- a/src/Nest/Document/Multiple/ScrollAll/ScrollAllRequest.cs
+++ b/src/Nest/Document/Multiple/ScrollAll/ScrollAllRequest.cs
@@ -6,102 +6,104 @@ namespace Nest
 	public interface IScrollAllRequest
 	{
 		/// <summary>
-		/// The ammount of time to keep the scroll alive on the server
+		/// Simple back pressure implementation that makes sure the minimum max concurrency between producer and consumer
+		/// is not amplified by the greedier of the two by more then a given back pressure factor
+		/// When set each scroll request will additionally wait on <see cref="ProducerConsumerBackPressure.WaitAsync" /> as well as
+		/// <see cref="MaxDegreeOfParallelism" /> if set. Not that the consumer has to call <see cref="ProducerConsumerBackPressure.Release" />
+		/// on the same instance every time it is done.
 		/// </summary>
-		Time ScrollTime { get; set; }
+		ProducerConsumerBackPressure BackPressure { get; set; }
+
 		/// <summary>
-		/// An optional search request that describes the search we want to scroll over.
-		/// Defaults to matchall on the index and type of T in the <see cref="ScrollAllObserver{T}"/>.
-		/// Note: both scroll and slice information WILL be overriden.
+		/// The maximum degree of parallelism we should drain the sliced scroll, defaults to the value of <see cref="Slices" />
 		/// </summary>
-		ISearchRequest Search { get; set; }
+		int? MaxDegreeOfParallelism { get; set; }
+
 		/// <summary>
-		/// The maximum number of slices to partition the scroll over
+		/// Set a different routing field, has to have doc_values enabled
 		/// </summary>
-		int Slices { get; set; }
+		Field RoutingField { get; set; }
+
 		/// <summary>
-		/// The maximum degree of parallelism we should drain the sliced scroll, defaults to the value of <see cref="Slices"/>
+		/// The ammount of time to keep the scroll alive on the server
 		/// </summary>
-		int? MaxDegreeOfParallelism { get; set; }
+		Time ScrollTime { get; set; }
 
 		/// <summary>
-		/// Simple back pressure implementation that makes sure the minimum max concurrency between producer and consumer
-		/// is not amplified by the greedier of the two by more then a given back pressure factor
-		/// When set each scroll request will additionally wait on <see cref="ProducerConsumerBackPressure.WaitAsync"/> as well as
-		/// <see cref="MaxDegreeOfParallelism"/> if set. Not that the consumer has to call <see cref="ProducerConsumerBackPressure.Release"/>
-		/// on the same instance every time it is done.
+		/// An optional search request that describes the search we want to scroll over.
+		/// Defaults to matchall on the index and type of T in the <see cref="ScrollAllObserver{T}" />.
+		/// Note: both scroll and slice information WILL be overriden.
 		/// </summary>
-		ProducerConsumerBackPressure BackPressure { get; set; }
+		ISearchRequest Search { get; set; }
 
 		/// <summary>
-		/// Set a different routing field, has to have doc_values enabled
+		/// The maximum number of slices to partition the scroll over
 		/// </summary>
-		Field RoutingField { get; set; }
+		int Slices { get; set; }
 	}
 
 	public class ScrollAllRequest : IScrollAllRequest
 	{
-		int IScrollAllRequest.Slices { get; set; }
-		Time IScrollAllRequest.ScrollTime { get; set; }
-
-		/// <inheritdoc/>
-		public ISearchRequest Search { get; set; }
-		/// <inheritdoc/>
-		public Field RoutingField { get; set; }
-		/// <inheritdoc/>
-		public int? MaxDegreeOfParallelism { get; set; }
-		/// <inheritdoc/>
-		public ProducerConsumerBackPressure BackPressure { get; set; }
-
 		public ScrollAllRequest(Time scrollTime, int numberOfSlices)
 		{
-			var i = ((IScrollAllRequest)this);
+			var i = (IScrollAllRequest)this;
 			i.ScrollTime = scrollTime;
 			i.Slices = numberOfSlices;
 		}
-		public ScrollAllRequest(Time scrollTime, int numberOfSlices, Field routingField) : this(scrollTime, numberOfSlices)
-		{
-			this.RoutingField = routingField;
-		}
+
+		public ScrollAllRequest(Time scrollTime, int numberOfSlices, Field routingField) : this(scrollTime, numberOfSlices) =>
+			RoutingField = routingField;
+
+		/// <inheritdoc />
+		public ProducerConsumerBackPressure BackPressure { get; set; }
+
+		/// <inheritdoc />
+		public int? MaxDegreeOfParallelism { get; set; }
+
+		/// <inheritdoc />
+		public Field RoutingField { get; set; }
+
+		/// <inheritdoc />
+		public ISearchRequest Search { get; set; }
+
+		Time IScrollAllRequest.ScrollTime { get; set; }
+		int IScrollAllRequest.Slices { get; set; }
 	}
 
 	public class ScrollAllDescriptor<T> : DescriptorBase<ScrollAllDescriptor<T>, IScrollAllRequest>, IScrollAllRequest where T : class
 	{
-		ISearchRequest IScrollAllRequest.Search { get; set; }
-		int IScrollAllRequest.Slices { get; set; }
+		public ScrollAllDescriptor(Time scrollTime, int numberOfSlices) => Assign(a =>
+		{
+			a.ScrollTime = scrollTime;
+			a.Slices = numberOfSlices;
+		});
+
+		ProducerConsumerBackPressure IScrollAllRequest.BackPressure { get; set; }
+		int? IScrollAllRequest.MaxDegreeOfParallelism { get; set; }
 		Field IScrollAllRequest.RoutingField { get; set; }
 		Time IScrollAllRequest.ScrollTime { get; set; }
-		int? IScrollAllRequest.MaxDegreeOfParallelism { get; set; }
-		ProducerConsumerBackPressure IScrollAllRequest.BackPressure { get; set; }
-
-		public ScrollAllDescriptor(Time scrollTime, int numberOfSlices)
-		{
-			Assign(a =>
-			{
-				a.ScrollTime = scrollTime;
-				a.Slices = numberOfSlices;
-			});
-		}
+		ISearchRequest IScrollAllRequest.Search { get; set; }
+		int IScrollAllRequest.Slices { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ScrollAllDescriptor<T> MaxDegreeOfParallelism(int? maxDegreeOfParallelism) =>
 			Assign(a => a.MaxDegreeOfParallelism = maxDegreeOfParallelism);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ScrollAllDescriptor<T> RoutingField(Field field) => Assign(a => a.RoutingField = field);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ScrollAllDescriptor<T> RoutingField(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.RoutingField = objectPath);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ScrollAllDescriptor<T> Search(Func<SearchDescriptor<T>, ISearchRequest> selector) =>
 			Assign(a => a.Search = selector?.Invoke(new SearchDescriptor<T>()));
 
 		/// <summary>
 		/// Simple back pressure implementation that makes sure the minimum max concurrency between producer and consumer
 		/// is not amplified by the greedier of the two by more then a given back pressure factor
-		/// When set each bulk request will call <see cref="ProducerConsumerBackPressure.Release"/>
+		/// When set each bulk request will call <see cref="ProducerConsumerBackPressure.Release" />
 		/// </summary>
 		/// <param name="maxConcurrency">The minimum maximum concurrency which would be the bottleneck of the producer consumer pipeline</param>
 		/// <param name="backPressureFactor">The maximum amplification back pressure of the greedier part of the producer consumer pipeline</param>
diff --git a/src/Nest/Document/Multiple/ScrollAll/ScrollAllResponse.cs b/src/Nest/Document/Multiple/ScrollAll/ScrollAllResponse.cs
index afe3b74bc90..54683fb17dc 100644
--- a/src/Nest/Document/Multiple/ScrollAll/ScrollAllResponse.cs
+++ b/src/Nest/Document/Multiple/ScrollAll/ScrollAllResponse.cs
@@ -6,14 +6,14 @@ namespace Nest
 	public interface IScrollAllResponse<T> where T : class
 	{
 		/// <summary>
-		/// The scroll result
+		/// The nth scroll this response represents
 		/// </summary>
-		ISearchResponse<T> SearchResponse { get; }
+		long Scroll { get; }
 
 		/// <summary>
-		/// The nth scroll this response represents
+		/// The scroll result
 		/// </summary>
-		long Scroll { get; }
+		ISearchResponse<T> SearchResponse { get; }
 
 		/// <summary>
 		/// The nth slice this response belongs to
@@ -26,12 +26,15 @@ public interface IScrollAllResponse<T> where T : class
 	public class ScrollAllResponse<T> : IScrollAllResponse<T> where T : class
 	{
 		/// <inheritdoc />
-		public ISearchResponse<T> SearchResponse { get; internal set; }
+		public bool IsValid => SearchResponse != null && SearchResponse.IsValid;
+
 		/// <inheritdoc />
 		public long Scroll { get; internal set; }
+
 		/// <inheritdoc />
-		public int Slice { get; internal set; }
+		public ISearchResponse<T> SearchResponse { get; internal set; }
+
 		/// <inheritdoc />
-		public bool IsValid => this.SearchResponse != null && this.SearchResponse.IsValid;
+		public int Slice { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Multiple/UpdateByQuery/ElasticClient-UpdateByQuery.cs b/src/Nest/Document/Multiple/UpdateByQuery/ElasticClient-UpdateByQuery.cs
index 6d410c37481..9a840ee8efe 100644
--- a/src/Nest/Document/Multiple/UpdateByQuery/ElasticClient-UpdateByQuery.cs
+++ b/src/Nest/Document/Multiple/UpdateByQuery/ElasticClient-UpdateByQuery.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,47 +10,56 @@ public partial interface IElasticClient
 		/// <summary>
 		/// The update by query API allows to update documents from one or more indices and one or more types based on a query.
 		/// </summary>
-		/// <typeparam name="T">The type used to infer the default index and typename as well as describe the strongly
-		///  typed parts of the query</typeparam>
+		/// <typeparam name="T">
+		/// The type used to infer the default index and typename as well as describe the strongly
+		///  typed parts of the query
+		/// </typeparam>
 		/// <param name="selector">An optional descriptor to further describe the update by query operation</param>
 		IUpdateByQueryResponse UpdateByQuery<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpdateByQueryResponse UpdateByQuery(IUpdateByQueryRequest request);
 
-		/// <inheritdoc/>
-		Task<IUpdateByQueryResponse> UpdateByQueryAsync<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IUpdateByQueryResponse> UpdateByQueryAsync<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
-		Task<IUpdateByQueryResponse> UpdateByQueryAsync(IUpdateByQueryRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<IUpdateByQueryResponse> UpdateByQueryAsync(IUpdateByQueryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateByQueryResponse UpdateByQuery<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector) where T : class =>
-			this.UpdateByQuery(selector?.Invoke(new UpdateByQueryDescriptor<T>(typeof(T))));
+			UpdateByQuery(selector?.Invoke(new UpdateByQueryDescriptor<T>(typeof(T))));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateByQueryResponse UpdateByQuery(IUpdateByQueryRequest request) =>
-			this.Dispatcher.Dispatch<IUpdateByQueryRequest, UpdateByQueryRequestParameters, UpdateByQueryResponse>(
+			Dispatcher.Dispatch<IUpdateByQueryRequest, UpdateByQueryRequestParameters, UpdateByQueryResponse>(
 				ForceConfiguration<IUpdateByQueryRequest, UpdateByQueryRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
-				this.LowLevelDispatch.UpdateByQueryDispatch<UpdateByQueryResponse>
+				LowLevelDispatch.UpdateByQueryDispatch<UpdateByQueryResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IUpdateByQueryResponse> UpdateByQueryAsync<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.UpdateByQueryAsync(selector?.Invoke(new UpdateByQueryDescriptor<T>(typeof(T))), cancellationToken);
+		/// <inheritdoc />
+		public Task<IUpdateByQueryResponse> UpdateByQueryAsync<T>(Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			UpdateByQueryAsync(selector?.Invoke(new UpdateByQueryDescriptor<T>(typeof(T))), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IUpdateByQueryResponse> UpdateByQueryAsync(IUpdateByQueryRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IUpdateByQueryRequest, UpdateByQueryRequestParameters, UpdateByQueryResponse, IUpdateByQueryResponse>(
+		/// <inheritdoc />
+		public Task<IUpdateByQueryResponse> UpdateByQueryAsync(IUpdateByQueryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IUpdateByQueryRequest, UpdateByQueryRequestParameters, UpdateByQueryResponse, IUpdateByQueryResponse>(
 				ForceConfiguration<IUpdateByQueryRequest, UpdateByQueryRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
 				cancellationToken,
-				this.LowLevelDispatch.UpdateByQueryDispatchAsync<UpdateByQueryResponse>
+				LowLevelDispatch.UpdateByQueryDispatchAsync<UpdateByQueryResponse>
 			);
 	}
 }
diff --git a/src/Nest/Document/Multiple/UpdateByQuery/UpdateByQueryRequest.cs b/src/Nest/Document/Multiple/UpdateByQuery/UpdateByQueryRequest.cs
index e69be7f325b..0481878c492 100644
--- a/src/Nest/Document/Multiple/UpdateByQuery/UpdateByQueryRequest.cs
+++ b/src/Nest/Document/Multiple/UpdateByQuery/UpdateByQueryRequest.cs
@@ -18,7 +18,6 @@ public partial class UpdateByQueryRequest
 	{
 		public QueryContainer Query { get; set; }
 		public IScript Script { get; set; }
-
 	}
 
 	public partial class UpdateByQueryRequest<T> : IUpdateByQueryRequest<T>
@@ -43,6 +42,5 @@ public UpdateByQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryC
 
 		public UpdateByQueryDescriptor<T> Script(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.Script = scriptSelector?.Invoke(new ScriptDescriptor()));
-
 	}
 }
diff --git a/src/Nest/Document/Multiple/UpdateByQuery/UpdateByQueryResponse.cs b/src/Nest/Document/Multiple/UpdateByQuery/UpdateByQueryResponse.cs
index 22d187ddaf6..7f9758ff785 100644
--- a/src/Nest/Document/Multiple/UpdateByQuery/UpdateByQueryResponse.cs
+++ b/src/Nest/Document/Multiple/UpdateByQuery/UpdateByQueryResponse.cs
@@ -5,8 +5,20 @@ namespace Nest
 {
 	public interface IUpdateByQueryResponse : IResponse
 	{
-		[JsonProperty("took")]
-		long Took { get; }
+		[JsonProperty("batches")]
+		long Batches { get; }
+
+		[JsonProperty("failures")]
+		IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; }
+
+		[JsonProperty("noops")]
+		long Noops { get; }
+
+		[JsonProperty("requests_per_second")]
+		float RequestsPerSecond { get; }
+
+		[JsonProperty("retries")]
+		Retries Retries { get; }
 
 		/// <summary>
 		/// Only has a value if WaitForCompletion is set to false on the request
@@ -17,36 +29,31 @@ public interface IUpdateByQueryResponse : IResponse
 		[JsonProperty("timed_out")]
 		bool TimedOut { get; }
 
+		[JsonProperty("took")]
+		long Took { get; }
+
 		[JsonProperty("total")]
 		long Total { get; }
 
 		[JsonProperty("updated")]
 		long Updated { get; }
 
-		[JsonProperty("batches")]
-		long Batches { get; }
-
 		[JsonProperty("version_conflicts")]
 		long VersionConflicts { get; }
-
-		[JsonProperty("noops")]
-		long Noops { get; }
-
-		[JsonProperty("retries")]
-		Retries Retries { get; }
-
-		[JsonProperty("failures")]
-		IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; }
-
-		[JsonProperty("requests_per_second")]
-		float RequestsPerSecond { get; }
 	}
 
 	public class UpdateByQueryResponse : ResponseBase, IUpdateByQueryResponse
 	{
-		public override bool IsValid => this.ApiCall?.HttpStatusCode == 200 && !this.Failures.HasAny();
+		public long Batches { get; internal set; }
 
-		public long Took { get; internal set; }
+		public IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; internal set; } = EmptyReadOnly<BulkIndexByScrollFailure>.Collection;
+		public override bool IsValid => ApiCall?.HttpStatusCode == 200 && !Failures.HasAny();
+
+		public long Noops { get; internal set; }
+
+		public float RequestsPerSecond { get; internal set; }
+
+		public Retries Retries { get; internal set; }
 
 		/// <summary>
 		/// Only has a value if WaitForCompletion is set to false on the request
@@ -55,20 +62,12 @@ public class UpdateByQueryResponse : ResponseBase, IUpdateByQueryResponse
 
 		public bool TimedOut { get; internal set; }
 
+		public long Took { get; internal set; }
+
 		public long Total { get; internal set; }
 
 		public long Updated { get; internal set; }
 
-		public long Batches { get; internal set; }
-
 		public long VersionConflicts { get; internal set; }
-
-		public long Noops { get; internal set; }
-
-		public Retries Retries { get; internal set; }
-
-		public IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; internal set; } = EmptyReadOnly<BulkIndexByScrollFailure>.Collection;
-
-		public float RequestsPerSecond { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Result.cs b/src/Nest/Document/Result.cs
index 0818093df2d..48bc6708d3c 100644
--- a/src/Nest/Document/Result.cs
+++ b/src/Nest/Document/Result.cs
@@ -1,11 +1,6 @@
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -13,14 +8,19 @@ namespace Nest
 	public enum Result
 	{
 		Error,
+
 		[EnumMember(Value = "created")]
 		Created,
+
 		[EnumMember(Value = "updated")]
 		Updated,
+
 		[EnumMember(Value = "deleted")]
 		Deleted,
+
 		[EnumMember(Value = "not_found")]
 		NotFound,
+
 		[EnumMember(Value = "noop")]
 		Noop
 	}
diff --git a/src/Nest/Document/Single/Create/CreateRequest.cs b/src/Nest/Document/Single/Create/CreateRequest.cs
index 82b6082f45e..2ea187cbfda 100644
--- a/src/Nest/Document/Single/Create/CreateRequest.cs
+++ b/src/Nest/Document/Single/Create/CreateRequest.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -14,12 +13,12 @@ public partial class CreateRequest<TDocument> where TDocument : class
 	{
 		public TDocument Document { get; set; }
 
-		partial void DocumentFromPath(TDocument document) => this.Document = document;
-		private TDocument AutoRouteDocument() => this.Document;
-
 		void IProxyRequest.WriteJson(IElasticsearchSerializer sourceSerializer, Stream stream, SerializationFormatting formatting) =>
-			sourceSerializer.Serialize(this.Document, stream, formatting);
+			sourceSerializer.Serialize(Document, stream, formatting);
+
+		partial void DocumentFromPath(TDocument document) => Document = document;
 
+		private TDocument AutoRouteDocument() => Document;
 	}
 
 	[DescriptorFor("Create")]
@@ -27,12 +26,13 @@ public partial class CreateDescriptor<TDocument> where TDocument : class
 	{
 		TDocument ICreateRequest<TDocument>.Document { get; set; }
 
-		partial void DocumentFromPath(TDocument document) => Assign(a => a.Document = document);
-		private TDocument AutoRouteDocument() => Self.Document;
-
 		void IProxyRequest.WriteJson(IElasticsearchSerializer sourceSerializer, Stream stream, SerializationFormatting formatting) =>
 			sourceSerializer.Serialize(Self.Document, stream, formatting);
 
+		partial void DocumentFromPath(TDocument document) => Assign(a => a.Document = document);
+
+		private TDocument AutoRouteDocument() => Self.Document;
+
 		/// <summary>
 		/// Sets the id for the document. Overrides the id that may be inferred from the document.
 		/// </summary>
diff --git a/src/Nest/Document/Single/Create/CreateResponse.cs b/src/Nest/Document/Single/Create/CreateResponse.cs
index f66b46c6fed..fc9ac178c8f 100644
--- a/src/Nest/Document/Single/Create/CreateResponse.cs
+++ b/src/Nest/Document/Single/Create/CreateResponse.cs
@@ -6,40 +6,39 @@ public interface ICreateResponse : IResponse
 	{
 		string Id { get; }
 		string Index { get; }
-		string Type { get; }
-		long Version { get; }
+		long PrimaryTerm { get; }
 		Result Result { get; }
-		ShardStatistics Shards { get; }
 		long SequenceNumber { get; }
-		long PrimaryTerm { get; }
+		ShardStatistics Shards { get; }
+		string Type { get; }
+		long Version { get; }
 	}
 
 	[JsonObject]
 	public class CreateResponse : ResponseBase, ICreateResponse
 	{
-		[JsonProperty("_index")]
-		public string Index { get; internal set; }
-
-		[JsonProperty("_type")]
-		public string Type { get; internal set; }
-
 		[JsonProperty("_id")]
 		public string Id { get; internal set; }
 
-		[JsonProperty("_version")]
-		public long Version { get; internal set; }
+		[JsonProperty("_index")]
+		public string Index { get; internal set; }
+
+		[JsonProperty("_primary_term")]
+		public long PrimaryTerm { get; internal set; }
 
 		[JsonProperty("result")]
 		public Result Result { get; internal set; }
 
-		[JsonProperty("_shards")]
-		public ShardStatistics Shards { get; internal set; }
-
 		[JsonProperty("_seq_no")]
 		public long SequenceNumber { get; internal set; }
 
-		[JsonProperty("_primary_term")]
-		public long PrimaryTerm { get; internal set; }
+		[JsonProperty("_shards")]
+		public ShardStatistics Shards { get; internal set; }
+
+		[JsonProperty("_type")]
+		public string Type { get; internal set; }
 
+		[JsonProperty("_version")]
+		public long Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Single/Create/ElasticClient-Create.cs b/src/Nest/Document/Single/Create/ElasticClient-Create.cs
index 27ef4cff22c..ba7583a31e6 100644
--- a/src/Nest/Document/Single/Create/ElasticClient-Create.cs
+++ b/src/Nest/Document/Single/Create/ElasticClient-Create.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -12,20 +12,25 @@ public partial interface IElasticClient
 		/// A 409 Conflict HTTP response status code and error will be returned.
 		/// </summary>
 		/// <typeparam name="TDocument">The document type used to infer the default index, type and id</typeparam>
-		/// <param name="document">The document to be created. Id will be inferred from (in order):
-		/// <para>1. Id property set up on <see cref="ConnectionSettings"/> for <typeparamref name="TDocument"/></para>
-		/// <para>2. <see cref="ElasticsearchTypeAttribute.IdProperty"/> property on <see cref="ElasticsearchTypeAttribute"/> applied to <typeparamref name="TDocument"/></para>
-		/// <para>3. A property named Id on <typeparamref name="TDocument"/></para>
+		/// <param name="document">
+		/// The document to be created. Id will be inferred from (in order):
+		/// <para>1. Id property set up on <see cref="ConnectionSettings" /> for <typeparamref name="TDocument" /></para>
+		/// <para>
+		/// 2. <see cref="ElasticsearchTypeAttribute.IdProperty" /> property on <see cref="ElasticsearchTypeAttribute" /> applied to
+		/// <typeparamref name="TDocument" />
+		/// </para>
+		/// <para>3. A property named Id on <typeparamref name="TDocument" /></para>
 		/// </param>
 		/// <param name="selector">Optionally further describe the create operation i.e override type/index/id</param>
 		ICreateResponse CreateDocument<TDocument>(TDocument document) where TDocument : class;
+
 		ICreateResponse Create<TDocument>(TDocument document, Func<CreateDescriptor<TDocument>, ICreateRequest<TDocument>> selector)
 			where TDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICreateResponse Create<TDocument>(ICreateRequest<TDocument> request) where TDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICreateResponse> CreateDocumentAsync<TDocument>(TDocument document, CancellationToken cancellationToken = default(CancellationToken))
 			where TDocument : class;
 
@@ -34,49 +39,53 @@ Task<ICreateResponse> CreateAsync<TDocument>(
 			CancellationToken cancellationToken = default(CancellationToken)
 		) where TDocument : class;
 
-		/// <inheritdoc/>
-		Task<ICreateResponse> CreateAsync<TDocument>(ICreateRequest<TDocument> request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ICreateResponse> CreateAsync<TDocument>(ICreateRequest<TDocument> request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where TDocument : class;
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public ICreateResponse CreateDocument<TDocument>(TDocument document) where TDocument : class => this.Create(document, s => s);
-
 		public ICreateResponse Create<TDocument>(TDocument document, Func<CreateDescriptor<TDocument>, ICreateRequest<TDocument>> selector)
 			where TDocument :
-			class => this.Create(selector?.InvokeOrDefault(new CreateDescriptor<TDocument>(document)));
+			class => Create(selector?.InvokeOrDefault(new CreateDescriptor<TDocument>(document)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICreateResponse Create<TDocument>(ICreateRequest<TDocument> request) where TDocument : class =>
-			this.Dispatcher.Dispatch<ICreateRequest<TDocument>, CreateRequestParameters, CreateResponse>(
+			Dispatcher.Dispatch<ICreateRequest<TDocument>, CreateRequestParameters, CreateResponse>(
 				request,
-				this.LowLevelDispatch.CreateDispatch<CreateResponse, TDocument>
+				LowLevelDispatch.CreateDispatch<CreateResponse, TDocument>
 			);
 
-		/// <inheritdoc/>
-		public Task<ICreateResponse> CreateDocumentAsync<TDocument>(
-			TDocument document,
-			CancellationToken cancellationToken = default(CancellationToken)
-		) where TDocument : class =>
-			this.CreateAsync(document, s => s, cancellationToken);
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICreateResponse> CreateAsync<TDocument>(
 			TDocument document,
 			Func<CreateDescriptor<TDocument>, ICreateRequest<TDocument>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		) where TDocument : class =>
-			this.CreateAsync(selector?.InvokeOrDefault(new CreateDescriptor<TDocument>(document)), cancellationToken);
+			CreateAsync(selector?.InvokeOrDefault(new CreateDescriptor<TDocument>(document)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICreateResponse> CreateAsync<TDocument>(ICreateRequest<TDocument> request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<ICreateResponse> CreateAsync<TDocument>(ICreateRequest<TDocument> request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where TDocument : class =>
-			this.Dispatcher.DispatchAsync<ICreateRequest<TDocument>, CreateRequestParameters, CreateResponse, ICreateResponse>(
+			Dispatcher.DispatchAsync<ICreateRequest<TDocument>, CreateRequestParameters, CreateResponse, ICreateResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.CreateDispatchAsync<CreateResponse, TDocument>
+				LowLevelDispatch.CreateDispatchAsync<CreateResponse, TDocument>
 			);
+
+		/// <inheritdoc />
+		public ICreateResponse CreateDocument<TDocument>(TDocument document) where TDocument : class => Create(document, s => s);
+
+		/// <inheritdoc />
+		public Task<ICreateResponse> CreateDocumentAsync<TDocument>(
+			TDocument document,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where TDocument : class =>
+			CreateAsync(document, s => s, cancellationToken);
 	}
 }
diff --git a/src/Nest/Document/Single/Delete/DeleteResponse.cs b/src/Nest/Document/Single/Delete/DeleteResponse.cs
index 270e23facc7..24294073761 100644
--- a/src/Nest/Document/Single/Delete/DeleteResponse.cs
+++ b/src/Nest/Document/Single/Delete/DeleteResponse.cs
@@ -14,6 +14,17 @@ public interface IDeleteResponse : IResponse
 		/// </summary>
 		string Index { get; }
 
+		long PrimaryTerm { get; }
+
+		/// <summary>
+		/// The operation that was performed on the document.
+		/// </summary>
+		Result Result { get; }
+
+		long SequenceNumber { get; }
+
+		ShardStatistics Shards { get; }
+
 		/// <summary>
 		/// The type of the deleted document.
 		/// </summary>
@@ -23,43 +34,34 @@ public interface IDeleteResponse : IResponse
 		/// The version of the deleted document.
 		/// </summary>
 		long Version { get; }
-
-		/// <summary>
-		/// The operation that was performed on the document.
-		/// </summary>
-		Result Result { get; }
-
-		ShardStatistics Shards { get; }
-		long SequenceNumber { get; }
-		long PrimaryTerm { get; }
 	}
 
 
 	[JsonObject]
 	public class DeleteResponse : ResponseBase, IDeleteResponse
 	{
-		[JsonProperty("_index")]
-		public string Index { get; internal set; }
-
-		[JsonProperty("_type")]
-		public string Type { get; internal set; }
-
 		[JsonProperty("_id")]
 		public string Id { get; internal set; }
 
-		[JsonProperty("_version")]
-		public long Version { get; internal set; }
+		[JsonProperty("_index")]
+		public string Index { get; internal set; }
+
+		[JsonProperty("_primary_term")]
+		public long PrimaryTerm { get; internal set; }
 
 		[JsonProperty("result")]
 		public Result Result { get; internal set; }
 
+		[JsonProperty("_seq_no")]
+		public long SequenceNumber { get; internal set; }
+
 		[JsonProperty("_shards")]
 		public ShardStatistics Shards { get; internal set; }
 
-		[JsonProperty("_seq_no")]
-		public long SequenceNumber { get; internal set; }
+		[JsonProperty("_type")]
+		public string Type { get; internal set; }
 
-		[JsonProperty("_primary_term")]
-		public long PrimaryTerm { get; internal set; }
+		[JsonProperty("_version")]
+		public long Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Single/Delete/ElasticClient-Delete.cs b/src/Nest/Document/Single/Delete/ElasticClient-Delete.cs
index 90851399cf6..fc685178bf1 100644
--- a/src/Nest/Document/Single/Delete/ElasticClient-Delete.cs
+++ b/src/Nest/Document/Single/Delete/ElasticClient-Delete.cs
@@ -1,58 +1,60 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
 		/// <summary>
-		///The delete API allows to delete a typed JSON document from a specific index based on its id.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete.html</a>
+		/// The delete API allows to delete a typed JSON document from a specific index based on its id.
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete.html</a>
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="selector">Describe the delete operation, i.e type/index/id</param>
 		IDeleteResponse Delete<T>(DocumentPath<T> document, Func<DeleteDescriptor<T>, IDeleteRequest> selector = null) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteResponse Delete(IDeleteRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteResponse> DeleteAsync<T>(
 			DocumentPath<T> document, Func<DeleteDescriptor<T>, IDeleteRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteResponse> DeleteAsync(IDeleteRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteResponse Delete<T>(DocumentPath<T> document, Func<DeleteDescriptor<T>, IDeleteRequest> selector = null) where T : class =>
-			this.Delete(selector.InvokeOrDefault(new DeleteDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)));
+			Delete(selector.InvokeOrDefault(new DeleteDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteResponse Delete(IDeleteRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteRequest, DeleteRequestParameters, DeleteResponse>(
+			Dispatcher.Dispatch<IDeleteRequest, DeleteRequestParameters, DeleteResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.DeleteDispatch<DeleteResponse>(p)
+				(p, d) => LowLevelDispatch.DeleteDispatch<DeleteResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IDeleteResponse> DeleteAsync<T>(
 			DocumentPath<T> document, Func<DeleteDescriptor<T>, IDeleteRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) where T : class => this.DeleteAsync(selector.InvokeOrDefault(new DeleteDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)), cancellationToken);
+		) where T : class => DeleteAsync(selector.InvokeOrDefault(new DeleteDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)),
+			cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IDeleteResponse> DeleteAsync(IDeleteRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteRequest, DeleteRequestParameters, DeleteResponse, IDeleteResponse>(
+			Dispatcher.DispatchAsync<IDeleteRequest, DeleteRequestParameters, DeleteResponse, IDeleteResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.DeleteDispatchAsync<DeleteResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.DeleteDispatchAsync<DeleteResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Document/Single/Exists/DocumentExistsRequest.cs b/src/Nest/Document/Single/Exists/DocumentExistsRequest.cs
index 2b1d21c396e..23c58fc0deb 100644
--- a/src/Nest/Document/Single/Exists/DocumentExistsRequest.cs
+++ b/src/Nest/Document/Single/Exists/DocumentExistsRequest.cs
@@ -1,6 +1,4 @@
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface IDocumentExistsRequest { }
 
diff --git a/src/Nest/Document/Single/Exists/ElasticClient-DocumentExists.cs b/src/Nest/Document/Single/Exists/ElasticClient-DocumentExists.cs
index 26979270fe7..b2713bf8eb8 100644
--- a/src/Nest/Document/Single/Exists/ElasticClient-DocumentExists.cs
+++ b/src/Nest/Document/Single/Exists/ElasticClient-DocumentExists.cs
@@ -1,58 +1,69 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using ExistConverter = Func<IApiCallDetails, Stream, ExistsResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Check if a document exists without returning its contents
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html</a>
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="selector">Describe what document we are looking for</param>
 		IExistsResponse DocumentExists<T>(DocumentPath<T> document, Func<DocumentExistsDescriptor<T>, IDocumentExistsRequest> selector = null)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExistsResponse DocumentExists(IDocumentExistsRequest request);
 
-		/// <inheritdoc/>
-		Task<IExistsResponse> DocumentExistsAsync<T>(DocumentPath<T> document, Func<DocumentExistsDescriptor<T>, IDocumentExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IExistsResponse> DocumentExistsAsync<T>(DocumentPath<T> document,
+			Func<DocumentExistsDescriptor<T>, IDocumentExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IExistsResponse> DocumentExistsAsync(IDocumentExistsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IExistsResponse DocumentExists<T>(DocumentPath<T> document, Func<DocumentExistsDescriptor<T>, IDocumentExistsRequest> selector = null) where T : class =>
-			this.DocumentExists(selector.InvokeOrDefault(new DocumentExistsDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)));
+		/// <inheritdoc />
+		public IExistsResponse DocumentExists<T>(DocumentPath<T> document, Func<DocumentExistsDescriptor<T>, IDocumentExistsRequest> selector = null)
+			where T : class =>
+			DocumentExists(selector.InvokeOrDefault(new DocumentExistsDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse DocumentExists(IDocumentExistsRequest request) =>
-			this.Dispatcher.Dispatch<IDocumentExistsRequest, DocumentExistsRequestParameters, ExistsResponse>(
+			Dispatcher.Dispatch<IDocumentExistsRequest, DocumentExistsRequestParameters, ExistsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ExistsDispatch<ExistsResponse>(p)
+				(p, d) => LowLevelDispatch.ExistsDispatch<ExistsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> DocumentExistsAsync<T>(DocumentPath<T> document, Func<DocumentExistsDescriptor<T>, IDocumentExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.DocumentExistsAsync(selector.InvokeOrDefault(new DocumentExistsDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IExistsResponse> DocumentExistsAsync<T>(DocumentPath<T> document,
+			Func<DocumentExistsDescriptor<T>, IDocumentExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			DocumentExistsAsync(selector.InvokeOrDefault(new DocumentExistsDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)),
+				cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> DocumentExistsAsync(IDocumentExistsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDocumentExistsRequest, DocumentExistsRequestParameters, ExistsResponse, IExistsResponse>(
+		/// <inheritdoc />
+		public Task<IExistsResponse> DocumentExistsAsync(IDocumentExistsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDocumentExistsRequest, DocumentExistsRequestParameters, ExistsResponse, IExistsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ExistsDispatchAsync<ExistsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.ExistsDispatchAsync<ExistsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Document/Single/Get/ElasticClient-Get.cs b/src/Nest/Document/Single/Get/ElasticClient-Get.cs
index 58b1ad52e5d..5120ffb4697 100644
--- a/src/Nest/Document/Single/Get/ElasticClient-Get.cs
+++ b/src/Nest/Document/Single/Get/ElasticClient-Get.cs
@@ -1,8 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.IO;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,54 +9,54 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Use the /{index}/{type}/{id} to get the document and its metadata
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html#_source
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html#_source
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="selector">A descriptor that describes which document's source to fetch</param>
 		IGetResponse<T> Get<T>(DocumentPath<T> document, Func<GetDescriptor<T>, IGetRequest> selector = null) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetResponse<T> Get<T>(IGetRequest request) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetResponse<T>> GetAsync<T>(
 			DocumentPath<T> document,
 			Func<GetDescriptor<T>, IGetRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetResponse<T>> GetAsync<T>(IGetRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
-
 	}
 
 	public partial class ElasticClient
 	{
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetResponse<T> Get<T>(DocumentPath<T> document, Func<GetDescriptor<T>, IGetRequest> selector = null) where T : class =>
-			this.Get<T>(selector.InvokeOrDefault(new GetDescriptor<T>(document)));
+			Get<T>(selector.InvokeOrDefault(new GetDescriptor<T>(document)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetResponse<T> Get<T>(IGetRequest request) where T : class =>
-			this.Dispatcher.Dispatch<IGetRequest, GetRequestParameters, GetResponse<T>>(
+			Dispatcher.Dispatch<IGetRequest, GetRequestParameters, GetResponse<T>>(
 				request,
-				(p, d) => this.LowLevelDispatch.GetDispatch<GetResponse<T>>(p)
+				(p, d) => LowLevelDispatch.GetDispatch<GetResponse<T>>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetResponse<T>> GetAsync<T>(
 			DocumentPath<T> document,
 			Func<GetDescriptor<T>, IGetRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) where T : class => this.GetAsync<T>(selector.InvokeOrDefault(new GetDescriptor<T>(document)), cancellationToken);
+		) where T : class => GetAsync<T>(selector.InvokeOrDefault(new GetDescriptor<T>(document)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetResponse<T>> GetAsync<T>(IGetRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.Dispatcher.DispatchAsync<IGetRequest, GetRequestParameters, GetResponse<T>, IGetResponse<T>>(
+		/// <inheritdoc />
+		public Task<IGetResponse<T>> GetAsync<T>(IGetRequest request, CancellationToken cancellationToken = default(CancellationToken))
+			where T : class =>
+			Dispatcher.DispatchAsync<IGetRequest, GetRequestParameters, GetResponse<T>, IGetResponse<T>>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.GetDispatchAsync<GetResponse<T>>(p, c)
+				(p, d, c) => LowLevelDispatch.GetDispatchAsync<GetResponse<T>>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Document/Single/Get/GetRequest.cs b/src/Nest/Document/Single/Get/GetRequest.cs
index 24e620cfca7..45f93a7d709 100644
--- a/src/Nest/Document/Single/Get/GetRequest.cs
+++ b/src/Nest/Document/Single/Get/GetRequest.cs
@@ -1,6 +1,7 @@
 namespace Nest
 {
 	public partial interface IGetRequest { }
+
 	public interface IGetRequest<T> : IGetRequest where T : class { }
 
 	public partial class GetRequest
@@ -18,8 +19,8 @@ public partial class GetDescriptor<T> where T : class
 	{
 		private object AutoRouteDocument() => null;
 
-		public GetDescriptor<T> ExecuteOnPrimary() => this.Preference("_primary");
+		public GetDescriptor<T> ExecuteOnPrimary() => Preference("_primary");
 
-		public GetDescriptor<T> ExecuteOnLocalShard() => this.Preference("_local");
+		public GetDescriptor<T> ExecuteOnLocalShard() => Preference("_local");
 	}
 }
diff --git a/src/Nest/Document/Single/Get/GetResponse.cs b/src/Nest/Document/Single/Get/GetResponse.cs
index 24ea8138e89..20adebe37d1 100644
--- a/src/Nest/Document/Single/Get/GetResponse.cs
+++ b/src/Nest/Document/Single/Get/GetResponse.cs
@@ -5,27 +5,17 @@ namespace Nest
 {
 	public interface IGetResponse<out TDocument> : IResponse where TDocument : class
 	{
-		[JsonProperty("_index")]
-		string Index { get; }
-
-		[JsonProperty("_type")]
-		string Type { get; }
-
-		[JsonProperty("_id")]
-		string Id { get; }
-
-		[JsonProperty("_version")]
-		long Version { get; }
+		[JsonProperty("fields")]
+		FieldValues Fields { get; }
 
 		[JsonProperty("found")]
 		bool Found { get; }
 
-		[JsonProperty("_source")]
-		[JsonConverter(typeof(SourceConverter))]
-		TDocument Source { get; }
+		[JsonProperty("_id")]
+		string Id { get; }
 
-		[JsonProperty("fields")]
-		FieldValues Fields { get; }
+		[JsonProperty("_index")]
+		string Index { get; }
 
 		[JsonProperty("_parent")]
 		[Obsolete("No longer returned on indices created in Elasticsearch 6.0")]
@@ -33,19 +23,29 @@ public interface IGetResponse<out TDocument> : IResponse where TDocument : class
 
 		[JsonProperty("_routing")]
 		string Routing { get; }
+
+		[JsonProperty("_source")]
+		[JsonConverter(typeof(SourceConverter))]
+		TDocument Source { get; }
+
+		[JsonProperty("_type")]
+		string Type { get; }
+
+		[JsonProperty("_version")]
+		long Version { get; }
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
 	public class GetResponse<TDocument> : ResponseBase, IGetResponse<TDocument> where TDocument : class
 	{
-		public string Index { get; internal set; }
-		public string Type { get; internal set; }
-		public string Id { get; internal set; }
-		public long Version { get; internal set; }
-		public bool Found { get; internal set; }
-		public TDocument Source { get; internal set; }
 		public FieldValues Fields { get; internal set; } = FieldValues.Empty;
+		public bool Found { get; internal set; }
+		public string Id { get; internal set; }
+		public string Index { get; internal set; }
 		public string Parent { get; internal set; }
 		public string Routing { get; internal set; }
+		public TDocument Source { get; internal set; }
+		public string Type { get; internal set; }
+		public long Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Single/Index/ElasticClient-Index.cs b/src/Nest/Document/Single/Index/ElasticClient-Index.cs
index 2119fd4afc0..1c6e7655aeb 100644
--- a/src/Nest/Document/Single/Index/ElasticClient-Index.cs
+++ b/src/Nest/Document/Single/Index/ElasticClient-Index.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,70 +9,76 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Adds or updates a typed JSON document in a specific index, making it searchable.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-index_.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-index_.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-index_.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-index_.html</a>
 		/// </summary>
 		/// <typeparam name="T">The document type used to infer the default index, type and id</typeparam>
-		/// <param name="document">The document to be indexed. Id will be inferred from (in order):
-		/// <para>1. Id property set up on <see cref="ConnectionSettings"/> for <typeparamref name="T"/></para>
-		/// <para>2. <see cref="ElasticsearchTypeAttribute.IdProperty"/> property on <see cref="ElasticsearchTypeAttribute"/> applied to <typeparamref name="T"/></para>
-		/// <para>3. A property named Id on <typeparamref name="T"/></para>
+		/// <param name="document">
+		/// The document to be indexed. Id will be inferred from (in order):
+		/// <para>1. Id property set up on <see cref="ConnectionSettings" /> for <typeparamref name="T" /></para>
+		/// <para>
+		/// 2. <see cref="ElasticsearchTypeAttribute.IdProperty" /> property on <see cref="ElasticsearchTypeAttribute" /> applied to
+		/// <typeparamref name="T" />
+		/// </para>
+		/// <para>3. A property named Id on <typeparamref name="T" /></para>
 		/// </param>
 		/// <param name="selector">Optionally further describe the index operation i.e override type, index, id</param>
 		IIndexResponse IndexDocument<T>(T document) where T : class;
+
 		IIndexResponse Index<T>(T document, Func<IndexDescriptor<T>, IIndexRequest<T>> selector) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IIndexResponse Index<T>(IIndexRequest<T> request) where T : class;
 
 		Task<IIndexResponse> IndexDocumentAsync<T>(T document, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IIndexResponse> IndexAsync<T>(
 			T document,
 			Func<IndexDescriptor<T>, IIndexRequest<T>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IIndexResponse> IndexAsync<T>(IIndexRequest<T> request, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class;
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IIndexResponse IndexDocument<T>(T document) where T : class => this.Index(document, s => s);
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IIndexResponse Index<T>(T document, Func<IndexDescriptor<T>, IIndexRequest<T>> selector)
 			where T : class =>
-			this.Index(selector?.InvokeOrDefault(new IndexDescriptor<T>(document)));
+			Index(selector?.InvokeOrDefault(new IndexDescriptor<T>(document)));
 
-		/// <inheritdoc/>
-		public IIndexResponse Index<T>(IIndexRequest<T> request) where T : class=>
-			this.Dispatcher.Dispatch<IIndexRequest<T>, IndexRequestParameters, IndexResponse>(
+		/// <inheritdoc />
+		public IIndexResponse Index<T>(IIndexRequest<T> request) where T : class =>
+			Dispatcher.Dispatch<IIndexRequest<T>, IndexRequestParameters, IndexResponse>(
 				request,
-				this.LowLevelDispatch.IndexDispatch<IndexResponse, T>
+				LowLevelDispatch.IndexDispatch<IndexResponse, T>
 			);
 
-		/// <inheritdoc/>
-		public Task<IIndexResponse> IndexDocumentAsync<T>(T document, CancellationToken cancellationToken = default(CancellationToken))
-			where T : class =>
-			this.IndexAsync(document, s => s, cancellationToken);
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IIndexResponse> IndexAsync<T>(T document, Func<IndexDescriptor<T>, IIndexRequest<T>> selector,
-			CancellationToken cancellationToken = default(CancellationToken))
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.IndexAsync(selector?.InvokeOrDefault(new IndexDescriptor<T>(document)), cancellationToken);
+			IndexAsync(selector?.InvokeOrDefault(new IndexDescriptor<T>(document)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IIndexResponse> IndexAsync<T>(IIndexRequest<T> request, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class =>
-			this.Dispatcher.DispatchAsync<IIndexRequest<T>, IndexRequestParameters, IndexResponse, IIndexResponse>(
-				request, cancellationToken, this.LowLevelDispatch.IndexDispatchAsync<IndexResponse, T>
+			Dispatcher.DispatchAsync<IIndexRequest<T>, IndexRequestParameters, IndexResponse, IIndexResponse>(
+				request, cancellationToken, LowLevelDispatch.IndexDispatchAsync<IndexResponse, T>
 			);
+
+		/// <inheritdoc />
+		public IIndexResponse IndexDocument<T>(T document) where T : class => Index(document, s => s);
+
+		/// <inheritdoc />
+		public Task<IIndexResponse> IndexDocumentAsync<T>(T document, CancellationToken cancellationToken = default(CancellationToken))
+			where T : class =>
+			IndexAsync(document, s => s, cancellationToken);
 	}
 }
diff --git a/src/Nest/Document/Single/Index/IndexRequest.cs b/src/Nest/Document/Single/Index/IndexRequest.cs
index 022bb17b5b9..a5efa9134ca 100644
--- a/src/Nest/Document/Single/Index/IndexRequest.cs
+++ b/src/Nest/Document/Single/Index/IndexRequest.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -15,31 +14,31 @@ public partial class IndexRequest<TDocument>
 	{
 		public TDocument Document { get; set; }
 
-		protected void DefaultRouting() => this.Self.RequestParameters.SetQueryString("routing", new Routing(() => Document));
-
 		protected override HttpMethod HttpMethod => GetHttpMethod(this);
 
+		void IProxyRequest.WriteJson(IElasticsearchSerializer sourceSerializer, Stream stream, SerializationFormatting formatting) =>
+			sourceSerializer.Serialize(Document, stream, formatting);
+
+		protected void DefaultRouting() => Self.RequestParameters.SetQueryString("routing", new Routing(() => Document));
+
 		internal static HttpMethod GetHttpMethod(IIndexRequest<TDocument> request) =>
-			request.Id?.StringOrLongValue != null || request.RouteValues.Id != null ? HttpMethod.PUT: HttpMethod.POST;
+			request.Id?.StringOrLongValue != null || request.RouteValues.Id != null ? HttpMethod.PUT : HttpMethod.POST;
 
-		partial void DocumentFromPath(TDocument document) => this.Document = document;
+		partial void DocumentFromPath(TDocument document) => Document = document;
 
 		private TDocument AutoRouteDocument() => Self.Document;
-
-		void IProxyRequest.WriteJson(IElasticsearchSerializer sourceSerializer, Stream stream, SerializationFormatting formatting) =>
-			sourceSerializer.Serialize(this.Document, stream, formatting);
 	}
 
-	public partial class IndexDescriptor<TDocument>  where TDocument : class
+	public partial class IndexDescriptor<TDocument> where TDocument : class
 	{
+		protected override HttpMethod HttpMethod => IndexRequest<TDocument>.GetHttpMethod(this);
 		TDocument IIndexRequest<TDocument>.Document { get; set; }
 
-		protected override HttpMethod HttpMethod => IndexRequest<TDocument>.GetHttpMethod(this);
+		void IProxyRequest.WriteJson(IElasticsearchSerializer sourceSerializer, Stream stream, SerializationFormatting formatting) =>
+			sourceSerializer.Serialize(Self.Document, stream, formatting);
 
 		partial void DocumentFromPath(TDocument document) => Assign(a => a.Document = document);
-		private TDocument AutoRouteDocument() => Self.Document;
 
-		void IProxyRequest.WriteJson(IElasticsearchSerializer sourceSerializer, Stream stream, SerializationFormatting formatting) =>
-			sourceSerializer.Serialize(Self.Document, stream, formatting);
+		private TDocument AutoRouteDocument() => Self.Document;
 	}
 }
diff --git a/src/Nest/Document/Single/Index/IndexResponse.cs b/src/Nest/Document/Single/Index/IndexResponse.cs
index ba87f86a5da..971306d585a 100644
--- a/src/Nest/Document/Single/Index/IndexResponse.cs
+++ b/src/Nest/Document/Single/Index/IndexResponse.cs
@@ -6,40 +6,39 @@ public interface IIndexResponse : IResponse
 	{
 		string Id { get; }
 		string Index { get; }
-		string Type { get; }
-		long Version { get; }
+		long PrimaryTerm { get; }
 		Result Result { get; }
-		ShardStatistics Shards { get; }
 		long SequenceNumber { get; }
-		long PrimaryTerm { get; }
+		ShardStatistics Shards { get; }
+		string Type { get; }
+		long Version { get; }
 	}
 
 	[JsonObject]
 	public class IndexResponse : ResponseBase, IIndexResponse
 	{
-		[JsonProperty("_index")]
-		public string Index { get; internal set; }
-
-		[JsonProperty("_type")]
-		public string Type { get; internal set; }
-
 		[JsonProperty("_id")]
 		public string Id { get; internal set; }
 
-		[JsonProperty("_version")]
-		public long Version { get; internal set; }
+		[JsonProperty("_index")]
+		public string Index { get; internal set; }
+
+		[JsonProperty("_primary_term")]
+		public long PrimaryTerm { get; internal set; }
 
 		[JsonProperty("result")]
 		public Result Result { get; internal set; }
 
-		[JsonProperty("_shards")]
-		public ShardStatistics Shards { get; internal set; }
-
 		[JsonProperty("_seq_no")]
 		public long SequenceNumber { get; internal set; }
 
-		[JsonProperty("_primary_term")]
-		public long PrimaryTerm { get; internal set; }
+		[JsonProperty("_shards")]
+		public ShardStatistics Shards { get; internal set; }
+
+		[JsonProperty("_type")]
+		public string Type { get; internal set; }
 
+		[JsonProperty("_version")]
+		public long Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Single/Source/ElasticClient-Source.cs b/src/Nest/Document/Single/Source/ElasticClient-Source.cs
index ec4fd6eaa82..fa193ebef32 100644
--- a/src/Nest/Document/Single/Source/ElasticClient-Source.cs
+++ b/src/Nest/Document/Single/Source/ElasticClient-Source.cs
@@ -11,67 +11,72 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Use the /{index}/{type}/{id}/_source endpoint to get just the _source field of the document,
 		/// without any additional content around it.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html#_source">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html#_source</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html#_source">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html#_source</a>
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="document">The document path</param>
 		/// <param name="selector">A descriptor that describes which document's source to fetch</param>
 		T Source<T>(DocumentPath<T> document, Func<SourceDescriptor<T>, ISourceRequest> selector = null) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		T Source<T>(ISourceRequest request) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<T> SourceAsync<T>(
 			DocumentPath<T> document,
 			Func<SourceDescriptor<T>, ISourceRequest> selector = null,
-			CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<T> SourceAsync<T>(ISourceRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public T Source<T>(DocumentPath<T> document, Func<SourceDescriptor<T>, ISourceRequest> selector = null) where T : class =>
-			this.Source<T>(selector.InvokeOrDefault(new SourceDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)));
+			Source<T>(selector.InvokeOrDefault(new SourceDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public T Source<T>(ISourceRequest request) where T : class
 		{
 			request.RouteValues.Resolve(ConnectionSettings);
-			return this.Dispatcher.Dispatch<ISourceRequest, SourceRequestParameters, SourceResponse<T>>(
-				request,
-				this.ToSourceResponse<T>,
-				(p, d) => this.LowLevelDispatch.GetSourceDispatch<SourceResponse<T>>(p)
-			).Body;
+			return Dispatcher.Dispatch<ISourceRequest, SourceRequestParameters, SourceResponse<T>>(
+					request,
+					ToSourceResponse<T>,
+					(p, d) => LowLevelDispatch.GetSourceDispatch<SourceResponse<T>>(p)
+				)
+				.Body;
 		}
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<T> SourceAsync<T>(
 			DocumentPath<T> document,
 			Func<SourceDescriptor<T>, ISourceRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) where T : class => this.SourceAsync<T>(selector.InvokeOrDefault(new SourceDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)), cancellationToken);
+		) where T : class =>
+			SourceAsync<T>(selector.InvokeOrDefault(new SourceDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)),
+				cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public async Task<T> SourceAsync<T>(ISourceRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class
 		{
 			request.RouteValues.Resolve(ConnectionSettings);
-			var result = await this.Dispatcher.DispatchAsync<ISourceRequest, SourceRequestParameters, SourceResponse<T>, ISourceResponse<T>>(
-				request,
-				cancellationToken,
-				this.ToSourceResponse<T>,
-				(p, d, c) => this.LowLevelDispatch.GetSourceDispatchAsync<SourceResponse<T>>(p, c)
-			).ConfigureAwait(false);
+			var result = await Dispatcher.DispatchAsync<ISourceRequest, SourceRequestParameters, SourceResponse<T>, ISourceResponse<T>>(
+					request,
+					cancellationToken,
+					ToSourceResponse<T>,
+					(p, d, c) => LowLevelDispatch.GetSourceDispatchAsync<SourceResponse<T>>(p, c)
+				)
+				.ConfigureAwait(false);
 			return result.Body;
 		}
 
 		private SourceResponse<T> ToSourceResponse<T>(IApiCallDetails apiCallDetails, Stream stream) where T : class
 		{
-			var source = this.SourceSerializer.Deserialize<T>(stream);
+			var source = SourceSerializer.Deserialize<T>(stream);
 			return new SourceResponse<T>
 			{
 				Body = source,
diff --git a/src/Nest/Document/Single/Source/SourceRequest.cs b/src/Nest/Document/Single/Source/SourceRequest.cs
index 978faf8a939..278a53d731e 100644
--- a/src/Nest/Document/Single/Source/SourceRequest.cs
+++ b/src/Nest/Document/Single/Source/SourceRequest.cs
@@ -1,6 +1,4 @@
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface ISourceRequest { }
 
@@ -20,16 +18,9 @@ public partial class SourceRequest<T> where T : class
 	public partial class SourceDescriptor<T> where T : class
 	{
 		private object AutoRouteDocument() => null;
-		
-		public SourceDescriptor<T> ExecuteOnPrimary()
-		{
-			return this.Preference("_primary");
-		}
 
-		public SourceDescriptor<T> ExecuteOnLocalShard()
-		{
-			return this.Preference("_local");
-		}
-	}
+		public SourceDescriptor<T> ExecuteOnPrimary() => Preference("_primary");
 
+		public SourceDescriptor<T> ExecuteOnLocalShard() => Preference("_local");
+	}
 }
diff --git a/src/Nest/Document/Single/SourceExists/ElasticClient-SourceExists.cs b/src/Nest/Document/Single/SourceExists/ElasticClient-SourceExists.cs
index 70f58f97764..58e9bb977f9 100644
--- a/src/Nest/Document/Single/SourceExists/ElasticClient-SourceExists.cs
+++ b/src/Nest/Document/Single/SourceExists/ElasticClient-SourceExists.cs
@@ -1,58 +1,66 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using ExistConverter = Func<IApiCallDetails, Stream, ExistsResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Check if a document's source exists without returning its contents
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html</a>
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the default index and typename</typeparam>
 		/// <param name="selector">Describe what document we are looking for</param>
 		IExistsResponse SourceExists<T>(DocumentPath<T> document, Func<SourceExistsDescriptor<T>, ISourceExistsRequest> selector = null)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExistsResponse SourceExists(ISourceExistsRequest request);
 
-		/// <inheritdoc/>
-		Task<IExistsResponse> SourceExistsAsync<T>(DocumentPath<T> document, Func<SourceExistsDescriptor<T>, ISourceExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IExistsResponse> SourceExistsAsync<T>(DocumentPath<T> document, Func<SourceExistsDescriptor<T>, ISourceExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IExistsResponse> SourceExistsAsync(ISourceExistsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IExistsResponse SourceExists<T>(DocumentPath<T> document, Func<SourceExistsDescriptor<T>, ISourceExistsRequest> selector = null) where T : class =>
-			this.SourceExists(selector.InvokeOrDefault(new SourceExistsDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)));
+		/// <inheritdoc />
+		public IExistsResponse SourceExists<T>(DocumentPath<T> document, Func<SourceExistsDescriptor<T>, ISourceExistsRequest> selector = null)
+			where T : class =>
+			SourceExists(selector.InvokeOrDefault(new SourceExistsDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse SourceExists(ISourceExistsRequest request) =>
-			this.Dispatcher.Dispatch<ISourceExistsRequest, SourceExistsRequestParameters, ExistsResponse>(
+			Dispatcher.Dispatch<ISourceExistsRequest, SourceExistsRequestParameters, ExistsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ExistsSourceDispatch<ExistsResponse>(p)
+				(p, d) => LowLevelDispatch.ExistsSourceDispatch<ExistsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> SourceExistsAsync<T>(DocumentPath<T> document, Func<SourceExistsDescriptor<T>, ISourceExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.SourceExistsAsync(selector.InvokeOrDefault(new SourceExistsDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IExistsResponse> SourceExistsAsync<T>(DocumentPath<T> document,
+			Func<SourceExistsDescriptor<T>, ISourceExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			SourceExistsAsync(selector.InvokeOrDefault(new SourceExistsDescriptor<T>(document.Self.Index, document.Self.Type, document.Self.Id)),
+				cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> SourceExistsAsync(ISourceExistsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ISourceExistsRequest, SourceExistsRequestParameters, ExistsResponse, IExistsResponse>(
+		/// <inheritdoc />
+		public Task<IExistsResponse> SourceExistsAsync(ISourceExistsRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ISourceExistsRequest, SourceExistsRequestParameters, ExistsResponse, IExistsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ExistsSourceDispatchAsync<ExistsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.ExistsSourceDispatchAsync<ExistsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Document/Single/SourceExists/SourceExistsRequest.cs b/src/Nest/Document/Single/SourceExists/SourceExistsRequest.cs
index 0e319a87c99..738deb0c8c0 100644
--- a/src/Nest/Document/Single/SourceExists/SourceExistsRequest.cs
+++ b/src/Nest/Document/Single/SourceExists/SourceExistsRequest.cs
@@ -1,6 +1,4 @@
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface ISourceExistsRequest { }
 
diff --git a/src/Nest/Document/Single/TermVectors/ElasticClient-TermVectors.cs b/src/Nest/Document/Single/TermVectors/ElasticClient-TermVectors.cs
index 3d3e5e3fc86..40191e76f51 100644
--- a/src/Nest/Document/Single/TermVectors/ElasticClient-TermVectors.cs
+++ b/src/Nest/Document/Single/TermVectors/ElasticClient-TermVectors.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,56 +9,58 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Returns information and statistics on terms in the fields of a particular document as stored in the index.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-termvectors.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-termvectors.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-termvectors.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-termvectors.html</a>
 		/// </summary>
 		/// <typeparam name="T">The type of the document</typeparam>
 		/// <param name="selector">A descriptor for the terms vector operation</param>
 		ITermVectorsResponse TermVectors<T>(Func<TermVectorsDescriptor<T>, ITermVectorsRequest<T>> selector)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ITermVectorsResponse TermVectors<T>(ITermVectorsRequest<T> request)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ITermVectorsResponse> TermVectorsAsync<T>(
 			Func<TermVectorsDescriptor<T>, ITermVectorsRequest<T>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		) where T : class;
 
-		/// <inheritdoc/>
-		Task<ITermVectorsResponse> TermVectorsAsync<T>(ITermVectorsRequest<T> request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ITermVectorsResponse> TermVectorsAsync<T>(ITermVectorsRequest<T> request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
-
 	}
 
 	public partial class ElasticClient
 	{
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ITermVectorsResponse TermVectors<T>(Func<TermVectorsDescriptor<T>, ITermVectorsRequest<T>> selector) where T : class =>
-			this.TermVectors(selector?.Invoke(new TermVectorsDescriptor<T>(typeof(T), typeof(T))));
+			TermVectors(selector?.Invoke(new TermVectorsDescriptor<T>(typeof(T), typeof(T))));
 
-		///<inheritdoc/>
-		public ITermVectorsResponse TermVectors<T>(ITermVectorsRequest<T> request) where T : class
-		{
-			return this.Dispatcher.Dispatch<ITermVectorsRequest<T>, TermVectorsRequestParameters, TermVectorsResponse>(
+		/// <inheritdoc />
+		public ITermVectorsResponse TermVectors<T>(ITermVectorsRequest<T> request) where T : class =>
+			Dispatcher.Dispatch<ITermVectorsRequest<T>, TermVectorsRequestParameters, TermVectorsResponse>(
 				request,
-				this.LowLevelDispatch.TermvectorsDispatch<TermVectorsResponse, T>
+				LowLevelDispatch.TermvectorsDispatch<TermVectorsResponse, T>
 			);
-		}
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public Task<ITermVectorsResponse> TermVectorsAsync<T>(
 			Func<TermVectorsDescriptor<T>, ITermVectorsRequest<T>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) where T : class => this.TermVectorsAsync(selector?.Invoke(new TermVectorsDescriptor<T>(typeof(T), typeof(T))), cancellationToken);
+		) where T : class => TermVectorsAsync(selector?.Invoke(new TermVectorsDescriptor<T>(typeof(T), typeof(T))), cancellationToken);
 
-		///<inheritdoc/>
-		public Task<ITermVectorsResponse> TermVectorsAsync<T>(ITermVectorsRequest<T> request, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.Dispatcher.DispatchAsync<ITermVectorsRequest<T>, TermVectorsRequestParameters, TermVectorsResponse, ITermVectorsResponse>(
+		/// <inheritdoc />
+		public Task<ITermVectorsResponse> TermVectorsAsync<T>(ITermVectorsRequest<T> request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			Dispatcher.DispatchAsync<ITermVectorsRequest<T>, TermVectorsRequestParameters, TermVectorsResponse, ITermVectorsResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.TermvectorsDispatchAsync<TermVectorsResponse, T>
+				LowLevelDispatch.TermvectorsDispatchAsync<TermVectorsResponse, T>
 			);
 	}
 }
diff --git a/src/Nest/Document/Single/TermVectors/FieldStatistics.cs b/src/Nest/Document/Single/TermVectors/FieldStatistics.cs
index 07cfe3484f6..e8de29f1278 100644
--- a/src/Nest/Document/Single/TermVectors/FieldStatistics.cs
+++ b/src/Nest/Document/Single/TermVectors/FieldStatistics.cs
@@ -2,16 +2,16 @@
 
 namespace Nest
 {
-    [JsonObject]
-    public class FieldStatistics
-    {
-        [JsonProperty("doc_count")]
-        public int DocumentCount { get; internal set; }
+	[JsonObject]
+	public class FieldStatistics
+	{
+		[JsonProperty("doc_count")]
+		public int DocumentCount { get; internal set; }
 
-        [JsonProperty("sum_doc_freq")]
-        public int SumOfDocumentFrequencies { get; internal set; }
-        
-        [JsonProperty("sum_ttf")]
-        public int SumOfTotalTermFrequencies { get; internal set; }
-    }
+		[JsonProperty("sum_doc_freq")]
+		public int SumOfDocumentFrequencies { get; internal set; }
+
+		[JsonProperty("sum_ttf")]
+		public int SumOfTotalTermFrequencies { get; internal set; }
+	}
 }
diff --git a/src/Nest/Document/Single/TermVectors/TermVectorFilter.cs b/src/Nest/Document/Single/TermVectors/TermVectorFilter.cs
index 2f3c5e327d5..d73be27eccd 100644
--- a/src/Nest/Document/Single/TermVectors/TermVectorFilter.cs
+++ b/src/Nest/Document/Single/TermVectors/TermVectorFilter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -12,16 +10,16 @@ namespace Nest
 	public interface ITermVectorFilter
 	{
 		/// <summary>
-		/// Maximum number of terms that must be returned per field. Defaults to 25.
+		/// Ignore words which occur in more than this many docs. Defaults to unbounded.
 		/// </summary>
-		[JsonProperty("max_num_terms")]
-		int? MaximumNumberOfTerms { get; set; }
+		[JsonProperty("max_doc_freq")]
+		int? MaximumDocumentFrequency { get; set; }
 
 		/// <summary>
-		/// Ignore words with less than this frequency in the source doc. Defaults to 1.
+		/// Maximum number of terms that must be returned per field. Defaults to 25.
 		/// </summary>
-		[JsonProperty("min_term_freq")]
-		int? MinimumTermFrequency { get; set; }
+		[JsonProperty("max_num_terms")]
+		int? MaximumNumberOfTerms { get; set; }
 
 		/// <summary>
 		/// Ignore words with more than this frequency in the source doc. Defaults to unbounded.
@@ -29,6 +27,12 @@ public interface ITermVectorFilter
 		[JsonProperty("max_term_freq")]
 		int? MaximumTermFrequency { get; set; }
 
+		/// <summary>
+		/// The maximum word length above which words will be ignored. Defaults to unbounded.
+		/// </summary>
+		[JsonProperty("max_word_length")]
+		int? MaximumWordLength { get; set; }
+
 		/// <summary>
 		/// Ignore terms which do not occur in at least this many docs. Defaults to 1.
 		/// </summary>
@@ -36,22 +40,16 @@ public interface ITermVectorFilter
 		int? MinimumDocumentFrequency { get; set; }
 
 		/// <summary>
-		/// Ignore words which occur in more than this many docs. Defaults to unbounded.
+		/// Ignore words with less than this frequency in the source doc. Defaults to 1.
 		/// </summary>
-		[JsonProperty("max_doc_freq")]
-		int? MaximumDocumentFrequency { get; set; }
+		[JsonProperty("min_term_freq")]
+		int? MinimumTermFrequency { get; set; }
 
 		/// <summary>
 		/// The minimum word length below which words will be ignored. Defaults to 0.
 		/// </summary>
 		[JsonProperty("min_word_length")]
 		int? MinimumWordLength { get; set; }
-
-		/// <summary>
-		/// The maximum word length above which words will be ignored. Defaults to unbounded.
-		/// </summary>
-		[JsonProperty("max_word_length")]
-		int? MaximumWordLength { get; set; }
 	}
 
 	/// <summary>
@@ -61,39 +59,39 @@ public interface ITermVectorFilter
 	public class TermVectorFilter : ITermVectorFilter
 	{
 		/// <summary>
-		/// Maximum number of terms that must be returned per field. Defaults to 25.
+		/// Ignore words which occur in more than this many docs. Defaults to unbounded.
 		/// </summary>
-		public int? MaximumNumberOfTerms { get; set; }
+		public int? MaximumDocumentFrequency { get; set; }
 
 		/// <summary>
-		/// Ignore words with less than this frequency in the source doc. Defaults to 1.
+		/// Maximum number of terms that must be returned per field. Defaults to 25.
 		/// </summary>
-		public int? MinimumTermFrequency { get; set; }
+		public int? MaximumNumberOfTerms { get; set; }
 
 		/// <summary>
 		/// Ignore words with more than this frequency in the source doc. Defaults to unbounded.
 		/// </summary>
 		public int? MaximumTermFrequency { get; set; }
 
+		/// <summary>
+		/// The maximum word length above which words will be ignored. Defaults to unbounded.
+		/// </summary>
+		public int? MaximumWordLength { get; set; }
+
 		/// <summary>
 		/// Ignore terms which do not occur in at least this many docs. Defaults to 1.
 		/// </summary>
 		public int? MinimumDocumentFrequency { get; set; }
 
 		/// <summary>
-		/// Ignore words which occur in more than this many docs. Defaults to unbounded.
+		/// Ignore words with less than this frequency in the source doc. Defaults to 1.
 		/// </summary>
-		public int? MaximumDocumentFrequency { get; set; }
+		public int? MinimumTermFrequency { get; set; }
 
 		/// <summary>
 		/// The minimum word length below which words will be ignored. Defaults to 0.
 		/// </summary>
 		public int? MinimumWordLength { get; set; }
-
-		/// <summary>
-		/// The maximum word length above which words will be ignored. Defaults to unbounded.
-		/// </summary>
-		public int? MaximumWordLength { get; set; }
 	}
 
 	/// <summary>
@@ -103,13 +101,13 @@ public class TermVectorFilter : ITermVectorFilter
 	public class TermVectorFilterDescriptor
 		: DescriptorBase<TermVectorFilterDescriptor, ITermVectorFilter>, ITermVectorFilter
 	{
+		int? ITermVectorFilter.MaximumDocumentFrequency { get; set; }
 		int? ITermVectorFilter.MaximumNumberOfTerms { get; set; }
-		int? ITermVectorFilter.MinimumTermFrequency { get; set; }
 		int? ITermVectorFilter.MaximumTermFrequency { get; set; }
+		int? ITermVectorFilter.MaximumWordLength { get; set; }
 		int? ITermVectorFilter.MinimumDocumentFrequency { get; set; }
-		int? ITermVectorFilter.MaximumDocumentFrequency { get; set; }
+		int? ITermVectorFilter.MinimumTermFrequency { get; set; }
 		int? ITermVectorFilter.MinimumWordLength { get; set; }
-		int? ITermVectorFilter.MaximumWordLength { get; set; }
 
 		/// <summary>
 		/// Maximum number of terms that must be returned per field. Defaults to 25.
@@ -147,4 +145,3 @@ public class TermVectorFilterDescriptor
 		public TermVectorFilterDescriptor MaximumWordLength(int? maxWordLength) => Assign(a => a.MaximumWordLength = maxWordLength);
 	}
 }
-
diff --git a/src/Nest/Document/Single/TermVectors/TermVectors.cs b/src/Nest/Document/Single/TermVectors/TermVectors.cs
index 9a15006da9a..f6bff47ebb9 100644
--- a/src/Nest/Document/Single/TermVectors/TermVectors.cs
+++ b/src/Nest/Document/Single/TermVectors/TermVectors.cs
@@ -5,37 +5,37 @@ namespace Nest
 {
 	public interface ITermVectors
 	{
+		bool Found { get; }
+		string Id { get; }
 		string Index { get; }
+		IReadOnlyDictionary<Field, TermVector> TermVectors { get; }
+		long Took { get; }
 		string Type { get; }
-		string Id { get; }
 		long Version { get; }
-		bool Found { get; }
-		long Took { get; }
-		IReadOnlyDictionary<Field, TermVector> TermVectors { get; }
 	}
 
 	public class TermVectorsResult : ITermVectors
 	{
-		[JsonProperty("_index")]
-		public string Index { get; internal set; }
-
-		[JsonProperty("_type")]
-		public string Type { get; internal set; }
+		[JsonProperty("found")]
+		public bool Found { get; internal set; }
 
 		[JsonProperty("_id")]
 		public string Id { get; internal set; }
 
-		[JsonProperty("_version")]
-		public long Version { get; internal set; }
+		[JsonProperty("_index")]
+		public string Index { get; internal set; }
 
-		[JsonProperty("found")]
-		public bool Found { get; internal set; }
+		[JsonProperty("term_vectors")]
+		[JsonConverter(typeof(ResolvableDictionaryJsonConverter<Field, TermVector>))]
+		public IReadOnlyDictionary<Field, TermVector> TermVectors { get; internal set; } = EmptyReadOnly<Field, TermVector>.Dictionary;
 
 		[JsonProperty("took")]
 		public long Took { get; internal set; }
 
-		[JsonProperty("term_vectors")]
-		[JsonConverter(typeof(ResolvableDictionaryJsonConverter<Field, TermVector>))]
-		public IReadOnlyDictionary<Field, TermVector> TermVectors { get; internal set; } = EmptyReadOnly<Field, TermVector>.Dictionary;
+		[JsonProperty("_type")]
+		public string Type { get; internal set; }
+
+		[JsonProperty("_version")]
+		public long Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Single/TermVectors/TermVectorsRequest.cs b/src/Nest/Document/Single/TermVectors/TermVectorsRequest.cs
index a1721bcb71e..55d3d270c2b 100644
--- a/src/Nest/Document/Single/TermVectors/TermVectorsRequest.cs
+++ b/src/Nest/Document/Single/TermVectors/TermVectorsRequest.cs
@@ -1,7 +1,6 @@
 using System;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
 
 namespace Nest
 {
@@ -15,44 +14,45 @@ public partial interface ITermVectorsRequest<TDocument>
 		[JsonConverter(typeof(SourceConverter))]
 		TDocument Document { get; set; }
 
-		/// <summary>
-		/// Provide a different analyzer than the one at the field.
-		/// This is useful in order to generate term vectors in any fashion, especially when using artificial documents.
-		/// </summary>
-		[JsonProperty("per_field_analyzer")]
-		IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
-
 		/// <summary>
 		/// Filter the terms returned based on their TF-IDF scores.
 		/// This can be useful in order find out a good characteristic vector of a document.
 		/// </summary>
 		[JsonProperty("filter")]
 		ITermVectorFilter Filter { get; set; }
+
+		/// <summary>
+		/// Provide a different analyzer than the one at the field.
+		/// This is useful in order to generate term vectors in any fashion, especially when using artificial documents.
+		/// </summary>
+		[JsonProperty("per_field_analyzer")]
+		IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
 	}
 
 	public partial class TermVectorsRequest<TDocument>
 		where TDocument : class
 	{
-		HttpMethod IRequest.HttpMethod => (this.Document != null || this.Filter != null) ? HttpMethod.POST : HttpMethod.GET;
-
 		/// <summary>
 		/// An optional document to get term vectors for instead of using an already indexed document
 		/// </summary>
 		public TDocument Document { get; set; }
 
+		/// <summary>
+		/// Filter the terms returned based on their TF-IDF scores.
+		/// This can be useful in order find out a good characteristic vector of a document.
+		/// </summary>
+		public ITermVectorFilter Filter { get; set; }
+
 		/// <summary>
 		/// Provide a different analyzer than the one at the field.
 		/// This is useful in order to generate term vectors in any fashion, especially when using artificial documents.
 		/// </summary>
 		public IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
 
-		/// <summary>
-		/// Filter the terms returned based on their TF-IDF scores.
-		/// This can be useful in order find out a good characteristic vector of a document.
-		/// </summary>
-		public ITermVectorFilter Filter { get; set; }
+		HttpMethod IRequest.HttpMethod => Document != null || Filter != null ? HttpMethod.POST : HttpMethod.GET;
 
 		private TDocument AutoRouteDocument() => Self.Document;
+
 		partial void DocumentFromPath(TDocument document)
 		{
 			Self.Document = document;
@@ -64,14 +64,14 @@ partial void DocumentFromPath(TDocument document)
 	[DescriptorFor("Termvectors")]
 	public partial class TermVectorsDescriptor<TDocument> where TDocument : class
 	{
-		HttpMethod IRequest.HttpMethod => (Self.Document != null || Self.Filter != null) ? HttpMethod.POST : HttpMethod.GET;
-		private TDocument AutoRouteDocument() => Self.Document;
-
 		TDocument ITermVectorsRequest<TDocument>.Document { get; set; }
 
+		ITermVectorFilter ITermVectorsRequest<TDocument>.Filter { get; set; }
+		HttpMethod IRequest.HttpMethod => Self.Document != null || Self.Filter != null ? HttpMethod.POST : HttpMethod.GET;
+
 		IPerFieldAnalyzer ITermVectorsRequest<TDocument>.PerFieldAnalyzer { get; set; }
 
-		ITermVectorFilter ITermVectorsRequest<TDocument>.Filter { get; set; }
+		private TDocument AutoRouteDocument() => Self.Document;
 
 		/// <summary>
 		/// An optional document to get term vectors for instead of using an already indexed document
@@ -82,7 +82,9 @@ public partial class TermVectorsDescriptor<TDocument> where TDocument : class
 		/// Provide a different analyzer than the one at the field.
 		/// This is useful in order to generate term vectors in any fashion, especially when using artificial documents.
 		/// </summary>
-		public TermVectorsDescriptor<TDocument> PerFieldAnalyzer(Func<PerFieldAnalyzerDescriptor<TDocument>, IPromise<IPerFieldAnalyzer>> analyzerSelector) =>
+		public TermVectorsDescriptor<TDocument> PerFieldAnalyzer(
+			Func<PerFieldAnalyzerDescriptor<TDocument>, IPromise<IPerFieldAnalyzer>> analyzerSelector
+		) =>
 			Assign(a => a.PerFieldAnalyzer = analyzerSelector?.Invoke(new PerFieldAnalyzerDescriptor<TDocument>())?.Value);
 
 		/// <summary>
diff --git a/src/Nest/Document/Single/TermVectors/TermVectorsResponse.cs b/src/Nest/Document/Single/TermVectors/TermVectorsResponse.cs
index 9bd6a0f2dcc..45da9c48765 100644
--- a/src/Nest/Document/Single/TermVectors/TermVectorsResponse.cs
+++ b/src/Nest/Document/Single/TermVectors/TermVectorsResponse.cs
@@ -3,33 +3,31 @@
 
 namespace Nest
 {
-	public interface ITermVectorsResponse : IResponse, ITermVectors
-	{
-	}
+	public interface ITermVectorsResponse : IResponse, ITermVectors { }
 
 	[JsonObject]
 	public class TermVectorsResponse : ResponseBase, ITermVectorsResponse
 	{
-		[JsonProperty("_index")]
-		public string Index { get; internal set; }
-
-		[JsonProperty("_type")]
-		public string Type { get; internal set; }
+		[JsonProperty("found")]
+		public bool Found { get; internal set; }
 
 		[JsonProperty("_id")]
 		public string Id { get; internal set; }
 
-		[JsonProperty("_version")]
-		public long Version { get; internal set; }
+		[JsonProperty("_index")]
+		public string Index { get; internal set; }
 
-		[JsonProperty("found")]
-		public bool Found { get; internal set; }
+		[JsonProperty("term_vectors")]
+		[JsonConverter(typeof(ResolvableDictionaryJsonConverter<Field, TermVector>))]
+		public IReadOnlyDictionary<Field, TermVector> TermVectors { get; internal set; } = EmptyReadOnly<Field, TermVector>.Dictionary;
 
 		[JsonProperty("took")]
 		public long Took { get; internal set; }
 
-		[JsonProperty("term_vectors")]
-		[JsonConverter(typeof(ResolvableDictionaryJsonConverter<Field, TermVector>))]
-		public IReadOnlyDictionary<Field, TermVector> TermVectors { get; internal set; } = EmptyReadOnly<Field, TermVector>.Dictionary;
+		[JsonProperty("_type")]
+		public string Type { get; internal set; }
+
+		[JsonProperty("_version")]
+		public long Version { get; internal set; }
 	}
 }
diff --git a/src/Nest/Document/Single/Update/ElasticClient-Update.cs b/src/Nest/Document/Single/Update/ElasticClient-Update.cs
index 1179bf45c55..e9f7e9a4b20 100644
--- a/src/Nest/Document/Single/Update/ElasticClient-Update.cs
+++ b/src/Nest/Document/Single/Update/ElasticClient-Update.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,117 +9,133 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The update API allows to update a document based on a script provided.
-		/// <para>The operation gets the document (collocated with the shard) from the index, runs the script
+		/// <para>
+		/// The operation gets the document (collocated with the shard) from the index, runs the script
 		/// (with optional script language and parameters), and index back the result
-		/// (also allows to delete, or ignore the operation). </para>
+		/// (also allows to delete, or ignore the operation).
+		/// </para>
 		/// <para>It uses versioning to make sure no updates have happened during the "get" and "reindex".</para>
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-update.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-update.html
 		/// </summary>
 		/// <typeparam name="TDocument">The type to describe the document to be updated</typeparam>
 		/// <param name="selector">a descriptor that describes the update operation</param>
-		IUpdateResponse<TDocument> Update<TDocument>(DocumentPath<TDocument> documentPath, Func<UpdateDescriptor<TDocument, TDocument>, IUpdateRequest<TDocument, TDocument>> selector) where TDocument : class;
+		IUpdateResponse<TDocument> Update<TDocument>(DocumentPath<TDocument> documentPath,
+			Func<UpdateDescriptor<TDocument, TDocument>, IUpdateRequest<TDocument, TDocument>> selector
+		) where TDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpdateResponse<TDocument> Update<TDocument>(IUpdateRequest<TDocument, TDocument> request) where TDocument : class;
 
-		/// <inheritdoc/>
-		IUpdateResponse<TDocument> Update<TDocument, TPartialDocument>(DocumentPath<TDocument> documentPath, Func<UpdateDescriptor<TDocument, TPartialDocument>, IUpdateRequest<TDocument, TPartialDocument>> selector)
+		/// <inheritdoc />
+		IUpdateResponse<TDocument> Update<TDocument, TPartialDocument>(DocumentPath<TDocument> documentPath,
+			Func<UpdateDescriptor<TDocument, TPartialDocument>, IUpdateRequest<TDocument, TPartialDocument>> selector
+		)
 			where TDocument : class
 			where TPartialDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpdateResponse<TDocument> Update<TDocument, TPartialDocument>(IUpdateRequest<TDocument, TPartialDocument> request)
 			where TDocument : class
 			where TPartialDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IUpdateResponse<TDocument>> UpdateAsync<TDocument>(
 			DocumentPath<TDocument> documentPath,
 			Func<UpdateDescriptor<TDocument, TDocument>, IUpdateRequest<TDocument, TDocument>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		) where TDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IUpdateResponse<TDocument>> UpdateAsync<TDocument>(
 			IUpdateRequest<TDocument, TDocument> request,
 			CancellationToken cancellationToken = default(CancellationToken)
 		) where TDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IUpdateResponse<TDocument>> UpdateAsync<TDocument, TPartialDocument>(
 			DocumentPath<TDocument> documentPath,
 			Func<UpdateDescriptor<TDocument, TPartialDocument>, IUpdateRequest<TDocument, TPartialDocument>> selector,
-			CancellationToken cancellationToken = default(CancellationToken))
-		where TDocument : class
-		where TPartialDocument : class;
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
+			where TDocument : class
+			where TPartialDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IUpdateResponse<TDocument>> UpdateAsync<TDocument, TPartialDocument>(
 			IUpdateRequest<TDocument, TPartialDocument> request,
-			CancellationToken cancellationToken = default(CancellationToken))
-		where TDocument : class
-		where TPartialDocument : class;
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
+			where TDocument : class
+			where TPartialDocument : class;
 	}
 
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IUpdateResponse<TDocument> Update<TDocument>(DocumentPath<TDocument> documentPath, Func<UpdateDescriptor<TDocument, TDocument>, IUpdateRequest<TDocument, TDocument>> selector) where TDocument : class =>
-			this.Update<TDocument, TDocument>(documentPath, selector);
+		/// <inheritdoc />
+		public IUpdateResponse<TDocument> Update<TDocument>(DocumentPath<TDocument> documentPath,
+			Func<UpdateDescriptor<TDocument, TDocument>, IUpdateRequest<TDocument, TDocument>> selector
+		) where TDocument : class =>
+			Update<TDocument, TDocument>(documentPath, selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateResponse<TDocument> Update<TDocument>(IUpdateRequest<TDocument, TDocument> request) where TDocument : class =>
-			this.Update<TDocument, TDocument>(request);
+			Update<TDocument, TDocument>(request);
 
-		/// <inheritdoc/>
-		public IUpdateResponse<TDocument> Update<TDocument, TPartialDocument>(DocumentPath<TDocument> documentPath, Func<UpdateDescriptor<TDocument, TPartialDocument>, IUpdateRequest<TDocument, TPartialDocument>> selector)
+		/// <inheritdoc />
+		public IUpdateResponse<TDocument> Update<TDocument, TPartialDocument>(DocumentPath<TDocument> documentPath,
+			Func<UpdateDescriptor<TDocument, TPartialDocument>, IUpdateRequest<TDocument, TPartialDocument>> selector
+		)
 			where TDocument : class
 			where TPartialDocument : class =>
-			this.Update(selector?.Invoke(new UpdateDescriptor<TDocument, TPartialDocument>(documentPath)));
+			Update(selector?.Invoke(new UpdateDescriptor<TDocument, TPartialDocument>(documentPath)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateResponse<TDocument> Update<TDocument, TPartialDocument>(IUpdateRequest<TDocument, TPartialDocument> request)
 			where TDocument : class
 			where TPartialDocument : class =>
-			this.Dispatcher.Dispatch<IUpdateRequest<TDocument, TPartialDocument>, UpdateRequestParameters, UpdateResponse<TDocument>>(
+			Dispatcher.Dispatch<IUpdateRequest<TDocument, TPartialDocument>, UpdateRequestParameters, UpdateResponse<TDocument>>(
 				request,
-				this.LowLevelDispatch.UpdateDispatch<UpdateResponse<TDocument>, TDocument, TPartialDocument>
+				LowLevelDispatch.UpdateDispatch<UpdateResponse<TDocument>, TDocument, TPartialDocument>
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IUpdateResponse<TDocument>> UpdateAsync<TDocument>(
 			DocumentPath<TDocument> documentPath,
 			Func<UpdateDescriptor<TDocument, TDocument>, IUpdateRequest<TDocument, TDocument>> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) where TDocument : class => this.UpdateAsync<TDocument, TDocument>(documentPath, selector, cancellationToken);
+		) where TDocument : class => UpdateAsync<TDocument, TDocument>(documentPath, selector, cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IUpdateResponse<TDocument>> UpdateAsync<TDocument>(
 			IUpdateRequest<TDocument, TDocument> request,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) where TDocument : class => this.UpdateAsync<TDocument, TDocument>(request, cancellationToken);
+		) where TDocument : class => UpdateAsync<TDocument, TDocument>(request, cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IUpdateResponse<TDocument>> UpdateAsync<TDocument, TPartialDocument>(
 			DocumentPath<TDocument> documentPath,
 			Func<UpdateDescriptor<TDocument, TPartialDocument>, IUpdateRequest<TDocument, TPartialDocument>> selector,
-			CancellationToken cancellationToken = default(CancellationToken))
-		where TDocument : class
-		where TPartialDocument : class =>
-			this.UpdateAsync(selector?.Invoke(new UpdateDescriptor<TDocument, TPartialDocument>(documentPath)), cancellationToken);
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
+			where TDocument : class
+			where TPartialDocument : class =>
+			UpdateAsync(selector?.Invoke(new UpdateDescriptor<TDocument, TPartialDocument>(documentPath)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IUpdateResponse<TDocument>> UpdateAsync<TDocument, TPartialDocument>(
 			IUpdateRequest<TDocument, TPartialDocument> request,
 			CancellationToken cancellationToken = default(CancellationToken)
 		)
-		where TDocument : class
-		where TPartialDocument : class =>
-			this.Dispatcher.DispatchAsync<IUpdateRequest<TDocument, TPartialDocument>, UpdateRequestParameters, UpdateResponse<TDocument>, IUpdateResponse<TDocument>>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.UpdateDispatchAsync<UpdateResponse<TDocument>, TDocument, TPartialDocument>
-			);
+			where TDocument : class
+			where TPartialDocument : class =>
+			Dispatcher
+				.DispatchAsync<IUpdateRequest<TDocument, TPartialDocument>, UpdateRequestParameters, UpdateResponse<TDocument>,
+					IUpdateResponse<TDocument>>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.UpdateDispatchAsync<UpdateResponse<TDocument>, TDocument, TPartialDocument>
+				);
 	}
 }
diff --git a/src/Nest/Document/Single/Update/UpdateRequest.cs b/src/Nest/Document/Single/Update/UpdateRequest.cs
index 66b7a589903..bb4dfcdc9c6 100644
--- a/src/Nest/Document/Single/Update/UpdateRequest.cs
+++ b/src/Nest/Document/Single/Update/UpdateRequest.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
 
@@ -9,16 +8,19 @@ public partial interface IUpdateRequest<TDocument, TPartialDocument>
 		where TDocument : class
 		where TPartialDocument : class
 	{
-		[JsonProperty("script")]
-		IScript Script { get; set; }
+		[JsonProperty("detect_noop")]
+		bool? DetectNoop { get; set; }
 
-		[JsonProperty("upsert")]
+		[JsonProperty("doc")]
 		[JsonConverter(typeof(SourceConverter))]
-		TDocument Upsert { get; set; }
+		TPartialDocument Doc { get; set; }
 
 		[JsonProperty("doc_as_upsert")]
 		bool? DocAsUpsert { get; set; }
 
+		[JsonProperty("script")]
+		IScript Script { get; set; }
+
 		/// <summary>
 		/// If you would like your script to run regardless of whether the document exists or not — i.e. the script handles
 		/// initializing the document instead of the upsert element — then set scripted_upsert to true
@@ -26,67 +28,70 @@ public partial interface IUpdateRequest<TDocument, TPartialDocument>
 		[JsonProperty("scripted_upsert")]
 		bool? ScriptedUpsert { get; set; }
 
-		[JsonProperty("doc")]
-		[JsonConverter(typeof(SourceConverter))]
-		TPartialDocument Doc { get; set; }
-
-		[JsonProperty("detect_noop")]
-		bool? DetectNoop { get; set; }
-
 		[JsonProperty("_source")]
 		Union<bool, ISourceFilter> Source { get; set; }
+
+		[JsonProperty("upsert")]
+		[JsonConverter(typeof(SourceConverter))]
+		TDocument Upsert { get; set; }
 	}
 
 	public partial class UpdateRequest<TDocument, TPartialDocument>
 		where TDocument : class
 		where TPartialDocument : class
 	{
-		/// <inheritdoc/>
-		public IScript Script { get; set; }
-		/// <inheritdoc/>
-		public TDocument Upsert { get; set; }
-		/// <inheritdoc/>
-		public bool? DocAsUpsert { get; set; }
-		/// <inheritdoc/>
-		public TPartialDocument Doc { get; set; }
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? DetectNoop { get; set; }
-		/// <inheritdoc/>
-		public bool? ScriptedUpsert { get; set; }
-		/// <inheritdoc/>
-		public Union<bool, ISourceFilter> Source { get; set; }
 
-		private object AutoRouteDocument() => (object)Self.Upsert ?? Self.Doc;
+		/// <inheritdoc />
+		public TPartialDocument Doc { get; set; }
+
+		/// <inheritdoc />
+		public bool? DocAsUpsert { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		[Obsolete("Removed in Elasticsearch 7.x, use source filtering instead")]
 		public Fields Fields
 		{
 			get => Self.RequestParameters.GetQueryStringValue<Fields>("fields");
 			set => Self.RequestParameters.SetQueryString("fields", value);
 		}
+
+		/// <inheritdoc />
+		public IScript Script { get; set; }
+
+		/// <inheritdoc />
+		public bool? ScriptedUpsert { get; set; }
+
+		/// <inheritdoc />
+		public Union<bool, ISourceFilter> Source { get; set; }
+
+		/// <inheritdoc />
+		public TDocument Upsert { get; set; }
+
+		private object AutoRouteDocument() => (object)Self.Upsert ?? Self.Doc;
 	}
 
 	public partial class UpdateDescriptor<TDocument, TPartialDocument>
 		where TDocument : class
 		where TPartialDocument : class
 	{
-		private object AutoRouteDocument() => (object)Self.Upsert ?? Self.Doc;
-
-		IScript IUpdateRequest<TDocument, TPartialDocument>.Script { get; set; }
+		bool? IUpdateRequest<TDocument, TPartialDocument>.DetectNoop { get; set; }
 
-		TDocument IUpdateRequest<TDocument, TPartialDocument>.Upsert { get; set; }
+		TPartialDocument IUpdateRequest<TDocument, TPartialDocument>.Doc { get; set; }
 
 		bool? IUpdateRequest<TDocument, TPartialDocument>.DocAsUpsert { get; set; }
 
-		TPartialDocument IUpdateRequest<TDocument, TPartialDocument>.Doc { get; set; }
-
-		bool? IUpdateRequest<TDocument, TPartialDocument>.DetectNoop { get; set; }
+		IScript IUpdateRequest<TDocument, TPartialDocument>.Script { get; set; }
 
 		bool? IUpdateRequest<TDocument, TPartialDocument>.ScriptedUpsert { get; set; }
 
 		Union<bool, ISourceFilter> IUpdateRequest<TDocument, TPartialDocument>.Source { get; set; }
 
+		TDocument IUpdateRequest<TDocument, TPartialDocument>.Upsert { get; set; }
+
+		private object AutoRouteDocument() => (object)Self.Upsert ?? Self.Doc;
+
 		/// <summary>
 		/// The full document to be created if an existing document does not exist for a partial merge.
 		/// </summary>
@@ -101,7 +106,8 @@ public partial class UpdateDescriptor<TDocument, TPartialDocument>
 
 		public UpdateDescriptor<TDocument, TPartialDocument> DetectNoop(bool? detectNoop = true) => Assign(a => a.DetectNoop = detectNoop);
 
-		public UpdateDescriptor<TDocument, TPartialDocument> ScriptedUpsert(bool? scriptedUpsert = true) => Assign(a => a.ScriptedUpsert = scriptedUpsert);
+		public UpdateDescriptor<TDocument, TPartialDocument> ScriptedUpsert(bool? scriptedUpsert = true) =>
+			Assign(a => a.ScriptedUpsert = scriptedUpsert);
 
 		public UpdateDescriptor<TDocument, TPartialDocument> Script(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.Script = scriptSelector?.Invoke(new ScriptDescriptor()));
diff --git a/src/Nest/Document/Single/Update/UpdateResponse.cs b/src/Nest/Document/Single/Update/UpdateResponse.cs
index 3d03c5e63d5..679374cfcb3 100644
--- a/src/Nest/Document/Single/Update/UpdateResponse.cs
+++ b/src/Nest/Document/Single/Update/UpdateResponse.cs
@@ -5,38 +5,38 @@ namespace Nest
 	public interface IUpdateResponse<TDocument> : IResponse
 		where TDocument : class
 	{
-		[JsonProperty("_shards")]
-		ShardStatistics ShardsHit { get; }
+		[JsonProperty("get")]
+		InstantGet<TDocument> Get { get; }
+
+		[JsonProperty("_id")]
+		string Id { get; }
 
 		[JsonProperty("_index")]
 		string Index { get; }
 
+		[JsonProperty("result")]
+		Result Result { get; }
+
+		[JsonProperty("_shards")]
+		ShardStatistics ShardsHit { get; }
+
 		[JsonProperty("_type")]
 		string Type { get; }
 
-		[JsonProperty("_id")]
-		string Id { get; }
-
 		[JsonProperty("_version")]
 		long Version { get; }
-
-		[JsonProperty("get")]
-		InstantGet<TDocument> Get { get; }
-
-		[JsonProperty("result")]
-		Result Result { get; }
 	}
 
 	[JsonObject]
 	public class UpdateResponse<TDocument> : ResponseBase, IUpdateResponse<TDocument>
 		where TDocument : class
 	{
-		public ShardStatistics ShardsHit { get; internal set; }
+		public InstantGet<TDocument> Get { get; internal set; }
+		public string Id { get; internal set; }
 		public string Index { get; internal set; }
+		public Result Result { get; internal set; }
+		public ShardStatistics ShardsHit { get; internal set; }
 		public string Type { get; internal set; }
-		public string Id { get; internal set; }
 		public long Version { get; internal set; }
-		public InstantGet<TDocument> Get { get; internal set; }
-		public Result Result { get; internal set; }
 	}
 }
diff --git a/src/Nest/ElasticClient.cs b/src/Nest/ElasticClient.cs
index 052ba4f30a2..64995b47462 100644
--- a/src/Nest/ElasticClient.cs
+++ b/src/Nest/ElasticClient.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -11,21 +11,10 @@ namespace Nest
 	/// </summary>
 	public partial class ElasticClient : IElasticClient, IHighLevelToLowLevelDispatcher
 	{
-		private IHighLevelToLowLevelDispatcher Dispatcher => this;
-
-		private LowLevelDispatch LowLevelDispatch { get; }
-
-		private ITransport<IConnectionSettingsValues> Transport { get; }
-
-		public IElasticsearchSerializer SourceSerializer => this.Transport.Settings.SourceSerializer;
-		public IElasticsearchSerializer RequestResponseSerializer => this.Transport.Settings.RequestResponseSerializer;
-		public Inferrer Infer => this.Transport.Settings.Inferrer;
-		public IConnectionSettingsValues ConnectionSettings => this.Transport.Settings;
-
-		public IElasticLowLevelClient LowLevel { get; }
-
 		public ElasticClient() : this(new ConnectionSettings(new Uri("http://localhost:9200"))) { }
+
 		public ElasticClient(Uri uri) : this(new ConnectionSettings(uri)) { }
+
 		public ElasticClient(IConnectionSettingsValues connectionSettings)
 			: this(new Transport<IConnectionSettingsValues>(connectionSettings ?? new ConnectionSettings())) { }
 
@@ -36,23 +25,36 @@ public ElasticClient(ITransport<IConnectionSettingsValues> transport)
 			transport.Settings.RequestResponseSerializer.ThrowIfNull(nameof(transport.Settings.RequestResponseSerializer));
 			transport.Settings.Inferrer.ThrowIfNull(nameof(transport.Settings.Inferrer));
 
-			this.Transport = transport;
-			this.LowLevel = new ElasticLowLevelClient(this.Transport);
-			this.LowLevelDispatch = new LowLevelDispatch(this.LowLevel);
+			Transport = transport;
+			LowLevel = new ElasticLowLevelClient(Transport);
+			LowLevelDispatch = new LowLevelDispatch(LowLevel);
 		}
 
+		public IConnectionSettingsValues ConnectionSettings => Transport.Settings;
+		public Inferrer Infer => Transport.Settings.Inferrer;
+
+		public IElasticLowLevelClient LowLevel { get; }
+		public IElasticsearchSerializer RequestResponseSerializer => Transport.Settings.RequestResponseSerializer;
+
+		public IElasticsearchSerializer SourceSerializer => Transport.Settings.SourceSerializer;
+		private IHighLevelToLowLevelDispatcher Dispatcher => this;
+
+		private LowLevelDispatch LowLevelDispatch { get; }
+
+		private ITransport<IConnectionSettingsValues> Transport { get; }
+
 		TResponse IHighLevelToLowLevelDispatcher.Dispatch<TRequest, TQueryString, TResponse>(
 			TRequest request,
 			Func<TRequest, SerializableData<TRequest>, TResponse> dispatch
-			) => this.Dispatcher.Dispatch<TRequest,TQueryString,TResponse>(request, null, dispatch);
+		) => Dispatcher.Dispatch<TRequest, TQueryString, TResponse>(request, null, dispatch);
 
 		TResponse IHighLevelToLowLevelDispatcher.Dispatch<TRequest, TQueryString, TResponse>(
 			TRequest request,
 			Func<IApiCallDetails, Stream, TResponse> responseGenerator,
 			Func<TRequest, SerializableData<TRequest>, TResponse> dispatch
-			)
+		)
 		{
-			request.RouteValues.Resolve(this.ConnectionSettings);
+			request.RouteValues.Resolve(ConnectionSettings);
 			request.RequestParameters.DeserializationOverride = responseGenerator;
 
 			var response = dispatch(request, request);
@@ -63,16 +65,16 @@ Task<TResponseInterface> IHighLevelToLowLevelDispatcher.DispatchAsync<TRequest,
 			TRequest descriptor,
 			CancellationToken cancellationToken,
 			Func<TRequest, SerializableData<TRequest>, CancellationToken, Task<TResponse>> dispatch
-			) => this.Dispatcher.DispatchAsync<TRequest,TQueryString,TResponse,TResponseInterface>(descriptor, cancellationToken, null, dispatch);
+		) => Dispatcher.DispatchAsync<TRequest, TQueryString, TResponse, TResponseInterface>(descriptor, cancellationToken, null, dispatch);
 
 		async Task<TResponseInterface> IHighLevelToLowLevelDispatcher.DispatchAsync<TRequest, TQueryString, TResponse, TResponseInterface>(
 			TRequest request,
 			CancellationToken cancellationToken,
 			Func<IApiCallDetails, Stream, TResponse> responseGenerator,
 			Func<TRequest, SerializableData<TRequest>, CancellationToken, Task<TResponse>> dispatch
-			)
+		)
 		{
-			request.RouteValues.Resolve(this.ConnectionSettings);
+			request.RouteValues.Resolve(ConnectionSettings);
 			request.RequestParameters.DeserializationOverride = responseGenerator;
 			var response = await dispatch(request, request, cancellationToken).ConfigureAwait(false);
 			return response;
@@ -87,6 +89,5 @@ private static TRequest ForceConfiguration<TRequest, TParams>(TRequest request,
 			request.RequestParameters.RequestConfiguration = configuration;
 			return request;
 		}
-
 	}
 }
diff --git a/src/Nest/IElasticClient.cs b/src/Nest/IElasticClient.cs
index caab7f2a2cb..d6d919f2389 100644
--- a/src/Nest/IElasticClient.cs
+++ b/src/Nest/IElasticClient.cs
@@ -1,5 +1,4 @@
-using System;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
 
 namespace Nest
 {
@@ -11,26 +10,26 @@ public partial interface IElasticClient
 		IConnectionSettingsValues ConnectionSettings { get; }
 
 		/// <summary>
-		/// Access the configured <see cref="IConnectionSettingsValues.SourceSerializer"/>
-		/// Out of the box <see cref="RequestResponseSerializer"/> and this point to the same instance
+		/// Access to the <see cref="Inferrer" /> that this instance of the client uses to resolve types to e.g
+		/// indices, property, field names
 		/// </summary>
-		IElasticsearchSerializer SourceSerializer { get; }
+		Inferrer Infer { get; }
 
 		/// <summary>
-		/// Access the configured <see cref="IConnectionConfigurationValues.RequestResponseSerializer"/>
-		/// Out of the box <see cref="SourceSerializer"/> and this point to the same instance
+		/// An instance of the low level client that uses the serializers from the highlevel client.
 		/// </summary>
-		IElasticsearchSerializer RequestResponseSerializer { get; }
+		IElasticLowLevelClient LowLevel { get; }
 
 		/// <summary>
-		/// An instance of the low level client that uses the serializers from the highlevel client.
+		/// Access the configured <see cref="IConnectionConfigurationValues.RequestResponseSerializer" />
+		/// Out of the box <see cref="SourceSerializer" /> and this point to the same instance
 		/// </summary>
-		IElasticLowLevelClient LowLevel { get; }
+		IElasticsearchSerializer RequestResponseSerializer { get; }
 
 		/// <summary>
-		/// Access to the <see cref="Inferrer"/> that this instance of the client uses to resolve types to e.g
-		/// indices, property, field names
+		/// Access the configured <see cref="IConnectionSettingsValues.SourceSerializer" />
+		/// Out of the box <see cref="RequestResponseSerializer" /> and this point to the same instance
 		/// </summary>
-		Inferrer Infer { get; }
+		IElasticsearchSerializer SourceSerializer { get; }
 	}
 }
diff --git a/src/Nest/IndexModules/IndexSettings/IndexState.cs b/src/Nest/IndexModules/IndexSettings/IndexState.cs
index 187f9063e8b..fa0274317fa 100644
--- a/src/Nest/IndexModules/IndexSettings/IndexState.cs
+++ b/src/Nest/IndexModules/IndexSettings/IndexState.cs
@@ -5,22 +5,21 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<IndexState>))]
 	public interface IIndexState
 	{
-		[JsonProperty("settings")]
-		IIndexSettings Settings { get; set; }
-
 		[JsonProperty("aliases")]
 		IAliases Aliases { get; set; }
 
 		[JsonProperty("mappings")]
 		IMappings Mappings { get; set; }
+
+		[JsonProperty("settings")]
+		IIndexSettings Settings { get; set; }
 	}
 
 	public class IndexState : IIndexState
 	{
-		public IIndexSettings Settings { get; set; }
+		public IAliases Aliases { get; set; }
 
 		public IMappings Mappings { get; set; }
-
-		public IAliases Aliases { get; set; }
+		public IIndexSettings Settings { get; set; }
 	}
 }
diff --git a/src/Nest/IndexModules/IndexSettings/Merge/MergePolicySettings.cs b/src/Nest/IndexModules/IndexSettings/Merge/MergePolicySettings.cs
index b0e6da240a2..1d34b996c1c 100644
--- a/src/Nest/IndexModules/IndexSettings/Merge/MergePolicySettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Merge/MergePolicySettings.cs
@@ -3,13 +3,13 @@ namespace Nest
 	public interface IMergePolicySettings
 	{
 		/// <summary>
-		/// When expungeDeletes is called, we only merge away a segment if its delete percentage 
-		/// is over this threshold. Default is 10. 
+		/// When expungeDeletes is called, we only merge away a segment if its delete percentage
+		/// is over this threshold. Default is 10.
 		/// </summary>
 		int? ExpungeDeletesAllowed { get; set; }
 
 		/// <summary>
-		/// Segments smaller than this are "rounded up" to this size, i.e. treated as equal (floor) size for merge selection. 
+		/// Segments smaller than this are "rounded up" to this size, i.e. treated as equal (floor) size for merge selection.
 		/// This is to prevent frequent flushing of tiny segments, thus preventing a long tail in the index. Default is 2mb.
 		/// </summary>
 		//TODO map special type for sizes (e.g 5gb, 16mb)
@@ -27,46 +27,52 @@ public interface IMergePolicySettings
 
 		/// <summary>
 		/// Maximum sized segment to produce during normal merging (not explicit optimize).
-		/// This setting is approximate: the estimate of the merged segment size is made by summing 
+		/// This setting is approximate: the estimate of the merged segment size is made by summing
 		/// sizes of to-be-merged segments (compensating for percent deleted docs). Default is 5gb.
 		/// </summary>
 		//TODO map special type for sizes (e.g 5gb, 16mb)
 		string MaxMergedSegment { get; set; }
 
 		/// <summary>
-		/// Sets the allowed number of segments per tier. Smaller values mean more merging but fewer segments. 
-		/// Default is 10. Note, this value needs to be >= than the max_merge_at_once otherwise you�ll force too 
-		/// many merges to occur.
+		/// Controls how aggressively merges that reclaim more deletions are favored. Higher values
+		/// favor selecting merges that reclaim deletions. A value of 0.0 means deletions don’t
+		/// impact merge selection. Defaults to 2.0
 		/// </summary>
-		int? SegmentsPerTier { get; set; }
+		double? ReclaimDeletesWeight { get; set; }
 
 		/// <summary>
-		/// Controls how aggressively merges that reclaim more deletions are favored. Higher values 
-		/// favor selecting merges that reclaim deletions. A value of 0.0 means deletions don�t 
-		/// impact merge selection. Defaults to 2.0
+		/// Sets the allowed number of segments per tier. Smaller values mean more merging but fewer segments.
+		/// Default is 10. Note, this value needs to be >= than the max_merge_at_once otherwise you’ll force too
+		/// many merges to occur.
 		/// </summary>
-		double? ReclaimDeletesWeight { get; set; }
+		int? SegmentsPerTier { get; set; }
 	}
 
 	public class MergePolicySettings : IMergePolicySettings
 	{
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public int? ExpungeDeletesAllowed { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public string FloorSegment { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public int? MaxMergeAtOnce { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public int? MaxMergeAtOnceExplicit { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public string MaxMergedSegment { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public double? ReclaimDeletesWeight { get; set; }
-		///<inheritdoc/>
+
+		/// <inheritdoc />
 		public int? SegmentsPerTier { get; set; }
 	}
 
-	public class MergePolicySettingsDescriptor 
+	public class MergePolicySettingsDescriptor
 		: DescriptorBase<MergePolicySettingsDescriptor, IMergePolicySettings>, IMergePolicySettings
 	{
 		int? IMergePolicySettings.ExpungeDeletesAllowed { get; set; }
@@ -77,33 +83,32 @@ public class MergePolicySettingsDescriptor
 		double? IMergePolicySettings.ReclaimDeletesWeight { get; set; }
 		int? IMergePolicySettings.SegmentsPerTier { get; set; }
 
-		///<inheritdoc/>
-		public MergePolicySettingsDescriptor ExpungeDeletesAllowed(int? allowed) => 
+		/// <inheritdoc />
+		public MergePolicySettingsDescriptor ExpungeDeletesAllowed(int? allowed) =>
 			Assign(a => a.ExpungeDeletesAllowed = allowed);
 
-		///<inheritdoc/>
-		public MergePolicySettingsDescriptor FloorSegment(string floorSegment) => 
+		/// <inheritdoc />
+		public MergePolicySettingsDescriptor FloorSegment(string floorSegment) =>
 			Assign(a => a.FloorSegment = floorSegment);
 
-		///<inheritdoc/>
-		public MergePolicySettingsDescriptor MaxMergeAtOnce(int? maxMergeAtOnce) => 
+		/// <inheritdoc />
+		public MergePolicySettingsDescriptor MaxMergeAtOnce(int? maxMergeAtOnce) =>
 			Assign(a => a.MaxMergeAtOnce = maxMergeAtOnce);
 
-		///<inheritdoc/>
-		public MergePolicySettingsDescriptor MaxMergeAtOnceExplicit(int? maxMergeOnceAtOnceExplicit) => 
+		/// <inheritdoc />
+		public MergePolicySettingsDescriptor MaxMergeAtOnceExplicit(int? maxMergeOnceAtOnceExplicit) =>
 			Assign(a => a.MaxMergeAtOnceExplicit = maxMergeOnceAtOnceExplicit);
 
-		///<inheritdoc/>
-		public MergePolicySettingsDescriptor MaxMergedSegement(string maxMergedSegment) => 
+		/// <inheritdoc />
+		public MergePolicySettingsDescriptor MaxMergedSegement(string maxMergedSegment) =>
 			Assign(a => a.MaxMergedSegment = maxMergedSegment);
 
-		///<inheritdoc/>
-		public MergePolicySettingsDescriptor ReclaimDeletesWeight(double? weight) => 
+		/// <inheritdoc />
+		public MergePolicySettingsDescriptor ReclaimDeletesWeight(double? weight) =>
 			Assign(a => a.ReclaimDeletesWeight = weight);
 
-		///<inheritdoc/>
-		public MergePolicySettingsDescriptor SegmentsPerTier(int? segmentsPerTier) => 
+		/// <inheritdoc />
+		public MergePolicySettingsDescriptor SegmentsPerTier(int? segmentsPerTier) =>
 			Assign(a => a.SegmentsPerTier = segmentsPerTier);
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/Merge/MergeSchedulerSettings.cs b/src/Nest/IndexModules/IndexSettings/Merge/MergeSchedulerSettings.cs
index 0eb3a0892b8..df7854b6978 100644
--- a/src/Nest/IndexModules/IndexSettings/Merge/MergeSchedulerSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Merge/MergeSchedulerSettings.cs
@@ -3,45 +3,44 @@ namespace Nest
 	public interface IMergeSchedulerSettings
 	{
 		/// <summary>
-		/// The maximum number of threads that may be merging at once. Defaults to 
-		/// <pre>Math.max(1, Math.min(4, Runtime.getRuntime().availableProcessors() / 2))</pre>
-		/// which works well for a good solid-state-disk (SSD). If your index is on spinning platter drives instead,
-		/// decrease this to 1. 
+		/// If this is true (the default), then the merge scheduler will rate-limit IO (writes) for merges to an
+		/// adaptive value depending on how many merges are requested over time. An application with a low indexing rate
+		/// that unluckily suddenly requires a large merge will see that merge aggressively throttled,
+		/// while an application doing heavy indexing will see the throttle move higher to allow merges to keep
+		/// up with ongoing indexing.
 		/// </summary>
-		int? MaxThreadCount { get; set; }
+		bool? AutoThrottle { get; set; }
 
 		/// <summary>
-		/// If this is true (the default), then the merge scheduler will rate-limit IO (writes) for merges to an 
-		/// adaptive value depending on how many merges are requested over time. An application with a low indexing rate 
-		/// that unluckily suddenly requires a large merge will see that merge aggressively throttled, 
-		/// while an application doing heavy indexing will see the throttle move higher to allow merges to keep 
-		/// up with ongoing indexing.
+		/// The maximum number of threads that may be merging at once. Defaults to
+		/// <pre>Math.max(1, Math.min(4, Runtime.getRuntime().availableProcessors() / 2))</pre>
+		/// which works well for a good solid-state-disk (SSD). If your index is on spinning platter drives instead,
+		/// decrease this to 1.
 		/// </summary>
-		bool? AutoThrottle { get; set; }
+		int? MaxThreadCount { get; set; }
 	}
 
 	public class MergeSchedulerSettings : IMergeSchedulerSettings
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? AutoThrottle { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public int? MaxThreadCount { get; set; }
 	}
 
-	public class MergeSchedulerSettingsDescriptor 
+	public class MergeSchedulerSettingsDescriptor
 		: DescriptorBase<MergeSchedulerSettingsDescriptor, IMergeSchedulerSettings>, IMergeSchedulerSettings
 	{
 		bool? IMergeSchedulerSettings.AutoThrottle { get; set; }
 		int? IMergeSchedulerSettings.MaxThreadCount { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public MergeSchedulerSettingsDescriptor AutoThrottle(bool? throttle = true) =>
 			Assign(a => a.AutoThrottle = throttle);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public MergeSchedulerSettingsDescriptor MaxThreadCount(int? maxThreadCount) =>
 			Assign(a => a.MaxThreadCount = maxThreadCount);
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/Merge/MergeSettings.cs b/src/Nest/IndexModules/IndexSettings/Merge/MergeSettings.cs
index cdff3bec4e2..00b7780ea1c 100644
--- a/src/Nest/IndexModules/IndexSettings/Merge/MergeSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Merge/MergeSettings.cs
@@ -10,26 +10,25 @@ public interface IMergeSettings
 
 	public class MergeSettings : IMergeSettings
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IMergePolicySettings Policy { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IMergeSchedulerSettings Scheduler { get; set; }
 	}
 
-	public class MergeSettingsDescriptor 
+	public class MergeSettingsDescriptor
 		: DescriptorBase<MergeSettingsDescriptor, IMergeSettings>, IMergeSettings
 	{
 		IMergePolicySettings IMergeSettings.Policy { get; set; }
 		IMergeSchedulerSettings IMergeSettings.Scheduler { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public MergeSettingsDescriptor Policy(Func<MergePolicySettingsDescriptor, IMergePolicySettings> selector) =>
 			Assign(a => a.Policy = selector?.Invoke(new MergePolicySettingsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public MergeSettingsDescriptor Scheduler(Func<MergeSchedulerSettingsDescriptor, IMergeSchedulerSettings> selector) =>
 			Assign(a => a.Scheduler = selector?.Invoke(new MergeSchedulerSettingsDescriptor()));
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/Queries/IQueriesCacheSettings.cs b/src/Nest/IndexModules/IndexSettings/Queries/IQueriesCacheSettings.cs
index e4a43fb75df..8811cb718c8 100644
--- a/src/Nest/IndexModules/IndexSettings/Queries/IQueriesCacheSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Queries/IQueriesCacheSettings.cs
@@ -17,7 +17,7 @@ public class QueriesCacheSettingsDescriptor : DescriptorBase<QueriesCacheSetting
 	{
 		bool? IQueriesCacheSettings.Enabled { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public QueriesCacheSettingsDescriptor Enabled(bool? enabled = true) =>
 			Assign(a => a.Enabled = enabled);
 	}
diff --git a/src/Nest/IndexModules/IndexSettings/Queries/IQueriesSettings.cs b/src/Nest/IndexModules/IndexSettings/Queries/IQueriesSettings.cs
index c6b16ef6378..3cdf0038e06 100644
--- a/src/Nest/IndexModules/IndexSettings/Queries/IQueriesSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Queries/IQueriesSettings.cs
@@ -16,7 +16,7 @@ public class QueriesSettingsDescriptor : DescriptorBase<QueriesSettingsDescripto
 	{
 		IQueriesCacheSettings IQueriesSettings.Cache { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public QueriesSettingsDescriptor Cache(Func<QueriesCacheSettingsDescriptor, IQueriesCacheSettings> selector) =>
 			Assign(a => a.Cache = selector.Invoke(new QueriesCacheSettingsDescriptor()));
 	}
diff --git a/src/Nest/IndexModules/IndexSettings/Settings/AutoExpandReplicas.cs b/src/Nest/IndexModules/IndexSettings/Settings/AutoExpandReplicas.cs
index 583db449d36..80c89e34096 100644
--- a/src/Nest/IndexModules/IndexSettings/Settings/AutoExpandReplicas.cs
+++ b/src/Nest/IndexModules/IndexSettings/Settings/AutoExpandReplicas.cs
@@ -10,43 +10,43 @@ public class AutoExpandReplicas
 		private Union<int?, string> _maxReplicas;
 		private int? _minReplicas;
 
+		public static AutoExpandReplicas Disabled { get; } = new AutoExpandReplicas();
+
 		/// <summary>
 		/// Whether auto expand replicas is enabled
 		/// </summary>
 		public bool Enabled { get; private set; }
 
 		/// <summary>
-		/// The lower bound of replicas
+		/// The upper bound of replicas. Can be an integer value or a string value of "all"
 		/// </summary>
-		public int? MinReplicas
+		public Union<int?, string> MaxReplicas
 		{
-			get { return _minReplicas; }
+			get => _maxReplicas;
 			private set
 			{
-				if (value == null && _maxReplicas == null) Enabled = false;
+				if (value == null && _minReplicas == null) Enabled = false;
 				else Enabled = true;
-				_minReplicas = value;
+				_maxReplicas = value;
 			}
 		}
 
 		/// <summary>
-		/// The upper bound of replicas. Can be an integer value or a string value of "all"
+		/// The lower bound of replicas
 		/// </summary>
-		public Union<int?, string> MaxReplicas
+		public int? MinReplicas
 		{
-			get { return _maxReplicas; }
+			get => _minReplicas;
 			private set
 			{
-				if (value == null && _minReplicas == null) Enabled = false;
+				if (value == null && _maxReplicas == null) Enabled = false;
 				else Enabled = true;
-				_maxReplicas = value;
+				_minReplicas = value;
 			}
 		}
 
-		public static AutoExpandReplicas Disabled { get; } = new AutoExpandReplicas();
-
 		/// <summary>
-		/// Creates an <see cref="AutoExpandReplicas"/> with the specified lower and upper bounds of replicas
+		/// Creates an <see cref="AutoExpandReplicas" /> with the specified lower and upper bounds of replicas
 		/// </summary>
 		public static AutoExpandReplicas Create(int minReplicas, int maxReplicas)
 		{
@@ -68,7 +68,7 @@ public static AutoExpandReplicas Create(int minReplicas, int maxReplicas)
 		}
 
 		/// <summary>
-		/// Creates an <see cref="AutoExpandReplicas"/> with the specified lower bound of replicas and an
+		/// Creates an <see cref="AutoExpandReplicas" /> with the specified lower bound of replicas and an
 		/// "all" upper bound of replicas
 		/// </summary>
 		public static AutoExpandReplicas Create(int minReplicas)
@@ -85,7 +85,7 @@ public static AutoExpandReplicas Create(int minReplicas)
 		}
 
 		/// <summary>
-		/// Creates an <see cref="AutoExpandReplicas"/> with the specified lower and upper bounds of replicas
+		/// Creates an <see cref="AutoExpandReplicas" /> with the specified lower and upper bounds of replicas
 		/// </summary>
 		/// <example>0-5</example>
 		/// <example>0-all</example>
@@ -95,10 +95,7 @@ public static AutoExpandReplicas Create(string value)
 				throw new ArgumentException("cannot be null or empty", nameof(value));
 
 			var expandReplicaParts = value.Split('-');
-			if (expandReplicaParts.Length != 2)
-			{
-				throw new ArgumentException("must contain a 'from' and 'to' value", nameof(value));
-			}
+			if (expandReplicaParts.Length != 2) throw new ArgumentException("must contain a 'from' and 'to' value", nameof(value));
 
 			int minReplicas;
 			if (!int.TryParse(expandReplicaParts[0], out minReplicas))
@@ -125,6 +122,7 @@ public static implicit operator AutoExpandReplicas(string value) =>
 		public override string ToString()
 		{
 			if (!Enabled) return "false";
+
 			var maxReplicas = MaxReplicas.Match(i => i.ToString(), s => s);
 			return string.Join("-", MinReplicas, maxReplicas);
 		}
diff --git a/src/Nest/IndexModules/IndexSettings/Settings/DynamicIndexSettings.cs b/src/Nest/IndexModules/IndexSettings/Settings/DynamicIndexSettings.cs
index 0a783ddfa3c..6ad930b8b1b 100644
--- a/src/Nest/IndexModules/IndexSettings/Settings/DynamicIndexSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Settings/DynamicIndexSettings.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -12,31 +10,30 @@ namespace Nest
 	public interface IDynamicIndexSettings : IIsADictionary<string, object>
 	{
 		/// <summary>
-		///The number of replicas each primary shard has. Defaults to 1.
+		/// Configure analysis
 		/// </summary>
-		int? NumberOfReplicas { get; set; }
+		IAnalysis Analysis { get; set; }
 
 		/// <summary>
-		///Auto-expand the number of replicas based on the number of available nodes.
-		/// Set to a dash delimited lower and upper bound (e.g. 0-5) or use all for the upper bound (e.g. 0-all). Defaults to false (i.e. disabled).
+		/// Auto-expand the number of replicas based on the number of available nodes.
+		///  Set to a dash delimited lower and upper bound (e.g. 0-5) or use all for the upper bound (e.g. 0-all). Defaults to false (i.e. disabled).
 		/// </summary>
 		AutoExpandReplicas AutoExpandReplicas { get; set; }
 
 		/// <summary>
-		/// How often to perform a refresh operation, which makes recent changes to the index visible to search.
-		/// Defaults to 1s. Can be set to -1 to disable refresh.
+		/// Set to true to disable index metadata reads and writes.
 		/// </summary>
-		Time RefreshInterval { get; set; }
+		bool? BlocksMetadata { get; set; }
 
 		/// <summary>
-		/// Set to true to make the index and index metadata read only, false to allow writes and metadata changes.
+		/// Set to true to disable read operations against the index.
 		/// </summary>
-		bool? BlocksReadOnly { get; set; }
+		bool? BlocksRead { get; set; }
 
 		/// <summary>
-		/// Set to true to disable read operations against the index.
+		/// Set to true to make the index and index metadata read only, false to allow writes and metadata changes.
 		/// </summary>
-		bool? BlocksRead { get; set; }
+		bool? BlocksReadOnly { get; set; }
 
 		/// <summary>
 		/// Set to true to disable write operations against the index.
@@ -44,9 +41,14 @@ public interface IDynamicIndexSettings : IIsADictionary<string, object>
 		bool? BlocksWrite { get; set; }
 
 		/// <summary>
-		/// Set to true to disable index metadata reads and writes.
+		/// All of the settings exposed in the merge module are expert only and may be obsoleted in the future at any time!
 		/// </summary>
-		bool? BlocksMetadata { get; set; }
+		IMergeSettings Merge { get; set; }
+
+		/// <summary>
+		/// The number of replicas each primary shard has. Defaults to 1.
+		/// </summary>
+		int? NumberOfReplicas { get; set; }
 
 		/// <summary>
 		/// Unallocated shards are recovered in order of priority when set
@@ -60,15 +62,15 @@ public interface IDynamicIndexSettings : IIsADictionary<string, object>
 		Union<int, RecoveryInitialShards> RecoveryInitialShards { get; set; }
 
 		/// <summary>
-		/// Enables the shard-level request cache. Not enabled by default.
+		/// How often to perform a refresh operation, which makes recent changes to the index visible to search.
+		/// Defaults to 1s. Can be set to -1 to disable refresh.
 		/// </summary>
-		bool? RequestsCacheEnabled { get; set; }
+		Time RefreshInterval { get; set; }
 
 		/// <summary>
-		/// The allocation of replica shards which become unassigned because a node has left can be
-		/// delayed with this dynamic setting, which defaults to 1m.
+		/// Enables the shard-level request cache. Not enabled by default.
 		/// </summary>
-		Time UnassignedNodeLeftDelayedTimeout { get; set; }
+		bool? RequestsCacheEnabled { get; set; }
 
 		/// <summary>
 		/// The maximum number of shards (replicas and primaries) that will be allocated to a single node. Defaults to unbounded.
@@ -76,9 +78,9 @@ public interface IDynamicIndexSettings : IIsADictionary<string, object>
 		int? RoutingAllocationTotalShardsPerNode { get; set; }
 
 		/// <summary>
-		/// All of the settings exposed in the merge module are expert only and may be obsoleted in the future at any time!
+		/// Configure similarity
 		/// </summary>
-		IMergeSettings Merge { get; set; }
+		ISimilarities Similarity { get; set; }
 
 		/// <summary>
 		/// Configure logging thresholds and levels in elasticsearch for search/fetch and indexing
@@ -91,169 +93,165 @@ public interface IDynamicIndexSettings : IIsADictionary<string, object>
 		ITranslogSettings Translog { get; set; }
 
 		/// <summary>
-		/// Configure analysis
-		/// </summary>
-		IAnalysis Analysis { get; set; }
-
-		/// <summary>
-		/// Configure similarity
+		/// The allocation of replica shards which become unassigned because a node has left can be
+		/// delayed with this dynamic setting, which defaults to 1m.
 		/// </summary>
-		ISimilarities Similarity { get; set; }
+		Time UnassignedNodeLeftDelayedTimeout { get; set; }
 	}
 
 	/// <inheritdoc />
 	public class DynamicIndexSettings : IsADictionaryBase<string, object>, IDynamicIndexSettings
 	{
 		private Time _refreshInterval;
+
 		public DynamicIndexSettings() { }
 
 		public DynamicIndexSettings(IDictionary<string, object> container) : base(container) { }
 
-		/// <inheritdoc/>
-		public int? NumberOfReplicas { get; set; }
+		/// <inheritdoc />
+		public IAnalysis Analysis { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public AutoExpandReplicas AutoExpandReplicas { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? BlocksMetadata { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? BlocksRead { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? BlocksReadOnly { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? BlocksWrite { get; set; }
 
-		/// <inheritdoc/>
-		public int? Priority { get; set; }
+		/// <inheritdoc />
+		public IMergeSettings Merge { get; set; }
 
-		/// <inheritdoc/>
-		public bool? RequestsCacheEnabled { get; set; }
+		/// <inheritdoc />
+		public int? NumberOfReplicas { get; set; }
 
-		/// <inheritdoc/>
-		public IMergeSettings Merge { get; set; }
+		/// <inheritdoc />
+		public int? Priority { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Union<int, RecoveryInitialShards> RecoveryInitialShards { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Time RefreshInterval
 		{
 			get => _refreshInterval;
 			set
 			{
-				this.BackingDictionary[UpdatableIndexSettings.RefreshInterval] = value;
+				BackingDictionary[UpdatableIndexSettings.RefreshInterval] = value;
 				_refreshInterval = value;
 			}
 		}
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public bool? RequestsCacheEnabled { get; set; }
+
+		/// <inheritdoc />
 		public int? RoutingAllocationTotalShardsPerNode { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public ISimilarities Similarity { get; set; }
+
+		/// <inheritdoc />
 		public ISlowLog SlowLog { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ITranslogSettings Translog { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Time UnassignedNodeLeftDelayedTimeout { get; set; }
 
-		/// <inheritdoc/>
-		public IAnalysis Analysis { get; set; }
-
-		/// <inheritdoc/>
-		public ISimilarities Similarity { get; set; }
-
 		/// <summary>
 		/// Add any setting to the index
 		/// </summary>
-		public void Add(string setting, object value) => this.BackingDictionary[setting] = value;
-
+		public void Add(string setting, object value) => BackingDictionary[setting] = value;
 	}
 
-	/// <inheritdoc cref="DynamicIndexSettings"/>
-	public class DynamicIndexSettingsDescriptor :
-		DynamicIndexSettingsDescriptorBase<DynamicIndexSettingsDescriptor, DynamicIndexSettings>
+	/// <inheritdoc cref="DynamicIndexSettings" />
+	public class DynamicIndexSettingsDescriptor : DynamicIndexSettingsDescriptorBase<DynamicIndexSettingsDescriptor, DynamicIndexSettings>
 	{
 		public DynamicIndexSettingsDescriptor() : base(new DynamicIndexSettings()) { }
 	}
 
 	/// <summary>Base descriptor implementation for dynamic index settings</summary>
-	public abstract class DynamicIndexSettingsDescriptorBase<TDescriptor, TIndexSettings> : IsADictionaryDescriptorBase<TDescriptor, TIndexSettings, string, object>
+	public abstract class DynamicIndexSettingsDescriptorBase<TDescriptor, TIndexSettings>
+		: IsADictionaryDescriptorBase<TDescriptor, TIndexSettings, string, object>
 		where TDescriptor : DynamicIndexSettingsDescriptorBase<TDescriptor, TIndexSettings>
 		where TIndexSettings : class, IDynamicIndexSettings
 	{
 		protected DynamicIndexSettingsDescriptorBase(TIndexSettings instance) : base(instance) { }
 
-		/// <inheritdoc cref="DynamicIndexSettings.Add"/>
+		/// <inheritdoc cref="DynamicIndexSettings.Add" />
 		public TDescriptor Setting(string setting, object value)
 		{
-			this.PromisedValue[setting] = value;
+			PromisedValue[setting] = value;
 			return (TDescriptor)this;
 		}
 
-		/// <inheritdoc cref="DynamicIndexSettings.NumberOfReplicas"/>
+		/// <inheritdoc cref="DynamicIndexSettings.NumberOfReplicas" />
 		public TDescriptor NumberOfReplicas(int? numberOfReplicas) => Assign(a => a.NumberOfReplicas = numberOfReplicas);
 
-		/// <inheritdoc cref="DynamicIndexSettings.AutoExpandReplicas"/>
+		/// <inheritdoc cref="DynamicIndexSettings.AutoExpandReplicas" />
 		public TDescriptor AutoExpandReplicas(AutoExpandReplicas autoExpandReplicas) => Assign(a => a.AutoExpandReplicas = autoExpandReplicas);
 
-		/// <inheritdoc cref="DynamicIndexSettings.BlocksMetadata"/>
+		/// <inheritdoc cref="DynamicIndexSettings.BlocksMetadata" />
 		public TDescriptor BlocksMetadata(bool? blocksMetadata = true) => Assign(a => a.BlocksMetadata = blocksMetadata);
 
-		/// <inheritdoc cref="DynamicIndexSettings.BlocksRead"/>
+		/// <inheritdoc cref="DynamicIndexSettings.BlocksRead" />
 		public TDescriptor BlocksRead(bool? blocksRead = true) => Assign(a => a.BlocksRead = blocksRead);
 
-		/// <inheritdoc cref="DynamicIndexSettings.BlocksReadOnly"/>
+		/// <inheritdoc cref="DynamicIndexSettings.BlocksReadOnly" />
 		public TDescriptor BlocksReadOnly(bool? blocksReadOnly = true) => Assign(a => a.BlocksReadOnly = blocksReadOnly);
 
-		/// <inheritdoc cref="DynamicIndexSettings.BlocksWrite"/>
+		/// <inheritdoc cref="DynamicIndexSettings.BlocksWrite" />
 		public TDescriptor BlocksWrite(bool? blocksWrite = true) => Assign(a => a.BlocksWrite = blocksWrite);
 
-		/// <inheritdoc cref="DynamicIndexSettings.Priority"/>
+		/// <inheritdoc cref="DynamicIndexSettings.Priority" />
 		public TDescriptor Priority(int? priority) => Assign(a => a.Priority = priority);
 
-		/// <inheritdoc cref="DynamicIndexSettings.Merge"/>
+		/// <inheritdoc cref="DynamicIndexSettings.Merge" />
 		public TDescriptor Merge(Func<MergeSettingsDescriptor, IMergeSettings> merge) =>
 			Assign(a => a.Merge = merge?.Invoke(new MergeSettingsDescriptor()));
 
-		/// <inheritdoc cref="DynamicIndexSettings.RecoveryInitialShards"/>
+		/// <inheritdoc cref="DynamicIndexSettings.RecoveryInitialShards" />
 		public TDescriptor RecoveryInitialShards(Union<int, RecoveryInitialShards> initialShards) =>
 			Assign(a => a.RecoveryInitialShards = initialShards);
 
-		/// <inheritdoc cref="DynamicIndexSettings.RequestsCacheEnabled"/>
+		/// <inheritdoc cref="DynamicIndexSettings.RequestsCacheEnabled" />
 		public TDescriptor RequestsCacheEnabled(bool? enable = true) =>
 			Assign(a => a.RequestsCacheEnabled = enable);
 
-		/// <inheritdoc cref="DynamicIndexSettings.RefreshInterval"/>
+		/// <inheritdoc cref="DynamicIndexSettings.RefreshInterval" />
 		public TDescriptor RefreshInterval(Time time) => Assign(a => a.RefreshInterval = time);
 
 		// TODO: align name for 7.x
-		/// <inheritdoc cref="DynamicIndexSettings.RoutingAllocationTotalShardsPerNode"/>
+		/// <inheritdoc cref="DynamicIndexSettings.RoutingAllocationTotalShardsPerNode" />
 		public TDescriptor TotalShardsPerNode(int? totalShardsPerNode) =>
 			Assign(a => a.RoutingAllocationTotalShardsPerNode = totalShardsPerNode);
 
-		/// <inheritdoc cref="DynamicIndexSettings.SlowLog"/>
+		/// <inheritdoc cref="DynamicIndexSettings.SlowLog" />
 		public TDescriptor SlowLog(Func<SlowLogDescriptor, ISlowLog> slowLogSelector) =>
 			Assign(a => a.SlowLog = slowLogSelector?.Invoke(new SlowLogDescriptor()));
 
-		/// <inheritdoc cref="DynamicIndexSettings.Translog"/>
+		/// <inheritdoc cref="DynamicIndexSettings.Translog" />
 		public TDescriptor Translog(Func<TranslogSettingsDescriptor, ITranslogSettings> translogSelector) =>
 			Assign(a => a.Translog = translogSelector?.Invoke(new TranslogSettingsDescriptor()));
 
-		/// <inheritdoc cref="DynamicIndexSettings.UnassignedNodeLeftDelayedTimeout"/>
+		/// <inheritdoc cref="DynamicIndexSettings.UnassignedNodeLeftDelayedTimeout" />
 		public TDescriptor UnassignedNodeLeftDelayedTimeout(Time time) =>
 			Assign(a => a.UnassignedNodeLeftDelayedTimeout = time);
 
-		/// <inheritdoc cref="DynamicIndexSettings.Analysis"/>
+		/// <inheritdoc cref="DynamicIndexSettings.Analysis" />
 		public TDescriptor Analysis(Func<AnalysisDescriptor, IAnalysis> selector) =>
 			Assign(a => a.Analysis = selector?.Invoke(new AnalysisDescriptor()));
 
-		/// <inheritdoc cref="DynamicIndexSettings.Similarity"/>
+		/// <inheritdoc cref="DynamicIndexSettings.Similarity" />
 		public TDescriptor Similarity(Func<SimilaritiesDescriptor, IPromise<ISimilarities>> selector) =>
 			Assign(a => a.Similarity = selector?.Invoke(new SimilaritiesDescriptor())?.Value);
 	}
diff --git a/src/Nest/IndexModules/IndexSettings/Settings/FixedIndexSettings.cs b/src/Nest/IndexModules/IndexSettings/Settings/FixedIndexSettings.cs
index 631d4b8c941..854f4ce7b68 100644
--- a/src/Nest/IndexModules/IndexSettings/Settings/FixedIndexSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Settings/FixedIndexSettings.cs
@@ -6,8 +6,8 @@ namespace Nest
 	/// </summary>
 	public static class FixedIndexSettings
 	{
-		public const string NumberOfShards = "index.number_of_shards";
 		public const string NumberOfRoutingShards = "index.number_of_routing_shards";
+		public const string NumberOfShards = "index.number_of_shards";
 		public const string RoutingPartitionSize = "index.routing_partition_size";
 	}
 }
diff --git a/src/Nest/IndexModules/IndexSettings/Settings/IndexSettings.cs b/src/Nest/IndexModules/IndexSettings/Settings/IndexSettings.cs
index e074d9c89ba..f79783cc22d 100644
--- a/src/Nest/IndexModules/IndexSettings/Settings/IndexSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Settings/IndexSettings.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Nest
 {
@@ -11,34 +10,34 @@ namespace Nest
 	public interface IIndexSettings : IDynamicIndexSettings
 	{
 		/// <summary>
-		/// The number of primary shards that an index should have. Defaults to 5.
-		/// This setting can only be set at index creation time. It cannot be changed on a closed index.
+		/// The store module allows you to control how index data is stored and accessed on disk.
+		/// <para>EXPERT MODE toggle</para>
 		/// </summary>
-		int? NumberOfShards { get; set; }
+		FileSystemStorageImplementation? FileSystemStorageImplementation { get; set; }
 
 
 		/// <summary>
 		/// The number of routing shards. Used in conjunction with the Split Index API. If specified, must be
-		/// greater than or equal to <see cref="NumberOfShards"/>
+		/// greater than or equal to <see cref="NumberOfShards" />
 		/// </summary>
 		int? NumberOfRoutingShards { get; set; }
 
 		/// <summary>
-		/// By defaulting, routing resolves to a single shard. Use this settings to have it resolve to a set of shards instead.
-		/// This mitigates creating hotspots and very large shards if you have a few routing keys generating the significant data.
+		/// The number of primary shards that an index should have. Defaults to 5.
+		/// This setting can only be set at index creation time. It cannot be changed on a closed index.
 		/// </summary>
-		int? RoutingPartitionSize { get; set; }
+		int? NumberOfShards { get; set; }
 
 		/// <summary>
-		/// The store module allows you to control how index data is stored and accessed on disk.
-		/// <para>EXPERT MODE toggle</para>
+		/// Settings associated with queries.
 		/// </summary>
-		FileSystemStorageImplementation? FileSystemStorageImplementation { get; set; }
+		IQueriesSettings Queries { get; set; }
 
 		/// <summary>
-		/// Settings associated with queries.
+		/// By defaulting, routing resolves to a single shard. Use this settings to have it resolve to a set of shards instead.
+		/// This mitigates creating hotspots and very large shards if you have a few routing keys generating the significant data.
 		/// </summary>
-		IQueriesSettings Queries { get; set; }
+		int? RoutingPartitionSize { get; set; }
 
 		/// <summary>
 		///  Settings associated with index sorting.
@@ -47,57 +46,58 @@ public interface IIndexSettings : IDynamicIndexSettings
 		ISortingSettings Sorting { get; set; }
 	}
 
-	/// <inheritdoc cref="IIndexSettings"/>
-	public class IndexSettings: DynamicIndexSettings, IIndexSettings
+	/// <inheritdoc cref="IIndexSettings" />
+	public class IndexSettings : DynamicIndexSettings, IIndexSettings
 	{
 		public IndexSettings() { }
+
 		public IndexSettings(IDictionary<string, object> container) : base(container) { }
 
 		/// <inheritdoc />
-		public int? NumberOfShards { get; set; }
+		public FileSystemStorageImplementation? FileSystemStorageImplementation { get; set; }
 
 		/// <inheritdoc />
 		public int? NumberOfRoutingShards { get; set; }
 
 		/// <inheritdoc />
-		public int? RoutingPartitionSize { get; set; }
+		public int? NumberOfShards { get; set; }
 
 		/// <inheritdoc />
-		public FileSystemStorageImplementation? FileSystemStorageImplementation { get; set; }
+		public IQueriesSettings Queries { get; set; }
 
 		/// <inheritdoc />
-		public IQueriesSettings Queries { get; set; }
+		public int? RoutingPartitionSize { get; set; }
 
 		/// <inheritdoc />
 		public ISortingSettings Sorting { get; set; }
 	}
 
-	/// <inheritdoc cref="IIndexSettings"/>
-	public class IndexSettingsDescriptor: DynamicIndexSettingsDescriptorBase<IndexSettingsDescriptor, IndexSettings>
+	/// <inheritdoc cref="IIndexSettings" />
+	public class IndexSettingsDescriptor : DynamicIndexSettingsDescriptorBase<IndexSettingsDescriptor, IndexSettings>
 	{
 		public IndexSettingsDescriptor() : base(new IndexSettings()) { }
 
-		/// <inheritdoc cref="IIndexSettings.NumberOfShards"/>
+		/// <inheritdoc cref="IIndexSettings.NumberOfShards" />
 		public IndexSettingsDescriptor NumberOfShards(int? numberOfShards) =>
 			Assign(a => a.NumberOfShards = numberOfShards);
 
-		/// <inheritdoc cref="IIndexSettings.NumberOfRoutingShards"/>
+		/// <inheritdoc cref="IIndexSettings.NumberOfRoutingShards" />
 		public IndexSettingsDescriptor NumberOfRoutingShards(int? numberOfRoutingShards) =>
 			Assign(a => a.NumberOfRoutingShards = numberOfRoutingShards);
 
-		/// <inheritdoc cref="IIndexSettings.RoutingPartitionSize"/>
+		/// <inheritdoc cref="IIndexSettings.RoutingPartitionSize" />
 		public IndexSettingsDescriptor RoutingPartitionSize(int? routingPartitionSize) =>
 			Assign(a => a.RoutingPartitionSize = routingPartitionSize);
 
-		/// <inheritdoc cref="IIndexSettings.FileSystemStorageImplementation"/>
+		/// <inheritdoc cref="IIndexSettings.FileSystemStorageImplementation" />
 		public IndexSettingsDescriptor FileSystemStorageImplementation(FileSystemStorageImplementation? fs) =>
 			Assign(a => a.FileSystemStorageImplementation = fs);
 
-		/// <inheritdoc cref="IIndexSettings.Queries"/>
+		/// <inheritdoc cref="IIndexSettings.Queries" />
 		public IndexSettingsDescriptor Queries(Func<QueriesSettingsDescriptor, IQueriesSettings> selector) =>
 			Assign(a => a.Queries = selector?.Invoke(new QueriesSettingsDescriptor()));
 
-		/// <inheritdoc cref="IIndexSettings.Sorting"/>
+		/// <inheritdoc cref="IIndexSettings.Sorting" />
 		public IndexSettingsDescriptor Sorting<T>(Func<SortingSettingsDescriptor<T>, ISortingSettings> selector) where T : class =>
 			Assign(a => a.Sorting = selector?.Invoke(new SortingSettingsDescriptor<T>()));
 	}
diff --git a/src/Nest/IndexModules/IndexSettings/Settings/IndexSettingsConverter.cs b/src/Nest/IndexModules/IndexSettings/Settings/IndexSettingsConverter.cs
index c32f7a884e2..95cab5137fc 100644
--- a/src/Nest/IndexModules/IndexSettings/Settings/IndexSettingsConverter.cs
+++ b/src/Nest/IndexModules/IndexSettings/Settings/IndexSettingsConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
@@ -14,6 +13,7 @@ internal class IndexSettingsConverter : VerbatimDictionaryKeysJsonConverter<stri
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		protected override bool SkipValue(JsonSerializer serializer, KeyValuePair<string, object> entry) =>
@@ -24,7 +24,8 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var ds = value as IDynamicIndexSettings ?? (value as IUpdateIndexSettingsRequest)?.IndexSettings;
 
 			if (ds == null) return;
-			IDictionary<string,object> d = ds;
+
+			IDictionary<string, object> d = ds;
 
 			void Set(string knownKey, object newValue)
 			{
@@ -90,11 +91,11 @@ void Set(string knownKey, object newValue)
 
 			var indexSettings = value as IIndexSettings;
 
-            Set(StoreType, indexSettings?.FileSystemStorageImplementation);
-            Set(QueriesCacheEnabled, indexSettings?.Queries?.Cache?.Enabled);
+			Set(StoreType, indexSettings?.FileSystemStorageImplementation);
+			Set(QueriesCacheEnabled, indexSettings?.Queries?.Cache?.Enabled);
 			Set(NumberOfShards, indexSettings?.NumberOfShards);
 			Set(NumberOfRoutingShards, indexSettings?.NumberOfRoutingShards);
-            Set(RoutingPartitionSize, indexSettings?.RoutingPartitionSize);
+			Set(RoutingPartitionSize, indexSettings?.RoutingPartitionSize);
 
 			if (indexSettings?.Sorting != null)
 			{
@@ -111,9 +112,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		{
 			var s = new IndexSettings();
 			SetKnownIndexSettings(reader, serializer, s);
-			if (!typeof (IUpdateIndexSettingsRequest).IsAssignableFrom(objectType)) return s;
+			if (!typeof(IUpdateIndexSettingsRequest).IsAssignableFrom(objectType)) return s;
 
-			var request = new UpdateIndexSettingsRequest() { IndexSettings =  s};
+			var request = new UpdateIndexSettingsRequest() { IndexSettings = s };
 			return request;
 		}
 
@@ -134,8 +135,8 @@ private static JObject Flatten(JObject original, string prefix = "", JObject new
 			foreach (var property in original.Properties())
 			{
 				if (property.Value is JObject &&
-				    property.Name != UpdatableIndexSettings.Analysis &&
-				    property.Name != Similarity)
+					property.Name != UpdatableIndexSettings.Analysis &&
+					property.Name != Similarity)
 					Flatten(property.Value.Value<JObject>(), prefix + property.Name + ".", newObject);
 				else newObject.Add(prefix + property.Name, property.Value);
 			}
@@ -220,16 +221,16 @@ private static void SetKnownIndexSettings(JsonReader reader, JsonSerializer seri
 			Set<FileSystemStorageImplementation?>(s, settings, StoreType, v => s.FileSystemStorageImplementation = v, serializer);
 
 			var sorting = s.Sorting = new SortingSettings();
-			SetArray<string[], string>(s, settings, IndexSortSettings.Fields, v => sorting.Fields = v, v => sorting.Fields = new [] { v });
-			SetArray<IndexSortOrder[], IndexSortOrder>(s, settings, Order, v => sorting.Order = v, v => sorting.Order = new [] { v });
-			SetArray<IndexSortMode[], IndexSortMode>(s, settings, Mode, v => sorting.Mode = v, v => sorting.Mode = new [] { v });
-			SetArray<IndexSortMissing[], IndexSortMissing>(s, settings, Missing, v => sorting.Missing = v, v => sorting.Missing = new [] { v });
+			SetArray<string[], string>(s, settings, IndexSortSettings.Fields, v => sorting.Fields = v, v => sorting.Fields = new[] { v });
+			SetArray<IndexSortOrder[], IndexSortOrder>(s, settings, Order, v => sorting.Order = v, v => sorting.Order = new[] { v });
+			SetArray<IndexSortMode[], IndexSortMode>(s, settings, Mode, v => sorting.Mode = v, v => sorting.Mode = new[] { v });
+			SetArray<IndexSortMissing[], IndexSortMissing>(s, settings, Missing, v => sorting.Missing = v, v => sorting.Missing = new[] { v });
 
 			var queries = s.Queries = new QueriesSettings();
 			var queriesCache = s.Queries.Cache = new QueriesCacheSettings();
 			Set<bool?>(s, settings, QueriesCacheEnabled, v => queriesCache.Enabled = v);
 
-			IDictionary<string,object> dict = s;
+			IDictionary<string, object> dict = s;
 			foreach (var kv in settings)
 			{
 				var setting = kv.Value;
@@ -238,15 +239,16 @@ private static void SetKnownIndexSettings(JsonReader reader, JsonSerializer seri
 				if (kv.Key == Similarity || kv.Key == "index.similarity")
 					s.Similarity = setting.Value.Value<JObject>().ToObject<Similarities>(serializer);
 				else
-				{
 					dict?.Add(kv.Key, serializer.Deserialize(kv.Value.Value.CreateReader()));
-				}
 			}
 		}
 
-		private static void Set<T>(IIndexSettings s, IDictionary<string, JProperty> settings, string key, Action<T> assign, JsonSerializer serializer = null)
+		private static void Set<T>(IIndexSettings s, IDictionary<string, JProperty> settings, string key, Action<T> assign,
+			JsonSerializer serializer = null
+		)
 		{
 			if (!settings.ContainsKey(key)) return;
+
 			var v = settings[key];
 			var value = serializer == null ? v.Value.ToObject<T>() : v.Value.ToObject<T>(serializer);
 			assign(value);
@@ -254,9 +256,12 @@ private static void Set<T>(IIndexSettings s, IDictionary<string, JProperty> sett
 			settings.Remove(key);
 		}
 
-		private static void SetArray<TArray, TItem>(IIndexSettings s, IDictionary<string, JProperty> settings, string key, Action<TArray> assign, Action<TItem> assign2, JsonSerializer serializer = null)
+		private static void SetArray<TArray, TItem>(IIndexSettings s, IDictionary<string, JProperty> settings, string key, Action<TArray> assign,
+			Action<TItem> assign2, JsonSerializer serializer = null
+		)
 		{
 			if (!settings.ContainsKey(key)) return;
+
 			var v = settings[key];
 			if (v.Value is JArray)
 			{
diff --git a/src/Nest/IndexModules/IndexSettings/Settings/RecoveryInitialShards.cs b/src/Nest/IndexModules/IndexSettings/Settings/RecoveryInitialShards.cs
index 2086652e7f1..3d8ec354b50 100644
--- a/src/Nest/IndexModules/IndexSettings/Settings/RecoveryInitialShards.cs
+++ b/src/Nest/IndexModules/IndexSettings/Settings/RecoveryInitialShards.cs
@@ -9,11 +9,14 @@ public enum RecoveryInitialShards
 	{
 		[EnumMember(Value = "quorem")]
 		Quorem,
+
 		[EnumMember(Value = "quorem-1")]
 		QuoremMinusOne,
+
 		[EnumMember(Value = "full")]
 		Full,
+
 		[EnumMember(Value = "full-1")]
 		FullMinusOne
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/Settings/UpdatableIndexSettings.cs b/src/Nest/IndexModules/IndexSettings/Settings/UpdatableIndexSettings.cs
index 1eeaa504bc5..5bb968f70cd 100644
--- a/src/Nest/IndexModules/IndexSettings/Settings/UpdatableIndexSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Settings/UpdatableIndexSettings.cs
@@ -5,74 +5,74 @@ namespace Nest
 	/// </summary>
 	public static class UpdatableIndexSettings
 	{
-		public const string NumberOfReplicas = "index.number_of_replicas";
+		public const string Analysis = "analysis";
 		public const string AutoExpandReplicas = "index.auto_expand_replicas";
-		public const string RefreshInterval = "index.refresh_interval";
-		public const string BlocksReadOnly = "index.blocks.read_only";
+		public const string BlocksMetadata = "index.blocks.metadata";
 		public const string BlocksRead = "index.blocks.read";
+		public const string BlocksReadOnly = "index.blocks.read_only";
 		public const string BlocksWrite = "index.blocks.write";
-		public const string BlocksMetadata = "index.blocks.metadata";
-		public const string Priority = "index.priority";
-
-		public const string TranslogFlushThresholdSize = "index.translog.flush_threshold_size";
-		public const string TranslogFlushThresholdPeriod = "index.translog.flush_threshold_period";
-		public const string TranslogDurability = "index.translog.durability";
-		public const string TranslogSyncInterval = "index.translog.sync_interval";
-
-		public const string RequestsCacheEnable = "index.requests.cache.enable";
-
-		public const string RoutingAllocationInclude = "index.routing.allocation.include";
-		public const string RoutingAllocationExclude = "index.routing.allocation.exclude";
-		public const string RoutingAllocationRequire = "index.routing.allocation.require";
-		public const string RoutingAllocationEnable = "index.routing.allocation.enable";
-		public const string RoutingAllocationDisableAllication = "index.routing.allocation.disable_allocation";
-		public const string RoutingAllocationDisableNewAllocation = "index.routing.allocation.disable_new_allocation";
-		public const string RoutingAllocationDisableReplicaAllocation = "index.routing.allocation.disable_replica_allocation";
-		public const string RoutingAllocationTotalShardsPerNode = "index.routing.allocation.total_shards_per_node";
-
-		public const string RecoveryInitialShards = "index.recovery.initial_shards";
-
-		public const string UnassignedNodeLeftDelayedTimeout = "index.unassigned.node_left.delayed_timeout";
 
 		public const string CompoundFormat = "index.compound_format";
 		public const string CompoundOnFlush = "index.compound_on_flush";
-		public const string Analysis = "analysis";
 
 		public const string MergePolicyExpungeDeletesAllowed = "index.merge.policy.expunge_deletes_allowed";
 		public const string MergePolicyFloorSegment = "index.merge.policy.floor_segment";
 		public const string MergePolicyMaxMergeAtOnce = "index.merge.policy.max_merge_at_once";
 		public const string MergePolicyMaxMergeAtOnceExplicit = "index.merge.policy.max_merge_at_once_explicit";
 		public const string MergePolicyMaxMergedSegment = "index.merge.policy.max_merged_segment";
-		public const string MergePolicySegmentsPerTier = "index.merge.policy.segments_per_tier";
 		public const string MergePolicyReclaimDeletesWeight = "index.merge.policy.reclaim_deletes_weight";
+		public const string MergePolicySegmentsPerTier = "index.merge.policy.segments_per_tier";
+		public const string MergeSchedulerAutoThrottle = "index.merge.scheduler.auto_throttle";
 
 		public const string MergeSchedulerMaxThreadCount = "index.merge.scheduler.max_thread_count";
-		public const string MergeSchedulerAutoThrottle = "index.merge.scheduler.auto_throttle";
+		public const string NumberOfReplicas = "index.number_of_replicas";
+		public const string Priority = "index.priority";
 
-		public const string Similarity = "similarity";
+		public const string QueriesCacheEnabled = "index.queries.cache.enabled";
 
-		public const string SlowlogSearchThresholdQueryWarn = "index.search.slowlog.threshold.query.warn";
-		public const string SlowlogSearchThresholdQueryInfo = "index.search.slowlog.threshold.query.info";
-		public const string SlowlogSearchThresholdQueryDebug = "index.search.slowlog.threshold.query.debug";
-		public const string SlowlogSearchThresholdQueryTrace = "index.search.slowlog.threshold.query.trace";
+		public const string RecoveryInitialShards = "index.recovery.initial_shards";
+		public const string RefreshInterval = "index.refresh_interval";
 
-		public const string SlowlogSearchThresholdFetchWarn = "index.search.slowlog.threshold.fetch.warn";
-		public const string SlowlogSearchThresholdFetchInfo = "index.search.slowlog.threshold.fetch.info";
-		public const string SlowlogSearchThresholdFetchDebug = "index.search.slowlog.threshold.fetch.debug";
-		public const string SlowlogSearchThresholdFetchTrace = "index.search.slowlog.threshold.fetch.trace";
+		public const string RequestsCacheEnable = "index.requests.cache.enable";
+		public const string RoutingAllocationDisableAllication = "index.routing.allocation.disable_allocation";
+		public const string RoutingAllocationDisableNewAllocation = "index.routing.allocation.disable_new_allocation";
+		public const string RoutingAllocationDisableReplicaAllocation = "index.routing.allocation.disable_replica_allocation";
+		public const string RoutingAllocationEnable = "index.routing.allocation.enable";
+		public const string RoutingAllocationExclude = "index.routing.allocation.exclude";
 
-		public const string SlowlogSearchLevel = "index.search.slowlog.level";
+		public const string RoutingAllocationInclude = "index.routing.allocation.include";
+		public const string RoutingAllocationRequire = "index.routing.allocation.require";
+		public const string RoutingAllocationTotalShardsPerNode = "index.routing.allocation.total_shards_per_node";
 
-		public const string SlowlogIndexingThresholdFetchWarn = "index.indexing.slowlog.threshold.index.warn";
-		public const string SlowlogIndexingThresholdFetchInfo = "index.indexing.slowlog.threshold.index.info";
-		public const string SlowlogIndexingThresholdFetchDebug = "index.indexing.slowlog.threshold.index.debug";
-		public const string SlowlogIndexingThresholdFetchTrace = "index.indexing.slowlog.threshold.index.trace";
+		public const string Similarity = "similarity";
 
 		public const string SlowlogIndexingLevel = "index.indexing.slowlog.level";
 		public const string SlowlogIndexingSource = "index.indexing.slowlog.source";
+		public const string SlowlogIndexingThresholdFetchDebug = "index.indexing.slowlog.threshold.index.debug";
+		public const string SlowlogIndexingThresholdFetchInfo = "index.indexing.slowlog.threshold.index.info";
+		public const string SlowlogIndexingThresholdFetchTrace = "index.indexing.slowlog.threshold.index.trace";
+
+		public const string SlowlogIndexingThresholdFetchWarn = "index.indexing.slowlog.threshold.index.warn";
+
+		public const string SlowlogSearchLevel = "index.search.slowlog.level";
+		public const string SlowlogSearchThresholdFetchDebug = "index.search.slowlog.threshold.fetch.debug";
+		public const string SlowlogSearchThresholdFetchInfo = "index.search.slowlog.threshold.fetch.info";
+		public const string SlowlogSearchThresholdFetchTrace = "index.search.slowlog.threshold.fetch.trace";
+
+		public const string SlowlogSearchThresholdFetchWarn = "index.search.slowlog.threshold.fetch.warn";
+		public const string SlowlogSearchThresholdQueryDebug = "index.search.slowlog.threshold.query.debug";
+		public const string SlowlogSearchThresholdQueryInfo = "index.search.slowlog.threshold.query.info";
+		public const string SlowlogSearchThresholdQueryTrace = "index.search.slowlog.threshold.query.trace";
+
+		public const string SlowlogSearchThresholdQueryWarn = "index.search.slowlog.threshold.query.warn";
 
 		public const string StoreType = "index.store.type";
+		public const string TranslogDurability = "index.translog.durability";
+		public const string TranslogFlushThresholdPeriod = "index.translog.flush_threshold_period";
 
-		public const string QueriesCacheEnabled = "index.queries.cache.enabled";
+		public const string TranslogFlushThresholdSize = "index.translog.flush_threshold_size";
+		public const string TranslogSyncInterval = "index.translog.sync_interval";
+
+		public const string UnassignedNodeLeftDelayedTimeout = "index.unassigned.node_left.delayed_timeout";
 	}
 }
diff --git a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLog.cs b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLog.cs
index 8b592dd0af5..7e16de43855 100644
--- a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLog.cs
+++ b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLog.cs
@@ -4,16 +4,16 @@ namespace Nest
 {
 	public interface ISlowLog
 	{
-		ISlowLogSearch Search { get; set; }
 		ISlowLogIndexing Indexing { get; set; }
+		ISlowLogSearch Search { get; set; }
 	}
 
 	public class SlowLog : ISlowLog
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISlowLogIndexing Indexing { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISlowLogSearch Search { get; set; }
 	}
 
@@ -22,12 +22,12 @@ public class SlowLogDescriptor : DescriptorBase<SlowLogDescriptor, ISlowLog>, IS
 		ISlowLogIndexing ISlowLog.Indexing { get; set; }
 		ISlowLogSearch ISlowLog.Search { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogDescriptor Search(Func<SlowLogSearchDescriptor, ISlowLogSearch> selector) =>
 			Assign(a => a.Search = selector?.Invoke(new SlowLogSearchDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogDescriptor Indexing(Func<SlowLogIndexingDescriptor, ISlowLogIndexing> selector) =>
 			Assign(a => a.Indexing = selector?.Invoke(new SlowLogIndexingDescriptor()));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogIndexing.cs b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogIndexing.cs
index 9753b8241fc..d0eb812a2aa 100644
--- a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogIndexing.cs
+++ b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogIndexing.cs
@@ -2,13 +2,14 @@ namespace Nest
 {
 	public interface ISlowLogIndexing
 	{
-		Time ThresholdWarn { get; set; }
-		Time ThresholdInfo { get; set; }
-		Time ThresholdDebug { get; set; }
-		Time ThresholdTrace { get; set; }
 		LogLevel? LogLevel { get; set; }
 		int? Source { get; set; }
+		Time ThresholdDebug { get; set; }
+		Time ThresholdInfo { get; set; }
+		Time ThresholdTrace { get; set; }
+		Time ThresholdWarn { get; set; }
 	}
+
 	public class SlowLogIndexing : ISlowLogIndexing
 	{
 		public LogLevel? LogLevel { get; set; }
@@ -33,24 +34,22 @@ public class SlowLogIndexingDescriptor : DescriptorBase<SlowLogIndexingDescripto
 		Time ISlowLogIndexing.ThresholdTrace { get; set; }
 		Time ISlowLogIndexing.ThresholdWarn { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogIndexingDescriptor LogLevel(LogLevel? level) => Assign(a => a.LogLevel = level);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogIndexingDescriptor Source(int? source) => Assign(a => a.Source = source);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogIndexingDescriptor ThresholdDebug(Time time) => Assign(a => a.ThresholdDebug = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogIndexingDescriptor ThresholdInfo(Time time) => Assign(a => a.ThresholdInfo = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogIndexingDescriptor ThresholdTrace(Time time) => Assign(a => a.ThresholdTrace = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogIndexingDescriptor ThresholdWarn(Time time) => Assign(a => a.ThresholdWarn = time);
-
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearch.cs b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearch.cs
index beef02755d0..f777a9a701e 100644
--- a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearch.cs
+++ b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearch.cs
@@ -4,35 +4,35 @@ namespace Nest
 {
 	public interface ISlowLogSearch
 	{
-		ISlowLogSearchQuery Query { get; set; }
 		ISlowLogSearchFetch Fetch { get; set; }
 		LogLevel? LogLevel { get; set; }
+		ISlowLogSearchQuery Query { get; set; }
 	}
 
 	public class SlowLogSearch : ISlowLogSearch
 	{
-	 	public ISlowLogSearchFetch Fetch { get; set; }
+		public ISlowLogSearchFetch Fetch { get; set; }
 
 		public LogLevel? LogLevel { get; set; }
 
 		public ISlowLogSearchQuery Query { get; set; }
 	}
 
-	public class SlowLogSearchDescriptor: DescriptorBase<SlowLogSearchDescriptor, ISlowLogSearch>, ISlowLogSearch
+	public class SlowLogSearchDescriptor : DescriptorBase<SlowLogSearchDescriptor, ISlowLogSearch>, ISlowLogSearch
 	{
-		ISlowLogSearchQuery ISlowLogSearch.Query { get; set; }
 		ISlowLogSearchFetch ISlowLogSearch.Fetch { get; set; }
 		LogLevel? ISlowLogSearch.LogLevel { get; set; }
+		ISlowLogSearchQuery ISlowLogSearch.Query { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchDescriptor LogLevel(LogLevel? level) => Assign(a => a.LogLevel = level);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchDescriptor Query(Func<SlowLogSearchQueryDescriptor, ISlowLogSearchQuery> selector) =>
 			Assign(a => a.Query = selector?.Invoke(new SlowLogSearchQueryDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchDescriptor Fetch(Func<SlowLogSearchFetchDescriptor, ISlowLogSearchFetch> selector) =>
 			Assign(a => a.Fetch = selector?.Invoke(new SlowLogSearchFetchDescriptor()));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearchFetch.cs b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearchFetch.cs
index 7529e78c420..6a574bed5e2 100644
--- a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearchFetch.cs
+++ b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearchFetch.cs
@@ -2,10 +2,10 @@ namespace Nest
 {
 	public interface ISlowLogSearchFetch
 	{
-		Time ThresholdWarn { get; set; }
-		Time ThresholdInfo { get; set; }
 		Time ThresholdDebug { get; set; }
+		Time ThresholdInfo { get; set; }
 		Time ThresholdTrace { get; set; }
+		Time ThresholdWarn { get; set; }
 	}
 
 	public class SlowLogSearchFetch : ISlowLogSearchFetch
@@ -16,25 +16,23 @@ public class SlowLogSearchFetch : ISlowLogSearchFetch
 		public Time ThresholdWarn { get; set; }
 	}
 
-	public class SlowLogSearchFetchDescriptor: DescriptorBase<SlowLogSearchFetchDescriptor, ISlowLogSearchFetch>, ISlowLogSearchFetch
+	public class SlowLogSearchFetchDescriptor : DescriptorBase<SlowLogSearchFetchDescriptor, ISlowLogSearchFetch>, ISlowLogSearchFetch
 	{
 		Time ISlowLogSearchFetch.ThresholdDebug { get; set; }
 		Time ISlowLogSearchFetch.ThresholdInfo { get; set; }
 		Time ISlowLogSearchFetch.ThresholdTrace { get; set; }
 		Time ISlowLogSearchFetch.ThresholdWarn { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchFetchDescriptor ThresholdDebug(Time time) => Assign(a => a.ThresholdDebug = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchFetchDescriptor ThresholdInfo(Time time) => Assign(a => a.ThresholdInfo = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchFetchDescriptor ThresholdTrace(Time time) => Assign(a => a.ThresholdTrace = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchFetchDescriptor ThresholdWarn(Time time) => Assign(a => a.ThresholdWarn = time);
-
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearchQuery.cs b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearchQuery.cs
index 877ca70f474..8af9d794aa8 100644
--- a/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearchQuery.cs
+++ b/src/Nest/IndexModules/IndexSettings/SlowLog/ISlowLogSearchQuery.cs
@@ -2,14 +2,17 @@ namespace Nest
 {
 	public interface ISlowLogSearchQuery
 	{
-		//index.search.slowlog.threshold.query.warn: 10s
-		Time ThresholdWarn { get; set; }
-		//index.search.slowlog.threshold.query.info: 5s
-		Time ThresholdInfo { get; set; }
 		//index.search.slowlog.threshold.query.debug: 2s
 		Time ThresholdDebug { get; set; }
+
+		//index.search.slowlog.threshold.query.info: 5s
+		Time ThresholdInfo { get; set; }
+
 		//index.search.slowlog.threshold.query.trace: 500ms
 		Time ThresholdTrace { get; set; }
+
+		//index.search.slowlog.threshold.query.warn: 10s
+		Time ThresholdWarn { get; set; }
 	}
 
 	public class SlowLogSearchQuery : ISlowLogSearchQuery
@@ -20,25 +23,23 @@ public class SlowLogSearchQuery : ISlowLogSearchQuery
 		public Time ThresholdWarn { get; set; }
 	}
 
-	public class SlowLogSearchQueryDescriptor: DescriptorBase<SlowLogSearchQueryDescriptor, ISlowLogSearchQuery>, ISlowLogSearchQuery
+	public class SlowLogSearchQueryDescriptor : DescriptorBase<SlowLogSearchQueryDescriptor, ISlowLogSearchQuery>, ISlowLogSearchQuery
 	{
 		Time ISlowLogSearchQuery.ThresholdDebug { get; set; }
 		Time ISlowLogSearchQuery.ThresholdInfo { get; set; }
 		Time ISlowLogSearchQuery.ThresholdTrace { get; set; }
 		Time ISlowLogSearchQuery.ThresholdWarn { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchQueryDescriptor ThresholdDebug(Time time) => Assign(a => a.ThresholdDebug = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchQueryDescriptor ThresholdInfo(Time time) => Assign(a => a.ThresholdInfo = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchQueryDescriptor ThresholdTrace(Time time) => Assign(a => a.ThresholdTrace = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public SlowLogSearchQueryDescriptor ThresholdWarn(Time time) => Assign(a => a.ThresholdWarn = time);
-
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/SlowLog/LogLevel.cs b/src/Nest/IndexModules/IndexSettings/SlowLog/LogLevel.cs
index 3d42d28dcdc..26d4bd88cb5 100644
--- a/src/Nest/IndexModules/IndexSettings/SlowLog/LogLevel.cs
+++ b/src/Nest/IndexModules/IndexSettings/SlowLog/LogLevel.cs
@@ -9,12 +9,16 @@ public enum LogLevel
 	{
 		[EnumMember(Value = "error")]
 		Error,
+
 		[EnumMember(Value = "warn")]
 		Warn,
+
 		[EnumMember(Value = "info")]
 		Info,
+
 		[EnumMember(Value = "debug")]
 		Debug,
+
 		[EnumMember(Value = "trace")]
 		Trace
 	}
diff --git a/src/Nest/IndexModules/IndexSettings/Sorting/ISortingSettings.cs b/src/Nest/IndexModules/IndexSettings/Sorting/ISortingSettings.cs
index 95a887a9556..1cdb12a3fcb 100644
--- a/src/Nest/IndexModules/IndexSettings/Sorting/ISortingSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Sorting/ISortingSettings.cs
@@ -8,9 +8,9 @@ namespace Nest
 	public static class IndexSortSettings
 	{
 		public const string Fields = "index.sort.field";
-		public const string Order = "index.sort.order";
-		public const string Mode = "index.sort.mode";
 		public const string Missing = "index.sort.missing";
+		public const string Mode = "index.sort.mode";
+		public const string Order = "index.sort.order";
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
@@ -18,6 +18,7 @@ public enum IndexSortMode
 	{
 		[EnumMember(Value = "min")]
 		Minimum,
+
 		[EnumMember(Value = "max")]
 		Maximum
 	}
@@ -27,6 +28,7 @@ public enum IndexSortMissing
 	{
 		[EnumMember(Value = "_first")]
 		First,
+
 		[EnumMember(Value = "_last")]
 		Last
 	}
@@ -36,6 +38,7 @@ public enum IndexSortOrder
 	{
 		[EnumMember(Value = "asc")]
 		Ascending,
+
 		[EnumMember(Value = "desc")]
 		Descending
 	}
@@ -48,9 +51,11 @@ public interface ISortingSettings
 		Fields Fields { get; set; }
 
 		/// <summary>
-		/// The sort order to use for each field. The order option can have the following values: <see cref="IndexSortOrder.Ascending"/> and <see cref="IndexSortOrder.Descending"/>.
+		/// The missing parameter specifies how docs which are missing the field should be treated. The missing value can have the following values:
+		/// <see cref="IndexSortMissing.Last" />: Documents without value for the field are sorted last.
+		/// <see cref="IndexSortMissing.First" />: Documents without value for the field are sorted first.
 		/// </summary>
-		IndexSortOrder[] Order { get; set; }
+		IndexSortMissing[] Missing { get; set; }
 
 		/// <summary>
 		/// The mode option controls what value, from a multi-value field, is picked to sort the document.
@@ -61,36 +66,36 @@ public interface ISortingSettings
 		IndexSortMode[] Mode { get; set; }
 
 		/// <summary>
-		/// The missing parameter specifies how docs which are missing the field should be treated. The missing value can have the following values:
-		/// <see cref="IndexSortMissing.Last"/>: Documents without value for the field are sorted last.
-		/// <see cref="IndexSortMissing.First"/>: Documents without value for the field are sorted first.
+		/// The sort order to use for each field. The order option can have the following values: <see cref="IndexSortOrder.Ascending" /> and
+		/// <see cref="IndexSortOrder.Descending" />.
 		/// </summary>
-		IndexSortMissing[] Missing { get; set; }
+		IndexSortOrder[] Order { get; set; }
 	}
 
 	public class SortingSettings : ISortingSettings
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Fields Fields { get; set; }
 
-		/// <inheritdoc/>
-		public IndexSortOrder[] Order { get; set; }
+		/// <inheritdoc />
+		public IndexSortMissing[] Missing { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IndexSortMode[] Mode { get; set; }
 
-		/// <inheritdoc/>
-		public IndexSortMissing[] Missing { get; set; }
+		/// <inheritdoc />
+		public IndexSortOrder[] Order { get; set; }
 	}
 
 	public class SortingSettingsDescriptor<T> : DescriptorBase<SortingSettingsDescriptor<T>, ISortingSettings>, ISortingSettings where T : class
 	{
 		Fields ISortingSettings.Fields { get; set; }
-		IndexSortOrder[] ISortingSettings.Order { get; set; }
-		IndexSortMode[] ISortingSettings.Mode { get; set; }
 		IndexSortMissing[] ISortingSettings.Missing { get; set; }
+		IndexSortMode[] ISortingSettings.Mode { get; set; }
+		IndexSortOrder[] ISortingSettings.Order { get; set; }
 
-		public SortingSettingsDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) => Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
+		public SortingSettingsDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
+			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
 		public SortingSettingsDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
 
diff --git a/src/Nest/IndexModules/IndexSettings/Store/FileSystemStorageImplementation.cs b/src/Nest/IndexModules/IndexSettings/Store/FileSystemStorageImplementation.cs
index 78209e2da06..d5299b06e99 100644
--- a/src/Nest/IndexModules/IndexSettings/Store/FileSystemStorageImplementation.cs
+++ b/src/Nest/IndexModules/IndexSettings/Store/FileSystemStorageImplementation.cs
@@ -11,37 +11,37 @@ namespace Nest
 	public enum FileSystemStorageImplementation
 	{
 		/// <summary>
-		///The Simple FS type is a straightforward implementation of file system storage (maps to 
-		/// Lucene SimpleFsDirectory) using a random access file. This implementation has poor 
-		/// concurrent performance (multiple threads will bottleneck). It is usually better to use
-		///  the niofs when you need index persistence. 
+		/// The Simple FS type is a straightforward implementation of file system storage (maps to
+		///  Lucene SimpleFsDirectory) using a random access file. This implementation has poor
+		///  concurrent performance (multiple threads will bottleneck). It is usually better to use
+		///   the niofs when you need index persistence.
 		/// </summary>
 		[EnumMember(Value = "simplefs")]
 		Simple,
 
 		/// <summary>
 		/// The NIO FS type stores the shard index on the file system (maps to Lucene NIOFSDirectory)
-		/// using NIO. It allows multiple threads to read from the same file concurrently. It is not 
+		/// using NIO. It allows multiple threads to read from the same file concurrently. It is not
 		/// recommended on Windows because of a bug in the SUN Java implementation./
 		/// </summary>
 		[EnumMember(Value = "niofs")]
 		NIO,
 
 		/// <summary>
-		///The MMap FS type stores the shard index on the file system (maps to Lucene MMapDirectory) 
-		/// by mapping a file into memory (mmap). Memory mapping uses up a portion of the virtual memory
-		///  address space in your process equal to the size of the file being mapped. Before using this class,
-		///  be sure you have allowed plenty of virtual address space.
+		/// The MMap FS type stores the shard index on the file system (maps to Lucene MMapDirectory)
+		///  by mapping a file into memory (mmap). Memory mapping uses up a portion of the virtual memory
+		///   address space in your process equal to the size of the file being mapped. Before using this class,
+		///   be sure you have allowed plenty of virtual address space.
 		/// </summary>
 		[EnumMember(Value = "mmapfs")]
 		MMap,
 
 		/// <summary>
 		/// The default type is a hybrid of NIO FS and MMapFS, which chooses the best file system for each
-		/// type of file. Currently only the Lucene term dictionary and doc values files are memory mapped to 
+		/// type of file. Currently only the Lucene term dictionary and doc values files are memory mapped to
 		/// reduce the impact on the operating system. All other files are opened using Lucene NIOFSDirectory.
 		/// </summary>
 		[EnumMember(Value = "default_fs")]
 		Default,
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/Translog/TranslogDurability.cs b/src/Nest/IndexModules/IndexSettings/Translog/TranslogDurability.cs
index 062f236ac5f..27831f3f9ac 100644
--- a/src/Nest/IndexModules/IndexSettings/Translog/TranslogDurability.cs
+++ b/src/Nest/IndexModules/IndexSettings/Translog/TranslogDurability.cs
@@ -9,7 +9,8 @@ public enum TranslogDurability
 	{
 		[EnumMember(Value = "request")]
 		Request,
+
 		[EnumMember(Value = "async")]
 		Async
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/IndexSettings/Translog/TranslogFlushSettings.cs b/src/Nest/IndexModules/IndexSettings/Translog/TranslogFlushSettings.cs
index 83d4a5f53c3..a3c1943c91f 100644
--- a/src/Nest/IndexModules/IndexSettings/Translog/TranslogFlushSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Translog/TranslogFlushSettings.cs
@@ -3,9 +3,10 @@ namespace Nest
 	public interface ITranslogFlushSettings
 	{
 		/// <summary>
-		/// Once the translog hits this size, a flush will happen. Defaults to 512mb.
+		/// How often to check if a flush is needed, randomized between
+		/// the interval value and 2x the interval value. Defaults to 5s.
 		/// </summary>
-		string ThresholdSize { get; set; }
+		Time Interval { get; set; }
 
 		/// <summary>
 		/// How long to wait before triggering a flush regardless of translog size. Defaults to 30m.
@@ -13,36 +14,37 @@ public interface ITranslogFlushSettings
 		Time ThresholdPeriod { get; set; }
 
 		/// <summary>
-		/// How often to check if a flush is needed, randomized between
-		/// the interval value and 2x the interval value. Defaults to 5s.
+		/// Once the translog hits this size, a flush will happen. Defaults to 512mb.
 		/// </summary>
-		Time Interval { get; set; }
+		string ThresholdSize { get; set; }
 	}
 
 	public class TranslogFlushSettings : ITranslogFlushSettings
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Time Interval { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public Time ThresholdPeriod { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public string ThresholdSize { get; set; }
 	}
 
-	public class TranslogFlushSettingsDescriptor: DescriptorBase<TranslogFlushSettingsDescriptor, ITranslogFlushSettings>, ITranslogFlushSettings
+	public class TranslogFlushSettingsDescriptor : DescriptorBase<TranslogFlushSettingsDescriptor, ITranslogFlushSettings>, ITranslogFlushSettings
 	{
 		Time ITranslogFlushSettings.Interval { get; set; }
 		Time ITranslogFlushSettings.ThresholdPeriod { get; set; }
 		string ITranslogFlushSettings.ThresholdSize { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TranslogFlushSettingsDescriptor ThresholdSize(string size) => Assign(a => a.ThresholdSize = size);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TranslogFlushSettingsDescriptor ThresholdPeriod(Time time) =>
 			Assign(a => a.ThresholdPeriod = time);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TranslogFlushSettingsDescriptor Interval(Time time) => Assign(a => a.Interval = time);
 	}
 }
diff --git a/src/Nest/IndexModules/IndexSettings/Translog/TranslogSettings.cs b/src/Nest/IndexModules/IndexSettings/Translog/TranslogSettings.cs
index 2c90a79faec..228decadd77 100644
--- a/src/Nest/IndexModules/IndexSettings/Translog/TranslogSettings.cs
+++ b/src/Nest/IndexModules/IndexSettings/Translog/TranslogSettings.cs
@@ -4,6 +4,11 @@ namespace Nest
 {
 	public interface ITranslogSettings
 	{
+		/// <summary>
+		/// Whether or not to fsync and commit the translog after every index, delete, update, or bulk request
+		/// </summary>
+		TranslogDurability? Durability { get; set; }
+
 		/// <summary>
 		/// Dynamically updatable flush settings
 		/// </summary>
@@ -13,38 +18,35 @@ public interface ITranslogSettings
 		/// How often the translog is fsynced to disk and committed, regardless of write operations. Defaults to 5s.
 		/// </summary>
 		Time SyncInterval { get; set; }
-
-		/// <summary>
-		/// Whether or not to fsync and commit the translog after every index, delete, update, or bulk request
-		/// </summary>
-		TranslogDurability? Durability { get; set; }
 	}
 
 	public class TranslogSettings : ITranslogSettings
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public TranslogDurability? Durability { get; set; }
+
+		/// <inheritdoc />
 		public ITranslogFlushSettings Flush { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public Time SyncInterval { get; set; }
-		/// <inheritdoc/>
-		public TranslogDurability? Durability { get; set; }
 	}
 
-	public class TranslogSettingsDescriptor: DescriptorBase<TranslogSettingsDescriptor, ITranslogSettings>, ITranslogSettings
+	public class TranslogSettingsDescriptor : DescriptorBase<TranslogSettingsDescriptor, ITranslogSettings>, ITranslogSettings
 	{
+		TranslogDurability? ITranslogSettings.Durability { get; set; }
 		ITranslogFlushSettings ITranslogSettings.Flush { get; set; }
 		Time ITranslogSettings.SyncInterval { get; set; }
-		TranslogDurability? ITranslogSettings.Durability { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TranslogSettingsDescriptor Flush(Func<TranslogFlushSettingsDescriptor, ITranslogFlushSettings> selector) =>
 			Assign(a => a.Flush = selector?.Invoke(new TranslogFlushSettingsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TranslogSettingsDescriptor Durability(TranslogDurability? durability) =>
 			Assign(a => a.Durability = durability);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TranslogSettingsDescriptor SyncInterval(Time time) =>
 			Assign(a => a.SyncInterval = time);
 	}
diff --git a/src/Nest/IndexModules/Similarity/BM25Similarity.cs b/src/Nest/IndexModules/Similarity/BM25Similarity.cs
index 8ad771d190a..a522af2d4ab 100644
--- a/src/Nest/IndexModules/Similarity/BM25Similarity.cs
+++ b/src/Nest/IndexModules/Similarity/BM25Similarity.cs
@@ -21,40 +21,43 @@ public interface IBM25Similarity : ISimilarity
 		bool? DiscountOverlaps { get; set; }
 
 		/// <summary>
-		///Controls non-linear term frequency normalization (saturation).
+		/// Controls non-linear term frequency normalization (saturation).
 		/// </summary>
 		[JsonProperty("k1")]
 		double? K1 { get; set; }
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class BM25Similarity : IBM25Similarity
 	{
-		public string Type => "BM25";
-
-		/// <inheritdoc/>
-		public double? K1 { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? B { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public bool? DiscountOverlaps { get; set; }
+
+		/// <inheritdoc />
+		public double? K1 { get; set; }
+
+		public string Type => "BM25";
 	}
-	/// <inheritdoc/>
+
+	/// <inheritdoc />
 	public class BM25SimilarityDescriptor
 		: DescriptorBase<BM25SimilarityDescriptor, IBM25Similarity>, IBM25Similarity
 	{
-		string ISimilarity.Type => "BM25";
+		double? IBM25Similarity.B { get; set; }
 		bool? IBM25Similarity.DiscountOverlaps { get; set; }
 		double? IBM25Similarity.K1 { get; set; }
-		double? IBM25Similarity.B { get; set; }
+		string ISimilarity.Type => "BM25";
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public BM25SimilarityDescriptor DiscountOverlaps(bool? discount = true) => Assign(a => a.DiscountOverlaps = discount);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public BM25SimilarityDescriptor K1(double? k1) => Assign(a => a.K1 = k1);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public BM25SimilarityDescriptor B(double? b) => Assign(a => a.B = b);
 	}
-
 }
diff --git a/src/Nest/IndexModules/Similarity/ClassicSimilarity.cs b/src/Nest/IndexModules/Similarity/ClassicSimilarity.cs
index 93464af2797..40f8bac3ccd 100644
--- a/src/Nest/IndexModules/Similarity/ClassicSimilarity.cs
+++ b/src/Nest/IndexModules/Similarity/ClassicSimilarity.cs
@@ -18,18 +18,18 @@ public interface IClassicSimilarity : ISimilarity
 	/// <inheritdoc />
 	public class ClassicSimilarity : IClassicSimilarity
 	{
-		public string Type => "classic";
-
 		/// <inheritdoc />
 		public bool? DiscountOverlaps { get; set; }
+
+		public string Type => "classic";
 	}
 
 	/// <inheritdoc />
 	public class ClassicSimilarityDescriptor
 		: DescriptorBase<ClassicSimilarityDescriptor, IClassicSimilarity>, IClassicSimilarity
 	{
-		string ISimilarity.Type => "classic";
 		bool? IClassicSimilarity.DiscountOverlaps { get; set; }
+		string ISimilarity.Type => "classic";
 
 		/// <inheritdoc />
 		public ClassicSimilarityDescriptor DiscountOverlaps(bool? discount = true) => Assign(a => a.DiscountOverlaps = discount);
diff --git a/src/Nest/IndexModules/Similarity/CustomSimilarity.cs b/src/Nest/IndexModules/Similarity/CustomSimilarity.cs
index 14831350347..a7cdd385e86 100644
--- a/src/Nest/IndexModules/Similarity/CustomSimilarity.cs
+++ b/src/Nest/IndexModules/Similarity/CustomSimilarity.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -9,18 +8,12 @@ namespace Nest
 	/// </summary>
 	public interface ICustomSimilarity : ISimilarity, IIsADictionary<string, object> { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class CustomSimilarity : IsADictionaryBase<string, object>, ICustomSimilarity
 	{
-		public string Type
-		{
-			get => this["type"] as string;
-			set => this.Add("type", value);
-		}
-
 		public CustomSimilarity(string type)
 		{
-			if (!string.IsNullOrEmpty(type)) this.Type = type;
+			if (!string.IsNullOrEmpty(type)) Type = type;
 		}
 
 		internal CustomSimilarity(IDictionary<string, object> container) : base(container) { }
@@ -28,10 +21,16 @@ internal CustomSimilarity(IDictionary<string, object> container) : base(containe
 		internal CustomSimilarity(Dictionary<string, object> container)
 			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
+		public string Type
+		{
+			get => this["type"] as string;
+			set => Add("type", value);
+		}
+
 		public void Add(string key, object value) => BackingDictionary.Add(key, value);
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class CustomSimilarityDescriptor
 		: IsADictionaryDescriptorBase<CustomSimilarityDescriptor, ICustomSimilarity, string, object>
 	{
@@ -41,5 +40,4 @@ public CustomSimilarityDescriptor() : base(new CustomSimilarity(string.Empty)) {
 
 		public CustomSimilarityDescriptor Add(string key, object value) => Assign(key, value);
 	}
-
 }
diff --git a/src/Nest/IndexModules/Similarity/DFI/DFIIndependenceMeasure.cs b/src/Nest/IndexModules/Similarity/DFI/DFIIndependenceMeasure.cs
index 1776e1f70ad..3ecc9ae3bf2 100644
--- a/src/Nest/IndexModules/Similarity/DFI/DFIIndependenceMeasure.cs
+++ b/src/Nest/IndexModules/Similarity/DFI/DFIIndependenceMeasure.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// <see cref="IDFISimilarity"/> independence measure
+	/// <see cref="IDFISimilarity" /> independence measure
 	/// </summary>
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum DFIIndependenceMeasure
diff --git a/src/Nest/IndexModules/Similarity/DFI/DFISimilarity.cs b/src/Nest/IndexModules/Similarity/DFI/DFISimilarity.cs
index d6d7b06bac4..98b66ff1478 100644
--- a/src/Nest/IndexModules/Similarity/DFI/DFISimilarity.cs
+++ b/src/Nest/IndexModules/Similarity/DFI/DFISimilarity.cs
@@ -14,23 +14,23 @@ public interface IDFISimilarity : ISimilarity
 		DFIIndependenceMeasure? IndependenceMeasure { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DFISimilarity : IDFISimilarity
 	{
-		public string Type => "DFI";
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DFIIndependenceMeasure? IndependenceMeasure { get; set; }
+
+		public string Type => "DFI";
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DFISimilarityDescriptor
 		: DescriptorBase<DFISimilarityDescriptor, IDFISimilarity>, IDFISimilarity
 	{
-		string ISimilarity.Type => "DFI";
 		DFIIndependenceMeasure? IDFISimilarity.IndependenceMeasure { get; set; }
+		string ISimilarity.Type => "DFI";
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DFISimilarityDescriptor IndependenceMeasure(DFIIndependenceMeasure? independenceMeasure) =>
 			Assign(a => a.IndependenceMeasure = independenceMeasure);
 	}
diff --git a/src/Nest/IndexModules/Similarity/DFR/DFRAfterEffect.cs b/src/Nest/IndexModules/Similarity/DFR/DFRAfterEffect.cs
index 2cda707b999..fff643ae394 100644
--- a/src/Nest/IndexModules/Similarity/DFR/DFRAfterEffect.cs
+++ b/src/Nest/IndexModules/Similarity/DFR/DFRAfterEffect.cs
@@ -24,6 +24,5 @@ public enum DFRAfterEffect
 		/// </summary>
 		[EnumMember(Value = "l")]
 		L,
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/Similarity/DFR/DFRBasicModel.cs b/src/Nest/IndexModules/Similarity/DFR/DFRBasicModel.cs
index b9c9a434739..4b5952cd265 100644
--- a/src/Nest/IndexModules/Similarity/DFR/DFRBasicModel.cs
+++ b/src/Nest/IndexModules/Similarity/DFR/DFRBasicModel.cs
@@ -8,20 +8,23 @@ namespace Nest
 	public enum DFRBasicModel
 	{
 		/// <summary>
-		/// Limiting form of the Bose-Einstein model. The formula used in Lucene differs slightly from the one in the original paper: F is increased by tfn+1 and N is increased by F
+		/// Limiting form of the Bose-Einstein model. The formula used in Lucene differs slightly from the one in the original paper: F is increased by
+		/// tfn+1 and N is increased by F
 		/// </summary>
 		[EnumMember(Value = "be")]
 		BE,
 
 		/// <summary>
-		/// Implements the approximation of the binomial model with the divergence for DFR. 
-		/// The formula used in Lucene differs slightly from the one in the original paper: to avoid underflow for small values of N and F, N is increased by 1 and F is always increased by tfn+1.
+		/// Implements the approximation of the binomial model with the divergence for DFR.
+		/// The formula used in Lucene differs slightly from the one in the original paper: to avoid underflow for small values of N and F, N is
+		/// increased by 1 and F is always increased by tfn+1.
 		/// </summary>
 		[EnumMember(Value = "d")]
 		D,
 
 		/// <summary>
-		///Geometric as limiting form of the Bose-Einstein model. The formula used in Lucene differs slightly from the one in the original paper: F is increased by 1 and N is increased by F.
+		/// Geometric as limiting form of the Bose-Einstein model. The formula used in Lucene differs slightly from the one in the original paper: F is
+		/// increased by 1 and N is increased by F.
 		/// </summary>
 		[EnumMember(Value = "g")]
 		G,
@@ -50,4 +53,4 @@ public enum DFRBasicModel
 		[EnumMember(Value = "p")]
 		P
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/Similarity/DFR/DFRSimilarity.cs b/src/Nest/IndexModules/Similarity/DFR/DFRSimilarity.cs
index a995adc6452..f67d71055e9 100644
--- a/src/Nest/IndexModules/Similarity/DFR/DFRSimilarity.cs
+++ b/src/Nest/IndexModules/Similarity/DFR/DFRSimilarity.cs
@@ -2,27 +2,29 @@
 
 namespace Nest
 {
-
 	/// <summary>
 	/// Implements the divergence from randomness (DFR) framework introduced in Gianni Amati and Cornelis Joost Van Rijsbergen. 2002.
-	/// Probabilistic models of information retrieval based on measuring the divergence from randomness. ACM Trans. Inf. Syst. 20, 4 (October 2002), 357-389.
-	/// The DFR scoring formula is composed of three separate components: the basic model, the aftereffect and an additional normalization component,
-	/// represented by the classes BasicModel, AfterEffect and Normalization, respectively.The names of these classes were chosen to match the names of their counterparts in the Terrier IR engine.
+	/// Probabilistic models of information retrieval based on measuring the divergence from randomness. ACM Trans. Inf. Syst. 20, 4 (October
+	/// 2002), 357-389.
+	/// The DFR scoring formula is composed of three separate components: the basic model, the aftereffect and an additional normalization
+	/// component,
+	/// represented by the classes BasicModel, AfterEffect and Normalization, respectively.The names of these classes were chosen to match the
+	/// names of their counterparts in the Terrier IR engine.
 	/// </summary>
 	public interface IDFRSimilarity : ISimilarity
 	{
-		/// <summary>
-		/// The basic model
-		/// </summary>
-		[JsonProperty("basic_model")]
-		DFRBasicModel? BasicModel { get; set; }
-
 		/// <summary>
 		/// The after effect
 		/// </summary>
 		[JsonProperty("after_effect")]
 		DFRAfterEffect? AfterEffect { get; set; }
 
+		/// <summary>
+		/// The basic model
+		/// </summary>
+		[JsonProperty("basic_model")]
+		DFRBasicModel? BasicModel { get; set; }
+
 		/// <summary>
 		/// The normalization
 		/// </summary>
@@ -54,53 +56,53 @@ public interface IDFRSimilarity : ISimilarity
 		double? NormalizationZZ { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DFRSimilarity : IDFRSimilarity
 	{
-		public string Type => "DFR";
+		/// <inheritdoc />
+		public DFRAfterEffect? AfterEffect { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DFRBasicModel? BasicModel { get; set; }
 
-		/// <inheritdoc/>
-		public DFRAfterEffect? AfterEffect { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Normalization? Normalization { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? NormalizationH1C { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? NormalizationH2C { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? NormalizationH3C { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? NormalizationZZ { get; set; }
+
+		public string Type => "DFR";
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DFRSimilarityDescriptor
 		: DescriptorBase<DFRSimilarityDescriptor, IDFRSimilarity>, IDFRSimilarity
 	{
-		string ISimilarity.Type => "DFR";
-		DFRBasicModel? IDFRSimilarity.BasicModel { get; set; }
 		DFRAfterEffect? IDFRSimilarity.AfterEffect { get; set; }
+		DFRBasicModel? IDFRSimilarity.BasicModel { get; set; }
 		Normalization? IDFRSimilarity.Normalization { get; set; }
 		double? IDFRSimilarity.NormalizationH1C { get; set; }
 		double? IDFRSimilarity.NormalizationH2C { get; set; }
 		double? IDFRSimilarity.NormalizationH3C { get; set; }
 		double? IDFRSimilarity.NormalizationZZ { get; set; }
+		string ISimilarity.Type => "DFR";
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DFRSimilarityDescriptor BasicModel(DFRBasicModel? model) => Assign(a => a.BasicModel = model);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DFRSimilarityDescriptor AfterEffect(DFRAfterEffect? afterEffect) => Assign(a => a.AfterEffect = afterEffect);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DFRSimilarityDescriptor NoNormalization() => Assign(a => a.Normalization = Normalization.No);
 
 		/// <summary>
@@ -109,7 +111,7 @@ public class DFRSimilarityDescriptor
 		/// <param name="c">hyper-parameter that controls the term frequency normalization with respect to the document length.</param>
 		public DFRSimilarityDescriptor NormalizationH1(double? c) => Assign(a =>
 		{
-			a.Normalization = c == null ? (Normalization?) null : Normalization.H1;
+			a.Normalization = c == null ? (Normalization?)null : Normalization.H1;
 			a.NormalizationH1C = c;
 		});
 
@@ -119,7 +121,7 @@ public DFRSimilarityDescriptor NormalizationH1(double? c) => Assign(a =>
 		/// <param name="c">hyper-parameter that controls the term frequency normalization with respect to the document length.</param>
 		public DFRSimilarityDescriptor NormalizationH2(double? c) => Assign(a =>
 		{
-			a.Normalization = c == null ? (Normalization?) null : Normalization.H2;
+			a.Normalization = c == null ? (Normalization?)null : Normalization.H2;
 			a.NormalizationH1C = c;
 		});
 
@@ -129,7 +131,7 @@ public DFRSimilarityDescriptor NormalizationH2(double? c) => Assign(a =>
 		/// <param name="mu">smoothing parameter μ.</param>
 		public DFRSimilarityDescriptor NormalizationH3(double? mu) => Assign(a =>
 		{
-			a.Normalization = mu == null ? (Normalization?) null : Normalization.H3;
+			a.Normalization = mu == null ? (Normalization?)null : Normalization.H3;
 			a.NormalizationH1C = mu;
 		});
 
@@ -137,9 +139,8 @@ public DFRSimilarityDescriptor NormalizationH3(double? mu) => Assign(a =>
 		/// <param name="z">represents A/(A+1) where A measures the specificity of the language..</param>
 		public DFRSimilarityDescriptor NormalizationZ(double? z) => Assign(a =>
 		{
-			a.Normalization = z == null ? (Normalization?) null : Normalization.Z;
+			a.Normalization = z == null ? (Normalization?)null : Normalization.Z;
 			a.NormalizationH1C = z;
 		});
 	}
-
 }
diff --git a/src/Nest/IndexModules/Similarity/IB/IBDistribution.cs b/src/Nest/IndexModules/Similarity/IB/IBDistribution.cs
index 8b5924f9b75..5e197b79da2 100644
--- a/src/Nest/IndexModules/Similarity/IB/IBDistribution.cs
+++ b/src/Nest/IndexModules/Similarity/IB/IBDistribution.cs
@@ -9,7 +9,8 @@ public enum IBDistribution
 	{
 		[EnumMember(Value = "ll")]
 		LogLogistic,
+
 		[EnumMember(Value = "spl")]
 		SmoothPowerLaw,
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/Similarity/IB/IBLambda.cs b/src/Nest/IndexModules/Similarity/IB/IBLambda.cs
index 07a0219663e..9d356052bb3 100644
--- a/src/Nest/IndexModules/Similarity/IB/IBLambda.cs
+++ b/src/Nest/IndexModules/Similarity/IB/IBLambda.cs
@@ -19,4 +19,4 @@ public enum IBLambda
 		[EnumMember(Value = "ttf")]
 		TermFrequency,
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/Similarity/IB/IBSimilarity.cs b/src/Nest/IndexModules/Similarity/IB/IBSimilarity.cs
index 1f8220943b9..9d1bc4301f8 100644
--- a/src/Nest/IndexModules/Similarity/IB/IBSimilarity.cs
+++ b/src/Nest/IndexModules/Similarity/IB/IBSimilarity.cs
@@ -53,38 +53,37 @@ public interface IIBSimilarity : ISimilarity
 		double? NormalizationZZ { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IBSimilarity : IIBSimilarity
 	{
-		public string Type => "IB";
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBDistribution? Distribution { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBLambda? Lambda { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Normalization? Normalization { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? NormalizationH1C { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? NormalizationH2C { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? NormalizationH3C { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? NormalizationZZ { get; set; }
+
+		public string Type => "IB";
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IBSimilarityDescriptor
 		: DescriptorBase<IBSimilarityDescriptor, IIBSimilarity>, IIBSimilarity
 	{
-		string ISimilarity.Type => "IB";
 		IBDistribution? IIBSimilarity.Distribution { get; set; }
 		IBLambda? IIBSimilarity.Lambda { get; set; }
 		Normalization? IIBSimilarity.Normalization { get; set; }
@@ -92,14 +91,15 @@ public class IBSimilarityDescriptor
 		double? IIBSimilarity.NormalizationH2C { get; set; }
 		double? IIBSimilarity.NormalizationH3C { get; set; }
 		double? IIBSimilarity.NormalizationZZ { get; set; }
+		string ISimilarity.Type => "IB";
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBSimilarityDescriptor Distribution(IBDistribution? distribution) => Assign(a => a.Distribution = distribution);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBSimilarityDescriptor Lambda(IBLambda? lambda) => Assign(a => a.Lambda = lambda);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBSimilarityDescriptor NoNormalization() => Assign(a => a.Normalization = Normalization.No);
 
 		/// <summary>
@@ -142,5 +142,4 @@ public IBSimilarityDescriptor NormalizationZ(double? z) => Assign(a =>
 			a.NormalizationH1C = z;
 		});
 	}
-
 }
diff --git a/src/Nest/IndexModules/Similarity/LMDirichletSimilarity.cs b/src/Nest/IndexModules/Similarity/LMDirichletSimilarity.cs
index 1551b3b6543..cf24bcc819a 100644
--- a/src/Nest/IndexModules/Similarity/LMDirichletSimilarity.cs
+++ b/src/Nest/IndexModules/Similarity/LMDirichletSimilarity.cs
@@ -17,18 +17,18 @@ public interface ILMDirichletSimilarity : ISimilarity
 	/// <inheritdoc />
 	public class LMDirichletSimilarity : ILMDirichletSimilarity
 	{
-		public string Type => "LMDirichlet";
-
 		/// <inheritdoc />
 		public int? Mu { get; set; }
+
+		public string Type => "LMDirichlet";
 	}
 
 	/// <inheritdoc />
 	public class LMDirichletSimilarityDescriptor
 		: DescriptorBase<LMDirichletSimilarityDescriptor, ILMDirichletSimilarity>, ILMDirichletSimilarity
 	{
-		string ISimilarity.Type => "LMDirichlet";
 		int? ILMDirichletSimilarity.Mu { get; set; }
+		string ISimilarity.Type => "LMDirichlet";
 
 		/// <inheritdoc />
 		public LMDirichletSimilarityDescriptor Mu(int? mu) => Assign(a => a.Mu = mu);
diff --git a/src/Nest/IndexModules/Similarity/LMJelinekMercerSimilarity.cs b/src/Nest/IndexModules/Similarity/LMJelinekMercerSimilarity.cs
index 7a0da18d208..055bb572923 100644
--- a/src/Nest/IndexModules/Similarity/LMJelinekMercerSimilarity.cs
+++ b/src/Nest/IndexModules/Similarity/LMJelinekMercerSimilarity.cs
@@ -18,18 +18,18 @@ public interface ILMJelinekMercerSimilarity : ISimilarity
 	/// <inheritdoc />
 	public class LMJelinekMercerSimilarity : ILMJelinekMercerSimilarity
 	{
-		public string Type => "LMJelinekMercer";
-
 		/// <inheritdoc />
 		public double? Lambda { get; set; }
+
+		public string Type => "LMJelinekMercer";
 	}
 
 	/// <inheritdoc />
 	public class LMJelinekMercerSimilarityDescriptor
 		: DescriptorBase<LMJelinekMercerSimilarityDescriptor, ILMJelinekMercerSimilarity>, ILMJelinekMercerSimilarity
 	{
-		string ISimilarity.Type => "LMJelinekMercer";
 		double? ILMJelinekMercerSimilarity.Lambda { get; set; }
+		string ISimilarity.Type => "LMJelinekMercer";
 
 		/// <inheritdoc />
 		public LMJelinekMercerSimilarityDescriptor Lamdba(double? lamda) => Assign(a => a.Lambda = lamda);
diff --git a/src/Nest/IndexModules/Similarity/Normalization.cs b/src/Nest/IndexModules/Similarity/Normalization.cs
index ffb4dc56012..f0dfb1a4735 100644
--- a/src/Nest/IndexModules/Similarity/Normalization.cs
+++ b/src/Nest/IndexModules/Similarity/Normalization.cs
@@ -8,30 +8,33 @@ namespace Nest
 	public enum Normalization
 	{
 		/// <summary>
-		/// Implementation used when there is no normalization. 
+		/// Implementation used when there is no normalization.
 		/// </summary>
 		[EnumMember(Value = "no")]
 		No,
 
 		/// <summary>
-		/// Normalization model that assumes a uniform distribution of the term frequency. 
+		/// Normalization model that assumes a uniform distribution of the term frequency.
 		/// </summary>
 		[EnumMember(Value = "h1")]
 		H1,
+
 		/// <summary>
 		///  Normalization model in which the term frequency is inversely related to the length.
 		/// </summary>
 		[EnumMember(Value = "h2")]
 		H2,
+
 		/// <summary>
 		/// Dirichlet Priors normalization
 		/// </summary>
 		[EnumMember(Value = "h3")]
 		H3,
+
 		/// <summary>
 		/// Pareto-Zipf Normalization
 		/// </summary>
 		[EnumMember(Value = "z")]
 		Z,
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/IndexModules/Similarity/ScriptedSimilarity.cs b/src/Nest/IndexModules/Similarity/ScriptedSimilarity.cs
index 1e0bf505971..4cce031d60e 100644
--- a/src/Nest/IndexModules/Similarity/ScriptedSimilarity.cs
+++ b/src/Nest/IndexModules/Similarity/ScriptedSimilarity.cs
@@ -21,18 +21,18 @@ public interface IScriptedSimilarity : ISimilarity
 	/// <inheritdoc />
 	public class ScriptedSimilarity : IScriptedSimilarity
 	{
-		public string Type => "scripted";
-
 		/// <inheritdoc />
 		public IScript Script { get; set; }
+
+		public string Type => "scripted";
 	}
 
 	/// <inheritdoc cref="IScriptedSimilarity" />
 	public class ScriptedSimilarityDescriptor
 		: DescriptorBase<ScriptedSimilarityDescriptor, IScriptedSimilarity>, IScriptedSimilarity
 	{
-		string ISimilarity.Type => "scripted";
 		IScript IScriptedSimilarity.Script { get; set; }
+		string ISimilarity.Type => "scripted";
 
 		/// <inheritdoc cref="IScriptedSimilarity.Script" />
 		public ScriptedSimilarityDescriptor Script(Func<ScriptDescriptor, IScript> selector) =>
diff --git a/src/Nest/IndexModules/Similarity/Similarities.cs b/src/Nest/IndexModules/Similarity/Similarities.cs
index d944cfd3cd4..d13f1ce6734 100644
--- a/src/Nest/IndexModules/Similarity/Similarities.cs
+++ b/src/Nest/IndexModules/Similarity/Similarities.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -11,11 +10,13 @@ public interface ISimilarities : IIsADictionary<string, ISimilarity> { }
 	public class Similarities : IsADictionaryBase<string, ISimilarity>, ISimilarities
 	{
 		public Similarities() { }
+
 		public Similarities(IDictionary<string, ISimilarity> container) : base(container) { }
+
 		public Similarities(Dictionary<string, ISimilarity> container) : base(container) { }
 
 		/// <summary>
-		/// Add an <see cref="ISimilarity"/>
+		/// Add an <see cref="ISimilarity" />
 		/// </summary>
 		public void Add(string type, ISimilarity mapping) => BackingDictionary.Add(type, mapping);
 	}
@@ -58,9 +59,12 @@ public SimilaritiesDescriptor DFI(string name, Func<DFISimilarityDescriptor, IDF
 
 		/// <summary>
 		/// Implements the divergence from randomness (DFR) framework introduced in Gianni Amati and Cornelis Joost Van Rijsbergen. 2002.
-		/// Probabilistic models of information retrieval based on measuring the divergence from randomness. ACM Trans. Inf. Syst. 20, 4 (October 2002), 357-389.
-		/// The DFR scoring formula is composed of three separate components: the basic model, the aftereffect and an additional normalization component,
-		/// represented by the classes BasicModel, AfterEffect and Normalization, respectively.The names of these classes were chosen to match the names of their counterparts in the Terrier IR engine.
+		/// Probabilistic models of information retrieval based on measuring the divergence from randomness. ACM Trans. Inf. Syst. 20, 4 (October
+		/// 2002), 357-389.
+		/// The DFR scoring formula is composed of three separate components: the basic model, the aftereffect and an additional normalization
+		/// component,
+		/// represented by the classes BasicModel, AfterEffect and Normalization, respectively.The names of these classes were chosen to match the
+		/// names of their counterparts in the Terrier IR engine.
 		/// </summary>
 		public SimilaritiesDescriptor DFR(string name, Func<DFRSimilarityDescriptor, IDFRSimilarity> selector) =>
 			Assign(name, selector?.Invoke(new DFRSimilarityDescriptor()));
diff --git a/src/Nest/IndexModules/Similarity/SimilarityJsonConverter.cs b/src/Nest/IndexModules/Similarity/SimilarityJsonConverter.cs
index e927537419f..012d1e93e0b 100644
--- a/src/Nest/IndexModules/Similarity/SimilarityJsonConverter.cs
+++ b/src/Nest/IndexModules/Similarity/SimilarityJsonConverter.cs
@@ -1,17 +1,18 @@
 using System;
+using System.Collections.Generic;
+using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Reflection;
-using System.Collections.Generic;
 
 namespace Nest
 {
 	internal class SimilarityJsonConverter : JsonConverter
 	{
+		public override bool CanRead => true;
+		public override bool CanWrite => false;
+
 		public override bool CanConvert(Type objectType) =>
 			typeof(ISimilarity).GetTypeInfo().IsAssignableFrom(objectType.GetTypeInfo());
-		public override bool CanWrite => false;
-		public override bool CanRead => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
diff --git a/src/Nest/Indices/AliasManagement/Alias.cs b/src/Nest/Indices/AliasManagement/Alias.cs
index e58164eaca8..26982725d8c 100644
--- a/src/Nest/Indices/AliasManagement/Alias.cs
+++ b/src/Nest/Indices/AliasManagement/Alias.cs
@@ -9,12 +9,12 @@ public interface IAlias
 		[JsonProperty("filter")]
 		QueryContainer Filter { get; set; }
 
-		[JsonProperty("routing")]
-		Routing Routing { get; set; }
-
 		[JsonProperty("index_routing")]
 		Routing IndexRouting { get; set; }
 
+		[JsonProperty("routing")]
+		Routing Routing { get; set; }
+
 		[JsonProperty("search_routing")]
 		Routing SearchRouting { get; set; }
 	}
@@ -22,21 +22,24 @@ public interface IAlias
 	public class Alias : IAlias
 	{
 		public QueryContainer Filter { get; set; }
-		public Routing Routing { get; set; }
 		public Routing IndexRouting { get; set; }
+		public Routing Routing { get; set; }
 		public Routing SearchRouting { get; set; }
 	}
 
 	public class AliasDescriptor : DescriptorBase<AliasDescriptor, IAlias>, IAlias
 	{
 		QueryContainer IAlias.Filter { get; set; }
-		Routing IAlias.Routing { get; set; }
 		Routing IAlias.IndexRouting { get; set; }
+		Routing IAlias.Routing { get; set; }
 		Routing IAlias.SearchRouting { get; set; }
 
 		public AliasDescriptor Routing(Routing routing) => Assign(a => a.Routing = routing);
+
 		public AliasDescriptor IndexRouting(Routing indexRouting) => Assign(a => a.IndexRouting = indexRouting);
+
 		public AliasDescriptor SearchRouting(Routing searchRouting) => Assign(a => a.SearchRouting = searchRouting);
+
 		public AliasDescriptor Filter<T>(Func<QueryContainerDescriptor<T>, QueryContainer> filterSelector) where T : class =>
 			Assign(a => a.Filter = filterSelector?.Invoke(new QueryContainerDescriptor<T>()));
 	}
diff --git a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasAdd.cs b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasAdd.cs
index 36c2e8d32ba..a651c0aa0a7 100644
--- a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasAdd.cs
+++ b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasAdd.cs
@@ -3,7 +3,6 @@
 
 namespace Nest
 {
-
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IAliasAddAction : IAliasAction
 	{
@@ -18,10 +17,7 @@ public class AliasAddAction : IAliasAddAction
 
 	public class AliasAddDescriptor : DescriptorBase<AliasAddDescriptor, IAliasAddAction>, IAliasAddAction
 	{
-		public AliasAddDescriptor()
-		{
-			Self.Add = new AliasAddOperation();
-		}
+		public AliasAddDescriptor() => Self.Add = new AliasAddOperation();
 
 		AliasAddOperation IAliasAddAction.Add { get; set; }
 
@@ -30,41 +26,49 @@ public AliasAddDescriptor Index(string index)
 			Self.Add.Index = index;
 			return this;
 		}
+
 		public AliasAddDescriptor Index(Type index)
 		{
 			Self.Add.Index = index;
 			return this;
 		}
+
 		public AliasAddDescriptor Index<T>() where T : class
 		{
 			Self.Add.Index = typeof(T);
 			return this;
 		}
+
 		public AliasAddDescriptor Alias(string alias)
 		{
 			Self.Add.Alias = alias;
 			return this;
 		}
+
 		public AliasAddDescriptor Routing(string routing)
 		{
 			Self.Add.Routing = routing;
 			return this;
 		}
+
 		public AliasAddDescriptor IndexRouting(string indexRouting)
 		{
 			Self.Add.IndexRouting = indexRouting;
 			return this;
 		}
+
 		public AliasAddDescriptor SearchRouting(string searchRouting)
 		{
 			Self.Add.SearchRouting = searchRouting;
 			return this;
 		}
+
 		public AliasAddDescriptor IsWriteIndex(bool? isWriteIndex = true)
 		{
 			Self.Add.IsWriteIndex = isWriteIndex;
 			return this;
 		}
+
 		public AliasAddDescriptor Filter<T>(Func<QueryContainerDescriptor<T>, QueryContainer> filterSelector)
 			where T : class
 		{
diff --git a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs
index bdf93c836dd..60f4f4c7467 100644
--- a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs
+++ b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs
@@ -4,29 +4,29 @@ namespace Nest
 {
 	public class AliasAddOperation
 	{
-		[JsonProperty("index")]
-		public IndexName Index { get; set; }
-
 		[JsonProperty("alias")]
 		public string Alias { get; set; }
 
 		[JsonProperty("filter")]
 		public QueryContainer Filter { get; set; }
 
-		[JsonProperty("routing")]
-		public string Routing { get; set; }
+		[JsonProperty("index")]
+		public IndexName Index { get; set; }
 
 		[JsonProperty("index_routing")]
 		public string IndexRouting { get; set; }
 
-		[JsonProperty("search_routing")]
-		public string SearchRouting { get; set; }
-
 		/// <summary>
 		/// If an alias points to multiple indices elasticsearch will reject the write operations
 		/// unless one is explicitly marked with as the write alias using this property.
 		/// </summary>
 		[JsonProperty("is_write_index")]
 		public bool? IsWriteIndex { get; set; }
+
+		[JsonProperty("routing")]
+		public string Routing { get; set; }
+
+		[JsonProperty("search_routing")]
+		public string SearchRouting { get; set; }
 	}
 }
diff --git a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemove.cs b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemove.cs
index ec818136a73..6cd7c010aa4 100644
--- a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemove.cs
+++ b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemove.cs
@@ -3,7 +3,6 @@
 
 namespace Nest
 {
-
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IAliasRemoveAction : IAliasAction
 	{
@@ -18,32 +17,32 @@ public class AliasRemoveAction : IAliasRemoveAction
 
 	public class AliasRemoveDescriptor : DescriptorBase<AliasRemoveDescriptor, IAliasRemoveAction>, IAliasRemoveAction
 	{
-		AliasRemoveOperation IAliasRemoveAction.Remove { get; set; }
+		public AliasRemoveDescriptor() => Self.Remove = new AliasRemoveOperation();
 
-		public AliasRemoveDescriptor()
-		{
-			Self.Remove = new AliasRemoveOperation();
-		}
+		AliasRemoveOperation IAliasRemoveAction.Remove { get; set; }
 
 		public AliasRemoveDescriptor Index(string index)
 		{
 			Self.Remove.Index = index;
 			return this;
 		}
+
 		public AliasRemoveDescriptor Index(Type index)
 		{
 			Self.Remove.Index = index;
 			return this;
 		}
+
 		public AliasRemoveDescriptor Index<T>() where T : class
 		{
 			Self.Remove.Index = typeof(T);
 			return this;
 		}
+
 		public AliasRemoveDescriptor Alias(string alias)
 		{
 			Self.Remove.Alias = alias;
 			return this;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveIndex.cs b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveIndex.cs
index 20ad8de3677..f0407330169 100644
--- a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveIndex.cs
+++ b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveIndex.cs
@@ -17,12 +17,9 @@ public class AliasRemoveIndexAction : IAliasRemoveIndexAction
 
 	public class AliasRemoveIndexDescriptor : DescriptorBase<AliasRemoveIndexDescriptor, IAliasRemoveIndexAction>, IAliasRemoveIndexAction
 	{
-		AliasRemoveIndexOperation IAliasRemoveIndexAction.RemoveIndex { get; set; }
+		public AliasRemoveIndexDescriptor() => Self.RemoveIndex = new AliasRemoveIndexOperation();
 
-		public AliasRemoveIndexDescriptor()
-		{
-			Self.RemoveIndex = new AliasRemoveIndexOperation();
-		}
+		AliasRemoveIndexOperation IAliasRemoveIndexAction.RemoveIndex { get; set; }
 
 		public AliasRemoveIndexDescriptor Index(IndexName index)
 		{
diff --git a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs
index 54f9cd4e189..f6fede83849 100644
--- a/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs
+++ b/src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs
@@ -4,9 +4,10 @@ namespace Nest
 {
 	public class AliasRemoveOperation
 	{
-		[JsonProperty("index")]
-		public IndexName Index { get; set; }
 		[JsonProperty("alias")]
 		public string Alias { get; set; }
+
+		[JsonProperty("index")]
+		public IndexName Index { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/AliasManagement/Alias/BulkAliasRequest.cs b/src/Nest/Indices/AliasManagement/Alias/BulkAliasRequest.cs
index 81daf2017ed..837135823c4 100644
--- a/src/Nest/Indices/AliasManagement/Alias/BulkAliasRequest.cs
+++ b/src/Nest/Indices/AliasManagement/Alias/BulkAliasRequest.cs
@@ -19,14 +19,15 @@ public partial class BulkAliasRequest
 	[DescriptorFor("IndicesUpdateAliases")]
 	public partial class BulkAliasDescriptor
 	{
-		public BulkAliasDescriptor Add(IAliasAction action) =>
-			Fluent.Assign<BulkAliasDescriptor, IBulkAliasRequest>(this, a=> a.Actions.AddIfNotNull(action));
-
 		IList<IAliasAction> IBulkAliasRequest.Actions { get; set; } = new List<IAliasAction>();
 
+		public BulkAliasDescriptor Add(IAliasAction action) =>
+			Fluent.Assign<BulkAliasDescriptor, IBulkAliasRequest>(this, a => a.Actions.AddIfNotNull(action));
+
 		public BulkAliasDescriptor Add(Func<AliasAddDescriptor, IAliasAddAction> addSelector) => Add(addSelector?.Invoke(new AliasAddDescriptor()));
 
-		public BulkAliasDescriptor Remove(Func<AliasRemoveDescriptor, IAliasRemoveAction> removeSelector)=> Add(removeSelector?.Invoke(new AliasRemoveDescriptor()));
+		public BulkAliasDescriptor Remove(Func<AliasRemoveDescriptor, IAliasRemoveAction> removeSelector) =>
+			Add(removeSelector?.Invoke(new AliasRemoveDescriptor()));
 
 		public BulkAliasDescriptor RemoveIndex(Func<AliasRemoveIndexDescriptor, IAliasRemoveIndexAction> removeIndexSelector) =>
 			Add(removeIndexSelector?.Invoke(new AliasRemoveIndexDescriptor()));
diff --git a/src/Nest/Indices/AliasManagement/Alias/BulkAliasResponse.cs b/src/Nest/Indices/AliasManagement/Alias/BulkAliasResponse.cs
index ec3af1a841c..ed79af39f59 100644
--- a/src/Nest/Indices/AliasManagement/Alias/BulkAliasResponse.cs
+++ b/src/Nest/Indices/AliasManagement/Alias/BulkAliasResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IBulkAliasResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Indices/AliasManagement/Alias/ElasticClient-Alias.cs b/src/Nest/Indices/AliasManagement/Alias/ElasticClient-Alias.cs
index 1e1149fd504..b966702534b 100644
--- a/src/Nest/Indices/AliasManagement/Alias/ElasticClient-Alias.cs
+++ b/src/Nest/Indices/AliasManagement/Alias/ElasticClient-Alias.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,49 +9,61 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// APIs in elasticsearch accept an index name when working against a specific index, and several indices when applicable.
-		/// <para>The index aliases API allow to alias an index with a name, with all APIs automatically converting the alias name to the
-		/// actual index name.</para><para> An alias can also be mapped to more than one index, and when specifying it, the alias
-		/// will automatically expand to the aliases indices.i</para><para> An alias can also be associated with a filter that will
-		/// automatically be applied when searching, and routing values.</para>
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-aliases.html
+		/// <para>
+		/// The index aliases API allow to alias an index with a name, with all APIs automatically converting the alias name to the
+		/// actual index name.
+		/// </para>
+		/// <para>
+		/// An alias can also be mapped to more than one index, and when specifying it, the alias
+		/// will automatically expand to the aliases indices.i
+		/// </para>
+		/// <para>
+		/// An alias can also be associated with a filter that will
+		/// automatically be applied when searching, and routing values.
+		/// </para>
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-aliases.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the alias operation</param>
 		IBulkAliasResponse Alias(Func<BulkAliasDescriptor, IBulkAliasRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IBulkAliasResponse Alias(IBulkAliasRequest request);
 
-		/// <inheritdoc/>
-		Task<IBulkAliasResponse> AliasAsync(Func<BulkAliasDescriptor, IBulkAliasRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IBulkAliasResponse> AliasAsync(Func<BulkAliasDescriptor, IBulkAliasRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IBulkAliasResponse> AliasAsync(IBulkAliasRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBulkAliasResponse Alias(IBulkAliasRequest request) =>
-			this.Dispatcher.Dispatch<IBulkAliasRequest, BulkAliasRequestParameters, BulkAliasResponse>(
+			Dispatcher.Dispatch<IBulkAliasRequest, BulkAliasRequestParameters, BulkAliasResponse>(
 				request,
-				this.LowLevelDispatch.IndicesUpdateAliasesDispatch<BulkAliasResponse>
+				LowLevelDispatch.IndicesUpdateAliasesDispatch<BulkAliasResponse>
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IBulkAliasResponse Alias(Func<BulkAliasDescriptor, IBulkAliasRequest> selector) =>
-			this.Alias(selector?.Invoke(new BulkAliasDescriptor()));
+			Alias(selector?.Invoke(new BulkAliasDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IBulkAliasResponse> AliasAsync(IBulkAliasRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IBulkAliasRequest, BulkAliasRequestParameters, BulkAliasResponse, IBulkAliasResponse>(
+			Dispatcher.DispatchAsync<IBulkAliasRequest, BulkAliasRequestParameters, BulkAliasResponse, IBulkAliasResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesUpdateAliasesDispatchAsync<BulkAliasResponse>
+				LowLevelDispatch.IndicesUpdateAliasesDispatchAsync<BulkAliasResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IBulkAliasResponse> AliasAsync(Func<BulkAliasDescriptor, IBulkAliasRequest> selector, CancellationToken cancellationToken = default(CancellationToken))=>
-			this.AliasAsync(selector?.Invoke(new BulkAliasDescriptor()), cancellationToken);
-
+		/// <inheritdoc />
+		public Task<IBulkAliasResponse> AliasAsync(Func<BulkAliasDescriptor, IBulkAliasRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			AliasAsync(selector?.Invoke(new BulkAliasDescriptor()), cancellationToken);
 	}
 }
diff --git a/src/Nest/Indices/AliasManagement/AliasDefinition.cs b/src/Nest/Indices/AliasManagement/AliasDefinition.cs
index 8b342b77b9e..1e0efff2212 100644
--- a/src/Nest/Indices/AliasManagement/AliasDefinition.cs
+++ b/src/Nest/Indices/AliasManagement/AliasDefinition.cs
@@ -7,17 +7,16 @@ public class AliasDefinition
 		[JsonProperty("filter")]
 		public IQueryContainer Filter { get; internal set; }
 
-		[JsonProperty("routing")]
-		public string Routing { get; internal set; }
-
 		[JsonProperty("index_routing")]
 		public string IndexRouting { get; internal set; }
 
-		[JsonProperty("search_routing")]
-		public string SearchRouting { get; internal set; }
-
 		[JsonProperty("is_write_index")]
 		public bool? IsWriteIndex { get; internal set; }
 
+		[JsonProperty("routing")]
+		public string Routing { get; internal set; }
+
+		[JsonProperty("search_routing")]
+		public string SearchRouting { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/AliasManagement/AliasExists/AliasExistsRequest.cs b/src/Nest/Indices/AliasManagement/AliasExists/AliasExistsRequest.cs
index 717fc49fc49..4538df8115b 100644
--- a/src/Nest/Indices/AliasManagement/AliasExists/AliasExistsRequest.cs
+++ b/src/Nest/Indices/AliasManagement/AliasExists/AliasExistsRequest.cs
@@ -14,7 +14,7 @@ public AliasExistsDescriptor() { }
 
 		public AliasExistsDescriptor Name(Names name)
 		{
-			this.RequestState.RouteValues.Required("name", name);
+			RequestState.RouteValues.Required("name", name);
 			return this;
 		}
 	}
diff --git a/src/Nest/Indices/AliasManagement/AliasExists/ElasticClient-AliasExists.cs b/src/Nest/Indices/AliasManagement/AliasExists/ElasticClient-AliasExists.cs
index 50cc16e3421..ffdbc72821a 100644
--- a/src/Nest/Indices/AliasManagement/AliasExists/ElasticClient-AliasExists.cs
+++ b/src/Nest/Indices/AliasManagement/AliasExists/ElasticClient-AliasExists.cs
@@ -1,11 +1,11 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using AliasExistConverter = Func<IApiCallDetails, Stream, ExistsResponse>;
 
 	public partial interface IElasticClient
@@ -30,12 +30,16 @@ public partial interface IElasticClient
 		/// Checks if aliases exist for indices
 		/// </summary>
 		[Obsolete("Maintained for binary compatibility. Use overload that accepts Names. Will be removed in 7.0")]
-		Task<IExistsResponse> AliasExistsAsync(Func<AliasExistsDescriptor, IAliasExistsRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IExistsResponse> AliasExistsAsync(Func<AliasExistsDescriptor, IAliasExistsRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Checks if aliases exist for indices
 		/// </summary>
-		Task<IExistsResponse> AliasExistsAsync(Names name, Func<AliasExistsDescriptor, IAliasExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IExistsResponse> AliasExistsAsync(Names name, Func<AliasExistsDescriptor, IAliasExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Checks if aliases exist for indices
@@ -45,42 +49,47 @@ public partial interface IElasticClient
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		[Obsolete("Maintained for binary compatibility. Use overload that accepts Names. Will be removed in 7.0")]
 		public IExistsResponse AliasExists(Func<AliasExistsDescriptor, IAliasExistsRequest> selector) =>
 #pragma warning disable 618 // changing method signature would be binary breaking
-			this.AliasExists(selector?.Invoke(new AliasExistsDescriptor()));
+			AliasExists(selector?.Invoke(new AliasExistsDescriptor()));
 #pragma warning restore 618
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse AliasExists(Names name, Func<AliasExistsDescriptor, IAliasExistsRequest> selector = null) =>
-			this.AliasExists(selector.InvokeOrDefault(new AliasExistsDescriptor(name)));
+			AliasExists(selector.InvokeOrDefault(new AliasExistsDescriptor(name)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse AliasExists(IAliasExistsRequest request) =>
-			this.Dispatcher.Dispatch<IAliasExistsRequest, AliasExistsRequestParameters, ExistsResponse>(
+			Dispatcher.Dispatch<IAliasExistsRequest, AliasExistsRequestParameters, ExistsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesExistsAliasDispatch<ExistsResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesExistsAliasDispatch<ExistsResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		[Obsolete("Maintained for binary compatibility. Use overload that accepts Names. Will be removed in 7.0")]
-		public Task<IExistsResponse> AliasExistsAsync(Func<AliasExistsDescriptor, IAliasExistsRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
+		public Task<IExistsResponse> AliasExistsAsync(Func<AliasExistsDescriptor, IAliasExistsRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
 #pragma warning disable 618 // changing method signature would be binary breaking
-			this.AliasExistsAsync(selector?.Invoke(new AliasExistsDescriptor()), cancellationToken);
+			AliasExistsAsync(selector?.Invoke(new AliasExistsDescriptor()), cancellationToken);
 #pragma warning restore 618
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> AliasExistsAsync(Names name, Func<AliasExistsDescriptor, IAliasExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.AliasExistsAsync(selector.InvokeOrDefault(new AliasExistsDescriptor(name)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IExistsResponse> AliasExistsAsync(Names name, Func<AliasExistsDescriptor, IAliasExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			AliasExistsAsync(selector.InvokeOrDefault(new AliasExistsDescriptor(name)), cancellationToken);
 
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> AliasExistsAsync(IAliasExistsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IAliasExistsRequest, AliasExistsRequestParameters, ExistsResponse, IExistsResponse>(
+		/// <inheritdoc />
+		public Task<IExistsResponse> AliasExistsAsync(IAliasExistsRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IAliasExistsRequest, AliasExistsRequestParameters, ExistsResponse, IExistsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesExistsAliasDispatchAsync<ExistsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesExistsAliasDispatchAsync<ExistsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/AliasManagement/Aliases.cs b/src/Nest/Indices/AliasManagement/Aliases.cs
index adf2a792a14..a7e1340f37a 100644
--- a/src/Nest/Indices/AliasManagement/Aliases.cs
+++ b/src/Nest/Indices/AliasManagement/Aliases.cs
@@ -7,13 +7,15 @@ namespace Nest
 {
 	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<Aliases, IndexName, IAlias>))]
 	public interface IAliases : IIsADictionary<IndexName, IAlias> { }
+
 	public class Aliases : IsADictionaryBase<IndexName, IAlias>, IAliases
 	{
-		public Aliases() {}
+		public Aliases() { }
+
 		public Aliases(IDictionary<IndexName, IAlias> container) : base(container) { }
+
 		public Aliases(Dictionary<IndexName, IAlias> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{}
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		/// <summary>
 		/// Add any setting to the index
@@ -23,9 +25,9 @@ public Aliases(Dictionary<IndexName, IAlias> container)
 
 	public class AliasesDescriptor : IsADictionaryDescriptorBase<AliasesDescriptor, IAliases, IndexName, IAlias>
 	{
-		public AliasesDescriptor() : base(new Aliases()) {}
+		public AliasesDescriptor() : base(new Aliases()) { }
 
-		public AliasesDescriptor Alias(string alias, Func<AliasDescriptor, IAlias> selector = null) => Assign(alias, selector.InvokeOrDefault(new AliasDescriptor()));
+		public AliasesDescriptor Alias(string alias, Func<AliasDescriptor, IAlias> selector = null) =>
+			Assign(alias, selector.InvokeOrDefault(new AliasDescriptor()));
 	}
-
 }
diff --git a/src/Nest/Indices/AliasManagement/DeleteAlias/DeleteAliasResponse.cs b/src/Nest/Indices/AliasManagement/DeleteAlias/DeleteAliasResponse.cs
index 644ce39b051..8d41495210d 100644
--- a/src/Nest/Indices/AliasManagement/DeleteAlias/DeleteAliasResponse.cs
+++ b/src/Nest/Indices/AliasManagement/DeleteAlias/DeleteAliasResponse.cs
@@ -1,10 +1,6 @@
 namespace Nest
 {
-	public interface IDeleteAliasResponse : IResponse
-	{
-	}
+	public interface IDeleteAliasResponse : IResponse { }
 
-	public class DeleteAliasResponse : ResponseBase, IDeleteAliasResponse
-	{
-	}
+	public class DeleteAliasResponse : ResponseBase, IDeleteAliasResponse { }
 }
diff --git a/src/Nest/Indices/AliasManagement/DeleteAlias/ElasticClient-DeleteAlias.cs b/src/Nest/Indices/AliasManagement/DeleteAlias/ElasticClient-DeleteAlias.cs
index bb148e2ecf9..904c88648f1 100644
--- a/src/Nest/Indices/AliasManagement/DeleteAlias/ElasticClient-DeleteAlias.cs
+++ b/src/Nest/Indices/AliasManagement/DeleteAlias/ElasticClient-DeleteAlias.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,18 +9,19 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Delete an index alias
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-aliases.html#deleting
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-aliases.html#deleting
 		/// </summary>
 		/// <param name="request">A descriptor that describes the delete alias request</param>
 		IDeleteAliasResponse DeleteAlias(IDeleteAliasRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteAliasResponse> DeleteAliasAsync(IDeleteAliasRequest request, CancellationToken cancellationToken = default(CancellationToken));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteAliasResponse DeleteAlias(Indices indices, Names names, Func<DeleteAliasDescriptor, IDeleteAliasRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteAliasResponse> DeleteAliasAsync(
 			Indices indices,
 			Names names,
@@ -32,31 +33,33 @@ Task<IDeleteAliasResponse> DeleteAliasAsync(
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteAliasResponse DeleteAlias(IDeleteAliasRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteAliasRequest, DeleteAliasRequestParameters, DeleteAliasResponse>(
+			Dispatcher.Dispatch<IDeleteAliasRequest, DeleteAliasRequestParameters, DeleteAliasResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesDeleteAliasDispatch<DeleteAliasResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesDeleteAliasDispatch<DeleteAliasResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteAliasResponse> DeleteAliasAsync(IDeleteAliasRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteAliasRequest, DeleteAliasRequestParameters, DeleteAliasResponse, IDeleteAliasResponse>(
+		/// <inheritdoc />
+		public IDeleteAliasResponse DeleteAlias(Indices indices, Names names, Func<DeleteAliasDescriptor, IDeleteAliasRequest> selector = null) =>
+			DeleteAlias(selector.InvokeOrDefault(new DeleteAliasDescriptor(indices, names)));
+
+		/// <inheritdoc />
+		public Task<IDeleteAliasResponse> DeleteAliasAsync(IDeleteAliasRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteAliasRequest, DeleteAliasRequestParameters, DeleteAliasResponse, IDeleteAliasResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesDeleteAliasDispatchAsync<DeleteAliasResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesDeleteAliasDispatchAsync<DeleteAliasResponse>(p, c)
 			);
 
-		/// <inheritdoc/>
-		public IDeleteAliasResponse DeleteAlias(Indices indices, Names names, Func<DeleteAliasDescriptor, IDeleteAliasRequest> selector = null) =>
-			this.DeleteAlias(selector.InvokeOrDefault(new DeleteAliasDescriptor(indices, names)));
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IDeleteAliasResponse> DeleteAliasAsync(
 			Indices indices,
 			Names names,
 			Func<DeleteAliasDescriptor, IDeleteAliasRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.DeleteAliasAsync(selector.InvokeOrDefault(new DeleteAliasDescriptor(indices, names)), cancellationToken);
+		) => DeleteAliasAsync(selector.InvokeOrDefault(new DeleteAliasDescriptor(indices, names)), cancellationToken);
 	}
 }
diff --git a/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAlias.cs b/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAlias.cs
index 5e52b680a35..58f101e297d 100644
--- a/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAlias.cs
+++ b/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAlias.cs
@@ -1,61 +1,60 @@
 using System;
-using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
-
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The get index alias api allows to filter by alias name and index name. This api redirects to the master and fetches
 		/// the requested index aliases, if available. This api only serialises the found index aliases.
 		/// <para> Difference with GetAlias is that this call will also return indices without aliases set</para>
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-aliases.html#alias-retrieving
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-aliases.html#alias-retrieving
 		/// </summary>
 		/// <param name="selector">A descriptor that describes which aliases/indexes we are interested int</param>
 		IGetAliasResponse GetAlias(Func<GetAliasDescriptor, IGetAliasRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetAliasResponse GetAlias(IGetAliasRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetAliasResponse> GetAliasAsync(
 			Func<GetAliasDescriptor, IGetAliasRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetAliasResponse> GetAliasAsync(IGetAliasRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetAliasResponse GetAlias(Func<GetAliasDescriptor, IGetAliasRequest> selector = null) =>
-			this.GetAlias(selector.InvokeOrDefault(new GetAliasDescriptor()));
+			GetAlias(selector.InvokeOrDefault(new GetAliasDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetAliasResponse GetAlias(IGetAliasRequest request) =>
-			this.Dispatcher.Dispatch<IGetAliasRequest, GetAliasRequestParameters, GetAliasResponse>(
+			Dispatcher.Dispatch<IGetAliasRequest, GetAliasRequestParameters, GetAliasResponse>(
 				ForceConfiguration<IGetAliasRequest, GetAliasRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
-				(p, d) => this.LowLevelDispatch.IndicesGetAliasDispatch<GetAliasResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesGetAliasDispatch<GetAliasResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetAliasResponse> GetAliasAsync(
 			Func<GetAliasDescriptor, IGetAliasRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.GetAliasAsync(selector.InvokeOrDefault(new GetAliasDescriptor()), cancellationToken);
+		) => GetAliasAsync(selector.InvokeOrDefault(new GetAliasDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetAliasResponse> GetAliasAsync(IGetAliasRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetAliasRequest, GetAliasRequestParameters, GetAliasResponse, IGetAliasResponse>(
+			Dispatcher.DispatchAsync<IGetAliasRequest, GetAliasRequestParameters, GetAliasResponse, IGetAliasResponse>(
 				ForceConfiguration<IGetAliasRequest, GetAliasRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesGetAliasDispatchAsync<GetAliasResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesGetAliasDispatchAsync<GetAliasResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAliasesPointingToIndex.cs b/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAliasesPointingToIndex.cs
index 8701bbc9c3d..0744075a654 100644
--- a/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAliasesPointingToIndex.cs
+++ b/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAliasesPointingToIndex.cs
@@ -1,35 +1,38 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using Elasticsearch.Net;
 
 namespace Nest
 {
 	public static class AliasPointingToIndexExtensions
 	{
 		/// <summary>
-		/// Returns a dictionary of aliases that point to the specified index, simplified version of <see cref="IElasticClient.GetAlias(IGetAliasRequest)"/>..
+		/// Returns a dictionary of aliases that point to the specified index, simplified version of
+		/// <see cref="IElasticClient.GetAlias(IGetAliasRequest)" />..
 		/// </summary>
 		/// <param name="index">The index name we want to know aliases of</param>
 		public static IReadOnlyDictionary<string, AliasDefinition> GetAliasesPointingToIndex(this IElasticClient client, IndexName index)
 		{
-			var response = client.GetAlias(a => a.Index(index).RequestConfiguration(r=>r.ThrowExceptions()));
+			var response = client.GetAlias(a => a.Index(index).RequestConfiguration(r => r.ThrowExceptions()));
 			return AliasesPointingToIndex(index, response);
 		}
 
 		/// <summary>
-		/// Returns a dictionary of aliases that point to the specified index, simplified version of <see cref="IElasticClient.GetAlias(IGetAliasRequest)"/>.
+		/// Returns a dictionary of aliases that point to the specified index, simplified version of
+		/// <see cref="IElasticClient.GetAlias(IGetAliasRequest)" />.
 		/// </summary>
 		/// <param name="index">The index name we want to know aliases of</param>
-		public static async Task<IReadOnlyDictionary<string, AliasDefinition>> GetAliasesPointingToIndexAsync(this IElasticClient client, IndexName index)
+		public static async Task<IReadOnlyDictionary<string, AliasDefinition>> GetAliasesPointingToIndexAsync(this IElasticClient client,
+			IndexName index
+		)
 		{
-			var response = await client.GetAliasAsync(a => a.Index(index).RequestConfiguration(r=>r.ThrowExceptions())).ConfigureAwait(false);
+			var response = await client.GetAliasAsync(a => a.Index(index).RequestConfiguration(r => r.ThrowExceptions())).ConfigureAwait(false);
 			return AliasesPointingToIndex(index, response);
 		}
 
 		private static IReadOnlyDictionary<string, AliasDefinition> AliasesPointingToIndex(IndexName index, IGetAliasResponse response)
 		{
 			if (!response.IsValid || !response.Indices.HasAny()) return EmptyReadOnly<string, AliasDefinition>.Dictionary;
+
 			return response.Indices[index].Aliases;
 		}
 	}
diff --git a/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetIndicesPointingToAlias.cs b/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetIndicesPointingToAlias.cs
index 9665d038a7a..39d053a79a3 100644
--- a/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetIndicesPointingToAlias.cs
+++ b/src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetIndicesPointingToAlias.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using Nest;
 
 namespace Nest
 {
@@ -18,7 +17,7 @@ public static class IndicesPointingToAliasExtensions
 		/// <param name="alias">The alias name(s)</param>
 		public static IReadOnlyCollection<string> GetIndicesPointingToAlias(this IElasticClient client, Names alias)
 		{
-			var response = client.GetAlias(a => a.Name(alias).RequestConfiguration(r=>r.ThrowExceptions()));
+			var response = client.GetAlias(a => a.Name(alias).RequestConfiguration(r => r.ThrowExceptions()));
 			return IndicesPointingToAlias(client.ConnectionSettings, alias, response);
 		}
 
@@ -29,14 +28,16 @@ public static IReadOnlyCollection<string> GetIndicesPointingToAlias(this IElasti
 		/// <param name="alias">The alias name(s)</param>
 		public static async Task<IReadOnlyCollection<string>> GetIndicesPointingToAliasAsync(this IElasticClient client, Names alias)
 		{
-			var response = await client.GetAliasAsync(a => a.Name(alias).RequestConfiguration(r=>r.ThrowExceptions())).ConfigureAwait(false);
+			var response = await client.GetAliasAsync(a => a.Name(alias).RequestConfiguration(r => r.ThrowExceptions())).ConfigureAwait(false);
 			return IndicesPointingToAlias(client.ConnectionSettings, alias, response);
 		}
 
-		private static IReadOnlyCollection<string> IndicesPointingToAlias(IConnectionSettingsValues settings, IUrlParameter alias, IGetAliasResponse aliasesResponse)
+		private static IReadOnlyCollection<string> IndicesPointingToAlias(IConnectionSettingsValues settings, IUrlParameter alias,
+			IGetAliasResponse aliasesResponse
+		)
 		{
 			if (!aliasesResponse.IsValid
-			    || !aliasesResponse.Indices.HasAny())
+				|| !aliasesResponse.Indices.HasAny())
 				return EmptyReadOnly<string>.Collection;
 
 			var aliases = alias.GetString(settings).Split(',');
diff --git a/src/Nest/Indices/AliasManagement/GetAlias/GetAliasRequest.cs b/src/Nest/Indices/AliasManagement/GetAlias/GetAliasRequest.cs
index 099f7bff2ff..c1737359e29 100644
--- a/src/Nest/Indices/AliasManagement/GetAlias/GetAliasRequest.cs
+++ b/src/Nest/Indices/AliasManagement/GetAlias/GetAliasRequest.cs
@@ -1,17 +1,9 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IGetAliasRequest
-	{
-	}
+	public partial interface IGetAliasRequest { }
 
-	public partial class GetAliasRequest
-	{
-	}
+	public partial class GetAliasRequest { }
 
 	[DescriptorFor("IndicesGetAlias")]
-	public partial class GetAliasDescriptor
-	{
-	}
+	public partial class GetAliasDescriptor { }
 }
diff --git a/src/Nest/Indices/AliasManagement/GetAlias/GetAliasResponse.cs b/src/Nest/Indices/AliasManagement/GetAlias/GetAliasResponse.cs
index 60a45e58ba7..7b8fdb07fe6 100644
--- a/src/Nest/Indices/AliasManagement/GetAlias/GetAliasResponse.cs
+++ b/src/Nest/Indices/AliasManagement/GetAlias/GetAliasResponse.cs
@@ -20,6 +20,6 @@ public class GetAliasResponse : DictionaryResponseBase<IndexName, IndexAliases>,
 		[JsonIgnore]
 		public IReadOnlyDictionary<IndexName, IndexAliases> Indices => Self.BackingDictionary;
 
-		public override bool IsValid => this.Indices.Count > 0;
+		public override bool IsValid => Indices.Count > 0;
 	}
 }
diff --git a/src/Nest/Indices/AliasManagement/PutAlias/ElasticClient-PutAlias.cs b/src/Nest/Indices/AliasManagement/PutAlias/ElasticClient-PutAlias.cs
index e2b9e32eff1..a924f7276a7 100644
--- a/src/Nest/Indices/AliasManagement/PutAlias/ElasticClient-PutAlias.cs
+++ b/src/Nest/Indices/AliasManagement/PutAlias/ElasticClient-PutAlias.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -14,13 +14,13 @@ public partial interface IElasticClient
 		/// <param name="request">A descriptor that describes the put alias request</param>
 		IPutAliasResponse PutAlias(IPutAliasRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutAliasResponse> PutAliasAsync(IPutAliasRequest request, CancellationToken cancellationToken = default(CancellationToken));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutAliasResponse PutAlias(Indices indices, Name alias, Func<PutAliasDescriptor, IPutAliasRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutAliasResponse> PutAliasAsync(
 			Indices indices,
 			Name alias,
@@ -31,31 +31,31 @@ Task<IPutAliasResponse> PutAliasAsync(
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutAliasResponse PutAlias(IPutAliasRequest request) =>
-			this.Dispatcher.Dispatch<IPutAliasRequest, PutAliasRequestParameters, PutAliasResponse>(
+			Dispatcher.Dispatch<IPutAliasRequest, PutAliasRequestParameters, PutAliasResponse>(
 				request,
-				this.LowLevelDispatch.IndicesPutAliasDispatch<PutAliasResponse>
+				LowLevelDispatch.IndicesPutAliasDispatch<PutAliasResponse>
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public IPutAliasResponse PutAlias(Indices indices, Name alias, Func<PutAliasDescriptor, IPutAliasRequest> selector = null) =>
+			PutAlias(selector.InvokeOrDefault(new PutAliasDescriptor(indices, alias)));
+
+		/// <inheritdoc />
 		public Task<IPutAliasResponse> PutAliasAsync(IPutAliasRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutAliasRequest, PutAliasRequestParameters, PutAliasResponse, IPutAliasResponse>(
+			Dispatcher.DispatchAsync<IPutAliasRequest, PutAliasRequestParameters, PutAliasResponse, IPutAliasResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesPutAliasDispatchAsync<PutAliasResponse>
+				LowLevelDispatch.IndicesPutAliasDispatchAsync<PutAliasResponse>
 			);
 
-		/// <inheritdoc/>
-		public IPutAliasResponse PutAlias(Indices indices, Name alias, Func<PutAliasDescriptor, IPutAliasRequest> selector = null) =>
-			this.PutAlias(selector.InvokeOrDefault(new PutAliasDescriptor(indices, alias)));
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IPutAliasResponse> PutAliasAsync(
 			Indices indices,
 			Name alias,
 			Func<PutAliasDescriptor, IPutAliasRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.PutAliasAsync(selector.InvokeOrDefault(new PutAliasDescriptor(indices, alias)), cancellationToken);
+		) => PutAliasAsync(selector.InvokeOrDefault(new PutAliasDescriptor(indices, alias)), cancellationToken);
 	}
 }
diff --git a/src/Nest/Indices/AliasManagement/PutAlias/PutAliasRequest.cs b/src/Nest/Indices/AliasManagement/PutAlias/PutAliasRequest.cs
index 533ae6e2ef6..bdca158d10a 100644
--- a/src/Nest/Indices/AliasManagement/PutAlias/PutAliasRequest.cs
+++ b/src/Nest/Indices/AliasManagement/PutAlias/PutAliasRequest.cs
@@ -3,45 +3,45 @@
 
 namespace Nest
 {
-
 	public partial interface IPutAliasRequest
 	{
-		[JsonProperty("routing")]
-		Routing Routing { get; set; }
-
 		[JsonProperty("filter")]
 		QueryContainer Filter { get; set; }
 
 		[JsonProperty("index_routing")]
 		Routing IndexRouting { get; set; }
 
-		[JsonProperty("search_routing")]
-		Routing SearchRouting { get; set; }
-
-		/// <inheritdoc cref="AliasAddOperation.IsWriteIndex"/>
+		/// <inheritdoc cref="AliasAddOperation.IsWriteIndex" />
 		[JsonProperty("is_write_index")]
 		bool? IsWriteIndex { get; set; }
+
+		[JsonProperty("routing")]
+		Routing Routing { get; set; }
+
+		[JsonProperty("search_routing")]
+		Routing SearchRouting { get; set; }
 	}
 
 	public partial class PutAliasRequest
 	{
 		public QueryContainer Filter { get; set; }
-		public Routing Routing { get; set; }
 		public Routing IndexRouting { get; set; }
-		public Routing SearchRouting { get; set; }
-		/// <inheritdoc cref="AliasAddOperation.IsWriteIndex"/>
+
+		/// <inheritdoc cref="AliasAddOperation.IsWriteIndex" />
 		public bool? IsWriteIndex { get; set; }
 
+		public Routing Routing { get; set; }
+		public Routing SearchRouting { get; set; }
 	}
 
 	[DescriptorFor("IndicesPutAlias")]
 	public partial class PutAliasDescriptor
 	{
-		Routing IPutAliasRequest.Routing { get; set; }
 		QueryContainer IPutAliasRequest.Filter { get; set; }
 		Routing IPutAliasRequest.IndexRouting { get; set; }
-		Routing IPutAliasRequest.SearchRouting { get; set; }
 		bool? IPutAliasRequest.IsWriteIndex { get; set; }
+		Routing IPutAliasRequest.Routing { get; set; }
+		Routing IPutAliasRequest.SearchRouting { get; set; }
 
 		public PutAliasDescriptor Routing(Routing routing) => Assign(a => a.Routing = routing);
 
@@ -49,7 +49,7 @@ public partial class PutAliasDescriptor
 
 		public PutAliasDescriptor SearchRouting(Routing routing) => Assign(a => a.SearchRouting = routing);
 
-		/// <inheritdoc cref="AliasAddOperation.IsWriteIndex"/>
+		/// <inheritdoc cref="AliasAddOperation.IsWriteIndex" />
 		public PutAliasDescriptor IsWriteIndex(bool? isWriteIndex = true) => Assign(a => a.IsWriteIndex = isWriteIndex);
 
 		public PutAliasDescriptor Filter<T>(Func<QueryContainerDescriptor<T>, QueryContainer> filterSelector) where T : class =>
diff --git a/src/Nest/Indices/Analyze/AnalyzeCharFilters.cs b/src/Nest/Indices/Analyze/AnalyzeCharFilters.cs
index cbc86ce99b8..57b8d7ff1b5 100644
--- a/src/Nest/Indices/Analyze/AnalyzeCharFilters.cs
+++ b/src/Nest/Indices/Analyze/AnalyzeCharFilters.cs
@@ -6,22 +6,30 @@ namespace Nest
 	public class AnalyzeCharFilters : List<Union<string, ICharFilter>>
 	{
 		public AnalyzeCharFilters() { }
+
 		public AnalyzeCharFilters(List<Union<string, ICharFilter>> tokenFilters)
 		{
 			if (tokenFilters == null) return;
+
 			foreach (var v in tokenFilters) this.AddIfNotNull(v);
 		}
+
 		public AnalyzeCharFilters(string[] tokenFilters)
 		{
 			if (tokenFilters == null) return;
+
 			foreach (var v in tokenFilters) this.AddIfNotNull(v);
 		}
 
-		public void Add(ICharFilter filter) => this.Add(new Union<string, ICharFilter>(filter));
+		public void Add(ICharFilter filter) => Add(new Union<string, ICharFilter>(filter));
+
+		public static implicit operator AnalyzeCharFilters(CharFilterBase tokenFilter) =>
+			tokenFilter == null ? null : new AnalyzeCharFilters { tokenFilter };
 
-		public static implicit operator AnalyzeCharFilters(CharFilterBase tokenFilter) => tokenFilter == null ? null : new AnalyzeCharFilters { tokenFilter };
 		public static implicit operator AnalyzeCharFilters(string tokenFilter) => tokenFilter == null ? null : new AnalyzeCharFilters { tokenFilter };
-		public static implicit operator AnalyzeCharFilters(string[] tokenFilters) => tokenFilters == null ? null : new AnalyzeCharFilters(tokenFilters);
+
+		public static implicit operator AnalyzeCharFilters(string[] tokenFilters) =>
+			tokenFilters == null ? null : new AnalyzeCharFilters(tokenFilters);
 	}
 
 	public class AnalyzeCharFiltersDescriptor : DescriptorPromiseBase<AnalyzeCharFiltersDescriptor, AnalyzeCharFilters>
@@ -61,7 +69,9 @@ public AnalyzeCharFiltersDescriptor Mapping(Func<MappingCharFilterDescriptor, IM
 		/// The kuromoji_iteration_mark normalizes Japanese horizontal iteration marks (odoriji) to their expanded form.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
-		public AnalyzeCharFiltersDescriptor KuromojiIterationMark(Func<KuromojiIterationMarkCharFilterDescriptor, IKuromojiIterationMarkCharFilter> selector = null) =>
+		public AnalyzeCharFiltersDescriptor KuromojiIterationMark(
+			Func<KuromojiIterationMarkCharFilterDescriptor, IKuromojiIterationMarkCharFilter> selector = null
+		) =>
 			AssignIfNotNull(selector?.InvokeOrDefault(new KuromojiIterationMarkCharFilterDescriptor()));
 
 		/// <summary>
diff --git a/src/Nest/Indices/Analyze/AnalyzeRequest.cs b/src/Nest/Indices/Analyze/AnalyzeRequest.cs
index 2ece8aee340..62e609444a5 100644
--- a/src/Nest/Indices/Analyze/AnalyzeRequest.cs
+++ b/src/Nest/Indices/Analyze/AnalyzeRequest.cs
@@ -13,22 +13,30 @@ public partial interface IAnalyzeRequest
 		[JsonProperty("analyzer")]
 		string Analyzer { get; set; }
 
-		///<summary>The name of the normalizer to use</summary>
-		[JsonProperty("normalizer")]
-		string Normalizer { get; set; }
+		///<summary>Filter only certain token attributes to be returned</summary>
+		[JsonProperty("attributes")]
+		IEnumerable<string> Attributes { get; set; }
 
 		///<summary>A collection of character filters to use for the analysis</summary>
 		[JsonProperty("char_filter")]
 		AnalyzeCharFilters CharFilter { get; set; }
 
-		///<summary>A collection of filters to use for the analysis</summary>
-		[JsonProperty("filter")]
-		AnalyzeTokenFilters Filter { get; set; }
+		///<summary>Return more details, and output the analyzer chain per step in the process</summary>
+		[JsonProperty("explain")]
+		bool? Explain { get; set; }
 
 		///<summary>Use the analyzer configured for this field (instead of passing the analyzer name)</summary>
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
+		///<summary>A collection of filters to use for the analysis</summary>
+		[JsonProperty("filter")]
+		AnalyzeTokenFilters Filter { get; set; }
+
+		///<summary>The name of the normalizer to use</summary>
+		[JsonProperty("normalizer")]
+		string Normalizer { get; set; }
+
 		///<summary>The text on which the analysis should be performed (when request body is not used)</summary>
 		[JsonProperty("text")]
 		IEnumerable<string> Text { get; set; }
@@ -36,64 +44,53 @@ public partial interface IAnalyzeRequest
 		///<summary>The name of the tokenizer to use for the analysis</summary>
 		[JsonProperty("tokenizer")]
 		Union<string, ITokenizer> Tokenizer { get; set; }
-
-		///<summary>Return more details, and output the analyzer chain per step in the process</summary>
-		[JsonProperty("explain")]
-		bool? Explain { get; set; }
-
-		///<summary>Filter only certain token attributes to be returned</summary>
-		[JsonProperty("attributes")]
-		IEnumerable<string> Attributes { get; set; }
 	}
 
 	public partial class AnalyzeRequest
 	{
 		public AnalyzeRequest(IndexName indices, string textToAnalyze)
-			: this(indices)
-		{
-			this.Text = new[] { textToAnalyze };
-		}
+			: this(indices) => Text = new[] { textToAnalyze };
 
 		/// <inheritdoc />
-		public Union<string, ITokenizer> Tokenizer { get; set; }
+		public string Analyzer { get; set; }
 
 		/// <inheritdoc />
-		public string Analyzer { get; set; }
+		public IEnumerable<string> Attributes { get; set; }
 
 		/// <inheritdoc />
-		public bool? Explain { get; set; }
+		public AnalyzeCharFilters CharFilter { get; set; }
 
 		/// <inheritdoc />
-		public IEnumerable<string> Attributes { get; set; }
+		public bool? Explain { get; set; }
 
-	    /// <inheritdoc />
-		public AnalyzeCharFilters CharFilter { get; set; }
+		/// <inheritdoc />
+		public Field Field { get; set; }
 
-	    /// <inheritdoc />
+		/// <inheritdoc />
 		public AnalyzeTokenFilters Filter { get; set; }
 
 		/// <inheritdoc />
 		public string Normalizer { get; set; }
 
 		/// <inheritdoc />
-		public Field Field { get; set; }
+		public IEnumerable<string> Text { get; set; }
 
 		/// <inheritdoc />
-		public IEnumerable<string> Text { get; set; }
+		public Union<string, ITokenizer> Tokenizer { get; set; }
 	}
 
 	[DescriptorFor("IndicesAnalyze")]
 	public partial class AnalyzeDescriptor
 	{
 		string IAnalyzeRequest.Analyzer { get; set; }
+		IEnumerable<string> IAnalyzeRequest.Attributes { get; set; }
 		AnalyzeCharFilters IAnalyzeRequest.CharFilter { get; set; }
+		bool? IAnalyzeRequest.Explain { get; set; }
+		Field IAnalyzeRequest.Field { get; set; }
 		AnalyzeTokenFilters IAnalyzeRequest.Filter { get; set; }
 		string IAnalyzeRequest.Normalizer { get; set; }
-		Field IAnalyzeRequest.Field { get; set; }
 		IEnumerable<string> IAnalyzeRequest.Text { get; set; }
 		Union<string, ITokenizer> IAnalyzeRequest.Tokenizer { get; set; }
-		bool? IAnalyzeRequest.Explain { get; set; }
-		IEnumerable<string> IAnalyzeRequest.Attributes { get; set; }
 
 		///<summary>The name of the tokenizer to use for the analysis</summary>
 		public AnalyzeDescriptor Tokenizer(string tokenizer) => Assign(a => a.Tokenizer = tokenizer);
diff --git a/src/Nest/Indices/Analyze/AnalyzeResponse.cs b/src/Nest/Indices/Analyze/AnalyzeResponse.cs
index ae226664e60..a895d872cf8 100644
--- a/src/Nest/Indices/Analyze/AnalyzeResponse.cs
+++ b/src/Nest/Indices/Analyze/AnalyzeResponse.cs
@@ -6,36 +6,36 @@ namespace Nest
 	public interface IAnalyzeResponse : IResponse
 	{
 		/// <summary>
-		/// When <see cref="IAnalyzeRequest.Explain "/> is not true this will hold the analyzed tokens.
+		/// When <see cref="IAnalyzeRequest.Explain " /> is to true this will hold the detailed view of the analyzed tokens.
 		/// </summary>
-		IReadOnlyCollection<AnalyzeToken> Tokens { get; }
+		AnalyzeDetail Detail { get; }
 
 		/// <summary>
-		/// When <see cref="IAnalyzeRequest.Explain "/> is to true this will hold the detailed view of the analyzed tokens.
+		/// When <see cref="IAnalyzeRequest.Explain " /> is not true this will hold the analyzed tokens.
 		/// </summary>
-		AnalyzeDetail Detail { get; }
+		IReadOnlyCollection<AnalyzeToken> Tokens { get; }
 	}
 
 	[JsonObject]
 	public class AnalyzeResponse : ResponseBase, IAnalyzeResponse
 	{
-		[JsonProperty("tokens")]
-		public IReadOnlyCollection<AnalyzeToken> Tokens { get; internal set; } = EmptyReadOnly<AnalyzeToken>.Collection;
-
 		[JsonProperty("detail")]
 		public AnalyzeDetail Detail { get; internal set; }
+
+		[JsonProperty("tokens")]
+		public IReadOnlyCollection<AnalyzeToken> Tokens { get; internal set; } = EmptyReadOnly<AnalyzeToken>.Collection;
 	}
 
 
 	[JsonObject]
 	public class AnalyzeDetail
 	{
-		[JsonProperty("custom_analyzer")]
-		public bool CustomAnalyzer { get; internal set; }
-
 		[JsonProperty("charfilters")]
 		public IReadOnlyCollection<CharFilterDetail> CharFilters { get; internal set; } = EmptyReadOnly<CharFilterDetail>.Collection;
 
+		[JsonProperty("custom_analyzer")]
+		public bool CustomAnalyzer { get; internal set; }
+
 		[JsonProperty("tokenfilters")]
 		public IReadOnlyCollection<TokenDetail> Filters { get; internal set; } = EmptyReadOnly<TokenDetail>.Collection;
 
@@ -46,12 +46,11 @@ public class AnalyzeDetail
 	[JsonObject]
 	public class CharFilterDetail
 	{
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
-
 		[JsonProperty("filtered_text")]
 		public IReadOnlyCollection<string> FilteredText { get; internal set; } = EmptyReadOnly<string>.Collection;
 
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
 	}
 
 	[JsonObject]
@@ -69,31 +68,31 @@ public class TokenDetail
 	[JsonObject]
 	public class ExplainAnalyzeToken
 	{
-		[JsonProperty("token")]
-		public string Token { get; internal set; }
-
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
-
-		[JsonProperty("start_offset")]
-		public long StartOffset { get; internal set; }
+		[JsonProperty("bytes")]
+		public string Bytes { get; internal set; }
 
 		[JsonProperty("end_offset")]
 		public long EndOffset { get; internal set; }
 
+		[JsonProperty("keyword")]
+		public bool? Keyword { get; internal set; }
+
 		[JsonProperty("position")]
 		public long Position { get; internal set; }
 
 		[JsonProperty("positionLength")]
 		public long? PositionLength { get; internal set; }
 
+		[JsonProperty("start_offset")]
+		public long StartOffset { get; internal set; }
+
 		[JsonProperty("termFrequency")]
 		public long? TermFrequency { get; internal set; }
 
-		[JsonProperty("keyword")]
-		public bool? Keyword { get; internal set; }
+		[JsonProperty("token")]
+		public string Token { get; internal set; }
 
-		[JsonProperty("bytes")]
-		public string Bytes { get; internal set; }
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Analyze/AnalyzeToken.cs b/src/Nest/Indices/Analyze/AnalyzeToken.cs
index 0fa535dbc4a..5aa1fff378e 100644
--- a/src/Nest/Indices/Analyze/AnalyzeToken.cs
+++ b/src/Nest/Indices/Analyze/AnalyzeToken.cs
@@ -1,20 +1,10 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject]
 	public class AnalyzeToken
 	{
-		[JsonProperty("token")]
-		public string Token { get; internal set; }
-
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
-
-		[JsonProperty("start_offset")]
-		public long StartOffset { get; internal set; }
-
 		[JsonProperty("end_offset")]
 		public long EndOffset { get; internal set; }
 
@@ -23,5 +13,14 @@ public class AnalyzeToken
 
 		[JsonProperty("position_length")]
 		public long? PositionLength { get; internal set; }
+
+		[JsonProperty("start_offset")]
+		public long StartOffset { get; internal set; }
+
+		[JsonProperty("token")]
+		public string Token { get; internal set; }
+
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs b/src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs
index 440ab4fccb8..439644d1e56 100644
--- a/src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs
+++ b/src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs
@@ -9,22 +9,31 @@ namespace Nest
 	public class AnalyzeTokenFilters : List<Union<string, ITokenFilter>>
 	{
 		public AnalyzeTokenFilters() { }
+
 		public AnalyzeTokenFilters(List<Union<string, ITokenFilter>> tokenFilters)
 		{
 			if (tokenFilters == null) return;
+
 			foreach (var v in tokenFilters) this.AddIfNotNull(v);
 		}
+
 		public AnalyzeTokenFilters(string[] tokenFilters)
 		{
 			if (tokenFilters == null) return;
+
 			foreach (var v in tokenFilters) this.AddIfNotNull(v);
 		}
 
-		public void Add(ITokenFilter filter) => this.Add(new Union<string, ITokenFilter>(filter));
+		public void Add(ITokenFilter filter) => Add(new Union<string, ITokenFilter>(filter));
 
-		public static implicit operator AnalyzeTokenFilters(TokenFilterBase tokenFilter) => tokenFilter == null ? null : new AnalyzeTokenFilters { tokenFilter };
-		public static implicit operator AnalyzeTokenFilters(string tokenFilter) => tokenFilter == null ? null : new AnalyzeTokenFilters { tokenFilter };
-		public static implicit operator AnalyzeTokenFilters(string[] tokenFilters) => tokenFilters == null ? null : new AnalyzeTokenFilters(tokenFilters);
+		public static implicit operator AnalyzeTokenFilters(TokenFilterBase tokenFilter) =>
+			tokenFilter == null ? null : new AnalyzeTokenFilters { tokenFilter };
+
+		public static implicit operator AnalyzeTokenFilters(string tokenFilter) =>
+			tokenFilter == null ? null : new AnalyzeTokenFilters { tokenFilter };
+
+		public static implicit operator AnalyzeTokenFilters(string[] tokenFilters) =>
+			tokenFilters == null ? null : new AnalyzeTokenFilters(tokenFilters);
 	}
 
 	public class AnalyzeTokenFiltersDescriptor : DescriptorPromiseBase<AnalyzeTokenFiltersDescriptor, AnalyzeTokenFilters>
@@ -46,14 +55,16 @@ private AnalyzeTokenFiltersDescriptor AssignIfNotNull(ITokenFilter filter) =>
 		/// Token filters that allow to decompose compound words using a dictionary
 		/// </summary>
 		public AnalyzeTokenFiltersDescriptor DictionaryDecompounder(
-			Func<DictionaryDecompounderTokenFilterDescriptor, IDictionaryDecompounderTokenFilter> selector) =>
+			Func<DictionaryDecompounderTokenFilterDescriptor, IDictionaryDecompounderTokenFilter> selector
+		) =>
 			AssignIfNotNull(selector?.Invoke(new DictionaryDecompounderTokenFilterDescriptor()));
 
 		/// <summary>
 		/// Token filters that allow to decompose compound words using FOP XML
 		/// </summary>
 		public AnalyzeTokenFiltersDescriptor HyphenationDecompounder(
-			Func<HyphenationDecompounderTokenFilterDescriptor, IHyphenationDecompounderTokenFilter> selector) =>
+			Func<HyphenationDecompounderTokenFilterDescriptor, IHyphenationDecompounderTokenFilter> selector
+		) =>
 			AssignIfNotNull(selector?.Invoke(new HyphenationDecompounderTokenFilterDescriptor()));
 
 		/// <summary>
@@ -105,7 +116,8 @@ public AnalyzeTokenFiltersDescriptor WordDelimiter(Func<WordDelimiterTokenFilter
 		/// A token filter of type asciifolding that converts alphabetic, numeric, and symbolic Unicode characters which are
 		/// <para> not in the first 127 ASCII characters (the “Basic Latin” Unicode block) into their ASCII equivalents, if one exists.</para>
 		/// </summary>
-		public AnalyzeTokenFiltersDescriptor WordDelimiterGraph(Func<WordDelimiterGraphTokenFilterDescriptor, IWordDelimiterGraphTokenFilter> selector) =>
+		public AnalyzeTokenFiltersDescriptor WordDelimiterGraph(Func<WordDelimiterGraphTokenFilterDescriptor, IWordDelimiterGraphTokenFilter> selector
+		) =>
 			AssignIfNotNull(selector?.Invoke(new WordDelimiterGraphTokenFilterDescriptor()));
 
 		/// <summary>
@@ -116,8 +128,8 @@ public AnalyzeTokenFiltersDescriptor AsciiFolding(Func<AsciiFoldingTokenFilterDe
 			AssignIfNotNull(selector?.Invoke(new AsciiFoldingTokenFilterDescriptor()));
 
 		/// <summary>
-		/// Token filter that generates bigrams for frequently occuring terms. Single terms are still indexed.
-		///<para>Note, common_words or common_words_path field is required.</para>
+		///  Token filter that generates bigrams for frequently occuring terms. Single terms are still indexed.
+		/// <para>Note, common_words or common_words_path field is required.</para>
 		/// </summary>
 		public AnalyzeTokenFiltersDescriptor CommonGrams(Func<CommonGramsTokenFilterDescriptor, ICommonGramsTokenFilter> selector) =>
 			AssignIfNotNull(selector?.Invoke(new CommonGramsTokenFilterDescriptor()));
@@ -135,8 +147,8 @@ public AnalyzeTokenFiltersDescriptor Elision(Func<ElisionTokenFilterDescriptor,
 			AssignIfNotNull(selector?.Invoke(new ElisionTokenFilterDescriptor()));
 
 		/// <summary>
-		/// Basic support for hunspell stemming.
-		///<para> Hunspell dictionaries will be picked up from a dedicated hunspell directory on the filesystem.</para>
+		///  Basic support for hunspell stemming.
+		/// <para> Hunspell dictionaries will be picked up from a dedicated hunspell directory on the filesystem.</para>
 		/// </summary>
 		public AnalyzeTokenFiltersDescriptor Hunspell(Func<HunspellTokenFilterDescriptor, IHunspellTokenFilter> selector) =>
 			AssignIfNotNull(selector?.Invoke(new HunspellTokenFilterDescriptor()));
@@ -160,8 +172,8 @@ public AnalyzeTokenFiltersDescriptor KeywordMarker(Func<KeywordMarkerTokenFilter
 			AssignIfNotNull(selector?.Invoke(new KeywordMarkerTokenFilterDescriptor()));
 
 		/// <summary>
-		///The kstem token filter is a high performance filter for english.
-		///<para> All terms must already be lowercased (use lowercase filter) for this filter to work correctly.</para>
+		/// The kstem token filter is a high performance filter for english.
+		/// <para> All terms must already be lowercased (use lowercase filter) for this filter to work correctly.</para>
 		/// </summary>
 		public AnalyzeTokenFiltersDescriptor KStem(Func<KStemTokenFilterDescriptor, IKStemTokenFilter> selector = null) =>
 			AssignIfNotNull(selector.InvokeOrDefault(new KStemTokenFilterDescriptor()));
@@ -179,8 +191,8 @@ public AnalyzeTokenFiltersDescriptor LimitTokenCount(Func<LimitTokenCountTokenFi
 			AssignIfNotNull(selector?.Invoke(new LimitTokenCountTokenFilterDescriptor()));
 
 		/// <summary>
-		/// A token filter of type lowercase that normalizes token text to lower case.
-		///<para> Lowercase token filter supports Greek and Turkish lowercase token filters through the language parameter.</para>
+		///  A token filter of type lowercase that normalizes token text to lower case.
+		/// <para> Lowercase token filter supports Greek and Turkish lowercase token filters through the language parameter.</para>
 		/// </summary>
 		public AnalyzeTokenFiltersDescriptor Lowercase(Func<LowercaseTokenFilterDescriptor, ILowercaseTokenFilter> selector = null) =>
 			AssignIfNotNull(selector.InvokeOrDefault(new LowercaseTokenFilterDescriptor()));
@@ -234,7 +246,8 @@ public AnalyzeTokenFiltersDescriptor Stemmer(Func<StemmerTokenFilterDescriptor,
 			AssignIfNotNull(selector?.Invoke(new StemmerTokenFilterDescriptor()));
 
 		/// <summary>
-		/// Overrides stemming algorithms, by applying a custom mapping, then protecting these terms from being modified by stemmers. Must be placed before any stemming filters.
+		/// Overrides stemming algorithms, by applying a custom mapping, then protecting these terms from being modified by stemmers. Must be placed
+		/// before any stemming filters.
 		/// </summary>
 		public AnalyzeTokenFiltersDescriptor StemmerOverride(Func<StemmerOverrideTokenFilterDescriptor, IStemmerOverrideTokenFilter> selector) =>
 			AssignIfNotNull(selector?.Invoke(new StemmerOverrideTokenFilterDescriptor()));
@@ -277,26 +290,32 @@ public AnalyzeTokenFiltersDescriptor Fingerprint(Func<FingerprintTokenFilterDesc
 		/// long sound character by removing this character (U+30FC). Only full-width katakana characters are supported.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
-		public AnalyzeTokenFiltersDescriptor KuromojiStemmer(Func<KuromojiStemmerTokenFilterDescriptor, IKuromojiStemmerTokenFilter> selector = null) =>
+		public AnalyzeTokenFiltersDescriptor
+			KuromojiStemmer(Func<KuromojiStemmerTokenFilterDescriptor, IKuromojiStemmerTokenFilter> selector = null) =>
 			AssignIfNotNull(selector.InvokeOrDefault(new KuromojiStemmerTokenFilterDescriptor()));
 
 		/// <summary>
 		/// The kuromoji_readingform token filter replaces the token with its reading form in either katakana or romaji.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
-		public AnalyzeTokenFiltersDescriptor KuromojiReadingForm(Func<KuromojiReadingFormTokenFilterDescriptor, IKuromojiReadingFormTokenFilter> selector) =>
+		public AnalyzeTokenFiltersDescriptor KuromojiReadingForm(
+			Func<KuromojiReadingFormTokenFilterDescriptor, IKuromojiReadingFormTokenFilter> selector
+		) =>
 			AssignIfNotNull(selector.Invoke(new KuromojiReadingFormTokenFilterDescriptor()));
 
 		/// <summary>
 		/// The kuromoji_part_of_speech token filter removes tokens that match a set of part-of-speech tags.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
-		public AnalyzeTokenFiltersDescriptor KuromojiPartOfSpeech(Func<KuromojiPartOfSpeechTokenFilterDescriptor, IKuromojiPartOfSpeechTokenFilter> selector) =>
+		public AnalyzeTokenFiltersDescriptor KuromojiPartOfSpeech(
+			Func<KuromojiPartOfSpeechTokenFilterDescriptor, IKuromojiPartOfSpeechTokenFilter> selector
+		) =>
 			AssignIfNotNull(selector.Invoke(new KuromojiPartOfSpeechTokenFilterDescriptor()));
 
 
 		/// <summary>
-		/// Collations are used for sorting documents in a language-specific word order. The icu_collation token filter is available to all indices and defaults to using the DUCET collation, which is a best-effort attempt at language-neutral sorting.
+		/// Collations are used for sorting documents in a language-specific word order. The icu_collation token filter is available to all indices and
+		/// defaults to using the DUCET collation, which is a best-effort attempt at language-neutral sorting.
 		/// Part of the `analysis-icu` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html
 		/// </summary>
 		public AnalyzeTokenFiltersDescriptor IcuCollation(Func<IcuCollationTokenFilterDescriptor, IIcuCollationTokenFilter> selector) =>
@@ -324,17 +343,16 @@ public AnalyzeTokenFiltersDescriptor IcuNormalization(Func<IcuNormalizationToken
 		public AnalyzeTokenFiltersDescriptor IcuTransform(Func<IcuTransformTokenFilterDescriptor, IIcuTransformTokenFilter> selector) =>
 			AssignIfNotNull(selector.Invoke(new IcuTransformTokenFilterDescriptor()));
 
-		/// <inheritdoc cref="INoriPartOfSpeechTokenFilter"/>
+		/// <inheritdoc cref="INoriPartOfSpeechTokenFilter" />
 		public AnalyzeTokenFiltersDescriptor NoriPartOfSpeech(Func<NoriPartOfSpeechTokenFilterDescriptor, INoriPartOfSpeechTokenFilter> selector) =>
 			AssignIfNotNull(selector.Invoke(new NoriPartOfSpeechTokenFilterDescriptor()));
 
-		///<inheritdoc cref="IMultiplexerTokenFilter"/>
+		/// <inheritdoc cref="IMultiplexerTokenFilter" />
 		public AnalyzeTokenFiltersDescriptor Multiplexer(Func<MultiplexerTokenFilterDescriptor, IMultiplexerTokenFilter> selector) =>
 			AssignIfNotNull(selector.Invoke(new MultiplexerTokenFilterDescriptor()));
 
-		///<inheritdoc cref="IRemoveDuplicatesTokenFilter"/>
+		/// <inheritdoc cref="IRemoveDuplicatesTokenFilter" />
 		public AnalyzeTokenFiltersDescriptor RemoveDuplicates(Func<RemoveDuplicatesTokenFilterDescriptor, IRemoveDuplicatesTokenFilter> selector) =>
 			AssignIfNotNull(selector.Invoke(new RemoveDuplicatesTokenFilterDescriptor()));
 	}
-
 }
diff --git a/src/Nest/Indices/Analyze/AnalyzeTokenizersDescriptor.cs b/src/Nest/Indices/Analyze/AnalyzeTokenizersDescriptor.cs
index 1335f271811..a1166e0c251 100644
--- a/src/Nest/Indices/Analyze/AnalyzeTokenizersDescriptor.cs
+++ b/src/Nest/Indices/Analyze/AnalyzeTokenizersDescriptor.cs
@@ -14,20 +14,23 @@ public ITokenizer EdgeNGram(Func<EdgeNGramTokenizerDescriptor, IEdgeNGramTokeniz
 		/// A tokenizer of type nGram.
 		/// </summary>
 		public ITokenizer NGram(Func<NGramTokenizerDescriptor, INGramTokenizer> selector) =>
-			(selector?.Invoke(new NGramTokenizerDescriptor()));
+			selector?.Invoke(new NGramTokenizerDescriptor());
 
 		/// <summary>
 		/// A tokenizer of type keyword that emits the entire input as a single input.
 		/// </summary>
 		public ITokenizer Keyword(Func<KeywordTokenizerDescriptor, IKeywordTokenizer> selector) =>
-			(selector?.Invoke(new KeywordTokenizerDescriptor()));
+			selector?.Invoke(new KeywordTokenizerDescriptor());
 
 		/// <summary>
 		/// A tokenizer of type letter that divides text at non-letters. That’s to say, it defines tokens as maximal strings of adjacent letters.
-		/// <para>Note, this does a decent job for most European languages, but does a terrible job for some Asian languages, where words are not separated by spaces.</para>
+		/// <para>
+		/// Note, this does a decent job for most European languages, but does a terrible job for some Asian languages, where words are not
+		/// separated by spaces.
+		/// </para>
 		/// </summary>
 		public ITokenizer Letter(Func<LetterTokenizerDescriptor, ILetterTokenizer> selector) =>
-			(selector?.Invoke(new LetterTokenizerDescriptor()));
+			selector?.Invoke(new LetterTokenizerDescriptor());
 
 		/// <summary>
 		/// A tokenizer of type lowercase that performs the function of Letter Tokenizer and Lower Case Token Filter together.
@@ -36,51 +39,51 @@ public ITokenizer Letter(Func<LetterTokenizerDescriptor, ILetterTokenizer> selec
 		/// <para>there is a performance advantage to doing the two tasks at once, hence this (redundant) implementation.</para>
 		/// </summary>
 		public ITokenizer Lowercase(Func<LowercaseTokenizerDescriptor, ILowercaseTokenizer> selector) =>
-			(selector?.Invoke(new LowercaseTokenizerDescriptor()));
+			selector?.Invoke(new LowercaseTokenizerDescriptor());
 
 		/// <summary>
-		/// The path_hierarchy tokenizer takes something like this:
-		///<para>/something/something/else</para>
-		///<para>And produces tokens:</para>
-		///<para></para>
-		///<para>/something</para>
-		///<para>/something/something</para>
-		///<para>/something/something/else</para>
+		///  The path_hierarchy tokenizer takes something like this:
+		/// <para>/something/something/else</para>
+		/// <para>And produces tokens:</para>
+		/// <para></para>
+		/// <para>/something</para>
+		/// <para>/something/something</para>
+		/// <para>/something/something/else</para>
 		/// </summary>
 		public ITokenizer PathHierarchy(Func<PathHierarchyTokenizerDescriptor, IPathHierarchyTokenizer> selector) =>
-			(selector?.Invoke(new PathHierarchyTokenizerDescriptor()));
+			selector?.Invoke(new PathHierarchyTokenizerDescriptor());
 
 		/// <summary>
 		/// A tokenizer of type pattern that can flexibly separate text into terms via a regular expression.
 		/// </summary>
 		public ITokenizer Pattern(Func<PatternTokenizerDescriptor, IPatternTokenizer> selector) =>
-			(selector?.Invoke(new PatternTokenizerDescriptor()));
+			selector?.Invoke(new PatternTokenizerDescriptor());
 
 		/// <summary>
 		/// A tokenizer of type standard providing grammar based tokenizer that is a good tokenizer for most European language documents.
 		/// <para>The tokenizer implements the Unicode Text Segmentation algorithm, as specified in Unicode Standard Annex #29.</para>
 		/// </summary>
 		public ITokenizer Standard(Func<StandardTokenizerDescriptor, IStandardTokenizer> selector = null) =>
-			(selector.InvokeOrDefault(new StandardTokenizerDescriptor()));
+			selector.InvokeOrDefault(new StandardTokenizerDescriptor());
 
 		/// <summary>
 		/// A tokenizer of type uax_url_email which works exactly like the standard tokenizer, but tokenizes emails and urls as single tokens
 		/// </summary>
 		public ITokenizer UaxEmailUrl(Func<UaxEmailUrlTokenizerDescriptor, IUaxEmailUrlTokenizer> selector) =>
-			(selector?.Invoke(new UaxEmailUrlTokenizerDescriptor()));
+			selector?.Invoke(new UaxEmailUrlTokenizerDescriptor());
 
 		/// <summary>
 		/// A tokenizer of type whitespace that divides text at whitespace.
 		/// </summary>
 		public ITokenizer Whitespace(Func<WhitespaceTokenizerDescriptor, IWhitespaceTokenizer> selector = null) =>
-			(selector.InvokeOrDefault(new WhitespaceTokenizerDescriptor()));
+			selector.InvokeOrDefault(new WhitespaceTokenizerDescriptor());
 
 		/// <summary>
 		/// A tokenizer of type pattern that can flexibly separate text into terms via a regular expression.
 		/// Part of the `analysis-kuromoji` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html
 		/// </summary>
 		public ITokenizer Kuromoji(Func<KuromojiTokenizerDescriptor, IKuromojiTokenizer> selector) =>
-			(selector?.Invoke(new KuromojiTokenizerDescriptor()));
+			selector?.Invoke(new KuromojiTokenizerDescriptor());
 
 		/// <summary>
 		/// Tokenizes text into words on word boundaries, as defined in UAX #29: Unicode Text Segmentation. It behaves much
@@ -90,13 +93,15 @@ public ITokenizer Kuromoji(Func<KuromojiTokenizerDescriptor, IKuromojiTokenizer>
 		/// Part of the `analysis-icu` plugin: https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html
 		/// </summary>
 		public ITokenizer Icu(Func<IcuTokenizerDescriptor, IIcuTokenizer> selector) =>
-			(selector?.Invoke(new IcuTokenizerDescriptor()));
+			selector?.Invoke(new IcuTokenizerDescriptor());
 
-		/// <inheritdoc cref="INoriTokenizer"/>
+		/// <inheritdoc cref="INoriTokenizer" />
 		public ITokenizer Nori(Func<NoriTokenizerDescriptor, INoriTokenizer> selector) =>
 			selector.Invoke(new NoriTokenizerDescriptor());
-      
-	    /// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters"/>>
-		public ITokenizer CharGroup(Func<CharGroupTokenizerDescriptor, ICharGroupTokenizer> selector) => selector?.Invoke(new CharGroupTokenizerDescriptor());
+
+		/// <inheritdoc cref="ICharGroupTokenizer.TokenizeOnCharacters" />
+		/// >
+		public ITokenizer CharGroup(Func<CharGroupTokenizerDescriptor, ICharGroupTokenizer> selector) =>
+			selector?.Invoke(new CharGroupTokenizerDescriptor());
 	}
 }
diff --git a/src/Nest/Indices/Analyze/ElasticClient-Analyze.cs b/src/Nest/Indices/Analyze/ElasticClient-Analyze.cs
index 881ff4b963e..4f8f7bcab41 100644
--- a/src/Nest/Indices/Analyze/ElasticClient-Analyze.cs
+++ b/src/Nest/Indices/Analyze/ElasticClient-Analyze.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,45 +9,49 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Performs the analysis process on a text and return the tokens breakdown of the text.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-analyze.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-analyze.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the analyze operation</param>
 		IAnalyzeResponse Analyze(Func<AnalyzeDescriptor, IAnalyzeRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IAnalyzeResponse Analyze(IAnalyzeRequest request);
 
-		/// <inheritdoc/>
-		Task<IAnalyzeResponse> AnalyzeAsync(Func<AnalyzeDescriptor, IAnalyzeRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IAnalyzeResponse> AnalyzeAsync(Func<AnalyzeDescriptor, IAnalyzeRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IAnalyzeResponse> AnalyzeAsync(IAnalyzeRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAnalyzeResponse Analyze(Func<AnalyzeDescriptor, IAnalyzeRequest> selector) =>
-			this.Analyze(selector?.Invoke(new AnalyzeDescriptor()));
+			Analyze(selector?.Invoke(new AnalyzeDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAnalyzeResponse Analyze(IAnalyzeRequest request) =>
-			this.Dispatcher.Dispatch<IAnalyzeRequest, AnalyzeRequestParameters, AnalyzeResponse>(
+			Dispatcher.Dispatch<IAnalyzeRequest, AnalyzeRequestParameters, AnalyzeResponse>(
 				request,
-				this.LowLevelDispatch.IndicesAnalyzeDispatch<AnalyzeResponse>
+				LowLevelDispatch.IndicesAnalyzeDispatch<AnalyzeResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IAnalyzeResponse> AnalyzeAsync(Func<AnalyzeDescriptor, IAnalyzeRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.AnalyzeAsync(selector?.Invoke(new AnalyzeDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IAnalyzeResponse> AnalyzeAsync(Func<AnalyzeDescriptor, IAnalyzeRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			AnalyzeAsync(selector?.Invoke(new AnalyzeDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IAnalyzeResponse> AnalyzeAsync(IAnalyzeRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IAnalyzeRequest, AnalyzeRequestParameters, AnalyzeResponse, IAnalyzeResponse>(
+			Dispatcher.DispatchAsync<IAnalyzeRequest, AnalyzeRequestParameters, AnalyzeResponse, IAnalyzeResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesAnalyzeDispatchAsync<AnalyzeResponse>
+				LowLevelDispatch.IndicesAnalyzeDispatchAsync<AnalyzeResponse>
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/CreateIndex/CreateIndexRequest.cs b/src/Nest/Indices/IndexManagement/CreateIndex/CreateIndexRequest.cs
index c616d4158ed..a4aecf39f36 100644
--- a/src/Nest/Indices/IndexManagement/CreateIndex/CreateIndexRequest.cs
+++ b/src/Nest/Indices/IndexManagement/CreateIndex/CreateIndexRequest.cs
@@ -4,22 +4,10 @@
 namespace Nest
 {
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<CreateIndexRequest>))]
-	public partial interface ICreateIndexRequest : IIndexState
-	{
-	}
+	public partial interface ICreateIndexRequest : IIndexState { }
 
 	public partial class CreateIndexRequest
 	{
-		//Only here for ReadAsType new() constraint needs to be updated
-		internal CreateIndexRequest() { }
-
-		public CreateIndexRequest(IndexName index, IIndexState state) : this(index)
-		{
-			this.Settings = state.Settings;
-			this.Mappings = state.Mappings;
-			CreateIndexRequest.RemoveReadOnlySettings(this.Settings);
-		}
-
 		private static readonly string[] ReadOnlySettings =
 		{
 			"index.creation_date",
@@ -28,31 +16,41 @@ public CreateIndexRequest(IndexName index, IIndexState state) : this(index)
 			"index.provided_name"
 		};
 
-		internal static void RemoveReadOnlySettings (IIndexSettings settings)
+		//Only here for ReadAsType new() constraint needs to be updated
+		internal CreateIndexRequest() { }
+
+		public CreateIndexRequest(IndexName index, IIndexState state) : this(index)
+		{
+			Settings = state.Settings;
+			Mappings = state.Mappings;
+			RemoveReadOnlySettings(Settings);
+		}
+
+		public IAliases Aliases { get; set; }
+
+		public IMappings Mappings { get; set; }
+
+		public IIndexSettings Settings { get; set; }
+
+		internal static void RemoveReadOnlySettings(IIndexSettings settings)
 		{
 			if (settings == null) return;
-			foreach(var bad in ReadOnlySettings)
+
+			foreach (var bad in ReadOnlySettings)
 			{
 				if (settings.ContainsKey(bad))
 					settings.Remove(bad);
 			}
 		}
-
-		public IIndexSettings Settings { get; set; }
-
-		public IMappings Mappings { get; set; }
-
-		public IAliases Aliases { get; set; }
 	}
 
 	[DescriptorFor("IndicesCreate")]
 	public partial class CreateIndexDescriptor
 	{
-		IIndexSettings IIndexState.Settings { get; set; }
+		IAliases IIndexState.Aliases { get; set; }
 
 		IMappings IIndexState.Mappings { get; set; }
-
-		IAliases IIndexState.Aliases { get; set; }
+		IIndexSettings IIndexState.Settings { get; set; }
 
 		public CreateIndexDescriptor InitializeUsing(IIndexState indexSettings) => Assign(a =>
 		{
diff --git a/src/Nest/Indices/IndexManagement/CreateIndex/CreateIndexResponse.cs b/src/Nest/Indices/IndexManagement/CreateIndex/CreateIndexResponse.cs
index 8309d04023e..3fc4068fd9f 100644
--- a/src/Nest/Indices/IndexManagement/CreateIndex/CreateIndexResponse.cs
+++ b/src/Nest/Indices/IndexManagement/CreateIndex/CreateIndexResponse.cs
@@ -1,13 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
-
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface ICreateIndexResponse : IAcknowledgedResponse
 	{
diff --git a/src/Nest/Indices/IndexManagement/CreateIndex/ElasticClient-CreateIndex.cs b/src/Nest/Indices/IndexManagement/CreateIndex/ElasticClient-CreateIndex.cs
index 52e4d02acdf..0b215ee7f57 100644
--- a/src/Nest/Indices/IndexManagement/CreateIndex/ElasticClient-CreateIndex.cs
+++ b/src/Nest/Indices/IndexManagement/CreateIndex/ElasticClient-CreateIndex.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,50 +10,54 @@ public partial interface IElasticClient
 		/// <summary>
 		/// The create index API allows to instantiate an index. Elasticsearch provides support for multiple indices,
 		/// including executing operations across several indices.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html</a>
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the create index operation</param>
 		ICreateIndexResponse CreateIndex(IndexName index, Func<CreateIndexDescriptor, ICreateIndexRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICreateIndexResponse CreateIndex(ICreateIndexRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICreateIndexResponse> CreateIndexAsync(
 			IndexName index,
 			Func<CreateIndexDescriptor, ICreateIndexRequest> selector = null,
-			CancellationToken cancellationToken = default(CancellationToken));
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICreateIndexResponse> CreateIndexAsync(ICreateIndexRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICreateIndexResponse CreateIndex(IndexName index, Func<CreateIndexDescriptor, ICreateIndexRequest> selector = null) =>
-			this.CreateIndex(selector.InvokeOrDefault(new CreateIndexDescriptor(index)));
+			CreateIndex(selector.InvokeOrDefault(new CreateIndexDescriptor(index)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICreateIndexResponse CreateIndex(ICreateIndexRequest request) =>
-			this.Dispatcher.Dispatch<ICreateIndexRequest, CreateIndexRequestParameters, CreateIndexResponse>(
+			Dispatcher.Dispatch<ICreateIndexRequest, CreateIndexRequestParameters, CreateIndexResponse>(
 				request,
-				this.LowLevelDispatch.IndicesCreateDispatch<CreateIndexResponse>
+				LowLevelDispatch.IndicesCreateDispatch<CreateIndexResponse>
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICreateIndexResponse> CreateIndexAsync(
 			IndexName index,
 			Func<CreateIndexDescriptor, ICreateIndexRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) =>  this.CreateIndexAsync(selector.InvokeOrDefault(new CreateIndexDescriptor(index)));
+		) => CreateIndexAsync(selector.InvokeOrDefault(new CreateIndexDescriptor(index)));
 
-		/// <inheritdoc/>
-		public Task<ICreateIndexResponse> CreateIndexAsync(ICreateIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ICreateIndexRequest, CreateIndexRequestParameters, CreateIndexResponse, ICreateIndexResponse>(
+		/// <inheritdoc />
+		public Task<ICreateIndexResponse> CreateIndexAsync(ICreateIndexRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ICreateIndexRequest, CreateIndexRequestParameters, CreateIndexResponse, ICreateIndexResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesCreateDispatchAsync<CreateIndexResponse>
+				LowLevelDispatch.IndicesCreateDispatchAsync<CreateIndexResponse>
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/DeleteIndex/DeleteIndexResponse.cs b/src/Nest/Indices/IndexManagement/DeleteIndex/DeleteIndexResponse.cs
index bdc2c3055d6..7b21750c8fe 100644
--- a/src/Nest/Indices/IndexManagement/DeleteIndex/DeleteIndexResponse.cs
+++ b/src/Nest/Indices/IndexManagement/DeleteIndex/DeleteIndexResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IDeleteIndexResponse : IIndicesResponse { }
 
diff --git a/src/Nest/Indices/IndexManagement/DeleteIndex/ElasticClient-DeleteIndex.cs b/src/Nest/Indices/IndexManagement/DeleteIndex/ElasticClient-DeleteIndex.cs
index 81d3123860c..27581791c82 100644
--- a/src/Nest/Indices/IndexManagement/DeleteIndex/ElasticClient-DeleteIndex.cs
+++ b/src/Nest/Indices/IndexManagement/DeleteIndex/ElasticClient-DeleteIndex.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,52 +9,54 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The delete index API allows to delete an existing index.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-delete-index.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-delete-index.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the delete index operation</param>
 		IDeleteIndexResponse DeleteIndex(Indices indices, Func<DeleteIndexDescriptor, IDeleteIndexRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteIndexResponse DeleteIndex(IDeleteIndexRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteIndexResponse> DeleteIndexAsync(
 			Indices indices,
 			Func<DeleteIndexDescriptor, IDeleteIndexRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteIndexResponse> DeleteIndexAsync(IDeleteIndexRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteIndexResponse DeleteIndex(Indices indices, Func<DeleteIndexDescriptor, IDeleteIndexRequest> selector = null) =>
-			this.DeleteIndex(selector.InvokeOrDefault(new DeleteIndexDescriptor(indices)));
+			DeleteIndex(selector.InvokeOrDefault(new DeleteIndexDescriptor(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteIndexResponse DeleteIndex(IDeleteIndexRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteIndexRequest, DeleteIndexRequestParameters, DeleteIndexResponse>(
+			Dispatcher.Dispatch<IDeleteIndexRequest, DeleteIndexRequestParameters, DeleteIndexResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesDeleteDispatch<DeleteIndexResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesDeleteDispatch<DeleteIndexResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IDeleteIndexResponse> DeleteIndexAsync(
 			Indices indices,
 			Func<DeleteIndexDescriptor, IDeleteIndexRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.DeleteIndexAsync(selector.InvokeOrDefault(new DeleteIndexDescriptor(indices)), cancellationToken);
+		) => DeleteIndexAsync(selector.InvokeOrDefault(new DeleteIndexDescriptor(indices)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeleteIndexResponse> DeleteIndexAsync(IDeleteIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteIndexRequest, DeleteIndexRequestParameters, DeleteIndexResponse, IDeleteIndexResponse>(
+		/// <inheritdoc />
+		public Task<IDeleteIndexResponse> DeleteIndexAsync(IDeleteIndexRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteIndexRequest, DeleteIndexRequestParameters, DeleteIndexResponse, IDeleteIndexResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesDeleteDispatchAsync<DeleteIndexResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesDeleteDispatchAsync<DeleteIndexResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/GetIndex/ElasticClient-GetIndex.cs b/src/Nest/Indices/IndexManagement/GetIndex/ElasticClient-GetIndex.cs
index 3426a85d30b..52bfc4cbc4c 100644
--- a/src/Nest/Indices/IndexManagement/GetIndex/ElasticClient-GetIndex.cs
+++ b/src/Nest/Indices/IndexManagement/GetIndex/ElasticClient-GetIndex.cs
@@ -1,54 +1,56 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using GetIndexResponseConverter = Func<IApiCallDetails, Stream, GetIndexResponse>;
 
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetIndexResponse GetIndex(Indices indices, Func<GetIndexDescriptor, IGetIndexRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetIndexResponse GetIndex(IGetIndexRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetIndexResponse> GetIndexAsync(Indices indices, Func<GetIndexDescriptor, IGetIndexRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetIndexResponse> GetIndexAsync(Indices indices, Func<GetIndexDescriptor, IGetIndexRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetIndexResponse> GetIndexAsync(IGetIndexRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetIndexResponse GetIndex(Indices indices, Func<GetIndexDescriptor, IGetIndexRequest> selector = null) =>
-			this.GetIndex(selector.InvokeOrDefault(new GetIndexDescriptor(indices)));
+			GetIndex(selector.InvokeOrDefault(new GetIndexDescriptor(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetIndexResponse GetIndex(IGetIndexRequest request) =>
-			this.Dispatcher.Dispatch<IGetIndexRequest, GetIndexRequestParameters, GetIndexResponse>(
+			Dispatcher.Dispatch<IGetIndexRequest, GetIndexRequestParameters, GetIndexResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesGetDispatch<GetIndexResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesGetDispatch<GetIndexResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetIndexResponse> GetIndexAsync(Indices indices, Func<GetIndexDescriptor, IGetIndexRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetIndexAsync(selector.InvokeOrDefault(new GetIndexDescriptor(indices)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetIndexResponse> GetIndexAsync(Indices indices, Func<GetIndexDescriptor, IGetIndexRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetIndexAsync(selector.InvokeOrDefault(new GetIndexDescriptor(indices)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetIndexResponse> GetIndexAsync(IGetIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetIndexRequest, GetIndexRequestParameters, GetIndexResponse, IGetIndexResponse>(
+			Dispatcher.DispatchAsync<IGetIndexRequest, GetIndexRequestParameters, GetIndexResponse, IGetIndexResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesGetDispatchAsync<GetIndexResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesGetDispatchAsync<GetIndexResponse>(p, c)
 			);
-
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/GetIndex/GetIndexRequest.cs b/src/Nest/Indices/IndexManagement/GetIndex/GetIndexRequest.cs
index 4b9008301b6..c557a6b57fd 100644
--- a/src/Nest/Indices/IndexManagement/GetIndex/GetIndexRequest.cs
+++ b/src/Nest/Indices/IndexManagement/GetIndex/GetIndexRequest.cs
@@ -1,15 +1,9 @@
 namespace Nest
 {
-	public partial interface IGetIndexRequest 
-	{
-	}
+	public partial interface IGetIndexRequest { }
 
-	public partial class GetIndexRequest 
-	{
-	}
+	public partial class GetIndexRequest { }
 
 	[DescriptorFor("IndicesGet")]
-	public partial class GetIndexDescriptor 
-	{
-	}
+	public partial class GetIndexDescriptor { }
 }
diff --git a/src/Nest/Indices/IndexManagement/IndicesExists/ElasticClient-IndexExists.cs b/src/Nest/Indices/IndexManagement/IndicesExists/ElasticClient-IndexExists.cs
index 255f85aedf2..15a8172fe83 100644
--- a/src/Nest/Indices/IndexManagement/IndicesExists/ElasticClient-IndexExists.cs
+++ b/src/Nest/Indices/IndexManagement/IndicesExists/ElasticClient-IndexExists.cs
@@ -1,56 +1,62 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using IndexExistConverter = Func<IApiCallDetails, Stream, ExistsResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Used to check if the index (indices) exists or not.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-exists.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-exists.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the index exist operation</param>
 		IExistsResponse IndexExists(Indices indices, Func<IndexExistsDescriptor, IIndexExistsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExistsResponse IndexExists(IIndexExistsRequest request);
 
-		/// <inheritdoc/>
-		Task<IExistsResponse> IndexExistsAsync(Indices indices, Func<IndexExistsDescriptor, IIndexExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IExistsResponse> IndexExistsAsync(Indices indices, Func<IndexExistsDescriptor, IIndexExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IExistsResponse> IndexExistsAsync(IIndexExistsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse IndexExists(Indices indices, Func<IndexExistsDescriptor, IIndexExistsRequest> selector = null) =>
-			this.IndexExists(selector.InvokeOrDefault(new IndexExistsDescriptor(indices)));
+			IndexExists(selector.InvokeOrDefault(new IndexExistsDescriptor(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse IndexExists(IIndexExistsRequest request) =>
-			this.Dispatcher.Dispatch<IIndexExistsRequest, IndexExistsRequestParameters, ExistsResponse>(
+			Dispatcher.Dispatch<IIndexExistsRequest, IndexExistsRequestParameters, ExistsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesExistsDispatch<ExistsResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesExistsDispatch<ExistsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> IndexExistsAsync(Indices indices, Func<IndexExistsDescriptor, IIndexExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.IndexExistsAsync(selector.InvokeOrDefault(new IndexExistsDescriptor(indices)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IExistsResponse> IndexExistsAsync(Indices indices, Func<IndexExistsDescriptor, IIndexExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			IndexExistsAsync(selector.InvokeOrDefault(new IndexExistsDescriptor(indices)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> IndexExistsAsync(IIndexExistsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IIndexExistsRequest, IndexExistsRequestParameters, ExistsResponse, IExistsResponse>(
+		/// <inheritdoc />
+		public Task<IExistsResponse> IndexExistsAsync(IIndexExistsRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IIndexExistsRequest, IndexExistsRequestParameters, ExistsResponse, IExistsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesExistsDispatchAsync<ExistsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesExistsDispatchAsync<ExistsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/IndicesExists/IndexExistsResponse.cs b/src/Nest/Indices/IndexManagement/IndicesExists/IndexExistsResponse.cs
index 81853835afa..2ccf583295f 100644
--- a/src/Nest/Indices/IndexManagement/IndicesExists/IndexExistsResponse.cs
+++ b/src/Nest/Indices/IndexManagement/IndicesExists/IndexExistsResponse.cs
@@ -1,5 +1,4 @@
-using Elasticsearch.Net;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -11,6 +10,6 @@ public interface IExistsResponse : IResponse
 	[JsonObject]
 	public class ExistsResponse : ResponseBase, IExistsResponse
 	{
-		public bool Exists => this.ApiCall != null && this.ApiCall.Success && this.ApiCall.HttpStatusCode == 200;
+		public bool Exists => ApiCall != null && ApiCall.Success && ApiCall.HttpStatusCode == 200;
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexResponse.cs b/src/Nest/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexResponse.cs
index 635f69106e0..43cd1007110 100644
--- a/src/Nest/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexResponse.cs
+++ b/src/Nest/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface ICloseIndexResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Indices/IndexManagement/OpenCloseIndex/CloseIndex/ElasticClient-CloseIndex.cs b/src/Nest/Indices/IndexManagement/OpenCloseIndex/CloseIndex/ElasticClient-CloseIndex.cs
index bb0c00f3d30..7632218a257 100644
--- a/src/Nest/Indices/IndexManagement/OpenCloseIndex/CloseIndex/ElasticClient-CloseIndex.cs
+++ b/src/Nest/Indices/IndexManagement/OpenCloseIndex/CloseIndex/ElasticClient-CloseIndex.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -12,51 +12,53 @@ public partial interface IElasticClient
 		/// A closed index has almost no overhead on the cluster (except for maintaining its metadata), and is blocked
 		/// for read/write operations.
 		/// A closed index can be opened which will then go through the normal recovery process.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-open-close.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-open-close.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-open-close.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-open-close.html</a>
 		/// </summary>
 		/// <param name="selector">A descriptor thata describes the close index operation</param>
 		ICloseIndexResponse CloseIndex(Indices indices, Func<CloseIndexDescriptor, ICloseIndexRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICloseIndexResponse CloseIndex(ICloseIndexRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICloseIndexResponse> CloseIndexAsync(
 			Indices indices,
 			Func<CloseIndexDescriptor, ICloseIndexRequest> selector = null,
-			CancellationToken cancellationToken = default(CancellationToken));
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICloseIndexResponse> CloseIndexAsync(ICloseIndexRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICloseIndexResponse CloseIndex(Indices indices, Func<CloseIndexDescriptor, ICloseIndexRequest> selector = null) =>
-			this.CloseIndex(selector.InvokeOrDefault(new CloseIndexDescriptor(indices)));
+			CloseIndex(selector.InvokeOrDefault(new CloseIndexDescriptor(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICloseIndexResponse CloseIndex(ICloseIndexRequest request) =>
-			this.Dispatcher.Dispatch<ICloseIndexRequest, CloseIndexRequestParameters, CloseIndexResponse>(
+			Dispatcher.Dispatch<ICloseIndexRequest, CloseIndexRequestParameters, CloseIndexResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesCloseDispatch<CloseIndexResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesCloseDispatch<CloseIndexResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICloseIndexResponse> CloseIndexAsync(
 			Indices indices,
 			Func<CloseIndexDescriptor, ICloseIndexRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.CloseIndexAsync(selector.InvokeOrDefault(new CloseIndexDescriptor(indices)), cancellationToken);
+		) => CloseIndexAsync(selector.InvokeOrDefault(new CloseIndexDescriptor(indices)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ICloseIndexResponse> CloseIndexAsync(ICloseIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ICloseIndexRequest, CloseIndexRequestParameters, CloseIndexResponse, ICloseIndexResponse>(
+		/// <inheritdoc />
+		public Task<ICloseIndexResponse> CloseIndexAsync(ICloseIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ICloseIndexRequest, CloseIndexRequestParameters, CloseIndexResponse, ICloseIndexResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesCloseDispatchAsync<CloseIndexResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesCloseDispatchAsync<CloseIndexResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/OpenCloseIndex/OpenIndex/ElasticClient-OpenIndex.cs b/src/Nest/Indices/IndexManagement/OpenCloseIndex/OpenIndex/ElasticClient-OpenIndex.cs
index 3b6e0ed649d..b1812e54747 100644
--- a/src/Nest/Indices/IndexManagement/OpenCloseIndex/OpenIndex/ElasticClient-OpenIndex.cs
+++ b/src/Nest/Indices/IndexManagement/OpenCloseIndex/OpenIndex/ElasticClient-OpenIndex.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -12,51 +12,52 @@ public partial interface IElasticClient
 		/// A closed index has almost no overhead on the cluster (except for maintaining its metadata), and is blocked
 		/// for read/write operations.
 		/// A closed index can be opened which will then go through the normal recovery process.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-open-close.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-open-close.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the open index operation</param>
 		IOpenIndexResponse OpenIndex(Indices indices, Func<OpenIndexDescriptor, IOpenIndexRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IOpenIndexResponse OpenIndex(IOpenIndexRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IOpenIndexResponse> OpenIndexAsync(
 			Indices indices,
 			Func<OpenIndexDescriptor, IOpenIndexRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IOpenIndexResponse> OpenIndexAsync(IOpenIndexRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IOpenIndexResponse OpenIndex(Indices indices, Func<OpenIndexDescriptor, IOpenIndexRequest> selector = null) =>
-			this.OpenIndex(selector.InvokeOrDefault(new OpenIndexDescriptor(indices)));
+			OpenIndex(selector.InvokeOrDefault(new OpenIndexDescriptor(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IOpenIndexResponse OpenIndex(IOpenIndexRequest request) =>
-			this.Dispatcher.Dispatch<IOpenIndexRequest, OpenIndexRequestParameters, OpenIndexResponse>(
+			Dispatcher.Dispatch<IOpenIndexRequest, OpenIndexRequestParameters, OpenIndexResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesOpenDispatch<OpenIndexResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesOpenDispatch<OpenIndexResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IOpenIndexResponse> OpenIndexAsync(
 			Indices indices,
 			Func<OpenIndexDescriptor, IOpenIndexRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.OpenIndexAsync(selector.InvokeOrDefault(new OpenIndexDescriptor(indices)), cancellationToken);
+		) => OpenIndexAsync(selector.InvokeOrDefault(new OpenIndexDescriptor(indices)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IOpenIndexResponse> OpenIndexAsync(IOpenIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IOpenIndexRequest, OpenIndexRequestParameters, OpenIndexResponse, IOpenIndexResponse>(
+			Dispatcher.DispatchAsync<IOpenIndexRequest, OpenIndexRequestParameters, OpenIndexResponse, IOpenIndexResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesOpenDispatchAsync<OpenIndexResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesOpenDispatchAsync<OpenIndexResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexResponse.cs b/src/Nest/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexResponse.cs
index 04cfc656b68..5b0c2f28f67 100644
--- a/src/Nest/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexResponse.cs
+++ b/src/Nest/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IOpenIndexResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Indices/IndexManagement/RolloverIndex/ElasticClient-RolloverIndex.cs b/src/Nest/Indices/IndexManagement/RolloverIndex/ElasticClient-RolloverIndex.cs
index b5a6bd34ab2..c04c65097e3 100644
--- a/src/Nest/Indices/IndexManagement/RolloverIndex/ElasticClient-RolloverIndex.cs
+++ b/src/Nest/Indices/IndexManagement/RolloverIndex/ElasticClient-RolloverIndex.cs
@@ -1,10 +1,7 @@
-using Elasticsearch.Net;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Elasticsearch.Net;
 
 namespace Nest
 {
@@ -20,31 +17,35 @@ Task<IRolloverIndexResponse> RolloverIndexAsync(
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		Task<IRolloverIndexResponse> RolloverIndexAsync(IRolloverIndexRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IRolloverIndexResponse> RolloverIndexAsync(IRolloverIndexRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
 		public IRolloverIndexResponse RolloverIndex(Name alias, Func<RolloverIndexDescriptor, IRolloverIndexRequest> selector = null) =>
-			this.RolloverIndex(selector.InvokeOrDefault(new RolloverIndexDescriptor(alias)));
+			RolloverIndex(selector.InvokeOrDefault(new RolloverIndexDescriptor(alias)));
 
 		public IRolloverIndexResponse RolloverIndex(IRolloverIndexRequest request) =>
-			this.Dispatcher.Dispatch<IRolloverIndexRequest, RolloverIndexRequestParameters, RolloverIndexResponse>(
+			Dispatcher.Dispatch<IRolloverIndexRequest, RolloverIndexRequestParameters, RolloverIndexResponse>(
 				request,
-				this.LowLevelDispatch.IndicesRolloverDispatch<RolloverIndexResponse>
+				LowLevelDispatch.IndicesRolloverDispatch<RolloverIndexResponse>
 			);
 
 		public Task<IRolloverIndexResponse> RolloverIndexAsync(
 			Name alias,
 			Func<RolloverIndexDescriptor, IRolloverIndexRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.RolloverIndexAsync(selector.InvokeOrDefault(new RolloverIndexDescriptor(alias)));
+		) => RolloverIndexAsync(selector.InvokeOrDefault(new RolloverIndexDescriptor(alias)));
 
-		public Task<IRolloverIndexResponse> RolloverIndexAsync(IRolloverIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRolloverIndexRequest, RolloverIndexRequestParameters, RolloverIndexResponse, IRolloverIndexResponse>(
+		public Task<IRolloverIndexResponse> RolloverIndexAsync(IRolloverIndexRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IRolloverIndexRequest, RolloverIndexRequestParameters, RolloverIndexResponse, IRolloverIndexResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesRolloverDispatchAsync<RolloverIndexResponse>
+				LowLevelDispatch.IndicesRolloverDispatchAsync<RolloverIndexResponse>
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverConditions.cs b/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverConditions.cs
index 8b6a4a7565d..4b721138f23 100644
--- a/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverConditions.cs
+++ b/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverConditions.cs
@@ -1,9 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -34,7 +29,7 @@ public interface IRolloverConditions
 		/// Valid in Elasticsearch 6.1.0+
 		/// </remarks>
 		[JsonProperty("max_size")]
-		string MaxSize{ get; set; }
+		string MaxSize { get; set; }
 	}
 
 	/// <inheritdoc />
@@ -50,7 +45,7 @@ public class RolloverConditions : IRolloverConditions
 		public string MaxSize { get; set; }
 	}
 
-	/// <inheritdoc cref="IRolloverConditions"/>
+	/// <inheritdoc cref="IRolloverConditions" />
 	public class RolloverConditionsDescriptor
 		: DescriptorBase<RolloverConditionsDescriptor, IRolloverConditions>, IRolloverConditions
 	{
@@ -58,13 +53,13 @@ public class RolloverConditionsDescriptor
 		long? IRolloverConditions.MaxDocs { get; set; }
 		string IRolloverConditions.MaxSize { get; set; }
 
-		/// <inheritdoc cref="IRolloverConditions.MaxAge"/>
+		/// <inheritdoc cref="IRolloverConditions.MaxAge" />
 		public RolloverConditionsDescriptor MaxAge(Time maxAge) => Assign(a => a.MaxAge = maxAge);
 
-		/// <inheritdoc cref="IRolloverConditions.MaxDocs"/>
+		/// <inheritdoc cref="IRolloverConditions.MaxDocs" />
 		public RolloverConditionsDescriptor MaxDocs(long? maxDocs) => Assign(a => a.MaxDocs = maxDocs);
 
-		/// <inheritdoc cref="IRolloverConditions.MaxSize"/>
+		/// <inheritdoc cref="IRolloverConditions.MaxSize" />
 		public RolloverConditionsDescriptor MaxSize(string maxSize) => Assign(a => a.MaxSize = maxSize);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverIndexRequest.cs b/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverIndexRequest.cs
index f50d976b308..dcac64337b3 100644
--- a/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverIndexRequest.cs
+++ b/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverIndexRequest.cs
@@ -1,9 +1,5 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -16,22 +12,21 @@ public partial interface IRolloverIndexRequest : IIndexState
 
 	public partial class RolloverIndexRequest
 	{
-		public IRolloverConditions Conditions { get; set; }
-
-		public IIndexSettings Settings { get; set; }
-
 		public IAliases Aliases { get; set; }
+		public IRolloverConditions Conditions { get; set; }
 
 		public IMappings Mappings { get; set; }
+
+		public IIndexSettings Settings { get; set; }
 	}
 
 	[DescriptorFor("IndicesRollover")]
 	public partial class RolloverIndexDescriptor
 	{
+		IAliases IIndexState.Aliases { get; set; }
 		IRolloverConditions IRolloverIndexRequest.Conditions { get; set; }
-		IIndexSettings IIndexState.Settings { get; set; }
 		IMappings IIndexState.Mappings { get; set; }
-		IAliases IIndexState.Aliases { get; set; }
+		IIndexSettings IIndexState.Settings { get; set; }
 
 		public RolloverIndexDescriptor Conditions(Func<RolloverConditionsDescriptor, IRolloverConditions> selector) =>
 			Assign(a => a.Conditions = selector?.Invoke(new RolloverConditionsDescriptor()));
diff --git a/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverIndexResponse.cs b/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverIndexResponse.cs
index 124f1ed29ca..43f22fec363 100644
--- a/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverIndexResponse.cs
+++ b/src/Nest/Indices/IndexManagement/RolloverIndex/RolloverIndexResponse.cs
@@ -1,36 +1,33 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IRolloverIndexResponse : IAcknowledgedResponse
 	{
-		[JsonProperty("old_index")]
-		string OldIndex { get; }
+		[JsonProperty("conditions")]
+		IReadOnlyDictionary<string, bool> Conditions { get; }
+
+		[JsonProperty("dry_run")]
+		bool DryRun { get; }
 
 		[JsonProperty("new_index")]
 		string NewIndex { get; }
 
+		[JsonProperty("old_index")]
+		string OldIndex { get; }
+
 		[JsonProperty("rolled_over")]
 		bool RolledOver { get; }
 
-		[JsonProperty("dry_run")]
-		bool DryRun { get; }
-
-		[JsonProperty("conditions")]
-		IReadOnlyDictionary<string, bool> Conditions { get; }
-
 		[JsonProperty("shards_acknowledged")]
 		bool ShardsAcknowledged { get; }
 	}
 
 	public class RolloverIndexResponse : AcknowledgedResponseBase, IRolloverIndexResponse
 	{
+		public IReadOnlyDictionary<string, bool> Conditions { get; internal set; } = EmptyReadOnly<string, bool>.Dictionary;
 		public bool DryRun { get; internal set; }
 
 		public string NewIndex { get; internal set; }
@@ -39,8 +36,6 @@ public class RolloverIndexResponse : AcknowledgedResponseBase, IRolloverIndexRes
 
 		public bool RolledOver { get; internal set; }
 
-		public IReadOnlyDictionary<string, bool> Conditions { get; internal set; } = EmptyReadOnly<string, bool>.Dictionary;
-
 		public bool ShardsAcknowledged { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/ShrinkIndex/ElasticClient-ShrinkIndex.cs b/src/Nest/Indices/IndexManagement/ShrinkIndex/ElasticClient-ShrinkIndex.cs
index 99872964cf5..45f6e8d8091 100644
--- a/src/Nest/Indices/IndexManagement/ShrinkIndex/ElasticClient-ShrinkIndex.cs
+++ b/src/Nest/Indices/IndexManagement/ShrinkIndex/ElasticClient-ShrinkIndex.cs
@@ -1,10 +1,7 @@
-using Elasticsearch.Net;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Elasticsearch.Net;
 
 namespace Nest
 {
@@ -26,13 +23,14 @@ Task<IShrinkIndexResponse> ShrinkIndexAsync(
 
 	public partial class ElasticClient
 	{
-		public IShrinkIndexResponse ShrinkIndex(IndexName source, IndexName target, Func<ShrinkIndexDescriptor, IShrinkIndexRequest> selector = null) =>
-			this.ShrinkIndex(selector.InvokeOrDefault(new ShrinkIndexDescriptor(source, target)));
+		public IShrinkIndexResponse ShrinkIndex(IndexName source, IndexName target, Func<ShrinkIndexDescriptor, IShrinkIndexRequest> selector = null
+		) =>
+			ShrinkIndex(selector.InvokeOrDefault(new ShrinkIndexDescriptor(source, target)));
 
 		public IShrinkIndexResponse ShrinkIndex(IShrinkIndexRequest request) =>
-			this.Dispatcher.Dispatch<IShrinkIndexRequest, ShrinkIndexRequestParameters, ShrinkIndexResponse>(
+			Dispatcher.Dispatch<IShrinkIndexRequest, ShrinkIndexRequestParameters, ShrinkIndexResponse>(
 				request,
-				this.LowLevelDispatch.IndicesShrinkDispatch<ShrinkIndexResponse>
+				LowLevelDispatch.IndicesShrinkDispatch<ShrinkIndexResponse>
 			);
 
 		public Task<IShrinkIndexResponse> ShrinkIndexAsync(
@@ -40,13 +38,15 @@ public Task<IShrinkIndexResponse> ShrinkIndexAsync(
 			IndexName target,
 			Func<ShrinkIndexDescriptor, IShrinkIndexRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.ShrinkIndexAsync(selector.InvokeOrDefault(new ShrinkIndexDescriptor(source, target)));
+		) => ShrinkIndexAsync(selector.InvokeOrDefault(new ShrinkIndexDescriptor(source, target)));
 
-		public Task<IShrinkIndexResponse> ShrinkIndexAsync(IShrinkIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IShrinkIndexRequest, ShrinkIndexRequestParameters, ShrinkIndexResponse, IShrinkIndexResponse>(
+		public Task<IShrinkIndexResponse> ShrinkIndexAsync(IShrinkIndexRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IShrinkIndexRequest, ShrinkIndexRequestParameters, ShrinkIndexResponse, IShrinkIndexResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesShrinkDispatchAsync<ShrinkIndexResponse>
+				LowLevelDispatch.IndicesShrinkDispatchAsync<ShrinkIndexResponse>
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/ShrinkIndex/ShrinkIndexRequest.cs b/src/Nest/Indices/IndexManagement/ShrinkIndex/ShrinkIndexRequest.cs
index 18015bf1815..ffde2705689 100644
--- a/src/Nest/Indices/IndexManagement/ShrinkIndex/ShrinkIndexRequest.cs
+++ b/src/Nest/Indices/IndexManagement/ShrinkIndex/ShrinkIndexRequest.cs
@@ -1,20 +1,16 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<ShrinkIndexRequest>))]
 	public partial interface IShrinkIndexRequest
 	{
-		[JsonProperty("settings")]
-		IIndexSettings Settings { get; set; }
-
 		[JsonProperty("aliases")]
 		IAliases Aliases { get; set; }
+
+		[JsonProperty("settings")]
+		IIndexSettings Settings { get; set; }
 	}
 
 	public partial class ShrinkIndexRequest
@@ -22,17 +18,16 @@ public partial class ShrinkIndexRequest
 		// For ReadAsType()
 		internal ShrinkIndexRequest() { }
 
-		public IIndexSettings Settings { get; set; }
-
 		public IAliases Aliases { get; set; }
+
+		public IIndexSettings Settings { get; set; }
 	}
 
 	[DescriptorFor("IndicesShrink")]
 	public partial class ShrinkIndexDescriptor
 	{
-		IIndexSettings IShrinkIndexRequest.Settings { get; set; }
-
 		IAliases IShrinkIndexRequest.Aliases { get; set; }
+		IIndexSettings IShrinkIndexRequest.Settings { get; set; }
 
 		public ShrinkIndexDescriptor Settings(Func<IndexSettingsDescriptor, IPromise<IIndexSettings>> selector) =>
 			Assign(a => a.Settings = selector?.Invoke(new IndexSettingsDescriptor())?.Value);
diff --git a/src/Nest/Indices/IndexManagement/ShrinkIndex/ShrinkIndexResponse.cs b/src/Nest/Indices/IndexManagement/ShrinkIndex/ShrinkIndexResponse.cs
index e31855c982a..f0224e50ed3 100644
--- a/src/Nest/Indices/IndexManagement/ShrinkIndex/ShrinkIndexResponse.cs
+++ b/src/Nest/Indices/IndexManagement/ShrinkIndex/ShrinkIndexResponse.cs
@@ -1,9 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
diff --git a/src/Nest/Indices/IndexManagement/SplitIndex/ElasticClient-SplitIndex.cs b/src/Nest/Indices/IndexManagement/SplitIndex/ElasticClient-SplitIndex.cs
index 5f7bde3ef48..1b7869631dd 100644
--- a/src/Nest/Indices/IndexManagement/SplitIndex/ElasticClient-SplitIndex.cs
+++ b/src/Nest/Indices/IndexManagement/SplitIndex/ElasticClient-SplitIndex.cs
@@ -1,10 +1,7 @@
-using Elasticsearch.Net;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Elasticsearch.Net;
 
 namespace Nest
 {
@@ -40,13 +37,13 @@ public partial class ElasticClient
 	{
 		/// <inheritdoc />
 		public ISplitIndexResponse SplitIndex(IndexName source, IndexName target, Func<SplitIndexDescriptor, ISplitIndexRequest> selector = null) =>
-			this.SplitIndex(selector.InvokeOrDefault(new SplitIndexDescriptor(source, target)));
+			SplitIndex(selector.InvokeOrDefault(new SplitIndexDescriptor(source, target)));
 
 		/// <inheritdoc />
 		public ISplitIndexResponse SplitIndex(ISplitIndexRequest request) =>
-			this.Dispatcher.Dispatch<ISplitIndexRequest, SplitIndexRequestParameters, SplitIndexResponse>(
+			Dispatcher.Dispatch<ISplitIndexRequest, SplitIndexRequestParameters, SplitIndexResponse>(
 				request,
-				this.LowLevelDispatch.IndicesSplitDispatch<SplitIndexResponse>
+				LowLevelDispatch.IndicesSplitDispatch<SplitIndexResponse>
 			);
 
 		/// <inheritdoc />
@@ -54,15 +51,17 @@ public Task<ISplitIndexResponse> SplitIndexAsync(
 			IndexName source,
 			IndexName target,
 			Func<SplitIndexDescriptor, ISplitIndexRequest> selector = null,
-			CancellationToken cancellationToken = default(CancellationToken)) =>
-				this.SplitIndexAsync(selector.InvokeOrDefault(new SplitIndexDescriptor(source, target)));
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			SplitIndexAsync(selector.InvokeOrDefault(new SplitIndexDescriptor(source, target)));
 
 		/// <inheritdoc />
-		public Task<ISplitIndexResponse> SplitIndexAsync(ISplitIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ISplitIndexRequest, SplitIndexRequestParameters, SplitIndexResponse, ISplitIndexResponse>(
+		public Task<ISplitIndexResponse> SplitIndexAsync(ISplitIndexRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ISplitIndexRequest, SplitIndexRequestParameters, SplitIndexResponse, ISplitIndexResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesSplitDispatchAsync<SplitIndexResponse>
+				LowLevelDispatch.IndicesSplitDispatchAsync<SplitIndexResponse>
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexManagement/SplitIndex/SplitIndexRequest.cs b/src/Nest/Indices/IndexManagement/SplitIndex/SplitIndexRequest.cs
index 546e7ebe0b1..ed6bee67ebb 100644
--- a/src/Nest/Indices/IndexManagement/SplitIndex/SplitIndexRequest.cs
+++ b/src/Nest/Indices/IndexManagement/SplitIndex/SplitIndexRequest.cs
@@ -1,9 +1,5 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -14,44 +10,44 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SplitIndexRequest>))]
 	public partial interface ISplitIndexRequest
 	{
-		/// <summary>
-		/// The settings for the target index
-		/// </summary>
-		[JsonProperty("settings")]
-		IIndexSettings Settings { get; set; }
-
 		/// <summary>
 		/// The aliases for the target index
 		/// </summary>
 		[JsonProperty("aliases")]
 		IAliases Aliases { get; set; }
+
+		/// <summary>
+		/// The settings for the target index
+		/// </summary>
+		[JsonProperty("settings")]
+		IIndexSettings Settings { get; set; }
 	}
 
-	/// <inheritdoc cref="ISplitIndexRequest"/>
+	/// <inheritdoc cref="ISplitIndexRequest" />
 	public partial class SplitIndexRequest
 	{
 		// For ReadAsType()
 		internal SplitIndexRequest() { }
 
 		/// <inheritdoc />
-		public IIndexSettings Settings { get; set; }
+		public IAliases Aliases { get; set; }
 
 		/// <inheritdoc />
-		public IAliases Aliases { get; set; }
+		public IIndexSettings Settings { get; set; }
 	}
 
-	/// <inheritdoc cref="ISplitIndexRequest"/>
+	/// <inheritdoc cref="ISplitIndexRequest" />
 	[DescriptorFor("IndicesSplit")]
 	public partial class SplitIndexDescriptor
 	{
-		IIndexSettings ISplitIndexRequest.Settings { get; set; }
 		IAliases ISplitIndexRequest.Aliases { get; set; }
+		IIndexSettings ISplitIndexRequest.Settings { get; set; }
 
-		/// <inheritdoc cref="ISplitIndexRequest.Settings"/>
+		/// <inheritdoc cref="ISplitIndexRequest.Settings" />
 		public SplitIndexDescriptor Settings(Func<IndexSettingsDescriptor, IPromise<IIndexSettings>> selector) =>
 			Assign(a => a.Settings = selector?.Invoke(new IndexSettingsDescriptor())?.Value);
 
-		/// <inheritdoc cref="ISplitIndexRequest.Aliases"/>
+		/// <inheritdoc cref="ISplitIndexRequest.Aliases" />
 		public SplitIndexDescriptor Aliases(Func<AliasesDescriptor, IPromise<IAliases>> selector) =>
 			Assign(a => a.Aliases = selector?.Invoke(new AliasesDescriptor())?.Value);
 	}
diff --git a/src/Nest/Indices/IndexManagement/SplitIndex/SplitIndexResponse.cs b/src/Nest/Indices/IndexManagement/SplitIndex/SplitIndexResponse.cs
index 1a2f6638c8d..9eafc3de65a 100644
--- a/src/Nest/Indices/IndexManagement/SplitIndex/SplitIndexResponse.cs
+++ b/src/Nest/Indices/IndexManagement/SplitIndex/SplitIndexResponse.cs
@@ -1,9 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
diff --git a/src/Nest/Indices/IndexManagement/TypesExists/ElasticClient-TypeExists.cs b/src/Nest/Indices/IndexManagement/TypesExists/ElasticClient-TypeExists.cs
index 905bec24fd1..63400addc6a 100644
--- a/src/Nest/Indices/IndexManagement/TypesExists/ElasticClient-TypeExists.cs
+++ b/src/Nest/Indices/IndexManagement/TypesExists/ElasticClient-TypeExists.cs
@@ -1,52 +1,55 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using TypeExistConverter = Func<IApiCallDetails, Stream, ExistsResponse>;
 
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExistsResponse TypeExists(Indices indices, Types types, Func<TypeExistsDescriptor, ITypeExistsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExistsResponse TypeExists(ITypeExistsRequest request);
 
-		/// <inheritdoc/>
-		Task<IExistsResponse> TypeExistsAsync(Indices indices, Types types, Func<TypeExistsDescriptor, ITypeExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IExistsResponse> TypeExistsAsync(Indices indices, Types types, Func<TypeExistsDescriptor, ITypeExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IExistsResponse> TypeExistsAsync(ITypeExistsRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse TypeExists(Indices indices, Types types, Func<TypeExistsDescriptor, ITypeExistsRequest> selector = null) =>
-			this.TypeExists(selector.InvokeOrDefault(new TypeExistsDescriptor(indices, types)));
+			TypeExists(selector.InvokeOrDefault(new TypeExistsDescriptor(indices, types)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse TypeExists(ITypeExistsRequest request) =>
-			this.Dispatcher.Dispatch<ITypeExistsRequest, TypeExistsRequestParameters, ExistsResponse>(
+			Dispatcher.Dispatch<ITypeExistsRequest, TypeExistsRequestParameters, ExistsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesExistsTypeDispatch<ExistsResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesExistsTypeDispatch<ExistsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IExistsResponse> TypeExistsAsync(Indices indices, Types types, Func<TypeExistsDescriptor, ITypeExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.TypeExistsAsync(selector.InvokeOrDefault(new TypeExistsDescriptor(indices, types)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IExistsResponse> TypeExistsAsync(Indices indices, Types types, Func<TypeExistsDescriptor, ITypeExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			TypeExistsAsync(selector.InvokeOrDefault(new TypeExistsDescriptor(indices, types)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IExistsResponse> TypeExistsAsync(ITypeExistsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ITypeExistsRequest, TypeExistsRequestParameters, ExistsResponse, IExistsResponse>(
+			Dispatcher.DispatchAsync<ITypeExistsRequest, TypeExistsRequestParameters, ExistsResponse, IExistsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesExistsTypeDispatchAsync<ExistsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesExistsTypeDispatchAsync<ExistsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/GetIndexSettings/ElasticClient-GetIndexSettings.cs b/src/Nest/Indices/IndexSettings/GetIndexSettings/ElasticClient-GetIndexSettings.cs
index 677862a5dd0..d75eeab1736 100644
--- a/src/Nest/Indices/IndexSettings/GetIndexSettings/ElasticClient-GetIndexSettings.cs
+++ b/src/Nest/Indices/IndexSettings/GetIndexSettings/ElasticClient-GetIndexSettings.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,44 +9,54 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The get settings API allows to retrieve settings of index/indices.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-get-settings.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-get-settings.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the get index settings operation</param>
 		IGetIndexSettingsResponse GetIndexSettings(Func<GetIndexSettingsDescriptor, IGetIndexSettingsRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetIndexSettingsResponse GetIndexSettings(IGetIndexSettingsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetIndexSettingsResponse> GetIndexSettingsAsync(Func<GetIndexSettingsDescriptor, IGetIndexSettingsRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetIndexSettingsResponse> GetIndexSettingsAsync(Func<GetIndexSettingsDescriptor, IGetIndexSettingsRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetIndexSettingsResponse> GetIndexSettingsAsync(IGetIndexSettingsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetIndexSettingsResponse> GetIndexSettingsAsync(IGetIndexSettingsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetIndexSettingsResponse GetIndexSettings(Func<GetIndexSettingsDescriptor, IGetIndexSettingsRequest> selector) =>
-			this.GetIndexSettings(selector?.Invoke(new GetIndexSettingsDescriptor()));
+			GetIndexSettings(selector?.Invoke(new GetIndexSettingsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetIndexSettingsResponse GetIndexSettings(IGetIndexSettingsRequest request) =>
-			this.Dispatcher.Dispatch<IGetIndexSettingsRequest, GetIndexSettingsRequestParameters, GetIndexSettingsResponse>(
+			Dispatcher.Dispatch<IGetIndexSettingsRequest, GetIndexSettingsRequestParameters, GetIndexSettingsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesGetSettingsDispatch<GetIndexSettingsResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesGetSettingsDispatch<GetIndexSettingsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetIndexSettingsResponse> GetIndexSettingsAsync(Func<GetIndexSettingsDescriptor, IGetIndexSettingsRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetIndexSettingsAsync(selector?.Invoke(new GetIndexSettingsDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetIndexSettingsResponse> GetIndexSettingsAsync(IGetIndexSettingsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetIndexSettingsRequest, GetIndexSettingsRequestParameters, GetIndexSettingsResponse, IGetIndexSettingsResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesGetSettingsDispatchAsync<GetIndexSettingsResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IGetIndexSettingsResponse> GetIndexSettingsAsync(Func<GetIndexSettingsDescriptor, IGetIndexSettingsRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetIndexSettingsAsync(selector?.Invoke(new GetIndexSettingsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetIndexSettingsResponse> GetIndexSettingsAsync(IGetIndexSettingsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetIndexSettingsRequest, GetIndexSettingsRequestParameters, GetIndexSettingsResponse, IGetIndexSettingsResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.IndicesGetSettingsDispatchAsync<GetIndexSettingsResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateResponse.cs b/src/Nest/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateResponse.cs
index f26d0105df7..35e56f53224 100644
--- a/src/Nest/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateResponse.cs
+++ b/src/Nest/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IDeleteIndexTemplateResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/ElasticClient-DeleteIndexTemplate.cs b/src/Nest/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/ElasticClient-DeleteIndexTemplate.cs
index 219cfcb845a..7b32843788f 100644
--- a/src/Nest/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/ElasticClient-DeleteIndexTemplate.cs
+++ b/src/Nest/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/ElasticClient-DeleteIndexTemplate.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,53 +9,61 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Deletes an index template
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html#delete">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html#delete</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html#delete">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html#delete</a>
 		/// </summary>
 		/// <param name="name">The name of the template to delete</param>
 		/// <param name="selector">An optional selector specifying additional parameters for the delete template operation</param>
 		IDeleteIndexTemplateResponse DeleteIndexTemplate(Name name, Func<DeleteIndexTemplateDescriptor, IDeleteIndexTemplateRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteIndexTemplateResponse DeleteIndexTemplate(IDeleteIndexTemplateRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteIndexTemplateResponse> DeleteIndexTemplateAsync(
 			Name name,
 			Func<DeleteIndexTemplateDescriptor, IDeleteIndexTemplateRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<IDeleteIndexTemplateResponse> DeleteIndexTemplateAsync(IDeleteIndexTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<IDeleteIndexTemplateResponse> DeleteIndexTemplateAsync(IDeleteIndexTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IDeleteIndexTemplateResponse DeleteIndexTemplate(Name name, Func<DeleteIndexTemplateDescriptor, IDeleteIndexTemplateRequest> selector = null) =>
-			this.DeleteIndexTemplate(selector.InvokeOrDefault(new DeleteIndexTemplateDescriptor(name)));
+		/// <inheritdoc />
+		public IDeleteIndexTemplateResponse DeleteIndexTemplate(Name name,
+			Func<DeleteIndexTemplateDescriptor, IDeleteIndexTemplateRequest> selector = null
+		) =>
+			DeleteIndexTemplate(selector.InvokeOrDefault(new DeleteIndexTemplateDescriptor(name)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteIndexTemplateResponse DeleteIndexTemplate(IDeleteIndexTemplateRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteIndexTemplateRequest, DeleteIndexTemplateRequestParameters, DeleteIndexTemplateResponse>(
+			Dispatcher.Dispatch<IDeleteIndexTemplateRequest, DeleteIndexTemplateRequestParameters, DeleteIndexTemplateResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesDeleteTemplateDispatch<DeleteIndexTemplateResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesDeleteTemplateDispatch<DeleteIndexTemplateResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IDeleteIndexTemplateResponse> DeleteIndexTemplateAsync(
 			Name name, Func<DeleteIndexTemplateDescriptor,
-			IDeleteIndexTemplateRequest> selector = null,
+				IDeleteIndexTemplateRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.DeleteIndexTemplateAsync(selector.InvokeOrDefault(new DeleteIndexTemplateDescriptor(name)), cancellationToken);
+		) => DeleteIndexTemplateAsync(selector.InvokeOrDefault(new DeleteIndexTemplateDescriptor(name)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeleteIndexTemplateResponse> DeleteIndexTemplateAsync(IDeleteIndexTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteIndexTemplateRequest, DeleteIndexTemplateRequestParameters, DeleteIndexTemplateResponse, IDeleteIndexTemplateResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesDeleteTemplateDispatchAsync<DeleteIndexTemplateResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IDeleteIndexTemplateResponse> DeleteIndexTemplateAsync(IDeleteIndexTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IDeleteIndexTemplateRequest, DeleteIndexTemplateRequestParameters, DeleteIndexTemplateResponse,
+					IDeleteIndexTemplateResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.IndicesDeleteTemplateDispatchAsync<DeleteIndexTemplateResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/ElasticClient-GetIndexTemplate.cs b/src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/ElasticClient-GetIndexTemplate.cs
index 62d3054d65b..8f19fd08319 100644
--- a/src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/ElasticClient-GetIndexTemplate.cs
+++ b/src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/ElasticClient-GetIndexTemplate.cs
@@ -1,61 +1,65 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using GetIndexTemplateConverter = Func<IApiCallDetails, Stream, GetIndexTemplateResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Gets an index template
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html#getting
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html#getting
 		/// </summary>
 		/// <param name="selector">An optional selector specifying additional parameters for the get template operation</param>
 		IGetIndexTemplateResponse GetIndexTemplate(Func<GetIndexTemplateDescriptor, IGetIndexTemplateRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetIndexTemplateResponse GetIndexTemplate(IGetIndexTemplateRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetIndexTemplateResponse> GetIndexTemplateAsync(Func<GetIndexTemplateDescriptor, IGetIndexTemplateRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<IGetIndexTemplateResponse> GetIndexTemplateAsync(IGetIndexTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetIndexTemplateResponse> GetIndexTemplateAsync(Func<GetIndexTemplateDescriptor, IGetIndexTemplateRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<IGetIndexTemplateResponse> GetIndexTemplateAsync(IGetIndexTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetIndexTemplateResponse GetIndexTemplate(Func<GetIndexTemplateDescriptor, IGetIndexTemplateRequest> selector = null) =>
-			this.GetIndexTemplate(selector.InvokeOrDefault(new GetIndexTemplateDescriptor()));
+			GetIndexTemplate(selector.InvokeOrDefault(new GetIndexTemplateDescriptor()));
 
-		/// <inheritdoc/>
-		public IGetIndexTemplateResponse GetIndexTemplate(IGetIndexTemplateRequest request)
-		{
-			return this.Dispatcher.Dispatch<IGetIndexTemplateRequest, GetIndexTemplateRequestParameters, GetIndexTemplateResponse>(
+		/// <inheritdoc />
+		public IGetIndexTemplateResponse GetIndexTemplate(IGetIndexTemplateRequest request) =>
+			Dispatcher.Dispatch<IGetIndexTemplateRequest, GetIndexTemplateRequestParameters, GetIndexTemplateResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesGetTemplateDispatch<GetIndexTemplateResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesGetTemplateDispatch<GetIndexTemplateResponse>(p)
 			);
-		}
-
-		/// <inheritdoc/>
-		public Task<IGetIndexTemplateResponse> GetIndexTemplateAsync(Func<GetIndexTemplateDescriptor, IGetIndexTemplateRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetIndexTemplateAsync(selector.InvokeOrDefault(new GetIndexTemplateDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetIndexTemplateResponse> GetIndexTemplateAsync(IGetIndexTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetIndexTemplateRequest, GetIndexTemplateRequestParameters, GetIndexTemplateResponse, IGetIndexTemplateResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesGetTemplateDispatchAsync<GetIndexTemplateResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IGetIndexTemplateResponse> GetIndexTemplateAsync(Func<GetIndexTemplateDescriptor, IGetIndexTemplateRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetIndexTemplateAsync(selector.InvokeOrDefault(new GetIndexTemplateDescriptor()), cancellationToken);
 
+		/// <inheritdoc />
+		public Task<IGetIndexTemplateResponse> GetIndexTemplateAsync(IGetIndexTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetIndexTemplateRequest, GetIndexTemplateRequestParameters, GetIndexTemplateResponse, IGetIndexTemplateResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.IndicesGetTemplateDispatchAsync<GetIndexTemplateResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs b/src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs
index 5cf09c5d460..de95379b3fc 100644
--- a/src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs
+++ b/src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs
@@ -5,37 +5,36 @@ namespace Nest
 {
 	public interface ITemplateMapping
 	{
+		[JsonProperty("aliases")]
+		IAliases Aliases { get; set; }
+
 		[JsonProperty("index_patterns")]
 		IReadOnlyCollection<string> IndexPatterns { get; set; }
 
+		[JsonProperty("mappings")]
+		IMappings Mappings { get; set; }
+
 		[JsonProperty("order")]
 		int? Order { get; set; }
 
 		[JsonProperty("settings")]
 		IIndexSettings Settings { get; set; }
 
-		[JsonProperty("mappings")]
-		IMappings Mappings { get; set; }
-
-		[JsonProperty("aliases")]
-		IAliases Aliases { get; set; }
-
 		[JsonProperty("version")]
 		int? Version { get; set; }
 	}
 
 	public class TemplateMapping : ITemplateMapping
 	{
-		public IReadOnlyCollection<string> IndexPatterns {get;set;} = EmptyReadOnly<string>.Collection;
+		public IAliases Aliases { get; set; }
+		public IReadOnlyCollection<string> IndexPatterns { get; set; } = EmptyReadOnly<string>.Collection;
+
+		public IMappings Mappings { get; set; }
 
 		public int? Order { get; set; }
 
 		public IIndexSettings Settings { get; set; }
 
-		public IMappings Mappings { get; set; }
-
-		public IAliases Aliases { get; set; }
-
 		public int? Version { get; set; }
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/ElasticClient-IndexTemplateExists.cs b/src/Nest/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/ElasticClient-IndexTemplateExists.cs
index 11d96e46df3..ffcff5023b9 100644
--- a/src/Nest/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/ElasticClient-IndexTemplateExists.cs
+++ b/src/Nest/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/ElasticClient-IndexTemplateExists.cs
@@ -1,55 +1,60 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-	using System.Threading;
 	using IndexTemplateExistConverter = Func<IApiCallDetails, Stream, ExistsResponse>;
 
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExistsResponse IndexTemplateExists(Name template, Func<IndexTemplateExistsDescriptor, IIndexTemplateExistsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExistsResponse IndexTemplateExists(IIndexTemplateExistsRequest request);
 
-		/// <inheritdoc/>
-		Task<IExistsResponse> IndexTemplateExistsAsync(Name template, Func<IndexTemplateExistsDescriptor, IIndexTemplateExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<IExistsResponse> IndexTemplateExistsAsync(IIndexTemplateExistsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IExistsResponse> IndexTemplateExistsAsync(Name template,
+			Func<IndexTemplateExistsDescriptor, IIndexTemplateExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<IExistsResponse> IndexTemplateExistsAsync(IIndexTemplateExistsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse IndexTemplateExists(Name template, Func<IndexTemplateExistsDescriptor, IIndexTemplateExistsRequest> selector = null) =>
-			this.IndexTemplateExists(selector.InvokeOrDefault(new IndexTemplateExistsDescriptor(template)));
+			IndexTemplateExists(selector.InvokeOrDefault(new IndexTemplateExistsDescriptor(template)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExistsResponse IndexTemplateExists(IIndexTemplateExistsRequest request) =>
-			this.Dispatcher.Dispatch<IIndexTemplateExistsRequest, IndexTemplateExistsRequestParameters, ExistsResponse>(
-				request,
-				(p, d) => this.LowLevelDispatch.IndicesExistsTemplateDispatch<ExistsResponse>(p)
-			);
-
-		/// <inheritdoc/>
-		public Task<IExistsResponse> IndexTemplateExistsAsync(Name template, Func<IndexTemplateExistsDescriptor, IIndexTemplateExistsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.IndexTemplateExistsAsync(selector.InvokeOrDefault(new IndexTemplateExistsDescriptor(template)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IExistsResponse> IndexTemplateExistsAsync(IIndexTemplateExistsRequest request, CancellationToken cancellationToken = default(CancellationToken))
-		{
-			return this.Dispatcher.DispatchAsync<IIndexTemplateExistsRequest, IndexTemplateExistsRequestParameters, ExistsResponse, IExistsResponse>(
+			Dispatcher.Dispatch<IIndexTemplateExistsRequest, IndexTemplateExistsRequestParameters, ExistsResponse>(
 				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesExistsTemplateDispatchAsync<ExistsResponse>(p, c)
+				(p, d) => LowLevelDispatch.IndicesExistsTemplateDispatch<ExistsResponse>(p)
 			);
-		}
 
+		/// <inheritdoc />
+		public Task<IExistsResponse> IndexTemplateExistsAsync(Name template,
+			Func<IndexTemplateExistsDescriptor, IIndexTemplateExistsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			IndexTemplateExistsAsync(selector.InvokeOrDefault(new IndexTemplateExistsDescriptor(template)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IExistsResponse> IndexTemplateExistsAsync(IIndexTemplateExistsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) => Dispatcher.DispatchAsync<IIndexTemplateExistsRequest, IndexTemplateExistsRequestParameters, ExistsResponse, IExistsResponse>(
+			request,
+			cancellationToken,
+			(p, d, c) => LowLevelDispatch.IndicesExistsTemplateDispatchAsync<ExistsResponse>(p, c)
+		);
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/ElasticClient-PutIndexTemplate.cs b/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/ElasticClient-PutIndexTemplate.cs
index c2f7494a81f..c33d38b281b 100644
--- a/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/ElasticClient-PutIndexTemplate.cs
+++ b/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/ElasticClient-PutIndexTemplate.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,55 +9,63 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Index templates allow to define templates that will automatically be applied to new indices created.
-		/// <para>The templates include both settings and mappings, and a simple pattern template that controls if
-		/// the template will be applied to the index created. </para>
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html
+		/// <para>
+		/// The templates include both settings and mappings, and a simple pattern template that controls if
+		/// the template will be applied to the index created.
+		/// </para>
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html
 		/// </summary>
 		/// <param name="name">The name of the template to register</param>
 		/// <param name="selector">An optional selector specifying additional parameters for the put template operation</param>
 		IPutIndexTemplateResponse PutIndexTemplate(Name name, Func<PutIndexTemplateDescriptor, IPutIndexTemplateRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutIndexTemplateResponse PutIndexTemplate(IPutIndexTemplateRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutIndexTemplateResponse> PutIndexTemplateAsync(
 			Name name,
 			Func<PutIndexTemplateDescriptor,
-			IPutIndexTemplateRequest> selector,
+				IPutIndexTemplateRequest> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<IPutIndexTemplateResponse> PutIndexTemplateAsync(IPutIndexTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<IPutIndexTemplateResponse> PutIndexTemplateAsync(IPutIndexTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutIndexTemplateResponse PutIndexTemplate(Name name, Func<PutIndexTemplateDescriptor, IPutIndexTemplateRequest> selector) =>
-			this.PutIndexTemplate(selector.InvokeOrDefault(new PutIndexTemplateDescriptor(name)));
+			PutIndexTemplate(selector.InvokeOrDefault(new PutIndexTemplateDescriptor(name)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutIndexTemplateResponse PutIndexTemplate(IPutIndexTemplateRequest request) =>
-			this.Dispatcher.Dispatch<IPutIndexTemplateRequest, PutIndexTemplateRequestParameters, PutIndexTemplateResponse>(
+			Dispatcher.Dispatch<IPutIndexTemplateRequest, PutIndexTemplateRequestParameters, PutIndexTemplateResponse>(
 				request,
-				this.LowLevelDispatch.IndicesPutTemplateDispatch<PutIndexTemplateResponse>
+				LowLevelDispatch.IndicesPutTemplateDispatch<PutIndexTemplateResponse>
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IPutIndexTemplateResponse> PutIndexTemplateAsync(
 			Name name,
 			Func<PutIndexTemplateDescriptor, IPutIndexTemplateRequest> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.PutIndexTemplateAsync(selector.InvokeOrDefault(new PutIndexTemplateDescriptor(name)), cancellationToken);
+		) => PutIndexTemplateAsync(selector.InvokeOrDefault(new PutIndexTemplateDescriptor(name)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IPutIndexTemplateResponse> PutIndexTemplateAsync(IPutIndexTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutIndexTemplateRequest, PutIndexTemplateRequestParameters, PutIndexTemplateResponse, IPutIndexTemplateResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.IndicesPutTemplateDispatchAsync<PutIndexTemplateResponse>
-			);
+		/// <inheritdoc />
+		public Task<IPutIndexTemplateResponse> PutIndexTemplateAsync(IPutIndexTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IPutIndexTemplateRequest, PutIndexTemplateRequestParameters, PutIndexTemplateResponse, IPutIndexTemplateResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.IndicesPutTemplateDispatchAsync<PutIndexTemplateResponse>
+				);
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs b/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs
index 6f899dd69e3..da58dc96587 100644
--- a/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs
+++ b/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs
@@ -1,51 +1,46 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
 
 namespace Nest
 {
-	public partial interface IPutIndexTemplateRequest : ITemplateMapping
-	{
-	}
+	public partial interface IPutIndexTemplateRequest : ITemplateMapping { }
 
 	public partial class PutIndexTemplateRequest
 	{
-		public IReadOnlyCollection<string> IndexPatterns {get;set;}
+		public IAliases Aliases { get; set; }
+		public IReadOnlyCollection<string> IndexPatterns { get; set; }
 
-		public int? Order { get; set; }
+		public IMappings Mappings { get; set; }
 
-		public int? Version { get; set; }
+		public int? Order { get; set; }
 
 		public IIndexSettings Settings { get; set; }
 
-		public IMappings Mappings { get; set; }
-
-		public IAliases Aliases { get; set; }
+		public int? Version { get; set; }
 	}
 
 	[DescriptorFor("IndicesPutTemplate")]
 	public partial class PutIndexTemplateDescriptor
 	{
-		int? ITemplateMapping.Order { get; set; }
-
-		int? ITemplateMapping.Version { get; set; }
+		IAliases ITemplateMapping.Aliases { get; set; }
 
-		IIndexSettings ITemplateMapping.Settings { get; set; }
+		IReadOnlyCollection<string> ITemplateMapping.IndexPatterns { get; set; }
 
 		IMappings ITemplateMapping.Mappings { get; set; }
+		int? ITemplateMapping.Order { get; set; }
 
-		IAliases ITemplateMapping.Aliases { get; set; }
+		IIndexSettings ITemplateMapping.Settings { get; set; }
 
-		IReadOnlyCollection<string> ITemplateMapping.IndexPatterns { get; set; }
+		int? ITemplateMapping.Version { get; set; }
 
 		public PutIndexTemplateDescriptor Order(int? order) => Assign(a => a.Order = order);
 
 		public PutIndexTemplateDescriptor Version(int? version) => Assign(a => a.Version = version);
 
-		public PutIndexTemplateDescriptor IndexPatterns(params string[] patterns)=> Assign(a => a.IndexPatterns = patterns);
+		public PutIndexTemplateDescriptor IndexPatterns(params string[] patterns) => Assign(a => a.IndexPatterns = patterns);
 
-		public PutIndexTemplateDescriptor IndexPatterns(IEnumerable<string> patterns)=> Assign(a => a.IndexPatterns = patterns?.ToArray());
+		public PutIndexTemplateDescriptor IndexPatterns(IEnumerable<string> patterns) => Assign(a => a.IndexPatterns = patterns?.ToArray());
 
 		public PutIndexTemplateDescriptor Settings(Func<IndexSettingsDescriptor, IPromise<IIndexSettings>> settingsSelector) =>
 			Assign(a => a.Settings = settingsSelector?.Invoke(new IndexSettingsDescriptor())?.Value);
diff --git a/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateResponse.cs b/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateResponse.cs
index d2a1c00dac1..8eaaec474e3 100644
--- a/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateResponse.cs
+++ b/src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IPutIndexTemplateResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Indices/IndexSettings/UpdateIndexSettings/ElasticClient-UpdateIndexSettings.cs b/src/Nest/Indices/IndexSettings/UpdateIndexSettings/ElasticClient-UpdateIndexSettings.cs
index c0cee96a197..2188dfb01f9 100644
--- a/src/Nest/Indices/IndexSettings/UpdateIndexSettings/ElasticClient-UpdateIndexSettings.cs
+++ b/src/Nest/Indices/IndexSettings/UpdateIndexSettings/ElasticClient-UpdateIndexSettings.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,51 +9,60 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Change specific index level settings in real time. Note not all index settings CAN be updated.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-update-settings.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-update-settings.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-update-settings.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-update-settings.html</a>
 		/// </summary>
 		/// <param name="selector">A descriptor that strongly types all the updateable settings</param>
 		IUpdateIndexSettingsResponse UpdateIndexSettings(Indices indices, Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpdateIndexSettingsResponse UpdateIndexSettings(IUpdateIndexSettingsRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IUpdateIndexSettingsResponse> UpdateIndexSettingsAsync(
 			Indices indices,
 			Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<IUpdateIndexSettingsResponse> UpdateIndexSettingsAsync(IUpdateIndexSettingsRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<IUpdateIndexSettingsResponse> UpdateIndexSettingsAsync(IUpdateIndexSettingsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IUpdateIndexSettingsResponse UpdateIndexSettings(Indices indices, Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> selector) =>
-			this.UpdateIndexSettings(selector.InvokeOrDefault(new UpdateIndexSettingsDescriptor().Index(indices)));
+		/// <inheritdoc />
+		public IUpdateIndexSettingsResponse UpdateIndexSettings(Indices indices,
+			Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> selector
+		) =>
+			UpdateIndexSettings(selector.InvokeOrDefault(new UpdateIndexSettingsDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateIndexSettingsResponse UpdateIndexSettings(IUpdateIndexSettingsRequest request) =>
-			this.Dispatcher.Dispatch<IUpdateIndexSettingsRequest, UpdateIndexSettingsRequestParameters, UpdateIndexSettingsResponse>(
+			Dispatcher.Dispatch<IUpdateIndexSettingsRequest, UpdateIndexSettingsRequestParameters, UpdateIndexSettingsResponse>(
 				request,
-				this.LowLevelDispatch.IndicesPutSettingsDispatch<UpdateIndexSettingsResponse>
+				LowLevelDispatch.IndicesPutSettingsDispatch<UpdateIndexSettingsResponse>
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IUpdateIndexSettingsResponse> UpdateIndexSettingsAsync(
 			Indices indices,
 			Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> selector,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.UpdateIndexSettingsAsync(selector.InvokeOrDefault(new UpdateIndexSettingsDescriptor().Index(indices)), cancellationToken);
+		) => UpdateIndexSettingsAsync(selector.InvokeOrDefault(new UpdateIndexSettingsDescriptor().Index(indices)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IUpdateIndexSettingsResponse> UpdateIndexSettingsAsync(IUpdateIndexSettingsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IUpdateIndexSettingsRequest, UpdateIndexSettingsRequestParameters, UpdateIndexSettingsResponse, IUpdateIndexSettingsResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.IndicesPutSettingsDispatchAsync<UpdateIndexSettingsResponse>
-			);
+		/// <inheritdoc />
+		public Task<IUpdateIndexSettingsResponse> UpdateIndexSettingsAsync(IUpdateIndexSettingsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IUpdateIndexSettingsRequest, UpdateIndexSettingsRequestParameters, UpdateIndexSettingsResponse,
+					IUpdateIndexSettingsResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.IndicesPutSettingsDispatchAsync<UpdateIndexSettingsResponse>
+				);
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsRequest.cs b/src/Nest/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsRequest.cs
index 5d77b64c477..1886471f1e1 100644
--- a/src/Nest/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsRequest.cs
+++ b/src/Nest/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsRequest.cs
@@ -9,19 +9,18 @@ public partial interface IUpdateIndexSettingsRequest
 		IDynamicIndexSettings IndexSettings { get; set; }
 	}
 
-	public partial class UpdateIndexSettingsRequest 
+	public partial class UpdateIndexSettingsRequest
 	{
 		public IDynamicIndexSettings IndexSettings { get; set; }
 	}
 
 	[DescriptorFor("IndicesPutSettings")]
-	public partial class UpdateIndexSettingsDescriptor 
+	public partial class UpdateIndexSettingsDescriptor
 	{
 		IDynamicIndexSettings IUpdateIndexSettingsRequest.IndexSettings { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UpdateIndexSettingsDescriptor IndexSettings(Func<DynamicIndexSettingsDescriptor, IPromise<IDynamicIndexSettings>> settings) =>
 			Assign(a => a.IndexSettings = settings?.Invoke(new DynamicIndexSettingsDescriptor())?.Value);
-
 	}
 }
diff --git a/src/Nest/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsResponse.cs b/src/Nest/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsResponse.cs
index 16316068230..962fb08d4cf 100644
--- a/src/Nest/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsResponse.cs
+++ b/src/Nest/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IUpdateIndexSettingsResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Indices/MappingManagement/GetFieldMapping/ElasticClient-GetFieldMapping.cs b/src/Nest/Indices/MappingManagement/GetFieldMapping/ElasticClient-GetFieldMapping.cs
index 264901cd0ba..123689d1dbe 100644
--- a/src/Nest/Indices/MappingManagement/GetFieldMapping/ElasticClient-GetFieldMapping.cs
+++ b/src/Nest/Indices/MappingManagement/GetFieldMapping/ElasticClient-GetFieldMapping.cs
@@ -1,54 +1,62 @@
 using System;
-using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetFieldMappingResponse GetFieldMapping<T>(Fields fields, Func<GetFieldMappingDescriptor<T>, IGetFieldMappingRequest> selector = null)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetFieldMappingResponse GetFieldMapping(IGetFieldMappingRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetFieldMappingResponse> GetFieldMappingAsync<T>(Fields fields, Func<GetFieldMappingDescriptor<T>, IGetFieldMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IGetFieldMappingResponse> GetFieldMappingAsync<T>(Fields fields,
+			Func<GetFieldMappingDescriptor<T>, IGetFieldMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
-		Task<IGetFieldMappingResponse> GetFieldMappingAsync(IGetFieldMappingRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetFieldMappingResponse> GetFieldMappingAsync(IGetFieldMappingRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetFieldMappingResponse GetFieldMapping<T>(Fields fields, Func<GetFieldMappingDescriptor<T>, IGetFieldMappingRequest> selector = null)
 			where T : class =>
-			this.GetFieldMapping(selector.InvokeOrDefault(new GetFieldMappingDescriptor<T>(fields)));
+			GetFieldMapping(selector.InvokeOrDefault(new GetFieldMappingDescriptor<T>(fields)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetFieldMappingResponse GetFieldMapping(IGetFieldMappingRequest request) =>
-			this.Dispatcher.Dispatch<IGetFieldMappingRequest, GetFieldMappingRequestParameters, GetFieldMappingResponse>(
+			Dispatcher.Dispatch<IGetFieldMappingRequest, GetFieldMappingRequestParameters, GetFieldMappingResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesGetFieldMappingDispatch<GetFieldMappingResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesGetFieldMappingDispatch<GetFieldMappingResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetFieldMappingResponse> GetFieldMappingAsync<T>(Fields fields, Func<GetFieldMappingDescriptor<T>, IGetFieldMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<IGetFieldMappingResponse> GetFieldMappingAsync<T>(Fields fields,
+			Func<GetFieldMappingDescriptor<T>, IGetFieldMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.GetFieldMappingAsync(selector.InvokeOrDefault(new GetFieldMappingDescriptor<T>(fields)), cancellationToken);
+			GetFieldMappingAsync(selector.InvokeOrDefault(new GetFieldMappingDescriptor<T>(fields)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetFieldMappingResponse> GetFieldMappingAsync(IGetFieldMappingRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetFieldMappingRequest, GetFieldMappingRequestParameters, GetFieldMappingResponse, IGetFieldMappingResponse>(
+		/// <inheritdoc />
+		public Task<IGetFieldMappingResponse> GetFieldMappingAsync(IGetFieldMappingRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetFieldMappingRequest, GetFieldMappingRequestParameters, GetFieldMappingResponse, IGetFieldMappingResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesGetFieldMappingDispatchAsync<GetFieldMappingResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesGetFieldMappingDispatchAsync<GetFieldMappingResponse>(p, c)
 			);
-
 	}
 }
diff --git a/src/Nest/Indices/MappingManagement/GetFieldMapping/FieldMappingJsonConverter.cs b/src/Nest/Indices/MappingManagement/GetFieldMapping/FieldMappingJsonConverter.cs
index b098826b433..1ac6b070dc8 100644
--- a/src/Nest/Indices/MappingManagement/GetFieldMapping/FieldMappingJsonConverter.cs
+++ b/src/Nest/Indices/MappingManagement/GetFieldMapping/FieldMappingJsonConverter.cs
@@ -14,10 +14,8 @@ internal class FieldMappingJsonConverter : JsonConverter
 
 		public override bool CanConvert(Type objectType) => objectType == typeof(IDictionary<string, IFieldMapping>);
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
 			_dictionaryConverter.WriteJson(writer, value, serializer);
-		}
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
@@ -46,7 +44,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 				if (mapping is IProperty esType) esType.Name = name;
 				r.Add(name, mapping);
-
 			}
 			var settings = serializer.GetConnectionSettings();
 			return new ResolvableDictionaryProxy<Field, IFieldMapping>(settings, r);
diff --git a/src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs b/src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs
index c249a1118e0..ca4fb5bdc20 100644
--- a/src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs
+++ b/src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs
@@ -3,7 +3,7 @@
 	public partial interface IGetFieldMappingRequest { }
 
 	public partial class GetFieldMappingRequest { }
-	
+
 	[DescriptorFor("IndicesGetFieldMapping")]
 	public partial class GetFieldMappingDescriptor<T> where T : class { }
 }
diff --git a/src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingResponse.cs b/src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingResponse.cs
index b642065e09a..854e6293fcd 100644
--- a/src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingResponse.cs
+++ b/src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingResponse.cs
@@ -13,8 +13,10 @@ internal class FieldMappingPropertiesJsonConverter
 		protected override FieldMappingProperties Create(IConnectionSettingsValues s, Dictionary<Field, FieldMapping> d) =>
 			new FieldMappingProperties(s, d);
 	}
+
 	[JsonConverter(typeof(FieldMappingPropertiesJsonConverter))]
-	public class FieldMappingProperties : ResolvableDictionaryProxy<Field, FieldMapping> {
+	public class FieldMappingProperties : ResolvableDictionaryProxy<Field, FieldMapping>
+	{
 		internal FieldMappingProperties(IConnectionConfigurationValues connectionSettings, IReadOnlyDictionary<Field, FieldMapping> backingDictionary)
 			: base(connectionSettings, backingDictionary) { }
 	}
@@ -23,7 +25,8 @@ public class TypeFieldMappings
 	{
 		[JsonProperty("mappings")]
 		[JsonConverter(typeof(ResolvableDictionaryJsonConverter<TypeName, FieldMappingProperties>))]
-		public IReadOnlyDictionary<TypeName, FieldMappingProperties> Mappings { get; internal set; } = EmptyReadOnly<TypeName, FieldMappingProperties>.Dictionary;
+		public IReadOnlyDictionary<TypeName, FieldMappingProperties> Mappings { get; internal set; } =
+			EmptyReadOnly<TypeName, FieldMappingProperties>.Dictionary;
 	}
 
 	public class FieldMapping
@@ -54,30 +57,32 @@ public class GetFieldMappingResponse : DictionaryResponseBase<IndexName, TypeFie
 		public IReadOnlyDictionary<IndexName, TypeFieldMappings> Indices => Self.BackingDictionary;
 
 		//if you call get mapping on an existing type and index but no fields match you still get back a 200.
-		public override bool IsValid => base.IsValid && this.Indices.HasAny();
-
-		private FieldMappingProperties MappingsFor(IndexName index, TypeName type)
-		{
-			if (!this.Indices.TryGetValue(index, out var indexMapping) || indexMapping.Mappings == null) return null;
-			return !indexMapping.Mappings.TryGetValue(type, out var typeFieldMapping) ? null : typeFieldMapping;
-		}
+		public override bool IsValid => base.IsValid && Indices.HasAny();
 
 		public IFieldMapping GetMapping(IndexName index, TypeName type, Field property)
 		{
 			if (property == null) return null;
 
-			var mappings = this.MappingsFor(index, type);
+			var mappings = MappingsFor(index, type);
 			if (mappings == null) return null;
 
 			if (!mappings.TryGetValue(property, out var fieldMapping) || fieldMapping.Mapping == null) return null;
+
 			return fieldMapping.Mapping.TryGetValue(property, out var field) ? field : null;
 		}
 
 		public IFieldMapping MappingFor<T>(Field property, IndexName index, TypeName type) =>
-			this.GetMapping(index ?? Index<T>(), type ?? Type<T>(), property);
+			GetMapping(index ?? Index<T>(), type ?? Type<T>(), property);
 
 		public IFieldMapping MappingFor<T>(Expression<Func<T, object>> objectPath, IndexName index = null, TypeName type = null)
 			where T : class =>
-			this.GetMapping(index ?? Index<T>(), type ?? Type<T>(), Field(objectPath));
+			GetMapping(index ?? Index<T>(), type ?? Type<T>(), Field(objectPath));
+
+		private FieldMappingProperties MappingsFor(IndexName index, TypeName type)
+		{
+			if (!Indices.TryGetValue(index, out var indexMapping) || indexMapping.Mappings == null) return null;
+
+			return !indexMapping.Mappings.TryGetValue(type, out var typeFieldMapping) ? null : typeFieldMapping;
+		}
 	}
 }
diff --git a/src/Nest/Indices/MappingManagement/GetMapping/ElasticClient-GetMapping.cs b/src/Nest/Indices/MappingManagement/GetMapping/ElasticClient-GetMapping.cs
index ff4a4adc289..b4ce3212817 100644
--- a/src/Nest/Indices/MappingManagement/GetMapping/ElasticClient-GetMapping.cs
+++ b/src/Nest/Indices/MappingManagement/GetMapping/ElasticClient-GetMapping.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading;
-using System.IO;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
@@ -10,47 +9,53 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The get mapping API allows to retrieve mapping definitions for an index or index/type.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-get-mapping.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-get-mapping.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the get mapping operation</param>
 		IGetMappingResponse GetMapping<T>(Func<GetMappingDescriptor<T>, IGetMappingRequest> selector = null) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetMappingResponse GetMapping(IGetMappingRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetMappingResponse> GetMappingAsync<T>(Func<GetMappingDescriptor<T>, IGetMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IGetMappingResponse> GetMappingAsync<T>(Func<GetMappingDescriptor<T>, IGetMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetMappingResponse> GetMappingAsync(IGetMappingRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetMappingResponse GetMapping<T>(Func<GetMappingDescriptor<T>, IGetMappingRequest> selector = null)
 			where T : class =>
-			this.GetMapping(selector.InvokeOrDefault(new GetMappingDescriptor<T>()));
+			GetMapping(selector.InvokeOrDefault(new GetMappingDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetMappingResponse GetMapping(IGetMappingRequest request) =>
-			this.Dispatcher.Dispatch<IGetMappingRequest, GetMappingRequestParameters, GetMappingResponse>(
+			Dispatcher.Dispatch<IGetMappingRequest, GetMappingRequestParameters, GetMappingResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesGetMappingDispatch<GetMappingResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesGetMappingDispatch<GetMappingResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetMappingResponse> GetMappingAsync<T>(Func<GetMappingDescriptor<T>, IGetMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<IGetMappingResponse> GetMappingAsync<T>(Func<GetMappingDescriptor<T>, IGetMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.GetMappingAsync(selector.InvokeOrDefault(new GetMappingDescriptor<T>()), cancellationToken);
+			GetMappingAsync(selector.InvokeOrDefault(new GetMappingDescriptor<T>()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetMappingResponse> GetMappingAsync(IGetMappingRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetMappingRequest, GetMappingRequestParameters, GetMappingResponse, IGetMappingResponse>(
+		/// <inheritdoc />
+		public Task<IGetMappingResponse> GetMappingAsync(IGetMappingRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetMappingRequest, GetMappingRequestParameters, GetMappingResponse, IGetMappingResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesGetMappingDispatchAsync<GetMappingResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesGetMappingDispatchAsync<GetMappingResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/MappingManagement/GetMapping/GetMappingRequest.cs b/src/Nest/Indices/MappingManagement/GetMapping/GetMappingRequest.cs
index 69fff6664f7..785848aec30 100644
--- a/src/Nest/Indices/MappingManagement/GetMapping/GetMappingRequest.cs
+++ b/src/Nest/Indices/MappingManagement/GetMapping/GetMappingRequest.cs
@@ -3,7 +3,7 @@
 	public partial interface IGetMappingRequest { }
 
 	public partial class GetMappingRequest { }
-	
+
 	[DescriptorFor("IndicesGetMapping")]
 	public partial class GetMappingDescriptor<T> where T : class { }
 }
diff --git a/src/Nest/Indices/MappingManagement/GetMapping/GetMappingResponse.cs b/src/Nest/Indices/MappingManagement/GetMapping/GetMappingResponse.cs
index 518b617a415..e8463ddc291 100644
--- a/src/Nest/Indices/MappingManagement/GetMapping/GetMappingResponse.cs
+++ b/src/Nest/Indices/MappingManagement/GetMapping/GetMappingResponse.cs
@@ -9,6 +9,7 @@ namespace Nest
 	public interface IGetMappingResponse : IResponse
 	{
 		IReadOnlyDictionary<IndexName, IndexMappings> Indices { get; }
+
 		[Obsolete("Renamed to Indices, will be deleted from NEST 7.x")]
 		IReadOnlyDictionary<IndexName, IndexMappings> Mappings { get; }
 
@@ -17,10 +18,10 @@ public interface IGetMappingResponse : IResponse
 
 	public class IndexMappings
 	{
+		public TypeMapping this[TypeName type] => Mappings?[type];
+
 		[JsonProperty("mappings")]
 		public TypeMappings Mappings { get; internal set; }
-
-		public TypeMapping this[TypeName type] => this.Mappings?[type];
 	}
 
 	[JsonConverter(typeof(TypeMappingsJsonConverter))]
@@ -42,13 +43,14 @@ public class GetMappingResponse : DictionaryResponseBase<IndexName, IndexMapping
 		[JsonIgnore]
 		public IReadOnlyDictionary<IndexName, IndexMappings> Indices => Self.BackingDictionary;
 
+		[Obsolete(
+			"Recommended to use GetMappingFor, this is a leaky abstraction that returns the mapping of the first index's first type on the response")]
+		public ITypeMapping Mapping => Indices.FirstOrDefault().Value?.Mappings?.FirstOrDefault().Value;
+
 		[JsonIgnore]
 		[Obsolete("Renamed to Indices, will be deleted from NEST 7.x")]
 		public IReadOnlyDictionary<IndexName, IndexMappings> Mappings => Indices;
 
-		[Obsolete("Recommended to use GetMappingFor, this is a leaky abstraction that returns the mapping of the first index's first type on the response")]
-		public ITypeMapping Mapping => this.Indices.FirstOrDefault().Value?.Mappings?.FirstOrDefault().Value;
-
 		public void Accept(IMappingVisitor visitor)
 		{
 			var walker = new MappingWalker(visitor);
@@ -58,16 +60,16 @@ public void Accept(IMappingVisitor visitor)
 
 	public static class GetMappingResponseExtensions
 	{
-
 		public static ITypeMapping GetMappingFor<T>(this IGetMappingResponse response) => response.GetMappingFor(typeof(T), typeof(T));
 
 		public static ITypeMapping GetMappingFor(this IGetMappingResponse response, IndexName index, TypeName type)
 		{
 			if (index.IsNullOrEmpty() || type.IsNullOrEmpty()) return null;
+
 			TypeMapping mapping = null;
 			var hasValue = response.Indices.TryGetValue(index, out var typeMapping)
-			        && typeMapping?.Mappings != null
-			        && typeMapping.Mappings.TryGetValue(type, out mapping);
+				&& typeMapping?.Mappings != null
+				&& typeMapping.Mappings.TryGetValue(type, out mapping);
 			return mapping;
 		}
 
@@ -75,8 +77,8 @@ public static ITypeMapping GetMappingFor(this IGetMappingResponse response, Inde
 		{
 			if (index.IsNullOrEmpty()) return null;
 			if (!response.Indices.TryGetValue(index, out var typeMapping)) return null;
+
 			return typeMapping?.Mappings?.FirstOrDefault().Value;
 		}
-
 	}
 }
diff --git a/src/Nest/Indices/MappingManagement/PutMapping/ElasticClient-Map.cs b/src/Nest/Indices/MappingManagement/PutMapping/ElasticClient-Map.cs
index 717b3e27aa4..8b19a26b9ad 100644
--- a/src/Nest/Indices/MappingManagement/PutMapping/ElasticClient-Map.cs
+++ b/src/Nest/Indices/MappingManagement/PutMapping/ElasticClient-Map.cs
@@ -1,58 +1,62 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-
 		/// <summary>
 		/// The put mapping API allows to register specific mapping definition for a specific type.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-put-mapping.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-put-mapping.html
 		/// </summary>
 		/// <typeparam name="T">The type we want to map in elasticsearch</typeparam>
 		/// <param name="selector">A descriptor to describe the mapping of our type</param>
 		IPutMappingResponse Map<T>(Func<PutMappingDescriptor<T>, IPutMappingRequest> selector)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutMappingResponse Map(IPutMappingRequest request);
 
-		/// <inheritdoc/>
-		Task<IPutMappingResponse> MapAsync<T>(Func<PutMappingDescriptor<T>, IPutMappingRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IPutMappingResponse> MapAsync<T>(Func<PutMappingDescriptor<T>, IPutMappingRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutMappingResponse> MapAsync(IPutMappingRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutMappingResponse Map<T>(Func<PutMappingDescriptor<T>, IPutMappingRequest> selector)
 			where T : class =>
-			this.Map(selector?.Invoke(new PutMappingDescriptor<T>()));
+			Map(selector?.Invoke(new PutMappingDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutMappingResponse Map(IPutMappingRequest request) =>
-			this.Dispatcher.Dispatch<IPutMappingRequest, PutMappingRequestParameters, PutMappingResponse>(
+			Dispatcher.Dispatch<IPutMappingRequest, PutMappingRequestParameters, PutMappingResponse>(
 				request,
-				this.LowLevelDispatch.IndicesPutMappingDispatch<PutMappingResponse>
+				LowLevelDispatch.IndicesPutMappingDispatch<PutMappingResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPutMappingResponse> MapAsync<T>(Func<PutMappingDescriptor<T>, IPutMappingRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<IPutMappingResponse> MapAsync<T>(Func<PutMappingDescriptor<T>, IPutMappingRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.MapAsync(selector?.Invoke(new PutMappingDescriptor<T>()), cancellationToken);
+			MapAsync(selector?.Invoke(new PutMappingDescriptor<T>()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IPutMappingResponse> MapAsync(IPutMappingRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutMappingRequest, PutMappingRequestParameters, PutMappingResponse, IPutMappingResponse>(
+			Dispatcher.DispatchAsync<IPutMappingRequest, PutMappingRequestParameters, PutMappingResponse, IPutMappingResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesPutMappingDispatchAsync<PutMappingResponse>
+				LowLevelDispatch.IndicesPutMappingDispatchAsync<PutMappingResponse>
 			);
 	}
 }
diff --git a/src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs b/src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
index 8d75f38c111..83f599449ee 100644
--- a/src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
+++ b/src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
@@ -5,9 +5,7 @@
 namespace Nest
 {
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<PutMappingRequest>))]
-	public partial interface IPutMappingRequest : ITypeMapping
-	{
-	}
+	public partial interface IPutMappingRequest : ITypeMapping { }
 
 	public interface IPutMappingRequest<T> : IPutMappingRequest where T : class { }
 
@@ -16,31 +14,43 @@ public partial class PutMappingRequest
 		// Needed for ReadAsType
 		internal PutMappingRequest() { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAllField AllField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public bool? DateDetection { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public Union<bool, DynamicMapping> Dynamic { get; set; }
+
+		/// <inheritdoc />
 		public IEnumerable<string> DynamicDateFormats { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IDynamicTemplateContainer DynamicTemplates { get; set; }
-		/// <inheritdoc/>
-		public Union<bool, DynamicMapping> Dynamic { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IFieldNamesField FieldNamesField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IIndexField IndexField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IDictionary<string, object> Meta { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public bool? NumericDetection { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IProperties Properties { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IRoutingField RoutingField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public ISizeField SizeField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public ISourceField SourceField { get; set; }
 	}
 
@@ -48,31 +58,43 @@ public partial class PutMappingRequest<T> where T : class
 	{
 		public PutMappingRequest() : this(typeof(T), typeof(T)) { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAllField AllField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public bool? DateDetection { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public Union<bool, DynamicMapping> Dynamic { get; set; }
+
+		/// <inheritdoc />
 		public IEnumerable<string> DynamicDateFormats { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IDynamicTemplateContainer DynamicTemplates { get; set; }
-		/// <inheritdoc/>
-		public Union<bool, DynamicMapping> Dynamic { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IFieldNamesField FieldNamesField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IIndexField IndexField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IDictionary<string, object> Meta { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public bool? NumericDetection { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IProperties Properties { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IRoutingField RoutingField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public ISizeField SizeField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public ISourceField SourceField { get; set; }
 	}
 
@@ -80,15 +102,14 @@ public PutMappingRequest() : this(typeof(T), typeof(T)) { }
 	public partial class PutMappingDescriptor<T> where T : class
 	{
 		public PutMappingDescriptor() : this(typeof(T), typeof(T)) { }
-		public PutMappingDescriptor(IndexName index, TypeName type) : base(r=>r.Required("index", index).Required("type", type)) { }
 
-		protected PutMappingDescriptor<T> Assign(Action<ITypeMapping> assigner) => Fluent.Assign(this, assigner);
+		public PutMappingDescriptor(IndexName index, TypeName type) : base(r => r.Required("index", index).Required("type", type)) { }
 
 		IAllField ITypeMapping.AllField { get; set; }
 		bool? ITypeMapping.DateDetection { get; set; }
+		Union<bool, DynamicMapping> ITypeMapping.Dynamic { get; set; }
 		IEnumerable<string> ITypeMapping.DynamicDateFormats { get; set; }
 		IDynamicTemplateContainer ITypeMapping.DynamicTemplates { get; set; }
-		Union<bool, DynamicMapping> ITypeMapping.Dynamic { get; set; }
 		IFieldNamesField ITypeMapping.FieldNamesField { get; set; }
 		IIndexField ITypeMapping.IndexField { get; set; }
 		IDictionary<string, object> ITypeMapping.Meta { get; set; }
@@ -98,6 +119,8 @@ public PutMappingDescriptor(IndexName index, TypeName type) : base(r=>r.Required
 		ISizeField ITypeMapping.SizeField { get; set; }
 		ISourceField ITypeMapping.SourceField { get; set; }
 
+		protected PutMappingDescriptor<T> Assign(Action<ITypeMapping> assigner) => Fluent.Assign(this, assigner);
+
 		/// <summary>
 		/// Convenience method to map as much as it can based on ElasticType attributes set on the type.
 		/// <pre>This method also automatically sets up mappings for known values types (int, long, double, datetime, etcetera)</pre>
@@ -107,61 +130,69 @@ public PutMappingDescriptor(IndexName index, TypeName type) : base(r=>r.Required
 		public PutMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int maxRecursion = 0) =>
 			Assign(a => a.Properties = a.Properties.AutoMap<T>(visitor, maxRecursion));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> AutoMap(int maxRecursion) => AutoMap(null, maxRecursion);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> Dynamic(Union<bool, DynamicMapping> dynamic) => Assign(a => a.Dynamic = dynamic);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> Dynamic(bool? dynamic = true) => Assign(a => a.Dynamic = dynamic);
 
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> AllField(Func<AllFieldDescriptor, IAllField> allFieldSelector) => Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
+		/// <inheritdoc />
+		public PutMappingDescriptor<T> AllField(Func<AllFieldDescriptor, IAllField> allFieldSelector) =>
+			Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
 
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> IndexField(Func<IndexFieldDescriptor, IIndexField> indexFieldSelector) => Assign(a => a.IndexField = indexFieldSelector?.Invoke(new IndexFieldDescriptor()));
+		/// <inheritdoc />
+		public PutMappingDescriptor<T> IndexField(Func<IndexFieldDescriptor, IIndexField> indexFieldSelector) =>
+			Assign(a => a.IndexField = indexFieldSelector?.Invoke(new IndexFieldDescriptor()));
 
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, ISizeField> sizeFieldSelector) => Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
+		/// <inheritdoc />
+		public PutMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, ISizeField> sizeFieldSelector) =>
+			Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> DisableSizeField(bool? disabled = true) => Assign(a => a.SizeField = new SizeField { Enabled = !disabled });
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> DisableIndexField(bool? disabled = true) => Assign(a => a.IndexField = new IndexField { Enabled = !disabled });
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> DynamicDateFormats(IEnumerable<string> dateFormats) => Assign(a => a.DynamicDateFormats = dateFormats);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> DateDetection(bool? detect = true) => Assign(a => a.DateDetection = detect);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> NumericDetection(bool? detect = true) => Assign(a => a.NumericDetection = detect);
 
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
+		/// <inheritdoc />
+		public PutMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) =>
+			Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
 
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
+		/// <inheritdoc />
+		public PutMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) =>
+			Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
 
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
+		/// <inheritdoc />
+		public PutMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) =>
+			Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> metaSelector) =>
 			Assign(a => a.Meta = metaSelector(new FluentDictionary<string, object>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> Meta(Dictionary<string, object> metaDictionary) => Assign(a => a.Meta = metaDictionary);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutMappingDescriptor<T> Properties(Func<PropertiesDescriptor<T>, IPromise<IProperties>> propertiesSelector) =>
 			Assign(a => a.Properties = propertiesSelector?.Invoke(new PropertiesDescriptor<T>(a.Properties))?.Value);
 
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> DynamicTemplates(Func<DynamicTemplateContainerDescriptor<T>, IPromise<IDynamicTemplateContainer>> dynamicTemplatesSelector) =>
+		/// <inheritdoc />
+		public PutMappingDescriptor<T> DynamicTemplates(
+			Func<DynamicTemplateContainerDescriptor<T>, IPromise<IDynamicTemplateContainer>> dynamicTemplatesSelector
+		) =>
 			Assign(a => a.DynamicTemplates = dynamicTemplatesSelector?.Invoke(new DynamicTemplateContainerDescriptor<T>())?.Value);
 	}
 }
diff --git a/src/Nest/Indices/MappingManagement/PutMapping/PutMappingResponse.cs b/src/Nest/Indices/MappingManagement/PutMapping/PutMappingResponse.cs
index f0738519b4c..188b13f01d8 100644
--- a/src/Nest/Indices/MappingManagement/PutMapping/PutMappingResponse.cs
+++ b/src/Nest/Indices/MappingManagement/PutMapping/PutMappingResponse.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IPutMappingResponse : IIndicesResponse { }
 
 	public class PutMappingResponse : IndicesResponseBase, IPutMappingResponse { }
-
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/ElasticClient-RecoveryStatus.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/ElasticClient-RecoveryStatus.cs
index 0e3531eff26..f5a2e854f34 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/ElasticClient-RecoveryStatus.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/ElasticClient-RecoveryStatus.cs
@@ -1,50 +1,56 @@
 using System;
 using System.Threading;
-using System.IO;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
 namespace Nest
 {
-
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRecoveryStatusResponse RecoveryStatus(Indices indices, Func<RecoveryStatusDescriptor, IRecoveryStatusRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRecoveryStatusResponse RecoveryStatus(IRecoveryStatusRequest request);
 
-		/// <inheritdoc/>
-		Task<IRecoveryStatusResponse> RecoveryStatusAsync(Indices indices, Func<RecoveryStatusDescriptor, IRecoveryStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRecoveryStatusResponse> RecoveryStatusAsync(Indices indices, Func<RecoveryStatusDescriptor, IRecoveryStatusRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IRecoveryStatusResponse> RecoveryStatusAsync(IRecoveryStatusRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRecoveryStatusResponse> RecoveryStatusAsync(IRecoveryStatusRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRecoveryStatusResponse RecoveryStatus(Indices indices, Func<RecoveryStatusDescriptor, IRecoveryStatusRequest> selector = null) =>
-			this.RecoveryStatus(selector.InvokeOrDefault(new RecoveryStatusDescriptor().Index(indices)));
+			RecoveryStatus(selector.InvokeOrDefault(new RecoveryStatusDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRecoveryStatusResponse RecoveryStatus(IRecoveryStatusRequest request) =>
-			this.Dispatcher.Dispatch<IRecoveryStatusRequest, RecoveryStatusRequestParameters, RecoveryStatusResponse>(
+			Dispatcher.Dispatch<IRecoveryStatusRequest, RecoveryStatusRequestParameters, RecoveryStatusResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesRecoveryDispatch<RecoveryStatusResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesRecoveryDispatch<RecoveryStatusResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IRecoveryStatusResponse> RecoveryStatusAsync(Indices indices, Func<RecoveryStatusDescriptor, IRecoveryStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RecoveryStatusAsync(selector.InvokeOrDefault(new RecoveryStatusDescriptor().Index(indices)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IRecoveryStatusResponse> RecoveryStatusAsync(IRecoveryStatusRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRecoveryStatusRequest, RecoveryStatusRequestParameters, RecoveryStatusResponse, IRecoveryStatusResponse>(
+		/// <inheritdoc />
+		public Task<IRecoveryStatusResponse> RecoveryStatusAsync(Indices indices,
+			Func<RecoveryStatusDescriptor, IRecoveryStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RecoveryStatusAsync(selector.InvokeOrDefault(new RecoveryStatusDescriptor().Index(indices)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IRecoveryStatusResponse> RecoveryStatusAsync(IRecoveryStatusRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IRecoveryStatusRequest, RecoveryStatusRequestParameters, RecoveryStatusResponse, IRecoveryStatusResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesRecoveryDispatchAsync<RecoveryStatusResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesRecoveryDispatchAsync<RecoveryStatusResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryBytes.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryBytes.cs
index 704ff3f07ae..6777579b048 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryBytes.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryBytes.cs
@@ -4,18 +4,16 @@ namespace Nest
 {
 	public class RecoveryBytes
 	{
-		
-		[JsonProperty("total")]
-		public long Total { get; internal set; }
-
-		[JsonProperty("reused")]
-		public long Reused { get; internal set; }
+		[JsonProperty("percent")]
+		public string Percent { get; internal set; }
 
 		[JsonProperty("recovered")]
 		public long Recovered { get; internal set; }
 
-		[JsonProperty("percent")]
-		public string Percent { get; internal set; }
+		[JsonProperty("reused")]
+		public long Reused { get; internal set; }
 
+		[JsonProperty("total")]
+		public long Total { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryFileDetails.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryFileDetails.cs
index 1903017b59a..8fdbdff984a 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryFileDetails.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryFileDetails.cs
@@ -4,14 +4,13 @@ namespace Nest
 {
 	public class RecoveryFileDetails
 	{
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
-
 		[JsonProperty("length")]
 		public long Length { get; internal set; }
 
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
+
 		[JsonProperty("recovered")]
 		public long Recovered { get; internal set; }
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryFiles.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryFiles.cs
index e7ecf49f2cd..63b7586ce22 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryFiles.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryFiles.cs
@@ -5,20 +5,19 @@ namespace Nest
 {
 	public class RecoveryFiles
 	{
-		[JsonProperty("total")]
-		public long Total { get; internal set; }
+		[JsonProperty("details")]
+		public IEnumerable<RecoveryFileDetails> Details { get; internal set; }
 
-		[JsonProperty("reused")]
-		public long Reused { get; internal set; }
+		[JsonProperty("percent")]
+		public string Percent { get; internal set; }
 
 		[JsonProperty("recovered")]
 		public long Recovered { get; internal set; }
 
-		[JsonProperty("percent")]
-		public string Percent { get; internal set; }
-
-		[JsonProperty("details")]
-		public IEnumerable<RecoveryFileDetails> Details { get; internal set; }
+		[JsonProperty("reused")]
+		public long Reused { get; internal set; }
 
+		[JsonProperty("total")]
+		public long Total { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryIndexStatus.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryIndexStatus.cs
index ddff0dcc719..a1619d72475 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryIndexStatus.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryIndexStatus.cs
@@ -4,14 +4,13 @@ namespace Nest
 {
 	public class RecoveryIndexStatus
 	{
-		[JsonProperty("total_time_in_millis")]
-		public long TotalTimeInMilliseconds { get; internal set; }
-
 		[JsonProperty("bytes")]
 		public RecoveryBytes Bytes { get; internal set; }
 
 		[JsonProperty("files")]
 		public RecoveryFiles Files { get; internal set; }
 
+		[JsonProperty("total_time_in_millis")]
+		public long TotalTimeInMilliseconds { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryOrigin.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryOrigin.cs
index 5318a9d2f94..1fcfa77ba81 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryOrigin.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryOrigin.cs
@@ -4,17 +4,16 @@ namespace Nest
 {
 	public class RecoveryOrigin
 	{
-		[JsonProperty("id")]
-		public string Id { get; internal set; }
-
 		[JsonProperty("hostname")]
 		public string HostName { get; internal set; }
 
+		[JsonProperty("id")]
+		public string Id { get; internal set; }
+
 		[JsonProperty("ip")]
 		public string Ip { get; internal set; }
 
 		[JsonProperty("name")]
 		public string Name { get; internal set; }
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryStartStatus.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryStartStatus.cs
index 5fdc8f03aca..28ca84c23fa 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryStartStatus.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryStartStatus.cs
@@ -10,4 +10,4 @@ public class RecoveryStartStatus
 		[JsonProperty("total_time_in_millis")]
 		public string TotalTimeInMilliseconds { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryStatusResponse.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryStatusResponse.cs
index 8366d79cc9c..a5479764ae9 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryStatusResponse.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryStatusResponse.cs
@@ -14,6 +14,5 @@ public class RecoveryStatusResponse : DictionaryResponseBase<IndexName, Recovery
 	{
 		[JsonIgnore]
 		public IReadOnlyDictionary<IndexName, RecoveryStatus> Indices => Self.BackingDictionary;
-
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryTranslogStatus.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryTranslogStatus.cs
index 7d0e2eba6ad..8f390bd215f 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryTranslogStatus.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/RecoveryTranslogStatus.cs
@@ -4,15 +4,15 @@ namespace Nest
 {
 	public class RecoveryTranslogStatus
 	{
+		[JsonProperty("percent")]
+		public string Percent { get; internal set; }
+
 		[JsonProperty("recovered")]
 		public long Recovered { get; internal set; }
 
 		[JsonProperty("total")]
 		public long Total { get; internal set; }
 
-		[JsonProperty("percent")]
-		public string Percent { get; internal set; }
-
 		[JsonProperty("total_on_start")]
 		public long TotalOnStart { get; internal set; }
 
@@ -22,4 +22,4 @@ public class RecoveryTranslogStatus
 		[JsonProperty("total_time_in_millis")]
 		public long TotalTimeInMilliseconds { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesRecovery/ShardRecovery.cs b/src/Nest/Indices/Monitoring/IndicesRecovery/ShardRecovery.cs
index 371140b6d8c..72dc299771c 100644
--- a/src/Nest/Indices/Monitoring/IndicesRecovery/ShardRecovery.cs
+++ b/src/Nest/Indices/Monitoring/IndicesRecovery/ShardRecovery.cs
@@ -8,14 +8,20 @@ public class ShardRecovery
 		[JsonProperty("id")]
 		public long Id { get; internal set; }
 
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
+		[JsonProperty("index")]
+		public RecoveryIndexStatus Index { get; internal set; }
+
+		[JsonProperty("primary")]
+		public bool Primary { get; internal set; }
+
+		[JsonProperty("source")]
+		public RecoveryOrigin Source { get; internal set; }
 
 		[JsonProperty("stage")]
 		public string Stage { get; internal set; }
 
-		[JsonProperty("primary")]
-		public bool Primary { get; internal set; }
+		[JsonProperty("start")]
+		public RecoveryStartStatus Start { get; internal set; }
 
 		[JsonProperty("start_time")]
 		public DateTime? StartTime { get; internal set; }
@@ -23,22 +29,16 @@ public class ShardRecovery
 		[JsonProperty("stop_time")]
 		public DateTime? StopTime { get; internal set; }
 
-		[JsonProperty("total_time_in_millis")]
-		public long TotalTimeInMilliseconds { get; internal set; }
-
-		[JsonProperty("source")]
-		public RecoveryOrigin Source { get; internal set; }
-
 		[JsonProperty("target")]
 		public RecoveryOrigin Target { get; internal set; }
 
-		[JsonProperty("index")]
-		public RecoveryIndexStatus Index { get; internal set; }
+		[JsonProperty("total_time_in_millis")]
+		public long TotalTimeInMilliseconds { get; internal set; }
 
 		[JsonProperty("translog")]
 		public RecoveryTranslogStatus Translog { get; internal set; }
-		
-		[JsonProperty("start")]
-		public RecoveryStartStatus Start { get; internal set; }
+
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/ElasticClient-Segments.cs b/src/Nest/Indices/Monitoring/IndicesSegments/ElasticClient-Segments.cs
index 63b7b98f0e3..9ecc9c3f00d 100644
--- a/src/Nest/Indices/Monitoring/IndicesSegments/ElasticClient-Segments.cs
+++ b/src/Nest/Indices/Monitoring/IndicesSegments/ElasticClient-Segments.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -11,51 +11,52 @@ public partial interface IElasticClient
 		/// Provide low level segments information that a Lucene index (shard level) is built with.
 		/// Allows to be used to provide more information on the state of a shard and an index, possibly optimization information,
 		/// data "wasted" on deletes, and so on.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-segments.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-segments.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the segments operation</param>
 		ISegmentsResponse Segments(Indices indices, Func<SegmentsDescriptor, ISegmentsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISegmentsResponse Segments(ISegmentsRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ISegmentsResponse> SegmentsAsync(
 			Indices indices,
 			Func<SegmentsDescriptor, ISegmentsRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ISegmentsResponse> SegmentsAsync(ISegmentsRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISegmentsResponse Segments(Indices indices, Func<SegmentsDescriptor, ISegmentsRequest> selector = null) =>
-			this.Segments(selector.InvokeOrDefault(new SegmentsDescriptor().Index(indices)));
+			Segments(selector.InvokeOrDefault(new SegmentsDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISegmentsResponse Segments(ISegmentsRequest request) =>
-			this.Dispatcher.Dispatch<ISegmentsRequest, SegmentsRequestParameters, SegmentsResponse>(
+			Dispatcher.Dispatch<ISegmentsRequest, SegmentsRequestParameters, SegmentsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesSegmentsDispatch<SegmentsResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesSegmentsDispatch<SegmentsResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ISegmentsResponse> SegmentsAsync(
 			Indices indices,
 			Func<SegmentsDescriptor, ISegmentsRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.SegmentsAsync(selector.InvokeOrDefault(new SegmentsDescriptor().Index(indices)), cancellationToken);
+		) => SegmentsAsync(selector.InvokeOrDefault(new SegmentsDescriptor().Index(indices)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ISegmentsResponse> SegmentsAsync(ISegmentsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ISegmentsRequest, SegmentsRequestParameters, SegmentsResponse, ISegmentsResponse>(
+			Dispatcher.DispatchAsync<ISegmentsRequest, SegmentsRequestParameters, SegmentsResponse, ISegmentsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesSegmentsDispatchAsync<SegmentsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesSegmentsDispatchAsync<SegmentsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/Segment.cs b/src/Nest/Indices/Monitoring/IndicesSegments/Segment.cs
index f946a9d7950..ebfdbfb6783 100644
--- a/src/Nest/Indices/Monitoring/IndicesSegments/Segment.cs
+++ b/src/Nest/Indices/Monitoring/IndicesSegments/Segment.cs
@@ -7,15 +7,28 @@ namespace Nest
 	[JsonObject]
 	public class Segment
 	{
-		[JsonProperty("generation")]
-		public int Generation { get; internal set; }
+		[JsonProperty("attributes")]
+		public IReadOnlyDictionary<string, string> Attributes { get; internal set; } =
+			EmptyReadOnly<string, string>.Dictionary;
 
-		[JsonProperty("num_docs")]
-		public long TotalDocuments { get; internal set; }
+		[JsonProperty("committed")]
+		public bool Committed { get; internal set; }
+
+		[JsonProperty("compound")]
+		public bool Compound { get; internal set; }
 
 		[JsonProperty("deleted_docs")]
 		public long DeletedDocuments { get; internal set; }
 
+		[JsonProperty("generation")]
+		public int Generation { get; internal set; }
+
+		[JsonProperty("memory_in_bytes")]
+		public double MemoryInBytes { get; internal set; }
+
+		[JsonProperty("search")]
+		public bool Search { get; internal set; }
+
 		[JsonProperty("size")]
 		[Obsolete("Unused. Will be removed in the next major release")]
 		public string Size { get; internal set; }
@@ -23,23 +36,10 @@ public class Segment
 		[JsonProperty("size_in_bytes")]
 		public double SizeInBytes { get; internal set; }
 
-		[JsonProperty("memory_in_bytes")]
-		public double MemoryInBytes { get; internal set; }
-
-		[JsonProperty("committed")]
-		public bool Committed { get; internal set; }
-
-		[JsonProperty("search")]
-		public bool Search { get; internal set; }
+		[JsonProperty("num_docs")]
+		public long TotalDocuments { get; internal set; }
 
 		[JsonProperty("version")]
 		public string Version { get; internal set; }
-
-		[JsonProperty("compound")]
-		public bool Compound { get; internal set; }
-
-		[JsonProperty("attributes")]
-		public IReadOnlyDictionary<string, string> Attributes { get; internal set; } =
-			EmptyReadOnly<string, string>.Dictionary;
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/SegmentsResponse.cs b/src/Nest/Indices/Monitoring/IndicesSegments/SegmentsResponse.cs
index 9678e24fac4..f60c4cdd597 100644
--- a/src/Nest/Indices/Monitoring/IndicesSegments/SegmentsResponse.cs
+++ b/src/Nest/Indices/Monitoring/IndicesSegments/SegmentsResponse.cs
@@ -5,21 +5,18 @@ namespace Nest
 {
 	public interface ISegmentsResponse : IResponse
 	{
-		ShardStatistics Shards { get; }
 		IReadOnlyDictionary<string, IndexSegment> Indices { get; }
+		ShardStatistics Shards { get; }
 	}
 
 	[JsonObject]
 	public class SegmentsResponse : ResponseBase, ISegmentsResponse
 	{
-
-		[JsonProperty("_shards")]
-		public ShardStatistics Shards { get; internal set; }
-
 		[JsonProperty("indices")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, IndexSegment>))]
 		public IReadOnlyDictionary<string, IndexSegment> Indices { get; internal set; } = EmptyReadOnly<string, IndexSegment>.Dictionary;
 
-
+		[JsonProperty("_shards")]
+		public ShardStatistics Shards { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/ShardSegmentRouting.cs b/src/Nest/Indices/Monitoring/IndicesSegments/ShardSegmentRouting.cs
index eb03707bdab..1774cfa9afc 100644
--- a/src/Nest/Indices/Monitoring/IndicesSegments/ShardSegmentRouting.cs
+++ b/src/Nest/Indices/Monitoring/IndicesSegments/ShardSegmentRouting.cs
@@ -5,13 +5,13 @@ namespace Nest
 	[JsonObject]
 	public class ShardSegmentRouting
 	{
-		[JsonProperty("state")]
-		public string State { get; internal set; }
+		[JsonProperty("node")]
+		public string Node { get; internal set; }
 
 		[JsonProperty("primary")]
 		public bool Primary { get; internal set; }
 
-		[JsonProperty("node")]
-		public string Node { get; internal set; }
+		[JsonProperty("state")]
+		public string State { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/ShardsSegment.cs b/src/Nest/Indices/Monitoring/IndicesSegments/ShardsSegment.cs
index 3228b3887b2..d9948057169 100644
--- a/src/Nest/Indices/Monitoring/IndicesSegments/ShardsSegment.cs
+++ b/src/Nest/Indices/Monitoring/IndicesSegments/ShardsSegment.cs
@@ -6,18 +6,18 @@
 namespace Nest
 {
 	[JsonObject]
-	[JsonConverter(typeof(ShardsSegment.Json))]
+	[JsonConverter(typeof(Json))]
 	public class ShardsSegment
 	{
 		[JsonProperty("num_committed_segments")]
 		public int CommittedSegments { get; internal set; }
 
-		[JsonProperty("num_search_segments")]
-		public int SearchSegments { get; internal set; }
-
 		[JsonProperty("routing")]
 		public ShardSegmentRouting Routing { get; internal set; }
 
+		[JsonProperty("num_search_segments")]
+		public int SearchSegments { get; internal set; }
+
 		[JsonProperty]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, Segment>))]
 		public IReadOnlyDictionary<string, Segment> Segments { get; internal set; } =
@@ -28,7 +28,8 @@ internal class Json : JsonConverterBase<ShardsSegment>
 			public override void WriteJson(JsonWriter writer, ShardsSegment value, JsonSerializer serializer) { }
 
 			public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
-											JsonSerializer serializer)
+				JsonSerializer serializer
+			)
 			{
 				if (reader.TokenType == JsonToken.StartArray)
 				{
diff --git a/src/Nest/Indices/Monitoring/IndicesShardStores/ElasticClient-IndicesShardStores.cs b/src/Nest/Indices/Monitoring/IndicesShardStores/ElasticClient-IndicesShardStores.cs
index e47eb687623..8f4e06fffc1 100644
--- a/src/Nest/Indices/Monitoring/IndicesShardStores/ElasticClient-IndicesShardStores.cs
+++ b/src/Nest/Indices/Monitoring/IndicesShardStores/ElasticClient-IndicesShardStores.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,50 +10,56 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Indices level stats provide statistics on different operations happening on an index. The API provides statistics on
 		/// the index level scope (though most stats can also be retrieved using node level scope).
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-stats.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-stats.html
 		/// </summary>
 		/// <param name="selector">Optionaly further describe the indices stats operation</param>
 		IIndicesShardStoresResponse IndicesShardStores(Func<IndicesShardStoresDescriptor, IIndicesShardStoresRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IIndicesShardStoresResponse IndicesShardStores(IIndicesShardStoresRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IIndicesShardStoresResponse> IndicesShardStoresAsync(
 			Func<IndicesShardStoresDescriptor, IIndicesShardStoresRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
-		Task<IIndicesShardStoresResponse> IndicesShardStoresAsync(IIndicesShardStoresRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<IIndicesShardStoresResponse> IndicesShardStoresAsync(IIndicesShardStoresRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IIndicesShardStoresResponse IndicesShardStores(Func<IndicesShardStoresDescriptor, IIndicesShardStoresRequest> selector = null) =>
-			this.IndicesShardStores(selector.InvokeOrDefault(new IndicesShardStoresDescriptor()));
+			IndicesShardStores(selector.InvokeOrDefault(new IndicesShardStoresDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IIndicesShardStoresResponse IndicesShardStores(IIndicesShardStoresRequest request) =>
-			this.Dispatcher.Dispatch<IIndicesShardStoresRequest, IndicesShardStoresRequestParameters, IndicesShardStoresResponse>(
+			Dispatcher.Dispatch<IIndicesShardStoresRequest, IndicesShardStoresRequestParameters, IndicesShardStoresResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesShardStoresDispatch<IndicesShardStoresResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesShardStoresDispatch<IndicesShardStoresResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IIndicesShardStoresResponse> IndicesShardStoresAsync(
 			Func<IndicesShardStoresDescriptor, IIndicesShardStoresRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.IndicesShardStoresAsync(selector.InvokeOrDefault(new IndicesShardStoresDescriptor()), cancellationToken);
+		) => IndicesShardStoresAsync(selector.InvokeOrDefault(new IndicesShardStoresDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IIndicesShardStoresResponse> IndicesShardStoresAsync(IIndicesShardStoresRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IIndicesShardStoresRequest, IndicesShardStoresRequestParameters, IndicesShardStoresResponse, IIndicesShardStoresResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesShardStoresDispatchAsync<IndicesShardStoresResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IIndicesShardStoresResponse> IndicesShardStoresAsync(IIndicesShardStoresRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IIndicesShardStoresRequest, IndicesShardStoresRequestParameters, IndicesShardStoresResponse,
+					IIndicesShardStoresResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.IndicesShardStoresDispatchAsync<IndicesShardStoresResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresRequest.cs b/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresRequest.cs
index 482fd30c749..48002477020 100644
--- a/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresRequest.cs
+++ b/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresRequest.cs
@@ -11,13 +11,14 @@ public partial interface IIndicesShardStoresRequest
 	public partial class IndicesShardStoresRequest
 	{
 		private IEnumerable<TypeName> _types;
+
 		public IEnumerable<TypeName> Types
 		{
 			get => _types;
 			set
 			{
-				this.RequestState.RequestParameters.SetQueryString("types", value.HasAny() ? value :  null);
-				this._types = value;
+				RequestState.RequestParameters.SetQueryString("types", value.HasAny() ? value : null);
+				_types = value;
 			}
 		}
 	}
@@ -26,13 +27,14 @@ public IEnumerable<TypeName> Types
 	public partial class IndicesShardStoresDescriptor
 	{
 		private IEnumerable<TypeName> _types;
+
 		IEnumerable<TypeName> IIndicesShardStoresRequest.Types
 		{
 			get => _types;
 			set
 			{
-				this.RequestState.RequestParameters.SetQueryString("types", value.HasAny() ? value :  null);
-				this._types = value;
+				RequestState.RequestParameters.SetQueryString("types", value.HasAny() ? value : null);
+				_types = value;
 			}
 		}
 
diff --git a/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs b/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs
index b0683f0a8bc..3e764f4bca0 100644
--- a/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs
+++ b/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs
@@ -34,38 +34,39 @@ public class ShardStoreWrapper
 	[JsonConverter(typeof(ShardStoreJsonConverter))]
 	public class ShardStore
 	{
-		[JsonProperty("id")]
-		public string Id { get; internal set; }
+		[JsonProperty("allocation")]
+		public ShardStoreAllocation Allocation { get; internal set; }
 
-		[JsonProperty("name")]
-		public string Name { get; internal set; }
+		[JsonProperty("allocation_id")]
+		public string AllocationId { get; internal set; }
 
-		[JsonProperty("transport_address")]
-		public string TransportAddress { get; internal set; }
+		[JsonProperty("attributes")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
+		public IReadOnlyDictionary<string, object> Attributes { get; internal set; } = EmptyReadOnly<string, object>.Dictionary;
+
+		[JsonProperty("id")]
+		public string Id { get; internal set; }
 
 		[JsonProperty("legacy_version")]
 		public long? LegacyVersion { get; internal set; }
 
-		[JsonProperty("allocation_id")]
-		public string AllocationId { get; internal set; }
+		[JsonProperty("name")]
+		public string Name { get; internal set; }
 
 		[JsonProperty("store_exception")]
 		public ShardStoreException StoreException { get; internal set; }
 
-		[JsonProperty("allocation")]
-		public ShardStoreAllocation Allocation { get; internal set; }
-
-		[JsonProperty("attributes")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
-		public IReadOnlyDictionary<string, object> Attributes { get; internal set; } = EmptyReadOnly<string, object>.Dictionary;
+		[JsonProperty("transport_address")]
+		public string TransportAddress { get; internal set; }
 	}
 
 	public class ShardStoreException
 	{
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
 		[JsonProperty("reason")]
 		public string Reason { get; internal set; }
+
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
@@ -73,8 +74,10 @@ public enum ShardStoreAllocation
 	{
 		[EnumMember(Value = "primary")]
 		Primary,
+
 		[EnumMember(Value = "replica")]
 		Replica,
+
 		[EnumMember(Value = "unused")]
 		Unused
 	}
diff --git a/src/Nest/Indices/Monitoring/IndicesShardStores/ShardStoreJsonConverter.cs b/src/Nest/Indices/Monitoring/IndicesShardStores/ShardStoreJsonConverter.cs
index b5838130d6b..4f68a5edf37 100644
--- a/src/Nest/Indices/Monitoring/IndicesShardStores/ShardStoreJsonConverter.cs
+++ b/src/Nest/Indices/Monitoring/IndicesShardStores/ShardStoreJsonConverter.cs
@@ -9,17 +9,15 @@ namespace Nest
 	internal class ShardStoreJsonConverter : JsonConverter
 	{
 		public override bool CanWrite => false;
+
 		public override bool CanConvert(Type objectType) => true;
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var r = new ShardStore();
-			JObject o = JObject.Load(reader);
+			var o = JObject.Load(reader);
 			var properties = o.Properties().ToListOrNullIfEmpty();
 			var id = properties.First();
 			properties.AddRange(id.Value.Value<JObject>().Properties());
@@ -28,7 +26,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 			foreach (var p in properties)
 			{
-				switch(p.Name)
+				switch (p.Name)
 				{
 					case "name":
 						r.Name = p.Value.Value<string>();
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ElasticClient-IndicesStats.cs b/src/Nest/Indices/Monitoring/IndicesStats/ElasticClient-IndicesStats.cs
index e7f81c2b1d0..2335dfbff80 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ElasticClient-IndicesStats.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ElasticClient-IndicesStats.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,52 +10,54 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Indices level stats provide statistics on different operations happening on an index. The API provides statistics on
 		/// the index level scope (though most stats can also be retrieved using node level scope).
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-stats.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-stats.html
 		/// </summary>
 		/// <param name="selector">Optionaly further describe the indices stats operation</param>
 		IIndicesStatsResponse IndicesStats(Indices indices, Func<IndicesStatsDescriptor, IIndicesStatsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IIndicesStatsResponse IndicesStats(IIndicesStatsRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IIndicesStatsResponse> IndicesStatsAsync(
 			Indices indices,
 			Func<IndicesStatsDescriptor, IIndicesStatsRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IIndicesStatsResponse> IndicesStatsAsync(IIndicesStatsRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IIndicesStatsResponse IndicesStats(Indices indices, Func<IndicesStatsDescriptor, IIndicesStatsRequest> selector = null) =>
-			this.IndicesStats(selector.InvokeOrDefault(new IndicesStatsDescriptor().Index(indices)));
+			IndicesStats(selector.InvokeOrDefault(new IndicesStatsDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IIndicesStatsResponse IndicesStats(IIndicesStatsRequest request) =>
-			this.Dispatcher.Dispatch<IIndicesStatsRequest, IndicesStatsRequestParameters, IndicesStatsResponse>(
+			Dispatcher.Dispatch<IIndicesStatsRequest, IndicesStatsRequestParameters, IndicesStatsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesStatsDispatch<IndicesStatsResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesStatsDispatch<IndicesStatsResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IIndicesStatsResponse> IndicesStatsAsync(
 			Indices indices,
 			Func<IndicesStatsDescriptor, IIndicesStatsRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.IndicesStatsAsync(selector.InvokeOrDefault(new IndicesStatsDescriptor().Index(indices)), cancellationToken);
+		) => IndicesStatsAsync(selector.InvokeOrDefault(new IndicesStatsDescriptor().Index(indices)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IIndicesStatsResponse> IndicesStatsAsync(IIndicesStatsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IIndicesStatsRequest, IndicesStatsRequestParameters, IndicesStatsResponse, IIndicesStatsResponse>(
+		/// <inheritdoc />
+		public Task<IIndicesStatsResponse> IndicesStatsAsync(IIndicesStatsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IIndicesStatsRequest, IndicesStatsRequestParameters, IndicesStatsResponse, IIndicesStatsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesStatsDispatchAsync<IndicesStatsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesStatsDispatchAsync<IndicesStatsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/IndexStats.cs b/src/Nest/Indices/Monitoring/IndicesStats/IndexStats.cs
index 6412169e2d0..379a0d7b503 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/IndexStats.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/IndexStats.cs
@@ -5,52 +5,52 @@ namespace Nest
 	[JsonObject]
 	public class IndexStats
 	{
+		[JsonProperty("completion")]
+		public CompletionStats Completion { get; set; }
+
 		[JsonProperty("docs")]
 		public DocStats Documents { get; set; }
 
-		[JsonProperty("store")]
-		public StoreStats Store { get; set; }
+		[JsonProperty("fielddata")]
+		public FielddataStats Fielddata { get; set; }
 
-		[JsonProperty("indexing")]
-		public IndexingStats Indexing { get; set; }
+		[JsonProperty("flush")]
+		public FlushStats Flush { get; set; }
 
 		[JsonProperty("get")]
 		public GetStats Get { get; set; }
 
-		[JsonProperty("search")]
-		public SearchStats Search { get; set; }
+		[JsonProperty("indexing")]
+		public IndexingStats Indexing { get; set; }
 
 		[JsonProperty("merges")]
 		public MergesStats Merges { get; set; }
 
-		[JsonProperty("refresh")]
-		public RefreshStats Refresh { get; set; }
-
-		[JsonProperty("flush")]
-		public FlushStats Flush { get; set; }
-
-		[JsonProperty("warmer")]
-		public WarmerStats Warmer { get; set; }
-
 		[JsonProperty("query_cache")]
 		public QueryCacheStats QueryCache { get; set; }
 
-		[JsonProperty("fielddata")]
-		public FielddataStats Fielddata { get; set; }
+		[JsonProperty("recovery")]
+		public RecoveryStats Recovery { get; set; }
 
-		[JsonProperty("completion")]
-		public CompletionStats Completion { get; set; }
+		[JsonProperty("refresh")]
+		public RefreshStats Refresh { get; set; }
+
+		[JsonProperty("request_cache")]
+		public RequestCacheStats RequestCache { get; set; }
+
+		[JsonProperty("search")]
+		public SearchStats Search { get; set; }
 
 		[JsonProperty("segments")]
 		public SegmentsStats Segments { get; set; }
 
+		[JsonProperty("store")]
+		public StoreStats Store { get; set; }
+
 		[JsonProperty("translog")]
 		public TranslogStats Translog { get; set; }
 
-		[JsonProperty("request_cache")]
-		public RequestCacheStats RequestCache { get; set; }
-
-		[JsonProperty("recovery")]
-		public RecoveryStats Recovery { get; set; }
+		[JsonProperty("warmer")]
+		public WarmerStats Warmer { get; set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStats.cs b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStats.cs
index ca84e2e3bd4..c966537ce3b 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStats.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStats.cs
@@ -6,6 +6,16 @@ namespace Nest
 	[JsonObject]
 	public class IndicesStats
 	{
+		[JsonProperty("primaries")]
+		public IndexStats Primaries { get; internal set; }
+
+		[JsonProperty("shards")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, ShardStats[]>))]
+		public IReadOnlyDictionary<string, ShardStats[]> Shards { get; internal set; } = EmptyReadOnly<string, ShardStats[]>.Dictionary;
+
+		[JsonProperty("total")]
+		public IndexStats Total { get; internal set; }
+
 		/// <summary>
 		/// Universal Unique Identifier for the index
 		/// </summary>
@@ -14,15 +24,5 @@ public class IndicesStats
 		/// </remarks>
 		[JsonProperty("uuid")]
 		public string UUID { get; }
-
-		[JsonProperty("primaries")]
-		public IndexStats Primaries { get; internal set; }
-
-		[JsonProperty("total")]
-		public IndexStats Total { get; internal set; }
-
-		[JsonProperty("shards")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, ShardStats[]>))]
-		public IReadOnlyDictionary<string, ShardStats[]> Shards { get; internal set; } = EmptyReadOnly<string, ShardStats[]>.Dictionary;
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsRequest.cs b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsRequest.cs
index 6e00e9f0270..5e44de77055 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsRequest.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsRequest.cs
@@ -10,13 +10,14 @@ public partial interface IIndicesStatsRequest
 	public partial class IndicesStatsRequest
 	{
 		private IEnumerable<TypeName> _types;
+
 		public IEnumerable<TypeName> Types
 		{
 			get => _types;
 			set
 			{
-				this.RequestState.RequestParameters.SetQueryString("types", value.HasAny() ? value :  null);
-				this._types = value;
+				RequestState.RequestParameters.SetQueryString("types", value.HasAny() ? value : null);
+				_types = value;
 			}
 		}
 	}
@@ -25,19 +26,19 @@ public IEnumerable<TypeName> Types
 	public partial class IndicesStatsDescriptor
 	{
 		private IEnumerable<TypeName> _types;
+
 		IEnumerable<TypeName> IIndicesStatsRequest.Types
 		{
 			get => _types;
 			set
 			{
-				this.RequestState.RequestParameters.SetQueryString("types", value.HasAny() ? value :  null);
-				this._types = value;
+				RequestState.RequestParameters.SetQueryString("types", value.HasAny() ? value : null);
+				_types = value;
 			}
 		}
 
 		//<summary>A comma-separated list of fields for `completion` metric (supports wildcards)</summary>
 		public IndicesStatsDescriptor Types(params TypeName[] types) =>
 			Assign(a => a.Types = types);
-
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsResponse.cs b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsResponse.cs
index 2911bb305df..19348fc9843 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsResponse.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsResponse.cs
@@ -5,24 +5,22 @@ namespace Nest
 {
 	public interface IIndicesStatsResponse : IResponse
 	{
-		ShardStatistics Shards { get; }
-		IndicesStats Stats { get;}
 		IReadOnlyDictionary<string, IndicesStats> Indices { get; }
+		ShardStatistics Shards { get; }
+		IndicesStats Stats { get; }
 	}
 
 	[JsonObject]
 	public class IndicesStatsResponse : ResponseBase, IIndicesStatsResponse
 	{
+		[JsonProperty("indices")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, IndicesStats>))]
+		public IReadOnlyDictionary<string, IndicesStats> Indices { get; internal set; } = EmptyReadOnly<string, IndicesStats>.Dictionary;
 
 		[JsonProperty("_shards")]
 		public ShardStatistics Shards { get; internal set; }
 
 		[JsonProperty("_all")]
 		public IndicesStats Stats { get; internal set; }
-
-		[JsonProperty("indices")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, IndicesStats>))]
-		public IReadOnlyDictionary<string, IndicesStats> Indices { get; internal set; } = EmptyReadOnly<string, IndicesStats>.Dictionary;
-
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardCommit.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardCommit.cs
index 00d3599eb5c..3a7456d522d 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardCommit.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardCommit.cs
@@ -6,16 +6,16 @@ namespace Nest
 	[JsonObject]
 	public class ShardCommit
 	{
-		[JsonProperty("id")]
-		public string Id { get; internal set; }
-
 		[JsonProperty("generation")]
 		public int Generation { get; internal set; }
 
-		[JsonProperty("user_data")]
-		public IReadOnlyDictionary<string, string> UserData { get; internal set; }
+		[JsonProperty("id")]
+		public string Id { get; internal set; }
 
 		[JsonProperty("num_docs")]
 		public long NumberOfDocuments { get; internal set; }
+
+		[JsonProperty("user_data")]
+		public IReadOnlyDictionary<string, string> UserData { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardFieldData.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardFieldData.cs
index b9383528dd1..f1508ee3c1b 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardFieldData.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardFieldData.cs
@@ -5,9 +5,10 @@ namespace Nest
 	[JsonObject]
 	public class ShardFieldData
 	{
-		[JsonProperty("memory_size_in_bytes")]
-		public long MemorySizeInBytes { get; internal set; }
 		[JsonProperty("evictions")]
 		public long Evictions { get; internal set; }
+
+		[JsonProperty("memory_size_in_bytes")]
+		public long MemorySizeInBytes { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardFileSizeInfo.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardFileSizeInfo.cs
index 39d3492d16b..4bba13143dc 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardFileSizeInfo.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardFileSizeInfo.cs
@@ -5,9 +5,10 @@ namespace Nest
 	[JsonObject]
 	public class ShardFileSizeInfo
 	{
-		[JsonProperty("size_in_bytes")]
-		public long SizeInBytes { get; internal set; }
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
+
+		[JsonProperty("size_in_bytes")]
+		public long SizeInBytes { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardFlush.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardFlush.cs
index 5ffdb9df4b9..540f2e536b9 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardFlush.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardFlush.cs
@@ -7,6 +7,7 @@ public class ShardFlush
 	{
 		[JsonProperty("total")]
 		public long Total { get; internal set; }
+
 		[JsonProperty("total_time_in_millis")]
 		public long TotalTimeInMilliseconds { get; internal set; }
 	}
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardGet.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardGet.cs
index 71d4e868f8e..5ef63942547 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardGet.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardGet.cs
@@ -5,25 +5,25 @@ namespace Nest
 	[JsonObject]
 	public class ShardGet
 	{
-		[JsonProperty("total")]
-		public long Total { get; internal set; }
+		[JsonProperty("current")]
+		public long Current { get; internal set; }
 
-		[JsonProperty("time_in_millis")]
-		public long TimeInMilliseconds { get; internal set; }
+		[JsonProperty("exists_time_in_millis")]
+		public long ExistsTimeInMilliseconds { get; internal set; }
 
 		[JsonProperty("exists_total")]
 		public long ExistsTotal { get; internal set; }
 
-		[JsonProperty("exists_time_in_millis")]
-		public long ExistsTimeInMilliseconds { get; internal set; }
+		[JsonProperty("missing_time_in_millis")]
+		public long MissingTimeInMilliseconds { get; internal set; }
 
 		[JsonProperty("missing_total")]
 		public long MissingTotal { get; internal set; }
 
-		[JsonProperty("missing_time_in_millis")]
-		public long MissingTimeInMilliseconds { get; internal set; }
+		[JsonProperty("time_in_millis")]
+		public long TimeInMilliseconds { get; internal set; }
 
-		[JsonProperty("current")]
-		public long Current { get; internal set; }
+		[JsonProperty("total")]
+		public long Total { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardIndexing.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardIndexing.cs
index d4a51811c26..4976a73db6c 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardIndexing.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardIndexing.cs
@@ -6,16 +6,22 @@ namespace Nest
 	public class ShardIndexing
 	{
 		/// <summary>
-		/// The total number of indexing operations
+		/// Returns the currently in-flight delete operations
 		/// </summary>
-		[JsonProperty("index_total")]
-		public long IndexTotal { get; internal set; }
+		[JsonProperty("delete_current")]
+		public long DeleteCurrent { get; internal set; }
 
 		/// <summary>
-		/// The total amount of time spend on executing index operations.
+		/// The total amount of time spend on executing delete operations.
 		/// </summary>
-		[JsonProperty("index_time_in_millis")]
-		public long IndexTimeInMilliseconds { get; internal set; }
+		[JsonProperty("delete_time_in_millis")]
+		public long DeleteTimeInMilliseconds { get; internal set; }
+
+		/// <summary>
+		/// Returns the number of delete operation executed
+		/// </summary>
+		[JsonProperty("delete_total")]
+		public long DeleteTotal { get; internal set; }
 
 		/// <summary>
 		/// Returns the currently in-flight indexing operations.
@@ -30,22 +36,22 @@ public class ShardIndexing
 		public long IndexFailed { get; internal set; }
 
 		/// <summary>
-		/// Returns the number of delete operation executed
+		/// The total amount of time spend on executing index operations.
 		/// </summary>
-		[JsonProperty("delete_total")]
-		public long DeleteTotal { get; internal set; }
+		[JsonProperty("index_time_in_millis")]
+		public long IndexTimeInMilliseconds { get; internal set; }
 
 		/// <summary>
-		/// The total amount of time spend on executing delete operations.
+		/// The total number of indexing operations
 		/// </summary>
-		[JsonProperty("delete_time_in_millis")]
-		public long DeleteTimeInMilliseconds { get; internal set; }
+		[JsonProperty("index_total")]
+		public long IndexTotal { get; internal set; }
 
 		/// <summary>
-		/// Returns the currently in-flight delete operations
+		/// Returns if the index is under merge throttling control
 		/// </summary>
-		[JsonProperty("delete_current")]
-		public long DeleteCurrent { get; internal set; }
+		[JsonProperty("is_throttled")]
+		public bool IsThrottled { get; internal set; }
 
 		/// <summary>
 		/// Returns the number of noop update operations
@@ -53,12 +59,6 @@ public class ShardIndexing
 		[JsonProperty("noop_update_total")]
 		public long NoopUpdateTotal { get; internal set; }
 
-		/// <summary>
-		/// Returns if the index is under merge throttling control
-		/// </summary>
-		[JsonProperty("is_throttled")]
-		public bool IsThrottled { get; internal set; }
-
 		/// <summary>
 		/// Gets the amount of time that the index has been under merge throttling control
 		/// </summary>
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardMerges.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardMerges.cs
index c405d8914cc..2f5a776e6f2 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardMerges.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardMerges.cs
@@ -7,23 +7,32 @@ public class ShardMerges
 	{
 		[JsonProperty("current")]
 		public long Current { get; internal set; }
+
 		[JsonProperty("current_docs")]
 		public long CurrentDocuments { get; internal set; }
+
 		[JsonProperty("current_size_in_bytes")]
 		public long CurrentSizeInBytes { get; internal set; }
+
 		[JsonProperty("total")]
 		public long Total { get; internal set; }
-		[JsonProperty("total_time_in_millis")]
-		public long TotalTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("total_auto_throttle_in_bytes")]
+		public long TotalAutoThrottleInBytes { get; internal set; }
+
 		[JsonProperty("total_docs")]
 		public long TotalDocuments { get; internal set; }
+
 		[JsonProperty("total_size_in_bytes")]
 		public long TotalSizeInBytes { get; internal set; }
+
 		[JsonProperty("total_stopped_time_in_millis")]
 		public long TotalStoppedTimeInMilliseconds { get; internal set; }
+
 		[JsonProperty("total_throttled_time_in_millis")]
 		public long TotalThrottledTimeInMilliseconds { get; internal set; }
-		[JsonProperty("total_auto_throttle_in_bytes")]
-		public long TotalAutoThrottleInBytes { get; internal set; }
+
+		[JsonProperty("total_time_in_millis")]
+		public long TotalTimeInMilliseconds { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardPath.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardPath.cs
index 36221a3c950..bef2ba0f6ce 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardPath.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardPath.cs
@@ -5,13 +5,13 @@ namespace Nest
 	[JsonObject]
 	public class ShardPath
 	{
-		[JsonProperty("state_path")]
-		public string StatePath { get; internal set; }
-
 		[JsonProperty("data_path")]
 		public string DataPath { get; internal set; }
 
 		[JsonProperty("is_custom_data_path")]
 		public bool IsCustomDataPath { get; internal set; }
+
+		[JsonProperty("state_path")]
+		public string StatePath { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardQueryCache.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardQueryCache.cs
index dbe32937bf5..325af32b027 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardQueryCache.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardQueryCache.cs
@@ -5,19 +5,25 @@ namespace Nest
 	[JsonObject]
 	public class ShardQueryCache
 	{
-		[JsonProperty("memory_size_in_bytes")]
-		public long MemorySizeInBytes { get; internal set; }
-		[JsonProperty("total_count")]
-		public long TotalCount { get; internal set; }
-		[JsonProperty("hit_count")]
-		public long HitCount { get; internal set; }
-		[JsonProperty("miss_count")]
-		public long MissCount { get; internal set; }
-		[JsonProperty("cache_size")]
-		public long CacheSize { get; internal set; }
 		[JsonProperty("cache_count")]
 		public long CacheCount { get; internal set; }
+
+		[JsonProperty("cache_size")]
+		public long CacheSize { get; internal set; }
+
 		[JsonProperty("evictions")]
 		public long Evictions { get; internal set; }
+
+		[JsonProperty("hit_count")]
+		public long HitCount { get; internal set; }
+
+		[JsonProperty("memory_size_in_bytes")]
+		public long MemorySizeInBytes { get; internal set; }
+
+		[JsonProperty("miss_count")]
+		public long MissCount { get; internal set; }
+
+		[JsonProperty("total_count")]
+		public long TotalCount { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardRefresh.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardRefresh.cs
index 4b19c193e81..f3f473fc785 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardRefresh.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardRefresh.cs
@@ -5,11 +5,13 @@ namespace Nest
 	[JsonObject]
 	public class ShardRefresh
 	{
+		[JsonProperty("listeners")]
+		public long Listeners { get; internal set; }
+
 		[JsonProperty("total")]
 		public long Total { get; internal set; }
+
 		[JsonProperty("total_time_in_millis")]
 		public long TotalTimeInMilliseconds { get; internal set; }
-		[JsonProperty("listeners")]
-		public long Listeners { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardRequestCache.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardRequestCache.cs
index e16c5c89818..afbaf786955 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardRequestCache.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardRequestCache.cs
@@ -5,12 +5,15 @@ namespace Nest
 	[JsonObject]
 	public class ShardRequestCache
 	{
-		[JsonProperty("memory_size_in_bytes")]
-		public long MemorySizeInBytes { get; internal set; }
 		[JsonProperty("evictions")]
 		public long Evictions { get; internal set; }
+
 		[JsonProperty("hit_count")]
 		public long HitCount { get; internal set; }
+
+		[JsonProperty("memory_size_in_bytes")]
+		public long MemorySizeInBytes { get; internal set; }
+
 		[JsonProperty("miss_count")]
 		public long MissCount { get; internal set; }
 	}
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardRouting.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardRouting.cs
index aefb2a8ba42..2d4f3536449 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardRouting.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardRouting.cs
@@ -5,16 +5,16 @@ namespace Nest
 	[JsonObject]
 	public class ShardRouting
 	{
-		[JsonProperty("state")]
-		public ShardRoutingState State { get; internal set; }
+		[JsonProperty("node")]
+		public string Node { get; internal set; }
 
 		[JsonProperty("primary")]
 		public bool Primary { get; internal set; }
 
-		[JsonProperty("node")]
-		public string Node { get; internal set; }
-
 		[JsonProperty("relocating_node")]
 		public string RelocatingNode { get; internal set; }
+
+		[JsonProperty("state")]
+		public ShardRoutingState State { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardRoutingState.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardRoutingState.cs
index 5043d2eabb7..2893685171b 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardRoutingState.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardRoutingState.cs
@@ -31,4 +31,4 @@ public enum ShardRoutingState
 		[EnumMember(Value = "RELOCATING")]
 		Relocating
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardSearch.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardSearch.cs
index ba8851386fb..744b64927d5 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardSearch.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardSearch.cs
@@ -5,31 +5,43 @@ namespace Nest
 	[JsonObject]
 	public class ShardSearch
 	{
+		[JsonProperty("fetch_current")]
+		public long FetchCurrent { get; internal set; }
+
+		[JsonProperty("fetch_time_in_millis")]
+		public long FetchTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("fetch_total")]
+		public long FetchTotal { get; internal set; }
+
 		[JsonProperty("open_contexts")]
 		public long OpenContexts { get; internal set; }
-		[JsonProperty("query_total")]
-		public long QueryTotal { get; internal set; }
-		[JsonProperty("query_time_in_millis")]
-		public long QueryTimeInMilliseconds { get; internal set; }
+
 		[JsonProperty("query_current")]
 		public long QueryCurrent { get; internal set; }
-		[JsonProperty("fetch_total")]
-		public long FetchTotal { get; internal set; }
-		[JsonProperty("fetch_time_in_millis")]
-		public long FetchTimeInMilliseconds { get; internal set; }
-		[JsonProperty("fetch_current")]
-		public long FetchCurrent { get; internal set; }
-		[JsonProperty("scroll_total")]
-		public long ScrollTotal { get; internal set; }
-		[JsonProperty("scroll_time_in_millis")]
-		public long ScrollTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("query_time_in_millis")]
+		public long QueryTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("query_total")]
+		public long QueryTotal { get; internal set; }
+
 		[JsonProperty("scroll_current")]
 		public long ScrollCurrent { get; internal set; }
-		[JsonProperty("suggest_total")]
-		public long SuggestTotal { get; internal set; }
-		[JsonProperty("suggest_time_in_millis")]
-		public long SuggestTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("scroll_time_in_millis")]
+		public long ScrollTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("scroll_total")]
+		public long ScrollTotal { get; internal set; }
+
 		[JsonProperty("suggest_current")]
 		public long SuggestCurrent { get; internal set; }
+
+		[JsonProperty("suggest_time_in_millis")]
+		public long SuggestTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("suggest_total")]
+		public long SuggestTotal { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardSegments.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardSegments.cs
index be0d3f9ffe9..38d21438643 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardSegments.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardSegments.cs
@@ -8,29 +8,41 @@ public class ShardSegments
 	{
 		[JsonProperty("count")]
 		public long Count { get; internal set; }
+
+		[JsonProperty("doc_values_memory_in_bytes")]
+		public long DocumentValuesMemoryInBytes { get; internal set; }
+
+		[JsonProperty("file_sizes")]
+		public IReadOnlyDictionary<string, ShardFileSizeInfo> FileSizes { get; internal set; } = EmptyReadOnly<string, ShardFileSizeInfo>.Dictionary;
+
+		[JsonProperty("fixed_bit_set_memory_in_bytes")]
+		public long FixedBitMemoryInBytes { get; internal set; }
+
+		[JsonProperty("index_writer_memory_in_bytes")]
+		public long IndexWriterMemoryInBytes { get; internal set; }
+
+		[JsonProperty("max_unsafe_auto_id_timestamp")]
+		public long MaxUnsafeAutoIdTimeStamp { get; internal set; }
+
 		[JsonProperty("memory_in_bytes")]
 		public long MemoryInBytes { get; internal set; }
-		[JsonProperty("terms_memory_in_bytes")]
-		public long TermsMemoryInBytes { get; internal set; }
-		[JsonProperty("stored_fields_memory_in_bytes")]
-		public long StoredFieldsMemoryInBytes { get; internal set; }
-		[JsonProperty("term_vectors_memory_in_bytes")]
-		public long TermVectorsMemoryInBytes { get; internal set; }
+
 		[JsonProperty("norms_memory_in_bytes")]
 		public long NormsMemoryInBytes { get; internal set; }
+
 		[JsonProperty("points_memory_in_bytes")]
 		public long PointsMemoryInBytes { get; internal set; }
-		[JsonProperty("doc_values_memory_in_bytes")]
-		public long DocumentValuesMemoryInBytes { get; internal set; }
-		[JsonProperty("index_writer_memory_in_bytes")]
-		public long IndexWriterMemoryInBytes { get; internal set; }
+
+		[JsonProperty("stored_fields_memory_in_bytes")]
+		public long StoredFieldsMemoryInBytes { get; internal set; }
+
+		[JsonProperty("terms_memory_in_bytes")]
+		public long TermsMemoryInBytes { get; internal set; }
+
+		[JsonProperty("term_vectors_memory_in_bytes")]
+		public long TermVectorsMemoryInBytes { get; internal set; }
+
 		[JsonProperty("version_map_memory_in_bytes")]
 		public long VersionMapMemoryInBytes { get; internal set; }
-		[JsonProperty("fixed_bit_set_memory_in_bytes")]
-		public long FixedBitMemoryInBytes { get; internal set; }
-		[JsonProperty("max_unsafe_auto_id_timestamp")]
-		public long MaxUnsafeAutoIdTimeStamp { get; internal set; }
-		[JsonProperty("file_sizes")]
-		public IReadOnlyDictionary<string, ShardFileSizeInfo> FileSizes { get; internal set; } = EmptyReadOnly<string, ShardFileSizeInfo>.Dictionary;
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardSequenceNumber.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardSequenceNumber.cs
index e11c4a3ea33..f68444a37ec 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardSequenceNumber.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardSequenceNumber.cs
@@ -5,11 +5,13 @@ namespace Nest
 	[JsonObject]
 	public class ShardSequenceNumber
 	{
-		[JsonProperty("max_seq_no")]
-		public long MaximumSequenceNumber { get; internal set; }
-		[JsonProperty("local_checkpoint")]
-		public long LocalCheckpoint { get; internal set; }
 		[JsonProperty("global_checkpoint")]
 		public long GlobalCheckpoint { get; internal set; }
+
+		[JsonProperty("local_checkpoint")]
+		public long LocalCheckpoint { get; internal set; }
+
+		[JsonProperty("max_seq_no")]
+		public long MaximumSequenceNumber { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardStats.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardStats.cs
index efaca77128f..571b98247ad 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardStats.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardStats.cs
@@ -5,64 +5,64 @@ namespace Nest
 	[JsonObject]
 	public class ShardStats
 	{
-		[JsonProperty("routing")]
-		public ShardRouting Routing { get; internal set; }
+		[JsonProperty("commit")]
+		public ShardCommit Commit { get; internal set; }
+
+		[JsonProperty("completion")]
+		public ShardCompletion Completion { get; internal set; }
 
 		[JsonProperty("docs")]
 		public ShardDocs Documents { get; internal set; }
 
-		[JsonProperty("store")]
-		public ShardStatsStore Store { get; internal set; }
+		[JsonProperty("fielddata")]
+		public ShardFieldData FieldData { get; internal set; }
 
-		[JsonProperty("indexing")]
-		public ShardIndexing Indexing { get; internal set; }
+		[JsonProperty("flush")]
+		public ShardFlush Flush { get; internal set; }
 
 		[JsonProperty("get")]
 		public ShardGet Get { get; internal set; }
 
-		[JsonProperty("search")]
-		public ShardSearch Search { get; internal set; }
+		[JsonProperty("indexing")]
+		public ShardIndexing Indexing { get; internal set; }
 
 		[JsonProperty("merges")]
 		public ShardMerges Merges { get; internal set; }
 
-		[JsonProperty("refresh")]
-		public ShardRefresh Refresh { get; internal set; }
-
-		[JsonProperty("flush")]
-		public ShardFlush Flush { get; internal set; }
-
-		[JsonProperty("warmer")]
-		public ShardWarmer Warmer { get; internal set; }
+		[JsonProperty("shard_path")]
+		public ShardPath Path { get; internal set; }
 
 		[JsonProperty("query_cache")]
 		public ShardQueryCache QueryCache { get; internal set; }
 
-		[JsonProperty("fielddata")]
-		public ShardFieldData FieldData { get; internal set; }
-
-		[JsonProperty("completion")]
-		public ShardCompletion Completion { get; internal set; }
-
-		[JsonProperty("segments")]
-		public ShardSegments Segments { get; internal set; }
+		[JsonProperty("recovery")]
+		public ShardStatsRecovery Recovery { get; internal set; }
 
-		[JsonProperty("translog")]
-		public ShardTransactionLog TransactionLog { get; internal set; }
+		[JsonProperty("refresh")]
+		public ShardRefresh Refresh { get; internal set; }
 
 		[JsonProperty("request_cache")]
 		public ShardRequestCache RequestCache { get; internal set; }
 
-		[JsonProperty("recovery")]
-		public ShardStatsRecovery Recovery { get; internal set; }
+		[JsonProperty("routing")]
+		public ShardRouting Routing { get; internal set; }
 
-		[JsonProperty("commit")]
-		public ShardCommit Commit { get; internal set; }
+		[JsonProperty("search")]
+		public ShardSearch Search { get; internal set; }
+
+		[JsonProperty("segments")]
+		public ShardSegments Segments { get; internal set; }
 
 		[JsonProperty("seq_no")]
 		public ShardSequenceNumber SequenceNumber { get; internal set; }
 
-		[JsonProperty("shard_path")]
-		public ShardPath Path { get; internal set; }
+		[JsonProperty("store")]
+		public ShardStatsStore Store { get; internal set; }
+
+		[JsonProperty("translog")]
+		public ShardTransactionLog TransactionLog { get; internal set; }
+
+		[JsonProperty("warmer")]
+		public ShardWarmer Warmer { get; internal set; }
 	}
 }
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardStatsRecovery.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardStatsRecovery.cs
index a091663af11..dbc54e9f4e5 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardStatsRecovery.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardStatsRecovery.cs
@@ -7,8 +7,10 @@ public class ShardStatsRecovery
 	{
 		[JsonProperty("current_as_source")]
 		public long CurrentAsSource { get; internal set; }
+
 		[JsonProperty("current_as_target")]
 		public long CurrentAsTarget { get; internal set; }
+
 		[JsonProperty("throttle_time_in_millis")]
 		public long ThrottleTimeInMilliseconds { get; internal set; }
 	}
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardTransactionLog.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardTransactionLog.cs
index 5284126476d..924b26e3607 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardTransactionLog.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardTransactionLog.cs
@@ -7,10 +7,13 @@ public class ShardTransactionLog
 	{
 		[JsonProperty("operations")]
 		public long Operations { get; internal set; }
+
 		[JsonProperty("size_in_bytes")]
 		public long SizeInBytes { get; internal set; }
+
 		[JsonProperty("uncommitted_operations")]
 		public long UncommittedOperations { get; internal set; }
+
 		[JsonProperty("uncommitted_size_in_bytes")]
 		public long UncommittedSizeInBytes { get; internal set; }
 	}
diff --git a/src/Nest/Indices/Monitoring/IndicesStats/ShardWarmer.cs b/src/Nest/Indices/Monitoring/IndicesStats/ShardWarmer.cs
index 5313456daaa..bd2f886513d 100644
--- a/src/Nest/Indices/Monitoring/IndicesStats/ShardWarmer.cs
+++ b/src/Nest/Indices/Monitoring/IndicesStats/ShardWarmer.cs
@@ -7,8 +7,10 @@ public class ShardWarmer
 	{
 		[JsonProperty("current")]
 		public long Current { get; internal set; }
+
 		[JsonProperty("total")]
 		public long Total { get; internal set; }
+
 		[JsonProperty("total_time_in_millis")]
 		public long TotalTimeInMilliseconds { get; internal set; }
 	}
diff --git a/src/Nest/Indices/StatusManagement/ClearCache/ClearCacheRequest.cs b/src/Nest/Indices/StatusManagement/ClearCache/ClearCacheRequest.cs
index 136c048cb45..871de5bb4e7 100644
--- a/src/Nest/Indices/StatusManagement/ClearCache/ClearCacheRequest.cs
+++ b/src/Nest/Indices/StatusManagement/ClearCache/ClearCacheRequest.cs
@@ -1,7 +1,7 @@
 namespace Nest
 {
 	public partial interface IClearCacheRequest { }
-	
+
 	public partial class ClearCacheRequest { }
 
 	[DescriptorFor("IndicesClearCache")]
diff --git a/src/Nest/Indices/StatusManagement/ClearCache/ClearCacheResponse.cs b/src/Nest/Indices/StatusManagement/ClearCache/ClearCacheResponse.cs
index ce993261958..66febe1a344 100644
--- a/src/Nest/Indices/StatusManagement/ClearCache/ClearCacheResponse.cs
+++ b/src/Nest/Indices/StatusManagement/ClearCache/ClearCacheResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IClearCacheResponse : IShardsOperationResponse { }
 
diff --git a/src/Nest/Indices/StatusManagement/ClearCache/ElasticClient-ClearCache.cs b/src/Nest/Indices/StatusManagement/ClearCache/ElasticClient-ClearCache.cs
index 2f0845d77ef..9aa6d2ac0e4 100644
--- a/src/Nest/Indices/StatusManagement/ClearCache/ElasticClient-ClearCache.cs
+++ b/src/Nest/Indices/StatusManagement/ClearCache/ElasticClient-ClearCache.cs
@@ -1,64 +1,64 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
-
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The clear cache API allows to clear either all caches or specific cached associated with one ore more indices.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-clearcache.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-clearcache.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the clear cache operation</param>
 		IClearCacheResponse ClearCache(Indices indices, Func<ClearCacheDescriptor, IClearCacheRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClearCacheResponse ClearCache(IClearCacheRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IClearCacheResponse> ClearCacheAsync(
 			Indices indices,
 			Func<ClearCacheDescriptor, IClearCacheRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
 		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IClearCacheResponse> ClearCacheAsync(IClearCacheRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClearCacheResponse ClearCache(Indices indices, Func<ClearCacheDescriptor, IClearCacheRequest> selector = null) =>
-			this.Dispatcher.Dispatch<IClearCacheRequest, ClearCacheRequestParameters, ClearCacheResponse>(
+			Dispatcher.Dispatch<IClearCacheRequest, ClearCacheRequestParameters, ClearCacheResponse>(
 				selector.InvokeOrDefault(new ClearCacheDescriptor().Index(indices)),
-				(p, d) => this.LowLevelDispatch.IndicesClearCacheDispatch<ClearCacheResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesClearCacheDispatch<ClearCacheResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClearCacheResponse ClearCache(IClearCacheRequest request) =>
-			this.Dispatcher.Dispatch<IClearCacheRequest, ClearCacheRequestParameters, ClearCacheResponse>(
+			Dispatcher.Dispatch<IClearCacheRequest, ClearCacheRequestParameters, ClearCacheResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesClearCacheDispatch<ClearCacheResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesClearCacheDispatch<ClearCacheResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IClearCacheResponse> ClearCacheAsync(
 			Indices indices,
 			Func<ClearCacheDescriptor, IClearCacheRequest> selector = null,
 			CancellationToken cancellationToken = default(CancellationToken)
-		) => this.ClearCacheAsync(selector.InvokeOrDefault(new ClearCacheDescriptor().Index(indices)), cancellationToken);
+		) => ClearCacheAsync(selector.InvokeOrDefault(new ClearCacheDescriptor().Index(indices)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IClearCacheResponse> ClearCacheAsync(IClearCacheRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClearCacheRequest, ClearCacheRequestParameters, ClearCacheResponse, IClearCacheResponse>(
+		/// <inheritdoc />
+		public Task<IClearCacheResponse> ClearCacheAsync(IClearCacheRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IClearCacheRequest, ClearCacheRequestParameters, ClearCacheResponse, IClearCacheResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesClearCacheDispatchAsync<ClearCacheResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesClearCacheDispatchAsync<ClearCacheResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/Flush/ElasticClient-Flush.cs b/src/Nest/Indices/StatusManagement/Flush/ElasticClient-Flush.cs
index e0fc930e33e..d078c161cda 100644
--- a/src/Nest/Indices/StatusManagement/Flush/ElasticClient-Flush.cs
+++ b/src/Nest/Indices/StatusManagement/Flush/ElasticClient-Flush.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -12,44 +12,49 @@ public partial interface IElasticClient
 		/// frees memory from the index by flushing data to the index storage and clearing the internal transaction log.
 		/// By default, Elasticsearch uses memory heuristics in order to automatically trigger
 		/// flush operations as required in order to clear memory.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-flush.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-flush.html
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the flush operation</param>
 		IFlushResponse Flush(Indices indices, Func<FlushDescriptor, IFlushRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IFlushResponse Flush(IFlushRequest request);
 
-		/// <inheritdoc/>
-		Task<IFlushResponse> FlushAsync(Indices indices, Func<FlushDescriptor, IFlushRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IFlushResponse> FlushAsync(Indices indices, Func<FlushDescriptor, IFlushRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IFlushResponse> FlushAsync(IFlushRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IFlushResponse Flush(Indices indices, Func<FlushDescriptor, IFlushRequest> selector = null) =>
-			this.Flush(selector.InvokeOrDefault(new FlushDescriptor().Index(indices)));
+			Flush(selector.InvokeOrDefault(new FlushDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IFlushResponse Flush(IFlushRequest request) =>
-			this.Dispatcher.Dispatch<IFlushRequest, FlushRequestParameters, FlushResponse>(
+			Dispatcher.Dispatch<IFlushRequest, FlushRequestParameters, FlushResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesFlushDispatch<FlushResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesFlushDispatch<FlushResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IFlushResponse> FlushAsync(Indices indices, Func<FlushDescriptor, IFlushRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.FlushAsync(selector.InvokeOrDefault(new FlushDescriptor().Index(indices)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IFlushResponse> FlushAsync(Indices indices, Func<FlushDescriptor, IFlushRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			FlushAsync(selector.InvokeOrDefault(new FlushDescriptor().Index(indices)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IFlushResponse> FlushAsync(IFlushRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IFlushRequest, FlushRequestParameters, FlushResponse, IFlushResponse>(
+			Dispatcher.DispatchAsync<IFlushRequest, FlushRequestParameters, FlushResponse, IFlushResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesFlushDispatchAsync<FlushResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesFlushDispatchAsync<FlushResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/Flush/FlushResponse.cs b/src/Nest/Indices/StatusManagement/Flush/FlushResponse.cs
index de172b30b0e..371fe0ebdaa 100644
--- a/src/Nest/Indices/StatusManagement/Flush/FlushResponse.cs
+++ b/src/Nest/Indices/StatusManagement/Flush/FlushResponse.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IFlushResponse : IShardsOperationResponse { }
-	
+
 	public class FlushResponse : ShardsOperationResponseBase, IFlushResponse { }
 }
diff --git a/src/Nest/Indices/StatusManagement/ForceMerge/ElasticClient-ForceMerge.cs b/src/Nest/Indices/StatusManagement/ForceMerge/ElasticClient-ForceMerge.cs
index b512dc4133d..69c136c8892 100644
--- a/src/Nest/Indices/StatusManagement/ForceMerge/ElasticClient-ForceMerge.cs
+++ b/src/Nest/Indices/StatusManagement/ForceMerge/ElasticClient-ForceMerge.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,40 +9,44 @@ public partial interface IElasticClient
 	{
 		IForceMergeResponse ForceMerge(Indices indices, Func<ForceMergeDescriptor, IForceMergeRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IForceMergeResponse ForceMerge(IForceMergeRequest request);
 
-		/// <inheritdoc/>
-		Task<IForceMergeResponse> ForceMergeAsync(Indices indices, Func<ForceMergeDescriptor, IForceMergeRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IForceMergeResponse> ForceMergeAsync(Indices indices, Func<ForceMergeDescriptor, IForceMergeRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IForceMergeResponse> ForceMergeAsync(IForceMergeRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IForceMergeResponse ForceMerge(Indices indices, Func<ForceMergeDescriptor, IForceMergeRequest> selector = null) =>
-			this.ForceMerge(selector.InvokeOrDefault(new ForceMergeDescriptor().Index(indices)));
+			ForceMerge(selector.InvokeOrDefault(new ForceMergeDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IForceMergeResponse ForceMerge(IForceMergeRequest request) =>
-			this.Dispatcher.Dispatch<IForceMergeRequest, ForceMergeRequestParameters, ForceMergeResponse>(
+			Dispatcher.Dispatch<IForceMergeRequest, ForceMergeRequestParameters, ForceMergeResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesForcemergeDispatch<ForceMergeResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesForcemergeDispatch<ForceMergeResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IForceMergeResponse> ForceMergeAsync(Indices indices, Func<ForceMergeDescriptor, IForceMergeRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ForceMergeAsync(selector.InvokeOrDefault(new ForceMergeDescriptor().Index(indices)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IForceMergeResponse> ForceMergeAsync(Indices indices, Func<ForceMergeDescriptor, IForceMergeRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ForceMergeAsync(selector.InvokeOrDefault(new ForceMergeDescriptor().Index(indices)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IForceMergeResponse> ForceMergeAsync(IForceMergeRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IForceMergeRequest, ForceMergeRequestParameters, ForceMergeResponse, IForceMergeResponse>(
+		/// <inheritdoc />
+		public Task<IForceMergeResponse> ForceMergeAsync(IForceMergeRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IForceMergeRequest, ForceMergeRequestParameters, ForceMergeResponse, IForceMergeResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesForcemergeDispatchAsync<ForceMergeResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesForcemergeDispatchAsync<ForceMergeResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/ForceMerge/ForceMergeResponse.cs b/src/Nest/Indices/StatusManagement/ForceMerge/ForceMergeResponse.cs
index a83f3af4d34..d64b665a924 100644
--- a/src/Nest/Indices/StatusManagement/ForceMerge/ForceMergeResponse.cs
+++ b/src/Nest/Indices/StatusManagement/ForceMerge/ForceMergeResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IForceMergeResponse : IShardsOperationResponse { }
 
diff --git a/src/Nest/Indices/StatusManagement/Refresh/ElasticClient-Refresh.cs b/src/Nest/Indices/StatusManagement/Refresh/ElasticClient-Refresh.cs
index 2a04f4c0d28..b42c9b34891 100644
--- a/src/Nest/Indices/StatusManagement/Refresh/ElasticClient-Refresh.cs
+++ b/src/Nest/Indices/StatusManagement/Refresh/ElasticClient-Refresh.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,44 +10,49 @@ public partial interface IElasticClient
 		/// <summary>
 		/// The refresh API allows to explicitly refresh one or more index, making all operations performed since the last refresh
 		/// available for search. The (near) real-time capabilities depend on the index engine used.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html</a>
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the parameters for the refresh operation</param>
 		IRefreshResponse Refresh(Indices indices, Func<RefreshDescriptor, IRefreshRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRefreshResponse Refresh(IRefreshRequest request);
 
-		/// <inheritdoc/>
-		Task<IRefreshResponse> RefreshAsync(Indices indices, Func<RefreshDescriptor, IRefreshRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRefreshResponse> RefreshAsync(Indices indices, Func<RefreshDescriptor, IRefreshRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IRefreshResponse> RefreshAsync(IRefreshRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRefreshResponse Refresh(Indices indices, Func<RefreshDescriptor, IRefreshRequest> selector = null) =>
-			this.Refresh(selector.InvokeOrDefault(new RefreshDescriptor().Index(indices)));
+			Refresh(selector.InvokeOrDefault(new RefreshDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRefreshResponse Refresh(IRefreshRequest request) =>
-			this.Dispatcher.Dispatch<IRefreshRequest, RefreshRequestParameters, RefreshResponse>(
+			Dispatcher.Dispatch<IRefreshRequest, RefreshRequestParameters, RefreshResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesRefreshDispatch<RefreshResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesRefreshDispatch<RefreshResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IRefreshResponse> RefreshAsync(Indices indices, Func<RefreshDescriptor, IRefreshRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RefreshAsync(selector.InvokeOrDefault(new RefreshDescriptor().Index(indices)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IRefreshResponse> RefreshAsync(Indices indices, Func<RefreshDescriptor, IRefreshRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RefreshAsync(selector.InvokeOrDefault(new RefreshDescriptor().Index(indices)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IRefreshResponse> RefreshAsync(IRefreshRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRefreshRequest, RefreshRequestParameters, RefreshResponse, IRefreshResponse>(
+			Dispatcher.DispatchAsync<IRefreshRequest, RefreshRequestParameters, RefreshResponse, IRefreshResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesRefreshDispatchAsync<RefreshResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesRefreshDispatchAsync<RefreshResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/Refresh/RefreshResponse.cs b/src/Nest/Indices/StatusManagement/Refresh/RefreshResponse.cs
index b09dc46f0c2..b573676f94c 100644
--- a/src/Nest/Indices/StatusManagement/Refresh/RefreshResponse.cs
+++ b/src/Nest/Indices/StatusManagement/Refresh/RefreshResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IRefreshResponse : IShardsOperationResponse { }
 
diff --git a/src/Nest/Indices/StatusManagement/SyncedFlush/ElasticClient-SyncedFlush.cs b/src/Nest/Indices/StatusManagement/SyncedFlush/ElasticClient-SyncedFlush.cs
index 90b5d9dbfd4..33a643a7975 100644
--- a/src/Nest/Indices/StatusManagement/SyncedFlush/ElasticClient-SyncedFlush.cs
+++ b/src/Nest/Indices/StatusManagement/SyncedFlush/ElasticClient-SyncedFlush.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -17,39 +17,45 @@ public partial interface IElasticClient
 		/// <returns></returns>
 		ISyncedFlushResponse SyncedFlush(Indices indices, Func<SyncedFlushDescriptor, ISyncedFlushRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISyncedFlushResponse SyncedFlush(ISyncedFlushRequest request);
 
-		/// <inheritdoc/>
-		Task<ISyncedFlushResponse> SyncedFlushAsync(Indices indices, Func<SyncedFlushDescriptor, ISyncedFlushRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ISyncedFlushResponse> SyncedFlushAsync(Indices indices, Func<SyncedFlushDescriptor, ISyncedFlushRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ISyncedFlushResponse> SyncedFlushAsync(ISyncedFlushRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISyncedFlushResponse SyncedFlush(Indices indices, Func<SyncedFlushDescriptor, ISyncedFlushRequest> selector = null) =>
-			this.SyncedFlush(selector.InvokeOrDefault(new SyncedFlushDescriptor().Index(indices)));
+			SyncedFlush(selector.InvokeOrDefault(new SyncedFlushDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISyncedFlushResponse SyncedFlush(ISyncedFlushRequest request) =>
-			this.Dispatcher.Dispatch<ISyncedFlushRequest, SyncedFlushRequestParameters, SyncedFlushResponse>(
+			Dispatcher.Dispatch<ISyncedFlushRequest, SyncedFlushRequestParameters, SyncedFlushResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesFlushSyncedDispatch<SyncedFlushResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesFlushSyncedDispatch<SyncedFlushResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<ISyncedFlushResponse> SyncedFlushAsync(Indices indices, Func<SyncedFlushDescriptor, ISyncedFlushRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.SyncedFlushAsync(selector.InvokeOrDefault(new SyncedFlushDescriptor().Index(indices)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ISyncedFlushResponse> SyncedFlushAsync(ISyncedFlushRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ISyncedFlushRequest, SyncedFlushRequestParameters, SyncedFlushResponse, ISyncedFlushResponse>(
+		/// <inheritdoc />
+		public Task<ISyncedFlushResponse> SyncedFlushAsync(Indices indices, Func<SyncedFlushDescriptor, ISyncedFlushRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			SyncedFlushAsync(selector.InvokeOrDefault(new SyncedFlushDescriptor().Index(indices)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<ISyncedFlushResponse> SyncedFlushAsync(ISyncedFlushRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ISyncedFlushRequest, SyncedFlushRequestParameters, SyncedFlushResponse, ISyncedFlushResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesFlushSyncedDispatchAsync<SyncedFlushResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesFlushSyncedDispatchAsync<SyncedFlushResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/SyncedFlush/SyncedFlushRequest.cs b/src/Nest/Indices/StatusManagement/SyncedFlush/SyncedFlushRequest.cs
index 625efe324db..7cf23b1de18 100644
--- a/src/Nest/Indices/StatusManagement/SyncedFlush/SyncedFlushRequest.cs
+++ b/src/Nest/Indices/StatusManagement/SyncedFlush/SyncedFlushRequest.cs
@@ -3,7 +3,7 @@
 	public partial interface ISyncedFlushRequest { }
 
 	public partial class SyncedFlushRequest { }
-	
+
 	[DescriptorFor("IndicesFlushSynced")]
 	public partial class SyncedFlushDescriptor { }
 }
diff --git a/src/Nest/Indices/StatusManagement/SyncedFlush/SyncedFlushResponse.cs b/src/Nest/Indices/StatusManagement/SyncedFlush/SyncedFlushResponse.cs
index de6193f9d47..5f0c9adba73 100644
--- a/src/Nest/Indices/StatusManagement/SyncedFlush/SyncedFlushResponse.cs
+++ b/src/Nest/Indices/StatusManagement/SyncedFlush/SyncedFlushResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface ISyncedFlushResponse : IShardsOperationResponse { }
 
diff --git a/src/Nest/Indices/StatusManagement/Upgrade/ElasticClient-Upgrade.cs b/src/Nest/Indices/StatusManagement/Upgrade/ElasticClient-Upgrade.cs
index bbf43719294..2e0c5a0b799 100644
--- a/src/Nest/Indices/StatusManagement/Upgrade/ElasticClient-Upgrade.cs
+++ b/src/Nest/Indices/StatusManagement/Upgrade/ElasticClient-Upgrade.cs
@@ -1,44 +1,48 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpgradeResponse Upgrade(IUpgradeRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpgradeResponse Upgrade(Indices indices, Func<UpgradeDescriptor, IUpgradeRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IUpgradeResponse> UpgradeAsync(IUpgradeRequest request, CancellationToken cancellationToken = default(CancellationToken));
 
-		/// <inheritdoc/>
-		Task<IUpgradeResponse> UpgradeAsync(Indices indices, Func<UpgradeDescriptor, IUpgradeRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IUpgradeResponse> UpgradeAsync(Indices indices, Func<UpgradeDescriptor, IUpgradeRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
 		public IUpgradeResponse Upgrade(IUpgradeRequest request) =>
-			this.Dispatcher.Dispatch<IUpgradeRequest, UpgradeRequestParameters, UpgradeResponse>(
+			Dispatcher.Dispatch<IUpgradeRequest, UpgradeRequestParameters, UpgradeResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesUpgradeDispatch<UpgradeResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesUpgradeDispatch<UpgradeResponse>(p)
 			);
 
 		public IUpgradeResponse Upgrade(Indices indices, Func<UpgradeDescriptor, IUpgradeRequest> selector = null) =>
-			this.Upgrade(selector.InvokeOrDefault(new UpgradeDescriptor().Index(indices)));
+			Upgrade(selector.InvokeOrDefault(new UpgradeDescriptor().Index(indices)));
 
 		public Task<IUpgradeResponse> UpgradeAsync(IUpgradeRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IUpgradeRequest, UpgradeRequestParameters, UpgradeResponse, IUpgradeResponse>(
+			Dispatcher.DispatchAsync<IUpgradeRequest, UpgradeRequestParameters, UpgradeResponse, IUpgradeResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesUpgradeDispatchAsync<UpgradeResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesUpgradeDispatchAsync<UpgradeResponse>(p, c)
 			);
 
-		public Task<IUpgradeResponse> UpgradeAsync(Indices indices, Func<UpgradeDescriptor, IUpgradeRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.UpgradeAsync(selector.InvokeOrDefault(new UpgradeDescriptor().Index(indices)), cancellationToken);
+		public Task<IUpgradeResponse> UpgradeAsync(Indices indices, Func<UpgradeDescriptor, IUpgradeRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			UpgradeAsync(selector.InvokeOrDefault(new UpgradeDescriptor().Index(indices)), cancellationToken);
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/ElasticClient-UpgradeStatus.cs b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/ElasticClient-UpgradeStatus.cs
index 9e1b1859c4e..c7183077dea 100644
--- a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/ElasticClient-UpgradeStatus.cs
+++ b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/ElasticClient-UpgradeStatus.cs
@@ -1,47 +1,55 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpgradeStatusResponse UpgradeStatus(IUpgradeStatusRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpgradeStatusResponse UpgradeStatus(Func<UpgradeStatusDescriptor, IUpgradeStatusRequest> selector = null);
 
-		/// <inheritdoc/>
-		Task<IUpgradeStatusResponse> UpgradeStatusAsync(IUpgradeStatusRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IUpgradeStatusResponse> UpgradeStatusAsync(IUpgradeStatusRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IUpgradeStatusResponse> UpgradeStatusAsync(Func<UpgradeStatusDescriptor, IUpgradeStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IUpgradeStatusResponse> UpgradeStatusAsync(Func<UpgradeStatusDescriptor, IUpgradeStatusRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpgradeStatusResponse UpgradeStatus(IUpgradeStatusRequest request) =>
-			this.Dispatcher.Dispatch<IUpgradeStatusRequest, UpgradeStatusRequestParameters, UpgradeStatusResponse>(
+			Dispatcher.Dispatch<IUpgradeStatusRequest, UpgradeStatusRequestParameters, UpgradeStatusResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IndicesGetUpgradeDispatch<UpgradeStatusResponse>(p)
+				(p, d) => LowLevelDispatch.IndicesGetUpgradeDispatch<UpgradeStatusResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpgradeStatusResponse UpgradeStatus(Func<UpgradeStatusDescriptor, IUpgradeStatusRequest> selector = null) =>
-			this.UpgradeStatus(selector.InvokeOrDefault(new UpgradeStatusDescriptor()));
+			UpgradeStatus(selector.InvokeOrDefault(new UpgradeStatusDescriptor()));
 
-		/// <inheritdoc/>
-		public Task<IUpgradeStatusResponse> UpgradeStatusAsync(IUpgradeStatusRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IUpgradeStatusRequest, UpgradeStatusRequestParameters, UpgradeStatusResponse, IUpgradeStatusResponse>(
+		/// <inheritdoc />
+		public Task<IUpgradeStatusResponse> UpgradeStatusAsync(IUpgradeStatusRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IUpgradeStatusRequest, UpgradeStatusRequestParameters, UpgradeStatusResponse, IUpgradeStatusResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IndicesGetUpgradeDispatchAsync<UpgradeStatusResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IndicesGetUpgradeDispatchAsync<UpgradeStatusResponse>(p, c)
 			);
 
-		public Task<IUpgradeStatusResponse> UpgradeStatusAsync(Func<UpgradeStatusDescriptor, IUpgradeStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.UpgradeStatusAsync(selector.InvokeOrDefault(new UpgradeStatusDescriptor()), cancellationToken);
+		public Task<IUpgradeStatusResponse> UpgradeStatusAsync(Func<UpgradeStatusDescriptor, IUpgradeStatusRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			UpgradeStatusAsync(selector.InvokeOrDefault(new UpgradeStatusDescriptor()), cancellationToken);
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatus.cs b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatus.cs
index a263116e42f..ef076b2ab36 100644
--- a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatus.cs
+++ b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatus.cs
@@ -13,10 +13,10 @@ public class UpgradeStatus
 		[JsonProperty("size_to_upgrade")]
 		public string SizeToUpgrade { get; set; }
 
-		[JsonProperty("size_to_upgrade_in_bytes")]
-		public string SizeToUpgradeInBytes { get; set; }
-
 		[JsonProperty("size_to_upgrade_ancient_in_bytes")]
 		public string SizeToUpgradeAncientInBytes { get; set; }
+
+		[JsonProperty("size_to_upgrade_in_bytes")]
+		public string SizeToUpgradeInBytes { get; set; }
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatusResponse.cs b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatusResponse.cs
index 6c4a9df91cf..2059813c480 100644
--- a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatusResponse.cs
+++ b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatusResponse.cs
@@ -8,17 +8,18 @@ namespace Nest
 	public interface IUpgradeStatusResponse : IResponse
 	{
 		long SizeInBytes { get; }
-		string SizeToUpgradeInBytes { get; }
 		string SizeToUpgradeAncientInBytes { get; }
+		string SizeToUpgradeInBytes { get; }
 		IReadOnlyDictionary<string, UpgradeStatus> Upgrades { get; }
 	}
 
 	public class UpgradeStatusResponse : ResponseBase, IUpgradeStatusResponse
 	{
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, UpgradeStatus>))]
-		public IReadOnlyDictionary<string, UpgradeStatus> Upgrades { get; internal set; } = EmptyReadOnly<string, UpgradeStatus>.Dictionary;
 		public long SizeInBytes { get; internal set; }
-		public string SizeToUpgradeInBytes { get; internal set; }
 		public string SizeToUpgradeAncientInBytes { get; internal set; }
+		public string SizeToUpgradeInBytes { get; internal set; }
+
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, UpgradeStatus>))]
+		public IReadOnlyDictionary<string, UpgradeStatus> Upgrades { get; internal set; } = EmptyReadOnly<string, UpgradeStatus>.Dictionary;
 	}
 }
diff --git a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatusResponseJsonConverter.cs b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatusResponseJsonConverter.cs
index 23302d7e39b..df93e8387c9 100644
--- a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatusResponseJsonConverter.cs
+++ b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeStatus/UpgradeStatusResponseJsonConverter.cs
@@ -16,8 +16,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			reader.Read();
 			if (reader.TokenType == JsonToken.EndObject)
 				return response;
-			bool newResponse = false;
-			if ((reader.Value as string) == "size_in_bytes")
+
+			var newResponse = false;
+			if (reader.Value as string == "size_in_bytes")
 			{
 				newResponse = true;
 				reader.Read();
@@ -36,7 +37,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				}
 			}
 			var upgrades = new Dictionary<string, UpgradeStatus>();
-			while(true)
+			while (true)
 			{
 				var status = new UpgradeStatus();
 				var index = reader.Value as string;
@@ -64,9 +65,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return response;
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 	}
 }
diff --git a/src/Nest/Ingest/DeletePipeline/DeletePipelineResponse.cs b/src/Nest/Ingest/DeletePipeline/DeletePipelineResponse.cs
index 8d18b0dd9f0..2b57bb7efc3 100644
--- a/src/Nest/Ingest/DeletePipeline/DeletePipelineResponse.cs
+++ b/src/Nest/Ingest/DeletePipeline/DeletePipelineResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IDeletePipelineResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Ingest/DeletePipeline/ElasticClient-DeletePipeline.cs b/src/Nest/Ingest/DeletePipeline/ElasticClient-DeletePipeline.cs
index 5a5b51b682b..7e40d62c450 100644
--- a/src/Nest/Ingest/DeletePipeline/ElasticClient-DeletePipeline.cs
+++ b/src/Nest/Ingest/DeletePipeline/ElasticClient-DeletePipeline.cs
@@ -1,48 +1,56 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
-		IDeletePipelineResponse DeletePipeline( Id id, Func<DeletePipelineDescriptor, IDeletePipelineRequest> selector = null);
+		/// <inheritdoc />
+		IDeletePipelineResponse DeletePipeline(Id id, Func<DeletePipelineDescriptor, IDeletePipelineRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeletePipelineResponse DeletePipeline(IDeletePipelineRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeletePipelineResponse> DeletePipelineAsync( Id id, Func<DeletePipelineDescriptor, IDeletePipelineRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<IDeletePipelineResponse> DeletePipelineAsync(IDeletePipelineRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeletePipelineResponse> DeletePipelineAsync(Id id, Func<DeletePipelineDescriptor, IDeletePipelineRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<IDeletePipelineResponse> DeletePipelineAsync(IDeletePipelineRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeletePipelineResponse DeletePipeline(IDeletePipelineRequest request) =>
-			this.Dispatcher.Dispatch<IDeletePipelineRequest, DeletePipelineRequestParameters, DeletePipelineResponse>(
+			Dispatcher.Dispatch<IDeletePipelineRequest, DeletePipelineRequestParameters, DeletePipelineResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IngestDeletePipelineDispatch<DeletePipelineResponse>(p)
+				(p, d) => LowLevelDispatch.IngestDeletePipelineDispatch<DeletePipelineResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public IDeletePipelineResponse DeletePipeline( Id id, Func<DeletePipelineDescriptor, IDeletePipelineRequest> selector = null) =>
-			this.DeletePipeline(selector.InvokeOrDefault(new DeletePipelineDescriptor( id)));
-
-		/// <inheritdoc/>
-		public Task<IDeletePipelineResponse> DeletePipelineAsync( Id id, Func<DeletePipelineDescriptor, IDeletePipelineRequest> selector = null,CancellationToken cancellationToken = default(CancellationToken) ) =>
-			this.DeletePipelineAsync(selector.InvokeOrDefault(new DeletePipelineDescriptor( id)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDeletePipelineResponse> DeletePipelineAsync(IDeletePipelineRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeletePipelineRequest, DeletePipelineRequestParameters, DeletePipelineResponse, IDeletePipelineResponse>(
+		/// <inheritdoc />
+		public IDeletePipelineResponse DeletePipeline(Id id, Func<DeletePipelineDescriptor, IDeletePipelineRequest> selector = null) =>
+			DeletePipeline(selector.InvokeOrDefault(new DeletePipelineDescriptor(id)));
+
+		/// <inheritdoc />
+		public Task<IDeletePipelineResponse> DeletePipelineAsync(Id id, Func<DeletePipelineDescriptor, IDeletePipelineRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeletePipelineAsync(selector.InvokeOrDefault(new DeletePipelineDescriptor(id)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDeletePipelineResponse> DeletePipelineAsync(IDeletePipelineRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeletePipelineRequest, DeletePipelineRequestParameters, DeletePipelineResponse, IDeletePipelineResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IngestDeletePipelineDispatchAsync<DeletePipelineResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IngestDeletePipelineDispatchAsync<DeletePipelineResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Ingest/GetPipeline/ElasticClient-GetPipeline.cs b/src/Nest/Ingest/GetPipeline/ElasticClient-GetPipeline.cs
index b7f384cc9d3..770f0908f82 100644
--- a/src/Nest/Ingest/GetPipeline/ElasticClient-GetPipeline.cs
+++ b/src/Nest/Ingest/GetPipeline/ElasticClient-GetPipeline.cs
@@ -1,50 +1,55 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetPipelineResponse GetPipeline(Func<GetPipelineDescriptor, IGetPipelineRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetPipelineResponse GetPipeline(IGetPipelineRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetPipelineResponse> GetPipelineAsync(Func<GetPipelineDescriptor, IGetPipelineRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetPipelineResponse> GetPipelineAsync(Func<GetPipelineDescriptor, IGetPipelineRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetPipelineResponse> GetPipelineAsync(IGetPipelineRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetPipelineResponse GetPipeline(Func<GetPipelineDescriptor, IGetPipelineRequest> selector = null) =>
-			this.GetPipeline(selector.InvokeOrDefault(new GetPipelineDescriptor()));
+			GetPipeline(selector.InvokeOrDefault(new GetPipelineDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetPipelineResponse GetPipeline(IGetPipelineRequest request) =>
-			this.Dispatcher.Dispatch<IGetPipelineRequest, GetPipelineRequestParameters, GetPipelineResponse>(
+			Dispatcher.Dispatch<IGetPipelineRequest, GetPipelineRequestParameters, GetPipelineResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IngestGetPipelineDispatch<GetPipelineResponse>(p)
+				(p, d) => LowLevelDispatch.IngestGetPipelineDispatch<GetPipelineResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetPipelineResponse> GetPipelineAsync(Func<GetPipelineDescriptor, IGetPipelineRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetPipelineAsync(selector.InvokeOrDefault(new GetPipelineDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetPipelineResponse> GetPipelineAsync(IGetPipelineRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetPipelineRequest, GetPipelineRequestParameters, GetPipelineResponse, IGetPipelineResponse>(
+		/// <inheritdoc />
+		public Task<IGetPipelineResponse> GetPipelineAsync(Func<GetPipelineDescriptor, IGetPipelineRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetPipelineAsync(selector.InvokeOrDefault(new GetPipelineDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetPipelineResponse> GetPipelineAsync(IGetPipelineRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetPipelineRequest, GetPipelineRequestParameters, GetPipelineResponse, IGetPipelineResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IngestGetPipelineDispatchAsync<GetPipelineResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.IngestGetPipelineDispatchAsync<GetPipelineResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Ingest/GetPipeline/GetPipelineResponse.cs b/src/Nest/Ingest/GetPipeline/GetPipelineResponse.cs
index 6177caabc07..a3096733e8f 100644
--- a/src/Nest/Ingest/GetPipeline/GetPipelineResponse.cs
+++ b/src/Nest/Ingest/GetPipeline/GetPipelineResponse.cs
@@ -1,7 +1,5 @@
-using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.Linq;
-using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -18,5 +16,4 @@ public class GetPipelineResponse : DictionaryResponseBase<string, IPipeline>, IG
 		[JsonIgnore]
 		public IReadOnlyDictionary<string, IPipeline> Pipelines => Self.BackingDictionary;
 	}
-
 }
diff --git a/src/Nest/Ingest/Pipeline.cs b/src/Nest/Ingest/Pipeline.cs
index 6ac485b791e..61028dc0088 100644
--- a/src/Nest/Ingest/Pipeline.cs
+++ b/src/Nest/Ingest/Pipeline.cs
@@ -1,9 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -14,11 +11,11 @@ public interface IPipeline
 		[JsonProperty("description")]
 		string Description { get; set; }
 
-		[JsonProperty("processors")]
-		IEnumerable<IProcessor> Processors { get; set; }
-
 		[JsonProperty("on_failure")]
 		IEnumerable<IProcessor> OnFailure { get; set; }
+
+		[JsonProperty("processors")]
+		IEnumerable<IProcessor> Processors { get; set; }
 	}
 
 	public class Pipeline : IPipeline
@@ -33,23 +30,23 @@ public class Pipeline : IPipeline
 	public class PipelineDescriptor : DescriptorBase<PipelineDescriptor, IPipeline>, IPipeline
 	{
 		string IPipeline.Description { get; set; }
-		IEnumerable<IProcessor> IPipeline.Processors { get; set; }
 		IEnumerable<IProcessor> IPipeline.OnFailure { get; set; }
+		IEnumerable<IProcessor> IPipeline.Processors { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PipelineDescriptor Description(string description) => Assign(a => a.Description = description);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PipelineDescriptor Processors(IEnumerable<IProcessor> processors) => Assign(a => a.Processors = processors.ToListOrNullIfEmpty());
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PipelineDescriptor Processors(Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> selector) =>
 			Assign(a => a.Processors = selector?.Invoke(new ProcessorsDescriptor())?.Value);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PipelineDescriptor OnFailure(IEnumerable<IProcessor> processors) => Assign(a => a.OnFailure = processors.ToListOrNullIfEmpty());
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PipelineDescriptor OnFailure(Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> selector) =>
 			Assign(a => a.OnFailure = selector?.Invoke(new ProcessorsDescriptor())?.Value);
 	}
diff --git a/src/Nest/Ingest/PipelineJsonConverter.cs b/src/Nest/Ingest/PipelineJsonConverter.cs
index 5bd6ffba4c9..36d3717c99a 100644
--- a/src/Nest/Ingest/PipelineJsonConverter.cs
+++ b/src/Nest/Ingest/PipelineJsonConverter.cs
@@ -1,18 +1,17 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
 	internal class PipelineJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-		public override bool CanWrite => false;
 		public override bool CanRead => true;
+		public override bool CanWrite => false;
+
+		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
diff --git a/src/Nest/Ingest/Processor.cs b/src/Nest/Ingest/Processor.cs
index 03d3a6c93e7..23d1d2377db 100644
--- a/src/Nest/Ingest/Processor.cs
+++ b/src/Nest/Ingest/Processor.cs
@@ -14,24 +14,24 @@ public interface IProcessor
 
 	public abstract class ProcessorBase : IProcessor
 	{
-		string IProcessor.Name => this.Name;
-		protected abstract string Name { get; }
-
 		public IEnumerable<IProcessor> OnFailure { get; set; }
+		protected abstract string Name { get; }
+		string IProcessor.Name => Name;
 	}
 
-	public abstract class ProcessorDescriptorBase<TProcessorDescriptor, TProcessorInterface> : DescriptorBase<TProcessorDescriptor, TProcessorInterface>, IProcessor
+	public abstract class ProcessorDescriptorBase<TProcessorDescriptor, TProcessorInterface>
+		: DescriptorBase<TProcessorDescriptor, TProcessorInterface>, IProcessor
 		where TProcessorDescriptor : ProcessorDescriptorBase<TProcessorDescriptor, TProcessorInterface>, TProcessorInterface
 		where TProcessorInterface : class, IProcessor
 	{
-		IEnumerable<IProcessor> IProcessor.OnFailure { get; set; }
-		string IProcessor.Name => this.Name;
 		protected abstract string Name { get; }
+		string IProcessor.Name => Name;
+		IEnumerable<IProcessor> IProcessor.OnFailure { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TProcessorDescriptor OnFailure(IEnumerable<IProcessor> processors) => Assign(a => a.OnFailure = processors.ToListOrNullIfEmpty());
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TProcessorDescriptor OnFailure(Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> selector) =>
 			Assign(a => a.OnFailure = selector?.Invoke(new ProcessorsDescriptor())?.Value);
 	}
diff --git a/src/Nest/Ingest/Processor/ElasticClient-GrokProcessorPatterns.cs b/src/Nest/Ingest/Processor/ElasticClient-GrokProcessorPatterns.cs
index 1ebb3f3d7ea..83d75e82929 100644
--- a/src/Nest/Ingest/Processor/ElasticClient-GrokProcessorPatterns.cs
+++ b/src/Nest/Ingest/Processor/ElasticClient-GrokProcessorPatterns.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,44 +9,59 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Retrieving which patterns the grok processor is packaged with, useful as different versions are bundled with different processors.
-		/// <para> </para>https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html
+		/// <para> </para>
+		/// https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html
 		/// </summary>
 		/// <param name="selector">An optional descriptor to further describe the endpoint usage operation</param>
 		IGrokProcessorPatternsResponse GrokProcessorPatterns(Func<GrokProcessorPatternsDescriptor, IGrokProcessorPatternsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGrokProcessorPatternsResponse GrokProcessorPatterns(IGrokProcessorPatternsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGrokProcessorPatternsResponse> GrokProcessorPatternsAsync(Func<GrokProcessorPatternsDescriptor, IGrokProcessorPatternsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGrokProcessorPatternsResponse> GrokProcessorPatternsAsync(
+			Func<GrokProcessorPatternsDescriptor, IGrokProcessorPatternsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGrokProcessorPatternsResponse> GrokProcessorPatternsAsync(IGrokProcessorPatternsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGrokProcessorPatternsResponse> GrokProcessorPatternsAsync(IGrokProcessorPatternsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IGrokProcessorPatternsResponse GrokProcessorPatterns(Func<GrokProcessorPatternsDescriptor, IGrokProcessorPatternsRequest> selector = null) =>
-			this.GrokProcessorPatterns(selector.InvokeOrDefault(new GrokProcessorPatternsDescriptor()));
+		/// <inheritdoc />
+		public IGrokProcessorPatternsResponse GrokProcessorPatterns(
+			Func<GrokProcessorPatternsDescriptor, IGrokProcessorPatternsRequest> selector = null
+		) =>
+			GrokProcessorPatterns(selector.InvokeOrDefault(new GrokProcessorPatternsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGrokProcessorPatternsResponse GrokProcessorPatterns(IGrokProcessorPatternsRequest request) =>
-			this.Dispatcher.Dispatch<IGrokProcessorPatternsRequest, GrokProcessorPatternsRequestParameters, GrokProcessorPatternsResponse>(
+			Dispatcher.Dispatch<IGrokProcessorPatternsRequest, GrokProcessorPatternsRequestParameters, GrokProcessorPatternsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.IngestProcessorGrokDispatch<GrokProcessorPatternsResponse>(p)
+				(p, d) => LowLevelDispatch.IngestProcessorGrokDispatch<GrokProcessorPatternsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGrokProcessorPatternsResponse> GrokProcessorPatternsAsync(Func<GrokProcessorPatternsDescriptor, IGrokProcessorPatternsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GrokProcessorPatternsAsync(selector.InvokeOrDefault(new GrokProcessorPatternsDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGrokProcessorPatternsResponse> GrokProcessorPatternsAsync(
+			Func<GrokProcessorPatternsDescriptor, IGrokProcessorPatternsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GrokProcessorPatternsAsync(selector.InvokeOrDefault(new GrokProcessorPatternsDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGrokProcessorPatternsResponse> GrokProcessorPatternsAsync(IGrokProcessorPatternsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGrokProcessorPatternsRequest, GrokProcessorPatternsRequestParameters, GrokProcessorPatternsResponse, IGrokProcessorPatternsResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.IngestProcessorGrokDispatchAsync<GrokProcessorPatternsResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IGrokProcessorPatternsResponse> GrokProcessorPatternsAsync(IGrokProcessorPatternsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGrokProcessorPatternsRequest, GrokProcessorPatternsRequestParameters, GrokProcessorPatternsResponse,
+					IGrokProcessorPatternsResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.IngestProcessorGrokDispatchAsync<GrokProcessorPatternsResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Ingest/Processor/GrokProcessorPatternsResponse.cs b/src/Nest/Ingest/Processor/GrokProcessorPatternsResponse.cs
index 4142e70d2fe..2686e8d846c 100644
--- a/src/Nest/Ingest/Processor/GrokProcessorPatternsResponse.cs
+++ b/src/Nest/Ingest/Processor/GrokProcessorPatternsResponse.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Ingest/ProcessorJsonConverter.cs b/src/Nest/Ingest/ProcessorJsonConverter.cs
index e013710c422..3e064f1a1b5 100644
--- a/src/Nest/Ingest/ProcessorJsonConverter.cs
+++ b/src/Nest/Ingest/ProcessorJsonConverter.cs
@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
-using System;
+using System;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -10,11 +10,12 @@ protected override void SerializeJson(JsonWriter writer, object value, IProcesso
 		{
 			var name = castValue.Name;
 			if (name == null) return;
+
 			writer.WriteStartObject();
 			{
 				writer.WritePropertyName(name);
 				{
-					this.Reserialize(writer, value, serializer);
+					Reserialize(writer, value, serializer);
 				}
 			}
 			writer.WriteEndObject();
@@ -23,8 +24,10 @@ protected override void SerializeJson(JsonWriter writer, object value, IProcesso
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject) return null;
+
 			reader.Read(); //property name of processor type
 			if (reader.TokenType != JsonToken.PropertyName) return null;
+
 			reader.Read();
 			return base.ReadJson(reader, objectType, existingValue, serializer);
 		}
diff --git a/src/Nest/Ingest/Processors/AppendProcessor.cs b/src/Nest/Ingest/Processors/AppendProcessor.cs
index e6c5d0dae21..c015819c4b8 100644
--- a/src/Nest/Ingest/Processors/AppendProcessor.cs
+++ b/src/Nest/Ingest/Processors/AppendProcessor.cs
@@ -20,9 +20,9 @@ public interface IAppendProcessor : IProcessor
 
 	public class AppendProcessor : ProcessorBase, IAppendProcessor
 	{
-		protected override string Name => "append";
 		public Field Field { get; set; }
 		public IEnumerable<object> Value { get; set; }
+		protected override string Name => "append";
 	}
 
 	public class AppendProcessorDescriptor<T> : ProcessorDescriptorBase<AppendProcessorDescriptor<T>, IAppendProcessor>, IAppendProcessor
@@ -39,11 +39,11 @@ public AppendProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath
 
 		public AppendProcessorDescriptor<T> Value<TValue>(IEnumerable<TValue> values) => Assign(a => a.Value = values?.Cast<object>());
 
-		public AppendProcessorDescriptor<T> Value<TValue>(params TValue[] values) => Assign(a => {
-			if(values?.Length == 1 && typeof(IEnumerable).IsAssignableFrom(typeof(TValue)) && typeof(TValue) != typeof(string))
+		public AppendProcessorDescriptor<T> Value<TValue>(params TValue[] values) => Assign(a =>
+		{
+			if (values?.Length == 1 && typeof(IEnumerable).IsAssignableFrom(typeof(TValue)) && typeof(TValue) != typeof(string))
 				a.Value = (values.First() as IEnumerable)?.Cast<object>();
 			else a.Value = values?.Cast<object>();
 		});
 	}
-
 }
diff --git a/src/Nest/Ingest/Processors/BytesProcessor.cs b/src/Nest/Ingest/Processors/BytesProcessor.cs
index dfeada41d2c..a56682f38dd 100644
--- a/src/Nest/Ingest/Processors/BytesProcessor.cs
+++ b/src/Nest/Ingest/Processors/BytesProcessor.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Linq.Expressions;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -17,37 +17,37 @@ public interface IBytesProcessor : IProcessor
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		/// <summary> The field to assign the converted value to, by default <see cref="Field"/> is updated in-place </summary>
-		[JsonProperty("target_field")]
-		Field TargetField { get; set; }
-
 		/// <summary>
-		/// If <c>true</c> and <see cref="Field"/> does not exist or is null,
+		/// If <c>true</c> and <see cref="Field" /> does not exist or is null,
 		/// the processor quietly exits without modifying the document. Default is <c>false</c>
 		/// </summary>
 		[JsonProperty("ignore_missing")]
 		bool? IgnoreMissing { get; set; }
+
+		/// <summary> The field to assign the converted value to, by default <see cref="Field" /> is updated in-place </summary>
+		[JsonProperty("target_field")]
+		Field TargetField { get; set; }
 	}
 
-	/// <inheritdoc cref="IBytesProcessor"/>
+	/// <inheritdoc cref="IBytesProcessor" />
 	public class BytesProcessor : ProcessorBase, IBytesProcessor
 	{
-		protected override string Name => "bytes";
-
 		/// <inheritdoc />
 		[JsonProperty("field")]
 		public Field Field { get; set; }
 
+		/// <inheritdoc />
+		[JsonProperty("ignore_missing")]
+		public bool? IgnoreMissing { get; set; }
+
 		/// <inheritdoc />
 		[JsonProperty("target_field")]
 		public Field TargetField { get; set; }
 
-		/// <inheritdoc />
-		[JsonProperty("ignore_missing")]
-		public bool? IgnoreMissing { get; set; }
+		protected override string Name => "bytes";
 	}
 
-	/// <inheritdoc cref="IBytesProcessor"/>
+	/// <inheritdoc cref="IBytesProcessor" />
 	public class BytesProcessorDescriptor<T>
 		: ProcessorDescriptorBase<BytesProcessorDescriptor<T>, IBytesProcessor>, IBytesProcessor
 		where T : class
@@ -55,22 +55,22 @@ public class BytesProcessorDescriptor<T>
 		protected override string Name => "bytes";
 
 		Field IBytesProcessor.Field { get; set; }
-		Field IBytesProcessor.TargetField { get; set; }
 		bool? IBytesProcessor.IgnoreMissing { get; set; }
+		Field IBytesProcessor.TargetField { get; set; }
 
-		/// <inheritdoc cref="IBytesProcessor.Field"/>
+		/// <inheritdoc cref="IBytesProcessor.Field" />
 		public BytesProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="IBytesProcessor.Field"/>
+		/// <inheritdoc cref="IBytesProcessor.Field" />
 		public BytesProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc cref="IBytesProcessor.TargetField"/>
+		/// <inheritdoc cref="IBytesProcessor.TargetField" />
 		public BytesProcessorDescriptor<T> TargetField(Field field) => Assign(a => a.TargetField = field);
 
-		/// <inheritdoc cref="IBytesProcessor.TargetField"/>
+		/// <inheritdoc cref="IBytesProcessor.TargetField" />
 		public BytesProcessorDescriptor<T> TargetField(Expression<Func<T, object>> objectPath) => Assign(a => a.TargetField = objectPath);
 
-		/// <inheritdoc cref="IBytesProcessor.IgnoreMissing"/>
+		/// <inheritdoc cref="IBytesProcessor.IgnoreMissing" />
 		public BytesProcessorDescriptor<T> IgnoreMissing(bool? ignoreMissing = true) => Assign(a => a.IgnoreMissing = ignoreMissing);
 	}
 }
diff --git a/src/Nest/Ingest/Processors/ConvertProcessor.cs b/src/Nest/Ingest/Processors/ConvertProcessor.cs
index 4dd9e4f4dd2..d6f97035270 100644
--- a/src/Nest/Ingest/Processors/ConvertProcessor.cs
+++ b/src/Nest/Ingest/Processors/ConvertProcessor.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
@@ -25,10 +22,10 @@ public interface IConvertProcessor : IProcessor
 
 	public class ConvertProcessor : ProcessorBase, IConvertProcessor
 	{
-		protected override string Name => "convert";
 		public Field Field { get; set; }
 		public Field TargetField { get; set; }
 		public ConvertProcessorType? Type { get; set; }
+		protected override string Name => "convert";
 	}
 
 	public class ConvertProcessorDescriptor<T> : ProcessorDescriptorBase<ConvertProcessorDescriptor<T>, IConvertProcessor>, IConvertProcessor
@@ -55,16 +52,19 @@ public ConvertProcessorDescriptor<T> TargetField(Expression<Func<T, object>> obj
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum ConvertProcessorType
 	{
-		[EnumMember(Value="integer")]
+		[EnumMember(Value = "integer")]
 		Integer,
-		[EnumMember(Value="float")]
+
+		[EnumMember(Value = "float")]
 		Float,
-		[EnumMember(Value="string")]
+
+		[EnumMember(Value = "string")]
 		String,
-		[EnumMember(Value="boolean")]
+
+		[EnumMember(Value = "boolean")]
 		Boolean,
-		[EnumMember(Value="auto")]
+
+		[EnumMember(Value = "auto")]
 		Auto
 	}
-
 }
diff --git a/src/Nest/Ingest/Processors/DateIndexNameProcessor.cs b/src/Nest/Ingest/Processors/DateIndexNameProcessor.cs
index f11db1b7080..fd7cda3fa80 100644
--- a/src/Nest/Ingest/Processors/DateIndexNameProcessor.cs
+++ b/src/Nest/Ingest/Processors/DateIndexNameProcessor.cs
@@ -16,16 +16,12 @@ namespace Nest
 	public interface IDateIndexNameProcessor : IProcessor
 	{
 		/// <summary>
-		/// The field to get the date or timestamp from.
-		/// </summary>
-		[JsonProperty("field")]
-		Field Field { get; set; }
-
-		/// <summary>
-		/// A prefix of the index name to be prepended before the printed date.
+		/// An array of the expected date formats for parsing
+		/// dates / timestamps in the document being preprocessed.
+		/// Default is yyyy-MM-dd’T'HH:mm:ss.SSSZ
 		/// </summary>
-		[JsonProperty("index_name_prefix")]
-		string IndexNamePrefix { get; set; }
+		[JsonProperty("date_formats")]
+		IEnumerable<string> DateFormats { get; set; }
 
 		/// <summary>
 		/// How to round the date when formatting the date into the index name.
@@ -34,20 +30,23 @@ public interface IDateIndexNameProcessor : IProcessor
 		DateRounding? DateRounding { get; set; }
 
 		/// <summary>
-		/// An array of the expected date formats for parsing
-		/// dates / timestamps in the document being preprocessed.
-		/// Default is yyyy-MM-dd’T'HH:mm:ss.SSSZ
+		/// The field to get the date or timestamp from.
 		/// </summary>
-		[JsonProperty("date_formats")]
-		IEnumerable<string> DateFormats { get; set; }
+		[JsonProperty("field")]
+		Field Field { get; set; }
 
 		/// <summary>
-		/// The timezone to use when parsing the date and when date
-		/// math index supports resolves expressions into concrete
-		/// index names.
+		/// The format to be used when printing the parsed date into
+		/// the index name.
 		/// </summary>
-		[JsonProperty("timezone")]
-		string TimeZone { get; set; }
+		[JsonProperty("index_name_format")]
+		string IndexNameFormat { get; set; }
+
+		/// <summary>
+		/// A prefix of the index name to be prepended before the printed date.
+		/// </summary>
+		[JsonProperty("index_name_prefix")]
+		string IndexNamePrefix { get; set; }
 
 		/// <summary>
 		/// The locale to use when parsing the date from the document
@@ -58,45 +57,43 @@ public interface IDateIndexNameProcessor : IProcessor
 		string Locale { get; set; }
 
 		/// <summary>
-		/// The format to be used when printing the parsed date into
-		/// the index name.
+		/// The timezone to use when parsing the date and when date
+		/// math index supports resolves expressions into concrete
+		/// index names.
 		/// </summary>
-		[JsonProperty("index_name_format")]
-		string IndexNameFormat { get; set; }
+		[JsonProperty("timezone")]
+		string TimeZone { get; set; }
 	}
 
 	public class DateIndexNameProcessor : ProcessorBase, IDateIndexNameProcessor
 	{
-		protected override string Name => "date_index_name";
-
 		/// <summary>
-		/// The field to get the date or timestamp from.
+		/// An array of the expected date formats for parsing
+		/// dates / timestamps in the document being preprocessed.
+		/// Default is yyyy-MM-dd’T'HH:mm:ss.SSSZ
 		/// </summary>
-		public Field Field { get; set; }
+		public IEnumerable<string> DateFormats { get; set; }
 
 		/// <summary>
-		/// A prefix of the index name to be prepended before the printed date.
+		/// How to round the date when formatting the date into the index name.
 		/// </summary>
-		public string IndexNamePrefix { get; set; }
+		public DateRounding? DateRounding { get; set; }
 
 		/// <summary>
-		/// How to round the date when formatting the date into the index name.
+		/// The field to get the date or timestamp from.
 		/// </summary>
-		public DateRounding? DateRounding { get; set; }
+		public Field Field { get; set; }
 
 		/// <summary>
-		/// An array of the expected date formats for parsing
-		/// dates / timestamps in the document being preprocessed.
-		/// Default is yyyy-MM-dd’T'HH:mm:ss.SSSZ
+		/// The format to be used when printing the parsed date into
+		/// the index name.
 		/// </summary>
-		public IEnumerable<string> DateFormats { get; set; }
+		public string IndexNameFormat { get; set; }
 
 		/// <summary>
-		/// The timezone to use when parsing the date and when date
-		/// math index supports resolves expressions into concrete
-		/// index names.
+		/// A prefix of the index name to be prepended before the printed date.
 		/// </summary>
-		public string TimeZone { get; set; }
+		public string IndexNamePrefix { get; set; }
 
 		/// <summary>
 		/// The locale to use when parsing the date from the document
@@ -106,10 +103,13 @@ public class DateIndexNameProcessor : ProcessorBase, IDateIndexNameProcessor
 		public string Locale { get; set; }
 
 		/// <summary>
-		/// The format to be used when printing the parsed date into
-		/// the index name.
+		/// The timezone to use when parsing the date and when date
+		/// math index supports resolves expressions into concrete
+		/// index names.
 		/// </summary>
-		public string IndexNameFormat { get; set; }
+		public string TimeZone { get; set; }
+
+		protected override string Name => "date_index_name";
 	}
 
 	public class DateIndexNameProcessorDescriptor<T>
@@ -117,14 +117,14 @@ public class DateIndexNameProcessorDescriptor<T>
 		where T : class
 	{
 		protected override string Name => "date_index_name";
+		IEnumerable<string> IDateIndexNameProcessor.DateFormats { get; set; }
+		DateRounding? IDateIndexNameProcessor.DateRounding { get; set; }
 
 		Field IDateIndexNameProcessor.Field { get; set; }
+		string IDateIndexNameProcessor.IndexNameFormat { get; set; }
 		string IDateIndexNameProcessor.IndexNamePrefix { get; set; }
-		DateRounding? IDateIndexNameProcessor.DateRounding { get; set; }
-		IEnumerable<string> IDateIndexNameProcessor.DateFormats { get; set; }
-		string IDateIndexNameProcessor.TimeZone { get; set; }
 		string IDateIndexNameProcessor.Locale { get; set; }
-		string IDateIndexNameProcessor.IndexNameFormat { get; set; }
+		string IDateIndexNameProcessor.TimeZone { get; set; }
 
 		/// <summary>
 		/// The field to get the date or timestamp from.
@@ -194,16 +194,22 @@ public enum DateRounding
 	{
 		[EnumMember(Value = "s")]
 		Second,
+
 		[EnumMember(Value = "m")]
 		Minute,
+
 		[EnumMember(Value = "h")]
 		Hour,
+
 		[EnumMember(Value = "d")]
 		Day,
+
 		[EnumMember(Value = "w")]
 		Week,
+
 		[EnumMember(Value = "M")]
 		Month,
+
 		[EnumMember(Value = "y")]
 		Year
 	}
diff --git a/src/Nest/Ingest/Processors/DateProcessor.cs b/src/Nest/Ingest/Processors/DateProcessor.cs
index 65dde1ba864..7cb4d35e333 100644
--- a/src/Nest/Ingest/Processors/DateProcessor.cs
+++ b/src/Nest/Ingest/Processors/DateProcessor.cs
@@ -1,10 +1,7 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -15,32 +12,31 @@ public interface IDateProcessor : IProcessor
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("target_field")]
-		Field TargetField { get; set; }
-
 		[JsonProperty("formats")]
 		IEnumerable<string> Formats { get; set; }
 
-		[JsonProperty("timezone")]
-		string Timezone { get; set; }
-
 		[JsonProperty("locale")]
 		string Locale { get; set; }
+
+		[JsonProperty("target_field")]
+		Field TargetField { get; set; }
+
+		[JsonProperty("timezone")]
+		string Timezone { get; set; }
 	}
 
 	public class DateProcessor : ProcessorBase, IDateProcessor
 	{
-		protected override string Name => "date";
-
 		public Field Field { get; set; }
 
-		public Field TargetField { get; set; }
-
 		public IEnumerable<string> Formats { get; set; }
 
-		public string Timezone { get; set; }
-
 		public string Locale { get; set; }
+
+		public Field TargetField { get; set; }
+
+		public string Timezone { get; set; }
+		protected override string Name => "date";
 	}
 
 	public class DateProcessorDescriptor<T>
@@ -50,10 +46,10 @@ public class DateProcessorDescriptor<T>
 		protected override string Name => "date";
 
 		Field IDateProcessor.Field { get; set; }
-		Field IDateProcessor.TargetField { get; set; }
 		IEnumerable<string> IDateProcessor.Formats { get; set; }
-		string IDateProcessor.Timezone { get; set; }
 		string IDateProcessor.Locale { get; set; }
+		Field IDateProcessor.TargetField { get; set; }
+		string IDateProcessor.Timezone { get; set; }
 
 		public DateProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
diff --git a/src/Nest/Ingest/Processors/DotExpanderProcessor.cs b/src/Nest/Ingest/Processors/DotExpanderProcessor.cs
index bd344bd6fb6..498cf7dad12 100644
--- a/src/Nest/Ingest/Processors/DotExpanderProcessor.cs
+++ b/src/Nest/Ingest/Processors/DotExpanderProcessor.cs
@@ -35,8 +35,6 @@ public interface IDotExpanderProcessor : IProcessor
 	/// </summary>
 	public class DotExpanderProcessor : ProcessorBase, IDotExpanderProcessor
 	{
-		protected override string Name => "dot_expander";
-
 		/// <summary>
 		/// The field to expand into an object field
 		/// </summary>
@@ -50,6 +48,8 @@ public class DotExpanderProcessor : ProcessorBase, IDotExpanderProcessor
 		/// </summary>
 		[JsonProperty("path")]
 		public string Path { get; set; }
+
+		protected override string Name => "dot_expander";
 	}
 
 	/// <summary>
diff --git a/src/Nest/Ingest/Processors/FailProcessor.cs b/src/Nest/Ingest/Processors/FailProcessor.cs
index d352ce3a2f3..7214dad6af6 100644
--- a/src/Nest/Ingest/Processors/FailProcessor.cs
+++ b/src/Nest/Ingest/Processors/FailProcessor.cs
@@ -1,10 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -18,8 +12,8 @@ public interface IFailProcessor : IProcessor
 
 	public class FailProcessor : ProcessorBase, IFailProcessor
 	{
-		protected override string Name => "fail";
 		public string Message { get; set; }
+		protected override string Name => "fail";
 	}
 
 	public class FailProcessorDescriptor
diff --git a/src/Nest/Ingest/Processors/ForeachProcessor.cs b/src/Nest/Ingest/Processors/ForeachProcessor.cs
index a33c6867e35..e0852ea2234 100644
--- a/src/Nest/Ingest/Processors/ForeachProcessor.cs
+++ b/src/Nest/Ingest/Processors/ForeachProcessor.cs
@@ -1,10 +1,8 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -21,9 +19,9 @@ public interface IForeachProcessor : IProcessor
 
 	public class ForeachProcessor : ProcessorBase, IForeachProcessor
 	{
-		protected override string Name => "foreach";
 		public Field Field { get; set; }
 		public IProcessor Processor { get; set; }
+		protected override string Name => "foreach";
 	}
 
 	public class ForeachProcessorDescriptor<T>
diff --git a/src/Nest/Ingest/Processors/GrokProcessor.cs b/src/Nest/Ingest/Processors/GrokProcessor.cs
index 096c8515191..0cbe9f673fb 100644
--- a/src/Nest/Ingest/Processors/GrokProcessor.cs
+++ b/src/Nest/Ingest/Processors/GrokProcessor.cs
@@ -1,10 +1,7 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -15,27 +12,26 @@ public interface IGrokProcessor : IProcessor
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("patterns")]
-		IEnumerable<string> Patterns { get; set; }
-
 		[JsonProperty("pattern_definitions")]
 		IDictionary<string, string> PatternDefinitions { get; set; }
 
+		[JsonProperty("patterns")]
+		IEnumerable<string> Patterns { get; set; }
+
 		[JsonProperty("trace_match")]
 		bool? TraceMatch { get; set; }
 	}
 
 	public class GrokProcessor : ProcessorBase, IGrokProcessor
 	{
-		protected override string Name => "grok";
-
 		public Field Field { get; set; }
 
-		public IEnumerable<string> Patterns { get; set; }
-
 		public IDictionary<string, string> PatternDefinitions { get; set; }
 
+		public IEnumerable<string> Patterns { get; set; }
+
 		public bool? TraceMatch { get; set; }
+		protected override string Name => "grok";
 	}
 
 	public class GrokProcessorDescriptor<T>
@@ -45,8 +41,8 @@ public class GrokProcessorDescriptor<T>
 		protected override string Name => "grok";
 
 		Field IGrokProcessor.Field { get; set; }
-		IEnumerable<string> IGrokProcessor.Patterns { get; set; }
 		IDictionary<string, string> IGrokProcessor.PatternDefinitions { get; set; }
+		IEnumerable<string> IGrokProcessor.Patterns { get; set; }
 		bool? IGrokProcessor.TraceMatch { get; set; }
 
 		public GrokProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
@@ -58,7 +54,9 @@ public GrokProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath)
 
 		public GrokProcessorDescriptor<T> Patterns(params string[] patterns) => Assign(a => a.Patterns = patterns);
 
-		public GrokProcessorDescriptor<T> PatternDefinitions(Func<FluentDictionary<string, string>, FluentDictionary<string, string>> patternDefinitions) =>
+		public GrokProcessorDescriptor<T> PatternDefinitions(
+			Func<FluentDictionary<string, string>, FluentDictionary<string, string>> patternDefinitions
+		) =>
 			Assign(a => a.PatternDefinitions = patternDefinitions?.Invoke(new FluentDictionary<string, string>()));
 
 		public GrokProcessorDescriptor<T> TraceMatch(bool? traceMatch = true) =>
diff --git a/src/Nest/Ingest/Processors/GsubProcessor.cs b/src/Nest/Ingest/Processors/GsubProcessor.cs
index 1e507fcefe2..f023fa01b7c 100644
--- a/src/Nest/Ingest/Processors/GsubProcessor.cs
+++ b/src/Nest/Ingest/Processors/GsubProcessor.cs
@@ -1,10 +1,6 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -24,13 +20,12 @@ public interface IGsubProcessor : IProcessor
 
 	public class GsubProcessor : ProcessorBase, IGsubProcessor
 	{
-		protected override string Name => "gsub";
-
 		public Field Field { get; set; }
 
 		public string Pattern { get; set; }
 
 		public string Replacement { get; set; }
+		protected override string Name => "gsub";
 	}
 
 	public class GsubProcessorDescriptor<T>
diff --git a/src/Nest/Ingest/Processors/JoinProcessor.cs b/src/Nest/Ingest/Processors/JoinProcessor.cs
index 914a028c174..b75c154a3fd 100644
--- a/src/Nest/Ingest/Processors/JoinProcessor.cs
+++ b/src/Nest/Ingest/Processors/JoinProcessor.cs
@@ -1,10 +1,6 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -21,11 +17,10 @@ public interface IJoinProcessor : IProcessor
 
 	public class JoinProcessor : ProcessorBase, IJoinProcessor
 	{
-		protected override string Name => "join";
-
 		public Field Field { get; set; }
 
 		public string Separator { get; set; }
+		protected override string Name => "join";
 	}
 
 	public class JoinProcessorDescriptor<T>
diff --git a/src/Nest/Ingest/Processors/JsonProcessor.cs b/src/Nest/Ingest/Processors/JsonProcessor.cs
index bb1ba230614..c96b45767df 100644
--- a/src/Nest/Ingest/Processors/JsonProcessor.cs
+++ b/src/Nest/Ingest/Processors/JsonProcessor.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
 
@@ -12,6 +11,13 @@ namespace Nest
 	[JsonConverter(typeof(ProcessorJsonConverter<JsonProcessor>))]
 	public interface IJsonProcessor : IProcessor
 	{
+		/// <summary>
+		/// Flag that forces the serialized json to be injected into the top level of the document.
+		/// <see cref="TargetField" /> must not be set when this option is chosen.
+		/// </summary>
+		[JsonProperty("add_to_root")]
+		bool? AddToRoot { get; set; }
+
 		/// <summary>
 		/// Field holding json as a string
 		/// </summary>
@@ -23,57 +29,49 @@ public interface IJsonProcessor : IProcessor
 		/// </summary>
 		[JsonProperty("target_field")]
 		Field TargetField { get; set; }
-
-		/// <summary>
-		/// Flag that forces the serialized json to be injected into the top level of the document.
-		/// <see cref="TargetField" /> must not be set when this option is chosen.
-		/// </summary>
-		[JsonProperty("add_to_root")]
-		bool? AddToRoot { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class JsonProcessor : ProcessorBase, IJsonProcessor
 	{
-		protected override string Name => "json";
+		/// <inheritdoc />
+		public bool? AddToRoot { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Field Field { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Field TargetField { get; set; }
 
-		/// <inheritdoc/>
-		public bool? AddToRoot { get; set; }
+		protected override string Name => "json";
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class JsonProcessorDescriptor<T>
-	: ProcessorDescriptorBase<JsonProcessorDescriptor<T>, IJsonProcessor>, IJsonProcessor
-	where T : class
+		: ProcessorDescriptorBase<JsonProcessorDescriptor<T>, IJsonProcessor>, IJsonProcessor
+		where T : class
 	{
 		protected override string Name => "json";
+		bool? IJsonProcessor.AddToRoot { get; set; }
 
 		Field IJsonProcessor.Field { get; set; }
 		Field IJsonProcessor.TargetField { get; set; }
-		bool? IJsonProcessor.AddToRoot { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public JsonProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public JsonProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public JsonProcessorDescriptor<T> TargetField(Field field) => Assign(a => a.TargetField = field);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public JsonProcessorDescriptor<T> TargetField(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.TargetField = objectPath);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public JsonProcessorDescriptor<T> AddToRoot(bool? addToRoot = true) => Assign(a => a.AddToRoot = addToRoot);
-
 	}
 }
diff --git a/src/Nest/Ingest/Processors/KeyValueProcessor.cs b/src/Nest/Ingest/Processors/KeyValueProcessor.cs
index adac1a88493..157187ff59e 100644
--- a/src/Nest/Ingest/Processors/KeyValueProcessor.cs
+++ b/src/Nest/Ingest/Processors/KeyValueProcessor.cs
@@ -13,28 +13,28 @@ public interface IKeyValueProcessor : IProcessor
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		/// <summary> The field to insert the extracted keys into. Defaults to the root of the document </summary>
-		[JsonProperty("target_field")]
-		Field TargetField { get; set; }
-
 		/// <summary> Regex pattern to use for splitting key-value pairs </summary>
 		[JsonProperty("field_split")]
 		string FieldSplit { get; set; }
 
-		/// <summary> Regex pattern to use for splitting the key from the value within a key-value pair </summary>
-		[JsonProperty("value_split")]
-		string ValueSplit { get; set; }
-
-		/// <summary> List of keys to filter and insert into document. Defaults to including all keys </summary>
-		[JsonProperty("include_keys")]
-		IEnumerable<string> IncludeKeys { get; set; }
-
 		/// <summary>
 		/// If `true` and `field` does not exist or is `null`, the processor quietly exits without modifying the document
 		/// </summary>
 		[JsonProperty("ignore_missing")]
 		bool? IgnoreMissing { get; set; }
 
+		/// <summary> List of keys to filter and insert into document. Defaults to including all keys </summary>
+		[JsonProperty("include_keys")]
+		IEnumerable<string> IncludeKeys { get; set; }
+
+		/// <summary> If true strip brackets (), &lt;&gt;, [] as well as quotes ' and " from extracted values </summary>
+		[JsonProperty("strip_brackets")]
+		bool? StripBrackets { get; set; }
+
+		/// <summary> The field to insert the extracted keys into. Defaults to the root of the document </summary>
+		[JsonProperty("target_field")]
+		Field TargetField { get; set; }
+
 		/// <summary> String of characters to trim from extracted keys </summary>
 		[JsonProperty("trim_key")]
 		string TrimKey { get; set; }
@@ -43,95 +43,94 @@ public interface IKeyValueProcessor : IProcessor
 		[JsonProperty("trim_value")]
 		string TrimValue { get; set; }
 
-		/// <summary> If true strip brackets (), &lt;&gt;, [] as well as quotes ' and " from extracted values </summary>
-		[JsonProperty("strip_brackets")]
-		bool? StripBrackets { get; set; }
+		/// <summary> Regex pattern to use for splitting the key from the value within a key-value pair </summary>
+		[JsonProperty("value_split")]
+		string ValueSplit { get; set; }
 	}
 
-	/// <inheritdoc cref="IKeyValueProcessor"/>
+	/// <inheritdoc cref="IKeyValueProcessor" />
 	public class KeyValueProcessor : ProcessorBase, IKeyValueProcessor
 	{
-		protected override string Name => "kv";
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Field Field { get; set; }
 
-		/// <inheritdoc/>
-		public Field TargetField { get; set; }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string FieldSplit { get; set; }
 
-		/// <inheritdoc/>
-		public string ValueSplit { get; set; }
+		/// <inheritdoc />
+		public bool? IgnoreMissing { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> IncludeKeys { get; set; }
 
-		/// <inheritdoc/>
-		public bool? IgnoreMissing { get; set; }
+		/// <inheritdoc />
+		public bool? StripBrackets { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public Field TargetField { get; set; }
+
+		/// <inheritdoc />
 		public string TrimKey { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string TrimValue { get; set; }
 
-		/// <inheritdoc/>
-		public bool? StripBrackets { get; set; }
+		/// <inheritdoc />
+		public string ValueSplit { get; set; }
+
+		protected override string Name => "kv";
 	}
 
-	/// <inheritdoc cref="IKeyValueProcessor"/>
+	/// <inheritdoc cref="IKeyValueProcessor" />
 	public class KeyValueProcessorDescriptor<T> : ProcessorDescriptorBase<KeyValueProcessorDescriptor<T>, IKeyValueProcessor>, IKeyValueProcessor
 		where T : class
 	{
 		protected override string Name => "kv";
 		Field IKeyValueProcessor.Field { get; set; }
-
-		Field IKeyValueProcessor.TargetField { get; set; }
 		string IKeyValueProcessor.FieldSplit { get; set; }
-		string IKeyValueProcessor.ValueSplit { get; set; }
-		IEnumerable<string> IKeyValueProcessor.IncludeKeys { get; set; }
 		bool? IKeyValueProcessor.IgnoreMissing { get; set; }
+		IEnumerable<string> IKeyValueProcessor.IncludeKeys { get; set; }
+		bool? IKeyValueProcessor.StripBrackets { get; set; }
+
+		Field IKeyValueProcessor.TargetField { get; set; }
 		string IKeyValueProcessor.TrimKey { get; set; }
 		string IKeyValueProcessor.TrimValue { get; set; }
-		bool? IKeyValueProcessor.StripBrackets { get; set; }
+		string IKeyValueProcessor.ValueSplit { get; set; }
 
-		/// <inheritdoc cref="IKeyValueProcessor.Field"/>
+		/// <inheritdoc cref="IKeyValueProcessor.Field" />
 		public KeyValueProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="IKeyValueProcessor.Field"/>
+		/// <inheritdoc cref="IKeyValueProcessor.Field" />
 		public KeyValueProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc cref="IKeyValueProcessor.TargetField"/>
+		/// <inheritdoc cref="IKeyValueProcessor.TargetField" />
 		public KeyValueProcessorDescriptor<T> TargetField(Field field) => Assign(a => a.TargetField = field);
 
-		/// <inheritdoc cref="IKeyValueProcessor.TargetField"/>
+		/// <inheritdoc cref="IKeyValueProcessor.TargetField" />
 		public KeyValueProcessorDescriptor<T> TargetField(Expression<Func<T, object>> objectPath) => Assign(a => a.TargetField = objectPath);
 
-		/// <inheritdoc cref="IKeyValueProcessor.FieldSplit"/>
+		/// <inheritdoc cref="IKeyValueProcessor.FieldSplit" />
 		public KeyValueProcessorDescriptor<T> FieldSplit(string split) => Assign(a => a.FieldSplit = split);
 
-		/// <inheritdoc cref="IKeyValueProcessor.ValueSplit"/>
+		/// <inheritdoc cref="IKeyValueProcessor.ValueSplit" />
 		public KeyValueProcessorDescriptor<T> ValueSplit(string split) => Assign(a => a.ValueSplit = split);
 
-		/// <inheritdoc cref="IKeyValueProcessor.IgnoreMissing"/>
+		/// <inheritdoc cref="IKeyValueProcessor.IgnoreMissing" />
 		public KeyValueProcessorDescriptor<T> IgnoreMissing(bool? ignoreMissing = true) => Assign(a => a.IgnoreMissing = ignoreMissing);
 
-		/// <inheritdoc cref="IKeyValueProcessor.IncludeKeys"/>
+		/// <inheritdoc cref="IKeyValueProcessor.IncludeKeys" />
 		public KeyValueProcessorDescriptor<T> IncludeKeys(IEnumerable<string> includeKeys) => Assign(a => a.IncludeKeys = includeKeys);
 
-		/// <inheritdoc cref="IKeyValueProcessor.IncludeKeys"/>
+		/// <inheritdoc cref="IKeyValueProcessor.IncludeKeys" />
 		public KeyValueProcessorDescriptor<T> IncludeKeys(params string[] includeKeys) => Assign(a => a.IncludeKeys = includeKeys);
 
-		/// <inheritdoc cref="IKeyValueProcessor.TrimKey"/>
+		/// <inheritdoc cref="IKeyValueProcessor.TrimKey" />
 		public KeyValueProcessorDescriptor<T> TrimKey(string trimKeys) => Assign(a => a.TrimKey = trimKeys);
 
-		/// <inheritdoc cref="IKeyValueProcessor.TrimValue"/>
+		/// <inheritdoc cref="IKeyValueProcessor.TrimValue" />
 		public KeyValueProcessorDescriptor<T> TrimValue(string trimValues) => Assign(a => a.TrimValue = trimValues);
 
-		/// <inheritdoc cref="IKeyValueProcessor.StripBrackets"/>
+		/// <inheritdoc cref="IKeyValueProcessor.StripBrackets" />
 		public KeyValueProcessorDescriptor<T> StripBrackets(bool? skip = true) => Assign(a => a.StripBrackets = skip);
 	}
-
 }
diff --git a/src/Nest/Ingest/Processors/LowercaseProcessor.cs b/src/Nest/Ingest/Processors/LowercaseProcessor.cs
index db45788b4f6..26599656054 100644
--- a/src/Nest/Ingest/Processors/LowercaseProcessor.cs
+++ b/src/Nest/Ingest/Processors/LowercaseProcessor.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Linq.Expressions;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -14,8 +14,8 @@ public interface ILowercaseProcessor : IProcessor
 
 	public class LowercaseProcessor : ProcessorBase, ILowercaseProcessor
 	{
-		protected override string Name => "lowercase";
 		public Field Field { get; set; }
+		protected override string Name => "lowercase";
 	}
 
 	public class LowercaseProcessorDescriptor<T>
diff --git a/src/Nest/Ingest/Processors/Plugins/AttachmentProcessor.cs b/src/Nest/Ingest/Processors/Plugins/AttachmentProcessor.cs
index eed3e5fbaf7..f0b04a9990c 100644
--- a/src/Nest/Ingest/Processors/Plugins/AttachmentProcessor.cs
+++ b/src/Nest/Ingest/Processors/Plugins/AttachmentProcessor.cs
@@ -21,16 +21,10 @@ public interface IAttachmentProcessor : IProcessor
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		/// <summary> The field that will hold the attachment information </summary>
-		[JsonProperty("target_field")]
-		Field TargetField { get; set; }
 
-		/// <summary>
-		/// Properties to select to be stored. Can be content, title, name, author,
-		/// keywords, date, content_type, content_length, language. Defaults to all
-		/// </summary>
-		[JsonProperty("properties")]
-		IEnumerable<string> Properties { get; set; }
+		/// <summary> If `true` and `field` does not exist, the processor quietly exits without modifying the document </summary>
+		[JsonProperty("ignore_missing")]
+		bool? IgnoreMissing { get; set; }
 
 		/// <summary>
 		/// The number of chars being used for extraction to prevent huge fields. Use -1 for no limit.
@@ -43,38 +37,44 @@ public interface IAttachmentProcessor : IProcessor
 		[JsonProperty("indexed_chars_field")]
 		Field IndexedCharactersField { get; set; }
 
+		/// <summary>
+		/// Properties to select to be stored. Can be content, title, name, author,
+		/// keywords, date, content_type, content_length, language. Defaults to all
+		/// </summary>
+		[JsonProperty("properties")]
+		IEnumerable<string> Properties { get; set; }
 
-		/// <summary> If `true` and `field` does not exist, the processor quietly exits without modifying the document </summary>
-		[JsonProperty("ignore_missing")]
-		bool? IgnoreMissing { get; set; }
+		/// <summary> The field that will hold the attachment information </summary>
+		[JsonProperty("target_field")]
+		Field TargetField { get; set; }
 	}
 
-	/// <inheritdoc cref="IAttachmentProcessor"/>
+	/// <inheritdoc cref="IAttachmentProcessor" />
 	public class AttachmentProcessor : ProcessorBase, IAttachmentProcessor
 	{
-		protected override string Name => "attachment";
-
-		/// <inheritdoc cref="IAttachmentProcessor.Field"/>
+		/// <inheritdoc cref="IAttachmentProcessor.Field" />
 		public Field Field { get; set; }
 
-		/// <inheritdoc cref="IAttachmentProcessor.TargetField"/>
-		public Field TargetField { get; set; }
-
-		/// <inheritdoc cref="IAttachmentProcessor.Properties"/>
-		public IEnumerable<string> Properties { get; set; }
+		/// <inheritdoc />
+		/// <inheritdoc cref="IAttachmentProcessor.IgnoreMissing" />
+		public bool? IgnoreMissing { get; set; }
 
-		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharacters"/>
+		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharacters" />
 		public long? IndexedCharacters { get; set; }
 
-		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharactersField"/>
+		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharactersField" />
 		public Field IndexedCharactersField { get; set; }
 
-		/// <inheritdoc/>
-		/// <inheritdoc cref="IAttachmentProcessor.IgnoreMissing"/>
-		public bool? IgnoreMissing { get; set; }
+		/// <inheritdoc cref="IAttachmentProcessor.Properties" />
+		public IEnumerable<string> Properties { get; set; }
+
+		/// <inheritdoc cref="IAttachmentProcessor.TargetField" />
+		public Field TargetField { get; set; }
+
+		protected override string Name => "attachment";
 	}
 
-	/// <inheritdoc cref="IAttachmentProcessor"/>
+	/// <inheritdoc cref="IAttachmentProcessor" />
 	public class AttachmentProcessorDescriptor<T>
 		: ProcessorDescriptorBase<AttachmentProcessorDescriptor<T>, IAttachmentProcessor>, IAttachmentProcessor
 		where T : class
@@ -82,40 +82,41 @@ public class AttachmentProcessorDescriptor<T>
 		protected override string Name => "attachment";
 
 		Field IAttachmentProcessor.Field { get; set; }
-		Field IAttachmentProcessor.TargetField { get; set; }
-		IEnumerable<string> IAttachmentProcessor.Properties { get; set; }
-		long? IAttachmentProcessor.IndexedCharacters { get; set; }
 		bool? IAttachmentProcessor.IgnoreMissing { get; set; }
+		long? IAttachmentProcessor.IndexedCharacters { get; set; }
 		Field IAttachmentProcessor.IndexedCharactersField { get; set; }
+		IEnumerable<string> IAttachmentProcessor.Properties { get; set; }
+		Field IAttachmentProcessor.TargetField { get; set; }
 
-		/// <inheritdoc cref="IAttachmentProcessor.Field"/>
+		/// <inheritdoc cref="IAttachmentProcessor.Field" />
 		public AttachmentProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="IAttachmentProcessor.Field"/>
+		/// <inheritdoc cref="IAttachmentProcessor.Field" />
 		public AttachmentProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc cref="IAttachmentProcessor.TargetField"/>
+		/// <inheritdoc cref="IAttachmentProcessor.TargetField" />
 		public AttachmentProcessorDescriptor<T> TargetField(Field field) => Assign(a => a.TargetField = field);
 
-		/// <inheritdoc cref="IAttachmentProcessor.TargetField"/>
+		/// <inheritdoc cref="IAttachmentProcessor.TargetField" />
 		public AttachmentProcessorDescriptor<T> TargetField(Expression<Func<T, object>> objectPath) => Assign(a => a.TargetField = objectPath);
 
-		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharacters"/>
+		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharacters" />
 		public AttachmentProcessorDescriptor<T> IndexedCharacters(long? indexedCharacters) => Assign(a => a.IndexedCharacters = indexedCharacters);
 
-		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharactersField"/>
+		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharactersField" />
 		public AttachmentProcessorDescriptor<T> IndexedCharactersField(Field field) => Assign(a => a.IndexedCharactersField = field);
 
-		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharactersField"/>
-		public AttachmentProcessorDescriptor<T> IndexedCharactersField(Expression<Func<T, object>> objectPath) => Assign(a => a.IndexedCharactersField = objectPath);
+		/// <inheritdoc cref="IAttachmentProcessor.IndexedCharactersField" />
+		public AttachmentProcessorDescriptor<T> IndexedCharactersField(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.IndexedCharactersField = objectPath);
 
-		/// <inheritdoc cref="IAttachmentProcessor.IgnoreMissing"/>
+		/// <inheritdoc cref="IAttachmentProcessor.IgnoreMissing" />
 		public AttachmentProcessorDescriptor<T> IgnoreMissing(bool? ignoreMissing = true) => Assign(a => a.IgnoreMissing = ignoreMissing);
 
-		/// <inheritdoc cref="IAttachmentProcessor.Properties"/>
+		/// <inheritdoc cref="IAttachmentProcessor.Properties" />
 		public AttachmentProcessorDescriptor<T> Properties(IEnumerable<string> properties) => Assign(a => a.Properties = properties);
 
-		/// <inheritdoc cref="IAttachmentProcessor.Properties"/>
+		/// <inheritdoc cref="IAttachmentProcessor.Properties" />
 		public AttachmentProcessorDescriptor<T> Properties(params string[] properties) => Assign(a => a.Properties = properties);
 	}
 }
diff --git a/src/Nest/Ingest/Processors/Plugins/GeoIpProcessor.cs b/src/Nest/Ingest/Processors/Plugins/GeoIpProcessor.cs
index 9c7c2fddc13..64118cfd5a7 100644
--- a/src/Nest/Ingest/Processors/Plugins/GeoIpProcessor.cs
+++ b/src/Nest/Ingest/Processors/Plugins/GeoIpProcessor.cs
@@ -18,23 +18,23 @@ namespace Nest
 	[JsonConverter(typeof(ProcessorJsonConverter<GeoIpProcessor>))]
 	public interface IGeoIpProcessor : IProcessor
 	{
-		[JsonProperty("field")]
-		Field Field { get; set; }
-
-		[JsonProperty("target_field")]
-		Field TargetField { get; set; }
-
 		[JsonProperty("database_file")]
 		string DatabaseFile { get; set; }
 
-		[JsonProperty("properties")]
-		IEnumerable<string> Properties { get; set; }
+		[JsonProperty("field")]
+		Field Field { get; set; }
 
 		/// <summary>
 		/// If `true` and `field` does not exist, the processor quietly exits without modifying the document
 		/// </summary>
 		[JsonProperty("ignore_missing")]
 		bool? IgnoreMissing { get; set; }
+
+		[JsonProperty("properties")]
+		IEnumerable<string> Properties { get; set; }
+
+		[JsonProperty("target_field")]
+		Field TargetField { get; set; }
 	}
 
 	/// <summary>
@@ -48,18 +48,17 @@ public interface IGeoIpProcessor : IProcessor
 	/// </remarks>
 	public class GeoIpProcessor : ProcessorBase, IGeoIpProcessor
 	{
-		protected override string Name => "geoip";
+		public string DatabaseFile { get; set; }
 
 		public Field Field { get; set; }
 
-		public Field TargetField { get; set; }
-
-		public string DatabaseFile { get; set; }
+		/// <inheritdoc />
+		public bool? IgnoreMissing { get; set; }
 
 		public IEnumerable<string> Properties { get; set; }
 
-		/// <inheritdoc/>
-		public bool? IgnoreMissing { get; set; }
+		public Field TargetField { get; set; }
+		protected override string Name => "geoip";
 	}
 
 	/// <summary>
@@ -72,16 +71,16 @@ public class GeoIpProcessor : ProcessorBase, IGeoIpProcessor
 	/// Requires the Ingest Geoip Processor Plugin to be installed on the cluster.
 	/// </remarks>
 	public class GeoIpProcessorDescriptor<T>
-	: ProcessorDescriptorBase<GeoIpProcessorDescriptor<T>, IGeoIpProcessor>, IGeoIpProcessor
-	where T : class
+		: ProcessorDescriptorBase<GeoIpProcessorDescriptor<T>, IGeoIpProcessor>, IGeoIpProcessor
+		where T : class
 	{
 		protected override string Name => "geoip";
+		string IGeoIpProcessor.DatabaseFile { get; set; }
 
 		Field IGeoIpProcessor.Field { get; set; }
-		Field IGeoIpProcessor.TargetField { get; set; }
-		string IGeoIpProcessor.DatabaseFile { get; set; }
-		IEnumerable<string> IGeoIpProcessor.Properties { get; set; }
 		bool? IGeoIpProcessor.IgnoreMissing { get; set; }
+		IEnumerable<string> IGeoIpProcessor.Properties { get; set; }
+		Field IGeoIpProcessor.TargetField { get; set; }
 
 
 		public GeoIpProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
@@ -89,7 +88,7 @@ public class GeoIpProcessorDescriptor<T>
 		public GeoIpProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public GeoIpProcessorDescriptor<T> IgnoreMissing(bool? ignoreMissing = true) => Assign(a => a.IgnoreMissing = ignoreMissing);
 
 		public GeoIpProcessorDescriptor<T> TargetField(Field field) => Assign(a => a.TargetField = field);
diff --git a/src/Nest/Ingest/Processors/Plugins/UserAgent/UserAgentProperty.cs b/src/Nest/Ingest/Processors/Plugins/UserAgent/UserAgentProperty.cs
index 8541b9dd67c..79e0723462d 100644
--- a/src/Nest/Ingest/Processors/Plugins/UserAgent/UserAgentProperty.cs
+++ b/src/Nest/Ingest/Processors/Plugins/UserAgent/UserAgentProperty.cs
@@ -7,15 +7,15 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum UserAgentProperty
 	{
-		[EnumMember(Value="NAME")] Name,
-		[EnumMember(Value="MAJOR")] Major,
-		[EnumMember(Value="MINOR")] Minor,
-		[EnumMember(Value="PATCH")] Patch,
-		[EnumMember(Value="OS")] Os,
-		[EnumMember(Value="OS_NAME")] OsName,
-		[EnumMember(Value="OS_MAJOR")] OsMajor,
-		[EnumMember(Value="OS_MINOR")] OsMinor,
-		[EnumMember(Value="DEVICE")] Device,
-		[EnumMember(Value="BUILD")] Build
+		[EnumMember(Value = "NAME")] Name,
+		[EnumMember(Value = "MAJOR")] Major,
+		[EnumMember(Value = "MINOR")] Minor,
+		[EnumMember(Value = "PATCH")] Patch,
+		[EnumMember(Value = "OS")] Os,
+		[EnumMember(Value = "OS_NAME")] OsName,
+		[EnumMember(Value = "OS_MAJOR")] OsMajor,
+		[EnumMember(Value = "OS_MINOR")] OsMinor,
+		[EnumMember(Value = "DEVICE")] Device,
+		[EnumMember(Value = "BUILD")] Build
 	}
 }
diff --git a/src/Nest/Ingest/Processors/Plugins/UserAgentProcessor.cs b/src/Nest/Ingest/Processors/Plugins/UserAgentProcessor.cs
index 6819c3de343..48c5b725a2d 100644
--- a/src/Nest/Ingest/Processors/Plugins/UserAgentProcessor.cs
+++ b/src/Nest/Ingest/Processors/Plugins/UserAgentProcessor.cs
@@ -21,81 +21,80 @@ public interface IUserAgentProcessor : IProcessor
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("target_field")]
-		Field TargetField { get; set; }
-
-		[JsonProperty("regex_file")]
-		string RegexFile { get; set; }
-
-		[JsonProperty("options")]
-		IEnumerable<UserAgentProperty> Properties { get; set; }
-
 		/// <summary>
 		/// If `true` and `field` does not exist, the processor quietly exits without modifying the document
 		/// </summary>
 		[JsonProperty("ignore_missing")]
 		bool? IgnoreMissing { get; set; }
 
+		[JsonProperty("options")]
+		IEnumerable<UserAgentProperty> Properties { get; set; }
+
+		[JsonProperty("regex_file")]
+		string RegexFile { get; set; }
+
+		[JsonProperty("target_field")]
+		Field TargetField { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class UserAgentProcessor : ProcessorBase, IUserAgentProcessor
 	{
-		protected override string Name => "user_agent";
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Field Field { get; set; }
 
-		/// <inheritdoc/>
-		public Field TargetField { get; set; }
+		/// <inheritdoc />
+		public bool? IgnoreMissing { get; set; }
+
+		/// <inheritdoc />
+		public IEnumerable<UserAgentProperty> Properties { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string RegexFile { get; set; }
 
-		/// <inheritdoc/>
-		public IEnumerable<UserAgentProperty> Properties { get; set; }
+		/// <inheritdoc />
+		public Field TargetField { get; set; }
 
-		/// <inheritdoc/>
-		public bool? IgnoreMissing { get; set; }
+		protected override string Name => "user_agent";
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class UserAgentProcessorDescriptor<T>
-	: ProcessorDescriptorBase<UserAgentProcessorDescriptor<T>, IUserAgentProcessor>, IUserAgentProcessor
-	where T : class
+		: ProcessorDescriptorBase<UserAgentProcessorDescriptor<T>, IUserAgentProcessor>, IUserAgentProcessor
+		where T : class
 	{
 		protected override string Name => "user_agent";
 
 		Field IUserAgentProcessor.Field { get; set; }
-		Field IUserAgentProcessor.TargetField { get; set; }
-		string IUserAgentProcessor.RegexFile { get; set; }
 		bool? IUserAgentProcessor.IgnoreMissing { get; set; }
 		IEnumerable<UserAgentProperty> IUserAgentProcessor.Properties { get; set; }
+		string IUserAgentProcessor.RegexFile { get; set; }
+		Field IUserAgentProcessor.TargetField { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UserAgentProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UserAgentProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UserAgentProcessorDescriptor<T> TargetField(Field field) => Assign(a => a.TargetField = field);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UserAgentProcessorDescriptor<T> TargetField(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.TargetField = objectPath);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UserAgentProcessorDescriptor<T> RegexFile(string file) => Assign(a => a.RegexFile = file);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UserAgentProcessorDescriptor<T> IgnoreMissing(bool? ignoreMissing = true) => Assign(a => a.IgnoreMissing = ignoreMissing);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UserAgentProcessorDescriptor<T> Properties(IEnumerable<UserAgentProperty> properties) => Assign(a => a.Properties = properties);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public UserAgentProcessorDescriptor<T> Properties(params UserAgentProperty[] properties) => Assign(a => a.Properties = properties);
 	}
 }
diff --git a/src/Nest/Ingest/Processors/RemoveProcessor.cs b/src/Nest/Ingest/Processors/RemoveProcessor.cs
index bbb35948fa9..32766160e57 100644
--- a/src/Nest/Ingest/Processors/RemoveProcessor.cs
+++ b/src/Nest/Ingest/Processors/RemoveProcessor.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Linq.Expressions;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -12,7 +12,7 @@ public interface IRemoveProcessor : IProcessor
 		Field Field { get; set; }
 
 		/// <summary>
-		/// If <c>true</c> and <see cref="Field"/> does not exist or is null,
+		/// If <c>true</c> and <see cref="Field" /> does not exist or is null,
 		/// the processor quietly exits without modifying the document. Default is <c>false</c>
 		/// </summary>
 		[JsonProperty("ignore_missing")]
@@ -22,11 +22,13 @@ public interface IRemoveProcessor : IProcessor
 	/// <inheritdoc cref="IRemoveProcessor" />
 	public class RemoveProcessor : ProcessorBase, IRemoveProcessor
 	{
-		protected override string Name => "remove";
 		/// <inheritdoc cref="IRemoveProcessor.Field" />
 		public Field Field { get; set; }
+
 		/// <inheritdoc cref="IRemoveProcessor.IgnoreMissing" />
 		public bool? IgnoreMissing { get; set; }
+
+		protected override string Name => "remove";
 	}
 
 	/// <inheritdoc cref="IRemoveProcessor" />
diff --git a/src/Nest/Ingest/Processors/RenameProcessor.cs b/src/Nest/Ingest/Processors/RenameProcessor.cs
index 5f4c0aba762..7e1eb5cb130 100644
--- a/src/Nest/Ingest/Processors/RenameProcessor.cs
+++ b/src/Nest/Ingest/Processors/RenameProcessor.cs
@@ -1,11 +1,6 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Runtime.Serialization;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
@@ -22,9 +17,9 @@ public interface IRenameProcessor : IProcessor
 
 	public class RenameProcessor : ProcessorBase, IRenameProcessor
 	{
-		protected override string Name => "rename";
 		public Field Field { get; set; }
 		public Field TargetField { get; set; }
+		protected override string Name => "rename";
 	}
 
 	public class RenameProcessorDescriptor<T>
diff --git a/src/Nest/Ingest/Processors/ScriptProcessor.cs b/src/Nest/Ingest/Processors/ScriptProcessor.cs
index 7643184b1c0..2e2e4db706d 100644
--- a/src/Nest/Ingest/Processors/ScriptProcessor.cs
+++ b/src/Nest/Ingest/Processors/ScriptProcessor.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -14,34 +11,34 @@ namespace Nest
 	[JsonConverter(typeof(ProcessorJsonConverter<ScriptProcessor>))]
 	public interface IScriptProcessor : IProcessor
 	{
-		/// <summary>
-		/// The scripting language. Defaults to painless
-		/// </summary>
-		[JsonProperty("lang")]
-		string Lang { get; set; }
-
 		/// <summary>
 		/// The stored script id to refer to
 		/// </summary>
 		[JsonProperty("id")]
 		string Id { get; set; }
 
-		/// <summary>
-		/// An inline script to be executed
-		/// </summary>
-		[JsonProperty("source")]
-		string Source { get; set; }
-
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		[JsonIgnore]
 		string Inline { get; set; }
 
+		/// <summary>
+		/// The scripting language. Defaults to painless
+		/// </summary>
+		[JsonProperty("lang")]
+		string Lang { get; set; }
+
 		/// <summary>
 		/// Parameters for the script
 		/// </summary>
 		[JsonProperty("params")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		Dictionary<string, object> Params { get; set; }
+
+		/// <summary>
+		/// An inline script to be executed
+		/// </summary>
+		[JsonProperty("source")]
+		string Source { get; set; }
 	}
 
 	/// <summary>
@@ -49,28 +46,33 @@ public interface IScriptProcessor : IProcessor
 	/// </summary>
 	public class ScriptProcessor : ProcessorBase, IScriptProcessor
 	{
-		protected override string Name => "script";
-
-		/// <summary>
-		/// The scripting language. Defaults to painless
-		/// </summary>
-		public string Lang { get; set; }
-
 		/// <summary>
 		/// The stored script id to refer to
 		/// </summary>
 		public string Id { get; set; }
 
-		/// <summary> An inline script to be executed </summary>
-		public string Source { get; set; }
 		/// <summary> An inline script to be executed </summary>
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
-		public string Inline { get => this.Source; set => this.Source = value; }
+		public string Inline
+		{
+			get => Source;
+			set => Source = value;
+		}
+
+		/// <summary>
+		/// The scripting language. Defaults to painless
+		/// </summary>
+		public string Lang { get; set; }
 
 		/// <summary>
 		/// Parameters for the script
 		/// </summary>
 		public Dictionary<string, object> Params { get; set; }
+
+		/// <summary> An inline script to be executed </summary>
+		public string Source { get; set; }
+
+		protected override string Name => "script";
 	}
 
 	/// <summary>
@@ -80,12 +82,17 @@ public class ScriptProcessorDescriptor
 		: ProcessorDescriptorBase<ScriptProcessorDescriptor, IScriptProcessor>, IScriptProcessor
 	{
 		protected override string Name => "script";
+		string IScriptProcessor.Id { get; set; }
+
+		string IScriptProcessor.Inline
+		{
+			get => Self.Source;
+			set => Self.Source = value;
+		}
 
 		string IScriptProcessor.Lang { get; set; }
-		string IScriptProcessor.Id{ get; set; }
-		string IScriptProcessor.Inline { get => Self.Source; set => Self.Source = value; }
-		string IScriptProcessor.Source { get; set; }
 		Dictionary<string, object> IScriptProcessor.Params { get; set; }
+		string IScriptProcessor.Source { get; set; }
 
 		/// <summary>
 		/// The scripting language. Defaults to painless
diff --git a/src/Nest/Ingest/Processors/SetProcessor.cs b/src/Nest/Ingest/Processors/SetProcessor.cs
index 4aacbec0f15..c44458837f8 100644
--- a/src/Nest/Ingest/Processors/SetProcessor.cs
+++ b/src/Nest/Ingest/Processors/SetProcessor.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
 
@@ -21,9 +18,9 @@ public interface ISetProcessor : IProcessor
 
 	public class SetProcessor : ProcessorBase, ISetProcessor
 	{
-		protected override string Name => "set";
 		public Field Field { get; set; }
 		public object Value { get; set; }
+		protected override string Name => "set";
 	}
 
 	public class SetProcessorDescriptor<T> : ProcessorDescriptorBase<SetProcessorDescriptor<T>, ISetProcessor>, ISetProcessor
diff --git a/src/Nest/Ingest/Processors/SortProcessor.cs b/src/Nest/Ingest/Processors/SortProcessor.cs
index a546ecc65c4..05cd7dace1d 100644
--- a/src/Nest/Ingest/Processors/SortProcessor.cs
+++ b/src/Nest/Ingest/Processors/SortProcessor.cs
@@ -28,16 +28,15 @@ public interface ISortProcessor : IProcessor
 
 	public class SortProcessor : ProcessorBase, ISortProcessor
 	{
-		protected override string Name => "sort";
-
 		public Field Field { get; set; }
 
 		public SortOrder? Order { get; set; }
+		protected override string Name => "sort";
 	}
 
 	public class SortProcessorDescriptor<T>
-	: ProcessorDescriptorBase<SortProcessorDescriptor<T>, ISortProcessor>, ISortProcessor
-	where T : class
+		: ProcessorDescriptorBase<SortProcessorDescriptor<T>, ISortProcessor>, ISortProcessor
+		where T : class
 	{
 		protected override string Name => "sort";
 
diff --git a/src/Nest/Ingest/Processors/SplitProcessor.cs b/src/Nest/Ingest/Processors/SplitProcessor.cs
index a37260df31c..ebbb3eb8a87 100644
--- a/src/Nest/Ingest/Processors/SplitProcessor.cs
+++ b/src/Nest/Ingest/Processors/SplitProcessor.cs
@@ -1,10 +1,6 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -21,11 +17,10 @@ public interface ISplitProcessor : IProcessor
 
 	public class SplitProcessor : ProcessorBase, ISplitProcessor
 	{
-		protected override string Name => "split";
-
 		public Field Field { get; set; }
 
 		public string Separator { get; set; }
+		protected override string Name => "split";
 	}
 
 	public class SplitProcessorDescriptor<T>
diff --git a/src/Nest/Ingest/Processors/TrimProcessor.cs b/src/Nest/Ingest/Processors/TrimProcessor.cs
index 5c3117acbac..f4b43b7f471 100644
--- a/src/Nest/Ingest/Processors/TrimProcessor.cs
+++ b/src/Nest/Ingest/Processors/TrimProcessor.cs
@@ -1,10 +1,6 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -18,8 +14,8 @@ public interface ITrimProcessor : IProcessor
 
 	public class TrimProcessor : ProcessorBase, ITrimProcessor
 	{
-		protected override string Name => "trim";
 		public Field Field { get; set; }
+		protected override string Name => "trim";
 	}
 
 	public class TrimProcessorDescriptor<T>
diff --git a/src/Nest/Ingest/Processors/UppercaseProcessor.cs b/src/Nest/Ingest/Processors/UppercaseProcessor.cs
index 3a53c1b9054..15366c42dfa 100644
--- a/src/Nest/Ingest/Processors/UppercaseProcessor.cs
+++ b/src/Nest/Ingest/Processors/UppercaseProcessor.cs
@@ -1,10 +1,6 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -18,9 +14,10 @@ public interface IUppercaseProcessor : IProcessor
 
 	public class UppercaseProcessor : ProcessorBase, IUppercaseProcessor
 	{
-		protected override string Name => "uppercase";
 		[JsonProperty("field")]
 		public Field Field { get; set; }
+
+		protected override string Name => "uppercase";
 	}
 
 	public class UppercaseProcessorDescriptor<T>
diff --git a/src/Nest/Ingest/Processors/UrlDecodeProcessor.cs b/src/Nest/Ingest/Processors/UrlDecodeProcessor.cs
index b4bb2a99a71..8f600dcd3fa 100644
--- a/src/Nest/Ingest/Processors/UrlDecodeProcessor.cs
+++ b/src/Nest/Ingest/Processors/UrlDecodeProcessor.cs
@@ -1,10 +1,6 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -22,38 +18,38 @@ public interface IUrlDecodeProcessor : IProcessor
 		Field Field { get; set; }
 
 		/// <summary>
-		/// The field to assign the converted value to, by default <see cref="Field"/> is updated in-place
-		/// </summary>
-		[JsonProperty("target_field")]
-		Field TargetField { get; set; }
-
-		/// <summary>
-		/// If <c>true</c> and <see cref="Field"/> does not exist or is null,
+		/// If <c>true</c> and <see cref="Field" /> does not exist or is null,
 		/// the processor quietly exits without modifying the document. Default is <c>false</c>
 		/// </summary>
 		[JsonProperty("ignore_missing")]
 		bool? IgnoreMissing { get; set; }
+
+		/// <summary>
+		/// The field to assign the converted value to, by default <see cref="Field" /> is updated in-place
+		/// </summary>
+		[JsonProperty("target_field")]
+		Field TargetField { get; set; }
 	}
 
-	/// <inheritdoc cref="IUrlDecodeProcessor"/>
+	/// <inheritdoc cref="IUrlDecodeProcessor" />
 	public class UrlDecodeProcessor : ProcessorBase, IUrlDecodeProcessor
 	{
-		protected override string Name => "urldecode";
-
 		/// <inheritdoc />
 		[JsonProperty("field")]
 		public Field Field { get; set; }
 
+		/// <inheritdoc />
+		[JsonProperty("ignore_missing")]
+		public bool? IgnoreMissing { get; set; }
+
 		/// <inheritdoc />
 		[JsonProperty("target_field")]
 		public Field TargetField { get; set; }
 
-		/// <inheritdoc />
-		[JsonProperty("ignore_missing")]
-		public bool? IgnoreMissing { get; set; }
+		protected override string Name => "urldecode";
 	}
 
-	/// <inheritdoc cref="IUrlDecodeProcessor"/>
+	/// <inheritdoc cref="IUrlDecodeProcessor" />
 	public class UrlDecodeProcessorDescriptor<T>
 		: ProcessorDescriptorBase<UrlDecodeProcessorDescriptor<T>, IUrlDecodeProcessor>, IUrlDecodeProcessor
 		where T : class
@@ -61,8 +57,8 @@ public class UrlDecodeProcessorDescriptor<T>
 		protected override string Name => "urldecode";
 
 		Field IUrlDecodeProcessor.Field { get; set; }
-		Field IUrlDecodeProcessor.TargetField { get; set; }
 		bool? IUrlDecodeProcessor.IgnoreMissing { get; set; }
+		Field IUrlDecodeProcessor.TargetField { get; set; }
 
 		/// <summary>
 		/// The field to decode
@@ -76,18 +72,18 @@ public UrlDecodeProcessorDescriptor<T> Field(Expression<Func<T, object>> objectP
 			Assign(a => a.Field = objectPath);
 
 		/// <summary>
-		/// The field to assign the converted value to, by default <see cref="IUrlDecodeProcessor.Field"/> is updated in-place
+		/// The field to assign the converted value to, by default <see cref="IUrlDecodeProcessor.Field" /> is updated in-place
 		/// </summary>
 		public UrlDecodeProcessorDescriptor<T> TargetField(Field field) => Assign(a => a.TargetField = field);
 
 		/// <summary>
-		/// The field to assign the converted value to, by default <see cref="IUrlDecodeProcessor.Field"/> is updated in-place
+		/// The field to assign the converted value to, by default <see cref="IUrlDecodeProcessor.Field" /> is updated in-place
 		/// </summary>
 		public UrlDecodeProcessorDescriptor<T> TargetField(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.TargetField = objectPath);
 
 		/// <summary>
-		/// If <c>true</c> and <see cref="IUrlDecodeProcessor.Field"/> does not exist or is null,
+		/// If <c>true</c> and <see cref="IUrlDecodeProcessor.Field" /> does not exist or is null,
 		/// the processor quietly exits without modifying the document. Default is <c>false</c>
 		/// </summary>
 		public UrlDecodeProcessorDescriptor<T> IgnoreMissing(bool? ignoreMissing = true) =>
diff --git a/src/Nest/Ingest/ProcessorsDescriptor.cs b/src/Nest/Ingest/ProcessorsDescriptor.cs
index ebdc135acf9..db17489fbcf 100644
--- a/src/Nest/Ingest/ProcessorsDescriptor.cs
+++ b/src/Nest/Ingest/ProcessorsDescriptor.cs
@@ -15,23 +15,23 @@ public ProcessorsDescriptor() : base(new List<IProcessor>()) { }
 		/// <remarks>
 		/// Requires the Ingest Attachment Processor Plugin to be installed on the cluster.
 		/// </remarks>
-		public ProcessorsDescriptor Attachment<T>(Func<AttachmentProcessorDescriptor<T>, IAttachmentProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Attachment<T>(Func<AttachmentProcessorDescriptor<T>, IAttachmentProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new AttachmentProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Append<T>(Func<AppendProcessorDescriptor<T>, IAppendProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Append<T>(Func<AppendProcessorDescriptor<T>, IAppendProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new AppendProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Convert<T>(Func<ConvertProcessorDescriptor<T>, IConvertProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Convert<T>(Func<ConvertProcessorDescriptor<T>, IConvertProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new ConvertProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Date<T>(Func<DateProcessorDescriptor<T>, IDateProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Date<T>(Func<DateProcessorDescriptor<T>, IDateProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new DateProcessorDescriptor<T>())));
 
 		/// <summary>
 		/// Point documents to the right time-based index based on a date or timestamp field in a document
 		/// by using the date math index name support.
 		/// </summary>
-		public ProcessorsDescriptor DateIndexName<T>(Func<DateIndexNameProcessorDescriptor<T>, IDateIndexNameProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor DateIndexName<T>(Func<DateIndexNameProcessorDescriptor<T>, IDateIndexNameProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new DateIndexNameProcessorDescriptor<T>())));
 
 		/// <summary>
@@ -39,13 +39,13 @@ public ProcessorsDescriptor DateIndexName<T>(Func<DateIndexNameProcessorDescript
 		/// This processor allows fields with dots in the name to be accessible by other processors in the pipeline.
 		/// Otherwise these fields can’t be accessed by any processor.
 		/// </summary>
-		public ProcessorsDescriptor DotExpander<T>(Func<DotExpanderProcessorDescriptor<T>, IDotExpanderProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor DotExpander<T>(Func<DotExpanderProcessorDescriptor<T>, IDotExpanderProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new DotExpanderProcessorDescriptor<T>())));
 
 		public ProcessorsDescriptor Fail(Func<FailProcessorDescriptor, IFailProcessor> selector) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new FailProcessorDescriptor())));
 
-		public ProcessorsDescriptor Foreach<T>(Func<ForeachProcessorDescriptor<T>, IForeachProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Foreach<T>(Func<ForeachProcessorDescriptor<T>, IForeachProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new ForeachProcessorDescriptor<T>())));
 
 		/// <summary>
@@ -57,26 +57,26 @@ public ProcessorsDescriptor Foreach<T>(Func<ForeachProcessorDescriptor<T>, IFore
 		/// <remarks>
 		/// Requires the Ingest Geoip Processor Plugin to be installed on the cluster.
 		/// </remarks>
-		public ProcessorsDescriptor GeoIp<T>(Func<GeoIpProcessorDescriptor<T>, IGeoIpProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor GeoIp<T>(Func<GeoIpProcessorDescriptor<T>, IGeoIpProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new GeoIpProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Grok<T>(Func<GrokProcessorDescriptor<T>, IGrokProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Grok<T>(Func<GrokProcessorDescriptor<T>, IGrokProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new GrokProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Gsub<T>(Func<GsubProcessorDescriptor<T>, IGsubProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Gsub<T>(Func<GsubProcessorDescriptor<T>, IGsubProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new GsubProcessorDescriptor<T>())));
 
 
-		public ProcessorsDescriptor Join<T>(Func<JoinProcessorDescriptor<T>, IJoinProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Join<T>(Func<JoinProcessorDescriptor<T>, IJoinProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new JoinProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Lowercase<T>(Func<LowercaseProcessorDescriptor<T>, ILowercaseProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Lowercase<T>(Func<LowercaseProcessorDescriptor<T>, ILowercaseProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new LowercaseProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Remove<T>(Func<RemoveProcessorDescriptor<T>, IRemoveProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Remove<T>(Func<RemoveProcessorDescriptor<T>, IRemoveProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new RemoveProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Rename<T>(Func<RenameProcessorDescriptor<T>, IRenameProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Rename<T>(Func<RenameProcessorDescriptor<T>, IRenameProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new RenameProcessorDescriptor<T>())));
 
 		/// <summary>
@@ -85,7 +85,7 @@ public ProcessorsDescriptor Rename<T>(Func<RenameProcessorDescriptor<T>, IRename
 		public ProcessorsDescriptor Script(Func<ScriptProcessorDescriptor, IScriptProcessor> selector) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new ScriptProcessorDescriptor())));
 
-		public ProcessorsDescriptor Set<T>(Func<SetProcessorDescriptor<T>, ISetProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Set<T>(Func<SetProcessorDescriptor<T>, ISetProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new SetProcessorDescriptor<T>())));
 
 		/// <summary>
@@ -93,53 +93,53 @@ public ProcessorsDescriptor Set<T>(Func<SetProcessorDescriptor<T>, ISetProcessor
 		/// will be sorted numerically, while arrays of strings or heterogeneous arrays
 		///  of strings and numbers will be sorted lexicographically.
 		/// </summary>
-		public ProcessorsDescriptor Sort<T>(Func<SortProcessorDescriptor<T>, ISortProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Sort<T>(Func<SortProcessorDescriptor<T>, ISortProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new SortProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Split<T>(Func<SplitProcessorDescriptor<T>, ISplitProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Split<T>(Func<SplitProcessorDescriptor<T>, ISplitProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new SplitProcessorDescriptor<T>())));
 
 
-		public ProcessorsDescriptor Trim<T>(Func<TrimProcessorDescriptor<T>, ITrimProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Trim<T>(Func<TrimProcessorDescriptor<T>, ITrimProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new TrimProcessorDescriptor<T>())));
 
-		public ProcessorsDescriptor Uppercase<T>(Func<UppercaseProcessorDescriptor<T>, IUppercaseProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Uppercase<T>(Func<UppercaseProcessorDescriptor<T>, IUppercaseProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new UppercaseProcessorDescriptor<T>())));
 
 		/// <summary>
 		/// Converts a JSON string into a structured JSON object.
 		/// </summary>
-		public ProcessorsDescriptor Json<T>(Func<JsonProcessorDescriptor<T>, IJsonProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor Json<T>(Func<JsonProcessorDescriptor<T>, IJsonProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new JsonProcessorDescriptor<T>())));
 
-        /// <summary>
-        /// The user_agent processor extracts details from the user agent string a browser sends with its web requests.
-        /// This processor adds this information by default under the user_agent field.
-        /// The ingest-user-agent plugin ships by default with the regexes.yaml made available by
-        /// uap-java with an Apache 2.0 license.
-        /// </summary>
-        /// <remarks>
-        /// Requires the UserAgent Processor Plugin to be installed on the cluster.
-        /// </remarks>
-		public ProcessorsDescriptor UserAgent<T>(Func<UserAgentProcessorDescriptor<T>, IUserAgentProcessor> selector) where T : class  =>
+		/// <summary>
+		/// The user_agent processor extracts details from the user agent string a browser sends with its web requests.
+		/// This processor adds this information by default under the user_agent field.
+		/// The ingest-user-agent plugin ships by default with the regexes.yaml made available by
+		/// uap-java with an Apache 2.0 license.
+		/// </summary>
+		/// <remarks>
+		/// Requires the UserAgent Processor Plugin to be installed on the cluster.
+		/// </remarks>
+		public ProcessorsDescriptor UserAgent<T>(Func<UserAgentProcessorDescriptor<T>, IUserAgentProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new UserAgentProcessorDescriptor<T>())));
 
 		[Obsolete("This method takes the wrong descriptor please use Kv")]
-		public ProcessorsDescriptor KeyValue<T>(Func<UserAgentProcessorDescriptor<T>, IUserAgentProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor KeyValue<T>(Func<UserAgentProcessorDescriptor<T>, IUserAgentProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new UserAgentProcessorDescriptor<T>())));
 
-		/// <inheritdoc cref="IKeyValueProcessor"/>
-		public ProcessorsDescriptor Kv<T>(Func<KeyValueProcessorDescriptor<T>, IKeyValueProcessor> selector) where T : class  =>
+		/// <inheritdoc cref="IKeyValueProcessor" />
+		public ProcessorsDescriptor Kv<T>(Func<KeyValueProcessorDescriptor<T>, IKeyValueProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new KeyValueProcessorDescriptor<T>())));
 
 		/// <summary>
 		/// URL-decodes a string
 		/// </summary>
-		public ProcessorsDescriptor UrlDecode<T>(Func<UrlDecodeProcessorDescriptor<T>, IUrlDecodeProcessor> selector) where T : class  =>
+		public ProcessorsDescriptor UrlDecode<T>(Func<UrlDecodeProcessorDescriptor<T>, IUrlDecodeProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new UrlDecodeProcessorDescriptor<T>())));
 
-		/// <inheritdoc cref="IBytesProcessor"/>
-		public ProcessorsDescriptor Bytes<T>(Func<BytesProcessorDescriptor<T>, IBytesProcessor> selector) where T : class  =>
+		/// <inheritdoc cref="IBytesProcessor" />
+		public ProcessorsDescriptor Bytes<T>(Func<BytesProcessorDescriptor<T>, IBytesProcessor> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new BytesProcessorDescriptor<T>())));
 	}
 }
diff --git a/src/Nest/Ingest/PutPipeline/ElasticClient-PutPipeline.cs b/src/Nest/Ingest/PutPipeline/ElasticClient-PutPipeline.cs
index f147e383cf7..d196f8f5de6 100644
--- a/src/Nest/Ingest/PutPipeline/ElasticClient-PutPipeline.cs
+++ b/src/Nest/Ingest/PutPipeline/ElasticClient-PutPipeline.cs
@@ -1,44 +1,50 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutPipelineResponse PutPipeline(Id id, Func<PutPipelineDescriptor, IPutPipelineRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutPipelineResponse PutPipeline(IPutPipelineRequest request);
 
-		/// <inheritdoc/>
-		Task<IPutPipelineResponse> PutPipelineAsync(Id id, Func<PutPipelineDescriptor, IPutPipelineRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPutPipelineResponse> PutPipelineAsync(Id id, Func<PutPipelineDescriptor, IPutPipelineRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutPipelineResponse> PutPipelineAsync(IPutPipelineRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
+
 	public partial class ElasticClient
 	{
 		public IPutPipelineResponse PutPipeline(Id id, Func<PutPipelineDescriptor, IPutPipelineRequest> selector) =>
-			this.PutPipeline(selector?.Invoke(new PutPipelineDescriptor(id)));
+			PutPipeline(selector?.Invoke(new PutPipelineDescriptor(id)));
 
 		public IPutPipelineResponse PutPipeline(IPutPipelineRequest request) =>
-			this.Dispatcher.Dispatch<IPutPipelineRequest, PutPipelineRequestParameters, PutPipelineResponse>(
+			Dispatcher.Dispatch<IPutPipelineRequest, PutPipelineRequestParameters, PutPipelineResponse>(
 				request,
-				this.LowLevelDispatch.IngestPutPipelineDispatch<PutPipelineResponse>
+				LowLevelDispatch.IngestPutPipelineDispatch<PutPipelineResponse>
 			);
 
-		public Task<IPutPipelineResponse> PutPipelineAsync(Id id, Func<PutPipelineDescriptor, IPutPipelineRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PutPipelineAsync(selector?.Invoke(new PutPipelineDescriptor(id)), cancellationToken);
+		public Task<IPutPipelineResponse> PutPipelineAsync(Id id, Func<PutPipelineDescriptor, IPutPipelineRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PutPipelineAsync(selector?.Invoke(new PutPipelineDescriptor(id)), cancellationToken);
 
-		public Task<IPutPipelineResponse> PutPipelineAsync(IPutPipelineRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutPipelineRequest, PutPipelineRequestParameters, PutPipelineResponse, IPutPipelineResponse>(
+		public Task<IPutPipelineResponse> PutPipelineAsync(IPutPipelineRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IPutPipelineRequest, PutPipelineRequestParameters, PutPipelineResponse, IPutPipelineResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IngestPutPipelineDispatchAsync<PutPipelineResponse>
+				LowLevelDispatch.IngestPutPipelineDispatchAsync<PutPipelineResponse>
 			);
 	}
 }
diff --git a/src/Nest/Ingest/PutPipeline/PutPipelineRequest.cs b/src/Nest/Ingest/PutPipeline/PutPipelineRequest.cs
index 0a5ca2bd34e..7e514274f05 100644
--- a/src/Nest/Ingest/PutPipeline/PutPipelineRequest.cs
+++ b/src/Nest/Ingest/PutPipeline/PutPipelineRequest.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -9,31 +8,31 @@ public partial interface IPutPipelineRequest : IPipeline { }
 	public partial class PutPipelineRequest
 	{
 		public string Description { get; set; }
-		public IEnumerable<IProcessor> Processors { get; set; }
 		public IEnumerable<IProcessor> OnFailure { get; set; }
+		public IEnumerable<IProcessor> Processors { get; set; }
 	}
 
 	[DescriptorFor("IngestPutPipeline")]
 	public partial class PutPipelineDescriptor
 	{
 		string IPipeline.Description { get; set; }
-		IEnumerable<IProcessor> IPipeline.Processors { get; set; }
 		IEnumerable<IProcessor> IPipeline.OnFailure { get; set; }
+		IEnumerable<IProcessor> IPipeline.Processors { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutPipelineDescriptor Description(string description) => Assign(a => a.Description = description);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutPipelineDescriptor Processors(IEnumerable<IProcessor> processors) => Assign(a => a.Processors = processors.ToListOrNullIfEmpty());
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutPipelineDescriptor Processors(Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> selector) =>
 			Assign(a => a.Processors = selector?.Invoke(new ProcessorsDescriptor())?.Value);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutPipelineDescriptor OnFailure(IEnumerable<IProcessor> processors) => Assign(a => a.OnFailure = processors.ToListOrNullIfEmpty());
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutPipelineDescriptor OnFailure(Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> selector) =>
 			Assign(a => a.OnFailure = selector?.Invoke(new ProcessorsDescriptor())?.Value);
 	}
diff --git a/src/Nest/Ingest/PutPipeline/PutPipelineResponse.cs b/src/Nest/Ingest/PutPipeline/PutPipelineResponse.cs
index 092b760d0cb..d3709a2ba12 100644
--- a/src/Nest/Ingest/PutPipeline/PutPipelineResponse.cs
+++ b/src/Nest/Ingest/PutPipeline/PutPipelineResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IPutPipelineResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Ingest/SimulatePipeline/ElasticClient-SimulatePipeline.cs b/src/Nest/Ingest/SimulatePipeline/ElasticClient-SimulatePipeline.cs
index a3f7b51a7ec..04439af63dc 100644
--- a/src/Nest/Ingest/SimulatePipeline/ElasticClient-SimulatePipeline.cs
+++ b/src/Nest/Ingest/SimulatePipeline/ElasticClient-SimulatePipeline.cs
@@ -1,44 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISimulatePipelineResponse SimulatePipeline(Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISimulatePipelineResponse SimulatePipeline(ISimulatePipelineRequest request);
 
-		/// <inheritdoc/>
-		Task<ISimulatePipelineResponse> SimulatePipelineAsync(Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<ISimulatePipelineResponse> SimulatePipelineAsync(ISimulatePipelineRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ISimulatePipelineResponse> SimulatePipelineAsync(Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<ISimulatePipelineResponse> SimulatePipelineAsync(ISimulatePipelineRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
 		public ISimulatePipelineResponse SimulatePipeline(Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> selector) =>
-			this.SimulatePipeline(selector?.Invoke(new SimulatePipelineDescriptor()));
+			SimulatePipeline(selector?.Invoke(new SimulatePipelineDescriptor()));
 
 		public ISimulatePipelineResponse SimulatePipeline(ISimulatePipelineRequest request) =>
-			this.Dispatcher.Dispatch<ISimulatePipelineRequest, SimulatePipelineRequestParameters, SimulatePipelineResponse>(
+			Dispatcher.Dispatch<ISimulatePipelineRequest, SimulatePipelineRequestParameters, SimulatePipelineResponse>(
 				request,
-				this.LowLevelDispatch.IngestSimulateDispatch<SimulatePipelineResponse>
+				LowLevelDispatch.IngestSimulateDispatch<SimulatePipelineResponse>
 			);
 
-		public Task<ISimulatePipelineResponse> SimulatePipelineAsync(Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.SimulatePipelineAsync(selector?.Invoke(new SimulatePipelineDescriptor()), cancellationToken);
-
-		public Task<ISimulatePipelineResponse> SimulatePipelineAsync(ISimulatePipelineRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ISimulatePipelineRequest, SimulatePipelineRequestParameters, SimulatePipelineResponse, ISimulatePipelineResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.IngestSimulateDispatchAsync<SimulatePipelineResponse>
-			);
+		public Task<ISimulatePipelineResponse> SimulatePipelineAsync(Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			SimulatePipelineAsync(selector?.Invoke(new SimulatePipelineDescriptor()), cancellationToken);
+
+		public Task<ISimulatePipelineResponse> SimulatePipelineAsync(ISimulatePipelineRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<ISimulatePipelineRequest, SimulatePipelineRequestParameters, SimulatePipelineResponse, ISimulatePipelineResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.IngestSimulateDispatchAsync<SimulatePipelineResponse>
+				);
 	}
 }
diff --git a/src/Nest/Ingest/SimulatePipeline/SimulatePipelineDocument.cs b/src/Nest/Ingest/SimulatePipeline/SimulatePipelineDocument.cs
index 3725619c5e8..70063740245 100644
--- a/src/Nest/Ingest/SimulatePipeline/SimulatePipelineDocument.cs
+++ b/src/Nest/Ingest/SimulatePipeline/SimulatePipelineDocument.cs
@@ -1,46 +1,46 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface ISimulatePipelineDocument
 	{
-		[JsonProperty("_index")]
-		IndexName Index { get; set; }
-
-		[JsonProperty("_type")]
-		TypeName Type { get; set; }
-
 		[JsonProperty("_id")]
 		Id Id { get; set; }
 
+		[JsonProperty("_index")]
+		IndexName Index { get; set; }
+
 		[JsonProperty("_source")]
 		[JsonConverter(typeof(SourceConverter))]
 		object Source { get; set; }
+
+		[JsonProperty("_type")]
+		TypeName Type { get; set; }
 	}
 
 	public class SimulatePipelineDocument : ISimulatePipelineDocument
 	{
-		public IndexName Index { get; set; }
-
-		public TypeName Type { get; set; }
+		private object _source;
 
 		public Id Id { get; set; }
+		public IndexName Index { get; set; }
 
-		private object _source;
 		public object Source
 		{
 			get => _source;
 			set
 			{
 				_source = value;
-				this.Index = this.Index ?? _source.GetType();
-				this.Type = this.Type ?? _source.GetType();
-				this.Id = this.Id ?? Id.From(_source);
+				Index = Index ?? _source.GetType();
+				Type = Type ?? _source.GetType();
+				Id = Id ?? Id.From(_source);
 			}
 		}
+
+		public TypeName Type { get; set; }
 	}
 
 	public class SimulatePipelineDocumentDescriptor
@@ -48,12 +48,15 @@ public class SimulatePipelineDocumentDescriptor
 	{
 		Id ISimulatePipelineDocument.Id { get; set; }
 		IndexName ISimulatePipelineDocument.Index { get; set; }
-		TypeName ISimulatePipelineDocument.Type { get; set; }
 		object ISimulatePipelineDocument.Source { get; set; }
+		TypeName ISimulatePipelineDocument.Type { get; set; }
 
 		public SimulatePipelineDocumentDescriptor Id(Id id) => Assign(a => a.Id = id);
+
 		public SimulatePipelineDocumentDescriptor Index(IndexName index) => Assign(a => a.Index = index);
+
 		public SimulatePipelineDocumentDescriptor Type(TypeName type) => Assign(a => a.Type = type);
+
 		public SimulatePipelineDocumentDescriptor Source<T>(T source) where T : class => Assign(a =>
 		{
 			a.Source = source;
@@ -69,6 +72,6 @@ public class SimulatePipelineDocumentsDescriptor
 		public SimulatePipelineDocumentsDescriptor() : base(new List<ISimulatePipelineDocument>()) { }
 
 		public SimulatePipelineDocumentsDescriptor Document(Func<SimulatePipelineDocumentDescriptor, ISimulatePipelineDocument> selector) =>
-			this.Assign(a => a.AddIfNotNull(selector?.Invoke(new SimulatePipelineDocumentDescriptor())));
+			Assign(a => a.AddIfNotNull(selector?.Invoke(new SimulatePipelineDocumentDescriptor())));
 	}
 }
diff --git a/src/Nest/Ingest/SimulatePipeline/SimulatePipelineRequest.cs b/src/Nest/Ingest/SimulatePipeline/SimulatePipelineRequest.cs
index 81d17c3eeaa..f39a4bdc696 100644
--- a/src/Nest/Ingest/SimulatePipeline/SimulatePipelineRequest.cs
+++ b/src/Nest/Ingest/SimulatePipeline/SimulatePipelineRequest.cs
@@ -1,31 +1,29 @@
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	public partial interface ISimulatePipelineRequest
 	{
-		[JsonProperty("pipeline")]
-		IPipeline Pipeline { get; set; }
-
 		[JsonProperty("docs")]
 		IEnumerable<ISimulatePipelineDocument> Documents { get; set; }
+
+		[JsonProperty("pipeline")]
+		IPipeline Pipeline { get; set; }
 	}
 
 	public partial class SimulatePipelineRequest
 	{
-		public IPipeline Pipeline { get; set; }
-
 		public IEnumerable<ISimulatePipelineDocument> Documents { get; set; }
+		public IPipeline Pipeline { get; set; }
 	}
 
 	[DescriptorFor("IngestSimulate")]
 	public partial class SimulatePipelineDescriptor
 	{
-		IPipeline ISimulatePipelineRequest.Pipeline { get; set; }
-
 		IEnumerable<ISimulatePipelineDocument> ISimulatePipelineRequest.Documents { get; set; }
+		IPipeline ISimulatePipelineRequest.Pipeline { get; set; }
 
 		public SimulatePipelineDescriptor Pipeline(Func<PipelineDescriptor, IPipeline> pipeline) =>
 			Assign(a => a.Pipeline = pipeline?.Invoke(new PipelineDescriptor()));
diff --git a/src/Nest/Ingest/SimulatePipeline/SimulatePipelineResponse.cs b/src/Nest/Ingest/SimulatePipeline/SimulatePipelineResponse.cs
index a41398d732d..419ea30abd9 100644
--- a/src/Nest/Ingest/SimulatePipeline/SimulatePipelineResponse.cs
+++ b/src/Nest/Ingest/SimulatePipeline/SimulatePipelineResponse.cs
@@ -1,9 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -22,27 +19,27 @@ public class SimulatePipelineResponse : ResponseBase, ISimulatePipelineResponse
 	[JsonObject(MemberSerialization.OptIn)]
 	public class PipelineSimulation
 	{
+		[JsonProperty("doc")]
+		public DocumentSimulation Document { get; internal set; }
+
 		[JsonProperty("processor_results")]
 		public IReadOnlyCollection<PipelineSimulation> ProcessorResults { get; internal set; } = EmptyReadOnly<PipelineSimulation>.Collection;
 
 		[JsonProperty("tag")]
 		public string Tag { get; internal set; }
-
-		[JsonProperty("doc")]
-		public DocumentSimulation Document { get; internal set; }
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
 	public class DocumentSimulation
 	{
+		[JsonProperty("_id")]
+		public string Id { get; internal set; }
+
 		[JsonProperty("_index")]
 		public string Index { get; internal set; }
 
-		[JsonProperty("_type")]
-		public string Type { get; internal set; }
-
-		[JsonProperty("_id")]
-		public string Id { get; internal set; }
+		[JsonProperty("_ingest")]
+		public Ingest Ingest { get; internal set; }
 
 		[JsonProperty("_parent")]
 		public string Parent { get; internal set; }
@@ -53,8 +50,8 @@ public class DocumentSimulation
 		[JsonProperty("_source")]
 		public ILazyDocument Source { get; internal set; }
 
-		[JsonProperty("_ingest")]
-		public Ingest Ingest { get; internal set; }
+		[JsonProperty("_type")]
+		public string Type { get; internal set; }
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
diff --git a/src/Nest/Mapping/AttributeBased/ElasticsearchCorePropertyAttributeBase.cs b/src/Nest/Mapping/AttributeBased/ElasticsearchCorePropertyAttributeBase.cs
index ffbaf623e7e..ba68fccacc3 100644
--- a/src/Nest/Mapping/AttributeBased/ElasticsearchCorePropertyAttributeBase.cs
+++ b/src/Nest/Mapping/AttributeBased/ElasticsearchCorePropertyAttributeBase.cs
@@ -11,16 +11,6 @@ public abstract class ElasticsearchCorePropertyAttributeBase : ElasticsearchProp
 	{
 		protected ElasticsearchCorePropertyAttributeBase(FieldType type) : base(type) { }
 
-		private ICoreProperty Self => this;
-
-		bool? ICoreProperty.Store { get; set; }
-
-		IProperties ICoreProperty.Fields { get; set; }
-
-		Fields ICoreProperty.CopyTo { get; set; }
-
-		Union<SimilarityOption, string> ICoreProperty.Similarity { get; set; }
-
 		/// <inheritdoc cref="ICoreProperty" />
 		public string Similarity
 		{
@@ -35,7 +25,17 @@ public bool Store
 			set => Self.Store = value;
 		}
 
-		public new static ElasticsearchCorePropertyAttributeBase From(MemberInfo memberInfo) =>
+		Fields ICoreProperty.CopyTo { get; set; }
+
+		IProperties ICoreProperty.Fields { get; set; }
+
+		private ICoreProperty Self => this;
+
+		Union<SimilarityOption, string> ICoreProperty.Similarity { get; set; }
+
+		bool? ICoreProperty.Store { get; set; }
+
+		public static new ElasticsearchCorePropertyAttributeBase From(MemberInfo memberInfo) =>
 			memberInfo.GetCustomAttribute<ElasticsearchCorePropertyAttributeBase>(true);
 	}
 }
diff --git a/src/Nest/Mapping/AttributeBased/ElasticsearchDocValuesPropertyAttributeBase.cs b/src/Nest/Mapping/AttributeBased/ElasticsearchDocValuesPropertyAttributeBase.cs
index e12dc02dc6c..fad5d5bf1a8 100644
--- a/src/Nest/Mapping/AttributeBased/ElasticsearchDocValuesPropertyAttributeBase.cs
+++ b/src/Nest/Mapping/AttributeBased/ElasticsearchDocValuesPropertyAttributeBase.cs
@@ -8,9 +8,7 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public abstract class ElasticsearchDocValuesPropertyAttributeBase : ElasticsearchCorePropertyAttributeBase, IDocValuesProperty
 	{
-		private IDocValuesProperty Self => this;
-
-		bool? IDocValuesProperty.DocValues { get; set; }
+		protected ElasticsearchDocValuesPropertyAttributeBase(FieldType type) : base(type) { }
 
 		public bool DocValues
 		{
@@ -18,11 +16,10 @@ public bool DocValues
 			set => Self.DocValues = value;
 		}
 
-		protected ElasticsearchDocValuesPropertyAttributeBase(FieldType type) : base(type) { }
+		bool? IDocValuesProperty.DocValues { get; set; }
+		private IDocValuesProperty Self => this;
 
-		public new static ElasticsearchDocValuesPropertyAttributeBase From(MemberInfo memberInfo)
-		{
-			return memberInfo.GetCustomAttribute<ElasticsearchDocValuesPropertyAttributeBase>(true);
-		}
+		public static new ElasticsearchDocValuesPropertyAttributeBase From(MemberInfo memberInfo) =>
+			memberInfo.GetCustomAttribute<ElasticsearchDocValuesPropertyAttributeBase>(true);
 	}
 }
diff --git a/src/Nest/Mapping/AttributeBased/ElasticsearchPropertyAttributeBase.cs b/src/Nest/Mapping/AttributeBased/ElasticsearchPropertyAttributeBase.cs
index 9c37466c423..5189ad0dd09 100644
--- a/src/Nest/Mapping/AttributeBased/ElasticsearchPropertyAttributeBase.cs
+++ b/src/Nest/Mapping/AttributeBased/ElasticsearchPropertyAttributeBase.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
@@ -11,23 +10,18 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public abstract class ElasticsearchPropertyAttributeBase : Attribute, IProperty, IPropertyMapping
 	{
-		private IProperty Self => this;
+		protected ElasticsearchPropertyAttributeBase(FieldType type) => Self.Type = type.GetStringValue();
 
-		PropertyName IProperty.Name { get; set; }
-		string IProperty.Type { get; set; }
-		IDictionary<string, object> IProperty.LocalMetadata { get; set; }
+		public bool Ignore { get; set; }
 
 		public string Name { get; set; }
-		public bool Ignore { get; set; }
+		IDictionary<string, object> IProperty.LocalMetadata { get; set; }
 
-		protected ElasticsearchPropertyAttributeBase(FieldType type)
-		{
-			Self.Type = type.GetStringValue();
-		}
+		PropertyName IProperty.Name { get; set; }
+		private IProperty Self => this;
+		string IProperty.Type { get; set; }
 
-		public static ElasticsearchPropertyAttributeBase From(MemberInfo memberInfo)
-		{
-			return memberInfo.GetCustomAttribute<ElasticsearchPropertyAttributeBase>(true);
-		}
+		public static ElasticsearchPropertyAttributeBase From(MemberInfo memberInfo) =>
+			memberInfo.GetCustomAttribute<ElasticsearchPropertyAttributeBase>(true);
 	}
 }
diff --git a/src/Nest/Mapping/AttributeBased/ElasticsearchTypeAttribute.cs b/src/Nest/Mapping/AttributeBased/ElasticsearchTypeAttribute.cs
index 6bec083d0f2..95357c21bb1 100644
--- a/src/Nest/Mapping/AttributeBased/ElasticsearchTypeAttribute.cs
+++ b/src/Nest/Mapping/AttributeBased/ElasticsearchTypeAttribute.cs
@@ -11,9 +11,10 @@ public class ElasticsearchTypeAttribute : Attribute
 		private static readonly ConcurrentDictionary<Type, ElasticsearchTypeAttribute> CachedTypeLookups =
 			new ConcurrentDictionary<Type, ElasticsearchTypeAttribute>();
 
-		public string Name { get; set; }
 		public string IdProperty { get; set; }
 
+		public string Name { get; set; }
+
 		public static ElasticsearchTypeAttribute From(Type type)
 		{
 			if (CachedTypeLookups.TryGetValue(type, out var attr))
diff --git a/src/Nest/Mapping/DynamicMapping.cs b/src/Nest/Mapping/DynamicMapping.cs
index 9245a61f683..b29abb9d07a 100644
--- a/src/Nest/Mapping/DynamicMapping.cs
+++ b/src/Nest/Mapping/DynamicMapping.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
diff --git a/src/Nest/Mapping/DynamicTemplate/DynamicTemplate.cs b/src/Nest/Mapping/DynamicTemplate/DynamicTemplate.cs
index 2b79d097b76..10c1938e24d 100644
--- a/src/Nest/Mapping/DynamicTemplate/DynamicTemplate.cs
+++ b/src/Nest/Mapping/DynamicTemplate/DynamicTemplate.cs
@@ -8,32 +8,28 @@ namespace Nest
 	/// <summary>
 	/// A Dynamic template that defines custom mappings to be applied
 	/// to dynamically added fields based on:
-	/// <para />- the datatype detected by Elasticsearch, with <see cref="MatchMappingType"/>.
-	/// <para />- the name of the field, with <see cref="Match"/> and <see cref="Unmatch"/> or <see cref="MatchPattern"/>.
-	/// <para />- the full dotted path to the field, with <see cref="PathMatch"/> and <see cref="PathUnmatch"/>.
+	/// <para />
+	/// - the datatype detected by Elasticsearch, with <see cref="MatchMappingType" />.
+	/// <para />
+	/// - the name of the field, with <see cref="Match" /> and <see cref="Unmatch" /> or <see cref="MatchPattern" />.
+	/// <para />
+	/// - the full dotted path to the field, with <see cref="PathMatch" /> and <see cref="PathUnmatch" />.
 	/// </summary>
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<DynamicTemplate>))]
 	public interface IDynamicTemplate
 	{
 		/// <summary>
-		/// A pattern to match on the field name
-		/// </summary>
-		[JsonProperty("match")]
-		string Match { get; set; }
-
-		/// <summary>
-		/// Adjusts the behavior of <see cref="Match"/> such that it supports full
-		/// Java regular expression matching on the field name instead of simple wildcards
+		/// The mapping to apply to matching fields
 		/// </summary>
-		[JsonProperty("match_pattern")]
-		MatchType? MatchPattern { get; set; }
+		[JsonProperty("mapping")]
+		IProperty Mapping { get; set; }
 
 		/// <summary>
-		/// A pattern to exclude fields matched by <see cref="Match"/>
+		/// A pattern to match on the field name
 		/// </summary>
-		[JsonProperty("unmatch")]
-		string Unmatch { get; set; }
+		[JsonProperty("match")]
+		string Match { get; set; }
 
 		/// <summary>
 		/// Matches on the datatype detected by dynamic field mapping,
@@ -44,6 +40,13 @@ public interface IDynamicTemplate
 		[JsonProperty("match_mapping_type")]
 		string MatchMappingType { get; set; }
 
+		/// <summary>
+		/// Adjusts the behavior of <see cref="Match" /> such that it supports full
+		/// Java regular expression matching on the field name instead of simple wildcards
+		/// </summary>
+		[JsonProperty("match_pattern")]
+		MatchType? MatchPattern { get; set; }
+
 		/// <summary>
 		/// A pattern to match on the field name, which may be the full dotted path
 		/// to the field name
@@ -52,32 +55,32 @@ public interface IDynamicTemplate
 		string PathMatch { get; set; }
 
 		/// <summary>
-		/// A pattern to exclude fields matched by <see cref="PathMatch"/>
+		/// A pattern to exclude fields matched by <see cref="PathMatch" />
 		/// </summary>
 		[JsonProperty("path_unmatch")]
 		string PathUnmatch { get; set; }
 
 		/// <summary>
-		/// The mapping to apply to matching fields
+		/// A pattern to exclude fields matched by <see cref="Match" />
 		/// </summary>
-		[JsonProperty("mapping")]
-		IProperty Mapping { get; set; }
+		[JsonProperty("unmatch")]
+		string Unmatch { get; set; }
 	}
 
 	/// <inheritdoc />
 	public class DynamicTemplate : IDynamicTemplate
 	{
 		/// <inheritdoc />
-		public string Match { get; set; }
+		public IProperty Mapping { get; set; }
 
 		/// <inheritdoc />
-		public MatchType? MatchPattern { get; set; }
+		public string Match { get; set; }
 
 		/// <inheritdoc />
-		public string Unmatch { get; set; }
+		public string MatchMappingType { get; set; }
 
 		/// <inheritdoc />
-		public string MatchMappingType { get; set; }
+		public MatchType? MatchPattern { get; set; }
 
 		/// <inheritdoc />
 		public string PathMatch { get; set; }
@@ -86,41 +89,42 @@ public class DynamicTemplate : IDynamicTemplate
 		public string PathUnmatch { get; set; }
 
 		/// <inheritdoc />
-		public IProperty Mapping { get; set; }
+		public string Unmatch { get; set; }
 	}
 
-	/// <inheritdoc cref="IDynamicTemplate"/>
+	/// <inheritdoc cref="IDynamicTemplate" />
 	public class DynamicTemplateDescriptor<T> : DescriptorBase<DynamicTemplateDescriptor<T>, IDynamicTemplate>, IDynamicTemplate
 		where T : class
 	{
+		IProperty IDynamicTemplate.Mapping { get; set; }
 		string IDynamicTemplate.Match { get; set; }
-		MatchType? IDynamicTemplate.MatchPattern { get; set; }
-		string IDynamicTemplate.Unmatch { get; set; }
 		string IDynamicTemplate.MatchMappingType { get; set; }
+		MatchType? IDynamicTemplate.MatchPattern { get; set; }
 		string IDynamicTemplate.PathMatch { get; set; }
 		string IDynamicTemplate.PathUnmatch { get; set; }
-		IProperty IDynamicTemplate.Mapping { get; set; }
+		string IDynamicTemplate.Unmatch { get; set; }
 
-		/// <inheritdoc cref="IDynamicTemplate.Match"/>
+		/// <inheritdoc cref="IDynamicTemplate.Match" />
 		public DynamicTemplateDescriptor<T> Match(string match) => Assign(a => a.Match = match);
 
-		/// <inheritdoc cref="IDynamicTemplate.MatchPattern"/>
+		/// <inheritdoc cref="IDynamicTemplate.MatchPattern" />
 		public DynamicTemplateDescriptor<T> MatchPattern(MatchType? matchPattern) => Assign(a => a.MatchPattern = matchPattern);
 
-		/// <inheritdoc cref="IDynamicTemplate.Unmatch"/>
+		/// <inheritdoc cref="IDynamicTemplate.Unmatch" />
 		public DynamicTemplateDescriptor<T> Unmatch(string unMatch) => Assign(a => a.Unmatch = unMatch);
 
-		/// <inheritdoc cref="IDynamicTemplate.MatchMappingType"/>
+		/// <inheritdoc cref="IDynamicTemplate.MatchMappingType" />
 		public DynamicTemplateDescriptor<T> MatchMappingType(string matchMappingType) => Assign(a => a.MatchMappingType = matchMappingType);
 
-		/// <inheritdoc cref="IDynamicTemplate.PathMatch"/>
+		/// <inheritdoc cref="IDynamicTemplate.PathMatch" />
 		public DynamicTemplateDescriptor<T> PathMatch(string pathMatch) => Assign(a => a.PathMatch = pathMatch);
 
-		/// <inheritdoc cref="IDynamicTemplate.PathUnmatch"/>
+		/// <inheritdoc cref="IDynamicTemplate.PathUnmatch" />
 		public DynamicTemplateDescriptor<T> PathUnmatch(string pathUnmatch) => Assign(a => a.PathUnmatch = pathUnmatch);
 
-		/// <inheritdoc cref="IDynamicTemplate.Mapping"/>
-		public DynamicTemplateDescriptor<T> Mapping(Func<SingleMappingSelector<T>, IProperty> mappingSelector) => Assign(a => a.Mapping = mappingSelector?.Invoke(new SingleMappingSelector<T>()));
+		/// <inheritdoc cref="IDynamicTemplate.Mapping" />
+		public DynamicTemplateDescriptor<T> Mapping(Func<SingleMappingSelector<T>, IProperty> mappingSelector) =>
+			Assign(a => a.Mapping = mappingSelector?.Invoke(new SingleMappingSelector<T>()));
 	}
 
 	/// <summary>
diff --git a/src/Nest/Mapping/DynamicTemplate/DynamicTemplateContainer.cs b/src/Nest/Mapping/DynamicTemplate/DynamicTemplateContainer.cs
index 41d0224c1aa..611c272dbc3 100644
--- a/src/Nest/Mapping/DynamicTemplate/DynamicTemplateContainer.cs
+++ b/src/Nest/Mapping/DynamicTemplate/DynamicTemplateContainer.cs
@@ -11,10 +11,11 @@ public interface IDynamicTemplateContainer : IIsADictionary<string, IDynamicTemp
 	public class DynamicTemplateContainer : IsADictionaryBase<string, IDynamicTemplate>, IDynamicTemplateContainer
 	{
 		public DynamicTemplateContainer() : base() { }
+
 		public DynamicTemplateContainer(IDictionary<string, IDynamicTemplate> container) : base(container) { }
+
 		public DynamicTemplateContainer(Dictionary<string, IDynamicTemplate> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		/// <summary>
 		/// Add any setting to the index
@@ -22,11 +23,13 @@ public DynamicTemplateContainer(Dictionary<string, IDynamicTemplate> container)
 		public void Add(string name, IDynamicTemplate dynamicTemplate) => BackingDictionary.Add(name, dynamicTemplate);
 	}
 
-	public class DynamicTemplateContainerDescriptor<T> : IsADictionaryDescriptorBase<DynamicTemplateContainerDescriptor<T>, IDynamicTemplateContainer, string, IDynamicTemplate>
+	public class DynamicTemplateContainerDescriptor<T>
+		: IsADictionaryDescriptorBase<DynamicTemplateContainerDescriptor<T>, IDynamicTemplateContainer, string, IDynamicTemplate>
 		where T : class
 	{
 		public DynamicTemplateContainerDescriptor() : base(new DynamicTemplateContainer()) { }
 
-		public DynamicTemplateContainerDescriptor<T> DynamicTemplate(string name, Func<DynamicTemplateDescriptor<T>, IDynamicTemplate> selector) => Assign(name, selector?.Invoke(new DynamicTemplateDescriptor<T>()));
+		public DynamicTemplateContainerDescriptor<T> DynamicTemplate(string name, Func<DynamicTemplateDescriptor<T>, IDynamicTemplate> selector) =>
+			Assign(name, selector?.Invoke(new DynamicTemplateDescriptor<T>()));
 	}
 }
diff --git a/src/Nest/Mapping/DynamicTemplate/DynamicTemplatesJsonConverter.cs b/src/Nest/Mapping/DynamicTemplate/DynamicTemplatesJsonConverter.cs
index 599445a6d57..e862af2df79 100644
--- a/src/Nest/Mapping/DynamicTemplate/DynamicTemplatesJsonConverter.cs
+++ b/src/Nest/Mapping/DynamicTemplate/DynamicTemplatesJsonConverter.cs
@@ -9,12 +9,14 @@ namespace Nest
 	internal class DynamicTemplatesJsonConverter : JsonConverter
 	{
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => objectType == typeof(IDictionary<string, DynamicTemplate>);
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var dict = value as DynamicTemplateContainer;
 			if (!dict.HasAny()) return;
+
 			writer.WriteStartArray();
 			foreach (var p in dict)
 			{
@@ -31,7 +33,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var dict = new DynamicTemplateContainer();
-			JArray o = JArray.Load(reader);
+			var o = JArray.Load(reader);
 			foreach (JObject p in o)
 			{
 				var prop = p.Properties().First();
diff --git a/src/Nest/Mapping/DynamicTemplate/SingleMapping.cs b/src/Nest/Mapping/DynamicTemplate/SingleMapping.cs
index 996c9f18077..c1ce7d4d27b 100644
--- a/src/Nest/Mapping/DynamicTemplate/SingleMapping.cs
+++ b/src/Nest/Mapping/DynamicTemplate/SingleMapping.cs
@@ -6,57 +6,17 @@ namespace Nest
 {
 	public class SingleMappingSelector<T> : SelectorBase<IProperty>, IPropertiesDescriptor<T, IProperty> where T : class
 	{
-		public IProperty Text(Func<TextPropertyDescriptor<T>, ITextProperty> selector) =>
-			selector?.Invoke(new TextPropertyDescriptor<T>());
-
-		public IProperty Keyword(Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector) =>
-			selector?.Invoke(new KeywordPropertyDescriptor<T>());
-
-		/// <summary>
-		/// Number introduces a numeric mapping that defaults to `float` use .Type() to set the right type if needed or use
-		/// Scalar instead of <see cref="Number"/>
-		/// </summary>
-		public IProperty Number(Func<NumberPropertyDescriptor<T>, INumberProperty> selector) =>
-			selector?.Invoke(new NumberPropertyDescriptor<T>());
-
-		public IProperty Date(Func<DatePropertyDescriptor<T>, IDateProperty> selector) =>
-			selector?.Invoke(new DatePropertyDescriptor<T>());
-
-		public IProperty Boolean(Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector) =>
-			selector?.Invoke(new BooleanPropertyDescriptor<T>());
-
 		public IProperty Binary(Func<BinaryPropertyDescriptor<T>, IBinaryProperty> selector) =>
 			selector?.Invoke(new BinaryPropertyDescriptor<T>());
 
-		public IProperty Object<TChild>(Func<ObjectTypeDescriptor<T, TChild>, IObjectProperty> selector)
-			where TChild : class => selector?.Invoke(new ObjectTypeDescriptor<T, TChild>());
-
-		public IProperty Nested<TChild>(Func<NestedPropertyDescriptor<T, TChild>, INestedProperty> selector)
-			where TChild : class => selector?.Invoke(new NestedPropertyDescriptor<T, TChild>());
-
-		public IProperty Ip(Func<IpPropertyDescriptor<T>, IIpProperty> selector) =>
-			selector?.Invoke(new IpPropertyDescriptor<T>());
-
-		public IProperty GeoPoint(Func<GeoPointPropertyDescriptor<T>, IGeoPointProperty> selector) =>
-			selector?.Invoke(new GeoPointPropertyDescriptor<T>());
-
-		public IProperty GeoShape(Func<GeoShapePropertyDescriptor<T>, IGeoShapeProperty> selector) =>
-			selector?.Invoke(new GeoShapePropertyDescriptor<T>());
+		public IProperty Boolean(Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector) =>
+			selector?.Invoke(new BooleanPropertyDescriptor<T>());
 
 		public IProperty Completion(Func<CompletionPropertyDescriptor<T>, ICompletionProperty> selector) =>
 			selector?.Invoke(new CompletionPropertyDescriptor<T>());
 
-		public IProperty Murmur3Hash(Func<Murmur3HashPropertyDescriptor<T>, IMurmur3HashProperty> selector) =>
-			selector?.Invoke(new Murmur3HashPropertyDescriptor<T>());
-
-		public IProperty TokenCount(Func<TokenCountPropertyDescriptor<T>, ITokenCountProperty> selector) =>
-			selector?.Invoke(new TokenCountPropertyDescriptor<T>());
-
-		public IProperty Generic(Func<GenericPropertyDescriptor<T>, IGenericProperty> selector) =>
-			selector?.Invoke(new GenericPropertyDescriptor<T>());
-
-		public IProperty Percolator(Func<PercolatorPropertyDescriptor<T>, IPercolatorProperty> selector) =>
-			selector?.Invoke(new PercolatorPropertyDescriptor<T>());
+		public IProperty Date(Func<DatePropertyDescriptor<T>, IDateProperty> selector) =>
+			selector?.Invoke(new DatePropertyDescriptor<T>());
 
 		public IProperty DateRange(Func<DateRangePropertyDescriptor<T>, IDateRangeProperty> selector) =>
 			selector?.Invoke(new DateRangePropertyDescriptor<T>());
@@ -67,11 +27,17 @@ public IProperty DoubleRange(Func<DoubleRangePropertyDescriptor<T>, IDoubleRange
 		public IProperty FloatRange(Func<FloatRangePropertyDescriptor<T>, IFloatRangeProperty> selector) =>
 			selector?.Invoke(new FloatRangePropertyDescriptor<T>());
 
+		public IProperty GeoPoint(Func<GeoPointPropertyDescriptor<T>, IGeoPointProperty> selector) =>
+			selector?.Invoke(new GeoPointPropertyDescriptor<T>());
+
+		public IProperty GeoShape(Func<GeoShapePropertyDescriptor<T>, IGeoShapeProperty> selector) =>
+			selector?.Invoke(new GeoShapePropertyDescriptor<T>());
+
 		public IProperty IntegerRange(Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector) =>
 			selector?.Invoke(new IntegerRangePropertyDescriptor<T>());
 
-		public IProperty LongRange(Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector) =>
-			selector?.Invoke(new LongRangePropertyDescriptor<T>());
+		public IProperty Ip(Func<IpPropertyDescriptor<T>, IIpProperty> selector) =>
+			selector?.Invoke(new IpPropertyDescriptor<T>());
 
 		public IProperty IpRange(Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> selector) =>
 			selector?.Invoke(new IpRangePropertyDescriptor<T>());
@@ -79,104 +45,176 @@ public IProperty IpRange(Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> se
 		public IProperty Join(Func<JoinPropertyDescriptor<T>, IJoinProperty> selector) =>
 			selector?.Invoke(new JoinPropertyDescriptor<T>());
 
+		public IProperty Keyword(Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector) =>
+			selector?.Invoke(new KeywordPropertyDescriptor<T>());
+
+		public IProperty LongRange(Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector) =>
+			selector?.Invoke(new LongRangePropertyDescriptor<T>());
+
+		public IProperty Murmur3Hash(Func<Murmur3HashPropertyDescriptor<T>, IMurmur3HashProperty> selector) =>
+			selector?.Invoke(new Murmur3HashPropertyDescriptor<T>());
+
+		public IProperty Nested<TChild>(Func<NestedPropertyDescriptor<T, TChild>, INestedProperty> selector)
+			where TChild : class => selector?.Invoke(new NestedPropertyDescriptor<T, TChild>());
+
+		/// <summary>
+		/// Number introduces a numeric mapping that defaults to `float` use .Type() to set the right type if needed or use
+		/// Scalar instead of <see cref="Number" />
+		/// </summary>
+		public IProperty Number(Func<NumberPropertyDescriptor<T>, INumberProperty> selector) =>
+			selector?.Invoke(new NumberPropertyDescriptor<T>());
+
+		public IProperty Object<TChild>(Func<ObjectTypeDescriptor<T, TChild>, IObjectProperty> selector)
+			where TChild : class => selector?.Invoke(new ObjectTypeDescriptor<T, TChild>());
+
+		public IProperty Percolator(Func<PercolatorPropertyDescriptor<T>, IPercolatorProperty> selector) =>
+			selector?.Invoke(new PercolatorPropertyDescriptor<T>());
+
+		public IProperty Text(Func<TextPropertyDescriptor<T>, ITextProperty> selector) =>
+			selector?.Invoke(new TextPropertyDescriptor<T>());
+
+		public IProperty TokenCount(Func<TokenCountPropertyDescriptor<T>, ITokenCountProperty> selector) =>
+			selector?.Invoke(new TokenCountPropertyDescriptor<T>());
+
+		public IProperty Generic(Func<GenericPropertyDescriptor<T>, IGenericProperty> selector) =>
+			selector?.Invoke(new GenericPropertyDescriptor<T>());
+
 #pragma warning disable CS3001 // Argument type is not CLS-compliant
 		public IProperty Scalar(Expression<Func<T, int>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<int>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
-				selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer));
+			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer));
+
 		public IProperty Scalar(Expression<Func<T, int?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<int?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer));
 
 		public IProperty Scalar(Expression<Func<T, float>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Float));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<float>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Float));
+
 		public IProperty Scalar(Expression<Func<T, float?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Float));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<float?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Float));
 
 		public IProperty Scalar(Expression<Func<T, sbyte>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Byte));
+
 		public IProperty Scalar(Expression<Func<T, sbyte?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Byte));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<sbyte>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Byte));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<sbyte?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Byte));
 
 		public IProperty Scalar(Expression<Func<T, short>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short));
+
 		public IProperty Scalar(Expression<Func<T, short?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<short>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<short?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short));
 
 		public IProperty Scalar(Expression<Func<T, byte>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short));
+
 		public IProperty Scalar(Expression<Func<T, byte?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<byte>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<byte?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short));
 
 		public IProperty Scalar(Expression<Func<T, long>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
+
 		public IProperty Scalar(Expression<Func<T, long?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<long>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<long?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
 
 		public IProperty Scalar(Expression<Func<T, uint>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
+
 		public IProperty Scalar(Expression<Func<T, uint?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<uint>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<uint?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
 
 		public IProperty Scalar(Expression<Func<T, TimeSpan>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
+
 		public IProperty Scalar(Expression<Func<T, TimeSpan?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<TimeSpan>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<TimeSpan>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<TimeSpan?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<TimeSpan?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long));
 
 		public IProperty Scalar(Expression<Func<T, decimal>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
+
 		public IProperty Scalar(Expression<Func<T, decimal?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<decimal>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<decimal>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<decimal?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<decimal?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
 
 		public IProperty Scalar(Expression<Func<T, ulong>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
+
 		public IProperty Scalar(Expression<Func<T, ulong?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<ulong>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<ulong?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
 
 		public IProperty Scalar(Expression<Func<T, double>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
+
 		public IProperty Scalar(Expression<Func<T, double?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<double>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<double?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<double?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double));
 
 		public IProperty Scalar(Expression<Func<T, Enum>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
@@ -184,64 +222,94 @@ public IProperty Scalar(Expression<Func<T, Enum>> field, Func<NumberPropertyDesc
 
 		public IProperty Scalar(Expression<Func<T, DateTime>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
 			selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, DateTime?>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
 			selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<DateTime>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
 			selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<DateTime?>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
 			selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field));
 
 		public IProperty Scalar(Expression<Func<T, DateTimeOffset>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
 			selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, DateTimeOffset?>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
 			selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<DateTimeOffset>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<DateTimeOffset>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<DateTimeOffset?>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<DateTimeOffset?>>> field,
+			Func<DatePropertyDescriptor<T>, IDateProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field));
 
 		public IProperty Scalar(Expression<Func<T, bool>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null) =>
 			selector.InvokeOrDefault(new BooleanPropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, bool?>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null) =>
 			selector.InvokeOrDefault(new BooleanPropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<bool>>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null) =>
 			selector.InvokeOrDefault(new BooleanPropertyDescriptor<T>().Name(field));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<bool?>>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<bool?>>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new BooleanPropertyDescriptor<T>().Name(field));
 
 		public IProperty Scalar(Expression<Func<T, char>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
 			selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, char?>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
 			selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<char>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
 			selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<char?>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<char?>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field));
 
 		public IProperty Scalar(Expression<Func<T, Guid>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
 			selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, Guid?>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
 			selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<Guid>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
 			selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field));
-		public IProperty Scalar(Expression<Func<T, IEnumerable<Guid?>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IEnumerable<Guid?>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field));
 
 		public IProperty Scalar(Expression<Func<T, string>> field, Func<TextPropertyDescriptor<T>, ITextProperty> selector = null) =>
 			selector.InvokeOrDefault(new TextPropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, IEnumerable<string>>> field, Func<TextPropertyDescriptor<T>, ITextProperty> selector = null) =>
 			selector.InvokeOrDefault(new TextPropertyDescriptor<T>().Name(field));
 
 		public IProperty Scalar(Expression<Func<T, DateRange>> field, Func<DateRangePropertyDescriptor<T>, IDateRangeProperty> selector = null) =>
 			selector.InvokeOrDefault(new DateRangePropertyDescriptor<T>().Name(field));
-		public IProperty Scalar(Expression<Func<T, DoubleRange>> field, Func<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, DoubleRange>> field, Func<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new DoubleRangePropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, LongRange>> field, Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector = null) =>
 			selector.InvokeOrDefault(new LongRangePropertyDescriptor<T>().Name(field));
-		public IProperty Scalar(Expression<Func<T, IntegerRange>> field, Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector = null) =>
+
+		public IProperty Scalar(Expression<Func<T, IntegerRange>> field,
+			Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector = null
+		) =>
 			selector.InvokeOrDefault(new IntegerRangePropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, FloatRange>> field, Func<FloatRangePropertyDescriptor<T>, IFloatRangeProperty> selector = null) =>
 			selector.InvokeOrDefault(new FloatRangePropertyDescriptor<T>().Name(field));
+
 		public IProperty Scalar(Expression<Func<T, IpAddressRange>> field, Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> selector = null) =>
 			selector.InvokeOrDefault(new IpRangePropertyDescriptor<T>().Name(field));
 #pragma warning restore CS3001 // Argument type is not CLS-compliant
diff --git a/src/Nest/Mapping/FieldIndexOption.cs b/src/Nest/Mapping/FieldIndexOption.cs
index a82305a259c..2b88c6a7cf5 100644
--- a/src/Nest/Mapping/FieldIndexOption.cs
+++ b/src/Nest/Mapping/FieldIndexOption.cs
@@ -9,8 +9,10 @@ public enum FieldIndexOption
 	{
 		[EnumMember(Value = "analyzed")]
 		Analyzed,
+
 		[EnumMember(Value = "not_analyzed")]
 		NotAnalyzed,
+
 		[EnumMember(Value = "no")]
 		No
 	}
diff --git a/src/Nest/Mapping/Mappings.cs b/src/Nest/Mapping/Mappings.cs
index b0c9978c777..40c5253876f 100644
--- a/src/Nest/Mapping/Mappings.cs
+++ b/src/Nest/Mapping/Mappings.cs
@@ -10,25 +10,27 @@ public interface IMappings : IIsADictionary<TypeName, ITypeMapping> { }
 
 	public class Mappings : IsADictionaryBase<TypeName, ITypeMapping>, IMappings
 	{
-		public Mappings() {}
+		public Mappings() { }
+
 		public Mappings(IDictionary<TypeName, ITypeMapping> container) : base(container) { }
+
 		public Mappings(Dictionary<TypeName, ITypeMapping> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		public void Add(TypeName type, ITypeMapping mapping) => BackingDictionary.Add(type, mapping);
 	}
 
-	public class MappingsDescriptor : IsADictionaryDescriptorBase<MappingsDescriptor,IMappings, TypeName, ITypeMapping>
+	public class MappingsDescriptor : IsADictionaryDescriptorBase<MappingsDescriptor, IMappings, TypeName, ITypeMapping>
 	{
 		public MappingsDescriptor() : base(new Mappings()) { }
+
 		internal MappingsDescriptor(IMappings mappings) : base(mappings) { }
 
-		protected MultipleMappingsDescriptor AssignMap(IPromise<IMappings> d)  =>
+		protected MultipleMappingsDescriptor AssignMap(IPromise<IMappings> d) =>
 			new MultipleMappingsDescriptor(d.Value);
 
 		public virtual MultipleMappingsDescriptor Map<T>(Func<TypeMappingDescriptor<T>, ITypeMapping> selector) where T : class =>
-			AssignMap(Assign(typeof (T), selector?.Invoke(new TypeMappingDescriptor<T>())));
+			AssignMap(Assign(typeof(T), selector?.Invoke(new TypeMappingDescriptor<T>())));
 
 		public virtual MultipleMappingsDescriptor Map<T>(TypeName name, Func<TypeMappingDescriptor<T>, ITypeMapping> selector) where T : class =>
 			AssignMap(Assign(name, selector?.Invoke(new TypeMappingDescriptor<T>())));
@@ -40,7 +42,6 @@ public virtual MultipleMappingsDescriptor Map(TypeName name, Func<TypeMappingDes
 	public class MultipleMappingsDescriptor : MappingsDescriptor
 	{
 		internal MultipleMappingsDescriptor(IMappings mappings) : base(mappings) { }
-
 #pragma warning disable 0809
 		[Obsolete("Mapping multiple types is no longer supported on indices created in Elasticsearch 6.x and up")]
 		public override MultipleMappingsDescriptor Map<T>(Func<TypeMappingDescriptor<T>, ITypeMapping> selector) =>
@@ -53,7 +54,5 @@ public override MultipleMappingsDescriptor Map<T>(TypeName name, Func<TypeMappin
 		[Obsolete("Mapping multiple types is no longer supported on indices created in Elasticsearch 6.x and up")]
 		public override MultipleMappingsDescriptor Map(TypeName name, Func<TypeMappingDescriptor<object>, ITypeMapping> selector) =>
 			AssignMap(Assign(name, selector?.Invoke(new TypeMappingDescriptor<object>())));
-
 	}
-
 }
diff --git a/src/Nest/Mapping/MetaFields/All/AllField.cs b/src/Nest/Mapping/MetaFields/All/AllField.cs
index c78abe3312b..7a035f38c08 100644
--- a/src/Nest/Mapping/MetaFields/All/AllField.cs
+++ b/src/Nest/Mapping/MetaFields/All/AllField.cs
@@ -5,66 +5,65 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<AllField>))]
 	public interface IAllField : IFieldMapping
 	{
+		[JsonProperty("analyzer")]
+		string Analyzer { get; set; }
+
 		[JsonProperty("enabled")]
 		bool? Enabled { get; set; }
 
+		[JsonProperty("omit_norms")]
+		bool? OmitNorms { get; set; }
+
+		[JsonProperty("search_analyzer")]
+		string SearchAnalyzer { get; set; }
+
+		[JsonProperty("similarity")]
+		string Similarity { get; set; }
+
 		[JsonProperty("store")]
 		bool? Store { get; set; }
 
-		[JsonProperty("store_term_vectors")]
-		bool? StoreTermVectors { get; set; }
-
 		[JsonProperty("store_term_vector_offsets")]
 		bool? StoreTermVectorOffsets { get; set; }
 
-		[JsonProperty("store_term_vector_positions")]
-		bool? StoreTermVectorPositions { get; set; }
-
 		[JsonProperty("store_term_vector_payloads")]
 		bool? StoreTermVectorPayloads { get; set; }
 
-		[JsonProperty("omit_norms")]
-		bool? OmitNorms { get; set; }
-
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
-
-		[JsonProperty("search_analyzer")]
-		string SearchAnalyzer { get; set; }
-
-		[JsonProperty("similarity")]
-		string Similarity { get; set; }
+		[JsonProperty("store_term_vector_positions")]
+		bool? StoreTermVectorPositions { get; set; }
 
+		[JsonProperty("store_term_vectors")]
+		bool? StoreTermVectors { get; set; }
 	}
 
 	public class AllField : IAllField
 	{
+		public string Analyzer { get; set; }
 		public bool? Enabled { get; set; }
-		public bool? Store { get; set; }
-		public bool? StoreTermVectors { get; set; }
-		public bool? StoreTermVectorOffsets { get; set; }
-		public bool? StoreTermVectorPositions { get; set; }
-		public bool? StoreTermVectorPayloads { get; set; }
 		public bool? OmitNorms { get; set; }
-		public string Analyzer { get; set; }
 		public string SearchAnalyzer { get; set; }
 		public string Similarity { get; set; }
+		public bool? Store { get; set; }
+		public bool? StoreTermVectorOffsets { get; set; }
+		public bool? StoreTermVectorPayloads { get; set; }
+		public bool? StoreTermVectorPositions { get; set; }
+		public bool? StoreTermVectors { get; set; }
 	}
 
 	//OBSOLETE
 	public class AllFieldDescriptor
 		: DescriptorBase<AllFieldDescriptor, IAllField>, IAllField
 	{
+		string IAllField.Analyzer { get; set; }
 		bool? IAllField.Enabled { get; set; }
-		bool? IAllField.Store { get; set; }
-		bool? IAllField.StoreTermVectors { get; set; }
-		bool? IAllField.StoreTermVectorOffsets { get; set; }
-		bool? IAllField.StoreTermVectorPositions { get; set; }
-		bool? IAllField.StoreTermVectorPayloads { get; set; }
 		bool? IAllField.OmitNorms { get; set; }
-		string IAllField.Analyzer { get; set; }
 		string IAllField.SearchAnalyzer { get; set; }
 		string IAllField.Similarity { get; set; }
+		bool? IAllField.Store { get; set; }
+		bool? IAllField.StoreTermVectorOffsets { get; set; }
+		bool? IAllField.StoreTermVectorPayloads { get; set; }
+		bool? IAllField.StoreTermVectorPositions { get; set; }
+		bool? IAllField.StoreTermVectors { get; set; }
 
 		public AllFieldDescriptor Enabled(bool? enabled = true) => Assign(a => a.Enabled = enabled);
 
diff --git a/src/Nest/Mapping/MetaFields/FieldNames/FieldNamesField.cs b/src/Nest/Mapping/MetaFields/FieldNames/FieldNamesField.cs
index 7db4a988037..ee24e8fd6ba 100644
--- a/src/Nest/Mapping/MetaFields/FieldNames/FieldNamesField.cs
+++ b/src/Nest/Mapping/MetaFields/FieldNames/FieldNamesField.cs
@@ -17,7 +17,7 @@ public class FieldNamesField : IFieldNamesField
 	public class FieldNamesFieldDescriptor<T>
 		: DescriptorBase<FieldNamesFieldDescriptor<T>, IFieldNamesField>, IFieldNamesField
 	{
-		bool? IFieldNamesField.Enabled { get; set;}
+		bool? IFieldNamesField.Enabled { get; set; }
 
 		public FieldNamesFieldDescriptor<T> Enabled(bool? enabled = true) => Assign(a => a.Enabled = enabled);
 	}
diff --git a/src/Nest/Mapping/MetaFields/Routing/RoutingField.cs b/src/Nest/Mapping/MetaFields/Routing/RoutingField.cs
index d8ae3e2cf8b..d2d10b30b77 100644
--- a/src/Nest/Mapping/MetaFields/Routing/RoutingField.cs
+++ b/src/Nest/Mapping/MetaFields/Routing/RoutingField.cs
@@ -17,7 +17,7 @@ public class RoutingField : IRoutingField
 	public class RoutingFieldDescriptor<T>
 		: DescriptorBase<RoutingFieldDescriptor<T>, IRoutingField>, IRoutingField
 	{
-		bool? IRoutingField.Required { get; set;}
+		bool? IRoutingField.Required { get; set; }
 
 		public RoutingFieldDescriptor<T> Required(bool? required = true) => Assign(a => a.Required = required);
 	}
diff --git a/src/Nest/Mapping/MetaFields/Source/SourceField.cs b/src/Nest/Mapping/MetaFields/Source/SourceField.cs
index c7cff7a2d8a..180b09e7fd3 100644
--- a/src/Nest/Mapping/MetaFields/Source/SourceField.cs
+++ b/src/Nest/Mapping/MetaFields/Source/SourceField.cs
@@ -6,49 +6,53 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SourceField>))]
 	public interface ISourceField : IFieldMapping
 	{
-		[JsonProperty("enabled")]
-		bool? Enabled { get; set; }
-
 		[JsonProperty("compress")]
 		bool? Compress { get; set; }
 
 		[JsonProperty("compress_threshold")]
 		string CompressThreshold { get; set; }
 
-		[JsonProperty("includes")]
-		IEnumerable<string> Includes { get; set; }
+		[JsonProperty("enabled")]
+		bool? Enabled { get; set; }
 
 		[JsonProperty("excludes")]
 		IEnumerable<string> Excludes { get; set; }
+
+		[JsonProperty("includes")]
+		IEnumerable<string> Includes { get; set; }
 	}
 
 	public class SourceField : ISourceField
 	{
-		public bool? Enabled { get; set; }
 		public bool? Compress { get; set; }
 		public string CompressThreshold { get; set; }
-		public IEnumerable<string> Includes { get; set; }
+		public bool? Enabled { get; set; }
 		public IEnumerable<string> Excludes { get; set; }
+		public IEnumerable<string> Includes { get; set; }
 	}
 
 	public class SourceFieldDescriptor
 		: DescriptorBase<SourceFieldDescriptor, ISourceField>, ISourceField
 	{
-        bool? ISourceField.Enabled { get; set; }
 		bool? ISourceField.Compress { get; set; }
 		string ISourceField.CompressThreshold { get; set; }
-		IEnumerable<string> ISourceField.Includes { get; set; }
+		bool? ISourceField.Enabled { get; set; }
 		IEnumerable<string> ISourceField.Excludes { get; set; }
+		IEnumerable<string> ISourceField.Includes { get; set; }
 
 		public SourceFieldDescriptor Enabled(bool? enabled = true) => Assign(a => a.Enabled = enabled);
 
 		public SourceFieldDescriptor Compress(bool? compress = true) => Assign(a => a.Compress = compress);
 
 		public SourceFieldDescriptor CompressionThreshold(string compressionThreshold) =>
-			Assign(a => { a.Compress = true; a.CompressThreshold = compressionThreshold; });
+			Assign(a =>
+			{
+				a.Compress = true;
+				a.CompressThreshold = compressionThreshold;
+			});
 
 		public SourceFieldDescriptor Includes(IEnumerable<string> includes) => Assign(a => a.Includes = includes);
 
 		public SourceFieldDescriptor Excludes(IEnumerable<string> excludes) => Assign(a => a.Excludes = excludes);
-    }
+	}
 }
diff --git a/src/Nest/Mapping/PropertyMapping.cs b/src/Nest/Mapping/PropertyMapping.cs
index e1a737a536f..f8b95549142 100644
--- a/src/Nest/Mapping/PropertyMapping.cs
+++ b/src/Nest/Mapping/PropertyMapping.cs
@@ -4,7 +4,6 @@
 
 namespace Nest
 {
-
 	public class PropertyMappingDescriptor<TDocument> : DescriptorBase<PropertyMappingDescriptor<TDocument>, IDescriptor>
 		where TDocument : class
 	{
@@ -14,16 +13,15 @@ public PropertyMappingDescriptor<TDocument> PropertyName(Expression<Func<TDocume
 		{
 			property.ThrowIfNull(nameof(property));
 			field.ThrowIfNullOrEmpty(nameof(field));
-			this.Mappings.Add(new RenameClrPropertyMapping<TDocument>(property, field));
+			Mappings.Add(new RenameClrPropertyMapping<TDocument>(property, field));
 			return this;
 		}
 
 		public PropertyMappingDescriptor<TDocument> Ignore(Expression<Func<TDocument, object>> property)
 		{
 			property.ThrowIfNull(nameof(property));
-			this.Mappings.Add(new IgnoreClrPropertyMapping<TDocument>(property));
+			Mappings.Add(new IgnoreClrPropertyMapping<TDocument>(property));
 			return this;
 		}
 	}
-
 }
diff --git a/src/Nest/Mapping/SimilarityOption.cs b/src/Nest/Mapping/SimilarityOption.cs
index 3b5bccb5245..e42d75bac79 100644
--- a/src/Nest/Mapping/SimilarityOption.cs
+++ b/src/Nest/Mapping/SimilarityOption.cs
@@ -9,6 +9,7 @@ public enum SimilarityOption
 	{
 		[EnumMember(Value = "classic")]
 		Classic,
+
 		[EnumMember(Value = "BM25")]
 		BM25
 	}
diff --git a/src/Nest/Mapping/TermVectorOption.cs b/src/Nest/Mapping/TermVectorOption.cs
index c2e809d0c25..30b1927dbf2 100644
--- a/src/Nest/Mapping/TermVectorOption.cs
+++ b/src/Nest/Mapping/TermVectorOption.cs
@@ -9,15 +9,20 @@ public enum TermVectorOption
 	{
 		[EnumMember(Value = "no")]
 		No,
+
 		[EnumMember(Value = "yes")]
 		Yes,
+
 		[EnumMember(Value = "with_offsets")]
 		WithOffsets,
+
 		[EnumMember(Value = "with_positions")]
 		WithPositions,
+
 		[EnumMember(Value = "with_positions_offsets")]
 		WithPositionsOffsets,
+
 		[EnumMember(Value = "with_positions_offsets_payloads")]
-        WithPositionsOffsetsPayloads
+		WithPositionsOffsetsPayloads
 	}
 }
diff --git a/src/Nest/Mapping/TypeMapping.cs b/src/Nest/Mapping/TypeMapping.cs
index 843e8aef6de..284e53f186c 100644
--- a/src/Nest/Mapping/TypeMapping.cs
+++ b/src/Nest/Mapping/TypeMapping.cs
@@ -8,74 +8,86 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<TypeMapping>))]
 	public interface ITypeMapping
 	{
-		[JsonProperty("dynamic_date_formats")]
-		IEnumerable<string> DynamicDateFormats { get; set; }
+		[JsonProperty("_all")]
+		IAllField AllField { get; set; }
 
 		[JsonProperty("date_detection")]
 		bool? DateDetection { get; set; }
 
-		[JsonProperty("numeric_detection")]
-		bool? NumericDetection { get; set; }
+		[JsonProperty("dynamic")]
+		Union<bool, DynamicMapping> Dynamic { get; set; }
 
-		[JsonProperty("_source")]
-		ISourceField SourceField { get; set; }
+		[JsonProperty("dynamic_date_formats")]
+		IEnumerable<string> DynamicDateFormats { get; set; }
 
-		[JsonProperty("_all")]
-		IAllField AllField { get; set; }
+		[JsonProperty("dynamic_templates")]
+		IDynamicTemplateContainer DynamicTemplates { get; set; }
 
-		[JsonProperty("_routing")]
-		IRoutingField RoutingField { get; set; }
+		[JsonProperty("_field_names")]
+		IFieldNamesField FieldNamesField { get; set; }
 
 		[JsonProperty("_index")]
 		IIndexField IndexField { get; set; }
 
-		[JsonProperty("_size")]
-		ISizeField SizeField { get; set; }
-
-		[JsonProperty("_field_names")]
-		IFieldNamesField FieldNamesField { get; set; }
-
 		[JsonProperty("_meta")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		IDictionary<string, object> Meta { get; set; }
 
-		[JsonProperty("dynamic_templates")]
-		IDynamicTemplateContainer DynamicTemplates { get; set; }
-
-		[JsonProperty("dynamic")]
-		Union<bool, DynamicMapping> Dynamic { get; set; }
+		[JsonProperty("numeric_detection")]
+		bool? NumericDetection { get; set; }
 
 		[JsonProperty("properties", TypeNameHandling = TypeNameHandling.None)]
 		IProperties Properties { get; set; }
+
+		[JsonProperty("_routing")]
+		IRoutingField RoutingField { get; set; }
+
+		[JsonProperty("_size")]
+		ISizeField SizeField { get; set; }
+
+		[JsonProperty("_source")]
+		ISourceField SourceField { get; set; }
 	}
 
 	public class TypeMapping : ITypeMapping
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAllField AllField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public bool? DateDetection { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public Union<bool, DynamicMapping> Dynamic { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IEnumerable<string> DynamicDateFormats { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IDynamicTemplateContainer DynamicTemplates { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IFieldNamesField FieldNamesField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IIndexField IndexField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IDictionary<string, object> Meta { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public bool? NumericDetection { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IProperties Properties { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IRoutingField RoutingField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public ISizeField SizeField { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public ISourceField SourceField { get; set; }
 	}
 
@@ -98,7 +110,7 @@ public class TypeMappingDescriptor<T> : DescriptorBase<TypeMappingDescriptor<T>,
 		ISourceField ITypeMapping.SourceField { get; set; }
 
 		/// <summary>
-		/// Convenience method to map as much as it can based on <see cref="ElasticsearchTypeAttribute"/> attributes set on the type.
+		/// Convenience method to map as much as it can based on <see cref="ElasticsearchTypeAttribute" /> attributes set on the type.
 		/// <pre>This method also automatically sets up mappings for known values types (int, long, double, datetime, etc)</pre>
 		/// <pre>Class types default to object and Enums to int</pre>
 		/// <pre>Later calls can override whatever is set is by this call.</pre>
@@ -107,7 +119,7 @@ public TypeMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int max
 			Assign(a => a.Properties = a.Properties.AutoMap<T>(visitor, maxRecursion));
 
 		/// <summary>
-		/// Convenience method to map as much as it can based on <see cref="ElasticsearchTypeAttribute"/> attributes set on the type.
+		/// Convenience method to map as much as it can based on <see cref="ElasticsearchTypeAttribute" /> attributes set on the type.
 		/// This particular overload is useful for automapping any children
 		/// <pre>This method also automatically sets up mappings for known values types (int, long, double, datetime, etc)</pre>
 		/// <pre>Class types default to object and Enums to int</pre>
@@ -116,11 +128,12 @@ public TypeMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int max
 		public TypeMappingDescriptor<T> AutoMap(Type documentType, IPropertyVisitor visitor = null, int maxRecursion = 0)
 		{
 			if (!documentType.IsClass()) throw new ArgumentException("must be a reference type", nameof(documentType));
+
 			return Assign(a => a.Properties = a.Properties.AutoMap(documentType, visitor, maxRecursion));
 		}
 
 		/// <summary>
-		/// Convenience method to map as much as it can based on <see cref="ElasticsearchTypeAttribute"/> attributes set on the type.
+		/// Convenience method to map as much as it can based on <see cref="ElasticsearchTypeAttribute" /> attributes set on the type.
 		/// This particular overload is useful for automapping any children
 		/// <pre>This method also automatically sets up mappings for known values types (int, long, double, datetime, etc)</pre>
 		/// <pre>Class types default to object and Enums to int</pre>
@@ -130,53 +143,60 @@ public TypeMappingDescriptor<T> AutoMap<TDocument>(IPropertyVisitor visitor = nu
 			where TDocument : class =>
 			Assign(a => a.Properties = a.Properties.AutoMap<TDocument>(visitor, maxRecursion));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> AutoMap(int maxRecursion) => AutoMap(null, maxRecursion);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> Dynamic(Union<bool, DynamicMapping> dynamic) => Assign(a => a.Dynamic = dynamic);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> Dynamic(bool dynamic = true) => Assign(a => a.Dynamic = dynamic);
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> AllField(Func<AllFieldDescriptor, IAllField> allFieldSelector) => Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
+		/// <inheritdoc />
+		public TypeMappingDescriptor<T> AllField(Func<AllFieldDescriptor, IAllField> allFieldSelector) =>
+			Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> IndexField(Func<IndexFieldDescriptor, IIndexField> indexFieldSelector) => Assign(a => a.IndexField = indexFieldSelector?.Invoke(new IndexFieldDescriptor()));
+		/// <inheritdoc />
+		public TypeMappingDescriptor<T> IndexField(Func<IndexFieldDescriptor, IIndexField> indexFieldSelector) =>
+			Assign(a => a.IndexField = indexFieldSelector?.Invoke(new IndexFieldDescriptor()));
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, ISizeField> sizeFieldSelector) => Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
+		/// <inheritdoc />
+		public TypeMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, ISizeField> sizeFieldSelector) =>
+			Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
+		/// <inheritdoc />
+		public TypeMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) =>
+			Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> DisableSizeField(bool? disabled = true) => Assign(a => a.SizeField = new SizeField { Enabled = !disabled });
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> DisableIndexField(bool? disabled = true) => Assign(a => a.IndexField = new IndexField { Enabled = !disabled });
+		/// <inheritdoc />
+		public TypeMappingDescriptor<T> DisableIndexField(bool? disabled = true) =>
+			Assign(a => a.IndexField = new IndexField { Enabled = !disabled });
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> DynamicDateFormats(IEnumerable<string> dateFormats) => Assign(a => a.DynamicDateFormats = dateFormats);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> DateDetection(bool? detect = true) => Assign(a => a.DateDetection = detect);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> NumericDetection(bool? detect = true) => Assign(a => a.NumericDetection = detect);
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
+		/// <inheritdoc />
+		public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) =>
+			Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
+		/// <inheritdoc />
+		public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) =>
+			Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> metaSelector) =>
 			Assign(a => a.Meta = metaSelector(new FluentDictionary<string, object>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TypeMappingDescriptor<T> Meta(Dictionary<string, object> metaDictionary) => Assign(a => a.Meta = metaDictionary);
 
 		public TypeMappingDescriptor<T> Properties(Func<PropertiesDescriptor<T>, IPromise<IProperties>> propertiesSelector) =>
@@ -186,8 +206,10 @@ public TypeMappingDescriptor<T> Properties<TDocument>(Func<PropertiesDescriptor<
 			where TDocument : class =>
 			Assign(a => a.Properties = propertiesSelector?.Invoke(new PropertiesDescriptor<TDocument>(Self.Properties))?.Value);
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> DynamicTemplates(Func<DynamicTemplateContainerDescriptor<T>, IPromise<IDynamicTemplateContainer>> dynamicTemplatesSelector) =>
+		/// <inheritdoc />
+		public TypeMappingDescriptor<T> DynamicTemplates(
+			Func<DynamicTemplateContainerDescriptor<T>, IPromise<IDynamicTemplateContainer>> dynamicTemplatesSelector
+		) =>
 			Assign(a => a.DynamicTemplates = dynamicTemplatesSelector?.Invoke(new DynamicTemplateContainerDescriptor<T>())?.Value);
 	}
 }
diff --git a/src/Nest/Mapping/Types/Complex/Nested/NestedAttribute.cs b/src/Nest/Mapping/Types/Complex/Nested/NestedAttribute.cs
index dbc59435297..03bcf904e76 100644
--- a/src/Nest/Mapping/Types/Complex/Nested/NestedAttribute.cs
+++ b/src/Nest/Mapping/Types/Complex/Nested/NestedAttribute.cs
@@ -2,14 +2,22 @@
 {
 	public class NestedAttribute : ObjectAttribute, INestedProperty
 	{
-		private INestedProperty Self => this;
+		public NestedAttribute() : base(FieldType.Nested) { }
 
-		bool? INestedProperty.IncludeInParent { get; set; }
-	 	bool? INestedProperty.IncludeInRoot { get; set; }
+		public bool IncludeInParent
+		{
+			get => Self.IncludeInParent.GetValueOrDefault();
+			set => Self.IncludeInParent = value;
+		}
 
-		public bool IncludeInParent { get => Self.IncludeInParent.GetValueOrDefault(); set => Self.IncludeInParent = value; }
-		public bool IncludeInRoot { get => Self.IncludeInRoot.GetValueOrDefault(); set => Self.IncludeInRoot = value; }
+		public bool IncludeInRoot
+		{
+			get => Self.IncludeInRoot.GetValueOrDefault();
+			set => Self.IncludeInRoot = value;
+		}
 
-		public NestedAttribute() : base(FieldType.Nested) { }
+		bool? INestedProperty.IncludeInParent { get; set; }
+		bool? INestedProperty.IncludeInRoot { get; set; }
+		private INestedProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Complex/Nested/NestedProperty.cs b/src/Nest/Mapping/Types/Complex/Nested/NestedProperty.cs
index c04262bc344..1d5d4e97bf5 100644
--- a/src/Nest/Mapping/Types/Complex/Nested/NestedProperty.cs
+++ b/src/Nest/Mapping/Types/Complex/Nested/NestedProperty.cs
@@ -25,15 +25,15 @@ public NestedProperty() : base(FieldType.Nested) { }
 	[DebuggerDisplay("{DebugDisplay}")]
 	public class NestedPropertyDescriptor<TParent, TChild>
 		: ObjectPropertyDescriptorBase<NestedPropertyDescriptor<TParent, TChild>, INestedProperty, TParent, TChild>
-		, INestedProperty
+			, INestedProperty
 		where TParent : class
 		where TChild : class
 	{
+		public NestedPropertyDescriptor() : base(FieldType.Nested) { }
+
 		bool? INestedProperty.IncludeInParent { get; set; }
 		bool? INestedProperty.IncludeInRoot { get; set; }
 
-		public NestedPropertyDescriptor() : base(FieldType.Nested) { }
-
 		public NestedPropertyDescriptor<TParent, TChild> IncludeInParent(bool? includeInParent = true) =>
 			Assign(a => a.IncludeInParent = includeInParent);
 
diff --git a/src/Nest/Mapping/Types/Complex/Object/ObjectAttribute.cs b/src/Nest/Mapping/Types/Complex/Object/ObjectAttribute.cs
index b282ff2847b..922c5f6b8ef 100644
--- a/src/Nest/Mapping/Types/Complex/Object/ObjectAttribute.cs
+++ b/src/Nest/Mapping/Types/Complex/Object/ObjectAttribute.cs
@@ -1,18 +1,20 @@
-using System;
-
-namespace Nest
+namespace Nest
 {
 	public class ObjectAttribute : ElasticsearchCorePropertyAttributeBase, IObjectProperty
 	{
-		private IObjectProperty Self => this;
-
 		public ObjectAttribute() : base(FieldType.Object) { }
+
 		protected ObjectAttribute(FieldType type) : base(type) { }
 
+		public bool Enabled
+		{
+			get => Self.Enabled.GetValueOrDefault();
+			set => Self.Enabled = value;
+		}
+
 		Union<bool, DynamicMapping> IObjectProperty.Dynamic { get; set; }
 		bool? IObjectProperty.Enabled { get; set; }
 		IProperties IObjectProperty.Properties { get; set; }
-
-		public bool Enabled { get => Self.Enabled.GetValueOrDefault(); set => Self.Enabled = value; }
+		private IObjectProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Complex/Object/ObjectProperty.cs b/src/Nest/Mapping/Types/Complex/Object/ObjectProperty.cs
index 0c3fbcbffee..93c5612f3b3 100644
--- a/src/Nest/Mapping/Types/Complex/Object/ObjectProperty.cs
+++ b/src/Nest/Mapping/Types/Complex/Object/ObjectProperty.cs
@@ -1,5 +1,4 @@
 using System;
-using Elasticsearch.Net;
 using System.Diagnostics;
 using Newtonsoft.Json;
 
@@ -43,8 +42,10 @@ protected ObjectProperty(FieldType type) : base(type) { }
 
 		/// <inheritdoc />
 		public Union<bool, DynamicMapping> Dynamic { get; set; }
+
 		/// <inheritdoc />
 		public bool? Enabled { get; set; }
+
 		/// <inheritdoc />
 		public IProperties Properties { get; set; }
 	}
@@ -53,9 +54,7 @@ protected ObjectProperty(FieldType type) : base(type) { }
 	public class ObjectTypeDescriptor<TParent, TChild>
 		: ObjectPropertyDescriptorBase<ObjectTypeDescriptor<TParent, TChild>, IObjectProperty, TParent, TChild>, IObjectProperty
 		where TParent : class
-		where TChild : class
-	{
-	}
+		where TChild : class { }
 
 	[DebuggerDisplay("{DebugDisplay}")]
 	public abstract class ObjectPropertyDescriptorBase<TDescriptor, TInterface, TParent, TChild>
@@ -65,17 +64,17 @@ public abstract class ObjectPropertyDescriptorBase<TDescriptor, TInterface, TPar
 		where TParent : class
 		where TChild : class
 	{
+		protected ObjectPropertyDescriptorBase() : this(FieldType.Object) { }
+
+		protected ObjectPropertyDescriptorBase(FieldType type) : base(type) =>
+			_TypeName = TypeName.Create<TChild>();
+
 		internal TypeName _TypeName { get; set; }
 
 		Union<bool, DynamicMapping> IObjectProperty.Dynamic { get; set; }
 		bool? IObjectProperty.Enabled { get; set; }
 		IProperties IObjectProperty.Properties { get; set; }
 
-		protected ObjectPropertyDescriptorBase() : this(FieldType.Object) { }
-
-		protected ObjectPropertyDescriptorBase(FieldType type) : base(type) =>
-			_TypeName = TypeName.Create<TChild>();
-
 		/// <summary>
 		/// Whether or not new properties should be added dynamically to an existing object.
 		/// Default is <c>true</c>
diff --git a/src/Nest/Mapping/Types/Core/Binary/BinaryProperty.cs b/src/Nest/Mapping/Types/Core/Binary/BinaryProperty.cs
index 258a83ff846..f7171171a8b 100644
--- a/src/Nest/Mapping/Types/Core/Binary/BinaryProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Binary/BinaryProperty.cs
@@ -4,9 +4,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
-	public interface IBinaryProperty : IDocValuesProperty
-	{
-	}
+	public interface IBinaryProperty : IDocValuesProperty { }
 
 	[DebuggerDisplay("{DebugDisplay}")]
 	public class BinaryProperty : DocValuesPropertyBase, IBinaryProperty
diff --git a/src/Nest/Mapping/Types/Core/Boolean/BooleanAttribute.cs b/src/Nest/Mapping/Types/Core/Boolean/BooleanAttribute.cs
index 05b752e2842..a0a720b3fa0 100644
--- a/src/Nest/Mapping/Types/Core/Boolean/BooleanAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Boolean/BooleanAttribute.cs
@@ -2,18 +2,31 @@
 {
 	public class BooleanAttribute : ElasticsearchDocValuesPropertyAttributeBase, IBooleanProperty
 	{
-		private IBooleanProperty Self => this;
-
 		public BooleanAttribute() : base(FieldType.Boolean) { }
 
-		bool? IBooleanProperty.Index { get; set; }
+		public double Boost
+		{
+			get => Self.Boost.GetValueOrDefault();
+			set => Self.Boost = value;
+		}
+
+		public bool Index
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
+
+		public bool NullValue
+		{
+			get => Self.NullValue.GetValueOrDefault();
+			set => Self.NullValue = value;
+		}
+
 		double? IBooleanProperty.Boost { get; set; }
-		bool? IBooleanProperty.NullValue { get; set; }
 		INumericFielddata IBooleanProperty.Fielddata { get; set; }
 
-		public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
-		public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
-		public bool NullValue { get { return Self.NullValue.GetValueOrDefault(); } set { Self.NullValue = value; } }
-
+		bool? IBooleanProperty.Index { get; set; }
+		bool? IBooleanProperty.NullValue { get; set; }
+		private IBooleanProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Boolean/BooleanProperty.cs b/src/Nest/Mapping/Types/Core/Boolean/BooleanProperty.cs
index c20e4d5ff1a..8be83fc9d1a 100644
--- a/src/Nest/Mapping/Types/Core/Boolean/BooleanProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Boolean/BooleanProperty.cs
@@ -7,17 +7,17 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IBooleanProperty : IDocValuesProperty
 	{
-		[JsonProperty("index")]
-		bool? Index { get; set; }
-
 		[JsonProperty("boost")]
 		double? Boost { get; set; }
 
-		[JsonProperty("null_value")]
-		bool? NullValue { get; set; }
-
 		[JsonProperty("fielddata")]
 		INumericFielddata Fielddata { get; set; }
+
+		[JsonProperty("index")]
+		bool? Index { get; set; }
+
+		[JsonProperty("null_value")]
+		bool? NullValue { get; set; }
 	}
 
 	[DebuggerDisplay("{DebugDisplay}")]
@@ -25,10 +25,11 @@ public class BooleanProperty : DocValuesPropertyBase, IBooleanProperty
 	{
 		public BooleanProperty() : base(FieldType.Boolean) { }
 
-		public bool? Index { get; set; }
 		public double? Boost { get; set; }
-		public bool? NullValue { get; set; }
 		public INumericFielddata Fielddata { get; set; }
+
+		public bool? Index { get; set; }
+		public bool? NullValue { get; set; }
 	}
 
 	[DebuggerDisplay("{DebugDisplay}")]
@@ -36,16 +37,19 @@ public class BooleanPropertyDescriptor<T>
 		: DocValuesPropertyDescriptorBase<BooleanPropertyDescriptor<T>, IBooleanProperty, T>, IBooleanProperty
 		where T : class
 	{
+		public BooleanPropertyDescriptor() : base(FieldType.Boolean) { }
+
 		double? IBooleanProperty.Boost { get; set; }
+		INumericFielddata IBooleanProperty.Fielddata { get; set; }
 		bool? IBooleanProperty.Index { get; set; }
 		bool? IBooleanProperty.NullValue { get; set; }
-		INumericFielddata IBooleanProperty.Fielddata { get; set; }
-
-		public BooleanPropertyDescriptor() : base(FieldType.Boolean) { }
 
 		public BooleanPropertyDescriptor<T> Boost(double? boost) => Assign(a => a.Boost = boost);
+
 		public BooleanPropertyDescriptor<T> Index(bool? index = true) => Assign(a => a.Index = index);
+
 		public BooleanPropertyDescriptor<T> NullValue(bool? nullValue) => Assign(a => a.NullValue = nullValue);
+
 		public BooleanPropertyDescriptor<T> Fielddata(Func<NumericFielddataDescriptor, INumericFielddata> selector) =>
 			Assign(a => a.Fielddata = selector(new NumericFielddataDescriptor()));
 	}
diff --git a/src/Nest/Mapping/Types/Core/Date/DateAttribute.cs b/src/Nest/Mapping/Types/Core/Date/DateAttribute.cs
index b8983fb0616..092bf253112 100644
--- a/src/Nest/Mapping/Types/Core/Date/DateAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Date/DateAttribute.cs
@@ -4,22 +4,45 @@ namespace Nest
 {
 	public class DateAttribute : ElasticsearchDocValuesPropertyAttributeBase, IDateProperty
 	{
-		private IDateProperty Self => this;
-
 		public DateAttribute() : base(FieldType.Date) { }
 
-		bool? IDateProperty.Index { get; set; }
+		public double Boost
+		{
+			get => Self.Boost.GetValueOrDefault();
+			set => Self.Boost = value;
+		}
+
+		public string Format
+		{
+			get => Self.Format;
+			set => Self.Format = value;
+		}
+
+		public bool IgnoreMalformed
+		{
+			get => Self.IgnoreMalformed.GetValueOrDefault();
+			set => Self.IgnoreMalformed = value;
+		}
+
+		public bool Index
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
+
+		public DateTime NullValue
+		{
+			get => Self.NullValue.GetValueOrDefault();
+			set => Self.NullValue = value;
+		}
+
 		double? IDateProperty.Boost { get; set; }
-		DateTime? IDateProperty.NullValue { get; set; }
-		bool? IDateProperty.IgnoreMalformed { get; set; }
-		string IDateProperty.Format { get; set; }
 		INumericFielddata IDateProperty.Fielddata { get; set; }
+		string IDateProperty.Format { get; set; }
+		bool? IDateProperty.IgnoreMalformed { get; set; }
 
-		public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
-		public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
-		public DateTime NullValue { get { return Self.NullValue.GetValueOrDefault(); } set { Self.NullValue = value; } }
-		public bool IgnoreMalformed { get { return Self.IgnoreMalformed.GetValueOrDefault(); } set { Self.IgnoreMalformed = value; } }
-		public string Format { get { return Self.Format; } set { Self.Format = value; } }
-
+		bool? IDateProperty.Index { get; set; }
+		DateTime? IDateProperty.NullValue { get; set; }
+		private IDateProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Date/DateProperty.cs b/src/Nest/Mapping/Types/Core/Date/DateProperty.cs
index 2faa8094449..e7d473067b1 100644
--- a/src/Nest/Mapping/Types/Core/Date/DateProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Date/DateProperty.cs
@@ -7,25 +7,21 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IDateProperty : IDocValuesProperty
 	{
-		/// <summary>
-		/// Should the field be searchable? Accepts true (default) and false.
-		/// </summary>
-		[JsonProperty("index")]
-		bool? Index { get; set; }
-
 		/// <summary>
 		/// Mapping field-level query time boosting. Accepts a floating point number, defaults to 1.0.
 		/// </summary>
 		[JsonProperty("boost")]
-        double? Boost { get; set; }
+		double? Boost { get; set; }
+
+		[JsonProperty("fielddata")]
+		INumericFielddata Fielddata { get; set; }
 
 		/// <summary>
-		/// Accepts a date value in one of the configured format's
-		/// as the field which is substituted for any explicit null values. Defaults to null,
-		/// which means the field is treated as missing.
+		/// The date format(s) that can be parsed. Defaults to strict_date_optional_time||epoch_millis.
+		/// <see cref="DateFormat" />
 		/// </summary>
-		[JsonProperty("null_value")]
-        DateTime? NullValue { get; set; }
+		[JsonProperty("format")]
+		string Format { get; set; }
 
 		/// <summary>
 		/// If true, malformed numbers are ignored. If false (default), malformed numbers throw an exception
@@ -35,14 +31,18 @@ public interface IDateProperty : IDocValuesProperty
 		bool? IgnoreMalformed { get; set; }
 
 		/// <summary>
-		/// The date format(s) that can be parsed. Defaults to strict_date_optional_time||epoch_millis.
-		/// <see cref="DateFormat"/>
+		/// Should the field be searchable? Accepts true (default) and false.
 		/// </summary>
-		[JsonProperty("format")]
-		string Format { get; set; }
+		[JsonProperty("index")]
+		bool? Index { get; set; }
 
-		[JsonProperty("fielddata")]
-		INumericFielddata Fielddata { get; set; }
+		/// <summary>
+		/// Accepts a date value in one of the configured format's
+		/// as the field which is substituted for any explicit null values. Defaults to null,
+		/// which means the field is treated as missing.
+		/// </summary>
+		[JsonProperty("null_value")]
+		DateTime? NullValue { get; set; }
 	}
 
 	[DebuggerDisplay("{DebugDisplay}")]
@@ -50,20 +50,26 @@ public class DateProperty : DocValuesPropertyBase, IDateProperty
 	{
 		public DateProperty() : base(FieldType.Date) { }
 
-		/// <inheritdoc/>
-		public bool? Index { get; set; }
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? Boost { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public INumericFielddata Fielddata { get; set; }
+
+		/// <inheritdoc />
+		public string Format { get; set; }
+
+		/// <inheritdoc />
+		public bool? IgnoreMalformed { get; set; }
+
+		/// <inheritdoc />
+		public bool? Index { get; set; }
+
+		/// <inheritdoc />
 		public DateTime? NullValue { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public int? PrecisionStep { get; set; }
-		/// <inheritdoc/>
-		public bool? IgnoreMalformed { get; set; }
-		/// <inheritdoc/>
-		public string Format { get; set; }
-		/// <inheritdoc/>
-		public INumericFielddata Fielddata { get; set; }
 	}
 
 	[DebuggerDisplay("{DebugDisplay}")]
@@ -71,26 +77,31 @@ public class DatePropertyDescriptor<T>
 		: DocValuesPropertyDescriptorBase<DatePropertyDescriptor<T>, IDateProperty, T>, IDateProperty
 		where T : class
 	{
-		bool? IDateProperty.Index { get; set; }
+		public DatePropertyDescriptor() : base(FieldType.Date) { }
+
 		double? IDateProperty.Boost { get; set; }
-		DateTime? IDateProperty.NullValue { get; set; }
-		bool? IDateProperty.IgnoreMalformed { get; set; }
-		string IDateProperty.Format { get; set; }
 		INumericFielddata IDateProperty.Fielddata { get; set; }
+		string IDateProperty.Format { get; set; }
+		bool? IDateProperty.IgnoreMalformed { get; set; }
+		bool? IDateProperty.Index { get; set; }
+		DateTime? IDateProperty.NullValue { get; set; }
 
-		public DatePropertyDescriptor() : base(FieldType.Date) { }
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DatePropertyDescriptor<T> Index(bool? index = true) => Assign(a => a.Index = index);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public DatePropertyDescriptor<T> Boost(double? boost) => Assign(a => a.Boost = boost);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public DatePropertyDescriptor<T> NullValue(DateTime? nullValue) => Assign(a => a.NullValue = nullValue);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public DatePropertyDescriptor<T> IgnoreMalformed(bool? ignoreMalformed = true) => Assign(a => a.IgnoreMalformed = ignoreMalformed);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public DatePropertyDescriptor<T> Format(string format) => Assign(a => a.Format = format);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public DatePropertyDescriptor<T> Fielddata(Func<NumericFielddataDescriptor, INumericFielddata> selector) =>
 			Assign(a => a.Fielddata = selector(new NumericFielddataDescriptor()));
 	}
diff --git a/src/Nest/Mapping/Types/Core/Join/Children.cs b/src/Nest/Mapping/Types/Core/Join/Children.cs
index c2c48e43637..c2a3892bfd8 100644
--- a/src/Nest/Mapping/Types/Core/Join/Children.cs
+++ b/src/Nest/Mapping/Types/Core/Join/Children.cs
@@ -1,9 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -14,20 +11,22 @@ public Children() { }
 
 		public Children(RelationName child, params RelationName[] moreChildren)
 		{
-			if (child != null) this.Add(child);
+			if (child != null) Add(child);
 			if (moreChildren == null || moreChildren.Length == 0) return;
-			this.AddRange(moreChildren);
+
+			AddRange(moreChildren);
 		}
 
 		public static implicit operator Children(RelationName child)
 		{
 			if (child == null) return null;
-			var children = new Children{child};
+
+			var children = new Children { child };
 			return children;
 		}
 
 		public static implicit operator Children(Type type) => type == null ? null : new Children { type };
+
 		public static implicit operator Children(string type) => type == null ? null : new Children { type };
 	}
-
 }
diff --git a/src/Nest/Mapping/Types/Core/Join/ChildrenJsonConverter.cs b/src/Nest/Mapping/Types/Core/Join/ChildrenJsonConverter.cs
index 9984f6a0fa5..1232aa96968 100644
--- a/src/Nest/Mapping/Types/Core/Join/ChildrenJsonConverter.cs
+++ b/src/Nest/Mapping/Types/Core/Join/ChildrenJsonConverter.cs
@@ -26,7 +26,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				return;
 			}
 			writer.WriteStartArray();
-			foreach(var r in resolved)
+			foreach (var r in resolved)
 				writer.WriteValue(r.GetString(settings));
 			writer.WriteEndArray();
 		}
@@ -41,6 +41,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				return c;
 			}
 			if (reader.TokenType != JsonToken.StartArray) return null;
+
 			var types = new List<RelationName> { };
 			while (reader.TokenType != JsonToken.EndArray)
 			{
@@ -51,6 +52,5 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			c.AddRange(types);
 			return c;
 		}
-
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Join/JoinAttribute.cs b/src/Nest/Mapping/Types/Core/Join/JoinAttribute.cs
index 4b4226ae7a6..cf890ae9b24 100644
--- a/src/Nest/Mapping/Types/Core/Join/JoinAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Join/JoinAttribute.cs
@@ -7,27 +7,25 @@ namespace Nest
 {
 	public class JoinAttribute : ElasticsearchPropertyAttributeBase, IJoinProperty
 	{
-		public JoinAttribute(RelationName parent, RelationName child, params RelationName[] moreChildren) : base(FieldType.Join)
-		{
-			Self.Relations = new Relations {{ parent, new Children(child, moreChildren) }};
-		}
+		public JoinAttribute(RelationName parent, RelationName child, params RelationName[] moreChildren) : base(FieldType.Join) =>
+			Self.Relations = new Relations { { parent, new Children(child, moreChildren) } };
 
 		public JoinAttribute(Type parent, Type child, params Type[] moreChildren) : base(FieldType.Join)
 		{
 			var children = new Children { child };
-			children.AddRange(moreChildren.Select(c => (RelationName) c));
-			Self.Relations = new Relations {{ parent, children}};
+			children.AddRange(moreChildren.Select(c => (RelationName)c));
+			Self.Relations = new Relations { { parent, children } };
 		}
 
 		public JoinAttribute(string parent, string child, params string[] moreChildren) : base(FieldType.Join)
 		{
-			var children = new Children{ child };
-			children.AddRange(moreChildren.Select(c => (RelationName) c));
-			Self.Relations = new Relations {{ parent, children}};
+			var children = new Children { child };
+			children.AddRange(moreChildren.Select(c => (RelationName)c));
+			Self.Relations = new Relations { { parent, children } };
 		}
 
-		private IJoinProperty Self => this;
-
 		IRelations IJoinProperty.Relations { get; set; }
+
+		private IJoinProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Join/JoinField.cs b/src/Nest/Mapping/Types/Core/Join/JoinField.cs
index 625a4043720..60c6e7f8909 100644
--- a/src/Nest/Mapping/Types/Core/Join/JoinField.cs
+++ b/src/Nest/Mapping/Types/Core/Join/JoinField.cs
@@ -14,80 +14,84 @@ namespace Nest
 	[ContractJsonConverter(typeof(JoinFieldJsonConverter))]
 	public class JoinField
 	{
-		internal readonly Parent _parent;
 		internal readonly Child _child;
+		internal readonly Parent _parent;
 		internal readonly int _tag;
 
 		public JoinField(Parent parentName)
 		{
-			this._parent = parentName;
-			this._tag = 0;
+			_parent = parentName;
+			_tag = 0;
 		}
 
 		public JoinField(Child child)
 		{
-			this._child = child;
-			this._tag = 1;
+			_child = child;
+			_tag = 1;
 		}
 
 		public static JoinField Root<TParent>() => new Parent(typeof(TParent));
+
 		public static JoinField Root(RelationName parent) => new Parent(parent);
 
 		public static JoinField Link(RelationName child, Id parentId) => new Child(child, parentId);
+
 		public static JoinField Link<TChild, TParentDocument>(TParentDocument parent) where TParentDocument : class =>
 			new Child(typeof(TChild), Id.From<TParentDocument>(parent));
+
 		public static JoinField Link<TChild>(Id parentId) => new Child(typeof(TChild), parentId);
 
 		public static implicit operator JoinField(Parent parent) => new JoinField(parent);
+
 		public static implicit operator JoinField(string parentName) => new JoinField(new Parent(parentName));
+
 		public static implicit operator JoinField(Type parentType) => new JoinField(new Parent(parentType));
+
 		public static implicit operator JoinField(Child child) => new JoinField(child);
 
-		public T Match<T>(Func<Parent, T> first, Func<Child,T> second)
+		public T Match<T>(Func<Parent, T> first, Func<Child, T> second)
 		{
 			switch (_tag)
 			{
 				case 0:
-					return first(this._parent);
+					return first(_parent);
 				case 1:
-					return second(this._child);
+					return second(_child);
 				default: throw new Exception($"Unrecognized tag value: {_tag}");
 			}
 		}
+
 		public void Match(Action<Parent> first, Action<Child> second)
 		{
 			switch (_tag)
 			{
 				case 0:
-					first(this._parent);
+					first(_parent);
 					break;
 				case 1:
-					second(this._child);
+					second(_child);
 					break;
 				default: throw new Exception($"Unrecognized tag value: {_tag}");
 			}
 		}
 
-        public class Parent
-        {
-            public RelationName Name { get; }
-
-            public Parent(RelationName name)
-            {
-                Name = name;
-            }
-        }
-
-        public class Child
-        {
-            public Id Parent { get; }
-            public RelationName Name { get; }
-
-            public Child(RelationName name, Id parent)
-            {
-                Name = name;
-                Parent = parent;
-            }
-        }
+		public class Parent
+		{
+			public Parent(RelationName name) => Name = name;
+
+			public RelationName Name { get; }
+		}
+
+		public class Child
+		{
+			public Child(RelationName name, Id parent)
+			{
+				Name = name;
+				Parent = parent;
+			}
+
+			public RelationName Name { get; }
+			public Id Parent { get; }
+		}
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Join/JoinFieldJsonConverter.cs b/src/Nest/Mapping/Types/Core/Join/JoinFieldJsonConverter.cs
index 281e88e52dd..6eae52458d9 100644
--- a/src/Nest/Mapping/Types/Core/Join/JoinFieldJsonConverter.cs
+++ b/src/Nest/Mapping/Types/Core/Join/JoinFieldJsonConverter.cs
@@ -6,10 +6,11 @@
 
 namespace Nest
 {
-	internal class JoinFieldJsonConverter :JsonConverter
+	internal class JoinFieldJsonConverter : JsonConverter
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -20,11 +21,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				return new JoinField(new JoinField.Parent(parent));
 			}
 			var jObject = JObject.Load(reader);
-			if (jObject.Properties().Any(p=>p.Name == "parent"))
-				using(var childReader =  jObject.CreateReader())
+			if (jObject.Properties().Any(p => p.Name == "parent"))
+				using (var childReader = jObject.CreateReader())
 					return (JoinField)serializer.Deserialize<JoinField.Child>(childReader);
 
-			using(var parentReader = jObject.CreateReader())
+			using (var parentReader = jObject.CreateReader())
 				return (JoinField)serializer.Deserialize<JoinField.Parent>(parentReader);
 		}
 
@@ -47,6 +48,5 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				}
 			);
 		}
-
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Join/JoinProperty.cs b/src/Nest/Mapping/Types/Core/Join/JoinProperty.cs
index a20f0b2d7e5..8394f20bf48 100644
--- a/src/Nest/Mapping/Types/Core/Join/JoinProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Join/JoinProperty.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Mapping/Types/Core/Join/Relations.cs b/src/Nest/Mapping/Types/Core/Join/Relations.cs
index 199c96c9806..c54440cc1bd 100644
--- a/src/Nest/Mapping/Types/Core/Join/Relations.cs
+++ b/src/Nest/Mapping/Types/Core/Join/Relations.cs
@@ -10,16 +10,18 @@ public interface IRelations : IIsADictionary<RelationName, Children> { }
 
 	public class Relations : IsADictionaryBase<RelationName, Children>, IRelations
 	{
-		public Relations() {}
+		public Relations() { }
+
 		public Relations(IDictionary<RelationName, Children> container) : base(container) { }
+
 		public Relations(Dictionary<RelationName, Children> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
 		public void Add(RelationName type, Children children)
 		{
 			if (BackingDictionary.ContainsKey(type))
 				throw new ArgumentException($"{type} is already mapped as parent, you have to map all it's children as a single entry");
+
 			BackingDictionary.Add(type, children);
 		}
 
@@ -27,13 +29,15 @@ public void Add(RelationName type, RelationName child, params RelationName[] mor
 		{
 			if (BackingDictionary.ContainsKey(type))
 				throw new ArgumentException($"{type} is already mapped as parent, you have to map all it's children as a single entry");
+
 			BackingDictionary.Add(type, new Children(child, moreChildren));
 		}
 	}
 
-	public class RelationsDescriptor : IsADictionaryDescriptorBase<RelationsDescriptor,	IRelations, RelationName, Children>
+	public class RelationsDescriptor : IsADictionaryDescriptorBase<RelationsDescriptor, IRelations, RelationName, Children>
 	{
 		public RelationsDescriptor() : base(new Relations()) { }
+
 		internal RelationsDescriptor(IRelations relations) : base(relations) { }
 
 		public RelationsDescriptor Join(RelationName parent, RelationName child, params RelationName[] moreChildren) =>
@@ -41,13 +45,15 @@ public RelationsDescriptor Join(RelationName parent, RelationName child, params
 
 		public RelationsDescriptor Join<TParent>(RelationName child, params RelationName[] moreChildren)
 		{
-			if (this.PromisedValue.ContainsKey(typeof(TParent))) throw new ArgumentException(Message(typeof(TParent)));
+			if (PromisedValue.ContainsKey(typeof(TParent))) throw new ArgumentException(Message(typeof(TParent)));
+
 			return Assign(typeof(TParent), new Children(child, moreChildren));
 		}
 
 		public RelationsDescriptor Join<TParent, TChild>()
 		{
-			if (this.PromisedValue.ContainsKey(typeof(TParent))) throw new ArgumentException(Message(typeof(TParent)));
+			if (PromisedValue.ContainsKey(typeof(TParent))) throw new ArgumentException(Message(typeof(TParent)));
+
 			return Assign(typeof(TParent), typeof(TChild));
 		}
 
diff --git a/src/Nest/Mapping/Types/Core/Keyword/KeywordAttribute.cs b/src/Nest/Mapping/Types/Core/Keyword/KeywordAttribute.cs
index 49c1611d2a2..8371da7af41 100644
--- a/src/Nest/Mapping/Types/Core/Keyword/KeywordAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Keyword/KeywordAttribute.cs
@@ -1,15 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public class KeywordAttribute : ElasticsearchDocValuesPropertyAttributeBase, IKeywordProperty
 	{
-		private IKeywordProperty Self => this;
-
 		public KeywordAttribute() : base(FieldType.Keyword) { }
 
 		double? IKeywordProperty.Boost { get; set; }
@@ -17,26 +9,66 @@ public KeywordAttribute() : base(FieldType.Keyword) { }
 		int? IKeywordProperty.IgnoreAbove { get; set; }
 		bool? IKeywordProperty.Index { get; set; }
 		IndexOptions? IKeywordProperty.IndexOptions { get; set; }
+		string IKeywordProperty.Normalizer { get; set; }
 		bool? IKeywordProperty.Norms { get; set; }
-		bool? IKeywordProperty.SplitQueriesOnWhitespace { get; set; }
 		string IKeywordProperty.NullValue { get; set; }
-		string IKeywordProperty.Normalizer { get; set; }
+		private IKeywordProperty Self => this;
+		bool? IKeywordProperty.SplitQueriesOnWhitespace { get; set; }
 
 		// ReSharper disable ArrangeThisQualifier
-		public double Boost { get => Self.Boost.GetValueOrDefault(); set => Self.Boost = value; }
-		public bool EagerGlobalOrdinals { get => Self.EagerGlobalOrdinals.GetValueOrDefault(); set => Self.EagerGlobalOrdinals = value; }
-		public int IgnoreAbove { get => Self.IgnoreAbove.GetValueOrDefault(); set => Self.IgnoreAbove = value; }
-		public bool Index { get => Self.Index.GetValueOrDefault(); set => Self.Index = value; }
-		public IndexOptions IndexOptions { get => Self.IndexOptions.GetValueOrDefault(); set => Self.IndexOptions = value; }
-		public string NullValue { get => Self.NullValue; set => Self.NullValue = value; }
-		public bool Norms { get => Self.Norms.GetValueOrDefault(true); set => Self.Norms = value; }
+		public double Boost
+		{
+			get => Self.Boost.GetValueOrDefault();
+			set => Self.Boost = value;
+		}
+
+		public bool EagerGlobalOrdinals
+		{
+			get => Self.EagerGlobalOrdinals.GetValueOrDefault();
+			set => Self.EagerGlobalOrdinals = value;
+		}
+
+		public int IgnoreAbove
+		{
+			get => Self.IgnoreAbove.GetValueOrDefault();
+			set => Self.IgnoreAbove = value;
+		}
+
+		public bool Index
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
+
+		public IndexOptions IndexOptions
+		{
+			get => Self.IndexOptions.GetValueOrDefault();
+			set => Self.IndexOptions = value;
+		}
+
+		public string NullValue
+		{
+			get => Self.NullValue;
+			set => Self.NullValue = value;
+		}
+
+		public bool Norms
+		{
+			get => Self.Norms.GetValueOrDefault(true);
+			set => Self.Norms = value;
+		}
+
 		public bool SplitQueriesOnWhitespace
 		{
 			get => Self.SplitQueriesOnWhitespace.GetValueOrDefault(false);
 			set => Self.SplitQueriesOnWhitespace = value;
 		}
-		public string Normalizer { get => Self.Normalizer; set => Self.Normalizer = value; }
-		// ReSharper restore ArrangeThisQualifier
 
+		public string Normalizer
+		{
+			get => Self.Normalizer;
+			set => Self.Normalizer = value;
+		}
+		// ReSharper restore ArrangeThisQualifier
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Keyword/KeywordProperty.cs b/src/Nest/Mapping/Types/Core/Keyword/KeywordProperty.cs
index 2eb2ee0686e..eef05eb9995 100644
--- a/src/Nest/Mapping/Types/Core/Keyword/KeywordProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Keyword/KeywordProperty.cs
@@ -1,10 +1,5 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -26,18 +21,18 @@ public interface IKeywordProperty : IDocValuesProperty
 		[JsonProperty("index_options")]
 		IndexOptions? IndexOptions { get; set; }
 
+		[JsonProperty("normalizer")]
+		string Normalizer { get; set; }
+
 		[JsonProperty("norms")]
 		bool? Norms { get; set; }
 
-		/// <summary> Whether full text queries should split the input on whitespace when building a query for this field. </summary>
-		[JsonProperty("split_queries_on_whitespace")]
-		bool? SplitQueriesOnWhitespace { get; set; }
-
 		[JsonProperty("null_value")]
 		string NullValue { get; set; }
 
-		[JsonProperty("normalizer")]
-		string Normalizer { get; set; }
+		/// <summary> Whether full text queries should split the input on whitespace when building a query for this field. </summary>
+		[JsonProperty("split_queries_on_whitespace")]
+		bool? SplitQueriesOnWhitespace { get; set; }
 	}
 
 	[DebuggerDisplay("{DebugDisplay}")]
@@ -50,11 +45,12 @@ public KeywordProperty() : base(FieldType.Keyword) { }
 		public int? IgnoreAbove { get; set; }
 		public bool? Index { get; set; }
 		public IndexOptions? IndexOptions { get; set; }
+		public string Normalizer { get; set; }
 		public bool? Norms { get; set; }
-		/// <inheritdoc cref="IKeywordProperty.SplitQueriesOnWhitespace"/>
-		public bool? SplitQueriesOnWhitespace { get; set; }
 		public string NullValue { get; set; }
-		public string Normalizer { get; set; }
+
+		/// <inheritdoc cref="IKeywordProperty.SplitQueriesOnWhitespace" />
+		public bool? SplitQueriesOnWhitespace { get; set; }
 	}
 
 	[DebuggerDisplay("{DebugDisplay}")]
@@ -62,27 +58,36 @@ public class KeywordPropertyDescriptor<T>
 		: DocValuesPropertyDescriptorBase<KeywordPropertyDescriptor<T>, IKeywordProperty, T>, IKeywordProperty
 		where T : class
 	{
+		public KeywordPropertyDescriptor() : base(FieldType.Keyword) { }
+
 		double? IKeywordProperty.Boost { get; set; }
-		bool? IKeywordProperty.EagerGlobalOrdinals{ get; set; }
-		int? IKeywordProperty.IgnoreAbove{ get; set; }
-		bool? IKeywordProperty.Index{ get; set; }
-		IndexOptions? IKeywordProperty.IndexOptions{ get; set; }
-		bool? IKeywordProperty.Norms{ get; set; }
+		bool? IKeywordProperty.EagerGlobalOrdinals { get; set; }
+		int? IKeywordProperty.IgnoreAbove { get; set; }
+		bool? IKeywordProperty.Index { get; set; }
+		IndexOptions? IKeywordProperty.IndexOptions { get; set; }
+		string IKeywordProperty.Normalizer { get; set; }
+		bool? IKeywordProperty.Norms { get; set; }
+		string IKeywordProperty.NullValue { get; set; }
 		bool? IKeywordProperty.SplitQueriesOnWhitespace { get; set; }
-		string IKeywordProperty.NullValue{ get; set; }
-		string IKeywordProperty.Normalizer{ get; set; }
-
-		public KeywordPropertyDescriptor() : base(FieldType.Keyword) { }
 
 		public KeywordPropertyDescriptor<T> Boost(double? boost) => Assign(a => a.Boost = boost);
-		public KeywordPropertyDescriptor<T> EagerGlobalOrdinals(bool? eagerGlobalOrdinals = true) => Assign(a => a.EagerGlobalOrdinals = eagerGlobalOrdinals);
+
+		public KeywordPropertyDescriptor<T> EagerGlobalOrdinals(bool? eagerGlobalOrdinals = true) =>
+			Assign(a => a.EagerGlobalOrdinals = eagerGlobalOrdinals);
+
 		public KeywordPropertyDescriptor<T> IgnoreAbove(int? ignoreAbove) => Assign(a => a.IgnoreAbove = ignoreAbove);
+
 		public KeywordPropertyDescriptor<T> Index(bool? index = true) => Assign(a => a.Index = index);
+
 		public KeywordPropertyDescriptor<T> IndexOptions(IndexOptions? indexOptions) => Assign(a => a.IndexOptions = indexOptions);
+
 		public KeywordPropertyDescriptor<T> Norms(bool? enabled = true) => Assign(a => a.Norms = enabled);
-		/// <inheritdoc cref="IKeywordProperty.SplitQueriesOnWhitespace"/>
+
+		/// <inheritdoc cref="IKeywordProperty.SplitQueriesOnWhitespace" />
 		public KeywordPropertyDescriptor<T> SplitQueriesOnWhitespace(bool? split = true) => Assign(a => a.SplitQueriesOnWhitespace = split);
+
 		public KeywordPropertyDescriptor<T> NullValue(string nullValue) => Assign(a => a.NullValue = nullValue);
+
 		public KeywordPropertyDescriptor<T> Normalizer(string normalizer) => Assign(a => a.Normalizer = normalizer);
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Number/NumberAttribute.cs b/src/Nest/Mapping/Types/Core/Number/NumberAttribute.cs
index 5b5be4cb63f..f21be40077e 100644
--- a/src/Nest/Mapping/Types/Core/Number/NumberAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Number/NumberAttribute.cs
@@ -1,6 +1,4 @@
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	/// <summary>
 	/// Maps a property as a number type. If no type is specified,
@@ -8,25 +6,54 @@ namespace Nest
 	/// </summary>
 	public class NumberAttribute : ElasticsearchDocValuesPropertyAttributeBase, INumberProperty
 	{
-		private INumberProperty Self => this;
-
 		public NumberAttribute() : base(FieldType.Float) { }
+
 		public NumberAttribute(NumberType type) : base(type.ToFieldType()) { }
 
-		bool? INumberProperty.Index { get; set; }
+		public double Boost
+		{
+			get => Self.Boost.GetValueOrDefault();
+			set => Self.Boost = value;
+		}
+
+		public bool Coerce
+		{
+			get => Self.Coerce.GetValueOrDefault();
+			set => Self.Coerce = value;
+		}
+
+		public bool IgnoreMalformed
+		{
+			get => Self.IgnoreMalformed.GetValueOrDefault();
+			set => Self.IgnoreMalformed = value;
+		}
+
+		public bool Index
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
+
+		public double NullValue
+		{
+			get => Self.NullValue.GetValueOrDefault();
+			set => Self.NullValue = value;
+		}
+
+		public double ScalingFactor
+		{
+			get => Self.ScalingFactor.GetValueOrDefault();
+			set => Self.ScalingFactor = value;
+		}
+
 		double? INumberProperty.Boost { get; set; }
-		double? INumberProperty.NullValue { get; set; }
-		bool? INumberProperty.IgnoreMalformed { get; set; }
 		bool? INumberProperty.Coerce { get; set; }
 		INumericFielddata INumberProperty.Fielddata { get; set; }
-		double? INumberProperty.ScalingFactor { get; set; }
-
-		public bool Index { get => Self.Index.GetValueOrDefault(); set => Self.Index = value; }
-		public double Boost { get => Self.Boost.GetValueOrDefault(); set => Self.Boost = value; }
-		public double NullValue { get => Self.NullValue.GetValueOrDefault(); set => Self.NullValue = value; }
-		public bool IgnoreMalformed { get => Self.IgnoreMalformed.GetValueOrDefault(); set => Self.IgnoreMalformed = value; }
-		public bool Coerce { get => Self.Coerce.GetValueOrDefault(); set => Self.Coerce = value; }
-		public double ScalingFactor { get => Self.ScalingFactor.GetValueOrDefault(); set => Self.ScalingFactor = value; }
+		bool? INumberProperty.IgnoreMalformed { get; set; }
 
+		bool? INumberProperty.Index { get; set; }
+		double? INumberProperty.NullValue { get; set; }
+		double? INumberProperty.ScalingFactor { get; set; }
+		private INumberProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Number/NumberProperty.cs b/src/Nest/Mapping/Types/Core/Number/NumberProperty.cs
index fcb3cfe3af4..8e829394bc7 100644
--- a/src/Nest/Mapping/Types/Core/Number/NumberProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Number/NumberProperty.cs
@@ -8,24 +8,24 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface INumberProperty : IDocValuesProperty
 	{
-		[JsonProperty("index")]
-		bool? Index { get; set; }
-
 		[JsonProperty("boost")]
 		double? Boost { get; set; }
 
-		[JsonProperty("null_value")]
-		double? NullValue { get; set; }
-
-		[JsonProperty("ignore_malformed")]
-		bool? IgnoreMalformed { get; set; }
-
 		[JsonProperty("coerce")]
 		bool? Coerce { get; set; }
 
 		[JsonProperty("fielddata")]
 		INumericFielddata Fielddata { get; set; }
 
+		[JsonProperty("ignore_malformed")]
+		bool? IgnoreMalformed { get; set; }
+
+		[JsonProperty("index")]
+		bool? Index { get; set; }
+
+		[JsonProperty("null_value")]
+		double? NullValue { get; set; }
+
 		[JsonProperty("scaling_factor")]
 		double? ScalingFactor { get; set; }
 	}
@@ -34,14 +34,16 @@ public interface INumberProperty : IDocValuesProperty
 	public class NumberProperty : DocValuesPropertyBase, INumberProperty
 	{
 		public NumberProperty() : base(FieldType.Float) { }
+
 		public NumberProperty(NumberType type) : base(type.ToFieldType()) { }
 
-		public bool? Index { get; set; }
 		public double? Boost { get; set; }
-		public double? NullValue { get; set; }
-		public bool? IgnoreMalformed { get; set; }
 		public bool? Coerce { get; set; }
 		public INumericFielddata Fielddata { get; set; }
+		public bool? IgnoreMalformed { get; set; }
+
+		public bool? Index { get; set; }
+		public double? NullValue { get; set; }
 		public double? ScalingFactor { get; set; }
 	}
 
@@ -56,12 +58,13 @@ protected NumberPropertyDescriptorBase() : base(FieldType.Float) { }
 
 		protected NumberPropertyDescriptorBase(FieldType type) : base(type) { }
 
-		bool? INumberProperty.Index { get; set; }
 		double? INumberProperty.Boost { get; set; }
-		double? INumberProperty.NullValue { get; set; }
-		bool? INumberProperty.IgnoreMalformed { get; set; }
 		bool? INumberProperty.Coerce { get; set; }
 		INumericFielddata INumberProperty.Fielddata { get; set; }
+		bool? INumberProperty.IgnoreMalformed { get; set; }
+
+		bool? INumberProperty.Index { get; set; }
+		double? INumberProperty.NullValue { get; set; }
 		double? INumberProperty.ScalingFactor { get; set; }
 
 		public TDescriptor Type(NumberType? type) => Assign(a => a.Type = type?.GetStringValue());
@@ -83,7 +86,5 @@ public TDescriptor Fielddata(Func<NumericFielddataDescriptor, INumericFielddata>
 	}
 
 	public class NumberPropertyDescriptor<T> : NumberPropertyDescriptorBase<NumberPropertyDescriptor<T>, INumberProperty, T>
-		where T : class
-	{
-	}
+		where T : class { }
 }
diff --git a/src/Nest/Mapping/Types/Core/Number/NumberType.cs b/src/Nest/Mapping/Types/Core/Number/NumberType.cs
index 15d8aea7c06..02344d8920b 100644
--- a/src/Nest/Mapping/Types/Core/Number/NumberType.cs
+++ b/src/Nest/Mapping/Types/Core/Number/NumberType.cs
@@ -10,18 +10,25 @@ public enum NumberType
 	{
 		[EnumMember(Value = "float")]
 		Float,
+
 		[EnumMember(Value = "half_float")]
 		HalfFloat,
+
 		[EnumMember(Value = "scaled_float")]
 		ScaledFloat,
+
 		[EnumMember(Value = "double")]
 		Double,
+
 		[EnumMember(Value = "integer")]
 		Integer,
+
 		[EnumMember(Value = "long")]
 		Long,
+
 		[EnumMember(Value = "short")]
 		Short,
+
 		[EnumMember(Value = "byte")]
 		Byte
 	}
@@ -43,7 +50,6 @@ public static FieldType ToFieldType(this NumberType numberType)
 				default:
 					throw new ArgumentOutOfRangeException(nameof(numberType), numberType, null);
 			}
-
 		}
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Percolator/PercolatorProperty.cs b/src/Nest/Mapping/Types/Core/Percolator/PercolatorProperty.cs
index 4ab15b173fe..5266eb31b23 100644
--- a/src/Nest/Mapping/Types/Core/Percolator/PercolatorProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Percolator/PercolatorProperty.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -19,8 +14,8 @@ public PercolatorProperty() : base(FieldType.Percolator) { }
 
 	[DebuggerDisplay("{DebugDisplay}")]
 	public class PercolatorPropertyDescriptor<T>
-	: PropertyDescriptorBase<PercolatorPropertyDescriptor<T>, IPercolatorProperty, T>, IPercolatorProperty
-	where T : class
+		: PropertyDescriptorBase<PercolatorPropertyDescriptor<T>, IPercolatorProperty, T>, IPercolatorProperty
+		where T : class
 	{
 		public PercolatorPropertyDescriptor() : base(FieldType.Percolator) { }
 	}
diff --git a/src/Nest/Mapping/Types/Core/Range/DateRange/DateRangeAttribute.cs b/src/Nest/Mapping/Types/Core/Range/DateRange/DateRangeAttribute.cs
index cb6cecb8303..8a4868e9615 100644
--- a/src/Nest/Mapping/Types/Core/Range/DateRange/DateRangeAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Range/DateRange/DateRangeAttribute.cs
@@ -1,16 +1,16 @@
-using System;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public class DateRangeAttribute : RangePropertyAttributeBase, IDateRangeProperty
 	{
-		private IDateRangeProperty Self => this;
-
 		public DateRangeAttribute() : base(RangeType.DateRange) { }
 
-		string IDateRangeProperty.Format { get; set; }
+		public string Format
+		{
+			get => Self.Format;
+			set => Self.Format = value;
+		}
 
-		public string Format { get { return Self.Format; } set { Self.Format = value; } }
+		string IDateRangeProperty.Format { get; set; }
+		private IDateRangeProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Range/DateRange/DateRangeProperty.cs b/src/Nest/Mapping/Types/Core/Range/DateRange/DateRangeProperty.cs
index 45a9e396d45..21b2f5fbc35 100644
--- a/src/Nest/Mapping/Types/Core/Range/DateRange/DateRangeProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Range/DateRange/DateRangeProperty.cs
@@ -1,10 +1,7 @@
-using System;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
 {
-
 	/// <summary>
 	/// A range of date values represented as unsigned 64-bit integer milliseconds elapsed since system epoch.
 	/// </summary>
@@ -13,22 +10,22 @@ public interface IDateRangeProperty : IRangeProperty
 	{
 		/// <summary>
 		/// The date format(s) that can be parsed. Defaults to strict_date_optional_time||epoch_millis.
-		/// <see cref="DateFormat"/>
+		/// <see cref="DateFormat" />
 		/// </summary>
 		[JsonProperty("format")]
 		string Format { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DateRangeProperty : RangePropertyBase, IDateRangeProperty
 	{
 		public DateRangeProperty() : base(RangeType.DateRange) { }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string Format { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DateRangePropertyDescriptor<T>
 		: RangePropertyDescriptorBase<DateRangePropertyDescriptor<T>, IDateRangeProperty, T>, IDateRangeProperty
 		where T : class
@@ -37,7 +34,7 @@ public DateRangePropertyDescriptor() : base(RangeType.DateRange) { }
 
 		string IDateRangeProperty.Format { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public DateRangePropertyDescriptor<T> Format(string format) => Assign(a => a.Format = format);
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttribute.cs b/src/Nest/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttribute.cs
index cf76c5d3eb3..dd9235357f5 100644
--- a/src/Nest/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttribute.cs
@@ -1,7 +1,4 @@
-using System;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public class DoubleRangeAttribute : RangePropertyAttributeBase, IDoubleRangeProperty
 	{
diff --git a/src/Nest/Mapping/Types/Core/Range/DoubleRange/DoubleRangeProperty.cs b/src/Nest/Mapping/Types/Core/Range/DoubleRange/DoubleRangeProperty.cs
index 3968c94ca72..28006f9709e 100644
--- a/src/Nest/Mapping/Types/Core/Range/DoubleRange/DoubleRangeProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Range/DoubleRange/DoubleRangeProperty.cs
@@ -1,5 +1,3 @@
-using System;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -10,13 +8,13 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IDoubleRangeProperty : IRangeProperty { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DoubleRangeProperty : RangePropertyBase, IDoubleRangeProperty
 	{
 		public DoubleRangeProperty() : base(RangeType.DoubleRange) { }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class DoubleRangePropertyDescriptor<T>
 		: RangePropertyDescriptorBase<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty, T>, IDoubleRangeProperty
 		where T : class
diff --git a/src/Nest/Mapping/Types/Core/Range/FloatRange/FloatRangeAttribute.cs b/src/Nest/Mapping/Types/Core/Range/FloatRange/FloatRangeAttribute.cs
index 09f7b93a348..04350a68e1d 100644
--- a/src/Nest/Mapping/Types/Core/Range/FloatRange/FloatRangeAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Range/FloatRange/FloatRangeAttribute.cs
@@ -1,7 +1,4 @@
-using System;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public class IntegerRangeAttribute : RangePropertyAttributeBase, IIntegerRangeProperty
 	{
diff --git a/src/Nest/Mapping/Types/Core/Range/FloatRange/FloatRangeProperty.cs b/src/Nest/Mapping/Types/Core/Range/FloatRange/FloatRangeProperty.cs
index a1e3e4340bd..ed1ea32aaa2 100644
--- a/src/Nest/Mapping/Types/Core/Range/FloatRange/FloatRangeProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Range/FloatRange/FloatRangeProperty.cs
@@ -1,5 +1,3 @@
-using System;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -10,13 +8,13 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IFloatRangeProperty : IRangeProperty { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class FloatRangeProperty : RangePropertyBase, IFloatRangeProperty
 	{
 		public FloatRangeProperty() : base(RangeType.FloatRange) { }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class FloatRangePropertyDescriptor<T>
 		: RangePropertyDescriptorBase<FloatRangePropertyDescriptor<T>, IFloatRangeProperty, T>, IFloatRangeProperty
 		where T : class
diff --git a/src/Nest/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttribute.cs b/src/Nest/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttribute.cs
index 1908e3d8d43..c186cfda70c 100644
--- a/src/Nest/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttribute.cs
@@ -1,7 +1,4 @@
-using System;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public class FloatRangeAttribute : RangePropertyAttributeBase, IFloatRangeProperty
 	{
diff --git a/src/Nest/Mapping/Types/Core/Range/IntegerRange/IntegerRangeProperty.cs b/src/Nest/Mapping/Types/Core/Range/IntegerRange/IntegerRangeProperty.cs
index d5389d8201b..c79d19abe9a 100644
--- a/src/Nest/Mapping/Types/Core/Range/IntegerRange/IntegerRangeProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Range/IntegerRange/IntegerRangeProperty.cs
@@ -1,5 +1,3 @@
-using System;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -10,13 +8,13 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IIntegerRangeProperty : IRangeProperty { }
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IntegerRangeProperty : RangePropertyBase, IIntegerRangeProperty
 	{
 		public IntegerRangeProperty() : base(RangeType.IntegerRange) { }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc />
 	public class IntegerRangePropertyDescriptor<T>
 		: RangePropertyDescriptorBase<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty, T>, IIntegerRangeProperty
 		where T : class
diff --git a/src/Nest/Mapping/Types/Core/Range/Ip/IpAddressRangeProperty.cs b/src/Nest/Mapping/Types/Core/Range/Ip/IpAddressRangeProperty.cs
index 58cd7d286f4..d07b9305cbe 100644
--- a/src/Nest/Mapping/Types/Core/Range/Ip/IpAddressRangeProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Range/Ip/IpAddressRangeProperty.cs
@@ -1,5 +1,3 @@
-using System;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Mapping/Types/Core/Range/Ip/IpRangeAttribute.cs b/src/Nest/Mapping/Types/Core/Range/Ip/IpRangeAttribute.cs
index b7c5fd9a824..9518d75c0a6 100644
--- a/src/Nest/Mapping/Types/Core/Range/Ip/IpRangeAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Range/Ip/IpRangeAttribute.cs
@@ -1,7 +1,4 @@
-using System;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public class IpRangeAttribute : RangePropertyAttributeBase, IIpRangeProperty
 	{
diff --git a/src/Nest/Mapping/Types/Core/Range/LongRange/LongRangeAttribute.cs b/src/Nest/Mapping/Types/Core/Range/LongRange/LongRangeAttribute.cs
index aec4694c68d..6ea34e7d9e8 100644
--- a/src/Nest/Mapping/Types/Core/Range/LongRange/LongRangeAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Range/LongRange/LongRangeAttribute.cs
@@ -1,7 +1,4 @@
-using System;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public class LongRangeAttribute : RangePropertyAttributeBase, ILongRangeProperty
 	{
diff --git a/src/Nest/Mapping/Types/Core/Range/LongRange/LongRangeProperty.cs b/src/Nest/Mapping/Types/Core/Range/LongRange/LongRangeProperty.cs
index e4c21518a71..7b80210d313 100644
--- a/src/Nest/Mapping/Types/Core/Range/LongRange/LongRangeProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Range/LongRange/LongRangeProperty.cs
@@ -1,5 +1,3 @@
-using System;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Mapping/Types/Core/Range/RangePropertyAttributeBase.cs b/src/Nest/Mapping/Types/Core/Range/RangePropertyAttributeBase.cs
index 6f3a4e58885..23a1923f34a 100644
--- a/src/Nest/Mapping/Types/Core/Range/RangePropertyAttributeBase.cs
+++ b/src/Nest/Mapping/Types/Core/Range/RangePropertyAttributeBase.cs
@@ -1,20 +1,31 @@
-using System;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public abstract class RangePropertyAttributeBase : ElasticsearchDocValuesPropertyAttributeBase, IRangeProperty
 	{
-		private IRangeProperty Self => this;
-
 		protected RangePropertyAttributeBase(RangeType type) : base(type.ToFieldType()) { }
 
-		public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
-		public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
-		public bool Coerce { get { return Self.Coerce.GetValueOrDefault(); } set { Self.Coerce = value; } }
+		public double Boost
+		{
+			get => Self.Boost.GetValueOrDefault();
+			set => Self.Boost = value;
+		}
+
+		public bool Coerce
+		{
+			get => Self.Coerce.GetValueOrDefault();
+			set => Self.Coerce = value;
+		}
+
+		public bool Index
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
 
-		bool? IRangeProperty.Coerce { get; set; }
 		double? IRangeProperty.Boost { get; set; }
+
+		bool? IRangeProperty.Coerce { get; set; }
 		bool? IRangeProperty.Index { get; set; }
+		private IRangeProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Range/RangePropertyBase.cs b/src/Nest/Mapping/Types/Core/Range/RangePropertyBase.cs
index 33753fe88f8..dc05601c3af 100644
--- a/src/Nest/Mapping/Types/Core/Range/RangePropertyBase.cs
+++ b/src/Nest/Mapping/Types/Core/Range/RangePropertyBase.cs
@@ -6,18 +6,18 @@ namespace Nest
 	[ContractJsonConverter(typeof(PropertyJsonConverter))]
 	public interface IRangeProperty : IDocValuesProperty
 	{
-		/// <summary>
-		/// Try to convert strings to numbers and truncate fractions for integers. Accepts true (default) and false.
-		/// </summary>
-		[JsonProperty("coerce")]
-		bool? Coerce { get; set; }
-
 		/// <summary>
 		/// Mapping field-level query time boosting. Accepts a floating point number, defaults to 1.0.
 		/// </summary>
 		[JsonProperty("boost")]
 		double? Boost { get; set; }
 
+		/// <summary>
+		/// Try to convert strings to numbers and truncate fractions for integers. Accepts true (default) and false.
+		/// </summary>
+		[JsonProperty("coerce")]
+		bool? Coerce { get; set; }
+
 		/// <summary>
 		/// Should the field be searchable? Accepts true (default) and false.
 		/// </summary>
@@ -29,11 +29,13 @@ public abstract class RangePropertyBase : DocValuesPropertyBase, IRangeProperty
 	{
 		protected RangePropertyBase(RangeType rangeType) : base(rangeType.ToFieldType()) { }
 
-		/// <inheritdoc/>
-		public bool? Coerce { get; set; }
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public double? Boost { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public bool? Coerce { get; set; }
+
+		/// <inheritdoc />
 		public bool? Index { get; set; }
 	}
 
@@ -43,17 +45,19 @@ public abstract class RangePropertyDescriptorBase<TDescriptor, TInterface, T>
 		where TInterface : class, IRangeProperty
 		where T : class
 	{
-		bool? IRangeProperty.Coerce { get; set; }
+		protected RangePropertyDescriptorBase(RangeType type) : base(type.ToFieldType()) { }
+
 		double? IRangeProperty.Boost { get; set; }
+		bool? IRangeProperty.Coerce { get; set; }
 		bool? IRangeProperty.Index { get; set; }
 
-		protected RangePropertyDescriptorBase(RangeType type) : base(type.ToFieldType()) { }
-
-		/// <inheritdoc cref="IRangeProperty.Coerce"/>
+		/// <inheritdoc cref="IRangeProperty.Coerce" />
 		public TDescriptor Coerce(bool? coerce = true) => Assign(a => a.Coerce = coerce);
-		/// <inheritdoc cref="IRangeProperty.Boost"/>
+
+		/// <inheritdoc cref="IRangeProperty.Boost" />
 		public TDescriptor Boost(double? boost) => Assign(a => a.Boost = boost);
-		/// <inheritdoc cref="IRangeProperty.Index"/>
+
+		/// <inheritdoc cref="IRangeProperty.Index" />
 		public TDescriptor Index(bool? index = true) => Assign(a => a.Index = index);
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Range/RangeType.cs b/src/Nest/Mapping/Types/Core/Range/RangeType.cs
index a83d49f48d2..722058f7d5f 100644
--- a/src/Nest/Mapping/Types/Core/Range/RangeType.cs
+++ b/src/Nest/Mapping/Types/Core/Range/RangeType.cs
@@ -13,32 +13,38 @@ public enum RangeType
 		/// </summary>
 		[EnumMember(Value = "integer_range")]
 		IntegerRange,
+
 		/// <summary>
 		/// A range of single-precision 32-bit IEEE 754 floating point values.
 		/// </summary>
 		[EnumMember(Value = "float_range")]
 		FloatRange,
+
 		/// <summary>
 		/// A range of signed 64-bit integers with a minimum value of -263 and maximum of 263-1.
 		/// </summary>
 		[EnumMember(Value = "long_range")]
 		LongRange,
+
 		/// <summary>
 		/// A range of double-precision 64-bit IEEE 754 floating point values.
 		/// </summary>
 		[EnumMember(Value = "double_range")]
 		DoubleRange,
+
 		/// <summary>
 		/// A range of date values represented as unsigned 64-bit integer milliseconds elapsed since system epoch.
 		/// </summary>
 		[EnumMember(Value = "date_range")]
 		DateRange,
+
 		/// <summary>
 		/// A range of ip values supporting either IPv4 or IPv6 (or mixed) addresses.
 		/// </summary>
 		[EnumMember(Value = "ip_range")]
 		IpRange
 	}
+
 	internal static class RangeTypeExtensions
 	{
 		public static FieldType ToFieldType(this RangeType rangeType)
@@ -54,7 +60,6 @@ public static FieldType ToFieldType(this RangeType rangeType)
 				default:
 					throw new ArgumentOutOfRangeException(nameof(rangeType), rangeType, null);
 			}
-
 		}
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Text/IndexOptions.cs b/src/Nest/Mapping/Types/Core/Text/IndexOptions.cs
index 2c3cd8e26c0..09445284145 100644
--- a/src/Nest/Mapping/Types/Core/Text/IndexOptions.cs
+++ b/src/Nest/Mapping/Types/Core/Text/IndexOptions.cs
@@ -7,13 +7,16 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum IndexOptions
 	{
-		[EnumMember(Value="docs")]
+		[EnumMember(Value = "docs")]
 		Docs,
+
 		[EnumMember(Value = "freqs")]
 		Freqs,
+
 		[EnumMember(Value = "positions")]
 		Positions,
-        [EnumMember(Value = "offsets")]
-        Offsets,
+
+		[EnumMember(Value = "offsets")]
+		Offsets,
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Text/TextAttribute.cs b/src/Nest/Mapping/Types/Core/Text/TextAttribute.cs
index ba4f414ac64..a03d3e6009b 100644
--- a/src/Nest/Mapping/Types/Core/Text/TextAttribute.cs
+++ b/src/Nest/Mapping/Types/Core/Text/TextAttribute.cs
@@ -1,44 +1,95 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public class TextAttribute : ElasticsearchCorePropertyAttributeBase, ITextProperty
 	{
-		private ITextProperty Self => this;
-
 		public TextAttribute() : base(FieldType.Text) { }
 
+		public string Analyzer
+		{
+			get => Self.Analyzer;
+			set => Self.Analyzer = value;
+		}
+
+		public double Boost
+		{
+			get => Self.Boost.GetValueOrDefault();
+			set => Self.Boost = value;
+		}
+
+		public bool EagerGlobalOrdinals
+		{
+			get => Self.EagerGlobalOrdinals.GetValueOrDefault();
+			set => Self.EagerGlobalOrdinals = value;
+		}
+
+		public bool Fielddata
+		{
+			get => Self.Fielddata.GetValueOrDefault();
+			set => Self.Fielddata = value;
+		}
+
+		public bool Index
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
+
+		public IndexOptions IndexOptions
+		{
+			get => Self.IndexOptions.GetValueOrDefault();
+			set => Self.IndexOptions = value;
+		}
+
+		public bool IndexPhrases
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
+
+		public bool Norms
+		{
+			get => Self.Norms.GetValueOrDefault(true);
+			set => Self.Norms = value;
+		}
+
+		public int PositionIncrementGap
+		{
+			get => Self.PositionIncrementGap.GetValueOrDefault();
+			set => Self.PositionIncrementGap = value;
+		}
+
+		public string SearchAnalyzer
+		{
+			get => Self.SearchAnalyzer;
+			set => Self.SearchAnalyzer = value;
+		}
+
+		public string SearchQuoteAnalyzer
+		{
+			get => Self.SearchQuoteAnalyzer;
+			set => Self.SearchQuoteAnalyzer = value;
+		}
+
+		public TermVectorOption TermVector
+		{
+			get => Self.TermVector.GetValueOrDefault();
+			set => Self.TermVector = value;
+		}
+
 		string ITextProperty.Analyzer { get; set; }
 		double? ITextProperty.Boost { get; set; }
 		bool? ITextProperty.EagerGlobalOrdinals { get; set; }
 		bool? ITextProperty.Fielddata { get; set; }
 		IFielddataFrequencyFilter ITextProperty.FielddataFrequencyFilter { get; set; }
-		ITextIndexPrefixes ITextProperty.IndexPrefixes { get; set; }
 		bool? ITextProperty.Index { get; set; }
-		bool? ITextProperty.IndexPhrases { get; set; }
 		IndexOptions? ITextProperty.IndexOptions { get; set; }
+		bool? ITextProperty.IndexPhrases { get; set; }
+		ITextIndexPrefixes ITextProperty.IndexPrefixes { get; set; }
 		bool? ITextProperty.Norms { get; set; }
 		int? ITextProperty.PositionIncrementGap { get; set; }
 		string ITextProperty.SearchAnalyzer { get; set; }
 		string ITextProperty.SearchQuoteAnalyzer { get; set; }
+		private ITextProperty Self => this;
 		TermVectorOption? ITextProperty.TermVector { get; set; }
-
-		public string Analyzer { get => Self.Analyzer; set => Self.Analyzer = value; }
-		public double Boost { get => Self.Boost.GetValueOrDefault(); set => Self.Boost = value; }
-		public bool EagerGlobalOrdinals { get => Self.EagerGlobalOrdinals.GetValueOrDefault(); set => Self.EagerGlobalOrdinals = value; }
-		public bool Fielddata { get => Self.Fielddata.GetValueOrDefault(); set => Self.Fielddata = value; }
-		public bool Index { get => Self.Index.GetValueOrDefault(); set => Self.Index = value; }
-		public bool IndexPhrases { get => Self.Index.GetValueOrDefault(); set => Self.Index = value; }
-		public IndexOptions IndexOptions { get => Self.IndexOptions.GetValueOrDefault(); set => Self.IndexOptions = value; }
-		public int PositionIncrementGap { get => Self.PositionIncrementGap.GetValueOrDefault(); set => Self.PositionIncrementGap = value; }
-		public string SearchAnalyzer { get => Self.SearchAnalyzer; set => Self.SearchAnalyzer = value; }
-		public string SearchQuoteAnalyzer { get => Self.SearchQuoteAnalyzer; set => Self.SearchQuoteAnalyzer = value; }
-		public bool Norms { get => Self.Norms.GetValueOrDefault(true); set => Self.Norms = value; }
-		public TermVectorOption TermVector { get => Self.TermVector.GetValueOrDefault(); set => Self.TermVector = value; }
-
 	}
 }
diff --git a/src/Nest/Mapping/Types/Core/Text/TextIndexPrefixes.cs b/src/Nest/Mapping/Types/Core/Text/TextIndexPrefixes.cs
index 713ca5fc3c2..4acd76ee851 100644
--- a/src/Nest/Mapping/Types/Core/Text/TextIndexPrefixes.cs
+++ b/src/Nest/Mapping/Types/Core/Text/TextIndexPrefixes.cs
@@ -6,24 +6,24 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<TextIndexPrefixes>))]
 	public interface ITextIndexPrefixes
 	{
-		[JsonProperty("min_chars")]
-		int? MinCharacters { get; set; }
-
 		[JsonProperty("max_chars")]
 		int? MaxCharacters { get; set; }
+
+		[JsonProperty("min_chars")]
+		int? MinCharacters { get; set; }
 	}
 
 	public class TextIndexPrefixes : ITextIndexPrefixes
 	{
-		public int? MinCharacters { get; set; }
 		public int? MaxCharacters { get; set; }
+		public int? MinCharacters { get; set; }
 	}
 
 	public class TextIndexPrefixesDescriptor
 		: DescriptorBase<TextIndexPrefixesDescriptor, ITextIndexPrefixes>, ITextIndexPrefixes
 	{
-		int? ITextIndexPrefixes.MinCharacters { get; set; }
 		int? ITextIndexPrefixes.MaxCharacters { get; set; }
+		int? ITextIndexPrefixes.MinCharacters { get; set; }
 
 		public TextIndexPrefixesDescriptor MinCharacters(int? min) => Assign(a => a.MinCharacters = min);
 
diff --git a/src/Nest/Mapping/Types/Core/Text/TextProperty.cs b/src/Nest/Mapping/Types/Core/Text/TextProperty.cs
index 73f512d9ac4..fada171653a 100644
--- a/src/Nest/Mapping/Types/Core/Text/TextProperty.cs
+++ b/src/Nest/Mapping/Types/Core/Text/TextProperty.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Diagnostics;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -10,12 +10,6 @@ public interface ITextProperty : ICoreProperty
 		[JsonProperty("analyzer")]
 		string Analyzer { get; set; }
 
-		[JsonProperty("search_analyzer")]
-		string SearchAnalyzer { get; set; }
-
-		[JsonProperty("search_quote_analyzer")]
-		string SearchQuoteAnalyzer { get; set; }
-
 		[JsonProperty("boost")]
 		double? Boost { get; set; }
 
@@ -28,17 +22,17 @@ public interface ITextProperty : ICoreProperty
 		[JsonProperty("fielddata_frequency_filter")]
 		IFielddataFrequencyFilter FielddataFrequencyFilter { get; set; }
 
-		[JsonProperty("index_prefixes")]
-		ITextIndexPrefixes IndexPrefixes { get; set; }
-
 		[JsonProperty("index")]
 		bool? Index { get; set; }
 
+		[JsonProperty("index_options")]
+		IndexOptions? IndexOptions { get; set; }
+
 		[JsonProperty("index_phrases")]
 		bool? IndexPhrases { get; set; }
 
-		[JsonProperty("index_options")]
-		IndexOptions? IndexOptions { get; set; }
+		[JsonProperty("index_prefixes")]
+		ITextIndexPrefixes IndexPrefixes { get; set; }
 
 		[JsonProperty("norms")]
 		bool? Norms { get; set; }
@@ -46,6 +40,12 @@ public interface ITextProperty : ICoreProperty
 		[JsonProperty("position_increment_gap")]
 		int? PositionIncrementGap { get; set; }
 
+		[JsonProperty("search_analyzer")]
+		string SearchAnalyzer { get; set; }
+
+		[JsonProperty("search_quote_analyzer")]
+		string SearchQuoteAnalyzer { get; set; }
+
 		[JsonProperty("term_vector")]
 		TermVectorOption? TermVector { get; set; }
 	}
@@ -55,17 +55,18 @@ public class TextProperty : CorePropertyBase, ITextProperty
 	{
 		public TextProperty() : base(FieldType.Text) { }
 
+		public string Analyzer { get; set; }
+
 		public double? Boost { get; set; }
 		public bool? EagerGlobalOrdinals { get; set; }
 		public bool? Fielddata { get; set; }
 		public IFielddataFrequencyFilter FielddataFrequencyFilter { get; set; }
-		public ITextIndexPrefixes IndexPrefixes { get; set; }
 		public bool? Index { get; set; }
-		public bool? IndexPhrases { get; set; }
 		public IndexOptions? IndexOptions { get; set; }
+		public bool? IndexPhrases { get; set; }
+		public ITextIndexPrefixes IndexPrefixes { get; set; }
 		public bool? Norms { get; set; }
 		public int? PositionIncrementGap { get; set; }
-		public string Analyzer { get; set; }
 		public string SearchAnalyzer { get; set; }
 		public string SearchQuoteAnalyzer { get; set; }
 		public TermVectorOption? TermVector { get; set; }
@@ -76,38 +77,53 @@ public class TextPropertyDescriptor<T>
 		: CorePropertyDescriptorBase<TextPropertyDescriptor<T>, ITextProperty, T>, ITextProperty
 		where T : class
 	{
+		public TextPropertyDescriptor() : base(FieldType.Text) { }
+
+		string ITextProperty.Analyzer { get; set; }
 		double? ITextProperty.Boost { get; set; }
 		bool? ITextProperty.EagerGlobalOrdinals { get; set; }
 		bool? ITextProperty.Fielddata { get; set; }
 		IFielddataFrequencyFilter ITextProperty.FielddataFrequencyFilter { get; set; }
-		ITextIndexPrefixes ITextProperty.IndexPrefixes { get; set; }
 		bool? ITextProperty.Index { get; set; }
-		bool? ITextProperty.IndexPhrases { get; set; }
 		IndexOptions? ITextProperty.IndexOptions { get; set; }
+		bool? ITextProperty.IndexPhrases { get; set; }
+		ITextIndexPrefixes ITextProperty.IndexPrefixes { get; set; }
 		bool? ITextProperty.Norms { get; set; }
 		int? ITextProperty.PositionIncrementGap { get; set; }
-		string ITextProperty.Analyzer { get; set; }
 		string ITextProperty.SearchAnalyzer { get; set; }
 		string ITextProperty.SearchQuoteAnalyzer { get; set; }
 		TermVectorOption? ITextProperty.TermVector { get; set; }
 
-		public TextPropertyDescriptor() : base(FieldType.Text) { }
-
 		public TextPropertyDescriptor<T> Boost(double? boost) => Assign(a => a.Boost = boost);
-		public TextPropertyDescriptor<T> EagerGlobalOrdinals(bool? eagerGlobalOrdinals = true) => Assign(a => a.EagerGlobalOrdinals = eagerGlobalOrdinals);
- 		public TextPropertyDescriptor<T> Fielddata(bool? fielddata = true) => Assign(a => a.Fielddata = fielddata);
+
+		public TextPropertyDescriptor<T> EagerGlobalOrdinals(bool? eagerGlobalOrdinals = true) =>
+			Assign(a => a.EagerGlobalOrdinals = eagerGlobalOrdinals);
+
+		public TextPropertyDescriptor<T> Fielddata(bool? fielddata = true) => Assign(a => a.Fielddata = fielddata);
+
 		public TextPropertyDescriptor<T> FielddataFrequencyFilter(Func<FielddataFrequencyFilterDescriptor, IFielddataFrequencyFilter> selector) =>
 			Assign(a => a.FielddataFrequencyFilter = selector?.Invoke(new FielddataFrequencyFilterDescriptor()));
+
 		public TextPropertyDescriptor<T> IndexPrefixes(Func<TextIndexPrefixesDescriptor, ITextIndexPrefixes> selector) =>
 			Assign(a => a.IndexPrefixes = selector?.Invoke(new TextIndexPrefixesDescriptor()));
+
 		public TextPropertyDescriptor<T> Index(bool? index = true) => Assign(a => a.Index = index);
+
 		public TextPropertyDescriptor<T> IndexPhrases(bool? indexPhrases = true) => Assign(a => a.IndexPhrases = indexPhrases);
+
 		public TextPropertyDescriptor<T> IndexOptions(IndexOptions? indexOptions) => Assign(a => a.IndexOptions = indexOptions);
+
 		public TextPropertyDescriptor<T> Norms(bool? enabled = true) => Assign(a => a.Norms = enabled);
-		public TextPropertyDescriptor<T> PositionIncrementGap(int? positionIncrementGap) => Assign(a => a.PositionIncrementGap = positionIncrementGap);
+
+		public TextPropertyDescriptor<T> PositionIncrementGap(int? positionIncrementGap) =>
+			Assign(a => a.PositionIncrementGap = positionIncrementGap);
+
 		public TextPropertyDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
+
 		public TextPropertyDescriptor<T> SearchAnalyzer(string searchAnalyzer) => Assign(a => a.SearchAnalyzer = searchAnalyzer);
+
 		public TextPropertyDescriptor<T> SearchQuoteAnalyzer(string searchQuoteAnalyzer) => Assign(a => a.SearchQuoteAnalyzer = searchQuoteAnalyzer);
+
 		public TextPropertyDescriptor<T> TermVector(TermVectorOption? termVector) => Assign(a => a.TermVector = termVector);
 	}
 }
diff --git a/src/Nest/Mapping/Types/CorePropertyBase.cs b/src/Nest/Mapping/Types/CorePropertyBase.cs
index d162f8ec30b..966d2c01e88 100644
--- a/src/Nest/Mapping/Types/CorePropertyBase.cs
+++ b/src/Nest/Mapping/Types/CorePropertyBase.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -12,14 +11,12 @@ namespace Nest
 	public interface ICoreProperty : IProperty
 	{
 		/// <summary>
-		/// Whether the field value should be stored and retrievable separately from the _source field
-		/// Default is <c>false</c>.
+		/// Copies the value of this field into another field, which can be queried as a single field.
+		/// Allows for the creation of custom _all fields
 		/// </summary>
-		/// <remarks>
-		/// Not valid on <see cref="ObjectProperty"/>
-		/// </remarks>
-		[JsonProperty("store")]
-		bool? Store { get; set; }
+		[JsonProperty("copy_to")]
+		[JsonConverter(typeof(FieldsJsonConverter))]
+		Fields CopyTo { get; set; }
 
 		/// <summary>
 		/// Configures multi-fields for this field. Allows one field to be indexed in different
@@ -30,21 +27,23 @@ public interface ICoreProperty : IProperty
 
 		/// <summary>
 		/// Which relevancy scoring algorithm or similarity should be used.
-		/// Defaults to <see cref="SimilarityOption.BM25"/>
+		/// Defaults to <see cref="SimilarityOption.BM25" />
 		/// </summary>
 		[JsonProperty("similarity")]
 		Union<SimilarityOption, string> Similarity { get; set; }
 
 		/// <summary>
-		/// Copies the value of this field into another field, which can be queried as a single field.
-		/// Allows for the creation of custom _all fields
+		/// Whether the field value should be stored and retrievable separately from the _source field
+		/// Default is <c>false</c>.
 		/// </summary>
-		[JsonProperty("copy_to")]
-		[JsonConverter(typeof(FieldsJsonConverter))]
-		Fields CopyTo { get; set; }
+		/// <remarks>
+		/// Not valid on <see cref="ObjectProperty" />
+		/// </remarks>
+		[JsonProperty("store")]
+		bool? Store { get; set; }
 	}
 
-	/// <inheritdoc cref="ICoreProperty"/>
+	/// <inheritdoc cref="ICoreProperty" />
 	[DebuggerDisplay("{DebugDisplay}")]
 	public abstract class CorePropertyBase : PropertyBase, ICoreProperty
 	{
@@ -52,10 +51,13 @@ protected CorePropertyBase(FieldType type) : base(type) { }
 
 		/// <inheritdoc />
 		public Fields CopyTo { get; set; }
+
 		/// <inheritdoc />
 		public IProperties Fields { get; set; }
+
 		/// <inheritdoc />
 		public Union<SimilarityOption, string> Similarity { get; set; }
+
 		/// <inheritdoc />
 		public bool? Store { get; set; }
 	}
diff --git a/src/Nest/Mapping/Types/CorePropertyDescriptorBase.cs b/src/Nest/Mapping/Types/CorePropertyDescriptorBase.cs
index 8b2ab54a778..cfbfb72e67c 100644
--- a/src/Nest/Mapping/Types/CorePropertyDescriptorBase.cs
+++ b/src/Nest/Mapping/Types/CorePropertyDescriptorBase.cs
@@ -1,35 +1,36 @@
 using System;
-using Elasticsearch.Net;
 
 namespace Nest
 {
-	/// <inheritdoc cref="ICoreProperty"/>
+	/// <inheritdoc cref="ICoreProperty" />
 	public abstract class CorePropertyDescriptorBase<TDescriptor, TInterface, T>
 		: PropertyDescriptorBase<TDescriptor, TInterface, T>, ICoreProperty
 		where TDescriptor : CorePropertyDescriptorBase<TDescriptor, TInterface, T>, TInterface
 		where TInterface : class, ICoreProperty
 		where T : class
 	{
-		bool? ICoreProperty.Store { get; set; }
-		Union<SimilarityOption, string> ICoreProperty.Similarity { get; set; }
+		protected CorePropertyDescriptorBase(FieldType type) : base(type) { }
+
 		Fields ICoreProperty.CopyTo { get; set; }
 		IProperties ICoreProperty.Fields { get; set; }
+		Union<SimilarityOption, string> ICoreProperty.Similarity { get; set; }
+		bool? ICoreProperty.Store { get; set; }
 
-		protected CorePropertyDescriptorBase(FieldType type) : base(type) {}
-
-		/// <inheritdoc cref="ICoreProperty.Store"/>
+		/// <inheritdoc cref="ICoreProperty.Store" />
 		public TDescriptor Store(bool? store = true) => Assign(a => a.Store = store);
 
-		/// <inheritdoc cref="ICoreProperty.Fields"/>
-		public TDescriptor Fields(Func<PropertiesDescriptor<T>, IPromise<IProperties>> selector) => Assign(a => a.Fields = selector?.Invoke(new PropertiesDescriptor<T>())?.Value);
+		/// <inheritdoc cref="ICoreProperty.Fields" />
+		public TDescriptor Fields(Func<PropertiesDescriptor<T>, IPromise<IProperties>> selector) =>
+			Assign(a => a.Fields = selector?.Invoke(new PropertiesDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="ICoreProperty.Similarity"/>
+		/// <inheritdoc cref="ICoreProperty.Similarity" />
 		public TDescriptor Similarity(SimilarityOption? similarity) => Assign(a => a.Similarity = similarity);
 
-		/// <inheritdoc cref="ICoreProperty.Similarity"/>
+		/// <inheritdoc cref="ICoreProperty.Similarity" />
 		public TDescriptor Similarity(string similarity) => Assign(a => a.Similarity = similarity);
 
-		/// <inheritdoc cref="ICoreProperty.CopyTo"/>
-		public TDescriptor CopyTo(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) => Assign(a => a.CopyTo = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
+		/// <inheritdoc cref="ICoreProperty.CopyTo" />
+		public TDescriptor CopyTo(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
+			Assign(a => a.CopyTo = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 	}
 }
diff --git a/src/Nest/Mapping/Types/DocValuesPropertyBase.cs b/src/Nest/Mapping/Types/DocValuesPropertyBase.cs
index d912c6afe4f..9c2df8c2757 100644
--- a/src/Nest/Mapping/Types/DocValuesPropertyBase.cs
+++ b/src/Nest/Mapping/Types/DocValuesPropertyBase.cs
@@ -1,6 +1,4 @@
-using System;
-using Elasticsearch.Net;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -19,7 +17,7 @@ public interface IDocValuesProperty : ICoreProperty
 		bool? DocValues { get; set; }
 	}
 
-	/// <inheritdoc cref="IDocValuesProperty"/>
+	/// <inheritdoc cref="IDocValuesProperty" />
 	public abstract class DocValuesPropertyBase : CorePropertyBase, IDocValuesProperty
 	{
 		protected DocValuesPropertyBase(FieldType type) : base(type) { }
diff --git a/src/Nest/Mapping/Types/DocValuesPropertyDescriptorBase.cs b/src/Nest/Mapping/Types/DocValuesPropertyDescriptorBase.cs
index a544cf99e8a..8c96b036bf4 100644
--- a/src/Nest/Mapping/Types/DocValuesPropertyDescriptorBase.cs
+++ b/src/Nest/Mapping/Types/DocValuesPropertyDescriptorBase.cs
@@ -1,20 +1,17 @@
-using System;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
-	/// <inheritdoc cref="IDocValuesProperty"/>
+	/// <inheritdoc cref="IDocValuesProperty" />
 	public abstract class DocValuesPropertyDescriptorBase<TDescriptor, TInterface, T>
-	: CorePropertyDescriptorBase<TDescriptor, TInterface, T>, IDocValuesProperty
-	where TDescriptor : DocValuesPropertyDescriptorBase<TDescriptor, TInterface, T>, TInterface
-	where TInterface : class, IDocValuesProperty
-	where T : class
+		: CorePropertyDescriptorBase<TDescriptor, TInterface, T>, IDocValuesProperty
+		where TDescriptor : DocValuesPropertyDescriptorBase<TDescriptor, TInterface, T>, TInterface
+		where TInterface : class, IDocValuesProperty
+		where T : class
 	{
-		bool? IDocValuesProperty.DocValues { get; set; }
-
 		protected DocValuesPropertyDescriptorBase(FieldType type) : base(type) { }
 
-		/// <inheritdoc cref="IDocValuesProperty.DocValues"/>
+		bool? IDocValuesProperty.DocValues { get; set; }
+
+		/// <inheritdoc cref="IDocValuesProperty.DocValues" />
 		public TDescriptor DocValues(bool? docValues = true) => Assign(a => a.DocValues = docValues);
 	}
 }
diff --git a/src/Nest/Mapping/Types/FieldType.cs b/src/Nest/Mapping/Types/FieldType.cs
index 3216bc706c9..f6d2c36f53f 100644
--- a/src/Nest/Mapping/Types/FieldType.cs
+++ b/src/Nest/Mapping/Types/FieldType.cs
@@ -15,79 +15,107 @@ public enum FieldType
 		/// </summary>
 		[EnumMember(Value = "none")]
 		None,
+
 		[EnumMember(Value = "geo_point")]
 		GeoPoint,
+
 		[EnumMember(Value = "geo_shape")]
 		GeoShape,
+
 		/// <summary>
 		/// An ip mapping type allows to store ipv4 addresses in a numeric form allowing to easily sort, and range query it (using ip values).
 		/// </summary>
 		[EnumMember(Value = "ip")]
 		Ip,
+
 		/// <summary>
 		/// The binary type is a base64 representation of binary data that can be stored in the index.
 		/// </summary>
 		[EnumMember(Value = "binary")]
 		Binary,
+
 		[EnumMember(Value = "keyword")]
 		Keyword,
+
 		[EnumMember(Value = "text")]
 		Text,
+
 		[EnumMember(Value = "date")]
 		Date,
+
 		[EnumMember(Value = "boolean")]
 		Boolean,
+
 		[EnumMember(Value = "completion")]
 		Completion,
+
 		[EnumMember(Value = "nested")]
 		Nested,
+
 		/// <summary>
 		/// object type, no need to set this manually if its not a value type this will be set.
 		/// Only set this if you need to force a value type to be mapped to an elasticsearch object type.
 		/// </summary>
 		[EnumMember(Value = "object")]
 		Object,
+
 		/// <summary>
 		/// Murmur hash type, for use with the cardinality aggregation.
 		/// </summary>
 		[EnumMember(Value = "murmur3")]
 		Murmur3Hash,
+
 		[EnumMember(Value = "token_count")]
 		TokenCount,
+
 		[EnumMember(Value = "percolator")]
 		Percolator,
 
 		[EnumMember(Value = "integer")]
 		Integer,
+
 		[EnumMember(Value = "long")]
 		Long,
+
 		[EnumMember(Value = "short")]
 		Short,
+
 		[EnumMember(Value = "byte")]
 		Byte,
+
 		[EnumMember(Value = "float")]
 		Float,
+
 		[EnumMember(Value = "half_float")]
 		HalfFloat,
+
 		[EnumMember(Value = "scaled_float")]
 		ScaledFloat,
+
 		[EnumMember(Value = "double")]
 		Double,
 
 		[EnumMember(Value = "integer_range")]
 		IntegerRange,
+
 		[EnumMember(Value = "float_range")]
 		FloatRange,
+
 		[EnumMember(Value = "long_range")]
 		LongRange,
+
 		[EnumMember(Value = "double_range")]
 		DoubleRange,
+
 		[EnumMember(Value = "date_range")]
 		DateRange,
+
 		[EnumMember(Value = "ip_range")]
 		IpRange,
+
 		[EnumMember(Value = "alias")]
 		Alias,
+
 		[EnumMember(Value = "join")]
 		Join,
 	}
diff --git a/src/Nest/Mapping/Types/Geo/GeoPoint/GeoPointAttribute.cs b/src/Nest/Mapping/Types/Geo/GeoPoint/GeoPointAttribute.cs
index 91013098fb0..10c1471d864 100644
--- a/src/Nest/Mapping/Types/Geo/GeoPoint/GeoPointAttribute.cs
+++ b/src/Nest/Mapping/Types/Geo/GeoPoint/GeoPointAttribute.cs
@@ -2,18 +2,25 @@
 {
 	public class GeoPointAttribute : ElasticsearchDocValuesPropertyAttributeBase, IGeoPointProperty
 	{
-		private IGeoPointProperty Self => this;
-
 		public GeoPointAttribute() : base(FieldType.GeoPoint) { }
 
+		/// <inheritdoc cref="IGeoPointProperty.IgnoreMalformed" />
+		public bool IgnoreMalformed
+		{
+			get => Self.IgnoreMalformed.GetValueOrDefault();
+			set => Self.IgnoreMalformed = value;
+		}
+
+		/// <inheritdoc cref="IGeoPointProperty.IgnoreZValue" />
+		public bool IgnoreZValue
+		{
+			get => Self.IgnoreZValue.GetValueOrDefault(true);
+			set => Self.IgnoreZValue = value;
+		}
+
 		bool? IGeoPointProperty.IgnoreMalformed { get; set; }
 		bool? IGeoPointProperty.IgnoreZValue { get; set; }
 		GeoLocation IGeoPointProperty.NullValue { get; set; }
-
-		/// <inheritdoc cref="IGeoPointProperty.IgnoreMalformed"/>
-		public bool IgnoreMalformed { get => Self.IgnoreMalformed.GetValueOrDefault(); set => Self.IgnoreMalformed = value; }
-
-		/// <inheritdoc cref="IGeoPointProperty.IgnoreZValue"/>
-		public bool IgnoreZValue { get => Self.IgnoreZValue.GetValueOrDefault(true); set => Self.IgnoreZValue= value; }
+		private IGeoPointProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Geo/GeoPoint/GeoPointProperty.cs b/src/Nest/Mapping/Types/Geo/GeoPoint/GeoPointProperty.cs
index 1cf243faf49..58999f1dd79 100644
--- a/src/Nest/Mapping/Types/Geo/GeoPoint/GeoPointProperty.cs
+++ b/src/Nest/Mapping/Types/Geo/GeoPoint/GeoPointProperty.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics;
 using Newtonsoft.Json;
 
@@ -15,7 +14,7 @@ public interface IGeoPointProperty : IDocValuesProperty
 		/// geo-points throw an exception and reject the whole document.
 		/// </summary>
 		[JsonProperty("ignore_malformed")]
-		bool? IgnoreMalformed { get; set;  }
+		bool? IgnoreMalformed { get; set; }
 
 
 		/// <summary>
@@ -25,7 +24,7 @@ public interface IGeoPointProperty : IDocValuesProperty
 		/// throw an exception and reject the whole document.
 		/// </summary>
 		[JsonProperty("ignore_z_value")]
-		bool? IgnoreZValue { get; set;  }
+		bool? IgnoreZValue { get; set; }
 
 		/// <summary>
 		/// Accepts a geo_point value which is substituted for any explicit null values.
@@ -55,12 +54,12 @@ public class GeoPointPropertyDescriptor<T>
 		: DocValuesPropertyDescriptorBase<GeoPointPropertyDescriptor<T>, IGeoPointProperty, T>, IGeoPointProperty
 		where T : class
 	{
+		public GeoPointPropertyDescriptor() : base(FieldType.GeoPoint) { }
+
 		bool? IGeoPointProperty.IgnoreMalformed { get; set; }
 		bool? IGeoPointProperty.IgnoreZValue { get; set; }
 		GeoLocation IGeoPointProperty.NullValue { get; set; }
 
-		public GeoPointPropertyDescriptor() : base(FieldType.GeoPoint) { }
-
 		/// <inheritdoc cref="IGeoPointProperty.IgnoreMalformed" />
 		public GeoPointPropertyDescriptor<T> IgnoreMalformed(bool? ignoreMalformed = true) => Assign(a => a.IgnoreMalformed = ignoreMalformed);
 
diff --git a/src/Nest/Mapping/Types/Geo/GeoShape/GeoOrientation.cs b/src/Nest/Mapping/Types/Geo/GeoShape/GeoOrientation.cs
index d981155026b..2cd6f4bda1f 100644
--- a/src/Nest/Mapping/Types/Geo/GeoShape/GeoOrientation.cs
+++ b/src/Nest/Mapping/Types/Geo/GeoShape/GeoOrientation.cs
@@ -9,6 +9,7 @@ public enum GeoOrientation
 	{
 		[EnumMember(Value = "cw")]
 		ClockWise,
+
 		[EnumMember(Value = "ccw")]
 		CounterClockWise
 	}
diff --git a/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeAttribute.cs b/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeAttribute.cs
index ef3cb1ee8f8..f4e555a1abd 100644
--- a/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeAttribute.cs
+++ b/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeAttribute.cs
@@ -1,43 +1,78 @@
 namespace Nest
 {
-	/// <inheritdoc cref="IGeoShapeProperty"/>
+	/// <inheritdoc cref="IGeoShapeProperty" />
 	public class GeoShapeAttribute : ElasticsearchDocValuesPropertyAttributeBase, IGeoShapeProperty
 	{
-		private IGeoShapeProperty Self => this;
-
 		public GeoShapeAttribute() : base(FieldType.GeoShape) { }
 
-		GeoTree? IGeoShapeProperty.Tree { get; set; }
-		Distance IGeoShapeProperty.Precision { get; set; }
-		GeoOrientation? IGeoShapeProperty.Orientation { get; set; }
-		int? IGeoShapeProperty.TreeLevels { get; set; }
-		GeoStrategy? IGeoShapeProperty.Strategy { get; set; }
-		double? IGeoShapeProperty.DistanceErrorPercentage { get; set; }
-		bool? IGeoShapeProperty.PointsOnly { get; set; }
-		bool? IGeoShapeProperty.IgnoreMalformed { get; set; }
-		bool? IGeoShapeProperty.IgnoreZValue { get; set; }
-
-		/// <inheritdoc cref="IGeoShapeProperty.Tree"/>
-		public GeoTree Tree { get => Self.Tree.GetValueOrDefault(GeoTree.Geohash); set => Self.Tree = value; }
-		/// <inheritdoc cref="IGeoShapeProperty.Orientation"/>
-		public GeoOrientation Orientation { get => Self.Orientation.GetValueOrDefault(GeoOrientation.CounterClockWise); set => Self.Orientation = value; }
-		/// <inheritdoc cref="IGeoShapeProperty.TreeLevels"/>
-		public int TreeLevels { get => Self.TreeLevels.GetValueOrDefault(50); set => Self.TreeLevels = value; }
-		/// <inheritdoc cref="IGeoShapeProperty.Strategy"/>
-		public GeoStrategy Strategy {  get => Self.Strategy.GetValueOrDefault(GeoStrategy.Recursive); set => Self.Strategy = value; }
-		/// <inheritdoc cref="IGeoShapeProperty.DistanceErrorPercentage"/>
+		/// <inheritdoc cref="IGeoShapeProperty.DistanceErrorPercentage" />
 		public double DistanceErrorPercentage
 		{
-			get => Self.Precision != null | Self.TreeLevels != null
+			get => (Self.Precision != null) | (Self.TreeLevels != null)
 				? Self.DistanceErrorPercentage.GetValueOrDefault(0)
 				: Self.DistanceErrorPercentage.GetValueOrDefault(0.025);
 			set => Self.DistanceErrorPercentage = value;
 		}
-		/// <inheritdoc cref="IGeoShapeProperty.PointsOnly"/>
-		public bool PointsOnly { get => Self.PointsOnly.GetValueOrDefault(false); set => Self.PointsOnly = value; }
-		/// <inheritdoc cref="IGeoShapeProperty.IgnoreMalformed"/>
-		public bool IgnoreMalformed { get => Self.IgnoreMalformed.GetValueOrDefault(false); set => Self.IgnoreMalformed = value; }
-		/// <inheritdoc cref="IGeoShapeProperty.IgnoreZValue"/>
-		public bool IgnoreZValue { get => Self.IgnoreZValue.GetValueOrDefault(true); set => Self.IgnoreZValue = value; }
+
+		/// <inheritdoc cref="IGeoShapeProperty.IgnoreMalformed" />
+		public bool IgnoreMalformed
+		{
+			get => Self.IgnoreMalformed.GetValueOrDefault(false);
+			set => Self.IgnoreMalformed = value;
+		}
+
+		/// <inheritdoc cref="IGeoShapeProperty.IgnoreZValue" />
+		public bool IgnoreZValue
+		{
+			get => Self.IgnoreZValue.GetValueOrDefault(true);
+			set => Self.IgnoreZValue = value;
+		}
+
+		/// <inheritdoc cref="IGeoShapeProperty.Orientation" />
+		public GeoOrientation Orientation
+		{
+			get => Self.Orientation.GetValueOrDefault(GeoOrientation.CounterClockWise);
+			set => Self.Orientation = value;
+		}
+
+		/// <inheritdoc cref="IGeoShapeProperty.PointsOnly" />
+		public bool PointsOnly
+		{
+			get => Self.PointsOnly.GetValueOrDefault(false);
+			set => Self.PointsOnly = value;
+		}
+
+		/// <inheritdoc cref="IGeoShapeProperty.Strategy" />
+		public GeoStrategy Strategy
+		{
+			get => Self.Strategy.GetValueOrDefault(GeoStrategy.Recursive);
+			set => Self.Strategy = value;
+		}
+
+		/// <inheritdoc cref="IGeoShapeProperty.Tree" />
+		public GeoTree Tree
+		{
+			get => Self.Tree.GetValueOrDefault(GeoTree.Geohash);
+			set => Self.Tree = value;
+		}
+
+		/// <inheritdoc cref="IGeoShapeProperty.TreeLevels" />
+		public int TreeLevels
+		{
+			get => Self.TreeLevels.GetValueOrDefault(50);
+			set => Self.TreeLevels = value;
+		}
+
+		double? IGeoShapeProperty.DistanceErrorPercentage { get; set; }
+		bool? IGeoShapeProperty.IgnoreMalformed { get; set; }
+		bool? IGeoShapeProperty.IgnoreZValue { get; set; }
+		GeoOrientation? IGeoShapeProperty.Orientation { get; set; }
+		bool? IGeoShapeProperty.PointsOnly { get; set; }
+		Distance IGeoShapeProperty.Precision { get; set; }
+		private IGeoShapeProperty Self => this;
+		GeoStrategy? IGeoShapeProperty.Strategy { get; set; }
+
+		GeoTree? IGeoShapeProperty.Tree { get; set; }
+		int? IGeoShapeProperty.TreeLevels { get; set; }
 	}
 }
diff --git a/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeProperty.cs b/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeProperty.cs
index aefbf6fb46b..54a23df37d5 100644
--- a/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeProperty.cs
+++ b/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeProperty.cs
@@ -10,72 +10,21 @@ namespace Nest
 	public interface IGeoShapeProperty : IDocValuesProperty
 	{
 		/// <summary>
-		/// Name of the PrefixTree implementation to be used.
-		/// Defaults to <see cref="GeoTree.Geohash"/>
-		/// </summary>
-		[JsonProperty("tree")]
-		GeoTree? Tree { get; set; }
-
-		/// <summary>
-		/// Used instead of <see cref="TreeLevels"/> to set an appropriate value for the <see cref="TreeLevels"/>
-		/// parameter. The value specifies the desired precision and Elasticsearch will calculate
-		/// the best tree_levels value to honor this precision.
-		/// </summary>
-		[JsonProperty("precision")]
-		Distance Precision { get; set; }
-
-		/// <summary>
-		/// Defines how to interpret vertex order for polygons and multipolygons.
-		/// Defaults to <see cref="GeoOrientation.CounterClockWise"/>
-		/// </summary>
-		[JsonProperty("orientation")]
-		GeoOrientation? Orientation { get; set; }
-
-		/// <summary>
-		/// Maximum number of layers to be used by the Prefix<see cref="Tree"/>. This can be used to control the
-		/// precision of shape representations and therefore how many terms are indexed.
-		/// Defaults to the default value of the chosen Prefix<see cref="Tree"/> implementation. Since this parameter requires a
-		/// certain level of understanding of the underlying implementation, users may use the
-		/// <see cref="Precision"/> parameter instead.
-		/// </summary>
-		[JsonProperty("tree_levels")]
-		int? TreeLevels { get; set; }
-
-		/// <summary>
-		/// Defines the approach for how to represent shapes at indexing and search time.
-		/// It also influences the capabilities available so it is recommended to let
-		/// Elasticsearch set this parameter automatically.
-		/// </summary>
-		[JsonProperty("strategy")]
-		GeoStrategy? Strategy { get; set; }
-
-		/// <summary>
-		/// Used as a hint to the Prefix<see cref="Tree"/> about how precise it should be.
+		/// Used as a hint to the Prefix<see cref="Tree" /> about how precise it should be.
 		/// Defaults to 0.025 (2.5%) with 0.5 as the maximum supported value.
 		/// </summary>
 		/// <remarks>
-		/// NOTE: This value will default to 0 if a <see cref="Precision"/> or <see cref="TreeLevels"/> definition
+		/// NOTE: This value will default to 0 if a <see cref="Precision" /> or <see cref="TreeLevels" /> definition
 		/// is explicitly defined. This guarantees spatial precision at the level defined in the mapping.
 		/// This can lead to significant memory usage for high resolution shapes with low error
 		/// (e.g. large shapes at 1m with &lt; 0.001 error).
-		/// To improve indexing performance (at the cost of query accuracy) explicitly define <see cref="TreeLevels"/> or
-		/// <see cref="Precision"/> along with a reasonable <see cref="DistanceErrorPercentage"/>,
+		/// To improve indexing performance (at the cost of query accuracy) explicitly define <see cref="TreeLevels" /> or
+		/// <see cref="Precision" /> along with a reasonable <see cref="DistanceErrorPercentage" />,
 		/// noting that large shapes will have greater false positives.
 		/// </remarks>
 		[JsonProperty("distance_error_pct")]
 		double? DistanceErrorPercentage { get; set; }
 
-		/// <summary>
-		/// Configures the geo_shape field type for point shapes only. Defaults to <c>false</c>.
-		/// This optimizes index and search performance
-		/// for the geohash and quadtree when it is known that only points will be indexed.
-		/// At present geo_shape queries can not be executed on geo_point field types.
-		/// This option bridges the gap by improving point performance on a geo_shape field
-		/// so that geo_shape queries are optimal on a point only field.
-		/// </summary>
-		[JsonProperty("points_only")]
-		bool? PointsOnly { get; set; }
-
 		/// <summary>
 		/// If <c>true</c>, malformed geojson shapes are ignored. If false (default),
 		/// malformed geojson shapes throw an exception and reject the whole document.
@@ -97,6 +46,57 @@ public interface IGeoShapeProperty : IDocValuesProperty
 		/// </remarks>
 		[JsonProperty("ignore_z_value")]
 		bool? IgnoreZValue { get; set; }
+
+		/// <summary>
+		/// Defines how to interpret vertex order for polygons and multipolygons.
+		/// Defaults to <see cref="GeoOrientation.CounterClockWise" />
+		/// </summary>
+		[JsonProperty("orientation")]
+		GeoOrientation? Orientation { get; set; }
+
+		/// <summary>
+		/// Configures the geo_shape field type for point shapes only. Defaults to <c>false</c>.
+		/// This optimizes index and search performance
+		/// for the geohash and quadtree when it is known that only points will be indexed.
+		/// At present geo_shape queries can not be executed on geo_point field types.
+		/// This option bridges the gap by improving point performance on a geo_shape field
+		/// so that geo_shape queries are optimal on a point only field.
+		/// </summary>
+		[JsonProperty("points_only")]
+		bool? PointsOnly { get; set; }
+
+		/// <summary>
+		/// Used instead of <see cref="TreeLevels" /> to set an appropriate value for the <see cref="TreeLevels" />
+		/// parameter. The value specifies the desired precision and Elasticsearch will calculate
+		/// the best tree_levels value to honor this precision.
+		/// </summary>
+		[JsonProperty("precision")]
+		Distance Precision { get; set; }
+
+		/// <summary>
+		/// Defines the approach for how to represent shapes at indexing and search time.
+		/// It also influences the capabilities available so it is recommended to let
+		/// Elasticsearch set this parameter automatically.
+		/// </summary>
+		[JsonProperty("strategy")]
+		GeoStrategy? Strategy { get; set; }
+
+		/// <summary>
+		/// Name of the PrefixTree implementation to be used.
+		/// Defaults to <see cref="GeoTree.Geohash" />
+		/// </summary>
+		[JsonProperty("tree")]
+		GeoTree? Tree { get; set; }
+
+		/// <summary>
+		/// Maximum number of layers to be used by the Prefix<see cref="Tree" />. This can be used to control the
+		/// precision of shape representations and therefore how many terms are indexed.
+		/// Defaults to the default value of the chosen Prefix<see cref="Tree" /> implementation. Since this parameter requires a
+		/// certain level of understanding of the underlying implementation, users may use the
+		/// <see cref="Precision" /> parameter instead.
+		/// </summary>
+		[JsonProperty("tree_levels")]
+		int? TreeLevels { get; set; }
 	}
 
 	/// <inheritdoc cref="IGeoShapeProperty" />
@@ -106,79 +106,79 @@ public class GeoShapeProperty : DocValuesPropertyBase, IGeoShapeProperty
 		public GeoShapeProperty() : base(FieldType.GeoShape) { }
 
 		/// <inheritdoc />
-		public GeoTree? Tree { get; set; }
+		public double? DistanceErrorPercentage { get; set; }
 
 		/// <inheritdoc />
-		public Distance Precision { get; set; }
+		public bool? IgnoreMalformed { get; set; }
 
 		/// <inheritdoc />
-		public GeoOrientation? Orientation { get; set; }
+		public bool? IgnoreZValue { get; set; }
 
 		/// <inheritdoc />
-		public int? TreeLevels { get; set; }
+		public GeoOrientation? Orientation { get; set; }
 
 		/// <inheritdoc />
-		public GeoStrategy? Strategy { get; set; }
+		public bool? PointsOnly { get; set; }
 
 		/// <inheritdoc />
-		public double? DistanceErrorPercentage { get; set; }
+		public Distance Precision { get; set; }
 
 		/// <inheritdoc />
-		public bool? PointsOnly { get; set; }
+		public GeoStrategy? Strategy { get; set; }
 
 		/// <inheritdoc />
-		public bool? IgnoreMalformed { get; set; }
+		public GeoTree? Tree { get; set; }
 
 		/// <inheritdoc />
-		public bool? IgnoreZValue { get; set; }
+		public int? TreeLevels { get; set; }
 	}
 
-	/// <inheritdoc cref="IGeoShapeProperty"/>
+	/// <inheritdoc cref="IGeoShapeProperty" />
 	[DebuggerDisplay("{DebugDisplay}")]
 	public class GeoShapePropertyDescriptor<T>
 		: DocValuesPropertyDescriptorBase<GeoShapePropertyDescriptor<T>, IGeoShapeProperty, T>, IGeoShapeProperty
 		where T : class
 	{
-		GeoTree? IGeoShapeProperty.Tree { get; set; }
-		Distance IGeoShapeProperty.Precision { get; set; }
-		GeoOrientation? IGeoShapeProperty.Orientation { get; set; }
-		int? IGeoShapeProperty.TreeLevels { get; set; }
-		GeoStrategy? IGeoShapeProperty.Strategy { get; set; }
+		public GeoShapePropertyDescriptor() : base(FieldType.GeoShape) { }
+
 		double? IGeoShapeProperty.DistanceErrorPercentage { get; set; }
-		bool? IGeoShapeProperty.PointsOnly { get; set; }
 		bool? IGeoShapeProperty.IgnoreMalformed { get; set; }
 		bool? IGeoShapeProperty.IgnoreZValue { get; set; }
+		GeoOrientation? IGeoShapeProperty.Orientation { get; set; }
+		bool? IGeoShapeProperty.PointsOnly { get; set; }
+		Distance IGeoShapeProperty.Precision { get; set; }
+		GeoStrategy? IGeoShapeProperty.Strategy { get; set; }
+		GeoTree? IGeoShapeProperty.Tree { get; set; }
+		int? IGeoShapeProperty.TreeLevels { get; set; }
 
-		public GeoShapePropertyDescriptor() : base(FieldType.GeoShape) { }
-
-		/// <inheritdoc cref="IGeoShapeProperty.Tree"/>
+		/// <inheritdoc cref="IGeoShapeProperty.Tree" />
 		public GeoShapePropertyDescriptor<T> Tree(GeoTree? tree) => Assign(a => a.Tree = tree);
 
-		/// <inheritdoc cref="IGeoShapeProperty.TreeLevels"/>
+		/// <inheritdoc cref="IGeoShapeProperty.TreeLevels" />
 		public GeoShapePropertyDescriptor<T> TreeLevels(int? treeLevels) => Assign(a => a.TreeLevels = treeLevels);
 
-		/// <inheritdoc cref="IGeoShapeProperty.Strategy"/>
+		/// <inheritdoc cref="IGeoShapeProperty.Strategy" />
 		public GeoShapePropertyDescriptor<T> Strategy(GeoStrategy? strategy) => Assign(a => a.Strategy = strategy);
 
-		/// <inheritdoc cref="IGeoShapeProperty.Precision"/>
+		/// <inheritdoc cref="IGeoShapeProperty.Precision" />
 		public GeoShapePropertyDescriptor<T> Precision(double precision, DistanceUnit unit) =>
 			Assign(a => a.Precision = new Distance(precision, unit));
 
-		/// <inheritdoc cref="IGeoShapeProperty.Orientation"/>
+		/// <inheritdoc cref="IGeoShapeProperty.Orientation" />
 		public GeoShapePropertyDescriptor<T> Orientation(GeoOrientation? orientation) => Assign(a => a.Orientation = orientation);
 
-		/// <inheritdoc cref="IGeoShapeProperty.DistanceErrorPercentage"/>
+		/// <inheritdoc cref="IGeoShapeProperty.DistanceErrorPercentage" />
 		public GeoShapePropertyDescriptor<T> DistanceErrorPercentage(double? distanceErrorPercentage) =>
 			Assign(a => a.DistanceErrorPercentage = distanceErrorPercentage);
 
-		/// <inheritdoc cref="IGeoShapeProperty.PointsOnly"/>
+		/// <inheritdoc cref="IGeoShapeProperty.PointsOnly" />
 		public GeoShapePropertyDescriptor<T> PointsOnly(bool? pointsOnly = true) => Assign(a => a.PointsOnly = pointsOnly);
 
-		/// <inheritdoc cref="IGeoShapeProperty.IgnoreMalformed"/>
+		/// <inheritdoc cref="IGeoShapeProperty.IgnoreMalformed" />
 		public GeoShapePropertyDescriptor<T> IgnoreMalformed(bool? ignoreMalformed = true) =>
 			Assign(a => a.IgnoreMalformed = ignoreMalformed);
 
-		/// <inheritdoc cref="IGeoShapeProperty.IgnoreZValue"/>
+		/// <inheritdoc cref="IGeoShapeProperty.IgnoreZValue" />
 		public GeoShapePropertyDescriptor<T> IgnoreZValue(bool? ignoreZValue = true) =>
 			Assign(a => a.IgnoreZValue = ignoreZValue);
 	}
diff --git a/src/Nest/Mapping/Types/Geo/GeoShape/GeoTree.cs b/src/Nest/Mapping/Types/Geo/GeoShape/GeoTree.cs
index 139a5a1b9a8..279c9d71c2d 100644
--- a/src/Nest/Mapping/Types/Geo/GeoShape/GeoTree.cs
+++ b/src/Nest/Mapping/Types/Geo/GeoShape/GeoTree.cs
@@ -9,6 +9,7 @@ public enum GeoTree
 	{
 		[EnumMember(Value = "geohash")]
 		Geohash,
+
 		[EnumMember(Value = "quadtree")]
 		Quadtree
 	}
diff --git a/src/Nest/Mapping/Types/Properties-Scalar.cs b/src/Nest/Mapping/Types/Properties-Scalar.cs
index 453282dafec..99997efb8bb 100644
--- a/src/Nest/Mapping/Types/Properties-Scalar.cs
+++ b/src/Nest/Mapping/Types/Properties-Scalar.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
-using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -12,199 +10,343 @@ public partial interface IPropertiesDescriptor<T, out TReturnType>
 	{
 #pragma warning disable CS3001 // Argument type is not CLS-compliant
 		TReturnType Scalar(Expression<Func<T, int>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, int?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<int>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<int?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, float>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, float?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<float>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<float?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, sbyte>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, sbyte?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<sbyte>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<sbyte?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, short>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, short?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<short>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<short?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, byte>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, byte?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<byte>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<byte?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, long>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, long?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<long>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<long?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, uint>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, uint?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<uint>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<uint?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, TimeSpan>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, TimeSpan?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<TimeSpan>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<TimeSpan?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, decimal>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, decimal?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<decimal>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<decimal?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, ulong>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, ulong?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<ulong>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<ulong?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, double>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, double?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<double>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<double?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, Enum>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, DateTime>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, DateTime?>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<DateTime>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<DateTime?>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, DateTimeOffset>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, DateTimeOffset?>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<DateTimeOffset>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<DateTimeOffset?>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, bool>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, bool?>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<bool>>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<bool?>>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, char>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, char?>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<char>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<char?>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, Guid>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, Guid?>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<Guid>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<Guid?>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null);
 
 		TReturnType Scalar(Expression<Func<T, string>> field, Func<TextPropertyDescriptor<T>, ITextProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IEnumerable<string>>> field, Func<TextPropertyDescriptor<T>, ITextProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, DateRange>> field, Func<DateRangePropertyDescriptor<T>, IDateRangeProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, DoubleRange>> field, Func<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, LongRange>> field, Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IntegerRange>> field, Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, FloatRange>> field, Func<FloatRangePropertyDescriptor<T>, IFloatRangeProperty> selector = null);
+
 		TReturnType Scalar(Expression<Func<T, IpAddressRange>> field, Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> selector = null);
 #pragma warning restore CS3001 // Argument type is not CLS-compliant
 	}
 
-	public partial class PropertiesDescriptor<T> : IsADictionaryDescriptorBase<PropertiesDescriptor<T>, IProperties, PropertyName, IProperty>, IPropertiesDescriptor<T, PropertiesDescriptor<T>>
+	public partial class PropertiesDescriptor<T>
+		: IsADictionaryDescriptorBase<PropertiesDescriptor<T>, IProperties, PropertyName, IProperty>,
+			IPropertiesDescriptor<T, PropertiesDescriptor<T>>
 		where T : class
 	{
 #pragma warning disable CS3001 // Argument type is not CLS-compliant
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, int>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<int>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
-				SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer)));
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<int>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
+			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer)));
+
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, int?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<int?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<int?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Integer)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, float>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Float)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<float>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<float>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Float)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, float?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, float?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Float)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<float?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<float?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Float)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, sbyte>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Byte)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, sbyte?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, sbyte?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Byte)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<sbyte>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<sbyte>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Byte)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<sbyte?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<sbyte?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Byte)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, short>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, short?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, short?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<short>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<short>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<short?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<short?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, byte>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short)));
+
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, byte?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<byte>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<byte>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<byte?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<byte?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Short)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, long>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
+
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, long?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<long>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<long>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<long?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<long?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, uint>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
+
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, uint?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<uint>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<uint>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<uint?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<uint?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
 
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, TimeSpan>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, TimeSpan>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, TimeSpan?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, TimeSpan?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<TimeSpan>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<TimeSpan>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<TimeSpan?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<TimeSpan?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Long)));
 
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, decimal>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, decimal>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, decimal?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, decimal?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<decimal>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<decimal>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<decimal?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<decimal?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, ulong>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, ulong?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, ulong?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<ulong>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<ulong>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<ulong?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<ulong?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
 
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, double>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, double>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, double?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, double?>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<double>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<double>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<double?>>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<double?>>> field,
+			Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new NumberPropertyDescriptor<T>().Name(field).Type(NumberType.Double)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, Enum>> field, Func<NumberPropertyDescriptor<T>, INumberProperty> selector = null) =>
@@ -212,65 +354,130 @@ public PropertiesDescriptor<T> Scalar(Expression<Func<T, Enum>> field, Func<Numb
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DateTime>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field)));
+
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DateTime?>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<DateTime>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<DateTime>>> field,
+			Func<DatePropertyDescriptor<T>, IDateProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<DateTime?>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<DateTime?>>> field,
+			Func<DatePropertyDescriptor<T>, IDateProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field)));
 
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DateTimeOffset>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DateTimeOffset>> field,
+			Func<DatePropertyDescriptor<T>, IDateProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DateTimeOffset?>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DateTimeOffset?>> field,
+			Func<DatePropertyDescriptor<T>, IDateProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<DateTimeOffset>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<DateTimeOffset>>> field,
+			Func<DatePropertyDescriptor<T>, IDateProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<DateTimeOffset?>>> field, Func<DatePropertyDescriptor<T>, IDateProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<DateTimeOffset?>>> field,
+			Func<DatePropertyDescriptor<T>, IDateProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor<T>().Name(field)));
 
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, bool>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null) =>
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, bool>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new BooleanPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, bool?>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, bool?>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new BooleanPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<bool>>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<bool>>> field,
+			Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new BooleanPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<bool?>>> field, Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<bool?>>> field,
+			Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new BooleanPropertyDescriptor<T>().Name(field)));
 
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, char>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, char>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, char?>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, char?>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<char>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<char>>> field,
+			Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<char?>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<char?>>> field,
+			Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field)));
 
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, Guid>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, Guid>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, Guid?>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, Guid?>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<Guid>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<Guid>>> field,
+			Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<Guid?>>> field, Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<Guid?>>> field,
+			Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new KeywordPropertyDescriptor<T>().Name(field)));
 
 		public PropertiesDescriptor<T> Scalar(Expression<Func<T, string>> field, Func<TextPropertyDescriptor<T>, ITextProperty> selector = null) =>
 			SetProperty(selector.InvokeOrDefault(new TextPropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<string>>> field, Func<TextPropertyDescriptor<T>, ITextProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IEnumerable<string>>> field,
+			Func<TextPropertyDescriptor<T>, ITextProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new TextPropertyDescriptor<T>().Name(field)));
 
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DateRange>> field, Func<DateRangePropertyDescriptor<T>, IDateRangeProperty> selector = null) =>
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DateRange>> field,
+			Func<DateRangePropertyDescriptor<T>, IDateRangeProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new DateRangePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DoubleRange>> field, Func<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, DoubleRange>> field,
+			Func<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new DoubleRangePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, LongRange>> field, Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, LongRange>> field,
+			Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new LongRangePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IntegerRange>> field, Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IntegerRange>> field,
+			Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new IntegerRangePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, FloatRange>> field, Func<FloatRangePropertyDescriptor<T>, IFloatRangeProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, FloatRange>> field,
+			Func<FloatRangePropertyDescriptor<T>, IFloatRangeProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new FloatRangePropertyDescriptor<T>().Name(field)));
-		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IpAddressRange>> field, Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> selector = null) =>
+
+		public PropertiesDescriptor<T> Scalar(Expression<Func<T, IpAddressRange>> field,
+			Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> selector = null
+		) =>
 			SetProperty(selector.InvokeOrDefault(new IpRangePropertyDescriptor<T>().Name(field)));
 
 #pragma warning restore CS3001 // Argument type is not CLS-compliant
diff --git a/src/Nest/Mapping/Types/Properties.cs b/src/Nest/Mapping/Types/Properties.cs
index 09d3b18c04c..c1c4aae25a9 100644
--- a/src/Nest/Mapping/Types/Properties.cs
+++ b/src/Nest/Mapping/Types/Properties.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Reflection;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -14,32 +12,35 @@ public interface IProperties : IIsADictionary<PropertyName, IProperty> { }
 	public class Properties : IsADictionaryBase<PropertyName, IProperty>, IProperties
 	{
 		private readonly IConnectionSettingsValues _settings;
-		public Properties() {}
+
+		public Properties() { }
+
 		public Properties(IDictionary<PropertyName, IProperty> container) : base(container) { }
+
 		public Properties(Dictionary<PropertyName, IProperty> container)
 			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
-		internal Properties(IConnectionSettingsValues values)
-		{
-			_settings = values;
-		}
+		internal Properties(IConnectionSettingsValues values) => _settings = values;
 
-		protected override PropertyName Sanitize(PropertyName key) => this._settings?.Inferrer.PropertyName(key) ?? key;
+		public void Add(PropertyName name, IProperty property) => BackingDictionary.Add(Sanitize(name), property);
 
-		public void Add(PropertyName name, IProperty property) => this.BackingDictionary.Add(Sanitize(name), property);
+		protected override PropertyName Sanitize(PropertyName key) => _settings?.Inferrer.PropertyName(key) ?? key;
 	}
 
 	public class Properties<T> : IsADictionaryBase<PropertyName, IProperty>, IProperties
 	{
-		public Properties() {}
+		public Properties() { }
+
 		public Properties(IDictionary<PropertyName, IProperty> container) : base(container) { }
+
 		public Properties(IProperties properties) : base(properties) { }
+
 		public Properties(Dictionary<PropertyName, IProperty> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{ }
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
-		public void Add(PropertyName name, IProperty property) => this.BackingDictionary.Add(name, property);
-		public void Add(Expression<Func<T, object>> name, IProperty property) => this.BackingDictionary.Add(name, property);
+		public void Add(PropertyName name, IProperty property) => BackingDictionary.Add(name, property);
+
+		public void Add(Expression<Func<T, object>> name, IProperty property) => BackingDictionary.Add(name, property);
 	}
 
 	public partial interface IPropertiesDescriptor<T, out TReturnType>
@@ -47,90 +48,112 @@ public partial interface IPropertiesDescriptor<T, out TReturnType>
 		where TReturnType : class
 	{
 		TReturnType Text(Func<TextPropertyDescriptor<T>, ITextProperty> selector);
+
 		TReturnType Keyword(Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector);
+
 		/// <summary>
 		/// Number introduces a numeric mapping that defaults to `float`. Use .Type() to set the right type if needed or use
-		/// Scalar instead of <see cref="Number"/>
+		/// Scalar instead of <see cref="Number" />
 		/// </summary>
 		TReturnType Number(Func<NumberPropertyDescriptor<T>, INumberProperty> selector);
+
 		TReturnType TokenCount(Func<TokenCountPropertyDescriptor<T>, ITokenCountProperty> selector);
+
 		TReturnType Date(Func<DatePropertyDescriptor<T>, IDateProperty> selector);
+
 		TReturnType Boolean(Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector);
+
 		TReturnType Binary(Func<BinaryPropertyDescriptor<T>, IBinaryProperty> selector);
+
 		TReturnType Object<TChild>(Func<ObjectTypeDescriptor<T, TChild>, IObjectProperty> selector)
 			where TChild : class;
+
 		TReturnType Nested<TChild>(Func<NestedPropertyDescriptor<T, TChild>, INestedProperty> selector)
 			where TChild : class;
+
 		TReturnType Ip(Func<IpPropertyDescriptor<T>, IIpProperty> selector);
+
 		TReturnType GeoPoint(Func<GeoPointPropertyDescriptor<T>, IGeoPointProperty> selector);
+
 		TReturnType GeoShape(Func<GeoShapePropertyDescriptor<T>, IGeoShapeProperty> selector);
+
 		TReturnType Completion(Func<CompletionPropertyDescriptor<T>, ICompletionProperty> selector);
+
 		TReturnType Murmur3Hash(Func<Murmur3HashPropertyDescriptor<T>, IMurmur3HashProperty> selector);
+
 		TReturnType Percolator(Func<PercolatorPropertyDescriptor<T>, IPercolatorProperty> selector);
+
 		TReturnType DateRange(Func<DateRangePropertyDescriptor<T>, IDateRangeProperty> selector);
+
 		TReturnType DoubleRange(Func<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty> selector);
+
 		TReturnType FloatRange(Func<FloatRangePropertyDescriptor<T>, IFloatRangeProperty> selector);
+
 		TReturnType IntegerRange(Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector);
+
 		TReturnType LongRange(Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector);
+
 		TReturnType IpRange(Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> selector);
+
 		TReturnType Join(Func<JoinPropertyDescriptor<T>, IJoinProperty> selector);
 	}
 
 	public partial class PropertiesDescriptor<T> where T : class
 	{
 		public PropertiesDescriptor() : base(new Properties<T>()) { }
-		public PropertiesDescriptor(IProperties properties) : base(properties ?? new Properties<T>()) { }
 
-		public PropertiesDescriptor<T> Text(Func<TextPropertyDescriptor<T>, ITextProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor(IProperties properties) : base(properties ?? new Properties<T>()) { }
 
-		public PropertiesDescriptor<T> Keyword(Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Binary(Func<BinaryPropertyDescriptor<T>, IBinaryProperty> selector) => SetProperty(selector);
 
-		/// <summary>
-		/// Number introduces a numeric mapping that defaults to <c>float</c>. use
-		/// <see cref="IProperty.Type"/> to set the right type if needed, or use .Scalar()
-		/// instead of <see cref="Number"/>
-		/// </summary>
-		public PropertiesDescriptor<T> Number(Func<NumberPropertyDescriptor<T>, INumberProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Boolean(Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> TokenCount(Func<TokenCountPropertyDescriptor<T>, ITokenCountProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Completion(Func<CompletionPropertyDescriptor<T>, ICompletionProperty> selector) => SetProperty(selector);
 
 		public PropertiesDescriptor<T> Date(Func<DatePropertyDescriptor<T>, IDateProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> Boolean(Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector) => SetProperty(selector);
-
-		public PropertiesDescriptor<T> Binary(Func<BinaryPropertyDescriptor<T>, IBinaryProperty> selector) => SetProperty(selector);
-
-		public PropertiesDescriptor<T> Object<TChild>(Func<ObjectTypeDescriptor<T, TChild>, IObjectProperty> selector)
-			where TChild : class => SetProperty(selector);
+		public PropertiesDescriptor<T> DateRange(Func<DateRangePropertyDescriptor<T>, IDateRangeProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> Nested<TChild>(Func<NestedPropertyDescriptor<T, TChild>, INestedProperty> selector)
-			where TChild : class => SetProperty(selector);
+		public PropertiesDescriptor<T> DoubleRange(Func<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> Ip(Func<IpPropertyDescriptor<T>, IIpProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> FloatRange(Func<FloatRangePropertyDescriptor<T>, IFloatRangeProperty> selector) => SetProperty(selector);
 
 		public PropertiesDescriptor<T> GeoPoint(Func<GeoPointPropertyDescriptor<T>, IGeoPointProperty> selector) => SetProperty(selector);
 
 		public PropertiesDescriptor<T> GeoShape(Func<GeoShapePropertyDescriptor<T>, IGeoShapeProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> Completion(Func<CompletionPropertyDescriptor<T>, ICompletionProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> IntegerRange(Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> Murmur3Hash(Func<Murmur3HashPropertyDescriptor<T>, IMurmur3HashProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Ip(Func<IpPropertyDescriptor<T>, IIpProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> Percolator(Func<PercolatorPropertyDescriptor<T>, IPercolatorProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> IpRange(Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> DateRange(Func<DateRangePropertyDescriptor<T>, IDateRangeProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Join(Func<JoinPropertyDescriptor<T>, IJoinProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> DoubleRange(Func<DoubleRangePropertyDescriptor<T>, IDoubleRangeProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Keyword(Func<KeywordPropertyDescriptor<T>, IKeywordProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> FloatRange(Func<FloatRangePropertyDescriptor<T>, IFloatRangeProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> LongRange(Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> IntegerRange(Func<IntegerRangePropertyDescriptor<T>, IIntegerRangeProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Murmur3Hash(Func<Murmur3HashPropertyDescriptor<T>, IMurmur3HashProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> LongRange(Func<LongRangePropertyDescriptor<T>, ILongRangeProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Nested<TChild>(Func<NestedPropertyDescriptor<T, TChild>, INestedProperty> selector)
+			where TChild : class => SetProperty(selector);
 
-		public PropertiesDescriptor<T> IpRange(Func<IpRangePropertyDescriptor<T>, IIpRangeProperty> selector) => SetProperty(selector);
+		/// <summary>
+		/// Number introduces a numeric mapping that defaults to <c>float</c>. use
+		/// <see cref="IProperty.Type" /> to set the right type if needed, or use .Scalar()
+		/// instead of <see cref="Number" />
+		/// </summary>
+		public PropertiesDescriptor<T> Number(Func<NumberPropertyDescriptor<T>, INumberProperty> selector) => SetProperty(selector);
 
-		public PropertiesDescriptor<T> Join(Func<JoinPropertyDescriptor<T>, IJoinProperty> selector) => SetProperty(selector);
+		public PropertiesDescriptor<T> Object<TChild>(Func<ObjectTypeDescriptor<T, TChild>, IObjectProperty> selector)
+			where TChild : class => SetProperty(selector);
+
+		public PropertiesDescriptor<T> Percolator(Func<PercolatorPropertyDescriptor<T>, IPercolatorProperty> selector) => SetProperty(selector);
+
+		public PropertiesDescriptor<T> Text(Func<TextPropertyDescriptor<T>, ITextProperty> selector) => SetProperty(selector);
+
+		public PropertiesDescriptor<T> TokenCount(Func<TokenCountPropertyDescriptor<T>, ITokenCountProperty> selector) => SetProperty(selector);
 
 		public PropertiesDescriptor<T> FieldAlias(Func<FieldAliasPropertyDescriptor<T>, IFieldAliasProperty> selector) => SetProperty(selector);
 
@@ -152,14 +175,15 @@ private PropertiesDescriptor<T> SetProperty(IProperty type)
 			if (type.Name.IsConditionless())
 				throw new ArgumentException($"Could not get field name for {typeName} mapping");
 
-			return this.Assign(a => a[type.Name] = type);
+			return Assign(a => a[type.Name] = type);
 		}
-
 	}
 
 	internal static class PropertiesExtensions
 	{
-		internal static IProperties AutoMap(this IProperties existingProperties, Type documentType, IPropertyVisitor visitor = null, int maxRecursion = 0)
+		internal static IProperties AutoMap(this IProperties existingProperties, Type documentType, IPropertyVisitor visitor = null,
+			int maxRecursion = 0
+		)
 		{
 			var properties = new Properties();
 			var autoProperties = new PropertyWalker(documentType, visitor, maxRecursion).GetProperties();
diff --git a/src/Nest/Mapping/Types/PropertiesJsonConverter.cs b/src/Nest/Mapping/Types/PropertiesJsonConverter.cs
index 0ce2fed83b8..88d037ec306 100644
--- a/src/Nest/Mapping/Types/PropertiesJsonConverter.cs
+++ b/src/Nest/Mapping/Types/PropertiesJsonConverter.cs
@@ -11,13 +11,14 @@ internal class PropertiesJsonConverter : JsonConverter
 			new VerbatimDictionaryKeysJsonConverter<PropertyName, IProperty>();
 
 		private readonly PropertyJsonConverter _elasticTypeConverter = new PropertyJsonConverter();
+		public override bool CanWrite => true;
 
 		public override bool CanConvert(Type objectType) => objectType == typeof(IProperties);
-		public override bool CanWrite => true;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			if (!(value is IDictionary<PropertyName, IProperty> dict)) return;
+
 			var settings = serializer.GetConnectionSettings();
 			var props = new Properties();
 			foreach (var kv in dict)
@@ -33,13 +34,14 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				if (settings.PropertyMappings.TryGetValue(propertyInfo, out var propertyMapping))
 				{
 					if (propertyMapping.Ignore) continue;
+
 					props.Add(propertyMapping.Name, kv.Value);
 					continue;
 				}
 				// Check against attribute mapping, CreatePropertyMapping caches.
 				// We do not have to take .Name into account from serializer PropertyName (kv.Key) already handles this
 				propertyMapping = settings.PropertyMappingProvider?.CreatePropertyMapping(propertyInfo);
-				if (propertyMapping  == null || !propertyMapping.Ignore)
+				if (propertyMapping == null || !propertyMapping.Ignore)
 					props.Add(kv.Key, kv.Value);
 			}
 			_dictionaryConverter.WriteJson(writer, props, serializer);
@@ -62,6 +64,5 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			}
 			return r;
 		}
-
 	}
 }
diff --git a/src/Nest/Mapping/Types/PropertyBase.cs b/src/Nest/Mapping/Types/PropertyBase.cs
index 30a10e5c885..abca30caaf5 100644
--- a/src/Nest/Mapping/Types/PropertyBase.cs
+++ b/src/Nest/Mapping/Types/PropertyBase.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 using Elasticsearch.Net;
@@ -14,6 +13,12 @@ namespace Nest
 	[ContractJsonConverter(typeof(PropertyJsonConverter))]
 	public interface IProperty : IFieldMapping
 	{
+		/// <summary>
+		/// Local property metadata that will not be stored in Elasticsearch with the mappings
+		/// </summary>
+		[JsonIgnore]
+		IDictionary<string, object> LocalMetadata { get; set; }
+
 		/// <summary>
 		/// The name of the property
 		/// </summary>
@@ -24,12 +29,6 @@ public interface IProperty : IFieldMapping
 		/// </summary>
 		[JsonProperty("type")]
 		string Type { get; set; }
-
-		/// <summary>
-		/// Local property metadata that will not be stored in Elasticsearch with the mappings
-		/// </summary>
-		[JsonIgnore]
-		IDictionary<string, object> LocalMetadata { get; set; }
 	}
 
 	/// <summary>
@@ -43,28 +42,31 @@ public interface IPropertyWithClrOrigin
 		PropertyInfo ClrOrigin { get; set; }
 	}
 
-	/// <inheritdoc cref="IProperty"/>
+	/// <inheritdoc cref="IProperty" />
 	[DebuggerDisplay("{DebugDisplay}")]
 	public abstract class PropertyBase : IProperty, IPropertyWithClrOrigin
 	{
-		private string _type;
+		protected PropertyBase(FieldType type) => ((IProperty)this).Type = type.GetStringValue();
 
-		string IProperty.Type { get => _type; set => _type = value; }
-		PropertyInfo IPropertyWithClrOrigin.ClrOrigin { get; set; }
+		/// <inheritdoc />
+		public IDictionary<string, object> LocalMetadata { get; set; }
 
-		protected PropertyBase(FieldType type) => ((IProperty)this).Type = type.GetStringValue();
+		/// <inheritdoc />
+		public PropertyName Name { get; set; }
+
+		protected string DebugDisplay => $"Type: {((IProperty)this).Type ?? "<empty>"}, Name: {Name.DebugDisplay} ";
 
 		/// <summary>
 		/// Override for the property type, used for custom mappings
 		/// </summary>
-		protected string TypeOverride { get => _type; set => _type = value; }
+		protected string TypeOverride { get; set; }
 
-		protected string DebugDisplay => $"Type: {((IProperty)this).Type ?? "<empty>"}, Name: {Name.DebugDisplay} ";
-
-		/// <inheritdoc />
-		public PropertyName Name { get; set; }
+		PropertyInfo IPropertyWithClrOrigin.ClrOrigin { get; set; }
 
-		/// <inheritdoc />
-		public IDictionary<string, object> LocalMetadata { get; set; }
+		string IProperty.Type
+		{
+			get => TypeOverride;
+			set => TypeOverride = value;
+		}
 	}
 }
diff --git a/src/Nest/Mapping/Types/PropertyDescriptorBase.cs b/src/Nest/Mapping/Types/PropertyDescriptorBase.cs
index 1264a59ab8e..dc9d5845eef 100644
--- a/src/Nest/Mapping/Types/PropertyDescriptorBase.cs
+++ b/src/Nest/Mapping/Types/PropertyDescriptorBase.cs
@@ -5,30 +5,40 @@
 
 namespace Nest
 {
-	/// <inheritdoc cref="IProperty"/>
+	/// <inheritdoc cref="IProperty" />
 	public abstract class PropertyDescriptorBase<TDescriptor, TInterface, T>
 		: DescriptorBase<TDescriptor, TInterface>, IProperty
 		where TDescriptor : PropertyDescriptorBase<TDescriptor, TInterface, T>, TInterface
 		where TInterface : class, IProperty
 		where T : class
 	{
-		PropertyName IProperty.Name { get; set; }
 		private string _type;
-		protected string TypeOverride { set => _type = value; }
-		string IProperty.Type { get => _type; set => _type = value; }
-		IDictionary<string, object> IProperty.LocalMetadata { get; set; }
+
+		protected PropertyDescriptorBase(FieldType type) => Self.Type = type.GetStringValue();
 
 		protected string DebugDisplay => $"Type: {Self.Type ?? "<empty>"}, Name: {Self.Name.DebugDisplay} ";
 
-		protected PropertyDescriptorBase(FieldType type) => Self.Type = type.GetStringValue();
+		protected string TypeOverride
+		{
+			set => _type = value;
+		}
+
+		IDictionary<string, object> IProperty.LocalMetadata { get; set; }
+		PropertyName IProperty.Name { get; set; }
+
+		string IProperty.Type
+		{
+			get => _type;
+			set => _type = value;
+		}
 
-		/// <inheritdoc cref="IProperty.Name"/>
+		/// <inheritdoc cref="IProperty.Name" />
 		public TDescriptor Name(PropertyName name) => Assign(a => a.Name = name);
 
-		/// <inheritdoc cref="IProperty.Name"/>
+		/// <inheritdoc cref="IProperty.Name" />
 		public TDescriptor Name(Expression<Func<T, object>> objectPath) => Assign(a => a.Name = objectPath);
 
-		/// <inheritdoc cref="IProperty.LocalMetadata"/>
+		/// <inheritdoc cref="IProperty.LocalMetadata" />
 		public TDescriptor LocalMetadata(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector) =>
 			Assign(a => a.LocalMetadata = selector?.Invoke(new FluentDictionary<string, object>()));
 	}
diff --git a/src/Nest/Mapping/Types/Specialized/Attachment/Attachment.cs b/src/Nest/Mapping/Types/Specialized/Attachment/Attachment.cs
index e0dd549062c..64df5d60cfc 100644
--- a/src/Nest/Mapping/Types/Specialized/Attachment/Attachment.cs
+++ b/src/Nest/Mapping/Types/Specialized/Attachment/Attachment.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -13,6 +12,18 @@ public class Attachment
 		[JsonProperty("author")]
 		public string Author { get; set; }
 
+		/// <summary>
+		/// Whether the attachment contains explicit metadata in addition to the
+		/// content. Used at indexing time to determine the serialized form of the
+		/// attachment.
+		/// </summary>
+		[JsonIgnore]
+		public bool ContainsMetadata => !Name.IsNullOrEmpty() ||
+			!ContentType.IsNullOrEmpty() ||
+			!Language.IsNullOrEmpty() ||
+			DetectLanguage.HasValue ||
+			IndexedCharacters.HasValue;
+
 		/// <summary>
 		/// The base64 encoded content. Can be explicitly set
 		/// </summary>
@@ -37,6 +48,22 @@ public class Attachment
 		[JsonProperty("date")]
 		public DateTime? Date { get; set; }
 
+		/// <summary>
+		/// Detect the language of the attachment. Language detection is
+		/// disabled by default.
+		/// </summary>
+		[JsonProperty("detect_language")]
+		public bool? DetectLanguage { get; set; }
+
+		/// <summary>
+		/// Determines how many characters are extracted when indexing the content.
+		/// By default, 100000 characters are extracted when indexing the content.
+		/// -1 can be set to extract all text, but note that all the text needs to be
+		/// allowed to be represented in memory
+		/// </summary>
+		[JsonProperty("indexed_chars")]
+		public long? IndexedCharacters { get; set; }
+
 		/// <summary>
 		/// The keywords in the attachment.
 		/// </summary>
@@ -49,13 +76,6 @@ public class Attachment
 		[JsonProperty("language")]
 		public string Language { get; set; }
 
-		/// <summary>
-		/// Detect the language of the attachment. Language detection is
-		/// disabled by default.
-		/// </summary>
-		[JsonProperty("detect_language")]
-		public bool? DetectLanguage { get; set; }
-
 		/// <summary>
 		/// The name of the attachment. Can be explicitly set
 		/// </summary>
@@ -67,27 +87,6 @@ public class Attachment
 		/// </summary>
 		[JsonProperty("title")]
 		public string Title { get; set; }
-
-		/// <summary>
-		/// Determines how many characters are extracted when indexing the content.
-		/// By default, 100000 characters are extracted when indexing the content.
-		/// -1 can be set to extract all text, but note that all the text needs to be
-		/// allowed to be represented in memory
-		/// </summary>
-		[JsonProperty("indexed_chars")]
-		public long? IndexedCharacters { get; set; }
-
-		/// <summary>
-		/// Whether the attachment contains explicit metadata in addition to the
-		/// content. Used at indexing time to determine the serialized form of the
-		/// attachment.
-		/// </summary>
-		[JsonIgnore]
-		public bool ContainsMetadata => !Name.IsNullOrEmpty() ||
-		                                !ContentType.IsNullOrEmpty() ||
-		                                !Language.IsNullOrEmpty() ||
-										DetectLanguage.HasValue ||
-										IndexedCharacters.HasValue;
 	}
 
 	internal class AttachmentConverter : JsonConverter
@@ -96,9 +95,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		{
 			var attachment = (Attachment)value;
 			if (!attachment.ContainsMetadata)
-			{
 				writer.WriteValue(attachment.Content);
-			}
 			else
 			{
 				writer.WriteStartObject();
@@ -141,10 +138,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			if (reader.TokenType == JsonToken.String)
-			{
-				return new Attachment { Content = (string)reader.Value };
-			}
+			if (reader.TokenType == JsonToken.String) return new Attachment { Content = (string)reader.Value };
 
 			if (reader.TokenType == JsonToken.StartObject)
 			{
@@ -206,7 +200,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 									case JsonToken.Float:
 										attachment.ContentLength = (long?)reader.Value;
 										break;
-
 								}
 								break;
 							case "_language":
@@ -230,7 +223,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 									case JsonToken.Float:
 										attachment.IndexedCharacters = (long?)reader.Value;
 										break;
-
 								}
 								break;
 							case "title":
@@ -238,10 +230,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 								break;
 						}
 					}
-					if (reader.TokenType == JsonToken.EndObject)
-					{
-						break;
-					}
+					if (reader.TokenType == JsonToken.EndObject) break;
 				}
 				return attachment;
 			}
diff --git a/src/Nest/Mapping/Types/Specialized/Completion/CompletionAttribute.cs b/src/Nest/Mapping/Types/Specialized/Completion/CompletionAttribute.cs
index dd97ab17ac2..e505e06c550 100644
--- a/src/Nest/Mapping/Types/Specialized/Completion/CompletionAttribute.cs
+++ b/src/Nest/Mapping/Types/Specialized/Completion/CompletionAttribute.cs
@@ -4,22 +4,45 @@ namespace Nest
 {
 	public class CompletionAttribute : ElasticsearchDocValuesPropertyAttributeBase, ICompletionProperty
 	{
-		private ICompletionProperty Self => this;
-
 		public CompletionAttribute() : base(FieldType.Completion) { }
 
-		string ICompletionProperty.SearchAnalyzer { get; set; }
+		public string Analyzer
+		{
+			get => Self.Analyzer;
+			set => Self.Analyzer = value;
+		}
+
+		public int MaxInputLength
+		{
+			get => Self.MaxInputLength.GetValueOrDefault();
+			set => Self.MaxInputLength = value;
+		}
+
+		public bool PreservePositionIncrements
+		{
+			get => Self.PreservePositionIncrements.GetValueOrDefault();
+			set => Self.PreservePositionIncrements = value;
+		}
+
+		public bool PreserveSeparators
+		{
+			get => Self.PreserveSeparators.GetValueOrDefault();
+			set => Self.PreserveSeparators = value;
+		}
+
+		public string SearchAnalyzer
+		{
+			get => Self.SearchAnalyzer;
+			set => Self.SearchAnalyzer = value;
+		}
+
 		string ICompletionProperty.Analyzer { get; set; }
-		bool? ICompletionProperty.PreserveSeparators { get; set; }
-		bool? ICompletionProperty.PreservePositionIncrements { get; set; }
-		int? ICompletionProperty.MaxInputLength { get; set; }
 		IList<ISuggestContext> ICompletionProperty.Contexts { get; set; }
+		int? ICompletionProperty.MaxInputLength { get; set; }
+		bool? ICompletionProperty.PreservePositionIncrements { get; set; }
+		bool? ICompletionProperty.PreserveSeparators { get; set; }
 
-		public string SearchAnalyzer { get { return Self.SearchAnalyzer; } set { Self.SearchAnalyzer = value; } }
-		public string Analyzer { get { return Self.Analyzer; } set { Self.Analyzer = value; } }
-		public bool PreserveSeparators { get { return Self.PreserveSeparators.GetValueOrDefault(); } set { Self.PreserveSeparators = value; } }
-		public bool PreservePositionIncrements { get { return Self.PreservePositionIncrements.GetValueOrDefault(); } set { Self.PreservePositionIncrements = value; } }
-		public int MaxInputLength { get { return Self.MaxInputLength.GetValueOrDefault(); } set { Self.MaxInputLength = value; } }
-
+		string ICompletionProperty.SearchAnalyzer { get; set; }
+		private ICompletionProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Specialized/Completion/CompletionProperty.cs b/src/Nest/Mapping/Types/Specialized/Completion/CompletionProperty.cs
index 6c62217d9d1..46e4b1a3595 100644
--- a/src/Nest/Mapping/Types/Specialized/Completion/CompletionProperty.cs
+++ b/src/Nest/Mapping/Types/Specialized/Completion/CompletionProperty.cs
@@ -1,31 +1,30 @@
 using System;
-using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface ICompletionProperty : IDocValuesProperty
 	{
-		[JsonProperty("search_analyzer")]
-		string SearchAnalyzer { get; set; }
-
 		[JsonProperty("analyzer")]
 		string Analyzer { get; set; }
 
-		[JsonProperty("preserve_separators")]
-		bool? PreserveSeparators { get; set; }
+		[JsonProperty("contexts")]
+		IList<ISuggestContext> Contexts { get; set; }
+
+		[JsonProperty("max_input_length")]
+		int? MaxInputLength { get; set; }
 
 		[JsonProperty("preserve_position_increments")]
 		bool? PreservePositionIncrements { get; set; }
 
-		[JsonProperty("max_input_length")]
-		int? MaxInputLength { get; set; }
+		[JsonProperty("preserve_separators")]
+		bool? PreserveSeparators { get; set; }
 
-		[JsonProperty("contexts")]
-		IList<ISuggestContext> Contexts { get; set; }
+		[JsonProperty("search_analyzer")]
+		string SearchAnalyzer { get; set; }
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
@@ -34,12 +33,13 @@ public class CompletionProperty : DocValuesPropertyBase, ICompletionProperty
 	{
 		public CompletionProperty() : base(FieldType.Completion) { }
 
-		public string SearchAnalyzer { get; set; }
 		public string Analyzer { get; set; }
-		public bool? PreserveSeparators { get; set; }
-		public bool? PreservePositionIncrements { get; set; }
-		public int? MaxInputLength { get; set; }
 		public IList<ISuggestContext> Contexts { get; set; }
+		public int? MaxInputLength { get; set; }
+		public bool? PreservePositionIncrements { get; set; }
+		public bool? PreserveSeparators { get; set; }
+
+		public string SearchAnalyzer { get; set; }
 	}
 
 	[DebuggerDisplay("{DebugDisplay}")]
@@ -47,14 +47,14 @@ public class CompletionPropertyDescriptor<T>
 		: DocValuesPropertyDescriptorBase<CompletionPropertyDescriptor<T>, ICompletionProperty, T>, ICompletionProperty
 		where T : class
 	{
-		string ICompletionProperty.SearchAnalyzer { get; set; }
+		public CompletionPropertyDescriptor() : base(FieldType.Completion) { }
+
 		string ICompletionProperty.Analyzer { get; set; }
-		bool? ICompletionProperty.PreserveSeparators { get; set; }
-		bool? ICompletionProperty.PreservePositionIncrements { get; set; }
-		int? ICompletionProperty.MaxInputLength { get; set; }
 		IList<ISuggestContext> ICompletionProperty.Contexts { get; set; }
-
-		public CompletionPropertyDescriptor() : base(FieldType.Completion) { }
+		int? ICompletionProperty.MaxInputLength { get; set; }
+		bool? ICompletionProperty.PreservePositionIncrements { get; set; }
+		bool? ICompletionProperty.PreserveSeparators { get; set; }
+		string ICompletionProperty.SearchAnalyzer { get; set; }
 
 		public CompletionPropertyDescriptor<T> SearchAnalyzer(string searchAnalyzer) =>
 			Assign(a => a.SearchAnalyzer = searchAnalyzer);
diff --git a/src/Nest/Mapping/Types/Specialized/FieldAlias/FieldAliasProperty.cs b/src/Nest/Mapping/Types/Specialized/FieldAlias/FieldAliasProperty.cs
index 16326513633..60cdde4a4b2 100644
--- a/src/Nest/Mapping/Types/Specialized/FieldAlias/FieldAliasProperty.cs
+++ b/src/Nest/Mapping/Types/Specialized/FieldAlias/FieldAliasProperty.cs
@@ -33,15 +33,14 @@ public class FieldAliasPropertyDescriptor<T>
 		: PropertyDescriptorBase<FieldAliasPropertyDescriptor<T>, IFieldAliasProperty, T>, IFieldAliasProperty
 		where T : class
 	{
-		Field IFieldAliasProperty.Path { get; set; }
-
 		public FieldAliasPropertyDescriptor() : base(FieldType.Alias) { }
 
+		Field IFieldAliasProperty.Path { get; set; }
+
 		/// <inheritdoc cref="IFieldAliasProperty.Path" />
 		public FieldAliasPropertyDescriptor<T> Path(Expression<Func<T, object>> field) => Assign(a => a.Path = field);
 
 		/// <inheritdoc cref="IFieldAliasProperty.Path" />
 		public FieldAliasPropertyDescriptor<T> Path(Field field) => Assign(a => a.Path = field);
-
 	}
 }
diff --git a/src/Nest/Mapping/Types/Specialized/Generic/GenericProperty.cs b/src/Nest/Mapping/Types/Specialized/Generic/GenericProperty.cs
index ec6bf55eb03..1afbdd7f5ea 100644
--- a/src/Nest/Mapping/Types/Specialized/Generic/GenericProperty.cs
+++ b/src/Nest/Mapping/Types/Specialized/Generic/GenericProperty.cs
@@ -11,6 +11,18 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IGenericProperty : IDocValuesProperty
 	{
+		[JsonProperty("analyzer")]
+		string Analyzer { get; set; }
+
+		[JsonProperty("boost")]
+		double? Boost { get; set; }
+
+		[JsonProperty("fielddata")]
+		IStringFielddata Fielddata { get; set; }
+
+		[JsonProperty("ignore_above")]
+		int? IgnoreAbove { get; set; }
+
 		[JsonIgnore]
 		[Obsolete("Please use Indexed. Will be fixed in NEST 7.x")]
 		FieldIndexOption? Index { get; set; }
@@ -18,35 +30,23 @@ public interface IGenericProperty : IDocValuesProperty
 		[JsonProperty("index")]
 		bool? Indexed { get; set; }
 
-		[JsonProperty("term_vector")]
-		TermVectorOption? TermVector { get; set; }
-
-		[JsonProperty("boost")]
-		double? Boost { get; set; }
-
-		[JsonProperty("null_value")]
-		string NullValue { get; set; }
+		[JsonProperty("index_options")]
+		IndexOptions? IndexOptions { get; set; }
 
 		[JsonProperty("norms")]
 		bool? Norms { get; set; }
 
-		[JsonProperty("index_options")]
-		IndexOptions? IndexOptions { get; set; }
+		[JsonProperty("null_value")]
+		string NullValue { get; set; }
 
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
+		[JsonProperty("position_increment_gap")]
+		int? PositionIncrementGap { get; set; }
 
 		[JsonProperty("search_analyzer")]
 		string SearchAnalyzer { get; set; }
 
-		[JsonProperty("ignore_above")]
-		int? IgnoreAbove { get; set; }
-
-		[JsonProperty("position_increment_gap")]
-		int? PositionIncrementGap { get; set; }
-
-		[JsonProperty("fielddata")]
-		IStringFielddata Fielddata { get; set; }
+		[JsonProperty("term_vector")]
+		TermVectorOption? TermVector { get; set; }
 	}
 
 	/// <summary>
@@ -58,14 +58,12 @@ public class GenericProperty : DocValuesPropertyBase, IGenericProperty
 	{
 		private FieldIndexOption? _index;
 
-		public GenericProperty() : base(FieldType.Object) => this.TypeOverride = null;
+		public GenericProperty() : base(FieldType.Object) => TypeOverride = null;
 
-		public TermVectorOption? TermVector { get; set; }
+		public string Analyzer { get; set; }
 		public double? Boost { get; set; }
-		public string SearchAnalyzer { get; set; }
-		public int? IgnoreAbove { get; set; }
-		public int? PositionIncrementGap { get; set; }
 		public IStringFielddata Fielddata { get; set; }
+		public int? IgnoreAbove { get; set; }
 
 		[Obsolete("Please use Indexed. Will be fixed in NEST 7.x")]
 		public FieldIndexOption? Index
@@ -91,14 +89,18 @@ public FieldIndexOption? Index
 		}
 
 		public bool? Indexed { get; set; }
-		public string NullValue { get; set; }
-		public bool? Norms { get; set; }
 		public IndexOptions? IndexOptions { get; set; }
-		public string Analyzer { get; set; }
+		public bool? Norms { get; set; }
+		public string NullValue { get; set; }
+		public int? PositionIncrementGap { get; set; }
+		public string SearchAnalyzer { get; set; }
+
+		public TermVectorOption? TermVector { get; set; }
+
 		public string Type
 		{
-			get => this.TypeOverride;
-			set => this.TypeOverride = value;
+			get => TypeOverride;
+			set => TypeOverride = value;
 		}
 	}
 
@@ -114,6 +116,13 @@ public class GenericPropertyDescriptor<T>
 	{
 		private FieldIndexOption? _index;
 
+		public GenericPropertyDescriptor() : base(FieldType.Object) => TypeOverride = null;
+
+		string IGenericProperty.Analyzer { get; set; }
+		double? IGenericProperty.Boost { get; set; }
+		IStringFielddata IGenericProperty.Fielddata { get; set; }
+		int? IGenericProperty.IgnoreAbove { get; set; }
+
 		FieldIndexOption? IGenericProperty.Index
 		{
 			get => _index;
@@ -137,20 +146,14 @@ public class GenericPropertyDescriptor<T>
 		}
 
 		bool? IGenericProperty.Indexed { get; set; }
-		TermVectorOption? IGenericProperty.TermVector { get; set; }
-		double? IGenericProperty.Boost { get; set; }
-		string IGenericProperty.NullValue { get; set; }
-		bool? IGenericProperty.Norms { get; set; }
 		IndexOptions? IGenericProperty.IndexOptions { get; set; }
-		string IGenericProperty.Analyzer { get; set; }
-		string IGenericProperty.SearchAnalyzer { get; set; }
-		int? IGenericProperty.IgnoreAbove { get; set; }
+		bool? IGenericProperty.Norms { get; set; }
+		string IGenericProperty.NullValue { get; set; }
 		int? IGenericProperty.PositionIncrementGap { get; set; }
-		IStringFielddata IGenericProperty.Fielddata { get; set; }
-
-		public GenericPropertyDescriptor() : base(FieldType.Object) => this.TypeOverride = null;
+		string IGenericProperty.SearchAnalyzer { get; set; }
+		TermVectorOption? IGenericProperty.TermVector { get; set; }
 
-		public GenericPropertyDescriptor<T> Type(string type) => Assign(a => this.TypeOverride = type);
+		public GenericPropertyDescriptor<T> Type(string type) => Assign(a => TypeOverride = type);
 
 		[Obsolete("Please use the overload that accepts bool?. Will be fixed in NEST 7.x")]
 		public GenericPropertyDescriptor<T> Index(FieldIndexOption? index = FieldIndexOption.NotAnalyzed) => Assign(a => a.Index = index);
@@ -176,7 +179,8 @@ public class GenericPropertyDescriptor<T>
 
 		public GenericPropertyDescriptor<T> IgnoreAbove(int? ignoreAbove) => Assign(a => a.IgnoreAbove = ignoreAbove);
 
-		public GenericPropertyDescriptor<T> PositionIncrementGap(int? positionIncrementGap) => Assign(a => a.PositionIncrementGap = positionIncrementGap);
+		public GenericPropertyDescriptor<T> PositionIncrementGap(int? positionIncrementGap) =>
+			Assign(a => a.PositionIncrementGap = positionIncrementGap);
 
 		public GenericPropertyDescriptor<T> Fielddata(Func<StringFielddataDescriptor, IStringFielddata> selector) =>
 			Assign(a => a.Fielddata = selector?.Invoke(new StringFielddataDescriptor()));
diff --git a/src/Nest/Mapping/Types/Specialized/Ip/IpAttribute.cs b/src/Nest/Mapping/Types/Specialized/Ip/IpAttribute.cs
index 85cf81ba914..51a0d6922ca 100644
--- a/src/Nest/Mapping/Types/Specialized/Ip/IpAttribute.cs
+++ b/src/Nest/Mapping/Types/Specialized/Ip/IpAttribute.cs
@@ -2,17 +2,29 @@
 {
 	public class IpAttribute : ElasticsearchDocValuesPropertyAttributeBase, IIpProperty
 	{
-		private IIpProperty Self => this;
-
 		public IpAttribute() : base(FieldType.Ip) { }
 
+		public double Boost
+		{
+			get => Self.Boost.GetValueOrDefault();
+			set => Self.Boost = value;
+		}
+
+		public bool Index
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
+
+		public string NullValue
+		{
+			get => Self.NullValue;
+			set => Self.NullValue = value;
+		}
+
 		double? IIpProperty.Boost { get; set; }
 		bool? IIpProperty.Index { get; set; }
 		string IIpProperty.NullValue { get; set; }
-
-		public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
-		public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
-		public string NullValue { get { return Self.NullValue; } set { Self.NullValue = value; } }
-
+		private IIpProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Specialized/Ip/IpProperty.cs b/src/Nest/Mapping/Types/Specialized/Ip/IpProperty.cs
index a831d051723..ea032f3d3b6 100644
--- a/src/Nest/Mapping/Types/Specialized/Ip/IpProperty.cs
+++ b/src/Nest/Mapping/Types/Specialized/Ip/IpProperty.cs
@@ -6,12 +6,12 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IIpProperty : IDocValuesProperty
 	{
-		[JsonProperty("index")]
-		bool? Index { get; set; }
-
 		[JsonProperty("boost")]
 		double? Boost { get; set; }
 
+		[JsonProperty("index")]
+		bool? Index { get; set; }
+
 		[JsonProperty("null_value")]
 		string NullValue { get; set; }
 	}
@@ -31,12 +31,12 @@ public class IpPropertyDescriptor<T>
 		: DocValuesPropertyDescriptorBase<IpPropertyDescriptor<T>, IIpProperty, T>, IIpProperty
 		where T : class
 	{
-		bool? IIpProperty.Index { get; set; }
+		public IpPropertyDescriptor() : base(FieldType.Ip) { }
+
 		double? IIpProperty.Boost { get; set; }
+		bool? IIpProperty.Index { get; set; }
 		string IIpProperty.NullValue { get; set; }
 
-		public IpPropertyDescriptor() : base(FieldType.Ip) { }
-
 		public IpPropertyDescriptor<T> Index(bool? index = true) => Assign(a => a.Index = index);
 
 		public IpPropertyDescriptor<T> Boost(double? boost) => Assign(a => a.Boost = boost);
diff --git a/src/Nest/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashProperty.cs b/src/Nest/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashProperty.cs
index 424f987176e..efa3ea4e57e 100644
--- a/src/Nest/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashProperty.cs
+++ b/src/Nest/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashProperty.cs
@@ -3,11 +3,8 @@
 
 namespace Nest
 {
-
 	[JsonObject(MemberSerialization.OptIn)]
-	public interface IMurmur3HashProperty : IDocValuesProperty
-	{
-	}
+	public interface IMurmur3HashProperty : IDocValuesProperty { }
 
 	[DebuggerDisplay("{DebugDisplay}")]
 	public class Murmur3HashProperty : DocValuesPropertyBase, IMurmur3HashProperty
diff --git a/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountAttribute.cs b/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountAttribute.cs
index c5372417a09..4edebe17517 100644
--- a/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountAttribute.cs
+++ b/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountAttribute.cs
@@ -1,22 +1,37 @@
-using System;
-
-namespace Nest
+namespace Nest
 {
 	public class TokenCountAttribute : ElasticsearchDocValuesPropertyAttributeBase, ITokenCountProperty
 	{
-		private ITokenCountProperty Self => this;
-
 		public TokenCountAttribute() : base(FieldType.TokenCount) { }
 
+		public string Analyzer
+		{
+			get => Self.Analyzer;
+			set => Self.Analyzer = value;
+		}
+
+		public double Boost
+		{
+			get => Self.Boost.GetValueOrDefault();
+			set => Self.Boost = value;
+		}
+
+		public bool Index
+		{
+			get => Self.Index.GetValueOrDefault();
+			set => Self.Index = value;
+		}
+
+		public double NullValue
+		{
+			get => Self.NullValue.GetValueOrDefault();
+			set => Self.NullValue = value;
+		}
+
 		string ITokenCountProperty.Analyzer { get; set; }
-		bool? ITokenCountProperty.Index { get; set; }
 		double? ITokenCountProperty.Boost { get; set; }
+		bool? ITokenCountProperty.Index { get; set; }
 		double? ITokenCountProperty.NullValue { get; set; }
-
-		public string Analyzer { get { return Self.Analyzer; } set { Self.Analyzer = value; } }
-		public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
-		public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
-		public double NullValue { get { return Self.NullValue.GetValueOrDefault(); } set { Self.NullValue = value; } }
-
+		private ITokenCountProperty Self => this;
 	}
 }
diff --git a/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountProperty.cs b/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountProperty.cs
index 750ceb2d25e..77b59e04431 100644
--- a/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountProperty.cs
+++ b/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountProperty.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -10,12 +9,12 @@ public interface ITokenCountProperty : IDocValuesProperty
 		[JsonProperty("analyzer")]
 		string Analyzer { get; set; }
 
-		[JsonProperty("index")]
-		bool? Index { get; set; }
-
 		[JsonProperty("boost")]
 		double? Boost { get; set; }
 
+		[JsonProperty("index")]
+		bool? Index { get; set; }
+
 		[JsonProperty("null_value")]
 		double? NullValue { get; set; }
 	}
@@ -27,12 +26,11 @@ public TokenCountProperty() : base(FieldType.TokenCount) { }
 
 		public string Analyzer { get; set; }
 
-		public bool? Index { get; set; }
-
 		public double? Boost { get; set; }
 
-		public double? NullValue { get; set; }
+		public bool? Index { get; set; }
 
+		public double? NullValue { get; set; }
 	}
 
 	[DebuggerDisplay("{DebugDisplay}")]
@@ -48,8 +46,11 @@ public TokenCountPropertyDescriptor() : base(FieldType.TokenCount) { }
 		double? ITokenCountProperty.NullValue { get; set; }
 
 		public TokenCountPropertyDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
+
 		public TokenCountPropertyDescriptor<T> Boost(double? boost) => Assign(a => a.Boost = boost);
+
 		public TokenCountPropertyDescriptor<T> Index(bool? index = true) => Assign(a => a.Index = index);
+
 		public TokenCountPropertyDescriptor<T> NullValue(double? nullValue) => Assign(a => a.NullValue = nullValue);
 	}
 }
diff --git a/src/Nest/Mapping/Visitor/IMappingVisitor.cs b/src/Nest/Mapping/Visitor/IMappingVisitor.cs
index bf2811d3dc8..31e0ba12750 100644
--- a/src/Nest/Mapping/Visitor/IMappingVisitor.cs
+++ b/src/Nest/Mapping/Visitor/IMappingVisitor.cs
@@ -1,32 +1,53 @@
-using System;
-
-namespace Nest
+namespace Nest
 {
 	public interface IMappingVisitor
 	{
 		int Depth { get; set; }
+
 		void Visit(ITypeMapping mapping);
+
 		void Visit(ITextProperty property);
+
 		void Visit(IKeywordProperty property);
+
 		void Visit(IDateProperty property);
+
 		void Visit(IBooleanProperty property);
+
 		void Visit(IBinaryProperty property);
+
 		void Visit(IObjectProperty property);
+
 		void Visit(INestedProperty property);
+
 		void Visit(IIpProperty property);
+
 		void Visit(IGeoPointProperty property);
+
 		void Visit(IGeoShapeProperty property);
+
 		void Visit(INumberProperty property);
+
 		void Visit(ICompletionProperty property);
+
 		void Visit(IMurmur3HashProperty property);
+
 		void Visit(ITokenCountProperty property);
+
 		void Visit(IPercolatorProperty property);
+
 		void Visit(IIntegerRangeProperty property);
+
 		void Visit(IFloatRangeProperty property);
+
 		void Visit(ILongRangeProperty property);
+
 		void Visit(IDoubleRangeProperty property);
+
 		void Visit(IDateRangeProperty property);
+
 		void Visit(IIpRangeProperty property);
+
 		void Visit(IJoinProperty property);
 	}
 
diff --git a/src/Nest/Mapping/Visitor/IPropertyVisitor.cs b/src/Nest/Mapping/Visitor/IPropertyVisitor.cs
index ecec780b817..c32cc1fc2e7 100644
--- a/src/Nest/Mapping/Visitor/IPropertyVisitor.cs
+++ b/src/Nest/Mapping/Visitor/IPropertyVisitor.cs
@@ -5,31 +5,53 @@ namespace Nest
 	public interface IPropertyVisitor
 	{
 		void Visit(ITextProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IKeywordProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(INumberProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IBooleanProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IDateProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IBinaryProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(INestedProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IObjectProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IGeoPointProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IGeoShapeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(ICompletionProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IIpProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IMurmur3HashProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(ITokenCountProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IPercolatorProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IIntegerRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IFloatRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(ILongRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IDoubleRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IDateRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IIpRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		void Visit(IJoinProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
 
 		void Visit(IProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
 
 		IProperty Visit(PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+
 		bool SkipProperty(PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
 	}
 }
diff --git a/src/Nest/Mapping/Visitor/MappingWalker.cs b/src/Nest/Mapping/Visitor/MappingWalker.cs
index c60207fcac1..71bce03551a 100644
--- a/src/Nest/Mapping/Visitor/MappingWalker.cs
+++ b/src/Nest/Mapping/Visitor/MappingWalker.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace Nest
 {
@@ -16,19 +15,22 @@ public MappingWalker(IMappingVisitor visitor)
 		public void Accept(IGetMappingResponse response)
 		{
 			if (response?.Indices == null) return;
+
 			foreach (var indexMapping in response.Indices)
 			{
 				if (indexMapping.Value?.Mappings == null) continue;
+
 				foreach (var typeMapping in indexMapping.Value.Mappings)
-					this.Accept(typeMapping.Value);
+					Accept(typeMapping.Value);
 			}
 		}
 
 		public void Accept(ITypeMapping mapping)
 		{
 			if (mapping == null) return;
-			this._visitor.Visit(mapping);
-			this.Accept(mapping.Properties);
+
+			_visitor.Visit(mapping);
+			Accept(mapping.Properties);
 		}
 
 
@@ -36,12 +38,14 @@ private static void Visit<TProperty>(IProperty prop, Action<TProperty> act)
 			where TProperty : class, IProperty
 		{
 			if (!(prop is TProperty t)) return;
+
 			act(t);
 		}
 
 		public void Accept(IProperties properties)
 		{
 			if (properties == null) return;
+
 			foreach (var kv in properties)
 			{
 				var field = kv.Value;
@@ -52,15 +56,15 @@ public void Accept(IProperties properties)
 					case FieldType.Text:
 						Visit<ITextProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.Keyword:
 						Visit<IKeywordProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.HalfFloat:
@@ -73,146 +77,140 @@ public void Accept(IProperties properties)
 					case FieldType.Long:
 						Visit<INumberProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.Date:
 						Visit<IDateProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.Boolean:
 						Visit<IBooleanProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.Binary:
 						Visit<IBinaryProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.Object:
 						Visit<IObjectProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this._visitor.Depth += 1;
-							this.Accept(t.Properties);
-							this._visitor.Depth -= 1;
+							_visitor.Visit(t);
+							_visitor.Depth += 1;
+							Accept(t.Properties);
+							_visitor.Depth -= 1;
 						});
 						break;
 					case FieldType.Nested:
 						Visit<INestedProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this._visitor.Depth += 1;
-							this.Accept(t.Properties);
-							this._visitor.Depth -= 1;
+							_visitor.Visit(t);
+							_visitor.Depth += 1;
+							Accept(t.Properties);
+							_visitor.Depth -= 1;
 						});
 						break;
 					case FieldType.Ip:
 						Visit<IIpProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.GeoPoint:
 						Visit<IGeoPointProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.GeoShape:
 						Visit<IGeoShapeProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.Completion:
 						Visit<ICompletionProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.Murmur3Hash:
 						Visit<IMurmur3HashProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.TokenCount:
 						Visit<ITokenCountProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.None:
 						continue;
 					case FieldType.Percolator:
-						Visit<IPercolatorProperty>(field, t =>
-						{
-							this._visitor.Visit(t);
-						});
+						Visit<IPercolatorProperty>(field, t => { _visitor.Visit(t); });
 						break;
 					case FieldType.IntegerRange:
 						Visit<IIntegerRangeProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.FloatRange:
 						Visit<IFloatRangeProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.LongRange:
 						Visit<ILongRangeProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.DoubleRange:
 						Visit<IDoubleRangeProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.DateRange:
 						Visit<IDateRangeProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.IpRange:
 						Visit<IIpRangeProperty>(field, t =>
 						{
-							this._visitor.Visit(t);
-							this.Accept(t.Fields);
+							_visitor.Visit(t);
+							Accept(t.Fields);
 						});
 						break;
 					case FieldType.Join:
-						Visit<IJoinProperty>(field, t =>
-						{
-							this._visitor.Visit(t);
-						});
+						Visit<IJoinProperty>(field, t => { _visitor.Visit(t); });
 						break;
 				}
 			}
diff --git a/src/Nest/Mapping/Visitor/NoopPropertyVisitor.cs b/src/Nest/Mapping/Visitor/NoopPropertyVisitor.cs
index cf26d80bb36..24d5bf79d1d 100644
--- a/src/Nest/Mapping/Visitor/NoopPropertyVisitor.cs
+++ b/src/Nest/Mapping/Visitor/NoopPropertyVisitor.cs
@@ -4,97 +4,53 @@ namespace Nest
 {
 	public class NoopPropertyVisitor : IPropertyVisitor
 	{
-		public virtual void Visit(IBooleanProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual bool SkipProperty(PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) => false;
 
-		public virtual void Visit(IBinaryProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(IBooleanProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(IObjectProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(IBinaryProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(IGeoShapeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(IObjectProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(ICompletionProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(IGeoShapeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(IMurmur3HashProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(ICompletionProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(ITokenCountProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(IMurmur3HashProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public void Visit(IPercolatorProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(ITokenCountProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public void Visit(IIntegerRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public void Visit(IPercolatorProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public void Visit(IFloatRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public void Visit(IIntegerRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public void Visit(ILongRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public void Visit(IFloatRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public void Visit(IDoubleRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public void Visit(ILongRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public void Visit(IDateRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public void Visit(IDoubleRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public void Visit(IIpRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public void Visit(IDateRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public void Visit(IJoinProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public void Visit(IIpRangeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(IIpProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public void Visit(IJoinProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(IGeoPointProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(IIpProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(INestedProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(IGeoPointProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(IDateProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(INestedProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(INumberProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(IDateProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(ITextProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(INumberProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual void Visit(IKeywordProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
-		{
-		}
+		public virtual void Visit(ITextProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual IProperty Visit(PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) => null;
+		public virtual void Visit(IKeywordProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) { }
 
-		public virtual bool SkipProperty(PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) => false;
+		public virtual IProperty Visit(PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute) => null;
 
 		public void Visit(IProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
 		{
diff --git a/src/Nest/Mapping/Visitor/PropertyWalker.cs b/src/Nest/Mapping/Visitor/PropertyWalker.cs
index 0a4fe842851..8344e528eed 100644
--- a/src/Nest/Mapping/Visitor/PropertyWalker.cs
+++ b/src/Nest/Mapping/Visitor/PropertyWalker.cs
@@ -1,16 +1,16 @@
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Reflection;
-using System.Collections;
 
 namespace Nest
 {
 	public class PropertyWalker
 	{
-		private readonly Type _type;
-		private readonly IPropertyVisitor _visitor;
 		private readonly int _maxRecursion;
 		private readonly ConcurrentDictionary<Type, int> _seenTypes;
+		private readonly Type _type;
+		private readonly IPropertyVisitor _visitor;
 
 		public PropertyWalker(Type type, IPropertyVisitor visitor, int maxRecursion = 0)
 		{
@@ -84,7 +84,8 @@ private static IProperty InferProperty(PropertyInfo propertyInfo)
 				{
 					Fields = new Properties
 					{
-						{ "keyword", new KeywordProperty
+						{
+							"keyword", new KeywordProperty
 							{
 								IgnoreAbove = 256
 							}
@@ -95,7 +96,7 @@ private static IProperty InferProperty(PropertyInfo propertyInfo)
 			if (type.IsEnumType())
 			{
 				if (type.GetTypeInfo().GetCustomAttribute<StringEnumAttribute>() != null
-				    || propertyInfo.GetCustomAttribute<StringEnumAttribute>() != null)
+					|| propertyInfo.GetCustomAttribute<StringEnumAttribute>() != null)
 					return new KeywordProperty();
 
 				return new NumberProperty(NumberType.Integer);
diff --git a/src/Nest/Modules/Cluster/AllocationAttribute.cs b/src/Nest/Modules/Cluster/AllocationAttribute.cs
index 79a000e0223..5ddcf59f989 100644
--- a/src/Nest/Modules/Cluster/AllocationAttribute.cs
+++ b/src/Nest/Modules/Cluster/AllocationAttribute.cs
@@ -5,18 +5,20 @@ namespace Nest
 {
 	public interface IAllocationAttributes : IIsADictionary<string, IList<string>>
 	{
-		IDictionary<string, IList<string>> Attributes { get; } 
+		IDictionary<string, IList<string>> Attributes { get; }
 	}
 
 	public class AllocationAttributes : IsADictionaryBase<string, IList<string>>, IAllocationAttributes
 	{
-		IDictionary<string, IList<string>> IAllocationAttributes.Attributes => this.BackingDictionary;
+		IDictionary<string, IList<string>> IAllocationAttributes.Attributes => BackingDictionary;
 
-		public void Add(string attribute, params string[] values) => this.BackingDictionary.Add(attribute, values.ToList());
-		public void Add(string attribute, IEnumerable<string> values) => this.BackingDictionary.Add(attribute, values.ToList());
+		public void Add(string attribute, params string[] values) => BackingDictionary.Add(attribute, values.ToList());
+
+		public void Add(string attribute, IEnumerable<string> values) => BackingDictionary.Add(attribute, values.ToList());
 	}
 
-	public class AllocationAttributesDescriptor : IsADictionaryDescriptorBase<AllocationAttributesDescriptor, IAllocationAttributes, string, IList<string>>
+	public class AllocationAttributesDescriptor
+		: IsADictionaryDescriptorBase<AllocationAttributesDescriptor, IAllocationAttributes, string, IList<string>>
 	{
 		public AllocationAttributesDescriptor() : base(new AllocationAttributes()) { }
 	}
diff --git a/src/Nest/Modules/Cluster/AllocationAwareness/AllocationAwarenessSettings.cs b/src/Nest/Modules/Cluster/AllocationAwareness/AllocationAwarenessSettings.cs
index d7cebc031d5..c23c81b6422 100644
--- a/src/Nest/Modules/Cluster/AllocationAwareness/AllocationAwarenessSettings.cs
+++ b/src/Nest/Modules/Cluster/AllocationAwareness/AllocationAwarenessSettings.cs
@@ -14,36 +14,33 @@ public interface IAllocationAwarenessSettings
 
 	public class AllocationAwarenessSettings : IAllocationAwarenessSettings
 	{
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IEnumerable<string> Attributes { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IAllocationAttributes Forced { get; set; }
-
 	}
 
 	public class AllocationAwarenessSettingsDescriptor
 		: DescriptorBase<AllocationAwarenessSettingsDescriptor, IAllocationAwarenessSettings>, IAllocationAwarenessSettings
 	{
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		IEnumerable<string> IAllocationAwarenessSettings.Attributes { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		IAllocationAttributes IAllocationAwarenessSettings.Forced { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationAwarenessSettingsDescriptor Attributes(IEnumerable<string> attributes) => Assign(a => a.Attributes = attributes);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationAwarenessSettingsDescriptor Attributes(params string[] attributes) => Assign(a => a.Attributes = attributes);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationAwarenessSettingsDescriptor Force(IAllocationAttributes forceValues) => Assign(a => a.Forced = forceValues);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationAwarenessSettingsDescriptor Force(Func<AllocationAttributesDescriptor, IAllocationAttributes> selector) =>
 			Assign(a => a.Forced = selector?.Invoke(new AllocationAttributesDescriptor()));
-
 	}
 }
diff --git a/src/Nest/Modules/Cluster/AllocationFiltering/AllocationFilteringSettings.cs b/src/Nest/Modules/Cluster/AllocationFiltering/AllocationFilteringSettings.cs
index bbc410b447e..81061c009aa 100644
--- a/src/Nest/Modules/Cluster/AllocationFiltering/AllocationFilteringSettings.cs
+++ b/src/Nest/Modules/Cluster/AllocationFiltering/AllocationFilteringSettings.cs
@@ -4,62 +4,58 @@ namespace Nest
 {
 	public interface IAllocationFilteringSettings
 	{
-		/// <summary>Assign the index to a node whose {attribute} has at least one of the comma-separated values.</summary>
-		IAllocationAttributes Include { get; set; }
-
 		/// <summary>Assign the index to a node whose {attribute} has all of the comma-separated values.</summary>
 		IAllocationAttributes Exclude { get; set; }
 
+		/// <summary>Assign the index to a node whose {attribute} has at least one of the comma-separated values.</summary>
+		IAllocationAttributes Include { get; set; }
+
 		/// <summary>Assign the index to a node whose {attribute} has none of the comma-separated values.</summary>
 		IAllocationAttributes Require { get; set; }
-
 	}
 
 	public class AllocationFilteringSettings : IAllocationFilteringSettings
 	{
-		///<inheritdoc/>
-		public IAllocationAttributes Include { get; set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IAllocationAttributes Exclude { get; set; }
 
-		///<inheritdoc/>
-		public IAllocationAttributes Require { get; set; }
-
+		/// <inheritdoc />
+		public IAllocationAttributes Include { get; set; }
 
+		/// <inheritdoc />
+		public IAllocationAttributes Require { get; set; }
 	}
 
 	public class AllocationFilteringSettingsDescriptor
 		: DescriptorBase<AllocationFilteringSettingsDescriptor, IAllocationFilteringSettings>, IAllocationFilteringSettings
 	{
+		/// <inheritdoc />
+		IAllocationAttributes IAllocationFilteringSettings.Exclude { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		IAllocationAttributes IAllocationFilteringSettings.Include { get; set; }
 
-		///<inheritdoc/>
-		IAllocationAttributes IAllocationFilteringSettings.Exclude { get; set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		IAllocationAttributes IAllocationFilteringSettings.Require { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationFilteringSettingsDescriptor Include(IAllocationAttributes include) => Assign(a => a.Include = include);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationFilteringSettingsDescriptor Include(Func<AllocationAttributesDescriptor, IAllocationAttributes> selector) =>
 			Assign(a => a.Include = selector?.Invoke(new AllocationAttributesDescriptor()));
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationFilteringSettingsDescriptor Exlude(IAllocationAttributes include) => Assign(a => a.Exclude = include);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationFilteringSettingsDescriptor Exclude(Func<AllocationAttributesDescriptor, IAllocationAttributes> selector) =>
 			Assign(a => a.Exclude = selector?.Invoke(new AllocationAttributesDescriptor()));
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationFilteringSettingsDescriptor Require(IAllocationAttributes include) => Assign(a => a.Require = include);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationFilteringSettingsDescriptor Require(Func<AllocationAttributesDescriptor, IAllocationAttributes> selector) =>
 			Assign(a => a.Require = selector?.Invoke(new AllocationAttributesDescriptor()));
 	}
diff --git a/src/Nest/Modules/Cluster/ClusterModuleSettings.cs b/src/Nest/Modules/Cluster/ClusterModuleSettings.cs
index de0c62f01ad..b62390747f2 100644
--- a/src/Nest/Modules/Cluster/ClusterModuleSettings.cs
+++ b/src/Nest/Modules/Cluster/ClusterModuleSettings.cs
@@ -7,19 +7,19 @@ namespace Nest
 	public interface IClusterModuleSettings
 	{
 		/// <summary></summary>
-		bool? ReadOnly { get; set; }
+		IAllocationAwarenessSettings AllocationAwareness { get; set; }
 
 		/// <summary></summary>
-		IDictionary<string, LogLevel> Logger { get; set; }
+		IAllocationFilteringSettings AllocationFiltering { get; set; }
 
 		/// <summary></summary>
-		IAllocationAwarenessSettings AllocationAwareness { get; set; }
+		IDiskBasedShardAllocationSettings DiskBasedShardAllocation { get; set; }
 
 		/// <summary></summary>
-		IAllocationFilteringSettings AllocationFiltering { get; set; }
+		IDictionary<string, LogLevel> Logger { get; set; }
 
 		/// <summary></summary>
-		IDiskBasedShardAllocationSettings DiskBasedShardAllocation { get; set; }
+		bool? ReadOnly { get; set; }
 
 		/// <summary></summary>
 		IShardAllocationSettings ShardAllocation { get; set; }
@@ -29,91 +29,91 @@ public interface IClusterModuleSettings
 
 		/// <summary></summary>
 		IShardRebalancingSettings ShardRebalancing { get; set; }
-
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class ClusterModuleSettings : IClusterModuleSettings
 	{
-		///<inheritdoc/>
-		public bool? ReadOnly { get; set; }
-
-		///<inheritdoc/>
-		public IDictionary<string, LogLevel> Logger { get; set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IAllocationAwarenessSettings AllocationAwareness { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IAllocationFilteringSettings AllocationFiltering { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IDiskBasedShardAllocationSettings DiskBasedShardAllocation { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
+		public IDictionary<string, LogLevel> Logger { get; set; }
+
+		/// <inheritdoc />
+		public bool? ReadOnly { get; set; }
+
+		/// <inheritdoc />
 		public IShardAllocationSettings ShardAllocation { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IShardBalancingHeuristicsSettings ShardBalancingHeuristics { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IShardRebalancingSettings ShardRebalancing { get; set; }
-
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class ClusterModuleSettingsDescriptor : DescriptorBase<ClusterModuleSettingsDescriptor, IClusterModuleSettings>, IClusterModuleSettings
 	{
-		bool? IClusterModuleSettings.ReadOnly { get; set; }
-
-		IDictionary<string, LogLevel> IClusterModuleSettings.Logger { get; set; }
-
 		IAllocationAwarenessSettings IClusterModuleSettings.AllocationAwareness { get; set; }
 
 		IAllocationFilteringSettings IClusterModuleSettings.AllocationFiltering { get; set; }
 
 		IDiskBasedShardAllocationSettings IClusterModuleSettings.DiskBasedShardAllocation { get; set; }
 
+		IDictionary<string, LogLevel> IClusterModuleSettings.Logger { get; set; }
+		bool? IClusterModuleSettings.ReadOnly { get; set; }
+
 		IShardAllocationSettings IClusterModuleSettings.ShardAllocation { get; set; }
 
 		IShardBalancingHeuristicsSettings IClusterModuleSettings.ShardBalancingHeuristics { get; set; }
 
 		IShardRebalancingSettings IClusterModuleSettings.ShardRebalancing { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ClusterModuleSettingsDescriptor ShardRebalancing(bool? readOnly = true) => Assign(a => a.ReadOnly = readOnly);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ClusterModuleSettingsDescriptor Logger(IDictionary<string, LogLevel> logger) => Assign(a => a.Logger = logger);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ClusterModuleSettingsDescriptor Logger(Func<FluentDictionary<string, LogLevel>, FluentDictionary<string, LogLevel>> selector) =>
 			Assign(a => a.Logger = selector?.Invoke(new FluentDictionary<string, LogLevel>()));
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ClusterModuleSettingsDescriptor AllocationAwareness(Func<AllocationAwarenessSettings, IAllocationAwarenessSettings> selector) =>
 			Assign(a => a.AllocationAwareness = selector?.Invoke(new AllocationAwarenessSettings()));
 
-		///<inheritdoc/>
-		public ClusterModuleSettingsDescriptor AllocationFiltering(Func<AllocationFilteringSettingsDescriptor, IAllocationFilteringSettings> selector) =>
+		/// <inheritdoc />
+		public ClusterModuleSettingsDescriptor
+			AllocationFiltering(Func<AllocationFilteringSettingsDescriptor, IAllocationFilteringSettings> selector) =>
 			Assign(a => a.AllocationFiltering = selector?.Invoke(new AllocationFilteringSettingsDescriptor()));
 
-		///<inheritdoc/>
-		public ClusterModuleSettingsDescriptor DiskBasedShardAllocation(Func<DiskBasedShardAllocationSettingsDescriptor, IDiskBasedShardAllocationSettings> selector) =>
+		/// <inheritdoc />
+		public ClusterModuleSettingsDescriptor DiskBasedShardAllocation(
+			Func<DiskBasedShardAllocationSettingsDescriptor, IDiskBasedShardAllocationSettings> selector
+		) =>
 			Assign(a => a.DiskBasedShardAllocation = selector?.Invoke(new DiskBasedShardAllocationSettingsDescriptor()));
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ClusterModuleSettingsDescriptor ShardAllocation(Func<ShardAllocationSettingsDescriptor, IShardAllocationSettings> selector) =>
 			Assign(a => a.ShardAllocation = selector?.Invoke(new ShardAllocationSettingsDescriptor()));
 
-		///<inheritdoc/>
-		public ClusterModuleSettingsDescriptor ShardBalancingHeuristics(Func<ShardBalancingHeuristicsSettingsDescriptor, IShardBalancingHeuristicsSettings> selector) =>
+		/// <inheritdoc />
+		public ClusterModuleSettingsDescriptor ShardBalancingHeuristics(
+			Func<ShardBalancingHeuristicsSettingsDescriptor, IShardBalancingHeuristicsSettings> selector
+		) =>
 			Assign(a => a.ShardBalancingHeuristics = selector?.Invoke(new ShardBalancingHeuristicsSettingsDescriptor()));
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ClusterModuleSettingsDescriptor ShardRebalancing(Func<ShardRebalancingSettingsDescriptor, IShardRebalancingSettings> selector) =>
 			Assign(a => a.ShardRebalancing = selector?.Invoke(new ShardRebalancingSettingsDescriptor()));
-
 	}
-
 }
diff --git a/src/Nest/Modules/Cluster/DiskBasedShardAllocation/DiskbasedShardAllocationSettings.cs b/src/Nest/Modules/Cluster/DiskBasedShardAllocation/DiskbasedShardAllocationSettings.cs
index 6df8b705fb5..b0c92760783 100644
--- a/src/Nest/Modules/Cluster/DiskBasedShardAllocation/DiskbasedShardAllocationSettings.cs
+++ b/src/Nest/Modules/Cluster/DiskBasedShardAllocation/DiskbasedShardAllocationSettings.cs
@@ -2,77 +2,81 @@ namespace Nest
 {
 	public interface IDiskBasedShardAllocationSettings
 	{
-		/// <summary>Defaults to true. Set to false to disable the disk allocation decider.</summary>
-		bool? ThresholdEnabled { get; set; }
-
-		/// <summary>Controls the low watermark for disk usage. It defaults to 85%, meaning ES will not allocate new shards to nodes once they have more than 85% disk used. It can also be set
-		/// to an absolute byte value (like 500mb) to prevent ES from allocating shards if less than the configured amount of space is available.</summary>
-		string LowWatermark { get; set; }
-
 		/// <summary>
-		/// Controls the high watermark. It defaults to 90%, meaning ES will attempt to relocate shards to another node if the node disk usage rises above 90%.
+		/// Controls the high watermark. It defaults to 90%, meaning ES will attempt to relocate shards to another node if the node disk usage rises
+		/// above 90%.
 		/// It can also be set to an absolute byte value (similar to the low watermark) to relocate shards once less than the
-		///  configured amount of space is available on the node.</summary>
+		///  configured amount of space is available on the node.
+		/// </summary>
 		string HighWatermark { get; set; }
 
-		/// <summary>How often Elasticsearch should check on disk usage for each node in the cluster. Defaults to 30s.</summary>
-		Time UpdateInterval { get; set; }
-
 		/// <summary>
-		/// Defaults to true, which means that Elasticsearch will take into account shards that are currently being relocated to the target node when computing
-		/// a node’s disk usage. Taking relocating shards' sizes into account may, however, mean that the disk usage for a node is incorrectly estimated on the high side,
+		/// Defaults to true, which means that Elasticsearch will take into account shards that are currently being relocated to the target node when
+		/// computing
+		/// a node’s disk usage. Taking relocating shards' sizes into account may, however, mean that the disk usage for a node is incorrectly
+		/// estimated on the high side,
 		/// since the relocation could be 90% complete and a recently retrieved disk usage would include the total size of the
 		/// relocating shard as well as the space already used by the running relocation.
 		/// </summary>
 		bool? IncludeRelocations { get; set; }
+
+		/// <summary>
+		/// Controls the low watermark for disk usage. It defaults to 85%, meaning ES will not allocate new shards to nodes once they have more than
+		/// 85% disk used. It can also be set
+		/// to an absolute byte value (like 500mb) to prevent ES from allocating shards if less than the configured amount of space is available.
+		/// </summary>
+		string LowWatermark { get; set; }
+
+		/// <summary>Defaults to true. Set to false to disable the disk allocation decider.</summary>
+		bool? ThresholdEnabled { get; set; }
+
+		/// <summary>How often Elasticsearch should check on disk usage for each node in the cluster. Defaults to 30s.</summary>
+		Time UpdateInterval { get; set; }
 	}
 
 	public class DiskBasedShardAllocationSettings : IDiskBasedShardAllocationSettings
 	{
-		///<inheritdoc/>
-		public bool? ThresholdEnabled { get; set; }
+		/// <inheritdoc />
+		public string HighWatermark { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
+		public bool? IncludeRelocations { get; set; }
+
+		/// <inheritdoc />
 		public string LowWatermark { get; set; }
 
-		///<inheritdoc/>
-		public string HighWatermark { get; set; }
+		/// <inheritdoc />
+		public bool? ThresholdEnabled { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public Time UpdateInterval { get; set; }
-
-		///<inheritdoc/>
-		public bool? IncludeRelocations { get; set; }
 	}
 
 	public class DiskBasedShardAllocationSettingsDescriptor
 		: DescriptorBase<DiskBasedShardAllocationSettingsDescriptor, IDiskBasedShardAllocationSettings>, IDiskBasedShardAllocationSettings
 	{
-		bool? IDiskBasedShardAllocationSettings.ThresholdEnabled { get; set; }
+		string IDiskBasedShardAllocationSettings.HighWatermark { get; set; }
 
-		string IDiskBasedShardAllocationSettings.LowWatermark { get; set; }
+		bool? IDiskBasedShardAllocationSettings.IncludeRelocations { get; set; }
 
-		string IDiskBasedShardAllocationSettings.HighWatermark { get; set; }
+		string IDiskBasedShardAllocationSettings.LowWatermark { get; set; }
+		bool? IDiskBasedShardAllocationSettings.ThresholdEnabled { get; set; }
 
 		Time IDiskBasedShardAllocationSettings.UpdateInterval { get; set; }
 
-		bool? IDiskBasedShardAllocationSettings.IncludeRelocations { get; set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public DiskBasedShardAllocationSettingsDescriptor ThresholdEnabled(bool? enable = true) => Assign(a => a.ThresholdEnabled = enable);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public DiskBasedShardAllocationSettingsDescriptor LowWatermark(string low) => Assign(a => a.LowWatermark = low);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public DiskBasedShardAllocationSettingsDescriptor HighWatermark(string high) => Assign(a => a.HighWatermark = high);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public DiskBasedShardAllocationSettingsDescriptor UpdateInterval(Time time) => Assign(a => a.UpdateInterval = time);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public DiskBasedShardAllocationSettingsDescriptor IncludeRelocations(bool? include = true) => Assign(a => a.IncludeRelocations = include);
-
-
 	}
 }
diff --git a/src/Nest/Modules/Cluster/ShardAllocation/AllocationEnable.cs b/src/Nest/Modules/Cluster/ShardAllocation/AllocationEnable.cs
index e74d48eb65b..400039caef0 100644
--- a/src/Nest/Modules/Cluster/ShardAllocation/AllocationEnable.cs
+++ b/src/Nest/Modules/Cluster/ShardAllocation/AllocationEnable.cs
@@ -30,6 +30,5 @@ public enum AllocationEnable
 		/// </summary>
 		[EnumMember(Value = "none")]
 		None,
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Cluster/ShardAllocation/AllowRebalance.cs b/src/Nest/Modules/Cluster/ShardAllocation/AllowRebalance.cs
index 817df78bdf4..dab577d6412 100644
--- a/src/Nest/Modules/Cluster/ShardAllocation/AllowRebalance.cs
+++ b/src/Nest/Modules/Cluster/ShardAllocation/AllowRebalance.cs
@@ -24,6 +24,5 @@ public enum AllowRebalance
 		/// </summary>
 		[EnumMember(Value = "indices_all_active")]
 		Replicas,
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Cluster/ShardAllocation/RebalanceEnable.cs b/src/Nest/Modules/Cluster/ShardAllocation/RebalanceEnable.cs
index 339932897ce..b891e38c29e 100644
--- a/src/Nest/Modules/Cluster/ShardAllocation/RebalanceEnable.cs
+++ b/src/Nest/Modules/Cluster/ShardAllocation/RebalanceEnable.cs
@@ -30,6 +30,5 @@ public enum RebalanceEnable
 		/// </summary>
 		[EnumMember(Value = "none")]
 		None,
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Cluster/ShardAllocation/ShardAllocationSettings.cs b/src/Nest/Modules/Cluster/ShardAllocation/ShardAllocationSettings.cs
index 78fc0c364a8..aa69fc6fdd6 100644
--- a/src/Nest/Modules/Cluster/ShardAllocation/ShardAllocationSettings.cs
+++ b/src/Nest/Modules/Cluster/ShardAllocation/ShardAllocationSettings.cs
@@ -11,28 +11,31 @@ public interface IShardAllocationSettings
 		/// <summary>
 		/// While the recovery of replicas happens over the network, the recovery of an unassigned primary after node restart uses
 		/// data from the local disk. These should be fast so more initial primary recoveries can happen in
-		/// parallel on the same node. Defaults to 4.</summary>
+		/// parallel on the same node. Defaults to 4.
+		/// </summary>
 		int? NodeInitialPrimariesRecoveries { get; set; }
 
-		/// <summary>Allows to perform a check to prevent allocation of multiple instances of
+		/// <summary>
+		/// Allows to perform a check to prevent allocation of multiple instances of
 		/// the same shard on a single host, based on host name and host address.
 		/// Defaults to false, meaning that no check is performed by default. This setting only
-		/// applies if multiple nodes are started on the same machine.</summary>
+		/// applies if multiple nodes are started on the same machine.
+		/// </summary>
 		bool? SameShardHost { get; set; }
 	}
 
 	public class ShardAllocationSettings : IShardAllocationSettings
 	{
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllocationEnable? AllocationEnable { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public int? NodeConcurrentRecoveries { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public int? NodeInitialPrimariesRecoveries { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public bool? SameShardHost { get; set; }
 	}
 
@@ -47,17 +50,17 @@ public class ShardAllocationSettingsDescriptor
 
 		bool? IShardAllocationSettings.SameShardHost { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardAllocationSettingsDescriptor AllocationEnable(AllocationEnable? enable) => Assign(a => a.AllocationEnable = enable);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardAllocationSettingsDescriptor NodeConcurrentRecoveries(int? concurrent) => Assign(a => a.NodeConcurrentRecoveries = concurrent);
 
-		///<inheritdoc/>
-		public ShardAllocationSettingsDescriptor NodeInitialPrimariesRecoveries(int? initial) => Assign(a => a.NodeInitialPrimariesRecoveries = initial);
+		/// <inheritdoc />
+		public ShardAllocationSettingsDescriptor NodeInitialPrimariesRecoveries(int? initial) =>
+			Assign(a => a.NodeInitialPrimariesRecoveries = initial);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardAllocationSettingsDescriptor SameShardHost(bool? same = true) => Assign(a => a.SameShardHost = same);
-
 	}
 }
diff --git a/src/Nest/Modules/Cluster/ShardAllocation/ShardBalancingHeuristicsSettings.cs b/src/Nest/Modules/Cluster/ShardAllocation/ShardBalancingHeuristicsSettings.cs
index 425de62c348..284aadbf8c8 100644
--- a/src/Nest/Modules/Cluster/ShardAllocation/ShardBalancingHeuristicsSettings.cs
+++ b/src/Nest/Modules/Cluster/ShardAllocation/ShardBalancingHeuristicsSettings.cs
@@ -2,49 +2,52 @@ namespace Nest
 {
 	public interface IShardBalancingHeuristicsSettings
 	{
-		/// <summary>Defines the weight factor for shards allocated on a node (float). Defaults to 0.45f.
-		///  Raising this raises the tendency to equalize the number of shards across all nodes in the cluster.</summary>
-		float? BalanceShard { get; set; }
-
-		/// <summary>Defines a factor to the number of shards per index allocated on a specific node (float). Defaults to 0.55f. 
-		/// Raising this raises the tendency to equalize the number of shards per index across all nodes in the cluster.</summary>
+		/// <summary>
+		/// Defines a factor to the number of shards per index allocated on a specific node (float). Defaults to 0.55f.
+		/// Raising this raises the tendency to equalize the number of shards per index across all nodes in the cluster.
+		/// </summary>
 		float? BalanceIndex { get; set; }
 
-		/// <summary>Minimal optimization value of operations that should be performed (non negative float). Defaults to 1.0f.
-		///  Raising this will cause the cluster to be less aggressive about optimizing the shard balance</summary>
+		/// <summary>
+		/// Defines the weight factor for shards allocated on a node (float). Defaults to 0.45f.
+		///  Raising this raises the tendency to equalize the number of shards across all nodes in the cluster.
+		/// </summary>
+		float? BalanceShard { get; set; }
+
+		/// <summary>
+		/// Minimal optimization value of operations that should be performed (non negative float). Defaults to 1.0f.
+		///  Raising this will cause the cluster to be less aggressive about optimizing the shard balance
+		/// </summary>
 		float? BalanceThreshold { get; set; }
 	}
 
 	public class ShardBalancingHeuristicsSettings : IShardBalancingHeuristicsSettings
 	{
-		///<inheritdoc/>
-		public float? BalanceShard { get; set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public float? BalanceIndex { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
+		public float? BalanceShard { get; set; }
+
+		/// <inheritdoc />
 		public float? BalanceThreshold { get; set; }
 	}
 
-	public class ShardBalancingHeuristicsSettingsDescriptor 
+	public class ShardBalancingHeuristicsSettingsDescriptor
 		: DescriptorBase<ShardBalancingHeuristicsSettingsDescriptor, IShardBalancingHeuristicsSettings>, IShardBalancingHeuristicsSettings
 	{
-		float? IShardBalancingHeuristicsSettings.BalanceShard { get; set; }
-
 		float? IShardBalancingHeuristicsSettings.BalanceIndex { get; set; }
+		float? IShardBalancingHeuristicsSettings.BalanceShard { get; set; }
 
 		float? IShardBalancingHeuristicsSettings.BalanceThreshold { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardBalancingHeuristicsSettingsDescriptor BalanceShard(float? balance) => Assign(a => a.BalanceShard = balance);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardBalancingHeuristicsSettingsDescriptor BalanceIndex(float? balance) => Assign(a => a.BalanceIndex = balance);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardBalancingHeuristicsSettingsDescriptor BalanceThreshold(float? balance) => Assign(a => a.BalanceThreshold = balance);
-
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Cluster/ShardAllocation/ShardRebalancingSettings.cs b/src/Nest/Modules/Cluster/ShardAllocation/ShardRebalancingSettings.cs
index 6658095e19c..91269c7061b 100644
--- a/src/Nest/Modules/Cluster/ShardAllocation/ShardRebalancingSettings.cs
+++ b/src/Nest/Modules/Cluster/ShardAllocation/ShardRebalancingSettings.cs
@@ -2,46 +2,43 @@ namespace Nest
 {
 	public interface IShardRebalancingSettings
 	{
-		/// <summary>Enable or disable rebalancing for specific kinds of shards</summary>
-		RebalanceEnable? RebalanceEnable { get; set; }
-
 		/// <summary>Specify when shard rebalancing is allowed</summary>
 		AllowRebalance? AllowRebalance { get; set; }
 
 		/// <summary>Allow to control how many concurrent shard rebalances are allowed cluster wide. Defaults to 2.</summary>
 		int? ConcurrentRebalance { get; set; }
+
+		/// <summary>Enable or disable rebalancing for specific kinds of shards</summary>
+		RebalanceEnable? RebalanceEnable { get; set; }
 	}
 
 	public class ShardRebalancingSettings : IShardRebalancingSettings
 	{
-		///<inheritdoc/>
-		public RebalanceEnable? RebalanceEnable { get; set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public AllowRebalance? AllowRebalance { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public int? ConcurrentRebalance { get; set; }
+
+		/// <inheritdoc />
+		public RebalanceEnable? RebalanceEnable { get; set; }
 	}
 
-	public class ShardRebalancingSettingsDescriptor 
+	public class ShardRebalancingSettingsDescriptor
 		: DescriptorBase<ShardRebalancingSettingsDescriptor, IShardRebalancingSettings>, IShardRebalancingSettings
 	{
-		RebalanceEnable? IShardRebalancingSettings.RebalanceEnable { get; set; }
-
 		AllowRebalance? IShardRebalancingSettings.AllowRebalance { get; set; }
 
 		int? IShardRebalancingSettings.ConcurrentRebalance { get; set; }
+		RebalanceEnable? IShardRebalancingSettings.RebalanceEnable { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardRebalancingSettingsDescriptor RebalanceEnable(RebalanceEnable? enable) => Assign(a => a.RebalanceEnable = enable);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardRebalancingSettingsDescriptor AllowRebalance(AllowRebalance? enable) => Assign(a => a.AllowRebalance = enable);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ShardRebalancingSettingsDescriptor ConcurrentRebalance(int? concurrent) => Assign(a => a.ConcurrentRebalance = concurrent);
-
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Gateway/GatewaySettings.cs b/src/Nest/Modules/Gateway/GatewaySettings.cs
index bd690765f9d..9bc4acef341 100644
--- a/src/Nest/Modules/Gateway/GatewaySettings.cs
+++ b/src/Nest/Modules/Gateway/GatewaySettings.cs
@@ -1,19 +1,18 @@
 namespace Nest
 {
-	///<inheritdoc/>
-	public class GatewaySettings 
+	/// <inheritdoc />
+	public class GatewaySettings
 	{
-		///<inheritdoc/>
-		public int? ExpectedNodes { get; internal set; }
+		/// <inheritdoc />
+		public int? ExpectedDataNodes { get; internal set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public int? ExpectedMasterNodes { get; internal set; }
 
-		///<inheritdoc/>
-		public int? ExpectedDataNodes { get; internal set; }
+		/// <inheritdoc />
+		public int? ExpectedNodes { get; internal set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public Time RecoveryAfterTime { get; internal set; }
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Indices/CircuitBreaker/CircuitBreakerSettings.cs b/src/Nest/Modules/Indices/CircuitBreaker/CircuitBreakerSettings.cs
index fb48e6acf7f..66f78239f72 100644
--- a/src/Nest/Modules/Indices/CircuitBreaker/CircuitBreakerSettings.cs
+++ b/src/Nest/Modules/Indices/CircuitBreaker/CircuitBreakerSettings.cs
@@ -2,55 +2,62 @@ namespace Nest
 {
 	public interface ICircuitBreakerSettings
 	{
-		/// <summary></summary>
-		string TotalLimit { get; set; }
 		/// <summary></summary>
 		string FielddataLimit { get; set; }
+
 		/// <summary></summary>
 		float? FielddataOverhead { get; set; }
+
 		/// <summary></summary>
 		string RequestLimit { get; set; }
+
 		/// <summary></summary>
 		float? RequestOverhead { get; set; }
+
+		/// <summary></summary>
+		string TotalLimit { get; set; }
 	}
 
 	public class CircuitBreakerSettings : ICircuitBreakerSettings
 	{
-		/// <inheritdoc/>
-		public string TotalLimit { get; set; }
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public string FielddataLimit { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public float? FielddataOverhead { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public string RequestLimit { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public float? RequestOverhead { get; set; }
+
+		/// <inheritdoc />
+		public string TotalLimit { get; set; }
 	}
 
-	public class CircuitBreakerSettingsDescriptor 
+	public class CircuitBreakerSettingsDescriptor
 		: DescriptorBase<CircuitBreakerSettingsDescriptor, ICircuitBreakerSettings>, ICircuitBreakerSettings
 	{
-		string ICircuitBreakerSettings.TotalLimit { get; set; }
 		string ICircuitBreakerSettings.FielddataLimit { get; set; }
 		float? ICircuitBreakerSettings.FielddataOverhead { get; set; }
 		string ICircuitBreakerSettings.RequestLimit { get; set; }
 		float? ICircuitBreakerSettings.RequestOverhead { get; set; }
+		string ICircuitBreakerSettings.TotalLimit { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CircuitBreakerSettingsDescriptor TotalLimit(string limit) => Assign(a => a.TotalLimit = limit);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CircuitBreakerSettingsDescriptor FielddataLimit(string limit) => Assign(a => a.FielddataLimit = limit);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CircuitBreakerSettingsDescriptor RequestLimit(string limit) => Assign(a => a.RequestLimit = limit);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CircuitBreakerSettingsDescriptor FielddataOverhead(float? overhead) => Assign(a => a.FielddataOverhead = overhead);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public CircuitBreakerSettingsDescriptor RequestOverhead(float? overhead) => Assign(a => a.RequestOverhead = overhead);
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Indices/Fielddata/FielddataBase.cs b/src/Nest/Modules/Indices/Fielddata/FielddataBase.cs
index 69eb62796bd..3a9ea6dacfb 100644
--- a/src/Nest/Modules/Indices/Fielddata/FielddataBase.cs
+++ b/src/Nest/Modules/Indices/Fielddata/FielddataBase.cs
@@ -6,11 +6,11 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IFielddata
 	{
-		[JsonProperty("loading")]
-		FielddataLoading? Loading { get; set; }
-
 		[JsonProperty("filter")]
 		IFielddataFilter Filter { get; set; }
+
+		[JsonProperty("loading")]
+		FielddataLoading? Loading { get; set; }
 	}
 
 	public abstract class FielddataBase : IFielddata
diff --git a/src/Nest/Modules/Indices/Fielddata/FielddataFilter.cs b/src/Nest/Modules/Indices/Fielddata/FielddataFilter.cs
index 2475c94242e..81f31b64ceb 100644
--- a/src/Nest/Modules/Indices/Fielddata/FielddataFilter.cs
+++ b/src/Nest/Modules/Indices/Fielddata/FielddataFilter.cs
@@ -27,11 +27,13 @@ public class FielddataFilterDescriptor
 		IFielddataRegexFilter IFielddataFilter.Regex { get; set; }
 
 		public FielddataFilterDescriptor Frequency(
-			Func<FielddataFrequencyFilterDescriptor, IFielddataFrequencyFilter> frequencyFilterSelector) =>
+			Func<FielddataFrequencyFilterDescriptor, IFielddataFrequencyFilter> frequencyFilterSelector
+		) =>
 			Assign(a => a.Frequency = frequencyFilterSelector(new FielddataFrequencyFilterDescriptor()));
 
 		public FielddataFilterDescriptor Regex(
-			Func<FielddataRegexFilterDescriptor, IFielddataRegexFilter> regexFilterSelector) =>
+			Func<FielddataRegexFilterDescriptor, IFielddataRegexFilter> regexFilterSelector
+		) =>
 			Assign(a => a.Regex = regexFilterSelector(new FielddataRegexFilterDescriptor()));
 	}
 }
diff --git a/src/Nest/Modules/Indices/Fielddata/FielddataFrequencyFilter.cs b/src/Nest/Modules/Indices/Fielddata/FielddataFrequencyFilter.cs
index 7e8c0da0ad3..32fcbe7aee8 100644
--- a/src/Nest/Modules/Indices/Fielddata/FielddataFrequencyFilter.cs
+++ b/src/Nest/Modules/Indices/Fielddata/FielddataFrequencyFilter.cs
@@ -6,28 +6,28 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<FielddataFrequencyFilter>))]
 	public interface IFielddataFrequencyFilter
 	{
-		[JsonProperty("min")]
-		double? Min { get; set; }
-
 		[JsonProperty("max")]
 		double? Max { get; set; }
 
+		[JsonProperty("min")]
+		double? Min { get; set; }
+
 		[JsonProperty("min_segment_size")]
 		int? MinSegmentSize { get; set; }
 	}
 
 	public class FielddataFrequencyFilter : IFielddataFrequencyFilter
 	{
-		public double? Min { get; set; }
 		public double? Max { get; set; }
+		public double? Min { get; set; }
 		public int? MinSegmentSize { get; set; }
 	}
 
 	public class FielddataFrequencyFilterDescriptor
 		: DescriptorBase<FielddataFrequencyFilterDescriptor, IFielddataFrequencyFilter>, IFielddataFrequencyFilter
 	{
-		double? IFielddataFrequencyFilter.Min { get; set; }
 		double? IFielddataFrequencyFilter.Max { get; set; }
+		double? IFielddataFrequencyFilter.Min { get; set; }
 		int? IFielddataFrequencyFilter.MinSegmentSize { get; set; }
 
 		public FielddataFrequencyFilterDescriptor Min(double? min) => Assign(a => a.Min = min);
diff --git a/src/Nest/Modules/Indices/Fielddata/FielddataLoading.cs b/src/Nest/Modules/Indices/Fielddata/FielddataLoading.cs
index 0710591a40a..4bd774acc15 100644
--- a/src/Nest/Modules/Indices/Fielddata/FielddataLoading.cs
+++ b/src/Nest/Modules/Indices/Fielddata/FielddataLoading.cs
@@ -9,6 +9,7 @@ public enum FielddataLoading
 	{
 		[EnumMember(Value = "eager")]
 		Eager,
+
 		[EnumMember(Value = "eager_global_ordinals")]
 		EagerGlobalOrdinals
 	}
diff --git a/src/Nest/Modules/Indices/Fielddata/FielddataSettings.cs b/src/Nest/Modules/Indices/Fielddata/FielddataSettings.cs
index dba0f657ac1..a0814bd24de 100644
--- a/src/Nest/Modules/Indices/Fielddata/FielddataSettings.cs
+++ b/src/Nest/Modules/Indices/Fielddata/FielddataSettings.cs
@@ -1,12 +1,12 @@
 namespace Nest
 {
-	///<inheritdoc/>
-	public class FielddataSettings 
+	/// <inheritdoc />
+	public class FielddataSettings
 	{
-		///<inheritdoc/>
-		public string CacheSize { get; internal set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public Time CacheExpire { get; internal set; }
+
+		/// <inheritdoc />
+		public string CacheSize { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Indices/Fielddata/GeoPoint/GeoPointFielddata.cs b/src/Nest/Modules/Indices/Fielddata/GeoPoint/GeoPointFielddata.cs
index 1a1e0e551ae..b602d9a51d1 100644
--- a/src/Nest/Modules/Indices/Fielddata/GeoPoint/GeoPointFielddata.cs
+++ b/src/Nest/Modules/Indices/Fielddata/GeoPoint/GeoPointFielddata.cs
@@ -5,18 +5,17 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IGeoPointFielddata : IFielddata
 	{
-		[JsonProperty("precision")]
-		Distance Precision { get; set; }
-
 		[JsonProperty("format")]
 		GeoPointFielddataFormat? Format { get; set; }
+
+		[JsonProperty("precision")]
+		Distance Precision { get; set; }
 	}
 
 	public class GeoPointFielddata : FielddataBase, IGeoPointFielddata
 	{
-		public Distance Precision { get; set; }
-
 		public GeoPointFielddataFormat? Format { get; set; }
+		public Distance Precision { get; set; }
 	}
 
 	public class GeoPointFielddataDescriptor
diff --git a/src/Nest/Modules/Indices/Fielddata/GeoPoint/GeoPointFielddataFormat.cs b/src/Nest/Modules/Indices/Fielddata/GeoPoint/GeoPointFielddataFormat.cs
index 1525d71e2e3..05a8397c281 100644
--- a/src/Nest/Modules/Indices/Fielddata/GeoPoint/GeoPointFielddataFormat.cs
+++ b/src/Nest/Modules/Indices/Fielddata/GeoPoint/GeoPointFielddataFormat.cs
@@ -9,10 +9,13 @@ public enum GeoPointFielddataFormat
 	{
 		[EnumMember(Value = "array")]
 		Array,
+
 		[EnumMember(Value = "doc_values")]
 		DocValues,
+
 		[EnumMember(Value = "compressed")]
 		Compressed,
+
 		[EnumMember(Value = "disabled")]
 		Disabled
 	}
diff --git a/src/Nest/Modules/Indices/Fielddata/Numeric/NumericFielddataFormat.cs b/src/Nest/Modules/Indices/Fielddata/Numeric/NumericFielddataFormat.cs
index 7f977134534..90c1285f03c 100644
--- a/src/Nest/Modules/Indices/Fielddata/Numeric/NumericFielddataFormat.cs
+++ b/src/Nest/Modules/Indices/Fielddata/Numeric/NumericFielddataFormat.cs
@@ -9,6 +9,7 @@ public enum NumericFielddataFormat
 	{
 		[EnumMember(Value = "array")]
 		Array,
+
 		[EnumMember(Value = "disabled")]
 		Disabled
 	}
diff --git a/src/Nest/Modules/Indices/Fielddata/String/StringFielddataFormat.cs b/src/Nest/Modules/Indices/Fielddata/String/StringFielddataFormat.cs
index bbe123dee89..c8a6725a2b7 100644
--- a/src/Nest/Modules/Indices/Fielddata/String/StringFielddataFormat.cs
+++ b/src/Nest/Modules/Indices/Fielddata/String/StringFielddataFormat.cs
@@ -9,6 +9,7 @@ public enum StringFielddataFormat
 	{
 		[EnumMember(Value = "paged_bytes")]
 		PagedBytes,
+
 		[EnumMember(Value = "disabled")]
 		Disabled
 	}
diff --git a/src/Nest/Modules/Indices/IndexingBuffer/IndexingBufferSettings.cs b/src/Nest/Modules/Indices/IndexingBuffer/IndexingBufferSettings.cs
index 28bd86774df..ddc7ebcef80 100644
--- a/src/Nest/Modules/Indices/IndexingBuffer/IndexingBufferSettings.cs
+++ b/src/Nest/Modules/Indices/IndexingBuffer/IndexingBufferSettings.cs
@@ -1,22 +1,31 @@
 namespace Nest
 {
 	/// <summary>
-	/// The indexing buffer is used to store newly indexed documents. When it fills up, the documents in the buffer are written to a segment on disk. It is divided between all shards on the node.
+	/// The indexing buffer is used to store newly indexed documents. When it fills up, the documents in the buffer are written to a segment on
+	/// disk. It is divided between all shards on the node.
 	/// <para>The following settings are static and must be configured on every data node in the cluster</para>
 	/// </summary>
-	public class IndexingBufferSettings 
+	public class IndexingBufferSettings
 	{
-		/// <summary>Accepts either a percentage or a byte size value. It defaults to 10%, meaning that 10% of the total heap allocated to a node will be used as the indexing buffer size.</summary>
+		/// <summary>
+		/// Accepts either a percentage or a byte size value. It defaults to 10%, meaning that 10% of the total heap allocated to a node will
+		/// be used as the indexing buffer size.
+		/// </summary>
 		public string IndexBufferSize { get; internal set; }
 
-		/// <summary>If the index_buffer_size is specified as a percentage, then this setting can be used to specify an absolute minimum. Defaults to 48mb.</summary>
-		public string IndexBufferSizeMinimum { get; internal set; }
-
-		/// <summary>If the index_buffer_size is specified as a percentage, then this setting can be used to specify an absolute maximum. Defaults to unbounded.</summary>
+		/// <summary>
+		/// If the index_buffer_size is specified as a percentage, then this setting can be used to specify an absolute maximum. Defaults to
+		/// unbounded.
+		/// </summary>
 		public string IndexBufferSizeMaximum { get; internal set; }
 
+		/// <summary>
+		/// If the index_buffer_size is specified as a percentage, then this setting can be used to specify an absolute minimum. Defaults to
+		/// 48mb.
+		/// </summary>
+		public string IndexBufferSizeMinimum { get; internal set; }
+
 		/// <summary>Sets a hard lower limit for the memory allocated per shard for its own indexing buffer. Defaults to 4mb.</summary>
 		public string ShardBufferSizeMinimum { get; internal set; }
-
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Indices/IndicesModuleSettings.cs b/src/Nest/Modules/Indices/IndicesModuleSettings.cs
index 3f9fc1381f0..d4625598b3f 100644
--- a/src/Nest/Modules/Indices/IndicesModuleSettings.cs
+++ b/src/Nest/Modules/Indices/IndicesModuleSettings.cs
@@ -5,9 +5,6 @@ namespace Nest
 	/// <summary> Settings to control where, when, and how shards are allocated to nodes. </summary>
 	public interface IIndicesModuleSettings
 	{
-		/// <summary></summary>
-		string QeueriesCacheSize { get; set; }
-
 		/// <summary></summary>
 		ICircuitBreakerSettings CircuitBreakerSettings { get; set; }
 
@@ -15,53 +12,51 @@ public interface IIndicesModuleSettings
 		FielddataSettings FielddataSettings { get; set; }
 
 		/// <summary></summary>
-		IIndicesRecoverySettings RecoverySettings { get; set; }
+		string QeueriesCacheSize { get; set; }
 
+		/// <summary></summary>
+		IIndicesRecoverySettings RecoverySettings { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class IndicesModuleSettings : IIndicesModuleSettings
 	{
-		///<inheritdoc/>
-		public string QeueriesCacheSize { get; set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public ICircuitBreakerSettings CircuitBreakerSettings { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public FielddataSettings FielddataSettings { get; set; }
 
-		///<inheritdoc/>
-		public IIndicesRecoverySettings RecoverySettings { get; set; }
+		/// <inheritdoc />
+		public string QeueriesCacheSize { get; set; }
 
+		/// <inheritdoc />
+		public IIndicesRecoverySettings RecoverySettings { get; set; }
 	}
 
-	///<inheritdoc/>
+	/// <inheritdoc />
 	public class IndicesModuleSettingsDescriptor : DescriptorBase<IndicesModuleSettingsDescriptor, IIndicesModuleSettings>, IIndicesModuleSettings
 	{
-
-		///<inheritdoc/>
-		string IIndicesModuleSettings.QeueriesCacheSize { get; set; }
-
-		///<inheritdoc/>
+		/// <inheritdoc />
 		ICircuitBreakerSettings IIndicesModuleSettings.CircuitBreakerSettings { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		FielddataSettings IIndicesModuleSettings.FielddataSettings { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
+		string IIndicesModuleSettings.QeueriesCacheSize { get; set; }
+
+		/// <inheritdoc />
 		IIndicesRecoverySettings IIndicesModuleSettings.RecoverySettings { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IndicesModuleSettingsDescriptor CircuitBreaker(Func<CircuitBreakerSettingsDescriptor, ICircuitBreakerSettings> selector) =>
 			Assign(a => a.CircuitBreakerSettings = selector?.Invoke(new CircuitBreakerSettingsDescriptor()));
 
 		//fielddatasettings are static
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public IndicesModuleSettingsDescriptor IndicesRecovery(Func<IndicesRecoverySettingsDescriptor, IIndicesRecoverySettings> selector) =>
 			Assign(a => a.RecoverySettings = selector?.Invoke(new IndicesRecoverySettingsDescriptor()));
-
 	}
-
 }
diff --git a/src/Nest/Modules/Indices/Recovery/IndicesRecoverySettings.cs b/src/Nest/Modules/Indices/Recovery/IndicesRecoverySettings.cs
index bc33adb4222..8f95f89fab5 100644
--- a/src/Nest/Modules/Indices/Recovery/IndicesRecoverySettings.cs
+++ b/src/Nest/Modules/Indices/Recovery/IndicesRecoverySettings.cs
@@ -2,64 +2,82 @@ namespace Nest
 {
 	public interface IIndicesRecoverySettings
 	{
-		/// <summary> defaults to 3</summary>
-		int? ConcurrentStreams { get; set; }
+		/// <summary> defaults to true</summary>
+		bool? Compress { get; set; }
+
 		/// <summary> defaults to 2</summary>
 		int? ConcurrentSmallFileStreams { get; set; }
+
+		/// <summary> defaults to 3</summary>
+		int? ConcurrentStreams { get; set; }
+
 		/// <summary> defaults to 512kb</summary>
 		string FileChunkSize { get; set; }
+
+		/// <summary> defaults to 40mb</summary>
+		string MaxBytesPerSecond { get; set; }
+
 		/// <summary> defaults to 1000</summary>
 		int? TranslogOperations { get; set; }
+
 		/// <summary> defaults to 512kb</summary>
 		string TranslogSize { get; set; }
-		/// <summary> defaults to true</summary>
-		bool? Compress { get; set; }
-		/// <summary> defaults to 40mb</summary>
-		string MaxBytesPerSecond { get; set; }
 	}
 
 	public class IndicesRecoverySettings : IIndicesRecoverySettings
 	{
-		/// <inheritdoc/>
-		public int? ConcurrentStreams { get; set; }
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public bool? Compress { get; set; }
+
+		/// <inheritdoc />
 		public int? ConcurrentSmallFileStreams { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public int? ConcurrentStreams { get; set; }
+
+		/// <inheritdoc />
 		public string FileChunkSize { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public string MaxBytesPerSecond { get; set; }
+
+		/// <inheritdoc />
 		public int? TranslogOperations { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public string TranslogSize { get; set; }
-		/// <inheritdoc/>
-		public bool? Compress { get; set; }
-		/// <inheritdoc/>
-		public string MaxBytesPerSecond { get; set; }
 	}
 
 	public class IndicesRecoverySettingsDescriptor
 		: DescriptorBase<IndicesRecoverySettingsDescriptor, IIndicesRecoverySettings>, IIndicesRecoverySettings
 	{
-		int? IIndicesRecoverySettings.ConcurrentStreams { get; set; }
+		bool? IIndicesRecoverySettings.Compress { get; set; }
 		int? IIndicesRecoverySettings.ConcurrentSmallFileStreams { get; set; }
+		int? IIndicesRecoverySettings.ConcurrentStreams { get; set; }
 		string IIndicesRecoverySettings.FileChunkSize { get; set; }
+		string IIndicesRecoverySettings.MaxBytesPerSecond { get; set; }
 		int? IIndicesRecoverySettings.TranslogOperations { get; set; }
 		string IIndicesRecoverySettings.TranslogSize { get; set; }
-		bool? IIndicesRecoverySettings.Compress { get; set; }
-		string IIndicesRecoverySettings.MaxBytesPerSecond { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IndicesRecoverySettingsDescriptor ConcurrentStreams(int? streams) => Assign(a => a.ConcurrentStreams = streams);
-		/// <inheritdoc/>
-		public IndicesRecoverySettingsDescriptor ConcurrentSmallFileStreams(int? streams)=> Assign(a => a.ConcurrentSmallFileStreams = streams);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public IndicesRecoverySettingsDescriptor ConcurrentSmallFileStreams(int? streams) => Assign(a => a.ConcurrentSmallFileStreams = streams);
+
+		/// <inheritdoc />
 		public IndicesRecoverySettingsDescriptor FileChunkSize(string size) => Assign(a => a.FileChunkSize = size);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IndicesRecoverySettingsDescriptor TranslogOperations(int? ops) => Assign(a => a.TranslogOperations = ops);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IndicesRecoverySettingsDescriptor TranslogSize(string size) => Assign(a => a.TranslogSize = size);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IndicesRecoverySettingsDescriptor Compress(bool? compress = true) => Assign(a => a.Compress = compress);
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IndicesRecoverySettingsDescriptor MaxBytesPerSecond(string max) => Assign(a => a.MaxBytesPerSecond = max);
 	}
 }
diff --git a/src/Nest/Modules/Scripting/DeleteScript/DeleteScriptRequest.cs b/src/Nest/Modules/Scripting/DeleteScript/DeleteScriptRequest.cs
index 98873110e10..e88f1354f30 100644
--- a/src/Nest/Modules/Scripting/DeleteScript/DeleteScriptRequest.cs
+++ b/src/Nest/Modules/Scripting/DeleteScript/DeleteScriptRequest.cs
@@ -6,4 +6,4 @@ public partial class DeleteScriptRequest { }
 
 	[DescriptorFor("ScriptDelete")]
 	public partial class DeleteScriptDescriptor { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Scripting/DeleteScript/DeleteScriptResponse.cs b/src/Nest/Modules/Scripting/DeleteScript/DeleteScriptResponse.cs
index f826c387b63..84e46536f0c 100644
--- a/src/Nest/Modules/Scripting/DeleteScript/DeleteScriptResponse.cs
+++ b/src/Nest/Modules/Scripting/DeleteScript/DeleteScriptResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IDeleteScriptResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Modules/Scripting/DeleteScript/ElasticClient-DeleteScript.cs b/src/Nest/Modules/Scripting/DeleteScript/ElasticClient-DeleteScript.cs
index b688ea523e4..fa7734a027d 100644
--- a/src/Nest/Modules/Scripting/DeleteScript/ElasticClient-DeleteScript.cs
+++ b/src/Nest/Modules/Scripting/DeleteScript/ElasticClient-DeleteScript.cs
@@ -1,48 +1,54 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteScriptResponse DeleteScript(Id id, Func<DeleteScriptDescriptor, IDeleteScriptRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteScriptResponse DeleteScript(IDeleteScriptRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteScriptResponse> DeleteScriptAsync(Id id, Func<DeleteScriptDescriptor, IDeleteScriptRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteScriptResponse> DeleteScriptAsync(Id id, Func<DeleteScriptDescriptor, IDeleteScriptRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteScriptResponse> DeleteScriptAsync(IDeleteScriptRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteScriptResponse DeleteScript(IDeleteScriptRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteScriptRequest, DeleteScriptRequestParameters, DeleteScriptResponse>(
+			Dispatcher.Dispatch<IDeleteScriptRequest, DeleteScriptRequestParameters, DeleteScriptResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.DeleteScriptDispatch<DeleteScriptResponse>(p)
+				(p, d) => LowLevelDispatch.DeleteScriptDispatch<DeleteScriptResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteScriptResponse DeleteScript(Id id, Func<DeleteScriptDescriptor, IDeleteScriptRequest> selector = null) =>
-			this.DeleteScript(selector.InvokeOrDefault(new DeleteScriptDescriptor(id)));
-
-		/// <inheritdoc/>
-		public Task<IDeleteScriptResponse> DeleteScriptAsync(Id id, Func<DeleteScriptDescriptor, IDeleteScriptRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteScriptAsync(selector.InvokeOrDefault(new DeleteScriptDescriptor(id)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDeleteScriptResponse> DeleteScriptAsync(IDeleteScriptRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteScriptRequest, DeleteScriptRequestParameters, DeleteScriptResponse, IDeleteScriptResponse>(
+			DeleteScript(selector.InvokeOrDefault(new DeleteScriptDescriptor(id)));
+
+		/// <inheritdoc />
+		public Task<IDeleteScriptResponse> DeleteScriptAsync(Id id, Func<DeleteScriptDescriptor, IDeleteScriptRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteScriptAsync(selector.InvokeOrDefault(new DeleteScriptDescriptor(id)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDeleteScriptResponse> DeleteScriptAsync(IDeleteScriptRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteScriptRequest, DeleteScriptRequestParameters, DeleteScriptResponse, IDeleteScriptResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.DeleteScriptDispatchAsync<DeleteScriptResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.DeleteScriptDispatchAsync<DeleteScriptResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Modules/Scripting/ExecutePainlessScript/ElasticClient-ExecutePainlessScript.cs b/src/Nest/Modules/Scripting/ExecutePainlessScript/ElasticClient-ExecutePainlessScript.cs
index f37d57783d1..50b7022c3a0 100644
--- a/src/Nest/Modules/Scripting/ExecutePainlessScript/ElasticClient-ExecutePainlessScript.cs
+++ b/src/Nest/Modules/Scripting/ExecutePainlessScript/ElasticClient-ExecutePainlessScript.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -11,44 +11,57 @@ public partial interface IElasticClient
 		/// Executes an arbitrary Painless script and returns a result.
 		/// Useful for testing the syntactical correctness of Painless scripts
 		/// </summary>
-		IExecutePainlessScriptResponse<TResult> ExecutePainlessScript<TResult>(Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> selector);
+		IExecutePainlessScriptResponse<TResult> ExecutePainlessScript<TResult>(
+			Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> selector
+		);
 
-		/// <inheritdoc cref="ExecutePainlessScript{TResult}(System.Func{Nest.ExecutePainlessScriptDescriptor,Nest.IExecutePainlessScriptRequest})"/>
+		/// <inheritdoc cref="ExecutePainlessScript{TResult}(System.Func{Nest.ExecutePainlessScriptDescriptor,Nest.IExecutePainlessScriptRequest})" />
 		IExecutePainlessScriptResponse<TResult> ExecutePainlessScript<TResult>(IExecutePainlessScriptRequest request);
 
-		/// <inheritdoc cref="ExecutePainlessScript{TResult}(System.Func{Nest.ExecutePainlessScriptDescriptor,Nest.IExecutePainlessScriptRequest})"/>
-		Task<IExecutePainlessScriptResponse<TResult>> ExecutePainlessScriptAsync<TResult>(Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> selector,
-			CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc cref="ExecutePainlessScript{TResult}(System.Func{Nest.ExecutePainlessScriptDescriptor,Nest.IExecutePainlessScriptRequest})"/>
-		Task<IExecutePainlessScriptResponse<TResult>> ExecutePainlessScriptAsync<TResult>(IExecutePainlessScriptRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="ExecutePainlessScript{TResult}(System.Func{Nest.ExecutePainlessScriptDescriptor,Nest.IExecutePainlessScriptRequest})" />
+		Task<IExecutePainlessScriptResponse<TResult>> ExecutePainlessScriptAsync<TResult>(
+			Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc cref="ExecutePainlessScript{TResult}(System.Func{Nest.ExecutePainlessScriptDescriptor,Nest.IExecutePainlessScriptRequest})" />
+		Task<IExecutePainlessScriptResponse<TResult>> ExecutePainlessScriptAsync<TResult>(IExecutePainlessScriptRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
 		/// <inheritdoc />
-		public IExecutePainlessScriptResponse<TResult> ExecutePainlessScript<TResult>(Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> selector) =>
-			this.ExecutePainlessScript<TResult>(selector?.Invoke(new ExecutePainlessScriptDescriptor()));
+		public IExecutePainlessScriptResponse<TResult> ExecutePainlessScript<TResult>(
+			Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> selector
+		) =>
+			ExecutePainlessScript<TResult>(selector?.Invoke(new ExecutePainlessScriptDescriptor()));
 
 		/// <inheritdoc />
 		public IExecutePainlessScriptResponse<TResult> ExecutePainlessScript<TResult>(IExecutePainlessScriptRequest request) =>
-			this.Dispatcher.Dispatch<IExecutePainlessScriptRequest, ExecutePainlessScriptRequestParameters, ExecutePainlessScriptResponse<TResult>>(
+			Dispatcher.Dispatch<IExecutePainlessScriptRequest, ExecutePainlessScriptRequestParameters, ExecutePainlessScriptResponse<TResult>>(
 				request,
-				this.LowLevelDispatch.ScriptsPainlessExecuteDispatch<ExecutePainlessScriptResponse<TResult>>
+				LowLevelDispatch.ScriptsPainlessExecuteDispatch<ExecutePainlessScriptResponse<TResult>>
 			);
 
 		/// <inheritdoc />
-		public Task<IExecutePainlessScriptResponse<TResult>> ExecutePainlessScriptAsync<TResult>(Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> selector,
-			CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ExecutePainlessScriptAsync<TResult>(selector?.Invoke(new ExecutePainlessScriptDescriptor()), cancellationToken);
+		public Task<IExecutePainlessScriptResponse<TResult>> ExecutePainlessScriptAsync<TResult>(
+			Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ExecutePainlessScriptAsync<TResult>(selector?.Invoke(new ExecutePainlessScriptDescriptor()), cancellationToken);
 
 		/// <inheritdoc />
-		public Task<IExecutePainlessScriptResponse<TResult>> ExecutePainlessScriptAsync<TResult>(IExecutePainlessScriptRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IExecutePainlessScriptRequest, ExecutePainlessScriptRequestParameters, ExecutePainlessScriptResponse<TResult>, IExecutePainlessScriptResponse<TResult>>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.ScriptsPainlessExecuteDispatchAsync<ExecutePainlessScriptResponse<TResult>>
-			);
+		public Task<IExecutePainlessScriptResponse<TResult>> ExecutePainlessScriptAsync<TResult>(IExecutePainlessScriptRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IExecutePainlessScriptRequest, ExecutePainlessScriptRequestParameters, ExecutePainlessScriptResponse<TResult>,
+					IExecutePainlessScriptResponse<TResult>>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.ScriptsPainlessExecuteDispatchAsync<ExecutePainlessScriptResponse<TResult>>
+				);
 	}
 }
diff --git a/src/Nest/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptRequest.cs b/src/Nest/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptRequest.cs
index 87fb5356a98..bea6c41af90 100644
--- a/src/Nest/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptRequest.cs
+++ b/src/Nest/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptRequest.cs
@@ -6,47 +6,49 @@ namespace Nest
 	/// <summary> The Painless execute API allows an arbitrary script to be executed and a result to be returned. </summary>
 	public partial interface IExecutePainlessScriptRequest
 	{
-		/// <summary> The script to execute </summary>
-		[JsonProperty("script")]
-		IInlineScript Script { get; set; }
-
 		/// <summary> The context the script should be executed in </summary>
 		[JsonProperty("context")]
 		string Context { get; set; }
 
-		/// <inheritdoc cref="IPainlessContextSetup"/>
+		/// <inheritdoc cref="IPainlessContextSetup" />
 		[JsonProperty("context_setup")]
 		IPainlessContextSetup ContextSetup { get; set; }
+
+		/// <summary> The script to execute </summary>
+		[JsonProperty("script")]
+		IInlineScript Script { get; set; }
 	}
 
-	/// <inheritdoc cref="IExecutePainlessScriptRequest"/>
+	/// <inheritdoc cref="IExecutePainlessScriptRequest" />
 	public partial class ExecutePainlessScriptRequest
 	{
-		/// <inheritdoc cref="IExecutePainlessScriptRequest.Script"/>
-		public IInlineScript Script { get; set; }
-		/// <inheritdoc cref="IExecutePainlessScriptRequest.Context"/>
+		/// <inheritdoc cref="IExecutePainlessScriptRequest.Context" />
 		public string Context { get; set; }
-		/// <inheritdoc cref="IExecutePainlessScriptRequest.ContextSetup"/>
+
+		/// <inheritdoc cref="IExecutePainlessScriptRequest.ContextSetup" />
 		public IPainlessContextSetup ContextSetup { get; set; }
+
+		/// <inheritdoc cref="IExecutePainlessScriptRequest.Script" />
+		public IInlineScript Script { get; set; }
 	}
 
-	/// <inheritdoc cref="IExecutePainlessScriptRequest"/>
+	/// <inheritdoc cref="IExecutePainlessScriptRequest" />
 	[DescriptorFor("ScriptsPainlessExecute")]
 	public partial class ExecutePainlessScriptDescriptor
 	{
-		IInlineScript IExecutePainlessScriptRequest.Script { get; set; }
 		string IExecutePainlessScriptRequest.Context { get; set; }
 		IPainlessContextSetup IExecutePainlessScriptRequest.ContextSetup { get; set; }
+		IInlineScript IExecutePainlessScriptRequest.Script { get; set; }
 
-		/// <inheritdoc cref="IExecutePainlessScriptRequest.Script"/>
+		/// <inheritdoc cref="IExecutePainlessScriptRequest.Script" />
 		public ExecutePainlessScriptDescriptor Script(Func<InlineScriptDescriptor, IInlineScript> selector) =>
 			Assign(a => a.Script = selector?.Invoke(new InlineScriptDescriptor()));
 
-		/// <inheritdoc cref="IExecutePainlessScriptRequest.ContextSetup"/>
+		/// <inheritdoc cref="IExecutePainlessScriptRequest.ContextSetup" />
 		public ExecutePainlessScriptDescriptor ContextSetup(Func<PainlessContextSetupDescriptor, IPainlessContextSetup> selector) =>
 			Assign(a => a.ContextSetup = selector?.Invoke(new PainlessContextSetupDescriptor()));
 
-		/// <inheritdoc cref="IExecutePainlessScriptRequest.Context"/>
+		/// <inheritdoc cref="IExecutePainlessScriptRequest.Context" />
 		public ExecutePainlessScriptDescriptor Context(string context) => Assign(a => a.Context = context);
 	}
 }
diff --git a/src/Nest/Modules/Scripting/ExecutePainlessScript/PainlessContextSetup.cs b/src/Nest/Modules/Scripting/ExecutePainlessScript/PainlessContextSetup.cs
index 95fd4c4274d..ad7f52afac7 100644
--- a/src/Nest/Modules/Scripting/ExecutePainlessScript/PainlessContextSetup.cs
+++ b/src/Nest/Modules/Scripting/ExecutePainlessScript/PainlessContextSetup.cs
@@ -14,11 +14,13 @@ public interface IPainlessContextSetup
 		/// </summary>
 		[JsonProperty("document")]
 		object Document { get; set; }
+
 		/// <summary>
 		/// The name of an index containing a mapping that is compatible with the document being indexed.
 		/// </summary>
 		[JsonProperty("index")]
 		IndexName Index { get; set; }
+
 		/// <summary>
 		/// If _score is used in the script then a query can specified that will be used to compute a score.
 		/// </summary>
@@ -26,29 +28,33 @@ public interface IPainlessContextSetup
 		QueryContainer Query { get; set; }
 	}
 
-	/// <inheritdoc cref="IPainlessContextSetup"/>
+	/// <inheritdoc cref="IPainlessContextSetup" />
 	public class PainlessContextSetup : IPainlessContextSetup
 	{
-		/// <inheritdoc cref="IPainlessContextSetup.Document"/>
+		/// <inheritdoc cref="IPainlessContextSetup.Document" />
 		public object Document { get; set; }
-		/// <inheritdoc cref="IPainlessContextSetup.Index"/>
+
+		/// <inheritdoc cref="IPainlessContextSetup.Index" />
 		public IndexName Index { get; set; }
-		/// <inheritdoc cref="IPainlessContextSetup.Query"/>
+
+		/// <inheritdoc cref="IPainlessContextSetup.Query" />
 		public QueryContainer Query { get; set; }
 	}
 
-	/// <inheritdoc cref="IPainlessContextSetup"/>
+	/// <inheritdoc cref="IPainlessContextSetup" />
 	public class PainlessContextSetupDescriptor : DescriptorBase<PainlessContextSetupDescriptor, IPainlessContextSetup>, IPainlessContextSetup
 	{
 		object IPainlessContextSetup.Document { get; set; }
 		IndexName IPainlessContextSetup.Index { get; set; }
 		QueryContainer IPainlessContextSetup.Query { get; set; }
 
-		/// <inheritdoc cref="IPainlessContextSetup.Document"/>
+		/// <inheritdoc cref="IPainlessContextSetup.Document" />
 		public PainlessContextSetupDescriptor Document<T>(T document) => Assign(a => a.Document = document);
-		/// <inheritdoc cref="IPainlessContextSetup.Index"/>
+
+		/// <inheritdoc cref="IPainlessContextSetup.Index" />
 		public PainlessContextSetupDescriptor Index(IndexName index) => Assign(a => a.Index = index);
-		/// <inheritdoc cref="IPainlessContextSetup.Query"/>
+
+		/// <inheritdoc cref="IPainlessContextSetup.Query" />
 		public PainlessContextSetupDescriptor Query<T>(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) where T : class =>
 			Assign(a => a.Query = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
 	}
diff --git a/src/Nest/Modules/Scripting/GetScript/ElasticClient-GetScript.cs b/src/Nest/Modules/Scripting/GetScript/ElasticClient-GetScript.cs
index 82bbbbf72e7..629db365116 100644
--- a/src/Nest/Modules/Scripting/GetScript/ElasticClient-GetScript.cs
+++ b/src/Nest/Modules/Scripting/GetScript/ElasticClient-GetScript.cs
@@ -1,50 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetScriptResponse GetScript(Id id, Func<GetScriptDescriptor, IGetScriptRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetScriptResponse GetScript(IGetScriptRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetScriptResponse> GetScriptAsync(Id id, Func<GetScriptDescriptor, IGetScriptRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetScriptResponse> GetScriptAsync(Id id, Func<GetScriptDescriptor, IGetScriptRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetScriptResponse> GetScriptAsync(IGetScriptRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetScriptResponse GetScript(Id id, Func<GetScriptDescriptor, IGetScriptRequest> selector = null) =>
-			this.GetScript(selector.InvokeOrDefault(new GetScriptDescriptor(id)));
+			GetScript(selector.InvokeOrDefault(new GetScriptDescriptor(id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetScriptResponse GetScript(IGetScriptRequest request) =>
-			this.Dispatcher.Dispatch<IGetScriptRequest, GetScriptRequestParameters, GetScriptResponse>(
+			Dispatcher.Dispatch<IGetScriptRequest, GetScriptRequestParameters, GetScriptResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.GetScriptDispatch<GetScriptResponse>(p)
+				(p, d) => LowLevelDispatch.GetScriptDispatch<GetScriptResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetScriptResponse> GetScriptAsync(Id id, Func<GetScriptDescriptor, IGetScriptRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetScriptAsync(selector.InvokeOrDefault(new GetScriptDescriptor(id)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetScriptResponse> GetScriptAsync(Id id, Func<GetScriptDescriptor, IGetScriptRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetScriptAsync(selector.InvokeOrDefault(new GetScriptDescriptor(id)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetScriptResponse> GetScriptAsync(IGetScriptRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetScriptRequest, GetScriptRequestParameters, GetScriptResponse, IGetScriptResponse>(
+			Dispatcher.DispatchAsync<IGetScriptRequest, GetScriptRequestParameters, GetScriptResponse, IGetScriptResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.GetScriptDispatchAsync<GetScriptResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.GetScriptDispatchAsync<GetScriptResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Modules/Scripting/GetScript/GetScriptRequest.cs b/src/Nest/Modules/Scripting/GetScript/GetScriptRequest.cs
index 1606ef42904..935394954d6 100644
--- a/src/Nest/Modules/Scripting/GetScript/GetScriptRequest.cs
+++ b/src/Nest/Modules/Scripting/GetScript/GetScriptRequest.cs
@@ -6,4 +6,4 @@ public partial class GetScriptRequest { }
 
 	[DescriptorFor("ScriptGet")]
 	public partial class GetScriptDescriptor { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/Scripting/IStoredScript.cs b/src/Nest/Modules/Scripting/IStoredScript.cs
index 7425dac9d04..0c62df59e1e 100644
--- a/src/Nest/Modules/Scripting/IStoredScript.cs
+++ b/src/Nest/Modules/Scripting/IStoredScript.cs
@@ -26,17 +26,11 @@ public interface IStoredScript
 	/// <inheritdoc />
 	public class StoredScript : IStoredScript
 	{
-		[JsonProperty("lang")]
-		string IStoredScript.Lang { get; set; }
-
-		[JsonProperty("source")]
-		string IStoredScript.Source { get; set; }
-
 		//used for deserialization
-		internal StoredScript() {}
+		internal StoredScript() { }
 
 		/// <summary>
-		/// Instantiates a new instance of <see cref="StoredScript"/>
+		/// Instantiates a new instance of <see cref="StoredScript" />
 		/// </summary>
 		/// <param name="lang">Script language</param>
 		/// <param name="source">Script source</param>
@@ -46,30 +40,39 @@ protected StoredScript(string lang, string source)
 			self.Lang = lang;
 			self.Source = source;
 		}
+
+		[JsonProperty("lang")]
+		string IStoredScript.Lang { get; set; }
+
+		[JsonProperty("source")]
+		string IStoredScript.Source { get; set; }
 	}
 
 	public class PainlessScript : StoredScript
 	{
 		private static readonly string Lang = ScriptLang.Painless.GetStringValue();
+
 		public PainlessScript(string source) : base(Lang, source) { }
 	}
 
 	public class LuceneExpressionScript : StoredScript
 	{
 		private static readonly string Lang = ScriptLang.Expression.GetStringValue();
+
 		public LuceneExpressionScript(string source) : base(Lang, source) { }
 	}
 
 	public class MustacheScript : StoredScript
 	{
 		private static readonly string Lang = ScriptLang.Mustache.GetStringValue();
-	 	public MustacheScript(string source) : base(Lang, source) { }
+
+		public MustacheScript(string source) : base(Lang, source) { }
 	}
 
 	public class StoredScriptDescriptor : DescriptorBase<StoredScriptDescriptor, IStoredScript>, IStoredScript
 	{
-		string IStoredScript.Source { get; set; }
 		string IStoredScript.Lang { get; set; }
+		string IStoredScript.Source { get; set; }
 
 		public StoredScriptDescriptor Source(string source) => Assign(a => a.Source = source);
 
diff --git a/src/Nest/Modules/Scripting/PutScript/ElasticClient-PutScript.cs b/src/Nest/Modules/Scripting/PutScript/ElasticClient-PutScript.cs
index 1a2d3c005a6..ee447004a5a 100644
--- a/src/Nest/Modules/Scripting/PutScript/ElasticClient-PutScript.cs
+++ b/src/Nest/Modules/Scripting/PutScript/ElasticClient-PutScript.cs
@@ -1,44 +1,48 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutScriptResponse PutScript(Id id, Func<PutScriptDescriptor, IPutScriptRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutScriptResponse PutScript(IPutScriptRequest request);
 
-		/// <inheritdoc/>
-		Task<IPutScriptResponse> PutScriptAsync(Id id, Func<PutScriptDescriptor, IPutScriptRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPutScriptResponse> PutScriptAsync(Id id, Func<PutScriptDescriptor, IPutScriptRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutScriptResponse> PutScriptAsync(IPutScriptRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
+
 	public partial class ElasticClient
 	{
 		public IPutScriptResponse PutScript(Id id, Func<PutScriptDescriptor, IPutScriptRequest> selector) =>
-			this.PutScript(selector?.Invoke(new PutScriptDescriptor(id)));
+			PutScript(selector?.Invoke(new PutScriptDescriptor(id)));
 
 		public IPutScriptResponse PutScript(IPutScriptRequest request) =>
-			this.Dispatcher.Dispatch<IPutScriptRequest, PutScriptRequestParameters, PutScriptResponse>(
+			Dispatcher.Dispatch<IPutScriptRequest, PutScriptRequestParameters, PutScriptResponse>(
 				request,
-				this.LowLevelDispatch.PutScriptDispatch<PutScriptResponse>
+				LowLevelDispatch.PutScriptDispatch<PutScriptResponse>
 			);
 
-		public Task<IPutScriptResponse> PutScriptAsync(Id id, Func<PutScriptDescriptor, IPutScriptRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PutScriptAsync(selector?.Invoke(new PutScriptDescriptor(id)), cancellationToken);
+		public Task<IPutScriptResponse> PutScriptAsync(Id id, Func<PutScriptDescriptor, IPutScriptRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PutScriptAsync(selector?.Invoke(new PutScriptDescriptor(id)), cancellationToken);
 
 		public Task<IPutScriptResponse> PutScriptAsync(IPutScriptRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutScriptRequest, PutScriptRequestParameters, PutScriptResponse, IPutScriptResponse>(
+			Dispatcher.DispatchAsync<IPutScriptRequest, PutScriptRequestParameters, PutScriptResponse, IPutScriptResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.PutScriptDispatchAsync<PutScriptResponse>
+				LowLevelDispatch.PutScriptDispatchAsync<PutScriptResponse>
 			);
 	}
 }
diff --git a/src/Nest/Modules/Scripting/PutScript/PutScriptResponse.cs b/src/Nest/Modules/Scripting/PutScript/PutScriptResponse.cs
index 18dd1785c6d..a41b3f208ba 100644
--- a/src/Nest/Modules/Scripting/PutScript/PutScriptResponse.cs
+++ b/src/Nest/Modules/Scripting/PutScript/PutScriptResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IPutScriptResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/AzureRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/AzureRepository.cs
index cd5f81fc6fc..fdffd299a9e 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/AzureRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/AzureRepository.cs
@@ -9,42 +9,40 @@ public class AzureRepository : IAzureRepository
 	{
 		public AzureRepository() { }
 
-		public AzureRepository(IAzureRepositorySettings settings)
-		{
-			Settings = settings;
-		}
+		public AzureRepository(IAzureRepositorySettings settings) => Settings = settings;
+
 		public IAzureRepositorySettings Settings { get; set; }
 		public string Type { get; } = "azure";
 	}
 
 	public interface IAzureRepositorySettings : IRepositorySettings
 	{
-		[JsonProperty("container")]
-		string Container { get; set; }
-
 		[JsonProperty("base_path")]
 		string BasePath { get; set; }
 
+		[JsonProperty("chunk_size")]
+		string ChunkSize { get; set; }
+
 		[JsonProperty("compress")]
 		bool? Compress { get; set; }
 
-		[JsonProperty("chunk_size")]
-		string ChunkSize { get; set; }
+		[JsonProperty("container")]
+		string Container { get; set; }
 	}
 
 	public class AzureRepositorySettings : IAzureRepositorySettings
 	{
-		[JsonProperty("container")]
-		public string Container { get; set; }
-
 		[JsonProperty("base_path")]
 		public string BasePath { get; set; }
 
+		[JsonProperty("chunk_size")]
+		public string ChunkSize { get; set; }
+
 		[JsonProperty("compress")]
 		public bool? Compress { get; set; }
 
-		[JsonProperty("chunk_size")]
-		public string ChunkSize { get; set; }
+		[JsonProperty("container")]
+		public string Container { get; set; }
 	}
 
 	public class AzureRepositorySettingsDescriptor
@@ -62,7 +60,7 @@ public class AzureRepositorySettingsDescriptor
 		public AzureRepositorySettingsDescriptor Container(string container) => Assign(a => a.Container = container);
 
 		/// <summary>
-		///Specifies the path within container to repository data. Defaults to empty (root directory).
+		/// Specifies the path within container to repository data. Defaults to empty (root directory).
 		/// </summary>
 		/// <param name="basePath"></param>
 		/// <returns></returns>
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryJsonConverter.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryJsonConverter.cs
index 766caefc641..ddfcf180267 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryJsonConverter.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryJsonConverter.cs
@@ -7,12 +7,11 @@ internal class CreateRepositoryJsonConverter : JsonConverter
 	{
 		public override bool CanRead => false;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			throw new NotSupportedException();
-		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryRequest.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryRequest.cs
index 74cf4385758..a7f4e876c6c 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryRequest.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryRequest.cs
@@ -3,7 +3,6 @@
 
 namespace Nest
 {
-
 	[JsonConverter(typeof(CreateRepositoryJsonConverter))]
 	public partial interface ICreateRepositoryRequest
 	{
@@ -21,9 +20,9 @@ public partial class CreateRepositoryDescriptor
 		ISnapshotRepository ICreateRepositoryRequest.Repository { get; set; }
 
 		/// <summary>
-		///	The shared file system repository ("type": "fs") is using shared file system to store snapshot.
-		/// The path specified in the location parameter should point to the same location in the shared
-		/// filesystem and be accessible on all data and master nodes.
+		/// 	The shared file system repository ("type": "fs") is using shared file system to store snapshot.
+		///  The path specified in the location parameter should point to the same location in the shared
+		///  filesystem and be accessible on all data and master nodes.
 		/// </summary>
 		public CreateRepositoryDescriptor FileSystem(Func<FileSystemRepositoryDescriptor, IFileSystemRepository> selector) =>
 			Assign(a => a.Repository = selector?.Invoke(new FileSystemRepositoryDescriptor()));
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryResponse.cs
index 7140262c451..8dc8e125e99 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryResponse.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface ICreateRepositoryResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/ElasticClient-CreateRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/ElasticClient-CreateRepository.cs
index cf7e3405bb9..66bd6aeb0de 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/ElasticClient-CreateRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/CreateRepository/ElasticClient-CreateRepository.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,46 +9,55 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Before any snapshot or restore operation can be performed a snapshot repository should be registered in Elasticsearch.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_repositories
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_repositories
 		/// </summary>
 		/// <param name="repository">The name for the repository</param>
 		/// <param name="selector">describe what the repository looks like</param>
 		ICreateRepositoryResponse CreateRepository(Name repository, Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICreateRepositoryResponse CreateRepository(ICreateRepositoryRequest request);
 
-		/// <inheritdoc/>
-		Task<ICreateRepositoryResponse> CreateRepositoryAsync(Name repository, Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<ICreateRepositoryResponse> CreateRepositoryAsync(ICreateRepositoryRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICreateRepositoryResponse> CreateRepositoryAsync(Name repository, Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<ICreateRepositoryResponse> CreateRepositoryAsync(ICreateRepositoryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICreateRepositoryResponse CreateRepository(Name repository, Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> selector) =>
-			this.CreateRepository(selector?.Invoke(new CreateRepositoryDescriptor(repository)));
+			CreateRepository(selector?.Invoke(new CreateRepositoryDescriptor(repository)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICreateRepositoryResponse CreateRepository(ICreateRepositoryRequest request) =>
-			this.Dispatcher.Dispatch<ICreateRepositoryRequest, CreateRepositoryRequestParameters, CreateRepositoryResponse>(
+			Dispatcher.Dispatch<ICreateRepositoryRequest, CreateRepositoryRequestParameters, CreateRepositoryResponse>(
 				request,
-				this.LowLevelDispatch.SnapshotCreateRepositoryDispatch<CreateRepositoryResponse>
+				LowLevelDispatch.SnapshotCreateRepositoryDispatch<CreateRepositoryResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<ICreateRepositoryResponse> CreateRepositoryAsync(Name repository, Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CreateRepositoryAsync(selector?.Invoke(new CreateRepositoryDescriptor(repository)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ICreateRepositoryResponse> CreateRepositoryAsync(ICreateRepositoryRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ICreateRepositoryRequest, CreateRepositoryRequestParameters, CreateRepositoryResponse, ICreateRepositoryResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.SnapshotCreateRepositoryDispatchAsync<CreateRepositoryResponse>
-			);
+		/// <inheritdoc />
+		public Task<ICreateRepositoryResponse> CreateRepositoryAsync(Name repository,
+			Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> selector, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CreateRepositoryAsync(selector?.Invoke(new CreateRepositoryDescriptor(repository)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<ICreateRepositoryResponse> CreateRepositoryAsync(ICreateRepositoryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<ICreateRepositoryRequest, CreateRepositoryRequestParameters, CreateRepositoryResponse, ICreateRepositoryResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.SnapshotCreateRepositoryDispatchAsync<CreateRepositoryResponse>
+				);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryResponse.cs
index d0eace3f77a..aeb94862b45 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryResponse.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IDeleteRepositoryResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/DeleteRepository/ElasticClient-DeleteRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/DeleteRepository/ElasticClient-DeleteRepository.cs
index de550996a49..895215844b2 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/DeleteRepository/ElasticClient-DeleteRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/DeleteRepository/ElasticClient-DeleteRepository.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,45 +9,60 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Delete a repository, if you have ongoing restore operations be sure to delete the indices being restored into first.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_repositories
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_repositories
 		/// </summary>
 		/// <param name="repositories">The names of the repositories</param>
-		/// <param name="selector">Optionaly provide the delete operation with more details</param>>
+		/// <param name="selector">Optionaly provide the delete operation with more details</param>
+		/// >
 		IDeleteRepositoryResponse DeleteRepository(Names repositories, Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteRepositoryResponse DeleteRepository(IDeleteRepositoryRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteRepositoryResponse> DeleteRepositoryAsync(Names repositories, Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<IDeleteRepositoryResponse> DeleteRepositoryAsync(IDeleteRepositoryRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteRepositoryResponse> DeleteRepositoryAsync(Names repositories,
+			Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<IDeleteRepositoryResponse> DeleteRepositoryAsync(IDeleteRepositoryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IDeleteRepositoryResponse DeleteRepository(Names repositories, Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> selector = null) =>
-			this.DeleteRepository(selector.InvokeOrDefault(new DeleteRepositoryDescriptor(repositories)));
+		/// <inheritdoc />
+		public IDeleteRepositoryResponse DeleteRepository(Names repositories,
+			Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> selector = null
+		) =>
+			DeleteRepository(selector.InvokeOrDefault(new DeleteRepositoryDescriptor(repositories)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteRepositoryResponse DeleteRepository(IDeleteRepositoryRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteRepositoryRequest, DeleteRepositoryRequestParameters, DeleteRepositoryResponse>(
+			Dispatcher.Dispatch<IDeleteRepositoryRequest, DeleteRepositoryRequestParameters, DeleteRepositoryResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.SnapshotDeleteRepositoryDispatch<DeleteRepositoryResponse>(p)
+				(p, d) => LowLevelDispatch.SnapshotDeleteRepositoryDispatch<DeleteRepositoryResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteRepositoryResponse> DeleteRepositoryAsync(Names repositories, Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteRepositoryAsync(selector.InvokeOrDefault(new DeleteRepositoryDescriptor(repositories)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IDeleteRepositoryResponse> DeleteRepositoryAsync(Names repositories,
+			Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteRepositoryAsync(selector.InvokeOrDefault(new DeleteRepositoryDescriptor(repositories)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeleteRepositoryResponse> DeleteRepositoryAsync(IDeleteRepositoryRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteRepositoryRequest, DeleteRepositoryRequestParameters, DeleteRepositoryResponse, IDeleteRepositoryResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SnapshotDeleteRepositoryDispatchAsync<DeleteRepositoryResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IDeleteRepositoryResponse> DeleteRepositoryAsync(IDeleteRepositoryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IDeleteRepositoryRequest, DeleteRepositoryRequestParameters, DeleteRepositoryResponse, IDeleteRepositoryResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.SnapshotDeleteRepositoryDispatchAsync<DeleteRepositoryResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/FileSystemRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/FileSystemRepository.cs
index 47339d2ea11..46d430f82bb 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/FileSystemRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/FileSystemRepository.cs
@@ -7,10 +7,7 @@ public interface IFileSystemRepository : IRepository<IFileSystemRepositorySettin
 
 	public class FileSystemRepository : IFileSystemRepository
 	{
-		public FileSystemRepository(FileSystemRepositorySettings settings)
-		{
-			Settings = settings;
-		}
+		public FileSystemRepository(FileSystemRepositorySettings settings) => Settings = settings;
 
 		public IFileSystemRepositorySettings Settings { get; set; }
 		public string Type { get; } = "fs";
@@ -18,8 +15,8 @@ public FileSystemRepository(FileSystemRepositorySettings settings)
 
 	public interface IFileSystemRepositorySettings : IRepositorySettings
 	{
-		[JsonProperty("location")]
-		string Location { get; set; }
+		[JsonProperty("chunk_size")]
+		string ChunkSize { get; set; }
 
 		[JsonProperty("compress")]
 		bool? Compress { get; set; }
@@ -27,8 +24,8 @@ public interface IFileSystemRepositorySettings : IRepositorySettings
 		[JsonProperty("concurrent_streams")]
 		int? ConcurrentStreams { get; set; }
 
-		[JsonProperty("chunk_size")]
-		string ChunkSize { get; set; }
+		[JsonProperty("location")]
+		string Location { get; set; }
 
 		[JsonProperty("max_restore_bytes_per_second")]
 		string RestoreBytesPerSecondMaximum { get; set; }
@@ -40,18 +37,16 @@ public interface IFileSystemRepositorySettings : IRepositorySettings
 	public class FileSystemRepositorySettings : IFileSystemRepositorySettings
 	{
 		internal FileSystemRepositorySettings() { }
-		public FileSystemRepositorySettings(string location)
-		{
-			this.Location = location;
-		}
 
-		public string Location { get; set; }
+		public FileSystemRepositorySettings(string location) => Location = location;
+
+		public string ChunkSize { get; set; }
 
 		public bool? Compress { get; set; }
 
 		public int? ConcurrentStreams { get; set; }
 
-		public string ChunkSize { get; set; }
+		public string Location { get; set; }
 
 		public string RestoreBytesPerSecondMaximum { get; set; }
 
@@ -61,10 +56,10 @@ public FileSystemRepositorySettings(string location)
 	public class FileSystemRepositorySettingsDescriptor
 		: DescriptorBase<FileSystemRepositorySettingsDescriptor, IFileSystemRepositorySettings>, IFileSystemRepositorySettings
 	{
-		string IFileSystemRepositorySettings.Location { get; set; }
-		bool? IFileSystemRepositorySettings.Compress  { get; set; }
-		int? IFileSystemRepositorySettings.ConcurrentStreams { get; set; }
 		string IFileSystemRepositorySettings.ChunkSize { get; set; }
+		bool? IFileSystemRepositorySettings.Compress { get; set; }
+		int? IFileSystemRepositorySettings.ConcurrentStreams { get; set; }
+		string IFileSystemRepositorySettings.Location { get; set; }
 		string IFileSystemRepositorySettings.RestoreBytesPerSecondMaximum { get; set; }
 		string IFileSystemRepositorySettings.SnapshotBytesPerSecondMaximum { get; set; }
 
@@ -84,7 +79,8 @@ public class FileSystemRepositorySettingsDescriptor
 		/// Throttles the number of streams (per node) preforming snapshot operation. Defaults to 5
 		/// </summary>
 		/// <param name="concurrentStreams"></param>
-		public FileSystemRepositorySettingsDescriptor ConcurrentStreams(int? concurrentStreams) => Assign(a => a.ConcurrentStreams = concurrentStreams);
+		public FileSystemRepositorySettingsDescriptor ConcurrentStreams(int? concurrentStreams) =>
+			Assign(a => a.ConcurrentStreams = concurrentStreams);
 
 		/// <summary>
 		/// Big files can be broken down into chunks during snapshotting if needed.
@@ -115,7 +111,9 @@ public class FileSystemRepositoryDescriptor
 		IFileSystemRepositorySettings IRepository<IFileSystemRepositorySettings>.Settings { get; set; }
 		string ISnapshotRepository.Type { get; } = "fs";
 
-		public FileSystemRepositoryDescriptor Settings(string location, Func<FileSystemRepositorySettingsDescriptor, IFileSystemRepositorySettings> settingsSelector = null) =>
+		public FileSystemRepositoryDescriptor Settings(string location,
+			Func<FileSystemRepositorySettingsDescriptor, IFileSystemRepositorySettings> settingsSelector = null
+		) =>
 			Assign(a => a.Settings = settingsSelector.InvokeOrDefault(new FileSystemRepositorySettingsDescriptor().Location(location)));
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/ElasticClient-GetRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/ElasticClient-GetRepository.cs
index 14994ca2bb6..7d1f919956c 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/ElasticClient-GetRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/ElasticClient-GetRepository.cs
@@ -1,48 +1,56 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetRepositoryResponse GetRepository(Func<GetRepositoryDescriptor, IGetRepositoryRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetRepositoryResponse GetRepository(IGetRepositoryRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetRepositoryResponse> GetRepositoryAsync(Func<GetRepositoryDescriptor, IGetRepositoryRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetRepositoryResponse> GetRepositoryAsync(Func<GetRepositoryDescriptor, IGetRepositoryRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetRepositoryResponse> GetRepositoryAsync(IGetRepositoryRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetRepositoryResponse> GetRepositoryAsync(IGetRepositoryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRepositoryResponse GetRepository(Func<GetRepositoryDescriptor, IGetRepositoryRequest> selector = null) =>
-			this.GetRepository(selector.InvokeOrDefault(new GetRepositoryDescriptor()));
+			GetRepository(selector.InvokeOrDefault(new GetRepositoryDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRepositoryResponse GetRepository(IGetRepositoryRequest request) =>
-			this.Dispatcher.Dispatch<IGetRepositoryRequest, GetRepositoryRequestParameters, GetRepositoryResponse>(
+			Dispatcher.Dispatch<IGetRepositoryRequest, GetRepositoryRequestParameters, GetRepositoryResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.SnapshotGetRepositoryDispatch<GetRepositoryResponse>(p)
+				(p, d) => LowLevelDispatch.SnapshotGetRepositoryDispatch<GetRepositoryResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetRepositoryResponse> GetRepositoryAsync(Func<GetRepositoryDescriptor, IGetRepositoryRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetRepositoryAsync(selector.InvokeOrDefault(new GetRepositoryDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetRepositoryResponse> GetRepositoryAsync(IGetRepositoryRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetRepositoryRequest, GetRepositoryRequestParameters, GetRepositoryResponse, IGetRepositoryResponse>(
+		/// <inheritdoc />
+		public Task<IGetRepositoryResponse> GetRepositoryAsync(Func<GetRepositoryDescriptor, IGetRepositoryRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetRepositoryAsync(selector.InvokeOrDefault(new GetRepositoryDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetRepositoryResponse> GetRepositoryAsync(IGetRepositoryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetRepositoryRequest, GetRepositoryRequestParameters, GetRepositoryResponse, IGetRepositoryResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SnapshotGetRepositoryDispatchAsync<GetRepositoryResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.SnapshotGetRepositoryDispatchAsync<GetRepositoryResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponse.cs
index fa01b71788b..64c5cc62bc2 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponse.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponse.cs
@@ -10,9 +10,13 @@ public interface IGetRepositoryResponse : IResponse
 		IReadOnlyDictionary<string, ISnapshotRepository> Repositories { get; }
 
 		AzureRepository Azure(string name);
+
 		FileSystemRepository FileSystem(string name);
+
 		HdfsRepository Hdfs(string name);
+
 		ReadOnlyUrlRepository ReadOnlyUrl(string name);
+
 		S3Repository S3(string name);
 	}
 
@@ -23,17 +27,22 @@ public class GetRepositoryResponse : ResponseBase, IGetRepositoryResponse
 			EmptyReadOnly<string, ISnapshotRepository>.Dictionary;
 
 		public AzureRepository Azure(string name) => Get<AzureRepository>(name);
+
 		public FileSystemRepository FileSystem(string name) => Get<FileSystemRepository>(name);
+
 		public HdfsRepository Hdfs(string name) => Get<HdfsRepository>(name);
+
 		public ReadOnlyUrlRepository ReadOnlyUrl(string name) => Get<ReadOnlyUrlRepository>(name);
+
 		public S3Repository S3(string name) => Get<S3Repository>(name);
 
 		private TRepository Get<TRepository>(string name)
 			where TRepository : class, ISnapshotRepository
 		{
-			if (this.Repositories == null) return null;
-			if (!this.Repositories.ContainsKey(name)) return null;
-			return this.Repositories[name] as TRepository;
+			if (Repositories == null) return null;
+			if (!Repositories.ContainsKey(name)) return null;
+
+			return Repositories[name] as TRepository;
 		}
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponseJsonConverter.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponseJsonConverter.cs
index d97fb641fe5..b5720304c7e 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponseJsonConverter.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponseJsonConverter.cs
@@ -9,24 +9,26 @@ namespace Nest
 	internal class GetRepositoryResponseJsonConverter : JsonConverter
 	{
 		public override bool CanConvert(Type objectType) => true;
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			serializer.Serialize(writer, value);
-		}
+
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => serializer.Serialize(writer, value);
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var response = new GetRepositoryResponse();
-			var repositories = JObject.Load(reader).Properties()
+			var repositories = JObject.Load(reader)
+				.Properties()
 				.Where(p => p.Name != "error" && p.Name != "status")
 				.ToDictionary(p => p.Name, p => p.Value);
 			if (!repositories.HasAny())
 				return response;
+
 			var d = new Dictionary<string, ISnapshotRepository>();
 			foreach (var kv in repositories)
 			{
 				var repository = JObject.FromObject(kv.Value);
 				var type = repository.Properties().Where(p => p.Name == "type").SingleOrDefault();
 				if (type == null) continue;
+
 				var typeName = type.Value.ToString();
 				var settings = GetSetingsJObject(repository);
 				if (typeName == "fs")
@@ -65,17 +67,19 @@ private TRepository GetRepository<TRepository, TSettings>(JObject settings)
 		{
 			if (settings == null)
 				return (TRepository)typeof(TRepository).CreateInstance();
+
 			return (TRepository)typeof(TRepository).CreateInstance(settings.ToObject<TSettings>());
 		}
 
 		private JObject GetSetingsJObject(JObject repository)
 		{
-			var settings = JObject.FromObject(repository).Properties()
+			var settings = JObject.FromObject(repository)
+				.Properties()
 				.Where(p => p.Name == "settings")
 				.SingleOrDefault();
 			if (settings == null) return null;
+
 			return JObject.FromObject(settings.Value);
 		}
 	}
 }
-
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/HdfsRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/HdfsRepository.cs
index 4b707d87cde..ef8af4b5c60 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/HdfsRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/HdfsRepository.cs
@@ -8,10 +8,7 @@ public interface IHdfsRepository : IRepository<IHdfsRepositorySettings> { }
 
 	public class HdfsRepository : IHdfsRepository
 	{
-		public HdfsRepository(HdfsRepositorySettings settings)
-		{
-			Settings = settings;
-		}
+		public HdfsRepository(HdfsRepositorySettings settings) => Settings = settings;
 
 		public IHdfsRepositorySettings Settings { get; set; }
 		public string Type { get; } = "hdfs";
@@ -19,17 +16,8 @@ public HdfsRepository(HdfsRepositorySettings settings)
 
 	public interface IHdfsRepositorySettings : IRepositorySettings
 	{
-		[JsonProperty("uri")]
-		string Uri { get; set; }
-
-		[JsonProperty("path")]
-		string Path { get; set; }
-
-		[JsonProperty("load_defaults")]
-		bool? LoadDefaults { get; set; }
-
-		[JsonProperty("conf_location")]
-		string ConfigurationLocation { get; set; }
+		[JsonProperty("chunk_size")]
+		string ChunkSize { get; set; }
 
 		[JsonProperty("compress")]
 		bool? Compress { get; set; }
@@ -37,21 +25,27 @@ public interface IHdfsRepositorySettings : IRepositorySettings
 		[JsonProperty("concurrent_streams")]
 		int? ConcurrentStreams { get; set; }
 
-		[JsonProperty("chunk_size")]
-		string ChunkSize { get; set; }
+		[JsonProperty("conf_location")]
+		string ConfigurationLocation { get; set; }
 
 		[JsonIgnore]
 		Dictionary<string, object> InlineHadoopConfiguration { get; set; }
+
+		[JsonProperty("load_defaults")]
+		bool? LoadDefaults { get; set; }
+
+		[JsonProperty("path")]
+		string Path { get; set; }
+
+		[JsonProperty("uri")]
+		string Uri { get; set; }
 	}
 
 	public class HdfsRepositorySettings : IHdfsRepositorySettings
 	{
 		internal HdfsRepositorySettings() { }
 
-		public HdfsRepositorySettings(string path)
-		{
-			this.Path = path;
-		}
+		public HdfsRepositorySettings(string path) => Path = path;
 
 		public string ChunkSize { get; set; }
 		public bool? Compress { get; set; }
@@ -66,14 +60,14 @@ public HdfsRepositorySettings(string path)
 	public class HdfsRepositorySettingsDescriptor
 		: DescriptorBase<HdfsRepositorySettingsDescriptor, IHdfsRepositorySettings>, IHdfsRepositorySettings
 	{
-		string IHdfsRepositorySettings.Uri { get; set; }
-		string IHdfsRepositorySettings.Path { get; set; }
-		bool? IHdfsRepositorySettings.LoadDefaults { get; set; }
-		string IHdfsRepositorySettings.ConfigurationLocation { get; set; }
+		string IHdfsRepositorySettings.ChunkSize { get; set; }
 		bool? IHdfsRepositorySettings.Compress { get; set; }
 		int? IHdfsRepositorySettings.ConcurrentStreams { get; set; }
-		string IHdfsRepositorySettings.ChunkSize { get; set; }
+		string IHdfsRepositorySettings.ConfigurationLocation { get; set; }
 		Dictionary<string, object> IHdfsRepositorySettings.InlineHadoopConfiguration { get; set; }
+		bool? IHdfsRepositorySettings.LoadDefaults { get; set; }
+		string IHdfsRepositorySettings.Path { get; set; }
+		string IHdfsRepositorySettings.Uri { get; set; }
 
 		/// <summary>
 		/// optional - Hadoop file-system URI
@@ -81,9 +75,10 @@ public class HdfsRepositorySettingsDescriptor
 		public HdfsRepositorySettingsDescriptor Uri(string uri) => Assign(a => a.Uri = uri);
 
 		/// <summary>
-		///required - path with the file-system where data is stored/loaded
+		/// required - path with the file-system where data is stored/loaded
 		/// </summary>
 		public HdfsRepositorySettingsDescriptor Path(string path) => Assign(a => a.Path = path);
+
 		/// <summary>
 		/// whether to load the default Hadoop configuration (default) or not
 		/// </summary>
@@ -100,7 +95,9 @@ public HdfsRepositorySettingsDescriptor ConfigurationLocation(string configurati
 		/// <summary>
 		/// 'inlined' key=value added to the Hadoop configuration
 		/// </summary>
-		public HdfsRepositorySettingsDescriptor InlinedHadoopConfiguration(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> inlineConfig) => Assign(a =>
+		public HdfsRepositorySettingsDescriptor InlinedHadoopConfiguration(
+			Func<FluentDictionary<string, object>, FluentDictionary<string, object>> inlineConfig
+		) => Assign(a =>
 			a.InlineHadoopConfiguration = inlineConfig(new FluentDictionary<string, object>())
 		);
 
@@ -129,11 +126,11 @@ public HdfsRepositorySettingsDescriptor InlinedHadoopConfiguration(Func<FluentDi
 	public class HdfsRepositoryDescriptor
 		: DescriptorBase<HdfsRepositoryDescriptor, IHdfsRepository>, IHdfsRepository
 	{
-		string ISnapshotRepository.Type => "hdfs";
-
 		IHdfsRepositorySettings IRepository<IHdfsRepositorySettings>.Settings { get; set; }
+		string ISnapshotRepository.Type => "hdfs";
 
-		public HdfsRepositoryDescriptor Settings(string path, Func<HdfsRepositorySettingsDescriptor, IHdfsRepositorySettings> settingsSelector = null) =>
+		public HdfsRepositoryDescriptor Settings(string path, Func<HdfsRepositorySettingsDescriptor, IHdfsRepositorySettings> settingsSelector = null
+		) =>
 			Assign(a => a.Settings = settingsSelector.InvokeOrDefault(new HdfsRepositorySettingsDescriptor().Path(path)));
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/ISnapshotRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/ISnapshotRepository.cs
index 35f50d92433..84aa25c955f 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/ISnapshotRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/ISnapshotRepository.cs
@@ -16,4 +16,4 @@ public interface IRepository<TSettings> : ISnapshotRepository
 	}
 
 	public interface IRepositorySettings { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/ReadOnlyUrlRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/ReadOnlyUrlRepository.cs
index 618fd50983b..6da07a753a8 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/ReadOnlyUrlRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/ReadOnlyUrlRepository.cs
@@ -7,10 +7,7 @@ public interface IReadOnlyUrlRepository : IRepository<IReadOnlyUrlRepositorySett
 
 	public class ReadOnlyUrlRepository : IReadOnlyUrlRepository
 	{
-		public ReadOnlyUrlRepository(ReadOnlyUrlRepositorySettings settings)
-		{
-			Settings = settings;
-		}
+		public ReadOnlyUrlRepository(ReadOnlyUrlRepositorySettings settings) => Settings = settings;
 
 		public IReadOnlyUrlRepositorySettings Settings { get; set; }
 		public string Type { get; } = "url";
@@ -18,31 +15,29 @@ public ReadOnlyUrlRepository(ReadOnlyUrlRepositorySettings settings)
 
 	public interface IReadOnlyUrlRepositorySettings : IRepositorySettings
 	{
-		[JsonProperty("location")]
-		string Location { get; set; }
-
 		[JsonProperty("concurrent_streams")]
 		int? ConcurrentStreams { get; set; }
+
+		[JsonProperty("location")]
+		string Location { get; set; }
 	}
 
 	public class ReadOnlyUrlRepositorySettings : IReadOnlyUrlRepositorySettings
 	{
 		internal ReadOnlyUrlRepositorySettings() { }
 
-		public ReadOnlyUrlRepositorySettings(string location)
-		{
-			this.Location = location;
-		}
+		public ReadOnlyUrlRepositorySettings(string location) => Location = location;
 
-		public string Location { get; set; }
 		public int? ConcurrentStreams { get; set; }
+
+		public string Location { get; set; }
 	}
 
 	public class ReadOnlyUrlRepositorySettingsDescriptor
 		: DescriptorBase<ReadOnlyUrlRepositorySettingsDescriptor, IReadOnlyUrlRepositorySettings>, IReadOnlyUrlRepositorySettings
 	{
 		int? IReadOnlyUrlRepositorySettings.ConcurrentStreams { get; set; }
-		string IReadOnlyUrlRepositorySettings.Location { get;set; }
+		string IReadOnlyUrlRepositorySettings.Location { get; set; }
 
 		/// <summary>
 		/// Location of the snapshots. Mandatory.
@@ -61,10 +56,12 @@ public ReadOnlyUrlRepositorySettingsDescriptor ConcurrentStreams(int? concurrent
 	public class ReadOnlyUrlRepositoryDescriptor
 		: DescriptorBase<ReadOnlyUrlRepositoryDescriptor, IReadOnlyUrlRepository>, IReadOnlyUrlRepository
 	{
-		string ISnapshotRepository.Type { get { return "url"; } }
 		IReadOnlyUrlRepositorySettings IRepository<IReadOnlyUrlRepositorySettings>.Settings { get; set; }
+		string ISnapshotRepository.Type => "url";
 
-		public ReadOnlyUrlRepositoryDescriptor Settings(string location, Func<ReadOnlyUrlRepositorySettingsDescriptor, IReadOnlyUrlRepositorySettings> settingsSelector = null) =>
+		public ReadOnlyUrlRepositoryDescriptor Settings(string location,
+			Func<ReadOnlyUrlRepositorySettingsDescriptor, IReadOnlyUrlRepositorySettings> settingsSelector = null
+		) =>
 			Assign(a => a.Settings = settingsSelector.InvokeOrDefault(new ReadOnlyUrlRepositorySettingsDescriptor().Location(location)));
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/S3Repository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/S3Repository.cs
index f2406be4c04..795de49906e 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/S3Repository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/S3Repository.cs
@@ -19,13 +19,12 @@ public interface IS3RepositorySettings : IRepositorySettings
 		[JsonProperty("access_key")]
 		string AccessKey { get; set; }
 
-		[Obsolete("Removed in Elasticsearch 6.0, please specify secure settings in the keystore.")]
-		[JsonProperty("secret_key")]
-		string SecretKey { get; set; }
-
-		[Obsolete("Removed in Elasticsearch 6.0")]
-		[JsonProperty("concurrent_streams")]
-		int? ConcurrentStreams { get; set; }
+		/// <summary>
+		/// Specifies the path within bucket to repository data.
+		/// Defaults to value of repositories.s3.base_path or to root directory if not set.
+		/// </summary>
+		[JsonProperty("base_path")]
+		string BasePath { get; set; }
 
 		/// <summary>
 		/// The name of the bucket to be used for snapshots. This field is required
@@ -34,17 +33,23 @@ public interface IS3RepositorySettings : IRepositorySettings
 		string Bucket { get; set; }
 
 		/// <summary>
-		/// The name of the s3 client to use to connect to S3. Defaults to default.
+		/// Minimum threshold below which the chunk is uploaded using a single request.
+		/// Beyond this threshold, the S3 repository will use the AWS Multipart Upload API to split the chunk into
+		/// several parts, each of buffer_size length, and to upload each part in its own request. Note that setting a
+		/// buffer size lower than 5mb is not allowed since it will prevent the use of the Multipart API and may result
+		/// in upload errors. It is also not possible to set a buffer size greater than 5gb as it is the maximum upload
+		/// size allowed by S3. Defaults to the minimum between 100mb and 5% of the heap size.
 		/// </summary>
-		[JsonProperty("client")]
-		string Client { get; set; }
+		[JsonProperty("buffer_size")]
+		string BufferSize { get; set; }
 
 		/// <summary>
-		/// Specifies the path within bucket to repository data.
-		/// Defaults to value of repositories.s3.base_path or to root directory if not set.
+		/// Specify a canned ACL for the S3 bucket.
+		/// The S3 repository supports all S3 canned ACLs : private, public-read, public-read-write, authenticated-read,
+		/// log-delivery-write, bucket-owner-read, bucket-owner-full-control. Defaults to private.
 		/// </summary>
-		[JsonProperty("base_path")]
-		string BasePath { get; set; }
+		[JsonProperty("canned_acl")]
+		string CannedAcl { get; set; }
 
 		/// <summary>
 		/// Big files can be broken down into chunks during snapshotting if needed.
@@ -54,6 +59,12 @@ public interface IS3RepositorySettings : IRepositorySettings
 		[JsonProperty("chunk_size")]
 		string ChunkSize { get; set; }
 
+		/// <summary>
+		/// The name of the s3 client to use to connect to S3. Defaults to default.
+		/// </summary>
+		[JsonProperty("client")]
+		string Client { get; set; }
+
 		/// <summary>
 		/// When set to true metadata files are stored in compressed format.
 		/// This setting doesn't affect index files that are already compressed by default.
@@ -62,6 +73,14 @@ public interface IS3RepositorySettings : IRepositorySettings
 		[JsonProperty("compress")]
 		bool? Compress { get; set; }
 
+		[Obsolete("Removed in Elasticsearch 6.0")]
+		[JsonProperty("concurrent_streams")]
+		int? ConcurrentStreams { get; set; }
+
+		[Obsolete("Removed in Elasticsearch 6.0, please specify secure settings in the keystore.")]
+		[JsonProperty("secret_key")]
+		string SecretKey { get; set; }
+
 		/// <summary>
 		/// When set to true files are encrypted on server side using AES256 algorithm.
 		/// Defaults to false.
@@ -69,25 +88,6 @@ public interface IS3RepositorySettings : IRepositorySettings
 		[JsonProperty("server_side_encryption")]
 		bool? ServerSideEncryption { get; set; }
 
-		/// <summary>
-		/// Minimum threshold below which the chunk is uploaded using a single request.
-		/// Beyond this threshold, the S3 repository will use the AWS Multipart Upload API to split the chunk into
-		/// several parts, each of buffer_size length, and to upload each part in its own request. Note that setting a
-		/// buffer size lower than 5mb is not allowed since it will prevent the use of the Multipart API and may result
-		/// in upload errors. It is also not possible to set a buffer size greater than 5gb as it is the maximum upload
-		/// size allowed by S3. Defaults to the minimum between 100mb and 5% of the heap size.
-		/// </summary>
-		[JsonProperty("buffer_size")]
-		string BufferSize { get; set; }
-
-		/// <summary>
-		/// Specify a canned ACL for the S3 bucket.
-		/// The S3 repository supports all S3 canned ACLs : private, public-read, public-read-write, authenticated-read,
-		/// log-delivery-write, bucket-owner-read, bucket-owner-full-control. Defaults to private.
-		/// </summary>
-		[JsonProperty("canned_acl")]
-		string CannedAcl { get; set; }
-
 		/// <summary>
 		/// Sets the S3 storage class type for the backup files. Values may be standard, reduced_redundancy, standard_ia.
 		/// Defaults to standard.
@@ -100,30 +100,41 @@ public class S3RepositorySettings : IS3RepositorySettings
 	{
 		internal S3RepositorySettings() { }
 
-		public S3RepositorySettings(string bucket) => this.Bucket = bucket;
+		public S3RepositorySettings(string bucket) => Bucket = bucket;
 
 		/// <inheritdoc />
 		public string AccessKey { get; set; }
+
 		/// <inheritdoc />
-		public string SecretKey { get; set; }
-		/// <inheritdoc />
-		public int? ConcurrentStreams { get; set; }
+		public string BasePath { get; set; }
+
 		/// <inheritdoc />
 		public string Bucket { get; set; }
+
 		/// <inheritdoc />
-		public string Client { get; set; }
+		public string BufferSize { get; set; }
+
 		/// <inheritdoc />
-		public string BasePath { get; set; }
+		public string CannedAcl { get; set; }
+
 		/// <inheritdoc />
 		public string ChunkSize { get; set; }
+
+		/// <inheritdoc />
+		public string Client { get; set; }
+
 		/// <inheritdoc />
 		public bool? Compress { get; set; }
+
 		/// <inheritdoc />
-		public bool? ServerSideEncryption { get; set; }
+		public int? ConcurrentStreams { get; set; }
+
 		/// <inheritdoc />
-		public string BufferSize { get; set; }
+		public string SecretKey { get; set; }
+
 		/// <inheritdoc />
-		public string CannedAcl { get; set; }
+		public bool? ServerSideEncryption { get; set; }
+
 		/// <inheritdoc />
 		public string StorageClass { get; set; }
 	}
@@ -131,70 +142,70 @@ internal S3RepositorySettings() { }
 	public class S3RepositorySettingsDescriptor
 		: DescriptorBase<S3RepositorySettingsDescriptor, IS3RepositorySettings>, IS3RepositorySettings
 	{
+		public S3RepositorySettingsDescriptor() { }
+
+		public S3RepositorySettingsDescriptor(string bucket) => Self.Bucket = bucket;
+
 		string IS3RepositorySettings.AccessKey { get; set; }
-		string IS3RepositorySettings.SecretKey { get; set; }
-		int? IS3RepositorySettings.ConcurrentStreams { get; set; }
+		string IS3RepositorySettings.BasePath { get; set; }
 
 		string IS3RepositorySettings.Bucket { get; set; }
+		string IS3RepositorySettings.BufferSize { get; set; }
+		string IS3RepositorySettings.CannedAcl { get; set; }
+		string IS3RepositorySettings.ChunkSize { get; set; }
 		string IS3RepositorySettings.Client { get; set; }
-		string IS3RepositorySettings.BasePath { get; set; }
 		bool? IS3RepositorySettings.Compress { get; set; }
-		string IS3RepositorySettings.ChunkSize { get; set; }
+		int? IS3RepositorySettings.ConcurrentStreams { get; set; }
+		string IS3RepositorySettings.SecretKey { get; set; }
 		bool? IS3RepositorySettings.ServerSideEncryption { get; set; }
-		string IS3RepositorySettings.BufferSize { get; set; }
-		string IS3RepositorySettings.CannedAcl { get; set; }
 		string IS3RepositorySettings.StorageClass { get; set; }
 
-		public S3RepositorySettingsDescriptor() { }
-
-		public S3RepositorySettingsDescriptor(string bucket) => Self.Bucket = bucket;
-
-		/// <inheritdoc cref="IS3RepositorySettings.AccessKey"/>
+		/// <inheritdoc cref="IS3RepositorySettings.AccessKey" />
 		[Obsolete("Removed in Elasticsearch 6.0, please specify secure settings in the keystore.")]
 		public S3RepositorySettingsDescriptor AccessKey(string accessKey) => Assign(a => a.AccessKey = accessKey);
 
-		/// <inheritdoc cref="IS3RepositorySettings.SecretKey"/>
+		/// <inheritdoc cref="IS3RepositorySettings.SecretKey" />
 		[Obsolete("Removed in Elasticsearch 6.0, please specify secure settings in the keystore.")]
 		public S3RepositorySettingsDescriptor SecretKey(string secretKey) => Assign(a => a.SecretKey = secretKey);
 
-		/// <inheritdoc cref="IS3RepositorySettings.ConcurrentStreams"/>
+		/// <inheritdoc cref="IS3RepositorySettings.ConcurrentStreams" />
 		[Obsolete("Removed in Elasticsearch 6.0")]
 		public S3RepositorySettingsDescriptor ConcurrentStreams(int? concurrentStreams) => Assign(a => a.ConcurrentStreams = concurrentStreams);
 
-		/// <inheritdoc cref="IS3RepositorySettings.Bucket"/>
+		/// <inheritdoc cref="IS3RepositorySettings.Bucket" />
 		public S3RepositorySettingsDescriptor Bucket(string bucket) => Assign(a => a.Bucket = bucket);
 
-		/// <inheritdoc cref="IS3RepositorySettings.Client"/>
+		/// <inheritdoc cref="IS3RepositorySettings.Client" />
 		public S3RepositorySettingsDescriptor Client(string client) => Assign(a => a.Client = client);
 
-		/// <inheritdoc cref="IS3RepositorySettings.BasePath"/>
+		/// <inheritdoc cref="IS3RepositorySettings.BasePath" />
 		public S3RepositorySettingsDescriptor BasePath(string basePath) => Assign(a => a.BasePath = basePath);
 
-		/// <inheritdoc cref="IS3RepositorySettings.Compress"/>
+		/// <inheritdoc cref="IS3RepositorySettings.Compress" />
 		public S3RepositorySettingsDescriptor Compress(bool? compress = true) => Assign(a => a.Compress = compress);
 
-		/// <inheritdoc cref="IS3RepositorySettings.ChunkSize"/>
+		/// <inheritdoc cref="IS3RepositorySettings.ChunkSize" />
 		public S3RepositorySettingsDescriptor ChunkSize(string chunkSize) => Assign(a => a.ChunkSize = chunkSize);
 
-		/// <inheritdoc cref="IS3RepositorySettings.ServerSideEncryption"/>
+		/// <inheritdoc cref="IS3RepositorySettings.ServerSideEncryption" />
 		public S3RepositorySettingsDescriptor ServerSideEncryption(bool? serverSideEncryption = true) =>
 			Assign(a => a.ServerSideEncryption = serverSideEncryption);
 
-		/// <inheritdoc cref="IS3RepositorySettings.BufferSize"/>
+		/// <inheritdoc cref="IS3RepositorySettings.BufferSize" />
 		public S3RepositorySettingsDescriptor BufferSize(string bufferSize) => Assign(a => a.BufferSize = bufferSize);
 
-		/// <inheritdoc cref="IS3RepositorySettings.CannedAcl"/>
+		/// <inheritdoc cref="IS3RepositorySettings.CannedAcl" />
 		public S3RepositorySettingsDescriptor CannedAcl(string cannedAcl) => Assign(a => a.CannedAcl = cannedAcl);
 
-		/// <inheritdoc cref="IS3RepositorySettings.StorageClass"/>
+		/// <inheritdoc cref="IS3RepositorySettings.StorageClass" />
 		public S3RepositorySettingsDescriptor StorageClass(string storageClass) => Assign(a => a.StorageClass = storageClass);
 	}
 
 	public class S3RepositoryDescriptor
 		: DescriptorBase<S3RepositoryDescriptor, IS3Repository>, IS3Repository
 	{
-		string ISnapshotRepository.Type { get; } = "s3";
 		IS3RepositorySettings IRepository<IS3RepositorySettings>.Settings { get; set; }
+		string ISnapshotRepository.Type { get; } = "s3";
 
 		public S3RepositoryDescriptor Settings(string bucket, Func<S3RepositorySettingsDescriptor, IS3RepositorySettings> settingsSelector = null) =>
 			Assign(a => a.Settings = settingsSelector.InvokeOrDefault(new S3RepositorySettingsDescriptor(bucket)));
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/ElasticClient-VerifyRepository.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/ElasticClient-VerifyRepository.cs
index 1d554e96516..2adc355210c 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/ElasticClient-VerifyRepository.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/ElasticClient-VerifyRepository.cs
@@ -1,48 +1,60 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IVerifyRepositoryResponse VerifyRepository(Name repository, Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IVerifyRepositoryResponse VerifyRepository(IVerifyRepositoryRequest request);
 
-		/// <inheritdoc/>
-		Task<IVerifyRepositoryResponse> VerifyRepositoryAsync(Name repository, Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IVerifyRepositoryResponse> VerifyRepositoryAsync(Name repository,
+			Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IVerifyRepositoryResponse> VerifyRepositoryAsync(IVerifyRepositoryRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IVerifyRepositoryResponse> VerifyRepositoryAsync(IVerifyRepositoryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IVerifyRepositoryResponse VerifyRepository(Name repository, Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> selector = null) =>
-			this.VerifyRepository(selector.InvokeOrDefault(new VerifyRepositoryDescriptor(repository)));
+		/// <inheritdoc />
+		public IVerifyRepositoryResponse VerifyRepository(Name repository, Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> selector = null
+		) =>
+			VerifyRepository(selector.InvokeOrDefault(new VerifyRepositoryDescriptor(repository)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IVerifyRepositoryResponse VerifyRepository(IVerifyRepositoryRequest request) =>
-			this.Dispatcher.Dispatch<IVerifyRepositoryRequest, VerifyRepositoryRequestParameters, VerifyRepositoryResponse>(
+			Dispatcher.Dispatch<IVerifyRepositoryRequest, VerifyRepositoryRequestParameters, VerifyRepositoryResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.SnapshotVerifyRepositoryDispatch<VerifyRepositoryResponse>(p)
+				(p, d) => LowLevelDispatch.SnapshotVerifyRepositoryDispatch<VerifyRepositoryResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IVerifyRepositoryResponse> VerifyRepositoryAsync(Name repository, Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.VerifyRepositoryAsync(selector.InvokeOrDefault(new VerifyRepositoryDescriptor(repository)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IVerifyRepositoryResponse> VerifyRepositoryAsync(IVerifyRepositoryRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IVerifyRepositoryRequest, VerifyRepositoryRequestParameters, VerifyRepositoryResponse, IVerifyRepositoryResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SnapshotVerifyRepositoryDispatchAsync<VerifyRepositoryResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IVerifyRepositoryResponse> VerifyRepositoryAsync(Name repository,
+			Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			VerifyRepositoryAsync(selector.InvokeOrDefault(new VerifyRepositoryDescriptor(repository)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IVerifyRepositoryResponse> VerifyRepositoryAsync(IVerifyRepositoryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IVerifyRepositoryRequest, VerifyRepositoryRequestParameters, VerifyRepositoryResponse, IVerifyRepositoryResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.SnapshotVerifyRepositoryDispatchAsync<VerifyRepositoryResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs
index f94ba6bd2d1..6c74ed5f394 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs
@@ -17,7 +17,6 @@ public interface IVerifyRepositoryResponse : IResponse
 	[JsonObject]
 	public class VerifyRepositoryResponse : ResponseBase, IVerifyRepositoryResponse
 	{
-
 		/// <summary>
 		///  A dictionary of nodeId => nodeinfo of nodes that verified the repository
 		/// </summary>
diff --git a/src/Nest/Modules/SnapshotAndRestore/Restore/ElasticClient-Restore.cs b/src/Nest/Modules/SnapshotAndRestore/Restore/ElasticClient-Restore.cs
index c85724dca66..b5d7b2b0010 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Restore/ElasticClient-Restore.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Restore/ElasticClient-Restore.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,46 +9,51 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Restore a snapshot
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_restore
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_restore
 		/// </summary>
 		/// <param name="repository">The repository name that holds our snapshot</param>
 		/// <param name="snapshotName">The name of the snapshot that we want to restore</param>
 		/// <param name="selector">Optionally further describe the restore operation</param>
 		IRestoreResponse Restore(Name repository, Name snapshotName, Func<RestoreDescriptor, IRestoreRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRestoreResponse Restore(IRestoreRequest request);
 
-		/// <inheritdoc/>
-		Task<IRestoreResponse> RestoreAsync(Name repository, Name snapshotName, Func<RestoreDescriptor, IRestoreRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRestoreResponse> RestoreAsync(Name repository, Name snapshotName, Func<RestoreDescriptor, IRestoreRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IRestoreResponse> RestoreAsync(IRestoreRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRestoreResponse Restore(IRestoreRequest request) =>
-			this.Dispatcher.Dispatch<IRestoreRequest, RestoreRequestParameters, RestoreResponse>(
+			Dispatcher.Dispatch<IRestoreRequest, RestoreRequestParameters, RestoreResponse>(
 				request,
-				this.LowLevelDispatch.SnapshotRestoreDispatch<RestoreResponse>
+				LowLevelDispatch.SnapshotRestoreDispatch<RestoreResponse>
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRestoreResponse Restore(Name repository, Name snapshotName, Func<RestoreDescriptor, IRestoreRequest> selector = null) =>
-			this.Restore(selector.InvokeOrDefault(new RestoreDescriptor(repository, snapshotName)));
+			Restore(selector.InvokeOrDefault(new RestoreDescriptor(repository, snapshotName)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IRestoreResponse> RestoreAsync(IRestoreRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRestoreRequest, RestoreRequestParameters, RestoreResponse, IRestoreResponse>(
+			Dispatcher.DispatchAsync<IRestoreRequest, RestoreRequestParameters, RestoreResponse, IRestoreResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SnapshotRestoreDispatchAsync<RestoreResponse>(p, d, c)
+				(p, d, c) => LowLevelDispatch.SnapshotRestoreDispatchAsync<RestoreResponse>(p, d, c)
 			);
 
-		/// <inheritdoc/>
-		public Task<IRestoreResponse> RestoreAsync(Name repository, Name snapshotName, Func<RestoreDescriptor, IRestoreRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RestoreAsync(selector.InvokeOrDefault(new RestoreDescriptor(repository, snapshotName)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IRestoreResponse> RestoreAsync(Name repository, Name snapshotName, Func<RestoreDescriptor, IRestoreRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RestoreAsync(selector.InvokeOrDefault(new RestoreDescriptor(repository, snapshotName)), cancellationToken);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/ElasticClient-RestoreObservable.cs b/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/ElasticClient-RestoreObservable.cs
index 5e2efde1d82..a648e6a6df9 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/ElasticClient-RestoreObservable.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/ElasticClient-RestoreObservable.cs
@@ -4,25 +4,29 @@ namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
-		IObservable<IRecoveryStatusResponse> RestoreObservable(Name repository, Name snapshot, TimeSpan interval, Func<RestoreDescriptor, IRestoreRequest> selector = null);
+		/// <inheritdoc />
+		IObservable<IRecoveryStatusResponse> RestoreObservable(Name repository, Name snapshot, TimeSpan interval,
+			Func<RestoreDescriptor, IRestoreRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IObservable<IRecoveryStatusResponse> RestoreObservable(TimeSpan interval, IRestoreRequest request);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IObservable<IRecoveryStatusResponse> RestoreObservable(Name repository, Name snapshot, TimeSpan interval, Func<RestoreDescriptor, IRestoreRequest> selector = null)
+		/// <inheritdoc />
+		public IObservable<IRecoveryStatusResponse> RestoreObservable(Name repository, Name snapshot, TimeSpan interval,
+			Func<RestoreDescriptor, IRestoreRequest> selector = null
+		)
 		{
 			var restoreDescriptor = selector.InvokeOrDefault(new RestoreDescriptor(repository, snapshot));
 			var observable = new RestoreObservable(this, restoreDescriptor, interval);
 			return observable;
 		}
 
-		/// <inheritdoc/>
-		public IObservable<IRecoveryStatusResponse> RestoreObservable(TimeSpan interval, IRestoreRequest request)=>
+		/// <inheritdoc />
+		public IObservable<IRecoveryStatusResponse> RestoreObservable(TimeSpan interval, IRestoreRequest request) =>
 			new RestoreObservable(this, request, interval);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObservable.cs b/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObservable.cs
index 2ac7d97ae00..fea3f641494 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObservable.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObservable.cs
@@ -10,14 +10,14 @@ namespace Nest
 	public class RestoreObservable : IDisposable, IObservable<IRecoveryStatusResponse>
 	{
 		private readonly IElasticClient _elasticClient;
-		private readonly IRestoreRequest _restoreRequest;
 		private readonly TimeSpan _interval = TimeSpan.FromSeconds(2);
-		private Timer _timer;
-		private bool _disposed;
+		private readonly IRestoreRequest _restoreRequest;
 		private readonly RestoreStatusHumbleObject _restoreStatusHumbleObject;
-		private EventHandler<RestoreNextEventArgs> _nextEventHandlers;
 		private EventHandler<RestoreCompletedEventArgs> _completedEentHandlers;
+		private bool _disposed;
 		private EventHandler<RestoreErrorEventArgs> _errorEventHandlers;
+		private EventHandler<RestoreNextEventArgs> _nextEventHandlers;
+		private Timer _timer;
 
 		public RestoreObservable(IElasticClient elasticClient, IRestoreRequest restoreRequest)
 		{
@@ -41,6 +41,8 @@ public RestoreObservable(IElasticClient elasticClient, IRestoreRequest restoreRe
 			_interval = interval;
 		}
 
+		public void Dispose() => Dispose(true);
+
 		public IDisposable Subscribe(IObserver<IRecoveryStatusResponse> observer)
 		{
 			observer.ThrowIfNull(nameof(observer));
@@ -48,7 +50,7 @@ public IDisposable Subscribe(IObserver<IRecoveryStatusResponse> observer)
 			try
 			{
 				_restoreRequest.RequestParameters.WaitForCompletion = false;
-				var restoreResponse = this._elasticClient.Restore(_restoreRequest);
+				var restoreResponse = _elasticClient.Restore(_restoreRequest);
 
 				if (!restoreResponse.IsValid)
 					throw new ElasticsearchClientException(PipelineFailure.BadResponse, "Failed to restore snapshot.", restoreResponse.ApiCall);
@@ -65,7 +67,7 @@ public IDisposable Subscribe(IObserver<IRecoveryStatusResponse> observer)
 				_restoreStatusHumbleObject.Completed += onCompleted;
 				_restoreStatusHumbleObject.Error += onError;
 
-				_timer = new Timer(Restore, observer, _interval, System.Threading.Timeout.InfiniteTimeSpan);
+				_timer = new Timer(Restore, observer, _interval, Timeout.InfiniteTimeSpan);
 			}
 			catch (Exception exception)
 			{
@@ -88,7 +90,8 @@ private void Restore(object state)
 
 				_restoreStatusHumbleObject.CheckStatus();
 
-				_timer.Change(TimeSpan.FromMilliseconds(Math.Max(0, _interval.TotalMilliseconds - watch.ElapsedMilliseconds)), System.Threading.Timeout.InfiniteTimeSpan);
+				_timer.Change(TimeSpan.FromMilliseconds(Math.Max(0, _interval.TotalMilliseconds - watch.ElapsedMilliseconds)),
+					Timeout.InfiniteTimeSpan);
 			}
 			catch (Exception exception)
 			{
@@ -96,19 +99,12 @@ private void Restore(object state)
 			}
 		}
 
-		private void StopTimer(object sender, EventArgs restoreCompletedEventArgs)
-		{
-			_timer.Change(System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
-		}
-
-		public void Dispose()
-		{
-			Dispose(true);
-		}
+		private void StopTimer(object sender, EventArgs restoreCompletedEventArgs) => _timer.Change(Timeout.Infinite, Timeout.Infinite);
 
 		protected virtual void Dispose(bool disposing)
 		{
 			if (_disposed) return;
+
 			_timer?.Dispose();
 
 			if (_restoreStatusHumbleObject != null)
@@ -124,52 +120,36 @@ protected virtual void Dispose(bool disposing)
 			_disposed = true;
 		}
 
-		~RestoreObservable()
-		{
-			Dispose(false);
-		}
+		~RestoreObservable() => Dispose(false);
 	}
 
 	public class RestoreNextEventArgs : EventArgs
 	{
-		public IRecoveryStatusResponse RecoveryStatusResponse { get; }
+		public RestoreNextEventArgs(IRecoveryStatusResponse recoveryStatusResponse) => RecoveryStatusResponse = recoveryStatusResponse;
 
-		public RestoreNextEventArgs(IRecoveryStatusResponse recoveryStatusResponse)
-		{
-			RecoveryStatusResponse = recoveryStatusResponse;
-		}
+		public IRecoveryStatusResponse RecoveryStatusResponse { get; }
 	}
 
 	public class RestoreCompletedEventArgs : EventArgs
 	{
-		public IRecoveryStatusResponse RecoveryStatusResponse { get; }
+		public RestoreCompletedEventArgs(IRecoveryStatusResponse recoveryStatusResponse) => RecoveryStatusResponse = recoveryStatusResponse;
 
-		public RestoreCompletedEventArgs(IRecoveryStatusResponse recoveryStatusResponse)
-		{
-			RecoveryStatusResponse = recoveryStatusResponse;
-		}
+		public IRecoveryStatusResponse RecoveryStatusResponse { get; }
 	}
 
 	public class RestoreErrorEventArgs : EventArgs
 	{
-		public Exception Exception { get; }
+		public RestoreErrorEventArgs(Exception exception) => Exception = exception;
 
-		public RestoreErrorEventArgs(Exception exception)
-		{
-			Exception = exception;
-		}
+		public Exception Exception { get; }
 	}
 
 	public class RestoreStatusHumbleObject
 	{
 		private readonly IElasticClient _elasticClient;
-		private readonly IRestoreRequest _restoreRequest;
 		private readonly string _renamePattern;
 		private readonly string _renameReplacement;
-
-		public event EventHandler<RestoreCompletedEventArgs> Completed;
-		public event EventHandler<RestoreErrorEventArgs> Error;
-		public event EventHandler<RestoreNextEventArgs> Next;
+		private readonly IRestoreRequest _restoreRequest;
 
 		public RestoreStatusHumbleObject(IElasticClient elasticClient, IRestoreRequest restoreRequest)
 		{
@@ -183,16 +163,20 @@ public RestoreStatusHumbleObject(IElasticClient elasticClient, IRestoreRequest r
 			_renameReplacement = string.IsNullOrEmpty(_restoreRequest.RenameReplacement) ? string.Empty : _restoreRequest.RenameReplacement;
 		}
 
+		public event EventHandler<RestoreCompletedEventArgs> Completed;
+		public event EventHandler<RestoreErrorEventArgs> Error;
+		public event EventHandler<RestoreNextEventArgs> Next;
+
 		public void CheckStatus()
 		{
 			try
 			{
 				var indices =
 					_restoreRequest.Indices.Item2.Indices.Select(
-						x => IndexName.Rebuild(
-							Regex.Replace(x.Name, _renamePattern, _renameReplacement),
-							x.Type
-						))
+							x => IndexName.Rebuild(
+								Regex.Replace(x.Name, _renamePattern, _renameReplacement),
+								x.Type
+							))
 						.ToArray();
 
 				var recoveryStatus = _elasticClient.RecoveryStatus(new RecoveryStatusRequest(indices)
diff --git a/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObserver.cs b/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObserver.cs
index 00474550c71..cc6300c77c7 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObserver.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObserver.cs
@@ -7,10 +7,8 @@ public class RestoreObserver : CoordinatedRequestObserverBase<IRecoveryStatusRes
 		public RestoreObserver(
 			Action<IRecoveryStatusResponse> onNext = null,
 			Action<Exception> onError = null,
-			Action completed = null)
-			: base(onNext, onError, completed)
-		{
-
-		}
+			Action completed = null
+		)
+			: base(onNext, onError, completed) { }
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs b/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs
index 0a72b3d8ee6..85826261fa4 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs
@@ -10,10 +10,10 @@ namespace Nest
 	public partial interface IRestoreRequest
 	{
 		/// <summary>
-		/// The indices to restore
+		/// The index settings to ignore as part of the restore operation
 		/// </summary>
-		[JsonProperty("indices")]
-		Indices Indices { get; set; }
+		[JsonProperty("ignore_index_settings")]
+		List<string> IgnoreIndexSettings { get; set; }
 
 		/// <summary>
 		/// Whether indices specified that do not exist
@@ -23,25 +23,16 @@ public partial interface IRestoreRequest
 		bool? IgnoreUnavailable { get; set; }
 
 		/// <summary>
-		/// Whether the cluster global state should be included
-		/// </summary>
-		[JsonProperty("include_global_state")]
-		bool? IncludeGlobalState { get; set; }
-
-		/// <summary>
-		/// A pattern to use to rename restored indices. The pattern
-		/// can be used to capture parts of the original index name
-		/// and used within <see cref="RenameReplacement"/>
+		/// Whether to include aliases as part of the restore
 		/// </summary>
-		[JsonProperty("rename_pattern")]
-		string RenamePattern { get; set; }
+		[JsonProperty("include_aliases")]
+		bool? IncludeAliases { get; set; }
 
 		/// <summary>
-		/// A replacement to use to rename restored indices. Used
-		/// in conjunction with <see cref="RenamePattern"/>.
+		/// Whether the cluster global state should be included
 		/// </summary>
-		[JsonProperty("rename_replacement")]
-		string RenameReplacement { get; set; }
+		[JsonProperty("include_global_state")]
+		bool? IncludeGlobalState { get; set; }
 
 		/// <summary>
 		/// The index settings that should be applied as part of
@@ -53,16 +44,10 @@ public partial interface IRestoreRequest
 		IUpdateIndexSettingsRequest IndexSettings { get; set; }
 
 		/// <summary>
-		/// The index settings to ignore as part of the restore operation
-		/// </summary>
-		[JsonProperty("ignore_index_settings")]
-		List<string> IgnoreIndexSettings { get; set; }
-
-		/// <summary>
-		/// Whether to include aliases as part of the restore
+		/// The indices to restore
 		/// </summary>
-		[JsonProperty("include_aliases")]
-		bool? IncludeAliases { get; set; }
+		[JsonProperty("indices")]
+		Indices Indices { get; set; }
 
 		/// <summary>
 		/// Allow partial restore for indices that don't have snapshots of all shards available.
@@ -70,93 +55,109 @@ public partial interface IRestoreRequest
 		/// By default, the entire restore operation will fail if one or more indices participating
 		/// in the operation don’t have snapshots of all shards available. It can occur if some
 		/// shards failed to snapshot for example. It is still possible to restore such indices
-		/// by setting <see cref="Partial"/> to <c>true</c>. Only successfully snapshotted shards
+		/// by setting <see cref="Partial" /> to <c>true</c>. Only successfully snapshotted shards
 		/// will be restored in this case and all missing shards will be recreated empty.
 		/// </summary>
 		[JsonProperty("partial")]
 		bool? Partial { get; set; }
- 	}
 
-	/// <inheritdoc cref="IRestoreRequest"/>
+		/// <summary>
+		/// A pattern to use to rename restored indices. The pattern
+		/// can be used to capture parts of the original index name
+		/// and used within <see cref="RenameReplacement" />
+		/// </summary>
+		[JsonProperty("rename_pattern")]
+		string RenamePattern { get; set; }
+
+		/// <summary>
+		/// A replacement to use to rename restored indices. Used
+		/// in conjunction with <see cref="RenamePattern" />.
+		/// </summary>
+		[JsonProperty("rename_replacement")]
+		string RenameReplacement { get; set; }
+	}
+
+	/// <inheritdoc cref="IRestoreRequest" />
 	public partial class RestoreRequest
 	{
 		/// <inheritdoc />
-		public Indices Indices { get; set; }
+		public List<string> IgnoreIndexSettings { get; set; }
 
 		/// <inheritdoc />
 		public bool? IgnoreUnavailable { get; set; }
 
 		/// <inheritdoc />
-		public bool? IncludeGlobalState { get; set; }
+		public bool? IncludeAliases { get; set; }
 
 		/// <inheritdoc />
-		public string RenamePattern { get; set; }
+		public bool? IncludeGlobalState { get; set; }
 
 		/// <inheritdoc />
-		public string RenameReplacement { get; set; }
+		public IUpdateIndexSettingsRequest IndexSettings { get; set; }
 
 		/// <inheritdoc />
-		public IUpdateIndexSettingsRequest IndexSettings { get; set; }
+		public Indices Indices { get; set; }
 
 		/// <inheritdoc />
-		public List<string> IgnoreIndexSettings { get; set; }
+		public bool? Partial { get; set; }
 
 		/// <inheritdoc />
-		public bool? IncludeAliases { get; set; }
+		public string RenamePattern { get; set; }
 
 		/// <inheritdoc />
-		public bool? Partial { get; set; }
+		public string RenameReplacement { get; set; }
 	}
 
-	/// <inheritdoc cref="IRestoreRequest"/>
+	/// <inheritdoc cref="IRestoreRequest" />
 	[DescriptorFor("SnapshotRestore")]
 	public partial class RestoreDescriptor
 	{
-		Indices IRestoreRequest.Indices { get; set; }
+		List<string> IRestoreRequest.IgnoreIndexSettings { get; set; }
 		bool? IRestoreRequest.IgnoreUnavailable { get; set; }
+		bool? IRestoreRequest.IncludeAliases { get; set; }
 		bool? IRestoreRequest.IncludeGlobalState { get; set; }
-		string IRestoreRequest.RenamePattern { get; set; }
-		string IRestoreRequest.RenameReplacement { get; set; }
 		IUpdateIndexSettingsRequest IRestoreRequest.IndexSettings { get; set; }
-		List<string> IRestoreRequest.IgnoreIndexSettings { get; set; }
-		bool? IRestoreRequest.IncludeAliases { get; set; }
+		Indices IRestoreRequest.Indices { get; set; }
 		bool? IRestoreRequest.Partial { get; set; }
+		string IRestoreRequest.RenamePattern { get; set; }
+		string IRestoreRequest.RenameReplacement { get; set; }
 
-		/// <inheritdoc cref="IRestoreRequest.Indices"/>
-		public RestoreDescriptor Index(IndexName index) => this.Indices(index);
+		/// <inheritdoc cref="IRestoreRequest.Indices" />
+		public RestoreDescriptor Index(IndexName index) => Indices(index);
 
-		/// <inheritdoc cref="IRestoreRequest.Indices"/>
-		public RestoreDescriptor Index<T>() where T : class => this.Indices(typeof(T));
+		/// <inheritdoc cref="IRestoreRequest.Indices" />
+		public RestoreDescriptor Index<T>() where T : class => Indices(typeof(T));
 
-		/// <inheritdoc cref="IRestoreRequest.Indices"/>
+		/// <inheritdoc cref="IRestoreRequest.Indices" />
 		public RestoreDescriptor Indices(Indices indices) => Assign(a => a.Indices = indices);
 
-		/// <inheritdoc cref="IRestoreRequest.IgnoreUnavailable"/>
+		/// <inheritdoc cref="IRestoreRequest.IgnoreUnavailable" />
 		public RestoreDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Assign(a => a.IgnoreUnavailable = ignoreUnavailable);
 
-		/// <inheritdoc cref="IRestoreRequest.IncludeGlobalState"/>
+		/// <inheritdoc cref="IRestoreRequest.IncludeGlobalState" />
 		public RestoreDescriptor IncludeGlobalState(bool? includeGlobalState = true) => Assign(a => a.IncludeGlobalState = includeGlobalState);
 
-		/// <inheritdoc cref="IRestoreRequest.RenamePattern"/>
+		/// <inheritdoc cref="IRestoreRequest.RenamePattern" />
 		public RestoreDescriptor RenamePattern(string renamePattern) => Assign(a => a.RenamePattern = renamePattern);
 
-		/// <inheritdoc cref="IRestoreRequest.RenameReplacement"/>
+		/// <inheritdoc cref="IRestoreRequest.RenameReplacement" />
 		public RestoreDescriptor RenameReplacement(string renameReplacement) => Assign(a => a.RenameReplacement = renameReplacement);
 
-		/// <inheritdoc cref="IRestoreRequest.IndexSettings"/>
+		/// <inheritdoc cref="IRestoreRequest.IndexSettings" />
 		public RestoreDescriptor IndexSettings(Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> settingsSelector) =>
-				Assign(a => a.IndexSettings = settingsSelector?.Invoke(new UpdateIndexSettingsDescriptor()));
+			Assign(a => a.IndexSettings = settingsSelector?.Invoke(new UpdateIndexSettingsDescriptor()));
 
-		/// <inheritdoc cref="IRestoreRequest.IgnoreIndexSettings"/>
+		/// <inheritdoc cref="IRestoreRequest.IgnoreIndexSettings" />
 		public RestoreDescriptor IgnoreIndexSettings(List<string> ignoreIndexSettings) => Assign(a => a.IgnoreIndexSettings = ignoreIndexSettings);
 
-		/// <inheritdoc cref="IRestoreRequest.IgnoreIndexSettings"/>
-		public RestoreDescriptor IgnoreIndexSettings(params string[] ignoreIndexSettings) => Assign(a => a.IgnoreIndexSettings = ignoreIndexSettings.ToListOrNullIfEmpty());
+		/// <inheritdoc cref="IRestoreRequest.IgnoreIndexSettings" />
+		public RestoreDescriptor IgnoreIndexSettings(params string[] ignoreIndexSettings) =>
+			Assign(a => a.IgnoreIndexSettings = ignoreIndexSettings.ToListOrNullIfEmpty());
 
-		/// <inheritdoc cref="IRestoreRequest.IncludeAliases"/>
+		/// <inheritdoc cref="IRestoreRequest.IncludeAliases" />
 		public RestoreDescriptor IncludeAliases(bool? includeAliases = true) => Assign(a => a.IncludeAliases = includeAliases);
 
-		/// <inheritdoc cref="IRestoreRequest.Partial"/>
+		/// <inheritdoc cref="IRestoreRequest.Partial" />
 		public RestoreDescriptor Partial(bool? partial = true) => Assign(a => a.Partial = partial);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Restore/SnapshotRestore.cs b/src/Nest/Modules/SnapshotAndRestore/Restore/SnapshotRestore.cs
index 948670eab9b..372a6d847d4 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Restore/SnapshotRestore.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Restore/SnapshotRestore.cs
@@ -5,14 +5,14 @@ namespace Nest
 {
 	public class SnapshotRestore
 	{
-		[JsonProperty("snapshot")]
-		public string Name { get; internal set;  }
-
 		[JsonProperty("indices")]
 		public IReadOnlyCollection<IndexName> Indices { get; internal set; } =
 			EmptyReadOnly<IndexName>.Collection;
 
+		[JsonProperty("snapshot")]
+		public string Name { get; internal set; }
+
 		[JsonProperty("shards")]
-		public ShardStatistics Shards { get; internal set;  }
+		public ShardStatistics Shards { get; internal set; }
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotResponse.cs
index 7d6171c1a99..68e2f7e0295 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotResponse.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotResponse.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public interface IDeleteSnapshotResponse : IAcknowledgedResponse { }
 
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/ElasticClient-DeleteSnapshot.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/ElasticClient-DeleteSnapshot.cs
index be80c5ad320..c5fe420654f 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/ElasticClient-DeleteSnapshot.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/ElasticClient-DeleteSnapshot.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,47 +9,60 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Delete a snapshot
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_snapshot
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_snapshot
 		/// </summary>
 		/// <param name="repository">The repository name under which the snapshot we want to delete lives</param>
 		/// <param name="snapshotName">The name of the snapshot that we want to delete</param>
 		/// <param name="selector">Optionally further describe the delete snapshot operation</param>
-		IDeleteSnapshotResponse DeleteSnapshot(Name repository, Name snapshotName, Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> selector = null);
+		IDeleteSnapshotResponse DeleteSnapshot(Name repository, Name snapshotName,
+			Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteSnapshotResponse DeleteSnapshot(IDeleteSnapshotRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteSnapshotResponse> DeleteSnapshotAsync(
-			Name repository, Name snapshotName, Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
-
-		/// <inheritdoc/>
-		Task<IDeleteSnapshotResponse> DeleteSnapshotAsync(IDeleteSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken));
+			Name repository, Name snapshotName, Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
+		/// <inheritdoc />
+		Task<IDeleteSnapshotResponse> DeleteSnapshotAsync(IDeleteSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IDeleteSnapshotResponse DeleteSnapshot(Name repository, Name snapshotName, Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> selector = null) =>
-			this.DeleteSnapshot(selector.InvokeOrDefault(new DeleteSnapshotDescriptor(repository, snapshotName)));
+		/// <inheritdoc />
+		public IDeleteSnapshotResponse DeleteSnapshot(Name repository, Name snapshotName,
+			Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> selector = null
+		) =>
+			DeleteSnapshot(selector.InvokeOrDefault(new DeleteSnapshotDescriptor(repository, snapshotName)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteSnapshotResponse DeleteSnapshot(IDeleteSnapshotRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteSnapshotRequest, DeleteSnapshotRequestParameters, DeleteSnapshotResponse>(
+			Dispatcher.Dispatch<IDeleteSnapshotRequest, DeleteSnapshotRequestParameters, DeleteSnapshotResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.SnapshotDeleteDispatch<DeleteSnapshotResponse>(p)
+				(p, d) => LowLevelDispatch.SnapshotDeleteDispatch<DeleteSnapshotResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteSnapshotResponse> DeleteSnapshotAsync(Name repository, Name snapshotName, Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteSnapshotAsync(selector.InvokeOrDefault(new DeleteSnapshotDescriptor(repository, snapshotName)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IDeleteSnapshotResponse> DeleteSnapshotAsync(Name repository, Name snapshotName,
+			Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteSnapshotAsync(selector.InvokeOrDefault(new DeleteSnapshotDescriptor(repository, snapshotName)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeleteSnapshotResponse> DeleteSnapshotAsync(IDeleteSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteSnapshotRequest, DeleteSnapshotRequestParameters, DeleteSnapshotResponse, IDeleteSnapshotResponse>(
+		/// <inheritdoc />
+		public Task<IDeleteSnapshotResponse> DeleteSnapshotAsync(IDeleteSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteSnapshotRequest, DeleteSnapshotRequestParameters, DeleteSnapshotResponse, IDeleteSnapshotResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SnapshotDeleteDispatchAsync<DeleteSnapshotResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.SnapshotDeleteDispatchAsync<DeleteSnapshotResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/ElasticClient-GetSnapshot.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/ElasticClient-GetSnapshot.cs
index 12cc2a2ad58..779db0223e3 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/ElasticClient-GetSnapshot.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/ElasticClient-GetSnapshot.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,47 +9,53 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Gets information about one or more snapshots
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_snapshot
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_snapshot
 		/// </summary>
 		/// <param name="repository">The repository name under which the snapshots live</param>
 		/// <param name="snapshots">The names of the snapshots we want information from (can be _all or wildcards)</param>
 		/// <param name="selector">Optionally further describe the get snapshot operation</param>
 		IGetSnapshotResponse GetSnapshot(Name repository, Names snapshots, Func<GetSnapshotDescriptor, IGetSnapshotRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetSnapshotResponse GetSnapshot(IGetSnapshotRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetSnapshotResponse> GetSnapshotAsync(Name repository, Names snapshots, Func<GetSnapshotDescriptor, IGetSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetSnapshotResponse> GetSnapshotAsync(Name repository, Names snapshots,
+			Func<GetSnapshotDescriptor, IGetSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetSnapshotResponse> GetSnapshotAsync(IGetSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetSnapshotResponse GetSnapshot(Name repository, Names snapshots, Func<GetSnapshotDescriptor, IGetSnapshotRequest> selector = null) =>
-			this.GetSnapshot(selector.InvokeOrDefault(new GetSnapshotDescriptor(repository, snapshots)));
+			GetSnapshot(selector.InvokeOrDefault(new GetSnapshotDescriptor(repository, snapshots)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetSnapshotResponse GetSnapshot(IGetSnapshotRequest request) =>
-			this.Dispatcher.Dispatch<IGetSnapshotRequest, GetSnapshotRequestParameters, GetSnapshotResponse>(
+			Dispatcher.Dispatch<IGetSnapshotRequest, GetSnapshotRequestParameters, GetSnapshotResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.SnapshotGetDispatch<GetSnapshotResponse>(p)
+				(p, d) => LowLevelDispatch.SnapshotGetDispatch<GetSnapshotResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetSnapshotResponse> GetSnapshotAsync(Name repository, Names snapshots, Func<GetSnapshotDescriptor, IGetSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetSnapshotAsync(selector.InvokeOrDefault(new GetSnapshotDescriptor(repository, snapshots)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetSnapshotResponse> GetSnapshotAsync(IGetSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetSnapshotRequest, GetSnapshotRequestParameters, GetSnapshotResponse, IGetSnapshotResponse>(
+		/// <inheritdoc />
+		public Task<IGetSnapshotResponse> GetSnapshotAsync(Name repository, Names snapshots,
+			Func<GetSnapshotDescriptor, IGetSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetSnapshotAsync(selector.InvokeOrDefault(new GetSnapshotDescriptor(repository, snapshots)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetSnapshotResponse> GetSnapshotAsync(IGetSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetSnapshotRequest, GetSnapshotRequestParameters, GetSnapshotResponse, IGetSnapshotResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SnapshotGetDispatchAsync<GetSnapshotResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.SnapshotGetDispatchAsync<GetSnapshotResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/GetSnapshotRequest.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/GetSnapshotRequest.cs
index 8ae6af3a1c1..1413cbe996b 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/GetSnapshotRequest.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/GetSnapshotRequest.cs
@@ -2,12 +2,8 @@
 {
 	public partial interface IGetSnapshotRequest { }
 
-	public partial class GetSnapshotRequest 
-	{
-	}
+	public partial class GetSnapshotRequest { }
 
 	[DescriptorFor("SnapshotGet")]
-	public partial class GetSnapshotDescriptor 
-	{
-	}
+	public partial class GetSnapshotDescriptor { }
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/GetSnapshotResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/GetSnapshotResponse.cs
index 10b4776a1a1..6923043eb51 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/GetSnapshotResponse.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/GetSapshot/GetSnapshotResponse.cs
@@ -12,9 +12,7 @@ public interface IGetSnapshotResponse : IResponse
 	[JsonObject]
 	public class GetSnapshotResponse : ResponseBase, IGetSnapshotResponse
 	{
-
 		[JsonProperty("snapshots")]
 		public IReadOnlyCollection<Snapshot> Snapshots { get; internal set; } = EmptyReadOnly<Snapshot>.Collection;
-
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot.cs
index d2aef155802..532a914f2b7 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot.cs
@@ -1,40 +1,39 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
 {
 	public class Snapshot
 	{
-		[JsonProperty("snapshot")]
-		public string Name { get; internal set;  }
-
-		[JsonProperty("indices")]
-		public IReadOnlyCollection<IndexName> Indices { get; internal set; }
-
-		[JsonProperty("state")]
-		public string State { get; internal set; }
-
-		[JsonProperty("start_time")]
-		public DateTime StartTime { get; internal set;  }
-
-		[JsonProperty("start_time_in_millis")]
-		public long StartTimeInMilliseconds { get; internal set;  }
+		[JsonProperty("duration_in_millis")]
+		public long DurationInMilliseconds { get; internal set; }
 
 		[JsonProperty("end_time")]
-		public DateTime EndTime { get; internal set;  }
+		public DateTime EndTime { get; internal set; }
 
 		[JsonProperty("end_time_in_millis")]
-		public long EndTimeInMilliseconds { get; internal set;  }
+		public long EndTimeInMilliseconds { get; internal set; }
 
-		[JsonProperty("duration_in_millis")]
-		public long DurationInMilliseconds { get; internal set;  }
+		[JsonProperty("failures")]
+		public IReadOnlyCollection<SnapshotShardFailure> Failures { get; internal set; }
+
+		[JsonProperty("indices")]
+		public IReadOnlyCollection<IndexName> Indices { get; internal set; }
+
+		[JsonProperty("snapshot")]
+		public string Name { get; internal set; }
 
 		[JsonProperty("shards")]
 		public ShardStatistics Shards { get; internal set; }
 
-		[JsonProperty("failures")]
-		public IReadOnlyCollection<SnapshotShardFailure> Failures { get; internal set; }
+		[JsonProperty("start_time")]
+		public DateTime StartTime { get; internal set; }
+
+		[JsonProperty("start_time_in_millis")]
+		public long StartTimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("state")]
+		public string State { get; internal set; }
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/ElasticClient-Snapshot.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/ElasticClient-Snapshot.cs
index 0ad540bad55..4ba08a1fd06 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/ElasticClient-Snapshot.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/ElasticClient-Snapshot.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,46 +9,52 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// A repository can contain multiple snapshots of the same cluster. Snapshot are identified by unique names within the cluster.
-		/// /// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_snapshot
+		/// ///
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-snapshots.html#_snapshot
 		/// </summary>
 		/// <param name="repository">The name of the repository we want to create a snapshot in</param>
 		/// <param name="snapshotName">The name of the snapshot</param>
 		/// <param name="selector">Optionally provide more details about the snapshot operation</param>
 		ISnapshotResponse Snapshot(Name repository, Name snapshotName, Func<SnapshotDescriptor, ISnapshotRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISnapshotResponse Snapshot(ISnapshotRequest request);
 
-		/// <inheritdoc/>
-		Task<ISnapshotResponse> SnapshotAsync(Name repository, Name snapshotName, Func<SnapshotDescriptor, ISnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ISnapshotResponse> SnapshotAsync(Name repository, Name snapshotName, Func<SnapshotDescriptor, ISnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ISnapshotResponse> SnapshotAsync(ISnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISnapshotResponse Snapshot(Name repository, Name snapshotName, Func<SnapshotDescriptor, ISnapshotRequest> selector = null) =>
-			this.Snapshot(selector.InvokeOrDefault(new SnapshotDescriptor(repository, snapshotName)));
+			Snapshot(selector.InvokeOrDefault(new SnapshotDescriptor(repository, snapshotName)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISnapshotResponse Snapshot(ISnapshotRequest request) =>
-			this.Dispatcher.Dispatch<ISnapshotRequest, SnapshotRequestParameters, SnapshotResponse>(
+			Dispatcher.Dispatch<ISnapshotRequest, SnapshotRequestParameters, SnapshotResponse>(
 				request,
-				this.LowLevelDispatch.SnapshotCreateDispatch<SnapshotResponse>
+				LowLevelDispatch.SnapshotCreateDispatch<SnapshotResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<ISnapshotResponse> SnapshotAsync(Name repository, Name snapshotName, Func<SnapshotDescriptor, ISnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.SnapshotAsync(selector.InvokeOrDefault(new SnapshotDescriptor(repository, snapshotName)), cancellationToken);
+		/// <inheritdoc />
+		public Task<ISnapshotResponse> SnapshotAsync(Name repository, Name snapshotName, Func<SnapshotDescriptor, ISnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			SnapshotAsync(selector.InvokeOrDefault(new SnapshotDescriptor(repository, snapshotName)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ISnapshotResponse> SnapshotAsync(ISnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ISnapshotRequest, SnapshotRequestParameters, SnapshotResponse, ISnapshotResponse>(
+			Dispatcher.DispatchAsync<ISnapshotRequest, SnapshotRequestParameters, SnapshotResponse, ISnapshotResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.SnapshotCreateDispatchAsync<SnapshotResponse>
+				LowLevelDispatch.SnapshotCreateDispatchAsync<SnapshotResponse>
 			);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotRequest.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotRequest.cs
index e088cbc75dc..bbbcb32f342 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotRequest.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotRequest.cs
@@ -4,45 +4,43 @@ namespace Nest
 {
 	public partial interface ISnapshotRequest
 	{
-		[JsonProperty("indices")]
-		[JsonConverter(typeof(IndicesMultiSyntaxJsonConverter))]
-		Indices Indices { get; set; }
-
 		[JsonProperty("ignore_unavailable")]
 		bool? IgnoreUnavailable { get; set; }
 
 		[JsonProperty("include_global_state")]
 		bool? IncludeGlobalState { get; set; }
 
+		[JsonProperty("indices")]
+		[JsonConverter(typeof(IndicesMultiSyntaxJsonConverter))]
+		Indices Indices { get; set; }
+
 		[JsonProperty("partial")]
 		bool? Partial { get; set; }
 	}
 
 	public partial class SnapshotRequest
 	{
-		public Indices Indices { get; set; }
-
 		public bool? IgnoreUnavailable { get; set; }
 
 		public bool? IncludeGlobalState { get; set; }
+		public Indices Indices { get; set; }
 
 		public bool? Partial { get; set; }
-
 	}
 
 	[DescriptorFor("SnapshotCreate")]
 	public partial class SnapshotDescriptor
 	{
-		Indices ISnapshotRequest.Indices { get; set; }
 		bool? ISnapshotRequest.IgnoreUnavailable { get; set; }
 
 		bool? ISnapshotRequest.IncludeGlobalState { get; set; }
+		Indices ISnapshotRequest.Indices { get; set; }
 
 		bool? ISnapshotRequest.Partial { get; set; }
 
-		public SnapshotDescriptor Index(IndexName index) => this.Indices(index);
+		public SnapshotDescriptor Index(IndexName index) => Indices(index);
 
-		public SnapshotDescriptor Index<T>() where T : class => this.Indices(typeof(T));
+		public SnapshotDescriptor Index<T>() where T : class => Indices(typeof(T));
 
 		public SnapshotDescriptor Indices(Indices indices) => Assign(a => a.Indices = indices);
 
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotResponse.cs
index baad5231cc3..50be3ed79f4 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotResponse.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotResponse.cs
@@ -15,18 +15,15 @@ public interface ISnapshotResponse : IResponse
 	public class SnapshotResponse : ResponseBase, ISnapshotResponse
 	{
 		private bool _accepted = false;
+
 		[JsonProperty("accepted")]
 		public bool Accepted
 		{
-			get
-			{
-				return  _accepted ? _accepted : this.Snapshot != null;
-			}
-			internal set { _accepted = value; }
+			get => _accepted ? _accepted : Snapshot != null;
+			internal set => _accepted = value;
 		}
 
 		[JsonProperty("snapshot")]
 		public Snapshot Snapshot { get; set; }
-
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/ElasticClient-SnapshotObservable.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/ElasticClient-SnapshotObservable.cs
index a7140f25210..94747678aef 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/ElasticClient-SnapshotObservable.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/ElasticClient-SnapshotObservable.cs
@@ -4,23 +4,28 @@ namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
-		IObservable<ISnapshotStatusResponse> SnapshotObservable(Name repository, Name snapshotName, TimeSpan interval, Func<SnapshotDescriptor, ISnapshotRequest> selector = null);
+		/// <inheritdoc />
+		IObservable<ISnapshotStatusResponse> SnapshotObservable(Name repository, Name snapshotName, TimeSpan interval,
+			Func<SnapshotDescriptor, ISnapshotRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IObservable<ISnapshotStatusResponse> SnapshotObservable(TimeSpan interval, ISnapshotRequest request);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IObservable<ISnapshotStatusResponse> SnapshotObservable(Name repository, Name snapshotName, TimeSpan interval, Func<SnapshotDescriptor, ISnapshotRequest> selector = null)
+		/// <inheritdoc />
+		public IObservable<ISnapshotStatusResponse> SnapshotObservable(Name repository, Name snapshotName, TimeSpan interval,
+			Func<SnapshotDescriptor, ISnapshotRequest> selector = null
+		)
 		{
 			var snapshotDescriptor = selector.InvokeOrDefault(new SnapshotDescriptor(repository, snapshotName));
 			return new SnapshotObservable(this, snapshotDescriptor);
 		}
 
-		/// <inheritdoc/>
-		public IObservable<ISnapshotStatusResponse> SnapshotObservable(TimeSpan interval, ISnapshotRequest request) => new SnapshotObservable(this, request);
+		/// <inheritdoc />
+		public IObservable<ISnapshotStatusResponse> SnapshotObservable(TimeSpan interval, ISnapshotRequest request) =>
+			new SnapshotObservable(this, request);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/SnapshotObservable.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/SnapshotObservable.cs
index dab545b66d1..5dc19b4a821 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/SnapshotObservable.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/SnapshotObservable.cs
@@ -1,22 +1,22 @@
-using Elasticsearch.Net;
-using System;
+using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using Elasticsearch.Net;
 
 namespace Nest
 {
 	public class SnapshotObservable : IDisposable, IObservable<ISnapshotStatusResponse>
 	{
 		private readonly IElasticClient _elasticClient;
-		private readonly ISnapshotRequest _snapshotRequest;
 		private readonly TimeSpan _interval = TimeSpan.FromSeconds(2);
-		private Timer _timer;
-		private bool _disposed;
+		private readonly ISnapshotRequest _snapshotRequest;
 		private readonly SnapshotStatusHumbleObject _snapshotStatusHumbleObject;
-		private EventHandler<SnapshotNextEventArgs> _nextEventHandler;
 		private EventHandler<SnapshotCompletedEventArgs> _completedEentHandler;
+		private bool _disposed;
 		private EventHandler<SnapshotErrorEventArgs> _errorEventHandler;
+		private EventHandler<SnapshotNextEventArgs> _nextEventHandler;
+		private Timer _timer;
 
 		public SnapshotObservable(IElasticClient elasticClient, ISnapshotRequest snapshotRequest)
 		{
@@ -39,6 +39,8 @@ public SnapshotObservable(IElasticClient elasticClient, ISnapshotRequest snapsho
 			_interval = interval;
 		}
 
+		public void Dispose() => Dispose(true);
+
 		public IDisposable Subscribe(IObserver<ISnapshotStatusResponse> observer)
 		{
 			observer.ThrowIfNull(nameof(observer));
@@ -46,7 +48,7 @@ public IDisposable Subscribe(IObserver<ISnapshotStatusResponse> observer)
 			try
 			{
 				_snapshotRequest.RequestParameters.WaitForCompletion = false;
-				var snapshotResponse = this._elasticClient.Snapshot(_snapshotRequest);
+				var snapshotResponse = _elasticClient.Snapshot(_snapshotRequest);
 
 				if (!snapshotResponse.IsValid)
 					throw new ElasticsearchClientException(PipelineFailure.BadResponse, "Failed to create snapshot.", snapshotResponse.ApiCall);
@@ -86,7 +88,8 @@ private void Snapshot(object state)
 
 				_snapshotStatusHumbleObject.CheckStatus();
 
-				_timer.Change(TimeSpan.FromMilliseconds(Math.Max(0, _interval.TotalMilliseconds - watch.ElapsedMilliseconds)), Timeout.InfiniteTimeSpan);
+				_timer.Change(TimeSpan.FromMilliseconds(Math.Max(0, _interval.TotalMilliseconds - watch.ElapsedMilliseconds)),
+					Timeout.InfiniteTimeSpan);
 			}
 			catch (Exception exception)
 			{
@@ -95,15 +98,7 @@ private void Snapshot(object state)
 			}
 		}
 
-		private void StopTimer(object sender, EventArgs restoreCompletedEventArgs)
-		{
-			_timer.Change(Timeout.Infinite, Timeout.Infinite);
-		}
-
-		public void Dispose()
-		{
-			Dispose(true);
-		}
+		private void StopTimer(object sender, EventArgs restoreCompletedEventArgs) => _timer.Change(Timeout.Infinite, Timeout.Infinite);
 
 		protected virtual void Dispose(bool disposing)
 		{
@@ -124,40 +119,28 @@ protected virtual void Dispose(bool disposing)
 			_disposed = true;
 		}
 
-		~SnapshotObservable()
-		{
-			Dispose(false);
-		}
+		~SnapshotObservable() => Dispose(false);
 	}
 
 	public class SnapshotNextEventArgs : EventArgs
 	{
-		public ISnapshotStatusResponse SnapshotStatusResponse { get; }
+		public SnapshotNextEventArgs(ISnapshotStatusResponse snapshotStatusResponse) => SnapshotStatusResponse = snapshotStatusResponse;
 
-		public SnapshotNextEventArgs(ISnapshotStatusResponse snapshotStatusResponse)
-		{
-			SnapshotStatusResponse = snapshotStatusResponse;
-		}
+		public ISnapshotStatusResponse SnapshotStatusResponse { get; }
 	}
 
 	public class SnapshotCompletedEventArgs : EventArgs
 	{
-		public ISnapshotStatusResponse SnapshotStatusResponse { get; private set; }
+		public SnapshotCompletedEventArgs(ISnapshotStatusResponse snapshotStatusResponse) => SnapshotStatusResponse = snapshotStatusResponse;
 
-		public SnapshotCompletedEventArgs(ISnapshotStatusResponse snapshotStatusResponse)
-		{
-			SnapshotStatusResponse = snapshotStatusResponse;
-		}
+		public ISnapshotStatusResponse SnapshotStatusResponse { get; private set; }
 	}
 
 	public class SnapshotErrorEventArgs : EventArgs
 	{
-		public Exception Exception { get; }
+		public SnapshotErrorEventArgs(Exception exception) => Exception = exception;
 
-		public SnapshotErrorEventArgs(Exception exception)
-		{
-			Exception = exception;
-		}
+		public Exception Exception { get; }
 	}
 
 	public class SnapshotStatusHumbleObject
@@ -165,10 +148,6 @@ public class SnapshotStatusHumbleObject
 		private readonly IElasticClient _elasticClient;
 		private readonly ISnapshotRequest _snapshotRequest;
 
-		public event EventHandler<SnapshotCompletedEventArgs> Completed;
-		public event EventHandler<SnapshotErrorEventArgs> Error;
-		public event EventHandler<SnapshotNextEventArgs> Next;
-
 		public SnapshotStatusHumbleObject(IElasticClient elasticClient, ISnapshotRequest snapshotRequest)
 		{
 			elasticClient.ThrowIfNull(nameof(elasticClient));
@@ -178,6 +157,10 @@ public SnapshotStatusHumbleObject(IElasticClient elasticClient, ISnapshotRequest
 			_snapshotRequest = snapshotRequest;
 		}
 
+		public event EventHandler<SnapshotCompletedEventArgs> Completed;
+		public event EventHandler<SnapshotErrorEventArgs> Error;
+		public event EventHandler<SnapshotNextEventArgs> Next;
+
 		public void CheckStatus()
 		{
 			try
@@ -187,7 +170,8 @@ public void CheckStatus()
 						_snapshotRequest.Snapshot));
 
 				if (!snapshotStatusResponse.IsValid)
-					throw new ElasticsearchClientException(PipelineFailure.BadResponse, "Failed to get snapshot status.", snapshotStatusResponse.ApiCall);
+					throw new ElasticsearchClientException(PipelineFailure.BadResponse, "Failed to get snapshot status.",
+						snapshotStatusResponse.ApiCall);
 
 				if (snapshotStatusResponse.Snapshots.All(s => s.ShardsStats.Done == s.ShardsStats.Total))
 				{
@@ -221,5 +205,4 @@ protected virtual void OnError(SnapshotErrorEventArgs errorEventArgs)
 			if (handler != null) handler(this, errorEventArgs);
 		}
 	}
-
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/SnapshotObserver.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/SnapshotObserver.cs
index d712347082f..a7efa2fcbe0 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/SnapshotObserver.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotObservable/SnapshotObserver.cs
@@ -7,10 +7,8 @@ public class SnapshotObserver : CoordinatedRequestObserverBase<ISnapshotStatusRe
 		public SnapshotObserver(
 			Action<ISnapshotStatusResponse> onNext = null,
 			Action<Exception> onError = null,
-			Action completed = null)
-			: base(onNext, onError, completed)
-		{
-
-		}
+			Action completed = null
+		)
+			: base(onNext, onError, completed) { }
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotShardFailure.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotShardFailure.cs
index 35ea0eb7098..77d83426998 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotShardFailure.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotShardFailure.cs
@@ -5,18 +5,18 @@ namespace Nest
 	[JsonObject]
 	public class SnapshotShardFailure
 	{
-		[JsonProperty("node_id")]
-		public string NodeId { get; set; }
-
 		[JsonProperty("index")]
 		public string Index { get; set; }
 
-		[JsonProperty("shard_id")]
-		public string ShardId { get; set; }
+		[JsonProperty("node_id")]
+		public string NodeId { get; set; }
 
 		[JsonProperty("reason")]
 		public string Reason { get; set; }
 
+		[JsonProperty("shard_id")]
+		public string ShardId { get; set; }
+
 		[JsonProperty("status")]
 		public string Status { get; set; }
 	}
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/ElasticClient-SnapshotStatus.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/ElasticClient-SnapshotStatus.cs
index 2a22efab873..0b3dc8fc684 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/ElasticClient-SnapshotStatus.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/ElasticClient-SnapshotStatus.cs
@@ -1,48 +1,56 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISnapshotStatusResponse SnapshotStatus(Func<SnapshotStatusDescriptor, ISnapshotStatusRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISnapshotStatusResponse SnapshotStatus(ISnapshotStatusRequest request);
 
-		/// <inheritdoc/>
-		Task<ISnapshotStatusResponse> SnapshotStatusAsync(Func<SnapshotStatusDescriptor, ISnapshotStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ISnapshotStatusResponse> SnapshotStatusAsync(Func<SnapshotStatusDescriptor, ISnapshotStatusRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<ISnapshotStatusResponse> SnapshotStatusAsync(ISnapshotStatusRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ISnapshotStatusResponse> SnapshotStatusAsync(ISnapshotStatusRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISnapshotStatusResponse SnapshotStatus(Func<SnapshotStatusDescriptor, ISnapshotStatusRequest> selector = null) =>
-			this.SnapshotStatus(selector.InvokeOrDefault(new SnapshotStatusDescriptor()));
+			SnapshotStatus(selector.InvokeOrDefault(new SnapshotStatusDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISnapshotStatusResponse SnapshotStatus(ISnapshotStatusRequest request) =>
-			this.Dispatcher.Dispatch<ISnapshotStatusRequest, SnapshotStatusRequestParameters, SnapshotStatusResponse>(
+			Dispatcher.Dispatch<ISnapshotStatusRequest, SnapshotStatusRequestParameters, SnapshotStatusResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.SnapshotStatusDispatch<SnapshotStatusResponse>(p)
+				(p, d) => LowLevelDispatch.SnapshotStatusDispatch<SnapshotStatusResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<ISnapshotStatusResponse> SnapshotStatusAsync(Func<SnapshotStatusDescriptor, ISnapshotStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.SnapshotStatusAsync(selector.InvokeOrDefault(new SnapshotStatusDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<ISnapshotStatusResponse> SnapshotStatusAsync(ISnapshotStatusRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ISnapshotStatusRequest, SnapshotStatusRequestParameters, SnapshotStatusResponse, ISnapshotStatusResponse>(
+		/// <inheritdoc />
+		public Task<ISnapshotStatusResponse> SnapshotStatusAsync(Func<SnapshotStatusDescriptor, ISnapshotStatusRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			SnapshotStatusAsync(selector.InvokeOrDefault(new SnapshotStatusDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<ISnapshotStatusResponse> SnapshotStatusAsync(ISnapshotStatusRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ISnapshotStatusRequest, SnapshotStatusRequestParameters, SnapshotStatusResponse, ISnapshotStatusResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SnapshotStatusDispatchAsync<SnapshotStatusResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.SnapshotStatusDispatchAsync<SnapshotStatusResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusResponse.cs
index 3ce94870651..8fb566f582b 100644
--- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusResponse.cs
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusResponse.cs
@@ -12,80 +12,100 @@ public interface ISnapshotStatusResponse : IResponse
 	[JsonObject]
 	public class SnapshotStatusResponse : ResponseBase, ISnapshotStatusResponse
 	{
-
 		[JsonProperty("snapshots")]
 		public IReadOnlyCollection<SnapshotStatus> Snapshots { get; internal set; } = EmptyReadOnly<SnapshotStatus>.Collection;
-
 	}
 
 	public class SnapshotStatus
 	{
-		[JsonProperty("snapshot")]
-		public string Snapshot { get; internal set; }
-		[JsonProperty("repository")]
-		public string Repository { get; internal set; }
-		[JsonProperty("uuid")]
-		public string UUID { get; internal set; }
-		[JsonProperty("state")]
-		public string State { get; internal set; }
 		[JsonProperty("include_global_state")]
 		public bool? IncludeGlobalState { get; internal set; }
+
+		[JsonProperty("indices")]
+		public IReadOnlyDictionary<string, SnapshotIndexStats> Indices { get; internal set; } = EmptyReadOnly<string, SnapshotIndexStats>.Dictionary;
+
+		[JsonProperty("repository")]
+		public string Repository { get; internal set; }
+
 		[JsonProperty("shards_stats")]
 		public SnapshotShardsStats ShardsStats { get; internal set; }
+
+		[JsonProperty("snapshot")]
+		public string Snapshot { get; internal set; }
+
+		[JsonProperty("state")]
+		public string State { get; internal set; }
+
 		[JsonProperty("stats")]
 		public SnapshotStats Stats { get; internal set; }
-		[JsonProperty("indices")]
-		public IReadOnlyDictionary<string, SnapshotIndexStats> Indices { get; internal set; } = EmptyReadOnly<string, SnapshotIndexStats>.Dictionary;
+
+		[JsonProperty("uuid")]
+		public string UUID { get; internal set; }
 	}
 
 	public class SnapshotIndexStats
 	{
+		[JsonProperty("shards")]
+		public IReadOnlyDictionary<string, SnapshotShardsStats> Shards { get; internal set; } = EmptyReadOnly<string, SnapshotShardsStats>.Dictionary;
+
 		[JsonProperty("shards_stats")]
 		public SnapshotShardsStats ShardsStats { get; internal set; }
+
 		[JsonProperty("stats")]
 		public SnapshotStats Stats { get; internal set; }
-		[JsonProperty("shards")]
-		public IReadOnlyDictionary<string, SnapshotShardsStats> Shards { get; internal set; } = EmptyReadOnly<string, SnapshotShardsStats>.Dictionary;
 	}
 
 	public class SnapshotIndexShardStats
 	{
-		[JsonProperty("stage")]
-		public string Stage { get; internal set; }
 		[JsonProperty("node")]
 		public string Node { get; internal set; }
+
+		[JsonProperty("stage")]
+		public string Stage { get; internal set; }
+
 		[JsonProperty("stats")]
 		public SnapshotStats Stats { get; internal set; }
 	}
 
 	public class SnapshotShardsStats
 	{
-		[JsonProperty("initializing")]
-		public long Initializing { get; internal set; }
-		[JsonProperty("started")]
-		public long Started { get; internal set; }
-		[JsonProperty("finalizing")]
-		public long Finalizing { get; internal set; }
 		[JsonProperty("done")]
 		public long Done { get; internal set; }
+
 		[JsonProperty("failed")]
 		public long Failed { get; internal set; }
+
+		[JsonProperty("finalizing")]
+		public long Finalizing { get; internal set; }
+
+		[JsonProperty("initializing")]
+		public long Initializing { get; internal set; }
+
+		[JsonProperty("started")]
+		public long Started { get; internal set; }
+
 		[JsonProperty("total")]
 		public long Total { get; internal set; }
 	}
+
 	public class SnapshotStats
 	{
 		[JsonProperty("number_of_files")]
 		public long NumberOfFiles { get; internal set; }
+
 		[JsonProperty("processed_files")]
 		public long ProcessedFiles { get; internal set; }
-		[JsonProperty("total_size_in_bytes")]
-		public long TotalSizeInBytes { get; internal set; }
+
 		[JsonProperty("processed_size_in_bytes")]
 		public long ProcessedSizeInBytes { get; internal set; }
+
 		[JsonProperty("start_time_in_millis")]
 		public long StartTimeInMilliseconds { get; internal set; }
+
 		[JsonProperty("time_in_millis")]
 		public long TimeInMilliseconds { get; internal set; }
+
+		[JsonProperty("total_size_in_bytes")]
+		public long TotalSizeInBytes { get; internal set; }
 	}
 }
diff --git a/src/Nest/Properties/ClsCompliancy.cs b/src/Nest/Properties/ClsCompliancy.cs
index a46fb3bed62..8c114539a19 100644
--- a/src/Nest/Properties/ClsCompliancy.cs
+++ b/src/Nest/Properties/ClsCompliancy.cs
@@ -1,3 +1,3 @@
 using System;
 
-[assembly: CLSCompliant(true)]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
diff --git a/src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs b/src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs
index 93eb5ed2b00..3f22978b860 100644
--- a/src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs
+++ b/src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs
@@ -1,4 +1,3 @@
-using System;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -7,107 +6,125 @@ namespace Nest
 	[ContractJsonConverter(typeof(QueryContainerJsonConverter))]
 	public interface IQueryContainer
 	{
-		[JsonIgnore]
-		bool IsConditionless { get; }
+		[JsonProperty("bool")]
+		IBoolQuery Bool { get; set; }
 
-		[JsonIgnore]
-		bool IsStrict { get; set; }
+		[JsonProperty("boosting")]
+		IBoostingQuery Boosting { get; set; }
 
-		[JsonIgnore]
-		bool IsVerbatim { get; set; }
+		[JsonProperty("common")]
+		ICommonTermsQuery CommonTerms { get; set; }
 
-		[JsonIgnore]
-		bool IsWritable { get; }
+		[JsonProperty("constant_score")]
+		IConstantScoreQuery ConstantScore { get; set; }
 
-		[JsonIgnore]
-		IRawQuery RawQuery { get; set; }
+		[JsonProperty("dis_max")]
+		IDisMaxQuery DisMax { get; set; }
 
-		[JsonProperty("bool")]
-		IBoolQuery Bool { get; set; }
+		[JsonProperty("exists")]
+		IExistsQuery Exists { get; set; }
 
-		[JsonProperty("match_all")]
-		IMatchAllQuery MatchAll { get; set; }
+		[JsonProperty("function_score")]
+		IFunctionScoreQuery FunctionScore { get; set; }
 
-		[JsonProperty("match_none")]
-		IMatchNoneQuery MatchNone { get; set; }
+		[JsonProperty("fuzzy")]
+		IFuzzyQuery Fuzzy { get; set; }
 
-		[JsonProperty("term")]
-		ITermQuery Term { get; set; }
+		[JsonProperty("geo_bounding_box")]
+		IGeoBoundingBoxQuery GeoBoundingBox { get; set; }
 
-		[JsonProperty("wildcard")]
-		IWildcardQuery Wildcard { get; set; }
+		[JsonProperty("geo_distance")]
+		IGeoDistanceQuery GeoDistance { get; set; }
 
-		[JsonProperty("prefix")]
-		IPrefixQuery Prefix { get; set; }
+		[JsonProperty("geo_polygon")]
+		IGeoPolygonQuery GeoPolygon { get; set; }
 
-		[JsonProperty("boosting")]
-		IBoostingQuery Boosting { get; set; }
+		[JsonProperty("geo_shape")]
+		IGeoShapeQuery GeoShape { get; set; }
+
+		[JsonProperty("has_child")]
+		IHasChildQuery HasChild { get; set; }
+
+		[JsonProperty("has_parent")]
+		IHasParentQuery HasParent { get; set; }
 
 		[JsonProperty("ids")]
 		IIdsQuery Ids { get; set; }
 
-		[JsonProperty("constant_score")]
-		IConstantScoreQuery ConstantScore { get; set; }
+		[JsonIgnore]
+		bool IsConditionless { get; }
 
-		[JsonProperty("dis_max")]
-		IDisMaxQuery DisMax { get; set; }
+		[JsonIgnore]
+		bool IsStrict { get; set; }
 
-		[JsonProperty("multi_match")]
-		IMultiMatchQuery MultiMatch { get; set; }
+		[JsonIgnore]
+		bool IsVerbatim { get; set; }
+
+		[JsonIgnore]
+		bool IsWritable { get; }
 
 		[JsonProperty("match")]
 		IMatchQuery Match { get; set; }
 
+		[JsonProperty("match_all")]
+		IMatchAllQuery MatchAll { get; set; }
+
+		[JsonProperty("match_none")]
+		IMatchNoneQuery MatchNone { get; set; }
+
 		[JsonProperty("match_phrase")]
 		IMatchPhraseQuery MatchPhrase { get; set; }
 
 		[JsonProperty("match_phrase_prefix")]
 		IMatchPhrasePrefixQuery MatchPhrasePrefix { get; set; }
 
-		[JsonProperty("fuzzy")]
-		IFuzzyQuery Fuzzy { get; set; }
+		[JsonProperty("more_like_this")]
+		IMoreLikeThisQuery MoreLikeThis { get; set; }
 
-		[JsonProperty("geo_shape")]
-		IGeoShapeQuery GeoShape { get; set; }
+		[JsonProperty("multi_match")]
+		IMultiMatchQuery MultiMatch { get; set; }
 
-		[JsonProperty("common")]
-		ICommonTermsQuery CommonTerms { get; set; }
+		[JsonProperty("nested")]
+		INestedQuery Nested { get; set; }
 
-		[JsonProperty("terms")]
-		ITermsQuery Terms { get; set; }
+		[JsonProperty("parent_id")]
+		IParentIdQuery ParentId { get; set; }
+
+		[JsonProperty("percolate")]
+		IPercolateQuery Percolate { get; set; }
+
+		[JsonProperty("prefix")]
+		IPrefixQuery Prefix { get; set; }
+
+		[JsonProperty("query_string")]
+		IQueryStringQuery QueryString { get; set; }
 
 		[JsonProperty("range")]
 		IRangeQuery Range { get; set; }
 
+		[JsonIgnore]
+		IRawQuery RawQuery { get; set; }
+
 		[JsonProperty("regexp")]
 		IRegexpQuery Regexp { get; set; }
 
-		[JsonProperty("has_child")]
-		IHasChildQuery HasChild { get; set; }
-
-		[JsonProperty("has_parent")]
-		IHasParentQuery HasParent { get; set; }
-
-		[JsonProperty("parent_id")]
-		IParentIdQuery ParentId { get; set; }
-
-		[JsonProperty("span_term")]
-		ISpanTermQuery SpanTerm { get; set; }
+		[JsonProperty("script")]
+		IScriptQuery Script { get; set; }
 
 		[JsonProperty("simple_query_string")]
 		ISimpleQueryStringQuery SimpleQueryString { get; set; }
 
-		[JsonProperty("query_string")]
-		IQueryStringQuery QueryString { get; set; }
+		[JsonProperty("span_containing")]
+		ISpanContainingQuery SpanContaining { get; set; }
 
-		[JsonProperty("more_like_this")]
-		IMoreLikeThisQuery MoreLikeThis { get; set; }
+		[JsonProperty("field_masking_span")]
+		ISpanFieldMaskingQuery SpanFieldMasking { get; set; }
 
 		[JsonProperty("span_first")]
 		ISpanFirstQuery SpanFirst { get; set; }
 
-		[JsonProperty("span_or")]
-		ISpanOrQuery SpanOr { get; set; }
+		[JsonProperty("span_multi")]
+		ISpanMultiTermQuery SpanMultiTerm { get; set; }
 
 		[JsonProperty("span_near")]
 		ISpanNearQuery SpanNear { get; set; }
@@ -115,47 +132,29 @@ public interface IQueryContainer
 		[JsonProperty("span_not")]
 		ISpanNotQuery SpanNot { get; set; }
 
-		[JsonProperty("span_containing")]
-		ISpanContainingQuery SpanContaining { get; set; }
+		[JsonProperty("span_or")]
+		ISpanOrQuery SpanOr { get; set; }
+
+		[JsonProperty("span_term")]
+		ISpanTermQuery SpanTerm { get; set; }
 
 		[JsonProperty("span_within")]
 		ISpanWithinQuery SpanWithin { get; set; }
 
-		[JsonProperty("span_multi")]
-		ISpanMultiTermQuery SpanMultiTerm { get; set; }
-
-		[JsonProperty("field_masking_span")]
-		ISpanFieldMaskingQuery SpanFieldMasking { get; set; }
-
-		[JsonProperty("nested")]
-		INestedQuery Nested { get; set; }
-
-		[JsonProperty("function_score")]
-		IFunctionScoreQuery FunctionScore { get; set; }
-
-		[JsonProperty("geo_bounding_box")]
-		IGeoBoundingBoxQuery GeoBoundingBox { get; set; }
-
-		[JsonProperty("geo_distance")]
-		IGeoDistanceQuery GeoDistance { get; set; }
-
-		[JsonProperty("geo_polygon")]
-		IGeoPolygonQuery GeoPolygon { get; set; }
+		[JsonProperty("term")]
+		ITermQuery Term { get; set; }
 
-		[JsonProperty("script")]
-		IScriptQuery Script { get; set; }
+		[JsonProperty("terms")]
+		ITermsQuery Terms { get; set; }
 
-		[JsonProperty("exists")]
-		IExistsQuery Exists { get; set; }
+		[JsonProperty("terms_set")]
+		ITermsSetQuery TermsSet { get; set; }
 
 		[JsonProperty("type")]
 		ITypeQuery Type { get; set; }
 
-		[JsonProperty("percolate")]
-		IPercolateQuery Percolate { get; set; }
-
-		[JsonProperty("terms_set")]
-		ITermsSetQuery TermsSet { get; set; }
+		[JsonProperty("wildcard")]
+		IWildcardQuery Wildcard { get; set; }
 
 		void Accept(IQueryVisitor visitor);
 	}
diff --git a/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs b/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs
index f38c76b0928..44296724f67 100644
--- a/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs
+++ b/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs
@@ -7,108 +7,340 @@ namespace Nest
 	public partial class QueryContainer : IQueryContainer, IDescriptor
 	{
 		private IBoolQuery _bool;
-		private IMatchAllQuery _matchAllQuery;
-		private IMatchNoneQuery _matchNoneQuery;
-		private ITermQuery _term;
-		private IWildcardQuery _wildcard;
-		private IPrefixQuery _prefix;
 		private IBoostingQuery _boosting;
-		private IIdsQuery _ids;
+		private ICommonTermsQuery _commonTerms;
 		private IConstantScoreQuery _constantScore;
 		private IDisMaxQuery _disMax;
-		private IMultiMatchQuery _multiMatch;
-		private IMatchQuery _match;
-		private IMatchPhraseQuery _matchPhrase;
-		private IMatchPhrasePrefixQuery _matchPhrasePrefix;
+		private IExistsQuery _exists;
+		private IFunctionScoreQuery _functionScore;
 		private IFuzzyQuery _fuzzy;
+		private IGeoBoundingBoxQuery _geoBoundingBox;
+		private IGeoDistanceQuery _geoDistance;
+		private IGeoPolygonQuery _geoPolygon;
 		private IGeoShapeQuery _geoShape;
-		private ICommonTermsQuery _commonTerms;
-		private ITermsQuery _terms;
-		private IQueryStringQuery _queryString;
-		private ISimpleQueryStringQuery _simpleQueryString;
-		private IRegexpQuery _regexp;
 		private IHasChildQuery _hasChild;
 		private IHasParentQuery _hasParent;
+		private IIdsQuery _ids;
+		private IMatchQuery _match;
+		private IMatchAllQuery _matchAllQuery;
+		private IMatchNoneQuery _matchNoneQuery;
+		private IMatchPhraseQuery _matchPhrase;
+		private IMatchPhrasePrefixQuery _matchPhrasePrefix;
 		private IMoreLikeThisQuery _moreLikeThis;
+		private IMultiMatchQuery _multiMatch;
+		private INestedQuery _nested;
+		private IParentIdQuery _parentId;
+		private IPercolateQuery _percolate;
+		private IPrefixQuery _prefix;
+		private IQueryStringQuery _queryString;
 		private IRangeQuery _range;
-		private ISpanTermQuery _spanTerm;
+		private IRawQuery _raw;
+		private IRegexpQuery _regexp;
+		private IScriptQuery _script;
+		private ISimpleQueryStringQuery _simpleQueryString;
+		private ISpanContainingQuery _spanContaining;
+		private ISpanFieldMaskingQuery _spanFieldMasking;
 		private ISpanFirstQuery _spanFirst;
-		private ISpanOrQuery _spanOr;
-		private ISpanNotQuery _spanNot;
+		private ISpanMultiTermQuery _spanMultiTerm;
 		private ISpanNearQuery _spanNear;
-		private ISpanContainingQuery _spanContaining;
+		private ISpanNotQuery _spanNot;
+		private ISpanOrQuery _spanOr;
+		private ISpanTermQuery _spanTerm;
 		private ISpanWithinQuery _spanWithin;
-		private ISpanMultiTermQuery _spanMultiTerm;
-		private ISpanFieldMaskingQuery _spanFieldMasking;
-		private INestedQuery _nested;
-		private IFunctionScoreQuery _functionScore;
-		private IGeoBoundingBoxQuery _geoBoundingBox;
-		private IGeoDistanceQuery _geoDistance;
-		private IGeoPolygonQuery _geoPolygon;
-		private IScriptQuery _script;
-		private IExistsQuery _exists;
-		private ITypeQuery _type;
-		private IRawQuery _raw;
-		private IPercolateQuery _percolate;
-		private IParentIdQuery _parentId;
+		private ITermQuery _term;
+		private ITermsQuery _terms;
 		private ITermsSetQuery _termsSet;
-		private IQueryContainer Self => this;
+		private ITypeQuery _type;
+		private IWildcardQuery _wildcard;
 
 		internal IQuery ContainedQuery { get; set; }
 
+		IBoolQuery IQueryContainer.Bool
+		{
+			get => _bool;
+			set => _bool = Set(value);
+		}
+
+		IBoostingQuery IQueryContainer.Boosting
+		{
+			get => _boosting;
+			set => _boosting = Set(value);
+		}
+
+		ICommonTermsQuery IQueryContainer.CommonTerms
+		{
+			get => _commonTerms;
+			set => _commonTerms = Set(value);
+		}
+
+		IConstantScoreQuery IQueryContainer.ConstantScore
+		{
+			get => _constantScore;
+			set => _constantScore = Set(value);
+		}
+
+		IDisMaxQuery IQueryContainer.DisMax
+		{
+			get => _disMax;
+			set => _disMax = Set(value);
+		}
+
+		IExistsQuery IQueryContainer.Exists
+		{
+			get => _exists;
+			set => _exists = Set(value);
+		}
+
+		IFunctionScoreQuery IQueryContainer.FunctionScore
+		{
+			get => _functionScore;
+			set => _functionScore = Set(value);
+		}
+
+		IFuzzyQuery IQueryContainer.Fuzzy
+		{
+			get => _fuzzy;
+			set => _fuzzy = Set(value);
+		}
+
+		IGeoBoundingBoxQuery IQueryContainer.GeoBoundingBox
+		{
+			get => _geoBoundingBox;
+			set => _geoBoundingBox = Set(value);
+		}
+
+		IGeoDistanceQuery IQueryContainer.GeoDistance
+		{
+			get => _geoDistance;
+			set => _geoDistance = Set(value);
+		}
+
+		IGeoPolygonQuery IQueryContainer.GeoPolygon
+		{
+			get => _geoPolygon;
+			set => _geoPolygon = Set(value);
+		}
+
+		IGeoShapeQuery IQueryContainer.GeoShape
+		{
+			get => _geoShape;
+			set => _geoShape = Set(value);
+		}
+
+		IHasChildQuery IQueryContainer.HasChild
+		{
+			get => _hasChild;
+			set => _hasChild = Set(value);
+		}
+
+		IHasParentQuery IQueryContainer.HasParent
+		{
+			get => _hasParent;
+			set => _hasParent = Set(value);
+		}
+
+		IIdsQuery IQueryContainer.Ids
+		{
+			get => _ids;
+			set => _ids = Set(value);
+		}
+
+		IMatchQuery IQueryContainer.Match
+		{
+			get => _match;
+			set => _match = Set(value);
+		}
+
+		IMatchAllQuery IQueryContainer.MatchAll
+		{
+			get => _matchAllQuery;
+			set => _matchAllQuery = Set(value);
+		}
+
+		IMatchNoneQuery IQueryContainer.MatchNone
+		{
+			get => _matchNoneQuery;
+			set => _matchNoneQuery = Set(value);
+		}
+
+		IMatchPhraseQuery IQueryContainer.MatchPhrase
+		{
+			get => _matchPhrase;
+			set => _matchPhrase = Set(value);
+		}
+
+		IMatchPhrasePrefixQuery IQueryContainer.MatchPhrasePrefix
+		{
+			get => _matchPhrasePrefix;
+			set => _matchPhrasePrefix = Set(value);
+		}
+
+		IMoreLikeThisQuery IQueryContainer.MoreLikeThis
+		{
+			get => _moreLikeThis;
+			set => _moreLikeThis = Set(value);
+		}
+
+		IMultiMatchQuery IQueryContainer.MultiMatch
+		{
+			get => _multiMatch;
+			set => _multiMatch = Set(value);
+		}
+
+		INestedQuery IQueryContainer.Nested
+		{
+			get => _nested;
+			set => _nested = Set(value);
+		}
+
+		IParentIdQuery IQueryContainer.ParentId
+		{
+			get => _parentId;
+			set => _parentId = Set(value);
+		}
+
+		IPercolateQuery IQueryContainer.Percolate
+		{
+			get => _percolate;
+			set => _percolate = Set(value);
+		}
+
+		IPrefixQuery IQueryContainer.Prefix
+		{
+			get => _prefix;
+			set => _prefix = Set(value);
+		}
+
+		IQueryStringQuery IQueryContainer.QueryString
+		{
+			get => _queryString;
+			set => _queryString = Set(value);
+		}
+
+		IRangeQuery IQueryContainer.Range
+		{
+			get => _range;
+			set => _range = Set(value);
+		}
+
+		IRawQuery IQueryContainer.RawQuery
+		{
+			get => _raw;
+			set => _raw = Set(value);
+		}
+
+		IRegexpQuery IQueryContainer.Regexp
+		{
+			get => _regexp;
+			set => _regexp = Set(value);
+		}
+
+		IScriptQuery IQueryContainer.Script
+		{
+			get => _script;
+			set => _script = Set(value);
+		}
+
+		private IQueryContainer Self => this;
+
+		ISimpleQueryStringQuery IQueryContainer.SimpleQueryString
+		{
+			get => _simpleQueryString;
+			set => _simpleQueryString = Set(value);
+		}
+
+		ISpanContainingQuery IQueryContainer.SpanContaining
+		{
+			get => _spanContaining;
+			set => _spanContaining = Set(value);
+		}
+
+		ISpanFieldMaskingQuery IQueryContainer.SpanFieldMasking
+		{
+			get => _spanFieldMasking;
+			set => _spanFieldMasking = Set(value);
+		}
+
+		ISpanFirstQuery IQueryContainer.SpanFirst
+		{
+			get => _spanFirst;
+			set => _spanFirst = Set(value);
+		}
+
+		ISpanMultiTermQuery IQueryContainer.SpanMultiTerm
+		{
+			get => _spanMultiTerm;
+			set => _spanMultiTerm = Set(value);
+		}
+
+		ISpanNearQuery IQueryContainer.SpanNear
+		{
+			get => _spanNear;
+			set => _spanNear = Set(value);
+		}
+
+		ISpanNotQuery IQueryContainer.SpanNot
+		{
+			get => _spanNot;
+			set => _spanNot = Set(value);
+		}
+
+		ISpanOrQuery IQueryContainer.SpanOr
+		{
+			get => _spanOr;
+			set => _spanOr = Set(value);
+		}
+
+		ISpanTermQuery IQueryContainer.SpanTerm
+		{
+			get => _spanTerm;
+			set => _spanTerm = Set(value);
+		}
+
+		ISpanWithinQuery IQueryContainer.SpanWithin
+		{
+			get => _spanWithin;
+			set => _spanWithin = Set(value);
+		}
+
+		ITermQuery IQueryContainer.Term
+		{
+			get => _term;
+			set => _term = Set(value);
+		}
+
+		ITermsQuery IQueryContainer.Terms
+		{
+			get => _terms;
+			set => _terms = Set(value);
+		}
+
+		ITermsSetQuery IQueryContainer.TermsSet
+		{
+			get => _termsSet;
+			set => _termsSet = Set(value);
+		}
+
+		ITypeQuery IQueryContainer.Type
+		{
+			get => _type;
+			set => _type = Set(value);
+		}
+
+		IWildcardQuery IQueryContainer.Wildcard
+		{
+			get => _wildcard;
+			set => _wildcard = Set(value);
+		}
+
 		private T Set<T>(T value) where T : IQuery
 		{
-			if (this.ContainedQuery != null)
-				throw new Exception($"{nameof(QueryContainer)} can only hold a single query; Instance already contains a {this.ContainedQuery.GetType().Name}");
-			this.ContainedQuery = value;
+			if (ContainedQuery != null)
+				throw new Exception(
+					$"{nameof(QueryContainer)} can only hold a single query; Instance already contains a {ContainedQuery.GetType().Name}");
+
+			ContainedQuery = value;
 			return value;
 		}
-
-		IRawQuery IQueryContainer.RawQuery { get => _raw; set => _raw = Set(value); }
-		IBoolQuery IQueryContainer.Bool { get => _bool; set => _bool = Set(value); }
-		IMatchAllQuery IQueryContainer.MatchAll { get => _matchAllQuery; set => _matchAllQuery = Set(value); }
-		IMatchNoneQuery IQueryContainer.MatchNone { get => _matchNoneQuery; set => _matchNoneQuery = Set(value); }
-		ITermQuery IQueryContainer.Term { get => _term; set => _term = Set(value); }
-		IWildcardQuery IQueryContainer.Wildcard { get => _wildcard; set => _wildcard = Set(value); }
-		IPrefixQuery IQueryContainer.Prefix { get => _prefix; set => _prefix = Set(value); }
-		IBoostingQuery IQueryContainer.Boosting { get => _boosting; set => _boosting = Set(value); }
-		IIdsQuery IQueryContainer.Ids { get => _ids; set => _ids = Set(value); }
-		IConstantScoreQuery IQueryContainer.ConstantScore { get => _constantScore; set => _constantScore = Set(value); }
-		IDisMaxQuery IQueryContainer.DisMax { get => _disMax; set => _disMax = Set(value); }
-		IMultiMatchQuery IQueryContainer.MultiMatch { get => _multiMatch; set => _multiMatch = Set(value); }
-		IMatchQuery IQueryContainer.Match { get => _match; set => _match = Set(value); }
-		IMatchPhraseQuery IQueryContainer.MatchPhrase { get => _matchPhrase; set => _matchPhrase = Set(value); }
-		IMatchPhrasePrefixQuery IQueryContainer.MatchPhrasePrefix { get => _matchPhrasePrefix; set => _matchPhrasePrefix = Set(value); }
-		IFuzzyQuery IQueryContainer.Fuzzy { get => _fuzzy; set => _fuzzy = Set(value); }
-		IGeoShapeQuery IQueryContainer.GeoShape { get => _geoShape; set => _geoShape = Set(value); }
-		ICommonTermsQuery IQueryContainer.CommonTerms { get => _commonTerms; set => _commonTerms = Set(value); }
-		ITermsQuery IQueryContainer.Terms { get => _terms; set => _terms = Set(value); }
-		IQueryStringQuery IQueryContainer.QueryString { get => _queryString; set => _queryString = Set(value); }
-		ISimpleQueryStringQuery IQueryContainer.SimpleQueryString { get => _simpleQueryString; set => _simpleQueryString = Set(value); }
-		IRegexpQuery IQueryContainer.Regexp { get => _regexp; set => _regexp = Set(value); }
-		IHasChildQuery IQueryContainer.HasChild { get => _hasChild; set => _hasChild = Set(value); }
-		IHasParentQuery IQueryContainer.HasParent { get => _hasParent; set => _hasParent = Set(value); }
-		IMoreLikeThisQuery IQueryContainer.MoreLikeThis { get => _moreLikeThis; set => _moreLikeThis = Set(value); }
-		IRangeQuery IQueryContainer.Range { get => _range; set => _range = Set(value); }
-		ISpanTermQuery IQueryContainer.SpanTerm { get => _spanTerm; set => _spanTerm = Set(value); }
-		ISpanFirstQuery IQueryContainer.SpanFirst { get => _spanFirst; set => _spanFirst = Set(value); }
-		ISpanOrQuery IQueryContainer.SpanOr { get => _spanOr; set => _spanOr = Set(value); }
-		ISpanNotQuery IQueryContainer.SpanNot { get => _spanNot; set => _spanNot = Set(value); }
-		ISpanNearQuery IQueryContainer.SpanNear { get => _spanNear; set => _spanNear = Set(value); }
-		ISpanContainingQuery IQueryContainer.SpanContaining { get => _spanContaining; set => _spanContaining = Set(value); }
-		ISpanWithinQuery IQueryContainer.SpanWithin { get => _spanWithin; set => _spanWithin = Set(value); }
-		ISpanMultiTermQuery IQueryContainer.SpanMultiTerm { get => _spanMultiTerm; set => _spanMultiTerm = Set(value); }
-		ISpanFieldMaskingQuery IQueryContainer.SpanFieldMasking { get => _spanFieldMasking; set => _spanFieldMasking = Set(value); }
-		INestedQuery IQueryContainer.Nested { get => _nested; set => _nested = Set(value); }
-		IFunctionScoreQuery IQueryContainer.FunctionScore { get => _functionScore; set => _functionScore = Set(value); }
-		IGeoBoundingBoxQuery IQueryContainer.GeoBoundingBox { get => _geoBoundingBox; set => _geoBoundingBox = Set(value); }
-		IGeoDistanceQuery IQueryContainer.GeoDistance { get => _geoDistance; set => _geoDistance = Set(value); }
-		IGeoPolygonQuery IQueryContainer.GeoPolygon { get => _geoPolygon; set => _geoPolygon = Set(value); }
-		IScriptQuery IQueryContainer.Script { get => _script; set => _script = Set(value); }
-		IExistsQuery IQueryContainer.Exists { get => _exists; set => _exists = Set(value); }
-		ITypeQuery IQueryContainer.Type { get => _type; set => _type = Set(value); }
-		IPercolateQuery IQueryContainer.Percolate { get => _percolate; set => _percolate = Set(value); }
-		IParentIdQuery IQueryContainer.ParentId { get => _parentId; set => _parentId = Set(value); }
-		ITermsSetQuery IQueryContainer.TermsSet { get => _termsSet; set => _termsSet = Set(value); }
 	}
 }
diff --git a/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Dsl.cs b/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Dsl.cs
index 3948a9eec37..326fbd8db97 100644
--- a/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Dsl.cs
+++ b/src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Dsl.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 
 namespace Nest
 {
@@ -10,20 +9,6 @@ internal static class QueryContainerExtensions
 
 	public partial class QueryContainer : IQueryContainer, IDescriptor
 	{
-		bool IQueryContainer.IsConditionless => ContainedQuery?.Conditionless ?? true;
-		internal bool IsConditionless => Self.IsConditionless;
-
-		bool IQueryContainer.IsStrict { get; set; }
-		internal bool IsStrict => Self.IsStrict;
-
-		bool IQueryContainer.IsWritable => Self.IsVerbatim || !Self.IsConditionless;
-		internal bool IsWritable => Self.IsWritable;
-
-		bool IQueryContainer.IsVerbatim { get; set; }
-		internal bool IsVerbatim => Self.IsVerbatim;
-
-		internal bool HoldsOnlyShouldMusts { get; set; }
-
 		public QueryContainer() { }
 
 		public QueryContainer(QueryBase query) : this()
@@ -36,6 +21,25 @@ public QueryContainer(QueryBase query) : this()
 			query.WrapInContainer(this);
 		}
 
+		internal bool HoldsOnlyShouldMusts { get; set; }
+		internal bool IsConditionless => Self.IsConditionless;
+		internal bool IsStrict => Self.IsStrict;
+		internal bool IsVerbatim => Self.IsVerbatim;
+		internal bool IsWritable => Self.IsWritable;
+		bool IQueryContainer.IsConditionless => ContainedQuery?.Conditionless ?? true;
+
+		bool IQueryContainer.IsStrict { get; set; }
+
+		bool IQueryContainer.IsVerbatim { get; set; }
+
+		bool IQueryContainer.IsWritable => Self.IsVerbatim || !Self.IsConditionless;
+
+		public void Accept(IQueryVisitor visitor)
+		{
+			if (visitor.Scope == VisitorScope.Unknown) visitor.Scope = VisitorScope.Query;
+			new QueryWalker().Walk(this, visitor);
+		}
+
 		public static QueryContainer operator &(QueryContainer leftContainer, QueryContainer rightContainer) =>
 			And(leftContainer, rightContainer);
 
@@ -52,10 +56,13 @@ internal static QueryContainer Or(QueryContainer leftContainer, QueryContainer r
 				? queryContainer
 				: leftContainer.CombineAsShould(rightContainer);
 
-		private static bool IfEitherIsEmptyReturnTheOtherOrEmpty(QueryContainer leftContainer, QueryContainer rightContainer, out QueryContainer queryContainer)
+		private static bool IfEitherIsEmptyReturnTheOtherOrEmpty(QueryContainer leftContainer, QueryContainer rightContainer,
+			out QueryContainer queryContainer
+		)
 		{
 			queryContainer = null;
 			if (leftContainer == null && rightContainer == null) return true;
+
 			var leftWritable = leftContainer?.IsWritable ?? false;
 			var rightWritable = rightContainer?.IsWritable ?? false;
 			if (leftWritable && rightWritable) return false;
@@ -65,22 +72,16 @@ private static bool IfEitherIsEmptyReturnTheOtherOrEmpty(QueryContainer leftCont
 			return true;
 		}
 
-		public static QueryContainer operator !(QueryContainer queryContainer) => queryContainer == null || (!queryContainer.IsWritable)
+		public static QueryContainer operator !(QueryContainer queryContainer) => queryContainer == null || !queryContainer.IsWritable
 			? null
 			: new QueryContainer(new BoolQuery { MustNot = new[] { queryContainer } });
 
-		public static QueryContainer operator +(QueryContainer queryContainer) => queryContainer == null || (!queryContainer.IsWritable)
+		public static QueryContainer operator +(QueryContainer queryContainer) => queryContainer == null || !queryContainer.IsWritable
 			? null
 			: new QueryContainer(new BoolQuery { Filter = new[] { queryContainer } });
 
 		public static bool operator false(QueryContainer a) => false;
 
 		public static bool operator true(QueryContainer a) => false;
-
-		public void Accept(IQueryVisitor visitor)
-		{
-			if (visitor.Scope == VisitorScope.Unknown) visitor.Scope = VisitorScope.Query;
-			new QueryWalker().Walk(this, visitor);
-		}
 	}
 }
diff --git a/src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs b/src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs
index 40c880d03d1..21553dfc3d7 100644
--- a/src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs
+++ b/src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
 
@@ -8,11 +7,10 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public class QueryContainerDescriptor<T> : QueryContainer where T : class
 	{
-
 		private QueryContainer WrapInContainer<TQuery, TQueryInterface>(
 			Func<TQuery, TQueryInterface> create,
 			Action<TQueryInterface, IQueryContainer> assign
-			)
+		)
 			where TQuery : class, TQueryInterface, IQuery, new()
 			where TQueryInterface : class, IQuery
 		{
@@ -21,7 +19,7 @@ Action<TQueryInterface, IQueryContainer> assign
 			// contains a query. See https://github.com/elastic/elasticsearch-net/issues/2875
 			var query = create.InvokeOrDefault(new TQuery());
 
-			var container = this.ContainedQuery == null
+			var container = ContainedQuery == null
 				? this
 				: new QueryContainerDescriptor<T>();
 
@@ -226,7 +224,8 @@ public QueryContainer GeoShapeMultiPolygon(Func<GeoShapeMultiPolygonQueryDescrip
 		/// A geo_shape query with a geometry collection finds documents
 		/// that have a geometry that matches for the given spatial relation and input geometry collection
 		/// </summary>
-		public QueryContainer GeoShapeGeometryCollection(Func<GeoShapeGeometryCollectionQueryDescriptor<T>, IGeoShapeGeometryCollectionQuery> selector) =>
+		public QueryContainer GeoShapeGeometryCollection(Func<GeoShapeGeometryCollectionQueryDescriptor<T>, IGeoShapeGeometryCollectionQuery> selector
+		) =>
 			WrapInContainer(selector, (query, container) => container.GeoShape = query);
 
 		/// <summary>
@@ -319,24 +318,24 @@ public QueryContainer MatchNone(Func<MatchNoneQueryDescriptor, IMatchNoneQuery>
 		/// The term query maps to Lucene TermQuery.
 		/// </summary>
 		public QueryContainer Term(Expression<Func<T, object>> field, object value, double? boost = null, string name = null) =>
-			this.Term(t => t.Field(field).Value(value).Boost(boost).Name(name));
+			Term(t => t.Field(field).Value(value).Boost(boost).Name(name));
 
 		/// <summary>
 		/// Helper method to easily filter on join relations
 		/// </summary>
 		public QueryContainer HasRelationName(Expression<Func<T, JoinField>> field, RelationName value) =>
-			this.Term(t => t.Field(field).Value(value));
+			Term(t => t.Field(field).Value(value));
 
 		/// <summary>Helper method to easily filter on join relations</summary>
 		public QueryContainer HasRelationName<TRelation>(Expression<Func<T, JoinField>> field) =>
-			this.Term(t => t.Field(field).Value(Infer.Relation<TRelation>()));
+			Term(t => t.Field(field).Value(Infer.Relation<TRelation>()));
 
 		/// <summary>
 		/// Matches documents that have fields that contain a term (not analyzed).
 		/// The term query maps to Lucene TermQuery.
 		/// </summary>
 		public QueryContainer Term(Field field, object value, double? boost = null, string name = null) =>
-			this.Term(t => t.Field(field).Value(value).Boost(boost).Name(name));
+			Term(t => t.Field(field).Value(value).Boost(boost).Name(name));
 
 		/// <summary>
 		/// Matches documents that have fields that contain a term (not analyzed).
@@ -352,8 +351,10 @@ public QueryContainer Term(Func<TermQueryDescriptor<T>, ITermQuery> selector) =>
 		/// over many terms. In order to prevent extremely slow wildcard queries, a wildcard term should
 		/// not start with one of the wildcards * or ?. The wildcard query maps to Lucene WildcardQuery.
 		/// </summary>
-		public QueryContainer Wildcard(Expression<Func<T, object>> field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
-			this.Wildcard(t => t.Field(field).Value(value).Rewrite(rewrite).Boost(boost).Name(name));
+		public QueryContainer Wildcard(Expression<Func<T, object>> field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null,
+			string name = null
+		) =>
+			Wildcard(t => t.Field(field).Value(value).Rewrite(rewrite).Boost(boost).Name(name));
 
 		/// <summary>
 		/// Matches documents that have fields matching a wildcard expression (not analyzed).
@@ -363,7 +364,7 @@ public QueryContainer Wildcard(Expression<Func<T, object>> field, string value,
 		/// one of the wildcards * or ?. The wildcard query maps to Lucene WildcardQuery.
 		/// </summary>
 		public QueryContainer Wildcard(Field field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
-			this.Wildcard(t => t.Field(field).Value(value).Rewrite(rewrite).Boost(boost).Name(name));
+			Wildcard(t => t.Field(field).Value(value).Rewrite(rewrite).Boost(boost).Name(name));
 
 		/// <summary>
 		/// Matches documents that have fields matching a wildcard expression (not analyzed).
@@ -379,15 +380,17 @@ public QueryContainer Wildcard(Func<WildcardQueryDescriptor<T>, IWildcardQuery>
 		/// Matches documents that have fields containing terms with a specified prefix (not analyzed).
 		/// The prefix query maps to Lucene PrefixQuery.
 		/// </summary>
-		public QueryContainer Prefix(Expression<Func<T, object>> field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
-			this.Prefix(t => t.Field(field).Value(value).Boost(boost).Rewrite(rewrite).Name(name));
+		public QueryContainer Prefix(Expression<Func<T, object>> field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null,
+			string name = null
+		) =>
+			Prefix(t => t.Field(field).Value(value).Boost(boost).Rewrite(rewrite).Name(name));
 
 		/// <summary>
 		/// Matches documents that have fields containing terms with a specified prefix (not analyzed).
 		/// The prefix query maps to Lucene PrefixQuery.
 		/// </summary>
 		public QueryContainer Prefix(Field field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
-			this.Prefix(t => t.Field(field).Value(value).Boost(boost).Rewrite(rewrite).Name(name));
+			Prefix(t => t.Field(field).Value(value).Boost(boost).Rewrite(rewrite).Name(name));
 
 		/// <summary>
 		/// Matches documents that have fields containing terms with a specified prefix (not analyzed).
@@ -494,7 +497,7 @@ public QueryContainer Exists(Func<ExistsQueryDescriptor<T>, IExistsQuery> select
 		public QueryContainer Type(Func<TypeQueryDescriptor, ITypeQuery> selector) =>
 			WrapInContainer(selector, (query, container) => container.Type = query);
 
-		public QueryContainer Type<TOther>() => this.Type(q => q.Value<TOther>());
+		public QueryContainer Type<TOther>() => Type(q => q.Value<TOther>());
 
 		/// <summary>
 		/// Used to match queries stored in an index.
diff --git a/src/Nest/QueryDsl/Abstractions/Container/QueryContainerJsonConverter.cs b/src/Nest/QueryDsl/Abstractions/Container/QueryContainerJsonConverter.cs
index 37fc9b9eaba..1cf950b7341 100644
--- a/src/Nest/QueryDsl/Abstractions/Container/QueryContainerJsonConverter.cs
+++ b/src/Nest/QueryDsl/Abstractions/Container/QueryContainerJsonConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using Newtonsoft.Json;
@@ -17,6 +16,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			//Some API's return the stored queries as escaped string, e.g the get shield role API
 			var escapedJson = reader.Value as string;
 			if (string.IsNullOrWhiteSpace(escapedJson)) return null;
+
 			using (var sr = new StringReader(escapedJson))
 			using (var escapedReader = new JsonTextReader(sr))
 			{
@@ -40,12 +40,12 @@ protected override void SerializeJson(JsonWriter writer, object value, IQueryCon
 
 	internal class QueryContainerCollectionJsonConverter : JsonConverter
 	{
-		public override bool CanWrite => true;
 		public override bool CanRead => false;
+		public override bool CanWrite => true;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
-			var collection = (IEnumerable<QueryContainer>) value;
+			var collection = (IEnumerable<QueryContainer>)value;
 
 			if (collection == null)
 			{
diff --git a/src/Nest/QueryDsl/Abstractions/FieldLookup/FieldLookup.cs b/src/Nest/QueryDsl/Abstractions/FieldLookup/FieldLookup.cs
index ac5dbeab7ac..1583887332d 100644
--- a/src/Nest/QueryDsl/Abstractions/FieldLookup/FieldLookup.cs
+++ b/src/Nest/QueryDsl/Abstractions/FieldLookup/FieldLookup.cs
@@ -7,51 +7,51 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<FieldLookup>))]
 	public interface IFieldLookup
 	{
-		[JsonProperty("index")]
-		IndexName Index { get; set; }
-
-		[JsonProperty("type")]
-		TypeName Type { get; set; }
-
 		[JsonProperty("id")]
 		Id Id { get; set; }
 
+		[JsonProperty("index")]
+		IndexName Index { get; set; }
+
 		[JsonProperty("path")]
 		Field Path { get; set; }
 
 		[JsonProperty("routing")]
 		Routing Routing { get; set; }
+
+		[JsonProperty("type")]
+		TypeName Type { get; set; }
 	}
 
 	public class FieldLookup : IFieldLookup
 	{
-		public IndexName Index { get; set; }
-		public TypeName Type { get; set; }
 		public Id Id { get; set; }
+		public IndexName Index { get; set; }
 		public Field Path { get; set; }
 		public Routing Routing { get; set; }
+		public TypeName Type { get; set; }
 	}
 
-	public class FieldLookupDescriptor<T> : DescriptorBase<FieldLookupDescriptor<T>,IFieldLookup>, IFieldLookup
+	public class FieldLookupDescriptor<T> : DescriptorBase<FieldLookupDescriptor<T>, IFieldLookup>, IFieldLookup
 		where T : class
 	{
-		internal Type _ClrType => typeof(T);
-
-		IndexName IFieldLookup.Index { get; set; }
+		public FieldLookupDescriptor()
+		{
+			Self.Type = _ClrType;
+			Self.Index = _ClrType;
+		}
 
-		TypeName IFieldLookup.Type { get; set; }
+		internal Type _ClrType => typeof(T);
 
 		Id IFieldLookup.Id { get; set; }
 
+		IndexName IFieldLookup.Index { get; set; }
+
 		Field IFieldLookup.Path { get; set; }
 
 		Routing IFieldLookup.Routing { get; set; }
 
-		public FieldLookupDescriptor()
-		{
-			Self.Type = this._ClrType;
-			Self.Index = this._ClrType;
-		}
+		TypeName IFieldLookup.Type { get; set; }
 
 		public FieldLookupDescriptor<T> Index(IndexName index) => Assign(a => a.Index = index);
 
diff --git a/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryDescriptorBase.cs b/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryDescriptorBase.cs
index 79cc31e0982..89bf6cd419d 100644
--- a/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryDescriptorBase.cs
+++ b/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryDescriptorBase.cs
@@ -11,10 +11,10 @@ public abstract class FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>
 	{
 		Field IFieldNameQuery.Field { get; set; }
 
-		bool IQuery.IsVerbatim { get; set; }
-
 		bool IQuery.IsStrict { get; set; }
 
+		bool IQuery.IsVerbatim { get; set; }
+
 		public TDescriptor Field(Field field) => Assign(a => a.Field = field);
 
 		public TDescriptor Field(Expression<Func<T, object>> objectPath) =>
diff --git a/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryJsonConverter.cs b/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryJsonConverter.cs
index 6d696278859..948972aee84 100644
--- a/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryJsonConverter.cs
+++ b/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryJsonConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -13,9 +12,10 @@ protected override object DeserializeJson(JsonReader reader, Type objectType, ob
 			reader.Read(); //property name
 			var fieldName = reader.Value as string;
 			reader.Read(); //{
-			var query = this.ReadAs(reader, objectType, existingValue, serializer);
+			var query = ReadAs(reader, objectType, existingValue, serializer);
 
 			if (query == null) return null;
+
 			query.Field = fieldName;
 
 			return query;
@@ -35,10 +35,9 @@ protected override void SerializeJson(JsonWriter writer, object value, IFieldNam
 			writer.WriteStartObject();
 			writer.WritePropertyName(field);
 
-			this.Reserialize(writer, value, serializer);
+			Reserialize(writer, value, serializer);
 
 			writer.WriteEndObject();
 		}
 	}
-
 }
diff --git a/src/Nest/QueryDsl/Abstractions/Query/BoolQueryAndExtensions.cs b/src/Nest/QueryDsl/Abstractions/Query/BoolQueryAndExtensions.cs
index 85b957b45e4..e853fe7fc30 100644
--- a/src/Nest/QueryDsl/Abstractions/Query/BoolQueryAndExtensions.cs
+++ b/src/Nest/QueryDsl/Abstractions/Query/BoolQueryAndExtensions.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 
 namespace Nest
 {
-	using Containers = System.Collections.Generic.List<QueryContainer>;
+	using Containers = List<QueryContainer>;
+
 	internal static class BoolQueryAndExtensions
 	{
 		internal static QueryContainer CombineAsMust(this QueryContainer leftContainer, QueryContainer rightContainer)
@@ -33,10 +32,12 @@ internal static QueryContainer CombineAsMust(this QueryContainer leftContainer,
 		/// <summary>
 		/// Handles cases where either side is a bool which indicates it can't be merged yet the other side is mergable.
 		/// A side is considered unmergable if its locked (has important metadata) or has should clauses.
-		/// Instead of always wrapping these cases in another bool we merge to unmergable side into to others must clause therefor flattening the generated graph
+		/// Instead of always wrapping these cases in another bool we merge to unmergable side into to others must clause therefor flattening the
+		/// generated graph
 		/// </summary>
 		private static bool TryHandleUnmergableBools(
-			QueryContainer leftContainer, QueryContainer rightContainer, IBoolQuery leftBool, IBoolQuery rightBool, out QueryContainer c)
+			QueryContainer leftContainer, QueryContainer rightContainer, IBoolQuery leftBool, IBoolQuery rightBool, out QueryContainer c
+		)
 		{
 			c = null;
 			var leftCantMergeAnd = leftBool != null && !leftBool.CanMergeAnd();
@@ -73,12 +74,14 @@ private static bool TryHandleUnmergableBools(
 		/// In this case we can optimize the generated graph by merging and preventing stack overflows
 		/// </summary>
 		private static bool TryHandleBoolsWithOnlyShouldClauses(
-			QueryContainer leftContainer, QueryContainer rightContainer, IBoolQuery leftBool, IBoolQuery rightBool, out QueryContainer c)
+			QueryContainer leftContainer, QueryContainer rightContainer, IBoolQuery leftBool, IBoolQuery rightBool, out QueryContainer c
+		)
 		{
 			c = null;
 			var leftHasOnlyShoulds = leftBool.HasOnlyShouldClauses();
 			var rightHasOnlyShoulds = rightBool.HasOnlyShouldClauses();
 			if (!leftHasOnlyShoulds && !rightHasOnlyShoulds) return false;
+
 			if (leftContainer.HoldsOnlyShouldMusts && rightHasOnlyShoulds)
 			{
 				leftBool.Must = leftBool.Must.AddIfNotNull(rightContainer);
@@ -97,29 +100,22 @@ private static bool TryHandleBoolsWithOnlyShouldClauses(
 			return true;
 		}
 
-		private static QueryContainer CreateMustContainer(QueryContainer left, QueryContainer right)
-		{
-			return CreateMustContainer(new Containers { left, right }, null);
-		}
+		private static QueryContainer CreateMustContainer(QueryContainer left, QueryContainer right) =>
+			CreateMustContainer(new Containers { left, right }, null);
 
-		private static QueryContainer CreateMustContainer(List<QueryContainer> mustClauses, QueryContainer reuse)
-		{
-			return new QueryContainer(new BoolQuery() { Must = mustClauses.ToListOrNullIfEmpty() });
-		}
+		private static QueryContainer CreateMustContainer(List<QueryContainer> mustClauses, QueryContainer reuse) =>
+			new QueryContainer(new BoolQuery() { Must = mustClauses.ToListOrNullIfEmpty() });
 
 		private static QueryContainer CreateMustContainer(
 			List<QueryContainer> mustClauses,
 			List<QueryContainer> mustNotClauses,
 			List<QueryContainer> filters
-			)
+		) => new QueryContainer(new BoolQuery
 		{
-			return new QueryContainer(new BoolQuery
-			{
-				Must = mustClauses.ToListOrNullIfEmpty(),
-				MustNot = mustNotClauses.ToListOrNullIfEmpty(),
-				Filter = filters.ToListOrNullIfEmpty()
-			});
-		}
+			Must = mustClauses.ToListOrNullIfEmpty(),
+			MustNot = mustNotClauses.ToListOrNullIfEmpty(),
+			Filter = filters.ToListOrNullIfEmpty()
+		});
 
 		private static bool CanMergeAnd(this IBoolQuery boolQuery) =>
 			boolQuery != null && !boolQuery.Locked && !boolQuery.Should.HasAny();
@@ -128,8 +124,10 @@ private static IEnumerable<QueryContainer> OrphanMusts(QueryContainer container)
 		{
 			var lBoolQuery = container.Self().Bool;
 			if (lBoolQuery == null) return new[] { container };
+
 			return lBoolQuery?.Must?.AsInstanceOrToListOrNull();
 		}
+
 		private static IEnumerable<QueryContainer> OrphanMustNots(IQueryContainer container) => container.Bool?.MustNot?.AsInstanceOrToListOrNull();
 
 		private static IEnumerable<QueryContainer> OrphanFilters(IQueryContainer container) => container.Bool?.Filter?.AsInstanceOrToListOrNull();
diff --git a/src/Nest/QueryDsl/Abstractions/Query/BoolQueryExtensions.cs b/src/Nest/QueryDsl/Abstractions/Query/BoolQueryExtensions.cs
index 67395672c4d..035f58b8f09 100644
--- a/src/Nest/QueryDsl/Abstractions/Query/BoolQueryExtensions.cs
+++ b/src/Nest/QueryDsl/Abstractions/Query/BoolQueryExtensions.cs
@@ -1,37 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Nest
+namespace Nest
 {
 	internal static class BoolQueryExtensions
 	{
-
 		internal static IQueryContainer Self(this QueryContainer q) => q;
 
 		internal static bool HasOnlyShouldClauses(this IBoolQuery boolQuery) =>
-			boolQuery != null && !boolQuery.IsVerbatim && (
-				boolQuery.Should.HasAny()
-				&& !boolQuery.Must.HasAny()
-				&& !boolQuery.MustNot.HasAny()
-				&& !boolQuery.Filter.HasAny()
-			);
+			boolQuery != null && !boolQuery.IsVerbatim && boolQuery.Should.HasAny() && !boolQuery.Must.HasAny() && !boolQuery.MustNot.HasAny()
+			&& !boolQuery.Filter.HasAny();
 
 		internal static bool HasOnlyFilterClauses(this IBoolQuery boolQuery) =>
-			boolQuery != null && !boolQuery.IsVerbatim && !boolQuery.Locked && (
-				!boolQuery.Should.HasAny()
-				&& !boolQuery.Must.HasAny()
-				&& !boolQuery.MustNot.HasAny()
-				&& boolQuery.Filter.HasAny()
-			);
+			boolQuery != null && !boolQuery.IsVerbatim && !boolQuery.Locked && !boolQuery.Should.HasAny() && !boolQuery.Must.HasAny()
+			&& !boolQuery.MustNot.HasAny() && boolQuery.Filter.HasAny();
 
 		internal static bool HasOnlyMustNotClauses(this IBoolQuery boolQuery) =>
-			boolQuery != null && !boolQuery.IsVerbatim && !boolQuery.Locked && (
-				!boolQuery.Should.HasAny()
-				&& !boolQuery.Must.HasAny()
-				&& boolQuery.MustNot.HasAny()
-			&& !boolQuery.Filter.HasAny()
-		);
-
+			boolQuery != null && !boolQuery.IsVerbatim && !boolQuery.Locked && !boolQuery.Should.HasAny() && !boolQuery.Must.HasAny()
+			&& boolQuery.MustNot.HasAny() && !boolQuery.Filter.HasAny();
 	}
 }
diff --git a/src/Nest/QueryDsl/Abstractions/Query/BoolQueryOrExtensions.cs b/src/Nest/QueryDsl/Abstractions/Query/BoolQueryOrExtensions.cs
index 81c5f946735..dd78c79dcd0 100644
--- a/src/Nest/QueryDsl/Abstractions/Query/BoolQueryOrExtensions.cs
+++ b/src/Nest/QueryDsl/Abstractions/Query/BoolQueryOrExtensions.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 
 namespace Nest
 {
-	using Containers = System.Collections.Generic.List<QueryContainer>;
+	using Containers = List<QueryContainer>;
+
 	internal static class BoolQueryOrExtensions
 	{
 		internal static QueryContainer CombineAsShould(this QueryContainer leftContainer, QueryContainer rightContainer)
@@ -27,8 +26,10 @@ internal static QueryContainer CombineAsShould(this QueryContainer leftContainer
 			var shouldClauses = lq.EagerConcat(rq);
 			return CreateShouldContainer(shouldClauses);
 		}
+
 		private static bool TryFlattenShould(
-			QueryContainer leftContainer, QueryContainer rightContainer, IBoolQuery leftBool, IBoolQuery rightBool, out QueryContainer c)
+			QueryContainer leftContainer, QueryContainer rightContainer, IBoolQuery leftBool, IBoolQuery rightBool, out QueryContainer c
+		)
 		{
 			c = null;
 			var leftCanMerge = leftContainer.CanMergeShould();
@@ -47,7 +48,6 @@ private static bool TryFlattenShould(
 				c = rightContainer;
 			}
 			return c != null;
-
 		}
 
 		private static bool CanMergeShould(this IQueryContainer container) => container.Bool.CanMergeShould();
@@ -60,6 +60,5 @@ private static QueryContainer CreateShouldContainer(List<QueryContainer> shouldC
 			{
 				Should = shouldClauses.ToListOrNullIfEmpty()
 			};
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Abstractions/Query/QueryBase.cs b/src/Nest/QueryDsl/Abstractions/Query/QueryBase.cs
index ce9539a7289..76d22ced999 100644
--- a/src/Nest/QueryDsl/Abstractions/Query/QueryBase.cs
+++ b/src/Nest/QueryDsl/Abstractions/Query/QueryBase.cs
@@ -1,17 +1,10 @@
 using System;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
 {
 	public interface IQuery
 	{
-		/// <summary>
-		/// The name of the query. Allows you to retrieve for each document what part of the query it matched on.
-		/// </summary>
-		[JsonProperty("_name")]
-		string Name { get; set; }
-
 		/// <summary>
 		/// Provides a boost to this query to influence its relevance score.
 		/// For example, a query with a boost of 2 is twice as important as a query with a boost of 1,
@@ -28,55 +21,63 @@ public interface IQuery
 		bool Conditionless { get; }
 
 		/// <summary>
-		/// Whether the query should be treated as verbatim. A verbatim query will be serialized as part of the request, irrespective
-		/// of whether it is <see cref="Conditionless"/> or not.
+		/// Whether the query should be treated as strict. A strict query will throw an exception when serialized
+		/// if it is <see cref="Conditionless" />.
 		/// </summary>
 		[JsonIgnore]
-		bool IsVerbatim { get; set; }
+		bool IsStrict { get; set; }
 
 		/// <summary>
-		/// Whether the query should be treated as strict. A strict query will throw an exception when serialized
-		/// if it is <see cref="Conditionless"/>.
+		/// Whether the query should be treated as verbatim. A verbatim query will be serialized as part of the request, irrespective
+		/// of whether it is <see cref="Conditionless" /> or not.
 		/// </summary>
 		[JsonIgnore]
-		bool IsStrict { get; set; }
+		bool IsVerbatim { get; set; }
 
 		/// <summary>
 		/// Whether the query should be treated as writable. Used when determining how to combine queries.
 		/// </summary>
 		[JsonIgnore]
 		bool IsWritable { get; }
+
+		/// <summary>
+		/// The name of the query. Allows you to retrieve for each document what part of the query it matched on.
+		/// </summary>
+		[JsonProperty("_name")]
+		string Name { get; set; }
 	}
 
 	public abstract class QueryBase : IQuery
 	{
-		/// <inheritdoc />
-		public string Name { get; set; }
 		public double? Boost { get; set; }
-		public bool IsVerbatim { get; set; }
 		public bool IsStrict { get; set; }
-		public bool IsWritable => this.IsVerbatim || !this.Conditionless;
+		public bool IsVerbatim { get; set; }
+		public bool IsWritable => IsVerbatim || !Conditionless;
+
+		/// <inheritdoc />
+		public string Name { get; set; }
 
-		bool IQuery.Conditionless => this.Conditionless;
 		protected abstract bool Conditionless { get; }
 
+		bool IQuery.Conditionless => Conditionless;
+
 		//always evaluate to false so that each side of && equation is evaluated
 		public static bool operator false(QueryBase a) => false;
 
 		//always evaluate to false so that each side of && equation is evaluated
 		public static bool operator true(QueryBase a) => false;
 
-		public static QueryBase operator &(QueryBase leftQuery, QueryBase rightQuery) => Combine(leftQuery, rightQuery, (l,r) => l && r);
+		public static QueryBase operator &(QueryBase leftQuery, QueryBase rightQuery) => Combine(leftQuery, rightQuery, (l, r) => l && r);
 
-		public static QueryBase operator |(QueryBase leftQuery, QueryBase rightQuery) => Combine(leftQuery, rightQuery, (l,r) => l || r);
+		public static QueryBase operator |(QueryBase leftQuery, QueryBase rightQuery) => Combine(leftQuery, rightQuery, (l, r) => l || r);
 
 		public static QueryBase operator !(QueryBase query) => query == null || !query.IsWritable
 			? null
-			: new BoolQuery { MustNot = new QueryContainer[] {query}};
+			: new BoolQuery { MustNot = new QueryContainer[] { query } };
 
 		public static QueryBase operator +(QueryBase query) => query == null || !query.IsWritable
 			? null
-			: new BoolQuery { Filter = new QueryContainer[] {query}};
+			: new BoolQuery { Filter = new QueryContainer[] { query } };
 
 		private static QueryBase Combine(QueryBase leftQuery, QueryBase rightQuery, Func<QueryContainer, QueryContainer, QueryContainer> combine)
 		{
@@ -98,6 +99,7 @@ private static bool IfEitherIsEmptyReturnTheOtherOrEmpty(QueryBase leftQuery, Qu
 		{
 			query = null;
 			if (leftQuery == null && rightQuery == null) return true;
+
 			var leftWritable = leftQuery?.IsWritable ?? false;
 			var rightWritable = rightQuery?.IsWritable ?? false;
 			if (leftWritable && rightWritable) return false;
@@ -112,8 +114,8 @@ public static implicit operator QueryContainer(QueryBase query) =>
 
 		internal void WrapInContainer(IQueryContainer container)
 		{
-			container.IsVerbatim = this.IsVerbatim;
-			container.IsStrict = this.IsStrict;
+			container.IsVerbatim = IsVerbatim;
+			container.IsStrict = IsStrict;
 			InternalWrapInContainer(container);
 		}
 
diff --git a/src/Nest/QueryDsl/Abstractions/Query/QueryDescriptorBase.cs b/src/Nest/QueryDsl/Abstractions/Query/QueryDescriptorBase.cs
index 494b45f5796..c0fa48a41fb 100644
--- a/src/Nest/QueryDsl/Abstractions/Query/QueryDescriptorBase.cs
+++ b/src/Nest/QueryDsl/Abstractions/Query/QueryDescriptorBase.cs
@@ -1,28 +1,29 @@
-using System;
-
-namespace Nest
+namespace Nest
 {
 	public abstract class QueryDescriptorBase<TDescriptor, TInterface>
 		: DescriptorBase<TDescriptor, TInterface>, IQuery
 		where TDescriptor : QueryDescriptorBase<TDescriptor, TInterface>, TInterface
 		where TInterface : class, IQuery
 	{
-		string IQuery.Name { get; set; }
-		public TDescriptor Name(string name) => Assign(a => a.Name = name);
+		protected abstract bool Conditionless { get; }
 
 		double? IQuery.Boost { get; set; }
-		public TDescriptor Boost(double? boost) => Assign(a => a.Boost = boost);
 
-		bool IQuery.Conditionless => this.Conditionless;
-		protected abstract bool Conditionless { get; }
-
-		bool IQuery.IsVerbatim { get; set; }
-		public TDescriptor Verbatim(bool verbatim = true) => Assign(a => a.IsVerbatim = verbatim);
+		bool IQuery.Conditionless => Conditionless;
 
 		bool IQuery.IsStrict { get; set; }
 
-		public TDescriptor Strict(bool strict = true) => Assign(a => a.IsStrict = strict);
+		bool IQuery.IsVerbatim { get; set; }
 
 		bool IQuery.IsWritable => Self.IsVerbatim || !Self.Conditionless;
+		string IQuery.Name { get; set; }
+
+		public TDescriptor Name(string name) => Assign(a => a.Name = name);
+
+		public TDescriptor Boost(double? boost) => Assign(a => a.Boost = boost);
+
+		public TDescriptor Verbatim(bool verbatim = true) => Assign(a => a.IsVerbatim = verbatim);
+
+		public TDescriptor Strict(bool strict = true) => Assign(a => a.IsStrict = strict);
 	}
 }
diff --git a/src/Nest/QueryDsl/Compound/Bool/BoolQuery.cs b/src/Nest/QueryDsl/Compound/Bool/BoolQuery.cs
index 55ff5dc4489..f673203284c 100644
--- a/src/Nest/QueryDsl/Compound/Bool/BoolQuery.cs
+++ b/src/Nest/QueryDsl/Compound/Bool/BoolQuery.cs
@@ -9,6 +9,20 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IBoolQuery : IQuery
 	{
+		/// <summary>
+		/// The clause (query) which is to be used as a filter (in filter context).
+		/// </summary>
+		[JsonProperty("filter", DefaultValueHandling = DefaultValueHandling.Ignore)]
+		IEnumerable<QueryContainer> Filter { get; set; }
+
+		bool Locked { get; }
+
+		/// <summary>
+		/// Specifies a minimum number of the optional BooleanClauses which must be satisfied.
+		/// </summary>
+		[JsonProperty("minimum_should_match")]
+		MinimumShouldMatch MinimumShouldMatch { get; set; }
+
 		/// <summary>
 		/// The clause(s) that must appear in matching documents
 		/// </summary>
@@ -23,80 +37,74 @@ public interface IBoolQuery : IQuery
 		IEnumerable<QueryContainer> MustNot { get; set; }
 
 		/// <summary>
-		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a document.
-		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch"/>.
+		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a
+		/// document.
+		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch" />.
 		/// </summary>
 		[JsonProperty("should", DefaultValueHandling = DefaultValueHandling.Ignore)]
 		IEnumerable<QueryContainer> Should { get; set; }
-
-		/// <summary>
-		/// The clause (query) which is to be used as a filter (in filter context).
-		/// </summary>
-		[JsonProperty("filter", DefaultValueHandling = DefaultValueHandling.Ignore)]
-		IEnumerable<QueryContainer> Filter { get; set; }
-
-		/// <summary>
-		/// Specifies a minimum number of the optional BooleanClauses which must be satisfied.
-		/// </summary>
-		[JsonProperty("minimum_should_match")]
-		MinimumShouldMatch MinimumShouldMatch { get; set; }
-
-		bool Locked { get; }
 	}
 
 	public class BoolQuery : QueryBase, IBoolQuery
 	{
-		internal static bool Locked(IBoolQuery q) => !q.Name.IsNullOrEmpty() || q.Boost.HasValue || q.MinimumShouldMatch != null;
-		bool IBoolQuery.Locked => BoolQuery.Locked(this);
+		private IList<QueryContainer> _filter;
 
 		private IList<QueryContainer> _must;
 		private IList<QueryContainer> _mustNot;
 		private IList<QueryContainer> _should;
-		private IList<QueryContainer> _filter;
 
 		public BoolQuery() { }
 
 		/// <summary>
-		/// The clause(s) that must appear in matching documents
+		/// The clause (query) which is to be used as a filter (in filter context).
 		/// </summary>
-		public IEnumerable<QueryContainer> Must {
-			get { return _must; }
-			set { _must = value.AsInstanceOrToListOrNull(); }
+		public IEnumerable<QueryContainer> Filter
+		{
+			get => _filter;
+			set => _filter = value.AsInstanceOrToListOrNull();
 		}
 
 		/// <summary>
-		/// The clause (query) must not appear in the matching documents. Note that it is not possible to search on documents that only consists of a must_not clauses.
+		/// Specifies a minimum number of the optional BooleanClauses which must be satisfied.
 		/// </summary>
-		public IEnumerable<QueryContainer> MustNot {
-			get { return _mustNot; }
-			set { _mustNot = value.AsInstanceOrToListOrNull(); }
-		}
+		public MinimumShouldMatch MinimumShouldMatch { get; set; }
 
 		/// <summary>
-		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a document.
-		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch"/>.
+		/// The clause(s) that must appear in matching documents
 		/// </summary>
-		public IEnumerable<QueryContainer> Should {
-			get { return _should; }
-			set { _should = value.AsInstanceOrToListOrNull(); }
+		public IEnumerable<QueryContainer> Must
+		{
+			get => _must;
+			set => _must = value.AsInstanceOrToListOrNull();
 		}
 
 		/// <summary>
-		/// The clause (query) which is to be used as a filter (in filter context).
+		/// The clause (query) must not appear in the matching documents. Note that it is not possible to search on documents that only consists of a
+		/// must_not clauses.
 		/// </summary>
-		public IEnumerable<QueryContainer> Filter {
-			get { return _filter; }
-			set { _filter = value.AsInstanceOrToListOrNull(); }
+		public IEnumerable<QueryContainer> MustNot
+		{
+			get => _mustNot;
+			set => _mustNot = value.AsInstanceOrToListOrNull();
 		}
 
 		/// <summary>
-		/// Specifies a minimum number of the optional BooleanClauses which must be satisfied.
+		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a
+		/// document.
+		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch" />.
 		/// </summary>
-		public MinimumShouldMatch MinimumShouldMatch { get; set; }
-
-		internal override void InternalWrapInContainer(IQueryContainer c) => c.Bool = this;
+		public IEnumerable<QueryContainer> Should
+		{
+			get => _should;
+			set => _should = value.AsInstanceOrToListOrNull();
+		}
 
 		protected override bool Conditionless => IsConditionless(this);
+		bool IBoolQuery.Locked => Locked(this);
+
+		internal static bool Locked(IBoolQuery q) => !q.Name.IsNullOrEmpty() || q.Boost.HasValue || q.MinimumShouldMatch != null;
+
+		internal override void InternalWrapInContainer(IQueryContainer c) => c.Bool = this;
 
 		internal static bool IsConditionless(IBoolQuery q) =>
 			q.Must.NotWritable() && q.MustNot.NotWritable() && q.Should.NotWritable() && q.Filter.NotWritable();
@@ -104,28 +112,49 @@ internal static bool IsConditionless(IBoolQuery q) =>
 
 	public class BoolQueryDescriptor<T>
 		: QueryDescriptorBase<BoolQueryDescriptor<T>, IBoolQuery>
-		, IBoolQuery where T : class
+			, IBoolQuery where T : class
 	{
-		bool IBoolQuery.Locked => BoolQuery.Locked(this);
-
-		protected override bool Conditionless => BoolQuery.IsConditionless(this);
+		private IList<QueryContainer> _filter;
 		private IList<QueryContainer> _must;
 		private IList<QueryContainer> _mustNot;
 		private IList<QueryContainer> _should;
-		private IList<QueryContainer> _filter;
-		IEnumerable<QueryContainer> IBoolQuery.Must { get => _must; set => _must = value.AsInstanceOrToListOrNull();
+
+		protected override bool Conditionless => BoolQuery.IsConditionless(this);
+
+		IEnumerable<QueryContainer> IBoolQuery.Filter
+		{
+			get => _filter;
+			set => _filter = value.AsInstanceOrToListOrNull();
 		}
-		IEnumerable<QueryContainer> IBoolQuery.MustNot { get => _mustNot; set => _mustNot = value.AsInstanceOrToListOrNull(); }
-		IEnumerable<QueryContainer> IBoolQuery.Should { get => _should; set => _should = value.AsInstanceOrToListOrNull(); }
-		IEnumerable<QueryContainer> IBoolQuery.Filter { get => _filter; set => _filter = value.AsInstanceOrToListOrNull(); }
+
+		bool IBoolQuery.Locked => BoolQuery.Locked(this);
 		MinimumShouldMatch IBoolQuery.MinimumShouldMatch { get; set; }
 
+		IEnumerable<QueryContainer> IBoolQuery.Must
+		{
+			get => _must;
+			set => _must = value.AsInstanceOrToListOrNull();
+		}
+
+		IEnumerable<QueryContainer> IBoolQuery.MustNot
+		{
+			get => _mustNot;
+			set => _mustNot = value.AsInstanceOrToListOrNull();
+		}
+
+		IEnumerable<QueryContainer> IBoolQuery.Should
+		{
+			get => _should;
+			set => _should = value.AsInstanceOrToListOrNull();
+		}
+
 		/// <summary>
 		/// Specifies a minimum number of the optional BooleanClauses which must be satisfied.
 		/// </summary>
 		/// <param name="minimumShouldMatches"></param>
 		/// <returns></returns>
-		public BoolQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatches) => Assign(a => a.MinimumShouldMatch = minimumShouldMatches);
+		public BoolQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatches) =>
+			Assign(a => a.MinimumShouldMatch = minimumShouldMatches);
 
 		/// <summary>
 		/// The clause(s) that must appear in matching documents
@@ -146,7 +175,8 @@ public BoolQueryDescriptor<T> Must(params QueryContainer[] queries) =>
 			Assign(a => a.Must = queries.ToListOrNullIfEmpty());
 
 		/// <summary>
-		/// The clause (query) must not appear in the matching documents. Note that it is not possible to search on documents that only consists of a must_not clauses.
+		/// The clause (query) must not appear in the matching documents. Note that it is not possible to search on documents that only consists of a
+		/// must_not clauses.
 		/// </summary>
 		/// <param name="queries"></param>
 		/// <returns></returns>
@@ -154,7 +184,8 @@ public BoolQueryDescriptor<T> MustNot(params Func<QueryContainerDescriptor<T>, Q
 			Assign(a => a.MustNot = queries.Select(q => q?.Invoke(new QueryContainerDescriptor<T>())).ToListOrNullIfEmpty());
 
 		/// <summary>
-		/// The clause (query) must not appear in the matching documents. Note that it is not possible to search on documents that only consists of a must_not clauses.
+		/// The clause (query) must not appear in the matching documents. Note that it is not possible to search on documents that only consists of a
+		/// must_not clauses.
 		/// </summary>
 		/// <param name="queries"></param>
 		/// <returns></returns>
@@ -162,7 +193,8 @@ public BoolQueryDescriptor<T> MustNot(IEnumerable<Func<QueryContainerDescriptor<
 			Assign(a => a.MustNot = queries.Select(q => q?.Invoke(new QueryContainerDescriptor<T>())).ToListOrNullIfEmpty());
 
 		/// <summary>
-		/// The clause (query) must not appear in the matching documents. Note that it is not possible to search on documents that only consists of a must_not clauses.
+		/// The clause (query) must not appear in the matching documents. Note that it is not possible to search on documents that only consists of a
+		/// must_not clauses.
 		/// </summary>
 		/// <param name="queries"></param>
 		/// <returns></returns>
@@ -170,8 +202,9 @@ public BoolQueryDescriptor<T> MustNot(params QueryContainer[] queries) =>
 			Assign(a => a.MustNot = queries.ToListOrNullIfEmpty());
 
 		/// <summary>
-		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a document.
-		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch"/>.
+		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a
+		/// document.
+		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch" />.
 		/// </summary>
 		/// <param name="queries"></param>
 		/// <returns></returns>
@@ -179,8 +212,9 @@ public BoolQueryDescriptor<T> Should(params Func<QueryContainerDescriptor<T>, Qu
 			Assign(a => a.Should = queries.Select(q => q?.Invoke(new QueryContainerDescriptor<T>())).ToListOrNullIfEmpty());
 
 		/// <summary>
-		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a document.
-		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch"/>.
+		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a
+		/// document.
+		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch" />.
 		/// </summary>
 		/// <param name="queries"></param>
 		/// <returns></returns>
@@ -188,8 +222,9 @@ public BoolQueryDescriptor<T> Should(IEnumerable<Func<QueryContainerDescriptor<T
 			Assign(a => a.Should = queries.Select(q => q?.Invoke(new QueryContainerDescriptor<T>())).ToListOrNullIfEmpty());
 
 		/// <summary>
-		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a document.
-		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch"/>.
+		/// The clause (query) should appear in the matching document. A boolean query with no must clauses, one or more should clauses must match a
+		/// document.
+		/// The minimum number of should clauses to match can be set using <see cref="MinimumShouldMatch" />.
 		/// </summary>
 		/// <param name="queries"></param>
 		/// <returns></returns>
diff --git a/src/Nest/QueryDsl/Compound/Boosting/BoostingQuery.cs b/src/Nest/QueryDsl/Compound/Boosting/BoostingQuery.cs
index 583e7fb5440..4fcb67e1cd7 100644
--- a/src/Nest/QueryDsl/Compound/Boosting/BoostingQuery.cs
+++ b/src/Nest/QueryDsl/Compound/Boosting/BoostingQuery.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -9,35 +7,36 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<BoostingQueryDescriptor<object>>))]
 	public interface IBoostingQuery : IQuery
 	{
-		[JsonProperty("positive")]
-		QueryContainer PositiveQuery { get; set; }
+		[JsonProperty("negative_boost")]
+		double? NegativeBoost { get; set; }
 
 		[JsonProperty("negative")]
 		QueryContainer NegativeQuery { get; set; }
 
-		[JsonProperty("negative_boost")]
-		double? NegativeBoost { get; set; }
+		[JsonProperty("positive")]
+		QueryContainer PositiveQuery { get; set; }
 	}
 
 	public class BoostingQuery : QueryBase, IBoostingQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public QueryContainer PositiveQuery { get; set; }
-		public QueryContainer NegativeQuery { get; set; }
 		public double? NegativeBoost { get; set; }
+		public QueryContainer NegativeQuery { get; set; }
+		public QueryContainer PositiveQuery { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Boosting = this;
+
 		internal static bool IsConditionless(IBoostingQuery q) => q.NegativeQuery.NotWritable() && q.PositiveQuery.NotWritable();
 	}
 
 	public class BoostingQueryDescriptor<T>
 		: QueryDescriptorBase<BoostingQueryDescriptor<T>, IBoostingQuery>
-		, IBoostingQuery where T : class
+			, IBoostingQuery where T : class
 	{
 		protected override bool Conditionless => BoostingQuery.IsConditionless(this);
-		QueryContainer IBoostingQuery.PositiveQuery { get; set; }
-		QueryContainer IBoostingQuery.NegativeQuery { get; set; }
 		double? IBoostingQuery.NegativeBoost { get; set; }
+		QueryContainer IBoostingQuery.NegativeQuery { get; set; }
+		QueryContainer IBoostingQuery.PositiveQuery { get; set; }
 
 		public BoostingQueryDescriptor<T> NegativeBoost(double? boost) => Assign(a => a.NegativeBoost = boost);
 
diff --git a/src/Nest/QueryDsl/Compound/ConstantScore/ConstantScoreQuery.cs b/src/Nest/QueryDsl/Compound/ConstantScore/ConstantScoreQuery.cs
index c9c0b39f586..8e154a6df66 100644
--- a/src/Nest/QueryDsl/Compound/ConstantScore/ConstantScoreQuery.cs
+++ b/src/Nest/QueryDsl/Compound/ConstantScore/ConstantScoreQuery.cs
@@ -14,19 +14,20 @@ public interface IConstantScoreQuery : IQuery
 
 	public class ConstantScoreQuery : QueryBase, IConstantScoreQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
+		public QueryContainer Filter { get; set; }
 		public string Lang { get; set; }
-		public string Script { get; set; }
 		public Dictionary<string, object> Params { get; set; }
-		public QueryContainer Filter { get; set; }
+		public string Script { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.ConstantScore = this;
+
 		internal static bool IsConditionless(IConstantScoreQuery q) => q.Filter.NotWritable();
 	}
 
 	public class ConstantScoreQueryDescriptor<T>
 		: QueryDescriptorBase<ConstantScoreQueryDescriptor<T>, IConstantScoreQuery>
-		, IConstantScoreQuery where T : class
+			, IConstantScoreQuery where T : class
 	{
 		protected override bool Conditionless => ConstantScoreQuery.IsConditionless(this);
 		QueryContainer IConstantScoreQuery.Filter { get; set; }
diff --git a/src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs b/src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs
index 32a5a872ca1..a3bb16f2494 100644
--- a/src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs
+++ b/src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs
@@ -9,38 +9,44 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<DisMaxQuery>))]
 	public interface IDisMaxQuery : IQuery
 	{
-		[JsonProperty("tie_breaker")]
-		double? TieBreaker { get; set; }
-
 		[JsonProperty("queries")]
 		IEnumerable<QueryContainer> Queries { get; set; }
+
+		[JsonProperty("tie_breaker")]
+		double? TieBreaker { get; set; }
 	}
 
 	public class DisMaxQuery : QueryBase, IDisMaxQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public double? TieBreaker { get; set; }
 		public IEnumerable<QueryContainer> Queries { get; set; }
+		public double? TieBreaker { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.DisMax = this;
+
 		internal static bool IsConditionless(IDisMaxQuery q) => q.Queries.NotWritable();
 	}
 
 	public class DisMaxQueryDescriptor<T>
 		: QueryDescriptorBase<DisMaxQueryDescriptor<T>, IDisMaxQuery>
-		, IDisMaxQuery where T : class
+			, IDisMaxQuery where T : class
 	{
 		protected override bool Conditionless => DisMaxQuery.IsConditionless(this);
-		double? IDisMaxQuery.TieBreaker { get; set; }
 		IEnumerable<QueryContainer> IDisMaxQuery.Queries { get; set; }
+		double? IDisMaxQuery.TieBreaker { get; set; }
 
 		public DisMaxQueryDescriptor<T> Queries(params Func<QueryContainerDescriptor<T>, QueryContainer>[] querySelectors) =>
-			Assign(a => a.Queries = querySelectors.Select(q=>q?.Invoke(new QueryContainerDescriptor<T>())).Where(q => q != null).ToListOrNullIfEmpty());
+			Assign(a => a.Queries = querySelectors.Select(q => q?.Invoke(new QueryContainerDescriptor<T>()))
+				.Where(q => q != null)
+				.ToListOrNullIfEmpty());
 
 		public DisMaxQueryDescriptor<T> Queries(IEnumerable<Func<QueryContainerDescriptor<T>, QueryContainer>> querySelectors) =>
-			Assign(a => a.Queries = querySelectors.Select(q=>q?.Invoke(new QueryContainerDescriptor<T>())).Where(q => q != null).ToListOrNullIfEmpty());
+			Assign(a => a.Queries = querySelectors.Select(q => q?.Invoke(new QueryContainerDescriptor<T>()))
+				.Where(q => q != null)
+				.ToListOrNullIfEmpty());
 
-		public DisMaxQueryDescriptor<T> Queries(params QueryContainer[] queries) => Assign(a => a.Queries = queries.Where(q => q != null).ToListOrNullIfEmpty());
+		public DisMaxQueryDescriptor<T> Queries(params QueryContainer[] queries) =>
+			Assign(a => a.Queries = queries.Where(q => q != null).ToListOrNullIfEmpty());
 
 		public DisMaxQueryDescriptor<T> TieBreaker(double? tieBreaker) => Assign(a => a.TieBreaker = tieBreaker);
 	}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/FunctionScoreQuery.cs b/src/Nest/QueryDsl/Compound/FunctionScore/FunctionScoreQuery.cs
index 3e0a54d6f56..06175577029 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/FunctionScoreQuery.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/FunctionScoreQuery.cs
@@ -8,8 +8,8 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<FunctionScoreQueryDescriptor<object>>))]
 	public interface IFunctionScoreQuery : IQuery
 	{
-		[JsonProperty("query")]
-		QueryContainer Query { get; set; }
+		[JsonProperty("boost_mode")]
+		FunctionBoostMode? BoostMode { get; set; }
 
 		[JsonProperty("functions")]
 		IEnumerable<IScoreFunction> Functions { get; set; }
@@ -17,44 +17,44 @@ public interface IFunctionScoreQuery : IQuery
 		[JsonProperty("max_boost")]
 		double? MaxBoost { get; set; }
 
-		[JsonProperty("score_mode")]
-		FunctionScoreMode? ScoreMode { get; set; }
-
-		[JsonProperty("boost_mode")]
-		FunctionBoostMode? BoostMode { get; set; }
-
 		[JsonProperty("min_score")]
 		double? MinScore { get; set; }
+
+		[JsonProperty("query")]
+		QueryContainer Query { get; set; }
+
+		[JsonProperty("score_mode")]
+		FunctionScoreMode? ScoreMode { get; set; }
 	}
 
 	public class FunctionScoreQuery : QueryBase, IFunctionScoreQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public IEnumerable<IScoreFunction> Functions { get; set; }
-		public QueryContainer Query { get; set; }
-		public FunctionScoreMode? ScoreMode { get; set; }
 		public FunctionBoostMode? BoostMode { get; set; }
+		public IEnumerable<IScoreFunction> Functions { get; set; }
 		public double? MaxBoost { get; set; }
 		public double? MinScore { get; set; }
+		public QueryContainer Query { get; set; }
+		public FunctionScoreMode? ScoreMode { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.FunctionScore = this;
 
-		internal static bool IsConditionless(IFunctionScoreQuery q, bool force = false) => 
+		internal static bool IsConditionless(IFunctionScoreQuery q, bool force = false) =>
 			force || !q.Functions.HasAny();
 	}
 
-	public class FunctionScoreQueryDescriptor<T> 
+	public class FunctionScoreQueryDescriptor<T>
 		: QueryDescriptorBase<FunctionScoreQueryDescriptor<T>, IFunctionScoreQuery>
-		, IFunctionScoreQuery where T : class
+			, IFunctionScoreQuery where T : class
 	{
 		private bool _forcedConditionless = false;
 		protected override bool Conditionless => FunctionScoreQuery.IsConditionless(this, _forcedConditionless);
-		IEnumerable<IScoreFunction> IFunctionScoreQuery.Functions { get; set; }
-		QueryContainer IFunctionScoreQuery.Query { get; set; }
-		FunctionScoreMode? IFunctionScoreQuery.ScoreMode { get; set; }
 		FunctionBoostMode? IFunctionScoreQuery.BoostMode { get; set; }
+		IEnumerable<IScoreFunction> IFunctionScoreQuery.Functions { get; set; }
 		double? IFunctionScoreQuery.MaxBoost { get; set; }
 		double? IFunctionScoreQuery.MinScore { get; set; }
+		QueryContainer IFunctionScoreQuery.Query { get; set; }
+		FunctionScoreMode? IFunctionScoreQuery.ScoreMode { get; set; }
 
 		public FunctionScoreQueryDescriptor<T> ConditionlessWhen(bool isConditionless) => Assign(a => _forcedConditionless = isConditionless);
 
@@ -74,4 +74,4 @@ public FunctionScoreQueryDescriptor<T> Functions(Func<ScoreFunctionsDescriptor<T
 
 		public FunctionScoreQueryDescriptor<T> MinScore(double? minScore) => Assign(a => a.MinScore = minScore);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/DecayFunctionBase.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/DecayFunctionBase.cs
index f8c8c8d66c7..68ed847fef4 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/DecayFunctionBase.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/DecayFunctionBase.cs
@@ -6,50 +6,46 @@ namespace Nest
 {
 	public interface IDecayFunction : IScoreFunction
 	{
+		[JsonProperty("decay")]
+		double? Decay { get; set; }
+
 		string DecayType { get; }
 
 		Field Field { get; set; }
 
-		[JsonProperty("decay")]
-		double? Decay { get; set; }
-
 		[JsonProperty("multi_value_mode")]
 		MultiValueMode? MultiValueMode { get; set; }
-
-
 	}
+
 	public interface IDecayFunction<TOrigin, TScale> : IDecayFunction
 	{
+		[JsonProperty("offset")]
+		TScale Offset { get; set; }
 
 		[JsonProperty("origin")]
 		TOrigin Origin { get; set; }
 
 		[JsonProperty("scale")]
 		TScale Scale { get; set; }
-
-		[JsonProperty("offset")]
-		TScale Offset { get; set; }
-
 	}
 
 
 	public abstract class DecayFunctionBase<TOrigin, TScale> : FunctionScoreFunctionBase, IDecayFunction<TOrigin, TScale>
 	{
-		protected abstract string DecayType { get; }
-
-		string IDecayFunction.DecayType => this.DecayType;
+		public double? Decay { get; set; }
 
 		public Field Field { get; set; }
 
-		public TOrigin Origin { get; set; }
-
-		public TScale Scale { get; set; }
+		public MultiValueMode? MultiValueMode { get; set; }
 
 		public TScale Offset { get; set; }
 
-		public double? Decay { get; set; }
+		public TOrigin Origin { get; set; }
 
-		public MultiValueMode? MultiValueMode { get; set; }
+		public TScale Scale { get; set; }
+		protected abstract string DecayType { get; }
+
+		string IDecayFunction.DecayType => DecayType;
 	}
 
 	public abstract class DecayFunctionDescriptorBase<TDescriptor, TOrigin, TScale, T>
@@ -59,19 +55,19 @@ public abstract class DecayFunctionDescriptorBase<TDescriptor, TOrigin, TScale,
 	{
 		protected abstract string DecayType { get; }
 
-		string IDecayFunction.DecayType => this.DecayType;
+		double? IDecayFunction.Decay { get; set; }
 
-		Field IDecayFunction.Field { get; set; }
+		string IDecayFunction.DecayType => DecayType;
 
-		TOrigin IDecayFunction<TOrigin, TScale>.Origin { get; set; }
+		Field IDecayFunction.Field { get; set; }
 
-		TScale IDecayFunction<TOrigin, TScale>.Scale { get; set; }
+		MultiValueMode? IDecayFunction.MultiValueMode { get; set; }
 
 		TScale IDecayFunction<TOrigin, TScale>.Offset { get; set; }
 
-		double? IDecayFunction.Decay { get; set; }
+		TOrigin IDecayFunction<TOrigin, TScale>.Origin { get; set; }
 
-		MultiValueMode? IDecayFunction.MultiValueMode { get; set; }
+		TScale IDecayFunction<TOrigin, TScale>.Scale { get; set; }
 
 		public TDescriptor Origin(TOrigin origin) => Assign(a => a.Origin = origin);
 
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/ExponentialDecayFunctionBase.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/ExponentialDecayFunctionBase.cs
index 70158c2a2cb..a5f6c486cd4 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/ExponentialDecayFunctionBase.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/ExponentialDecayFunctionBase.cs
@@ -5,14 +5,16 @@ public abstract class ExponentialDecayFunctionBase<TOrigin, TScale> : DecayFunct
 		protected override string DecayType => "exp";
 	}
 
-	public class ExponentialDecayFunctionDescriptor<TOrigin, TScale, T> : DecayFunctionDescriptorBase<ExponentialDecayFunctionDescriptor<TOrigin, TScale, T>, TOrigin, TScale, T>
+	public class ExponentialDecayFunctionDescriptor<TOrigin, TScale, T>
+		: DecayFunctionDescriptorBase<ExponentialDecayFunctionDescriptor<TOrigin, TScale, T>, TOrigin, TScale, T>
 		where T : class
 	{
 		protected override string DecayType => "exp";
 	}
 
 	public class ExponentialDecayFunction : ExponentialDecayFunctionBase<double?, double?> { }
+
 	public class ExponentialDateDecayFunction : ExponentialDecayFunctionBase<DateMath, Time> { }
-	public class ExponentialGeoDecayFunction : ExponentialDecayFunctionBase<GeoLocation, Distance> { }
 
-}
\ No newline at end of file
+	public class ExponentialGeoDecayFunction : ExponentialDecayFunctionBase<GeoLocation, Distance> { }
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/GaussDecayFunctionBase.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/GaussDecayFunctionBase.cs
index 2a7454fa718..67ddde1a0b7 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/GaussDecayFunctionBase.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/GaussDecayFunctionBase.cs
@@ -5,13 +5,16 @@ public abstract class GaussDecayFunctionBase<TOrigin, TScale> : DecayFunctionBas
 		protected override string DecayType => "gauss";
 	}
 
-	public class GaussDecayFunctionDescriptor<TOrigin, TScale, T> : DecayFunctionDescriptorBase<GaussDecayFunctionDescriptor<TOrigin, TScale, T>, TOrigin, TScale, T>
+	public class GaussDecayFunctionDescriptor<TOrigin, TScale, T>
+		: DecayFunctionDescriptorBase<GaussDecayFunctionDescriptor<TOrigin, TScale, T>, TOrigin, TScale, T>
 		where T : class
 	{
 		protected override string DecayType => "gauss";
 	}
 
 	public class GaussDecayFunction : GaussDecayFunctionBase<double?, double?> { }
+
 	public class GaussDateDecayFunction : GaussDecayFunctionBase<DateMath, Time> { }
+
 	public class GaussGeoDecayFunction : GaussDecayFunctionBase<GeoLocation, Distance> { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/LinearDecayFunctionBase.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/LinearDecayFunctionBase.cs
index 69bf30c7924..458aeeb296c 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/LinearDecayFunctionBase.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/LinearDecayFunctionBase.cs
@@ -4,13 +4,17 @@ public abstract class LinearDecayFunctionBase<TOrigin, TScale> : DecayFunctionBa
 	{
 		protected override string DecayType => "linear";
 	}
-	public class LinearDecayFunctionDescriptor<TOrigin, TScale, T> : DecayFunctionDescriptorBase<LinearDecayFunctionDescriptor<TOrigin, TScale, T>, TOrigin, TScale, T>
+
+	public class LinearDecayFunctionDescriptor<TOrigin, TScale, T>
+		: DecayFunctionDescriptorBase<LinearDecayFunctionDescriptor<TOrigin, TScale, T>, TOrigin, TScale, T>
 		where T : class
 	{
 		protected override string DecayType => "linear";
 	}
 
 	public class LinearDecayFunction : LinearDecayFunctionBase<double?, double?> { }
+
 	public class LinearDateDecayFunction : LinearDecayFunctionBase<DateMath, Time> { }
+
 	public class LinearGeoDecayFunction : LinearDecayFunctionBase<GeoLocation, Distance> { }
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/MultiValueMode.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/MultiValueMode.cs
index 2befbfe283f..87ec43eb47c 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/MultiValueMode.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/MultiValueMode.cs
@@ -8,12 +8,15 @@ namespace Nest
 	public enum MultiValueMode
 	{
 		[EnumMember(Value = "min")]
-		Min, 
+		Min,
+
 		[EnumMember(Value = "max")]
 		Max,
+
 		[EnumMember(Value = "avg")]
 		Average,
+
 		[EnumMember(Value = "sum")]
 		Sum
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FieldValue/FieldValueFactorFunction.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FieldValue/FieldValueFactorFunction.cs
index a551536cfcd..7a565c192fd 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FieldValue/FieldValueFactorFunction.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FieldValue/FieldValueFactorFunction.cs
@@ -8,44 +8,41 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IFieldValueFactorFunction : IScoreFunction
 	{
+		[JsonProperty("factor")]
+		double? Factor { get; set; }
 
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("factor")]
-		double? Factor { get; set; }
+		[JsonProperty("missing")]
+		double? Missing { get; set; }
 
 		[JsonProperty("modifier")]
 		[JsonConverter(typeof(StringEnumConverter))]
 		FieldValueFactorModifier? Modifier { get; set; }
-
-		[JsonProperty("missing")]
-		double? Missing { get; set; }
-
 	}
 
-	public class FieldValueFactorFunction : FunctionScoreFunctionBase,IFieldValueFactorFunction
+	public class FieldValueFactorFunction : FunctionScoreFunctionBase, IFieldValueFactorFunction
 	{
-		public Field Field { get; set; }
-
 		public double? Factor { get; set; }
-
-		public FieldValueFactorModifier? Modifier { get; set; }
+		public Field Field { get; set; }
 
 		public double? Missing { get; set; }
 
+		public FieldValueFactorModifier? Modifier { get; set; }
 	}
 
-	public class FieldValueFactorFunctionDescriptor<T> 
-		: FunctionScoreFunctionDescriptorBase<FieldValueFactorFunctionDescriptor<T>, IFieldValueFactorFunction, T >, IFieldValueFactorFunction
+	public class FieldValueFactorFunctionDescriptor<T>
+		: FunctionScoreFunctionDescriptorBase<FieldValueFactorFunctionDescriptor<T>, IFieldValueFactorFunction, T>, IFieldValueFactorFunction
 		where T : class
 	{
-		Field IFieldValueFactorFunction.Field { get; set; }
 		double? IFieldValueFactorFunction.Factor { get; set; }
-		FieldValueFactorModifier? IFieldValueFactorFunction.Modifier { get; set; }
+		Field IFieldValueFactorFunction.Field { get; set; }
 		double? IFieldValueFactorFunction.Missing { get; set; }
+		FieldValueFactorModifier? IFieldValueFactorFunction.Modifier { get; set; }
 
 		public FieldValueFactorFunctionDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
+
 		public FieldValueFactorFunctionDescriptor<T> Field(Expression<Func<T, object>> field) => Assign(a => a.Field = field);
 
 		public FieldValueFactorFunctionDescriptor<T> Factor(double? factor) => Assign(a => a.Factor = factor);
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FieldValue/FieldValueFactorModifier.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FieldValue/FieldValueFactorModifier.cs
index e5a40b0c078..d60a7b3cb29 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FieldValue/FieldValueFactorModifier.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FieldValue/FieldValueFactorModifier.cs
@@ -9,23 +9,32 @@ public enum FieldValueFactorModifier
 	{
 		[EnumMember(Value = "none")]
 		None,
+
 		[EnumMember(Value = "log")]
 		Log,
+
 		[EnumMember(Value = "log1p")]
 		Log1P,
+
 		[EnumMember(Value = "log2p")]
 		Log2P,
+
 		[EnumMember(Value = "ln")]
 		Ln,
+
 		[EnumMember(Value = "ln1p")]
 		Ln1P,
+
 		[EnumMember(Value = "ln2p")]
 		Ln2P,
+
 		[EnumMember(Value = "square")]
 		Square,
+
 		[EnumMember(Value = "sqrt")]
 		SquareRoot,
+
 		[EnumMember(Value = "reciprocal")]
 		Reciprocal
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FunctionBoostMode.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FunctionBoostMode.cs
index 58182a2c52a..f9c86e85233 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FunctionBoostMode.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FunctionBoostMode.cs
@@ -9,15 +9,20 @@ public enum FunctionBoostMode
 	{
 		[EnumMember(Value = "multiply")]
 		Multiply,
+
 		[EnumMember(Value = "replace")]
 		Replace,
+
 		[EnumMember(Value = "sum")]
 		Sum,
+
 		[EnumMember(Value = "avg")]
 		Average,
+
 		[EnumMember(Value = "max")]
 		Max,
+
 		[EnumMember(Value = "min")]
 		Min
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FunctionScoreMode.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FunctionScoreMode.cs
index b9e4dda4920..5c686e60311 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FunctionScoreMode.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/FunctionScoreMode.cs
@@ -9,15 +9,20 @@ public enum FunctionScoreMode
 	{
 		[EnumMember(Value = "multiply")]
 		Multiply,
+
 		[EnumMember(Value = "sum")]
 		Sum,
+
 		[EnumMember(Value = "avg")]
 		Average,
+
 		[EnumMember(Value = "first")]
 		First,
+
 		[EnumMember(Value = "max")]
 		Max,
+
 		[EnumMember(Value = "min")]
 		Min
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/IScoreFunction.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/IScoreFunction.cs
index 111e08073ce..35791ef9345 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/IScoreFunction.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/IScoreFunction.cs
@@ -15,6 +15,7 @@ public interface IScoreFunction
 	}
 
 	public class FunctionScoreFunction : FunctionScoreFunctionBase { }
+
 	public abstract class FunctionScoreFunctionBase : IScoreFunction
 	{
 		public QueryContainer Filter { get; set; }
@@ -22,10 +23,9 @@ public abstract class FunctionScoreFunctionBase : IScoreFunction
 	}
 
 	public class FunctionScoreFunctionDescriptor<T> : FunctionScoreFunctionDescriptorBase<FunctionScoreFunctionDescriptor<T>, IScoreFunction, T>
-		where T : class { } 
+		where T : class { }
 
-	public abstract class FunctionScoreFunctionDescriptorBase<TDescriptor, TInterface, T> : 
-		DescriptorBase<TDescriptor, TInterface>, IScoreFunction
+	public abstract class FunctionScoreFunctionDescriptorBase<TDescriptor, TInterface, T> : DescriptorBase<TDescriptor, TInterface>, IScoreFunction
 		where TDescriptor : FunctionScoreFunctionDescriptorBase<TDescriptor, TInterface, T>, TInterface, IScoreFunction
 		where TInterface : class, IScoreFunction
 		where T : class
@@ -39,4 +39,4 @@ public TDescriptor Filter(Func<QueryContainerDescriptor<T>, QueryContainer> filt
 
 		public TDescriptor Weight(double? weight) => Assign(a => a.Weight = weight);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Random/RandomScoreFunction.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Random/RandomScoreFunction.cs
index b45d85c54f8..080e8938d28 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Random/RandomScoreFunction.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Random/RandomScoreFunction.cs
@@ -8,31 +8,33 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<RandomScoreFunction>))]
 	public interface IRandomScoreFunction : IScoreFunction
 	{
-		[JsonProperty("seed")]
-		Union<long, string> Seed { get; set; }
-
 		[JsonProperty("field")]
 		Field Field { get; set; }
+
+		[JsonProperty("seed")]
+		Union<long, string> Seed { get; set; }
 	}
 
-	public class RandomScoreFunction: FunctionScoreFunctionBase, IRandomScoreFunction
+	public class RandomScoreFunction : FunctionScoreFunctionBase, IRandomScoreFunction
 	{
-		public Union<long, string> Seed { get; set; }
-
 		public Field Field { get; set; }
+		public Union<long, string> Seed { get; set; }
 	}
 
-	public class RandomScoreFunctionDescriptor<T> : FunctionScoreFunctionDescriptorBase<RandomScoreFunctionDescriptor<T>, IRandomScoreFunction,T>, IRandomScoreFunction
+	public class RandomScoreFunctionDescriptor<T>
+		: FunctionScoreFunctionDescriptorBase<RandomScoreFunctionDescriptor<T>, IRandomScoreFunction, T>, IRandomScoreFunction
 		where T : class
 	{
-		Union<long, string> IRandomScoreFunction.Seed { get; set; }
 		Field IRandomScoreFunction.Field { get; set; }
+		Union<long, string> IRandomScoreFunction.Seed { get; set; }
 
 		public RandomScoreFunctionDescriptor<T> Seed(long? seed) => Assign(a => a.Seed = seed);
+
 		public RandomScoreFunctionDescriptor<T> Seed(string seed) => Assign(a => a.Seed = seed);
+
 		public RandomScoreFunctionDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
+
 		public RandomScoreFunctionDescriptor<T> Field(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.Field = objectPath);
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScoreFunctionJsonConverter.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScoreFunctionJsonConverter.cs
index 9a8d1f9ba54..2f252f62cbe 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScoreFunctionJsonConverter.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScoreFunctionJsonConverter.cs
@@ -8,8 +8,22 @@ namespace Nest
 {
 	internal class ScoreFunctionJsonConverter : JsonConverter
 	{
+		private static readonly IDictionary<string, Type> DecayTypeMapping = new Dictionary<string, Type>
+		{
+			{ "exp_numeric", typeof(ExponentialDecayFunction) },
+			{ "exp_date", typeof(ExponentialDateDecayFunction) },
+			{ "exp_geo", typeof(ExponentialGeoDecayFunction) },
+			{ "gauss_numeric", typeof(GaussDecayFunction) },
+			{ "gauss_date", typeof(GaussDateDecayFunction) },
+			{ "gauss_geo", typeof(GaussGeoDecayFunction) },
+			{ "linear_numeric", typeof(LinearDecayFunction) },
+			{ "linear_date", typeof(LinearDateDecayFunction) },
+			{ "linear_geo", typeof(LinearGeoDecayFunction) },
+		};
+
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
@@ -37,7 +51,6 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 					writer.WritePropertyName("weight");
 					serializer.Serialize(writer, function.Weight.Value);
 				}
-
 			}
 			writer.WriteEndObject();
 		}
@@ -48,6 +61,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		private bool WriteScriptScore(JsonWriter writer, IScriptScoreFunction value, JsonSerializer serializer)
 		{
 			if (value == null) return false;
+
 			writer.WritePropertyName("script_score");
 			serializer.Serialize(writer, value.Script);
 			return true;
@@ -56,6 +70,7 @@ private bool WriteScriptScore(JsonWriter writer, IScriptScoreFunction value, Jso
 		private bool WriteRandomScore(JsonWriter writer, IRandomScoreFunction value, JsonSerializer serializer)
 		{
 			if (value == null) return false;
+
 			writer.WritePropertyName("random_score");
 			writer.WriteStartObject();
 			{
@@ -65,9 +80,11 @@ private bool WriteRandomScore(JsonWriter writer, IRandomScoreFunction value, Jso
 			writer.WriteEndObject();
 			return true;
 		}
+
 		private bool WriteFieldValueFactor(JsonWriter writer, IFieldValueFactorFunction value, JsonSerializer serializer)
 		{
 			if (value == null) return false;
+
 			writer.WritePropertyName("field_value_factor");
 			writer.WriteStartObject();
 			{
@@ -79,6 +96,7 @@ private bool WriteFieldValueFactor(JsonWriter writer, IFieldValueFactorFunction
 			writer.WriteEndObject();
 			return true;
 		}
+
 		private bool WriteDecay(JsonWriter writer, IDecayFunction decay, JsonSerializer serializer)
 		{
 			if (decay == null) return false;
@@ -90,8 +108,8 @@ private bool WriteDecay(JsonWriter writer, IDecayFunction decay, JsonSerializer
 				writer.WriteStartObject();
 				{
 					var write = WriteNumericDecay(writer, decay as IDecayFunction<double?, double?>, serializer)
-								|| WriteDateDecay(writer, decay as IDecayFunction<DateMath, Time>, serializer)
-								|| WriteGeoDecay(writer, decay as IDecayFunction<GeoLocation, Distance>, serializer);
+						|| WriteDateDecay(writer, decay as IDecayFunction<DateMath, Time>, serializer)
+						|| WriteGeoDecay(writer, decay as IDecayFunction<GeoLocation, Distance>, serializer);
 					if (!write) throw new Exception($"Can not write decay function json for {decay.GetType().Name}");
 
 					if (decay.Decay.HasValue)
@@ -109,12 +127,12 @@ private bool WriteDecay(JsonWriter writer, IDecayFunction decay, JsonSerializer
 			}
 			writer.WriteEndObject();
 			return true;
-
 		}
 
 		private bool WriteNumericDecay(JsonWriter writer, IDecayFunction<double?, double?> value, JsonSerializer serializer)
 		{
 			if (value == null) return false;
+
 			writer.WritePropertyName("origin");
 			serializer.Serialize(writer, value.Origin);
 			writer.WritePropertyName("scale");
@@ -130,6 +148,7 @@ private bool WriteNumericDecay(JsonWriter writer, IDecayFunction<double?, double
 		private bool WriteDateDecay(JsonWriter writer, IDecayFunction<DateMath, Time> value, JsonSerializer serializer)
 		{
 			if (value == null || value.Field.IsConditionless()) return false;
+
 			if (value.Origin != null)
 			{
 				writer.WritePropertyName("origin");
@@ -143,12 +162,12 @@ private bool WriteDateDecay(JsonWriter writer, IDecayFunction<DateMath, Time> va
 				serializer.Serialize(writer, value.Offset);
 			}
 			return true;
-
 		}
 
 		private bool WriteGeoDecay(JsonWriter writer, IDecayFunction<GeoLocation, Distance> value, JsonSerializer serializer)
 		{
 			if (value == null || value.Field.IsConditionless()) return false;
+
 			writer.WritePropertyName("origin");
 			serializer.Serialize(writer, value.Origin);
 			writer.WritePropertyName("scale");
@@ -164,8 +183,9 @@ private bool WriteGeoDecay(JsonWriter writer, IDecayFunction<GeoLocation, Distan
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var jo = JObject.Load(reader);
-			QueryContainer filter = jo.Property("filter")?.Value.ToObject<QueryContainer>(serializer);
-			double? weight = jo.Property("weight")?.Value.ToObject<double?>(); ;
+			var filter = jo.Property("filter")?.Value.ToObject<QueryContainer>(serializer);
+			var weight = jo.Property("weight")?.Value.ToObject<double?>();
+			;
 			IScoreFunction function = null;
 			foreach (var prop in jo.Properties())
 			{
@@ -177,7 +197,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 						var properties = prop.Value.Value<JObject>().Properties().ToList();
 						var fieldProp = properties.First(p => p.Name != "multi_value_mode");
 						var field = fieldProp.Name;
-						var f = this.ReadDecayFunction(prop.Name, fieldProp.Value.Value<JObject>(), serializer);
+						var f = ReadDecayFunction(prop.Name, fieldProp.Value.Value<JObject>(), serializer);
 						f.Field = field;
 						var mv = properties.FirstOrDefault(p => p.Name == "multi_value_mode")?.Value;
 						if (mv != null)
@@ -198,28 +218,17 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			}
 			if (function == null && weight.HasValue) function = new WeightFunction { Weight = weight };
 			else if (function == null) return null; //throw new Exception("error deserializing function score function");
+
 			function.Weight = weight;
 			function.Filter = filter;
 			return function;
 		}
 
-		private static IDictionary<string, Type> DecayTypeMapping = new Dictionary<string, Type>
-		{
-			{ "exp_numeric", typeof(ExponentialDecayFunction) },
-			{ "exp_date", typeof(ExponentialDateDecayFunction) },
-			{ "exp_geo", typeof(ExponentialGeoDecayFunction) },
-			{ "gauss_numeric", typeof(GaussDecayFunction) },
-			{ "gauss_date", typeof(GaussDateDecayFunction) },
-			{ "gauss_geo", typeof(GaussGeoDecayFunction) },
-			{ "linear_numeric", typeof(LinearDecayFunction) },
-			{ "linear_date", typeof(LinearDateDecayFunction) },
-			{ "linear_geo", typeof(LinearGeoDecayFunction) },
-		};
-
 		private IDecayFunction ReadDecayFunction(string type, JObject o, JsonSerializer serializer)
 		{
 			var origin = o.Property("origin")?.Value.Type;
 			if (origin == null) return null;
+
 			var subType = "numeric";
 			switch (origin)
 			{
@@ -233,6 +242,5 @@ private IDecayFunction ReadDecayFunction(string type, JObject o, JsonSerializer
 			var t = DecayTypeMapping[$"{type}_{subType}"];
 			return FromJson.Read(o.CreateReader(), t, serializer) as IDecayFunction;
 		}
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScoreFunctions.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScoreFunctions.cs
index 9937abf650c..445f39424ec 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScoreFunctions.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScoreFunctions.cs
@@ -8,31 +8,45 @@ public class ScoreFunctionsDescriptor<T> : DescriptorPromiseBase<ScoreFunctionsD
 	{
 		public ScoreFunctionsDescriptor() : base(new List<IScoreFunction>()) { }
 
-		public ScoreFunctionsDescriptor<T> Gauss(Func<GaussDecayFunctionDescriptor<double?, double?, T>, IDecayFunction<double?, double?>> selector) =>
+		public ScoreFunctionsDescriptor<T> Gauss(Func<GaussDecayFunctionDescriptor<double?, double?, T>, IDecayFunction<double?, double?>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new GaussDecayFunctionDescriptor<double?, double?, T>())));
 
-		public ScoreFunctionsDescriptor<T> GaussDate(Func<GaussDecayFunctionDescriptor<DateMath, Time, T>, IDecayFunction<DateMath, Time>> selector) =>
+		public ScoreFunctionsDescriptor<T> GaussDate(Func<GaussDecayFunctionDescriptor<DateMath, Time, T>, IDecayFunction<DateMath, Time>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new GaussDecayFunctionDescriptor<DateMath, Time, T>())));
 
-		public ScoreFunctionsDescriptor<T> GaussGeoLocation(Func<GaussDecayFunctionDescriptor<GeoLocation, Distance, T>, IDecayFunction<GeoLocation, Distance>> selector) =>
+		public ScoreFunctionsDescriptor<T> GaussGeoLocation(
+			Func<GaussDecayFunctionDescriptor<GeoLocation, Distance, T>, IDecayFunction<GeoLocation, Distance>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new GaussDecayFunctionDescriptor<GeoLocation, Distance, T>())));
 
-		public ScoreFunctionsDescriptor<T> Linear(Func<LinearDecayFunctionDescriptor<double?, double?, T>, IDecayFunction<double?, double?>> selector) =>
+		public ScoreFunctionsDescriptor<T> Linear(Func<LinearDecayFunctionDescriptor<double?, double?, T>, IDecayFunction<double?, double?>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new LinearDecayFunctionDescriptor<double?, double?, T>())));
 
-		public ScoreFunctionsDescriptor<T> LinearDate(Func<LinearDecayFunctionDescriptor<DateMath, Time, T>, IDecayFunction<DateMath, Time>> selector) =>
+		public ScoreFunctionsDescriptor<T> LinearDate(Func<LinearDecayFunctionDescriptor<DateMath, Time, T>, IDecayFunction<DateMath, Time>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new LinearDecayFunctionDescriptor<DateMath, Time, T>())));
 
-		public ScoreFunctionsDescriptor<T> LinearGeoLocation(Func<LinearDecayFunctionDescriptor<GeoLocation, Distance, T>, IDecayFunction<GeoLocation, Distance>> selector) =>
+		public ScoreFunctionsDescriptor<T> LinearGeoLocation(
+			Func<LinearDecayFunctionDescriptor<GeoLocation, Distance, T>, IDecayFunction<GeoLocation, Distance>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new LinearDecayFunctionDescriptor<GeoLocation, Distance, T>())));
 
-		public ScoreFunctionsDescriptor<T> Exponential(Func<ExponentialDecayFunctionDescriptor<double?, double?, T>, IDecayFunction<double?, double?>> selector) =>
+		public ScoreFunctionsDescriptor<T> Exponential(
+			Func<ExponentialDecayFunctionDescriptor<double?, double?, T>, IDecayFunction<double?, double?>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new ExponentialDecayFunctionDescriptor<double?, double?, T>())));
 
-		public ScoreFunctionsDescriptor<T> ExponentialDate(Func<ExponentialDecayFunctionDescriptor<DateMath, Time, T>, IDecayFunction<DateMath, Time>> selector) =>
+		public ScoreFunctionsDescriptor<T> ExponentialDate(
+			Func<ExponentialDecayFunctionDescriptor<DateMath, Time, T>, IDecayFunction<DateMath, Time>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new ExponentialDecayFunctionDescriptor<DateMath, Time, T>())));
 
-		public ScoreFunctionsDescriptor<T> ExponentialGeoLocation(Func<ExponentialDecayFunctionDescriptor<GeoLocation, Distance, T>, IDecayFunction<GeoLocation, Distance>> selector) =>
+		public ScoreFunctionsDescriptor<T> ExponentialGeoLocation(
+			Func<ExponentialDecayFunctionDescriptor<GeoLocation, Distance, T>, IDecayFunction<GeoLocation, Distance>> selector
+		) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new ExponentialDecayFunctionDescriptor<GeoLocation, Distance, T>())));
 
 		public ScoreFunctionsDescriptor<T> ScriptScore(Func<ScriptScoreFunctionDescriptor<T>, IScriptScoreFunction> selector) =>
@@ -55,6 +69,5 @@ public ScoreFunctionsDescriptor<T> Weight(Func<WeightFunctionDescriptor<T>, IWei
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new WeightFunctionDescriptor<T>())));
 
 		public ScoreFunctionsDescriptor<T> Weight(double weight) => Assign(a => a.AddIfNotNull(new WeightFunction { Weight = weight }));
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScriptScore/ScriptScoreFunction.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScriptScore/ScriptScoreFunction.cs
index 736a66f8733..b529293e0b1 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScriptScore/ScriptScoreFunction.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScriptScore/ScriptScoreFunction.cs
@@ -15,8 +15,8 @@ public class ScriptScoreFunction : FunctionScoreFunctionBase, IScriptScoreFuncti
 		public IScriptQuery Script { get; set; }
 	}
 
-	public class ScriptScoreFunctionDescriptor<T> :
-		FunctionScoreFunctionDescriptorBase<ScriptScoreFunctionDescriptor<T>, IScriptScoreFunction, T> , IScriptScoreFunction
+	public class ScriptScoreFunctionDescriptor<T>
+		: FunctionScoreFunctionDescriptorBase<ScriptScoreFunctionDescriptor<T>, IScriptScoreFunction, T>, IScriptScoreFunction
 		where T : class
 	{
 		IScriptQuery IScriptScoreFunction.Script { get; set; }
diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Weight/WeightFunction.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Weight/WeightFunction.cs
index b6c3ab2bd36..d63f952850c 100644
--- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Weight/WeightFunction.cs
+++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Weight/WeightFunction.cs
@@ -3,14 +3,10 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	public interface IWeightFunction : IScoreFunction
-	{
-	}
+	public interface IWeightFunction : IScoreFunction { }
 
 	public class WeightFunction : FunctionScoreFunctionBase, IWeightFunction { }
 
-	public class WeightFunctionDescriptor<T> : FunctionScoreFunctionDescriptorBase<WeightFunctionDescriptor<T>, IWeightFunction,T> , IWeightFunction
-		where T : class
-	{
-	}
+	public class WeightFunctionDescriptor<T> : FunctionScoreFunctionDescriptorBase<WeightFunctionDescriptor<T>, IWeightFunction, T>, IWeightFunction
+		where T : class { }
 }
diff --git a/src/Nest/QueryDsl/FullText/CommonTerms/CommonTermsQuery.cs b/src/Nest/QueryDsl/FullText/CommonTerms/CommonTermsQuery.cs
index 0def1315748..0e7091dd5d5 100644
--- a/src/Nest/QueryDsl/FullText/CommonTerms/CommonTermsQuery.cs
+++ b/src/Nest/QueryDsl/FullText/CommonTerms/CommonTermsQuery.cs
@@ -4,74 +4,75 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (FieldNameQueryJsonConverter<CommonTermsQuery>))]
+	[JsonConverter(typeof(FieldNameQueryJsonConverter<CommonTermsQuery>))]
 	public interface ICommonTermsQuery : IFieldNameQuery
 	{
-		[JsonProperty("query")]
-		string Query { get; set; }
+		[JsonProperty("analyzer")]
+		string Analyzer { get; set; }
 
 		[JsonProperty("cutoff_frequency")]
 		double? CutoffFrequency { get; set; }
 
-		[JsonProperty("low_freq_operator")]
-		[JsonConverter(typeof (StringEnumConverter))]
-		Operator? LowFrequencyOperator { get; set; }
-
 		[JsonProperty("high_freq_operator")]
-		[JsonConverter(typeof (StringEnumConverter))]
+		[JsonConverter(typeof(StringEnumConverter))]
 		Operator? HighFrequencyOperator { get; set; }
 
+		[JsonProperty("low_freq_operator")]
+		[JsonConverter(typeof(StringEnumConverter))]
+		Operator? LowFrequencyOperator { get; set; }
+
 		[JsonProperty("minimum_should_match")]
 		MinimumShouldMatch MinimumShouldMatch { get; set; }
 
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
+		[JsonProperty("query")]
+		string Query { get; set; }
 	}
 
 	public class CommonTermsQuery : FieldNameQueryBase, ICommonTermsQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public string Query { get; set; }
+		public string Analyzer { get; set; }
 		public double? CutoffFrequency { get; set; }
-		public Operator? LowFrequencyOperator { get; set; }
 		public Operator? HighFrequencyOperator { get; set; }
+		public Operator? LowFrequencyOperator { get; set; }
 		public MinimumShouldMatch MinimumShouldMatch { get; set; }
-		public string Analyzer { get; set; }
+		public string Query { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.CommonTerms = this;
+
 		internal static bool IsConditionless(ICommonTermsQuery q) => q.Field.IsConditionless() || q.Query.IsNullOrEmpty();
 	}
 
 	public class CommonTermsQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<CommonTermsQueryDescriptor<T>, ICommonTermsQuery, T>
-		, ICommonTermsQuery
+			, ICommonTermsQuery
 		where T : class
 	{
-		string IQuery.Name { get; set; }
 		protected override bool Conditionless => CommonTermsQuery.IsConditionless(this);
-		string ICommonTermsQuery.Query { get; set; }
-		Field IFieldNameQuery.Field { get; set; }
+		string ICommonTermsQuery.Analyzer { get; set; }
 		double? ICommonTermsQuery.CutoffFrequency { get; set; }
-		Operator? ICommonTermsQuery.LowFrequencyOperator { get; set; }
+		Field IFieldNameQuery.Field { get; set; }
 		Operator? ICommonTermsQuery.HighFrequencyOperator { get; set; }
+		Operator? ICommonTermsQuery.LowFrequencyOperator { get; set; }
 		MinimumShouldMatch ICommonTermsQuery.MinimumShouldMatch { get; set; }
-		string ICommonTermsQuery.Analyzer { get; set; }
+		string IQuery.Name { get; set; }
+		string ICommonTermsQuery.Query { get; set; }
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonTermsQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonTermsQueryDescriptor<T> HighFrequencyOperator(Operator? op) => Assign(a => a.HighFrequencyOperator = op);
 
 		public CommonTermsQueryDescriptor<T> LowFrequencyOperator(Operator? op) => Assign(a => a.LowFrequencyOperator = op);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonTermsQueryDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonTermsQueryDescriptor<T> CutoffFrequency(double? cutOffFrequency) => Assign(a => a.CutoffFrequency = cutOffFrequency);
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		public CommonTermsQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatch) =>
 			Assign(a => a.MinimumShouldMatch = minimumShouldMatch);
 	}
diff --git a/src/Nest/QueryDsl/FullText/Match/MatchQuery.cs b/src/Nest/QueryDsl/FullText/Match/MatchQuery.cs
index b86df2e3e18..f47059a99f7 100644
--- a/src/Nest/QueryDsl/FullText/Match/MatchQuery.cs
+++ b/src/Nest/QueryDsl/FullText/Match/MatchQuery.cs
@@ -9,24 +9,24 @@ namespace Nest
 	[JsonConverter(typeof(FieldNameQueryJsonConverter<MatchQuery>))]
 	public interface IMatchQuery : IFieldNameQuery
 	{
-		/// <summary>
-		/// The query to execute
-		/// </summary>
-		[JsonProperty("query")]
-		string Query { get; set; }
-
 		/// <summary>
 		/// The analyzer name used to analyze the query
 		/// </summary>
 		[JsonProperty("analyzer")]
 		string Analyzer { get; set; }
 
+		/// <summary></summary>
+		[JsonProperty("auto_generate_synonyms_phrase_query")]
+		bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+
 		/// <summary>
-		/// Controls how the query is rewritten if <see cref="Fuzziness"/> is set.
-		/// In this scenario, the default is <see cref="MultiTermQueryRewrite.TopTermsBlendedFreqs"/>.
+		/// A cutoff frequency that allows specifying an absolute or relative document frequency where
+		/// high frequency terms are moved into an optional subquery and are only scored if one of the low frequency
+		/// (below the cutoff) terms in the case of <see cref="Operator.Or" />,
+		/// or all of the low frequency terms in the case of an <see cref="Operator.And" /> match.
 		/// </summary>
-		[JsonProperty("fuzzy_rewrite")]
-		MultiTermQueryRewrite FuzzyRewrite { get; set; }
+		[JsonProperty("cutoff_frequency")]
+		double? CutoffFrequency { get; set; }
 
 		/// <summary>
 		/// Allows fuzzy matching based on the type of field being queried.
@@ -34,6 +34,13 @@ public interface IMatchQuery : IFieldNameQuery
 		[JsonProperty("fuzziness")]
 		IFuzziness Fuzziness { get; set; }
 
+		/// <summary>
+		/// Controls how the query is rewritten if <see cref="Fuzziness" /> is set.
+		/// In this scenario, the default is <see cref="MultiTermQueryRewrite.TopTermsBlendedFreqs" />.
+		/// </summary>
+		[JsonProperty("fuzzy_rewrite")]
+		MultiTermQueryRewrite FuzzyRewrite { get; set; }
+
 		/// <summary>
 		/// Sets whether transpositions are supported in fuzzy queries.
 		/// <para />
@@ -46,32 +53,17 @@ public interface IMatchQuery : IFieldNameQuery
 		bool? FuzzyTranspositions { get; set; }
 
 		/// <summary>
-		/// A cutoff frequency that allows specifying an absolute or relative document frequency where
-		/// high frequency terms are moved into an optional subquery and are only scored if one of the low frequency
-		/// (below the cutoff) terms in the case of <see cref="Operator.Or"/>,
-		/// or all of the low frequency terms in the case of an <see cref="Operator.And"/> match.
-		/// </summary>
-		[JsonProperty("cutoff_frequency")]
-		double? CutoffFrequency { get; set; }
-
-		/// <summary>
-		/// Set the prefix length for fuzzy queries. Default is <c>0</c>.
+		/// If set to <c>true</c> will cause format based failures (like providing text to a numeric field)
+		/// to be ignored
 		/// </summary>
-		[JsonProperty("prefix_length")]
-		int? PrefixLength { get; set; }
+		[JsonProperty("lenient")]
+		bool? Lenient { get; set; }
 
 		/// <summary>
 		/// Controls the number of terms fuzzy queries will expand to. Defaults to <c>50</c>
 		/// </summary>
 		[JsonProperty("max_expansions")]
- 		int? MaxExpansions { get; set; }
-
-		/// <summary>
-		/// If set to <c>true</c> will cause format based failures (like providing text to a numeric field)
-		/// to be ignored
-		/// </summary>
-		[JsonProperty("lenient")]
-		bool? Lenient { get; set; }
+		int? MaxExpansions { get; set; }
 
 		/// <summary>
 		/// A value controlling how many "should" clauses in the resulting boolean query should match.
@@ -82,55 +74,76 @@ public interface IMatchQuery : IFieldNameQuery
 
 		/// <summary>
 		/// The operator used if no explicit operator is specified.
-		/// The default operator is <see cref="Operator.Or"/>
+		/// The default operator is <see cref="Operator.Or" />
 		/// </summary>
 		[JsonProperty("operator")]
 		Operator? Operator { get; set; }
 
+		/// <summary>
+		/// Set the prefix length for fuzzy queries. Default is <c>0</c>.
+		/// </summary>
+		[JsonProperty("prefix_length")]
+		int? PrefixLength { get; set; }
+
+		/// <summary>
+		/// The query to execute
+		/// </summary>
+		[JsonProperty("query")]
+		string Query { get; set; }
+
 		/// <summary>
 		/// If the analyzer used removes all tokens in a query like a stop filter does, the default behavior is
-		/// to match no documents at all. In order to change that, <see cref="ZeroTermsQuery"/> can be used,
-		/// which accepts <see cref="ZeroTermsQuery.None"/> (default) and <see cref="ZeroTermsQuery.All"/>
+		/// to match no documents at all. In order to change that, <see cref="ZeroTermsQuery" /> can be used,
+		/// which accepts <see cref="ZeroTermsQuery.None" /> (default) and <see cref="ZeroTermsQuery.All" />
 		/// which corresponds to a match_all query.
 		/// </summary>
 		[JsonProperty("zero_terms_query")]
 		ZeroTermsQuery? ZeroTermsQuery { get; set; }
-
-    /// <summary></summary>
-		[JsonProperty("auto_generate_synonyms_phrase_query")]
-		bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 	}
 
 	/// <inheritdoc cref="IMatchQuery" />
 	public class MatchQuery : FieldNameQueryBase, IMatchQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		/// <inheritdoc />
-		public string Query { get; set; }
 		/// <inheritdoc />
 		public string Analyzer { get; set; }
+
 		/// <inheritdoc />
-		public MultiTermQueryRewrite FuzzyRewrite { get; set; }
+		public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+
+		/// <inheritdoc />
+		public double? CutoffFrequency { get; set; }
+
 		/// <inheritdoc />
 		public IFuzziness Fuzziness { get; set; }
+
 		/// <inheritdoc />
-		public bool? FuzzyTranspositions { get; set; }
+		public MultiTermQueryRewrite FuzzyRewrite { get; set; }
+
 		/// <inheritdoc />
-		public double? CutoffFrequency { get; set; }
+		public bool? FuzzyTranspositions { get; set; }
+
 		/// <inheritdoc />
 		public bool? Lenient { get; set; }
+
+		/// <inheritdoc />
+		public int? MaxExpansions { get; set; }
+
 		/// <inheritdoc />
 		public MinimumShouldMatch MinimumShouldMatch { get; set; }
+
 		/// <inheritdoc />
 		public Operator? Operator { get; set; }
+
 		/// <inheritdoc />
-		public ZeroTermsQuery? ZeroTermsQuery { get; set; }
-		/// <inheritdoc />
-		public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
-    /// <inheritdoc />
 		public int? PrefixLength { get; set; }
+
 		/// <inheritdoc />
-		public int? MaxExpansions { get; set; }
+		public string Query { get; set; }
+
+		/// <inheritdoc />
+		public ZeroTermsQuery? ZeroTermsQuery { get; set; }
+
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Match = this;
 
@@ -141,23 +154,23 @@ public class MatchQuery : FieldNameQueryBase, IMatchQuery
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class MatchQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<MatchQueryDescriptor<T>, IMatchQuery, T>
-		, IMatchQuery where T : class
+			, IMatchQuery where T : class
 	{
-		protected virtual string MatchQueryType => null;
 		protected override bool Conditionless => MatchQuery.IsConditionless(this);
-		string IMatchQuery.Query { get; set; }
+		protected virtual string MatchQueryType => null;
 		string IMatchQuery.Analyzer { get; set; }
-		MinimumShouldMatch IMatchQuery.MinimumShouldMatch { get; set; }
-		MultiTermQueryRewrite IMatchQuery.FuzzyRewrite { get; set; }
+		bool? IMatchQuery.AutoGenerateSynonymsPhraseQuery { get; set; }
+		double? IMatchQuery.CutoffFrequency { get; set; }
 		IFuzziness IMatchQuery.Fuzziness { get; set; }
+		MultiTermQueryRewrite IMatchQuery.FuzzyRewrite { get; set; }
 		bool? IMatchQuery.FuzzyTranspositions { get; set; }
-		double? IMatchQuery.CutoffFrequency { get; set; }
 		bool? IMatchQuery.Lenient { get; set; }
+		int? IMatchQuery.MaxExpansions { get; set; }
+		MinimumShouldMatch IMatchQuery.MinimumShouldMatch { get; set; }
 		Operator? IMatchQuery.Operator { get; set; }
-		ZeroTermsQuery? IMatchQuery.ZeroTermsQuery { get; set; }
 		int? IMatchQuery.PrefixLength { get; set; }
-		int? IMatchQuery.MaxExpansions { get; set; }
-		bool? IMatchQuery.AutoGenerateSynonymsPhraseQuery { get; set; }
+		string IMatchQuery.Query { get; set; }
+		ZeroTermsQuery? IMatchQuery.ZeroTermsQuery { get; set; }
 
 		/// <inheritdoc cref="IMatchQuery.Query" />
 		public MatchQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);
@@ -172,7 +185,8 @@ public class MatchQueryDescriptor<T>
 		public MatchQueryDescriptor<T> Fuzziness(Fuzziness fuzziness) => Assign(a => a.Fuzziness = fuzziness);
 
 		/// <inheritdoc cref="IMatchQuery.FuzzyTranspositions" />
-		public MatchQueryDescriptor<T> FuzzyTranspositions(bool? fuzzyTranspositions = true) => Assign(a => a.FuzzyTranspositions = fuzzyTranspositions);
+		public MatchQueryDescriptor<T> FuzzyTranspositions(bool? fuzzyTranspositions = true) =>
+			Assign(a => a.FuzzyTranspositions = fuzzyTranspositions);
 
 		/// <inheritdoc cref="IMatchQuery.CutoffFrequency" />
 		public MatchQueryDescriptor<T> CutoffFrequency(double? cutoffFrequency) => Assign(a => a.CutoffFrequency = cutoffFrequency);
@@ -181,7 +195,8 @@ public class MatchQueryDescriptor<T>
 		public MatchQueryDescriptor<T> FuzzyRewrite(MultiTermQueryRewrite rewrite) => Assign(a => Self.FuzzyRewrite = rewrite);
 
 		/// <inheritdoc cref="IMatchQuery.MinimumShouldMatch" />
-		public MatchQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatch) => Assign(a => a.MinimumShouldMatch = minimumShouldMatch);
+		public MatchQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatch) =>
+			Assign(a => a.MinimumShouldMatch = minimumShouldMatch);
 
 		/// <inheritdoc cref="IMatchQuery.Operator" />
 		public MatchQueryDescriptor<T> Operator(Operator? op) => Assign(a => a.Operator = op);
@@ -195,7 +210,7 @@ public class MatchQueryDescriptor<T>
 		/// <inheritdoc cref="IMatchQuery.MaxExpansions" />
 		public MatchQueryDescriptor<T> MaxExpansions(int? maxExpansions) => Assign(a => a.MaxExpansions = maxExpansions);
 
-    /// <inheritdoc cref="IMatchQuery.AutoGenerateSynonymsPhraseQuery" />
+		/// <inheritdoc cref="IMatchQuery.AutoGenerateSynonymsPhraseQuery" />
 		public MatchQueryDescriptor<T> AutoGenerateSynonymsPhraseQuery(bool? autoGenerateSynonymsPhraseQuery = true) =>
 			Assign(a => a.AutoGenerateSynonymsPhraseQuery = autoGenerateSynonymsPhraseQuery);
 	}
diff --git a/src/Nest/QueryDsl/FullText/MatchPhrase/MatchPhraseQuery.cs b/src/Nest/QueryDsl/FullText/MatchPhrase/MatchPhraseQuery.cs
index 6084b9e2886..5dd43507116 100644
--- a/src/Nest/QueryDsl/FullText/MatchPhrase/MatchPhraseQuery.cs
+++ b/src/Nest/QueryDsl/FullText/MatchPhrase/MatchPhraseQuery.cs
@@ -1,5 +1,4 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -7,23 +6,22 @@ namespace Nest
 	[JsonConverter(typeof(FieldNameQueryJsonConverter<MatchPhraseQuery>))]
 	public interface IMatchPhraseQuery : IFieldNameQuery
 	{
-		[JsonProperty("query")]
-		string Query { get; set; }
-
 		[JsonProperty("analyzer")]
 		string Analyzer { get; set; }
 
+		[JsonProperty("query")]
+		string Query { get; set; }
+
 		[JsonProperty("slop")]
 		int? Slop { get; set; }
 	}
 
 	public class MatchPhraseQuery : FieldNameQueryBase, IMatchPhraseQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-
 		public string Analyzer { get; set; }
 		public string Query { get; set; }
 		public int? Slop { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.MatchPhrase = this;
 
diff --git a/src/Nest/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixQuery.cs b/src/Nest/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixQuery.cs
index 5e974d1b61e..e740970923a 100644
--- a/src/Nest/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixQuery.cs
+++ b/src/Nest/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixQuery.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System;
 
 namespace Nest
 {
@@ -7,22 +6,22 @@ namespace Nest
 	[JsonConverter(typeof(FieldNameQueryJsonConverter<MatchPhrasePrefixQuery>))]
 	public interface IMatchPhrasePrefixQuery : IFieldNameQuery
 	{
-		[JsonProperty("query")]
-		string Query { get; set; }
-
 		[JsonProperty("analyzer")]
 		string Analyzer { get; set; }
 
 		[JsonProperty("max_expansions")]
 		int? MaxExpansions { get; set; }
 
+		[JsonProperty("query")]
+		string Query { get; set; }
+
 		[JsonProperty("slop")]
 		int? Slop { get; set; }
 
 		/// <summary>
 		/// If the analyzer used removes all tokens in a query like a stop filter does, the default behavior is
-		/// to match no documents at all. In order to change that, <see cref="ZeroTermsQuery"/> can be used,
-		/// which accepts <see cref="ZeroTermsQuery.None"/> (default) and <see cref="ZeroTermsQuery.All"/>
+		/// to match no documents at all. In order to change that, <see cref="ZeroTermsQuery" /> can be used,
+		/// which accepts <see cref="ZeroTermsQuery.None" /> (default) and <see cref="ZeroTermsQuery.All" />
 		/// which corresponds to a match_all query.
 		/// </summary>
 		[JsonProperty("zero_terms_query")]
@@ -31,15 +30,16 @@ public interface IMatchPhrasePrefixQuery : IFieldNameQuery
 
 	public class MatchPhrasePrefixQuery : FieldNameQueryBase, IMatchPhrasePrefixQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-
 		public string Analyzer { get; set; }
 		public int? MaxExpansions { get; set; }
 		public string Query { get; set; }
 		public int? Slop { get; set; }
+
 		/// <inheritdoc />
 		public ZeroTermsQuery? ZeroTermsQuery { get; set; }
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.MatchPhrasePrefix = this;
 
 		internal static bool IsConditionless(IMatchPhrasePrefixQuery q) => q.Field.IsConditionless() || q.Query.IsNullOrEmpty();
@@ -50,10 +50,10 @@ public class MatchPhrasePrefixQueryDescriptor<T>
 		where T : class
 	{
 		protected override bool Conditionless => MatchPhrasePrefixQuery.IsConditionless(this);
-
-		string IMatchPhrasePrefixQuery.Query { get; set; }
 		string IMatchPhrasePrefixQuery.Analyzer { get; set; }
 		int? IMatchPhrasePrefixQuery.MaxExpansions { get; set; }
+
+		string IMatchPhrasePrefixQuery.Query { get; set; }
 		int? IMatchPhrasePrefixQuery.Slop { get; set; }
 		ZeroTermsQuery? IMatchPhrasePrefixQuery.ZeroTermsQuery { get; set; }
 
@@ -67,6 +67,5 @@ public class MatchPhrasePrefixQueryDescriptor<T>
 
 		/// <inheritdoc cref="IMatchQuery.ZeroTermsQuery" />
 		public MatchPhrasePrefixQueryDescriptor<T> ZeroTermsQuery(ZeroTermsQuery? zeroTermsQuery) => Assign(a => a.ZeroTermsQuery = zeroTermsQuery);
-
 	}
 }
diff --git a/src/Nest/QueryDsl/FullText/MultiMatch/MultiMatchQuery.cs b/src/Nest/QueryDsl/FullText/MultiMatch/MultiMatchQuery.cs
index 2ad6d03753e..e7915ca4bea 100644
--- a/src/Nest/QueryDsl/FullText/MultiMatch/MultiMatchQuery.cs
+++ b/src/Nest/QueryDsl/FullText/MultiMatch/MultiMatchQuery.cs
@@ -1,6 +1,5 @@
 using System;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
@@ -12,41 +11,47 @@ namespace Nest
 	public interface IMultiMatchQuery : IQuery
 	{
 		/// <summary>
-		/// How the fields should be combined to build the text query.
-		/// Default is <see cref="TextQueryType.BestFields"/>
+		/// The analyzer name used to analyze the query
 		/// </summary>
-		[JsonProperty("type")]
-		TextQueryType? Type { get; set; }
+		[JsonProperty("analyzer")]
+		string Analyzer { get; set; }
 
-		/// <summary>
-		/// The query to execute
-		/// </summary>
-		[JsonProperty("query")]
-		string Query { get; set; }
+		/// <summary></summary>
+		[JsonProperty("auto_generate_synonyms_phrase_query")]
+		bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 		/// <summary>
-		/// The analyzer name used to analyze the query
+		/// A cutoff frequency that allows specifying an absolute or relative document frequency where
+		/// high frequency terms are moved into an optional subquery and are only scored if one of the low frequency
+		/// (below the cutoff) terms in the case of <see cref="Operator.Or" />,
+		/// or all of the low frequency terms in the case of an <see cref="Operator.And" /> match.
 		/// </summary>
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
+		[JsonProperty("cutoff_frequency")]
+		double? CutoffFrequency { get; set; }
 
 		/// <summary>
-		/// Controls how the query is rewritten if <see cref="Fuzziness"/> is set.
-		/// In this scenario, the default is <see cref="MultiTermQueryRewrite.TopTermsBlendedFreqs"/>.
+		/// The fields to perform the query against.
 		/// </summary>
-		[JsonProperty("fuzzy_rewrite")]
-		MultiTermQueryRewrite FuzzyRewrite { get; set; }
+		[JsonProperty("fields")]
+		Fields Fields { get; set; }
 
 		/// <summary>
 		/// Allows fuzzy matching based on the type of field being queried.
 		/// Cannot be used with the
-		/// <see cref="TextQueryType.CrossFields"/>,
-		/// <see cref="TextQueryType.Phrase"/> or
-		/// <see cref="TextQueryType.PhrasePrefix"/> types.
+		/// <see cref="TextQueryType.CrossFields" />,
+		/// <see cref="TextQueryType.Phrase" /> or
+		/// <see cref="TextQueryType.PhrasePrefix" /> types.
 		/// </summary>
 		[JsonProperty("fuzziness")]
 		Fuzziness Fuzziness { get; set; }
 
+		/// <summary>
+		/// Controls how the query is rewritten if <see cref="Fuzziness" /> is set.
+		/// In this scenario, the default is <see cref="MultiTermQueryRewrite.TopTermsBlendedFreqs" />.
+		/// </summary>
+		[JsonProperty("fuzzy_rewrite")]
+		MultiTermQueryRewrite FuzzyRewrite { get; set; }
+
 		/// <summary>
 		/// Sets whether transpositions are supported in fuzzy queries.
 		/// <para />
@@ -59,19 +64,11 @@ public interface IMultiMatchQuery : IQuery
 		bool? FuzzyTranspositions { get; set; }
 
 		/// <summary>
-		/// A cutoff frequency that allows specifying an absolute or relative document frequency where
-		/// high frequency terms are moved into an optional subquery and are only scored if one of the low frequency
-		/// (below the cutoff) terms in the case of <see cref="Operator.Or"/>,
-		/// or all of the low frequency terms in the case of an <see cref="Operator.And"/> match.
-		/// </summary>
-		[JsonProperty("cutoff_frequency")]
-		double? CutoffFrequency { get; set; }
-
-		/// <summary>
-		/// Set the prefix length for fuzzy queries. Default is <c>0</c>.
+		/// If set to <c>true</c> will cause format based failures (like providing text to a numeric field)
+		/// to be ignored
 		/// </summary>
-		[JsonProperty("prefix_length")]
-		int? PrefixLength { get; set; }
+		[JsonProperty("lenient")]
+		bool? Lenient { get; set; }
 
 		/// <summary>
 		/// Controls the number of terms fuzzy queries will expand to. Defaults to <c>50</c>
@@ -80,203 +77,224 @@ public interface IMultiMatchQuery : IQuery
 		int? MaxExpansions { get; set; }
 
 		/// <summary>
-		/// How far apart terms are allowed to be while still considering the document to be a match.
+		/// A value controlling how many "should" clauses in the resulting boolean query should match.
+		/// It can be an absolute value, a percentage or a combination of both.
 		/// </summary>
-		[JsonProperty("slop")]
-		int? Slop { get; set; }
+		[JsonProperty("minimum_should_match")]
+		MinimumShouldMatch MinimumShouldMatch { get; set; }
 
 		/// <summary>
-		/// If set to <c>true</c> will cause format based failures (like providing text to a numeric field)
-		/// to be ignored
+		/// The operator used if no explicit operator is specified.
+		/// The default operator is <see cref="Operator.Or" />
 		/// </summary>
-		[JsonProperty("lenient")]
-		bool? Lenient { get; set; }
+		/// <remarks>
+		/// <see cref="TextQueryType.BestFields" /> and <see cref="TextQueryType.MostFields" /> types are field-centric ;
+		/// they generate a match query per field. This means that <see cref="Operator" /> and <see cref="MinimumShouldMatch" />
+		/// are applied to each field individually, which is probably not what you want.
+		/// Consider using <see cref="TextQueryType.CrossFields" />.
+		/// </remarks>
+		[JsonProperty("operator")]
+		Operator? Operator { get; set; }
 
 		/// <summary>
-		/// By default, a <see cref="IMultiMatchQuery"/> generates a match clause per field, then wraps them
-		/// in a <see cref="IDisMaxQuery"/>. By setting <see cref="UseDisMax"/> to <c>false</c>,
-		/// they will be wrapped in a <see cref="IBoolQuery"/> instead.
+		/// Set the prefix length for fuzzy queries. Default is <c>0</c>.
 		/// </summary>
-		[JsonProperty("use_dis_max")]
-		bool? UseDisMax { get; set; }
+		[JsonProperty("prefix_length")]
+		int? PrefixLength { get; set; }
 
 		/// <summary>
-		/// Used to influence how the score is calculated for <see cref="TextQueryType.BestFields"/>. If specified,
-		/// score is calculated using
+		/// The query to execute
 		/// </summary>
-		[JsonProperty("tie_breaker")]
-		double? TieBreaker { get; set; }
+		[JsonProperty("query")]
+		string Query { get; set; }
 
 		/// <summary>
-		/// A value controlling how many "should" clauses in the resulting boolean query should match.
-		/// It can be an absolute value, a percentage or a combination of both.
+		/// How far apart terms are allowed to be while still considering the document to be a match.
 		/// </summary>
-		[JsonProperty("minimum_should_match")]
-		MinimumShouldMatch MinimumShouldMatch { get; set; }
+		[JsonProperty("slop")]
+		int? Slop { get; set; }
 
 		/// <summary>
-		/// The operator used if no explicit operator is specified.
-		/// The default operator is <see cref="Operator.Or"/>
+		/// Used to influence how the score is calculated for <see cref="TextQueryType.BestFields" />. If specified,
+		/// score is calculated using
 		/// </summary>
-		/// <remarks>
-		/// <see cref="TextQueryType.BestFields"/> and <see cref="TextQueryType.MostFields"/> types are field-centric ;
-		/// they generate a match query per field. This means that <see cref="Operator"/> and <see cref="MinimumShouldMatch"/>
-		/// are applied to each field individually, which is probably not what you want.
-		/// Consider using <see cref="TextQueryType.CrossFields"/>.
-		/// </remarks>
-		[JsonProperty("operator")]
-		Operator? Operator { get; set; }
+		[JsonProperty("tie_breaker")]
+		double? TieBreaker { get; set; }
 
 		/// <summary>
-		/// The fields to perform the query against.
+		/// How the fields should be combined to build the text query.
+		/// Default is <see cref="TextQueryType.BestFields" />
 		/// </summary>
-		[JsonProperty("fields")]
-		Fields Fields { get; set; }
+		[JsonProperty("type")]
+		TextQueryType? Type { get; set; }
+
+		/// <summary>
+		/// By default, a <see cref="IMultiMatchQuery" /> generates a match clause per field, then wraps them
+		/// in a <see cref="IDisMaxQuery" />. By setting <see cref="UseDisMax" /> to <c>false</c>,
+		/// they will be wrapped in a <see cref="IBoolQuery" /> instead.
+		/// </summary>
+		[JsonProperty("use_dis_max")]
+		bool? UseDisMax { get; set; }
 
 		/// <summary>
 		/// If the analyzer used removes all tokens in a query like a stop filter does, the default behavior is
-		/// to match no documents at all. In order to change that, <see cref="ZeroTermsQuery"/> can be used,
-		/// which accepts <see cref="ZeroTermsQuery.None"/> (default) and <see cref="ZeroTermsQuery.All"/>
+		/// to match no documents at all. In order to change that, <see cref="ZeroTermsQuery" /> can be used,
+		/// which accepts <see cref="ZeroTermsQuery.None" /> (default) and <see cref="ZeroTermsQuery.All" />
 		/// which corresponds to a match_all query.
 		/// </summary>
 		[JsonProperty("zero_terms_query")]
 		ZeroTermsQuery? ZeroTermsQuery { get; set; }
-
-    	/// <summary></summary>
-		[JsonProperty("auto_generate_synonyms_phrase_query")]
-		bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 	}
 
 	/// <inheritdoc cref="IMultiMatchQuery" />
 	public class MultiMatchQuery : QueryBase, IMultiMatchQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		/// <inheritdoc />
-		public TextQueryType? Type { get; set; }
+		public string Analyzer { get; set; }
+
 		/// <inheritdoc />
-		public string Query { get; set; }
+		public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+
 		/// <inheritdoc />
-		public string Analyzer { get; set; }
+		public double? CutoffFrequency { get; set; }
+
 		/// <inheritdoc />
-		public MultiTermQueryRewrite FuzzyRewrite { get; set; }
+		public Fields Fields { get; set; }
+
 		/// <inheritdoc />
 		public Fuzziness Fuzziness { get; set; }
+
 		/// <inheritdoc />
-		public double? CutoffFrequency { get; set; }
+		public MultiTermQueryRewrite FuzzyRewrite { get; set; }
+
 		/// <inheritdoc />
-		public int? PrefixLength { get; set; }
+		public bool? FuzzyTranspositions { get; set; }
+
+		/// <inheritdoc />
+		public bool? Lenient { get; set; }
+
 		/// <inheritdoc />
 		public int? MaxExpansions { get; set; }
+
 		/// <inheritdoc />
-		public int? Slop { get; set; }
+		public MinimumShouldMatch MinimumShouldMatch { get; set; }
+
 		/// <inheritdoc />
-		public bool? Lenient { get; set; }
+		public Operator? Operator { get; set; }
+
 		/// <inheritdoc />
-		public bool? UseDisMax { get; set; }
+		public int? PrefixLength { get; set; }
+
 		/// <inheritdoc />
-		public double? TieBreaker { get; set; }
+		public string Query { get; set; }
+
 		/// <inheritdoc />
-		public MinimumShouldMatch MinimumShouldMatch { get; set; }
+		public int? Slop { get; set; }
+
 		/// <inheritdoc />
-		public Operator? Operator { get; set; }
+		public double? TieBreaker { get; set; }
+
 		/// <inheritdoc />
-		public Fields Fields { get; set; }
+		public TextQueryType? Type { get; set; }
+
 		/// <inheritdoc />
-		public ZeroTermsQuery? ZeroTermsQuery { get; set; }
+		public bool? UseDisMax { get; set; }
+
 		/// <inheritdoc />
-		public bool? FuzzyTranspositions { get; set; }
-    	/// <inheritdoc />
-		public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+		public ZeroTermsQuery? ZeroTermsQuery { get; set; }
+
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.MultiMatch = this;
+
 		internal static bool IsConditionless(IMultiMatchQuery q) => q.Query.IsNullOrEmpty();
 	}
 
-	/// <inheritdoc cref="IMultiMatchQuery"/>
+	/// <inheritdoc cref="IMultiMatchQuery" />
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class MultiMatchQueryDescriptor<T>
 		: QueryDescriptorBase<MultiMatchQueryDescriptor<T>, IMultiMatchQuery>
-		, IMultiMatchQuery where T : class
+			, IMultiMatchQuery where T : class
 	{
 		protected override bool Conditionless => MultiMatchQuery.IsConditionless(this);
-		TextQueryType? IMultiMatchQuery.Type { get; set; }
-		string IMultiMatchQuery.Query { get; set; }
 		string IMultiMatchQuery.Analyzer { get; set; }
-		MultiTermQueryRewrite IMultiMatchQuery.FuzzyRewrite { get; set; }
-		Fuzziness IMultiMatchQuery.Fuzziness { get; set; }
+		bool? IMultiMatchQuery.AutoGenerateSynonymsPhraseQuery { get; set; }
 		double? IMultiMatchQuery.CutoffFrequency { get; set; }
-		int? IMultiMatchQuery.PrefixLength { get; set; }
-		int? IMultiMatchQuery.MaxExpansions { get; set; }
-		int? IMultiMatchQuery.Slop { get; set; }
+		Fields IMultiMatchQuery.Fields { get; set; }
+		Fuzziness IMultiMatchQuery.Fuzziness { get; set; }
+		MultiTermQueryRewrite IMultiMatchQuery.FuzzyRewrite { get; set; }
+		bool? IMultiMatchQuery.FuzzyTranspositions { get; set; }
 		bool? IMultiMatchQuery.Lenient { get; set; }
-		bool? IMultiMatchQuery.UseDisMax { get; set; }
-		double? IMultiMatchQuery.TieBreaker { get; set; }
+		int? IMultiMatchQuery.MaxExpansions { get; set; }
 		MinimumShouldMatch IMultiMatchQuery.MinimumShouldMatch { get; set; }
 		Operator? IMultiMatchQuery.Operator { get; set; }
-		Fields IMultiMatchQuery.Fields { get; set; }
+		int? IMultiMatchQuery.PrefixLength { get; set; }
+		string IMultiMatchQuery.Query { get; set; }
+		int? IMultiMatchQuery.Slop { get; set; }
+		double? IMultiMatchQuery.TieBreaker { get; set; }
+		TextQueryType? IMultiMatchQuery.Type { get; set; }
+		bool? IMultiMatchQuery.UseDisMax { get; set; }
 		ZeroTermsQuery? IMultiMatchQuery.ZeroTermsQuery { get; set; }
-		bool? IMultiMatchQuery.FuzzyTranspositions { get; set; }
-		bool? IMultiMatchQuery.AutoGenerateSynonymsPhraseQuery { get; set; }
 
-		/// <inheritdoc cref="IMultiMatchQuery.Fields"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Fields" />
 		public MultiMatchQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="IMultiMatchQuery.Fields"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Fields" />
 		public MultiMatchQueryDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
 
-		/// <inheritdoc cref="IMultiMatchQuery.Query"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Query" />
 		public MultiMatchQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);
 
-		/// <inheritdoc cref="IMultiMatchQuery.Analyzer"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Analyzer" />
 		public MultiMatchQueryDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
 
-		/// <inheritdoc cref="IMultiMatchQuery.Fuzziness"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Fuzziness" />
 		public MultiMatchQueryDescriptor<T> Fuzziness(Fuzziness fuzziness) => Assign(a => a.Fuzziness = fuzziness);
 
-		/// <inheritdoc cref="IMultiMatchQuery.CutoffFrequency"/>
+		/// <inheritdoc cref="IMultiMatchQuery.CutoffFrequency" />
 		public MultiMatchQueryDescriptor<T> CutoffFrequency(double? cutoffFrequency)
 			=> Assign(a => a.CutoffFrequency = cutoffFrequency);
 
-		/// <inheritdoc cref="IMultiMatchQuery.MinimumShouldMatch"/>
+		/// <inheritdoc cref="IMultiMatchQuery.MinimumShouldMatch" />
 		public MultiMatchQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatch)
 			=> Assign(a => a.MinimumShouldMatch = minimumShouldMatch);
 
-		/// <inheritdoc cref="IMultiMatchQuery.FuzzyRewrite"/>
+		/// <inheritdoc cref="IMultiMatchQuery.FuzzyRewrite" />
 		public MultiMatchQueryDescriptor<T> FuzzyRewrite(MultiTermQueryRewrite rewrite) => Assign(a => Self.FuzzyRewrite = rewrite);
 
-		/// <inheritdoc cref="IMultiMatchQuery.FuzzyTranspositions"/>
+		/// <inheritdoc cref="IMultiMatchQuery.FuzzyTranspositions" />
 		public MultiMatchQueryDescriptor<T> FuzzyTranspositions(bool? fuzzyTranpositions = true) =>
 			Assign(a => a.FuzzyTranspositions = fuzzyTranpositions);
 
-		/// <inheritdoc cref="IMultiMatchQuery.Lenient"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Lenient" />
 		public MultiMatchQueryDescriptor<T> Lenient(bool? lenient = true) => Assign(a => a.Lenient = lenient);
 
-		/// <inheritdoc cref="IMultiMatchQuery.PrefixLength"/>
+		/// <inheritdoc cref="IMultiMatchQuery.PrefixLength" />
 		public MultiMatchQueryDescriptor<T> PrefixLength(int? prefixLength) => Assign(a => a.PrefixLength = prefixLength);
 
-		/// <inheritdoc cref="IMultiMatchQuery.MaxExpansions"/>
+		/// <inheritdoc cref="IMultiMatchQuery.MaxExpansions" />
 		public MultiMatchQueryDescriptor<T> MaxExpansions(int? maxExpansions) => Assign(a => a.MaxExpansions = maxExpansions);
 
-		/// <inheritdoc cref="IMultiMatchQuery.Slop"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Slop" />
 		public MultiMatchQueryDescriptor<T> Slop(int? slop) => Assign(a => a.Slop = slop);
 
-		/// <inheritdoc cref="IMultiMatchQuery.Operator"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Operator" />
 		public MultiMatchQueryDescriptor<T> Operator(Operator? op) => Assign(a => a.Operator = op);
 
-		/// <inheritdoc cref="IMultiMatchQuery.TieBreaker"/>
+		/// <inheritdoc cref="IMultiMatchQuery.TieBreaker" />
 		public MultiMatchQueryDescriptor<T> TieBreaker(double? tieBreaker) => Assign(a => a.TieBreaker = tieBreaker);
 
-		/// <inheritdoc cref="IMultiMatchQuery.Type"/>
+		/// <inheritdoc cref="IMultiMatchQuery.Type" />
 		public MultiMatchQueryDescriptor<T> Type(TextQueryType? type) => Assign(a => a.Type = type);
 
-		/// <inheritdoc cref="IMultiMatchQuery.UseDisMax"/>
+		/// <inheritdoc cref="IMultiMatchQuery.UseDisMax" />
 		public MultiMatchQueryDescriptor<T> UseDisMax(bool? useDisMax = true) => Assign(a => a.UseDisMax = useDisMax);
 
-		/// <inheritdoc cref="IMultiMatchQuery.ZeroTermsQuery"/>
+		/// <inheritdoc cref="IMultiMatchQuery.ZeroTermsQuery" />
 		public MultiMatchQueryDescriptor<T> ZeroTermsQuery(ZeroTermsQuery? zeroTermsQuery) => Assign(a => a.ZeroTermsQuery = zeroTermsQuery);
 
-    	/// <inheritdoc cref="IMultiMatchQuery.AutoGenerateSynonymsPhraseQuery"/>
+		/// <inheritdoc cref="IMultiMatchQuery.AutoGenerateSynonymsPhraseQuery" />
 		public MultiMatchQueryDescriptor<T> AutoGenerateSynonymsPhraseQuery(bool? autoGenerateSynonymsPhraseQuery = true) =>
 			Assign(a => a.AutoGenerateSynonymsPhraseQuery = autoGenerateSynonymsPhraseQuery);
 	}
diff --git a/src/Nest/QueryDsl/FullText/MultiMatch/TextQueryType.cs b/src/Nest/QueryDsl/FullText/MultiMatch/TextQueryType.cs
index 2fc5c9b18d9..a4973eab9c1 100644
--- a/src/Nest/QueryDsl/FullText/MultiMatch/TextQueryType.cs
+++ b/src/Nest/QueryDsl/FullText/MultiMatch/TextQueryType.cs
@@ -5,17 +5,21 @@
 namespace Nest
 {
 	[JsonConverter(typeof(StringEnumConverter))]
-    public enum TextQueryType
-    {
+	public enum TextQueryType
+	{
 		[EnumMember(Value = "best_fields")]
-        BestFields,
+		BestFields,
+
 		[EnumMember(Value = "most_fields")]
-        MostFields,
+		MostFields,
+
 		[EnumMember(Value = "cross_fields")]
-        CrossFields,
+		CrossFields,
+
 		[EnumMember(Value = "phrase")]
-        Phrase,
+		Phrase,
+
 		[EnumMember(Value = "phrase_prefix")]
-        PhrasePrefix
-    }
-}
\ No newline at end of file
+		PhrasePrefix
+	}
+}
diff --git a/src/Nest/QueryDsl/FullText/MultiMatch/ZeroTermsQuery.cs b/src/Nest/QueryDsl/FullText/MultiMatch/ZeroTermsQuery.cs
index 668337a3753..5dba53a6e58 100644
--- a/src/Nest/QueryDsl/FullText/MultiMatch/ZeroTermsQuery.cs
+++ b/src/Nest/QueryDsl/FullText/MultiMatch/ZeroTermsQuery.cs
@@ -9,7 +9,8 @@ public enum ZeroTermsQuery
 	{
 		[EnumMember(Value = "all")]
 		All,
+
 		[EnumMember(Value = "none")]
 		None
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs b/src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs
index 5521925ce59..b71f05dbfc2 100644
--- a/src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs
+++ b/src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs
@@ -12,17 +12,27 @@ namespace Nest
 	public interface IQueryStringQuery : IQuery
 	{
 		/// <summary>
-		/// How the fields should be combined to build the text query.
-		/// Default is <see cref="TextQueryType.BestFields"/>
+		/// When set, <c>*</c> or <c>?</c> are allowed as the first character. Defaults to <c>true</c>.
 		/// </summary>
-		[JsonProperty("type")]
-		TextQueryType? Type { get; set; }
+		[JsonProperty("allow_leading_wildcard")]
+		bool? AllowLeadingWildcard { get; set; }
 
 		/// <summary>
-		/// The query to be parsed
+		/// The analyzer name used to analyze the query
 		/// </summary>
-		[JsonProperty("query")]
-		string Query { get; set; }
+		[JsonProperty("analyzer")]
+		string Analyzer { get; set; }
+
+		/// <summary>
+		/// By default, wildcards terms in a query are not analyzed.
+		/// By setting this value to <c>true</c>, a best effort will be made to analyze those as well.
+		/// </summary>
+		[JsonProperty("analyze_wildcard")]
+		bool? AnalyzeWildcard { get; set; }
+
+		/// <summary></summary>
+		[JsonProperty("auto_generate_synonyms_phrase_query")]
+		bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 
 		/// <summary>
 		/// The default field for query terms if no prefix field is specified.
@@ -35,42 +45,42 @@ public interface IQueryStringQuery : IQuery
 
 		/// <summary>
 		/// The default operator used if no explicit operator is specified.
-		/// The default operator is <see cref="Operator.Or"/>
+		/// The default operator is <see cref="Operator.Or" />
 		/// </summary>
 		[JsonProperty("default_operator")]
 		Operator? DefaultOperator { get; set; }
 
 		/// <summary>
-		/// The analyzer name used to analyze the query
+		/// Set to <c>true<c> to enable position increments in result queries. Defaults to <c>true<c>.
 		/// </summary>
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
+		[JsonProperty("enable_position_increments")]
+		bool? EnablePositionIncrements { get; set; }
 
 		/// <summary>
-		/// The name of the analyzer that is used to analyze quoted phrases in the query string.
-		/// For those parts, it overrides other analyzers that are set using the analyzer parameter
-		/// or the search_quote_analyzer setting.
+		/// Enables escaping of the query
 		/// </summary>
-		[JsonProperty("quote_analyzer")]
-		string QuoteAnalyzer { get; set; }
+		[JsonProperty("escape")]
+		bool? Escape { get; set; }
 
 		/// <summary>
-		/// When set, <c>*</c> or <c>?</c> are allowed as the first character. Defaults to <c>true</c>.
+		/// The fields to perform the parsed query against.
+		/// Defaults to the <c>index.query.default_field</c> index settings, which in turn defaults to <c>*</c>.
+		/// <c>*</c> extracts all fields in the mapping that are eligible to term queries and filters the metadata fields.
 		/// </summary>
-		[JsonProperty("allow_leading_wildcard")]
-		bool? AllowLeadingWildcard { get; set; }
+		[JsonProperty("fields")]
+		Fields Fields { get; set; }
 
 		/// <summary>
-		/// Controls the number of terms fuzzy queries will expand to. Defaults to <c>50</c>
+		/// Set the fuzziness for fuzzy queries. Defaults to <see cref="Fuzziness.Auto" />
 		/// </summary>
-		[JsonProperty("fuzzy_max_expansions")]
-		int? FuzzyMaxExpansions { get; set; }
+		[JsonProperty("fuzziness")]
+		Fuzziness Fuzziness { get; set; }
 
 		/// <summary>
-		/// Set the fuzziness for fuzzy queries. Defaults to <see cref="Fuzziness.Auto"/>
+		/// Controls the number of terms fuzzy queries will expand to. Defaults to <c>50</c>
 		/// </summary>
-		[JsonProperty("fuzziness")]
-		Fuzziness Fuzziness { get; set; }
+		[JsonProperty("fuzzy_max_expansions")]
+		int? FuzzyMaxExpansions { get; set; }
 
 		/// <summary>
 		/// Set the prefix length for fuzzy queries. Default is <c>0</c>.
@@ -78,6 +88,13 @@ public interface IQueryStringQuery : IQuery
 		[JsonProperty("fuzzy_prefix_length")]
 		int? FuzzyPrefixLength { get; set; }
 
+		/// <summary>
+		/// Controls how the query is rewritten if <see cref="Fuzziness" /> is set.
+		/// In this scenario, the default is <see cref="MultiTermQueryRewrite.TopTermsBlendedFreqs" />.
+		/// </summary>
+		[JsonProperty("fuzzy_rewrite")]
+		MultiTermQueryRewrite FuzzyRewrite { get; set; }
+
 		/// <summary>
 		/// Sets whether transpositions are supported in fuzzy queries.
 		/// <para />
@@ -90,18 +107,11 @@ public interface IQueryStringQuery : IQuery
 		bool? FuzzyTranspositions { get; set; }
 
 		/// <summary>
-		/// Sets the default slop for phrases. If zero, then exact phrase matches are required.
-		/// Default value is <c>0</c>.
-		/// </summary>
-		[JsonProperty("phrase_slop")]
-		double? PhraseSlop { get; set; }
-
-		/// <summary>
-		/// By default, wildcards terms in a query are not analyzed.
-		/// By setting this value to <c>true</c>, a best effort will be made to analyze those as well.
+		/// If set to <c>true</c> will cause format based failures (like providing text to a numeric field)
+		/// to be ignored
 		/// </summary>
-		[JsonProperty("analyze_wildcard")]
-		bool? AnalyzeWildcard { get; set; }
+		[JsonProperty("lenient")]
+		bool? Lenient { get; set; }
 
 		/// <summary>
 		/// Limit on how many automaton states regexp queries are allowed to create.
@@ -119,38 +129,25 @@ public interface IQueryStringQuery : IQuery
 		MinimumShouldMatch MinimumShouldMatch { get; set; }
 
 		/// <summary>
-		/// If set to <c>true</c> will cause format based failures (like providing text to a numeric field)
-		/// to be ignored
-		/// </summary>
-		[JsonProperty("lenient")]
-		bool? Lenient { get; set; }
-
-		/// <summary>
-		/// The fields to perform the parsed query against.
-		/// Defaults to the <c>index.query.default_field</c> index settings, which in turn defaults to <c>*</c>.
-		/// <c>*</c> extracts all fields in the mapping that are eligible to term queries and filters the metadata fields.
-		/// </summary>
-		[JsonProperty("fields")]
-		Fields Fields { get; set; }
-
-		/// <summary>
-		/// The disjunction max tie breaker for multi fields. Defaults to <c>0</c>
+		/// Sets the default slop for phrases. If zero, then exact phrase matches are required.
+		/// Default value is <c>0</c>.
 		/// </summary>
-		[JsonProperty("tie_breaker")]
-		double? TieBreaker { get; set; }
+		[JsonProperty("phrase_slop")]
+		double? PhraseSlop { get; set; }
 
 		/// <summary>
-		/// Controls how a multi term query such as a wildcard or prefix query, is rewritten.
+		/// The query to be parsed
 		/// </summary>
-		[JsonProperty("rewrite")]
-		MultiTermQueryRewrite Rewrite { get; set; }
+		[JsonProperty("query")]
+		string Query { get; set; }
 
 		/// <summary>
-		/// Controls how the query is rewritten if <see cref="Fuzziness"/> is set.
-		/// In this scenario, the default is <see cref="MultiTermQueryRewrite.TopTermsBlendedFreqs"/>.
+		/// The name of the analyzer that is used to analyze quoted phrases in the query string.
+		/// For those parts, it overrides other analyzers that are set using the analyzer parameter
+		/// or the search_quote_analyzer setting.
 		/// </summary>
-		[JsonProperty("fuzzy_rewrite")]
-		MultiTermQueryRewrite FuzzyRewrite { get; set; }
+		[JsonProperty("quote_analyzer")]
+		string QuoteAnalyzer { get; set; }
 
 		/// <summary>
 		/// A suffix to append to fields for quoted parts of the query string.
@@ -160,10 +157,16 @@ public interface IQueryStringQuery : IQuery
 		string QuoteFieldSuffix { get; set; }
 
 		/// <summary>
-		/// Enables escaping of the query
+		/// Controls how a multi term query such as a wildcard or prefix query, is rewritten.
 		/// </summary>
-		[JsonProperty("escape")]
-		bool? Escape { get; set; }
+		[JsonProperty("rewrite")]
+		MultiTermQueryRewrite Rewrite { get; set; }
+
+		/// <summary>
+		/// The disjunction max tie breaker for multi fields. Defaults to <c>0</c>
+		/// </summary>
+		[JsonProperty("tie_breaker")]
+		double? TieBreaker { get; set; }
 
 		/// <summary>
 		/// Time Zone to be applied to any range query related to dates.
@@ -172,193 +175,218 @@ public interface IQueryStringQuery : IQuery
 		string Timezone { get; set; }
 
 		/// <summary>
-		/// Set to <c>true<c> to enable position increments in result queries. Defaults to <c>true<c>.
+		/// How the fields should be combined to build the text query.
+		/// Default is <see cref="TextQueryType.BestFields" />
 		/// </summary>
-		[JsonProperty("enable_position_increments")]
-		bool? EnablePositionIncrements { get; set; }
-
-    /// <summary></summary>
-		[JsonProperty("auto_generate_synonyms_phrase_query")]
-		bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+		[JsonProperty("type")]
+		TextQueryType? Type { get; set; }
 	}
 
-	/// <inheritdoc cref="IQueryStringQuery"/>
+	/// <inheritdoc cref="IQueryStringQuery" />
 	public class QueryStringQuery : QueryBase, IQueryStringQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		/// <inheritdoc />
-		public TextQueryType? Type { get; set; }
+		public bool? AllowLeadingWildcard { get; set; }
+
 		/// <inheritdoc />
-		public int? FuzzyMaxExpansions { get; set; }
+		public string Analyzer { get; set; }
+
 		/// <inheritdoc />
-		public Fuzziness Fuzziness { get; set; }
+		public bool? AnalyzeWildcard { get; set; }
+
 		/// <inheritdoc />
-		public MinimumShouldMatch MinimumShouldMatch { get; set; }
+		public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+
 		/// <inheritdoc />
-		public MultiTermQueryRewrite Rewrite { get; set; }
+		public Field DefaultField { get; set; }
+
 		/// <inheritdoc />
-		public MultiTermQueryRewrite FuzzyRewrite { get; set; }
+		public Operator? DefaultOperator { get; set; }
+
 		/// <inheritdoc />
-		public string QuoteFieldSuffix { get; set; }
+		public bool? EnablePositionIncrements { get; set; }
+
 		/// <inheritdoc />
 		public bool? Escape { get; set; }
+
 		/// <inheritdoc />
-		public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
-    /// <inheritdoc />
-		public string Query { get; set; }
+		public Fields Fields { get; set; }
+
 		/// <inheritdoc />
-		public string Timezone { get; set; }
+		public Fuzziness Fuzziness { get; set; }
+
 		/// <inheritdoc />
-		public Field DefaultField { get; set; }
+		public int? FuzzyMaxExpansions { get; set; }
+
 		/// <inheritdoc />
-		public Fields Fields { get; set; }
+		public int? FuzzyPrefixLength { get; set; }
+
 		/// <inheritdoc />
-		public Operator? DefaultOperator { get; set; }
+		public MultiTermQueryRewrite FuzzyRewrite { get; set; }
+
 		/// <inheritdoc />
-		public string Analyzer { get; set; }
+		public bool? FuzzyTranspositions { get; set; }
+
 		/// <inheritdoc />
-		public string QuoteAnalyzer { get; set; }
+		public bool? Lenient { get; set; }
+
 		/// <inheritdoc />
-		public bool? AllowLeadingWildcard { get; set; }
+		public int? MaximumDeterminizedStates { get; set; }
+
 		/// <inheritdoc />
-		public bool? EnablePositionIncrements { get; set; }
+		public MinimumShouldMatch MinimumShouldMatch { get; set; }
+
 		/// <inheritdoc />
-		public int? FuzzyPrefixLength { get; set; }
+		public double? PhraseSlop { get; set; }
+
 		/// <inheritdoc />
-		public bool? FuzzyTranspositions { get; set; }
+		public string Query { get; set; }
+
 		/// <inheritdoc />
-		public double? PhraseSlop { get; set; }
+		public string QuoteAnalyzer { get; set; }
+
 		/// <inheritdoc />
-		public bool? Lenient { get; set; }
+		public string QuoteFieldSuffix { get; set; }
+
 		/// <inheritdoc />
-		public bool? AnalyzeWildcard { get; set; }
+		public MultiTermQueryRewrite Rewrite { get; set; }
+
 		/// <inheritdoc />
 		public double? TieBreaker { get; set; }
+
 		/// <inheritdoc />
-		public int? MaximumDeterminizedStates { get; set; }
+		public string Timezone { get; set; }
+
+		/// <inheritdoc />
+		public TextQueryType? Type { get; set; }
+
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.QueryString = this;
+
 		internal static bool IsConditionless(IQueryStringQuery q) => q.Query.IsNullOrEmpty();
 	}
 
-	/// <inheritdoc cref="IQueryStringQuery"/>
+	/// <inheritdoc cref="IQueryStringQuery" />
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class QueryStringQueryDescriptor<T>
 		: QueryDescriptorBase<QueryStringQueryDescriptor<T>, IQueryStringQuery>
-		, IQueryStringQuery where T : class
+			, IQueryStringQuery where T : class
 	{
 		protected override bool Conditionless => QueryStringQuery.IsConditionless(this);
-
-		TextQueryType? IQueryStringQuery.Type { get; set; }
-		string IQueryStringQuery.Query { get; set; }
+		bool? IQueryStringQuery.AllowLeadingWildcard { get; set; }
+		string IQueryStringQuery.Analyzer { get; set; }
+		bool? IQueryStringQuery.AnalyzeWildcard { get; set; }
+		bool? IQueryStringQuery.AutoGenerateSynonymsPhraseQuery { get; set; }
 		Field IQueryStringQuery.DefaultField { get; set; }
-		Fields IQueryStringQuery.Fields { get; set; }
 		Operator? IQueryStringQuery.DefaultOperator { get; set; }
-		string IQueryStringQuery.Analyzer { get; set; }
-		string IQueryStringQuery.QuoteAnalyzer { get; set; }
-		bool? IQueryStringQuery.AllowLeadingWildcard { get; set; }
-		int? IQueryStringQuery.FuzzyMaxExpansions { get; set; }
+		bool? IQueryStringQuery.EnablePositionIncrements { get; set; }
+		bool? IQueryStringQuery.Escape { get; set; }
+		Fields IQueryStringQuery.Fields { get; set; }
 		Fuzziness IQueryStringQuery.Fuzziness { get; set; }
+		int? IQueryStringQuery.FuzzyMaxExpansions { get; set; }
 		int? IQueryStringQuery.FuzzyPrefixLength { get; set; }
+		MultiTermQueryRewrite IQueryStringQuery.FuzzyRewrite { get; set; }
 		bool? IQueryStringQuery.FuzzyTranspositions { get; set; }
-		double? IQueryStringQuery.PhraseSlop { get; set; }
-		MinimumShouldMatch IQueryStringQuery.MinimumShouldMatch { get; set; }
 		bool? IQueryStringQuery.Lenient { get; set; }
-		bool? IQueryStringQuery.AnalyzeWildcard { get; set; }
-		double? IQueryStringQuery.TieBreaker { get; set; }
 		int? IQueryStringQuery.MaximumDeterminizedStates { get; set; }
-		MultiTermQueryRewrite IQueryStringQuery.FuzzyRewrite { get; set; }
-		MultiTermQueryRewrite IQueryStringQuery.Rewrite { get; set; }
+		MinimumShouldMatch IQueryStringQuery.MinimumShouldMatch { get; set; }
+		double? IQueryStringQuery.PhraseSlop { get; set; }
+		string IQueryStringQuery.Query { get; set; }
+		string IQueryStringQuery.QuoteAnalyzer { get; set; }
 		string IQueryStringQuery.QuoteFieldSuffix { get; set; }
-		bool? IQueryStringQuery.Escape { get; set; }
-		bool? IQueryStringQuery.EnablePositionIncrements { get; set; }
+		MultiTermQueryRewrite IQueryStringQuery.Rewrite { get; set; }
+		double? IQueryStringQuery.TieBreaker { get; set; }
 		string IQueryStringQuery.Timezone { get; set; }
-		bool? IQueryStringQuery.AutoGenerateSynonymsPhraseQuery { get; set; }
 
-		/// <inheritdoc cref="IQueryStringQuery.DefaultField"/>
+		TextQueryType? IQueryStringQuery.Type { get; set; }
+
+		/// <inheritdoc cref="IQueryStringQuery.DefaultField" />
 		public QueryStringQueryDescriptor<T> DefaultField(Field field) => Assign(a => a.DefaultField = field);
 
-		/// <inheritdoc cref="IQueryStringQuery.DefaultField"/>
+		/// <inheritdoc cref="IQueryStringQuery.DefaultField" />
 		public QueryStringQueryDescriptor<T> DefaultField(Expression<Func<T, object>> field) => Assign(a => a.DefaultField = field);
 
-		/// <inheritdoc cref="IQueryStringQuery.Fields"/>
+		/// <inheritdoc cref="IQueryStringQuery.Fields" />
 		public QueryStringQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="IQueryStringQuery.Fields"/>
+		/// <inheritdoc cref="IQueryStringQuery.Fields" />
 		public QueryStringQueryDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
 
-		/// <inheritdoc cref="IQueryStringQuery.Type"/>
+		/// <inheritdoc cref="IQueryStringQuery.Type" />
 		public QueryStringQueryDescriptor<T> Type(TextQueryType? type) => Assign(a => a.Type = type);
 
-		/// <inheritdoc cref="IQueryStringQuery.Query"/>
+		/// <inheritdoc cref="IQueryStringQuery.Query" />
 		public QueryStringQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);
 
-		/// <inheritdoc cref="IQueryStringQuery.DefaultOperator"/>
+		/// <inheritdoc cref="IQueryStringQuery.DefaultOperator" />
 		public QueryStringQueryDescriptor<T> DefaultOperator(Operator? op) => Assign(a => a.DefaultOperator = op);
 
-		/// <inheritdoc cref="IQueryStringQuery.Analyzer"/>
+		/// <inheritdoc cref="IQueryStringQuery.Analyzer" />
 		public QueryStringQueryDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
 
-		/// <inheritdoc cref="IQueryStringQuery.QuoteAnalyzer"/>
+		/// <inheritdoc cref="IQueryStringQuery.QuoteAnalyzer" />
 		public QueryStringQueryDescriptor<T> QuoteAnalyzer(string analyzer) => Assign(a => a.QuoteAnalyzer = analyzer);
 
-		/// <inheritdoc cref="IQueryStringQuery.AllowLeadingWildcard"/>
+		/// <inheritdoc cref="IQueryStringQuery.AllowLeadingWildcard" />
 		public QueryStringQueryDescriptor<T> AllowLeadingWildcard(bool? allowLeadingWildcard = true) =>
 			Assign(a => a.AllowLeadingWildcard = allowLeadingWildcard);
 
-		/// <inheritdoc cref="IQueryStringQuery.Fuzziness"/>
+		/// <inheritdoc cref="IQueryStringQuery.Fuzziness" />
 		public QueryStringQueryDescriptor<T> Fuzziness(Fuzziness fuzziness) => Assign(a => a.Fuzziness = fuzziness);
 
-		/// <inheritdoc cref="IQueryStringQuery.FuzzyPrefixLength"/>
+		/// <inheritdoc cref="IQueryStringQuery.FuzzyPrefixLength" />
 		public QueryStringQueryDescriptor<T> FuzzyPrefixLength(int? fuzzyPrefixLength) => Assign(a => a.FuzzyPrefixLength = fuzzyPrefixLength);
 
-		/// <inheritdoc cref="IQueryStringQuery.FuzzyMaxExpansions"/>
+		/// <inheritdoc cref="IQueryStringQuery.FuzzyMaxExpansions" />
 		public QueryStringQueryDescriptor<T> FuzzyMaxExpansions(int? fuzzyMaxExpansions) => Assign(a => a.FuzzyMaxExpansions = fuzzyMaxExpansions);
 
-		/// <inheritdoc cref="IQueryStringQuery.FuzzyTranspositions"/>
+		/// <inheritdoc cref="IQueryStringQuery.FuzzyTranspositions" />
 		public QueryStringQueryDescriptor<T> FuzzyTranspositions(bool? fuzzyTranspositions = true) =>
 			Assign(a => a.FuzzyTranspositions = fuzzyTranspositions);
 
-		/// <inheritdoc cref="IQueryStringQuery.PhraseSlop"/>
+		/// <inheritdoc cref="IQueryStringQuery.PhraseSlop" />
 		public QueryStringQueryDescriptor<T> PhraseSlop(double? phraseSlop) => Assign(a => a.PhraseSlop = phraseSlop);
 
-		/// <inheritdoc cref="IQueryStringQuery.MinimumShouldMatch"/>
-		public QueryStringQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatch) => Assign(a => a.MinimumShouldMatch = minimumShouldMatch);
+		/// <inheritdoc cref="IQueryStringQuery.MinimumShouldMatch" />
+		public QueryStringQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatch) =>
+			Assign(a => a.MinimumShouldMatch = minimumShouldMatch);
 
-		/// <inheritdoc cref="IQueryStringQuery.Lenient"/>
+		/// <inheritdoc cref="IQueryStringQuery.Lenient" />
 		public QueryStringQueryDescriptor<T> Lenient(bool? lenient = true) => Assign(a => a.Lenient = lenient);
 
-		/// <inheritdoc cref="IQueryStringQuery.AnalyzeWildcard"/>
+		/// <inheritdoc cref="IQueryStringQuery.AnalyzeWildcard" />
 		public QueryStringQueryDescriptor<T> AnalyzeWildcard(bool? analyzeWildcard = true) => Assign(a => a.AnalyzeWildcard = analyzeWildcard);
 
-		/// <inheritdoc cref="IQueryStringQuery.TieBreaker"/>
+		/// <inheritdoc cref="IQueryStringQuery.TieBreaker" />
 		public QueryStringQueryDescriptor<T> TieBreaker(double? tieBreaker) => Assign(a => a.TieBreaker = tieBreaker);
 
-		/// <inheritdoc cref="IQueryStringQuery.MaximumDeterminizedStates"/>
-		public QueryStringQueryDescriptor<T> MaximumDeterminizedStates(int? maxDeterminizedStates) => Assign(a => a.MaximumDeterminizedStates = maxDeterminizedStates);
+		/// <inheritdoc cref="IQueryStringQuery.MaximumDeterminizedStates" />
+		public QueryStringQueryDescriptor<T> MaximumDeterminizedStates(int? maxDeterminizedStates) =>
+			Assign(a => a.MaximumDeterminizedStates = maxDeterminizedStates);
 
-		/// <inheritdoc cref="IQueryStringQuery.FuzzyRewrite"/>
+		/// <inheritdoc cref="IQueryStringQuery.FuzzyRewrite" />
 		public QueryStringQueryDescriptor<T> FuzzyRewrite(MultiTermQueryRewrite rewrite) => Assign(a => Self.FuzzyRewrite = rewrite);
 
-		/// <inheritdoc cref="IQueryStringQuery.Rewrite"/>
+		/// <inheritdoc cref="IQueryStringQuery.Rewrite" />
 		public QueryStringQueryDescriptor<T> Rewrite(MultiTermQueryRewrite rewrite) => Assign(a => Self.Rewrite = rewrite);
 
-		/// <inheritdoc cref="IQueryStringQuery.QuoteFieldSuffix"/>
+		/// <inheritdoc cref="IQueryStringQuery.QuoteFieldSuffix" />
 		public QueryStringQueryDescriptor<T> QuoteFieldSuffix(string quoteFieldSuffix) =>
 			Assign(a => a.QuoteFieldSuffix = quoteFieldSuffix);
 
-		/// <inheritdoc cref="IQueryStringQuery.Escape"/>
+		/// <inheritdoc cref="IQueryStringQuery.Escape" />
 		public QueryStringQueryDescriptor<T> Escape(bool? escape = true) => Assign(a => a.Escape = escape);
 
-		/// <inheritdoc cref="IQueryStringQuery.EnablePositionIncrements"/>
+		/// <inheritdoc cref="IQueryStringQuery.EnablePositionIncrements" />
 		public QueryStringQueryDescriptor<T> EnablePositionIncrements(bool? enablePositionIncrements = true) =>
 			Assign(a => a.EnablePositionIncrements = enablePositionIncrements);
 
-		/// <inheritdoc cref="IQueryStringQuery.Timezone"/>
+		/// <inheritdoc cref="IQueryStringQuery.Timezone" />
 		public QueryStringQueryDescriptor<T> Timezone(string timezone) => Assign(a => a.Timezone = timezone);
-      
-    /// <inheritdoc cref="IQueryStringQuery.AutoGenerateSynonymsPhraseQuery"/>
+
+		/// <inheritdoc cref="IQueryStringQuery.AutoGenerateSynonymsPhraseQuery" />
 		public QueryStringQueryDescriptor<T> AutoGenerateSynonymsPhraseQuery(bool? autoGenerateSynonymsPhraseQuery = true) =>
 			Assign(a => a.AutoGenerateSynonymsPhraseQuery = autoGenerateSynonymsPhraseQuery);
 	}
diff --git a/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringFlags.cs b/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringFlags.cs
index 55fd85f53a2..cf4e7774397 100644
--- a/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringFlags.cs
+++ b/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringFlags.cs
@@ -12,28 +12,40 @@ public enum SimpleQueryStringFlags
 	{
 		[EnumMember(Value = "NONE")]
 		None = 1 << 0,
+
 		[EnumMember(Value = "AND")]
 		And = 1 << 1,
+
 		[EnumMember(Value = "OR")]
 		Or = 1 << 2,
+
 		[EnumMember(Value = "NOT")]
 		Not = 1 << 3,
+
 		[EnumMember(Value = "PREFIX")]
 		Prefix = 1 << 4,
+
 		[EnumMember(Value = "PHRASE")]
 		Phrase = 1 << 5,
+
 		[EnumMember(Value = "PRECEDENCE")]
 		Precedence = 1 << 6,
+
 		[EnumMember(Value = "ESCAPE")]
 		Escape = 1 << 7,
+
 		[EnumMember(Value = "WHITESPACE")]
 		Whitespace = 1 << 8,
+
 		[EnumMember(Value = "FUZZY")]
 		Fuzzy = 1 << 9,
+
 		[EnumMember(Value = "NEAR")]
 		Near = 1 << 10,
+
 		[EnumMember(Value = "SLOP")]
 		Slop = 1 << 11,
+
 		[EnumMember(Value = "ALL")]
 		All = 1 << 12,
 	}
@@ -43,7 +55,9 @@ internal class SimpleQueryStringFlagsJsonConverter : JsonConverter
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var em = value as SimpleQueryStringFlags?;
-			if (!em.HasValue) return; ;
+			if (!em.HasValue) return;
+
+			;
 			var e = em.Value;
 			var list = new List<string>();
 			if (e.HasFlag(SimpleQueryStringFlags.All)) list.Add("ALL");
diff --git a/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs b/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs
index b68b822a0d3..55ada50c703 100644
--- a/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs
+++ b/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs
@@ -5,13 +5,37 @@ namespace Nest
 {
 	/// <summary>
 	/// A query that uses the SimpleQueryParser to parse its context.
-	/// Unlike the regular <see cref="IQueryStringQuery"/>, the <see cref="ISimpleQueryStringQuery"/> query will
+	/// Unlike the regular <see cref="IQueryStringQuery" />, the <see cref="ISimpleQueryStringQuery" /> query will
 	/// never throw an exception, and discards invalid parts of the query.
 	/// </summary>
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SimpleQueryStringQueryDescriptor<object>>))]
 	public interface ISimpleQueryStringQuery : IQuery
 	{
+		/// <summary>
+		/// The analyzer name used to analyze the query
+		/// </summary>
+		[JsonProperty("analyzer")]
+		string Analyzer { get; set; }
+
+		/// <summary>
+		/// By default, wildcards terms in a query are not analyzed.
+		/// By setting this value to <c>true</c>, a best effort will be made to analyze those as well.
+		/// </summary>
+		[JsonProperty("analyze_wildcard")]
+		bool? AnalyzeWildcard { get; set; }
+
+		/// <summary></summary>
+		[JsonProperty("auto_generate_synonyms_phrase_query")]
+		bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+
+		/// <summary>
+		/// The default operator used if no explicit operator is specified
+		/// The default operator is <see cref="Operator.Or" />
+		/// </summary>
+		[JsonProperty("default_operator")]
+		Operator? DefaultOperator { get; set; }
+
 		/// <summary>
 		/// The fields to perform the parsed query against.
 		/// Defaults to the <c>index.query.default_field</c> index settings, which in turn defaults to <c>*</c>.
@@ -21,30 +45,34 @@ public interface ISimpleQueryStringQuery : IQuery
 		Fields Fields { get; set; }
 
 		/// <summary>
-		/// The query to be parsed
+		/// Flags specifying which features to enable.
+		/// Defaults to <see cref="SimpleQueryStringFlags.All" />.
 		/// </summary>
-		[JsonProperty("query")]
-		string Query { get; set; }
+		[JsonProperty("flags")]
+		SimpleQueryStringFlags? Flags { get; set; }
 
 		/// <summary>
-		/// The analyzer name used to analyze the query
+		/// Controls the number of terms fuzzy queries will expand to. Defaults to <c>50</c>
 		/// </summary>
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
+		[JsonProperty("fuzzy_max_expansions")]
+		int? FuzzyMaxExpansions { get; set; }
 
 		/// <summary>
-		/// The default operator used if no explicit operator is specified
-		/// The default operator is <see cref="Operator.Or"/>
+		/// Set the prefix length for fuzzy queries. Default is <c>0</c>
 		/// </summary>
-		[JsonProperty("default_operator")]
-		Operator? DefaultOperator { get; set; }
+		[JsonProperty("fuzzy_prefix_length")]
+		int? FuzzyPrefixLength { get; set; }
 
 		/// <summary>
-		/// Flags specifying which features to enable.
-		/// Defaults to <see cref="SimpleQueryStringFlags.All"/>.
+		/// Sets whether transpositions are supported in fuzzy queries. Default is <c>true</c>.
+		/// <para />
+		/// The default metric used by fuzzy queries to determine a match is the Damerau-Levenshtein
+		/// distance formula which supports transpositions. Setting transposition to false will
+		/// switch to classic Levenshtein distance.
+		/// If not set, Damerau-Levenshtein distance metric will be used.
 		/// </summary>
-		[JsonProperty("flags")]
-		SimpleQueryStringFlags? Flags { get; set; }
+		[JsonProperty("fuzzy_transpositions")]
+		bool? FuzzyTranspositions { get; set; }
 
 		/// <summary>
 		/// If set to <c>true</c> will cause format based failures (like providing text to a numeric field)
@@ -53,13 +81,6 @@ public interface ISimpleQueryStringQuery : IQuery
 		[JsonProperty("lenient")]
 		bool? Lenient { get; set; }
 
-		/// <summary>
-		/// By default, wildcards terms in a query are not analyzed.
-		/// By setting this value to <c>true</c>, a best effort will be made to analyze those as well.
-		/// </summary>
-		[JsonProperty("analyze_wildcard")]
-		bool? AnalyzeWildcard { get; set; }
-
 		/// <summary>
 		/// A value controlling how many "should" clauses in the resulting boolean query should match.
 		/// It can be an absolute value, a percentage or a combination of both
@@ -67,141 +88,135 @@ public interface ISimpleQueryStringQuery : IQuery
 		[JsonProperty("minimum_should_match")]
 		MinimumShouldMatch MinimumShouldMatch { get; set; }
 
+		/// <summary>
+		/// The query to be parsed
+		/// </summary>
+		[JsonProperty("query")]
+		string Query { get; set; }
+
 		/// <summary>
 		/// A suffix to append to fields for quoted parts of the query string.
 		/// This allows to use a field that has a different analysis chain for exact matching.
 		/// </summary>
 		[JsonProperty("quote_field_suffix")]
 		string QuoteFieldSuffix { get; set; }
-
-		/// <summary>
-		/// Set the prefix length for fuzzy queries. Default is <c>0</c>
-		/// </summary>
-		[JsonProperty("fuzzy_prefix_length")]
-		int? FuzzyPrefixLength { get; set; }
-
-		/// <summary>
-		/// Controls the number of terms fuzzy queries will expand to. Defaults to <c>50</c>
-		/// </summary>
-		[JsonProperty("fuzzy_max_expansions")]
-		int? FuzzyMaxExpansions { get; set; }
-
-		/// <summary>
-		/// Sets whether transpositions are supported in fuzzy queries. Default is <c>true</c>.
-		/// <para />
-		/// The default metric used by fuzzy queries to determine a match is the Damerau-Levenshtein
-		/// distance formula which supports transpositions. Setting transposition to false will
-		/// switch to classic Levenshtein distance.
-		/// If not set, Damerau-Levenshtein distance metric will be used.
-		/// </summary>
-		[JsonProperty("fuzzy_transpositions")]
-		bool? FuzzyTranspositions { get; set; }
-
-    /// <summary></summary>
-		[JsonProperty("auto_generate_synonyms_phrase_query")]
-		bool? AutoGenerateSynonymsPhraseQuery { get; set; }
 	}
 
-	/// <inheritdoc cref="ISimpleQueryStringQuery"/>
+	/// <inheritdoc cref="ISimpleQueryStringQuery" />
 	public class SimpleQueryStringQuery : QueryBase, ISimpleQueryStringQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		/// <inheritdoc />
-		public Fields Fields { get; set; }
+		public string Analyzer { get; set; }
+
 		/// <inheritdoc />
-		public string Query { get; set; }
+		public bool? AnalyzeWildcard { get; set; }
+
 		/// <inheritdoc />
-		public string Analyzer { get; set; }
+		public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+
 		/// <inheritdoc />
 		public Operator? DefaultOperator { get; set; }
+
+		/// <inheritdoc />
+		public Fields Fields { get; set; }
+
 		/// <inheritdoc />
 		public SimpleQueryStringFlags? Flags { get; set; }
+
 		/// <inheritdoc />
-		public bool? Lenient { get; set; }
+		public int? FuzzyMaxExpansions { get; set; }
+
 		/// <inheritdoc />
-		public bool? AnalyzeWildcard { get; set; }
+		public int? FuzzyPrefixLength { get; set; }
+
 		/// <inheritdoc />
-		public MinimumShouldMatch MinimumShouldMatch { get; set; }
+		public bool? FuzzyTranspositions { get; set; }
+
 		/// <inheritdoc />
-		public string QuoteFieldSuffix { get; set; }
+		public bool? Lenient { get; set; }
+
 		/// <inheritdoc />
-		public int? FuzzyPrefixLength { get; set; }
+		public MinimumShouldMatch MinimumShouldMatch { get; set; }
+
 		/// <inheritdoc />
-		public int? FuzzyMaxExpansions { get; set; }
+		public string Query { get; set; }
+
 		/// <inheritdoc />
-		public bool? FuzzyTranspositions { get; set; }
-    /// <inheritdoc />
-		public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
+		public string QuoteFieldSuffix { get; set; }
+
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SimpleQueryString = this;
+
 		internal static bool IsConditionless(ISimpleQueryStringQuery q) => q.Query.IsNullOrEmpty();
 	}
 
-	/// <inheritdoc cref="ISimpleQueryStringQuery"/>
+	/// <inheritdoc cref="ISimpleQueryStringQuery" />
 	public class SimpleQueryStringQueryDescriptor<T>
 		: QueryDescriptorBase<SimpleQueryStringQueryDescriptor<T>, ISimpleQueryStringQuery>
-		, ISimpleQueryStringQuery where T : class
+			, ISimpleQueryStringQuery where T : class
 	{
 		protected override bool Conditionless => SimpleQueryStringQuery.IsConditionless(this);
-		Fields ISimpleQueryStringQuery.Fields { get; set; }
-		string ISimpleQueryStringQuery.Query { get; set; }
 		string ISimpleQueryStringQuery.Analyzer { get; set; }
+		bool? ISimpleQueryStringQuery.AnalyzeWildcard { get; set; }
+		bool? ISimpleQueryStringQuery.AutoGenerateSynonymsPhraseQuery { get; set; }
 		Operator? ISimpleQueryStringQuery.DefaultOperator { get; set; }
+		Fields ISimpleQueryStringQuery.Fields { get; set; }
 		SimpleQueryStringFlags? ISimpleQueryStringQuery.Flags { get; set; }
-		bool? ISimpleQueryStringQuery.AnalyzeWildcard { get; set; }
+		int? ISimpleQueryStringQuery.FuzzyMaxExpansions { get; set; }
+		int? ISimpleQueryStringQuery.FuzzyPrefixLength { get; set; }
+		bool? ISimpleQueryStringQuery.FuzzyTranspositions { get; set; }
 		bool? ISimpleQueryStringQuery.Lenient { get; set; }
 		MinimumShouldMatch ISimpleQueryStringQuery.MinimumShouldMatch { get; set; }
+		string ISimpleQueryStringQuery.Query { get; set; }
 		string ISimpleQueryStringQuery.QuoteFieldSuffix { get; set; }
-		int? ISimpleQueryStringQuery.FuzzyPrefixLength { get; set; }
-		int? ISimpleQueryStringQuery.FuzzyMaxExpansions { get; set; }
-		bool? ISimpleQueryStringQuery.FuzzyTranspositions { get; set; }
-		bool? ISimpleQueryStringQuery.AutoGenerateSynonymsPhraseQuery { get; set; }
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.Fields"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.Fields" />
 		public SimpleQueryStringQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.Fields"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.Fields" />
 		public SimpleQueryStringQueryDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.Query"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.Query" />
 		public SimpleQueryStringQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.Analyzer"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.Analyzer" />
 		public SimpleQueryStringQueryDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.DefaultOperator"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.DefaultOperator" />
 		public SimpleQueryStringQueryDescriptor<T> DefaultOperator(Operator? op) => Assign(a => a.DefaultOperator = op);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.Flags"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.Flags" />
 		public SimpleQueryStringQueryDescriptor<T> Flags(SimpleQueryStringFlags? flags) => Assign(a => a.Flags = flags);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.AnalyzeWildcard"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.AnalyzeWildcard" />
 		public SimpleQueryStringQueryDescriptor<T> AnalyzeWildcard(bool? analyzeWildcard = true) =>
 			Assign(a => a.AnalyzeWildcard = analyzeWildcard);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.Lenient"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.Lenient" />
 		public SimpleQueryStringQueryDescriptor<T> Lenient(bool? lenient = true) => Assign(a => a.Lenient = lenient);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.MinimumShouldMatch"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.MinimumShouldMatch" />
 		public SimpleQueryStringQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minimumShouldMatch) =>
 			Assign(a => a.MinimumShouldMatch = minimumShouldMatch);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.QuoteFieldSuffix"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.QuoteFieldSuffix" />
 		public SimpleQueryStringQueryDescriptor<T> QuoteFieldSuffix(string quoteFieldSuffix) =>
 			Assign(a => a.QuoteFieldSuffix = quoteFieldSuffix);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.FuzzyPrefixLength"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.FuzzyPrefixLength" />
 		public SimpleQueryStringQueryDescriptor<T> FuzzyPrefixLength(int? fuzzyPrefixLength) => Assign(a => a.FuzzyPrefixLength = fuzzyPrefixLength);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.FuzzyMaxExpansions"/>
-		public SimpleQueryStringQueryDescriptor<T> FuzzyMaxExpansions(int? fuzzyMaxExpansions) => Assign(a => a.FuzzyMaxExpansions = fuzzyMaxExpansions);
+		/// <inheritdoc cref="ISimpleQueryStringQuery.FuzzyMaxExpansions" />
+		public SimpleQueryStringQueryDescriptor<T> FuzzyMaxExpansions(int? fuzzyMaxExpansions) =>
+			Assign(a => a.FuzzyMaxExpansions = fuzzyMaxExpansions);
 
-		/// <inheritdoc cref="ISimpleQueryStringQuery.FuzzyTranspositions"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.FuzzyTranspositions" />
 		public SimpleQueryStringQueryDescriptor<T> FuzzyTranspositions(bool? fuzzyTranspositions = true) =>
 			Assign(a => a.FuzzyTranspositions = fuzzyTranspositions);
 
-    /// <inheritdoc cref="ISimpleQueryStringQuery.AutoGenerateSynonymsPhraseQuery"/>
+		/// <inheritdoc cref="ISimpleQueryStringQuery.AutoGenerateSynonymsPhraseQuery" />
 		public SimpleQueryStringQueryDescriptor<T> AutoGenerateSynonymsPhraseQuery(bool? autoGenerateSynonymsPhraseQuery = true) =>
 			Assign(a => a.AutoGenerateSynonymsPhraseQuery = autoGenerateSynonymsPhraseQuery);
 	}
diff --git a/src/Nest/QueryDsl/Geo/BoundingBox/BoundingBox.cs b/src/Nest/QueryDsl/Geo/BoundingBox/BoundingBox.cs
index 79a2e530f73..cd09fa737b4 100644
--- a/src/Nest/QueryDsl/Geo/BoundingBox/BoundingBox.cs
+++ b/src/Nest/QueryDsl/Geo/BoundingBox/BoundingBox.cs
@@ -5,35 +5,37 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<BoundingBox>))]
 	public interface IBoundingBox
 	{
-		[JsonProperty("top_left")]
-		GeoLocation TopLeft { get; set; }
-
 		[JsonProperty("bottom_right")]
 		GeoLocation BottomRight { get; set; }
 
+		[JsonProperty("top_left")]
+		GeoLocation TopLeft { get; set; }
+
 		[JsonProperty("wkt")]
 		string WellKnownText { get; set; }
 	}
 
 	public class BoundingBox : IBoundingBox
 	{
-		public GeoLocation TopLeft { get; set; }
 		public GeoLocation BottomRight { get; set; }
+		public GeoLocation TopLeft { get; set; }
 		public string WellKnownText { get; set; }
 	}
 
 	public class BoundingBoxDescriptor : DescriptorBase<BoundingBoxDescriptor, IBoundingBox>, IBoundingBox
 	{
-		GeoLocation IBoundingBox.TopLeft { get; set; }
 		GeoLocation IBoundingBox.BottomRight { get; set; }
+		GeoLocation IBoundingBox.TopLeft { get; set; }
 		string IBoundingBox.WellKnownText { get; set; }
 
 		public BoundingBoxDescriptor TopLeft(GeoLocation topLeft) => Assign(a => a.TopLeft = topLeft);
-		public BoundingBoxDescriptor TopLeft(double lat, double lon) => Assign(a => a.TopLeft = new GeoLocation(lat,lon));
+
+		public BoundingBoxDescriptor TopLeft(double lat, double lon) => Assign(a => a.TopLeft = new GeoLocation(lat, lon));
 
 		public BoundingBoxDescriptor BottomRight(GeoLocation bottomRight) => Assign(a => a.BottomRight = bottomRight);
+
 		public BoundingBoxDescriptor BottomRight(double lat, double lon) => Assign(a => a.BottomRight = new GeoLocation(lat, lon));
 
-		public BoundingBoxDescriptor WellKnownText(string wkt)=> Assign(a => a.WellKnownText = wkt);
+		public BoundingBoxDescriptor WellKnownText(string wkt) => Assign(a => a.WellKnownText = wkt);
 	}
 }
diff --git a/src/Nest/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQuery.cs b/src/Nest/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQuery.cs
index 3303dd1a366..de6f0c9aba2 100644
--- a/src/Nest/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQuery.cs
+++ b/src/Nest/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQuery.cs
@@ -20,21 +20,21 @@ public interface IGeoBoundingBoxQuery : IFieldNameQuery
 
 	public class GeoBoundingBoxQuery : FieldNameQueryBase, IGeoBoundingBoxQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public IBoundingBox BoundingBox { get; set; }
 		public GeoExecution? Type { get; set; }
 
 		public GeoValidationMethod? ValidationMethod { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoBoundingBox = this;
 
 		internal static bool IsConditionless(IGeoBoundingBoxQuery q) =>
-			q.Field.IsConditionless() || (q.BoundingBox?.BottomRight == null && q.BoundingBox?.TopLeft == null && q.BoundingBox?.WellKnownText == null);
+			q.Field.IsConditionless() || q.BoundingBox?.BottomRight == null && q.BoundingBox?.TopLeft == null && q.BoundingBox?.WellKnownText == null;
 	}
 
 	public class GeoBoundingBoxQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<GeoBoundingBoxQueryDescriptor<T>, IGeoBoundingBoxQuery, T>
-		, IGeoBoundingBoxQuery where T : class
+			, IGeoBoundingBoxQuery where T : class
 	{
 		protected override bool Conditionless => GeoBoundingBoxQuery.IsConditionless(this);
 		IBoundingBox IGeoBoundingBoxQuery.BoundingBox { get; set; }
@@ -42,13 +42,13 @@ public class GeoBoundingBoxQueryDescriptor<T>
 		GeoValidationMethod? IGeoBoundingBoxQuery.ValidationMethod { get; set; }
 
 		public GeoBoundingBoxQueryDescriptor<T> BoundingBox(double topLeftLat, double topLeftLon, double bottomRightLat, double bottomRightLon) =>
-			BoundingBox(f=>f.TopLeft(topLeftLat, topLeftLon).BottomRight(bottomRightLat, bottomRightLon));
+			BoundingBox(f => f.TopLeft(topLeftLat, topLeftLon).BottomRight(bottomRightLat, bottomRightLon));
 
 		public GeoBoundingBoxQueryDescriptor<T> BoundingBox(GeoLocation topLeft, GeoLocation bottomRight) =>
-			BoundingBox(f=>f.TopLeft(topLeft).BottomRight(bottomRight));
+			BoundingBox(f => f.TopLeft(topLeft).BottomRight(bottomRight));
 
 		public GeoBoundingBoxQueryDescriptor<T> BoundingBox(string wkt) =>
-			BoundingBox(f=>f.WellKnownText(wkt));
+			BoundingBox(f => f.WellKnownText(wkt));
 
 		public GeoBoundingBoxQueryDescriptor<T> BoundingBox(Func<BoundingBoxDescriptor, IBoundingBox> boundingBoxSelector) =>
 			Assign(a => a.BoundingBox = boundingBoxSelector?.Invoke(new BoundingBoxDescriptor()));
diff --git a/src/Nest/QueryDsl/Geo/BoundingBox/GeoExecution.cs b/src/Nest/QueryDsl/Geo/BoundingBox/GeoExecution.cs
index 99c08b51334..aa4e255e63f 100644
--- a/src/Nest/QueryDsl/Geo/BoundingBox/GeoExecution.cs
+++ b/src/Nest/QueryDsl/Geo/BoundingBox/GeoExecution.cs
@@ -9,6 +9,7 @@ public enum GeoExecution
 	{
 		[EnumMember(Value = "memory")]
 		Memory,
+
 		[EnumMember(Value = "indexed")]
 		Indexed
 	}
diff --git a/src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs b/src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs
index 3671810b0f6..cd7712e0181 100644
--- a/src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs
@@ -1,33 +1,31 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (VariableFieldNameQueryJsonConverter<GeoDistanceQuery, IGeoDistanceQuery>))]
+	[JsonConverter(typeof(VariableFieldNameQueryJsonConverter<GeoDistanceQuery, IGeoDistanceQuery>))]
 	public interface IGeoDistanceQuery : IFieldNameQuery
 	{
-		[VariableField]
-		GeoLocation Location { get; set; }
-
 		[JsonProperty("distance")]
 		Distance Distance { get; set; }
 
 		[JsonProperty("distance_type")]
 		GeoDistanceType? DistanceType { get; set; }
 
+		[VariableField]
+		GeoLocation Location { get; set; }
+
 		[JsonProperty("validation_method")]
 		GeoValidationMethod? ValidationMethod { get; set; }
-
 	}
 
 	public class GeoDistanceQuery : FieldNameQueryBase, IGeoDistanceQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public GeoLocation Location { get; set; }
 		public Distance Distance { get; set; }
 		public GeoDistanceType? DistanceType { get; set; }
+		public GeoLocation Location { get; set; }
 		public GeoValidationMethod? ValidationMethod { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoDistance = this;
 
@@ -37,12 +35,12 @@ internal static bool IsConditionless(IGeoDistanceQuery q) =>
 
 	public class GeoDistanceQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<GeoDistanceQueryDescriptor<T>, IGeoDistanceQuery, T>
-		, IGeoDistanceQuery where T : class
+			, IGeoDistanceQuery where T : class
 	{
 		protected override bool Conditionless => GeoDistanceQuery.IsConditionless(this);
-		GeoLocation IGeoDistanceQuery.Location { get; set; }
 		Distance IGeoDistanceQuery.Distance { get; set; }
 		GeoDistanceType? IGeoDistanceQuery.DistanceType { get; set; }
+		GeoLocation IGeoDistanceQuery.Location { get; set; }
 		GeoValidationMethod? IGeoDistanceQuery.ValidationMethod { get; set; }
 
 		public GeoDistanceQueryDescriptor<T> Location(GeoLocation location) => Assign(a => a.Location = location);
diff --git a/src/Nest/QueryDsl/Geo/GeoCoordinateJsonConverter.cs b/src/Nest/QueryDsl/Geo/GeoCoordinateJsonConverter.cs
index 5931559903e..3ed3fa667fa 100644
--- a/src/Nest/QueryDsl/Geo/GeoCoordinateJsonConverter.cs
+++ b/src/Nest/QueryDsl/Geo/GeoCoordinateJsonConverter.cs
@@ -6,6 +6,7 @@ namespace Nest
 	internal class GeoCoordinateJsonConverter : JsonConverter
 	{
 		public override bool CanConvert(Type objectType) => true;
+
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var p = (GeoCoordinate)value;
@@ -25,6 +26,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartArray) return null;
+
 			var doubles = serializer.Deserialize<double[]>(reader);
 			switch (doubles.Length)
 			{
diff --git a/src/Nest/QueryDsl/Geo/GeoLocation.cs b/src/Nest/QueryDsl/Geo/GeoLocation.cs
index 5c1b22741fd..77dc2788d0e 100644
--- a/src/Nest/QueryDsl/Geo/GeoLocation.cs
+++ b/src/Nest/QueryDsl/Geo/GeoLocation.cs
@@ -13,24 +13,12 @@ namespace Nest
 	/// </summary>
 	public class GeoLocation : IEquatable<GeoLocation>, IFormattable
 	{
-		/// <summary>
-		/// Latitude
-		/// </summary>
-		[JsonProperty("lat")]
-		public double Latitude { get; }
-
-		/// <summary>
-		/// Longitude
-		/// </summary>
-		[JsonProperty("lon")]
-		public double Longitude { get; }
-
 		/// <summary>
 		/// Represents a Latitude/Longitude as a 2 dimensional point.
 		/// </summary>
 		/// <param name="latitude">Value between -90 and 90</param>
 		/// <param name="longitude">Value between -180 and 180</param>
-		/// <exception cref="ArgumentOutOfRangeException">If <paramref name="latitude"/> or <paramref name="longitude"/> are invalid</exception>
+		/// <exception cref="ArgumentOutOfRangeException">If <paramref name="latitude" /> or <paramref name="longitude" /> are invalid</exception>
 		public GeoLocation(double latitude, double longitude)
 		{
 			if (!IsValidLatitude(latitude))
@@ -39,27 +27,54 @@ public GeoLocation(double latitude, double longitude)
 			if (!IsValidLongitude(longitude))
 				throw new ArgumentOutOfRangeException(string.Format(CultureInfo.InvariantCulture,
 					"Invalid longitude '{0}'. Valid values are between -180 and 180", longitude));
+
 			Latitude = latitude;
 			Longitude = longitude;
 		}
 
 		/// <summary>
-		/// True if <paramref name="latitude"/> is a valid latitude. Otherwise false.
+		/// Latitude
+		/// </summary>
+		[JsonProperty("lat")]
+		public double Latitude { get; }
+
+		/// <summary>
+		/// Longitude
+		/// </summary>
+		[JsonProperty("lon")]
+		public double Longitude { get; }
+
+		public bool Equals(GeoLocation other)
+		{
+			if (ReferenceEquals(null, other))
+				return false;
+			if (ReferenceEquals(this, other))
+				return true;
+
+			return Latitude.Equals(other.Latitude) && Longitude.Equals(other.Longitude);
+		}
+
+		public string ToString(string format, IFormatProvider formatProvider) => ToString();
+
+		/// <summary>
+		/// True if <paramref name="latitude" /> is a valid latitude. Otherwise false.
 		/// </summary>
 		/// <param name="latitude"></param>
 		/// <returns></returns>
 		public static bool IsValidLatitude(double latitude) => latitude >= -90 && latitude <= 90;
 
 		/// <summary>
-		/// True if <paramref name="longitude"/> is a valid longitude. Otherwise false.
+		/// True if <paramref name="longitude" /> is a valid longitude. Otherwise false.
 		/// </summary>
 		/// <param name="longitude"></param>
 		/// <returns></returns>
 		public static bool IsValidLongitude(double longitude) => longitude >= -180 && longitude <= 180;
 
 		/// <summary>
-		/// Try to create a <see cref="GeoLocation"/>.
-		/// Return <value>null</value> if either <paramref name="latitude"/> or <paramref name="longitude"/> are invalid.
+		/// Try to create a <see cref="GeoLocation" />.
+		/// Return
+		/// <value>null</value>
+		/// if either <paramref name="latitude" /> or <paramref name="longitude" /> are invalid.
 		/// </summary>
 		/// <param name="latitude">Value between -90 and 90</param>
 		/// <param name="longitude">Value between -180 and 180</param>
@@ -68,6 +83,7 @@ public static GeoLocation TryCreate(double latitude, double longitude)
 		{
 			if (IsValidLatitude(latitude) && IsValidLongitude(longitude))
 				return new GeoLocation(latitude, longitude);
+
 			return null;
 		}
 
@@ -75,35 +91,25 @@ public override string ToString() =>
 			Latitude.ToString("#0.0#######", CultureInfo.InvariantCulture) + "," +
 			Longitude.ToString("#0.0#######", CultureInfo.InvariantCulture);
 
-		public bool Equals(GeoLocation other)
-		{
-			if (ReferenceEquals(null, other))
-				return false;
-			if (ReferenceEquals(this, other))
-				return true;
-			return Latitude.Equals(other.Latitude) && Longitude.Equals(other.Longitude);
-		}
-
 		public override bool Equals(object obj)
 		{
 			if (ReferenceEquals(null, obj))
 				return false;
 			if (ReferenceEquals(this, obj))
 				return true;
-			if (obj.GetType() != this.GetType())
+			if (obj.GetType() != GetType())
 				return false;
+
 			return Equals((GeoLocation)obj);
 		}
 
 		public override int GetHashCode() =>
 			unchecked((Latitude.GetHashCode() * 397) ^ Longitude.GetHashCode());
 
-		public string ToString(string format, IFormatProvider formatProvider) => ToString();
-
 		public static implicit operator GeoLocation(string latLon)
 		{
-            if (string.IsNullOrEmpty(latLon))
-                throw new ArgumentNullException(nameof(latLon));
+			if (string.IsNullOrEmpty(latLon))
+				throw new ArgumentNullException(nameof(latLon));
 
 			var parts = latLon.Split(',');
 			if (parts.Length != 2) throw new ArgumentException("Invalid format: string must be in the form of lat,lon");
@@ -111,15 +117,13 @@ public static implicit operator GeoLocation(string latLon)
 				throw new ArgumentException("Invalid latitude value");
 			if (!double.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out var lon))
 				throw new ArgumentException("Invalid longitude value");
+
 			return new GeoLocation(lat, lon);
 		}
 
-		public static implicit operator GeoLocation(double[] lonLat)
-		{
-			return lonLat.Length != 2
-				? null
-				: new GeoLocation(lonLat[1], lonLat[0]);
-		}
+		public static implicit operator GeoLocation(double[] lonLat) => lonLat.Length != 2
+			? null
+			: new GeoLocation(lonLat[1], lonLat[0]);
 	}
 
 	/// <summary>
@@ -130,12 +134,12 @@ public static implicit operator GeoLocation(double[] lonLat)
 	public class GeoCoordinate : GeoLocation
 	{
 		/// <summary>
-		/// Creates a new instance of <see cref="GeoCoordinate"/>
+		/// Creates a new instance of <see cref="GeoCoordinate" />
 		/// </summary>
 		public GeoCoordinate(double latitude, double longitude) : base(latitude, longitude) { }
 
 		/// <summary>
-		/// Creates a new instance of <see cref="GeoCoordinate"/>
+		/// Creates a new instance of <see cref="GeoCoordinate" />
 		/// </summary>
 		public GeoCoordinate(double latitude, double longitude, double z) : base(latitude, longitude) =>
 			Z = z;
@@ -146,7 +150,7 @@ public GeoCoordinate(double latitude, double longitude, double z) : base(latitud
 		public double? Z { get; set; }
 
 		/// <summary>
-		/// Creates a new instance of <see cref="GeoCoordinate"/> from an array
+		/// Creates a new instance of <see cref="GeoCoordinate" /> from an array
 		/// of 2 or 3 doubles, in the order Latitude, Longitude, and optional Z value.
 		/// </summary>
 		public static implicit operator GeoCoordinate(double[] coordinates)
diff --git a/src/Nest/QueryDsl/Geo/GeoValidationMethod.cs b/src/Nest/QueryDsl/Geo/GeoValidationMethod.cs
index 4fc7c7c5512..c5753b4f00e 100644
--- a/src/Nest/QueryDsl/Geo/GeoValidationMethod.cs
+++ b/src/Nest/QueryDsl/Geo/GeoValidationMethod.cs
@@ -9,9 +9,11 @@ public enum GeoValidationMethod
 	{
 		[EnumMember(Value = "coerce")]
 		Coerce,
+
 		[EnumMember(Value = "ignore_malformed")]
 		IgnoreMalformed,
+
 		[EnumMember(Value = "strict")]
 		Strict
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Geo/LatLon.cs b/src/Nest/QueryDsl/Geo/LatLon.cs
index ee9a6449e4c..9ed0ef2438a 100644
--- a/src/Nest/QueryDsl/Geo/LatLon.cs
+++ b/src/Nest/QueryDsl/Geo/LatLon.cs
@@ -5,4 +5,4 @@ public class LatLon
 		public double? Lat { get; set; }
 		public double? Lon { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/QueryDsl/Geo/Polygon/GeoPolygonQuery.cs b/src/Nest/QueryDsl/Geo/Polygon/GeoPolygonQuery.cs
index 8d593dd996c..39f6ac924cc 100644
--- a/src/Nest/QueryDsl/Geo/Polygon/GeoPolygonQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Polygon/GeoPolygonQuery.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (VariableFieldNameQueryJsonConverter<GeoPolygonQuery, IGeoPolygonQuery>))]
+	[JsonConverter(typeof(VariableFieldNameQueryJsonConverter<GeoPolygonQuery, IGeoPolygonQuery>))]
 	public interface IGeoPolygonQuery : IFieldNameQuery
 	{
 		[VariableField("points")]
@@ -13,23 +12,23 @@ public interface IGeoPolygonQuery : IFieldNameQuery
 
 		[JsonProperty("validation_method")]
 		GeoValidationMethod? ValidationMethod { get; set; }
-
 	}
 
 	public class GeoPolygonQuery : FieldNameQueryBase, IGeoPolygonQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public IEnumerable<GeoLocation> Points { get; set; }
 
 		public GeoValidationMethod? ValidationMethod { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoPolygon = this;
+
 		internal static bool IsConditionless(IGeoPolygonQuery q) => q.Field == null || !q.Points.HasAny();
 	}
 
 	public class GeoPolygonQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<GeoPolygonQueryDescriptor<T>, IGeoPolygonQuery, T>
-		, IGeoPolygonQuery where T : class
+			, IGeoPolygonQuery where T : class
 	{
 		protected override bool Conditionless => GeoPolygonQuery.IsConditionless(this);
 		IEnumerable<GeoLocation> IGeoPolygonQuery.Points { get; set; }
diff --git a/src/Nest/QueryDsl/Geo/Shape/Circle/CircleGeoShape.cs b/src/Nest/QueryDsl/Geo/Shape/Circle/CircleGeoShape.cs
index 9b73e574d0b..f77a6e510f5 100644
--- a/src/Nest/QueryDsl/Geo/Shape/Circle/CircleGeoShape.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/Circle/CircleGeoShape.cs
@@ -15,10 +15,7 @@ public class CircleGeoShape : GeoShapeBase, ICircleGeoShape
 	{
 		public CircleGeoShape() : this(null) { }
 
-		public CircleGeoShape(GeoCoordinate location) : base("circle")
-		{
-			this.Coordinates = location;
-		}
+		public CircleGeoShape(GeoCoordinate location) : base("circle") => Coordinates = location;
 
 		public GeoCoordinate Coordinates { get; set; }
 
diff --git a/src/Nest/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQuery.cs b/src/Nest/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQuery.cs
index 16d2ef0562f..6651702724d 100644
--- a/src/Nest/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQuery.cs
@@ -12,7 +12,6 @@ public interface IGeoShapeCircleQuery : IGeoShapeQuery
 	public class GeoShapeCircleQuery : GeoShapeQueryBase, IGeoShapeCircleQuery
 	{
 		private ICircleGeoShape _shape;
-		protected override bool Conditionless => IsConditionless(this);
 
 		public ICircleGeoShape Shape
 		{
@@ -30,6 +29,8 @@ public ICircleGeoShape Shape
 			}
 		}
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
 
 		internal static bool IsConditionless(IGeoShapeCircleQuery q) => q.Field.IsConditionless() || q.Shape?.Coordinates == null;
@@ -37,7 +38,7 @@ public ICircleGeoShape Shape
 
 	public class GeoShapeCircleQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapeCircleQueryDescriptor<T>, IGeoShapeCircleQuery, T>
-		, IGeoShapeCircleQuery where T : class
+			, IGeoShapeCircleQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeCircleQuery.IsConditionless(this);
 		ICircleGeoShape IGeoShapeCircleQuery.Shape { get; set; }
diff --git a/src/Nest/QueryDsl/Geo/Shape/Envelope/EnvelopeGeoShape.cs b/src/Nest/QueryDsl/Geo/Shape/Envelope/EnvelopeGeoShape.cs
index 96f56ee1c6c..218b47f56c1 100644
--- a/src/Nest/QueryDsl/Geo/Shape/Envelope/EnvelopeGeoShape.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/Envelope/EnvelopeGeoShape.cs
@@ -14,7 +14,7 @@ public class EnvelopeGeoShape : GeoShapeBase, IEnvelopeGeoShape
 		public EnvelopeGeoShape() : this(null) { }
 
 		public EnvelopeGeoShape(IEnumerable<GeoCoordinate> coordinates) : base("envelope") =>
-			this.Coordinates = coordinates;
+			Coordinates = coordinates;
 
 		public IEnumerable<GeoCoordinate> Coordinates { get; set; }
 	}
diff --git a/src/Nest/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQuery.cs b/src/Nest/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQuery.cs
index 92ccfd8a715..0a9248f2a99 100644
--- a/src/Nest/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQuery.cs
@@ -13,7 +13,6 @@ public interface IGeoShapeEnvelopeQuery : IGeoShapeQuery
 	public class GeoShapeEnvelopeQuery : GeoShapeQueryBase, IGeoShapeEnvelopeQuery
 	{
 		private IEnvelopeGeoShape _shape;
-		protected override bool Conditionless => IsConditionless(this);
 
 		public IEnvelopeGeoShape Shape
 		{
@@ -31,13 +30,17 @@ public IEnvelopeGeoShape Shape
 			}
 		}
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
-		internal static bool IsConditionless(IGeoShapeEnvelopeQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
+
+		internal static bool IsConditionless(IGeoShapeEnvelopeQuery q) =>
+			q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
 	public class GeoShapeEnvelopeQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapeEnvelopeQueryDescriptor<T>, IGeoShapeEnvelopeQuery, T>
-		, IGeoShapeEnvelopeQuery where T : class
+			, IGeoShapeEnvelopeQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeEnvelopeQuery.IsConditionless(this);
 		IEnvelopeGeoShape IGeoShapeEnvelopeQuery.Shape { get; set; }
diff --git a/src/Nest/QueryDsl/Geo/Shape/GeoShapeBase.cs b/src/Nest/QueryDsl/Geo/Shape/GeoShapeBase.cs
index 3852534b80c..e0753bc36a4 100644
--- a/src/Nest/QueryDsl/Geo/Shape/GeoShapeBase.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/GeoShapeBase.cs
@@ -6,15 +6,9 @@
 
 namespace Nest
 {
-	[ContractJsonConverterAttribute(typeof(GeoShapeConverter))]
+	[ContractJsonConverter(typeof(GeoShapeConverter))]
 	public interface IGeoShape
 	{
-		/// <summary>
-		/// The type of geo shape
-		/// </summary>
-		[JsonProperty("type")]
-		string Type { get; }
-
 		/// <summary>
 		/// Will ignore an unmapped field and will not match any documents for this query.
 		/// This can be useful when querying multiple indexes which might have different mappings.
@@ -22,6 +16,12 @@ public interface IGeoShape
 		[JsonProperty("ignore_unmapped")]
 		[Obsolete("Removed in NEST 7.x. Use IgnoreUnmapped on IGeoShapeQuery")]
 		bool? IgnoreUnmapped { get; set; }
+
+		/// <summary>
+		/// The type of geo shape
+		/// </summary>
+		[JsonProperty("type")]
+		string Type { get; }
 	}
 
 	internal enum GeoShapeFormat
@@ -32,32 +32,31 @@ internal enum GeoShapeFormat
 
 	internal static class GeoShapeType
 	{
-		public const string Point = "POINT";
-		public const string MultiPoint = "MULTIPOINT";
-		public const string LineString = "LINESTRING";
-		public const string MultiLineString = "MULTILINESTRING";
-		public const string Polygon = "POLYGON";
-		public const string MultiPolygon = "MULTIPOLYGON";
+		// WKT uses BBOX for envelope geo shape
+		public const string BoundingBox = "BBOX";
 		public const string Circle = "CIRCLE";
 		public const string Envelope = "ENVELOPE";
 		public const string GeometryCollection = "GEOMETRYCOLLECTION";
-
-		// WKT uses BBOX for envelope geo shape
-		public const string BoundingBox = "BBOX";
+		public const string LineString = "LINESTRING";
+		public const string MultiLineString = "MULTILINESTRING";
+		public const string MultiPoint = "MULTIPOINT";
+		public const string MultiPolygon = "MULTIPOLYGON";
+		public const string Point = "POINT";
+		public const string Polygon = "POLYGON";
 	}
 
 	public abstract class GeoShapeBase : IGeoShape
 	{
-		internal GeoShapeFormat Format { get; set; }
+		protected GeoShapeBase(string type) => Type = type;
 
-	    protected GeoShapeBase(string type) => this.Type = type;
+		/// <inheritdoc />
+		[Obsolete("Removed in NEST 7.x. Use IgnoreUnmapped on IGeoShapeQuery")]
+		public bool? IgnoreUnmapped { get; set; }
 
 		/// <inheritdoc />
 		public string Type { get; protected set; }
 
-		/// <inheritdoc />
-		[Obsolete("Removed in NEST 7.x. Use IgnoreUnmapped on IGeoShapeQuery")]
-		public bool? IgnoreUnmapped { get; set; }
+		internal GeoShapeFormat Format { get; set; }
 	}
 
 	internal class GeoShapeConverter : JsonConverter
@@ -201,13 +200,13 @@ private static MultiPolygonGeoShape ParseMultiPolygonGeoShape(JToken shape, Json
 			};
 
 		private static PolygonGeoShape ParsePolygonGeoShape(JToken shape, JsonSerializer serializer) =>
-			new PolygonGeoShape {Coordinates = GetCoordinates<IEnumerable<IEnumerable<GeoCoordinate>>>(shape, serializer)};
+			new PolygonGeoShape { Coordinates = GetCoordinates<IEnumerable<IEnumerable<GeoCoordinate>>>(shape, serializer) };
 
 		private static MultiPointGeoShape ParseMultiPointGeoShape(JToken shape, JsonSerializer serializer) =>
-			new MultiPointGeoShape {Coordinates = GetCoordinates<IEnumerable<GeoCoordinate>>(shape, serializer)};
+			new MultiPointGeoShape { Coordinates = GetCoordinates<IEnumerable<GeoCoordinate>>(shape, serializer) };
 
 		private static PointGeoShape ParsePointGeoShape(JToken shape, JsonSerializer serializer) =>
-			new PointGeoShape {Coordinates = GetCoordinates<GeoCoordinate>(shape, serializer)};
+			new PointGeoShape { Coordinates = GetCoordinates<GeoCoordinate>(shape, serializer) };
 
 		private static MultiLineStringGeoShape ParseMultiLineStringGeoShape(JToken shape, JsonSerializer serializer) =>
 			new MultiLineStringGeoShape
@@ -216,10 +215,10 @@ private static MultiLineStringGeoShape ParseMultiLineStringGeoShape(JToken shape
 			};
 
 		private static LineStringGeoShape ParseLineStringGeoShape(JToken shape, JsonSerializer serializer) =>
-			new LineStringGeoShape {Coordinates = GetCoordinates<IEnumerable<GeoCoordinate>>(shape, serializer)};
+			new LineStringGeoShape { Coordinates = GetCoordinates<IEnumerable<GeoCoordinate>>(shape, serializer) };
 
 		private static EnvelopeGeoShape ParseEnvelopeGeoShape(JToken shape, JsonSerializer serializer) =>
-			new EnvelopeGeoShape {Coordinates = GetCoordinates<IEnumerable<GeoCoordinate>>(shape, serializer)};
+			new EnvelopeGeoShape { Coordinates = GetCoordinates<IEnumerable<GeoCoordinate>>(shape, serializer) };
 
 		private static CircleGeoShape ParseCircleGeoShape(JToken shape, JsonSerializer serializer) =>
 			new CircleGeoShape
diff --git a/src/Nest/QueryDsl/Geo/Shape/GeoShapeQueryJsonConverter.cs b/src/Nest/QueryDsl/Geo/Shape/GeoShapeQueryJsonConverter.cs
index 992e46b2e7c..b1d04c43a0d 100644
--- a/src/Nest/QueryDsl/Geo/Shape/GeoShapeQueryJsonConverter.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/GeoShapeQueryJsonConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -12,7 +11,8 @@ namespace Nest
 	/// </summary>
 	internal class GeoShapeQueryFieldNameConverter : ReserializeJsonConverter<GeoShapeCircleQuery, IGeoShapeQuery>
 	{
-		private static readonly string[] SkipProperties = {"boost", "_name", "ignore_unmapped"};
+		private static readonly string[] SkipProperties = { "boost", "_name", "ignore_unmapped" };
+
 		protected override bool SkipWriteProperty(string propertyName) => SkipProperties.Contains(propertyName);
 
 		protected override void SerializeJson(JsonWriter writer, object value, IGeoShapeQuery castValue, JsonSerializer serializer)
@@ -32,17 +32,18 @@ protected override void SerializeJson(JsonWriter writer, object value, IGeoShape
 			if (boost != null) writer.WriteProperty(serializer, "boost", boost);
 			if (ignoreUnmapped != null) writer.WriteProperty(serializer, "ignore_unmapped", ignoreUnmapped);
 			writer.WritePropertyName(field);
-			this.Reserialize(writer, value, serializer);
+			Reserialize(writer, value, serializer);
 			writer.WriteEndObject();
 		}
 	}
 
 	internal class GeoShapeQueryJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		// TODO: remove in 7.x
 		public virtual T GetCoordinates<T>(JToken shape, JsonSerializer serializer)
 		{
@@ -58,9 +59,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			if (j == null || !j.HasValues) return null;
 
 			double? boost = null;
-			string name  = null;
+			string name = null;
 			bool? ignoreUnmapped = null;
-			if (j.TryGetValue("boost", out var boostToken) && (boostToken.Type != JTokenType.Array && boostToken.Type != JTokenType.Object))
+			if (j.TryGetValue("boost", out var boostToken) && boostToken.Type != JTokenType.Array && boostToken.Type != JTokenType.Object)
 			{
 				j.Remove("boost");
 				boost = boostToken.Value<double?>();
@@ -90,6 +91,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				query = ParseIndexedShapeQuery(indexedShape);
 
 			if (query == null) return null;
+
 			var relation = jo["relation"]?.Value<string>().ToEnum<GeoShapeRelation>();
 			query.Boost = boost;
 			query.Name = name;
@@ -100,7 +102,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		}
 
 		private static IGeoShapeQuery ParseIndexedShapeQuery(JToken indexedShape) =>
-			new GeoIndexedShapeQuery {IndexedShape = (indexedShape as JObject)?.ToObject<FieldLookup>()};
+			new GeoIndexedShapeQuery { IndexedShape = (indexedShape as JObject)?.ToObject<FieldLookup>() };
 
 		private static IGeoShapeQuery ParseShapeQuery(JToken shape, JsonSerializer serializer)
 		{
diff --git a/src/Nest/QueryDsl/Geo/Shape/GeometryCollection/GeoShapeGeometryCollectionQuery.cs b/src/Nest/QueryDsl/Geo/Shape/GeometryCollection/GeoShapeGeometryCollectionQuery.cs
index a696898cea9..145585d0323 100644
--- a/src/Nest/QueryDsl/Geo/Shape/GeometryCollection/GeoShapeGeometryCollectionQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/GeometryCollection/GeoShapeGeometryCollectionQuery.cs
@@ -11,8 +11,8 @@ public interface IGeoShapeGeometryCollectionQuery : IGeoShapeQuery
 
 	public class GeoShapeGeometryCollectionQuery : GeoShapeQueryBase, IGeoShapeGeometryCollectionQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public IGeometryCollection Shape { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
 
@@ -21,7 +21,7 @@ public class GeoShapeGeometryCollectionQuery : GeoShapeQueryBase, IGeoShapeGeome
 
 	public class GeoShapeGeometryCollectionQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapeGeometryCollectionQueryDescriptor<T>, IGeoShapeGeometryCollectionQuery, T>
-		, IGeoShapeGeometryCollectionQuery where T : class
+			, IGeoShapeGeometryCollectionQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeGeometryCollectionQuery.IsConditionless(this);
 
diff --git a/src/Nest/QueryDsl/Geo/Shape/GeometryCollection/GeometryCollection.cs b/src/Nest/QueryDsl/Geo/Shape/GeometryCollection/GeometryCollection.cs
index c12bbb395c2..783f5f2918b 100644
--- a/src/Nest/QueryDsl/Geo/Shape/GeometryCollection/GeometryCollection.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/GeometryCollection/GeometryCollection.cs
@@ -5,41 +5,41 @@
 namespace Nest
 {
 	/// <summary>
-	/// A geo shape representing a collection of <see cref="IGeoShape"/> geometries
+	/// A geo shape representing a collection of <see cref="IGeoShape" /> geometries
 	/// </summary>
 	[ContractJsonConverter(typeof(GeoShapeConverter))]
 	public interface IGeometryCollection
 	{
 		/// <summary>
-		/// The type of geo shape
+		/// A collection of <see cref="IGeoShape" /> geometries
 		/// </summary>
-		[JsonProperty("type")]
-		string Type { get; }
+		[JsonProperty("geometries")]
+		IEnumerable<IGeoShape> Geometries { get; set; }
 
 		/// <summary>
-		/// A collection of <see cref="IGeoShape"/> geometries
+		/// The type of geo shape
 		/// </summary>
-		[JsonProperty("geometries")]
-		IEnumerable<IGeoShape> Geometries { get; set; }
+		[JsonProperty("type")]
+		string Type { get; }
 	}
 
 	// TODO: IGeometryCollection should implement IGeoShape
-	/// <inheritdoc cref="IGeometryCollection"/>
+	/// <inheritdoc cref="IGeometryCollection" />
 	public class GeometryCollection : IGeometryCollection, IGeoShape
 	{
-		internal GeoShapeFormat Format { get; set; }
-
-		/// <inheritdoc />
-		public string Type => "geometrycollection";
-
 		/// <inheritdoc />
-		string IGeoShape.Type => this.Type;
+		public IEnumerable<IGeoShape> Geometries { get; set; }
 
 		/// <inheritdoc />
 		[Obsolete("Removed in NEST 7.x. Use IgnoreUnmapped on IGeoShapeQuery")]
 		public bool? IgnoreUnmapped { get; set; }
 
 		/// <inheritdoc />
-		public IEnumerable<IGeoShape> Geometries { get; set; }
+		public string Type => "geometrycollection";
+
+		internal GeoShapeFormat Format { get; set; }
+
+		/// <inheritdoc />
+		string IGeoShape.Type => Type;
 	}
 }
diff --git a/src/Nest/QueryDsl/Geo/Shape/IGeoShapeQuery.cs b/src/Nest/QueryDsl/Geo/Shape/IGeoShapeQuery.cs
index 63b8a4ebefa..f626818ebb7 100644
--- a/src/Nest/QueryDsl/Geo/Shape/IGeoShapeQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/IGeoShapeQuery.cs
@@ -3,30 +3,30 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (CompositeJsonConverter<GeoShapeQueryJsonConverter, GeoShapeQueryFieldNameConverter>))]
+	[JsonConverter(typeof(CompositeJsonConverter<GeoShapeQueryJsonConverter, GeoShapeQueryFieldNameConverter>))]
 	public interface IGeoShapeQuery : IFieldNameQuery
 	{
-		/// <summary>
-		/// Controls the spatial relation operator to use at search time.
-		/// </summary>
-		[JsonProperty("relation")]
-		GeoShapeRelation? Relation { get; set; }
-
 		/// <summary>
 		/// Will ignore an unmapped field and will not match any documents for this query.
 		/// This can be useful when querying multiple indexes which might have different mappings.
 		/// </summary>
 		[JsonProperty("ignore_unmapped")]
 		bool? IgnoreUnmapped { get; set; }
+
+		/// <summary>
+		/// Controls the spatial relation operator to use at search time.
+		/// </summary>
+		[JsonProperty("relation")]
+		GeoShapeRelation? Relation { get; set; }
 	}
 
 	public abstract class GeoShapeQueryBase : FieldNameQueryBase, IGeoShapeQuery
 	{
 		/// <inheritdoc />
-		public GeoShapeRelation? Relation { get; set; }
+		public bool? IgnoreUnmapped { get; set; }
 
 		/// <inheritdoc />
-		public bool? IgnoreUnmapped { get; set; }
+		public GeoShapeRelation? Relation { get; set; }
 	}
 
 	public abstract class GeoShapeQueryDescriptorBase<TDescriptor, TInterface, T>
@@ -35,13 +35,13 @@ public abstract class GeoShapeQueryDescriptorBase<TDescriptor, TInterface, T>
 		where TInterface : class, IGeoShapeQuery
 		where T : class
 	{
-		GeoShapeRelation? IGeoShapeQuery.Relation { get; set; }
 		bool? IGeoShapeQuery.IgnoreUnmapped { get; set; }
+		GeoShapeRelation? IGeoShapeQuery.Relation { get; set; }
 
-		/// <inheritdoc cref="IGeoShapeQuery.Relation"/>
+		/// <inheritdoc cref="IGeoShapeQuery.Relation" />
 		public TDescriptor Relation(GeoShapeRelation? relation) => Assign(a => a.Relation = relation);
 
-		/// <inheritdoc cref="IGeoShapeQuery.IgnoreUnmapped"/>
+		/// <inheritdoc cref="IGeoShapeQuery.IgnoreUnmapped" />
 		public TDescriptor IgnoreUnmapped(bool? ignoreUnmapped = true) => Assign(a => a.IgnoreUnmapped = ignoreUnmapped);
 	}
 }
diff --git a/src/Nest/QueryDsl/Geo/Shape/IndexedShape/GeoIndexedShapeQuery.cs b/src/Nest/QueryDsl/Geo/Shape/IndexedShape/GeoIndexedShapeQuery.cs
index d534dc94e33..aa6313dc68b 100644
--- a/src/Nest/QueryDsl/Geo/Shape/IndexedShape/GeoIndexedShapeQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/IndexedShape/GeoIndexedShapeQuery.cs
@@ -12,20 +12,20 @@ public interface IGeoIndexedShapeQuery : IGeoShapeQuery
 
 	public class GeoIndexedShapeQuery : GeoShapeQueryBase, IGeoIndexedShapeQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public IFieldLookup IndexedShape { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
 
 		internal static bool IsConditionless(IGeoIndexedShapeQuery q) =>
 			q.Field.IsConditionless() || q.IndexedShape == null
-			|| q.IndexedShape.Id == null | q.IndexedShape.Index == null || q.IndexedShape.Type == null
+			|| (q.IndexedShape.Id == null) | (q.IndexedShape.Index == null) || q.IndexedShape.Type == null
 			|| q.IndexedShape.Path == null;
 	}
 
 	public class GeoIndexedShapeQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoIndexedShapeQueryDescriptor<T>, IGeoIndexedShapeQuery, T>
-		, IGeoIndexedShapeQuery where T : class
+			, IGeoIndexedShapeQuery where T : class
 	{
 		protected override bool Conditionless => GeoIndexedShapeQuery.IsConditionless(this);
 		IFieldLookup IGeoIndexedShapeQuery.IndexedShape { get; set; }
diff --git a/src/Nest/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQuery.cs b/src/Nest/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQuery.cs
index 4c1e7ab301a..ded0a283ed0 100644
--- a/src/Nest/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQuery.cs
@@ -13,7 +13,6 @@ public interface IGeoShapeLineStringQuery : IGeoShapeQuery
 	public class GeoShapeLineStringQuery : GeoShapeQueryBase, IGeoShapeLineStringQuery
 	{
 		private ILineStringGeoShape _shape;
-		protected override bool Conditionless => IsConditionless(this);
 
 		public ILineStringGeoShape Shape
 		{
@@ -31,13 +30,17 @@ public ILineStringGeoShape Shape
 			}
 		}
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
-		internal static bool IsConditionless(IGeoShapeLineStringQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
+
+		internal static bool IsConditionless(IGeoShapeLineStringQuery q) =>
+			q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
 	public class GeoShapeLineStringQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapeLineStringQueryDescriptor<T>, IGeoShapeLineStringQuery, T>
-		, IGeoShapeLineStringQuery where T : class
+			, IGeoShapeLineStringQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeLineStringQuery.IsConditionless(this);
 		ILineStringGeoShape IGeoShapeLineStringQuery.Shape { get; set; }
diff --git a/src/Nest/QueryDsl/Geo/Shape/LineString/LineStringGeoShape.cs b/src/Nest/QueryDsl/Geo/Shape/LineString/LineStringGeoShape.cs
index 84b5a099f08..17a405ec663 100644
--- a/src/Nest/QueryDsl/Geo/Shape/LineString/LineStringGeoShape.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/LineString/LineStringGeoShape.cs
@@ -13,11 +13,8 @@ public class LineStringGeoShape : GeoShapeBase, ILineStringGeoShape
 	{
 		public LineStringGeoShape() : this(null) { }
 
-		public LineStringGeoShape(IEnumerable<GeoCoordinate> coordinates) 
-			: base("linestring") 
-		{
-			this.Coordinates = coordinates;
-		}
+		public LineStringGeoShape(IEnumerable<GeoCoordinate> coordinates)
+			: base("linestring") => Coordinates = coordinates;
 
 		public IEnumerable<GeoCoordinate> Coordinates { get; set; }
 	}
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQuery.cs b/src/Nest/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQuery.cs
index cdc76f5c267..7c1c5743fa2 100644
--- a/src/Nest/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQuery.cs
@@ -13,7 +13,6 @@ public interface IGeoShapeMultiLineStringQuery : IGeoShapeQuery
 	public class GeoShapeMultiLineStringQuery : GeoShapeQueryBase, IGeoShapeMultiLineStringQuery
 	{
 		private IMultiLineStringGeoShape _shape;
-		protected override bool Conditionless => IsConditionless(this);
 
 		public IMultiLineStringGeoShape Shape
 		{
@@ -31,18 +30,23 @@ public IMultiLineStringGeoShape Shape
 			}
 		}
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
-		internal static bool IsConditionless(IGeoShapeMultiLineStringQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
+
+		internal static bool IsConditionless(IGeoShapeMultiLineStringQuery q) =>
+			q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
 	public class GeoShapeMultiLineStringQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapeMultiLineStringQueryDescriptor<T>, IGeoShapeMultiLineStringQuery, T>
-		, IGeoShapeMultiLineStringQuery where T : class
+			, IGeoShapeMultiLineStringQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeMultiLineStringQuery.IsConditionless(this);
 		IMultiLineStringGeoShape IGeoShapeMultiLineStringQuery.Shape { get; set; }
 
-		public GeoShapeMultiLineStringQueryDescriptor<T> Coordinates(IEnumerable<IEnumerable<GeoCoordinate>> coordinates, bool? ignoreUnmapped = null) => Assign(a =>
+		public GeoShapeMultiLineStringQueryDescriptor<T>
+			Coordinates(IEnumerable<IEnumerable<GeoCoordinate>> coordinates, bool? ignoreUnmapped = null) => Assign(a =>
 		{
 			a.Shape = a.Shape ?? new MultiLineStringGeoShape();
 			a.Shape.Coordinates = coordinates;
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiLineString/MultiLineStringGeoShape.cs b/src/Nest/QueryDsl/Geo/Shape/MultiLineString/MultiLineStringGeoShape.cs
index e33c8cf9193..15e038b0417 100644
--- a/src/Nest/QueryDsl/Geo/Shape/MultiLineString/MultiLineStringGeoShape.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/MultiLineString/MultiLineStringGeoShape.cs
@@ -14,10 +14,7 @@ public class MultiLineStringGeoShape : GeoShapeBase, IMultiLineStringGeoShape
 		public MultiLineStringGeoShape() : this(null) { }
 
 		public MultiLineStringGeoShape(IEnumerable<IEnumerable<GeoCoordinate>> coordinates)
-			: base("multilinestring")
-		{
-			this.Coordinates = coordinates;
-		}
+			: base("multilinestring") => Coordinates = coordinates;
 
 		public IEnumerable<IEnumerable<GeoCoordinate>> Coordinates { get; set; }
 	}
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQuery.cs b/src/Nest/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQuery.cs
index f09dab665f3..351f30ede8b 100644
--- a/src/Nest/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQuery.cs
@@ -13,7 +13,6 @@ public interface IGeoShapeMultiPointQuery : IGeoShapeQuery
 	public class GeoShapeMultiPointQuery : GeoShapeQueryBase, IGeoShapeMultiPointQuery
 	{
 		private IMultiPointGeoShape _shape;
-		protected override bool Conditionless => IsConditionless(this);
 
 		public IMultiPointGeoShape Shape
 		{
@@ -31,13 +30,17 @@ public IMultiPointGeoShape Shape
 			}
 		}
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
-		internal static bool IsConditionless(IGeoShapeMultiPointQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
+
+		internal static bool IsConditionless(IGeoShapeMultiPointQuery q) =>
+			q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
 	public class GeoShapeMultiPointQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapeMultiPointQueryDescriptor<T>, IGeoShapeMultiPointQuery, T>
-		, IGeoShapeMultiPointQuery where T : class
+			, IGeoShapeMultiPointQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeMultiPointQuery.IsConditionless(this);
 		IMultiPointGeoShape IGeoShapeMultiPointQuery.Shape { get; set; }
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiPoint/MultiPointGeoShape.cs b/src/Nest/QueryDsl/Geo/Shape/MultiPoint/MultiPointGeoShape.cs
index 13cc7904c42..e11560530a4 100644
--- a/src/Nest/QueryDsl/Geo/Shape/MultiPoint/MultiPointGeoShape.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/MultiPoint/MultiPointGeoShape.cs
@@ -13,11 +13,8 @@ public class MultiPointGeoShape : GeoShapeBase, IMultiPointGeoShape
 	{
 		public MultiPointGeoShape() : this(null) { }
 
-		public MultiPointGeoShape(IEnumerable<GeoCoordinate> coordinates) 
-			: base("multipoint")
-		{
-			this.Coordinates = coordinates;
-		}
+		public MultiPointGeoShape(IEnumerable<GeoCoordinate> coordinates)
+			: base("multipoint") => Coordinates = coordinates;
 
 		public IEnumerable<GeoCoordinate> Coordinates { get; set; }
 	}
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQuery.cs b/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQuery.cs
index 87b4682c400..6211735f0af 100644
--- a/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQuery.cs
@@ -13,7 +13,6 @@ public interface IGeoShapeMultiPolygonQuery : IGeoShapeQuery
 	public class GeoShapeMultiPolygonQuery : GeoShapeQueryBase, IGeoShapeMultiPolygonQuery
 	{
 		private IMultiPolygonGeoShape _shape;
-		protected override bool Conditionless => IsConditionless(this);
 
 		public IMultiPolygonGeoShape Shape
 		{
@@ -31,25 +30,29 @@ public IMultiPolygonGeoShape Shape
 			}
 		}
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
-		internal static bool IsConditionless(IGeoShapeMultiPolygonQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
+
+		internal static bool IsConditionless(IGeoShapeMultiPolygonQuery q) =>
+			q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
 	public class GeoShapeMultiPolygonQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapeMultiPolygonQueryDescriptor<T>, IGeoShapeMultiPolygonQuery, T>
-		, IGeoShapeMultiPolygonQuery where T : class
+			, IGeoShapeMultiPolygonQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeMultiPolygonQuery.IsConditionless(this);
 		IMultiPolygonGeoShape IGeoShapeMultiPolygonQuery.Shape { get; set; }
 
-		public GeoShapeMultiPolygonQueryDescriptor<T> Coordinates(IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> coordinates, bool? ignoreUnmapped = null) =>
+		public GeoShapeMultiPolygonQueryDescriptor<T> Coordinates(IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> coordinates,
+			bool? ignoreUnmapped = null
+		) =>
 			Assign(a =>
 			{
 				a.Shape = a.Shape ?? new MultiPolygonGeoShape();
 				a.Shape.Coordinates = coordinates;
 				a.IgnoreUnmapped = ignoreUnmapped;
 			});
-
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/MultiPolygonGeoShape.cs b/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/MultiPolygonGeoShape.cs
index 0c8ee1a560d..eb0c195ba12 100644
--- a/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/MultiPolygonGeoShape.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/MultiPolygonGeoShape.cs
@@ -13,11 +13,8 @@ public class MultiPolygonGeoShape : GeoShapeBase, IMultiPolygonGeoShape
 	{
 		public MultiPolygonGeoShape() : this(null) { }
 
-		public MultiPolygonGeoShape(IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> coordinates) 
-			: base("multipolygon") 
-		{
-			this.Coordinates = coordinates;
-		}
+		public MultiPolygonGeoShape(IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> coordinates)
+			: base("multipolygon") => Coordinates = coordinates;
 
 		public IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> Coordinates { get; set; }
 	}
diff --git a/src/Nest/QueryDsl/Geo/Shape/Point/GeoShapePointQuery.cs b/src/Nest/QueryDsl/Geo/Shape/Point/GeoShapePointQuery.cs
index 59a7d08cba4..01f9414fbb5 100644
--- a/src/Nest/QueryDsl/Geo/Shape/Point/GeoShapePointQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/Point/GeoShapePointQuery.cs
@@ -12,7 +12,6 @@ public interface IGeoShapePointQuery : IGeoShapeQuery
 	public class GeoShapePointQuery : GeoShapeQueryBase, IGeoShapePointQuery
 	{
 		private IPointGeoShape _shape;
-		protected override bool Conditionless => IsConditionless(this);
 
 		public IPointGeoShape Shape
 		{
@@ -30,13 +29,16 @@ public IPointGeoShape Shape
 			}
 		}
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
+
 		internal static bool IsConditionless(IGeoShapePointQuery q) => q.Field.IsConditionless() || q.Shape?.Coordinates == null;
 	}
 
 	public class GeoShapePointQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapePointQueryDescriptor<T>, IGeoShapePointQuery, T>
-		, IGeoShapePointQuery where T : class
+			, IGeoShapePointQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapePointQuery.IsConditionless(this);
 		IPointGeoShape IGeoShapePointQuery.Shape { get; set; }
diff --git a/src/Nest/QueryDsl/Geo/Shape/Point/PointGeoShape.cs b/src/Nest/QueryDsl/Geo/Shape/Point/PointGeoShape.cs
index 7b97c80e022..e49bc93bef7 100644
--- a/src/Nest/QueryDsl/Geo/Shape/Point/PointGeoShape.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/Point/PointGeoShape.cs
@@ -12,11 +12,8 @@ public class PointGeoShape : GeoShapeBase, IPointGeoShape
 	{
 		public PointGeoShape() : this(null) { }
 
-		public PointGeoShape(GeoCoordinate coordinates) 
-			: base("point") 
-		{
-			this.Coordinates = coordinates;
-		}
+		public PointGeoShape(GeoCoordinate coordinates)
+			: base("point") => Coordinates = coordinates;
 
 		public GeoCoordinate Coordinates { get; set; }
 	}
diff --git a/src/Nest/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQuery.cs b/src/Nest/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQuery.cs
index 720661ae497..726f3c9e280 100644
--- a/src/Nest/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQuery.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQuery.cs
@@ -13,7 +13,6 @@ public interface IGeoShapePolygonQuery : IGeoShapeQuery
 	public class GeoShapePolygonQuery : GeoShapeQueryBase, IGeoShapePolygonQuery
 	{
 		private IPolygonGeoShape _shape;
-		protected override bool Conditionless => IsConditionless(this);
 
 		public IPolygonGeoShape Shape
 		{
@@ -31,13 +30,17 @@ public IPolygonGeoShape Shape
 			}
 		}
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
-		internal static bool IsConditionless(IGeoShapePolygonQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
+
+		internal static bool IsConditionless(IGeoShapePolygonQuery q) =>
+			q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
 	public class GeoShapePolygonQueryDescriptor<T>
 		: GeoShapeQueryDescriptorBase<GeoShapePolygonQueryDescriptor<T>, IGeoShapePolygonQuery, T>
-		, IGeoShapePolygonQuery where T : class
+			, IGeoShapePolygonQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapePolygonQuery.IsConditionless(this);
 		IPolygonGeoShape IGeoShapePolygonQuery.Shape { get; set; }
diff --git a/src/Nest/QueryDsl/Geo/Shape/Polygon/PolygonGeoShape.cs b/src/Nest/QueryDsl/Geo/Shape/Polygon/PolygonGeoShape.cs
index 93c2fd9bf3f..96573c63b09 100644
--- a/src/Nest/QueryDsl/Geo/Shape/Polygon/PolygonGeoShape.cs
+++ b/src/Nest/QueryDsl/Geo/Shape/Polygon/PolygonGeoShape.cs
@@ -13,11 +13,8 @@ public class PolygonGeoShape : GeoShapeBase, IPolygonGeoShape
 	{
 		public PolygonGeoShape() : this(null) { }
 
-		public PolygonGeoShape(IEnumerable<IEnumerable<GeoCoordinate>> coordinates) 
-			: base("polygon") 
-		{
-			this.Coordinates = coordinates;
-		}
+		public PolygonGeoShape(IEnumerable<IEnumerable<GeoCoordinate>> coordinates)
+			: base("polygon") => Coordinates = coordinates;
 
 		public IEnumerable<IEnumerable<GeoCoordinate>> Coordinates { get; set; }
 	}
diff --git a/src/Nest/QueryDsl/Geo/WKT/GeoWKTException.cs b/src/Nest/QueryDsl/Geo/WKT/GeoWKTException.cs
index 8c5dbf737da..fe72aa7a9dc 100644
--- a/src/Nest/QueryDsl/Geo/WKT/GeoWKTException.cs
+++ b/src/Nest/QueryDsl/Geo/WKT/GeoWKTException.cs
@@ -3,18 +3,14 @@
 namespace Nest
 {
 	/// <summary>
-	/// An exception when handling <see cref="IGeoShape"/> in Well-Known Text format
+	/// An exception when handling <see cref="IGeoShape" /> in Well-Known Text format
 	/// </summary>
 	public class GeoWKTException : Exception
 	{
 		public GeoWKTException(string message)
-			: base(message)
-		{
-		}
+			: base(message) { }
 
 		public GeoWKTException(string message, int lineNumber, int position)
-			: base($"{message} at line {lineNumber}, position {position}")
-		{
-		}
+			: base($"{message} at line {lineNumber}, position {position}") { }
 	}
 }
diff --git a/src/Nest/QueryDsl/Geo/WKT/GeoWKTReader.cs b/src/Nest/QueryDsl/Geo/WKT/GeoWKTReader.cs
index 19e1542109e..fa6a9cc1812 100644
--- a/src/Nest/QueryDsl/Geo/WKT/GeoWKTReader.cs
+++ b/src/Nest/QueryDsl/Geo/WKT/GeoWKTReader.cs
@@ -6,12 +6,12 @@
 namespace Nest
 {
 	/// <summary>
-	/// Reads Well-Known Text (WKT) into <see cref="IGeoShape"/> types
+	/// Reads Well-Known Text (WKT) into <see cref="IGeoShape" /> types
 	/// </summary>
 	public class GeoWKTReader
 	{
 		/// <summary>
-		/// Reads Well-Known Text (WKT) into a new instance of <see cref="IGeoShape"/>
+		/// Reads Well-Known Text (WKT) into a new instance of <see cref="IGeoShape" />
 		/// </summary>
 		public static IGeoShape Read(string wellKnownText)
 		{
@@ -147,7 +147,7 @@ private static EnvelopeGeoShape ParseBoundingBox(WellKnownTextTokenizer tokenize
 			NextComma(tokenizer);
 			var minLat = NextNumber(tokenizer);
 			NextCloser(tokenizer);
-			return new EnvelopeGeoShape(new [] { new GeoCoordinate(maxLat, minLon), new GeoCoordinate(minLat, maxLon) });
+			return new EnvelopeGeoShape(new[] { new GeoCoordinate(maxLat, minLon), new GeoCoordinate(minLat, maxLon) });
 		}
 
 		private static GeometryCollection ParseGeometryCollection(WellKnownTextTokenizer tokenizer)
@@ -186,7 +186,7 @@ private static List<GeoCoordinate> ParseCoordinates(WellKnownTextTokenizer token
 		{
 			var coordinates = new List<GeoCoordinate>();
 
-			if (IsNumberNext(tokenizer) || (tokenizer.NextToken() == TokenType.LParen))
+			if (IsNumberNext(tokenizer) || tokenizer.NextToken() == TokenType.LParen)
 				coordinates.Add(ParseCoordinate(tokenizer));
 
 			while (NextCloserOrComma(tokenizer) == TokenType.Comma)
@@ -238,7 +238,7 @@ private static TokenType NextEmptyOrOpen(WellKnownTextTokenizer tokenizer)
 		{
 			var token = tokenizer.NextToken();
 			if (token == TokenType.LParen ||
-			    token == TokenType.Word && tokenizer.TokenValue.Equals(WellKnownTextTokenizer.Empty, StringComparison.OrdinalIgnoreCase))
+				token == TokenType.Word && tokenizer.TokenValue.Equals(WellKnownTextTokenizer.Empty, StringComparison.OrdinalIgnoreCase))
 				return token;
 
 			throw new GeoWKTException(
@@ -265,9 +265,9 @@ private static double NextNumber(WellKnownTextTokenizer tokenizer)
 					return double.NaN;
 
 				if (double.TryParse(
-						tokenizer.TokenValue,
-						NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign,
-						CultureInfo.InvariantCulture, out var d))
+					tokenizer.TokenValue,
+					NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign,
+					CultureInfo.InvariantCulture, out var d))
 					return d;
 			}
 
@@ -308,38 +308,31 @@ internal enum TokenType : byte
 
 	/// <summary>
 	/// Tokenizes a sequence of characters into Well-Known Text
-	/// (WKT) <see cref="TokenType"/>
+	/// (WKT) <see cref="TokenType" />
 	/// </summary>
 	internal class WellKnownTextTokenizer : IDisposable
 	{
-		private const int NeedChar = int.MaxValue;
-		private const int CharacterTypesLength = 256;
-
-		public const int Linefeed = '\n';
 		public const int CarriageReturn = '\r';
-		public const int LParen = '(';
-		public const int RParen = ')';
+		private const int CharacterTypesLength = 256;
 		public const int Comma = ',';
 		public const int Comment = '#';
 		public const int Dot = '.';
-		public const int Plus = '+';
+		public const string Empty = "EMPTY";
+
+		public const int Linefeed = '\n';
+		public const int LParen = '(';
 		public const int Minus = '-';
 		public const string NaN = "NAN";
-		public const string Empty = "EMPTY";
+		private const int NeedChar = int.MaxValue;
+		public const int Plus = '+';
+		public const int RParen = ')';
 
 		private static readonly CharacterType[] CharacterTypes = new CharacterType[CharacterTypesLength];
+		private readonly List<char> _buffer = new List<char>();
 
-		private static void Chars(int low, int high, CharacterType type)
-		{
-			if (low < 0)
-				low = 0;
-
-			if (high >= CharacterTypesLength)
-				high = CharacterTypesLength - 1;
-
-			while (low <= high)
-				CharacterTypes[low++] = type;
-		}
+		private readonly TextReader _reader;
+		private int _peekChar = NeedChar;
+		private bool _pushed;
 
 		static WellKnownTextTokenizer()
 		{
@@ -358,24 +351,24 @@ static WellKnownTextTokenizer()
 			Chars(Comment, Comment, CharacterType.Comment);
 		}
 
-		private readonly TextReader _reader;
-		private readonly List<char> _buffer = new List<char>();
-		private bool _pushed;
-		private int _peekChar = NeedChar;
-
 		// TODO: use ReadOnlySpan<char> in future
 		public WellKnownTextTokenizer(TextReader reader) =>
 			_reader = reader ?? throw new ArgumentNullException(nameof(reader));
 
+		/// <summary>
+		/// Gets the current line number
+		/// </summary>
+		public int LineNumber { get; private set; } = 1;
+
 		/// <summary>
 		/// Gets the current position
 		/// </summary>
 		public int Position { get; private set; }
 
 		/// <summary>
-		/// Gets the current line number
+		/// Gets the current token type
 		/// </summary>
-		public int LineNumber { get; private set; } = 1;
+		public TokenType TokenType { get; private set; } = TokenType.None;
 
 		/// <summary>
 		/// Gets the current token value
@@ -383,9 +376,21 @@ public WellKnownTextTokenizer(TextReader reader) =>
 		public string TokenValue { get; private set; }
 
 		/// <summary>
-		/// Gets the current token type
+		/// Disposes of the reader from which characters are read
 		/// </summary>
-		public TokenType TokenType { get; private set; } = TokenType.None;
+		public void Dispose() => _reader?.Dispose();
+
+		private static void Chars(int low, int high, CharacterType type)
+		{
+			if (low < 0)
+				low = 0;
+
+			if (high >= CharacterTypesLength)
+				high = CharacterTypesLength - 1;
+
+			while (low <= high)
+				CharacterTypes[low++] = type;
+		}
 
 		/// <summary>
 		/// A user friendly string for the current token
@@ -521,7 +526,6 @@ public TokenType NextToken()
 						characterType = CharacterTypes[c];
 					else
 						characterType = CharacterType.Alpha;
-
 				} while (characterType == CharacterType.Alpha);
 
 				_peekChar = c;
@@ -566,9 +570,7 @@ public TokenType NextToken()
 			if (characterType == CharacterType.Comment)
 			{
 				// consume all characters on comment line
-				while ((c = Read()) != Linefeed && c != CarriageReturn && c >= 0)
-				{
-				}
+				while ((c = Read()) != Linefeed && c != CarriageReturn && c >= 0) { }
 
 				_peekChar = c;
 				return NextToken();
@@ -576,10 +578,5 @@ public TokenType NextToken()
 
 			return TokenType = TokenType.None;
 		}
-
-		/// <summary>
-		/// Disposes of the reader from which characters are read
-		/// </summary>
-		public void Dispose() => _reader?.Dispose();
 	}
 }
diff --git a/src/Nest/QueryDsl/Geo/WKT/GeoWKTWriter.cs b/src/Nest/QueryDsl/Geo/WKT/GeoWKTWriter.cs
index d0a658df21d..bc9b8865f6a 100644
--- a/src/Nest/QueryDsl/Geo/WKT/GeoWKTWriter.cs
+++ b/src/Nest/QueryDsl/Geo/WKT/GeoWKTWriter.cs
@@ -1,23 +1,22 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
 namespace Nest
 {
 	/// <summary>
-	/// Writes <see cref="IGeoShape"/> types to Well-Known Text (WKT)
+	/// Writes <see cref="IGeoShape" /> types to Well-Known Text (WKT)
 	/// </summary>
 	public class GeoWKTWriter
 	{
 		/// <summary>
-		/// Writes a <see cref="IGeoShape"/> to Well-Known Text (WKT)
+		/// Writes a <see cref="IGeoShape" /> to Well-Known Text (WKT)
 		/// </summary>
 		public static string Write(IGeoShape shape) =>
 			shape == null ? null : Write(shape, new StringBuilder());
 
 		/// <summary>
-		/// Writes a <see cref="IGeometryCollection"/> to Well-Known Text (WKT)
+		/// Writes a <see cref="IGeometryCollection" /> to Well-Known Text (WKT)
 		/// </summary>
 		// TODO: Remove in 7.x, where IGeometryCollection implements IGeoShape
 		public static string Write(IGeometryCollection collection)
diff --git a/src/Nest/QueryDsl/Joining/HasChild/ChildScoreMode.cs b/src/Nest/QueryDsl/Joining/HasChild/ChildScoreMode.cs
index 338c4563f51..72a16d25b68 100644
--- a/src/Nest/QueryDsl/Joining/HasChild/ChildScoreMode.cs
+++ b/src/Nest/QueryDsl/Joining/HasChild/ChildScoreMode.cs
@@ -9,12 +9,16 @@ public enum ChildScoreMode
 	{
 		[EnumMember(Value = "none")]
 		None,
+
 		[EnumMember(Value = "avg")]
 		Average,
+
 		[EnumMember(Value = "sum")]
 		Sum,
+
 		[EnumMember(Value = "max")]
 		Max,
+
 		[EnumMember(Value = "min")]
 		Min
 	}
diff --git a/src/Nest/QueryDsl/Joining/HasChild/HasChildQuery.cs b/src/Nest/QueryDsl/Joining/HasChild/HasChildQuery.cs
index f606f01f36f..ff4ad04b8b6 100644
--- a/src/Nest/QueryDsl/Joining/HasChild/HasChildQuery.cs
+++ b/src/Nest/QueryDsl/Joining/HasChild/HasChildQuery.cs
@@ -7,14 +7,11 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<HasChildQueryDescriptor<object>>))]
 	public interface IHasChildQuery : IQuery
 	{
-		[JsonProperty("type")]
-		TypeName Type { get; set; }
-
-		[JsonProperty("score_mode")]
-		ChildScoreMode? ScoreMode { get; set; }
+		[JsonProperty("ignore_unmapped")]
+		bool? IgnoreUnmapped { get; set; }
 
-		[JsonProperty("min_children")]
-		int? MinChildren { get; set; }
+		[JsonProperty("inner_hits")]
+		IInnerHits InnerHits { get; set; }
 
 		/// <summary>
 		/// Specify how many child documents are allowed to match.
@@ -22,56 +19,59 @@ public interface IHasChildQuery : IQuery
 		[JsonProperty("max_children")]
 		int? MaxChildren { get; set; }
 
+		[JsonProperty("min_children")]
+		int? MinChildren { get; set; }
+
 		[JsonProperty("query")]
 		QueryContainer Query { get; set; }
 
-		[JsonProperty("inner_hits")]
-		IInnerHits InnerHits { get; set; }
+		[JsonProperty("score_mode")]
+		ChildScoreMode? ScoreMode { get; set; }
 
-		[JsonProperty("ignore_unmapped")]
-		bool? IgnoreUnmapped { get; set; }
+		[JsonProperty("type")]
+		TypeName Type { get; set; }
 	}
 
 	public class HasChildQuery : QueryBase, IHasChildQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public TypeName Type { get; set; }
-		public ChildScoreMode? ScoreMode { get; set; }
-		public int? MinChildren { get; set; }
+		public bool? IgnoreUnmapped { get; set; }
+		public IInnerHits InnerHits { get; set; }
 
 		/// <summary>
 		/// Specify how many child documents are allowed to match.
 		/// </summary>
 		public int? MaxChildren { get; set; }
+
+		public int? MinChildren { get; set; }
 		public QueryContainer Query { get; set; }
-		public IInnerHits InnerHits { get; set; }
-		public bool? IgnoreUnmapped { get; set; }
+		public ChildScoreMode? ScoreMode { get; set; }
+		public TypeName Type { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.HasChild = this;
+
 		internal static bool IsConditionless(IHasChildQuery q) => q.Query == null || q.Query.IsConditionless || q.Type == null;
 	}
 
 	public class HasChildQueryDescriptor<T>
 		: QueryDescriptorBase<HasChildQueryDescriptor<T>, IHasChildQuery>
-		, IHasChildQuery where T : class
+			, IHasChildQuery where T : class
 	{
+		public HasChildQueryDescriptor() => ((IHasChildQuery)this).Type = TypeName.Create<T>();
+
 		protected override bool Conditionless => HasChildQuery.IsConditionless(this);
-		TypeName IHasChildQuery.Type { get; set; }
-		ChildScoreMode? IHasChildQuery.ScoreMode { get; set; }
-		int? IHasChildQuery.MinChildren { get; set; }
+		bool? IHasChildQuery.IgnoreUnmapped { get; set; }
+		IInnerHits IHasChildQuery.InnerHits { get; set; }
 
 		/// <summary>
 		/// Specify how many child documents are allowed to match.
 		/// </summary>
 		int? IHasChildQuery.MaxChildren { get; set; }
-		QueryContainer IHasChildQuery.Query { get; set; }
-		IInnerHits IHasChildQuery.InnerHits { get; set; }
-		bool? IHasChildQuery.IgnoreUnmapped { get; set; }
 
-		public HasChildQueryDescriptor()
-		{
-			((IHasChildQuery)this).Type = TypeName.Create<T>();
-		}
+		int? IHasChildQuery.MinChildren { get; set; }
+		QueryContainer IHasChildQuery.Query { get; set; }
+		ChildScoreMode? IHasChildQuery.ScoreMode { get; set; }
+		TypeName IHasChildQuery.Type { get; set; }
 
 		public HasChildQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> selector) =>
 			Assign(a => a.Query = selector?.Invoke(new QueryContainerDescriptor<T>()));
diff --git a/src/Nest/QueryDsl/Joining/HasParent/HasParentQuery.cs b/src/Nest/QueryDsl/Joining/HasParent/HasParentQuery.cs
index 4ea0ec3e5e9..31a74503b17 100644
--- a/src/Nest/QueryDsl/Joining/HasParent/HasParentQuery.cs
+++ b/src/Nest/QueryDsl/Joining/HasParent/HasParentQuery.cs
@@ -7,61 +7,66 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<HasParentQueryDescriptor<object>>))]
 	public interface IHasParentQuery : IQuery
 	{
+		[JsonProperty("ignore_unmapped")]
+		bool? IgnoreUnmapped { get; set; }
+
+		[JsonProperty("inner_hits")]
+		IInnerHits InnerHits { get; set; }
+
 		[JsonProperty("parent_type")]
 		TypeName ParentType { get; set; }
 
+		[JsonProperty("query")]
+		QueryContainer Query { get; set; }
+
 		/// <summary>
-		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent document.
+		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent
+		/// document.
 		/// The default is false which ignores the score from the parent document.
 		/// </summary>
 		[JsonProperty("score")]
 		bool? Score { get; set; }
-
-		[JsonProperty("query")]
-		QueryContainer Query { get; set; }
-
-		[JsonProperty("inner_hits")]
-		IInnerHits InnerHits { get; set; }
-
-		[JsonProperty("ignore_unmapped")]
-		bool? IgnoreUnmapped { get; set; }
 	}
 
 	public class HasParentQuery : QueryBase, IHasParentQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
+		public bool? IgnoreUnmapped { get; set; }
+		public IInnerHits InnerHits { get; set; }
 		public TypeName ParentType { get; set; }
+		public QueryContainer Query { get; set; }
 
 		/// <summary>
-		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent document.
+		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent
+		/// document.
 		/// The default is false which ignores the score from the parent document.
 		/// </summary>
-		public bool? Score{ get; set; }
-		public QueryContainer Query { get; set; }
-		public IInnerHits InnerHits { get; set; }
-		public bool? IgnoreUnmapped { get; set; }
+		public bool? Score { get; set; }
+
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.HasParent = this;
+
 		internal static bool IsConditionless(IHasParentQuery q) => q.Query == null || q.Query.IsConditionless || q.ParentType == null;
 	}
 
 	public class HasParentQueryDescriptor<T>
 		: QueryDescriptorBase<HasParentQueryDescriptor<T>, IHasParentQuery>
-		, IHasParentQuery where T : class
+			, IHasParentQuery where T : class
 	{
+		public HasParentQueryDescriptor() => Self.ParentType = TypeName.Create<T>();
+
 		protected override bool Conditionless => HasParentQuery.IsConditionless(this);
+		bool? IHasParentQuery.IgnoreUnmapped { get; set; }
+		IInnerHits IHasParentQuery.InnerHits { get; set; }
 		TypeName IHasParentQuery.ParentType { get; set; }
+		QueryContainer IHasParentQuery.Query { get; set; }
 
 		/// <summary>
-		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent document.
+		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent
+		/// document.
 		/// The default is false which ignores the score from the parent document.
 		/// </summary>
 		bool? IHasParentQuery.Score { get; set; }
-		IInnerHits IHasParentQuery.InnerHits { get; set; }
-		QueryContainer IHasParentQuery.Query { get; set; }
-		bool? IHasParentQuery.IgnoreUnmapped { get; set; }
-
-		public HasParentQueryDescriptor() { Self.ParentType = TypeName.Create<T>(); }
 
 		public HasParentQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> selector) =>
 			Assign(a => a.Query = selector?.Invoke(new QueryContainerDescriptor<T>()));
@@ -69,7 +74,8 @@ public HasParentQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, Query
 		public HasParentQueryDescriptor<T> ParentType(string type) => Assign(a => a.ParentType = type);
 
 		/// <summary>
-		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent document.
+		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent
+		/// document.
 		/// The default is false which ignores the score from the parent document.
 		/// </summary>
 		public HasParentQueryDescriptor<T> Score(bool? score = true) => Assign(a => a.Score = score);
diff --git a/src/Nest/QueryDsl/Joining/Nested/NestedQuery.cs b/src/Nest/QueryDsl/Joining/Nested/NestedQuery.cs
index 7780a4f6695..f3997620b3b 100644
--- a/src/Nest/QueryDsl/Joining/Nested/NestedQuery.cs
+++ b/src/Nest/QueryDsl/Joining/Nested/NestedQuery.cs
@@ -8,46 +8,47 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<NestedQueryDescriptor<object>>))]
 	public interface INestedQuery : IQuery
 	{
-		[JsonProperty("score_mode")]
-		NestedScoreMode? ScoreMode { get; set; }
+		[JsonProperty("ignore_unmapped")]
+		bool? IgnoreUnmapped { get; set; }
 
-		[JsonProperty("query")]
-		QueryContainer Query { get; set; }
+		[JsonProperty("inner_hits")]
+		IInnerHits InnerHits { get; set; }
 
 		[JsonProperty("path")]
 		Field Path { get; set; }
 
-		[JsonProperty("inner_hits")]
-		IInnerHits InnerHits { get; set; }
+		[JsonProperty("query")]
+		QueryContainer Query { get; set; }
 
-		[JsonProperty("ignore_unmapped")]
-		bool? IgnoreUnmapped { get; set; }
+		[JsonProperty("score_mode")]
+		NestedScoreMode? ScoreMode { get; set; }
 	}
 
 	public class NestedQuery : QueryBase, INestedQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public NestedScoreMode? ScoreMode { get; set; }
-		public QueryContainer Query { get; set; }
-		public Field Path { get; set; }
-		public IInnerHits InnerHits { get; set; }
 		public bool? IgnoreUnmapped { get; set; }
+		public IInnerHits InnerHits { get; set; }
+		public Field Path { get; set; }
+		public QueryContainer Query { get; set; }
+		public NestedScoreMode? ScoreMode { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Nested = this;
+
 		internal static bool IsConditionless(INestedQuery q) => q.Path == null || q.Query.IsConditionless();
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class NestedQueryDescriptor<T>
 		: QueryDescriptorBase<NestedQueryDescriptor<T>, INestedQuery>
-		, INestedQuery where T : class
+			, INestedQuery where T : class
 	{
 		protected override bool Conditionless => NestedQuery.IsConditionless(this);
-		NestedScoreMode? INestedQuery.ScoreMode { get; set; }
-		QueryContainer INestedQuery.Query { get; set; }
-		Field INestedQuery.Path { get; set; }
-		IInnerHits INestedQuery.InnerHits { get; set; }
 		bool? INestedQuery.IgnoreUnmapped { get; set; }
+		IInnerHits INestedQuery.InnerHits { get; set; }
+		Field INestedQuery.Path { get; set; }
+		QueryContainer INestedQuery.Query { get; set; }
+		NestedScoreMode? INestedQuery.ScoreMode { get; set; }
 
 		public NestedQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> selector) =>
 			Assign(a => a.Query = selector?.Invoke(new QueryContainerDescriptor<T>()));
diff --git a/src/Nest/QueryDsl/Joining/Nested/NestedScoreMode.cs b/src/Nest/QueryDsl/Joining/Nested/NestedScoreMode.cs
index 4f481567081..1c5aa084622 100644
--- a/src/Nest/QueryDsl/Joining/Nested/NestedScoreMode.cs
+++ b/src/Nest/QueryDsl/Joining/Nested/NestedScoreMode.cs
@@ -9,12 +9,16 @@ public enum NestedScoreMode
 	{
 		[EnumMember(Value = "avg")]
 		Average,
+
 		[EnumMember(Value = "sum")]
 		Sum,
+
 		[EnumMember(Value = "min")]
 		Min,
+
 		[EnumMember(Value = "max")]
 		Max,
+
 		[EnumMember(Value = "none")]
 		None
 	}
diff --git a/src/Nest/QueryDsl/Joining/ParentId/ParentIdQuery.cs b/src/Nest/QueryDsl/Joining/ParentId/ParentIdQuery.cs
index d4eb2a0493a..090df1e730b 100644
--- a/src/Nest/QueryDsl/Joining/ParentId/ParentIdQuery.cs
+++ b/src/Nest/QueryDsl/Joining/ParentId/ParentIdQuery.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -14,12 +9,6 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<ParentIdQuery>))]
 	public interface IParentIdQuery : IQuery
 	{
-		/// <summary>
-		/// The child type. This must be a type with _parent field.
-	    /// </summary>
-		[JsonProperty("type")]
-		RelationName Type { get; set; }
-
 		/// <summary>
 		/// The id of the parent document to get children for.
 		/// </summary>
@@ -32,34 +21,39 @@ public interface IParentIdQuery : IQuery
 		/// </summary>
 		[JsonProperty("ignore_unmapped")]
 		bool? IgnoreUnmapped { get; set; }
+
+		/// <summary>
+		/// The child type. This must be a type with _parent field.
+		/// </summary>
+		[JsonProperty("type")]
+		RelationName Type { get; set; }
 	}
 
 	public class ParentIdQuery : QueryBase, IParentIdQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-
-		internal override void InternalWrapInContainer(IQueryContainer c) => c.ParentId = this;
+		public Id Id { get; set; }
 
-		internal static bool IsConditionless(IParentIdQuery q) => q.Type.IsConditionless() || q.Id.IsConditionless();
+		public bool? IgnoreUnmapped { get; set; }
 
 		public RelationName Type { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
-		public Id Id { get; set; }
+		internal override void InternalWrapInContainer(IQueryContainer c) => c.ParentId = this;
 
-		public bool? IgnoreUnmapped { get; set; }
+		internal static bool IsConditionless(IParentIdQuery q) => q.Type.IsConditionless() || q.Id.IsConditionless();
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class ParentIdQueryDescriptor<T>
-	: QueryDescriptorBase<ParentIdQueryDescriptor<T>, IParentIdQuery>
-	, IParentIdQuery where T : class
+		: QueryDescriptorBase<ParentIdQueryDescriptor<T>, IParentIdQuery>
+			, IParentIdQuery where T : class
 	{
 		protected override bool Conditionless => ParentIdQuery.IsConditionless(this);
-
-		RelationName IParentIdQuery.Type { get; set; }
 		Id IParentIdQuery.Id { get; set; }
 		bool? IParentIdQuery.IgnoreUnmapped { get; set; }
 
+		RelationName IParentIdQuery.Type { get; set; }
+
 		public ParentIdQueryDescriptor<T> Id(Id id) => Assign(a => a.Id = id);
 
 		public ParentIdQueryDescriptor<T> Type(RelationName type) => Assign(a => a.Type = type);
diff --git a/src/Nest/QueryDsl/MatchAllQuery.cs b/src/Nest/QueryDsl/MatchAllQuery.cs
index a5707432bdc..87d6074a092 100644
--- a/src/Nest/QueryDsl/MatchAllQuery.cs
+++ b/src/Nest/QueryDsl/MatchAllQuery.cs
@@ -19,7 +19,7 @@ public interface IMatchAllQuery : IQuery
 	public class MatchAllQuery : QueryBase, IMatchAllQuery
 	{
 		/// <inheritdoc />
-		public string NormField { get;  set; }
+		public string NormField { get; set; }
 
 		protected override bool Conditionless => false;
 
@@ -28,7 +28,7 @@ public class MatchAllQuery : QueryBase, IMatchAllQuery
 
 	public class MatchAllQueryDescriptor
 		: QueryDescriptorBase<MatchAllQueryDescriptor, IMatchAllQuery>
-		, IMatchAllQuery
+			, IMatchAllQuery
 	{
 		protected override bool Conditionless => false;
 
diff --git a/src/Nest/QueryDsl/MatchNoneQuery.cs b/src/Nest/QueryDsl/MatchNoneQuery.cs
index bd9c14fa602..c38e9bdb2ca 100644
--- a/src/Nest/QueryDsl/MatchNoneQuery.cs
+++ b/src/Nest/QueryDsl/MatchNoneQuery.cs
@@ -4,9 +4,7 @@ namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<MatchNoneQuery>))]
-	public interface IMatchNoneQuery : IQuery
-	{
-	}
+	public interface IMatchNoneQuery : IQuery { }
 
 	public class MatchNoneQuery : QueryBase, IMatchNoneQuery
 	{
@@ -16,8 +14,8 @@ public class MatchNoneQuery : QueryBase, IMatchNoneQuery
 	}
 
 	public class MatchNoneQueryDescriptor
-	: QueryDescriptorBase<MatchNoneQueryDescriptor, IMatchNoneQuery>
-	, IMatchNoneQuery
+		: QueryDescriptorBase<MatchNoneQueryDescriptor, IMatchNoneQuery>
+			, IMatchNoneQuery
 	{
 		protected override bool Conditionless => false;
 	}
diff --git a/src/Nest/QueryDsl/MultiTermQueryRewrite/RewriteMultiTerm.cs b/src/Nest/QueryDsl/MultiTermQueryRewrite/RewriteMultiTerm.cs
index 26a7a2ef8e9..20f700e2357 100644
--- a/src/Nest/QueryDsl/MultiTermQueryRewrite/RewriteMultiTerm.cs
+++ b/src/Nest/QueryDsl/MultiTermQueryRewrite/RewriteMultiTerm.cs
@@ -18,6 +18,7 @@ public enum RewriteMultiTerm
 		/// </summary>
 		[EnumMember(Value = "constant_score")]
 		ConstantScore,
+
 		/// <summary>
 		/// A rewrite method that first translates each term into a should clause in a boolean query, and keeps the scores
 		///  as computed by the query. Note that typically such scores are meaningless to the user, and require non-trivial
@@ -26,6 +27,7 @@ public enum RewriteMultiTerm
 		/// </summary>
 		[EnumMember(Value = "scoring_boolean")]
 		ScoringBoolean,
+
 		/// <summary>
 		/// Similar to scoring_boolean except scores are not computed. Instead, each matching document receives a constant
 		///  score equal to the query’s boost. This rewrite method will hit too many clauses failure if it exceeds the
@@ -33,6 +35,7 @@ public enum RewriteMultiTerm
 		/// </summary>
 		[EnumMember(Value = "constant_score_boolean")]
 		ConstantScoreBoolean,
+
 		/// <summary>
 		/// A rewrite method that first translates each term into should clause in boolean query, and keeps the scores
 		/// as computed by the query. This rewrite method only uses the top scoring terms so it will not overflow boolean
@@ -40,6 +43,7 @@ public enum RewriteMultiTerm
 		/// </summary>
 		[EnumMember(Value = "top_terms_N")]
 		TopTermsN,
+
 		/// <summary>
 		/// A rewrite method that first translates each term into should clause in boolean query, but the scores are only
 		/// computed as the boost. This rewrite method only uses the top scoring terms so it will not overflow the boolean
@@ -47,6 +51,7 @@ public enum RewriteMultiTerm
 		/// </summary>
 		[EnumMember(Value = "top_terms_boost_N")]
 		TopTermsBoostN,
+
 		/// <summary>
 		/// A rewrite method that first translates each term into should clause in boolean query, but all term queries compute
 		///  scores as if they had the same frequency. In practice the frequency which is used is the maximum frequency of all
@@ -67,16 +72,6 @@ public class MultiTermQueryRewrite : IEquatable<MultiTermQueryRewrite>
 
 		private readonly string _value;
 
-		/// <summary>
-		/// The type of multi term rewrite to perform
-		/// </summary>
-		public RewriteMultiTerm Rewrite { get; }
-
-		/// <summary>
-		/// The size of the top scoring terms to use
-		/// </summary>
-		public int? Size { get; }
-
 		internal MultiTermQueryRewrite(RewriteMultiTerm rewrite, int? size = null)
 		{
 			switch (rewrite)
@@ -111,6 +106,18 @@ internal MultiTermQueryRewrite(RewriteMultiTerm rewrite, int? size = null)
 		/// </summary>
 		public static MultiTermQueryRewrite ConstantScore { get; } = new MultiTermQueryRewrite(RewriteMultiTerm.ConstantScore);
 
+		/// <summary>
+		/// Similar to scoring_boolean except scores are not computed. Instead, each matching document receives a constant
+		///  score equal to the query’s boost. This rewrite method will hit too many clauses failure if it exceeds the
+		/// boolean query limit (defaults to 1024).
+		/// </summary>
+		public static MultiTermQueryRewrite ConstantScoreBoolean { get; } = new MultiTermQueryRewrite(RewriteMultiTerm.ConstantScoreBoolean);
+
+		/// <summary>
+		/// The type of multi term rewrite to perform
+		/// </summary>
+		public RewriteMultiTerm Rewrite { get; }
+
 		/// <summary>
 		/// A rewrite method that first translates each term into a should clause in a boolean query, and keeps the scores
 		///  as computed by the query. Note that typically such scores are meaningless to the user, and require non-trivial
@@ -120,23 +127,33 @@ internal MultiTermQueryRewrite(RewriteMultiTerm rewrite, int? size = null)
 		public static MultiTermQueryRewrite ScoringBoolean { get; } = new MultiTermQueryRewrite(RewriteMultiTerm.ScoringBoolean);
 
 		/// <summary>
-		/// Similar to scoring_boolean except scores are not computed. Instead, each matching document receives a constant
-		///  score equal to the query’s boost. This rewrite method will hit too many clauses failure if it exceeds the
-		/// boolean query limit (defaults to 1024).
+		/// The size of the top scoring terms to use
 		/// </summary>
-		public static MultiTermQueryRewrite ConstantScoreBoolean { get; } = new MultiTermQueryRewrite(RewriteMultiTerm.ConstantScoreBoolean);
+		public int? Size { get; }
+
+		public bool Equals(MultiTermQueryRewrite other)
+		{
+			if (ReferenceEquals(null, other)) return false;
+			if (ReferenceEquals(this, other)) return true;
+
+			return Rewrite == other.Rewrite && Size == other.Size;
+		}
 
 		/// <summary>
 		/// A rewrite method that first translates each term into should clause in boolean query, and keeps the scores
 		/// as computed by the query. This rewrite method only uses the top scoring terms so it will not overflow boolean
-		///  max clause count. <param name="size" /> controls the size of the top scoring terms to use.
+		///  max clause count.
+		/// <param name="size" />
+		/// controls the size of the top scoring terms to use.
 		/// </summary>
 		public static MultiTermQueryRewrite TopTerms(int size) => new MultiTermQueryRewrite(RewriteMultiTerm.TopTermsN, size);
 
 		/// <summary>
 		/// A rewrite method that first translates each term into should clause in boolean query, but the scores are only
 		/// computed as the boost. This rewrite method only uses the top scoring terms so it will not overflow the boolean
-		///  max clause count. <param name="size" /> controls the size of the top scoring terms to use.
+		///  max clause count.
+		/// <param name="size" />
+		/// controls the size of the top scoring terms to use.
 		/// </summary>
 		public static MultiTermQueryRewrite TopTermsBoost(int size) => new MultiTermQueryRewrite(RewriteMultiTerm.TopTermsBoostN, size);
 
@@ -144,7 +161,8 @@ internal MultiTermQueryRewrite(RewriteMultiTerm rewrite, int? size = null)
 		/// A rewrite method that first translates each term into should clause in boolean query, but all term queries compute
 		///  scores as if they had the same frequency. In practice the frequency which is used is the maximum frequency of all
 		///  matching terms. This rewrite method only uses the top scoring terms so it will not overflow boolean max clause count.
-		/// <param name="size" /> controls the size of the top scoring terms to use.
+		/// <param name="size" />
+		/// controls the size of the top scoring terms to use.
 		/// </summary>
 		public static MultiTermQueryRewrite TopTermsBlendedFreqs(int size) => new MultiTermQueryRewrite(RewriteMultiTerm.TopTermsBlendedFreqsN, size);
 
@@ -185,14 +203,7 @@ internal static MultiTermQueryRewrite Create(string value)
 			}
 		}
 
-		public override string ToString() => this._value;
-
-		public bool Equals(MultiTermQueryRewrite other)
-		{
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return Rewrite == other.Rewrite && Size == other.Size;
-		}
+		public override string ToString() => _value;
 
 		public override bool Equals(object obj)
 		{
@@ -203,7 +214,7 @@ public override bool Equals(object obj)
 			if (value != null)
 				return string.Equals(value, _value);
 
-			return obj.GetType() == this.GetType() && Equals((MultiTermQueryRewrite)obj);
+			return obj.GetType() == GetType() && Equals((MultiTermQueryRewrite)obj);
 		}
 
 		public override int GetHashCode()
diff --git a/src/Nest/QueryDsl/NestSpecific/ConditionlessQuery.cs b/src/Nest/QueryDsl/NestSpecific/ConditionlessQuery.cs
index 83fbb2e9086..00be0974525 100644
--- a/src/Nest/QueryDsl/NestSpecific/ConditionlessQuery.cs
+++ b/src/Nest/QueryDsl/NestSpecific/ConditionlessQuery.cs
@@ -1,28 +1,24 @@
-
-using System;
+using System;
 
 namespace Nest
 {
 	public interface IConditionlessQuery : IQuery
 	{
-		QueryContainer Query { get; set; }
-
 		QueryContainer Fallback { get; set; }
-
+		QueryContainer Query { get; set; }
 	}
 
-	public class ConditionlessQueryDescriptor<T> 
+	public class ConditionlessQueryDescriptor<T>
 		: QueryDescriptorBase<ConditionlessQueryDescriptor<T>, IConditionlessQuery>
-		, IConditionlessQuery where T : class
+			, IConditionlessQuery where T : class
 	{
-		QueryContainer IConditionlessQuery.Query { get; set; }
+		protected override bool Conditionless => (Self.Query == null || Self.Query.IsConditionless)
+			&& (Self.Fallback == null || Self.Fallback.IsConditionless);
 
 		QueryContainer IConditionlessQuery.Fallback { get; set; }
+		QueryContainer IConditionlessQuery.Query { get; set; }
 
-		protected override bool Conditionless => (Self.Query == null || Self.Query.IsConditionless)
-										&& (Self.Fallback == null || Self.Fallback.IsConditionless);
-
-		public ConditionlessQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) => 
+		public ConditionlessQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) =>
 			Assign(a => a.Query = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
 
 		public ConditionlessQueryDescriptor<T> Fallback(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) =>
diff --git a/src/Nest/QueryDsl/NestSpecific/RawQuery.cs b/src/Nest/QueryDsl/NestSpecific/RawQuery.cs
index 60537190e18..3b4f2553d80 100644
--- a/src/Nest/QueryDsl/NestSpecific/RawQuery.cs
+++ b/src/Nest/QueryDsl/NestSpecific/RawQuery.cs
@@ -1,7 +1,4 @@
-
-using System;
-
-namespace Nest
+namespace Nest
 {
 	public interface IRawQuery : IQuery
 	{
@@ -11,28 +8,24 @@ public interface IRawQuery : IQuery
 	public class RawQuery : QueryBase, IRawQuery
 	{
 		public RawQuery() { }
-		public RawQuery(string rawQuery)
-		{
-			this.Raw = rawQuery;
-		}
+
+		public RawQuery(string rawQuery) => Raw = rawQuery;
+
 		public string Raw { get; set; }
 
-		protected override bool Conditionless => this.Raw.IsNullOrEmpty();
+		protected override bool Conditionless => Raw.IsNullOrEmpty();
+
 		internal override void InternalWrapInContainer(IQueryContainer container) => container.RawQuery = this;
 	}
 
-	public class RawQueryDescriptor : QueryDescriptorBase<RawQueryDescriptor, IRawQuery> , IRawQuery
+	public class RawQueryDescriptor : QueryDescriptorBase<RawQueryDescriptor, IRawQuery>, IRawQuery
 	{
-		string IRawQuery.Raw { get; set; }
-
-		public RawQueryDescriptor() {}
+		public RawQueryDescriptor() { }
 
-		public RawQueryDescriptor(string rawQuery)
-		{
-			Self.Raw = rawQuery;
-		}
+		public RawQueryDescriptor(string rawQuery) => Self.Raw = rawQuery;
 
 		protected override bool Conditionless => Self.Raw.IsNullOrEmpty();
+		string IRawQuery.Raw { get; set; }
 
 		public RawQueryDescriptor Raw(string rawQuery) =>
 			Assign(a => a.Raw = rawQuery);
diff --git a/src/Nest/QueryDsl/Operator.cs b/src/Nest/QueryDsl/Operator.cs
index 360df6d3fd1..a4c0956f036 100644
--- a/src/Nest/QueryDsl/Operator.cs
+++ b/src/Nest/QueryDsl/Operator.cs
@@ -9,6 +9,7 @@ public enum Operator
 	{
 		[EnumMember(Value = "and")]
 		And,
+
 		[EnumMember(Value = "or")]
 		Or
 	}
diff --git a/src/Nest/QueryDsl/Query.cs b/src/Nest/QueryDsl/Query.cs
index ce6289aff73..26a339ccace 100644
--- a/src/Nest/QueryDsl/Query.cs
+++ b/src/Nest/QueryDsl/Query.cs
@@ -53,7 +53,8 @@ public static QueryContainer GeoShapeEnvelope(Func<GeoShapeEnvelopeQueryDescript
 		public static QueryContainer GeoShapeLineString(Func<GeoShapeLineStringQueryDescriptor<T>, IGeoShapeLineStringQuery> selector) =>
 			new QueryContainerDescriptor<T>().GeoShapeLineString(selector);
 
-		public static QueryContainer GeoShapeMultiLineString(Func<GeoShapeMultiLineStringQueryDescriptor<T>, IGeoShapeMultiLineStringQuery> selector) =>
+		public static QueryContainer
+			GeoShapeMultiLineString(Func<GeoShapeMultiLineStringQueryDescriptor<T>, IGeoShapeMultiLineStringQuery> selector) =>
 			new QueryContainerDescriptor<T>().GeoShapeMultiLineString(selector);
 
 		public static QueryContainer GeoShapeMultiPoint(Func<GeoShapeMultiPointQueryDescriptor<T>, IGeoShapeMultiPointQuery> selector) =>
@@ -68,7 +69,9 @@ public static QueryContainer GeoShapePoint(Func<GeoShapePointQueryDescriptor<T>,
 		public static QueryContainer GeoShapePolygon(Func<GeoShapePolygonQueryDescriptor<T>, IGeoShapePolygonQuery> selector) =>
 			new QueryContainerDescriptor<T>().GeoShapePolygon(selector);
 
-		public static QueryContainer GeoShapeGeometryCollection(Func<GeoShapeGeometryCollectionQueryDescriptor<T>, IGeoShapeGeometryCollectionQuery> selector) =>
+		public static QueryContainer GeoShapeGeometryCollection(
+			Func<GeoShapeGeometryCollectionQueryDescriptor<T>, IGeoShapeGeometryCollectionQuery> selector
+		) =>
 			new QueryContainerDescriptor<T>().GeoShapeGeometryCollection(selector);
 
 		public static QueryContainer HasChild<TChild>(Func<HasChildQueryDescriptor<TChild>, IHasChildQuery> selector) where TChild : class =>
@@ -110,10 +113,13 @@ public static QueryContainer ParentId(Func<ParentIdQueryDescriptor<T>, IParentId
 		public static QueryContainer Percolate(Func<PercolateQueryDescriptor<T>, IPercolateQuery> selector) =>
 			new QueryContainerDescriptor<T>().Percolate(selector);
 
-		public static QueryContainer Prefix(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
+		public static QueryContainer Prefix(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null,
+			MultiTermQueryRewrite rewrite = null, string name = null
+		) =>
 			new QueryContainerDescriptor<T>().Prefix(fieldDescriptor, value, boost, rewrite, name);
 
-		public static QueryContainer Prefix(Field field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
+		public static QueryContainer Prefix(Field field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null
+		) =>
 			new QueryContainerDescriptor<T>().Prefix(field, value, boost, rewrite, name);
 
 		public static QueryContainer Prefix(Func<PrefixQueryDescriptor<T>, IPrefixQuery> selector) =>
@@ -187,10 +193,14 @@ public static QueryContainer Type(Func<TypeQueryDescriptor, ITypeQuery> selector
 
 		public static QueryContainer Type<TOther>() => Type(q => q.Value<TOther>());
 
-		public static QueryContainer Wildcard(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
+		public static QueryContainer Wildcard(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null,
+			MultiTermQueryRewrite rewrite = null, string name = null
+		) =>
 			new QueryContainerDescriptor<T>().Wildcard(fieldDescriptor, value, boost, rewrite, name);
 
-		public static QueryContainer Wildcard(Field field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
+		public static QueryContainer Wildcard(Field field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null,
+			string name = null
+		) =>
 			new QueryContainerDescriptor<T>().Wildcard(field, value, boost, rewrite, name);
 
 		public static QueryContainer Wildcard(Func<WildcardQueryDescriptor<T>, IWildcardQuery> selector) =>
diff --git a/src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs b/src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs
index 76f909f97e8..dcf3056f7ef 100644
--- a/src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs
+++ b/src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs
@@ -7,46 +7,45 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SpanContainingQuery>))]
 	public interface ISpanContainingQuery : ISpanSubQuery
 	{
-		[JsonProperty("little")]
-		ISpanQuery Little { get; set; }
-
 		[JsonProperty("big")]
 		ISpanQuery Big { get; set; }
 
+		[JsonProperty("little")]
+		ISpanQuery Little { get; set; }
 	}
 
 	public class SpanContainingQuery : QueryBase, ISpanContainingQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public ISpanQuery Little { get; set; }
 		public ISpanQuery Big { get; set; }
+		public ISpanQuery Little { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanContaining = this;
+
 		internal static bool IsConditionless(ISpanContainingQuery q)
 		{
 			var exclude = q.Little as IQuery;
 			var include = q.Big as IQuery;
 
-			return (exclude == null && include == null)
-				|| (include == null && exclude.Conditionless)
-				|| (exclude == null && include.Conditionless)
-				|| (exclude != null && exclude.Conditionless && include != null && include.Conditionless);
+			return exclude == null && include == null
+				|| include == null && exclude.Conditionless
+				|| exclude == null && include.Conditionless
+				|| exclude != null && exclude.Conditionless && include != null && include.Conditionless;
 		}
 	}
 
 	public class SpanContainingQueryDescriptor<T>
 		: QueryDescriptorBase<SpanContainingQueryDescriptor<T>, ISpanContainingQuery>
-		, ISpanContainingQuery where T : class
+			, ISpanContainingQuery where T : class
 	{
 		protected override bool Conditionless => SpanContainingQuery.IsConditionless(this);
-		ISpanQuery ISpanContainingQuery.Little { get; set; }
 		ISpanQuery ISpanContainingQuery.Big { get; set; }
+		ISpanQuery ISpanContainingQuery.Little { get; set; }
 
 		public SpanContainingQueryDescriptor<T> Little(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
 			Assign(a => a.Little = selector(new SpanQueryDescriptor<T>()));
 
 		public SpanContainingQueryDescriptor<T> Big(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
 			Assign(a => a.Big = selector(new SpanQueryDescriptor<T>()));
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Span/FieldMasking/SpanFieldMaskingQuery.cs b/src/Nest/QueryDsl/Span/FieldMasking/SpanFieldMaskingQuery.cs
index 2171f3a4c8c..f0741557e38 100644
--- a/src/Nest/QueryDsl/Span/FieldMasking/SpanFieldMaskingQuery.cs
+++ b/src/Nest/QueryDsl/Span/FieldMasking/SpanFieldMaskingQuery.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -21,22 +17,23 @@ public interface ISpanFieldMaskingQuery : ISpanSubQuery
 
 	public class SpanFieldMaskingQuery : QueryBase, ISpanFieldMaskingQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public ISpanQuery Query { get; set; }
 		public Field Field { get; set; }
+		public ISpanQuery Query { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanFieldMasking = this;
+
 		internal static bool IsConditionless(ISpanFieldMaskingQuery q) =>
 			q.Field.IsConditionless() || q.Query == null || q.Query.Conditionless;
 	}
 
 	public class SpanFieldMaskingQueryDescriptor<T>
 		: QueryDescriptorBase<SpanFieldMaskingQueryDescriptor<T>, ISpanFieldMaskingQuery>
-		, ISpanFieldMaskingQuery where T : class
+			, ISpanFieldMaskingQuery where T : class
 	{
 		protected override bool Conditionless => SpanFieldMaskingQuery.IsConditionless(this);
-		ISpanQuery ISpanFieldMaskingQuery.Query { get; set; }
 		Field ISpanFieldMaskingQuery.Field { get; set; }
+		ISpanQuery ISpanFieldMaskingQuery.Query { get; set; }
 
 		public SpanFieldMaskingQueryDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
diff --git a/src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs b/src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs
index af02740d554..03b3315b988 100644
--- a/src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs
+++ b/src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs
@@ -7,30 +7,31 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SpanFirstQueryDescriptor<object>>))]
 	public interface ISpanFirstQuery : ISpanSubQuery
 	{
-		[JsonProperty("match")]
-		ISpanQuery Match { get; set; }
-
 		[JsonProperty("end")]
 		int? End { get; set; }
+
+		[JsonProperty("match")]
+		ISpanQuery Match { get; set; }
 	}
 
 	public class SpanFirstQuery : QueryBase, ISpanFirstQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public ISpanQuery Match { get; set; }
 		public int? End { get; set; }
+		public ISpanQuery Match { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanFirst = this;
+
 		internal static bool IsConditionless(ISpanFirstQuery q) => q.Match == null || q.Match.Conditionless;
 	}
 
 	public class SpanFirstQueryDescriptor<T>
 		: QueryDescriptorBase<SpanFirstQueryDescriptor<T>, ISpanFirstQuery>
-		, ISpanFirstQuery where T : class
+			, ISpanFirstQuery where T : class
 	{
 		protected override bool Conditionless => SpanFirstQuery.IsConditionless(this);
-		ISpanQuery ISpanFirstQuery.Match { get; set; }
 		int? ISpanFirstQuery.End { get; set; }
+		ISpanQuery ISpanFirstQuery.Match { get; set; }
 
 		public SpanFirstQueryDescriptor<T> Match(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
 			Assign(a => a.Match = selector(new SpanQueryDescriptor<T>()));
diff --git a/src/Nest/QueryDsl/Span/Gap/SpanGapQuery.cs b/src/Nest/QueryDsl/Span/Gap/SpanGapQuery.cs
index 4d07033a059..c3d1e2c7a8e 100644
--- a/src/Nest/QueryDsl/Span/Gap/SpanGapQuery.cs
+++ b/src/Nest/QueryDsl/Span/Gap/SpanGapQuery.cs
@@ -14,16 +14,14 @@ public interface ISpanGapQuery : ISpanSubQuery
 
 	public class SpanGapQuery : QueryBase, ISpanGapQuery
 	{
-		protected override bool Conditionless => SpanGapQuery.IsConditionless(this);
-
-		internal static bool IsConditionless(ISpanGapQuery q) => q?.Width == null || q.Field.IsConditionless();
-
 		public Field Field { get; set; }
 		public int? Width { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
+
+		internal static bool IsConditionless(ISpanGapQuery q) => q?.Width == null || q.Field.IsConditionless();
 
 		internal override void InternalWrapInContainer(IQueryContainer c) =>
 			throw new Exception("span_gap may only appear as a span near clause");
-
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
@@ -47,6 +45,7 @@ internal class SpanGapQueryJsonConverter : JsonConverter
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => typeof(ISpanGapQuery).IsAssignableFrom(objectType);
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
@@ -68,12 +67,12 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject) return null;
+
 			reader.Read();
 			var field = (Field)reader.Value.ToString(); // field
 			var width = reader.ReadAsInt32();
 			reader.Read();
-			return new SpanGapQuery {Field = field, Width = width};
+			return new SpanGapQuery { Field = field, Width = width };
 		}
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Span/ISpanSubQuery.cs b/src/Nest/QueryDsl/Span/ISpanSubQuery.cs
index c53d09ef9ce..805e2c8d4ea 100644
--- a/src/Nest/QueryDsl/Span/ISpanSubQuery.cs
+++ b/src/Nest/QueryDsl/Span/ISpanSubQuery.cs
@@ -1,4 +1,4 @@
 namespace Nest
 {
-	public interface ISpanSubQuery : IQuery {}
-}
\ No newline at end of file
+	public interface ISpanSubQuery : IQuery { }
+}
diff --git a/src/Nest/QueryDsl/Span/MultiTerm/SpanMultiTermQuery.cs b/src/Nest/QueryDsl/Span/MultiTerm/SpanMultiTermQuery.cs
index 16e28bc6b8d..5f4a11f1c93 100644
--- a/src/Nest/QueryDsl/Span/MultiTerm/SpanMultiTermQuery.cs
+++ b/src/Nest/QueryDsl/Span/MultiTerm/SpanMultiTermQuery.cs
@@ -13,16 +13,17 @@ public interface ISpanMultiTermQuery : ISpanSubQuery
 
 	public class SpanMultiTermQuery : QueryBase, ISpanMultiTermQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public QueryContainer Match { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanMultiTerm = this;
+
 		internal static bool IsConditionless(ISpanMultiTermQuery q) => q.Match == null || q.Match.IsConditionless;
 	}
 
-	public class SpanMultiTermQueryDescriptor<T> 
+	public class SpanMultiTermQueryDescriptor<T>
 		: QueryDescriptorBase<SpanMultiTermQueryDescriptor<T>, ISpanMultiTermQuery>
-		, ISpanMultiTermQuery
+			, ISpanMultiTermQuery
 		where T : class
 	{
 		protected override bool Conditionless => SpanMultiTermQuery.IsConditionless(this);
diff --git a/src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs b/src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs
index bdd5db8b907..43b03e7fba1 100644
--- a/src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs
+++ b/src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs
@@ -12,44 +12,46 @@ public interface ISpanNearQuery : ISpanSubQuery
 		[JsonProperty("clauses")]
 		IEnumerable<ISpanQuery> Clauses { get; set; }
 
-		[JsonProperty("slop")]
-		int? Slop { get; set; }
-
 		[JsonProperty("in_order")]
 		bool? InOrder { get; set; }
+
+		[JsonProperty("slop")]
+		int? Slop { get; set; }
 	}
 
 	public class SpanNearQuery : QueryBase, ISpanNearQuery
 	{
-		protected override bool Conditionless => SpanNearQuery.IsConditionless(this);
 		public IEnumerable<ISpanQuery> Clauses { get; set; }
-		public int? Slop { get; set; }
 		public bool? InOrder { get; set; }
+		public int? Slop { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanNear = this;
+
 		internal static bool IsConditionless(ISpanNearQuery q) => !q.Clauses.HasAny() || q.Clauses.Cast<IQuery>().All(qq => qq.Conditionless);
 	}
 
 	public class SpanNearQueryDescriptor<T>
 		: QueryDescriptorBase<SpanNearQueryDescriptor<T>, ISpanNearQuery>
-		, ISpanNearQuery where T : class
+			, ISpanNearQuery where T : class
 	{
 		protected override bool Conditionless => SpanNearQuery.IsConditionless(this);
 		IEnumerable<ISpanQuery> ISpanNearQuery.Clauses { get; set; }
-		int? ISpanNearQuery.Slop { get; set; }
 		bool? ISpanNearQuery.InOrder { get; set; }
+		int? ISpanNearQuery.Slop { get; set; }
 
-		public SpanNearQueryDescriptor<T> Clauses(params Func<SpanQueryDescriptor<T>, SpanQueryDescriptor<T>>[] selectors) => Clauses(selectors.ToList());
+		public SpanNearQueryDescriptor<T> Clauses(params Func<SpanQueryDescriptor<T>, SpanQueryDescriptor<T>>[] selectors) =>
+			Clauses(selectors.ToList());
 
 		public SpanNearQueryDescriptor<T> Clauses(IEnumerable<Func<SpanQueryDescriptor<T>, SpanQueryDescriptor<T>>> selectors) => Assign(a =>
 		{
 			a.Clauses = selectors.Select(selector => selector?.Invoke(new SpanQueryDescriptor<T>()))
-				.Where(query => query != null && !((IQuery) query).Conditionless).ToListOrNullIfEmpty();
+				.Where(query => query != null && !((IQuery)query).Conditionless)
+				.ToListOrNullIfEmpty();
 		});
 
 		public SpanNearQueryDescriptor<T> Slop(int? slop) => Assign(a => a.Slop = slop);
 
 		public SpanNearQueryDescriptor<T> InOrder(bool? inOrder = true) => Assign(a => a.InOrder = inOrder);
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs b/src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs
index 7a017c814a9..b8cb1e42207 100644
--- a/src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs
+++ b/src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs
@@ -7,55 +7,55 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SpanNotQuery>))]
 	public interface ISpanNotQuery : ISpanSubQuery
 	{
-		[JsonProperty("include")]
-		ISpanQuery Include { get; set; }
+		[JsonProperty("dist")]
+		int? Dist { get; set; }
 
 		[JsonProperty("exclude")]
 		ISpanQuery Exclude { get; set; }
 
-		[JsonProperty("pre")]
-		int? Pre { get; set; }
+		[JsonProperty("include")]
+		ISpanQuery Include { get; set; }
 
 		[JsonProperty("post")]
 		int? Post { get; set; }
 
-		[JsonProperty("dist")]
-		int? Dist { get; set; }
-
+		[JsonProperty("pre")]
+		int? Pre { get; set; }
 	}
 
 	public class SpanNotQuery : QueryBase, ISpanNotQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public ISpanQuery Include { get; set; }
+		public int? Dist { get; set; }
 		public ISpanQuery Exclude { get; set; }
-		public int? Pre { get; set; }
+		public ISpanQuery Include { get; set; }
 		public int? Post { get; set; }
-		public int? Dist { get; set; }
+		public int? Pre { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanNot = this;
+
 		internal static bool IsConditionless(ISpanNotQuery q)
 		{
 			var exclude = q.Exclude as IQuery;
 			var include = q.Include as IQuery;
 
-			return (exclude == null && include == null)
-				|| (include == null && exclude.Conditionless)
-				|| (exclude == null && include.Conditionless)
-				|| (exclude != null && exclude.Conditionless && include != null && include.Conditionless);
+			return exclude == null && include == null
+				|| include == null && exclude.Conditionless
+				|| exclude == null && include.Conditionless
+				|| exclude != null && exclude.Conditionless && include != null && include.Conditionless;
 		}
 	}
 
 	public class SpanNotQueryDescriptor<T>
 		: QueryDescriptorBase<SpanNotQueryDescriptor<T>, ISpanNotQuery>
-		, ISpanNotQuery where T : class
+			, ISpanNotQuery where T : class
 	{
 		protected override bool Conditionless => SpanNotQuery.IsConditionless(this);
-		ISpanQuery ISpanNotQuery.Include { get; set; }
+		int? ISpanNotQuery.Dist { get; set; }
 		ISpanQuery ISpanNotQuery.Exclude { get; set; }
-		int? ISpanNotQuery.Pre { get; set; }
+		ISpanQuery ISpanNotQuery.Include { get; set; }
 		int? ISpanNotQuery.Post { get; set; }
-		int? ISpanNotQuery.Dist { get; set; }
+		int? ISpanNotQuery.Pre { get; set; }
 
 		public SpanNotQueryDescriptor<T> Include(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
 			Assign(a => a.Include = selector(new SpanQueryDescriptor<T>()));
diff --git a/src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs b/src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs
index 50b8f29a638..93a76724d27 100644
--- a/src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs
+++ b/src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs
@@ -15,16 +15,17 @@ public interface ISpanOrQuery : ISpanSubQuery
 
 	public class SpanOrQuery : QueryBase, ISpanOrQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public IEnumerable<ISpanQuery> Clauses { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanOr = this;
+
 		internal static bool IsConditionless(ISpanOrQuery q) => !q.Clauses.HasAny() || q.Clauses.Cast<IQuery>().All(qq => qq.Conditionless);
 	}
 
 	public class SpanOrQueryDescriptor<T>
 		: QueryDescriptorBase<SpanOrQueryDescriptor<T>, ISpanOrQuery>
-		, ISpanOrQuery where T : class
+			, ISpanOrQuery where T : class
 	{
 		protected override bool Conditionless => SpanOrQuery.IsConditionless(this);
 		IEnumerable<ISpanQuery> ISpanOrQuery.Clauses { get; set; }
@@ -33,7 +34,8 @@ public SpanOrQueryDescriptor<T> Clauses(params Func<SpanQueryDescriptor<T>, Span
 		{
 			var clauses = (
 				from selector in selectors
-				select selector(new SpanQueryDescriptor<T>()) into q
+				select selector(new SpanQueryDescriptor<T>())
+				into q
 				where !(q as IQuery).Conditionless
 				select q
 			).ToList();
diff --git a/src/Nest/QueryDsl/Span/SpanQuery.cs b/src/Nest/QueryDsl/Span/SpanQuery.cs
index c57eb276889..67664d1f0e6 100644
--- a/src/Nest/QueryDsl/Span/SpanQuery.cs
+++ b/src/Nest/QueryDsl/Span/SpanQuery.cs
@@ -8,58 +8,58 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SpanQueryDescriptor<object>>))]
 	public interface ISpanQuery : IQuery
 	{
-		[JsonProperty("span_term")]
-		ISpanTermQuery SpanTerm { get; set; }
+		[JsonProperty("span_containing")]
+		ISpanContainingQuery SpanContaining { get; set; }
+
+		[JsonProperty("field_masking_span")]
+		ISpanFieldMaskingQuery SpanFieldMasking { get; set; }
 
 		[JsonProperty("span_first")]
 		ISpanFirstQuery SpanFirst { get; set; }
 
-		[JsonProperty("span_near")]
-		ISpanNearQuery SpanNear { get; set; }
-
 		[JsonProperty("span_gap")]
 		ISpanGapQuery SpanGap { get; set; }
 
-		[JsonProperty("span_or")]
-		ISpanOrQuery SpanOr { get; set; }
+		[JsonProperty("span_multi")]
+		ISpanMultiTermQuery SpanMultiTerm { get; set; }
+
+		[JsonProperty("span_near")]
+		ISpanNearQuery SpanNear { get; set; }
 
 		[JsonProperty("span_not")]
 		ISpanNotQuery SpanNot { get; set; }
 
-		[JsonProperty("span_containing")]
-		ISpanContainingQuery SpanContaining { get; set; }
+		[JsonProperty("span_or")]
+		ISpanOrQuery SpanOr { get; set; }
+
+		[JsonProperty("span_term")]
+		ISpanTermQuery SpanTerm { get; set; }
 
 		[JsonProperty("span_within")]
 		ISpanWithinQuery SpanWithin { get; set; }
 
-		[JsonProperty("span_multi")]
-		ISpanMultiTermQuery SpanMultiTerm { get; set; }
-
-		[JsonProperty("field_masking_span")]
-		ISpanFieldMaskingQuery SpanFieldMasking { get; set; }
-
 		void Accept(IQueryVisitor visitor);
 	}
 
 	public class SpanQuery : ISpanQuery
 	{
-		string IQuery.Name { get; set; }
-		double? IQuery.Boost { get; set; }
-		bool IQuery.IsWritable { get; }
-		public bool IsVerbatim { get; set; }
 		public bool IsStrict { get; set; }
-		public bool IsWritable => this.IsVerbatim || !IsConditionless(this);
-		bool IQuery.Conditionless => IsConditionless(this);
-		public ISpanTermQuery SpanTerm { get; set; }
+		public bool IsVerbatim { get; set; }
+		public bool IsWritable => IsVerbatim || !IsConditionless(this);
+		public ISpanContainingQuery SpanContaining { get; set; }
+		public ISpanFieldMaskingQuery SpanFieldMasking { get; set; }
 		public ISpanFirstQuery SpanFirst { get; set; }
-		public ISpanNearQuery SpanNear { get; set; }
 		public ISpanGapQuery SpanGap { get; set; }
-		public ISpanOrQuery SpanOr { get; set; }
-		public ISpanNotQuery SpanNot { get; set; }
 		public ISpanMultiTermQuery SpanMultiTerm { get; set; }
-		public ISpanContainingQuery SpanContaining{ get; set; }
+		public ISpanNearQuery SpanNear { get; set; }
+		public ISpanNotQuery SpanNot { get; set; }
+		public ISpanOrQuery SpanOr { get; set; }
+		public ISpanTermQuery SpanTerm { get; set; }
 		public ISpanWithinQuery SpanWithin { get; set; }
-		public ISpanFieldMaskingQuery SpanFieldMasking { get; set; }
+		double? IQuery.Boost { get; set; }
+		bool IQuery.Conditionless => IsConditionless(this);
+		bool IQuery.IsWritable { get; }
+		string IQuery.Name { get; set; }
 
 		public void Accept(IQueryVisitor visitor) => new QueryWalker().Walk(this, visitor);
 
@@ -68,7 +68,7 @@ internal static bool IsConditionless(ISpanQuery q) => new[]
 			q.SpanTerm as IQuery,
 			q.SpanFirst,
 			q.SpanNear,
-			q.SpanOr ,
+			q.SpanOr,
 			q.SpanNot,
 			q.SpanMultiTerm,
 			q.SpanGap,
@@ -76,20 +76,23 @@ internal static bool IsConditionless(ISpanQuery q) => new[]
 		}.All(sq => sq == null || sq.Conditionless);
 	}
 
-	public class SpanQueryDescriptor<T> : QueryDescriptorBase<SpanQueryDescriptor<T>, ISpanQuery>
-		, ISpanQuery where T : class
+	public class SpanQueryDescriptor<T>
+		: QueryDescriptorBase<SpanQueryDescriptor<T>, ISpanQuery>
+			, ISpanQuery where T : class
 	{
 		protected override bool Conditionless => SpanQuery.IsConditionless(this);
-		ISpanTermQuery ISpanQuery.SpanTerm { get; set; }
+		ISpanContainingQuery ISpanQuery.SpanContaining { get; set; }
+		ISpanFieldMaskingQuery ISpanQuery.SpanFieldMasking { get; set; }
 		ISpanFirstQuery ISpanQuery.SpanFirst { get; set; }
-		ISpanNearQuery ISpanQuery.SpanNear { get; set; }
 		ISpanGapQuery ISpanQuery.SpanGap { get; set; }
-		ISpanOrQuery ISpanQuery.SpanOr { get; set; }
-		ISpanNotQuery ISpanQuery.SpanNot { get; set; }
 		ISpanMultiTermQuery ISpanQuery.SpanMultiTerm { get; set; }
-		ISpanContainingQuery ISpanQuery.SpanContaining{ get; set; }
+		ISpanNearQuery ISpanQuery.SpanNear { get; set; }
+		ISpanNotQuery ISpanQuery.SpanNot { get; set; }
+		ISpanOrQuery ISpanQuery.SpanOr { get; set; }
+		ISpanTermQuery ISpanQuery.SpanTerm { get; set; }
 		ISpanWithinQuery ISpanQuery.SpanWithin { get; set; }
-		ISpanFieldMaskingQuery ISpanQuery.SpanFieldMasking { get; set; }
+
+		void ISpanQuery.Accept(IQueryVisitor visitor) => new QueryWalker().Walk(this, visitor);
 
 		public SpanQueryDescriptor<T> SpanTerm(Func<SpanTermQueryDescriptor<T>, ISpanTermQuery> selector) =>
 			Assign(a => a.SpanTerm = selector?.Invoke(new SpanTermQueryDescriptor<T>()));
@@ -120,8 +123,5 @@ public SpanQueryDescriptor<T> SpanWithin(Func<SpanWithinQueryDescriptor<T>, ISpa
 
 		public SpanQueryDescriptor<T> SpanFieldMasking(Func<SpanFieldMaskingQueryDescriptor<T>, ISpanFieldMaskingQuery> selector) =>
 			Assign(a => a.SpanFieldMasking = selector?.Invoke(new SpanFieldMaskingQueryDescriptor<T>()));
-
-		void ISpanQuery.Accept(IQueryVisitor visitor) => new QueryWalker().Walk(this, visitor);
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Span/Term/SpanTermQuery.cs b/src/Nest/QueryDsl/Span/Term/SpanTermQuery.cs
index 0118304d253..16872b68e15 100644
--- a/src/Nest/QueryDsl/Span/Term/SpanTermQuery.cs
+++ b/src/Nest/QueryDsl/Span/Term/SpanTermQuery.cs
@@ -4,21 +4,17 @@ namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[JsonConverter(typeof(FieldNameQueryJsonConverter<SpanTermQuery>))]
-	public interface ISpanTermQuery : ITermQuery, ISpanSubQuery
-	{
-	}
+	public interface ISpanTermQuery : ITermQuery, ISpanSubQuery { }
 
 	public class SpanTermQuery : FieldNameQueryBase, ISpanTermQuery
 	{
-		protected override bool Conditionless => TermQuery.IsConditionless(this);
 		public object Value { get; set; }
+		protected override bool Conditionless => TermQuery.IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanTerm = this;
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class SpanTermQueryDescriptor<T> : TermQueryDescriptorBase<SpanTermQueryDescriptor<T>, ISpanTermQuery, T>, ISpanTermQuery
-		where T : class
-	{
-	}
+		where T : class { }
 }
diff --git a/src/Nest/QueryDsl/Span/Within/SpanWithinQuery.cs b/src/Nest/QueryDsl/Span/Within/SpanWithinQuery.cs
index 030774772ff..91f3ba1bb54 100644
--- a/src/Nest/QueryDsl/Span/Within/SpanWithinQuery.cs
+++ b/src/Nest/QueryDsl/Span/Within/SpanWithinQuery.cs
@@ -7,46 +7,45 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SpanWithinQuery>))]
 	public interface ISpanWithinQuery : ISpanSubQuery
 	{
-		[JsonProperty("little")]
-		ISpanQuery Little { get; set; }
-
 		[JsonProperty("big")]
 		ISpanQuery Big { get; set; }
 
+		[JsonProperty("little")]
+		ISpanQuery Little { get; set; }
 	}
 
 	public class SpanWithinQuery : QueryBase, ISpanWithinQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public ISpanQuery Little { get; set; }
 		public ISpanQuery Big { get; set; }
+		public ISpanQuery Little { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.SpanWithin = this;
+
 		internal static bool IsConditionless(ISpanWithinQuery q)
 		{
 			var exclude = q.Little as IQuery;
 			var include = q.Big as IQuery;
 
-			return (exclude == null && include == null)
-				|| (include == null && exclude.Conditionless)
-				|| (exclude == null && include.Conditionless)
-				|| (exclude != null && exclude.Conditionless && include != null && include.Conditionless);
+			return exclude == null && include == null
+				|| include == null && exclude.Conditionless
+				|| exclude == null && include.Conditionless
+				|| exclude != null && exclude.Conditionless && include != null && include.Conditionless;
 		}
 	}
 
 	public class SpanWithinQueryDescriptor<T>
 		: QueryDescriptorBase<SpanWithinQueryDescriptor<T>, ISpanWithinQuery>
-		, ISpanWithinQuery where T : class
+			, ISpanWithinQuery where T : class
 	{
 		protected override bool Conditionless => SpanWithinQuery.IsConditionless(this);
-		ISpanQuery ISpanWithinQuery.Little { get; set; }
 		ISpanQuery ISpanWithinQuery.Big { get; set; }
+		ISpanQuery ISpanWithinQuery.Little { get; set; }
 
 		public SpanWithinQueryDescriptor<T> Little(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
 			Assign(a => a.Little = selector(new SpanQueryDescriptor<T>()));
 
 		public SpanWithinQueryDescriptor<T> Big(Func<SpanQueryDescriptor<T>, ISpanQuery> selector) =>
 			Assign(a => a.Big = selector(new SpanQueryDescriptor<T>()));
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/Like.cs b/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/Like.cs
index 4a735a5ff12..e4a0238148e 100644
--- a/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/Like.cs
+++ b/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/Like.cs
@@ -8,13 +8,15 @@ namespace Nest
 	public class Like : Union<string, ILikeDocument>
 	{
 		public Like(string item) : base(item) { }
+
 		public Like(ILikeDocument item) : base(item) { }
 
 		public static implicit operator Like(string likeText) => new Like(likeText);
+
 		public static implicit operator Like(LikeDocumentBase like) => new Like(like);
 
 		internal static bool IsConditionless(Like like) =>
-			like.Item1.IsNullOrEmpty() && (like.Item2 == null || (like.Item2.Id == null && like.Item2.Document == null));
+			like.Item1.IsNullOrEmpty() && (like.Item2 == null || like.Item2.Id == null && like.Item2.Document == null);
 	}
 
 	public class LikeDescriptor<T> : DescriptorPromiseBase<LikeDescriptor<T>, List<Like>>
@@ -29,16 +31,14 @@ public LikeDescriptor<T> Document(Func<LikeDocumentDescriptor<T>, ILikeDocument>
 			var l = selector?.Invoke(new LikeDocumentDescriptor<T>());
 			return l == null ? this : Assign(a => a.Add(new Like(l)));
 		}
-
 	}
 
-	internal class LikeJsonConverter :JsonConverter
+	internal class LikeJsonConverter : JsonConverter
 	{
+		public static UnionJsonConverter<string, ILikeDocument> Unionconverter = new UnionJsonConverter<string, ILikeDocument>();
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
 
-		public static UnionJsonConverter<string, ILikeDocument> Unionconverter = new UnionJsonConverter<string, ILikeDocument>();
-
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (!(Unionconverter.ReadJson(reader, objectType, existingValue, serializer) is Union<string, ILikeDocument> union)) return null;
@@ -46,12 +46,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return union.Item1 != null ? new Like(union.Item1) : new Like(union.Item2);
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
 			Unionconverter.WriteJson(writer, value, serializer);
-		}
 
 		public override bool CanConvert(Type objectType) => true;
 	}
-
 }
diff --git a/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs b/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs
index affd597ea02..d54f51c033d 100644
--- a/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs
+++ b/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs
@@ -7,49 +7,49 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<LikeDocument<object>>))]
 	public interface ILikeDocument
 	{
-		[JsonProperty("_index")]
-		IndexName Index { get; set; }
+		[JsonProperty("doc")]
+		[JsonConverter(typeof(SourceConverter))]
+		object Document { get; set; }
 
-		[JsonProperty("_type")]
-		TypeName Type { get; set; }
+		[JsonProperty("fields")]
+		Fields Fields { get; set; }
 
 		[JsonProperty("_id")]
 		Id Id { get; set; }
 
-		[JsonProperty("fields")]
-		Fields Fields { get; set; }
+		[JsonProperty("_index")]
+		IndexName Index { get; set; }
+
+		[JsonProperty("per_field_analyzer")]
+		IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
 
 		[JsonProperty("_routing")]
 		Routing Routing { get; set; }
 
-		[JsonProperty("doc")]
-		[JsonConverter(typeof(SourceConverter))]
-		object Document { get; set; }
-
-		[JsonProperty("per_field_analyzer")]
-		IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
+		[JsonProperty("_type")]
+		TypeName Type { get; set; }
 	}
 
 	public abstract class LikeDocumentBase : ILikeDocument
 	{
-		public IndexName Index { get; set; }
+		private Routing _routing;
 
-		public TypeName Type { get; set; }
+		public object Document { get; set; }
+
+		public Fields Fields { get; set; }
 
 		public Id Id { get; set; }
+		public IndexName Index { get; set; }
 
-		public Fields Fields { get; set; }
+		public IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
 
-		private Routing _routing;
 		public Routing Routing
 		{
 			get => _routing ?? (Document == null ? null : new Routing(Document));
 			set => _routing = value;
 		}
 
-		public object Document { get; set; }
-
-		public IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
+		public TypeName Type { get; set; }
 	}
 
 	public class LikeDocument<TDocument> : LikeDocumentBase
@@ -59,43 +59,46 @@ internal LikeDocument() { }
 
 		public LikeDocument(Id id)
 		{
-			this.Id = id;
-			this.Index = typeof(TDocument);
-			this.Type = typeof(TDocument);
+			Id = id;
+			Index = typeof(TDocument);
+			Type = typeof(TDocument);
 		}
+
 		public LikeDocument(TDocument document)
 		{
-			this.Id = Id.From(document);
-			this.Document = document;
-			this.Index = typeof(TDocument);
-			this.Type = typeof(TDocument);
+			Id = Id.From(document);
+			Document = document;
+			Index = typeof(TDocument);
+			Type = typeof(TDocument);
 		}
 	}
 
 	public class LikeDocumentDescriptor<TDocument> : DescriptorBase<LikeDocumentDescriptor<TDocument>, ILikeDocument>, ILikeDocument
 		where TDocument : class
 	{
-		IndexName ILikeDocument.Index { get; set; }
-		TypeName ILikeDocument.Type { get; set; }
-		Id ILikeDocument.Id { get; set; }
-
 		private Routing _routing;
-		Routing ILikeDocument.Routing
+
+		public LikeDocumentDescriptor()
 		{
-			get => _routing ?? (Self.Document == null ? null : new Routing(Self.Document));
-			set => _routing = value;
+			Self.Index = typeof(TDocument);
+			Self.Type = typeof(TDocument);
 		}
 
-		Fields ILikeDocument.Fields { get; set; }
 		object ILikeDocument.Document { get; set; }
+
+		Fields ILikeDocument.Fields { get; set; }
+		Id ILikeDocument.Id { get; set; }
+		IndexName ILikeDocument.Index { get; set; }
 		IPerFieldAnalyzer ILikeDocument.PerFieldAnalyzer { get; set; }
 
-		public LikeDocumentDescriptor()
+		Routing ILikeDocument.Routing
 		{
-			Self.Index = typeof(TDocument);
-			Self.Type = typeof(TDocument);
+			get => _routing ?? (Self.Document == null ? null : new Routing(Self.Document));
+			set => _routing = value;
 		}
 
+		TypeName ILikeDocument.Type { get; set; }
+
 		public LikeDocumentDescriptor<TDocument> Index(IndexName index) => Assign(a => a.Index = index);
 
 		public LikeDocumentDescriptor<TDocument> Type(TypeName type) => Assign(a => a.Type = type);
@@ -111,12 +114,13 @@ public LikeDocumentDescriptor<TDocument> Fields(Func<FieldsDescriptor<TDocument>
 
 		public LikeDocumentDescriptor<TDocument> Document(TDocument document) => Assign(a =>
 		{
-			a.Id = Nest.Infer.Id(document);
+			a.Id = Infer.Id(document);
 			a.Document = document;
 		});
 
-		public LikeDocumentDescriptor<TDocument> PerFieldAnalyzer(Func<PerFieldAnalyzerDescriptor<TDocument>, IPromise<IPerFieldAnalyzer>> analyzerSelector) =>
+		public LikeDocumentDescriptor<TDocument> PerFieldAnalyzer(
+			Func<PerFieldAnalyzerDescriptor<TDocument>, IPromise<IPerFieldAnalyzer>> analyzerSelector
+		) =>
 			Assign(a => a.PerFieldAnalyzer = analyzerSelector?.Invoke(new PerFieldAnalyzerDescriptor<TDocument>())?.Value);
-
 	}
 }
diff --git a/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs b/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs
index 79e4048edfc..898fe19c31b 100644
--- a/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs
+++ b/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs
@@ -10,47 +10,41 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<MoreLikeThisQueryDescriptor<object>>))]
 	public interface IMoreLikeThisQuery : IQuery
 	{
+		[JsonProperty("analyzer")]
+		string Analyzer { get; set; }
+
+		[JsonProperty("boost_terms")]
+		double? BoostTerms { get; set; }
+
 		[JsonProperty("fields")]
 		Fields Fields { get; set; }
 
+		[JsonProperty("include")]
+		bool? Include { get; set; }
+
 		[JsonProperty("like")]
 		IEnumerable<Like> Like { get; set; }
 
-		[JsonProperty("unlike")]
-		IEnumerable<Like> Unlike { get; set; }
-
-		[JsonProperty("max_query_terms")]
-		int? MaxQueryTerms { get; set; }
-
-		[JsonProperty("min_term_freq")]
-		int? MinTermFrequency { get; set; }
-
-		[JsonProperty("min_doc_freq")]
-		int? MinDocumentFrequency { get; set; }
-
 		[JsonProperty("max_doc_freq")]
 		int? MaxDocumentFrequency { get; set; }
 
-		[JsonProperty("min_word_length")]
-		int? MinWordLength { get; set; }
+		[JsonProperty("max_query_terms")]
+		int? MaxQueryTerms { get; set; }
 
 		[JsonProperty("max_word_length")]
 		int? MaxWordLength { get; set; }
 
-		[JsonProperty("stop_words")]
-		StopWords StopWords { get; set; }
-
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
+		[JsonProperty("min_doc_freq")]
+		int? MinDocumentFrequency { get; set; }
 
 		[JsonProperty("minimum_should_match")]
 		MinimumShouldMatch MinimumShouldMatch { get; set; }
 
-		[JsonProperty("boost_terms")]
-		double? BoostTerms { get; set; }
+		[JsonProperty("min_term_freq")]
+		int? MinTermFrequency { get; set; }
 
-		[JsonProperty("include")]
-		bool? Include { get; set; }
+		[JsonProperty("min_word_length")]
+		int? MinWordLength { get; set; }
 
 		/// <summary>
 		/// Provide a different analyzer than the one at the field.
@@ -59,68 +53,78 @@ public interface IMoreLikeThisQuery : IQuery
 		[JsonProperty("per_field_analyzer")]
 		IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
 
+		[JsonProperty("routing")]
+		Routing Routing { get; set; }
+
+		[JsonProperty("stop_words")]
+		StopWords StopWords { get; set; }
+
+		[JsonProperty("unlike")]
+		IEnumerable<Like> Unlike { get; set; }
+
 		[JsonProperty("version")]
 		long? Version { get; set; }
 
 		[JsonProperty("version_type")]
 		VersionType? VersionType { get; set; }
-
-		[JsonProperty("routing")]
-		Routing Routing { get; set; }
 	}
 
 	public class MoreLikeThisQuery : QueryBase, IMoreLikeThisQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
+		public string Analyzer { get; set; }
+		public double? BoostTerms { get; set; }
 		public Fields Fields { get; set; }
-		public double? TermMatchPercentage { get; set; }
-		public MinimumShouldMatch MinimumShouldMatch { get; set; }
-		public StopWords StopWords { get; set; }
-		public int? MinTermFrequency { get; set; }
+		public bool? Include { get; set; }
+		public IEnumerable<Like> Like { get; set; }
+		public int? MaxDocumentFrequency { get; set; }
 		public int? MaxQueryTerms { get; set; }
+		public int? MaxWordLength { get; set; }
 		public int? MinDocumentFrequency { get; set; }
-		public int? MaxDocumentFrequency { get; set; }
+		public MinimumShouldMatch MinimumShouldMatch { get; set; }
+		public int? MinTermFrequency { get; set; }
 		public int? MinWordLength { get; set; }
-		public int? MaxWordLength { get; set; }
-		public double? BoostTerms { get; set; }
-		public string Analyzer { get; set; }
-		public bool? Include { get; set; }
-		public IEnumerable<Like> Like { get; set; }
-		public IEnumerable<Like> Unlike { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
 
+		public Routing Routing { get; set; }
+		public StopWords StopWords { get; set; }
+		public double? TermMatchPercentage { get; set; }
+		public IEnumerable<Like> Unlike { get; set; }
+
 		public long? Version { get; set; }
 		public VersionType? VersionType { get; set; }
-		public Routing Routing { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.MoreLikeThis = this;
-		internal static bool IsConditionless(IMoreLikeThisQuery q) => q.Fields.IsConditionless() || (!q.Like.HasAny() || q.Like.All(Nest.Like.IsConditionless));
+
+		internal static bool IsConditionless(IMoreLikeThisQuery q) =>
+			q.Fields.IsConditionless() || !q.Like.HasAny() || q.Like.All(Nest.Like.IsConditionless);
 	}
 
 	public class MoreLikeThisQueryDescriptor<T>
 		: QueryDescriptorBase<MoreLikeThisQueryDescriptor<T>, IMoreLikeThisQuery>
-		, IMoreLikeThisQuery where T : class
+			, IMoreLikeThisQuery where T : class
 	{
 		protected override bool Conditionless => MoreLikeThisQuery.IsConditionless(this);
+		string IMoreLikeThisQuery.Analyzer { get; set; }
+		double? IMoreLikeThisQuery.BoostTerms { get; set; }
 		Fields IMoreLikeThisQuery.Fields { get; set; }
-		MinimumShouldMatch IMoreLikeThisQuery.MinimumShouldMatch { get; set; }
-		StopWords IMoreLikeThisQuery.StopWords { get; set; }
-		int? IMoreLikeThisQuery.MinTermFrequency { get; set; }
+		bool? IMoreLikeThisQuery.Include { get; set; }
+		IEnumerable<Like> IMoreLikeThisQuery.Like { get; set; }
+		int? IMoreLikeThisQuery.MaxDocumentFrequency { get; set; }
 		int? IMoreLikeThisQuery.MaxQueryTerms { get; set; }
+		int? IMoreLikeThisQuery.MaxWordLength { get; set; }
 		int? IMoreLikeThisQuery.MinDocumentFrequency { get; set; }
-		int? IMoreLikeThisQuery.MaxDocumentFrequency { get; set; }
+		MinimumShouldMatch IMoreLikeThisQuery.MinimumShouldMatch { get; set; }
+		int? IMoreLikeThisQuery.MinTermFrequency { get; set; }
 		int? IMoreLikeThisQuery.MinWordLength { get; set; }
-		int? IMoreLikeThisQuery.MaxWordLength { get; set; }
-		double? IMoreLikeThisQuery.BoostTerms { get; set; }
-		string IMoreLikeThisQuery.Analyzer { get; set; }
-		bool? IMoreLikeThisQuery.Include { get; set; }
 		IPerFieldAnalyzer IMoreLikeThisQuery.PerFieldAnalyzer { get; set; }
-		long? IMoreLikeThisQuery.Version { get; set; }
-		VersionType? IMoreLikeThisQuery.VersionType { get; set; }
 		Routing IMoreLikeThisQuery.Routing { get; set; }
-		IEnumerable<Like> IMoreLikeThisQuery.Like { get; set; }
+		StopWords IMoreLikeThisQuery.StopWords { get; set; }
 		IEnumerable<Like> IMoreLikeThisQuery.Unlike { get; set; }
+		long? IMoreLikeThisQuery.Version { get; set; }
+		VersionType? IMoreLikeThisQuery.VersionType { get; set; }
 
 		public MoreLikeThisQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
@@ -140,9 +144,11 @@ public MoreLikeThisQueryDescriptor<T> StopWords(StopWords stopWords) =>
 
 		public MoreLikeThisQueryDescriptor<T> MinTermFrequency(int? minTermFrequency) => Assign(a => a.MinTermFrequency = minTermFrequency);
 
-		public MoreLikeThisQueryDescriptor<T> MinDocumentFrequency(int? minDocumentFrequency) => Assign(a => a.MinDocumentFrequency = minDocumentFrequency);
+		public MoreLikeThisQueryDescriptor<T> MinDocumentFrequency(int? minDocumentFrequency) =>
+			Assign(a => a.MinDocumentFrequency = minDocumentFrequency);
 
-		public MoreLikeThisQueryDescriptor<T> MaxDocumentFrequency(int? maxDocumentFrequency) => Assign(a => a.MaxDocumentFrequency = maxDocumentFrequency);
+		public MoreLikeThisQueryDescriptor<T> MaxDocumentFrequency(int? maxDocumentFrequency) =>
+			Assign(a => a.MaxDocumentFrequency = maxDocumentFrequency);
 
 		public MoreLikeThisQueryDescriptor<T> MinWordLength(int? minWordLength) => Assign(a => a.MinWordLength = minWordLength);
 
diff --git a/src/Nest/QueryDsl/Specialized/Percolate/PercolateQuery.cs b/src/Nest/QueryDsl/Specialized/Percolate/PercolateQuery.cs
index 792a472d900..be2cdfbbdab 100644
--- a/src/Nest/QueryDsl/Specialized/Percolate/PercolateQuery.cs
+++ b/src/Nest/QueryDsl/Specialized/Percolate/PercolateQuery.cs
@@ -13,19 +13,6 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<PercolateQuery>))]
 	public interface IPercolateQuery : IQuery
 	{
-		/// <summary>
-		/// The name of the field containing the percolated query on an existing document. This is a required parameter.
-		/// </summary>
-		[JsonProperty("field")]
-		Field Field { get; set; }
-
-		/// <summary>
-		/// The type / mapping of the document to percolate. This is a required parameter.
-		/// </summary>
-		[JsonProperty("document_type")]
-		[Obsolete("Deprecated in 6.x, types are gone from indices created as of Elasticsearch 6.x")]
-		TypeName DocumentType { get; set; }
-
 		/// <summary>
 		/// The source of the document to percolate.
 		/// </summary>
@@ -34,51 +21,64 @@ public interface IPercolateQuery : IQuery
 		object Document { get; set; }
 
 		/// <summary>
-		/// The source of the documents to percolate. Like <see cref="Document"/> but allows
+		/// The source of the documents to percolate. Like <see cref="Document" /> but allows
 		/// multiple documents to be percolated.
 		/// </summary>
 		[JsonProperty("documents")]
 		[JsonConverter(typeof(SourceConverter))]
 		IEnumerable<object> Documents { get; set; }
 
+		/// <summary>
+		/// The type / mapping of the document to percolate. This is a required parameter.
+		/// </summary>
+		[JsonProperty("document_type")]
+		[Obsolete("Deprecated in 6.x, types are gone from indices created as of Elasticsearch 6.x")]
+		TypeName DocumentType { get; set; }
+
+		/// <summary>
+		/// The name of the field containing the percolated query on an existing document. This is a required parameter.
+		/// </summary>
+		[JsonProperty("field")]
+		Field Field { get; set; }
+
 		/// <summary>
 		/// The id of the document to fetch for percolation.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document"/>
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document" />
 		/// </summary>
 		[JsonProperty("id")]
 		Id Id { get; set; }
 
 		/// <summary>
 		/// The index the document resides in for percolation.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document"/>
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document" />
 		/// </summary>
 		[JsonProperty("index")]
 		IndexName Index { get; set; }
 
 		/// <summary>
-		/// The type of the document to fetch for percolation.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document"/>
+		/// Preference to be used to fetch the document to percolate.
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document" />
 		/// </summary>
-		[JsonProperty("type")]
-		TypeName Type { get; set; }
+		[JsonProperty("preference")]
+		string Preference { get; set; }
 
 		/// <summary>
 		/// Routing to be used to fetch the document to percolate.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document"/>
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document" />
 		/// </summary>
 		[JsonProperty("routing")]
 		Routing Routing { get; set; }
 
 		/// <summary>
-		/// Preference to be used to fetch the document to percolate.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document"/>
+		/// The type of the document to fetch for percolation.
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document" />
 		/// </summary>
-		[JsonProperty("preference")]
-		string Preference { get; set; }
+		[JsonProperty("type")]
+		TypeName Type { get; set; }
 
 		/// <summary>
 		/// The expected version of the document to be fetched for percolation.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document"/>
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document" />
 		/// </summary>
 		[JsonProperty("version")]
 		long? Version { get; set; }
@@ -89,33 +89,20 @@ public interface IPercolateQuery : IQuery
 	/// </summary>
 	public class PercolateQuery : QueryBase, IPercolateQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-
-		internal override void InternalWrapInContainer(IQueryContainer c) => c.Percolate = this;
-
-		internal static bool IsConditionless(IPercolateQuery q)
-		{
-			var docFields = q.Document == null && q.Documents == null;
-			if (!docFields) return false;
+		private Routing _routing;
 
-			return q.Type.IsConditionless() ||
-			       q.Index == null ||
-			       q.Id.IsConditionless() ||
-			       q.Field.IsConditionless();
-		}
+		/// <inheritdoc />
+		public object Document { get; set; }
 
 		/// <inheritdoc />
-		public Field Field { get; set; }
+		public IEnumerable<object> Documents { get; set; }
 
 		/// <inheritdoc />
 		[Obsolete("Deprecated in 6.x, types are gone from indices created as of Elasticsearch 6.x")]
 		public TypeName DocumentType { get; set; }
 
 		/// <inheritdoc />
-		public object Document { get; set; }
-
-		/// <inheritdoc />
-		public IEnumerable<object> Documents { get; set; }
+		public Field Field { get; set; }
 
 		/// <inheritdoc />
 		public Id Id { get; set; }
@@ -124,9 +111,7 @@ internal static bool IsConditionless(IPercolateQuery q)
 		public IndexName Index { get; set; }
 
 		/// <inheritdoc />
-		public TypeName Type { get; set; }
-
-		private Routing _routing;
+		public string Preference { get; set; }
 
 		/// <inheritdoc />
 		public Routing Routing
@@ -136,10 +121,25 @@ public Routing Routing
 		}
 
 		/// <inheritdoc />
-		public string Preference { get; set; }
+		public TypeName Type { get; set; }
 
 		/// <inheritdoc />
 		public long? Version { get; set; }
+
+		protected override bool Conditionless => IsConditionless(this);
+
+		internal override void InternalWrapInContainer(IQueryContainer c) => c.Percolate = this;
+
+		internal static bool IsConditionless(IPercolateQuery q)
+		{
+			var docFields = q.Document == null && q.Documents == null;
+			if (!docFields) return false;
+
+			return q.Type.IsConditionless() ||
+				q.Index == null ||
+				q.Id.IsConditionless() ||
+				q.Field.IsConditionless();
+		}
 	}
 
 	/// <summary>
@@ -148,87 +148,88 @@ public Routing Routing
 	/// <typeparam name="T">The document type that contains the percolated query</typeparam>
 	public class PercolateQueryDescriptor<T>
 		: QueryDescriptorBase<PercolateQueryDescriptor<T>, IPercolateQuery>
-		, IPercolateQuery where T : class
+			, IPercolateQuery where T : class
 	{
-		Field IPercolateQuery.Field { get; set; }
-		TypeName IPercolateQuery.DocumentType { get; set; }
+		private Routing _routing;
+
+		protected override bool Conditionless => PercolateQuery.IsConditionless(this);
 		object IPercolateQuery.Document { get; set; }
 		IEnumerable<object> IPercolateQuery.Documents { get; set; }
+		TypeName IPercolateQuery.DocumentType { get; set; }
+		Field IPercolateQuery.Field { get; set; }
 		Id IPercolateQuery.Id { get; set; }
 		IndexName IPercolateQuery.Index { get; set; }
-		TypeName IPercolateQuery.Type { get; set; }
 
-		private Routing _routing;
+		string IPercolateQuery.Preference { get; set; }
+
 		Routing IPercolateQuery.Routing
 		{
 			get => _routing ?? (Self.Document == null ? null : new Routing(Self.Document));
 			set => _routing = value;
 		}
 
-		string IPercolateQuery.Preference { get; set; }
+		TypeName IPercolateQuery.Type { get; set; }
 		long? IPercolateQuery.Version { get; set; }
-		
-		protected override bool Conditionless => PercolateQuery.IsConditionless(this);
 
-		/// <inheritdoc cref="IPercolateQuery.Field"/>
+		/// <inheritdoc cref="IPercolateQuery.Field" />
 		public PercolateQueryDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="IPercolateQuery.Field"/>
+		/// <inheritdoc cref="IPercolateQuery.Field" />
 		public PercolateQueryDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc cref="IPercolateQuery.DocumentType"/>
+		/// <inheritdoc cref="IPercolateQuery.DocumentType" />
 		[Obsolete("Deprecated in 6.x, types are gone from indices created as of Elasticsearch 6.x")]
 		public PercolateQueryDescriptor<T> DocumentType(TypeName type) => Assign(a => a.DocumentType = type);
 
-		/// <inheritdoc cref="IPercolateQuery.DocumentType"/>
+		/// <inheritdoc cref="IPercolateQuery.DocumentType" />
 		[Obsolete("Deprecated in 6.x, types are gone from indices created as of Elasticsearch 6.x")]
 		public PercolateQueryDescriptor<T> DocumentType<TDocument>() => Assign(a => a.DocumentType = typeof(TDocument));
 
-		/// <inheritdoc cref="IPercolateQuery.Document"/>
+		/// <inheritdoc cref="IPercolateQuery.Document" />
 		public PercolateQueryDescriptor<T> Document<TDocument>(TDocument document) => Assign(a => a.Document = document);
 
-		/// <inheritdoc cref="IPercolateQuery.Documents"/>
+		/// <inheritdoc cref="IPercolateQuery.Documents" />
 		public PercolateQueryDescriptor<T> Documents<TDocument>(params TDocument[] documents) =>
 			Assign(a => a.Documents = documents.Cast<object>());
 
-		/// <inheritdoc cref="IPercolateQuery.Documents"/>
+		/// <inheritdoc cref="IPercolateQuery.Documents" />
 		public PercolateQueryDescriptor<T> Documents<TDocument>(IEnumerable<TDocument> documents) =>
 			Assign(a => a.Documents = documents.Cast<object>());
 
-		/// <inheritdoc cref="IPercolateQuery.Id"/>
+		/// <inheritdoc cref="IPercolateQuery.Id" />
 		public PercolateQueryDescriptor<T> Id(string id) => Assign(a => a.Id = id);
 
 		/// <summary>
 		/// The index the document resides in for percolation.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document{TDocument}"/>
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document{TDocument}" />
 		/// </summary>
 		public PercolateQueryDescriptor<T> Index(IndexName index) => Assign(a => a.Index = index);
 
 		/// <summary>
 		/// The index the document resides in for percolation.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document{TDocument}"/>
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document{TDocument}" />
 		/// </summary>
 		public PercolateQueryDescriptor<T> Index<TDocument>() => Assign(a => a.Index = typeof(TDocument));
 
 		/// <summary>
 		/// The type of the document to fetch for percolation.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document{TDocument}"/>
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document{TDocument}" />
 		/// </summary>
 		public PercolateQueryDescriptor<T> Type(TypeName type) => Assign(a => a.Type = type);
 
 		/// <summary>
 		/// The type of the document to fetch for percolation.
-		/// Can be specified to percolate an existing document instead of providing <see cref="Document{TDocument}"/>
+		/// Can be specified to percolate an existing document instead of providing <see cref="Document{TDocument}" />
 		/// </summary>
 		public PercolateQueryDescriptor<T> Type<TDocument>() => Assign(a => a.Type = typeof(TDocument));
 
-		/// <inheritdoc cref="IPercolateQuery.Routing"/>
+		/// <inheritdoc cref="IPercolateQuery.Routing" />
 		public PercolateQueryDescriptor<T> Routing(Routing routing) => Assign(a => a.Routing = routing);
 
-		/// <inheritdoc cref="IPercolateQuery.Preference"/>
+		/// <inheritdoc cref="IPercolateQuery.Preference" />
 		public PercolateQueryDescriptor<T> Preference(string preference) => Assign(a => a.Preference = preference);
 
-		/// <inheritdoc cref="IPercolateQuery.Version"/>
+		/// <inheritdoc cref="IPercolateQuery.Version" />
 		public PercolateQueryDescriptor<T> Version(long? version) => Assign(a => a.Version = version);
 	}
 }
diff --git a/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs b/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs
index 9e785a90562..10091e1e6d4 100644
--- a/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs
+++ b/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs
@@ -9,50 +9,62 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IScriptQuery : IQuery
 	{
-		[JsonProperty("source")]
-		string Source { get; set; }
+		[JsonProperty("id")]
+		Id Id { get; set; }
 
 		[Obsolete("Use Source. Inline is deprecated and scheduled to be removed in Elasticsearch 7.0")]
 		[JsonIgnore]
 		string Inline { get; set; }
 
-		[JsonProperty("id")]
-		Id Id { get; set; }
+		[JsonProperty("lang")]
+		string Lang { get; set; }
 
 		[JsonProperty("params")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		Dictionary<string, object> Params { get; set; }
 
-		[JsonProperty("lang")]
-		string Lang { get; set; }
+		[JsonProperty("source")]
+		string Source { get; set; }
 	}
 
 	public class ScriptQuery : QueryBase, IScriptQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public string Source { get; set; }
-		[Obsolete("Use Source. Inline is deprecated and scheduled to be removed in Elasticsearch 7.0")]
-		public string Inline { get => this.Source; set => this.Source = value; }
 		public Id Id { get; set; }
-		public Dictionary<string, object> Params { get; set; }
+
+		[Obsolete("Use Source. Inline is deprecated and scheduled to be removed in Elasticsearch 7.0")]
+		public string Inline
+		{
+			get => Source;
+			set => Source = value;
+		}
+
 		public string Lang { get; set; }
+		public Dictionary<string, object> Params { get; set; }
+		public string Source { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Script = this;
+
 		internal static bool IsConditionless(IScriptQuery q) =>
 			q.Source.IsNullOrEmpty() && q.Id == null;
-
 	}
 
 	public class ScriptQueryDescriptor<T>
 		: QueryDescriptorBase<ScriptQueryDescriptor<T>, IScriptQuery>
-		, IScriptQuery where T : class
+			, IScriptQuery where T : class
 	{
 		protected override bool Conditionless => ScriptQuery.IsConditionless(this);
-		string IScriptQuery.Inline { get => Self.Source; set => Self.Source = value; }
-		string IScriptQuery.Source { get; set; }
 		Id IScriptQuery.Id { get; set; }
+
+		string IScriptQuery.Inline
+		{
+			get => Self.Source;
+			set => Self.Source = value;
+		}
+
 		string IScriptQuery.Lang { get; set; }
 		Dictionary<string, object> IScriptQuery.Params { get; set; }
+		string IScriptQuery.Source { get; set; }
 
 		/// <summary> Inline script to execute </summary>
 		[Obsolete("Use Source(). Inline() is deprecated and scheduled to be removed in Elasticsearch 7.0")]
@@ -65,13 +77,13 @@ public class ScriptQueryDescriptor<T>
 		public ScriptQueryDescriptor<T> Id(string scriptId) => Assign(a => a.Id = scriptId);
 
 		/// <summary>
-		/// Scripts are compiled and cached for faster execution.
-		/// If the same script can be used, just with different parameters provided,
-		/// it is preferable to use the ability to pass parameters to the script itself.
+		///  Scripts are compiled and cached for faster execution.
+		///  If the same script can be used, just with different parameters provided,
+		///  it is preferable to use the ability to pass parameters to the script itself.
 		/// </summary>
 		/// <example>
-		///	    script: "doc['num1'].value &gt; param1"
-		///		param: "param1" = 5
+		/// 	    script: "doc['num1'].value &gt; param1"
+		/// 		param: "param1" = 5
 		/// </example>
 		/// <param name="paramsDictionary">param</param>
 		/// <returns>this</returns>
diff --git a/src/Nest/QueryDsl/Specialized/Script/ScriptQueryConverter.cs b/src/Nest/QueryDsl/Specialized/Script/ScriptQueryConverter.cs
index 1a0c8eefbee..8155bf1ee66 100644
--- a/src/Nest/QueryDsl/Specialized/Script/ScriptQueryConverter.cs
+++ b/src/Nest/QueryDsl/Specialized/Script/ScriptQueryConverter.cs
@@ -10,6 +10,7 @@ internal class ScriptQueryConverter : JsonConverter
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
@@ -35,7 +36,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var r = new ScriptQuery();
-			JObject o = JObject.Load(reader);
+			var o = JObject.Load(reader);
 			var properties = o.Properties().ToListOrNullIfEmpty();
 			var scriptProperty = properties.FirstOrDefault(p => p.Name == "script");
 			if (scriptProperty != null)
diff --git a/src/Nest/QueryDsl/TermLevel/Exists/ExistsQuery.cs b/src/Nest/QueryDsl/TermLevel/Exists/ExistsQuery.cs
index f5c44688e3b..4371051ff35 100644
--- a/src/Nest/QueryDsl/TermLevel/Exists/ExistsQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Exists/ExistsQuery.cs
@@ -18,19 +18,20 @@ public class ExistsQuery : QueryBase, IExistsQuery
 		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Exists = this;
+
 		internal static bool IsConditionless(IExistsQuery q) => q.Field.IsConditionless();
 	}
 
-	public class ExistsQueryDescriptor<T> 
+	public class ExistsQueryDescriptor<T>
 		: QueryDescriptorBase<ExistsQueryDescriptor<T>, IExistsQuery>
-		, IExistsQuery where T : class
+			, IExistsQuery where T : class
 	{
 		protected override bool Conditionless => ExistsQuery.IsConditionless(this);
 
 		Field IExistsQuery.Field { get; set; }
 
 		public ExistsQueryDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
-		public ExistsQueryDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
+		public ExistsQueryDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 	}
 }
diff --git a/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueries.cs b/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueries.cs
index 41c9318dc58..4b0dfba0c9b 100644
--- a/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueries.cs
+++ b/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueries.cs
@@ -3,38 +3,41 @@
 namespace Nest
 {
 	public interface IFuzzyStringQuery : IFuzzyQuery<string, Fuzziness> { }
+
 	public class FuzzyQuery : FuzzyQueryBase<string, Fuzziness>, IFuzzyStringQuery { }
 
-	public class FuzzyQueryDescriptor<T> 
+	public class FuzzyQueryDescriptor<T>
 		: FuzzyQueryDescriptorBase<FuzzyQueryDescriptor<T>, T, string, Fuzziness>
-		, IFuzzyStringQuery where T : class
+			, IFuzzyStringQuery where T : class
 	{
 		public FuzzyQueryDescriptor<T> Fuzziness(Fuzziness fuzziness) => Assign(a => a.Fuzziness = fuzziness);
 
 		public FuzzyQueryDescriptor<T> Value(string value) => Assign(a => a.Value = value);
 	}
-
+
 	public interface IFuzzyNumericQuery : IFuzzyQuery<double?, double?> { }
+
 	public class FuzzyNumericQuery : FuzzyQueryBase<double?, double?>, IFuzzyNumericQuery { }
 
-	public class FuzzyNumericQueryDescriptor<T> 
+	public class FuzzyNumericQueryDescriptor<T>
 		: FuzzyQueryDescriptorBase<FuzzyNumericQueryDescriptor<T>, T, double?, double?>
-		, IFuzzyNumericQuery where T : class
+			, IFuzzyNumericQuery where T : class
 	{
 		public FuzzyNumericQueryDescriptor<T> Fuzziness(double? fuzziness) => Assign(a => a.Fuzziness = fuzziness);
 
 		public FuzzyNumericQueryDescriptor<T> Value(double? value) => Assign(a => a.Value = value);
 	}
 
-	public interface IFuzzyDateQuery : IFuzzyQuery<DateTime?, Time> { }
-	public class FuzzyDateQuery : FuzzyQueryBase<DateTime?, Time>, IFuzzyDateQuery { }
-
+	public interface IFuzzyDateQuery : IFuzzyQuery<DateTime?, Time> { }
+
+	public class FuzzyDateQuery : FuzzyQueryBase<DateTime?, Time>, IFuzzyDateQuery { }
+
 
-	public class FuzzyDateQueryDescriptor<T> 
-		: FuzzyQueryDescriptorBase<FuzzyDateQueryDescriptor<T>, T, DateTime?, Time>
-		, IFuzzyDateQuery where T : class
+	public class FuzzyDateQueryDescriptor<T>
+		: FuzzyQueryDescriptorBase<FuzzyDateQueryDescriptor<T>, T, DateTime?, Time>
+			, IFuzzyDateQuery where T : class
 	{
-		public FuzzyDateQueryDescriptor<T> Fuzziness(Time fuzziness) => Assign(a => a.Fuzziness = fuzziness);
+		public FuzzyDateQueryDescriptor<T> Fuzziness(Time fuzziness) => Assign(a => a.Fuzziness = fuzziness);
 
 		public FuzzyDateQueryDescriptor<T> Value(DateTime? value) => Assign(a => a.Value = value);
 	}
diff --git a/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryBase.cs b/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryBase.cs
index 296e57c1ced..c88c368619c 100644
--- a/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryBase.cs
+++ b/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryBase.cs
@@ -1,5 +1,4 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -7,25 +6,26 @@ namespace Nest
 	[JsonConverter(typeof(FuzzyQueryJsonConverter))]
 	public interface IFuzzyQuery : IFieldNameQuery
 	{
+		[JsonProperty("max_expansions")]
+		int? MaxExpansions { get; set; }
+
 		[JsonProperty("prefix_length")]
 		int? PrefixLength { get; set; }
 
 		[JsonProperty("rewrite")]
 		MultiTermQueryRewrite Rewrite { get; set; }
 
-		[JsonProperty("max_expansions")]
-		int? MaxExpansions { get; set; }
-
 		[JsonProperty("transpositions")]
 		bool? Transpositions { get; set; }
 	}
+
 	public interface IFuzzyQuery<TValue, TFuzziness> : IFuzzyQuery
 	{
-		[JsonProperty("value")]
-		TValue Value { get; set; }
-
 		[JsonProperty("fuzziness")]
 		TFuzziness Fuzziness { get; set; }
+
+		[JsonProperty("value")]
+		TValue Value { get; set; }
 	}
 
 	internal static class FuzzyQueryBase
@@ -36,35 +36,33 @@ internal static bool IsConditionless<TValue, TFuzziness>(IFuzzyQuery<TValue, TFu
 
 	public abstract class FuzzyQueryBase<TValue, TFuzziness> : FieldNameQueryBase, IFuzzyQuery<TValue, TFuzziness>
 	{
-		public int? PrefixLength { get; set; }
-
-		public TValue Value { get; set; }
-
 		public TFuzziness Fuzziness { get; set; }
 
-		public MultiTermQueryRewrite Rewrite { get; set; }
-
 		public int? MaxExpansions { get; set; }
+		public int? PrefixLength { get; set; }
+
+		public MultiTermQueryRewrite Rewrite { get; set; }
 
 		public bool? Transpositions { get; set; }
 
-		internal override void InternalWrapInContainer(IQueryContainer c) => c.Fuzzy = this;
+		public TValue Value { get; set; }
 
 		protected override bool Conditionless => FuzzyQueryBase.IsConditionless(this);
 
+		internal override void InternalWrapInContainer(IQueryContainer c) => c.Fuzzy = this;
 	}
 
 	public abstract class FuzzyQueryDescriptorBase<TDescriptor, T, TValue, TFuzziness>
-		: FieldNameQueryDescriptorBase<TDescriptor, IFuzzyQuery<TValue, TFuzziness>, T> , IFuzzyQuery<TValue, TFuzziness>
+		: FieldNameQueryDescriptorBase<TDescriptor, IFuzzyQuery<TValue, TFuzziness>, T>, IFuzzyQuery<TValue, TFuzziness>
 		where T : class
 		where TDescriptor : FieldNameQueryDescriptorBase<TDescriptor, IFuzzyQuery<TValue, TFuzziness>, T>, IFuzzyQuery<TValue, TFuzziness>
 	{
 		protected override bool Conditionless => FuzzyQueryBase.IsConditionless(this);
-		int? IFuzzyQuery.PrefixLength { get; set; }
+		TFuzziness IFuzzyQuery<TValue, TFuzziness>.Fuzziness { get; set; }
 		int? IFuzzyQuery.MaxExpansions { get; set; }
-		bool? IFuzzyQuery.Transpositions { get; set; }
+		int? IFuzzyQuery.PrefixLength { get; set; }
 		MultiTermQueryRewrite IFuzzyQuery.Rewrite { get; set; }
-		TFuzziness IFuzzyQuery<TValue, TFuzziness>.Fuzziness { get; set; }
+		bool? IFuzzyQuery.Transpositions { get; set; }
 		TValue IFuzzyQuery<TValue, TFuzziness>.Value { get; set; }
 
 		public TDescriptor MaxExpansions(int? maxExpansions) => Assign(a => a.MaxExpansions = maxExpansions);
diff --git a/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryJsonConverter.cs b/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryJsonConverter.cs
index 42c87561a17..2be6e050ba1 100644
--- a/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryJsonConverter.cs
+++ b/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryJsonConverter.cs
@@ -5,14 +5,14 @@
 
 namespace Nest
 {
-	internal class FuzzyQueryJsonConverter: FieldNameQueryJsonConverter<FuzzyQuery>
+	internal class FuzzyQueryJsonConverter : FieldNameQueryJsonConverter<FuzzyQuery>
 	{
-		public override bool CanConvert(Type objectType) => true;
-
 		public override bool CanRead => true;
 
 		public override bool CanWrite => true;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var j = JObject.Load(reader);
@@ -30,29 +30,23 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 			IFuzzyQuery fq;
 			if (v.Type == JTokenType.String)
-			{
 				fq = new FuzzyQuery
 				{
 					Value = GetPropValue<string>(jo, "value"),
 					Fuzziness = GetPropObject<Fuzziness>(jo, "fuzziness")
 				};
-			}
 			else if (v.Type == JTokenType.Date)
-			{
 				fq = new FuzzyDateQuery
 				{
 					Value = GetPropValue<DateTime?>(jo, "value"),
 					Fuzziness = GetPropObject<Time>(jo, "fuzziness")
 				};
-			}
 			else if (v.Type == JTokenType.Integer || v.Type == JTokenType.Float)
-			{
 				fq = new FuzzyNumericQuery
 				{
 					Value = GetPropValue<double?>(jo, "value"),
 					Fuzziness = GetPropValue<double?>(jo, "fuzziness")
 				};
-			}
 			else return null;
 
 			fq.PrefixLength = GetPropValue<int?>(jo, "prefix_length");
diff --git a/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs b/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs
index e1b768a8b7e..df4fb86bc8b 100644
--- a/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs
@@ -18,41 +18,42 @@ public interface IIdsQuery : IQuery
 
 	public class IdsQuery : QueryBase, IIdsQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public Types Types { get; set; }
 		public IEnumerable<Id> Values { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Ids = this;
+
 		internal static bool IsConditionless(IIdsQuery q) => !q.Values.HasAny();
 	}
 
 	public class IdsQueryDescriptor
 		: QueryDescriptorBase<IdsQueryDescriptor, IIdsQuery>
-		, IIdsQuery
+			, IIdsQuery
 	{
 		protected override bool Conditionless => IdsQuery.IsConditionless(this);
-		IEnumerable<Id> IIdsQuery.Values { get; set; }
 		Types IIdsQuery.Types { get; set; }
+		IEnumerable<Id> IIdsQuery.Values { get; set; }
 
-		public IdsQueryDescriptor Types(params TypeName[] types) => Assign(a=>a.Types = types);
+		public IdsQueryDescriptor Types(params TypeName[] types) => Assign(a => a.Types = types);
 
 		public IdsQueryDescriptor Types(IEnumerable<TypeName> values) => Types(values?.ToArray());
 
-		public IdsQueryDescriptor Types(Types types) => Assign(a=>a.Types = types);
+		public IdsQueryDescriptor Types(Types types) => Assign(a => a.Types = types);
 
 		public IdsQueryDescriptor Values(params Id[] values) => Assign(a => a.Values = values);
 
 		public IdsQueryDescriptor Values(IEnumerable<Id> values) => Values(values?.ToArray());
 
-		public IdsQueryDescriptor Values(params string[] values) => Assign(a => a.Values = values?.Select(v=>(Id)v));
+		public IdsQueryDescriptor Values(params string[] values) => Assign(a => a.Values = values?.Select(v => (Id)v));
 
 		public IdsQueryDescriptor Values(IEnumerable<string> values) => Values(values.ToArray());
 
-		public IdsQueryDescriptor Values(params long[] values) => Assign(a => a.Values = values?.Select(v=>(Id)v));
+		public IdsQueryDescriptor Values(params long[] values) => Assign(a => a.Values = values?.Select(v => (Id)v));
 
 		public IdsQueryDescriptor Values(IEnumerable<long> values) => Values(values.ToArray());
 
-		public IdsQueryDescriptor Values(params Guid[] values) => Assign(a => a.Values = values?.Select(v=>(Id)v));
+		public IdsQueryDescriptor Values(params Guid[] values) => Assign(a => a.Values = values?.Select(v => (Id)v));
 
 		public IdsQueryDescriptor Values(IEnumerable<Guid> values) => Values(values.ToArray());
 	}
diff --git a/src/Nest/QueryDsl/TermLevel/Prefix/PrefixQuery.cs b/src/Nest/QueryDsl/TermLevel/Prefix/PrefixQuery.cs
index 049edfb4e17..76f31e9d0b2 100644
--- a/src/Nest/QueryDsl/TermLevel/Prefix/PrefixQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Prefix/PrefixQuery.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (FieldNameQueryJsonConverter<PrefixQuery>))]
+	[JsonConverter(typeof(FieldNameQueryJsonConverter<PrefixQuery>))]
 	public interface IPrefixQuery : ITermQuery
 	{
 		[JsonProperty("rewrite")]
@@ -12,19 +12,19 @@ public interface IPrefixQuery : ITermQuery
 
 	public class PrefixQuery : FieldNameQueryBase, IPrefixQuery
 	{
-		protected override bool Conditionless => TermQuery.IsConditionless(this);
-		public object Value { get; set; }
-
 		public MultiTermQueryRewrite Rewrite { get; set; }
+		public object Value { get; set; }
+		protected override bool Conditionless => TermQuery.IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Prefix = this;
 	}
 
-	public class PrefixQueryDescriptor<T> : TermQueryDescriptorBase<PrefixQueryDescriptor<T>, IPrefixQuery, T>,
-		IPrefixQuery where T : class
+	public class PrefixQueryDescriptor<T>
+		: TermQueryDescriptorBase<PrefixQueryDescriptor<T>, IPrefixQuery, T>,
+			IPrefixQuery where T : class
 	{
 		MultiTermQueryRewrite IPrefixQuery.Rewrite { get; set; }
 
 		public PrefixQueryDescriptor<T> Rewrite(MultiTermQueryRewrite rewrite) => Assign(a => a.Rewrite = rewrite);
-		}
-		}
+	}
+}
diff --git a/src/Nest/QueryDsl/TermLevel/Range/DateRangeQuery .cs b/src/Nest/QueryDsl/TermLevel/Range/DateRangeQuery .cs
index 570a510fbe7..22ba2ceb190 100644
--- a/src/Nest/QueryDsl/TermLevel/Range/DateRangeQuery .cs	
+++ b/src/Nest/QueryDsl/TermLevel/Range/DateRangeQuery .cs	
@@ -3,67 +3,65 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (FieldNameQueryJsonConverter<DateRangeQuery>))]
-	public interface IDateRangeQuery :  IRangeQuery
+	[JsonConverter(typeof(FieldNameQueryJsonConverter<DateRangeQuery>))]
+	public interface IDateRangeQuery : IRangeQuery
 	{
-		[JsonProperty("gte")]
-		DateMath GreaterThanOrEqualTo { get; set; }
-
-		[JsonProperty("lte")]
-		DateMath LessThanOrEqualTo { get; set; }
+		[JsonProperty("format")]
+		string Format { get; set; }
 
 		[JsonProperty("gt")]
 		DateMath GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		DateMath GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		DateMath LessThan { get; set; }
 
-		[JsonProperty("time_zone")]
-		string TimeZone { get; set; }
-
-		[JsonProperty("format")]
-		string Format { get; set; }
+		[JsonProperty("lte")]
+		DateMath LessThanOrEqualTo { get; set; }
 
 		[JsonProperty("relation")]
 		RangeRelation? Relation { get; set; }
+
+		[JsonProperty("time_zone")]
+		string TimeZone { get; set; }
 	}
 
 	public class DateRangeQuery : FieldNameQueryBase, IDateRangeQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		internal override void InternalWrapInContainer(IQueryContainer c) => c.Range = this;
+		public string Format { get; set; }
+		public DateMath GreaterThan { get; set; }
 
 		public DateMath GreaterThanOrEqualTo { get; set; }
-		public DateMath LessThanOrEqualTo { get; set; }
-		public DateMath GreaterThan { get; set; }
 		public DateMath LessThan { get; set; }
-		public string TimeZone { get; set; }
-		public string Format { get; set; }
+		public DateMath LessThanOrEqualTo { get; set; }
 		public RangeRelation? Relation { get; set; }
+		public string TimeZone { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
-		internal static bool IsConditionless(IDateRangeQuery q)
-		{
-			return q.Field.IsConditionless()
-				|| (q.GreaterThanOrEqualTo == null
-				&& q.LessThanOrEqualTo == null
-				&& q.GreaterThan == null
-				&& q.LessThan == null);
-		}
+		internal override void InternalWrapInContainer(IQueryContainer c) => c.Range = this;
+
+		internal static bool IsConditionless(IDateRangeQuery q) => q.Field.IsConditionless()
+			|| q.GreaterThanOrEqualTo == null
+			&& q.LessThanOrEqualTo == null
+			&& q.GreaterThan == null
+			&& q.LessThan == null;
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class DateRangeQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<DateRangeQueryDescriptor<T>, IDateRangeQuery, T>
-		, IDateRangeQuery where T : class
+			, IDateRangeQuery where T : class
 	{
 		protected override bool Conditionless => DateRangeQuery.IsConditionless(this);
-		DateMath IDateRangeQuery.GreaterThanOrEqualTo { get; set; }
-		DateMath IDateRangeQuery.LessThanOrEqualTo { get; set; }
+		string IDateRangeQuery.Format { get; set; }
 		DateMath IDateRangeQuery.GreaterThan { get; set; }
+		DateMath IDateRangeQuery.GreaterThanOrEqualTo { get; set; }
 		DateMath IDateRangeQuery.LessThan { get; set; }
-		string IDateRangeQuery.TimeZone { get; set; }
-		string IDateRangeQuery.Format { get; set; }
+		DateMath IDateRangeQuery.LessThanOrEqualTo { get; set; }
 		RangeRelation? IDateRangeQuery.Relation { get; set; }
+		string IDateRangeQuery.TimeZone { get; set; }
 
 		public DateRangeQueryDescriptor<T> GreaterThan(DateMath from) => Assign(a => a.GreaterThan = from);
 
diff --git a/src/Nest/QueryDsl/TermLevel/Range/LongRangeQuery.cs b/src/Nest/QueryDsl/TermLevel/Range/LongRangeQuery.cs
index 640345d9a0f..640e1f780d2 100644
--- a/src/Nest/QueryDsl/TermLevel/Range/LongRangeQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Range/LongRangeQuery.cs
@@ -4,42 +4,39 @@ namespace Nest
 {
 	public interface ILongRangeQuery : IRangeQuery
 	{
-		[JsonProperty("gte")]
-		long? GreaterThanOrEqualTo { get; set; }
-
-		[JsonProperty("lte")]
-		long? LessThanOrEqualTo { get; set; }
-
 		[JsonProperty("gt")]
 		long? GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		long? GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		long? LessThan { get; set; }
 
+		[JsonProperty("lte")]
+		long? LessThanOrEqualTo { get; set; }
+
 		[JsonProperty("relation")]
 		RangeRelation? Relation { get; set; }
 	}
 
 	public class LongRangeQuery : FieldNameQueryBase, ILongRangeQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public long? GreaterThanOrEqualTo { get; set; }
-		public long? LessThanOrEqualTo { get; set; }
 		public long? GreaterThan { get; set; }
+		public long? GreaterThanOrEqualTo { get; set; }
 		public long? LessThan { get; set; }
+		public long? LessThanOrEqualTo { get; set; }
 
 		public RangeRelation? Relation { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Range = this;
 
-		internal static bool IsConditionless(ILongRangeQuery q)
-		{
-			return q.Field.IsConditionless()
-			       || (q.GreaterThanOrEqualTo == null
-			           && q.LessThanOrEqualTo == null
-			           && q.GreaterThan == null
-			           && q.LessThan == null);
-		}
+		internal static bool IsConditionless(ILongRangeQuery q) => q.Field.IsConditionless()
+			|| q.GreaterThanOrEqualTo == null
+			&& q.LessThanOrEqualTo == null
+			&& q.GreaterThan == null
+			&& q.LessThan == null;
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
@@ -48,10 +45,10 @@ public class LongRangeQueryDescriptor<T>
 			, ILongRangeQuery where T : class
 	{
 		protected override bool Conditionless => LongRangeQuery.IsConditionless(this);
-		long? ILongRangeQuery.GreaterThanOrEqualTo { get; set; }
-		long? ILongRangeQuery.LessThanOrEqualTo { get; set; }
 		long? ILongRangeQuery.GreaterThan { get; set; }
+		long? ILongRangeQuery.GreaterThanOrEqualTo { get; set; }
 		long? ILongRangeQuery.LessThan { get; set; }
+		long? ILongRangeQuery.LessThanOrEqualTo { get; set; }
 		RangeRelation? ILongRangeQuery.Relation { get; set; }
 
 		public LongRangeQueryDescriptor<T> Relation(RangeRelation? relation) => Assign(a => a.Relation = relation);
diff --git a/src/Nest/QueryDsl/TermLevel/Range/NumericRangeQuery.cs b/src/Nest/QueryDsl/TermLevel/Range/NumericRangeQuery.cs
index be86363fd2e..d9ed17122aa 100644
--- a/src/Nest/QueryDsl/TermLevel/Range/NumericRangeQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Range/NumericRangeQuery.cs
@@ -4,56 +4,53 @@ namespace Nest
 {
 	public interface INumericRangeQuery : IRangeQuery
 	{
-		[JsonProperty("gte")]
-		double? GreaterThanOrEqualTo { get; set; }
-
-		[JsonProperty("lte")]
-		double? LessThanOrEqualTo { get; set; }
-
 		[JsonProperty("gt")]
 		double? GreaterThan { get; set; }
 
+		[JsonProperty("gte")]
+		double? GreaterThanOrEqualTo { get; set; }
+
 		[JsonProperty("lt")]
 		double? LessThan { get; set; }
 
+		[JsonProperty("lte")]
+		double? LessThanOrEqualTo { get; set; }
+
 		[JsonProperty("relation")]
 		RangeRelation? Relation { get; set; }
 	}
 
 	public class NumericRangeQuery : FieldNameQueryBase, INumericRangeQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public double? GreaterThanOrEqualTo { get; set; }
-		public double? LessThanOrEqualTo { get; set; }
 		public double? GreaterThan { get; set; }
+		public double? GreaterThanOrEqualTo { get; set; }
 		public double? LessThan { get; set; }
+		public double? LessThanOrEqualTo { get; set; }
 
 		public RangeRelation? Relation { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Range = this;
 
-		internal static bool IsConditionless(INumericRangeQuery q)
-		{
-			return q.Field.IsConditionless()
-				|| (q.GreaterThanOrEqualTo == null
-				&& q.LessThanOrEqualTo == null
-				&& q.GreaterThan == null
-				&& q.LessThan == null);
-		}
+		internal static bool IsConditionless(INumericRangeQuery q) => q.Field.IsConditionless()
+			|| q.GreaterThanOrEqualTo == null
+			&& q.LessThanOrEqualTo == null
+			&& q.GreaterThan == null
+			&& q.LessThan == null;
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class NumericRangeQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<NumericRangeQueryDescriptor<T>, INumericRangeQuery, T>
-		, INumericRangeQuery where T : class
+			, INumericRangeQuery where T : class
 	{
 		protected override bool Conditionless => NumericRangeQuery.IsConditionless(this);
-		double? INumericRangeQuery.GreaterThanOrEqualTo { get; set; }
-		double? INumericRangeQuery.LessThanOrEqualTo { get; set; }
 		double? INumericRangeQuery.GreaterThan { get; set; }
+		double? INumericRangeQuery.GreaterThanOrEqualTo { get; set; }
 		double? INumericRangeQuery.LessThan { get; set; }
+		double? INumericRangeQuery.LessThanOrEqualTo { get; set; }
 
-		RangeRelation? INumericRangeQuery.Relation{ get; set; }
+		RangeRelation? INumericRangeQuery.Relation { get; set; }
 
 		public NumericRangeQueryDescriptor<T> GreaterThan(double? from) => Assign(a => a.GreaterThan = from);
 
diff --git a/src/Nest/QueryDsl/TermLevel/Range/RangeQuery.cs b/src/Nest/QueryDsl/TermLevel/Range/RangeQuery.cs
index d22f56bb1fc..3dbfa76f910 100644
--- a/src/Nest/QueryDsl/TermLevel/Range/RangeQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Range/RangeQuery.cs
@@ -3,6 +3,6 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (RangeQueryJsonConverter))]
+	[JsonConverter(typeof(RangeQueryJsonConverter))]
 	public interface IRangeQuery : IFieldNameQuery { }
 }
diff --git a/src/Nest/QueryDsl/TermLevel/Range/RangeQueryJsonConverter.cs b/src/Nest/QueryDsl/TermLevel/Range/RangeQueryJsonConverter.cs
index 1f5aa9dc11b..943807b376e 100644
--- a/src/Nest/QueryDsl/TermLevel/Range/RangeQueryJsonConverter.cs
+++ b/src/Nest/QueryDsl/TermLevel/Range/RangeQueryJsonConverter.cs
@@ -5,15 +5,16 @@
 
 namespace Nest
 {
-	internal class RangeQueryJsonConverter: FieldNameQueryJsonConverter<NumericRangeQuery>
+	internal class RangeQueryJsonConverter : FieldNameQueryJsonConverter<NumericRangeQuery>
 	{
 		private static readonly string[] _rangeKeys = new[] { "gt", "gte", "lte", "lt" };
-		public override bool CanConvert(Type objectType) => true;
 
 		public override bool CanRead => true;
 
 		public override bool CanWrite => true;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var j = JObject.Load(reader);
@@ -44,6 +45,7 @@ private static IRangeQuery GetRangeQuery(JsonSerializer serializer, JObject jo)
 			{
 				if (property.Name == "format" || property.Name == "time_zone")
 					return FromJson.ReadAs<DateRangeQuery>(jo.CreateReader(), serializer);
+
 				if (_rangeKeys.Contains(property.Name))
 				{
 					if (property.Value.Type == JTokenType.Float)
diff --git a/src/Nest/QueryDsl/TermLevel/Range/RangeRelation.cs b/src/Nest/QueryDsl/TermLevel/Range/RangeRelation.cs
index 49afe5857da..7004656b4c3 100644
--- a/src/Nest/QueryDsl/TermLevel/Range/RangeRelation.cs
+++ b/src/Nest/QueryDsl/TermLevel/Range/RangeRelation.cs
@@ -7,8 +7,8 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum RangeRelation
 	{
-		[EnumMember(Value="within")] Within,
-		[EnumMember(Value="contains")] Contains,
-		[EnumMember(Value="intersects")] Intersects
+		[EnumMember(Value = "within")] Within,
+		[EnumMember(Value = "contains")] Contains,
+		[EnumMember(Value = "intersects")] Intersects
 	}
 }
diff --git a/src/Nest/QueryDsl/TermLevel/Range/TermRangeQuery.cs b/src/Nest/QueryDsl/TermLevel/Range/TermRangeQuery.cs
index dd5f32b22e2..ab1bc087ed4 100644
--- a/src/Nest/QueryDsl/TermLevel/Range/TermRangeQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Range/TermRangeQuery.cs
@@ -2,59 +2,56 @@
 
 namespace Nest
 {
-    [JsonConverter(typeof(FieldNameQueryJsonConverter<TermRangeQuery>))]
-    public interface ITermRangeQuery : IRangeQuery
-    {
-        [JsonProperty("gte")]
-        string GreaterThanOrEqualTo { get; set; }
-
-        [JsonProperty("lte")]
-        string LessThanOrEqualTo { get; set; }
-
-        [JsonProperty("gt")]
-        string GreaterThan { get; set; }
-
-        [JsonProperty("lt")]
-        string LessThan { get; set; }
-    }
-
-    public class TermRangeQuery : FieldNameQueryBase, ITermRangeQuery
-    {
-        protected override bool Conditionless => IsConditionless(this);
-        public string GreaterThanOrEqualTo { get; set; }
-        public string LessThanOrEqualTo { get; set; }
-        public string GreaterThan { get; set; }
-        public string LessThan { get; set; }
-
-        internal override void InternalWrapInContainer(IQueryContainer c) => c.Range = this;
-
-        internal static bool IsConditionless(ITermRangeQuery q)
-        {
-            return q.Field.IsConditionless()
-                   || (q.GreaterThanOrEqualTo.IsNullOrEmpty()
-                       && q.LessThanOrEqualTo.IsNullOrEmpty()
-                       && q.GreaterThan.IsNullOrEmpty()
-                       && q.LessThan.IsNullOrEmpty());
-        }
-    }
-
-    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-    public class TermRangeQueryDescriptor<T>
-        : FieldNameQueryDescriptorBase<TermRangeQueryDescriptor<T>, ITermRangeQuery, T>
-        , ITermRangeQuery where T : class
-    {
-        protected override bool Conditionless => TermRangeQuery.IsConditionless(this);
-        string ITermRangeQuery.GreaterThanOrEqualTo { get; set; }
-        string ITermRangeQuery.LessThanOrEqualTo { get; set; }
-        string ITermRangeQuery.GreaterThan { get; set; }
-        string ITermRangeQuery.LessThan { get; set; }
-
-        public TermRangeQueryDescriptor<T> GreaterThan(string from) => Assign(a => a.GreaterThan = from);
-
-        public TermRangeQueryDescriptor<T> GreaterThanOrEquals(string from) => Assign(a => a.GreaterThanOrEqualTo = from);
-
-        public TermRangeQueryDescriptor<T> LessThan(string to) => Assign(a => a.LessThan = to);
-
-        public TermRangeQueryDescriptor<T> LessThanOrEquals(string to) => Assign(a => a.LessThanOrEqualTo = to);
-    }
+	[JsonConverter(typeof(FieldNameQueryJsonConverter<TermRangeQuery>))]
+	public interface ITermRangeQuery : IRangeQuery
+	{
+		[JsonProperty("gt")]
+		string GreaterThan { get; set; }
+
+		[JsonProperty("gte")]
+		string GreaterThanOrEqualTo { get; set; }
+
+		[JsonProperty("lt")]
+		string LessThan { get; set; }
+
+		[JsonProperty("lte")]
+		string LessThanOrEqualTo { get; set; }
+	}
+
+	public class TermRangeQuery : FieldNameQueryBase, ITermRangeQuery
+	{
+		public string GreaterThan { get; set; }
+		public string GreaterThanOrEqualTo { get; set; }
+		public string LessThan { get; set; }
+		public string LessThanOrEqualTo { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
+
+		internal override void InternalWrapInContainer(IQueryContainer c) => c.Range = this;
+
+		internal static bool IsConditionless(ITermRangeQuery q) => q.Field.IsConditionless()
+			|| q.GreaterThanOrEqualTo.IsNullOrEmpty()
+			&& q.LessThanOrEqualTo.IsNullOrEmpty()
+			&& q.GreaterThan.IsNullOrEmpty()
+			&& q.LessThan.IsNullOrEmpty();
+	}
+
+	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+	public class TermRangeQueryDescriptor<T>
+		: FieldNameQueryDescriptorBase<TermRangeQueryDescriptor<T>, ITermRangeQuery, T>
+			, ITermRangeQuery where T : class
+	{
+		protected override bool Conditionless => TermRangeQuery.IsConditionless(this);
+		string ITermRangeQuery.GreaterThan { get; set; }
+		string ITermRangeQuery.GreaterThanOrEqualTo { get; set; }
+		string ITermRangeQuery.LessThan { get; set; }
+		string ITermRangeQuery.LessThanOrEqualTo { get; set; }
+
+		public TermRangeQueryDescriptor<T> GreaterThan(string from) => Assign(a => a.GreaterThan = from);
+
+		public TermRangeQueryDescriptor<T> GreaterThanOrEquals(string from) => Assign(a => a.GreaterThanOrEqualTo = from);
+
+		public TermRangeQueryDescriptor<T> LessThan(string to) => Assign(a => a.LessThan = to);
+
+		public TermRangeQueryDescriptor<T> LessThanOrEquals(string to) => Assign(a => a.LessThanOrEqualTo = to);
+	}
 }
diff --git a/src/Nest/QueryDsl/TermLevel/Regexp/RegexpQuery.cs b/src/Nest/QueryDsl/TermLevel/Regexp/RegexpQuery.cs
index 0cb8c90d9b9..5f1e9b8ce0c 100644
--- a/src/Nest/QueryDsl/TermLevel/Regexp/RegexpQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Regexp/RegexpQuery.cs
@@ -3,38 +3,39 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (FieldNameQueryJsonConverter<RegexpQuery>))]
+	[JsonConverter(typeof(FieldNameQueryJsonConverter<RegexpQuery>))]
 	public interface IRegexpQuery : IFieldNameQuery
 	{
-		[JsonProperty("value")]
-		string Value { get; set; }
-
 		[JsonProperty("flags")]
 		string Flags { get; set; }
 
 		[JsonProperty("max_determinized_states")]
 		int? MaximumDeterminizedStates { get; set; }
+
+		[JsonProperty("value")]
+		string Value { get; set; }
 	}
 
 	public class RegexpQuery : FieldNameQueryBase, IRegexpQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-		public string Value { get; set; }
 		public string Flags { get; set; }
 		public int? MaximumDeterminizedStates { get; set; }
+		public string Value { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Regexp = this;
+
 		internal static bool IsConditionless(IRegexpQuery q) => q.Field.IsConditionless() || q.Value.IsNullOrEmpty();
 	}
 
 	public class RegexpQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<RegexpQueryDescriptor<T>, IRegexpQuery, T>
-		, IRegexpQuery where T : class
+			, IRegexpQuery where T : class
 	{
 		protected override bool Conditionless => RegexpQuery.IsConditionless(this);
-		string IRegexpQuery.Value { get; set; }
 		string IRegexpQuery.Flags { get; set; }
 		int? IRegexpQuery.MaximumDeterminizedStates { get; set; }
+		string IRegexpQuery.Value { get; set; }
 
 		public RegexpQueryDescriptor<T> MaximumDeterminizedStates(int? maxDeterminizedStates) =>
 			Assign(a => a.MaximumDeterminizedStates = maxDeterminizedStates);
diff --git a/src/Nest/QueryDsl/TermLevel/Term/TermQuery.cs b/src/Nest/QueryDsl/TermLevel/Term/TermQuery.cs
index 73f4e79ed3f..50860e29050 100644
--- a/src/Nest/QueryDsl/TermLevel/Term/TermQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Term/TermQuery.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (FieldNameQueryJsonConverter<TermQuery>))]
+	[JsonConverter(typeof(FieldNameQueryJsonConverter<TermQuery>))]
 	public interface ITermQuery : IFieldNameQuery
 	{
 		[JsonProperty("value")]
@@ -13,17 +13,19 @@ public interface ITermQuery : IFieldNameQuery
 
 	public class TermQuery : FieldNameQueryBase, ITermQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		[JsonConverter(typeof(SourceValueWriteConverter))]
 		public object Value { get; set; }
 
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Term = this;
 
 		internal static bool IsConditionless(ITermQuery q) => q.Value == null || q.Value.ToString().IsNullOrEmpty() || q.Field.IsConditionless();
 	}
 
-	public abstract class TermQueryDescriptorBase<TDescriptor, TInterface, T> : FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>
-		, ITermQuery
+	public abstract class TermQueryDescriptorBase<TDescriptor, TInterface, T>
+		: FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>
+			, ITermQuery
 		where TDescriptor : TermQueryDescriptorBase<TDescriptor, TInterface, T>, TInterface
 		where TInterface : class, ITermQuery
 		where T : class
@@ -39,7 +41,5 @@ public TDescriptor Value(object value)
 	}
 
 	public class TermQueryDescriptor<T> : TermQueryDescriptorBase<TermQueryDescriptor<T>, ITermQuery, T>
-		where T : class
-	{
-	}
+		where T : class { }
 }
diff --git a/src/Nest/QueryDsl/TermLevel/Terms/TermsQuery.cs b/src/Nest/QueryDsl/TermLevel/Terms/TermsQuery.cs
index 2b91e41ea3e..5bee3b36d8b 100644
--- a/src/Nest/QueryDsl/TermLevel/Terms/TermsQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Terms/TermsQuery.cs
@@ -16,28 +16,25 @@ public interface ITermsQuery : IFieldNameQuery
 
 	public class TermsQuery : FieldNameQueryBase, ITermsQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public IEnumerable<object> Terms { get; set; }
 		public IFieldLookup TermsLookup { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Terms = this;
-		internal static bool IsConditionless(ITermsQuery q)
-		{
-			return q.Field.IsConditionless()
-				|| (
-				(q.Terms == null
-					|| !q.Terms.HasAny()
-					|| q.Terms.All(t=>t == null
+
+		internal static bool IsConditionless(ITermsQuery q) => q.Field.IsConditionless()
+			|| (q.Terms == null
+				|| !q.Terms.HasAny()
+				|| q.Terms.All(t => t == null
 					|| ((t as string)?.IsNullOrEmpty()).GetValueOrDefault(false))
-				)
-				&&
-				(q.TermsLookup == null
-					|| q.TermsLookup.Id == null
-					|| q.TermsLookup.Path.IsConditionless()
-					|| q.TermsLookup.Index == null
-					|| q.TermsLookup.Type == null
-				));
-		}
+			)
+			&&
+			(q.TermsLookup == null
+				|| q.TermsLookup.Id == null
+				|| q.TermsLookup.Path.IsConditionless()
+				|| q.TermsLookup.Index == null
+				|| q.TermsLookup.Type == null
+			);
 	}
 
 	/// <summary>
@@ -47,7 +44,7 @@ internal static bool IsConditionless(ITermsQuery q)
 	/// <typeparam name="T">The type that represents the expected hit type</typeparam>
 	public class TermsQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<TermsQueryDescriptor<T>, ITermsQuery, T>
-		, ITermsQuery where T : class
+			, ITermsQuery where T : class
 	{
 		protected override bool Conditionless => TermsQuery.IsConditionless(this);
 		IEnumerable<object> ITermsQuery.Terms { get; set; }
@@ -58,13 +55,11 @@ public TermsQueryDescriptor<T> TermsLookup<TOther>(Func<FieldLookupDescriptor<TO
 
 		public TermsQueryDescriptor<T> Terms<TValue>(IEnumerable<TValue> terms) => Assign(a => a.Terms = terms?.Cast<object>());
 
-		public TermsQueryDescriptor<T> Terms<TValue>(params TValue[] terms) => Assign(a => {
-			if(terms?.Length == 1 && typeof(IEnumerable).IsAssignableFrom(typeof(TValue)) && typeof(TValue) != typeof(string))
-			{
+		public TermsQueryDescriptor<T> Terms<TValue>(params TValue[] terms) => Assign(a =>
+		{
+			if (terms?.Length == 1 && typeof(IEnumerable).IsAssignableFrom(typeof(TValue)) && typeof(TValue) != typeof(string))
 				a.Terms = (terms.First() as IEnumerable)?.Cast<object>();
-			}
 			else a.Terms = terms?.Cast<object>();
 		});
-
 	}
 }
diff --git a/src/Nest/QueryDsl/TermLevel/Terms/TermsQueryJsonConverter.cs b/src/Nest/QueryDsl/TermLevel/Terms/TermsQueryJsonConverter.cs
index 65e68611036..69c794d960f 100644
--- a/src/Nest/QueryDsl/TermLevel/Terms/TermsQueryJsonConverter.cs
+++ b/src/Nest/QueryDsl/TermLevel/Terms/TermsQueryJsonConverter.cs
@@ -67,6 +67,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			}
 			writer.WriteEndObject();
 		}
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var filter = new TermsQuery();
@@ -96,7 +97,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				}
 			}
 			return filter;
-
 		}
 
 		private void ReadTerms(ITermsQuery termsQuery, JsonReader reader, JsonSerializer serializer)
@@ -143,5 +143,4 @@ private void ReadTerms(ITermsQuery termsQuery, JsonReader reader, JsonSerializer
 			}
 		}
 	}
-
 }
diff --git a/src/Nest/QueryDsl/TermLevel/TermsSet/TermsSetQuery.cs b/src/Nest/QueryDsl/TermLevel/TermsSet/TermsSetQuery.cs
index dd1886ef7da..bff56363856 100644
--- a/src/Nest/QueryDsl/TermLevel/TermsSet/TermsSetQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/TermsSet/TermsSetQuery.cs
@@ -17,13 +17,6 @@ namespace Nest
 	[JsonConverter(typeof(FieldNameQueryJsonConverter<TermsSetQuery>))]
 	public interface ITermsSetQuery : IFieldNameQuery
 	{
-		/// <summary>
-		/// The required terms to match
-		/// </summary>
-		[JsonProperty("terms")]
-		[JsonConverter(typeof(SourceValueWriteConverter))]
-		IEnumerable<object> Terms { get; set; }
-
 		/// <summary>
 		/// A field containing the number of required terms that must match
 		/// </summary>
@@ -35,29 +28,38 @@ public interface ITermsSetQuery : IFieldNameQuery
 		/// </summary>
 		[JsonProperty("minimum_should_match_script")]
 		IScript MinimumShouldMatchScript { get; set; }
+
+		/// <summary>
+		/// The required terms to match
+		/// </summary>
+		[JsonProperty("terms")]
+		[JsonConverter(typeof(SourceValueWriteConverter))]
+		IEnumerable<object> Terms { get; set; }
 	}
 
-	/// <<inheritdoc cref="ITermsSetQuery" />
+	/// <
+	/// <inheritdoc cref="ITermsSetQuery" />
 	public class TermsSetQuery : FieldNameQueryBase, ITermsSetQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
-
-		/// <inheritdoc />
-		public IEnumerable<object> Terms { get; set; }
-
 		/// <inheritdoc />
 		public Field MinimumShouldMatchField { get; set; }
 
 		/// <inheritdoc />
 		public IScript MinimumShouldMatchScript { get; set; }
 
+		/// <inheritdoc />
+		public IEnumerable<object> Terms { get; set; }
+
+		protected override bool Conditionless => IsConditionless(this);
+
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.TermsSet = this;
+
 		internal static bool IsConditionless(ITermsSetQuery q) =>
 			q.Field.IsConditionless() ||
-		    q.Terms == null ||
-		    !q.Terms.HasAny() ||
-		    q.Terms.All(t => t == null || ((t as string)?.IsNullOrEmpty()).GetValueOrDefault(false)) ||
-		    (q.MinimumShouldMatchField.IsConditionless() && q.MinimumShouldMatchScript == null);
+			q.Terms == null ||
+			!q.Terms.HasAny() ||
+			q.Terms.All(t => t == null || ((t as string)?.IsNullOrEmpty()).GetValueOrDefault(false)) ||
+			q.MinimumShouldMatchField.IsConditionless() && q.MinimumShouldMatchScript == null;
 	}
 
 	/// <summary>
@@ -69,12 +71,12 @@ internal static bool IsConditionless(ITermsSetQuery q) =>
 	/// <typeparam name="T">The type that represents the expected hit type</typeparam>
 	public class TermsSetQueryDescriptor<T>
 		: FieldNameQueryDescriptorBase<TermsSetQueryDescriptor<T>, ITermsSetQuery, T>
-		, ITermsSetQuery where T : class
+			, ITermsSetQuery where T : class
 	{
 		protected override bool Conditionless => TermsSetQuery.IsConditionless(this);
-		IEnumerable<object> ITermsSetQuery.Terms { get; set; }
 		Field ITermsSetQuery.MinimumShouldMatchField { get; set; }
 		IScript ITermsSetQuery.MinimumShouldMatchScript { get; set; }
+		IEnumerable<object> ITermsSetQuery.Terms { get; set; }
 
 		/// <summary>
 		/// The required terms to match
@@ -84,11 +86,10 @@ public class TermsSetQueryDescriptor<T>
 		/// <summary>
 		/// The required terms to match
 		/// </summary>
-		public TermsSetQueryDescriptor<T> Terms<TValue>(params TValue[] terms) => Assign(a => {
-			if(terms?.Length == 1 && typeof(IEnumerable).IsAssignableFrom(typeof(TValue)) && typeof(TValue) != typeof(string))
-			{
+		public TermsSetQueryDescriptor<T> Terms<TValue>(params TValue[] terms) => Assign(a =>
+		{
+			if (terms?.Length == 1 && typeof(IEnumerable).IsAssignableFrom(typeof(TValue)) && typeof(TValue) != typeof(string))
 				a.Terms = (terms.First() as IEnumerable)?.Cast<object>();
-			}
 			else a.Terms = terms?.Cast<object>();
 		});
 
diff --git a/src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs b/src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs
index 6956689495e..368478c9e25 100644
--- a/src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs
@@ -12,16 +12,17 @@ public interface ITypeQuery : IQuery
 
 	public class TypeQuery : QueryBase, ITypeQuery
 	{
-		protected override bool Conditionless => IsConditionless(this);
 		public TypeName Value { get; set; }
+		protected override bool Conditionless => IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Type = this;
+
 		internal static bool IsConditionless(ITypeQuery q) => q.Value.IsConditionless();
 	}
 
 	public class TypeQueryDescriptor
 		: QueryDescriptorBase<TypeQueryDescriptor, ITypeQuery>
-		, ITypeQuery
+			, ITypeQuery
 	{
 		protected override bool Conditionless => TypeQuery.IsConditionless(this);
 
diff --git a/src/Nest/QueryDsl/TermLevel/Wildcard/WildcardQuery.cs b/src/Nest/QueryDsl/TermLevel/Wildcard/WildcardQuery.cs
index 9b0a5dd92a3..17f510d4cbe 100644
--- a/src/Nest/QueryDsl/TermLevel/Wildcard/WildcardQuery.cs
+++ b/src/Nest/QueryDsl/TermLevel/Wildcard/WildcardQuery.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (FieldNameQueryJsonConverter<WildcardQuery>))]
+	[JsonConverter(typeof(FieldNameQueryJsonConverter<WildcardQuery>))]
 	public interface IWildcardQuery : ITermQuery
 	{
 		[JsonProperty("rewrite")]
@@ -15,25 +15,25 @@ public interface IWildcardQuery : ITermQuery
 	public class WildcardQuery<T> : WildcardQuery
 		where T : class
 	{
-		public WildcardQuery(Expression<Func<T, object>> field) { this.Field = field; }
+		public WildcardQuery(Expression<Func<T, object>> field) => Field = field;
 	}
 
 	public class WildcardQuery : FieldNameQueryBase, IWildcardQuery
 	{
-		protected override bool Conditionless => TermQuery.IsConditionless(this);
-		public object Value { get; set; }
-
 		public MultiTermQueryRewrite Rewrite { get; set; }
+		public object Value { get; set; }
+		protected override bool Conditionless => TermQuery.IsConditionless(this);
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Wildcard = this;
 	}
 
-	public class WildcardQueryDescriptor<T> : TermQueryDescriptorBase<WildcardQueryDescriptor<T>, IWildcardQuery, T>,
-		IWildcardQuery
+	public class WildcardQueryDescriptor<T>
+		: TermQueryDescriptorBase<WildcardQueryDescriptor<T>, IWildcardQuery, T>,
+			IWildcardQuery
 		where T : class
 	{
 		MultiTermQueryRewrite IWildcardQuery.Rewrite { get; set; }
 
 		public WildcardQueryDescriptor<T> Rewrite(MultiTermQueryRewrite rewrite) => Assign(a => a.Rewrite = rewrite);
-		}
 	}
+}
diff --git a/src/Nest/QueryDsl/VariableFields.cs b/src/Nest/QueryDsl/VariableFields.cs
index 55a0e7f7a1b..44c37cd2d2b 100644
--- a/src/Nest/QueryDsl/VariableFields.cs
+++ b/src/Nest/QueryDsl/VariableFields.cs
@@ -11,14 +11,11 @@ namespace Nest
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
 	internal class VariableFieldAttribute : Attribute
 	{
-		public string FieldName { get; set; }
-
 		public VariableFieldAttribute() { }
 
-		public VariableFieldAttribute(string fieldName)
-		{
-			this.FieldName = fieldName;
-		}
+		public VariableFieldAttribute(string fieldName) => FieldName = fieldName;
+
+		public string FieldName { get; set; }
 	}
 
 	internal static class VariableFields
@@ -33,13 +30,15 @@ internal class VariableFieldNameQueryJsonConverter<TReadAs, TInterface> : Reseri
 		protected override object DeserializeJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var jo = JObject.Load(reader);
-			var query = this.ReadAs(jo.CreateReader(), typeof(TReadAs), existingValue, serializer);
+			var query = ReadAs(jo.CreateReader(), typeof(TReadAs), existingValue, serializer);
 
 			var info = GetOrCreateTypeInfo(typeof(TInterface));
 			var deeperPropertyName = info.Item2.FieldName;
 
-			var knownProperties = typeof (TInterface).GetCachedObjectProperties();
-			var unknownProperties = jo.Properties().Select(p => p.Name).Except(knownProperties.Where(p=>p.HasMemberAttribute).Select(p=>p.PropertyName));
+			var knownProperties = typeof(TInterface).GetCachedObjectProperties();
+			var unknownProperties = jo.Properties()
+				.Select(p => p.Name)
+				.Except(knownProperties.Where(p => p.HasMemberAttribute).Select(p => p.PropertyName));
 			var fieldProperty = unknownProperties.FirstOrDefault();
 			var variableProperty = info.Item1.PropertyName;
 
@@ -74,7 +73,7 @@ protected override void SerializeJson(JsonWriter writer, object value, IFieldNam
 			using (var sw = new StringWriter())
 			using (var localWriter = new JsonTextWriter(sw))
 			{
-				this.Reserialize(localWriter, value, serializer);
+				Reserialize(localWriter, value, serializer);
 				var jo = JObject.Parse(sw.ToString());
 				var v = info.Item1.ValueProvider.GetValue(castValue);
 				JToken o = null;
@@ -86,7 +85,7 @@ protected override void SerializeJson(JsonWriter writer, object value, IFieldNam
 				{
 					var subObject = new JObject
 					{
-						{info.Item2.FieldName, o}
+						{ info.Item2.FieldName, o }
 					};
 					jo.Add(field, subObject);
 				}
@@ -99,12 +98,14 @@ private static Tuple<JsonProperty, VariableFieldAttribute> GetOrCreateTypeInfo(T
 			if (!VariableFields.CachedTypeInformation.TryGetValue(t, out var info))
 			{
 				var properties = from prop in t.GetCachedObjectProperties(MemberSerialization.OptOut)
-					let attributes = prop.AttributeProvider.GetAttributes(typeof (VariableFieldAttribute), true)
+					let attributes = prop.AttributeProvider.GetAttributes(typeof(VariableFieldAttribute), true)
 					where attributes.Count > 0
-					select Tuple.Create(prop, (VariableFieldAttribute) attributes.First());
+					select Tuple.Create(prop, (VariableFieldAttribute)attributes.First());
 				info = properties.FirstOrDefault();
 				if (info == null)
-					throw new Exception($"Can not use {typeof(VariableFieldNameQueryJsonConverter<TReadAs,TInterface>).Name} if TInterface has no property with VariableFieldAttribute set");
+					throw new Exception(
+						$"Can not use {typeof(VariableFieldNameQueryJsonConverter<TReadAs, TInterface>).Name} if TInterface has no property with VariableFieldAttribute set");
+
 				VariableFields.CachedTypeInformation.TryAdd(t, info);
 			}
 			return info;
diff --git a/src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs b/src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs
index 35f3012e561..dd381017907 100644
--- a/src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs
+++ b/src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs
@@ -8,9 +8,21 @@ namespace Nest
 {
 	public class DslPrettyPrintVisitor : IQueryVisitor
 	{
+		private readonly Inferrer _infer;
 		private readonly StringBuilder _sb;
 		private string _final;
-		private readonly Inferrer _infer;
+
+		public DslPrettyPrintVisitor(IConnectionSettingsValues settings)
+		{
+			_sb = new StringBuilder();
+			_infer = settings.Inferrer;
+		}
+
+		public virtual int Depth { get; set; }
+		public bool IsConditionless { get; set; }
+		public bool IsStrict { get; set; }
+
+		public bool IsVerbatim { get; set; }
 
 		public string PrettyPrint
 		{
@@ -22,43 +34,17 @@ public string PrettyPrint
 			}
 		}
 
-		public DslPrettyPrintVisitor(IConnectionSettingsValues settings)
-		{
-			this._sb = new StringBuilder();
-			this._infer = settings.Inferrer;
-		}
-
-		public virtual int Depth { get; set; }
 		public virtual VisitorScope Scope { get; set; }
 
-		public bool IsVerbatim { get; set; }
-		public bool IsConditionless { get; set; }
-		public bool IsStrict { get; set; }
-
 		public virtual void Visit(IQueryContainer baseQuery)
 		{
-			this.IsConditionless = baseQuery.IsConditionless;
-			this.IsStrict = baseQuery.IsStrict;
-			this.IsVerbatim = baseQuery.IsVerbatim;
+			IsConditionless = baseQuery.IsConditionless;
+			IsStrict = baseQuery.IsStrict;
+			IsVerbatim = baseQuery.IsVerbatim;
 		}
 
 		public virtual void Visit(IQuery query) { }
 
-		private void Write(string queryType, Dictionary<string, string> properties)
-		{
-			properties = properties ?? new Dictionary<string, string>();
-			var props = string.Join(", ", properties.Select(kv => $"{kv.Key}: {kv.Value}"));
-			var indent = new string('-',(Depth -1) * 2);
-			var scope = this.Scope.GetStringValue().ToLowerInvariant();
-			_sb.AppendFormat("{0}{1}: {2} ({3}){4}", indent, scope, queryType, props, Environment.NewLine);
-		}
-		private void Write(string queryType, Field field = null)
-		{
-			this.Write(queryType, field == null
-				? null
-				: new Dictionary<string, string> {{"field", this._infer.Field(field)}});
-		}
-
 		public virtual void Visit(IBoolQuery query) => Write("bool");
 
 		public virtual void Visit(IBoostingQuery query) => Write("boosting");
@@ -153,29 +139,27 @@ private void Write(string queryType, Field field = null)
 
 		public virtual void Visit(ISpanMultiTermQuery query) => Write("span_multi_term");
 
-		public virtual void Visit(IGeoShapeMultiPointQuery query)=> Write("geo_multi_point");
+		public virtual void Visit(IGeoShapeMultiPointQuery query) => Write("geo_multi_point");
 
-		public virtual void Visit(IGeoShapeMultiPolygonQuery query)=> Write("geo_shape_multi_polygon");
+		public virtual void Visit(IGeoShapeMultiPolygonQuery query) => Write("geo_shape_multi_polygon");
 
-		public virtual void Visit(IGeoShapePolygonQuery query)=> Write("geo_shape_polygon");
+		public virtual void Visit(IGeoShapePolygonQuery query) => Write("geo_shape_polygon");
 
-		public virtual void Visit(IGeoShapePointQuery query)=> Write("geo_shape_point");
+		public virtual void Visit(IGeoShapePointQuery query) => Write("geo_shape_point");
 
-		public virtual void Visit(IGeoShapeMultiLineStringQuery query)=> Write("geo_shape_multi_line");
+		public virtual void Visit(IGeoShapeMultiLineStringQuery query) => Write("geo_shape_multi_line");
 
-		public virtual void Visit(IGeoShapeLineStringQuery query)=> Write("geo_shape_line");
+		public virtual void Visit(IGeoShapeLineStringQuery query) => Write("geo_shape_line");
 
-		public virtual void Visit(IGeoShapeEnvelopeQuery query)=> Write("geo_shape_envelope");
+		public virtual void Visit(IGeoShapeEnvelopeQuery query) => Write("geo_shape_envelope");
 
-		public virtual void Visit(IGeoShapeGeometryCollectionQuery query)=> Write("geo_shape_geometrycollection");
+		public virtual void Visit(IGeoShapeGeometryCollectionQuery query) => Write("geo_shape_geometrycollection");
 
-		public virtual void Visit(ISpanSubQuery query)=> Write("span_sub");
+		public virtual void Visit(ISpanSubQuery query) => Write("span_sub");
 
-		public virtual void Visit(IGeoShapeCircleQuery query)=> Write("geo_shape");
+		public virtual void Visit(IGeoShapeCircleQuery query) => Write("geo_shape");
 
-		public virtual void Visit(IConditionlessQuery query)=> Write("conditonless_query");
-
-		public virtual void Visit(ISpanQuery query)=> Write("span");
+		public virtual void Visit(ISpanQuery query) => Write("span");
 
 		public virtual void Visit(IGeoBoundingBoxQuery query) => Write("geo_bounding_box");
 
@@ -190,5 +174,20 @@ private void Write(string queryType, Field field = null)
 		public virtual void Visit(IParentIdQuery query) => Write("parent_id");
 
 		public virtual void Visit(ITermsSetQuery query) => Write("terms_set");
+
+		private void Write(string queryType, Dictionary<string, string> properties)
+		{
+			properties = properties ?? new Dictionary<string, string>();
+			var props = string.Join(", ", properties.Select(kv => $"{kv.Key}: {kv.Value}"));
+			var indent = new string('-', (Depth - 1) * 2);
+			var scope = Scope.GetStringValue().ToLowerInvariant();
+			_sb.AppendFormat("{0}{1}: {2} ({3}){4}", indent, scope, queryType, props, Environment.NewLine);
+		}
+
+		private void Write(string queryType, Field field = null) => Write(queryType, field == null
+			? null
+			: new Dictionary<string, string> { { "field", _infer.Field(field) } });
+
+		public virtual void Visit(IConditionlessQuery query) => Write("conditonless_query");
 	}
 }
diff --git a/src/Nest/QueryDsl/Visitor/QueryVisitor.cs b/src/Nest/QueryDsl/Visitor/QueryVisitor.cs
index 1f4c1d8c74a..7259b81415b 100644
--- a/src/Nest/QueryDsl/Visitor/QueryVisitor.cs
+++ b/src/Nest/QueryDsl/Visitor/QueryVisitor.cs
@@ -25,70 +25,133 @@ public interface IQueryVisitor
 		void Visit(IQuery query);
 
 		void Visit(IBoolQuery query);
+
 		void Visit(IBoostingQuery query);
+
 		void Visit(ICommonTermsQuery query);
+
 		void Visit(IConstantScoreQuery query);
+
 		void Visit(IDisMaxQuery query);
+
 		void Visit(IFunctionScoreQuery query);
+
 		void Visit(IFuzzyQuery query);
+
 		void Visit(IFuzzyNumericQuery query);
+
 		void Visit(IFuzzyDateQuery query);
+
 		void Visit(IFuzzyStringQuery query);
+
 		void Visit(IHasChildQuery query);
+
 		void Visit(IHasParentQuery query);
+
 		void Visit(IIdsQuery query);
+
 		void Visit(IMatchQuery query);
+
 		void Visit(IMatchPhraseQuery query);
+
 		void Visit(IMatchPhrasePrefixQuery query);
+
 		void Visit(IMatchAllQuery query);
+
 		void Visit(IMatchNoneQuery query);
+
 		void Visit(IMoreLikeThisQuery query);
+
 		void Visit(IMultiMatchQuery query);
+
 		void Visit(INestedQuery query);
+
 		void Visit(IPrefixQuery query);
+
 		void Visit(IQueryStringQuery query);
+
 		void Visit(IRangeQuery query);
+
 		void Visit(IRegexpQuery query);
+
 		void Visit(ISimpleQueryStringQuery query);
+
 		void Visit(ITermQuery query);
+
 		void Visit(IWildcardQuery query);
+
 		void Visit(ITermsQuery query);
+
 		void Visit(ITypeQuery query);
+
 		void Visit(IScriptQuery query);
+
 		void Visit(IGeoPolygonQuery query);
+
 		void Visit(IGeoDistanceQuery query);
+
 		void Visit(IGeoBoundingBoxQuery query);
+
 		void Visit(IExistsQuery query);
+
 		void Visit(IDateRangeQuery query);
+
 		void Visit(INumericRangeQuery query);
+
 		void Visit(ILongRangeQuery query);
+
 		void Visit(ITermRangeQuery query);
+
 		void Visit(ISpanFirstQuery query);
+
 		void Visit(ISpanNearQuery query);
+
 		void Visit(ISpanNotQuery query);
+
 		void Visit(ISpanOrQuery query);
+
 		void Visit(ISpanTermQuery query);
+
 		void Visit(ISpanQuery query);
+
 		void Visit(ISpanSubQuery query);
+
 		void Visit(ISpanContainingQuery query);
+
 		void Visit(ISpanWithinQuery query);
+
 		void Visit(ISpanMultiTermQuery query);
+
 		void Visit(ISpanFieldMaskingQuery query);
 
 		void Visit(IGeoIndexedShapeQuery query);
+
 		void Visit(IGeoShapeQuery query);
+
 		void Visit(IGeoShapeMultiPointQuery query);
+
 		void Visit(IGeoShapeMultiPolygonQuery query);
+
 		void Visit(IGeoShapePolygonQuery query);
+
 		void Visit(IGeoShapePointQuery query);
+
 		void Visit(IGeoShapeMultiLineStringQuery query);
+
 		void Visit(IGeoShapeLineStringQuery query);
+
 		void Visit(IGeoShapeEnvelopeQuery query);
+
 		void Visit(IGeoShapeCircleQuery query);
+
 		void Visit(IGeoShapeGeometryCollectionQuery query);
+
 		void Visit(IRawQuery query);
+
 		void Visit(IPercolateQuery query);
+
 		void Visit(IParentIdQuery query);
+
 		void Visit(ITermsSetQuery query);
 	}
 
@@ -98,8 +161,6 @@ public class QueryVisitor : IQueryVisitor
 
 		public VisitorScope Scope { get; set; }
 
-		public virtual void Visit(IQueryVisitor visitor) { }
-
 		public virtual void Visit(IQueryContainer query) { }
 
 		public virtual void Visit(IQuery query) { }
@@ -233,5 +294,7 @@ public virtual void Visit(IPercolateQuery query) { }
 		public virtual void Visit(IParentIdQuery query) { }
 
 		public virtual void Visit(ITermsSetQuery query) { }
+
+		public virtual void Visit(IQueryVisitor visitor) { }
 	}
 }
diff --git a/src/Nest/QueryDsl/Visitor/QueryWalker.cs b/src/Nest/QueryDsl/Visitor/QueryWalker.cs
index 284fd984e0f..9088c7a0858 100644
--- a/src/Nest/QueryDsl/Visitor/QueryWalker.cs
+++ b/src/Nest/QueryDsl/Visitor/QueryWalker.cs
@@ -165,12 +165,14 @@ public void Walk(ISpanQuery qd, IQueryVisitor visitor)
 		private static void Accept(IQueryVisitor visitor, IEnumerable<IQueryContainer> queries, VisitorScope scope = VisitorScope.Query)
 		{
 			if (queries == null) return;
+
 			foreach (var f in queries) Accept(visitor, f, scope);
 		}
 
 		private static void Accept(IQueryVisitor visitor, IQueryContainer query, VisitorScope scope = VisitorScope.Query)
 		{
 			if (query == null) return;
+
 			visitor.Scope = scope;
 			query.Accept(visitor);
 		}
@@ -178,6 +180,7 @@ private static void Accept(IQueryVisitor visitor, IQueryContainer query, Visitor
 		private static void Accept(IQueryVisitor visitor, ISpanQuery query, VisitorScope scope = VisitorScope.Span)
 		{
 			if (query == null) return;
+
 			visitor.Scope = scope;
 			query.Accept(visitor);
 		}
@@ -249,6 +252,7 @@ private static void VisitSpanSubQuery<T>(T qd, IQueryVisitor visitor, Action<IQu
 			where T : class, ISpanSubQuery
 		{
 			if (qd == null) return;
+
 			VisitQuery(qd, visitor, (v, d) =>
 			{
 				visitor.Visit(qd);
diff --git a/src/Nest/QueryDsl/Visitor/VisitorScope.cs b/src/Nest/QueryDsl/Visitor/VisitorScope.cs
index c0a1655b8f9..b01381a0097 100644
--- a/src/Nest/QueryDsl/Visitor/VisitorScope.cs
+++ b/src/Nest/QueryDsl/Visitor/VisitorScope.cs
@@ -11,6 +11,5 @@ public enum VisitorScope
 		PositiveQuery,
 		NegativeQuery,
 		Span,
-
 	}
 }
diff --git a/src/Nest/Search/Count/CountRequest.cs b/src/Nest/Search/Count/CountRequest.cs
index 1ac02d5e47c..581f4f5f68f 100644
--- a/src/Nest/Search/Count/CountRequest.cs
+++ b/src/Nest/Search/Count/CountRequest.cs
@@ -10,37 +10,40 @@ public partial interface ICountRequest
 		[JsonProperty("query")]
 		QueryContainer Query { get; set; }
 	}
-	public partial interface ICountRequest<T> : ICountRequest
-		where T : class
-	{
 
-	}
+	public partial interface ICountRequest<T> : ICountRequest
+		where T : class { }
 
 	public partial class CountRequest
 	{
-		protected override HttpMethod HttpMethod =>
-			Self.RequestParameters.ContainsQueryString("source") || Self.RequestParameters.ContainsQueryString("q") || Self.Query == null || Self.Query.IsConditionless()
-				? HttpMethod.GET : HttpMethod.POST;
-
 		public QueryContainer Query { get; set; }
 
+		protected override HttpMethod HttpMethod =>
+			Self.RequestParameters.ContainsQueryString("source") || Self.RequestParameters.ContainsQueryString("q") || Self.Query == null
+			|| Self.Query.IsConditionless()
+				? HttpMethod.GET
+				: HttpMethod.POST;
 	}
 
 	public partial class CountRequest<T>
 	{
-		protected override HttpMethod HttpMethod =>
-			Self.RequestParameters.ContainsQueryString("source") || Self.RequestParameters.ContainsQueryString("q") || Self.Query == null || Self.Query.IsConditionless()
-				? HttpMethod.GET : HttpMethod.POST;
-
 		public QueryContainer Query { get; set; }
+
+		protected override HttpMethod HttpMethod =>
+			Self.RequestParameters.ContainsQueryString("source") || Self.RequestParameters.ContainsQueryString("q") || Self.Query == null
+			|| Self.Query.IsConditionless()
+				? HttpMethod.GET
+				: HttpMethod.POST;
 	}
 
 	[DescriptorFor("Count")]
 	public partial class CountDescriptor<T> where T : class
 	{
 		protected override HttpMethod HttpMethod =>
-			Self.RequestParameters.ContainsQueryString("source") || Self.RequestParameters.ContainsQueryString("q") || Self.Query == null || Self.Query.IsConditionless()
-				? HttpMethod.GET : HttpMethod.POST;
+			Self.RequestParameters.ContainsQueryString("source") || Self.RequestParameters.ContainsQueryString("q") || Self.Query == null
+			|| Self.Query.IsConditionless()
+				? HttpMethod.GET
+				: HttpMethod.POST;
 
 		QueryContainer ICountRequest.Query { get; set; }
 
diff --git a/src/Nest/Search/Count/ElasticClient-Count.cs b/src/Nest/Search/Count/ElasticClient-Count.cs
index a2c1e5fca13..a3d75a93c6f 100644
--- a/src/Nest/Search/Count/ElasticClient-Count.cs
+++ b/src/Nest/Search/Count/ElasticClient-Count.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,54 +10,61 @@ public partial interface IElasticClient
 		/// <summary>
 		/// The count API allows to easily execute a query and get the number of matches for that query.
 		/// It can be executed across one or more indices and across one or more types.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-count.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-count.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-count.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-count.html</a>
 		/// </summary>
-		/// <typeparam name="T">The type used to infer the default index and typename as well as describe the strongly
-		///  typed parts of the query</typeparam>
+		/// <typeparam name="T">
+		/// The type used to infer the default index and typename as well as describe the strongly
+		///  typed parts of the query
+		/// </typeparam>
 		/// <param name="selector">An optional descriptor to further describe the count operation</param>
 		ICountResponse Count<T>(Func<CountDescriptor<T>, ICountRequest> selector = null)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICountResponse Count<T>(ICountRequest request)
 			where T : class;
 
-		/// <inheritdoc/>
-		Task<ICountResponse> CountAsync<T>(Func<CountDescriptor<T>, ICountRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ICountResponse> CountAsync<T>(Func<CountDescriptor<T>, ICountRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICountResponse> CountAsync<T>(ICountRequest request, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class;
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICountResponse Count<T>(Func<CountDescriptor<T>, ICountRequest> selector = null)
 			where T : class =>
-			this.Count<T>(selector.InvokeOrDefault(new CountDescriptor<T>()));
+			Count<T>(selector.InvokeOrDefault(new CountDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICountResponse Count<T>(ICountRequest request)
 			where T : class =>
-			this.Dispatcher.Dispatch<ICountRequest, CountRequestParameters, CountResponse>(
+			Dispatcher.Dispatch<ICountRequest, CountRequestParameters, CountResponse>(
 				request,
-				this.LowLevelDispatch.CountDispatch<CountResponse>
+				LowLevelDispatch.CountDispatch<CountResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<ICountResponse> CountAsync<T>(Func<CountDescriptor<T>, ICountRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<ICountResponse> CountAsync<T>(Func<CountDescriptor<T>, ICountRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.CountAsync<T>(selector.InvokeOrDefault(new CountDescriptor<T>()), cancellationToken);
+			CountAsync<T>(selector.InvokeOrDefault(new CountDescriptor<T>()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICountResponse> CountAsync<T>(ICountRequest request, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class =>
-			this.Dispatcher.DispatchAsync<ICountRequest, CountRequestParameters, CountResponse, ICountResponse>(
+			Dispatcher.DispatchAsync<ICountRequest, CountRequestParameters, CountResponse, ICountResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.CountDispatchAsync<CountResponse>
+				LowLevelDispatch.CountDispatchAsync<CountResponse>
 			);
 	}
 }
diff --git a/src/Nest/Search/CovariantSearch.cs b/src/Nest/Search/CovariantSearch.cs
index e63ec22f22c..55b37e49181 100644
--- a/src/Nest/Search/CovariantSearch.cs
+++ b/src/Nest/Search/CovariantSearch.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 
 namespace Nest
 {
diff --git a/src/Nest/Search/Explain/ElasticClient-Explain.cs b/src/Nest/Search/Explain/ElasticClient-Explain.cs
index d182db84abe..e030aef99fe 100644
--- a/src/Nest/Search/Explain/ElasticClient-Explain.cs
+++ b/src/Nest/Search/Explain/ElasticClient-Explain.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,52 +10,64 @@ public partial interface IElasticClient
 		/// <summary>
 		/// The explain api computes a score explanation for a query and a specific document.
 		/// This can give useful feedback whether a document matches or didn’t match a specific query.
-		/// <para> </para><a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-explain.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/search-explain.html</a>
+		/// <para> </para>
+		/// <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-explain.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/search-explain.html</a>
 		/// </summary>
-		IExplainResponse<TDocument> Explain<TDocument>(DocumentPath<TDocument> document, Func<ExplainDescriptor<TDocument>, IExplainRequest<TDocument>> selector)
+		IExplainResponse<TDocument> Explain<TDocument>(DocumentPath<TDocument> document,
+			Func<ExplainDescriptor<TDocument>, IExplainRequest<TDocument>> selector
+		)
 			where TDocument : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExplainResponse<TDocument> Explain<TDocument>(IExplainRequest<TDocument> request)
 			where TDocument : class;
 
-		/// <inheritdoc/>
-		Task<IExplainResponse<TDocument>> ExplainAsync<TDocument>(DocumentPath<TDocument> document,Func<ExplainDescriptor<TDocument>, IExplainRequest<TDocument>> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IExplainResponse<TDocument>> ExplainAsync<TDocument>(DocumentPath<TDocument> document,
+			Func<ExplainDescriptor<TDocument>, IExplainRequest<TDocument>> selector, CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where TDocument : class;
 
-		/// <inheritdoc/>
-		Task<IExplainResponse<TDocument>> ExplainAsync<TDocument>(IExplainRequest<TDocument> request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IExplainResponse<TDocument>> ExplainAsync<TDocument>(IExplainRequest<TDocument> request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where TDocument : class;
-
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IExplainResponse<TDocument> Explain<TDocument>(DocumentPath<TDocument> document, Func<ExplainDescriptor<TDocument>, IExplainRequest<TDocument>> selector)
+		/// <inheritdoc />
+		public IExplainResponse<TDocument> Explain<TDocument>(DocumentPath<TDocument> document,
+			Func<ExplainDescriptor<TDocument>, IExplainRequest<TDocument>> selector
+		)
 			where TDocument : class =>
-			this.Explain<TDocument>(selector?.Invoke(new ExplainDescriptor<TDocument>(document)));
+			Explain<TDocument>(selector?.Invoke(new ExplainDescriptor<TDocument>(document)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExplainResponse<TDocument> Explain<TDocument>(IExplainRequest<TDocument> request)
 			where TDocument : class =>
-			this.Dispatcher.Dispatch<IExplainRequest<TDocument>, ExplainRequestParameters, ExplainResponse<TDocument>>(
+			Dispatcher.Dispatch<IExplainRequest<TDocument>, ExplainRequestParameters, ExplainResponse<TDocument>>(
 				request,
-				this.LowLevelDispatch.ExplainDispatch<ExplainResponse<TDocument>, TDocument>
+				LowLevelDispatch.ExplainDispatch<ExplainResponse<TDocument>, TDocument>
 			);
 
-		/// <inheritdoc/>
-		public Task<IExplainResponse<TDocument>> ExplainAsync<TDocument>(DocumentPath<TDocument> document, Func<ExplainDescriptor<TDocument>, IExplainRequest<TDocument>> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<IExplainResponse<TDocument>> ExplainAsync<TDocument>(DocumentPath<TDocument> document,
+			Func<ExplainDescriptor<TDocument>, IExplainRequest<TDocument>> selector, CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where TDocument : class =>
-			this.ExplainAsync<TDocument>(selector?.Invoke(new ExplainDescriptor<TDocument>(document)), cancellationToken);
+			ExplainAsync<TDocument>(selector?.Invoke(new ExplainDescriptor<TDocument>(document)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IExplainResponse<TDocument>> ExplainAsync<TDocument>(IExplainRequest<TDocument> request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<IExplainResponse<TDocument>> ExplainAsync<TDocument>(IExplainRequest<TDocument> request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where TDocument : class =>
-			this.Dispatcher.DispatchAsync<IExplainRequest<TDocument>, ExplainRequestParameters, ExplainResponse<TDocument>, IExplainResponse<TDocument>>(
+			Dispatcher.DispatchAsync<IExplainRequest<TDocument>, ExplainRequestParameters, ExplainResponse<TDocument>, IExplainResponse<TDocument>>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.ExplainDispatchAsync<ExplainResponse<TDocument>, TDocument>
+				LowLevelDispatch.ExplainDispatchAsync<ExplainResponse<TDocument>, TDocument>
 			);
 	}
 }
diff --git a/src/Nest/Search/Explain/ExplainGet.cs b/src/Nest/Search/Explain/ExplainGet.cs
index 9848f0b8a58..491ae627da7 100644
--- a/src/Nest/Search/Explain/ExplainGet.cs
+++ b/src/Nest/Search/Explain/ExplainGet.cs
@@ -1,20 +1,18 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject]
 	public class InstantGet<TDocument> where TDocument : class
 	{
+		[JsonProperty("fields")]
+		public FieldValues Fields { get; internal set; }
+
 		[JsonProperty("found")]
 		public bool Found { get; internal set; }
 
 		[JsonProperty("_source")]
 		[JsonConverter(typeof(SourceConverter))]
 		public TDocument Source { get; internal set; }
-
-		[JsonProperty("fields")]
-		public FieldValues Fields { get; internal set; }
-
 	}
 }
diff --git a/src/Nest/Search/Explain/ExplainRequest.cs b/src/Nest/Search/Explain/ExplainRequest.cs
index ea32937ab27..b1de8953bec 100644
--- a/src/Nest/Search/Explain/ExplainRequest.cs
+++ b/src/Nest/Search/Explain/ExplainRequest.cs
@@ -13,11 +13,15 @@ public partial interface IExplainRequest<TDocument> where TDocument : class
 	public partial class ExplainRequest<TDocument> : IExplainRequest<TDocument>
 		where TDocument : class
 	{
-		protected override HttpMethod HttpMethod =>
-			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q")  == true? HttpMethod.GET : HttpMethod.POST;
+		public QueryContainer Query { get; set; }
 
 		public Fields StoredFields { get; set; }
-		public QueryContainer Query { get; set; }
+
+		protected override HttpMethod HttpMethod =>
+			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q") == true
+				? HttpMethod.GET
+				: HttpMethod.POST;
+
 		private object AutoRouteDocument() => null;
 	}
 
@@ -26,12 +30,15 @@ public partial class ExplainDescriptor<TDocument> : IExplainRequest<TDocument>
 		where TDocument : class
 	{
 		protected override HttpMethod HttpMethod =>
-			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q")  == true? HttpMethod.GET : HttpMethod.POST;
+			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q") == true
+				? HttpMethod.GET
+				: HttpMethod.POST;
 
-		private object AutoRouteDocument() => null;
+		QueryContainer IExplainRequest<TDocument>.Query { get; set; }
 
 		Fields IExplainRequest<TDocument>.StoredFields { get; set; }
-		QueryContainer IExplainRequest<TDocument>.Query { get; set; }
+
+		private object AutoRouteDocument() => null;
 
 		public ExplainDescriptor<TDocument> Query(Func<QueryContainerDescriptor<TDocument>, QueryContainer> querySelector) =>
 			Assign(a => a.Query = querySelector?.Invoke(new QueryContainerDescriptor<TDocument>()));
diff --git a/src/Nest/Search/Explain/ExplainResponse.cs b/src/Nest/Search/Explain/ExplainResponse.cs
index 1dd28db836b..e9932fb818c 100644
--- a/src/Nest/Search/Explain/ExplainResponse.cs
+++ b/src/Nest/Search/Explain/ExplainResponse.cs
@@ -1,27 +1,26 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	public interface IExplainResponse<TDocument> : IResponse
 		where TDocument : class
 	{
-		bool Matched { get; }
 		ExplanationDetail Explanation { get; }
 		InstantGet<TDocument> Get { get; }
+		bool Matched { get; }
 	}
 
 	[JsonObject]
 	public class ExplainResponse<TDocument> : ResponseBase, IExplainResponse<TDocument>
 		where TDocument : class
 	{
-		[JsonProperty("matched")]
-		public bool Matched { get; internal set; }
-
 		[JsonProperty("explanation")]
 		public ExplanationDetail Explanation { get; internal set; }
 
 		[JsonProperty("get")]
 		public InstantGet<TDocument> Get { get; internal set; }
+
+		[JsonProperty("matched")]
+		public bool Matched { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Explain/Explanation.cs b/src/Nest/Search/Explain/Explanation.cs
index 299bd949ed0..ef2f6b40d22 100644
--- a/src/Nest/Search/Explain/Explanation.cs
+++ b/src/Nest/Search/Explain/Explanation.cs
@@ -6,12 +6,13 @@ namespace Nest
 	[JsonObject]
 	public class Explanation
 	{
-		[JsonProperty("value")]
-		public float Value { get; internal set; }
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
 
 		[JsonProperty("details")]
 		public IReadOnlyCollection<ExplanationDetail> Details { get; internal set; } = EmptyReadOnly<ExplanationDetail>.Collection;
+
+		[JsonProperty("value")]
+		public float Value { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Explain/ExplanationDetail.cs b/src/Nest/Search/Explain/ExplanationDetail.cs
index 2699b7a010d..b7bfc2890c8 100644
--- a/src/Nest/Search/Explain/ExplanationDetail.cs
+++ b/src/Nest/Search/Explain/ExplanationDetail.cs
@@ -6,13 +6,13 @@ namespace Nest
 	[JsonObject]
 	public class ExplanationDetail
 	{
-		[JsonProperty("value")]
-		public float Value { get; internal set; }
-
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
 
 		[JsonProperty("details")]
 		public IReadOnlyCollection<ExplanationDetail> Details { get; internal set; } = EmptyReadOnly<ExplanationDetail>.Collection;
+
+		[JsonProperty("value")]
+		public float Value { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/FieldCapabilities/ElasticClient-FieldCapabilities.cs b/src/Nest/Search/FieldCapabilities/ElasticClient-FieldCapabilities.cs
index 5f9527e0851..2dfdd46ccd6 100644
--- a/src/Nest/Search/FieldCapabilities/ElasticClient-FieldCapabilities.cs
+++ b/src/Nest/Search/FieldCapabilities/ElasticClient-FieldCapabilities.cs
@@ -1,47 +1,60 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IFieldCapabilitiesResponse FieldCapabilities(Indices indices, Func<FieldCapabilitiesDescriptor, IFieldCapabilitiesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IFieldCapabilitiesResponse FieldCapabilities(IFieldCapabilitiesRequest request);
 
-		/// <inheritdoc/>
-		Task<IFieldCapabilitiesResponse> FieldCapabilitiesAsync(Indices indices, Func<FieldCapabilitiesDescriptor, IFieldCapabilitiesRequest> selector= null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IFieldCapabilitiesResponse> FieldCapabilitiesAsync(Indices indices,
+			Func<FieldCapabilitiesDescriptor, IFieldCapabilitiesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IFieldCapabilitiesResponse> FieldCapabilitiesAsync(IFieldCapabilitiesRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IFieldCapabilitiesResponse> FieldCapabilitiesAsync(IFieldCapabilitiesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IFieldCapabilitiesResponse FieldCapabilities(Indices indices, Func<FieldCapabilitiesDescriptor, IFieldCapabilitiesRequest> selector = null) =>
-			this.FieldCapabilities(selector.InvokeOrDefault(new FieldCapabilitiesDescriptor().Index(indices)));
+		/// <inheritdoc />
+		public IFieldCapabilitiesResponse FieldCapabilities(Indices indices,
+			Func<FieldCapabilitiesDescriptor, IFieldCapabilitiesRequest> selector = null
+		) =>
+			FieldCapabilities(selector.InvokeOrDefault(new FieldCapabilitiesDescriptor().Index(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IFieldCapabilitiesResponse FieldCapabilities(IFieldCapabilitiesRequest request) =>
-			this.Dispatcher.Dispatch<IFieldCapabilitiesRequest, FieldCapabilitiesRequestParameters, FieldCapabilitiesResponse>(
-				request, this.LowLevelDispatch.FieldCapsDispatch<FieldCapabilitiesResponse>
+			Dispatcher.Dispatch<IFieldCapabilitiesRequest, FieldCapabilitiesRequestParameters, FieldCapabilitiesResponse>(
+				request, LowLevelDispatch.FieldCapsDispatch<FieldCapabilitiesResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IFieldCapabilitiesResponse> FieldCapabilitiesAsync(Indices indices, Func<FieldCapabilitiesDescriptor, IFieldCapabilitiesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.FieldCapabilitiesAsync(selector.InvokeOrDefault(new FieldCapabilitiesDescriptor().Index(indices)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IFieldCapabilitiesResponse> FieldCapabilitiesAsync(IFieldCapabilitiesRequest request, CancellationToken cancellationToken = default(CancellationToken))
-			=> this.Dispatcher.DispatchAsync<IFieldCapabilitiesRequest, FieldCapabilitiesRequestParameters, FieldCapabilitiesResponse, IFieldCapabilitiesResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.FieldCapsDispatchAsync<FieldCapabilitiesResponse>
-			);
+		/// <inheritdoc />
+		public Task<IFieldCapabilitiesResponse> FieldCapabilitiesAsync(Indices indices,
+			Func<FieldCapabilitiesDescriptor, IFieldCapabilitiesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			FieldCapabilitiesAsync(selector.InvokeOrDefault(new FieldCapabilitiesDescriptor().Index(indices)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IFieldCapabilitiesResponse> FieldCapabilitiesAsync(IFieldCapabilitiesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
+			=> Dispatcher
+				.DispatchAsync<IFieldCapabilitiesRequest, FieldCapabilitiesRequestParameters, FieldCapabilitiesResponse, IFieldCapabilitiesResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.FieldCapsDispatchAsync<FieldCapabilitiesResponse>
+				);
 	}
 }
diff --git a/src/Nest/Search/FieldCapabilities/FieldCapabilitiesRequest.cs b/src/Nest/Search/FieldCapabilities/FieldCapabilitiesRequest.cs
index b35c1b8205f..b6f65895bc9 100644
--- a/src/Nest/Search/FieldCapabilities/FieldCapabilitiesRequest.cs
+++ b/src/Nest/Search/FieldCapabilities/FieldCapabilitiesRequest.cs
@@ -1,7 +1,4 @@
-
-using System;
-using Elasticsearch.Net;
-using Newtonsoft.Json;
+using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Search/FieldCapabilities/FieldCapabilitiesResponse.cs b/src/Nest/Search/FieldCapabilities/FieldCapabilitiesResponse.cs
index de91c34e983..102f140ad61 100644
--- a/src/Nest/Search/FieldCapabilities/FieldCapabilitiesResponse.cs
+++ b/src/Nest/Search/FieldCapabilities/FieldCapabilitiesResponse.cs
@@ -13,11 +13,11 @@ public interface IFieldCapabilitiesResponse : IResponse
 
 	public class FieldCapabilitiesResponse : ResponseBase, IFieldCapabilitiesResponse
 	{
-		public ShardStatistics Shards { get; internal set; }
 		public FieldCapabilitiesFields Fields { get; internal set; }
+		public ShardStatistics Shards { get; internal set; }
 	}
 
-	[JsonConverter(typeof(FieldCapabilitiesFields.Converter))]
+	[JsonConverter(typeof(Converter))]
 	public class FieldCapabilitiesFields : ResolvableDictionaryProxy<Field, FieldTypes>
 	{
 		internal FieldCapabilitiesFields(IConnectionConfigurationValues c, IReadOnlyDictionary<Field, FieldTypes> b) : base(c, b) { }
@@ -31,61 +31,60 @@ protected override FieldCapabilitiesFields Create(IConnectionSettingsValues s, D
 
 	public class FieldTypes : IsADictionaryBase<string, FieldCapabilities>
 	{
-		public FieldCapabilities All => this.BackingDictionary.TryGetValue("_all", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Id => this.BackingDictionary.TryGetValue("_id", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Uid => this.BackingDictionary.TryGetValue("_uid", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Type => this.BackingDictionary.TryGetValue("_type", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Index => this.BackingDictionary.TryGetValue("_index", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Parent => this.BackingDictionary.TryGetValue("_parent", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Version => this.BackingDictionary.TryGetValue("_version", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Routing => this.BackingDictionary.TryGetValue("_routing", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Source => this.BackingDictionary.TryGetValue("_source", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities FieldNames => this.BackingDictionary.TryGetValue("_field_names", out FieldCapabilities f) ? f : null;
+		public FieldCapabilities All => BackingDictionary.TryGetValue("_all", out var f) ? f : null;
+		public FieldCapabilities Attachment => BackingDictionary.TryGetValue("attachment", out var f) ? f : null;
+		public FieldCapabilities Binary => BackingDictionary.TryGetValue("binary", out var f) ? f : null;
+		public FieldCapabilities Boolean => BackingDictionary.TryGetValue("boolean", out var f) ? f : null;
+		public FieldCapabilities Byte => BackingDictionary.TryGetValue("byte", out var f) ? f : null;
+		public FieldCapabilities Completion => BackingDictionary.TryGetValue("completion", out var f) ? f : null;
+		public FieldCapabilities Date => BackingDictionary.TryGetValue("date", out var f) ? f : null;
+		public FieldCapabilities DateRange => BackingDictionary.TryGetValue("date_range", out var f) ? f : null;
+		public FieldCapabilities Double => BackingDictionary.TryGetValue("double", out var f) ? f : null;
+		public FieldCapabilities DoubleRange => BackingDictionary.TryGetValue("double_range", out var f) ? f : null;
+		public FieldCapabilities FieldNames => BackingDictionary.TryGetValue("_field_names", out var f) ? f : null;
+		public FieldCapabilities Float => BackingDictionary.TryGetValue("float", out var f) ? f : null;
+		public FieldCapabilities FloatRange => BackingDictionary.TryGetValue("float_range", out var f) ? f : null;
+		public FieldCapabilities GeoPoint => BackingDictionary.TryGetValue("geo_point", out var f) ? f : null;
+		public FieldCapabilities GeoShape => BackingDictionary.TryGetValue("geo_shape", out var f) ? f : null;
+		public FieldCapabilities HalfFloat => BackingDictionary.TryGetValue("half_float", out var f) ? f : null;
+		public FieldCapabilities Id => BackingDictionary.TryGetValue("_id", out var f) ? f : null;
+		public FieldCapabilities Index => BackingDictionary.TryGetValue("_index", out var f) ? f : null;
+		public FieldCapabilities Integer => BackingDictionary.TryGetValue("integer", out var f) ? f : null;
+		public FieldCapabilities IntegerRange => BackingDictionary.TryGetValue("integer_range", out var f) ? f : null;
+		public FieldCapabilities Ip => BackingDictionary.TryGetValue("ip", out var f) ? f : null;
 
-		public FieldCapabilities Keyword => this.BackingDictionary.TryGetValue("keyword", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Text => this.BackingDictionary.TryGetValue("text", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities GeoPoint => this.BackingDictionary.TryGetValue("geo_point", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities GeoShape => this.BackingDictionary.TryGetValue("geo_shape", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Attachment => this.BackingDictionary.TryGetValue("attachment", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Ip => this.BackingDictionary.TryGetValue("ip", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Binary => this.BackingDictionary.TryGetValue("binary", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Date => this.BackingDictionary.TryGetValue("date", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Boolean => this.BackingDictionary.TryGetValue("boolean", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Completion => this.BackingDictionary.TryGetValue("completion", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Murmur3 => this.BackingDictionary.TryGetValue("murmur3", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities TokenCount => this.BackingDictionary.TryGetValue("token_count", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Percolator => this.BackingDictionary.TryGetValue("percolator", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Integer => this.BackingDictionary.TryGetValue("integer", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Long => this.BackingDictionary.TryGetValue("long", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Short => this.BackingDictionary.TryGetValue("short", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Byte => this.BackingDictionary.TryGetValue("byte", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Float => this.BackingDictionary.TryGetValue("float", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities HalfFloat => this.BackingDictionary.TryGetValue("half_float", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities ScaledFloat => this.BackingDictionary.TryGetValue("scaled_float", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities Double => this.BackingDictionary.TryGetValue("double", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities IntegerRange => this.BackingDictionary.TryGetValue("integer_range", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities FloatRange => this.BackingDictionary.TryGetValue("float_range", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities LongRange => this.BackingDictionary.TryGetValue("long_range", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities DoubleRange => this.BackingDictionary.TryGetValue("double_range", out FieldCapabilities f) ? f : null;
-		public FieldCapabilities DateRange => this.BackingDictionary.TryGetValue("date_range", out FieldCapabilities f) ? f : null;
+		public FieldCapabilities Keyword => BackingDictionary.TryGetValue("keyword", out var f) ? f : null;
+		public FieldCapabilities Long => BackingDictionary.TryGetValue("long", out var f) ? f : null;
+		public FieldCapabilities LongRange => BackingDictionary.TryGetValue("long_range", out var f) ? f : null;
+		public FieldCapabilities Murmur3 => BackingDictionary.TryGetValue("murmur3", out var f) ? f : null;
+		public FieldCapabilities Parent => BackingDictionary.TryGetValue("_parent", out var f) ? f : null;
+		public FieldCapabilities Percolator => BackingDictionary.TryGetValue("percolator", out var f) ? f : null;
+		public FieldCapabilities Routing => BackingDictionary.TryGetValue("_routing", out var f) ? f : null;
+		public FieldCapabilities ScaledFloat => BackingDictionary.TryGetValue("scaled_float", out var f) ? f : null;
+		public FieldCapabilities Short => BackingDictionary.TryGetValue("short", out var f) ? f : null;
+		public FieldCapabilities Source => BackingDictionary.TryGetValue("_source", out var f) ? f : null;
+		public FieldCapabilities Text => BackingDictionary.TryGetValue("text", out var f) ? f : null;
+		public FieldCapabilities TokenCount => BackingDictionary.TryGetValue("token_count", out var f) ? f : null;
+		public FieldCapabilities Type => BackingDictionary.TryGetValue("_type", out var f) ? f : null;
+		public FieldCapabilities Uid => BackingDictionary.TryGetValue("_uid", out var f) ? f : null;
+		public FieldCapabilities Version => BackingDictionary.TryGetValue("_version", out var f) ? f : null;
 	}
 
 	public class FieldCapabilities
 	{
-		[JsonProperty("searchable")]
-		public bool Searchable { get; internal set; }
-
 		[JsonProperty("aggregatable")]
 		public bool Aggregatable { get; internal set; }
 
 		[JsonProperty("indices")]
 		public Indices Indices { get; internal set; }
 
-		[JsonProperty("non_searchable_indices")]
-		public Indices NonSearchableIndices { get; internal set; }
-
 		[JsonProperty("non_aggregatable_indices")]
 		public Indices NonAggregatableIndices { get; internal set; }
 
+		[JsonProperty("non_searchable_indices")]
+		public Indices NonSearchableIndices { get; internal set; }
+
+		[JsonProperty("searchable")]
+		public bool Searchable { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/MultiSearch/ElasticClient-MultiSearch.cs b/src/Nest/Search/MultiSearch/ElasticClient-MultiSearch.cs
index e10e9a9fa32..e8daa357387 100644
--- a/src/Nest/Search/MultiSearch/ElasticClient-MultiSearch.cs
+++ b/src/Nest/Search/MultiSearch/ElasticClient-MultiSearch.cs
@@ -1,30 +1,33 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
 {
-	using System.Threading;
 	using MultiSearchCreator = Func<IApiCallDetails, Stream, MultiSearchResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The multi search API allows to execute several search requests within the same API.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html</a>
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the search operations on the multi search api</param>
 		IMultiSearchResponse MultiSearch(Func<MultiSearchDescriptor, IMultiSearchRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IMultiSearchResponse MultiSearch(IMultiSearchRequest request);
 
-		/// <inheritdoc/>
-		Task<IMultiSearchResponse> MultiSearchAsync(Func<MultiSearchDescriptor, IMultiSearchRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IMultiSearchResponse> MultiSearchAsync(Func<MultiSearchDescriptor, IMultiSearchRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IMultiSearchResponse> MultiSearchAsync(IMultiSearchRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
@@ -32,49 +35,46 @@ public partial class ElasticClient
 	{
 		/// <inheritdoc />
 		public IMultiSearchResponse MultiSearch(Func<MultiSearchDescriptor, IMultiSearchRequest> selector) =>
-			this.MultiSearch(selector?.Invoke(new MultiSearchDescriptor()));
+			MultiSearch(selector?.Invoke(new MultiSearchDescriptor()));
 
 		/// <inheritdoc />
-		public IMultiSearchResponse MultiSearch(IMultiSearchRequest request)
-		{
-			return this.Dispatcher.Dispatch<IMultiSearchRequest, MultiSearchRequestParameters, MultiSearchResponse>(
+		public IMultiSearchResponse MultiSearch(IMultiSearchRequest request) =>
+			Dispatcher.Dispatch<IMultiSearchRequest, MultiSearchRequestParameters, MultiSearchResponse>(
 				request,
 				(p, d) =>
 				{
 					var converter = CreateMultiSearchDeserializer(p);
-					var serializer = this.ConnectionSettings.CreateStateful(converter);
+					var serializer = ConnectionSettings.CreateStateful(converter);
 					var creator = new MultiSearchCreator((r, s) => serializer.Deserialize<MultiSearchResponse>(s));
 					request.RequestParameters.DeserializationOverride = creator;
-					return this.LowLevelDispatch.MsearchDispatch<MultiSearchResponse>(p, new SerializableData<IMultiSearchRequest>(p));
+					return LowLevelDispatch.MsearchDispatch<MultiSearchResponse>(p, new SerializableData<IMultiSearchRequest>(p));
 				}
 			);
-		}
 
 		/// <inheritdoc />
-		public Task<IMultiSearchResponse> MultiSearchAsync(Func<MultiSearchDescriptor, IMultiSearchRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.MultiSearchAsync(selector?.Invoke(new MultiSearchDescriptor()), cancellationToken);
+		public Task<IMultiSearchResponse> MultiSearchAsync(Func<MultiSearchDescriptor, IMultiSearchRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			MultiSearchAsync(selector?.Invoke(new MultiSearchDescriptor()), cancellationToken);
 
 
 		/// <inheritdoc />
-		public Task<IMultiSearchResponse> MultiSearchAsync(IMultiSearchRequest request, CancellationToken cancellationToken = default(CancellationToken))
-		{
-			return this.Dispatcher.DispatchAsync<IMultiSearchRequest, MultiSearchRequestParameters, MultiSearchResponse, IMultiSearchResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) =>
-				{
-					var converter = CreateMultiSearchDeserializer(p);
-					var serializer = this.ConnectionSettings.CreateStateful(converter);
-					var creator = new MultiSearchCreator((r, s) => serializer.Deserialize<MultiSearchResponse>(s));
-					request.RequestParameters.DeserializationOverride = creator;
-					return this.LowLevelDispatch.MsearchDispatchAsync<MultiSearchResponse>(p, new SerializableData<IMultiSearchRequest>(p), c);
-				}
-			);
-		}
+		public Task<IMultiSearchResponse> MultiSearchAsync(IMultiSearchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) => Dispatcher.DispatchAsync<IMultiSearchRequest, MultiSearchRequestParameters, MultiSearchResponse, IMultiSearchResponse>(
+			request,
+			cancellationToken,
+			(p, d, c) =>
+			{
+				var converter = CreateMultiSearchDeserializer(p);
+				var serializer = ConnectionSettings.CreateStateful(converter);
+				var creator = new MultiSearchCreator((r, s) => serializer.Deserialize<MultiSearchResponse>(s));
+				request.RequestParameters.DeserializationOverride = creator;
+				return LowLevelDispatch.MsearchDispatchAsync<MultiSearchResponse>(p, new SerializableData<IMultiSearchRequest>(p), c);
+			}
+		);
 
-		private JsonConverter CreateMultiSearchDeserializer(IMultiSearchRequest request)
-		{
-			return new MultiSearchResponseJsonConverter(this.ConnectionSettings, request);
-		}
+		private JsonConverter CreateMultiSearchDeserializer(IMultiSearchRequest request) =>
+			new MultiSearchResponseJsonConverter(ConnectionSettings, request);
 	}
 }
diff --git a/src/Nest/Search/MultiSearch/IMultiSearchResponse.cs b/src/Nest/Search/MultiSearch/IMultiSearchResponse.cs
index 7f9f91ffd23..e0eb49c053a 100644
--- a/src/Nest/Search/MultiSearch/IMultiSearchResponse.cs
+++ b/src/Nest/Search/MultiSearch/IMultiSearchResponse.cs
@@ -4,10 +4,13 @@ namespace Nest
 {
 	public interface IMultiSearchResponse : IResponse
 	{
-		IEnumerable<IResponse> AllResponses { get; }
-		IEnumerable<IResponse> GetInvalidResponses();
+		IEnumerable<IResponse> AllResponses { get; }
+		int TotalResponses { get; }
+
+		IEnumerable<IResponse> GetInvalidResponses();
+
 		IEnumerable<ISearchResponse<T>> GetResponses<T>() where T : class;
+
 		ISearchResponse<T> GetResponse<T>(string name) where T : class;
-		int TotalResponses { get; }
 	}
-}
+}
diff --git a/src/Nest/Search/MultiSearch/MultiSearchJsonConverter.cs b/src/Nest/Search/MultiSearch/MultiSearchJsonConverter.cs
index aa46a64934d..a9efedef6ae 100644
--- a/src/Nest/Search/MultiSearch/MultiSearchJsonConverter.cs
+++ b/src/Nest/Search/MultiSearch/MultiSearchJsonConverter.cs
@@ -6,14 +6,16 @@ namespace Nest
 {
 	internal class MultiSearchJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
 		public override bool CanRead => false;
 		public override bool CanWrite => true;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var request = (IMultiSearchRequest)value;
 			if (request == null) return;
+
 			var settings = serializer.GetConnectionSettings();
 			var elasticsearchSerializer = settings.RequestResponseSerializer;
 			if (elasticsearchSerializer == null) return;
@@ -23,7 +25,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			foreach (var operation in request.Operations.Values)
 			{
 				var p = operation.RequestParameters;
-				string GetString(string key) => p.GetResolvedQueryStringValue(key, settings);
+
+				string GetString(string key)
+				{
+					return p.GetResolvedQueryStringValue(key, settings);
+				}
 
 				IUrlParameter indices = request.Index == null || !request.Index.Equals(operation.Index)
 					? operation.Index
@@ -54,9 +60,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			}
 		}
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			throw new NotSupportedException();
-		}
 	}
 }
diff --git a/src/Nest/Search/MultiSearch/MultiSearchRequest.cs b/src/Nest/Search/MultiSearch/MultiSearchRequest.cs
index 729518758bc..5f974bd7e3b 100644
--- a/src/Nest/Search/MultiSearch/MultiSearchRequest.cs
+++ b/src/Nest/Search/MultiSearch/MultiSearchRequest.cs
@@ -14,8 +14,7 @@ public partial class MultiSearchRequest
 	{
 		public IDictionary<string, ISearchRequest> Operations { get; set; }
 
-		protected sealed override void Initialize() => this.TypedKeys = true;
-
+		protected sealed override void Initialize() => TypedKeys = true;
 	}
 
 	[DescriptorFor("Msearch")]
@@ -25,11 +24,11 @@ public partial class MultiSearchDescriptor
 
 		IDictionary<string, ISearchRequest> IMultiSearchRequest.Operations
 		{
-			get { return _operations; }
-			set { _operations = value; }
+			get => _operations;
+			set => _operations = value;
 		}
 
-		protected sealed override void Initialize() => this.TypedKeys();
+		protected sealed override void Initialize() => TypedKeys();
 
 		public MultiSearchDescriptor Search<T>(string name, Func<SearchDescriptor<T>, ISearchRequest> searchSelector) where T : class
 		{
@@ -38,13 +37,12 @@ public MultiSearchDescriptor Search<T>(string name, Func<SearchDescriptor<T>, IS
 			var descriptor = searchSelector(new SearchDescriptor<T>());
 			if (descriptor == null)
 				return this;
-			this._operations.Add(name, descriptor);
+
+			_operations.Add(name, descriptor);
 			return this;
 		}
 
-		public MultiSearchDescriptor Search<T>(Func<SearchDescriptor<T>, ISearchRequest> searchSelector) where T : class
-		{
-			return this.Search(Guid.NewGuid().ToString(), searchSelector);
-		}
+		public MultiSearchDescriptor Search<T>(Func<SearchDescriptor<T>, ISearchRequest> searchSelector) where T : class =>
+			Search(Guid.NewGuid().ToString(), searchSelector);
 	}
 }
diff --git a/src/Nest/Search/MultiSearch/MultiSearchResponse.cs b/src/Nest/Search/MultiSearch/MultiSearchResponse.cs
index 57a05f5aa40..b88e0ed3c97 100644
--- a/src/Nest/Search/MultiSearch/MultiSearchResponse.cs
+++ b/src/Nest/Search/MultiSearch/MultiSearchResponse.cs
@@ -10,48 +10,45 @@ namespace Nest
 	[ContractJsonConverter(typeof(MultiSearchResponseJsonConverter))]
 	public class MultiSearchResponse : ResponseBase, IMultiSearchResponse
 	{
-		public MultiSearchResponse()
+		public MultiSearchResponse() => Responses = new Dictionary<string, object>();
+
+		public IEnumerable<IResponse> AllResponses => _allResponses<IResponse>();
+
+		public override bool IsValid => base.IsValid && AllResponses.All(b => b.IsValid);
+
+		public int TotalResponses => Responses.HasAny() ? Responses.Count() : 0;
+
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
+		internal IDictionary<string, object> Responses { get; set; }
+
+		public IEnumerable<IResponse> GetInvalidResponses() => _allResponses<IResponse>().Where(r => !r.IsValid);
+
+		public ISearchResponse<T> GetResponse<T>(string name) where T : class
 		{
-			this.Responses = new Dictionary<string, object>();
+			object response;
+			Responses.TryGetValue(name, out response);
+			var r = response as IElasticsearchResponse;
+			if (r != null)
+				r.ApiCall = ApiCall;
+			return response as SearchResponse<T>;
 		}
 
-		public override bool IsValid => base.IsValid && this.AllResponses.All(b => b.IsValid);
+		public IEnumerable<ISearchResponse<T>> GetResponses<T>() where T : class => _allResponses<SearchResponse<T>>();
 
 		protected override void DebugIsValid(StringBuilder sb)
 		{
 			sb.AppendLine($"# Invalid searches (inspect individual response.DebugInformation for more detail):");
-			foreach(var i in AllResponses.Select((item, i) => new { item, i}).Where(i=>!i.item.IsValid))
+			foreach (var i in AllResponses.Select((item, i) => new { item, i }).Where(i => !i.item.IsValid))
 				sb.AppendLine($"  search[{i.i}]: {i.item}");
 		}
 
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
-		internal IDictionary<string, object> Responses { get; set; }
-
-		public int TotalResponses => this.Responses.HasAny() ? this.Responses.Count() : 0;
-
 		private IEnumerable<T> _allResponses<T>() where T : class, IResponse, IElasticsearchResponse
 		{
-			foreach (var r in this.Responses.Values.OfType<T>())
+			foreach (var r in Responses.Values.OfType<T>())
 			{
-				((IElasticsearchResponse)r).ApiCall = this.ApiCall;
+				((IElasticsearchResponse)r).ApiCall = ApiCall;
 				yield return r;
 			}
 		}
-
-		public IEnumerable<IResponse> AllResponses => this._allResponses<IResponse>();
-
-		public IEnumerable<IResponse> GetInvalidResponses() => this._allResponses<IResponse>().Where(r => !r.IsValid);
-
-		public IEnumerable<ISearchResponse<T>> GetResponses<T>() where T : class => this._allResponses<SearchResponse<T>>();
-
-		public ISearchResponse<T> GetResponse<T>(string name) where T : class
-		{
-			object response;
-			this.Responses.TryGetValue(name, out response);
-			var r = response as IElasticsearchResponse;
-			if (r != null)
-				r.ApiCall = this.ApiCall;
-			return response as SearchResponse<T>;
-		}
 	}
 }
diff --git a/src/Nest/Search/MultiSearch/MultiSearchResponseJsonConverter.cs b/src/Nest/Search/MultiSearch/MultiSearchResponseJsonConverter.cs
index 5e0e41663ca..f2c32194cfb 100644
--- a/src/Nest/Search/MultiSearch/MultiSearchResponseJsonConverter.cs
+++ b/src/Nest/Search/MultiSearch/MultiSearchResponseJsonConverter.cs
@@ -10,27 +10,28 @@ namespace Nest
 {
 	internal class MultiSearchResponseJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-		public override bool CanWrite => false;
-		public override bool CanRead => true;
-
-		private readonly IRequest _request;
-
 		private static readonly MethodInfo MakeDelegateMethodInfo =
 			typeof(MultiSearchResponseJsonConverter).GetMethod(nameof(CreateSearchResponse), BindingFlags.Static | BindingFlags.NonPublic);
+
+		private readonly IRequest _request;
 		private readonly IConnectionSettingsValues _settings;
 
 		public MultiSearchResponseJsonConverter(IConnectionSettingsValues settings, IRequest request)
 		{
-			this._settings = settings;
-			this._request = request;
+			_settings = settings;
+			_request = request;
 		}
 
 		public MultiSearchResponseJsonConverter() { }
 
+		public override bool CanRead => true;
+		public override bool CanWrite => false;
+
+		public override bool CanConvert(Type objectType) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			if (this._settings == null)
+			if (_settings == null)
 			{
 				var realConverter = serializer.GetStatefulConverter<MultiSearchResponseJsonConverter>();
 				return realConverter.ReadJson(reader, objectType, existingValue, serializer);
@@ -42,41 +43,45 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var docsJarray = (JArray)jsonObject["responses"];
 			if (docsJarray == null)
 				return response;
-			var multiSearchDescriptor = this._request;
-			if (this._request == null)
+
+			var multiSearchDescriptor = _request;
+			if (_request == null)
 				return multiSearchDescriptor;
 
 			IEnumerable<SearchHitTuple> withMeta;
-			if (this._request is IMultiSearchRequest multiSearch)
-			{
+			if (_request is IMultiSearchRequest multiSearch)
 				withMeta = docsJarray.Zip(multiSearch.Operations,
-					(doc, desc) => new SearchHitTuple { Hit = doc, Descriptor = new KeyValuePair<string, ICovariantSearchRequest>(desc.Key, desc.Value) });
-			}
+					(doc, desc) => new SearchHitTuple
+						{ Hit = doc, Descriptor = new KeyValuePair<string, ICovariantSearchRequest>(desc.Key, desc.Value) });
 			else
 			{
-				if (!(this._request is IMultiSearchTemplateRequest multiSearchTemplate))
-					throw new InvalidOperationException($"Request must be an instance of {nameof(IMultiSearchRequest)} or {nameof(IMultiSearchTemplateRequest)}");
+				if (!(_request is IMultiSearchTemplateRequest multiSearchTemplate))
+					throw new InvalidOperationException(
+						$"Request must be an instance of {nameof(IMultiSearchRequest)} or {nameof(IMultiSearchTemplateRequest)}");
 
 				withMeta = docsJarray.Zip(multiSearchTemplate.Operations,
-					(doc, desc) => new SearchHitTuple { Hit = doc, Descriptor = new KeyValuePair<string, ICovariantSearchRequest>(desc.Key, desc.Value) });
+					(doc, desc) => new SearchHitTuple
+						{ Hit = doc, Descriptor = new KeyValuePair<string, ICovariantSearchRequest>(desc.Key, desc.Value) });
 			}
 
 			foreach (var m in withMeta)
 			{
 				var descriptor = m.Descriptor.Value;
 				var baseType = m.Descriptor.Value.ClrType ?? typeof(object);
-				var cachedDelegate = serializer.GetConnectionSettings().Inferrer.CreateSearchResponseDelegates.GetOrAdd(baseType, t =>
-				{
-					// Compile a delegate from an expression
-					var methodInfo = MakeDelegateMethodInfo.MakeGenericMethod(t);
-					var tupleParameter = Expression.Parameter(typeof(SearchHitTuple), "tuple");
-					var serializerParameter = Expression.Parameter(typeof(JsonSerializer), "serializer");
-					var multiHitCollection = Expression.Parameter(typeof(IDictionary<string, object>), "collection");
-					var parameterExpressions = new[] { tupleParameter, serializerParameter, multiHitCollection };
-					var call = Expression.Call(null, methodInfo, parameterExpressions);
-					var lambda = Expression.Lambda<Action<SearchHitTuple, JsonSerializer, IDictionary<string, object>>>(call, parameterExpressions);
-					return lambda.Compile();
-				});
+				var cachedDelegate = serializer.GetConnectionSettings()
+					.Inferrer.CreateSearchResponseDelegates.GetOrAdd(baseType, t =>
+					{
+						// Compile a delegate from an expression
+						var methodInfo = MakeDelegateMethodInfo.MakeGenericMethod(t);
+						var tupleParameter = Expression.Parameter(typeof(SearchHitTuple), "tuple");
+						var serializerParameter = Expression.Parameter(typeof(JsonSerializer), "serializer");
+						var multiHitCollection = Expression.Parameter(typeof(IDictionary<string, object>), "collection");
+						var parameterExpressions = new[] { tupleParameter, serializerParameter, multiHitCollection };
+						var call = Expression.Call(null, methodInfo, parameterExpressions);
+						var lambda = Expression.Lambda<Action<SearchHitTuple, JsonSerializer, IDictionary<string, object>>>(call,
+							parameterExpressions);
+						return lambda.Compile();
+					});
 
 				cachedDelegate(m, serializer, response.Responses);
 			}
@@ -84,16 +89,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return response;
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
-
-		internal class SearchHitTuple
-		{
-			public JToken Hit { get; set; }
-			public KeyValuePair<string, ICovariantSearchRequest> Descriptor { get; set; }
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 
 		private static void CreateSearchResponse<T>(SearchHitTuple tuple, JsonSerializer serializer, IDictionary<string, object> collection)
 			where T : class
@@ -102,5 +98,11 @@ private static void CreateSearchResponse<T>(SearchHitTuple tuple, JsonSerializer
 
 			collection.Add(tuple.Descriptor.Key, response);
 		}
+
+		internal class SearchHitTuple
+		{
+			public KeyValuePair<string, ICovariantSearchRequest> Descriptor { get; set; }
+			public JToken Hit { get; set; }
+		}
 	}
 }
diff --git a/src/Nest/Search/MultiSearchTemplate/ElasticClient-MultiSearchTemplate.cs b/src/Nest/Search/MultiSearchTemplate/ElasticClient-MultiSearchTemplate.cs
index 3add5d49bff..f925def061d 100644
--- a/src/Nest/Search/MultiSearchTemplate/ElasticClient-MultiSearchTemplate.cs
+++ b/src/Nest/Search/MultiSearchTemplate/ElasticClient-MultiSearchTemplate.cs
@@ -1,80 +1,82 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
 {
-	using System.Threading;
 	using MultiSearchTemplateCreator = Func<IApiCallDetails, Stream, MultiSearchResponse>;
 
 	public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The multi search API allows to execute several search requests within the same API.
-		/// <para> </para><a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html</a>
+		/// <para> </para>
+		/// <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html">http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html</a>
 		/// </summary>
 		/// <param name="selector">A descriptor that describes the search operations on the multi search api</param>
 		IMultiSearchResponse MultiSearchTemplate(Func<MultiSearchTemplateDescriptor, IMultiSearchTemplateRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IMultiSearchResponse MultiSearchTemplate(IMultiSearchTemplateRequest request);
 
-		/// <inheritdoc/>
-		Task<IMultiSearchResponse> MultiSearchTemplateAsync(Func<MultiSearchTemplateDescriptor, IMultiSearchTemplateRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IMultiSearchResponse> MultiSearchTemplateAsync(Func<MultiSearchTemplateDescriptor, IMultiSearchTemplateRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IMultiSearchResponse> MultiSearchTemplateAsync(IMultiSearchTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IMultiSearchResponse> MultiSearchTemplateAsync(IMultiSearchTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
 		/// <inheritdoc />
 		public IMultiSearchResponse MultiSearchTemplate(Func<MultiSearchTemplateDescriptor, IMultiSearchTemplateRequest> selector) =>
-			this.MultiSearchTemplate(selector?.Invoke(new MultiSearchTemplateDescriptor()));
+			MultiSearchTemplate(selector?.Invoke(new MultiSearchTemplateDescriptor()));
 
 		/// <inheritdoc />
-		public IMultiSearchResponse MultiSearchTemplate(IMultiSearchTemplateRequest request)
-		{
-			return this.Dispatcher.Dispatch<IMultiSearchTemplateRequest, MultiSearchTemplateRequestParameters, MultiSearchResponse>(
+		public IMultiSearchResponse MultiSearchTemplate(IMultiSearchTemplateRequest request) =>
+			Dispatcher.Dispatch<IMultiSearchTemplateRequest, MultiSearchTemplateRequestParameters, MultiSearchResponse>(
 				request,
 				(p, d) =>
 				{
 					var converter = CreateMultiSearchTemplateDeserializer(p);
-					var serializer = this.ConnectionSettings.CreateStateful(converter);
+					var serializer = ConnectionSettings.CreateStateful(converter);
 					var creator = new MultiSearchTemplateCreator((r, s) => serializer.Deserialize<MultiSearchResponse>(s));
 					request.RequestParameters.DeserializationOverride = creator;
-					return this.LowLevelDispatch.MsearchTemplateDispatch<MultiSearchResponse>(p, new SerializableData<IMultiSearchTemplateRequest>(p));
+					return LowLevelDispatch.MsearchTemplateDispatch<MultiSearchResponse>(p, new SerializableData<IMultiSearchTemplateRequest>(p));
 				}
 			);
-		}
 
 		/// <inheritdoc />
-		public Task<IMultiSearchResponse> MultiSearchTemplateAsync(Func<MultiSearchTemplateDescriptor, IMultiSearchTemplateRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.MultiSearchTemplateAsync(selector?.Invoke(new MultiSearchTemplateDescriptor()), cancellationToken);
+		public Task<IMultiSearchResponse> MultiSearchTemplateAsync(Func<MultiSearchTemplateDescriptor, IMultiSearchTemplateRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			MultiSearchTemplateAsync(selector?.Invoke(new MultiSearchTemplateDescriptor()), cancellationToken);
 
 
 		/// <inheritdoc />
-		public Task<IMultiSearchResponse> MultiSearchTemplateAsync(IMultiSearchTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken))
-		{
-			return this.Dispatcher.DispatchAsync<IMultiSearchTemplateRequest, MultiSearchTemplateRequestParameters, MultiSearchResponse, IMultiSearchResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) =>
-				{
-					var converter = CreateMultiSearchTemplateDeserializer(p);
-					var serializer = this.ConnectionSettings.CreateStateful(converter);
-					var creator = new MultiSearchTemplateCreator((r, s) => serializer.Deserialize<MultiSearchResponse>(s));
-					request.RequestParameters.DeserializationOverride = creator;
-					return this.LowLevelDispatch.MsearchTemplateDispatchAsync<MultiSearchResponse>(p, new SerializableData<IMultiSearchTemplateRequest>(p), c);
-				}
-			);
-		}
+		public Task<IMultiSearchResponse> MultiSearchTemplateAsync(IMultiSearchTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) => Dispatcher.DispatchAsync<IMultiSearchTemplateRequest, MultiSearchTemplateRequestParameters, MultiSearchResponse, IMultiSearchResponse>(
+			request,
+			cancellationToken,
+			(p, d, c) =>
+			{
+				var converter = CreateMultiSearchTemplateDeserializer(p);
+				var serializer = ConnectionSettings.CreateStateful(converter);
+				var creator = new MultiSearchTemplateCreator((r, s) => serializer.Deserialize<MultiSearchResponse>(s));
+				request.RequestParameters.DeserializationOverride = creator;
+				return LowLevelDispatch.MsearchTemplateDispatchAsync<MultiSearchResponse>(p, new SerializableData<IMultiSearchTemplateRequest>(p), c);
+			}
+		);
 
-		private JsonConverter CreateMultiSearchTemplateDeserializer(IMultiSearchTemplateRequest request)
-		{
-			return new MultiSearchResponseJsonConverter(this.ConnectionSettings, request);
-		}
+		private JsonConverter CreateMultiSearchTemplateDeserializer(IMultiSearchTemplateRequest request) =>
+			new MultiSearchResponseJsonConverter(ConnectionSettings, request);
 	}
 }
diff --git a/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateJsonConverter.cs b/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateJsonConverter.cs
index 5f9f11a8bf2..292b97732a2 100644
--- a/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateJsonConverter.cs
+++ b/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateJsonConverter.cs
@@ -1,28 +1,24 @@
-using Elasticsearch.Net;
+using System;
+using Elasticsearch.Net;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
 	internal class MultiSearchTemplateJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
 		public override bool CanRead => false;
 		public override bool CanWrite => true;
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
+		public override bool CanConvert(Type objectType) => true;
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			throw new NotSupportedException();
-		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var request = (IMultiSearchTemplateRequest)value;
 			if (request == null) return;
+
 			var settings = serializer.GetConnectionSettings();
 			var elasticsearchSerializer = settings.RequestResponseSerializer;
 			if (elasticsearchSerializer == null) return;
@@ -32,7 +28,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			foreach (var operation in request.Operations.Values)
 			{
 				var p = operation.RequestParameters;
-				string GetString(string key) => p.GetResolvedQueryStringValue(key, settings);
+
+				string GetString(string key)
+				{
+					return p.GetResolvedQueryStringValue(key, settings);
+				}
 
 				IUrlParameter indices = request.Index == null || !request.Index.Equals(operation.Index)
 					? operation.Index
@@ -60,7 +60,8 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				writer.WriteRaw($"{headerString}\n");
 				var bodyString = elasticsearchSerializer.SerializeToString(operation, SerializationFormatting.None);
 				writer.WriteRaw($"{bodyString}\n");
-			};
+			}
+			;
 		}
 	}
 }
diff --git a/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateRequest.cs b/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateRequest.cs
index 1b48b032626..3351c0855e2 100644
--- a/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateRequest.cs
+++ b/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateRequest.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -12,16 +12,14 @@ public partial interface IMultiSearchTemplateRequest
 
 	public partial class MultiSearchTemplateRequest
 	{
-		protected sealed override void Initialize() => this.TypedKeys = true;
-
 		public IDictionary<string, ISearchTemplateRequest> Operations { get; set; }
+
+		protected sealed override void Initialize() => TypedKeys = true;
 	}
 
 	[DescriptorFor("MsearchTemplate")]
 	public partial class MultiSearchTemplateDescriptor
 	{
-		protected sealed override void Initialize() => this.TypedKeys();
-
 		internal IDictionary<string, ISearchTemplateRequest> _operations = new Dictionary<string, ISearchTemplateRequest>();
 
 		IDictionary<string, ISearchTemplateRequest> IMultiSearchTemplateRequest.Operations
@@ -30,20 +28,22 @@ IDictionary<string, ISearchTemplateRequest> IMultiSearchTemplateRequest.Operatio
 			set => _operations = value;
 		}
 
-		public MultiSearchTemplateDescriptor Template<T>(string name, Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector) where T : class
+		protected sealed override void Initialize() => TypedKeys();
+
+		public MultiSearchTemplateDescriptor Template<T>(string name, Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector)
+			where T : class
 		{
 			name.ThrowIfNull(nameof(name));
 			selector.ThrowIfNull(nameof(selector));
 			var descriptor = selector(new SearchTemplateDescriptor<T>());
 			if (descriptor == null)
 				return this;
-			this._operations.Add(name, descriptor);
+
+			_operations.Add(name, descriptor);
 			return this;
 		}
 
-		public MultiSearchTemplateDescriptor Template<T>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector) where T : class
-		{
-			return this.Template(Guid.NewGuid().ToString(), selector);
-		}
+		public MultiSearchTemplateDescriptor Template<T>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector) where T : class =>
+			Template(Guid.NewGuid().ToString(), selector);
 	}
 }
diff --git a/src/Nest/Search/Scroll/ClearScroll/ClearScrollRequest.cs b/src/Nest/Search/Scroll/ClearScroll/ClearScrollRequest.cs
index c2963bb7f4d..089eaed28ae 100644
--- a/src/Nest/Search/Scroll/ClearScroll/ClearScrollRequest.cs
+++ b/src/Nest/Search/Scroll/ClearScroll/ClearScrollRequest.cs
@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -11,17 +11,11 @@ public partial interface IClearScrollRequest
 
 	public partial class ClearScrollRequest
 	{
-		public IEnumerable<string> ScrollIds { get; set; }
+		public ClearScrollRequest(IEnumerable<string> scrollIds) => ScrollIds = scrollIds;
 
-		public ClearScrollRequest(IEnumerable<string> scrollIds)
-		{
-			this.ScrollIds = scrollIds;
-		}
+		public ClearScrollRequest(string scrollId) => ScrollIds = new string[] { scrollId };
 
-		public ClearScrollRequest(string scrollId)
-		{
-			this.ScrollIds = new string[] { scrollId };
-		}
+		public IEnumerable<string> ScrollIds { get; set; }
 	}
 
 	[DescriptorFor("ClearScroll")]
diff --git a/src/Nest/Search/Scroll/ClearScroll/ElasticClient-ClearScroll.cs b/src/Nest/Search/Scroll/ClearScroll/ElasticClient-ClearScroll.cs
index 23d75bfea1c..0b2b663ea14 100644
--- a/src/Nest/Search/Scroll/ClearScroll/ElasticClient-ClearScroll.cs
+++ b/src/Nest/Search/Scroll/ClearScroll/ElasticClient-ClearScroll.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,45 +9,52 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Deletes a registered scroll request on the cluster
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-scroll.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-scroll.html
 		/// </summary>
 		/// <param name="selector">Specify the scroll id as well as request specific configuration</param>
 		IClearScrollResponse ClearScroll(Func<ClearScrollDescriptor, IClearScrollRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClearScrollResponse ClearScroll(IClearScrollRequest request);
 
-		/// <inheritdoc/>
-		Task<IClearScrollResponse> ClearScrollAsync(Func<ClearScrollDescriptor, IClearScrollRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClearScrollResponse> ClearScrollAsync(Func<ClearScrollDescriptor, IClearScrollRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IClearScrollResponse> ClearScrollAsync(IClearScrollRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClearScrollResponse ClearScroll(Func<ClearScrollDescriptor, IClearScrollRequest> selector) =>
-			this.ClearScroll(selector.InvokeOrDefault(new ClearScrollDescriptor()));
+			ClearScroll(selector.InvokeOrDefault(new ClearScrollDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClearScrollResponse ClearScroll(IClearScrollRequest request) =>
-			this.Dispatcher.Dispatch<IClearScrollRequest, ClearScrollRequestParameters, ClearScrollResponse>(
+			Dispatcher.Dispatch<IClearScrollRequest, ClearScrollRequestParameters, ClearScrollResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.ClearScrollDispatch<ClearScrollResponse>(p, d)
+				(p, d) => LowLevelDispatch.ClearScrollDispatch<ClearScrollResponse>(p, d)
 			);
 
 
-		/// <inheritdoc/>
-		public Task<IClearScrollResponse> ClearScrollAsync(Func<ClearScrollDescriptor, IClearScrollRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClearScrollAsync(selector.InvokeOrDefault(new ClearScrollDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IClearScrollResponse> ClearScrollAsync(Func<ClearScrollDescriptor, IClearScrollRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClearScrollAsync(selector.InvokeOrDefault(new ClearScrollDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IClearScrollResponse> ClearScrollAsync(IClearScrollRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClearScrollRequest, ClearScrollRequestParameters, ClearScrollResponse, IClearScrollResponse>(
+		/// <inheritdoc />
+		public Task<IClearScrollResponse> ClearScrollAsync(IClearScrollRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IClearScrollRequest, ClearScrollRequestParameters, ClearScrollResponse, IClearScrollResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ClearScrollDispatchAsync<ClearScrollResponse>(p, d, c)
+				(p, d, c) => LowLevelDispatch.ClearScrollDispatchAsync<ClearScrollResponse>(p, d, c)
 			);
 	}
 }
diff --git a/src/Nest/Search/Scroll/Scroll/ElasticClient-Scroll.cs b/src/Nest/Search/Scroll/Scroll/ElasticClient-Scroll.cs
index a46ff0cee2d..44abdc0191d 100644
--- a/src/Nest/Search/Scroll/Scroll/ElasticClient-Scroll.cs
+++ b/src/Nest/Search/Scroll/Scroll/ElasticClient-Scroll.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,53 +9,64 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// A search request can be scrolled by specifying the scroll parameter.
-		/// <para>The scroll parameter is a time value parameter (for example: scroll=5m),
+		/// <para>
+		/// The scroll parameter is a time value parameter (for example: scroll=5m),
 		/// indicating for how long the nodes that participate in the search will maintain relevant resources in
-		/// order to continue and support it.</para><para>
-		/// This is very similar in its idea to opening a cursor against a database.</para>
-		/// <para> </para><para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-scroll.html</para>
+		/// order to continue and support it.
+		/// </para>
+		/// <para>
+		/// This is very similar in its idea to opening a cursor against a database.
+		/// </para>
+		/// <para> </para>
+		/// <para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-scroll.html</para>
 		/// </summary>
 		/// <typeparam name="T">The type that represents the result hits</typeparam>
 		/// <param name="request">A descriptor that describes the scroll operation</param>
-		/// <returns>A query response holding <typeparamref name="T"/> hits as well as the ScrollId for the next scroll operation</returns>
+		/// <returns>A query response holding <typeparamref name="T" /> hits as well as the ScrollId for the next scroll operation</returns>
 		ISearchResponse<T> Scroll<T>(IScrollRequest request) where T : class;
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		ISearchResponse<T> Scroll<T>(Time scrollTime, string scrollId, Func<ScrollDescriptor<T>, IScrollRequest> selector = null)
 			where T : class;
 
-		///<inheritdoc/>
+		/// <inheritdoc />
 		Task<ISearchResponse<T>> ScrollAsync<T>(IScrollRequest request, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class;
 
-		///<inheritdoc/>
-		Task<ISearchResponse<T>> ScrollAsync<T>(Time scrollTime, string scrollId, Func<ScrollDescriptor<T>, IScrollRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ISearchResponse<T>> ScrollAsync<T>(Time scrollTime, string scrollId, Func<ScrollDescriptor<T>, IScrollRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISearchResponse<T> Scroll<T>(IScrollRequest request) where T : class =>
-			this.Dispatcher.Dispatch<IScrollRequest, ScrollRequestParameters, SearchResponse<T>>(
+			Dispatcher.Dispatch<IScrollRequest, ScrollRequestParameters, SearchResponse<T>>(
 				request,
-				(p, d) => this.LowLevelDispatch.ScrollDispatch<SearchResponse<T>>(p, d)
+				(p, d) => LowLevelDispatch.ScrollDispatch<SearchResponse<T>>(p, d)
 			);
 
-		/// <inheritdoc/>
-		public ISearchResponse<T> Scroll<T>(Time scrollTime, string scrollId, Func<ScrollDescriptor<T>, IScrollRequest> selector = null) where T : class =>
-			this.Scroll<T>(selector.InvokeOrDefault(new ScrollDescriptor<T>().Scroll(scrollTime).ScrollId(scrollId)));
+		/// <inheritdoc />
+		public ISearchResponse<T> Scroll<T>(Time scrollTime, string scrollId, Func<ScrollDescriptor<T>, IScrollRequest> selector = null)
+			where T : class =>
+			Scroll<T>(selector.InvokeOrDefault(new ScrollDescriptor<T>().Scroll(scrollTime).ScrollId(scrollId)));
 
-		/// <inheritdoc/>
-		public Task<ISearchResponse<T>> ScrollAsync<T>(IScrollRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.Dispatcher.DispatchAsync<IScrollRequest, ScrollRequestParameters, SearchResponse<T>, ISearchResponse<T>>(
+		/// <inheritdoc />
+		public Task<ISearchResponse<T>> ScrollAsync<T>(IScrollRequest request, CancellationToken cancellationToken = default(CancellationToken))
+			where T : class =>
+			Dispatcher.DispatchAsync<IScrollRequest, ScrollRequestParameters, SearchResponse<T>, ISearchResponse<T>>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.ScrollDispatchAsync<SearchResponse<T>>(p, d, c)
+				(p, d, c) => LowLevelDispatch.ScrollDispatchAsync<SearchResponse<T>>(p, d, c)
 			);
 
-		/// <inheritdoc/>
-		public Task<ISearchResponse<T>> ScrollAsync<T>(Time scrollTime, string scrollId, Func<ScrollDescriptor<T>, IScrollRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.ScrollAsync<T>(selector.InvokeOrDefault(new ScrollDescriptor<T>().Scroll(scrollTime).ScrollId(scrollId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<ISearchResponse<T>> ScrollAsync<T>(Time scrollTime, string scrollId, Func<ScrollDescriptor<T>, IScrollRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			ScrollAsync<T>(selector.InvokeOrDefault(new ScrollDescriptor<T>().Scroll(scrollTime).ScrollId(scrollId)), cancellationToken);
 	}
 }
diff --git a/src/Nest/Search/Scroll/Scroll/ScrollRequest.cs b/src/Nest/Search/Scroll/Scroll/ScrollRequest.cs
index ceabbb5d091..f5b1dcee73c 100644
--- a/src/Nest/Search/Scroll/Scroll/ScrollRequest.cs
+++ b/src/Nest/Search/Scroll/Scroll/ScrollRequest.cs
@@ -14,20 +14,19 @@ public partial interface IScrollRequest : ICovariantSearchRequest
 
 	public partial class ScrollRequest
 	{
-		private Type _clrType { get; set; }
-		Type ICovariantSearchRequest.ClrType => this._clrType;
-
-		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
+		public ScrollRequest(string scrollId, Time scroll)
+		{
+			Scroll = scroll;
+			ScrollId = scrollId;
+		}
 
 		public Time Scroll { get; set; }
 
 		public string ScrollId { get; set; }
 
-		public ScrollRequest(string scrollId, Time scroll)
-		{
-			this.Scroll = scroll;
-			this.ScrollId = scrollId;
-		}
+		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
+		private Type _clrType { get; set; }
+		Type ICovariantSearchRequest.ClrType => _clrType;
 	}
 
 	public partial class ScrollDescriptor<T> where T : class
diff --git a/src/Nest/Search/Scroll/Scroll/SlicedScroll.cs b/src/Nest/Search/Scroll/Scroll/SlicedScroll.cs
index cc12d8d0343..db5c673697f 100644
--- a/src/Nest/Search/Scroll/Scroll/SlicedScroll.cs
+++ b/src/Nest/Search/Scroll/Scroll/SlicedScroll.cs
@@ -7,28 +7,29 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SlicedScroll>))]
 	public interface ISlicedScroll
 	{
+		[JsonProperty("field")]
+		Field Field { get; set; }
+
 		[JsonProperty("id")]
 		int? Id { get; set; }
+
 		[JsonProperty("max")]
 		int? Max { get; set; }
-		[JsonProperty("field")]
-		Field Field { get; set; }
 	}
 
 	public class SlicedScroll : ISlicedScroll
 	{
+		public Field Field { get; set; }
 		public int? Id { get; set; }
 		public int? Max { get; set; }
-		public Field Field { get; set; }
-
 	}
 
 	public class SlicedScrollDescriptor<T> : DescriptorBase<SlicedScrollDescriptor<T>, ISlicedScroll>, ISlicedScroll
 		where T : class
 	{
+		Field ISlicedScroll.Field { get; set; }
 		int? ISlicedScroll.Id { get; set; }
 		int? ISlicedScroll.Max { get; set; }
-		Field ISlicedScroll.Field { get; set; }
 
 		public SlicedScrollDescriptor<T> Id(int? id) => Assign(a => a.Id = id);
 
@@ -37,6 +38,5 @@ public class SlicedScrollDescriptor<T> : DescriptorBase<SlicedScrollDescriptor<T
 		public SlicedScrollDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
 		public SlicedScrollDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
-
 	}
 }
diff --git a/src/Nest/Search/Search/Collapsing/FieldCollapse.cs b/src/Nest/Search/Search/Collapsing/FieldCollapse.cs
index 2c825cd0963..6733713252e 100644
--- a/src/Nest/Search/Search/Collapsing/FieldCollapse.cs
+++ b/src/Nest/Search/Search/Collapsing/FieldCollapse.cs
@@ -38,21 +38,20 @@ public interface IFieldCollapse
 		int? MaxConcurrentGroupSearches { get; set; }
 	}
 
-	/// <inheritdoc cref="IFieldCollapse"/>
+	/// <inheritdoc cref="IFieldCollapse" />
 	public class FieldCollapse : IFieldCollapse
 	{
-		/// <inheritdoc cref="IFieldCollapse.Field"/>
+		/// <inheritdoc cref="IFieldCollapse.Field" />
 		public Field Field { get; set; }
 
-		/// <inheritdoc cref="IFieldCollapse.InnerHits"/>
+		/// <inheritdoc cref="IFieldCollapse.InnerHits" />
 		public IInnerHits InnerHits { get; set; }
 
-		/// <inheritdoc cref="IFieldCollapse.MaxConcurrentGroupSearches"/>
+		/// <inheritdoc cref="IFieldCollapse.MaxConcurrentGroupSearches" />
 		public int? MaxConcurrentGroupSearches { get; set; }
-
 	}
 
-	/// <inheritdoc cref="IFieldCollapse"/>
+	/// <inheritdoc cref="IFieldCollapse" />
 	public class FieldCollapseDescriptor<T> : DescriptorBase<FieldCollapseDescriptor<T>, IFieldCollapse>, IFieldCollapse
 		where T : class
 	{
@@ -60,19 +59,18 @@ public class FieldCollapseDescriptor<T> : DescriptorBase<FieldCollapseDescriptor
 		IInnerHits IFieldCollapse.InnerHits { get; set; }
 		int? IFieldCollapse.MaxConcurrentGroupSearches { get; set; }
 
-		/// <inheritdoc cref="IFieldCollapse.MaxConcurrentGroupSearches"/>
+		/// <inheritdoc cref="IFieldCollapse.MaxConcurrentGroupSearches" />
 		public FieldCollapseDescriptor<T> MaxConcurrentGroupSearches(int? maxConcurrentGroupSearches) =>
 			Assign(a => a.MaxConcurrentGroupSearches = maxConcurrentGroupSearches);
 
-		/// <inheritdoc cref="IFieldCollapse.Field"/>
+		/// <inheritdoc cref="IFieldCollapse.Field" />
 		public FieldCollapseDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="IFieldCollapse.Field"/>
+		/// <inheritdoc cref="IFieldCollapse.Field" />
 		public FieldCollapseDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc cref="IFieldCollapse.InnerHits"/>
+		/// <inheritdoc cref="IFieldCollapse.InnerHits" />
 		public FieldCollapseDescriptor<T> InnerHits(Func<InnerHitsDescriptor<T>, IInnerHits> selector = null) =>
 			Assign(a => a.InnerHits = selector.InvokeOrDefault(new InnerHitsDescriptor<T>()));
-
 	}
 }
diff --git a/src/Nest/Search/Search/ElasticClient-Search.cs b/src/Nest/Search/Search/ElasticClient-Search.cs
index e602f03a1fe..ae034ee5586 100644
--- a/src/Nest/Search/Search/ElasticClient-Search.cs
+++ b/src/Nest/Search/Search/ElasticClient-Search.cs
@@ -1,8 +1,7 @@
 using System;
-using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,40 +9,48 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The search API allows to execute a search query and get back search hits that match the query.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-search.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-search.html
 		/// </summary>
 		/// <typeparam name="T">The type used to infer the index and typename as well describe the query strongly typed</typeparam>
 		/// <param name="selector">A descriptor that describes the parameters for the search operation</param>
 		ISearchResponse<T> Search<T>(Func<SearchDescriptor<T>, ISearchRequest> selector = null) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISearchResponse<T> Search<T>(ISearchRequest request) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISearchResponse<TResult> Search<T, TResult>(Func<SearchDescriptor<T>, ISearchRequest> selector = null)
 			where T : class
 			where TResult : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISearchResponse<TResult> Search<T, TResult>(ISearchRequest request)
 			where T : class
 			where TResult : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		/// <typeparam name="T">The type used to infer the index and typename as well describe the query strongly typed</typeparam>
 		/// <param name="selector">A descriptor that describes the parameters for the search operation</param>
-		Task<ISearchResponse<T>> SearchAsync<T>(Func<SearchDescriptor<T>, ISearchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
-
-		/// <inheritdoc/>
-		Task<ISearchResponse<T>> SearchAsync<T>(ISearchRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
-
-		/// <inheritdoc/>
-		Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(Func<SearchDescriptor<T>, ISearchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		Task<ISearchResponse<T>> SearchAsync<T>(Func<SearchDescriptor<T>, ISearchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class;
+
+		/// <inheritdoc />
+		Task<ISearchResponse<T>> SearchAsync<T>(ISearchRequest request, CancellationToken cancellationToken = default(CancellationToken))
+			where T : class;
+
+		/// <inheritdoc />
+		Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(Func<SearchDescriptor<T>, ISearchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 			where TResult : class;
 
-		/// <inheritdoc/>
-		Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(ISearchRequest request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(ISearchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 			where TResult : class;
 	}
@@ -51,52 +58,59 @@ ISearchResponse<TResult> Search<T, TResult>(ISearchRequest request)
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISearchResponse<T> Search<T>(Func<SearchDescriptor<T>, ISearchRequest> selector = null) where T : class =>
-			this.Search<T, T>(selector);
+			Search<T, T>(selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISearchResponse<TResult> Search<T, TResult>(Func<SearchDescriptor<T>, ISearchRequest> selector = null)
 			where T : class
 			where TResult : class =>
-			this.Search<TResult>(selector.InvokeOrDefault(new SearchDescriptor<T>()));
+			Search<TResult>(selector.InvokeOrDefault(new SearchDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISearchResponse<T> Search<T>(ISearchRequest request) where T : class =>
-			this.Search<T, T>(request);
+			Search<T, T>(request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISearchResponse<TResult> Search<T, TResult>(ISearchRequest request)
 			where T : class
 			where TResult : class =>
-			this.Dispatcher.Dispatch<ISearchRequest, SearchRequestParameters, SearchResponse<TResult>>(
+			Dispatcher.Dispatch<ISearchRequest, SearchRequestParameters, SearchResponse<TResult>>(
 				request,
-				(p, d) => this.LowLevelDispatch.SearchDispatch<SearchResponse<TResult>>(p, d)
+				(p, d) => LowLevelDispatch.SearchDispatch<SearchResponse<TResult>>(p, d)
 			);
 
-		/// <inheritdoc/>
-		public Task<ISearchResponse<T>> SearchAsync<T>(Func<SearchDescriptor<T>, ISearchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<ISearchResponse<T>> SearchAsync<T>(Func<SearchDescriptor<T>, ISearchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.SearchAsync<T, T>(selector, cancellationToken);
+			SearchAsync<T, T>(selector, cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(Func<SearchDescriptor<T>, ISearchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(Func<SearchDescriptor<T>, ISearchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 			where TResult : class =>
-			this.SearchAsync<TResult>(selector.InvokeOrDefault(new SearchDescriptor<T>()), cancellationToken);
+			SearchAsync<TResult>(selector.InvokeOrDefault(new SearchDescriptor<T>()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ISearchResponse<T>> SearchAsync<T>(ISearchRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.SearchAsync<T, T>(request, cancellationToken);
+		/// <inheritdoc />
+		public Task<ISearchResponse<T>> SearchAsync<T>(ISearchRequest request, CancellationToken cancellationToken = default(CancellationToken))
+			where T : class =>
+			SearchAsync<T, T>(request, cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(ISearchRequest request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(ISearchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 			where TResult : class =>
-			this.Dispatcher.DispatchAsync<ISearchRequest, SearchRequestParameters, SearchResponse<TResult>, ISearchResponse<TResult>>(
+			Dispatcher.DispatchAsync<ISearchRequest, SearchRequestParameters, SearchResponse<TResult>, ISearchResponse<TResult>>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SearchDispatchAsync<SearchResponse<TResult>>(p, d, c)
+				(p, d, c) => LowLevelDispatch.SearchDispatchAsync<SearchResponse<TResult>>(p, d, c)
 			);
 	}
 }
diff --git a/src/Nest/Search/Search/Highlighting/BoundaryScanner.cs b/src/Nest/Search/Search/Highlighting/BoundaryScanner.cs
index 45113a23b71..7e8832cc565 100644
--- a/src/Nest/Search/Search/Highlighting/BoundaryScanner.cs
+++ b/src/Nest/Search/Search/Highlighting/BoundaryScanner.cs
@@ -14,12 +14,14 @@ public enum BoundaryScanner
 		/// </summary>
 		[EnumMember(Value = "chars")]
 		Characters,
+
 		/// <summary>
 		/// sentence and word: use Java’s BreakIterator to break the highlighted fragments at the next sentence or word boundary.
 		/// You can further specify boundary_scanner_locale to control which Locale is used to search the text for these boundaries.
 		/// </summary>
 		[EnumMember(Value = "sentence")]
 		Sentence,
+
 		/// <summary>
 		/// sentence and word: use Java’s BreakIterator to break the highlighted fragments at the next sentence or word boundary.
 		/// You can further specify boundary_scanner_locale to control which Locale is used to search the text for these boundaries.
diff --git a/src/Nest/Search/Search/Highlighting/Highlight.cs b/src/Nest/Search/Search/Highlighting/Highlight.cs
index 6a8f260c45d..9f55a0a7233 100644
--- a/src/Nest/Search/Search/Highlighting/Highlight.cs
+++ b/src/Nest/Search/Search/Highlighting/Highlight.cs
@@ -13,20 +13,54 @@ namespace Nest
 	public interface IHighlight
 	{
 		/// <summary>
-		/// Controls the pre tag in which to wrap highights.
-		/// By default, the highlighting will wrap highlighted text in &lt;em&gt; and &lt;/em&gt;.
-		/// Using the fast vector highlighter, there can be more tags, and the importance is ordered.
+		/// Defines what constitutes a boundary for highlighting when using the fast vector highlighter.
+		/// It's a single string with each boundary character defined in it. It defaults to .,!? \t\n.
 		/// </summary>
-		[JsonProperty("pre_tags")]
-		IEnumerable<string> PreTags { get; set; }
+		[JsonProperty("boundary_chars")]
+		string BoundaryChars { get; set; }
 
 		/// <summary>
-		/// Controls the post tag in which to wrap highights.
-		/// By default, the highlighting will wrap highlighted text in &lt;em&gt; and &lt;/em&gt;.
-		/// Using the fast vector highlighter, there can be more tags, and the importance is ordered.
+		/// Controls how far to look for boundary characters. Defaults to 20.
 		/// </summary>
-		[JsonProperty("post_tags")]
-		IEnumerable<string> PostTags { get; set; }
+		[JsonProperty("boundary_max_scan")]
+		int? BoundaryMaxScan { get; set; }
+
+		/// <summary>
+		/// When highlighting a field using the unified highlighter or the fast vector highlighter, you can specify how to break the highlighted
+		/// fragments using boundary_scanner
+		/// </summary>
+		[JsonProperty("boundary_scanner")]
+		BoundaryScanner? BoundaryScanner { get; set; }
+
+		/// <summary>
+		/// You can further specify boundary_scanner_locale to control which Locale is used to search the text for these boundaries.
+		/// </summary>
+		[JsonProperty("boundary_scanner_locale")]
+		string BoundaryScannerLocale { get; set; }
+
+		/// <summary>
+		/// Define how highlighted text will be encoded.
+		/// It can be either default (no encoding) or html (will escape html, if you use html highlighting tags).
+		/// </summary>
+		[JsonProperty("encoder")]
+		HighlighterEncoder? Encoder { get; set; }
+
+		[JsonProperty("fields")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<Field, IHighlightField>))]
+		Dictionary<Field, IHighlightField> Fields { get; set; }
+
+		/// <summary>
+		/// Fragmenter can control how text should be broken up in highlight snippets. However, this option is
+		/// applicable only for the Plain Highlighter
+		/// </summary>
+		[JsonProperty("fragmenter")]
+		HighlighterFragmenter? Fragmenter { get; set; }
+
+		/// <summary>
+		/// Controls the margin to start highlighting from when using the fast vector highlighter
+		/// </summary>
+		[JsonProperty("fragment_offset")]
+		int? FragmentOffset { get; set; }
 
 		/// <summary>
 		/// The size of the highlighted fragment, in characters. Defaults to 100
@@ -34,8 +68,12 @@ public interface IHighlight
 		[JsonProperty("fragment_size")]
 		int? FragmentSize { get; set; }
 
+		[JsonProperty("max_fragment_length")]
+		int? MaxFragmentLength { get; set; }
+
 		/// <summary>
-		/// In the case where there is no matching fragment to highlight, the default is to not return anything. Instead, we can return a snippet of text from
+		/// In the case where there is no matching fragment to highlight, the default is to not return anything. Instead, we can return a snippet of
+		/// text from
 		/// the beginning of the field by setting no_match_size (default 0) to the length of the text that you want returned. The actual length may be
 		/// shorter or longer than specified as it tries to break on a word boundary.
 		/// </summary>
@@ -49,29 +87,26 @@ public interface IHighlight
 		int? NumberOfFragments { get; set; }
 
 		/// <summary>
-		/// Controls the margin to start highlighting from when using the fast vector highlighter
-		/// </summary>
-		[JsonProperty("fragment_offset")]
-		int? FragmentOffset { get; set; }
-
-		/// <summary>
-		/// Controls how far to look for boundary characters. Defaults to 20.
+		/// The order in which highlighted fragments are sorted
 		/// </summary>
-		[JsonProperty("boundary_max_scan")]
-		int? BoundaryMaxScan { get; set; }
+		[JsonProperty("order")]
+		HighlighterOrder? Order { get; set; }
 
 		/// <summary>
-		/// Define how highlighted text will be encoded.
-		/// It can be either default (no encoding) or html (will escape html, if you use html highlighting tags).
+		/// Controls the post tag in which to wrap highights.
+		/// By default, the highlighting will wrap highlighted text in &lt;em&gt; and &lt;/em&gt;.
+		/// Using the fast vector highlighter, there can be more tags, and the importance is ordered.
 		/// </summary>
-		[JsonProperty("encoder")]
-		HighlighterEncoder? Encoder { get; set; }
+		[JsonProperty("post_tags")]
+		IEnumerable<string> PostTags { get; set; }
 
 		/// <summary>
-		/// The order in which highlighted fragments are sorted
+		/// Controls the pre tag in which to wrap highights.
+		/// By default, the highlighting will wrap highlighted text in &lt;em&gt; and &lt;/em&gt;.
+		/// Using the fast vector highlighter, there can be more tags, and the importance is ordered.
 		/// </summary>
-		[JsonProperty("order")]
-		HighlighterOrder? Order { get; set; }
+		[JsonProperty("pre_tags")]
+		IEnumerable<string> PreTags { get; set; }
 
 		/// <summary>
 		/// Use a specific "tag" schemas.
@@ -83,12 +118,8 @@ public interface IHighlight
 		/// &lt;em class="hlt7"&gt;, &lt;em class="hlt8"&gt;, &lt;em class="hlt9"&gt;,
 		/// &lt;em class="hlt10"&gt;
 		/// </remarks>
-		[JsonProperty("tags_schema")]
-		HighlighterTagsSchema? TagsSchema { get; set; }
-
-		[JsonProperty("fields")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<Field, IHighlightField>))]
-		Dictionary<Field, IHighlightField> Fields { get; set; }
+		[JsonProperty("require_field_match")]
+		bool? RequireFieldMatch { get; set; }
 
 		/// <summary>
 		/// Use a specific "tag" schemas.
@@ -100,108 +131,93 @@ public interface IHighlight
 		/// &lt;em class="hlt7"&gt;, &lt;em class="hlt8"&gt;, &lt;em class="hlt9"&gt;,
 		/// &lt;em class="hlt10"&gt;
 		/// </remarks>
-		[JsonProperty("require_field_match")]
-		bool? RequireFieldMatch { get; set; }
-
-		/// <summary>
-		/// Defines what constitutes a boundary for highlighting when using the fast vector highlighter.
-		/// It's a single string with each boundary character defined in it. It defaults to .,!? \t\n.
-		/// </summary>
-		[JsonProperty("boundary_chars")]
-		string BoundaryChars { get; set; }
-
-		[JsonProperty("max_fragment_length")]
-		int? MaxFragmentLength { get; set; }
-
-		/// <summary>
-		/// When highlighting a field using the unified highlighter or the fast vector highlighter, you can specify how to break the highlighted
-		/// fragments using boundary_scanner
-		/// </summary>
-		[JsonProperty("boundary_scanner")]
-		BoundaryScanner? BoundaryScanner { get; set; }
-
-		/// <summary>
-		///You can further specify boundary_scanner_locale to control which Locale is used to search the text for these boundaries.
-		/// </summary>
-		[JsonProperty("boundary_scanner_locale")]
-		string BoundaryScannerLocale { get; set; }
-
-		/// <summary>
-		/// Fragmenter can control how text should be broken up in highlight snippets. However, this option is
-		/// applicable only for the Plain Highlighter
-		/// </summary>
-		[JsonProperty("fragmenter")]
-		HighlighterFragmenter? Fragmenter { get; set; }
+		[JsonProperty("tags_schema")]
+		HighlighterTagsSchema? TagsSchema { get; set; }
 	}
 
 	public class Highlight : IHighlight
 	{
 		// <inheritdoc/>
-		public IEnumerable<string> PreTags { get; set; }
-		// <inheritdoc/>
-		public IEnumerable<string> PostTags { get; set; }
-		// <inheritdoc/>
-		public int? FragmentSize { get; set; }
-		// <inheritdoc/>
-		public HighlighterTagsSchema? TagsSchema { get; set; }
+		public string BoundaryChars { get; set; }
+
 		// <inheritdoc/>
-		public int? NumberOfFragments { get; set; }
+		public int? BoundaryMaxScan { get; set; }
+
 		// <inheritdoc/>
-		public int? FragmentOffset { get; set; }
+		public BoundaryScanner? BoundaryScanner { get; set; }
+
 		// <inheritdoc/>
-		public int? BoundaryMaxScan { get; set; }
+		public string BoundaryScannerLocale { get; set; }
+
 		// <inheritdoc/>
 		public HighlighterEncoder? Encoder { get; set; }
-		// <inheritdoc/>
-		public HighlighterOrder? Order { get; set; }
+
 		// <inheritdoc/>
 		public Dictionary<Field, IHighlightField> Fields { get; set; }
+
 		// <inheritdoc/>
-		public bool? RequireFieldMatch { get; set; }
+		public HighlighterFragmenter? Fragmenter { get; set; }
+
 		// <inheritdoc/>
-		public string BoundaryChars { get; set; }
+		public int? FragmentOffset { get; set; }
+
+		// <inheritdoc/>
+		public int? FragmentSize { get; set; }
+
 		// <inheritdoc/>
 		public int? MaxFragmentLength { get; set; }
+
 		// <inheritdoc/>
 		public int? NoMatchSize { get; set; }
+
 		// <inheritdoc/>
-		public BoundaryScanner? BoundaryScanner { get; set; }
+		public int? NumberOfFragments { get; set; }
+
 		// <inheritdoc/>
-		public string BoundaryScannerLocale { get; set; }
+		public HighlighterOrder? Order { get; set; }
+
 		// <inheritdoc/>
-		public HighlighterFragmenter? Fragmenter { get; set; }
+		public IEnumerable<string> PostTags { get; set; }
+
+		// <inheritdoc/>
+		public IEnumerable<string> PreTags { get; set; }
+
+		// <inheritdoc/>
+		public bool? RequireFieldMatch { get; set; }
+
+		// <inheritdoc/>
+		public HighlighterTagsSchema? TagsSchema { get; set; }
 
 		public static Highlight Field(Field field) => new Highlight
 		{
 			Fields = new Dictionary<Field, IHighlightField>
 			{
-				{field, new HighlightField()}
+				{ field, new HighlightField() }
 			}
 		};
-
 	}
 
-	public class HighlightDescriptor<T> : DescriptorBase<HighlightDescriptor<T> ,IHighlight>, IHighlight
+	public class HighlightDescriptor<T> : DescriptorBase<HighlightDescriptor<T>, IHighlight>, IHighlight
 		where T : class
 	{
-
-		IEnumerable<string> IHighlight.PreTags { get; set; }
-		IEnumerable<string> IHighlight.PostTags { get; set; }
-		int? IHighlight.FragmentSize { get; set; }
-		HighlighterTagsSchema? IHighlight.TagsSchema { get; set; }
-		int? IHighlight.NumberOfFragments { get; set; }
-		int? IHighlight.FragmentOffset { get; set; }
+		string IHighlight.BoundaryChars { get; set; }
 		int? IHighlight.BoundaryMaxScan { get; set; }
+		BoundaryScanner? IHighlight.BoundaryScanner { get; set; }
+		string IHighlight.BoundaryScannerLocale { get; set; }
 		HighlighterEncoder? IHighlight.Encoder { get; set; }
-		HighlighterOrder? IHighlight.Order { get; set; }
 		Dictionary<Field, IHighlightField> IHighlight.Fields { get; set; }
-		bool? IHighlight.RequireFieldMatch { get; set; }
-		string IHighlight.BoundaryChars { get; set; }
+		HighlighterFragmenter? IHighlight.Fragmenter { get; set; }
+		int? IHighlight.FragmentOffset { get; set; }
+		int? IHighlight.FragmentSize { get; set; }
 		int? IHighlight.MaxFragmentLength { get; set; }
 		int? IHighlight.NoMatchSize { get; set; }
-		BoundaryScanner? IHighlight.BoundaryScanner { get; set; }
-		string IHighlight.BoundaryScannerLocale { get; set; }
-		HighlighterFragmenter? IHighlight.Fragmenter { get; set; }
+		int? IHighlight.NumberOfFragments { get; set; }
+		HighlighterOrder? IHighlight.Order { get; set; }
+		IEnumerable<string> IHighlight.PostTags { get; set; }
+
+		IEnumerable<string> IHighlight.PreTags { get; set; }
+		bool? IHighlight.RequireFieldMatch { get; set; }
+		HighlighterTagsSchema? IHighlight.TagsSchema { get; set; }
 
 		// <inheritdoc/>
 		public HighlightDescriptor<T> Fields(params Func<HighlightFieldDescriptor<T>, IHighlightField>[] fieldHighlighters) =>
@@ -218,10 +234,10 @@ public HighlightDescriptor<T> Fields(params Func<HighlightFieldDescriptor<T>, IH
 		public HighlightDescriptor<T> TagsSchema(HighlighterTagsSchema? schema) => Assign(a => a.TagsSchema = schema);
 
 		// <inheritdoc/>
-		public HighlightDescriptor<T> PreTags(string preTags) => this.PreTags(new[] {preTags});
+		public HighlightDescriptor<T> PreTags(string preTags) => PreTags(new[] { preTags });
 
 		// <inheritdoc/>
-		public HighlightDescriptor<T> PostTags(string postTags) => this.PostTags(new[] {postTags});
+		public HighlightDescriptor<T> PostTags(string postTags) => PostTags(new[] { postTags });
 
 		// <inheritdoc/>
 		public HighlightDescriptor<T> PreTags(IEnumerable<string> preTags) => Assign(a => a.PreTags = preTags.ToListOrNullIfEmpty());
diff --git a/src/Nest/Search/Search/Highlighting/HighlightDocumentDictionary.cs b/src/Nest/Search/Search/Highlighting/HighlightDocumentDictionary.cs
index bf6c3a0b04e..79391cfdc81 100644
--- a/src/Nest/Search/Search/Highlighting/HighlightDocumentDictionary.cs
+++ b/src/Nest/Search/Search/Highlighting/HighlightDocumentDictionary.cs
@@ -9,10 +9,8 @@ public class HighlightFieldDictionary : Dictionary<string, HighlightHit>
 		public HighlightFieldDictionary(IDictionary<string, HighlightHit> dictionary = null)
 		{
 			if (dictionary == null) return;
-			foreach(var kv in dictionary)
-			{
-				this.Add(kv.Key, kv.Value);
-			}
+
+			foreach (var kv in dictionary) Add(kv.Key, kv.Value);
 		}
 	}
 }
diff --git a/src/Nest/Search/Search/Highlighting/HighlightField.cs b/src/Nest/Search/Search/Highlighting/HighlightField.cs
index ce2b1c25818..6a368a104ed 100644
--- a/src/Nest/Search/Search/Highlighting/HighlightField.cs
+++ b/src/Nest/Search/Search/Highlighting/HighlightField.cs
@@ -9,6 +9,32 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<HighlightField>))]
 	public interface IHighlightField
 	{
+		/// <summary>
+		/// Defines what constitutes a boundary for highlighting when using the fast vector highlighter.
+		/// It's a single string with each boundary character defined in it. It defaults to .,!? \t\n.
+		/// </summary>
+		[JsonProperty("boundary_chars")]
+		string BoundaryChars { get; set; }
+
+		/// <summary>
+		/// Controls how far to look for boundary characters. Defaults to 20.
+		/// </summary>
+		[JsonProperty("boundary_max_scan")]
+		int? BoundaryMaxScan { get; set; }
+
+		/// <summary>
+		/// When highlighting a field using the unified highlighter or the fast vector highlighter, you can specify how to break the highlighted
+		/// fragments using boundary_scanner
+		/// </summary>
+		[JsonProperty("boundary_scanner")]
+		BoundaryScanner? BoundaryScanner { get; set; }
+
+		/// <summary>
+		/// You can further specify boundary_scanner_locale to control which Locale is used to search the text for these boundaries.
+		/// </summary>
+		[JsonProperty("boundary_scanner_locale")]
+		string BoundaryScannerLocale { get; set; }
+
 		/// <summary>
 		/// The field on which to perform highlighting.
 		/// </summary>
@@ -20,20 +46,23 @@ public interface IHighlightField
 		Field Field { get; set; }
 
 		/// <summary>
-		/// Controls the pre tag in which to wrap highights.
-		/// By default, the highlighting will wrap highlighted text in &lt;em&gt; and &lt;/em&gt;.
-		/// Using the fast vector highlighter, there can be more tags, and the importance is ordered.
+		/// Forces the highlighting to highlight fields based on the source even if fields are stored separately.
 		/// </summary>
-		[JsonProperty("pre_tags")]
-		IEnumerable<string> PreTags { get; set; }
+		[JsonProperty("force_source")]
+		bool? ForceSource { get; set; }
 
 		/// <summary>
-		/// Controls the post tag in which to wrap highights.
-		/// By default, the highlighting will wrap highlighted text in &lt;em&gt; and &lt;/em&gt;.
-		/// Using the fast vector highlighter, there can be more tags, and the importance is ordered.
+		/// Fragmenter can control how text should be broken up in highlight snippets. However, this option is
+		/// applicable only for the Plain Highlighter
 		/// </summary>
-		[JsonProperty("post_tags")]
-		IEnumerable<string> PostTags { get; set; }
+		[JsonProperty("fragmenter")]
+		HighlighterFragmenter? Fragmenter { get; set; }
+
+		/// <summary>
+		/// Controls the margin to start highlighting from when using the fast vector highlighter
+		/// </summary>
+		[JsonProperty("fragment_offset")]
+		int? FragmentOffset { get; set; }
 
 		/// <summary>
 		/// The size of the highlighted fragment, in characters. Defaults to 100
@@ -41,6 +70,24 @@ public interface IHighlightField
 		[JsonProperty("fragment_size")]
 		int? FragmentSize { get; set; }
 
+		/// <summary>
+		/// The query to use for highlighting
+		/// </summary>
+		[JsonProperty("highlight_query")]
+		QueryContainer HighlightQuery { get; set; }
+
+		/// <summary>
+		/// Combine matches on multiple fields to highlight a single field when using the fast vector highighter.
+		/// This is most intuitive for multifields that analyze the same string in different ways.
+		/// All matched fields must have term_vector set to with_positions_offsets, but only the field to
+		/// which the matches are combined is loaded so only that field would benefit from having store set to yes.
+		/// </summary>
+		[JsonProperty("matched_fields")]
+		Fields MatchedFields { get; set; }
+
+		[JsonProperty("max_fragment_length")]
+		int? MaxFragmentLength { get; set; }
+
 		/// <summary>
 		/// The length of a snippet of text from the beginning of the field to return
 		/// when no match for highlighting is found. Default behaviour is to not return anything when a match is not found.
@@ -56,22 +103,42 @@ public interface IHighlightField
 		int? NumberOfFragments { get; set; }
 
 		/// <summary>
-		/// Controls the margin to start highlighting from when using the fast vector highlighter
+		/// The order in which highlighted fragments are sorted. Only valid for the unified highlighter.
 		/// </summary>
-		[JsonProperty("fragment_offset")]
-		int? FragmentOffset { get; set; }
+		[JsonProperty("order")]
+		HighlighterOrder? Order { get; set; }
 
 		/// <summary>
-		/// Controls how far to look for boundary characters. Defaults to 20.
+		/// Controls the number of matching phrases in a document that are considered. Prevents the
+		/// <see cref="HighlighterType.Fvh" /> highlighter from analyzing too many phrases and consuming too much memory.
+		/// When using matched_fields, <see cref="PhraseLimit" /> phrases per matched field are considered. Raising the limit increases query time
+		/// and consumes more memory. Only supported by the <see cref="HighlighterType.Fvh" /> highlighter. Defaults to 256.
 		/// </summary>
-		[JsonProperty("boundary_max_scan")]
-		int? BoundaryMaxScan { get; set; }
+		[JsonProperty("phrase_limit")]
+		int? PhraseLimit { get; set; }
 
 		/// <summary>
-		/// The order in which highlighted fragments are sorted. Only valid for the unified highlighter.
+		/// Controls the post tag in which to wrap highights.
+		/// By default, the highlighting will wrap highlighted text in &lt;em&gt; and &lt;/em&gt;.
+		/// Using the fast vector highlighter, there can be more tags, and the importance is ordered.
 		/// </summary>
-		[JsonProperty("order")]
-		HighlighterOrder? Order { get; set; }
+		[JsonProperty("post_tags")]
+		IEnumerable<string> PostTags { get; set; }
+
+		/// <summary>
+		/// Controls the pre tag in which to wrap highights.
+		/// By default, the highlighting will wrap highlighted text in &lt;em&gt; and &lt;/em&gt;.
+		/// Using the fast vector highlighter, there can be more tags, and the importance is ordered.
+		/// </summary>
+		[JsonProperty("pre_tags")]
+		IEnumerable<string> PreTags { get; set; }
+
+		/// <summary>
+		/// Determines if only fields that hold a query match will be highlighted. Set to <c>false</c>
+		/// will cause any field to be highlighted regardless of whether the query matched specifically on them. Default behaviour is <c>true</c>.
+		/// </summary>
+		[JsonProperty("require_field_match")]
+		bool? RequireFieldMatch { get; set; }
 
 		/// <summary>
 		/// Use a specific "tag" schemas.
@@ -87,228 +154,181 @@ public interface IHighlightField
 		HighlighterTagsSchema? TagsSchema { get; set; }
 
 		/// <summary>
-		/// Determines if only fields that hold a query match will be highlighted. Set to <c>false</c>
-		/// will cause any field to be highlighted regardless of whether the query matched specifically on them. Default behaviour is <c>true</c>.
+		/// The type of highlighter to use. Can be a defined or custom highlighter
 		/// </summary>
-		[JsonProperty("require_field_match")]
-		bool? RequireFieldMatch { get; set; }
+		[JsonProperty("type")]
+		Union<HighlighterType, string> Type { get; set; }
+	}
 
-		/// <summary>
-		/// Defines what constitutes a boundary for highlighting when using the fast vector highlighter.
-		/// It's a single string with each boundary character defined in it. It defaults to .,!? \t\n.
-		/// </summary>
-		[JsonProperty("boundary_chars")]
-		string BoundaryChars { get; set; }
+	public class HighlightField : IHighlightField
+	{
+		/// <inheritdoc />
+		public string BoundaryChars { get; set; }
 
-		[JsonProperty("max_fragment_length")]
-		int? MaxFragmentLength { get; set; }
+		/// <inheritdoc />
+		public int? BoundaryMaxScan { get; set; }
 
-		/// <summary>
-		/// When highlighting a field using the unified highlighter or the fast vector highlighter, you can specify how to break the highlighted
-		/// fragments using boundary_scanner
-		/// </summary>
-		[JsonProperty("boundary_scanner")]
-		BoundaryScanner? BoundaryScanner { get; set; }
+		/// <inheritdoc />
+		public BoundaryScanner? BoundaryScanner { get; set; }
 
-		/// <summary>
-		///You can further specify boundary_scanner_locale to control which Locale is used to search the text for these boundaries.
-		/// </summary>
-		[JsonProperty("boundary_scanner_locale")]
-		string BoundaryScannerLocale { get; set; }
+		/// <inheritdoc />
+		public string BoundaryScannerLocale { get; set; }
 
-		/// <summary>
-		/// Fragmenter can control how text should be broken up in highlight snippets. However, this option is
-		/// applicable only for the Plain Highlighter
-		/// </summary>
-		[JsonProperty("fragmenter")]
-		HighlighterFragmenter? Fragmenter { get; set; }
+		/// <inheritdoc />
+		public Field Field { get; set; }
 
-		/// <summary>
-		/// The type of highlighter to use. Can be a defined or custom highlighter
-		/// </summary>
-		[JsonProperty("type")]
-		Union<HighlighterType, string> Type { get; set; }
+		/// <inheritdoc />
+		public bool? ForceSource { get; set; }
 
-		/// <summary>
-		/// Forces the highlighting to highlight fields based on the source even if fields are stored separately.
-		/// </summary>
-		[JsonProperty("force_source")]
-		bool? ForceSource { get; set; }
+		/// <inheritdoc />
+		public HighlighterFragmenter? Fragmenter { get; set; }
 
-		/// <summary>
-		/// Combine matches on multiple fields to highlight a single field when using the fast vector highighter.
-		/// This is most intuitive for multifields that analyze the same string in different ways.
-		/// All matched fields must have term_vector set to with_positions_offsets, but only the field to
-		/// which the matches are combined is loaded so only that field would benefit from having store set to yes.
-		/// </summary>
-		[JsonProperty("matched_fields")]
-		Fields MatchedFields { get; set; }
+		/// <inheritdoc />
+		public int? FragmentOffset { get; set; }
 
-		/// <summary>
-		/// The query to use for highlighting
-		/// </summary>
-		[JsonProperty("highlight_query")]
-		QueryContainer HighlightQuery { get; set; }
+		/// <inheritdoc />
+		public int? FragmentSize { get; set; }
 
-		/// <summary>
-		/// Controls the number of matching phrases in a document that are considered. Prevents the
-		/// <see cref="HighlighterType.Fvh"/> highlighter from analyzing too many phrases and consuming too much memory.
-		/// When using matched_fields, <see cref="PhraseLimit"/> phrases per matched field are considered. Raising the limit increases query time
-		/// and consumes more memory. Only supported by the <see cref="HighlighterType.Fvh"/> highlighter. Defaults to 256.
-		/// </summary>
-		[JsonProperty("phrase_limit")]
-		int? PhraseLimit { get; set; }
-	}
+		/// <inheritdoc />
+		public QueryContainer HighlightQuery { get; set; }
 
-	public class HighlightField : IHighlightField
-	{
-		/// <inheritdoc/>
-		public Field Field { get; set; }
-		/// <inheritdoc/>
-		public IEnumerable<string> PreTags { get; set; }
-		/// <inheritdoc/>
-		public IEnumerable<string> PostTags { get; set; }
-		/// <inheritdoc/>
-		public int? FragmentSize { get; set; }
-		/// <inheritdoc/>
+		/// <inheritdoc />
+		public Fields MatchedFields { get; set; }
+
+		/// <inheritdoc />
+		public int? MaxFragmentLength { get; set; }
+
+		/// <inheritdoc />
 		public int? NoMatchSize { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public int? NumberOfFragments { get; set; }
-		/// <inheritdoc/>
-		public int? FragmentOffset { get; set; }
-		/// <inheritdoc/>
-		public int? BoundaryMaxScan { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
 		public HighlighterOrder? Order { get; set; }
-		/// <inheritdoc/>
-		public HighlighterTagsSchema? TagsSchema { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public int? PhraseLimit { get; set; }
+
+		/// <inheritdoc />
+		public IEnumerable<string> PostTags { get; set; }
+
+		/// <inheritdoc />
+		public IEnumerable<string> PreTags { get; set; }
+
+		/// <inheritdoc />
 		public bool? RequireFieldMatch { get; set; }
-		/// <inheritdoc/>
-		public string BoundaryChars { get; set; }
-		/// <inheritdoc/>
-		public int? MaxFragmentLength { get; set; }
-		/// <inheritdoc/>
-		public BoundaryScanner? BoundaryScanner { get; set; }
-		/// <inheritdoc/>
-		public string BoundaryScannerLocale { get; set; }
-		/// <inheritdoc/>
-		public HighlighterFragmenter? Fragmenter { get; set; }
-		/// <inheritdoc/>
+
+		/// <inheritdoc />
+		public HighlighterTagsSchema? TagsSchema { get; set; }
+
+		/// <inheritdoc />
 		public Union<HighlighterType, string> Type { get; set; }
-		/// <inheritdoc/>
-		public bool? ForceSource { get; set; }
-		/// <inheritdoc/>
-		public Fields MatchedFields { get; set; }
-		/// <inheritdoc/>
-		public QueryContainer HighlightQuery { get; set; }
-		/// <inheritdoc/>
-		public int? PhraseLimit { get; set; }
 	}
 
-	public class HighlightFieldDescriptor<T> : DescriptorBase<HighlightFieldDescriptor<T>,IHighlightField>, IHighlightField
+	public class HighlightFieldDescriptor<T> : DescriptorBase<HighlightFieldDescriptor<T>, IHighlightField>, IHighlightField
 		where T : class
 	{
+		string IHighlightField.BoundaryChars { get; set; }
+		int? IHighlightField.BoundaryMaxScan { get; set; }
+		BoundaryScanner? IHighlightField.BoundaryScanner { get; set; }
+		string IHighlightField.BoundaryScannerLocale { get; set; }
 		Field IHighlightField.Field { get; set; }
-		IEnumerable<string> IHighlightField.PreTags { get; set; }
-		IEnumerable<string> IHighlightField.PostTags { get; set; }
+		bool? IHighlightField.ForceSource { get; set; }
+		HighlighterFragmenter? IHighlightField.Fragmenter { get; set; }
+		int? IHighlightField.FragmentOffset { get; set; }
 		int? IHighlightField.FragmentSize { get; set; }
+		QueryContainer IHighlightField.HighlightQuery { get; set; }
+		Fields IHighlightField.MatchedFields { get; set; }
+		int? IHighlightField.MaxFragmentLength { get; set; }
 		int? IHighlightField.NoMatchSize { get; set; }
 		int? IHighlightField.NumberOfFragments { get; set; }
-		int? IHighlightField.FragmentOffset { get; set; }
-		int? IHighlightField.BoundaryMaxScan { get; set; }
 		HighlighterOrder? IHighlightField.Order { get; set; }
-		HighlighterTagsSchema? IHighlightField.TagsSchema { get; set; }
+		int? IHighlightField.PhraseLimit { get; set; }
+		IEnumerable<string> IHighlightField.PostTags { get; set; }
+		IEnumerable<string> IHighlightField.PreTags { get; set; }
 		bool? IHighlightField.RequireFieldMatch { get; set; }
-		string IHighlightField.BoundaryChars { get; set; }
-		int? IHighlightField.MaxFragmentLength { get; set; }
-		BoundaryScanner? IHighlightField.BoundaryScanner { get; set; }
-		string IHighlightField.BoundaryScannerLocale { get; set; }
-		HighlighterFragmenter? IHighlightField.Fragmenter { get; set; }
+		HighlighterTagsSchema? IHighlightField.TagsSchema { get; set; }
 		Union<HighlighterType, string> IHighlightField.Type { get; set; }
-		bool? IHighlightField.ForceSource { get; set; }
-		Fields IHighlightField.MatchedFields { get; set; }
-		QueryContainer IHighlightField.HighlightQuery { get; set; }
-		int? IHighlightField.PhraseLimit { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc/>
-		public HighlightFieldDescriptor<T> AllField() => this.Field("_all");
+		/// <inheritdoc />
+		public HighlightFieldDescriptor<T> AllField() => Field("_all");
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> TagsSchema(HighlighterTagsSchema? schema) => Assign(a => a.TagsSchema = schema);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> ForceSource(bool? force = true) => Assign(a => a.ForceSource = force);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> Type(HighlighterType type) => Assign(a => a.Type = type);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> Type(string type) => Assign(a => a.Type = type);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> PreTags(params string[] preTags) => Assign(a => a.PreTags = preTags);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> PostTags(params string[] postTags) => Assign(a => a.PostTags = postTags);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> PreTags(IEnumerable<string> preTags) => Assign(a => a.PreTags = preTags);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> PostTags(IEnumerable<string> postTags) => Assign(a => a.PostTags = postTags);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> FragmentSize(int? fragmentSize) => Assign(a => a.FragmentSize = fragmentSize);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> NoMatchSize(int? noMatchSize) => Assign(a => a.NoMatchSize = noMatchSize);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> NumberOfFragments(int? numberOfFragments) => Assign(a => a.NumberOfFragments = numberOfFragments);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> FragmentOffset(int? fragmentOffset) => Assign(a => a.FragmentOffset = fragmentOffset);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> Order(HighlighterOrder? order) => Assign(a => a.Order = order);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> RequireFieldMatch(bool? requireFieldMatch = true) => Assign(a => a.RequireFieldMatch = requireFieldMatch);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> BoundaryCharacters(string boundaryCharacters) => Assign(a => a.BoundaryChars = boundaryCharacters);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> BoundaryMaxScan(int? boundaryMaxSize) => Assign(a => a.BoundaryMaxScan = boundaryMaxSize);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> MatchedFields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.MatchedFields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> HighlightQuery(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) =>
 			Assign(a => a.HighlightQuery = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> MaxFragmentLength(int? maxFragmentLength) => Assign(a => a.MaxFragmentLength = maxFragmentLength);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> BoundaryScanner(BoundaryScanner? boundaryScanner) => Assign(a => a.BoundaryScanner = boundaryScanner);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> BoundaryScannerLocale(string locale) => Assign(a => a.BoundaryScannerLocale = locale);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> Fragmenter(HighlighterFragmenter? fragmenter) => Assign(a => a.Fragmenter = fragmenter);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public HighlightFieldDescriptor<T> PhraseLimit(int? phraseLimit) => Assign(a => a.PhraseLimit = phraseLimit);
 	}
 }
diff --git a/src/Nest/Search/Search/Highlighting/HighlightHit.cs b/src/Nest/Search/Search/Highlighting/HighlightHit.cs
index 886e5d34bb9..29398ff8623 100644
--- a/src/Nest/Search/Search/Highlighting/HighlightHit.cs
+++ b/src/Nest/Search/Search/Highlighting/HighlightHit.cs
@@ -6,6 +6,7 @@ public class HighlightHit
 	{
 		public string DocumentId { get; internal set; }
 		public string Field { get; internal set; }
+
 		public IReadOnlyCollection<string> Highlights { get; internal set; } =
 			EmptyReadOnly<string>.Collection;
 	}
diff --git a/src/Nest/Search/Search/Highlighting/HighlighterEncoder.cs b/src/Nest/Search/Search/Highlighting/HighlighterEncoder.cs
index 560a3dd0527..73e6e2912e8 100644
--- a/src/Nest/Search/Search/Highlighting/HighlighterEncoder.cs
+++ b/src/Nest/Search/Search/Highlighting/HighlighterEncoder.cs
@@ -15,6 +15,7 @@ public enum HighlighterEncoder
 		/// </summary>
 		[EnumMember(Value = "default")]
 		Default,
+
 		/// <summary>
 		/// Escapes HTML highlighting tags
 		/// </summary>
diff --git a/src/Nest/Search/Search/Highlighting/HighlighterFragmenter.cs b/src/Nest/Search/Search/Highlighting/HighlighterFragmenter.cs
index 358943e662f..ed07ff2db12 100644
--- a/src/Nest/Search/Search/Highlighting/HighlighterFragmenter.cs
+++ b/src/Nest/Search/Search/Highlighting/HighlighterFragmenter.cs
@@ -16,6 +16,7 @@ public enum HighlighterFragmenter
 		/// </summary>
 		[EnumMember(Value = "simple")]
 		Simple,
+
 		/// <summary>
 		/// Same as the simple fragmenter, but tries not to break up text between highlighted terms (this is applicable
 		/// when using phrase like queries). This is the default.
diff --git a/src/Nest/Search/Search/Highlighting/HighlighterOrder.cs b/src/Nest/Search/Search/Highlighting/HighlighterOrder.cs
index 1e1dbed79bd..e345e2db3bd 100644
--- a/src/Nest/Search/Search/Highlighting/HighlighterOrder.cs
+++ b/src/Nest/Search/Search/Highlighting/HighlighterOrder.cs
@@ -11,7 +11,7 @@ namespace Nest
 	public enum HighlighterOrder
 	{
 		/// <summary>
-		/// Sorts highlighted fragments by score. Only valid for the <see cref="HighlighterType.Unified"/> highligher
+		/// Sorts highlighted fragments by score. Only valid for the <see cref="HighlighterType.Unified" /> highligher
 		/// </remarks>
 		[EnumMember(Value = "score")]
 		Score
diff --git a/src/Nest/Search/Search/Hits/Hit.cs b/src/Nest/Search/Search/Hits/Hit.cs
index 4e663ba2b1a..143d5c49a95 100644
--- a/src/Nest/Search/Search/Hits/Hit.cs
+++ b/src/Nest/Search/Search/Hits/Hit.cs
@@ -7,15 +7,19 @@ namespace Nest
 {
 	public interface IHitMetadata<out TDocument> where TDocument : class
 	{
-		string Index { get; }
-		string Type { get; }
-		long? Version { get; }
-		string Routing { get; }
 		string Id { get; }
+		string Index { get; }
+
 		[Obsolete("No longer returned on indexes created in Elasticsearch 6.x and up, use Routing instead")]
 		string Parent { get; }
+
+		string Routing { get; }
+
 		[JsonConverter(typeof(SourceConverter))]
 		TDocument Source { get; }
+
+		string Type { get; }
+		long? Version { get; }
 	}
 
 	internal static class HitMetadataConversionExtensions
@@ -41,24 +45,48 @@ public static IHitMetadata<TTarget> Copy<TDocument, TTarget>(this IHitMetadata<T
 	[ReadAs(typeof(Hit<>))]
 	public interface IHit<out TDocument> : IHitMetadata<TDocument> where TDocument : class
 	{
-		//search/get related features on hits
-		double? Score { get; }
+		Explanation Explanation { get; }
 		FieldValues Fields { get; }
-		IReadOnlyCollection<object> Sorts { get; }
 		HighlightFieldDictionary Highlights { get; }
-		Explanation Explanation { get; }
-		IReadOnlyCollection<string> MatchedQueries { get; }
 		IReadOnlyDictionary<string, InnerHitsResult> InnerHits { get; }
+
+		IReadOnlyCollection<string> MatchedQueries { get; }
+
+		//search/get related features on hits
+		double? Score { get; }
+		IReadOnlyCollection<object> Sorts { get; }
 	}
 
 	[JsonObject]
 	public class Hit<TDocument> : IHit<TDocument> where TDocument : class
 	{
+		[JsonProperty("_explanation")]
+		public Explanation Explanation { get; internal set; }
+
 		[JsonProperty("fields")]
 		public FieldValues Fields { get; internal set; }
 
-		[JsonProperty("_source")]
-		public TDocument Source { get; internal set; }
+		public HighlightFieldDictionary Highlights
+		{
+			get
+			{
+				if (_Highlight == null)
+					return new HighlightFieldDictionary();
+
+				var highlights = _Highlight.Select(kv => new HighlightHit
+					{
+						DocumentId = Id,
+						Field = kv.Key,
+						Highlights = kv.Value
+					})
+					.ToDictionary(k => k.Field, v => v);
+
+				return new HighlightFieldDictionary(highlights);
+			}
+		}
+
+		[JsonProperty("_id")]
+		public string Id { get; internal set; }
 
 		[JsonProperty("_index")]
 		public string Index { get; internal set; }
@@ -68,17 +96,8 @@ public class Hit<TDocument> : IHit<TDocument> where TDocument : class
 		public IReadOnlyDictionary<string, InnerHitsResult> InnerHits { get; internal set; } =
 			EmptyReadOnly<string, InnerHitsResult>.Dictionary;
 
-		[JsonProperty("_score")]
-		public double? Score { get; set; }
-
-		[JsonProperty("_type")]
-		public string Type { get; internal set; }
-
-		[JsonProperty("_version")]
-		public long? Version { get; internal set; }
-
-		[JsonProperty("_id")]
-		public string Id { get; internal set; }
+		[JsonProperty("matched_queries")]
+		public IReadOnlyCollection<string> MatchedQueries { get; internal set; } = EmptyReadOnly<string>.Collection;
 
 		[JsonProperty("_nested")]
 		public NestedIdentity Nested { get; internal set; }
@@ -90,35 +109,23 @@ public class Hit<TDocument> : IHit<TDocument> where TDocument : class
 		[JsonProperty("_routing")]
 		public string Routing { get; internal set; }
 
+		[JsonProperty("_score")]
+		public double? Score { get; set; }
+
 		[JsonProperty("sort")]
 		public IReadOnlyCollection<object> Sorts { get; internal set; } = EmptyReadOnly<object>.Collection;
 
-		[JsonProperty("highlight")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, List<string>>))]
-		internal Dictionary<string, List<string>> _Highlight { get; set; }
-
-		public HighlightFieldDictionary Highlights
-		{
-			get
-			{
-				if (_Highlight == null)
-					return new HighlightFieldDictionary();
-
-				var highlights = _Highlight.Select(kv => new HighlightHit
-				{
-					DocumentId = this.Id,
-					Field = kv.Key,
-					Highlights = kv.Value
-				}).ToDictionary(k => k.Field, v => v);
+		[JsonProperty("_source")]
+		public TDocument Source { get; internal set; }
 
-				return new HighlightFieldDictionary(highlights);
-			}
-		}
+		[JsonProperty("_type")]
+		public string Type { get; internal set; }
 
-		[JsonProperty("_explanation")]
-		public Explanation Explanation { get; internal set; }
+		[JsonProperty("_version")]
+		public long? Version { get; internal set; }
 
-		[JsonProperty("matched_queries")]
-		public IReadOnlyCollection<string> MatchedQueries { get; internal set; } = EmptyReadOnly<string>.Collection;
+		[JsonProperty("highlight")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, List<string>>))]
+		internal Dictionary<string, List<string>> _Highlight { get; set; }
 	}
 }
diff --git a/src/Nest/Search/Search/Hits/HitsMetaData.cs b/src/Nest/Search/Search/Hits/HitsMetaData.cs
index 152dfb2b7b4..ed7ae67e1b1 100644
--- a/src/Nest/Search/Search/Hits/HitsMetaData.cs
+++ b/src/Nest/Search/Search/Hits/HitsMetaData.cs
@@ -6,15 +6,13 @@ namespace Nest
 	[JsonObject]
 	public class HitsMetadata<T> where T : class
 	{
-		[JsonProperty("total")]
-		public long Total { get; internal set; }
-
-		[JsonProperty("max_score")]
-		public double MaxScore { get; internal set; }
-
 		[JsonProperty("hits")]
 		public IReadOnlyCollection<IHit<T>> Hits { get; internal set; } = EmptyReadOnly<IHit<T>>.Collection;
 
+		[JsonProperty("max_score")]
+		public double MaxScore { get; internal set; }
 
+		[JsonProperty("total")]
+		public long Total { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Search/Hits/InnerHitsMetaData.cs b/src/Nest/Search/Search/Hits/InnerHitsMetaData.cs
index a5cc0357a07..0506ca4f728 100644
--- a/src/Nest/Search/Search/Hits/InnerHitsMetaData.cs
+++ b/src/Nest/Search/Search/Hits/InnerHitsMetaData.cs
@@ -6,20 +6,21 @@ namespace Nest
 {
 	public class InnerHitsMetadata
 	{
-		[JsonProperty("total")]
-		public long Total { get; internal set; }
+		[JsonProperty("hits")]
+		public List<Hit<ILazyDocument>> Hits { get; internal set; }
 
 		[JsonProperty("max_score")]
 		public double? MaxScore { get; internal set; }
 
-		[JsonProperty("hits")]
-		public List<Hit<ILazyDocument>> Hits { get; internal set; }
+		[JsonProperty("total")]
+		public long Total { get; internal set; }
 
 		public IEnumerable<T> Documents<T>() where T : class
 		{
-			if (this.Hits == null || !this.Hits.HasAny())
+			if (Hits == null || !Hits.HasAny())
 				return Enumerable.Empty<T>();
-			return this.Hits.Select(hit => hit.Source.As<T>()).ToList();
+
+			return Hits.Select(hit => hit.Source.As<T>()).ToList();
 		}
 	}
 }
diff --git a/src/Nest/Search/Search/Hits/InnerHitsResult.cs b/src/Nest/Search/Search/Hits/InnerHitsResult.cs
index ae5da3d3a94..c90a1bcae9b 100644
--- a/src/Nest/Search/Search/Hits/InnerHitsResult.cs
+++ b/src/Nest/Search/Search/Hits/InnerHitsResult.cs
@@ -10,11 +10,11 @@ public class InnerHitsResult
 		public InnerHitsMetadata Hits { get; internal set; }
 
 		/// <summary>
-		/// Retrieve <see cref="Hits"/> documents as a strongly typed
+		/// Retrieve <see cref="Hits" /> documents as a strongly typed
 		/// collection
 		/// </summary>
 		/// <typeparam name="T">The hits document type</typeparam>
 		public IEnumerable<T> Documents<T>() where T : class =>
-			this.Hits == null ? Enumerable.Empty<T>() : this.Hits.Documents<T>();
+			Hits == null ? Enumerable.Empty<T>() : Hits.Documents<T>();
 	}
 }
diff --git a/src/Nest/Search/Search/Hits/NestedIdentity.cs b/src/Nest/Search/Search/Hits/NestedIdentity.cs
index f4ae0bbae6a..9507e4228d1 100644
--- a/src/Nest/Search/Search/Hits/NestedIdentity.cs
+++ b/src/Nest/Search/Search/Hits/NestedIdentity.cs
@@ -8,10 +8,10 @@ public class NestedIdentity
 		[JsonProperty("field")]
 		public Field Field { get; internal set; }
 
-		[JsonProperty("offset")]
-		public int Offset { get; internal set; }
-
 		[JsonProperty("_nested")]
 		public NestedIdentity Nested { get; internal set; }
+
+		[JsonProperty("offset")]
+		public int Offset { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Search/Search/InnerHits/InnerHits.cs b/src/Nest/Search/Search/InnerHits/InnerHits.cs
index 527894aedbf..4bf1d5f1db3 100644
--- a/src/Nest/Search/Search/InnerHits/InnerHits.cs
+++ b/src/Nest/Search/Search/InnerHits/InnerHits.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -9,89 +7,88 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<InnerHits>))]
 	public interface IInnerHits
 	{
-		[JsonProperty("name")]
-		string Name { get; set; }
+		/// <summary>
+		/// Provides a second level of collapsing, NOTE: Elasticsearch only supports collapsing up to two levels.
+		/// </summary>
+		[JsonProperty("collapse")]
+		IFieldCollapse Collapse { get; set; }
+
+		[JsonProperty("docvalue_fields")]
+		Fields DocValueFields { get; set; }
+
+		[JsonProperty("explain")]
+		bool? Explain { get; set; }
 
 		[JsonProperty("from")]
 		int? From { get; set; }
 
+		[JsonProperty("highlight")]
+		IHighlight Highlight { get; set; }
+
+		[JsonProperty("ignore_unmapped")]
+		bool? IgnoreUnmapped { get; set; }
+
+		[JsonProperty("name")]
+		string Name { get; set; }
+
+		[JsonProperty("script_fields")]
+		IScriptFields ScriptFields { get; set; }
+
 		[JsonProperty("size")]
 		int? Size { get; set; }
 
 		[JsonProperty("sort")]
 		IList<ISort> Sort { get; set; }
 
-		[JsonProperty("highlight")]
-		IHighlight Highlight { get; set; }
-
-		[JsonProperty("explain")]
-		bool? Explain { get; set; }
-
 		[JsonProperty("_source")]
 		Union<bool, ISourceFilter> Source { get; set; }
 
 		[JsonProperty("version")]
 		bool? Version { get; set; }
-
-		[JsonProperty("script_fields")]
-		IScriptFields ScriptFields { get; set; }
-
-		[JsonProperty("docvalue_fields")]
-		Fields DocValueFields { get; set; }
-
-		[JsonProperty("ignore_unmapped")]
-		bool? IgnoreUnmapped { get; set; }
-
-		/// <summary>
-		/// Provides a second level of collapsing, NOTE: Elasticsearch only supports collapsing up to two levels.
-		/// </summary>
-		[JsonProperty("collapse")]
-		IFieldCollapse Collapse { get; set; }
 	}
 
 	public class InnerHits : IInnerHits
 	{
-		public string Name { get; set; }
+		/// <inheritdoc cref="IInnerHits.Collapse" />
+		public IFieldCollapse Collapse { get; set; }
 
-		public int? From { get; set; }
+		public Fields DocValueFields { get; set; }
 
-		public int? Size { get; set; }
+		public bool? Explain { get; set; }
 
-		public IList<ISort> Sort { get; set; }
+		public int? From { get; set; }
 
 		public IHighlight Highlight { get; set; }
 
-		public bool? Explain { get; set; }
-
-		public Union<bool, ISourceFilter> Source { get; set; }
-
-		public bool? Version { get; set; }
+		public bool? IgnoreUnmapped { get; set; }
+		public string Name { get; set; }
 
 		public IScriptFields ScriptFields { get; set; }
 
-		public Fields DocValueFields { get; set; }
+		public int? Size { get; set; }
 
-		public bool? IgnoreUnmapped { get; set; }
+		public IList<ISort> Sort { get; set; }
 
-		/// <inheritdoc cref="IInnerHits.Collapse"/>
-		public IFieldCollapse Collapse { get; set; }
+		public Union<bool, ISourceFilter> Source { get; set; }
+
+		public bool? Version { get; set; }
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public class InnerHitsDescriptor<T> : DescriptorBase<InnerHitsDescriptor<T>, IInnerHits>, IInnerHits where T : class
 	{
-		string IInnerHits.Name { get; set; }
+		IFieldCollapse IInnerHits.Collapse { get; set; }
+		Fields IInnerHits.DocValueFields { get; set; }
+		bool? IInnerHits.Explain { get; set; }
 		int? IInnerHits.From { get; set; }
+		IHighlight IInnerHits.Highlight { get; set; }
+		bool? IInnerHits.IgnoreUnmapped { get; set; }
+		string IInnerHits.Name { get; set; }
+		IScriptFields IInnerHits.ScriptFields { get; set; }
 		int? IInnerHits.Size { get; set; }
 		IList<ISort> IInnerHits.Sort { get; set; }
-		IHighlight IInnerHits.Highlight { get; set; }
-		bool? IInnerHits.Explain { get; set; }
 		Union<bool, ISourceFilter> IInnerHits.Source { get; set; }
 		bool? IInnerHits.Version { get; set; }
-		IScriptFields IInnerHits.ScriptFields { get; set; }
-		Fields IInnerHits.DocValueFields { get; set; }
-		bool? IInnerHits.IgnoreUnmapped { get; set; }
-		IFieldCollapse IInnerHits.Collapse { get; set; }
 
 		public InnerHitsDescriptor<T> From(int? from) => Assign(a => a.From = from);
 
@@ -103,7 +100,8 @@ public class InnerHitsDescriptor<T> : DescriptorBase<InnerHitsDescriptor<T>, IIn
 
 		public InnerHitsDescriptor<T> Version(bool? version = true) => Assign(a => a.Version = version);
 
-		public InnerHitsDescriptor<T> Sort(Func<SortDescriptor<T>, IPromise<IList<ISort>>> selector) => Assign(a => a.Sort = selector?.Invoke(new SortDescriptor<T>())?.Value);
+		public InnerHitsDescriptor<T> Sort(Func<SortDescriptor<T>, IPromise<IList<ISort>>> selector) =>
+			Assign(a => a.Sort = selector?.Invoke(new SortDescriptor<T>())?.Value);
 
 		/// <summary>
 		/// Allow to highlight search results on one or more fields. The implementation uses the either lucene fast-vector-highlighter or highlighter.
@@ -126,7 +124,7 @@ public InnerHitsDescriptor<T> DocValueFields(Func<FieldsDescriptor<T>, IPromise<
 
 		public InnerHitsDescriptor<T> IgnoreUnmapped(bool? ignoreUnmapped = true) => Assign(a => a.IgnoreUnmapped = ignoreUnmapped);
 
-		/// <inheritdoc cref="IInnerHits.Collapse"/>
+		/// <inheritdoc cref="IInnerHits.Collapse" />
 		public InnerHitsDescriptor<T> Collapse(Func<FieldCollapseDescriptor<T>, IFieldCollapse> collapseSelector) =>
 			Assign(a => a.Collapse = collapseSelector?.Invoke(new FieldCollapseDescriptor<T>()));
 	}
diff --git a/src/Nest/Search/Search/Profile/AggregationBreakdown.cs b/src/Nest/Search/Search/Profile/AggregationBreakdown.cs
index e8512cc8cbd..3b9658b0f58 100644
--- a/src/Nest/Search/Search/Profile/AggregationBreakdown.cs
+++ b/src/Nest/Search/Search/Profile/AggregationBreakdown.cs
@@ -1,32 +1,31 @@
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
 {
 	public class AggregationBreakdown
 	{
-		[JsonProperty("reduce")]
-		public long Reduce { get; internal set; }
-
 		[JsonProperty("build_aggregation")]
 		public long BuildAggregation { get; internal set; }
 
 		[JsonProperty("build_aggregation_count")]
 		public long BuildAggregationCount { get; internal set; }
 
+		[JsonProperty("collect")]
+		public long Collect { get; internal set; }
+
+		[JsonProperty("collect_count")]
+		public long CollectCount { get; internal set; }
+
 		[JsonProperty("initialize")]
 		public long Initialize { get; internal set; }
 
 		[JsonProperty("intialize_count")]
 		public long InitializeCount { get; internal set; }
 
+		[JsonProperty("reduce")]
+		public long Reduce { get; internal set; }
+
 		[JsonProperty("reduce_count")]
 		public long ReduceCount { get; internal set; }
-
-		[JsonProperty("collect")]
-		public long Collect { get; internal set; }
-
-		[JsonProperty("collect_count")]
-		public long CollectCount { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Search/Profile/AggregationProfile.cs b/src/Nest/Search/Search/Profile/AggregationProfile.cs
index e96f6b4c6a6..1734b29ff31 100644
--- a/src/Nest/Search/Search/Profile/AggregationProfile.cs
+++ b/src/Nest/Search/Search/Profile/AggregationProfile.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -6,10 +5,10 @@ namespace Nest
 	public class AggregationProfile
 	{
 		/// <summary>
-		/// The Elasticsearch aggregation type
+		/// Detailed stats about how the time was spent
 		/// </summary>
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
+		[JsonProperty("breakdown")]
+		public AggregationBreakdown Breakdown { get; internal set; }
 
 		/// <summary>
 		/// The user defined name of the aggregation
@@ -24,9 +23,9 @@ public class AggregationProfile
 		public long TimeInNanoseconds { get; internal set; }
 
 		/// <summary>
-		/// Detailed stats about how the time was spent
+		/// The Elasticsearch aggregation type
 		/// </summary>
-		[JsonProperty("breakdown")]
-		public AggregationBreakdown Breakdown { get; internal set; }
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Search/Profile/Collector.cs b/src/Nest/Search/Search/Profile/Collector.cs
index d529962b0c7..b23133729f6 100644
--- a/src/Nest/Search/Search/Profile/Collector.cs
+++ b/src/Nest/Search/Search/Profile/Collector.cs
@@ -5,6 +5,10 @@ namespace Nest
 {
 	public class Collector
 	{
+		[JsonProperty("children")]
+		public IReadOnlyCollection<Collector> Children { get; internal set; } =
+			EmptyReadOnly<Collector>.Collection;
+
 		[JsonProperty("name")]
 		public string Name { get; internal set; }
 
@@ -13,11 +17,5 @@ public class Collector
 
 		[JsonProperty("time_in_nanos")]
 		public long TimeInNanoseconds { get; internal set; }
-
-	[JsonProperty("children")]
-		public IReadOnlyCollection<Collector> Children { get; internal set; } =
-			EmptyReadOnly<Collector>.Collection;
-
-
 	}
 }
diff --git a/src/Nest/Search/Search/Profile/Profile.cs b/src/Nest/Search/Search/Profile/Profile.cs
index 972a4dcf94f..1936992f704 100644
--- a/src/Nest/Search/Search/Profile/Profile.cs
+++ b/src/Nest/Search/Search/Profile/Profile.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Search/Search/Profile/QueryBreakdown.cs b/src/Nest/Search/Search/Profile/QueryBreakdown.cs
index 8397cfafaf9..f06e8c054ce 100644
--- a/src/Nest/Search/Search/Profile/QueryBreakdown.cs
+++ b/src/Nest/Search/Search/Profile/QueryBreakdown.cs
@@ -4,22 +4,22 @@ namespace Nest
 {
 	public class QueryBreakdown
 	{
-		[JsonProperty("score")]
-		public long Score { get; internal set; }
-
-		[JsonProperty("next_doc")]
-		public long NextDoc { get; internal set; }
-
-		[JsonProperty("create_weight")]
-		public long CreateWeight { get; internal set; }
+		[JsonProperty("advance")]
+		public long Advance { get; internal set; }
 
 		[JsonProperty("build_scorer")]
 		public long BuildScorer { get; internal set; }
 
-		[JsonProperty("advance")]
-		public long Advance { get; internal set; }
+		[JsonProperty("create_weight")]
+		public long CreateWeight { get; internal set; }
 
 		[JsonProperty("match")]
 		public long Match { get; internal set; }
+
+		[JsonProperty("next_doc")]
+		public long NextDoc { get; internal set; }
+
+		[JsonProperty("score")]
+		public long Score { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Search/Profile/QueryProfile.cs b/src/Nest/Search/Search/Profile/QueryProfile.cs
index 7ba2141d4dc..aa83e18171b 100644
--- a/src/Nest/Search/Search/Profile/QueryProfile.cs
+++ b/src/Nest/Search/Search/Profile/QueryProfile.cs
@@ -6,10 +6,16 @@ namespace Nest
 	public class QueryProfile
 	{
 		/// <summary>
-		/// The lucene class name for the type of query
+		/// Detailed stats about how the time was spent
 		/// </summary>
-		[JsonProperty("type")]
-		public string Type { get; internal set; }
+		[JsonProperty("breakdown")]
+		public QueryBreakdown Breakdown { get; internal set; }
+
+		/// <summary>
+		/// Sub-queries of this query
+		/// </summary>
+		[JsonProperty("children")]
+		public IEnumerable<QueryProfile> Children { get; internal set; }
 
 		/// <summary>
 		/// The lucene explanation text for the query
@@ -24,15 +30,9 @@ public class QueryProfile
 		public long TimeInNanoseconds { get; internal set; }
 
 		/// <summary>
-		/// Detailed stats about how the time was spent
-		/// </summary>
-		[JsonProperty("breakdown")]
-		public QueryBreakdown Breakdown { get; internal set; }
-
-		/// <summary>
-		/// Sub-queries of this query
+		/// The lucene class name for the type of query
 		/// </summary>
-		[JsonProperty("children")]
-		public IEnumerable<QueryProfile> Children { get; internal set; }
+		[JsonProperty("type")]
+		public string Type { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Search/Profile/SearchProfile.cs b/src/Nest/Search/Search/Profile/SearchProfile.cs
index ed4aab38c54..c6d8f0cf51f 100644
--- a/src/Nest/Search/Search/Profile/SearchProfile.cs
+++ b/src/Nest/Search/Search/Profile/SearchProfile.cs
@@ -5,15 +5,15 @@ namespace Nest
 {
 	public class SearchProfile
 	{
-		[JsonProperty("rewrite_time")]
-		public long RewriteTime { get; internal set; }
+		[JsonProperty("collector")]
+		public IReadOnlyCollection<Collector> Collector { get; internal set; } =
+			EmptyReadOnly<Collector>.Collection;
 
 		[JsonProperty("query")]
 		public IReadOnlyCollection<QueryProfile> Query { get; internal set; } =
 			EmptyReadOnly<QueryProfile>.Collection;
 
-		[JsonProperty("collector")]
-		public IReadOnlyCollection<Collector> Collector { get; internal set; } =
-			EmptyReadOnly<Collector>.Collection;
+		[JsonProperty("rewrite_time")]
+		public long RewriteTime { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Search/Profile/ShardProfile.cs b/src/Nest/Search/Search/Profile/ShardProfile.cs
index 5771ca7410d..bdd2b451948 100644
--- a/src/Nest/Search/Search/Profile/ShardProfile.cs
+++ b/src/Nest/Search/Search/Profile/ShardProfile.cs
@@ -5,15 +5,15 @@ namespace Nest
 {
 	public class ShardProfile
 	{
+		[JsonProperty("aggregations")]
+		public IReadOnlyCollection<AggregationProfile> Aggregations { get; internal set; } =
+			EmptyReadOnly<AggregationProfile>.Collection;
+
 		[JsonProperty("id")]
 		public string Id { get; internal set; }
 
 		[JsonProperty("searches")]
 		public IReadOnlyCollection<SearchProfile> Searches { get; internal set; } =
 			EmptyReadOnly<SearchProfile>.Collection;
-
-		[JsonProperty("aggregations")]
-		public IReadOnlyCollection<AggregationProfile> Aggregations { get; internal set; } =
-			EmptyReadOnly<AggregationProfile>.Collection;
 	}
 }
diff --git a/src/Nest/Search/Search/Rescoring/Rescore.cs b/src/Nest/Search/Search/Rescoring/Rescore.cs
index 4f563f0cc5d..3c1d33fcc75 100644
--- a/src/Nest/Search/Search/Rescoring/Rescore.cs
+++ b/src/Nest/Search/Search/Rescoring/Rescore.cs
@@ -8,17 +8,17 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<Rescore>))]
 	public interface IRescore
 	{
-		[JsonProperty("window_size")]
-		int? WindowSize { get; set; }
-
 		[JsonProperty("query")]
 		IRescoreQuery Query { get; set; }
+
+		[JsonProperty("window_size")]
+		int? WindowSize { get; set; }
 	}
 
 	public class Rescore : IRescore
 	{
-		public int? WindowSize { get; set; }
 		public IRescoreQuery Query { get; set; }
+		public int? WindowSize { get; set; }
 	}
 
 	public class RescoringDescriptor<T> : DescriptorPromiseBase<RescoringDescriptor<T>, IList<IRescore>>
@@ -29,20 +29,18 @@ public RescoringDescriptor() : base(new List<IRescore>()) { }
 		public RescoringDescriptor<T> Rescore(Func<RescoreDescriptor<T>, IRescore> selector) =>
 			AddRescore(selector?.Invoke(new RescoreDescriptor<T>()));
 
-		private RescoringDescriptor<T> AddRescore(IRescore rescore) => rescore == null ? this : this.Assign(a => a.Add(rescore));
+		private RescoringDescriptor<T> AddRescore(IRescore rescore) => rescore == null ? this : Assign(a => a.Add(rescore));
 	}
 
 	public class RescoreDescriptor<T> : DescriptorBase<RescoreDescriptor<T>, IRescore>, IRescore
 		where T : class
 	{
-		int? IRescore.WindowSize { get; set; }
-
 		IRescoreQuery IRescore.Query { get; set; }
+		int? IRescore.WindowSize { get; set; }
 
 		public virtual RescoreDescriptor<T> RescoreQuery(Func<RescoreQueryDescriptor<T>, IRescoreQuery> rescoreQuerySelector) =>
 			Assign(a => a.Query = rescoreQuerySelector?.Invoke(new RescoreQueryDescriptor<T>()));
 
 		public virtual RescoreDescriptor<T> WindowSize(int? windowSize) => Assign(a => a.WindowSize = windowSize);
-
 	}
 }
diff --git a/src/Nest/Search/Search/Rescoring/RescoreQuery.cs b/src/Nest/Search/Search/Rescoring/RescoreQuery.cs
index 9862336fdf5..cddace3a5a4 100644
--- a/src/Nest/Search/Search/Rescoring/RescoreQuery.cs
+++ b/src/Nest/Search/Search/Rescoring/RescoreQuery.cs
@@ -19,7 +19,7 @@ public interface IRescoreQuery
 		[JsonProperty("score_mode")]
 		ScoreMode? ScoreMode { get; set; }
 	}
-	
+
 	public class RescoreQuery : IRescoreQuery
 	{
 		public QueryContainer Query { get; set; }
@@ -28,7 +28,7 @@ public class RescoreQuery : IRescoreQuery
 		public ScoreMode? ScoreMode { get; set; }
 	}
 
-	public class RescoreQueryDescriptor<T> :  DescriptorBase<RescoreQueryDescriptor<T>, IRescoreQuery>, IRescoreQuery 
+	public class RescoreQueryDescriptor<T> : DescriptorBase<RescoreQueryDescriptor<T>, IRescoreQuery>, IRescoreQuery
 		where T : class
 	{
 		QueryContainer IRescoreQuery.Query { get; set; }
@@ -45,6 +45,5 @@ public virtual RescoreQueryDescriptor<T> RescoreQueryWeight(double? rescoreQuery
 
 		public virtual RescoreQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> query) =>
 			Assign(a => a.Query = query?.Invoke(new QueryContainerDescriptor<T>()));
-		
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Search/Search/Rescoring/ScoreMode.cs b/src/Nest/Search/Search/Rescoring/ScoreMode.cs
index 9a3c6cb9e90..a1e74e92d3f 100644
--- a/src/Nest/Search/Search/Rescoring/ScoreMode.cs
+++ b/src/Nest/Search/Search/Rescoring/ScoreMode.cs
@@ -5,17 +5,21 @@
 namespace Nest
 {
 	[JsonConverter(typeof(StringEnumConverter))]
-    public enum ScoreMode
-    {
+	public enum ScoreMode
+	{
 		[EnumMember(Value = "avg")]
-        Average,
+		Average,
+
 		[EnumMember(Value = "max")]
-        Max,
+		Max,
+
 		[EnumMember(Value = "min")]
-        Min,
+		Min,
+
 		[EnumMember(Value = "multiply")]
-        Multiply,
+		Multiply,
+
 		[EnumMember(Value = "total")]
-        Total,
-    }
+		Total,
+	}
 }
diff --git a/src/Nest/Search/Search/SearchRequest.cs b/src/Nest/Search/Search/SearchRequest.cs
index 4e570ad5219..0832545c6e0 100644
--- a/src/Nest/Search/Search/SearchRequest.cs
+++ b/src/Nest/Search/Search/SearchRequest.cs
@@ -5,55 +5,39 @@
 
 namespace Nest
 {
-
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SearchRequest>))]
 	public partial interface ISearchRequest : ICovariantSearchRequest
 	{
-		[JsonProperty("timeout")]
-		string Timeout { get; set; }
-
-		[JsonProperty("from")]
-		int? From { get; set; }
+		[JsonProperty("aggs")]
+		AggregationDictionary Aggregations { get; set; }
 
-		[JsonProperty("size")]
-		int? Size { get; set; }
+		[JsonProperty("collapse")]
+		IFieldCollapse Collapse { get; set; }
 
 		[JsonProperty("explain")]
 		bool? Explain { get; set; }
 
-		[JsonProperty("version")]
-		bool? Version { get; set; }
-
-		[JsonProperty("track_scores")]
-		bool? TrackScores { get; set; }
-
-		[JsonProperty("profile")]
-		bool? Profile { get; set; }
-
-		[JsonProperty("min_score")]
-		double? MinScore { get; set; }
+		[JsonProperty("from")]
+		int? From { get; set; }
 
-		[JsonProperty("terminate_after")]
-		long? TerminateAfter { get; set; }
+		[JsonProperty("highlight")]
+		IHighlight Highlight { get; set; }
 
 		[JsonProperty("indices_boost")]
 		[JsonConverter(typeof(IndicesBoostJsonConverter))]
 		IDictionary<IndexName, double> IndicesBoost { get; set; }
 
-		[JsonProperty("sort")]
-		IList<ISort> Sort { get; set; }
-
-		[JsonProperty("search_after")]
-		IList<object> SearchAfter { get; set; }
+		[JsonProperty("min_score")]
+		double? MinScore { get; set; }
 
-		[JsonProperty("suggest")]
-		ISuggestContainer Suggest { get; set; }
+		[JsonProperty("post_filter")]
+		QueryContainer PostFilter { get; set; }
 
-		[JsonProperty("highlight")]
-		IHighlight Highlight { get; set; }
+		[JsonProperty("profile")]
+		bool? Profile { get; set; }
 
-		[JsonProperty("collapse")]
-		IFieldCollapse Collapse { get; set; }
+		[JsonProperty("query")]
+		QueryContainer Query { get; set; }
 
 		[JsonProperty("rescore")]
 		IList<IRescore> Rescore { get; set; }
@@ -61,96 +45,118 @@ public partial interface ISearchRequest : ICovariantSearchRequest
 		[JsonProperty("script_fields")]
 		IScriptFields ScriptFields { get; set; }
 
-		[JsonProperty("_source")]
-		Union<bool, ISourceFilter> Source { get; set; }
+		[JsonProperty("search_after")]
+		IList<object> SearchAfter { get; set; }
 
-		[JsonProperty("aggs")]
-		AggregationDictionary Aggregations { get; set; }
+		[JsonProperty("size")]
+		int? Size { get; set; }
 
 		[JsonProperty("slice")]
 		ISlicedScroll Slice { get; set; }
 
-		[JsonProperty("query")]
-		QueryContainer Query { get; set; }
+		[JsonProperty("sort")]
+		IList<ISort> Sort { get; set; }
 
-		[JsonProperty("post_filter")]
-		QueryContainer PostFilter { get; set; }
+		[JsonProperty("_source")]
+		Union<bool, ISourceFilter> Source { get; set; }
+
+		[JsonProperty("suggest")]
+		ISuggestContainer Suggest { get; set; }
+
+		[JsonProperty("terminate_after")]
+		long? TerminateAfter { get; set; }
 
+		[JsonProperty("timeout")]
+		string Timeout { get; set; }
+
+		[JsonProperty("track_scores")]
+		bool? TrackScores { get; set; }
+
+		[JsonProperty("version")]
+		bool? Version { get; set; }
 	}
 
 	public partial interface ISearchRequest<T> : ISearchRequest { }
 
 	public partial class SearchRequest
 	{
-		private Type _clrType { get; set; }
-		Type ICovariantSearchRequest.ClrType => this._clrType;
-		protected override HttpMethod HttpMethod =>
-			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q") == true ? HttpMethod.GET : HttpMethod.POST;
-
-		protected sealed override void Initialize() => this.TypedKeys = true;
-
-		public string Timeout { get; set; }
-		public int? From { get; set; }
-		public int? Size { get; set; }
-		public bool? Explain { get; set; }
-		public bool? Version { get; set; }
-		public bool? TrackScores { get; set; }
-		public bool? Profile { get; set; }
-		public double? MinScore { get; set; }
-		public long? TerminateAfter { get; set; }
+		public AggregationDictionary Aggregations { get; set; }
+		public IFieldCollapse Collapse { get; set; }
 		public Fields DocValueFields { get; set; }
-		public Fields StoredFields { get; set; }
-		public IScriptFields ScriptFields { get; set; }
-		public Union<bool, ISourceFilter> Source { get; set; }
-		public IList<ISort> Sort { get; set; }
-		public IList<object> SearchAfter { get; set; }
+		public bool? Explain { get; set; }
+		public int? From { get; set; }
+		public IHighlight Highlight { get; set; }
 		public IDictionary<IndexName, double> IndicesBoost { get; set; }
+		public double? MinScore { get; set; }
 		public QueryContainer PostFilter { get; set; }
-		public ISlicedScroll Slice { get; set; }
+		public bool? Profile { get; set; }
 		public QueryContainer Query { get; set; }
 		public IList<IRescore> Rescore { get; set; }
+		public IScriptFields ScriptFields { get; set; }
+		public IList<object> SearchAfter { get; set; }
+		public int? Size { get; set; }
+		public ISlicedScroll Slice { get; set; }
+		public IList<ISort> Sort { get; set; }
+		public Union<bool, ISourceFilter> Source { get; set; }
+		public Fields StoredFields { get; set; }
 		public ISuggestContainer Suggest { get; set; }
-		public IHighlight Highlight { get; set; }
-		public IFieldCollapse Collapse { get; set; }
-		public AggregationDictionary Aggregations { get; set; }
+		public long? TerminateAfter { get; set; }
+
+		public string Timeout { get; set; }
+		public bool? TrackScores { get; set; }
 
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
-	}
+		public bool? Version { get; set; }
 
-	public partial class SearchRequest<T>
-	{
-		Type ICovariantSearchRequest.ClrType => typeof(T);
 		protected override HttpMethod HttpMethod =>
-			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q") == true ? HttpMethod.GET : HttpMethod.POST;
+			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q") == true
+				? HttpMethod.GET
+				: HttpMethod.POST;
 
-		protected sealed override void Initialize() => this.TypedKeys = true;
+		private Type _clrType { get; set; }
+		Type ICovariantSearchRequest.ClrType => _clrType;
 
-		public string Timeout { get; set; }
-		public int? From { get; set; }
-		public int? Size { get; set; }
-		public bool? Explain { get; set; }
-		public bool? Version { get; set; }
-		public bool? TrackScores { get; set; }
-		public bool? Profile { get; set; }
-		public double? MinScore { get; set; }
-		public long? TerminateAfter { get; set; }
+		protected sealed override void Initialize() => TypedKeys = true;
+	}
+
+	public partial class SearchRequest<T>
+	{
+		public AggregationDictionary Aggregations { get; set; }
+		public IFieldCollapse Collapse { get; set; }
 		public Fields DocValueFields { get; set; }
-		public Fields StoredFields { get; set; }
-		public IScriptFields ScriptFields { get; set; }
-		public Union<bool, ISourceFilter> Source { get; set; }
-		public IList<ISort> Sort { get; set; }
-		public IList<object> SearchAfter { get; set; }
+		public bool? Explain { get; set; }
+		public int? From { get; set; }
+		public IHighlight Highlight { get; set; }
 		public IDictionary<IndexName, double> IndicesBoost { get; set; }
+		public double? MinScore { get; set; }
 		public QueryContainer PostFilter { get; set; }
-		public ISlicedScroll Slice { get; set; }
+		public bool? Profile { get; set; }
 		public QueryContainer Query { get; set; }
 		public IList<IRescore> Rescore { get; set; }
+		public IScriptFields ScriptFields { get; set; }
+		public IList<object> SearchAfter { get; set; }
+		public int? Size { get; set; }
+		public ISlicedScroll Slice { get; set; }
+		public IList<ISort> Sort { get; set; }
+		public Union<bool, ISourceFilter> Source { get; set; }
+		public Fields StoredFields { get; set; }
 		public ISuggestContainer Suggest { get; set; }
-		public IHighlight Highlight { get; set; }
-		public IFieldCollapse Collapse { get; set; }
-		public AggregationDictionary Aggregations { get; set; }
+		public long? TerminateAfter { get; set; }
+
+		public string Timeout { get; set; }
+		public bool? TrackScores { get; set; }
 
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
+		public bool? Version { get; set; }
+
+		protected override HttpMethod HttpMethod =>
+			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q") == true
+				? HttpMethod.GET
+				: HttpMethod.POST;
+
+		Type ICovariantSearchRequest.ClrType => typeof(T);
+
+		protected sealed override void Initialize() => TypedKeys = true;
 	}
 
 	/// <summary>
@@ -158,37 +164,40 @@ public partial class SearchRequest<T>
 	/// </summary>
 	public partial class SearchDescriptor<T> where T : class
 	{
-		Type ICovariantSearchRequest.ClrType => typeof(T);
 		protected override HttpMethod HttpMethod =>
-			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q") == true ? HttpMethod.GET : HttpMethod.POST;
+			RequestState.RequestParameters?.ContainsQueryString("source") == true || RequestState.RequestParameters?.ContainsQueryString("q") == true
+				? HttpMethod.GET
+				: HttpMethod.POST;
 
-		protected sealed override void Initialize() => this.TypedKeys();
-
-		string ISearchRequest.Timeout { get; set; }
-		int? ISearchRequest.From { get; set; }
-		int? ISearchRequest.Size { get; set; }
+		AggregationDictionary ISearchRequest.Aggregations { get; set; }
+		Type ICovariantSearchRequest.ClrType => typeof(T);
+		IFieldCollapse ISearchRequest.Collapse { get; set; }
+		Fields ISearchRequest.DocValueFields { get; set; }
 		bool? ISearchRequest.Explain { get; set; }
-		bool? ISearchRequest.Version { get; set; }
-		bool? ISearchRequest.TrackScores { get; set; }
-		bool? ISearchRequest.Profile { get; set; }
-		double? ISearchRequest.MinScore { get; set; }
-		long? ISearchRequest.TerminateAfter { get; set; }
+		int? ISearchRequest.From { get; set; }
+		IHighlight ISearchRequest.Highlight { get; set; }
 
 		IDictionary<IndexName, double> ISearchRequest.IndicesBoost { get; set; }
-		IList<ISort> ISearchRequest.Sort { get; set; }
-		IList<object> ISearchRequest.SearchAfter { get; set; }
-		ISuggestContainer ISearchRequest.Suggest { get; set; }
-		IHighlight ISearchRequest.Highlight { get; set; }
-		IFieldCollapse ISearchRequest.Collapse { get; set; }
-		IList<IRescore> ISearchRequest.Rescore { get; set; }
-		ISlicedScroll ISearchRequest.Slice { get; set; }
-		QueryContainer ISearchRequest.Query { get; set; }
+		double? ISearchRequest.MinScore { get; set; }
 		QueryContainer ISearchRequest.PostFilter { get; set; }
-		Fields ISearchRequest.StoredFields { get; set; }
-		Fields ISearchRequest.DocValueFields { get; set; }
+		bool? ISearchRequest.Profile { get; set; }
+		QueryContainer ISearchRequest.Query { get; set; }
+		IList<IRescore> ISearchRequest.Rescore { get; set; }
 		IScriptFields ISearchRequest.ScriptFields { get; set; }
+		IList<object> ISearchRequest.SearchAfter { get; set; }
+		int? ISearchRequest.Size { get; set; }
+		ISlicedScroll ISearchRequest.Slice { get; set; }
+		IList<ISort> ISearchRequest.Sort { get; set; }
 		Union<bool, ISourceFilter> ISearchRequest.Source { get; set; }
-		AggregationDictionary ISearchRequest.Aggregations { get; set; }
+		Fields ISearchRequest.StoredFields { get; set; }
+		ISuggestContainer ISearchRequest.Suggest { get; set; }
+		long? ISearchRequest.TerminateAfter { get; set; }
+
+		string ISearchRequest.Timeout { get; set; }
+		bool? ISearchRequest.TrackScores { get; set; }
+		bool? ISearchRequest.Version { get; set; }
+
+		protected sealed override void Initialize() => TypedKeys();
 
 		public SearchDescriptor<T> Aggregations(Func<AggregationContainerDescriptor<T>, IAggregationContainer> aggregationsSelector) =>
 			Assign(a => a.Aggregations = aggregationsSelector(new AggregationContainerDescriptor<T>())?.Aggregations);
@@ -205,9 +214,9 @@ public SearchDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter>
 		public SearchDescriptor<T> Size(int? size) => Assign(a => a.Size = size);
 
 		/// <summary>
-		/// The number of hits to return. Alias for <see cref="Size"/>. Defaults to 10.
+		/// The number of hits to return. Alias for <see cref="Size" />. Defaults to 10.
 		/// </summary>
-		public SearchDescriptor<T> Take(int? take) => this.Size(take);
+		public SearchDescriptor<T> Take(int? take) => Size(take);
 
 		/// <summary>
 		/// The starting from index of the hits to return. Defaults to 0.
@@ -215,9 +224,9 @@ public SearchDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter>
 		public SearchDescriptor<T> From(int? from) => Assign(a => a.From = from);
 
 		/// <summary>
-		/// The starting from index of the hits to return. Alias for <see cref="From"/>. Defaults to 0.
+		/// The starting from index of the hits to return. Alias for <see cref="From" />. Defaults to 0.
 		/// </summary>
-		public SearchDescriptor<T> Skip(int? skip) => this.From(skip);
+		public SearchDescriptor<T> Skip(int? skip) => From(skip);
 
 		/// <summary>
 		/// A search timeout, bounding the search request to be executed within the
@@ -269,7 +278,7 @@ public SearchDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter>
 		/// The operation will go and be executed only on the primary shards.
 		/// </para>
 		/// </summary>
-		public SearchDescriptor<T> ExecuteOnPrimary() => this.Preference("_primary");
+		public SearchDescriptor<T> ExecuteOnPrimary() => Preference("_primary");
 
 		/// <summary>
 		/// <para>
@@ -281,7 +290,7 @@ public SearchDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter>
 		/// will execute on other shards.
 		/// </para>
 		/// </summary>
-		public SearchDescriptor<T> ExecuteOnPrimaryFirst() => this.Preference("_primary_first");
+		public SearchDescriptor<T> ExecuteOnPrimaryFirst() => Preference("_primary_first");
 
 		/// <summary>
 		/// <para>
@@ -292,7 +301,7 @@ public SearchDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter>
 		/// The operation will prefer to be executed on a local allocated shard is possible.
 		/// </para>
 		/// </summary>
-		public SearchDescriptor<T> ExecuteOnLocalShard() => this.Preference("_local");
+		public SearchDescriptor<T> ExecuteOnLocalShard() => Preference("_local");
 
 		/// <summary>
 		/// <para>
@@ -303,7 +312,7 @@ public SearchDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter>
 		/// Restricts the search to execute only on a node with the provided node id
 		/// </para>
 		/// </summary>
-		public SearchDescriptor<T> ExecuteOnNode(string node) => this.Preference($"_only_node:{node}");
+		public SearchDescriptor<T> ExecuteOnNode(string node) => Preference($"_only_node:{node}");
 
 		/// <summary>
 		/// <para>
@@ -314,7 +323,7 @@ public SearchDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter>
 		/// Prefers execution on the node with the provided node id if applicable.
 		/// </para>
 		/// </summary>
-		public SearchDescriptor<T> ExecuteOnPreferredNode(string node) => this.Preference(node.IsNullOrEmpty() ? null : $"_prefer_node:{node}");
+		public SearchDescriptor<T> ExecuteOnPreferredNode(string node) => Preference(node.IsNullOrEmpty() ? null : $"_prefer_node:{node}");
 
 		/// <summary>
 		/// Allows to configure different boost level per index when searching across
@@ -341,24 +350,25 @@ public SearchDescriptor<T> DocValueFields(Func<FieldsDescriptor<T>, IPromise<Fie
 
 		public SearchDescriptor<T> DocValueFields(Fields fields) => Assign(a => a.DocValueFields = fields);
 
-		///<summary>
-		///A comma-separated list of fields to return as the field data representation of a field for each hit
-		///</summary>
-		public SearchDescriptor<T> Sort(Func<SortDescriptor<T>, IPromise<IList<ISort>>> selector) => Assign(a => a.Sort = selector?.Invoke(new SortDescriptor<T>())?.Value);
+		/// <summary>
+		/// A comma-separated list of fields to return as the field data representation of a field for each hit
+		/// </summary>
+		public SearchDescriptor<T> Sort(Func<SortDescriptor<T>, IPromise<IList<ISort>>> selector) =>
+			Assign(a => a.Sort = selector?.Invoke(new SortDescriptor<T>())?.Value);
 
-		///<summary>
-		/// Sort values that can be used to start returning results "after" any document in the result list.
-		///</summary>
+		/// <summary>
+		///  Sort values that can be used to start returning results "after" any document in the result list.
+		/// </summary>
 		public SearchDescriptor<T> SearchAfter(IList<object> searchAfter) => Assign(a => a.SearchAfter = searchAfter);
 
-		///<summary>
-		/// Sort values that can be used to start returning results "after" any document in the result list.
-		///</summary>
+		/// <summary>
+		///  Sort values that can be used to start returning results "after" any document in the result list.
+		/// </summary>
 		public SearchDescriptor<T> SearchAfter(params object[] searchAfter) => Assign(a => a.SearchAfter = searchAfter);
 
-		///<summary>
-		/// The suggest feature suggests similar looking terms based on a provided text by using a suggester
-		///</summary>
+		/// <summary>
+		///  The suggest feature suggests similar looking terms based on a provided text by using a suggester
+		/// </summary>
 		public SearchDescriptor<T> Suggest(Func<SuggestContainerDescriptor<T>, IPromise<ISuggestContainer>> selector) =>
 			Assign(a => a.Suggest = selector?.Invoke(new SuggestContainerDescriptor<T>())?.Value);
 
@@ -377,7 +387,7 @@ public SearchDescriptor<T> Slice(Func<SlicedScrollDescriptor<T>, ISlicedScroll>
 		/// <summary>
 		/// Shortcut to default to a match all query
 		/// </summary>
-		public SearchDescriptor<T> MatchAll(Func<MatchAllQueryDescriptor, IMatchAllQuery> selector = null) => this.Query(q => q.MatchAll(selector));
+		public SearchDescriptor<T> MatchAll(Func<MatchAllQueryDescriptor, IMatchAllQuery> selector = null) => Query(q => q.MatchAll(selector));
 
 		/// <summary>
 		/// Filter search using a filter descriptor lambda
@@ -408,6 +418,5 @@ public SearchDescriptor<T> Collapse(Func<FieldCollapseDescriptor<T>, IFieldColla
 		/// </summary>
 		public SearchDescriptor<T> Rescore(Func<RescoringDescriptor<T>, IPromise<IList<IRescore>>> rescoreSelector) =>
 			Assign(a => a.Rescore = rescoreSelector?.Invoke(new RescoringDescriptor<T>()).Value);
-
 	}
 }
diff --git a/src/Nest/Search/Search/SearchResponse.cs b/src/Nest/Search/Search/SearchResponse.cs
index 66386160a3e..830f06cd723 100644
--- a/src/Nest/Search/Search/SearchResponse.cs
+++ b/src/Nest/Search/Search/SearchResponse.cs
@@ -8,123 +8,141 @@ namespace Nest
 	public interface ISearchResponse<T> : IResponse where T : class
 	{
 		/// <summary>
-		/// Gets the meta data about the shards on which the search query was executed.
+		/// Gets the collection of aggregations
 		/// </summary>
-		ShardStatistics Shards { get; }
+		AggregateDictionary Aggregations { get; }
+
+		[Obsolete("Aggs has been renamed to Aggregations and will be removed in NEST 7.x")]
+		AggregateDictionary Aggs { get; }
 
 		/// <summary>
-		/// Gets the meta data about the hits that match the search query criteria.
+		/// Gets the documents inside the hits, by deserializing <see cref="IHitMetadata{T}.Source" /> into T.
+		/// <para>
+		/// NOTE: if you use <see cref="ISearchRequest.StoredFields" /> on the search request,
+		/// <see cref="Documents" /> will be empty and you should use <see cref="Fields" />
+		/// instead to get the field values. As an alternative to
+		/// <see cref="Fields" />, try source filtering using <see cref="ISearchRequest.Source" /> on the
+		/// search request to return <see cref="Documents" /> with partial fields selected
+		/// </para>
 		/// </summary>
-		HitsMetadata<T> HitsMetadata { get; }
+		IReadOnlyCollection<T> Documents { get; }
 
 		/// <summary>
-		/// Gets the collection of aggregations
+		/// Gets the field values inside the hits, when the search request uses
+		/// <see cref="SearchRequest{T}.StoredFields" />.
 		/// </summary>
-		AggregateDictionary Aggregations { get; }
-
-		[Obsolete("Aggs has been renamed to Aggregations and will be removed in NEST 7.x")]
-		AggregateDictionary Aggs { get; }
+		IReadOnlyCollection<FieldValues> Fields { get; }
 
 		/// <summary>
-		/// Gets the results of profiling the search query. Has a value only when
-		/// <see cref="ISearchRequest.Profile"/> is set to <c>true</c> on the search request.
+		/// Gets the collection of hits that matched the query
 		/// </summary>
-		Profile Profile { get; }
+		/// <value>
+		/// The hits.
+		/// </value>
+		IReadOnlyCollection<IHit<T>> Hits { get; }
 
 		/// <summary>
-		/// Gets the suggester results.
+		/// Gets the meta data about the hits that match the search query criteria.
 		/// </summary>
-		SuggestDictionary<T> Suggest { get; }
+		HitsMetadata<T> HitsMetadata { get; }
 
 		/// <summary>
-		/// Time in milliseconds for Elasticsearch to execute the search
+		/// Gets the maximum score for documents matching the search query criteria
 		/// </summary>
-		long Took { get; }
+		double MaxScore { get; }
 
 		/// <summary>
-		/// Gets a value indicating whether the search timed out or not
+		/// Number of times the server performed an incremental reduce phase
 		/// </summary>
-		bool TimedOut { get; }
+		long NumberOfReducePhases { get; }
 
 		/// <summary>
-		/// Gets a value indicating whether the search was terminated early
+		/// Gets the results of profiling the search query. Has a value only when
+		/// <see cref="ISearchRequest.Profile" /> is set to <c>true</c> on the search request.
 		/// </summary>
-		bool TerminatedEarly { get; }
+		Profile Profile { get; }
 
 		/// <summary>
 		/// Gets the scroll id which can be passed to the Scroll API in order to retrieve the next batch
-		/// of results. Has a value only when <see cref="SearchRequest{T}.Scroll"/> is specified on the
+		/// of results. Has a value only when <see cref="SearchRequest{T}.Scroll" /> is specified on the
 		/// search request
 		/// </summary>
 		string ScrollId { get; }
 
 		/// <summary>
-		/// Gets the total number of documents matching the search query criteria
+		/// Gets the meta data about the shards on which the search query was executed.
 		/// </summary>
-		long Total { get; }
+		ShardStatistics Shards { get; }
 
 		/// <summary>
-		/// Gets the maximum score for documents matching the search query criteria
+		/// Gets the suggester results.
 		/// </summary>
-		double MaxScore { get; }
+		SuggestDictionary<T> Suggest { get; }
 
 		/// <summary>
-		/// Number of times the server performed an incremental reduce phase
+		/// Gets a value indicating whether the search was terminated early
 		/// </summary>
-		long NumberOfReducePhases { get; }
+		bool TerminatedEarly { get; }
 
 		/// <summary>
-		/// Gets the documents inside the hits, by deserializing <see cref="IHitMetadata{T}.Source"/> into T.
-		/// <para>NOTE: if you use <see cref="ISearchRequest.StoredFields"/> on the search request,
-		/// <see cref="Documents"/> will be empty and you should use <see cref="Fields"/>
-		/// instead to get the field values. As an alternative to
-		/// <see cref="Fields"/>, try source filtering using <see cref="ISearchRequest.Source"/> on the
-		/// search request to return <see cref="Documents"/> with partial fields selected
-		/// </para>
+		/// Gets a value indicating whether the search timed out or not
 		/// </summary>
-		IReadOnlyCollection<T> Documents { get; }
+		bool TimedOut { get; }
 
 		/// <summary>
-		/// Gets the collection of hits that matched the query
+		/// Time in milliseconds for Elasticsearch to execute the search
 		/// </summary>
-		/// <value>
-		/// The hits.
-		/// </value>
-		IReadOnlyCollection<IHit<T>> Hits { get; }
+		long Took { get; }
 
 		/// <summary>
-		/// Gets the field values inside the hits, when the search request uses
-		/// <see cref="SearchRequest{T}.StoredFields"/>.
+		/// Gets the total number of documents matching the search query criteria
 		/// </summary>
-		IReadOnlyCollection<FieldValues> Fields { get; }
+		long Total { get; }
 	}
 
 	[JsonObject]
 	public class SearchResponse<T> : ResponseBase, ISearchResponse<T> where T : class
 	{
-		[JsonProperty("_shards")]
-		public ShardStatistics Shards { get; internal set; }
+		private IReadOnlyCollection<T> _documents;
+
+		private IReadOnlyCollection<FieldValues> _fields;
+
+		private IReadOnlyCollection<IHit<T>> _hits;
 
 		[JsonProperty("aggregations")]
 		public AggregateDictionary Aggregations { get; internal set; } = AggregateDictionary.Default;
 
 		[JsonIgnore]
-		public AggregateDictionary Aggs => this.Aggregations;
+		public AggregateDictionary Aggs => Aggregations;
 
-		[JsonProperty("profile")]
-		public Profile Profile { get; internal set; }
+		/// <inheritdoc />
+		[JsonIgnore]
+		public IReadOnlyCollection<T> Documents =>
+			_documents ?? (_documents = Hits
+				.Select(h => h.Source)
+				.ToList());
 
-		[JsonProperty("suggest")]
-		public SuggestDictionary<T> Suggest { get; internal set; } = SuggestDictionary<T>.Default;
+		/// <inheritdoc />
+		public IReadOnlyCollection<FieldValues> Fields =>
+			_fields ?? (_fields = Hits
+				.Select(h => h.Fields)
+				.ToList());
 
-		[JsonProperty("took")]
-		public long Took { get; internal set; }
+		[JsonIgnore]
+		public IReadOnlyCollection<IHit<T>> Hits =>
+			_hits ?? (_hits = HitsMetadata?.Hits ?? EmptyReadOnly<IHit<T>>.Collection);
 
-		[JsonProperty("timed_out")]
-		public bool TimedOut { get; internal set; }
+		[JsonProperty("hits")]
+		public HitsMetadata<T> HitsMetadata { get; internal set; }
 
-		[JsonProperty("terminated_early")]
-		public bool TerminatedEarly { get; internal set; }
+		[JsonIgnore]
+		public double MaxScore => HitsMetadata?.MaxScore ?? 0;
+
+		[JsonProperty("num_reduce_phases")]
+		public long NumberOfReducePhases { get; internal set; }
+
+		[JsonProperty("profile")]
+		public Profile Profile { get; internal set; }
 
 		/// <summary>
 		/// Only set when search type = scan and scroll specified
@@ -132,39 +150,22 @@ public class SearchResponse<T> : ResponseBase, ISearchResponse<T> where T : clas
 		[JsonProperty("_scroll_id")]
 		public string ScrollId { get; internal set; }
 
-		[JsonProperty("hits")]
-		public HitsMetadata<T> HitsMetadata { get; internal set; }
-
-		[JsonProperty("num_reduce_phases")]
-		public long NumberOfReducePhases { get; internal set; }
-
-		[JsonIgnore]
-		public long Total => this.HitsMetadata?.Total ?? 0;
+		[JsonProperty("_shards")]
+		public ShardStatistics Shards { get; internal set; }
 
-		[JsonIgnore]
-		public double MaxScore => this.HitsMetadata?.MaxScore ?? 0;
+		[JsonProperty("suggest")]
+		public SuggestDictionary<T> Suggest { get; internal set; } = SuggestDictionary<T>.Default;
 
-		private IReadOnlyCollection<T> _documents;
+		[JsonProperty("terminated_early")]
+		public bool TerminatedEarly { get; internal set; }
 
-		/// <inheritdoc/>
-		[JsonIgnore]
-		public IReadOnlyCollection<T> Documents =>
-			this._documents ?? (this._documents = this.Hits
-				.Select(h => h.Source)
-				.ToList());
+		[JsonProperty("timed_out")]
+		public bool TimedOut { get; internal set; }
 
-		private IReadOnlyCollection<IHit<T>> _hits;
+		[JsonProperty("took")]
+		public long Took { get; internal set; }
 
 		[JsonIgnore]
-		public IReadOnlyCollection<IHit<T>> Hits =>
-			this._hits ?? (this._hits = this.HitsMetadata?.Hits ?? EmptyReadOnly<IHit<T>>.Collection);
-
-		private IReadOnlyCollection<FieldValues> _fields;
-
-		/// <inheritdoc/>
-		public IReadOnlyCollection<FieldValues> Fields =>
-			this._fields ?? (this._fields = this.Hits
-				.Select(h => h.Fields)
-				.ToList());
+		public long Total => HitsMetadata?.Total ?? 0;
 	}
 }
diff --git a/src/Nest/Search/Search/Sort/NestedSort.cs b/src/Nest/Search/Search/Sort/NestedSort.cs
index 04b3b7c4d0e..6d6ebf81536 100644
--- a/src/Nest/Search/Search/Sort/NestedSort.cs
+++ b/src/Nest/Search/Search/Sort/NestedSort.cs
@@ -8,29 +8,29 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<NestedSort>))]
 	public interface INestedSort
 	{
-		[JsonProperty("path")]
-		Field Path { get; set; }
-
 		[JsonProperty("filter")]
 		QueryContainer Filter { get; set; }
 
 		[JsonProperty("nested")]
 		INestedSort Nested { get; set; }
+
+		[JsonProperty("path")]
+		Field Path { get; set; }
 	}
 
 	public class NestedSort : INestedSort
 	{
-		public Field Path { get; set; }
 		public QueryContainer Filter { get; set; }
 		public INestedSort Nested { get; set; }
+		public Field Path { get; set; }
 	}
 
 	public class NestedSortDescriptor<T>
 		: DescriptorBase<NestedSortDescriptor<T>, INestedSort>, INestedSort where T : class
 	{
-		Field INestedSort.Path { get; set; }
 		QueryContainer INestedSort.Filter { get; set; }
 		INestedSort INestedSort.Nested { get; set; }
+		Field INestedSort.Path { get; set; }
 
 		public NestedSortDescriptor<T> Path(Field path) => Assign(a => a.Path = path);
 
diff --git a/src/Nest/Search/Search/Sort/SortBase.cs b/src/Nest/Search/Search/Sort/SortBase.cs
index b9722a2c0aa..6da52ed8484 100644
--- a/src/Nest/Search/Search/Sort/SortBase.cs
+++ b/src/Nest/Search/Search/Sort/SortBase.cs
@@ -8,11 +8,6 @@ namespace Nest
 	[ContractJsonConverter(typeof(SortJsonConverter))]
 	public interface ISort
 	{
-		/// <summary>
-		/// The field on which to sort
-		/// </summary>
-		Field SortKey { get; }
-
 		/// <summary>
 		/// Specifies how documents which are missing the sort field should
 		/// be treated.
@@ -20,12 +15,6 @@ public interface ISort
 		[JsonProperty("missing")]
 		object Missing { get; set; }
 
-		/// <summary>
-		/// Controls the order of sorting
-		/// </summary>
-		[JsonProperty("order")]
-		SortOrder? Order { get; set; }
-
 		/// <summary>
 		/// Controls what collection value is picked for sorting a document
 		/// when the field is a collection
@@ -33,6 +22,15 @@ public interface ISort
 		[JsonProperty("mode")]
 		SortMode? Mode { get; set; }
 
+		/// <summary>
+		/// Specifies the path and filter to apply when sorting on a nested field
+		/// </summary>
+		/// <remarks>
+		/// Valid in Elasticsearch 6.1.0+
+		/// </remarks>
+		[JsonProperty("nested")]
+		INestedSort Nested { get; set; }
+
 		/// <summary>
 		/// Specifies the filter to apply when sorting on a nested field
 		/// </summary>
@@ -48,37 +46,46 @@ public interface ISort
 		Field NestedPath { get; set; }
 
 		/// <summary>
-		/// Specifies the path and filter to apply when sorting on a nested field
+		/// Controls the order of sorting
 		/// </summary>
-		/// <remarks>
-		/// Valid in Elasticsearch 6.1.0+
-		/// </remarks>
-		[JsonProperty("nested")]
-		INestedSort Nested { get; set; }
-	}
+		[JsonProperty("order")]
+		SortOrder? Order { get; set; }
 
-	public abstract class SortBase : ISort
-	{
-		/// <inheritdoc />
-		Field ISort.SortKey => this.SortKey;
 		/// <summary>
 		/// The field on which to sort
 		/// </summary>
-		protected abstract Field SortKey { get; }
+		Field SortKey { get; }
+	}
+
+	public abstract class SortBase : ISort
+	{
 		/// <inheritdoc />
 		public object Missing { get; set; }
-		/// <inheritdoc />
-		public SortOrder? Order { get; set; }
+
 		/// <inheritdoc />
 		public SortMode? Mode { get; set; }
+
+		/// <inheritdoc />
+		public INestedSort Nested { get; set; }
+
 		/// <inheritdoc />
 		[Obsolete("Deprecated in 6.1.0. Use Nested. Will be removed in 7.x")]
 		public QueryContainer NestedFilter { get; set; }
+
 		/// <inheritdoc />
 		[Obsolete("Deprecated in 6.1.0. Use Nested. Will be removed in 7.x")]
 		public Field NestedPath { get; set; }
+
 		/// <inheritdoc />
-		public INestedSort Nested { get; set; }
+		public SortOrder? Order { get; set; }
+
+		/// <summary>
+		/// The field on which to sort
+		/// </summary>
+		protected abstract Field SortKey { get; }
+
+		/// <inheritdoc />
+		Field ISort.SortKey => SortKey;
 	}
 
 	public abstract class SortDescriptorBase<TDescriptor, TInterface, T> : DescriptorBase<TDescriptor, TInterface>, ISort
@@ -86,19 +93,19 @@ public abstract class SortDescriptorBase<TDescriptor, TInterface, T> : Descripto
 		where TDescriptor : SortDescriptorBase<TDescriptor, TInterface, T>, TInterface, ISort
 		where TInterface : class, ISort
 	{
-		Field ISort.SortKey => this.SortKey;
-		object ISort.Missing { get; set; }
-		SortOrder? ISort.Order { get; set; }
-		SortMode? ISort.Mode { get; set; }
-		QueryContainer ISort.NestedFilter { get; set; }
-		Field ISort.NestedPath { get; set; }
-		INestedSort ISort.Nested { get; set; }
-
 		/// <summary>
 		/// The field on which to sort
 		/// </summary>
 		protected abstract Field SortKey { get; }
 
+		object ISort.Missing { get; set; }
+		SortMode? ISort.Mode { get; set; }
+		INestedSort ISort.Nested { get; set; }
+		QueryContainer ISort.NestedFilter { get; set; }
+		Field ISort.NestedPath { get; set; }
+		SortOrder? ISort.Order { get; set; }
+		Field ISort.SortKey => SortKey;
+
 		/// <summary>
 		/// Sorts by ascending sort order
 		/// </summary>
diff --git a/src/Nest/Search/Search/Sort/SortDescriptor.cs b/src/Nest/Search/Search/Sort/SortDescriptor.cs
index 7c6ee45e5f6..17164ab013a 100644
--- a/src/Nest/Search/Search/Sort/SortDescriptor.cs
+++ b/src/Nest/Search/Search/Sort/SortDescriptor.cs
@@ -10,29 +10,36 @@ public class SortDescriptor<T> : DescriptorPromiseBase<SortDescriptor<T>, IList<
 	{
 		public SortDescriptor() : base(new List<ISort>()) { }
 
-		public SortDescriptor<T> Ascending(Expression<Func<T, object>> objectPath) => Assign(a => a.Add(new SortField { Field = objectPath, Order = SortOrder.Ascending }));
+		public SortDescriptor<T> Ascending(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.Add(new SortField { Field = objectPath, Order = SortOrder.Ascending }));
 
-		public SortDescriptor<T> Descending(Expression<Func<T, object>> objectPath)=> Assign(a => a.Add(new SortField { Field = objectPath, Order = SortOrder.Descending }));
+		public SortDescriptor<T> Descending(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.Add(new SortField { Field = objectPath, Order = SortOrder.Descending }));
 
 		public SortDescriptor<T> Ascending(Field field) => Assign(a => a.Add(new SortField { Field = field, Order = SortOrder.Ascending }));
 
-		public SortDescriptor<T> Descending(Field field)=> Assign(a => a.Add(new SortField { Field = field, Order = SortOrder.Descending }));
+		public SortDescriptor<T> Descending(Field field) => Assign(a => a.Add(new SortField { Field = field, Order = SortOrder.Descending }));
 
-		public SortDescriptor<T> Ascending(SortSpecialField field) => Assign(a => a.Add(new SortField { Field = field.GetStringValue(), Order = SortOrder.Ascending }));
+		public SortDescriptor<T> Ascending(SortSpecialField field) =>
+			Assign(a => a.Add(new SortField { Field = field.GetStringValue(), Order = SortOrder.Ascending }));
 
-		public SortDescriptor<T> Descending(SortSpecialField field) => Assign(a => a.Add(new SortField { Field = field.GetStringValue(), Order = SortOrder.Descending }));
+		public SortDescriptor<T> Descending(SortSpecialField field) =>
+			Assign(a => a.Add(new SortField { Field = field.GetStringValue(), Order = SortOrder.Descending }));
 
-		public SortDescriptor<T> Field(Func<SortFieldDescriptor<T>, IFieldSort> sortSelector) => AddSort(sortSelector?.Invoke(new SortFieldDescriptor<T>()));
+		public SortDescriptor<T> Field(Func<SortFieldDescriptor<T>, IFieldSort> sortSelector) =>
+			AddSort(sortSelector?.Invoke(new SortFieldDescriptor<T>()));
 
 		public SortDescriptor<T> Field(Field field, SortOrder order) => AddSort(new SortField { Field = field, Order = order });
 
 		public SortDescriptor<T> Field(Expression<Func<T, object>> field, SortOrder order) =>
 			AddSort(new SortField { Field = field, Order = order });
 
-		public SortDescriptor<T> GeoDistance(Func<SortGeoDistanceDescriptor<T>, IGeoDistanceSort> sortSelector) => AddSort(sortSelector?.Invoke(new SortGeoDistanceDescriptor<T>()));
+		public SortDescriptor<T> GeoDistance(Func<SortGeoDistanceDescriptor<T>, IGeoDistanceSort> sortSelector) =>
+			AddSort(sortSelector?.Invoke(new SortGeoDistanceDescriptor<T>()));
 
-		public SortDescriptor<T> Script(Func<SortScriptDescriptor<T>, IScriptSort> sortSelector) => AddSort(sortSelector?.Invoke(new SortScriptDescriptor<T>()));
+		public SortDescriptor<T> Script(Func<SortScriptDescriptor<T>, IScriptSort> sortSelector) =>
+			AddSort(sortSelector?.Invoke(new SortScriptDescriptor<T>()));
 
-		private SortDescriptor<T> AddSort(ISort sort) => sort == null ? this : this.Assign(a => a.Add(sort));
+		private SortDescriptor<T> AddSort(ISort sort) => sort == null ? this : Assign(a => a.Add(sort));
 	}
 }
diff --git a/src/Nest/Search/Search/Sort/SortField.cs b/src/Nest/Search/Search/Sort/SortField.cs
index 42096818343..a3bee675d77 100644
--- a/src/Nest/Search/Search/Sort/SortField.cs
+++ b/src/Nest/Search/Search/Sort/SortField.cs
@@ -6,7 +6,6 @@
 
 namespace Nest
 {
-
 	public interface IFieldSort : ISort
 	{
 		[JsonProperty("ignore_unmapped")]
@@ -19,10 +18,10 @@ public interface IFieldSort : ISort
 	public class SortField : SortBase, IFieldSort
 	{
 		public static readonly IList<ISort> ByDocumentOrder = new ReadOnlyCollection<ISort>(new List<ISort> { new SortField { Field = "_doc" } });
-		protected override Field SortKey => this.Field;
-		public FieldType? UnmappedType { get; set; }
-		public bool? IgnoreUnmappedFields { get; set; }
 		public Field Field { get; set; }
+		public bool? IgnoreUnmappedFields { get; set; }
+		public FieldType? UnmappedType { get; set; }
+		protected override Field SortKey => Field;
 	}
 
 	public class SortFieldDescriptor<T> : SortDescriptorBase<SortFieldDescriptor<T>, IFieldSort, T>, IFieldSort where T : class
@@ -33,7 +32,7 @@ public class SortFieldDescriptor<T> : SortDescriptorBase<SortFieldDescriptor<T>,
 		bool? IFieldSort.IgnoreUnmappedFields { get; set; }
 		FieldType? IFieldSort.UnmappedType { get; set; }
 
-		public virtual SortFieldDescriptor<T> Field(Field field) => Assign(a => this._field = field);
+		public virtual SortFieldDescriptor<T> Field(Field field) => Assign(a => _field = field);
 
 		public virtual SortFieldDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => _field = objectPath);
 
diff --git a/src/Nest/Search/Search/Sort/SortGeoDistance.cs b/src/Nest/Search/Search/Sort/SortGeoDistance.cs
index 2797312e253..c6cc2b71fa6 100644
--- a/src/Nest/Search/Search/Sort/SortGeoDistance.cs
+++ b/src/Nest/Search/Search/Sort/SortGeoDistance.cs
@@ -5,16 +5,9 @@
 
 namespace Nest
 {
-	/// <summary> Allows you to sort based on a proximity to one or more <see cref="GeoLocation"/> </summary>
+	/// <summary> Allows you to sort based on a proximity to one or more <see cref="GeoLocation" /> </summary>
 	public interface IGeoDistanceSort : ISort
 	{
-		Field Field { get; set; }
-		IEnumerable<GeoLocation> Points { get; set; }
-
-		/// <summary> The unit to use when computing sort values. The default is m (meters) </summary>
-		[JsonProperty("unit")]
-		DistanceUnit? GeoUnit { get; set; }
-
 		/// <summary>
 		/// How to compute the distance. Can either be arc (default), or plane (faster, but
 		/// inaccurate on long distances and close to the poles).
@@ -22,57 +15,67 @@ public interface IGeoDistanceSort : ISort
 		[JsonProperty("distance_type")]
 		GeoDistanceType? DistanceType { get; set; }
 
+		Field Field { get; set; }
+
+		/// <summary> The unit to use when computing sort values. The default is m (meters) </summary>
+		[JsonProperty("unit")]
+		DistanceUnit? GeoUnit { get; set; }
+
 		/// <summary>
 		/// Indicates if the unmapped field should be treated as a missing value. Setting it to `true` is equivalent to specifying
 		/// an `unmapped_type` in the field sort. The default is `false` (unmapped field are causing the search to fail)
 		/// </summary>
 		[JsonProperty("ignore_unmapped")]
 		bool? IgnoreUnmapped { get; set; }
+
+		IEnumerable<GeoLocation> Points { get; set; }
 	}
 
-	/// <inheritdoc cref="IGeoDistanceSort"/>
+	/// <inheritdoc cref="IGeoDistanceSort" />
 	public class GeoDistanceSort : SortBase, IGeoDistanceSort
 	{
-		protected override Field SortKey => "_geo_distance";
+		/// <inheritdoc cref="IGeoDistanceSort.DistanceType" />
+		public GeoDistanceType? DistanceType { get; set; }
+
 		public Field Field { get; set; }
-		public IEnumerable<GeoLocation> Points { get; set; }
-		/// <inheritdoc cref="IGeoDistanceSort.GeoUnit"/>
+
+		/// <inheritdoc cref="IGeoDistanceSort.GeoUnit" />
 		public DistanceUnit? GeoUnit { get; set; }
-		/// <inheritdoc cref="IGeoDistanceSort.DistanceType"/>
-		public GeoDistanceType? DistanceType { get; set; }
-		/// <inheritdoc cref="IGeoDistanceSort.IgnoreUnmapped"/>
+
+		/// <inheritdoc cref="IGeoDistanceSort.IgnoreUnmapped" />
 		public bool? IgnoreUnmapped { get; set; }
 
+		public IEnumerable<GeoLocation> Points { get; set; }
+		protected override Field SortKey => "_geo_distance";
 	}
 
-	/// <inheritdoc cref="IGeoDistanceSort"/>
+	/// <inheritdoc cref="IGeoDistanceSort" />
 	public class SortGeoDistanceDescriptor<T> : SortDescriptorBase<SortGeoDistanceDescriptor<T>, IGeoDistanceSort, T>, IGeoDistanceSort
 		where T : class
 	{
 		protected override Field SortKey => "_geo_distance";
+		GeoDistanceType? IGeoDistanceSort.DistanceType { get; set; }
 
 		Field IGeoDistanceSort.Field { get; set; }
-		IEnumerable<GeoLocation> IGeoDistanceSort.Points { get; set; }
 		DistanceUnit? IGeoDistanceSort.GeoUnit { get; set; }
-		GeoDistanceType? IGeoDistanceSort.DistanceType { get; set; }
 		bool? IGeoDistanceSort.IgnoreUnmapped { get; set; }
+		IEnumerable<GeoLocation> IGeoDistanceSort.Points { get; set; }
 
 		public SortGeoDistanceDescriptor<T> Points(params GeoLocation[] geoLocations) => Assign(a => a.Points = geoLocations);
 
 		public SortGeoDistanceDescriptor<T> Points(IEnumerable<GeoLocation> geoLocations) => Assign(a => a.Points = geoLocations);
 
-		/// <inheritdoc cref="IGeoDistanceSort.GeoUnit"/>
+		/// <inheritdoc cref="IGeoDistanceSort.GeoUnit" />
 		public SortGeoDistanceDescriptor<T> Unit(DistanceUnit? unit) => Assign(a => a.GeoUnit = unit);
 
-		/// <inheritdoc cref="IGeoDistanceSort.DistanceType"/>
+		/// <inheritdoc cref="IGeoDistanceSort.DistanceType" />
 		public SortGeoDistanceDescriptor<T> DistanceType(GeoDistanceType? distanceType) => Assign(a => a.DistanceType = distanceType);
 
 		public SortGeoDistanceDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
 		public SortGeoDistanceDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
 
-		/// <inheritdoc cref="IGeoDistanceSort.IgnoreUnmapped"/>
+		/// <inheritdoc cref="IGeoDistanceSort.IgnoreUnmapped" />
 		public SortGeoDistanceDescriptor<T> IgnoreUnmapped(bool? ignoreUnmapped = true) => Assign(a => a.IgnoreUnmapped = ignoreUnmapped);
-
 	}
 }
diff --git a/src/Nest/Search/Search/Sort/SortMode.cs b/src/Nest/Search/Search/Sort/SortMode.cs
index 3f49942b6dd..297f9b5bf58 100644
--- a/src/Nest/Search/Search/Sort/SortMode.cs
+++ b/src/Nest/Search/Search/Sort/SortMode.cs
@@ -14,15 +14,19 @@ public enum SortMode
 		/// <summary> Pick the lowest value. </summary>
 		[EnumMember(Value = "min")]
 		Min,
+
 		/// <summary> Pick the highest value.</summary>
 		[EnumMember(Value = "max")]
 		Max,
+
 		/// <summary> Use the sum of all values as sort value. Only applicable for number based array fields. </summary>
 		[EnumMember(Value = "sum")]
 		Sum,
+
 		/// <summary> Use the average of all values as sort value. Only applicable for number based array fields. </summary>
 		[EnumMember(Value = "avg")]
 		Average,
+
 		/// <summary> Use the median of all values as sort value. Only applicable for number based array fields. </summary>
 		[EnumMember(Value = "median")]
 		Median
diff --git a/src/Nest/Search/Search/Sort/SortOrder.cs b/src/Nest/Search/Search/Sort/SortOrder.cs
index 9a87c8f5558..c69cf7095dc 100644
--- a/src/Nest/Search/Search/Sort/SortOrder.cs
+++ b/src/Nest/Search/Search/Sort/SortOrder.cs
@@ -9,7 +9,8 @@ public enum SortOrder
 	{
 		[EnumMember(Value = "asc")]
 		Ascending,
+
 		[EnumMember(Value = "desc")]
 		Descending
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Search/Search/Sort/SortScript.cs b/src/Nest/Search/Search/Sort/SortScript.cs
index 07af4b267af..f0f3dfa5e2d 100644
--- a/src/Nest/Search/Search/Sort/SortScript.cs
+++ b/src/Nest/Search/Search/Sort/SortScript.cs
@@ -5,21 +5,20 @@ namespace Nest
 {
 	public interface IScriptSort : ISort
 	{
-		[JsonProperty("type")]
-		string Type { get; set; }
-
 		[JsonProperty("script")]
 		IScript Script { get; set; }
 
+		[JsonProperty("type")]
+		string Type { get; set; }
 	}
 
 	public class ScriptSort : SortBase, IScriptSort
 	{
-		protected override Field SortKey => "_script";
+		public string Language { get; set; }
+		public IScript Script { get; set; }
 
 		public string Type { get; set; }
-		public IScript Script { get; set; }
-		public string Language { get; set; }
+		protected override Field SortKey => "_script";
 	}
 
 	public class SortScriptDescriptor<T> : SortDescriptorBase<SortScriptDescriptor<T>, IScriptSort, T>, IScriptSort
@@ -27,14 +26,13 @@ public class SortScriptDescriptor<T> : SortDescriptorBase<SortScriptDescriptor<T
 	{
 		protected override Field SortKey => "_script";
 
-		string IScriptSort.Type { get; set; }
-
 		IScript IScriptSort.Script { get; set; }
 
+		string IScriptSort.Type { get; set; }
+
 		public virtual SortScriptDescriptor<T> Type(string type) => Assign(a => a.Type = type);
 
 		public SortScriptDescriptor<T> Script(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.Script = scriptSelector?.Invoke(new ScriptDescriptor()));
-
 	}
 }
diff --git a/src/Nest/Search/Search/Sort/SortSpecialField.cs b/src/Nest/Search/Search/Sort/SortSpecialField.cs
index acd8e9a33dd..1016e90dfc0 100644
--- a/src/Nest/Search/Search/Sort/SortSpecialField.cs
+++ b/src/Nest/Search/Search/Sort/SortSpecialField.cs
@@ -9,7 +9,8 @@ public enum SortSpecialField
 	{
 		[EnumMember(Value = "_score")]
 		Score,
+
 		[EnumMember(Value = "_doc")]
 		DocumentIndexOrder
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/Search/Search/SourceFiltering/SourceFilter.cs b/src/Nest/Search/Search/SourceFiltering/SourceFilter.cs
index 7b85b566dba..8d0b1917e6b 100644
--- a/src/Nest/Search/Search/SourceFiltering/SourceFilter.cs
+++ b/src/Nest/Search/Search/SourceFiltering/SourceFilter.cs
@@ -6,37 +6,36 @@ namespace Nest
 	[JsonConverter(typeof(SourceFilterJsonConverter))]
 	public interface ISourceFilter
 	{
-		[JsonProperty("includes")]
-		Fields Includes { get; set; }
-
 		[JsonProperty("excludes")]
 		Fields Excludes { get; set; }
+
+		[JsonProperty("includes")]
+		Fields Includes { get; set; }
 	}
 
 	public class SourceFilter : ISourceFilter
 	{
-		public static SourceFilter ExcludeAll { get; } = new SourceFilter { Excludes = new [] {"*"} };
-		public static SourceFilter IncludeAll { get; } = new SourceFilter { Includes = new [] {"*"} };
+		public static SourceFilter ExcludeAll { get; } = new SourceFilter { Excludes = new[] { "*" } };
+		public Fields Excludes { get; set; }
+		public static SourceFilter IncludeAll { get; } = new SourceFilter { Includes = new[] { "*" } };
 
 		public Fields Includes { get; set; }
-		public Fields Excludes { get; set; }
 	}
 
 	public class SourceFilterDescriptor<T> : DescriptorBase<SourceFilterDescriptor<T>, ISourceFilter>, ISourceFilter
 		where T : class
 	{
-		Fields ISourceFilter.Includes { get; set; }
-
 		Fields ISourceFilter.Excludes { get; set; }
+		Fields ISourceFilter.Includes { get; set; }
 
 		public SourceFilterDescriptor<T> Includes(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Includes = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		public SourceFilterDescriptor<T> IncludeAll() => Assign(a => a.Includes = new[] { "*" } );
+		public SourceFilterDescriptor<T> IncludeAll() => Assign(a => a.Includes = new[] { "*" });
 
 		public SourceFilterDescriptor<T> Excludes(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Excludes = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		public SourceFilterDescriptor<T> ExcludeAll() => Assign(a => a.Excludes = new[] { "*" } );
+		public SourceFilterDescriptor<T> ExcludeAll() => Assign(a => a.Excludes = new[] { "*" });
 	}
 }
diff --git a/src/Nest/Search/Search/SourceFiltering/SourceFilterJsonConverter.cs b/src/Nest/Search/Search/SourceFiltering/SourceFilterJsonConverter.cs
index e663f7f36b9..e64e95459ed 100644
--- a/src/Nest/Search/Search/SourceFiltering/SourceFilterJsonConverter.cs
+++ b/src/Nest/Search/Search/SourceFiltering/SourceFilterJsonConverter.cs
@@ -8,21 +8,20 @@ internal class SourceFilterJsonConverter : JsonConverter
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
+
 		public override bool CanConvert(Type objectType) => true;
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { }
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType == JsonToken.Null) return null;
 
-			var filter =  new SourceFilter();
+			var filter = new SourceFilter();
 			switch (reader.TokenType)
 			{
 				case JsonToken.String:
-					filter.Includes = new [] { (string)reader.Value };
+					filter.Includes = new[] { (string)reader.Value };
 					break;
 				case JsonToken.StartArray:
 					var include = new List<string>();
diff --git a/src/Nest/Search/SearchShards/ElasticClient-SearchShards.cs b/src/Nest/Search/SearchShards/ElasticClient-SearchShards.cs
index 11731aa1c54..1b18bfc491b 100644
--- a/src/Nest/Search/SearchShards/ElasticClient-SearchShards.cs
+++ b/src/Nest/Search/SearchShards/ElasticClient-SearchShards.cs
@@ -1,50 +1,56 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISearchShardsResponse SearchShards<T>(Func<SearchShardsDescriptor<T>, ISearchShardsRequest> selector) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISearchShardsResponse SearchShards(ISearchShardsRequest request);
 
-		/// <inheritdoc/>
-		Task<ISearchShardsResponse> SearchShardsAsync<T>(Func<SearchShardsDescriptor<T>, ISearchShardsRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ISearchShardsResponse> SearchShardsAsync<T>(Func<SearchShardsDescriptor<T>, ISearchShardsRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ISearchShardsResponse> SearchShardsAsync(ISearchShardsRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISearchShardsResponse SearchShards<T>(Func<SearchShardsDescriptor<T>, ISearchShardsRequest> selector) where T : class =>
-			this.SearchShards(selector?.Invoke(new SearchShardsDescriptor<T>()));
+			SearchShards(selector?.Invoke(new SearchShardsDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ISearchShardsResponse SearchShards(ISearchShardsRequest request) =>
-			this.Dispatcher.Dispatch<ISearchShardsRequest, SearchShardsRequestParameters, SearchShardsResponse>(
+			Dispatcher.Dispatch<ISearchShardsRequest, SearchShardsRequestParameters, SearchShardsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.SearchShardsDispatch<SearchShardsResponse>(p)
+				(p, d) => LowLevelDispatch.SearchShardsDispatch<SearchShardsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<ISearchShardsResponse> SearchShardsAsync<T>(Func<SearchShardsDescriptor<T>, ISearchShardsRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<ISearchShardsResponse> SearchShardsAsync<T>(Func<SearchShardsDescriptor<T>, ISearchShardsRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.SearchShardsAsync(selector?.Invoke(new SearchShardsDescriptor<T>()), cancellationToken);
+			SearchShardsAsync(selector?.Invoke(new SearchShardsDescriptor<T>()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<ISearchShardsResponse> SearchShardsAsync(ISearchShardsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ISearchShardsRequest, SearchShardsRequestParameters, SearchShardsResponse, ISearchShardsResponse>(
+		/// <inheritdoc />
+		public Task<ISearchShardsResponse> SearchShardsAsync(ISearchShardsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ISearchShardsRequest, SearchShardsRequestParameters, SearchShardsResponse, ISearchShardsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.SearchShardsDispatchAsync<SearchShardsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.SearchShardsDispatchAsync<SearchShardsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/Search/SearchShards/SearchShardsRequest.cs b/src/Nest/Search/SearchShards/SearchShardsRequest.cs
index 615b957b6ed..3c402d878c4 100644
--- a/src/Nest/Search/SearchShards/SearchShardsRequest.cs
+++ b/src/Nest/Search/SearchShards/SearchShardsRequest.cs
@@ -1,9 +1,11 @@
 namespace Nest
 {
 	public partial interface ISearchShardsRequest { }
+
 	public partial interface ISearchShardsRequest<T> : ISearchShardsRequest { }
 
 	public partial class SearchShardsRequest { }
+
 	public partial class SearchShardsRequest<T> where T : class { }
 
 	/// <summary>
diff --git a/src/Nest/Search/SearchShards/SearchShardsResponse.cs b/src/Nest/Search/SearchShards/SearchShardsResponse.cs
index 73268ec7124..e1a71c65b25 100644
--- a/src/Nest/Search/SearchShards/SearchShardsResponse.cs
+++ b/src/Nest/Search/SearchShards/SearchShardsResponse.cs
@@ -6,18 +6,19 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface ISearchShardsResponse : IResponse
 	{
-		[JsonProperty("shards")]
-		IReadOnlyCollection<IReadOnlyCollection<SearchShard>> Shards { get; }
-
 		[JsonProperty("nodes")]
 		IReadOnlyDictionary<string, SearchNode> Nodes { get; }
+
+		[JsonProperty("shards")]
+		IReadOnlyCollection<IReadOnlyCollection<SearchShard>> Shards { get; }
 	}
 
 	public class SearchShardsResponse : ResponseBase, ISearchShardsResponse
 	{
-		public IReadOnlyCollection<IReadOnlyCollection<SearchShard>> Shards { get; internal set; } = EmptyReadOnly<IReadOnlyCollection<SearchShard>>.Collection;
-
 		public IReadOnlyDictionary<string, SearchNode> Nodes { get; internal set; } = EmptyReadOnly<string, SearchNode>.Dictionary;
+
+		public IReadOnlyCollection<IReadOnlyCollection<SearchShard>> Shards { get; internal set; } =
+			EmptyReadOnly<IReadOnlyCollection<SearchShard>>.Collection;
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
@@ -33,22 +34,22 @@ public class SearchNode
 	[JsonObject(MemberSerialization.OptIn)]
 	public class SearchShard
 	{
-		[JsonProperty("state")]
-		public string State { get; internal set; }
-
-		[JsonProperty("primary")]
-		public bool Primary { get; internal set; }
+		[JsonProperty("index")]
+		public string Index { get; internal set; }
 
 		[JsonProperty("node")]
 		public string Node { get; internal set; }
 
+		[JsonProperty("primary")]
+		public bool Primary { get; internal set; }
+
 		[JsonProperty("relocating_node")]
 		public string RelocatingNode { get; internal set; }
 
 		[JsonProperty("shard")]
 		public int Shard { get; internal set; }
 
-		[JsonProperty("index")]
-		public string Index { get; internal set; }
+		[JsonProperty("state")]
+		public string State { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/SearchTemplate/ElasticClient-SearchTemplate.cs b/src/Nest/Search/SearchTemplate/ElasticClient-SearchTemplate.cs
index 88c3d375c35..c7668cc04eb 100644
--- a/src/Nest/Search/SearchTemplate/ElasticClient-SearchTemplate.cs
+++ b/src/Nest/Search/SearchTemplate/ElasticClient-SearchTemplate.cs
@@ -1,9 +1,7 @@
 using System;
-using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
-using System.Threading;
 
 namespace Nest
 {
@@ -19,35 +17,43 @@ public partial interface IElasticClient
 		ISearchResponse<T> SearchTemplate<T>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISearchResponse<TResult> SearchTemplate<T, TResult>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector)
 			where T : class
 			where TResult : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISearchResponse<T> SearchTemplate<T>(ISearchTemplateRequest request)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ISearchResponse<TResult> SearchTemplate<T, TResult>(ISearchTemplateRequest request)
 			where T : class
 			where TResult : class;
 
-		/// <inheritdoc/>
-		Task<ISearchResponse<T>> SearchTemplateAsync<T>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ISearchResponse<T>> SearchTemplateAsync<T>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
-		Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 			where TResult : class;
 
-		/// <inheritdoc/>
-		Task<ISearchResponse<T>> SearchTemplateAsync<T>(ISearchTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ISearchResponse<T>> SearchTemplateAsync<T>(ISearchTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
-		Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(ISearchTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(ISearchTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 			where TResult : class;
 	}
@@ -55,43 +61,50 @@ ISearchResponse<TResult> SearchTemplate<T, TResult>(ISearchTemplateRequest reque
 	public partial class ElasticClient
 	{
 		public ISearchResponse<T> SearchTemplate<T>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector) where T : class =>
-			this.SearchTemplate<T, T>(selector);
+			SearchTemplate<T, T>(selector);
 
 		public ISearchResponse<TResult> SearchTemplate<T, TResult>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector)
 			where T : class
 			where TResult : class =>
-			this.SearchTemplate<T, TResult>(selector?.Invoke(new SearchTemplateDescriptor<T>()));
+			SearchTemplate<T, TResult>(selector?.Invoke(new SearchTemplateDescriptor<T>()));
 
 		public ISearchResponse<T> SearchTemplate<T>(ISearchTemplateRequest request) where T : class =>
-			this.SearchTemplate<T, T>(request);
+			SearchTemplate<T, T>(request);
 
 		public ISearchResponse<TResult> SearchTemplate<T, TResult>(ISearchTemplateRequest request)
 			where T : class
 			where TResult : class =>
-			this.Dispatcher.Dispatch<ISearchTemplateRequest, SearchTemplateRequestParameters, SearchResponse<TResult>>(
+			Dispatcher.Dispatch<ISearchTemplateRequest, SearchTemplateRequestParameters, SearchResponse<TResult>>(
 				request,
-				this.LowLevelDispatch.SearchTemplateDispatch<SearchResponse<TResult>>
+				LowLevelDispatch.SearchTemplateDispatch<SearchResponse<TResult>>
 			);
 
-		public Task<ISearchResponse<T>> SearchTemplateAsync<T>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.SearchTemplateAsync<T, T>(selector, cancellationToken);
+		public Task<ISearchResponse<T>> SearchTemplateAsync<T>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			SearchTemplateAsync<T, T>(selector, cancellationToken);
 
-		public Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(Func<SearchTemplateDescriptor<T>, ISearchTemplateRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 			where TResult : class =>
-			this.SearchTemplateAsync<T, TResult>(selector?.Invoke(new SearchTemplateDescriptor<T>()), cancellationToken);
+			SearchTemplateAsync<T, TResult>(selector?.Invoke(new SearchTemplateDescriptor<T>()), cancellationToken);
 
-		public Task<ISearchResponse<T>> SearchTemplateAsync<T>(ISearchTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.SearchTemplateAsync<T, T>(request, cancellationToken);
+		public Task<ISearchResponse<T>> SearchTemplateAsync<T>(ISearchTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			SearchTemplateAsync<T, T>(request, cancellationToken);
 
-		public Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(ISearchTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<ISearchResponse<TResult>> SearchTemplateAsync<T, TResult>(ISearchTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class
 			where TResult : class =>
-			this.Dispatcher.DispatchAsync<ISearchTemplateRequest, SearchTemplateRequestParameters, SearchResponse<TResult>, ISearchResponse<TResult>>(
+			Dispatcher.DispatchAsync<ISearchTemplateRequest, SearchTemplateRequestParameters, SearchResponse<TResult>, ISearchResponse<TResult>>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.SearchTemplateDispatchAsync<SearchResponse<TResult>>
+				LowLevelDispatch.SearchTemplateDispatchAsync<SearchResponse<TResult>>
 			);
-
 	}
 }
diff --git a/src/Nest/Search/SearchTemplate/RenderSearchTemplate/ElasticClient-RenderSearchTemplate.cs b/src/Nest/Search/SearchTemplate/RenderSearchTemplate/ElasticClient-RenderSearchTemplate.cs
index 0fa46cb3c2a..da7fdefdf18 100644
--- a/src/Nest/Search/SearchTemplate/RenderSearchTemplate/ElasticClient-RenderSearchTemplate.cs
+++ b/src/Nest/Search/SearchTemplate/RenderSearchTemplate/ElasticClient-RenderSearchTemplate.cs
@@ -1,43 +1,55 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRenderSearchTemplateResponse RenderSearchTemplate(Func<RenderSearchTemplateDescriptor, IRenderSearchTemplateRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRenderSearchTemplateResponse RenderSearchTemplate(IRenderSearchTemplateRequest request);
 
-		/// <inheritdoc/>
-		Task<IRenderSearchTemplateResponse> RenderSearchTemplateAsync(Func<RenderSearchTemplateDescriptor, IRenderSearchTemplateRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRenderSearchTemplateResponse> RenderSearchTemplateAsync(Func<RenderSearchTemplateDescriptor, IRenderSearchTemplateRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IRenderSearchTemplateResponse> RenderSearchTemplateAsync(IRenderSearchTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRenderSearchTemplateResponse> RenderSearchTemplateAsync(IRenderSearchTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
 		public IRenderSearchTemplateResponse RenderSearchTemplate(Func<RenderSearchTemplateDescriptor, IRenderSearchTemplateRequest> selector) =>
-			this.RenderSearchTemplate(selector.InvokeOrDefault(new RenderSearchTemplateDescriptor()));
+			RenderSearchTemplate(selector.InvokeOrDefault(new RenderSearchTemplateDescriptor()));
 
 		public IRenderSearchTemplateResponse RenderSearchTemplate(IRenderSearchTemplateRequest request) =>
-			this.Dispatcher.Dispatch<IRenderSearchTemplateRequest, RenderSearchTemplateRequestParameters, RenderSearchTemplateResponse>(
+			Dispatcher.Dispatch<IRenderSearchTemplateRequest, RenderSearchTemplateRequestParameters, RenderSearchTemplateResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.RenderSearchTemplateDispatch<RenderSearchTemplateResponse>(p, d)
+				(p, d) => LowLevelDispatch.RenderSearchTemplateDispatch<RenderSearchTemplateResponse>(p, d)
 			);
 
-		public Task<IRenderSearchTemplateResponse> RenderSearchTemplateAsync(Func<RenderSearchTemplateDescriptor, IRenderSearchTemplateRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RenderSearchTemplateAsync(selector.InvokeOrDefault(new RenderSearchTemplateDescriptor()), cancellationToken);
+		public Task<IRenderSearchTemplateResponse> RenderSearchTemplateAsync(
+			Func<RenderSearchTemplateDescriptor, IRenderSearchTemplateRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RenderSearchTemplateAsync(selector.InvokeOrDefault(new RenderSearchTemplateDescriptor()), cancellationToken);
 
-		public Task<IRenderSearchTemplateResponse> RenderSearchTemplateAsync(IRenderSearchTemplateRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRenderSearchTemplateRequest, RenderSearchTemplateRequestParameters, RenderSearchTemplateResponse, IRenderSearchTemplateResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.RenderSearchTemplateDispatchAsync<RenderSearchTemplateResponse>(p, d, c)
-			);
+		public Task<IRenderSearchTemplateResponse> RenderSearchTemplateAsync(IRenderSearchTemplateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IRenderSearchTemplateRequest, RenderSearchTemplateRequestParameters, RenderSearchTemplateResponse,
+					IRenderSearchTemplateResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.RenderSearchTemplateDispatchAsync<RenderSearchTemplateResponse>(p, d, c)
+				);
 	}
 }
diff --git a/src/Nest/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateRequest.cs b/src/Nest/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateRequest.cs
index f13da564475..3458dabc271 100644
--- a/src/Nest/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateRequest.cs
+++ b/src/Nest/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateRequest.cs
@@ -6,40 +6,52 @@ namespace Nest
 {
 	public partial interface IRenderSearchTemplateRequest
 	{
-		[JsonProperty("source")]
-		string Source { get; set; }
+		[JsonProperty("file")]
+		string File { get; set; }
 
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		[JsonIgnore]
 		string Inline { get; set; }
 
-		[JsonProperty("file")]
-		string File { get; set; }
-
 		[JsonProperty("params")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		Dictionary<string, object> Params { get; set; }
 
+		[JsonProperty("source")]
+		string Source { get; set; }
 	}
 
 	public partial class RenderSearchTemplateRequest
 	{
-		public string Source { get; set; }
-		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
-		public string Inline { get => this.Source; set => this.Source = value; }
 		public string File { get; set; }
+
+		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
+		public string Inline
+		{
+			get => Source;
+			set => Source = value;
+		}
+
 		public Dictionary<string, object> Params { get; set; }
+		public string Source { get; set; }
 	}
 
 	public partial class RenderSearchTemplateDescriptor
 	{
-		string IRenderSearchTemplateRequest.Inline { get => Self.Source; set => Self.Source = value; }
-		string IRenderSearchTemplateRequest.Source { get; set; }
 		string IRenderSearchTemplateRequest.File { get; set; }
+
+		string IRenderSearchTemplateRequest.Inline
+		{
+			get => Self.Source;
+			set => Self.Source = value;
+		}
+
 		Dictionary<string, object> IRenderSearchTemplateRequest.Params { get; set; }
+		string IRenderSearchTemplateRequest.Source { get; set; }
 
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		public RenderSearchTemplateDescriptor Inline(string inline) => Assign(a => a.Inline = inline);
+
 		public RenderSearchTemplateDescriptor Source(string source) => Assign(a => a.Source = source);
 
 		public RenderSearchTemplateDescriptor File(string file) => Assign(a => a.File = file);
@@ -48,6 +60,5 @@ public partial class RenderSearchTemplateDescriptor
 
 		public RenderSearchTemplateDescriptor Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramsSelector) =>
 			Assign(a => a.Params = paramsSelector?.Invoke(new FluentDictionary<string, object>()));
-
 	}
 }
diff --git a/src/Nest/Search/SearchTemplate/SearchTemplateRequest.cs b/src/Nest/Search/SearchTemplate/SearchTemplateRequest.cs
index 86b29686d6e..0929310e6c1 100644
--- a/src/Nest/Search/SearchTemplate/SearchTemplateRequest.cs
+++ b/src/Nest/Search/SearchTemplate/SearchTemplateRequest.cs
@@ -1,74 +1,89 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SearchTemplateRequest>))]
 	public partial interface ISearchTemplateRequest : ICovariantSearchRequest
 	{
-		[JsonProperty("params")]
-		IDictionary<string, object> Params { get; set; }
-
-		[JsonProperty("source")]
-		string Source { get; set; }
+		[JsonProperty("id")]
+		string Id { get; set; }
 
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		[JsonIgnore]
 		string Inline { get; set; }
 
-		[JsonProperty("id")]
-		string Id { get; set; }
+		[JsonProperty("params")]
+		IDictionary<string, object> Params { get; set; }
+
+		[JsonProperty("source")]
+		string Source { get; set; }
 	}
 
 	public partial class SearchTemplateRequest
 	{
-		protected sealed override void Initialize() => this.TypedKeys = true;
+		public string Id { get; set; }
 
-		public string Source { get; set; }
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
-		public string Inline { get => this.Source; set => this.Source = value; }
-		public string Id { get; set; }
+		public string Inline
+		{
+			get => Source;
+			set => Source = value;
+		}
+
 		public IDictionary<string, object> Params { get; set; }
-		protected Type ClrType { get; set; }
+
+		public string Source { get; set; }
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
-		Type ICovariantSearchRequest.ClrType => this.ClrType;
+		protected Type ClrType { get; set; }
+		Type ICovariantSearchRequest.ClrType => ClrType;
 
+		protected sealed override void Initialize() => TypedKeys = true;
 	}
 
 	public class SearchTemplateRequest<T> : SearchTemplateRequest
 		where T : class
 	{
-		public SearchTemplateRequest() : base(typeof(T)) { this.ClrType = typeof(T); }
-		public SearchTemplateRequest(Indices indices) : base(indices) { this.ClrType = typeof(T); }
-		public SearchTemplateRequest(Indices indices, Types types) : base(indices, types) { this.ClrType = typeof(T); }
+		public SearchTemplateRequest() : base(typeof(T)) => ClrType = typeof(T);
+
+		public SearchTemplateRequest(Indices indices) : base(indices) => ClrType = typeof(T);
+
+		public SearchTemplateRequest(Indices indices, Types types) : base(indices, types) => ClrType = typeof(T);
 	}
 
 	public partial class SearchTemplateDescriptor<T> where T : class
 	{
-		protected sealed override void Initialize() => this.TypedKeys();
-
-		Type ICovariantSearchRequest.ClrType => typeof(T);
-
 		/// <summary>
 		/// Whether conditionless queries are allowed or not
 		/// </summary>
 		internal bool _Strict { get; set; }
 
-		string ISearchTemplateRequest.Inline { get => Self.Source; set => Self.Source = value; }
+		Type ICovariantSearchRequest.ClrType => typeof(T);
+
+		string ISearchTemplateRequest.Id { get; set; }
+
+		string ISearchTemplateRequest.Inline
+		{
+			get => Self.Source;
+			set => Self.Source = value;
+		}
+
+		IDictionary<string, object> ISearchTemplateRequest.Params { get; set; }
+
+		string ISearchTemplateRequest.Source { get; set; }
+
+		protected sealed override void Initialize() => TypedKeys();
+
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		public SearchTemplateDescriptor<T> Inline(string template) => Assign(a => a.Inline = template);
 
-		string ISearchTemplateRequest.Source { get; set; }
 		public SearchTemplateDescriptor<T> Source(string template) => Assign(a => a.Source = template);
 
-		string ISearchTemplateRequest.Id { get; set; }
 		public SearchTemplateDescriptor<T> Id(string id) => Assign(a => a.Id = id);
 
 		public SearchTemplateDescriptor<T> Params(Dictionary<string, object> paramDictionary) => Assign(a => a.Params = paramDictionary);
 
-		IDictionary<string, object> ISearchTemplateRequest.Params { get; set; }
 		public SearchTemplateDescriptor<T> Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramDictionary) =>
 			Assign(a => a.Params = paramDictionary?.Invoke(new FluentDictionary<string, object>()));
 	}
diff --git a/src/Nest/Search/Suggesters/BaseSuggest.cs b/src/Nest/Search/Suggesters/BaseSuggest.cs
index 8763334ba81..41203ba1e05 100644
--- a/src/Nest/Search/Suggesters/BaseSuggest.cs
+++ b/src/Nest/Search/Suggesters/BaseSuggest.cs
@@ -6,26 +6,26 @@ namespace Nest
 {
 	public interface ISuggester
 	{
+		[JsonProperty("analyzer")]
+		string Analyzer { get; set; }
+
 		/// <summary>
 		/// The name of the field on which to run the query
 		/// </summary>
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
-
 		/// <summary>
 		/// The number of suggestions to return. Defaults to 5
 		/// </summary>
 		[JsonProperty("size")]
 		int? Size { get; set; }
-}
+	}
 
 	public abstract class SuggesterBase : ISuggester
 	{
-		public Field Field { get; set; }
 		public string Analyzer { get; set; }
+		public Field Field { get; set; }
 		public int? Size { get; set; }
 	}
 
@@ -34,9 +34,8 @@ public abstract class SuggestDescriptorBase<TDescriptor, TInterface, T> : Descri
 		where TDescriptor : SuggestDescriptorBase<TDescriptor, TInterface, T>, TInterface, ISuggester
 		where TInterface : class, ISuggester
 	{
-		Field ISuggester.Field { get; set; }
-
 		string ISuggester.Analyzer { get; set; }
+		Field ISuggester.Field { get; set; }
 
 		int? ISuggester.Size { get; set; }
 
diff --git a/src/Nest/Search/Suggesters/CompletionSuggester/CompletionField.cs b/src/Nest/Search/Suggesters/CompletionSuggester/CompletionField.cs
index 099a4f3bda0..782a9724380 100644
--- a/src/Nest/Search/Suggesters/CompletionSuggester/CompletionField.cs
+++ b/src/Nest/Search/Suggesters/CompletionSuggester/CompletionField.cs
@@ -9,13 +9,13 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public class CompletionField
 	{
+		[JsonProperty("contexts")]
+		public IDictionary<string, IEnumerable<string>> Contexts { get; set; }
+
 		[JsonProperty("input")]
 		public IEnumerable<string> Input { get; set; }
 
 		[JsonProperty("weight")]
 		public int? Weight { get; set; }
-
-		[JsonProperty("contexts")]
-		public IDictionary<string, IEnumerable<string>> Contexts { get; set; }
 	}
 }
diff --git a/src/Nest/Search/Suggesters/CompletionSuggester/CompletionSuggester.cs b/src/Nest/Search/Suggesters/CompletionSuggester/CompletionSuggester.cs
index b77ec25bab4..746bd684572 100644
--- a/src/Nest/Search/Suggesters/CompletionSuggester/CompletionSuggester.cs
+++ b/src/Nest/Search/Suggesters/CompletionSuggester/CompletionSuggester.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using System.Linq;
 
 namespace Nest
 {
@@ -10,16 +9,10 @@ namespace Nest
 	public interface ICompletionSuggester : ISuggester
 	{
 		/// <summary>
-		/// Prefix used to search for suggestions
-		/// </summary>
-		[JsonIgnore]
-		string Prefix { get; set; }
-
-		/// <summary>
-		/// Prefix as a regular expression used to search for suggestions
+		/// Context mappings used to filter and/or boost suggestions
 		/// </summary>
-		[JsonIgnore]
-		string Regex { get; set; }
+		[JsonProperty("contexts")]
+		IDictionary<string, IList<ISuggestContextQuery>> Contexts { get; set; }
 
 		/// <summary>
 		/// Support fuzziness for the suggestions
@@ -28,10 +21,16 @@ public interface ICompletionSuggester : ISuggester
 		IFuzzySuggester Fuzzy { get; set; }
 
 		/// <summary>
-		/// Context mappings used to filter and/or boost suggestions
+		/// Prefix used to search for suggestions
 		/// </summary>
-		[JsonProperty("contexts")]
-		IDictionary<string, IList<ISuggestContextQuery>> Contexts { get; set; }
+		[JsonIgnore]
+		string Prefix { get; set; }
+
+		/// <summary>
+		/// Prefix as a regular expression used to search for suggestions
+		/// </summary>
+		[JsonIgnore]
+		string Regex { get; set; }
 
 		/// <summary>
 		/// Whether duplicate suggestions should be filtered out. Defaults to <c>false</c>
@@ -44,10 +43,10 @@ public interface ICompletionSuggester : ISuggester
 	public class CompletionSuggester : SuggesterBase, ICompletionSuggester
 	{
 		/// <inheritdoc />
-		public IFuzzySuggester Fuzzy { get; set; }
+		public IDictionary<string, IList<ISuggestContextQuery>> Contexts { get; set; }
 
 		/// <inheritdoc />
-		public IDictionary<string, IList<ISuggestContextQuery>> Contexts { get; set; }
+		public IFuzzySuggester Fuzzy { get; set; }
 
 		/// <inheritdoc />
 		public string Prefix { get; set; }
@@ -59,11 +58,12 @@ public class CompletionSuggester : SuggesterBase, ICompletionSuggester
 		public bool? SkipDuplicates { get; set; }
 	}
 
-	public class CompletionSuggesterDescriptor<T> : SuggestDescriptorBase<CompletionSuggesterDescriptor<T>, ICompletionSuggester, T>, ICompletionSuggester
+	public class CompletionSuggesterDescriptor<T>
+		: SuggestDescriptorBase<CompletionSuggesterDescriptor<T>, ICompletionSuggester, T>, ICompletionSuggester
 		where T : class
 	{
-		IFuzzySuggester ICompletionSuggester.Fuzzy { get; set; }
 		IDictionary<string, IList<ISuggestContextQuery>> ICompletionSuggester.Contexts { get; set; }
+		IFuzzySuggester ICompletionSuggester.Fuzzy { get; set; }
 		string ICompletionSuggester.Prefix { get; set; }
 		string ICompletionSuggester.Regex { get; set; }
 		bool? ICompletionSuggester.SkipDuplicates { get; set; }
@@ -87,7 +87,9 @@ public CompletionSuggesterDescriptor<T> Fuzzy(Func<FuzzySuggestDescriptor<T>, IF
 		/// <summary>
 		/// Context mappings used to filter and/or boost suggestions
 		/// </summary>
-		public CompletionSuggesterDescriptor<T> Contexts(Func<SuggestContextQueriesDescriptor<T>, IPromise<IDictionary<string, IList<ISuggestContextQuery>>>> contexts) =>
+		public CompletionSuggesterDescriptor<T> Contexts(
+			Func<SuggestContextQueriesDescriptor<T>, IPromise<IDictionary<string, IList<ISuggestContextQuery>>>> contexts
+		) =>
 			Assign(a => a.Contexts = contexts?.Invoke(new SuggestContextQueriesDescriptor<T>()).Value);
 
 		/// <summary>
diff --git a/src/Nest/Search/Suggesters/CompletionSuggester/FuzzySuggest.cs b/src/Nest/Search/Suggesters/CompletionSuggester/FuzzySuggest.cs
index 970ff079244..1ec70361210 100644
--- a/src/Nest/Search/Suggesters/CompletionSuggester/FuzzySuggest.cs
+++ b/src/Nest/Search/Suggesters/CompletionSuggester/FuzzySuggest.cs
@@ -6,8 +6,8 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<FuzzySuggester>))]
 	public interface IFuzzySuggester
 	{
-		[JsonProperty("transpositions")]
-		bool? Transpositions { get; set; }
+		[JsonProperty("fuzziness")]
+		IFuzziness Fuzziness { get; set; }
 
 		[JsonProperty("min_length")]
 		int? MinLength { get; set; }
@@ -15,8 +15,8 @@ public interface IFuzzySuggester
 		[JsonProperty("prefix_length")]
 		int? PrefixLength { get; set; }
 
-		[JsonProperty("fuzziness")]
-		IFuzziness Fuzziness { get; set; }
+		[JsonProperty("transpositions")]
+		bool? Transpositions { get; set; }
 
 		[JsonProperty("unicode_aware")]
 		bool? UnicodeAware { get; set; }
@@ -24,20 +24,20 @@ public interface IFuzzySuggester
 
 	public class FuzzySuggester : IFuzzySuggester
 	{
-		public bool? Transpositions { get; set; }
+		public IFuzziness Fuzziness { get; set; }
 		public int? MinLength { get; set; }
 		public int? PrefixLength { get; set; }
-		public IFuzziness Fuzziness { get; set; }
+		public bool? Transpositions { get; set; }
 		public bool? UnicodeAware { get; set; }
 	}
 
-	public class FuzzySuggestDescriptor<T> : DescriptorBase<FuzzySuggestDescriptor<T>, IFuzzySuggester>,  IFuzzySuggester
+	public class FuzzySuggestDescriptor<T> : DescriptorBase<FuzzySuggestDescriptor<T>, IFuzzySuggester>, IFuzzySuggester
 		where T : class
 	{
-		bool? IFuzzySuggester.Transpositions { get; set; }
+		IFuzziness IFuzzySuggester.Fuzziness { get; set; }
 		int? IFuzzySuggester.MinLength { get; set; }
 		int? IFuzzySuggester.PrefixLength { get; set; }
-		IFuzziness IFuzzySuggester.Fuzziness { get; set; }
+		bool? IFuzzySuggester.Transpositions { get; set; }
 		bool? IFuzzySuggester.UnicodeAware { get; set; }
 
 		public FuzzySuggestDescriptor<T> Fuzziness(Fuzziness fuzziness) => Assign(a => a.Fuzziness = fuzziness);
diff --git a/src/Nest/Search/Suggesters/ContextSuggester/CategorySuggestContext.cs b/src/Nest/Search/Suggesters/ContextSuggester/CategorySuggestContext.cs
index 365ff893ccd..dc951871f0e 100644
--- a/src/Nest/Search/Suggesters/ContextSuggester/CategorySuggestContext.cs
+++ b/src/Nest/Search/Suggesters/ContextSuggester/CategorySuggestContext.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -11,7 +10,8 @@ public class CategorySuggestContext : SuggestContextBase, ICategorySuggestContex
 		public override string Type => "category";
 	}
 
-	public class CategorySuggestContextDescriptor<T> : SuggestContextDescriptorBase<CategorySuggestContextDescriptor<T>, ICategorySuggestContext, T>, ICategorySuggestContext
+	public class CategorySuggestContextDescriptor<T>
+		: SuggestContextDescriptorBase<CategorySuggestContextDescriptor<T>, ICategorySuggestContext, T>, ICategorySuggestContext
 		where T : class
 	{
 		protected override string Type => "category";
diff --git a/src/Nest/Search/Suggesters/ContextSuggester/Context.cs b/src/Nest/Search/Suggesters/ContextSuggester/Context.cs
index 713fee14700..2a142538348 100644
--- a/src/Nest/Search/Suggesters/ContextSuggester/Context.cs
+++ b/src/Nest/Search/Suggesters/ContextSuggester/Context.cs
@@ -1,9 +1,5 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -11,34 +7,35 @@ namespace Nest
 	public class Context : Union<string, GeoLocation>
 	{
 		public Context(string category) : base(category) { }
+
 		public Context(GeoLocation geo) : base(geo) { }
 
-		public string Category => this.Item1;
-		public GeoLocation Geo => this.Item2;
+		public string Category => Item1;
+		public GeoLocation Geo => Item2;
 
 		public static implicit operator Context(string context) => new Context(context);
+
 		public static implicit operator Context(GeoLocation context) => new Context(context);
 	}
 
 	internal class ContextJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
+		public static UnionJsonConverter<string, GeoLocation> UnionConverter = new UnionJsonConverter<string, GeoLocation>();
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
 
-		public static UnionJsonConverter<string, GeoLocation> UnionConverter = new UnionJsonConverter<string, GeoLocation>();
+		public override bool CanConvert(Type objectType) => true;
 
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var union = UnionConverter.ReadJson(reader, objectType, existingValue, serializer) as Union<string, GeoLocation>;
 			if (!union.Item1.IsNullOrEmpty()) return new Context(union.Item1);
+
 			return new Context(union.Item2);
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
 			UnionConverter.WriteJson(writer, value, serializer);
-		}
 	}
 }
diff --git a/src/Nest/Search/Suggesters/ContextSuggester/GeoSuggestContext.cs b/src/Nest/Search/Suggesters/ContextSuggester/GeoSuggestContext.cs
index 39c51d5d7b4..82a57a128a4 100644
--- a/src/Nest/Search/Suggesters/ContextSuggester/GeoSuggestContext.cs
+++ b/src/Nest/Search/Suggesters/ContextSuggester/GeoSuggestContext.cs
@@ -6,30 +6,29 @@ namespace Nest
 	[JsonObject]
 	public interface IGeoSuggestContext : ISuggestContext
 	{
-		[JsonProperty("precision")]
-		IEnumerable<string> Precision { get; set; }
-
 		[JsonProperty("neighbors")]
 		bool? Neighbors { get; set; }
+
+		[JsonProperty("precision")]
+		IEnumerable<string> Precision { get; set; }
 	}
 
 	[JsonObject]
 	public class GeoSuggestContext : SuggestContextBase, IGeoSuggestContext
 	{
-		public override string Type => "geo";
-
-		public IEnumerable<string> Precision { get; set; }
-
 		public bool? Neighbors { get; set; }
 
+		public IEnumerable<string> Precision { get; set; }
+		public override string Type => "geo";
 	}
 
-	public class GeoSuggestContextDescriptor<T> : SuggestContextDescriptorBase<GeoSuggestContextDescriptor<T>, IGeoSuggestContext, T>, IGeoSuggestContext
+	public class GeoSuggestContextDescriptor<T>
+		: SuggestContextDescriptorBase<GeoSuggestContextDescriptor<T>, IGeoSuggestContext, T>, IGeoSuggestContext
 		where T : class
 	{
 		protected override string Type => "geo";
-		IEnumerable<string> IGeoSuggestContext.Precision { get; set; }
 		bool? IGeoSuggestContext.Neighbors { get; set; }
+		IEnumerable<string> IGeoSuggestContext.Precision { get; set; }
 
 		public GeoSuggestContextDescriptor<T> Precision(params string[] precisions) => Assign(a => a.Precision = precisions);
 
diff --git a/src/Nest/Search/Suggesters/ContextSuggester/ISuggestContext.cs b/src/Nest/Search/Suggesters/ContextSuggester/ISuggestContext.cs
index bd59b3a7c76..bc2230cdc93 100644
--- a/src/Nest/Search/Suggesters/ContextSuggester/ISuggestContext.cs
+++ b/src/Nest/Search/Suggesters/ContextSuggester/ISuggestContext.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
-using System.Collections.Generic;
 
 namespace Nest
 {
@@ -12,28 +11,28 @@ public interface ISuggestContext
 		[JsonProperty("name")]
 		string Name { get; set; }
 
-		[JsonProperty("type")]
-		string Type { get; }
-
 		[JsonProperty("path")]
 		Field Path { get; set; }
+
+		[JsonProperty("type")]
+		string Type { get; }
 	}
 
 	public abstract class SuggestContextBase : ISuggestContext
 	{
 		public string Name { get; set; }
-		public abstract string Type { get; }
 		public Field Path { get; set; }
+		public abstract string Type { get; }
 	}
 
 	public abstract class SuggestContextDescriptorBase<TDescriptor, TInterface, T> : DescriptorBase<TDescriptor, TInterface>, ISuggestContext
 		where TDescriptor : SuggestContextDescriptorBase<TDescriptor, TInterface, T>, TInterface, ISuggestContext
 		where TInterface : class, ISuggestContext
 	{
-		string ISuggestContext.Name { get; set; }
 		protected abstract string Type { get; }
-		string ISuggestContext.Type => this.Type;
+		string ISuggestContext.Name { get; set; }
 		Field ISuggestContext.Path { get; set; }
+		string ISuggestContext.Type => Type;
 
 		public TDescriptor Name(string name) => Assign(a => a.Name = name);
 
diff --git a/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextJsonConverter.cs b/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextJsonConverter.cs
index 378d4f8cec1..42367a59c51 100644
--- a/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextJsonConverter.cs
+++ b/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextJsonConverter.cs
@@ -8,6 +8,7 @@ internal class SuggestContextJsonConverter : JsonConverter
 	{
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
+
 		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -15,21 +16,22 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var jo = JObject.Load(reader);
 			var prop = jo.Property("type");
 			if (prop == null) return null;
-			switch(prop.Value.Value<string>())
-			{
-				case "geo":
-					var g = new GeoSuggestContext();
-					serializer.Populate(jo.CreateReader(), g);
-					return g;
-
-				case "category":
-				default:
-					var c = new CategorySuggestContext();
-					serializer.Populate(jo.CreateReader(), c);
-					return c;
+
+			switch (prop.Value.Value<string>())
+			{
+				case "geo":
+					var g = new GeoSuggestContext();
+					serializer.Populate(jo.CreateReader(), g);
+					return g;
+
+				case "category":
+				default:
+					var c = new CategorySuggestContext();
+					serializer.Populate(jo.CreateReader(), c);
+					return c;
 			}
 		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { }
 	}
-}
+}
diff --git a/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextQuery.cs b/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextQuery.cs
index ed1ab3eb52e..aa22b883ade 100644
--- a/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextQuery.cs
+++ b/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextQuery.cs
@@ -1,9 +1,7 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -11,20 +9,20 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SuggestContextQuery>))]
 	public interface ISuggestContextQuery
 	{
-		[JsonProperty("context")]
-		Context Context { get; set; }
-
 		[JsonProperty("boost")]
 		double? Boost { get; set; }
 
-		[JsonProperty("prefix")]
-		bool? Prefix { get; set; }
+		[JsonProperty("context")]
+		Context Context { get; set; }
+
+		[JsonProperty("neighbours")]
+		Union<Distance[], int[]> Neighbours { get; set; }
 
 		[JsonProperty("precision")]
 		Union<Distance, int> Precision { get; set; }
 
-		[JsonProperty("neighbours")]
-		Union<Distance[], int[]> Neighbours { get; set; }
+		[JsonProperty("prefix")]
+		bool? Prefix { get; set; }
 	}
 
 	public class SuggestContextQuery : ISuggestContextQuery
@@ -71,10 +69,12 @@ public class SuggestContextQueriesDescriptor<T>
 	{
 		public SuggestContextQueriesDescriptor() : base(new Dictionary<string, IList<ISuggestContextQuery>>()) { }
 
-		public SuggestContextQueriesDescriptor<T> Context(string name, params Func<SuggestContextQueryDescriptor<T>, ISuggestContextQuery>[] categoryDescriptors) =>
+		public SuggestContextQueriesDescriptor<T> Context(string name,
+			params Func<SuggestContextQueryDescriptor<T>, ISuggestContextQuery>[] categoryDescriptors
+		) =>
 			AddContextQueries(name, categoryDescriptors?.Select(d => d?.Invoke(new SuggestContextQueryDescriptor<T>())).ToList());
 
 		private SuggestContextQueriesDescriptor<T> AddContextQueries(string name, List<ISuggestContextQuery> contextQueries) =>
-			contextQueries == null ? this : this.Assign(a => a.Add(name, contextQueries));
+			contextQueries == null ? this : Assign(a => a.Add(name, contextQueries));
 	}
 }
diff --git a/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextsDescriptor.cs b/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextsDescriptor.cs
index 6ba9c05b22f..0b3e37ab7a5 100644
--- a/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextsDescriptor.cs
+++ b/src/Nest/Search/Suggesters/ContextSuggester/SuggestContextsDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -16,7 +15,6 @@ public SuggestContextsDescriptor<T> Category(Func<CategorySuggestContextDescript
 		public SuggestContextsDescriptor<T> GeoLocation(Func<GeoSuggestContextDescriptor<T>, IGeoSuggestContext> geoLocationDescriptor) =>
 			AddContext(geoLocationDescriptor?.Invoke(new GeoSuggestContextDescriptor<T>()));
 
-		private SuggestContextsDescriptor<T> AddContext(ISuggestContext context) => context == null ? this : this.Assign(a => a.Add(context));
-
+		private SuggestContextsDescriptor<T> AddContext(ISuggestContext context) => context == null ? this : Assign(a => a.Add(context));
 	}
 }
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/DirectGenerator.cs b/src/Nest/Search/Suggesters/PhraseSuggester/DirectGenerator.cs
index 4d38aee9e2c..17e2530f495 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/DirectGenerator.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/DirectGenerator.cs
@@ -13,67 +13,67 @@ public interface IDirectGenerator
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("size")]
-		int? Size { get; set; }
-
-		[JsonProperty("prefix_length")]
-		int? PrefixLength { get; set; }
-
-		[JsonProperty("suggest_mode")]
-		[JsonConverter(typeof(StringEnumConverter))]
-		SuggestMode? SuggestMode { get; set; }
-
-		[JsonProperty("min_word_length")]
-		int? MinWordLength { get; set; }
-
 		[JsonProperty("max_edits")]
 		int? MaxEdits { get; set; }
 
 		[JsonProperty("max_inspections")]
 		decimal? MaxInspections { get; set; }
 
+		[JsonProperty("max_term_freq")]
+		decimal? MaxTermFrequency { get; set; }
+
 		[JsonProperty("min_doc_freq")]
 		decimal? MinDocFrequency { get; set; }
 
-		[JsonProperty("max_term_freq")]
-		decimal? MaxTermFrequency { get; set; }
+		[JsonProperty("min_word_length")]
+		int? MinWordLength { get; set; }
+
+		[JsonProperty("post_filter")]
+		string PostFilter { get; set; }
 
 		[JsonProperty("pre_filter")]
 		string PreFilter { get; set; }
 
-		[JsonProperty("post_filter")]
-		string PostFilter { get; set; }
+		[JsonProperty("prefix_length")]
+		int? PrefixLength { get; set; }
+
+		[JsonProperty("size")]
+		int? Size { get; set; }
+
+		[JsonProperty("suggest_mode")]
+		[JsonConverter(typeof(StringEnumConverter))]
+		SuggestMode? SuggestMode { get; set; }
 	}
 
 	public class DirectGenerator : IDirectGenerator
 	{
 		public Field Field { get; set; }
-		public int? Size { get; set; }
-		public int? PrefixLength { get; set; }
-		public SuggestMode? SuggestMode { get; set; }
-		public int? MinWordLength { get; set; }
 		public int? MaxEdits { get; set; }
 		public decimal? MaxInspections { get; set; }
-		public decimal? MinDocFrequency { get; set; }
 		public decimal? MaxTermFrequency { get; set; }
-		public string PreFilter { get; set; }
+		public decimal? MinDocFrequency { get; set; }
+		public int? MinWordLength { get; set; }
 		public string PostFilter { get; set; }
+		public string PreFilter { get; set; }
+		public int? PrefixLength { get; set; }
+		public int? Size { get; set; }
+		public SuggestMode? SuggestMode { get; set; }
 	}
 
 	public class DirectGeneratorDescriptor<T> : DescriptorBase<DirectGeneratorDescriptor<T>, IDirectGenerator>, IDirectGenerator
 		where T : class
 	{
 		Field IDirectGenerator.Field { get; set; }
-		int? IDirectGenerator.Size { get; set; }
-		int? IDirectGenerator.PrefixLength { get; set; }
-		SuggestMode? IDirectGenerator.SuggestMode { get; set; }
-		int? IDirectGenerator.MinWordLength { get; set; }
 		int? IDirectGenerator.MaxEdits { get; set; }
 		decimal? IDirectGenerator.MaxInspections { get; set; }
-		decimal? IDirectGenerator.MinDocFrequency { get; set; }
 		decimal? IDirectGenerator.MaxTermFrequency { get; set; }
-		string IDirectGenerator.PreFilter { get; set; }
+		decimal? IDirectGenerator.MinDocFrequency { get; set; }
+		int? IDirectGenerator.MinWordLength { get; set; }
 		string IDirectGenerator.PostFilter { get; set; }
+		string IDirectGenerator.PreFilter { get; set; }
+		int? IDirectGenerator.PrefixLength { get; set; }
+		int? IDirectGenerator.Size { get; set; }
+		SuggestMode? IDirectGenerator.SuggestMode { get; set; }
 
 		public DirectGeneratorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
@@ -98,6 +98,5 @@ public class DirectGeneratorDescriptor<T> : DescriptorBase<DirectGeneratorDescri
 		public DirectGeneratorDescriptor<T> PreFilter(string preFilter) => Assign(a => a.PreFilter = preFilter);
 
 		public DirectGeneratorDescriptor<T> PostFilter(string postFilter) => Assign(a => a.PostFilter = postFilter);
-
 	}
 }
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs
index fe28e8c7174..1d110aafc7b 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs
@@ -13,45 +13,45 @@ namespace Nest
 	public interface IPhraseSuggestCollate
 	{
 		/// <summary>
-		/// The collate query to run.
+		/// The parameters for the query. the suggestion value will be added to the variables you specify.
 		/// </summary>
-		[JsonProperty("query")]
-		IPhraseSuggestCollateQuery Query { get; set; }
+		[JsonProperty("params")]
+		IDictionary<string, object> Params { get; set; }
 
 		/// <summary>
 		/// Controls if all phrase suggestions will be returned. When set to <c>true</c>, the suggestions will have
 		/// an additional option collate_match, which will be <c>true</c> if matching documents for the phrase was found,
-		/// <c>false</c> otherwise. The default value for <see cref="Prune"/> is <c>false</c>.
+		/// <c>false</c> otherwise. The default value for <see cref="Prune" /> is <c>false</c>.
 		/// </summary>
 		[JsonProperty("prune")]
 		bool? Prune { get; set; }
 
 		/// <summary>
-		/// The parameters for the query. the suggestion value will be added to the variables you specify.
+		/// The collate query to run.
 		/// </summary>
-		[JsonProperty("params")]
-		IDictionary<string, object> Params { get; set; }
+		[JsonProperty("query")]
+		IPhraseSuggestCollateQuery Query { get; set; }
 	}
 
 	/// <inheritdoc />
 	public class PhraseSuggestCollate : IPhraseSuggestCollate
 	{
 		/// <inheritdoc />
-		public IPhraseSuggestCollateQuery Query { get; set; }
+		public IDictionary<string, object> Params { get; set; }
 
 		/// <inheritdoc />
 		public bool? Prune { get; set; }
 
 		/// <inheritdoc />
-		public IDictionary<string, object> Params { get; set; }
+		public IPhraseSuggestCollateQuery Query { get; set; }
 	}
 
 	public class PhraseSuggestCollateDescriptor<T> : DescriptorBase<PhraseSuggestCollateDescriptor<T>, IPhraseSuggestCollate>, IPhraseSuggestCollate
 		where T : class
 	{
-		IPhraseSuggestCollateQuery IPhraseSuggestCollate.Query { get; set; }
 		IDictionary<string, object> IPhraseSuggestCollate.Params { get; set; }
 		bool? IPhraseSuggestCollate.Prune { get; set; }
+		IPhraseSuggestCollateQuery IPhraseSuggestCollate.Query { get; set; }
 
 		/// <summary>
 		/// The collate query to run
@@ -62,7 +62,7 @@ public PhraseSuggestCollateDescriptor<T> Query(Func<PhraseSuggestCollateQueryDes
 		/// <summary>
 		/// Controls if all phrase suggestions will be returned. When set to <c>true</c>, the suggestions will have
 		/// an additional option collate_match, which will be <c>true</c> if matching documents for the phrase was found,
-		/// <c>false</c> otherwise. The default value for <see cref="Prune"/> is <c>false</c>.
+		/// <c>false</c> otherwise. The default value for <see cref="Prune" /> is <c>false</c>.
 		/// </summary>
 		public PhraseSuggestCollateDescriptor<T> Prune(bool? prune = true) => Assign(a => a.Prune = prune);
 
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollateQuery.cs b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollateQuery.cs
index cda0adaf204..67df2380b2e 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollateQuery.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollateQuery.cs
@@ -9,35 +9,35 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<PhraseSuggestCollateQuery>))]
 	public interface IPhraseSuggestCollateQuery
 	{
-		/// <summary>
-		/// The source script to be executed
-		/// </summary>
-		[JsonProperty("source")]
-		string Source { get; set; }
-
 		/// <summary>
 		/// The id for a stored script to execute
 		/// </summary>
 		[JsonProperty("id")]
 		Id Id { get; set; }
+
+		/// <summary>
+		/// The source script to be executed
+		/// </summary>
+		[JsonProperty("source")]
+		string Source { get; set; }
 	}
 
 	/// <inheritdoc />
 	public class PhraseSuggestCollateQuery : IPhraseSuggestCollateQuery
 	{
 		/// <inheritdoc />
-		public string Source { get; set; }
+		public Id Id { get; set; }
 
 		/// <inheritdoc />
-		public Id Id { get; set; }
+		public string Source { get; set; }
 	}
 
 	/// <inheritdoc />
-	public class PhraseSuggestCollateQueryDescriptor :
-		DescriptorBase<PhraseSuggestCollateQueryDescriptor, IPhraseSuggestCollateQuery>, IPhraseSuggestCollateQuery
+	public class PhraseSuggestCollateQueryDescriptor
+		: DescriptorBase<PhraseSuggestCollateQueryDescriptor, IPhraseSuggestCollateQuery>, IPhraseSuggestCollateQuery
 	{
-		string IPhraseSuggestCollateQuery.Source { get; set; }
 		Id IPhraseSuggestCollateQuery.Id { get; set; }
+		string IPhraseSuggestCollateQuery.Source { get; set; }
 
 		/// <inheritdoc />
 		public PhraseSuggestCollateQueryDescriptor Source(string source) => Assign(a => a.Source = source);
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestHighlight.cs b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestHighlight.cs
index fce910de237..c62fa9abb9c 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestHighlight.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestHighlight.cs
@@ -5,25 +5,23 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IPhraseSuggestHighlight
 	{
-		[JsonProperty("pre_tag")]
-		string PreTag { get; set; }
-
 		[JsonProperty("post_tag")]
 		string PostTag { get; set; }
+
+		[JsonProperty("pre_tag")]
+		string PreTag { get; set; }
 	}
 
 	public class PhraseSuggestHighlight : IPhraseSuggestHighlight
 	{
-		public string PreTag { get; set; }
-
 		public string PostTag { get; set; }
+		public string PreTag { get; set; }
 	}
 
 	public class PhraseSuggestHighlightDescriptor : DescriptorBase<PhraseSuggestHighlightDescriptor, IPhraseSuggestHighlight>, IPhraseSuggestHighlight
 	{
-		string IPhraseSuggestHighlight.PreTag { get; set; }
-
 		string IPhraseSuggestHighlight.PostTag { get; set; }
+		string IPhraseSuggestHighlight.PreTag { get; set; }
 
 		public PhraseSuggestHighlightDescriptor PreTag(string preTag) => Assign(a => a.PreTag = preTag);
 
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggester.cs b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggester.cs
index 722f01d7ef5..1540cd0bbd2 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggester.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggester.cs
@@ -9,79 +9,79 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<PhraseSuggester>))]
 	public interface IPhraseSuggester : ISuggester
 	{
-		[JsonIgnore]
-		string Text { get; set; }
+		[JsonProperty("collate")]
+		IPhraseSuggestCollate Collate { get; set; }
 
-		[JsonProperty("shard_size")]
-		int? ShardSize { get; set; }
+		[JsonProperty("confidence")]
+		double? Confidence { get; set; }
+
+		[JsonProperty("direct_generator")]
+		IEnumerable<IDirectGenerator> DirectGenerator { get; set; }
+
+		[JsonProperty("force_unigrams")]
+		bool? ForceUnigrams { get; set; }
 
 		[JsonProperty("gram_size")]
 		int? GramSize { get; set; }
 
-		[JsonProperty("real_word_error_likelihood")]
-		double? RealWordErrorLikelihood { get; set; }
-
-		[JsonProperty("confidence")]
-		double? Confidence { get; set; }
+		[JsonProperty("highlight")]
+		IPhraseSuggestHighlight Highlight { get; set; }
 
 		[JsonProperty("max_errors")]
 		double? MaxErrors { get; set; }
 
+		[JsonProperty("real_word_error_likelihood")]
+		double? RealWordErrorLikelihood { get; set; }
+
 		[JsonProperty("separator")]
 		char? Separator { get; set; }
 
-		[JsonProperty("direct_generator")]
-		IEnumerable<IDirectGenerator> DirectGenerator { get; set; }
-
-		[JsonProperty("highlight")]
-		IPhraseSuggestHighlight Highlight { get; set; }
-
-		[JsonProperty("collate")]
-		IPhraseSuggestCollate Collate { get; set; }
+		[JsonProperty("shard_size")]
+		int? ShardSize { get; set; }
 
 		[JsonProperty("smoothing")]
 		SmoothingModelContainer Smoothing { get; set; }
 
+		[JsonIgnore]
+		string Text { get; set; }
+
 		[JsonProperty("token_limit")]
 		int? TokenLimit { get; set; }
-
-		[JsonProperty("force_unigrams")]
-		bool? ForceUnigrams { get; set; }
 	}
 
 	public class PhraseSuggester : SuggesterBase, IPhraseSuggester
 	{
-		public string Text { get; set; }
-		public int? ShardSize { get; set; }
-		public int? GramSize { get; set; }
-		public double? RealWordErrorLikelihood { get; set; }
+		public IPhraseSuggestCollate Collate { get; set; }
 		public double? Confidence { get; set; }
-		public double? MaxErrors { get; set; }
-		public char? Separator { get; set; }
 		public IEnumerable<IDirectGenerator> DirectGenerator { get; set; }
+		public bool? ForceUnigrams { get; set; }
+		public int? GramSize { get; set; }
 		public IPhraseSuggestHighlight Highlight { get; set; }
-		public IPhraseSuggestCollate Collate { get; set; }
+		public double? MaxErrors { get; set; }
+		public double? RealWordErrorLikelihood { get; set; }
+		public char? Separator { get; set; }
+		public int? ShardSize { get; set; }
 		public SmoothingModelContainer Smoothing { get; set; }
+		public string Text { get; set; }
 		public int? TokenLimit { get; set; }
-		public bool? ForceUnigrams { get; set; }
 	}
 
 	public class PhraseSuggesterDescriptor<T> : SuggestDescriptorBase<PhraseSuggesterDescriptor<T>, IPhraseSuggester, T>, IPhraseSuggester
 		where T : class
 	{
-		string IPhraseSuggester.Text { get; set; }
-		int? IPhraseSuggester.ShardSize { get; set; }
-		int? IPhraseSuggester.GramSize { get; set; }
-		double? IPhraseSuggester.RealWordErrorLikelihood { get; set; }
+		IPhraseSuggestCollate IPhraseSuggester.Collate { get; set; }
 		double? IPhraseSuggester.Confidence { get; set; }
-		double? IPhraseSuggester.MaxErrors { get; set; }
-		char? IPhraseSuggester.Separator { get; set; }
 		IEnumerable<IDirectGenerator> IPhraseSuggester.DirectGenerator { get; set; }
+		bool? IPhraseSuggester.ForceUnigrams { get; set; }
+		int? IPhraseSuggester.GramSize { get; set; }
 		IPhraseSuggestHighlight IPhraseSuggester.Highlight { get; set; }
-		IPhraseSuggestCollate IPhraseSuggester.Collate { get; set; }
+		double? IPhraseSuggester.MaxErrors { get; set; }
+		double? IPhraseSuggester.RealWordErrorLikelihood { get; set; }
+		char? IPhraseSuggester.Separator { get; set; }
+		int? IPhraseSuggester.ShardSize { get; set; }
 		SmoothingModelContainer IPhraseSuggester.Smoothing { get; set; }
+		string IPhraseSuggester.Text { get; set; }
 		int? IPhraseSuggester.TokenLimit { get; set; }
-		bool? IPhraseSuggester.ForceUnigrams { get; set; }
 
 		public PhraseSuggesterDescriptor<T> Text(string text) => Assign(a => a.Text = text);
 
@@ -96,13 +96,13 @@ public class PhraseSuggesterDescriptor<T> : SuggestDescriptorBase<PhraseSuggeste
 		public PhraseSuggesterDescriptor<T> Separator(char? separator) => Assign(a => a.Separator = separator);
 
 		public PhraseSuggesterDescriptor<T> DirectGenerator(params Func<DirectGeneratorDescriptor<T>, IDirectGenerator>[] generators) =>
-			Assign(a=>a.DirectGenerator = generators.Select(g => g(new DirectGeneratorDescriptor<T>())).ToList());
+			Assign(a => a.DirectGenerator = generators.Select(g => g(new DirectGeneratorDescriptor<T>())).ToList());
 
 		public PhraseSuggesterDescriptor<T> RealWordErrorLikelihood(double? realWordErrorLikelihood) =>
 			Assign(a => a.RealWordErrorLikelihood = realWordErrorLikelihood);
 
 		public PhraseSuggesterDescriptor<T> Highlight(Func<PhraseSuggestHighlightDescriptor, IPhraseSuggestHighlight> selector) =>
-			Assign(a=> a.Highlight = selector?.Invoke(new PhraseSuggestHighlightDescriptor()));
+			Assign(a => a.Highlight = selector?.Invoke(new PhraseSuggestHighlightDescriptor()));
 
 		public PhraseSuggesterDescriptor<T> Collate(Func<PhraseSuggestCollateDescriptor<T>, IPhraseSuggestCollate> selector) =>
 			Assign(a => a.Collate = selector?.Invoke(new PhraseSuggestCollateDescriptor<T>()));
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/LaplaceSmoothingModel.cs b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/LaplaceSmoothingModel.cs
index 7ed4e7b3542..ebd90776196 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/LaplaceSmoothingModel.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/LaplaceSmoothingModel.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System;
 
 namespace Nest
 {
@@ -20,7 +19,7 @@ public class LaplaceSmoothingModel : SmoothingModelBase, ILaplaceSmoothingModel
 
 	public class LaplaceSmoothingModelDescriptor : DescriptorBase<LaplaceSmoothingModelDescriptor, ILaplaceSmoothingModel>, ILaplaceSmoothingModel
 	{
-		double? ILaplaceSmoothingModel.Alpha{ get; set; }
+		double? ILaplaceSmoothingModel.Alpha { get; set; }
 
 		public LaplaceSmoothingModelDescriptor Alpha(double? alpha) => Assign(a => a.Alpha = alpha);
 	}
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/LinearInterpolationSmoothingModel.cs b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/LinearInterpolationSmoothingModel.cs
index 0c2976ee382..d11d049b822 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/LinearInterpolationSmoothingModel.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/LinearInterpolationSmoothingModel.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System;
 
 namespace Nest
 {
@@ -7,31 +6,36 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<LinearInterpolationSmoothingModel>))]
 	public interface ILinearInterpolationSmoothingModel : ISmoothingModel
 	{
-		[JsonProperty("trigram_lambda")]
-		double? TrigramLambda { get; set; }
 		[JsonProperty("bigram_lambda")]
 		double? BigramLambda { get; set; }
+
+		[JsonProperty("trigram_lambda")]
+		double? TrigramLambda { get; set; }
+
 		[JsonProperty("unigram_lambda")]
 		double? UnigramLambda { get; set; }
 	}
 
 	public class LinearInterpolationSmoothingModel : SmoothingModelBase, ILinearInterpolationSmoothingModel
 	{
-		public double? TrigramLambda { get; set; }
 		public double? BigramLambda { get; set; }
+		public double? TrigramLambda { get; set; }
 		public double? UnigramLambda { get; set; }
 
 		internal override void WrapInContainer(ISmoothingModelContainer container) => container.LinearInterpolation = this;
 	}
 
-	public class LinearInterpolationSmoothingModelDescriptor : DescriptorBase<LinearInterpolationSmoothingModelDescriptor, ILinearInterpolationSmoothingModel>, ILinearInterpolationSmoothingModel
+	public class LinearInterpolationSmoothingModelDescriptor
+		: DescriptorBase<LinearInterpolationSmoothingModelDescriptor, ILinearInterpolationSmoothingModel>, ILinearInterpolationSmoothingModel
 	{
+		double? ILinearInterpolationSmoothingModel.BigramLambda { get; set; }
 		double? ILinearInterpolationSmoothingModel.TrigramLambda { get; set; }
 		double? ILinearInterpolationSmoothingModel.UnigramLambda { get; set; }
-		double? ILinearInterpolationSmoothingModel.BigramLambda { get; set; }
 
 		public LinearInterpolationSmoothingModelDescriptor TrigramLambda(double? lambda) => Assign(a => a.TrigramLambda = lambda);
+
 		public LinearInterpolationSmoothingModelDescriptor UnigramLambda(double? lambda) => Assign(a => a.UnigramLambda = lambda);
+
 		public LinearInterpolationSmoothingModelDescriptor BigramLambda(double? lambda) => Assign(a => a.BigramLambda = lambda);
 	}
 }
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/SmoothingModelBase.cs b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/SmoothingModelBase.cs
index 2c517130bbd..21161008dcc 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/SmoothingModelBase.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/SmoothingModelBase.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface ISmoothingModel {}
+	public interface ISmoothingModel { }
 
 	public abstract class SmoothingModelBase
 	{
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/SmoothingModelContainer.cs b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/SmoothingModelContainer.cs
index ef79e8b9eeb..cae88259a0b 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/SmoothingModelContainer.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/SmoothingModelContainer.cs
@@ -7,20 +7,20 @@ namespace Nest
 	[JsonConverter(typeof(ReserializeJsonConverter<SmoothingModelContainer, ISmoothingModelContainer>))]
 	public interface ISmoothingModelContainer
 	{
-		[JsonProperty("stupid_backoff")]
-		IStupidBackoffSmoothingModel StupidBackoff { get; set; }
-
 		[JsonProperty("laplace")]
 		ILaplaceSmoothingModel Laplace { get; set; }
 
 		[JsonProperty("linear_interpolation")]
 		ILinearInterpolationSmoothingModel LinearInterpolation { get; set; }
+
+		[JsonProperty("stupid_backoff")]
+		IStupidBackoffSmoothingModel StupidBackoff { get; set; }
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
 	public class SmoothingModelContainer : ISmoothingModelContainer, IDescriptor
 	{
-		internal SmoothingModelContainer() {}
+		internal SmoothingModelContainer() { }
 
 		public SmoothingModelContainer(SmoothingModelBase model)
 		{
@@ -28,9 +28,10 @@ public SmoothingModelContainer(SmoothingModelBase model)
 			model.WrapInContainer(this);
 		}
 
-		IStupidBackoffSmoothingModel ISmoothingModelContainer.StupidBackoff { get; set; }
 		ILaplaceSmoothingModel ISmoothingModelContainer.Laplace { get; set; }
 		ILinearInterpolationSmoothingModel ISmoothingModelContainer.LinearInterpolation { get; set; }
+
+		IStupidBackoffSmoothingModel ISmoothingModelContainer.StupidBackoff { get; set; }
 	}
 
 	public class SmoothingModelContainerDescriptor : SmoothingModelContainer
@@ -40,7 +41,9 @@ public class SmoothingModelContainerDescriptor : SmoothingModelContainer
 		public SmoothingModelContainerDescriptor StupidBackoff(Func<StupidBackoffSmoothingModelDescriptor, IStupidBackoffSmoothingModel> selector) =>
 			Assign(a => a.StupidBackoff = selector?.InvokeOrDefault(new StupidBackoffSmoothingModelDescriptor()));
 
-		public SmoothingModelContainerDescriptor LinearInterpolation(Func<LinearInterpolationSmoothingModelDescriptor, ILinearInterpolationSmoothingModel> selector) =>
+		public SmoothingModelContainerDescriptor LinearInterpolation(
+			Func<LinearInterpolationSmoothingModelDescriptor, ILinearInterpolationSmoothingModel> selector
+		) =>
 			Assign(a => a.LinearInterpolation = selector?.InvokeOrDefault(new LinearInterpolationSmoothingModelDescriptor()));
 
 		public SmoothingModelContainerDescriptor Laplace(Func<LaplaceSmoothingModelDescriptor, ILaplaceSmoothingModel> selector) =>
diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/StupidBackoffSmoothingModel.cs b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/StupidBackoffSmoothingModel.cs
index cdb5cdfe58d..2e40014dd57 100644
--- a/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/StupidBackoffSmoothingModel.cs
+++ b/src/Nest/Search/Suggesters/PhraseSuggester/SmoothingModel/StupidBackoffSmoothingModel.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System;
 
 namespace Nest
 {
@@ -18,9 +17,10 @@ public class StupidBackoffSmoothingModel : SmoothingModelBase, IStupidBackoffSmo
 		internal override void WrapInContainer(ISmoothingModelContainer container) => container.StupidBackoff = this;
 	}
 
-	public class StupidBackoffSmoothingModelDescriptor : DescriptorBase<StupidBackoffSmoothingModelDescriptor, IStupidBackoffSmoothingModel>, IStupidBackoffSmoothingModel
+	public class StupidBackoffSmoothingModelDescriptor
+		: DescriptorBase<StupidBackoffSmoothingModelDescriptor, IStupidBackoffSmoothingModel>, IStupidBackoffSmoothingModel
 	{
-		double? IStupidBackoffSmoothingModel.Discount{ get; set; }
+		double? IStupidBackoffSmoothingModel.Discount { get; set; }
 
 		public StupidBackoffSmoothingModelDescriptor Discount(double? discount) => Assign(a => a.Discount = discount);
 	}
diff --git a/src/Nest/Search/Suggesters/Suggest.cs b/src/Nest/Search/Suggesters/Suggest.cs
index 8e62e14f95c..adb76dc5f8b 100644
--- a/src/Nest/Search/Suggesters/Suggest.cs
+++ b/src/Nest/Search/Suggesters/Suggest.cs
@@ -8,11 +8,14 @@ public class Suggest<T> where T : class
 	{
 		[JsonProperty("length")]
 		public int Length { get; internal set; }
+
 		[JsonProperty("offset")]
 		public int Offset { get; internal set; }
-		[JsonProperty("text")]
-		public string Text { get; internal set; }
+
 		[JsonProperty("options")]
 		public IReadOnlyCollection<SuggestOption<T>> Options { get; internal set; } = EmptyReadOnly<SuggestOption<T>>.Collection;
+
+		[JsonProperty("text")]
+		public string Text { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Suggesters/SuggestBucket.cs b/src/Nest/Search/Suggesters/SuggestBucket.cs
index 3ff36a7d2fc..8c3ee384121 100644
--- a/src/Nest/Search/Suggesters/SuggestBucket.cs
+++ b/src/Nest/Search/Suggesters/SuggestBucket.cs
@@ -6,8 +6,11 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SuggestBucket>))]
 	public interface ISuggestBucket
 	{
-		[JsonProperty("text")]
-		string Text { get; set; }
+		[JsonProperty("completion")]
+		ICompletionSuggester Completion { get; set; }
+
+		[JsonProperty("phrase")]
+		IPhraseSuggester Phrase { get; set; }
 
 		[JsonProperty("prefix")]
 		string Prefix { get; set; }
@@ -18,25 +21,21 @@ public interface ISuggestBucket
 		[JsonProperty("term")]
 		ITermSuggester Term { get; set; }
 
-		[JsonProperty("phrase")]
-		IPhraseSuggester Phrase { get; set; }
-
-		[JsonProperty("completion")]
-		ICompletionSuggester Completion { get; set; }
+		[JsonProperty("text")]
+		string Text { get; set; }
 	}
 
 	public class SuggestBucket : ISuggestBucket
 	{
-		public string Text { get; set; }
+		public ICompletionSuggester Completion { get; set; }
+
+		public IPhraseSuggester Phrase { get; set; }
 
 		public string Prefix { get; set; }
 
 		public string Regex { get; set; }
 
 		public ITermSuggester Term { get; set; }
-
-		public IPhraseSuggester Phrase { get; set; }
-
-		public ICompletionSuggester Completion { get; set; }
+		public string Text { get; set; }
 	}
 }
diff --git a/src/Nest/Search/Suggesters/SuggestContainer.cs b/src/Nest/Search/Suggesters/SuggestContainer.cs
index 14c64bbe992..8b80013f8e3 100644
--- a/src/Nest/Search/Suggesters/SuggestContainer.cs
+++ b/src/Nest/Search/Suggesters/SuggestContainer.cs
@@ -10,13 +10,14 @@ public interface ISuggestContainer : IIsADictionary<string, ISuggestBucket> { }
 
 	public class SuggestContainer : IsADictionaryBase<string, ISuggestBucket>, ISuggestContainer
 	{
-		public SuggestContainer() {}
+		public SuggestContainer() { }
+
 		public SuggestContainer(IDictionary<string, ISuggestBucket> container) : base(container) { }
+
 		public SuggestContainer(Dictionary<string, ISuggestBucket> container)
-			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value))
-		{}
+			: base(container.Select(kv => kv).ToDictionary(kv => kv.Key, kv => kv.Value)) { }
 
-		public void Add(string name, ISuggestBucket script) => this.BackingDictionary.Add(name, script);
+		public void Add(string name, ISuggestBucket script) => BackingDictionary.Add(name, script);
 	}
 
 	public class SuggestContainerDescriptor<T>
@@ -35,24 +36,37 @@ private SuggestContainerDescriptor<T> AssignToBucket<TSuggester>(string name, TS
 
 		/// <summary>
 		/// The term suggester suggests terms based on edit distance. The provided suggest text is analyzed before terms are suggested.
-		/// The suggested terms are provided per analyzed suggest text token. The term suggester doesn’t take the query into account that is part of request.
+		/// The suggested terms are provided per analyzed suggest text token. The term suggester doesn’t take the query into account that is part of
+		/// request.
 		/// </summary>
 		public SuggestContainerDescriptor<T> Term(string name, Func<TermSuggesterDescriptor<T>, ITermSuggester> suggest) =>
-			AssignToBucket(name, suggest?.Invoke(new TermSuggesterDescriptor<T>()), (b, s) => { b.Term = s; b.Text = s.Text; });
+			AssignToBucket(name, suggest?.Invoke(new TermSuggesterDescriptor<T>()), (b, s) =>
+			{
+				b.Term = s;
+				b.Text = s.Text;
+			});
 
 		/// <summary>
 		/// The phrase suggester adds additional logic on top of the term suggester to select entire corrected phrases
 		/// instead of individual tokens weighted based on ngram-langugage models.
 		/// </summary>
 		public SuggestContainerDescriptor<T> Phrase(string name, Func<PhraseSuggesterDescriptor<T>, IPhraseSuggester> suggest) =>
-			AssignToBucket(name, suggest?.Invoke(new PhraseSuggesterDescriptor<T>()), (b, s) => { b.Phrase = s; b.Text = s.Text; });
+			AssignToBucket(name, suggest?.Invoke(new PhraseSuggesterDescriptor<T>()), (b, s) =>
+			{
+				b.Phrase = s;
+				b.Text = s.Text;
+			});
 
 		/// <summary>
 		/// The completion suggester is a so-called prefix suggester.
 		/// It does not do spell correction like the term or phrase suggesters but allows basic auto-complete functionality.
 		/// </summary>
 		public SuggestContainerDescriptor<T> Completion(string name, Func<CompletionSuggesterDescriptor<T>, ICompletionSuggester> suggest) =>
-			AssignToBucket(name, suggest?.Invoke(new CompletionSuggesterDescriptor<T>()), (b, s) => { b.Completion = s; b.Prefix = s.Prefix; b.Regex = s.Regex; });
-
+			AssignToBucket(name, suggest?.Invoke(new CompletionSuggesterDescriptor<T>()), (b, s) =>
+			{
+				b.Completion = s;
+				b.Prefix = s.Prefix;
+				b.Regex = s.Regex;
+			});
 	}
 }
diff --git a/src/Nest/Search/Suggesters/SuggestDictionary.cs b/src/Nest/Search/Suggesters/SuggestDictionary.cs
index 16e9291529b..358c2b98d33 100644
--- a/src/Nest/Search/Suggesters/SuggestDictionary.cs
+++ b/src/Nest/Search/Suggesters/SuggestDictionary.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -20,10 +19,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 	public class SuggestDictionary<T> : IsAReadOnlyDictionaryBase<string, Suggest<T>[]>
 		where T : class
 	{
-		public static SuggestDictionary<T> Default { get; } = new SuggestDictionary<T>(EmptyReadOnly<string, Suggest<T>[]>.Dictionary);
-
 		public SuggestDictionary(IReadOnlyDictionary<string, Suggest<T>[]> backingDictionary) : base(backingDictionary) { }
 
+		public static SuggestDictionary<T> Default { get; } = new SuggestDictionary<T>(EmptyReadOnly<string, Suggest<T>[]>.Dictionary);
+
 		protected override string Sanitize(string key)
 		{
 			//typed_keys = true results in suggest keys being returned as "<type>#<name>"
diff --git a/src/Nest/Search/Suggesters/SuggestOption.cs b/src/Nest/Search/Suggesters/SuggestOption.cs
index b65910979ce..01380d72cbd 100644
--- a/src/Nest/Search/Suggesters/SuggestOption.cs
+++ b/src/Nest/Search/Suggesters/SuggestOption.cs
@@ -1,25 +1,22 @@
-using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System.Linq;
-using System.Collections.Generic;
 
 namespace Nest
 {
 	[JsonObject]
 	public class SuggestOption<TDocument> where TDocument : class
 	{
-		[JsonProperty("text")]
-		public string Text { get; internal set; }
-
-		[JsonProperty("_score")]
-		internal double? DocumentScore { get; set; }
-
-		[JsonProperty("score")]
-		internal double? SuggestScore { get; set; }
+		/// <summary>
+		/// Phrase suggestions only, true if matching documents for the collate query were found,
+		/// </summary>
+		[JsonProperty("collate_match")]
+		public bool CollateMatch { get; internal set; }
 
-		[JsonIgnore]
-		public double Score => DocumentScore ?? SuggestScore ?? 0;
+		/// <summary>
+		/// Completion suggester only, the contexts associated with the completed document
+		/// </summary>
+		[JsonProperty("contexts")]
+		public IDictionary<string, IEnumerable<Context>> Contexts { get; internal set; }
 
 		/// <summary>
 		/// Term suggester only
@@ -28,16 +25,10 @@ public class SuggestOption<TDocument> where TDocument : class
 		public long Frequency { get; set; }
 
 		/// <summary>
-		/// Completion suggester only, the index of the completed document
-		/// </summary>
-		[JsonProperty("_index")]
-		public IndexName Index { get; internal set; }
-
-		/// <summary>
-		/// Completion suggester only, the type of the completed document
+		/// Phrase suggester only, higlighted version of text
 		/// </summary>
-		[JsonProperty("_type")]
-		public TypeName Type { get; internal set; }
+		[JsonProperty("highlighted")]
+		public string Highlighted { get; internal set; }
 
 		/// <summary>
 		/// Completion suggester only, the id of the completed document
@@ -45,6 +36,15 @@ public class SuggestOption<TDocument> where TDocument : class
 		[JsonProperty("_id")]
 		public Id Id { get; internal set; }
 
+		/// <summary>
+		/// Completion suggester only, the index of the completed document
+		/// </summary>
+		[JsonProperty("_index")]
+		public IndexName Index { get; internal set; }
+
+		[JsonIgnore]
+		public double Score => DocumentScore ?? SuggestScore ?? 0;
+
 		/// <summary>
 		/// Completion suggester only, the source of the completed document
 		/// </summary>
@@ -52,23 +52,19 @@ public class SuggestOption<TDocument> where TDocument : class
 		[JsonConverter(typeof(SourceConverter))]
 		public TDocument Source { get; internal set; }
 
-		/// <summary>
-		/// Completion suggester only, the contexts associated with the completed document
-		/// </summary>
-		[JsonProperty("contexts")]
-		public IDictionary<string, IEnumerable<Context>> Contexts { get; internal set; }
+		[JsonProperty("text")]
+		public string Text { get; internal set; }
 
 		/// <summary>
-		/// Phrase suggester only, higlighted version of text
+		/// Completion suggester only, the type of the completed document
 		/// </summary>
-		[JsonProperty("highlighted")]
-		public string Highlighted { get; internal set; }
+		[JsonProperty("_type")]
+		public TypeName Type { get; internal set; }
 
-		/// <summary>
-		/// Phrase suggestions only, true if matching documents for the collate query were found,
-		/// </summary>
-		[JsonProperty("collate_match")]
-		public bool CollateMatch { get; internal set; }
+		[JsonProperty("_score")]
+		internal double? DocumentScore { get; set; }
 
+		[JsonProperty("score")]
+		internal double? SuggestScore { get; set; }
 	}
 }
diff --git a/src/Nest/Search/Suggesters/TermSuggester/StringDistance.cs b/src/Nest/Search/Suggesters/TermSuggester/StringDistance.cs
index dee09676907..b73fb6f1f5b 100644
--- a/src/Nest/Search/Suggesters/TermSuggester/StringDistance.cs
+++ b/src/Nest/Search/Suggesters/TermSuggester/StringDistance.cs
@@ -1,11 +1,6 @@
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -14,32 +9,40 @@ public enum StringDistance
 	{
 		[EnumMember(Value = "internal")]
 		Internal,
+
 		[EnumMember(Value = "damerau_levenshtein")]
 		DamerauLevenshtein,
+
 		/// <summary>
 		/// Use for Elasticsearch 6.2.0+
 		/// </summary>
-		/// <remarks>Use Levenstein for Elasticsearch < 6.2.0</remarks>
+		/// <remarks>
+		/// Use Levenstein for Elasticsearch < 6.2.0</remarks>
 		[EnumMember(Value = "levenshtein")]
 		Levenshtein,
+
 		/// <summary>
 		/// Use for Elasticsearch < 6.2.0
 		/// </summary>
 		/// <remarks>Use Levenshtein for Elasticsearch 6.2.0+</remarks>
 		[EnumMember(Value = "levenstein")]
 		Levenstein,
+
 		/// <summary>
 		/// Use for Elasticsearch < 6.2.0
 		/// </summary>
 		/// <remarks>Use Jaro_winkler for Elasticsearch 6.2.0+</remarks>
 		[EnumMember(Value = "jarowinkler")]
 		Jarowinkler,
+
 		/// <summary>
 		/// Use for Elasticsearch 6.2.0+
 		/// </summary>
-		/// <remarks>Use Jarowinkler for Elasticsearch < 6.2.0</remarks>
+		/// <remarks>
+		/// Use Jarowinkler for Elasticsearch < 6.2.0</remarks>
 		[EnumMember(Value = "jaro_winkler")]
 		Jaro_winkler,
+
 		[EnumMember(Value = "ngram")]
 		Ngram
 	}
diff --git a/src/Nest/Search/Suggesters/TermSuggester/SuggestSort.cs b/src/Nest/Search/Suggesters/TermSuggester/SuggestSort.cs
index 448bb4437d8..7c99aab728c 100644
--- a/src/Nest/Search/Suggesters/TermSuggester/SuggestSort.cs
+++ b/src/Nest/Search/Suggesters/TermSuggester/SuggestSort.cs
@@ -1,11 +1,6 @@
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest
 {
@@ -14,6 +9,7 @@ public enum SuggestSort
 	{
 		[EnumMember(Value = "score")]
 		Score,
+
 		[EnumMember(Value = "frequency")]
 		Frequency
 	}
diff --git a/src/Nest/Search/Suggesters/TermSuggester/TermSuggester.cs b/src/Nest/Search/Suggesters/TermSuggester/TermSuggester.cs
index d1e24e3c2d2..58efd8a94e3 100644
--- a/src/Nest/Search/Suggesters/TermSuggester/TermSuggester.cs
+++ b/src/Nest/Search/Suggesters/TermSuggester/TermSuggester.cs
@@ -1,5 +1,4 @@
-using System;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -9,21 +8,8 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<TermSuggester>))]
 	public interface ITermSuggester : ISuggester
 	{
-		[JsonIgnore]
-		string Text { get; set; }
-
-		[JsonProperty("shard_size")]
-		int? ShardSize { get; set; }
-
-		[JsonProperty("prefix_length")]
-		int? PrefixLength { get; set; }
-
-		[JsonProperty("suggest_mode")]
-		[JsonConverter(typeof(StringEnumConverter))]
-		SuggestMode? SuggestMode { get; set; }
-
-		[JsonProperty("min_word_length")]
-		int? MinWordLength { get; set; }
+		[JsonProperty("lowercase_terms")]
+		bool? LowercaseTerms { get; set; }
 
 		[JsonProperty("max_edits")]
 		int? MaxEdits { get; set; }
@@ -31,66 +17,78 @@ public interface ITermSuggester : ISuggester
 		[JsonProperty("max_inspections")]
 		int? MaxInspections { get; set; }
 
+		[JsonProperty("max_term_freq")]
+		decimal? MaxTermFrequency { get; set; }
+
 		[JsonProperty("min_doc_freq")]
 		decimal? MinDocFrequency { get; set; }
 
-		[JsonProperty("max_term_freq")]
-		decimal? MaxTermFrequency { get; set; }
+		[JsonProperty("min_word_length")]
+		int? MinWordLength { get; set; }
+
+		[JsonProperty("prefix_length")]
+		int? PrefixLength { get; set; }
+
+		[JsonProperty("shard_size")]
+		int? ShardSize { get; set; }
 
 		[JsonProperty("sort")]
 		SuggestSort? Sort { get; set; }
 
-		[JsonProperty("lowercase_terms")]
-		bool? LowercaseTerms { get; set; }
-
 		[JsonProperty("string_distance")]
 		StringDistance? StringDistance { get; set; }
+
+		[JsonProperty("suggest_mode")]
+		[JsonConverter(typeof(StringEnumConverter))]
+		SuggestMode? SuggestMode { get; set; }
+
+		[JsonIgnore]
+		string Text { get; set; }
 	}
 
 	public class TermSuggester : SuggesterBase, ITermSuggester
 	{
-		public string Text { get; set; }
-		public int? ShardSize { get; set; }
-		public int? PrefixLength { get; set; }
-		public SuggestMode? SuggestMode { get; set; }
-		public int? MinWordLength { get; set; }
+		public bool? LowercaseTerms { get; set; }
 		public int? MaxEdits { get; set; }
 		public int? MaxInspections { get; set; }
-		public decimal? MinDocFrequency { get; set; }
 		public decimal? MaxTermFrequency { get; set; }
+		public decimal? MinDocFrequency { get; set; }
+		public int? MinWordLength { get; set; }
+		public int? PrefixLength { get; set; }
+		public int? ShardSize { get; set; }
 		public SuggestSort? Sort { get; set; }
-		public bool? LowercaseTerms { get; set; }
 		public StringDistance? StringDistance { get; set; }
+		public SuggestMode? SuggestMode { get; set; }
+		public string Text { get; set; }
 	}
 
 	public class TermSuggesterDescriptor<T>
 		: SuggestDescriptorBase<TermSuggesterDescriptor<T>, ITermSuggester, T>, ITermSuggester
 		where T : class
 	{
-		string ITermSuggester.Text { get; set; }
-
-		int? ITermSuggester.ShardSize { get; set; }
-
-		int? ITermSuggester.PrefixLength { get; set; }
-
-		SuggestMode? ITermSuggester.SuggestMode { get; set; }
-
-		int? ITermSuggester.MinWordLength { get; set; }
+		bool? ITermSuggester.LowercaseTerms { get; set; }
 
 		int? ITermSuggester.MaxEdits { get; set; }
 
 		int? ITermSuggester.MaxInspections { get; set; }
 
+		decimal? ITermSuggester.MaxTermFrequency { get; set; }
+
 		decimal? ITermSuggester.MinDocFrequency { get; set; }
 
-		decimal? ITermSuggester.MaxTermFrequency { get; set; }
+		int? ITermSuggester.MinWordLength { get; set; }
 
-		SuggestSort? ITermSuggester.Sort { get; set; }
+		int? ITermSuggester.PrefixLength { get; set; }
 
-		bool? ITermSuggester.LowercaseTerms { get; set; }
+		int? ITermSuggester.ShardSize { get; set; }
+
+		SuggestSort? ITermSuggester.Sort { get; set; }
 
 		StringDistance? ITermSuggester.StringDistance { get; set; }
 
+		SuggestMode? ITermSuggester.SuggestMode { get; set; }
+		string ITermSuggester.Text { get; set; }
+
 		public TermSuggesterDescriptor<T> Text(string text) => Assign(a => a.Text = text);
 
 		public TermSuggesterDescriptor<T> ShardSize(int? shardSize) => Assign(a => a.ShardSize = shardSize);
diff --git a/src/Nest/Search/Validate/ElasticClient-ValidateQuery.cs b/src/Nest/Search/Validate/ElasticClient-ValidateQuery.cs
index 74d36e1e873..e9499fcf34c 100644
--- a/src/Nest/Search/Validate/ElasticClient-ValidateQuery.cs
+++ b/src/Nest/Search/Validate/ElasticClient-ValidateQuery.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -9,49 +9,58 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// The validate API allows a user to validate a potentially expensive query without executing it.
-		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-validate.html
+		/// <para> </para>
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-validate.html
 		/// </summary>
 		/// <typeparam name="T">The type used to describe the query</typeparam>
 		/// <param name="selector">A descriptor that describes the query operation</param>
 		IValidateQueryResponse ValidateQuery<T>(Func<ValidateQueryDescriptor<T>, IValidateQueryRequest> selector)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IValidateQueryResponse ValidateQuery(IValidateQueryRequest request);
 
-		/// <inheritdoc/>
-		Task<IValidateQueryResponse> ValidateQueryAsync<T>(Func<ValidateQueryDescriptor<T>, IValidateQueryRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IValidateQueryResponse> ValidateQueryAsync<T>(Func<ValidateQueryDescriptor<T>, IValidateQueryRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
-		Task<IValidateQueryResponse> ValidateQueryAsync(IValidateQueryRequest request, CancellationToken cancellationToken = default(CancellationToken));
-
+		/// <inheritdoc />
+		Task<IValidateQueryResponse> ValidateQueryAsync(IValidateQueryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
+
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IValidateQueryResponse ValidateQuery<T>(Func<ValidateQueryDescriptor<T>, IValidateQueryRequest> selector)
 			where T : class =>
-			this.ValidateQuery(selector?.Invoke(new ValidateQueryDescriptor<T>()));
+			ValidateQuery(selector?.Invoke(new ValidateQueryDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IValidateQueryResponse ValidateQuery(IValidateQueryRequest request) =>
-			this.Dispatcher.Dispatch<IValidateQueryRequest, ValidateQueryRequestParameters, ValidateQueryResponse>(
+			Dispatcher.Dispatch<IValidateQueryRequest, ValidateQueryRequestParameters, ValidateQueryResponse>(
 				request,
-				this.LowLevelDispatch.IndicesValidateQueryDispatch<ValidateQueryResponse>
+				LowLevelDispatch.IndicesValidateQueryDispatch<ValidateQueryResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IValidateQueryResponse> ValidateQueryAsync<T>(Func<ValidateQueryDescriptor<T>, IValidateQueryRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public Task<IValidateQueryResponse> ValidateQueryAsync<T>(Func<ValidateQueryDescriptor<T>, IValidateQueryRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class =>
-			this.ValidateQueryAsync(selector?.Invoke(new ValidateQueryDescriptor<T>()), cancellationToken);
+			ValidateQueryAsync(selector?.Invoke(new ValidateQueryDescriptor<T>()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IValidateQueryResponse> ValidateQueryAsync(IValidateQueryRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IValidateQueryRequest, ValidateQueryRequestParameters, ValidateQueryResponse, IValidateQueryResponse>(
+		/// <inheritdoc />
+		public Task<IValidateQueryResponse> ValidateQueryAsync(IValidateQueryRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IValidateQueryRequest, ValidateQueryRequestParameters, ValidateQueryResponse, IValidateQueryResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.IndicesValidateQueryDispatchAsync<ValidateQueryResponse>
+				LowLevelDispatch.IndicesValidateQueryDispatchAsync<ValidateQueryResponse>
 			);
 	}
 }
diff --git a/src/Nest/Search/Validate/ValidateQueryRequest.cs b/src/Nest/Search/Validate/ValidateQueryRequest.cs
index bcf8277082a..7165ce291da 100644
--- a/src/Nest/Search/Validate/ValidateQueryRequest.cs
+++ b/src/Nest/Search/Validate/ValidateQueryRequest.cs
@@ -11,8 +11,7 @@ public partial interface IValidateQueryRequest
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IValidateQueryRequest<T> : IValidateQueryRequest
-		where T : class
-	{ }
+		where T : class { }
 
 	public partial class ValidateQueryRequest
 	{
diff --git a/src/Nest/Search/Validate/ValidateQueryResponse.cs b/src/Nest/Search/Validate/ValidateQueryResponse.cs
index 6b4732b02cb..20ac9cce87e 100644
--- a/src/Nest/Search/Validate/ValidateQueryResponse.cs
+++ b/src/Nest/Search/Validate/ValidateQueryResponse.cs
@@ -1,29 +1,28 @@
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
 {
 	public interface IValidateQueryResponse : IResponse
 	{
-		bool Valid { get; }
-		ShardStatistics Shards { get; }
 		IReadOnlyCollection<ValidationExplanation> Explanations { get; }
+		ShardStatistics Shards { get; }
+		bool Valid { get; }
 	}
 
 	[JsonObject]
 	public class ValidateQueryResponse : ResponseBase, IValidateQueryResponse
 	{
-		[JsonProperty("valid")]
-		public bool Valid { get; internal set; }
-
-		[JsonProperty("_shards")]
-		public ShardStatistics Shards { get; internal set; }
-
 		/// <summary>
 		/// Gets the explanations if Explain() was set.
 		/// </summary>
 		[JsonProperty("explanations")]
 		public IReadOnlyCollection<ValidationExplanation> Explanations { get; internal set; } = EmptyReadOnly<ValidationExplanation>.Collection;
+
+		[JsonProperty("_shards")]
+		public ShardStatistics Shards { get; internal set; }
+
+		[JsonProperty("valid")]
+		public bool Valid { get; internal set; }
 	}
 }
diff --git a/src/Nest/Search/Validate/ValidationExplanation.cs b/src/Nest/Search/Validate/ValidationExplanation.cs
index 8714a9933f0..0f7a0d8d91b 100644
--- a/src/Nest/Search/Validate/ValidationExplanation.cs
+++ b/src/Nest/Search/Validate/ValidationExplanation.cs
@@ -5,16 +5,16 @@ namespace Nest
 	[JsonObject]
 	public class ValidationExplanation
 	{
-		[JsonProperty("index")]
-		public string Index { get; internal set; }
-
-		[JsonProperty("valid")]
-		public bool Valid { get; internal set; }
-
 		[JsonProperty("error")]
 		public string Error { get; internal set; }
 
 		[JsonProperty("explanation")]
 		public string Explanation { get; internal set; }
+
+		[JsonProperty("index")]
+		public string Index { get; internal set; }
+
+		[JsonProperty("valid")]
+		public bool Valid { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/Graph/Explore/ElasticClient-GraphExplore.cs b/src/Nest/XPack/Graph/Explore/ElasticClient-GraphExplore.cs
index f01648aa771..7025870f3ed 100644
--- a/src/Nest/XPack/Graph/Explore/ElasticClient-GraphExplore.cs
+++ b/src/Nest/XPack/Graph/Explore/ElasticClient-GraphExplore.cs
@@ -1,50 +1,56 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGraphExploreResponse GraphExplore<T>(Func<GraphExploreDescriptor<T>, IGraphExploreRequest> selector)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGraphExploreResponse GraphExplore(IGraphExploreRequest request);
 
-		/// <inheritdoc/>
-		Task<IGraphExploreResponse> GraphExploreAsync<T>(Func<GraphExploreDescriptor<T>, IGraphExploreRequest> selector, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		Task<IGraphExploreResponse> GraphExploreAsync<T>(Func<GraphExploreDescriptor<T>, IGraphExploreRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGraphExploreResponse> GraphExploreAsync(IGraphExploreRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGraphExploreResponse GraphExplore<T>(Func<GraphExploreDescriptor<T>, IGraphExploreRequest> selector) where T : class =>
-			this.GraphExplore(selector?.Invoke(new GraphExploreDescriptor<T>()));
+			GraphExplore(selector?.Invoke(new GraphExploreDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGraphExploreResponse GraphExplore(IGraphExploreRequest request) =>
-			this.Dispatcher.Dispatch<IGraphExploreRequest, GraphExploreRequestParameters, GraphExploreResponse>(
+			Dispatcher.Dispatch<IGraphExploreRequest, GraphExploreRequestParameters, GraphExploreResponse>(
 				request,
-				this.LowLevelDispatch.XpackGraphExploreDispatch<GraphExploreResponse>
+				LowLevelDispatch.XpackGraphExploreDispatch<GraphExploreResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IGraphExploreResponse> GraphExploreAsync<T>(Func<GraphExploreDescriptor<T>, IGraphExploreRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.GraphExploreAsync(selector?.Invoke(new GraphExploreDescriptor<T>()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGraphExploreResponse> GraphExploreAsync(IGraphExploreRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGraphExploreRequest, GraphExploreRequestParameters, GraphExploreResponse, IGraphExploreResponse>(
+		/// <inheritdoc />
+		public Task<IGraphExploreResponse> GraphExploreAsync<T>(Func<GraphExploreDescriptor<T>, IGraphExploreRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			GraphExploreAsync(selector?.Invoke(new GraphExploreDescriptor<T>()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGraphExploreResponse> GraphExploreAsync(IGraphExploreRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGraphExploreRequest, GraphExploreRequestParameters, GraphExploreResponse, IGraphExploreResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackGraphExploreDispatchAsync<GraphExploreResponse>
+				LowLevelDispatch.XpackGraphExploreDispatchAsync<GraphExploreResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/Graph/Explore/GraphExploreRequest.cs b/src/Nest/XPack/Graph/Explore/GraphExploreRequest.cs
index cee9ec6baad..11d027037a5 100644
--- a/src/Nest/XPack/Graph/Explore/GraphExploreRequest.cs
+++ b/src/Nest/XPack/Graph/Explore/GraphExploreRequest.cs
@@ -14,33 +14,34 @@ public interface IGraphExploreRequest<T> : IGraphExploreRequest where T : class
 
 	public partial class GraphExploreRequest
 	{
-		public QueryContainer Query { get; set; }
-		public IEnumerable<IGraphVertexDefinition> Vertices { get; set; }
 		public IHop Connections { get; set; }
 		public IGraphExploreControls Controls { get; set; }
+		public QueryContainer Query { get; set; }
+		public IEnumerable<IGraphVertexDefinition> Vertices { get; set; }
 	}
 
 	public partial class GraphExploreRequest<T> : IGraphExploreRequest<T>
 		where T : class
 	{
-		public GraphExploreRequest() : this(typeof(T), typeof(T)){}
+		public GraphExploreRequest() : this(typeof(T), typeof(T)) { }
 
-		public QueryContainer Query { get; set; }
-		public IEnumerable<IGraphVertexDefinition> Vertices { get; set; }
 		public IHop Connections { get; set; }
 		public IGraphExploreControls Controls { get; set; }
+
+		public QueryContainer Query { get; set; }
+		public IEnumerable<IGraphVertexDefinition> Vertices { get; set; }
 	}
 
 	[DescriptorFor("XpackGraphExplore")]
 	public partial class GraphExploreDescriptor<T> : IGraphExploreRequest<T>
 		where T : class
 	{
-		QueryContainer IHop.Query { get; set; }
-		IEnumerable<IGraphVertexDefinition> IHop.Vertices { get; set; }
+		public GraphExploreDescriptor() : base(r => r.Optional("index", (Indices)typeof(T)).Optional("type", (Types)typeof(T))) { }
+
 		IHop IHop.Connections { get; set; }
 		IGraphExploreControls IGraphExploreRequest.Controls { get; set; }
-
-		public GraphExploreDescriptor() : base(r=> r.Optional("index", (Indices)typeof(T)).Optional("type", (Types)typeof(T))){ }
+		QueryContainer IHop.Query { get; set; }
+		IEnumerable<IGraphVertexDefinition> IHop.Vertices { get; set; }
 
 		public GraphExploreDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) =>
 			Assign(a => a.Query = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
@@ -53,6 +54,5 @@ public GraphExploreDescriptor<T> Connections(Func<HopDescriptor<T>, IHop> select
 
 		public GraphExploreDescriptor<T> Controls(Func<GraphExploreControlsDescriptor<T>, IGraphExploreControls> selector) =>
 			Assign(a => a.Controls = selector?.Invoke(new GraphExploreControlsDescriptor<T>()));
-
 	}
 }
diff --git a/src/Nest/XPack/Graph/Explore/GraphExploreResponse.cs b/src/Nest/XPack/Graph/Explore/GraphExploreResponse.cs
index 7643d6b9519..434adaad53d 100644
--- a/src/Nest/XPack/Graph/Explore/GraphExploreResponse.cs
+++ b/src/Nest/XPack/Graph/Explore/GraphExploreResponse.cs
@@ -6,29 +6,29 @@ namespace Nest
 {
 	public interface IGraphExploreResponse : IResponse
 	{
-		[JsonProperty("took")]
-		long Took { get; }
+		[JsonProperty("connections")]
+		IReadOnlyCollection<GraphConnection> Connections { get; }
+
+		[JsonProperty("failures")]
+		IReadOnlyCollection<ShardFailure> Failures { get; }
 
 		[JsonProperty("timed_out")]
 		bool TimedOut { get; }
 
+		[JsonProperty("took")]
+		long Took { get; }
+
 		[JsonProperty("vertices")]
 		IReadOnlyCollection<GraphVertex> Vertices { get; }
-
-		[JsonProperty("connections")]
-		IReadOnlyCollection<GraphConnection> Connections { get; }
-
-		[JsonProperty("failures")]
-		IReadOnlyCollection<ShardFailure> Failures { get; }
 	}
 
 	public class GraphExploreResponse : ResponseBase, IGraphExploreResponse
 	{
-		public long Took { get; internal set; }
+		public IReadOnlyCollection<GraphConnection> Connections { get; internal set; } = EmptyReadOnly<GraphConnection>.Collection;
+		public IReadOnlyCollection<ShardFailure> Failures { get; internal set; } = EmptyReadOnly<ShardFailure>.Collection;
 
 		public bool TimedOut { get; internal set; }
-		public IReadOnlyCollection<GraphConnection> Connections { get; internal set; } = EmptyReadOnly<GraphConnection>.Collection;
+		public long Took { get; internal set; }
 		public IReadOnlyCollection<GraphVertex> Vertices { get; internal set; } = EmptyReadOnly<GraphVertex>.Collection;
-		public IReadOnlyCollection<ShardFailure> Failures { get; internal set; } = EmptyReadOnly<ShardFailure>.Collection;
 	}
 }
diff --git a/src/Nest/XPack/Graph/Explore/Request/GraphExploreControls.cs b/src/Nest/XPack/Graph/Explore/Request/GraphExploreControls.cs
index aeef07b633d..903cc8e0729 100644
--- a/src/Nest/XPack/Graph/Explore/Request/GraphExploreControls.cs
+++ b/src/Nest/XPack/Graph/Explore/Request/GraphExploreControls.cs
@@ -6,8 +6,8 @@ namespace Nest
 {
 	public interface IGraphExploreControls
 	{
-		[JsonProperty("use_significance")]
-		bool? UseSignificance { get; set; }
+		[JsonProperty("sample_diversity")]
+		SampleDiversity SampleDiversity { get; set; }
 
 		[JsonProperty("sample_size")]
 		int? SampleSize { get; set; }
@@ -15,36 +15,38 @@ public interface IGraphExploreControls
 		[JsonProperty("timeout")]
 		Time Timeout { get; set; }
 
-		[JsonProperty("sample_diversity")]
-		SampleDiversity SampleDiversity { get; set; }
+		[JsonProperty("use_significance")]
+		bool? UseSignificance { get; set; }
 	}
 
 	public class GraphExploreControls : IGraphExploreControls
 	{
-		public bool? UseSignificance { get; set; }
+		public SampleDiversity SampleDiversity { get; set; }
 
 		public int? SampleSize { get; set; }
 
 		public Time Timeout { get; set; }
-
-		public SampleDiversity SampleDiversity { get; set; }
+		public bool? UseSignificance { get; set; }
 	}
 
-	public class GraphExploreControlsDescriptor<T> : DescriptorBase<GraphExploreControlsDescriptor<T>, IGraphExploreControls>,  IGraphExploreControls
+	public class GraphExploreControlsDescriptor<T> : DescriptorBase<GraphExploreControlsDescriptor<T>, IGraphExploreControls>, IGraphExploreControls
 		where T : class
 	{
-		bool? IGraphExploreControls.UseSignificance { get; set; }
+		SampleDiversity IGraphExploreControls.SampleDiversity { get; set; }
 		int? IGraphExploreControls.SampleSize { get; set; }
 		Time IGraphExploreControls.Timeout { get; set; }
-		SampleDiversity IGraphExploreControls.SampleDiversity { get; set; }
+		bool? IGraphExploreControls.UseSignificance { get; set; }
 
 		public GraphExploreControlsDescriptor<T> UseSignificance(bool? useSignificance = true) => Assign(a => a.UseSignificance = useSignificance);
+
 		public GraphExploreControlsDescriptor<T> SampleSize(int? sampleSize) => Assign(a => a.SampleSize = sampleSize);
+
 		public GraphExploreControlsDescriptor<T> Timeout(Time time) => Assign(a => a.Timeout = time);
+
 		public GraphExploreControlsDescriptor<T> SamleDiversity(Field field, int? maxDocumentsPerValue) =>
 			Assign(a => a.SampleDiversity = new SampleDiversity { Field = field, MaxDocumentsPerValue = maxDocumentsPerValue });
+
 		public GraphExploreControlsDescriptor<T> SamleDiversity(Expression<Func<T, object>> field, int? maxDocumentsPerValue) =>
 			Assign(a => a.SampleDiversity = new SampleDiversity { Field = field, MaxDocumentsPerValue = maxDocumentsPerValue });
-
 	}
 }
diff --git a/src/Nest/XPack/Graph/Explore/Request/GraphVertexDefinition.cs b/src/Nest/XPack/Graph/Explore/Request/GraphVertexDefinition.cs
index b64d1bf0148..e2b1405657a 100644
--- a/src/Nest/XPack/Graph/Explore/Request/GraphVertexDefinition.cs
+++ b/src/Nest/XPack/Graph/Explore/Request/GraphVertexDefinition.cs
@@ -7,11 +7,14 @@ namespace Nest
 {
 	public interface IGraphVertexDefinition
 	{
+		[JsonProperty("exclude")]
+		IEnumerable<string> Exclude { get; set; }
+
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("size")]
-		int? Size { get; set; }
+		[JsonProperty("include")]
+		IEnumerable<GraphVertexInclude> Include { get; set; }
 
 		[JsonProperty("min_doc_count")]
 		long? MinimumDocumentCount { get; set; }
@@ -19,45 +22,45 @@ public interface IGraphVertexDefinition
 		[JsonProperty("shard_min_doc_count")]
 		long? ShardMinimumDocumentCount { get; set; }
 
-		[JsonProperty("exclude")]
-		IEnumerable<string> Exclude { get; set; }
-
-		[JsonProperty("include")]
-		IEnumerable<GraphVertexInclude> Include { get; set; }
+		[JsonProperty("size")]
+		int? Size { get; set; }
 	}
+
 	public class GraphVertexDefinition : IGraphVertexDefinition
 	{
+		public IEnumerable<string> Exclude { get; set; }
 		public Field Field { get; set; }
-		public int? Size { get; set; }
+		public IEnumerable<GraphVertexInclude> Include { get; set; }
 		public long? MinimumDocumentCount { get; set; }
 		public long? ShardMinimumDocumentCount { get; set; }
-		public IEnumerable<string> Exclude { get; set; }
-		public IEnumerable<GraphVertexInclude> Include { get; set; }
+		public int? Size { get; set; }
 	}
+
 	public class GraphVertexDefinitionDescriptor : DescriptorBase<GraphVertexDefinitionDescriptor, IGraphVertexDefinition>, IGraphVertexDefinition
 	{
+		public GraphVertexDefinitionDescriptor(Field field) => Assign(a => a.Field = field);
+
+		IEnumerable<string> IGraphVertexDefinition.Exclude { get; set; }
 		Field IGraphVertexDefinition.Field { get; set; }
-		int? IGraphVertexDefinition.Size { get; set; }
+		IEnumerable<GraphVertexInclude> IGraphVertexDefinition.Include { get; set; }
 		long? IGraphVertexDefinition.MinimumDocumentCount { get; set; }
 		long? IGraphVertexDefinition.ShardMinimumDocumentCount { get; set; }
-		IEnumerable<string> IGraphVertexDefinition.Exclude { get; set; }
-		IEnumerable<GraphVertexInclude> IGraphVertexDefinition.Include { get; set; }
-
-		public GraphVertexDefinitionDescriptor(Field field) { Assign(a => a.Field = field); }
+		int? IGraphVertexDefinition.Size { get; set; }
 
 		public GraphVertexDefinitionDescriptor Size(int? size) => Assign(a => a.Size = size);
 
 		public GraphVertexDefinitionDescriptor MinimumDocumentCount(int? minDocCount) => Assign(a => a.MinimumDocumentCount = minDocCount);
 
-		public GraphVertexDefinitionDescriptor ShardMinimumDocumentCount(int? shardMinDocCount) => Assign(a => a.ShardMinimumDocumentCount = shardMinDocCount);
+		public GraphVertexDefinitionDescriptor ShardMinimumDocumentCount(int? shardMinDocCount) =>
+			Assign(a => a.ShardMinimumDocumentCount = shardMinDocCount);
 
 		public GraphVertexDefinitionDescriptor Exclude(params string[] excludes) => Assign(a => a.Exclude = excludes);
 
 		public GraphVertexDefinitionDescriptor Exclude(IEnumerable<string> excludes) => Assign(a => a.Exclude = excludes);
 
-		public GraphVertexDefinitionDescriptor Include(params string[] includes) => Include(i=>i.IncludeRange(includes));
+		public GraphVertexDefinitionDescriptor Include(params string[] includes) => Include(i => i.IncludeRange(includes));
 
-		public GraphVertexDefinitionDescriptor Include(IEnumerable<string> includes) => Include(i=>i.IncludeRange(includes));
+		public GraphVertexDefinitionDescriptor Include(IEnumerable<string> includes) => Include(i => i.IncludeRange(includes));
 
 		public GraphVertexDefinitionDescriptor Include(Func<GraphVertexIncludeDescriptor, IPromise<List<GraphVertexInclude>>> selector) =>
 			Assign(a => a.Include = selector?.Invoke(new GraphVertexIncludeDescriptor())?.Value);
@@ -68,7 +71,9 @@ public class GraphVerticesDescriptor<T> : DescriptorPromiseBase<GraphVerticesDes
 	{
 		public GraphVerticesDescriptor() : base(new List<IGraphVertexDefinition>()) { }
 
-		public GraphVerticesDescriptor<T> Vertex(Expression<Func<T, object>> field, Func<GraphVertexDefinitionDescriptor, IGraphVertexDefinition> selector = null) =>
+		public GraphVerticesDescriptor<T> Vertex(Expression<Func<T, object>> field,
+			Func<GraphVertexDefinitionDescriptor, IGraphVertexDefinition> selector = null
+		) =>
 			Assign(a => a.Add(selector.InvokeOrDefault(new GraphVertexDefinitionDescriptor(field))));
 
 		public GraphVerticesDescriptor<T> Vertex(Field field, Func<GraphVertexDefinitionDescriptor, IGraphVertexDefinition> selector = null) =>
diff --git a/src/Nest/XPack/Graph/Explore/Request/GraphVertexInclude.cs b/src/Nest/XPack/Graph/Explore/Request/GraphVertexInclude.cs
index e39832b51d7..e3c57bcc9bf 100644
--- a/src/Nest/XPack/Graph/Explore/Request/GraphVertexInclude.cs
+++ b/src/Nest/XPack/Graph/Explore/Request/GraphVertexInclude.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 
@@ -7,11 +6,11 @@ namespace Nest
 {
 	public class GraphVertexInclude
 	{
-		[JsonProperty("term")]
-		public string Term { get; set; }
-
 		[JsonProperty("boost")]
 		public double? Boost { get; set; }
+
+		[JsonProperty("term")]
+		public string Term { get; set; }
 	}
 
 	public class GraphVertexIncludeDescriptor : DescriptorPromiseBase<GraphVertexIncludeDescriptor, List<GraphVertexInclude>>
@@ -22,13 +21,12 @@ public GraphVertexIncludeDescriptor Include(string term, double? boost = null) =
 			Assign(a => a.Add(new GraphVertexInclude { Term = term, Boost = boost }));
 
 		public GraphVertexIncludeDescriptor IncludeRange(params string[] terms) =>
-			Assign(a => a.AddRange(terms.Select(t=>new GraphVertexInclude { Term = t })));
+			Assign(a => a.AddRange(terms.Select(t => new GraphVertexInclude { Term = t })));
 
 		public GraphVertexIncludeDescriptor IncludeRange(IEnumerable<string> terms) =>
-			Assign(a => a.AddRange(terms.Select(t=>new GraphVertexInclude { Term = t })));
+			Assign(a => a.AddRange(terms.Select(t => new GraphVertexInclude { Term = t })));
 
 		public GraphVertexIncludeDescriptor IncludeRange(IEnumerable<GraphVertexInclude> includes) =>
 			Assign(a => a.AddRange(includes));
-
 	}
 }
diff --git a/src/Nest/XPack/Graph/Explore/Request/Hop.cs b/src/Nest/XPack/Graph/Explore/Request/Hop.cs
index 9f6343e559f..3044c31b2b4 100644
--- a/src/Nest/XPack/Graph/Explore/Request/Hop.cs
+++ b/src/Nest/XPack/Graph/Explore/Request/Hop.cs
@@ -1,35 +1,34 @@
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using Newtonsoft.Json;
 
 namespace Nest
 {
 	public interface IHop
 	{
+		[JsonProperty("connections")]
+		IHop Connections { get; set; }
+
 		[JsonProperty("query")]
 		QueryContainer Query { get; set; }
 
 		[JsonProperty("vertices")]
 		IEnumerable<IGraphVertexDefinition> Vertices { get; set; }
-
-		[JsonProperty("connections")]
-		IHop Connections { get; set; }
 	}
 
 	public class Hop : IHop
 	{
+		public IHop Connections { get; set; }
 		public QueryContainer Query { get; set; }
 		public IEnumerable<IGraphVertexDefinition> Vertices { get; set; }
-		public IHop Connections { get; set; }
 	}
 
 	public class HopDescriptor<T> : DescriptorBase<HopDescriptor<T>, IHop>, IHop
 		where T : class
 	{
+		IHop IHop.Connections { get; set; }
 		QueryContainer IHop.Query { get; set; }
 		IEnumerable<IGraphVertexDefinition> IHop.Vertices { get; set; }
-		IHop IHop.Connections { get; set; }
 
 		public HopDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) =>
 			Assign(a => a.Query = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
@@ -39,7 +38,5 @@ public HopDescriptor<T> Vertices(Func<GraphVerticesDescriptor<T>, IPromise<IList
 
 		public HopDescriptor<T> Connections(Func<HopDescriptor<T>, IHop> selector) =>
 			Assign(a => a.Connections = selector?.Invoke(new HopDescriptor<T>()));
-
 	}
-
 }
diff --git a/src/Nest/XPack/Graph/Explore/Response/GraphConnection.cs b/src/Nest/XPack/Graph/Explore/Response/GraphConnection.cs
index 8f34959ccf3..11c5f180ba0 100644
--- a/src/Nest/XPack/Graph/Explore/Response/GraphConnection.cs
+++ b/src/Nest/XPack/Graph/Explore/Response/GraphConnection.cs
@@ -15,6 +15,5 @@ public class GraphConnection
 
 		[JsonProperty("weight")]
 		public double Weight { get; internal set; }
-
 	}
 }
diff --git a/src/Nest/XPack/Graph/Explore/Response/GraphVertex.cs b/src/Nest/XPack/Graph/Explore/Response/GraphVertex.cs
index 2928886231c..7b993e8eb38 100644
--- a/src/Nest/XPack/Graph/Explore/Response/GraphVertex.cs
+++ b/src/Nest/XPack/Graph/Explore/Response/GraphVertex.cs
@@ -15,6 +15,5 @@ public class GraphVertex
 
 		[JsonProperty("weight")]
 		public double Weight { get; internal set; }
-
 	}
 }
diff --git a/src/Nest/XPack/Info/XPackInfo/ElasticClient-XPackInfo.cs b/src/Nest/XPack/Info/XPackInfo/ElasticClient-XPackInfo.cs
index 0b9cee4dce4..5db14cfc275 100644
--- a/src/Nest/XPack/Info/XPackInfo/ElasticClient-XPackInfo.cs
+++ b/src/Nest/XPack/Info/XPackInfo/ElasticClient-XPackInfo.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IXPackInfoResponse XPackInfo(Func<XPackInfoDescriptor, IXPackInfoRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IXPackInfoResponse XPackInfo(IXPackInfoRequest request);
 
-		/// <inheritdoc/>
-		Task<IXPackInfoResponse> XPackInfoAsync(Func<XPackInfoDescriptor, IXPackInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IXPackInfoResponse> XPackInfoAsync(Func<XPackInfoDescriptor, IXPackInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IXPackInfoResponse> XPackInfoAsync(IXPackInfoRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IXPackInfoResponse XPackInfo(Func<XPackInfoDescriptor, IXPackInfoRequest> selector = null) =>
-			this.XPackInfo(selector.InvokeOrDefault(new XPackInfoDescriptor()));
+			XPackInfo(selector.InvokeOrDefault(new XPackInfoDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IXPackInfoResponse XPackInfo(IXPackInfoRequest request) =>
-			this.Dispatcher.Dispatch<IXPackInfoRequest, XPackInfoRequestParameters, XPackInfoResponse>(
+			Dispatcher.Dispatch<IXPackInfoRequest, XPackInfoRequestParameters, XPackInfoResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackInfoDispatch<XPackInfoResponse>(p)
+				(p, d) => LowLevelDispatch.XpackInfoDispatch<XPackInfoResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IXPackInfoResponse> XPackInfoAsync(Func<XPackInfoDescriptor, IXPackInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.XPackInfoAsync(selector.InvokeOrDefault(new XPackInfoDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IXPackInfoResponse> XPackInfoAsync(Func<XPackInfoDescriptor, IXPackInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			XPackInfoAsync(selector.InvokeOrDefault(new XPackInfoDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IXPackInfoResponse> XPackInfoAsync(IXPackInfoRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IXPackInfoRequest, XPackInfoRequestParameters, XPackInfoResponse, IXPackInfoResponse>(
+			Dispatcher.DispatchAsync<IXPackInfoRequest, XPackInfoRequestParameters, XPackInfoResponse, IXPackInfoResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackInfoDispatchAsync<XPackInfoResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackInfoDispatchAsync<XPackInfoResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Info/XPackInfo/XPackInfoRequest.cs b/src/Nest/XPack/Info/XPackInfo/XPackInfoRequest.cs
index d06b8a0cf12..bda9617fbc8 100644
--- a/src/Nest/XPack/Info/XPackInfo/XPackInfoRequest.cs
+++ b/src/Nest/XPack/Info/XPackInfo/XPackInfoRequest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface IXPackInfoRequest { }
 
diff --git a/src/Nest/XPack/Info/XPackInfo/XPackInfoResponse.cs b/src/Nest/XPack/Info/XPackInfo/XPackInfoResponse.cs
index f07beb79bbf..8f63e8b811e 100644
--- a/src/Nest/XPack/Info/XPackInfo/XPackInfoResponse.cs
+++ b/src/Nest/XPack/Info/XPackInfo/XPackInfoResponse.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -9,10 +7,13 @@ public interface IXPackInfoResponse : IResponse
 	{
 		[JsonProperty("build")]
 		XPackBuildInformation Build { get; }
-		[JsonProperty("license")]
-		MinimalLicenseInformation License { get; }
+
 		[JsonProperty("features")]
 		XPackFeatures Features { get; }
+
+		[JsonProperty("license")]
+		MinimalLicenseInformation License { get; }
+
 		[JsonProperty("tagline")]
 		string Tagline { get; }
 	}
@@ -20,8 +21,8 @@ public interface IXPackInfoResponse : IResponse
 	public class XPackInfoResponse : ResponseBase, IXPackInfoResponse
 	{
 		public XPackBuildInformation Build { get; internal set; }
-		public MinimalLicenseInformation License { get; internal set; }
 		public XPackFeatures Features { get; internal set; }
+		public MinimalLicenseInformation License { get; internal set; }
 		public string Tagline { get; internal set; }
 	}
 
@@ -29,17 +30,15 @@ public class XPackBuildInformation
 	{
 		[JsonProperty("date")]
 		public DateTimeOffset Date { get; internal set; }
+
 		[JsonProperty("hash")]
 		public string Hash { get; internal set; }
 	}
 
 	public class MinimalLicenseInformation
 	{
-		[JsonProperty("uid")]
-		public string UID { get; internal set; }
-
-		[JsonProperty("type")]
-		public LicenseType Type { get; internal set; }
+		[JsonProperty("expiry_date_in_millis")]
+		public long ExpiryDateInMilliseconds { get; set; }
 
 		[JsonProperty("mode")]
 		public LicenseType Mode { get; internal set; }
@@ -47,41 +46,52 @@ public class MinimalLicenseInformation
 		[JsonProperty("status")]
 		public LicenseStatus Status { get; internal set; }
 
-		[JsonProperty("expiry_date_in_millis")]
-		public long ExpiryDateInMilliseconds { get; set; }
+		[JsonProperty("type")]
+		public LicenseType Type { get; internal set; }
+
+		[JsonProperty("uid")]
+		public string UID { get; internal set; }
 	}
 
 	public class XPackFeatures
 	{
-		[JsonProperty("watcher")]
-		public XPackFeature Watcher { get; internal set; }
 		[JsonProperty("graph")]
 		public XPackFeature Graph { get; internal set; }
+
 		[JsonProperty("ml")]
 		public XPackFeature MachineLearning { get; internal set; }
+
 		[JsonProperty("monitoring")]
 		public XPackFeature Monitoring { get; internal set; }
+
 		[JsonProperty("security")]
 		public XPackFeature Security { get; internal set; }
+
+		[JsonProperty("watcher")]
+		public XPackFeature Watcher { get; internal set; }
 	}
 
 	public class XPackFeature
 	{
-		[JsonProperty("description")]
-		public string Description { get; internal set; }
 		[JsonProperty("available")]
 		public bool Available { get; internal set; }
+
+		[JsonProperty("description")]
+		public string Description { get; internal set; }
+
 		[JsonProperty("enabled")]
 		public bool Enabled { get; internal set; }
+
 		[JsonProperty("native_code_info")]
 		public NativeCodeInformation NativeCodeInformation { get; internal set; }
 	}
+
 	public class NativeCodeInformation
 	{
-		[JsonProperty("version")]
-		public string Version { get; internal set; }
 		[JsonProperty("build_hash")]
 		public string BuildHash { get; internal set; }
-	}
 
+		[JsonProperty("version")]
+		public string Version { get; internal set; }
+	}
 }
diff --git a/src/Nest/XPack/Info/XPackUsage/ElasticClient-XPackUsage.cs b/src/Nest/XPack/Info/XPackUsage/ElasticClient-XPackUsage.cs
index b9f5b084f10..35787c6264e 100644
--- a/src/Nest/XPack/Info/XPackUsage/ElasticClient-XPackUsage.cs
+++ b/src/Nest/XPack/Info/XPackUsage/ElasticClient-XPackUsage.cs
@@ -1,48 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IXPackUsageResponse XPackUsage(Func<XPackUsageDescriptor, IXPackUsageRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IXPackUsageResponse XPackUsage(IXPackUsageRequest request);
 
-		/// <inheritdoc/>
-		Task<IXPackUsageResponse> XPackUsageAsync(Func<XPackUsageDescriptor, IXPackUsageRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IXPackUsageResponse> XPackUsageAsync(Func<XPackUsageDescriptor, IXPackUsageRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IXPackUsageResponse> XPackUsageAsync(IXPackUsageRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IXPackUsageResponse XPackUsage(Func<XPackUsageDescriptor, IXPackUsageRequest> selector = null) =>
-			this.XPackUsage(selector.InvokeOrDefault(new XPackUsageDescriptor()));
+			XPackUsage(selector.InvokeOrDefault(new XPackUsageDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IXPackUsageResponse XPackUsage(IXPackUsageRequest request) =>
-			this.Dispatcher.Dispatch<IXPackUsageRequest, XPackUsageRequestParameters, XPackUsageResponse>(
+			Dispatcher.Dispatch<IXPackUsageRequest, XPackUsageRequestParameters, XPackUsageResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackUsageDispatch<XPackUsageResponse>(p)
+				(p, d) => LowLevelDispatch.XpackUsageDispatch<XPackUsageResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IXPackUsageResponse> XPackUsageAsync(Func<XPackUsageDescriptor, IXPackUsageRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.XPackUsageAsync(selector.InvokeOrDefault(new XPackUsageDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IXPackUsageResponse> XPackUsageAsync(Func<XPackUsageDescriptor, IXPackUsageRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			XPackUsageAsync(selector.InvokeOrDefault(new XPackUsageDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IXPackUsageResponse> XPackUsageAsync(IXPackUsageRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IXPackUsageRequest, XPackUsageRequestParameters, XPackUsageResponse, IXPackUsageResponse>(
+		/// <inheritdoc />
+		public Task<IXPackUsageResponse> XPackUsageAsync(IXPackUsageRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IXPackUsageRequest, XPackUsageRequestParameters, XPackUsageResponse, IXPackUsageResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackUsageDispatchAsync<XPackUsageResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackUsageDispatchAsync<XPackUsageResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Info/XPackUsage/XPackUsageRequest.cs b/src/Nest/XPack/Info/XPackUsage/XPackUsageRequest.cs
index 11ae7f56abb..ad1316b1da8 100644
--- a/src/Nest/XPack/Info/XPackUsage/XPackUsageRequest.cs
+++ b/src/Nest/XPack/Info/XPackUsage/XPackUsageRequest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface IXPackUsageRequest { }
 
diff --git a/src/Nest/XPack/Info/XPackUsage/XPackUsageResponse.cs b/src/Nest/XPack/Info/XPackUsage/XPackUsageResponse.cs
index 9f7cd3ad0bf..d96028a69a1 100644
--- a/src/Nest/XPack/Info/XPackUsage/XPackUsageResponse.cs
+++ b/src/Nest/XPack/Info/XPackUsage/XPackUsageResponse.cs
@@ -1,23 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
 {
 	public interface IXPackUsageResponse : IResponse
 	{
+		[JsonProperty("watcher")]
+		AlertingUsage Alerting { get; }
+
 		[JsonProperty("graph")]
 		XPackUsage Graph { get; }
 
-		[JsonProperty("monitoring")]
-		MonitoringUsage Monitoring { get; }
-
 		[JsonProperty("ml")]
 		MachineLearningUsage MachineLearning { get; }
 
-		[JsonProperty("watcher")]
-		AlertingUsage Alerting { get; }
+		[JsonProperty("monitoring")]
+		MonitoringUsage Monitoring { get; }
 
 		[JsonProperty("security")]
 		SecurityUsage Security { get; }
@@ -25,17 +23,17 @@ public interface IXPackUsageResponse : IResponse
 
 	public class XPackUsageResponse : ResponseBase, IXPackUsageResponse
 	{
+		[JsonProperty("watcher")]
+		public AlertingUsage Alerting { get; internal set; }
+
 		[JsonProperty("graph")]
 		public XPackUsage Graph { get; internal set; }
 
-		[JsonProperty("monitoring")]
-		public MonitoringUsage Monitoring { get; internal set; }
-
 		[JsonProperty("ml")]
 		public MachineLearningUsage MachineLearning { get; internal set; }
 
-		[JsonProperty("watcher")]
-		public AlertingUsage Alerting { get; internal set; }
+		[JsonProperty("monitoring")]
+		public MonitoringUsage Monitoring { get; internal set; }
 
 		[JsonProperty("security")]
 		public SecurityUsage Security { get; internal set; }
@@ -49,26 +47,26 @@ public class XPackUsage
 
 	public class SecurityUsage : XPackUsage
 	{
-		[JsonProperty("system_key")]
-		public SecurityFeatureToggle SystemKey { get; internal set; }
-
 		[JsonProperty("anonymous")]
 		public SecurityFeatureToggle Anonymous { get; internal set; }
 
-		[JsonProperty("ssl")]
-		public SslUsage Ssl { get; internal set; }
+		[JsonProperty("audit")]
+		public AuditUsage Audit { get; internal set; }
 
 		[JsonProperty("ipfilter")]
 		public IpFilterUsage IpFilter { get; internal set; }
 
-		[JsonProperty("audit")]
-		public AuditUsage Audit { get; internal set; }
+		[JsonProperty("realms")]
+		public IReadOnlyDictionary<string, RealmUsage> Realms { get; internal set; } = EmptyReadOnly<string, RealmUsage>.Dictionary;
 
 		[JsonProperty("roles")]
 		public IReadOnlyDictionary<string, RoleUsage> Roles { get; internal set; } = EmptyReadOnly<string, RoleUsage>.Dictionary;
 
-		[JsonProperty("realms")]
-		public IReadOnlyDictionary<string, RealmUsage> Realms { get; internal set; } = EmptyReadOnly<string, RealmUsage>.Dictionary;
+		[JsonProperty("ssl")]
+		public SslUsage Ssl { get; internal set; }
+
+		[JsonProperty("system_key")]
+		public SecurityFeatureToggle SystemKey { get; internal set; }
 
 		public class AuditUsage : SecurityFeatureToggle
 		{
@@ -90,11 +88,11 @@ public class RealmUsage : XPackUsage
 			[JsonProperty("name")]
 			public IReadOnlyCollection<string> Name { get; internal set; } = EmptyReadOnly<string>.Collection;
 
-			[JsonProperty("size")]
-			public IReadOnlyCollection<long> Size { get; internal set; } = EmptyReadOnly<long>.Collection;
-
 			[JsonProperty("order")]
 			public IReadOnlyCollection<long> Order { get; internal set; } = EmptyReadOnly<long>.Collection;
+
+			[JsonProperty("size")]
+			public IReadOnlyCollection<long> Size { get; internal set; } = EmptyReadOnly<long>.Collection;
 		}
 
 		public class RoleUsage
@@ -127,12 +125,12 @@ public class SecurityFeatureToggle
 
 	public class AlertingUsage : XPackUsage
 	{
-		[JsonProperty("execution")]
-		public AlertingExecution Execution { get; internal set; }
-
 		[JsonProperty("count")]
 		public AlertingCount Count { get; internal set; }
 
+		[JsonProperty("execution")]
+		public AlertingExecution Execution { get; internal set; }
+
 		public class AlertingExecution
 		{
 			[JsonProperty("actions")]
@@ -150,11 +148,11 @@ public class ExecutionAction
 
 		public class AlertingCount
 		{
-			[JsonProperty("total")]
-			public long Total { get; internal set; }
-
 			[JsonProperty("active")]
 			public long Active { get; internal set; }
+
+			[JsonProperty("total")]
+			public long Total { get; internal set; }
 		}
 	}
 
@@ -166,12 +164,12 @@ public class MonitoringUsage : XPackUsage
 
 	public class MachineLearningUsage : XPackUsage
 	{
-		[JsonProperty("jobs")]
-		public IReadOnlyDictionary<string, Job> Jobs { get; set; } = EmptyReadOnly<string, Job>.Dictionary;
-
 		[JsonProperty("datafeeds")]
 		public IReadOnlyDictionary<string, DataFeed> Datafeeds { get; set; } = EmptyReadOnly<string, DataFeed>.Dictionary;
 
+		[JsonProperty("jobs")]
+		public IReadOnlyDictionary<string, Job> Jobs { get; set; } = EmptyReadOnly<string, Job>.Dictionary;
+
 		public class DataFeed
 		{
 			[JsonProperty("count")]
@@ -192,17 +190,17 @@ public class Job
 
 		public class JobStatistics
 		{
-			[JsonProperty("total")]
-			public double Total { get; internal set; }
-
-			[JsonProperty("min")]
-			public double Minimum { get; internal set; }
+			[JsonProperty("avg")]
+			public double Average { get; internal set; }
 
 			[JsonProperty("max")]
 			public double Maximum { get; internal set; }
 
-			[JsonProperty("avg")]
-			public double Average { get; internal set; }
+			[JsonProperty("min")]
+			public double Minimum { get; internal set; }
+
+			[JsonProperty("total")]
+			public double Total { get; internal set; }
 		}
 	}
 }
diff --git a/src/Nest/XPack/License/DeleteLicense/DeleteLicenseRequest.cs b/src/Nest/XPack/License/DeleteLicense/DeleteLicenseRequest.cs
index 1775be7c247..b88bd1034f0 100644
--- a/src/Nest/XPack/License/DeleteLicense/DeleteLicenseRequest.cs
+++ b/src/Nest/XPack/License/DeleteLicense/DeleteLicenseRequest.cs
@@ -1,20 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IDeleteLicenseRequest
-	{
-	}
+	public partial interface IDeleteLicenseRequest { }
 
-	public partial class DeleteLicenseRequest
-	{
-	}
+	public partial class DeleteLicenseRequest { }
 
 	[DescriptorFor("XpackLicenseDelete")]
-	public partial class DeleteLicenseDescriptor : IDeleteLicenseRequest
-	{
-
-	}
+	public partial class DeleteLicenseDescriptor : IDeleteLicenseRequest { }
 }
diff --git a/src/Nest/XPack/License/DeleteLicense/DeleteLicenseResponse.cs b/src/Nest/XPack/License/DeleteLicense/DeleteLicenseResponse.cs
index e30494496eb..2ffb4bac35e 100644
--- a/src/Nest/XPack/License/DeleteLicense/DeleteLicenseResponse.cs
+++ b/src/Nest/XPack/License/DeleteLicense/DeleteLicenseResponse.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	public interface IDeleteLicenseResponse : IResponse { }
 
diff --git a/src/Nest/XPack/License/DeleteLicense/ElasticClient-DeleteLicense.cs b/src/Nest/XPack/License/DeleteLicense/ElasticClient-DeleteLicense.cs
index 1e3c19ed928..7f7d4fb1b8b 100644
--- a/src/Nest/XPack/License/DeleteLicense/ElasticClient-DeleteLicense.cs
+++ b/src/Nest/XPack/License/DeleteLicense/ElasticClient-DeleteLicense.cs
@@ -1,48 +1,56 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteLicenseResponse DeleteLicense(Func<DeleteLicenseDescriptor, IDeleteLicenseRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteLicenseResponse DeleteLicense(IDeleteLicenseRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteLicenseResponse> DeleteLicenseAsync(Func<DeleteLicenseDescriptor, IDeleteLicenseRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteLicenseResponse> DeleteLicenseAsync(Func<DeleteLicenseDescriptor, IDeleteLicenseRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IDeleteLicenseResponse> DeleteLicenseAsync(IDeleteLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteLicenseResponse> DeleteLicenseAsync(IDeleteLicenseRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteLicenseResponse DeleteLicense(Func<DeleteLicenseDescriptor, IDeleteLicenseRequest> selector = null) =>
-			this.DeleteLicense(selector.InvokeOrDefault(new DeleteLicenseDescriptor()));
+			DeleteLicense(selector.InvokeOrDefault(new DeleteLicenseDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteLicenseResponse DeleteLicense(IDeleteLicenseRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteLicenseRequest, DeleteLicenseRequestParameters, DeleteLicenseResponse>(
+			Dispatcher.Dispatch<IDeleteLicenseRequest, DeleteLicenseRequestParameters, DeleteLicenseResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackLicenseDeleteDispatch<DeleteLicenseResponse>(p)
+				(p, d) => LowLevelDispatch.XpackLicenseDeleteDispatch<DeleteLicenseResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteLicenseResponse> DeleteLicenseAsync(Func<DeleteLicenseDescriptor, IDeleteLicenseRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteLicenseAsync(selector.InvokeOrDefault(new DeleteLicenseDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDeleteLicenseResponse> DeleteLicenseAsync(IDeleteLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteLicenseRequest, DeleteLicenseRequestParameters, DeleteLicenseResponse, IDeleteLicenseResponse>(
+		/// <inheritdoc />
+		public Task<IDeleteLicenseResponse> DeleteLicenseAsync(Func<DeleteLicenseDescriptor, IDeleteLicenseRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteLicenseAsync(selector.InvokeOrDefault(new DeleteLicenseDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDeleteLicenseResponse> DeleteLicenseAsync(IDeleteLicenseRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteLicenseRequest, DeleteLicenseRequestParameters, DeleteLicenseResponse, IDeleteLicenseResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackLicenseDeleteDispatchAsync<DeleteLicenseResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackLicenseDeleteDispatchAsync<DeleteLicenseResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/License/GetLicense/ElasticClient-GetLicense.cs b/src/Nest/XPack/License/GetLicense/ElasticClient-GetLicense.cs
index 91aeb58cb46..c67a4c475a1 100644
--- a/src/Nest/XPack/License/GetLicense/ElasticClient-GetLicense.cs
+++ b/src/Nest/XPack/License/GetLicense/ElasticClient-GetLicense.cs
@@ -1,48 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetLicenseResponse GetLicense(Func<GetLicenseDescriptor, IGetLicenseRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetLicenseResponse GetLicense(IGetLicenseRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetLicenseResponse> GetLicenseAsync(Func<GetLicenseDescriptor, IGetLicenseRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetLicenseResponse> GetLicenseAsync(Func<GetLicenseDescriptor, IGetLicenseRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetLicenseResponse> GetLicenseAsync(IGetLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetLicenseResponse GetLicense(Func<GetLicenseDescriptor, IGetLicenseRequest> selector = null) =>
-			this.GetLicense(selector.InvokeOrDefault(new GetLicenseDescriptor()));
+			GetLicense(selector.InvokeOrDefault(new GetLicenseDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetLicenseResponse GetLicense(IGetLicenseRequest request) =>
-			this.Dispatcher.Dispatch<IGetLicenseRequest, GetLicenseRequestParameters, GetLicenseResponse>(
+			Dispatcher.Dispatch<IGetLicenseRequest, GetLicenseRequestParameters, GetLicenseResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackLicenseGetDispatch<GetLicenseResponse>(p)
+				(p, d) => LowLevelDispatch.XpackLicenseGetDispatch<GetLicenseResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetLicenseResponse> GetLicenseAsync(Func<GetLicenseDescriptor, IGetLicenseRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetLicenseAsync(selector.InvokeOrDefault(new GetLicenseDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetLicenseResponse> GetLicenseAsync(Func<GetLicenseDescriptor, IGetLicenseRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetLicenseAsync(selector.InvokeOrDefault(new GetLicenseDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetLicenseResponse> GetLicenseAsync(IGetLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetLicenseRequest, GetLicenseRequestParameters, GetLicenseResponse, IGetLicenseResponse>(
+		/// <inheritdoc />
+		public Task<IGetLicenseResponse> GetLicenseAsync(IGetLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetLicenseRequest, GetLicenseRequestParameters, GetLicenseResponse, IGetLicenseResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackLicenseGetDispatchAsync<GetLicenseResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackLicenseGetDispatchAsync<GetLicenseResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/License/GetLicense/GetLicenseRequest.cs b/src/Nest/XPack/License/GetLicense/GetLicenseRequest.cs
index fb687705f6d..a14957414b4 100644
--- a/src/Nest/XPack/License/GetLicense/GetLicenseRequest.cs
+++ b/src/Nest/XPack/License/GetLicense/GetLicenseRequest.cs
@@ -1,20 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IGetLicenseRequest
-	{
-	}
+	public partial interface IGetLicenseRequest { }
 
-	public partial class GetLicenseRequest
-	{
-	}
+	public partial class GetLicenseRequest { }
 
 	[DescriptorFor("XpackLicenseGet")]
-	public partial class GetLicenseDescriptor : IGetLicenseRequest
-	{
-
-	}
+	public partial class GetLicenseDescriptor : IGetLicenseRequest { }
 }
diff --git a/src/Nest/XPack/License/GetLicense/GetLicenseResponse.cs b/src/Nest/XPack/License/GetLicense/GetLicenseResponse.cs
index 1f84535dbe8..ee59e564004 100644
--- a/src/Nest/XPack/License/GetLicense/GetLicenseResponse.cs
+++ b/src/Nest/XPack/License/GetLicense/GetLicenseResponse.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using Newtonsoft.Json;
 
@@ -20,14 +19,11 @@ public class GetLicenseResponse : ResponseBase, IGetLicenseResponse
 
 	public class LicenseInformation
 	{
-		[JsonProperty("status")]
-		public LicenseStatus Status { get; internal set; }
-
-		[JsonProperty("uid")]
-		public string UID { get; internal set; }
+		[JsonProperty("expiry_date")]
+		public DateTime ExpiryDate { get; internal set; }
 
-		[JsonProperty("type")]
-		public LicenseType Type { get; internal set; }
+		[JsonProperty("expiry_date_in_millis")]
+		public long ExpiryDateInMilliseconds { get; internal set; }
 
 		[JsonProperty("issue_date")]
 		public DateTime IssueDate { get; internal set; }
@@ -35,41 +31,32 @@ public class LicenseInformation
 		[JsonProperty("issue_date_in_millis")]
 		public long IssueDateInMilliseconds { get; internal set; }
 
-		[JsonProperty("expiry_date")]
-		public DateTime ExpiryDate { get; internal set; }
-
-		[JsonProperty("expiry_date_in_millis")]
-		public long ExpiryDateInMilliseconds { get; internal set; }
-
-		[JsonProperty("max_nodes")]
-		public long MaxNodes { get; internal set; }
-
 		[JsonProperty("issued_to")]
 		public string IssuedTo { get; internal set; }
 
 		[JsonProperty("issuer")]
 		public string Issuer { get; internal set; }
-	}
 
-	public class License
-	{
-		[JsonProperty("uid")]
-		public string UID { get; set; }
+		[JsonProperty("max_nodes")]
+		public long MaxNodes { get; internal set; }
 
-		[JsonProperty("signature")]
-		public string Signature { get; set; }
+		[JsonProperty("status")]
+		public LicenseStatus Status { get; internal set; }
 
 		[JsonProperty("type")]
-		public LicenseType Type { get; set; }
+		public LicenseType Type { get; internal set; }
 
-		[JsonProperty("issue_date_in_millis")]
-		public long IssueDateInMilliseconds { get; set; }
+		[JsonProperty("uid")]
+		public string UID { get; internal set; }
+	}
 
+	public class License
+	{
 		[JsonProperty("expiry_date_in_millis")]
 		public long ExpiryDateInMilliseconds { get; set; }
 
-		[JsonProperty("max_nodes")]
-		public long MaxNodes { get; set; }
+		[JsonProperty("issue_date_in_millis")]
+		public long IssueDateInMilliseconds { get; set; }
 
 		[JsonProperty("issued_to")]
 		public string IssuedTo { get; set; }
@@ -77,16 +64,29 @@ public class License
 		[JsonProperty("issuer")]
 		public string Issuer { get; set; }
 
-		private class Wrapped
-		{
-			[JsonProperty("license")]
-			public License License { get; set; }
-		}
+		[JsonProperty("max_nodes")]
+		public long MaxNodes { get; set; }
+
+		[JsonProperty("signature")]
+		public string Signature { get; set; }
+
+		[JsonProperty("type")]
+		public LicenseType Type { get; set; }
+
+		[JsonProperty("uid")]
+		public string UID { get; set; }
+
 		public static License LoadFromDisk(string path)
 		{
 			var contents = File.ReadAllText(path);
 			var license = JsonConvert.DeserializeObject<Wrapped>(contents)?.License;
 			return license;
 		}
+
+		private class Wrapped
+		{
+			[JsonProperty("license")]
+			public License License { get; set; }
+		}
 	}
 }
diff --git a/src/Nest/XPack/License/GetLicense/LicenseStatus.cs b/src/Nest/XPack/License/GetLicense/LicenseStatus.cs
index 10d2f37a7a8..0371f131f14 100644
--- a/src/Nest/XPack/License/GetLicense/LicenseStatus.cs
+++ b/src/Nest/XPack/License/GetLicense/LicenseStatus.cs
@@ -7,13 +7,16 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum LicenseStatus
 	{
-		[EnumMember(Value="active")]
+		[EnumMember(Value = "active")]
 		Active,
+
 		[EnumMember(Value = "valid")]
 		Valid,
-		[EnumMember(Value="invalid")]
+
+		[EnumMember(Value = "invalid")]
 		Invalid,
-		[EnumMember(Value="expired")]
+
+		[EnumMember(Value = "expired")]
 		Expired
 	}
 }
diff --git a/src/Nest/XPack/License/GetLicense/LicenseType.cs b/src/Nest/XPack/License/GetLicense/LicenseType.cs
index fec1c62adf7..30b661f5557 100644
--- a/src/Nest/XPack/License/GetLicense/LicenseType.cs
+++ b/src/Nest/XPack/License/GetLicense/LicenseType.cs
@@ -7,21 +7,28 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum LicenseType
 	{
-		[EnumMember(Value="missing")]
+		[EnumMember(Value = "missing")]
 		Missing,
-		[EnumMember(Value="trial")]
+
+		[EnumMember(Value = "trial")]
 		Trial,
-		[EnumMember(Value="basic")]
+
+		[EnumMember(Value = "basic")]
 		Basic,
-		[EnumMember(Value="standard")]
+
+		[EnumMember(Value = "standard")]
 		Standard,
-		[EnumMember(Value="dev")]//bwc
+
+		[EnumMember(Value = "dev")] //bwc
 		Dev,
-		[EnumMember(Value="silver")] //bwc
+
+		[EnumMember(Value = "silver")] //bwc
 		Silver,
-		[EnumMember(Value="gold")]
+
+		[EnumMember(Value = "gold")]
 		Gold,
-		[EnumMember(Value="platinum")]
+
+		[EnumMember(Value = "platinum")]
 		Platinum
 	}
 }
diff --git a/src/Nest/XPack/License/GetTrialLicenseStatus/ElasticClient-GetTrialLicenseStatus.cs b/src/Nest/XPack/License/GetTrialLicenseStatus/ElasticClient-GetTrialLicenseStatus.cs
index ab3664354bf..4e138f1e7d7 100644
--- a/src/Nest/XPack/License/GetTrialLicenseStatus/ElasticClient-GetTrialLicenseStatus.cs
+++ b/src/Nest/XPack/License/GetTrialLicenseStatus/ElasticClient-GetTrialLicenseStatus.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -29,7 +29,10 @@ public partial interface IElasticClient
 		/// <remarks>
 		/// Valid in Elasticsearch 6.2.0+.
 		/// </remarks>
-		Task<IGetTrialLicenseStatusResponse> GetTrialLicenseStatusAsync(Func<GetTrialLicenseStatusDescriptor, IGetTrialLicenseStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IGetTrialLicenseStatusResponse> GetTrialLicenseStatusAsync(
+			Func<GetTrialLicenseStatusDescriptor, IGetTrialLicenseStatusRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Checks the status of a trial license.
@@ -37,32 +40,43 @@ public partial interface IElasticClient
 		/// <remarks>
 		/// Valid in Elasticsearch 6.2.0+.
 		/// </remarks>
-		Task<IGetTrialLicenseStatusResponse> GetTrialLicenseStatusAsync(IGetTrialLicenseStatusRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IGetTrialLicenseStatusResponse> GetTrialLicenseStatusAsync(IGetTrialLicenseStatusRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IGetTrialLicenseStatusResponse GetTrialLicenseStatus(Func<GetTrialLicenseStatusDescriptor, IGetTrialLicenseStatusRequest> selector = null) =>
-			this.GetTrialLicenseStatus(selector.InvokeOrDefault(new GetTrialLicenseStatusDescriptor()));
+		/// <inheritdoc />
+		public IGetTrialLicenseStatusResponse GetTrialLicenseStatus(
+			Func<GetTrialLicenseStatusDescriptor, IGetTrialLicenseStatusRequest> selector = null
+		) =>
+			GetTrialLicenseStatus(selector.InvokeOrDefault(new GetTrialLicenseStatusDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetTrialLicenseStatusResponse GetTrialLicenseStatus(IGetTrialLicenseStatusRequest request) =>
-			this.Dispatcher.Dispatch<IGetTrialLicenseStatusRequest, GetTrialLicenseStatusRequestParameters, GetTrialLicenseStatusResponse>(
+			Dispatcher.Dispatch<IGetTrialLicenseStatusRequest, GetTrialLicenseStatusRequestParameters, GetTrialLicenseStatusResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackLicenseGetTrialStatusDispatch<GetTrialLicenseStatusResponse>(p)
+				(p, d) => LowLevelDispatch.XpackLicenseGetTrialStatusDispatch<GetTrialLicenseStatusResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetTrialLicenseStatusResponse> GetTrialLicenseStatusAsync(Func<GetTrialLicenseStatusDescriptor, IGetTrialLicenseStatusRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetTrialLicenseStatusAsync(selector.InvokeOrDefault(new GetTrialLicenseStatusDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetTrialLicenseStatusResponse> GetTrialLicenseStatusAsync(
+			Func<GetTrialLicenseStatusDescriptor, IGetTrialLicenseStatusRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetTrialLicenseStatusAsync(selector.InvokeOrDefault(new GetTrialLicenseStatusDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetTrialLicenseStatusResponse> GetTrialLicenseStatusAsync(IGetTrialLicenseStatusRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetTrialLicenseStatusRequest, GetTrialLicenseStatusRequestParameters, GetTrialLicenseStatusResponse, IGetTrialLicenseStatusResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackLicenseGetTrialStatusDispatchAsync<GetTrialLicenseStatusResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IGetTrialLicenseStatusResponse> GetTrialLicenseStatusAsync(IGetTrialLicenseStatusRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetTrialLicenseStatusRequest, GetTrialLicenseStatusRequestParameters, GetTrialLicenseStatusResponse,
+					IGetTrialLicenseStatusResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackLicenseGetTrialStatusDispatchAsync<GetTrialLicenseStatusResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusRequest.cs b/src/Nest/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusRequest.cs
index c862d8b3034..2ae3702545f 100644
--- a/src/Nest/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusRequest.cs
+++ b/src/Nest/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusRequest.cs
@@ -1,20 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IGetTrialLicenseStatusRequest
-	{
-	}
+	public partial interface IGetTrialLicenseStatusRequest { }
 
-	public partial class GetTrialLicenseStatusRequest
-	{
-	}
+	public partial class GetTrialLicenseStatusRequest { }
 
 	[DescriptorFor("XpackLicenseGetTrialStatus")]
-	public partial class GetTrialLicenseStatusDescriptor : IGetTrialLicenseStatusRequest
-	{
-
-	}
+	public partial class GetTrialLicenseStatusDescriptor : IGetTrialLicenseStatusRequest { }
 }
diff --git a/src/Nest/XPack/License/PostLicense/ElasticClient-PostLicense.cs b/src/Nest/XPack/License/PostLicense/ElasticClient-PostLicense.cs
index b3dee3ff6f7..9e97f6ef07d 100644
--- a/src/Nest/XPack/License/PostLicense/ElasticClient-PostLicense.cs
+++ b/src/Nest/XPack/License/PostLicense/ElasticClient-PostLicense.cs
@@ -1,48 +1,54 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPostLicenseResponse PostLicense(Func<PostLicenseDescriptor, IPostLicenseRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPostLicenseResponse PostLicense(IPostLicenseRequest request);
 
-		/// <inheritdoc/>
-		Task<IPostLicenseResponse> PostLicenseAsync(Func<PostLicenseDescriptor, IPostLicenseRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPostLicenseResponse> PostLicenseAsync(Func<PostLicenseDescriptor, IPostLicenseRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPostLicenseResponse> PostLicenseAsync(IPostLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPostLicenseResponse PostLicense(Func<PostLicenseDescriptor, IPostLicenseRequest> selector = null) =>
-			this.PostLicense(selector.InvokeOrDefault(new PostLicenseDescriptor()));
+			PostLicense(selector.InvokeOrDefault(new PostLicenseDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPostLicenseResponse PostLicense(IPostLicenseRequest request) =>
-			this.Dispatcher.Dispatch<IPostLicenseRequest, PostLicenseRequestParameters, PostLicenseResponse>(
+			Dispatcher.Dispatch<IPostLicenseRequest, PostLicenseRequestParameters, PostLicenseResponse>(
 				request,
-				this.LowLevelDispatch.XpackLicensePostDispatch<PostLicenseResponse>
+				LowLevelDispatch.XpackLicensePostDispatch<PostLicenseResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPostLicenseResponse> PostLicenseAsync(Func<PostLicenseDescriptor, IPostLicenseRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PostLicenseAsync(selector.InvokeOrDefault(new PostLicenseDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IPostLicenseResponse> PostLicenseAsync(IPostLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPostLicenseRequest, PostLicenseRequestParameters, PostLicenseResponse, IPostLicenseResponse>(
+		/// <inheritdoc />
+		public Task<IPostLicenseResponse> PostLicenseAsync(Func<PostLicenseDescriptor, IPostLicenseRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PostLicenseAsync(selector.InvokeOrDefault(new PostLicenseDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IPostLicenseResponse> PostLicenseAsync(IPostLicenseRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IPostLicenseRequest, PostLicenseRequestParameters, PostLicenseResponse, IPostLicenseResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackLicensePostDispatchAsync<PostLicenseResponse>
+				LowLevelDispatch.XpackLicensePostDispatchAsync<PostLicenseResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/License/PostLicense/LicenseAcknowledgement.cs b/src/Nest/XPack/License/PostLicense/LicenseAcknowledgement.cs
index 202684f56a7..3ac658813ed 100644
--- a/src/Nest/XPack/License/PostLicense/LicenseAcknowledgement.cs
+++ b/src/Nest/XPack/License/PostLicense/LicenseAcknowledgement.cs
@@ -3,11 +3,12 @@
 namespace Nest
 {
 	/// <summary>
-	/// If the license is valid but is older or has less capabilities this will list out the reasons why a resubmission with acknowledge=true is required
+	/// If the license is valid but is older or has less capabilities this will list out the reasons why a resubmission with acknowledge=true is
+	/// required
 	/// </summary>
 	public class LicenseAcknowledgement
 	{
-		public string Message { get; set; }
 		public IReadOnlyCollection<string> License { get; set; }
+		public string Message { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/License/PostLicense/PostLicenseRequest.cs b/src/Nest/XPack/License/PostLicense/PostLicenseRequest.cs
index f121e93ca75..729aad65e96 100644
--- a/src/Nest/XPack/License/PostLicense/PostLicenseRequest.cs
+++ b/src/Nest/XPack/License/PostLicense/PostLicenseRequest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -24,6 +22,5 @@ public partial class PostLicenseDescriptor
 
 		public PostLicenseDescriptor License(License license) =>
 			Assign(a => a.License = license);
-
 	}
 }
diff --git a/src/Nest/XPack/License/PostLicense/PostLicenseResponse.cs b/src/Nest/XPack/License/PostLicense/PostLicenseResponse.cs
index 6eaf45353c5..d40f0e16b42 100644
--- a/src/Nest/XPack/License/PostLicense/PostLicenseResponse.cs
+++ b/src/Nest/XPack/License/PostLicense/PostLicenseResponse.cs
@@ -1,30 +1,29 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	public interface IPostLicenseResponse : IResponse
 	{
-		[JsonProperty("acknowledged")]
-		bool Acknowledged { get; }
-
-		[JsonProperty("license_status")]
-		LicenseStatus LicenseStatus { get; }
-
 		/// <summary>
-		/// If the license is valid but is older or has less capabilities this will list out the reasons why a resubmission with acknowledge=true is required.
+		/// If the license is valid but is older or has less capabilities this will list out the reasons why a resubmission with acknowledge=true is
+		/// required.
 		/// null if no acknowledge resubmission is needed
 		/// </summary>
 		[JsonProperty("acknowledge")]
 		LicenseAcknowledgement Acknowledge { get; }
+
+		[JsonProperty("acknowledged")]
+		bool Acknowledged { get; }
+
+		[JsonProperty("license_status")]
+		LicenseStatus LicenseStatus { get; }
 	}
 
 	public class PostLicenseResponse : ResponseBase, IPostLicenseResponse
 	{
+		public LicenseAcknowledgement Acknowledge { get; internal set; }
 		public bool Acknowledged { get; internal set; }
 
 		public LicenseStatus LicenseStatus { get; internal set; }
-
-		public LicenseAcknowledgement Acknowledge { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/License/StartTrialLicense/ElasticClient-StartTrialLicense.cs b/src/Nest/XPack/License/StartTrialLicense/ElasticClient-StartTrialLicense.cs
index 9e428223f3d..7adbbfd2bbf 100644
--- a/src/Nest/XPack/License/StartTrialLicense/ElasticClient-StartTrialLicense.cs
+++ b/src/Nest/XPack/License/StartTrialLicense/ElasticClient-StartTrialLicense.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -35,7 +35,9 @@ public partial interface IElasticClient
 		/// Valid in Elasticsearch 6.2.0+. You are allowed to initiate a trial license only if your cluster
 		/// has not already activated a trial license for the current major X-Pack version.
 		/// </remarks>
-		Task<IStartTrialLicenseResponse> StartTrialLicenseAsync(Func<StartTrialLicenseDescriptor, IStartTrialLicenseRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IStartTrialLicenseResponse> StartTrialLicenseAsync(Func<StartTrialLicenseDescriptor, IStartTrialLicenseRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Starts a 30-day trial license, allowing an upgrade from a basic license to a 30-day trial license,
@@ -45,32 +47,39 @@ public partial interface IElasticClient
 		/// Valid in Elasticsearch 6.2.0+. You are allowed to initiate a trial license only if your cluster
 		/// has not already activated a trial license for the current major X-Pack version.
 		/// </remarks>
-		Task<IStartTrialLicenseResponse> StartTrialLicenseAsync(IStartTrialLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IStartTrialLicenseResponse> StartTrialLicenseAsync(IStartTrialLicenseRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStartTrialLicenseResponse StartTrialLicense(Func<StartTrialLicenseDescriptor, IStartTrialLicenseRequest> selector = null) =>
-			this.StartTrialLicense(selector.InvokeOrDefault(new StartTrialLicenseDescriptor()));
+			StartTrialLicense(selector.InvokeOrDefault(new StartTrialLicenseDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStartTrialLicenseResponse StartTrialLicense(IStartTrialLicenseRequest request) =>
-			this.Dispatcher.Dispatch<IStartTrialLicenseRequest, StartTrialLicenseRequestParameters, StartTrialLicenseResponse>(
+			Dispatcher.Dispatch<IStartTrialLicenseRequest, StartTrialLicenseRequestParameters, StartTrialLicenseResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackLicensePostStartTrialDispatch<StartTrialLicenseResponse>(p)
+				(p, d) => LowLevelDispatch.XpackLicensePostStartTrialDispatch<StartTrialLicenseResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IStartTrialLicenseResponse> StartTrialLicenseAsync(Func<StartTrialLicenseDescriptor, IStartTrialLicenseRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.StartTrialLicenseAsync(selector.InvokeOrDefault(new StartTrialLicenseDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IStartTrialLicenseResponse> StartTrialLicenseAsync(Func<StartTrialLicenseDescriptor, IStartTrialLicenseRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			StartTrialLicenseAsync(selector.InvokeOrDefault(new StartTrialLicenseDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IStartTrialLicenseResponse> StartTrialLicenseAsync(IStartTrialLicenseRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IStartTrialLicenseRequest, StartTrialLicenseRequestParameters, StartTrialLicenseResponse, IStartTrialLicenseResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackLicensePostStartTrialDispatchAsync<StartTrialLicenseResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IStartTrialLicenseResponse> StartTrialLicenseAsync(IStartTrialLicenseRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IStartTrialLicenseRequest, StartTrialLicenseRequestParameters, StartTrialLicenseResponse, IStartTrialLicenseResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackLicensePostStartTrialDispatchAsync<StartTrialLicenseResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseRequest.cs b/src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseRequest.cs
index 393a5a0e8b2..f7504518197 100644
--- a/src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseRequest.cs
+++ b/src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseRequest.cs
@@ -1,20 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IStartTrialLicenseRequest
-	{
-	}
+	public partial interface IStartTrialLicenseRequest { }
 
-	public partial class StartTrialLicenseRequest
-	{
-	}
+	public partial class StartTrialLicenseRequest { }
 
 	[DescriptorFor("XpackLicensePostStartTrial")]
-	public partial class StartTrialLicenseDescriptor : IStartTrialLicenseRequest
-	{
-
-	}
+	public partial class StartTrialLicenseDescriptor : IStartTrialLicenseRequest { }
 }
diff --git a/src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseResponse.cs b/src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseResponse.cs
index ca9083c7c5a..eca97d13c13 100644
--- a/src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseResponse.cs
+++ b/src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseResponse.cs
@@ -4,17 +4,16 @@ namespace Nest
 {
 	public interface IStartTrialLicenseResponse : IResponse
 	{
-		[JsonProperty("trial_was_started")]
-		bool TrialWasStarted { get; }
-
 		[JsonProperty("error_message")]
 		string ErrorMessage { get; }
+
+		[JsonProperty("trial_was_started")]
+		bool TrialWasStarted { get; }
 	}
 
 	public class StartTrialLicenseResponse : ResponseBase, IStartTrialLicenseResponse
 	{
-		public bool TrialWasStarted { get; internal set; }
-
 		public string ErrorMessage { get; internal set; }
+		public bool TrialWasStarted { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/CloseJob/CloseJobRequest.cs b/src/Nest/XPack/MachineLearning/CloseJob/CloseJobRequest.cs
index 72be85a6f4e..c7961db649b 100644
--- a/src/Nest/XPack/MachineLearning/CloseJob/CloseJobRequest.cs
+++ b/src/Nest/XPack/MachineLearning/CloseJob/CloseJobRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface ICloseJobRequest {}
+	public partial interface ICloseJobRequest { }
 
-	public partial class CloseJobRequest {}
+	public partial class CloseJobRequest { }
 
 	[DescriptorFor("XpackMlCloseJob")]
-	public partial class CloseJobDescriptor {}
+	public partial class CloseJobDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/CloseJob/ElasticClient-CloseJob.cs b/src/Nest/XPack/MachineLearning/CloseJob/ElasticClient-CloseJob.cs
index ae1c923dda1..96ad19b1bab 100644
--- a/src/Nest/XPack/MachineLearning/CloseJob/ElasticClient-CloseJob.cs
+++ b/src/Nest/XPack/MachineLearning/CloseJob/ElasticClient-CloseJob.cs
@@ -13,39 +13,43 @@ public partial interface IElasticClient
 		/// </summary>
 		ICloseJobResponse CloseJob(Id jobId, Func<CloseJobDescriptor, ICloseJobRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		ICloseJobResponse CloseJob(ICloseJobRequest request);
 
-		/// <inheritdoc/>
-		Task<ICloseJobResponse> CloseJobAsync(Id jobId, Func<CloseJobDescriptor, ICloseJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<ICloseJobResponse> CloseJobAsync(Id jobId, Func<CloseJobDescriptor, ICloseJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<ICloseJobResponse> CloseJobAsync(ICloseJobRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICloseJobResponse CloseJob(Id jobId, Func<CloseJobDescriptor, ICloseJobRequest> selector = null) =>
-			this.CloseJob(selector.InvokeOrDefault(new CloseJobDescriptor(jobId)));
+			CloseJob(selector.InvokeOrDefault(new CloseJobDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICloseJobResponse CloseJob(ICloseJobRequest request) =>
-			this.Dispatcher.Dispatch<ICloseJobRequest, CloseJobRequestParameters, CloseJobResponse>(
+			Dispatcher.Dispatch<ICloseJobRequest, CloseJobRequestParameters, CloseJobResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlCloseJobDispatch<CloseJobResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlCloseJobDispatch<CloseJobResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<ICloseJobResponse> CloseJobAsync(Id jobId, Func<CloseJobDescriptor, ICloseJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.CloseJobAsync(selector.InvokeOrDefault(new CloseJobDescriptor(jobId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<ICloseJobResponse> CloseJobAsync(Id jobId, Func<CloseJobDescriptor, ICloseJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			CloseJobAsync(selector.InvokeOrDefault(new CloseJobDescriptor(jobId)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICloseJobResponse> CloseJobAsync(ICloseJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ICloseJobRequest, CloseJobRequestParameters, CloseJobResponse, ICloseJobResponse>(
+			Dispatcher.DispatchAsync<ICloseJobRequest, CloseJobRequestParameters, CloseJobResponse, ICloseJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlCloseJobDispatchAsync<CloseJobResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlCloseJobDispatchAsync<CloseJobResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Datafeed/ChunkingConfig.cs b/src/Nest/XPack/MachineLearning/Datafeed/ChunkingConfig.cs
index 21fdcdb8939..a00c19b7890 100644
--- a/src/Nest/XPack/MachineLearning/Datafeed/ChunkingConfig.cs
+++ b/src/Nest/XPack/MachineLearning/Datafeed/ChunkingConfig.cs
@@ -21,7 +21,7 @@ public interface IChunkingConfig
 
 		/// <summary>
 		/// The time span that each search will be querying.
-		/// This setting is only applicable when <see cref="Mode"/> is set to <see cref="ChunkingMode.Manual"/>.
+		/// This setting is only applicable when <see cref="Mode" /> is set to <see cref="ChunkingMode.Manual" />.
 		/// </summary>
 		[JsonProperty("time_span")]
 		Time TimeSpan { get; set; }
diff --git a/src/Nest/XPack/MachineLearning/Datafeed/DatafeedConfig.cs b/src/Nest/XPack/MachineLearning/Datafeed/DatafeedConfig.cs
index 01ec60c26e9..73f9c29f3f3 100644
--- a/src/Nest/XPack/MachineLearning/Datafeed/DatafeedConfig.cs
+++ b/src/Nest/XPack/MachineLearning/Datafeed/DatafeedConfig.cs
@@ -8,12 +8,6 @@ namespace Nest
 	[JsonObject]
 	public class DatafeedConfig
 	{
-		/// <summary>
-		/// The datafeed id.
-		/// </summary>
-		[JsonProperty("datafeed_id")]
-		public string DatafeedId { get; internal set; }
-
 		/// <summary>
 		/// The aggregation searches to perform for the datafeed.
 		/// </summary>
@@ -26,6 +20,12 @@ public class DatafeedConfig
 		[JsonProperty("chunking_config")]
 		public IChunkingConfig ChunkingConfig { get; internal set; }
 
+		/// <summary>
+		/// The datafeed id.
+		/// </summary>
+		[JsonProperty("datafeed_id")]
+		public string DatafeedId { get; internal set; }
+
 		/// <summary>
 		/// The interval at which scheduled queries are made while the datafeed runs in real time.
 		/// The default value is either the bucket span for short bucket spans, or, for longer bucket spans,
@@ -74,8 +74,8 @@ public class DatafeedConfig
 		[JsonProperty("scroll_size")]
 		public int? ScrollSize { get; internal set; }
 
-		///<summary>
-		/// A list of types to search for within the specified indices.
+		/// <summary>
+		///  A list of types to search for within the specified indices.
 		/// </summary>
 		[JsonProperty("types")]
 		[JsonConverter(typeof(TypesJsonConverter))]
diff --git a/src/Nest/XPack/MachineLearning/Datafeed/DatafeedState.cs b/src/Nest/XPack/MachineLearning/Datafeed/DatafeedState.cs
index d08cf6af869..1c856beb94d 100644
--- a/src/Nest/XPack/MachineLearning/Datafeed/DatafeedState.cs
+++ b/src/Nest/XPack/MachineLearning/Datafeed/DatafeedState.cs
@@ -9,11 +9,14 @@ public enum DatafeedState
 	{
 		[EnumMember(Value = "started")]
 		Started,
+
 		[EnumMember(Value = "stopped")]
 		Stopped,
+
 		[EnumMember(Value = "starting")]
 		Starting,
+
 		[EnumMember(Value = "stopping")]
 		Stopping
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/MachineLearning/Datafeed/DatafeedStats.cs b/src/Nest/XPack/MachineLearning/Datafeed/DatafeedStats.cs
index 048e30e71cd..860fb1d1082 100644
--- a/src/Nest/XPack/MachineLearning/Datafeed/DatafeedStats.cs
+++ b/src/Nest/XPack/MachineLearning/Datafeed/DatafeedStats.cs
@@ -5,16 +5,16 @@ namespace Nest
 	[JsonObject]
 	public class DatafeedStats
 	{
+		[JsonProperty("assignment_explanation")]
+		public string AssignmentExplanation { get; internal set; }
+
 		[JsonProperty("datafeed_id")]
 		public string DatafeedId { get; internal set; }
 
-		[JsonProperty("state")]
-		public DatafeedState State { get; internal set; }
-
 		[JsonProperty("node")]
 		public DiscoveryNode Node { get; internal set; }
 
-		[JsonProperty("assignment_explanation")]
-		public string AssignmentExplanation { get; internal set; }
+		[JsonProperty("state")]
+		public DatafeedState State { get; internal set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/MachineLearning/Datafeed/DiscoveryNode.cs b/src/Nest/XPack/MachineLearning/Datafeed/DiscoveryNode.cs
index ab981cd1b7d..1980c2ebb7c 100644
--- a/src/Nest/XPack/MachineLearning/Datafeed/DiscoveryNode.cs
+++ b/src/Nest/XPack/MachineLearning/Datafeed/DiscoveryNode.cs
@@ -6,6 +6,19 @@ namespace Nest
 	[JsonObject]
 	public class DiscoveryNode
 	{
+		/// <summary>
+		/// The node attributes
+		/// </summary>
+		[JsonProperty("attributes")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, string>))]
+		public IReadOnlyDictionary<string, string> Attributes { get; internal set; } = EmptyReadOnly<string, string>.Dictionary;
+
+		/// <summary>
+		/// The ephemeral id of the node.
+		/// </summary>
+		[JsonProperty("ephemeral_id")]
+		public string EphemeralId { get; internal set; }
+
 		/// <summary>
 		/// The unique identifier of the node.
 		/// </summary>
@@ -18,23 +31,10 @@ public class DiscoveryNode
 		[JsonProperty("name")]
 		public string Name { get; internal set; }
 
-		/// <summary>
-		/// The ephemeral id of the node.
-		/// </summary>
-		[JsonProperty("ephemeral_id")]
-		public string EphemeralId { get; internal set; }
-
 		/// <summary>
 		/// The host and port where transport HTTP connections are accepted.
 		/// </summary>
 		[JsonProperty("transport_address")]
 		public string TransportAddress { get; internal set; }
-
-		/// <summary>
-		/// The node attributes
-		/// </summary>
-		[JsonProperty("attributes")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, string>))]
-		public IReadOnlyDictionary<string, string> Attributes { get; internal set; } = EmptyReadOnly<string, string>.Dictionary;
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedRequest.cs b/src/Nest/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedRequest.cs
index e09f0eabcc9..5b1015b6427 100644
--- a/src/Nest/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedRequest.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IDeleteDatafeedRequest {}
+	public partial interface IDeleteDatafeedRequest { }
 
-	public partial class DeleteDatafeedRequest {}
+	public partial class DeleteDatafeedRequest { }
 
 	[DescriptorFor("XpackMlDeleteDatafeed")]
-	public partial class DeleteDatafeedDescriptor {}
+	public partial class DeleteDatafeedDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedResponse.cs b/src/Nest/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedResponse.cs
index c42c6b9d01f..bf898c84115 100644
--- a/src/Nest/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedResponse.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedResponse.cs
@@ -1,6 +1,6 @@
 namespace Nest
 {
-	public interface IDeleteDatafeedResponse : IAcknowledgedResponse {}
+	public interface IDeleteDatafeedResponse : IAcknowledgedResponse { }
 
-	public class DeleteDatafeedResponse : AcknowledgedResponseBase, IDeleteDatafeedResponse {}
+	public class DeleteDatafeedResponse : AcknowledgedResponseBase, IDeleteDatafeedResponse { }
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteDatafeed/ElasticClient-DeleteDatafeed.cs b/src/Nest/XPack/MachineLearning/DeleteDatafeed/ElasticClient-DeleteDatafeed.cs
index 359c613fe7d..8e478830545 100644
--- a/src/Nest/XPack/MachineLearning/DeleteDatafeed/ElasticClient-DeleteDatafeed.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteDatafeed/ElasticClient-DeleteDatafeed.cs
@@ -12,39 +12,47 @@ public partial interface IElasticClient
 		/// </summary>
 		IDeleteDatafeedResponse DeleteDatafeed(Id datafeedId, Func<DeleteDatafeedDescriptor, IDeleteDatafeedRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteDatafeedResponse DeleteDatafeed(IDeleteDatafeedRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteDatafeedResponse> DeleteDatafeedAsync(Id datafeedId, Func<DeleteDatafeedDescriptor, IDeleteDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteDatafeedResponse> DeleteDatafeedAsync(Id datafeedId, Func<DeleteDatafeedDescriptor, IDeleteDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IDeleteDatafeedResponse> DeleteDatafeedAsync(IDeleteDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteDatafeedResponse> DeleteDatafeedAsync(IDeleteDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteDatafeedResponse DeleteDatafeed(Id datafeedId, Func<DeleteDatafeedDescriptor, IDeleteDatafeedRequest> selector = null) =>
-			this.DeleteDatafeed(selector.InvokeOrDefault(new DeleteDatafeedDescriptor(datafeedId)));
+			DeleteDatafeed(selector.InvokeOrDefault(new DeleteDatafeedDescriptor(datafeedId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteDatafeedResponse DeleteDatafeed(IDeleteDatafeedRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteDatafeedRequest, DeleteDatafeedRequestParameters, DeleteDatafeedResponse>(
+			Dispatcher.Dispatch<IDeleteDatafeedRequest, DeleteDatafeedRequestParameters, DeleteDatafeedResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlDeleteDatafeedDispatch<DeleteDatafeedResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlDeleteDatafeedDispatch<DeleteDatafeedResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteDatafeedResponse> DeleteDatafeedAsync(Id datafeedId, Func<DeleteDatafeedDescriptor, IDeleteDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteDatafeedAsync(selector.InvokeOrDefault(new DeleteDatafeedDescriptor(datafeedId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDeleteDatafeedResponse> DeleteDatafeedAsync(IDeleteDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteDatafeedRequest, DeleteDatafeedRequestParameters, DeleteDatafeedResponse, IDeleteDatafeedResponse>(
+		/// <inheritdoc />
+		public Task<IDeleteDatafeedResponse> DeleteDatafeedAsync(Id datafeedId,
+			Func<DeleteDatafeedDescriptor, IDeleteDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteDatafeedAsync(selector.InvokeOrDefault(new DeleteDatafeedDescriptor(datafeedId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDeleteDatafeedResponse> DeleteDatafeedAsync(IDeleteDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteDatafeedRequest, DeleteDatafeedRequestParameters, DeleteDatafeedResponse, IDeleteDatafeedResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlDeleteDatafeedDispatchAsync<DeleteDatafeedResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlDeleteDatafeedDispatchAsync<DeleteDatafeedResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataRequest.cs b/src/Nest/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataRequest.cs
index ec0116a7c53..035df187623 100644
--- a/src/Nest/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataRequest.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IDeleteExpiredDataRequest {}
+	public partial interface IDeleteExpiredDataRequest { }
 
-	public partial class DeleteExpiredDataRequest {}
+	public partial class DeleteExpiredDataRequest { }
 
 	[DescriptorFor("XpackMlDeleteExpiredData")]
-	public partial class DeleteExpiredDataDescriptor {}
+	public partial class DeleteExpiredDataDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteExpiredData/ElasticClient-DeleteExpiredData.cs b/src/Nest/XPack/MachineLearning/DeleteExpiredData/ElasticClient-DeleteExpiredData.cs
index 62007c52cb9..1ddbfc38412 100644
--- a/src/Nest/XPack/MachineLearning/DeleteExpiredData/ElasticClient-DeleteExpiredData.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteExpiredData/ElasticClient-DeleteExpiredData.cs
@@ -12,39 +12,48 @@ public partial interface IElasticClient
 		/// </summary>
 		IDeleteExpiredDataResponse DeleteExpiredData(Func<DeleteExpiredDataDescriptor, IDeleteExpiredDataRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteExpiredDataResponse DeleteExpiredData(IDeleteExpiredDataRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteExpiredDataResponse> DeleteExpiredDataAsync(Func<DeleteExpiredDataDescriptor, IDeleteExpiredDataRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteExpiredDataResponse> DeleteExpiredDataAsync(Func<DeleteExpiredDataDescriptor, IDeleteExpiredDataRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IDeleteExpiredDataResponse> DeleteExpiredDataAsync(IDeleteExpiredDataRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteExpiredDataResponse> DeleteExpiredDataAsync(IDeleteExpiredDataRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteExpiredDataResponse DeleteExpiredData(Func<DeleteExpiredDataDescriptor, IDeleteExpiredDataRequest> selector = null) =>
-			this.DeleteExpiredData(selector.InvokeOrDefault(new DeleteExpiredDataDescriptor()));
+			DeleteExpiredData(selector.InvokeOrDefault(new DeleteExpiredDataDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteExpiredDataResponse DeleteExpiredData(IDeleteExpiredDataRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteExpiredDataRequest, DeleteExpiredDataRequestParameters, DeleteExpiredDataResponse>(
+			Dispatcher.Dispatch<IDeleteExpiredDataRequest, DeleteExpiredDataRequestParameters, DeleteExpiredDataResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlDeleteExpiredDataDispatch<DeleteExpiredDataResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlDeleteExpiredDataDispatch<DeleteExpiredDataResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteExpiredDataResponse> DeleteExpiredDataAsync(Func<DeleteExpiredDataDescriptor, IDeleteExpiredDataRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteExpiredDataAsync(selector.InvokeOrDefault(new DeleteExpiredDataDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDeleteExpiredDataResponse> DeleteExpiredDataAsync(IDeleteExpiredDataRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteExpiredDataRequest, DeleteExpiredDataRequestParameters, DeleteExpiredDataResponse, IDeleteExpiredDataResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlDeleteExpiredDataDispatchAsync<DeleteExpiredDataResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IDeleteExpiredDataResponse> DeleteExpiredDataAsync(Func<DeleteExpiredDataDescriptor, IDeleteExpiredDataRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteExpiredDataAsync(selector.InvokeOrDefault(new DeleteExpiredDataDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDeleteExpiredDataResponse> DeleteExpiredDataAsync(IDeleteExpiredDataRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IDeleteExpiredDataRequest, DeleteExpiredDataRequestParameters, DeleteExpiredDataResponse, IDeleteExpiredDataResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackMlDeleteExpiredDataDispatchAsync<DeleteExpiredDataResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteJob/DeleteJobRequest.cs b/src/Nest/XPack/MachineLearning/DeleteJob/DeleteJobRequest.cs
index b6ac38225d5..7a6c02d0694 100644
--- a/src/Nest/XPack/MachineLearning/DeleteJob/DeleteJobRequest.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteJob/DeleteJobRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IDeleteJobRequest {}
+	public partial interface IDeleteJobRequest { }
 
-	public partial class DeleteJobRequest {}
+	public partial class DeleteJobRequest { }
 
 	[DescriptorFor("XpackMlDeleteJob")]
-	public partial class DeleteJobDescriptor {}
+	public partial class DeleteJobDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteJob/DeleteJobResponse.cs b/src/Nest/XPack/MachineLearning/DeleteJob/DeleteJobResponse.cs
index 33caf65ef0f..5b18ecbf4a0 100644
--- a/src/Nest/XPack/MachineLearning/DeleteJob/DeleteJobResponse.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteJob/DeleteJobResponse.cs
@@ -1,6 +1,6 @@
 namespace Nest
 {
-	public interface IDeleteJobResponse : IAcknowledgedResponse {}
+	public interface IDeleteJobResponse : IAcknowledgedResponse { }
 
-	public class DeleteJobResponse : AcknowledgedResponseBase, IDeleteJobResponse {}
+	public class DeleteJobResponse : AcknowledgedResponseBase, IDeleteJobResponse { }
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteJob/ElasticClient-DeleteJob.cs b/src/Nest/XPack/MachineLearning/DeleteJob/ElasticClient-DeleteJob.cs
index 138bd7b7d8e..bdeb6c85124 100644
--- a/src/Nest/XPack/MachineLearning/DeleteJob/ElasticClient-DeleteJob.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteJob/ElasticClient-DeleteJob.cs
@@ -17,39 +17,43 @@ public partial interface IElasticClient
 		/// </remarks>
 		IDeleteJobResponse DeleteJob(Id jobId, Func<DeleteJobDescriptor, IDeleteJobRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteJobResponse DeleteJob(IDeleteJobRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteJobResponse> DeleteJobAsync(Id jobId, Func<DeleteJobDescriptor, IDeleteJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteJobResponse> DeleteJobAsync(Id jobId, Func<DeleteJobDescriptor, IDeleteJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteJobResponse> DeleteJobAsync(IDeleteJobRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteJobResponse DeleteJob(Id jobId, Func<DeleteJobDescriptor, IDeleteJobRequest> selector = null) =>
-			this.DeleteJob(selector.InvokeOrDefault(new DeleteJobDescriptor(jobId)));
+			DeleteJob(selector.InvokeOrDefault(new DeleteJobDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteJobResponse DeleteJob(IDeleteJobRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteJobRequest, DeleteJobRequestParameters, DeleteJobResponse>(
+			Dispatcher.Dispatch<IDeleteJobRequest, DeleteJobRequestParameters, DeleteJobResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlDeleteJobDispatch<DeleteJobResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlDeleteJobDispatch<DeleteJobResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteJobResponse> DeleteJobAsync(Id jobId, Func<DeleteJobDescriptor, IDeleteJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteJobAsync(selector.InvokeOrDefault(new DeleteJobDescriptor(jobId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IDeleteJobResponse> DeleteJobAsync(Id jobId, Func<DeleteJobDescriptor, IDeleteJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteJobAsync(selector.InvokeOrDefault(new DeleteJobDescriptor(jobId)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IDeleteJobResponse> DeleteJobAsync(IDeleteJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteJobRequest, DeleteJobRequestParameters, DeleteJobResponse, IDeleteJobResponse>(
+			Dispatcher.DispatchAsync<IDeleteJobRequest, DeleteJobRequestParameters, DeleteJobResponse, IDeleteJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlDeleteJobDispatchAsync<DeleteJobResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlDeleteJobDispatchAsync<DeleteJobResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotRequest.cs b/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotRequest.cs
index 66d534929af..351ecdfd051 100644
--- a/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotRequest.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IDeleteModelSnapshotRequest {}
+	public partial interface IDeleteModelSnapshotRequest { }
 
-	public partial class DeleteModelSnapshotRequest {}
+	public partial class DeleteModelSnapshotRequest { }
 
 	[DescriptorFor("XpackMlDeleteModelSnapshot")]
-	public partial class DeleteModelSnapshotDescriptor {}
+	public partial class DeleteModelSnapshotDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotResponse.cs b/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotResponse.cs
index be4908b23cc..babceb64230 100644
--- a/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotResponse.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotResponse.cs
@@ -1,6 +1,6 @@
 namespace Nest
 {
-	public interface IDeleteModelSnapshotResponse : IAcknowledgedResponse {}
+	public interface IDeleteModelSnapshotResponse : IAcknowledgedResponse { }
 
-	public class DeleteModelSnapshotResponse : AcknowledgedResponseBase, IDeleteModelSnapshotResponse {}
+	public class DeleteModelSnapshotResponse : AcknowledgedResponseBase, IDeleteModelSnapshotResponse { }
 }
diff --git a/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/ElasticClient-DeleteModelSnapshot.cs b/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/ElasticClient-DeleteModelSnapshot.cs
index 96d957dafec..bbfd5e0af62 100644
--- a/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/ElasticClient-DeleteModelSnapshot.cs
+++ b/src/Nest/XPack/MachineLearning/DeleteModelSnapshot/ElasticClient-DeleteModelSnapshot.cs
@@ -13,41 +13,57 @@ public partial interface IElasticClient
 		/// <remarks>
 		/// You cannot delete the active model snapshot, unless you first revert to a different one.
 		/// </remarks>
-		IDeleteModelSnapshotResponse DeleteModelSnapshot(Id jobId, Id snapshotId, Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> selector = null);
+		IDeleteModelSnapshotResponse DeleteModelSnapshot(Id jobId, Id snapshotId,
+			Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteModelSnapshotResponse DeleteModelSnapshot(IDeleteModelSnapshotRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteModelSnapshotResponse> DeleteModelSnapshotAsync(Id jobId, Id snapshotId, Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteModelSnapshotResponse> DeleteModelSnapshotAsync(Id jobId, Id snapshotId,
+			Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IDeleteModelSnapshotResponse> DeleteModelSnapshotAsync(IDeleteModelSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteModelSnapshotResponse> DeleteModelSnapshotAsync(IDeleteModelSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IDeleteModelSnapshotResponse DeleteModelSnapshot(Id jobId, Id snapshotId, Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> selector = null) =>
-			this.DeleteModelSnapshot(selector.InvokeOrDefault(new DeleteModelSnapshotDescriptor(jobId, snapshotId)));
+		/// <inheritdoc />
+		public IDeleteModelSnapshotResponse DeleteModelSnapshot(Id jobId, Id snapshotId,
+			Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> selector = null
+		) =>
+			DeleteModelSnapshot(selector.InvokeOrDefault(new DeleteModelSnapshotDescriptor(jobId, snapshotId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteModelSnapshotResponse DeleteModelSnapshot(IDeleteModelSnapshotRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteModelSnapshotRequest, DeleteModelSnapshotRequestParameters, DeleteModelSnapshotResponse>(
+			Dispatcher.Dispatch<IDeleteModelSnapshotRequest, DeleteModelSnapshotRequestParameters, DeleteModelSnapshotResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlDeleteModelSnapshotDispatch<DeleteModelSnapshotResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlDeleteModelSnapshotDispatch<DeleteModelSnapshotResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteModelSnapshotResponse> DeleteModelSnapshotAsync(Id jobId, Id snapshotId, Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteModelSnapshotAsync(selector.InvokeOrDefault(new DeleteModelSnapshotDescriptor(jobId, snapshotId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IDeleteModelSnapshotResponse> DeleteModelSnapshotAsync(Id jobId, Id snapshotId,
+			Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteModelSnapshotAsync(selector.InvokeOrDefault(new DeleteModelSnapshotDescriptor(jobId, snapshotId)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeleteModelSnapshotResponse> DeleteModelSnapshotAsync(IDeleteModelSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteModelSnapshotRequest, DeleteModelSnapshotRequestParameters, DeleteModelSnapshotResponse, IDeleteModelSnapshotResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlDeleteModelSnapshotDispatchAsync<DeleteModelSnapshotResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IDeleteModelSnapshotResponse> DeleteModelSnapshotAsync(IDeleteModelSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IDeleteModelSnapshotRequest, DeleteModelSnapshotRequestParameters, DeleteModelSnapshotResponse,
+					IDeleteModelSnapshotResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackMlDeleteModelSnapshotDispatchAsync<DeleteModelSnapshotResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/FlushJob/ElasticClient-FlushJob.cs b/src/Nest/XPack/MachineLearning/FlushJob/ElasticClient-FlushJob.cs
index c862863024b..730cb88ab0f 100644
--- a/src/Nest/XPack/MachineLearning/FlushJob/ElasticClient-FlushJob.cs
+++ b/src/Nest/XPack/MachineLearning/FlushJob/ElasticClient-FlushJob.cs
@@ -12,39 +12,43 @@ public partial interface IElasticClient
 		/// </summary>
 		IFlushJobResponse FlushJob(Id jobId, Func<FlushJobDescriptor, IFlushJobRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IFlushJobResponse FlushJob(IFlushJobRequest request);
 
-		/// <inheritdoc/>
-		Task<IFlushJobResponse> FlushJobAsync(Id jobId, Func<FlushJobDescriptor, IFlushJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IFlushJobResponse> FlushJobAsync(Id jobId, Func<FlushJobDescriptor, IFlushJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IFlushJobResponse> FlushJobAsync(IFlushJobRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IFlushJobResponse FlushJob(Id jobId, Func<FlushJobDescriptor, IFlushJobRequest> selector = null) =>
-			this.FlushJob(selector.InvokeOrDefault(new FlushJobDescriptor(jobId)));
+			FlushJob(selector.InvokeOrDefault(new FlushJobDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IFlushJobResponse FlushJob(IFlushJobRequest request) =>
-			this.Dispatcher.Dispatch<IFlushJobRequest, FlushJobRequestParameters, FlushJobResponse>(
+			Dispatcher.Dispatch<IFlushJobRequest, FlushJobRequestParameters, FlushJobResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlFlushJobDispatch<FlushJobResponse>
+				LowLevelDispatch.XpackMlFlushJobDispatch<FlushJobResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IFlushJobResponse> FlushJobAsync(Id jobId, Func<FlushJobDescriptor, IFlushJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.FlushJobAsync(selector.InvokeOrDefault(new FlushJobDescriptor(jobId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IFlushJobResponse> FlushJobAsync(Id jobId, Func<FlushJobDescriptor, IFlushJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			FlushJobAsync(selector.InvokeOrDefault(new FlushJobDescriptor(jobId)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IFlushJobResponse> FlushJobAsync(IFlushJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IFlushJobRequest, FlushJobRequestParameters, FlushJobResponse, IFlushJobResponse>(
+			Dispatcher.DispatchAsync<IFlushJobRequest, FlushJobRequestParameters, FlushJobResponse, IFlushJobResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlFlushJobDispatchAsync<FlushJobResponse>
+				LowLevelDispatch.XpackMlFlushJobDispatchAsync<FlushJobResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/FlushJob/FlushJobRequest.cs b/src/Nest/XPack/MachineLearning/FlushJob/FlushJobRequest.cs
index 74f5a9394bf..64bac870e3a 100644
--- a/src/Nest/XPack/MachineLearning/FlushJob/FlushJobRequest.cs
+++ b/src/Nest/XPack/MachineLearning/FlushJob/FlushJobRequest.cs
@@ -21,7 +21,7 @@ public partial interface IFlushJobRequest
 		bool? CalculateInterim { get; set; }
 
 		/// <summary>
-		///  When used in conjunction with <see cref="CalculateInterim"/>, specifies the range of buckets on
+		///  When used in conjunction with <see cref="CalculateInterim" />, specifies the range of buckets on
 		/// which to calculate interim results.
 		/// </summary>
 		[JsonProperty("end")]
@@ -30,7 +30,7 @@ public partial interface IFlushJobRequest
 		DateTimeOffset? End { get; set; }
 
 		/// <summary>
-		/// When used in conjunction with <see cref="CalculateInterim"/>, specifies the range of buckets
+		/// When used in conjunction with <see cref="CalculateInterim" />, specifies the range of buckets
 		/// on which to calculate interim results.
 		/// </summary>
 		[JsonProperty("start")]
@@ -43,10 +43,13 @@ public partial class FlushJobRequest
 	{
 		/// <inheritdoc />
 		public DateTimeOffset? AdvanceTime { get; set; }
+
 		/// <inheritdoc />
 		public bool? CalculateInterim { get; set; }
+
 		/// <inheritdoc />
 		public DateTimeOffset? End { get; set; }
+
 		/// <inheritdoc />
 		public DateTimeOffset? Start { get; set; }
 	}
diff --git a/src/Nest/XPack/MachineLearning/ForecastJob/ElasticClient-ForecastJob.cs b/src/Nest/XPack/MachineLearning/ForecastJob/ElasticClient-ForecastJob.cs
index 1b83c30ead5..c3b1f0aa2c9 100644
--- a/src/Nest/XPack/MachineLearning/ForecastJob/ElasticClient-ForecastJob.cs
+++ b/src/Nest/XPack/MachineLearning/ForecastJob/ElasticClient-ForecastJob.cs
@@ -20,7 +20,9 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Uses historical behavior to predict the future behavior of a time series.
 		/// </summary>
-		Task<IForecastJobResponse> ForecastJobAsync(Id jobId, Func<ForecastJobDescriptor, IForecastJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IForecastJobResponse> ForecastJobAsync(Id jobId, Func<ForecastJobDescriptor, IForecastJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Uses historical behavior to predict the future behavior of a time series.
@@ -30,27 +32,31 @@ public partial interface IElasticClient
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IForecastJobResponse ForecastJob(Id jobId, Func<ForecastJobDescriptor, IForecastJobRequest> selector = null) =>
-			this.ForecastJob(selector.InvokeOrDefault(new ForecastJobDescriptor(jobId)));
+			ForecastJob(selector.InvokeOrDefault(new ForecastJobDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IForecastJobResponse ForecastJob(IForecastJobRequest request) =>
-			this.Dispatcher.Dispatch<IForecastJobRequest, ForecastJobRequestParameters, ForecastJobResponse>(
+			Dispatcher.Dispatch<IForecastJobRequest, ForecastJobRequestParameters, ForecastJobResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlForecastDispatch<ForecastJobResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlForecastDispatch<ForecastJobResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IForecastJobResponse> ForecastJobAsync(Id jobId, Func<ForecastJobDescriptor, IForecastJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ForecastJobAsync(selector.InvokeOrDefault(new ForecastJobDescriptor(jobId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IForecastJobResponse> ForecastJobAsync(IForecastJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IForecastJobRequest, ForecastJobRequestParameters, ForecastJobResponse, IForecastJobResponse>(
+		/// <inheritdoc />
+		public Task<IForecastJobResponse> ForecastJobAsync(Id jobId, Func<ForecastJobDescriptor, IForecastJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ForecastJobAsync(selector.InvokeOrDefault(new ForecastJobDescriptor(jobId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IForecastJobResponse> ForecastJobAsync(IForecastJobRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IForecastJobRequest, ForecastJobRequestParameters, ForecastJobResponse, IForecastJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlForecastDispatchAsync<ForecastJobResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlForecastDispatchAsync<ForecastJobResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/ForecastJob/ForecastJobRequest.cs b/src/Nest/XPack/MachineLearning/ForecastJob/ForecastJobRequest.cs
index 5d2e806ada3..aaf07f78459 100644
--- a/src/Nest/XPack/MachineLearning/ForecastJob/ForecastJobRequest.cs
+++ b/src/Nest/XPack/MachineLearning/ForecastJob/ForecastJobRequest.cs
@@ -1,4 +1,3 @@
-using System;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -22,7 +21,7 @@ public partial interface IForecastJobRequest
 		Time ExpiresIn { get; set; }
 	}
 
-	/// <inheritdoc cref="IForecastJobRequest"/>
+	/// <inheritdoc cref="IForecastJobRequest" />
 	public partial class ForecastJobRequest : IForecastJobRequest
 	{
 		/// <inheritdoc />
diff --git a/src/Nest/XPack/MachineLearning/ForecastJob/ForecastJobResponse.cs b/src/Nest/XPack/MachineLearning/ForecastJob/ForecastJobResponse.cs
index 379502d00d6..7ab4d0cfeec 100644
--- a/src/Nest/XPack/MachineLearning/ForecastJob/ForecastJobResponse.cs
+++ b/src/Nest/XPack/MachineLearning/ForecastJob/ForecastJobResponse.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/MachineLearning/GetAnomalyRecords/ElasticClient-GetAnomalyRecords.cs b/src/Nest/XPack/MachineLearning/GetAnomalyRecords/ElasticClient-GetAnomalyRecords.cs
index 42981e7cd1b..f3986512e67 100644
--- a/src/Nest/XPack/MachineLearning/GetAnomalyRecords/ElasticClient-GetAnomalyRecords.cs
+++ b/src/Nest/XPack/MachineLearning/GetAnomalyRecords/ElasticClient-GetAnomalyRecords.cs
@@ -12,39 +12,50 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetAnomalyRecordsResponse GetAnomalyRecords(Id jobId, Func<GetAnomalyRecordsDescriptor, IGetAnomalyRecordsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetAnomalyRecordsResponse GetAnomalyRecords(IGetAnomalyRecordsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetAnomalyRecordsResponse> GetAnomalyRecordsAsync(Id jobId, Func<GetAnomalyRecordsDescriptor, IGetAnomalyRecordsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetAnomalyRecordsResponse> GetAnomalyRecordsAsync(Id jobId,
+			Func<GetAnomalyRecordsDescriptor, IGetAnomalyRecordsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetAnomalyRecordsResponse> GetAnomalyRecordsAsync(IGetAnomalyRecordsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetAnomalyRecordsResponse> GetAnomalyRecordsAsync(IGetAnomalyRecordsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetAnomalyRecordsResponse GetAnomalyRecords(Id jobId, Func<GetAnomalyRecordsDescriptor, IGetAnomalyRecordsRequest> selector = null) =>
-			this.GetAnomalyRecords(selector.InvokeOrDefault(new GetAnomalyRecordsDescriptor(jobId)));
+			GetAnomalyRecords(selector.InvokeOrDefault(new GetAnomalyRecordsDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetAnomalyRecordsResponse GetAnomalyRecords(IGetAnomalyRecordsRequest request) =>
-			this.Dispatcher.Dispatch<IGetAnomalyRecordsRequest, GetAnomalyRecordsRequestParameters, GetAnomalyRecordsResponse>(
+			Dispatcher.Dispatch<IGetAnomalyRecordsRequest, GetAnomalyRecordsRequestParameters, GetAnomalyRecordsResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlGetRecordsDispatch<GetAnomalyRecordsResponse>
+				LowLevelDispatch.XpackMlGetRecordsDispatch<GetAnomalyRecordsResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetAnomalyRecordsResponse> GetAnomalyRecordsAsync(Id jobId, Func<GetAnomalyRecordsDescriptor, IGetAnomalyRecordsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetAnomalyRecordsAsync(selector.InvokeOrDefault(new GetAnomalyRecordsDescriptor(jobId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetAnomalyRecordsResponse> GetAnomalyRecordsAsync(IGetAnomalyRecordsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetAnomalyRecordsRequest, GetAnomalyRecordsRequestParameters, GetAnomalyRecordsResponse, IGetAnomalyRecordsResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.XpackMlGetRecordsDispatchAsync<GetAnomalyRecordsResponse>
-			);
+		/// <inheritdoc />
+		public Task<IGetAnomalyRecordsResponse> GetAnomalyRecordsAsync(Id jobId,
+			Func<GetAnomalyRecordsDescriptor, IGetAnomalyRecordsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetAnomalyRecordsAsync(selector.InvokeOrDefault(new GetAnomalyRecordsDescriptor(jobId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetAnomalyRecordsResponse> GetAnomalyRecordsAsync(IGetAnomalyRecordsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetAnomalyRecordsRequest, GetAnomalyRecordsRequestParameters, GetAnomalyRecordsResponse, IGetAnomalyRecordsResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.XpackMlGetRecordsDispatchAsync<GetAnomalyRecordsResponse>
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsRequest.cs b/src/Nest/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsRequest.cs
index 14c1a57b79c..1e851291d81 100644
--- a/src/Nest/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsRequest.cs
+++ b/src/Nest/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsRequest.cs
@@ -14,12 +14,6 @@ public partial interface IGetAnomalyRecordsRequest
 		[JsonProperty("desc")]
 		bool? Descending { get; set; }
 
-		/// <summary>
-		/// If true, the output excludes interim results. By default, interim results are included.
-		/// </summary>
-		[JsonProperty("exclude_interim")]
-		bool? ExcludeInterim { get; set; }
-
 		/// <summary>
 		/// Returns records with timestamps earlier than this time.
 		/// </summary>
@@ -27,6 +21,12 @@ public partial interface IGetAnomalyRecordsRequest
 		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
 		DateTimeOffset? End { get; set; }
 
+		/// <summary>
+		/// If true, the output excludes interim results. By default, interim results are included.
+		/// </summary>
+		[JsonProperty("exclude_interim")]
+		bool? ExcludeInterim { get; set; }
+
 		/// <summary>
 		/// Specifies pagination for the records
 		/// </summary>
@@ -60,10 +60,10 @@ public partial class GetAnomalyRecordsRequest
 		public bool? Descending { get; set; }
 
 		/// <inheritdoc />
-		public bool? ExcludeInterim { get; set; }
+		public DateTimeOffset? End { get; set; }
 
 		/// <inheritdoc />
-		public DateTimeOffset? End { get; set; }
+		public bool? ExcludeInterim { get; set; }
 
 		/// <inheritdoc />
 		public IPage Page { get; set; }
@@ -86,11 +86,11 @@ public GetAnomalyRecordsDescriptor() : base() { }
 
 		bool? IGetAnomalyRecordsRequest.Descending { get; set; }
 		DateTimeOffset? IGetAnomalyRecordsRequest.End { get; set; }
+		bool? IGetAnomalyRecordsRequest.ExcludeInterim { get; set; }
 		IPage IGetAnomalyRecordsRequest.Page { get; set; }
+		double? IGetAnomalyRecordsRequest.RecordScore { get; set; }
 		Field IGetAnomalyRecordsRequest.Sort { get; set; }
 		DateTimeOffset? IGetAnomalyRecordsRequest.Start { get; set; }
-		bool? IGetAnomalyRecordsRequest.ExcludeInterim { get; set; }
-		double? IGetAnomalyRecordsRequest.RecordScore { get; set; }
 
 		/// <inheritdoc />
 		public GetAnomalyRecordsDescriptor Descending(bool? descending = true) => Assign(a => a.Descending = descending);
diff --git a/src/Nest/XPack/MachineLearning/GetBuckets/ElasticClient-GetBuckets.cs b/src/Nest/XPack/MachineLearning/GetBuckets/ElasticClient-GetBuckets.cs
index db00518631b..9d60fc89fbb 100644
--- a/src/Nest/XPack/MachineLearning/GetBuckets/ElasticClient-GetBuckets.cs
+++ b/src/Nest/XPack/MachineLearning/GetBuckets/ElasticClient-GetBuckets.cs
@@ -12,39 +12,44 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetBucketsResponse GetBuckets(Id jobId, Func<GetBucketsDescriptor, IGetBucketsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetBucketsResponse GetBuckets(IGetBucketsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetBucketsResponse> GetBucketsAsync(Id jobId, Func<GetBucketsDescriptor, IGetBucketsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetBucketsResponse> GetBucketsAsync(Id jobId, Func<GetBucketsDescriptor, IGetBucketsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetBucketsResponse> GetBucketsAsync(IGetBucketsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetBucketsResponse GetBuckets(Id jobId, Func<GetBucketsDescriptor, IGetBucketsRequest> selector = null) =>
-			this.GetBuckets(selector.InvokeOrDefault(new GetBucketsDescriptor(jobId)));
+			GetBuckets(selector.InvokeOrDefault(new GetBucketsDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetBucketsResponse GetBuckets(IGetBucketsRequest request) =>
-			this.Dispatcher.Dispatch<IGetBucketsRequest, GetBucketsRequestParameters, GetBucketsResponse>(
+			Dispatcher.Dispatch<IGetBucketsRequest, GetBucketsRequestParameters, GetBucketsResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlGetBucketsDispatch<GetBucketsResponse>
+				LowLevelDispatch.XpackMlGetBucketsDispatch<GetBucketsResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetBucketsResponse> GetBucketsAsync(Id jobId, Func<GetBucketsDescriptor, IGetBucketsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetBucketsAsync(selector.InvokeOrDefault(new GetBucketsDescriptor(jobId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetBucketsResponse> GetBucketsAsync(Id jobId, Func<GetBucketsDescriptor, IGetBucketsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetBucketsAsync(selector.InvokeOrDefault(new GetBucketsDescriptor(jobId)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetBucketsResponse> GetBucketsAsync(IGetBucketsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetBucketsRequest, GetBucketsRequestParameters, GetBucketsResponse, IGetBucketsResponse>(
+		/// <inheritdoc />
+		public Task<IGetBucketsResponse> GetBucketsAsync(IGetBucketsRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetBucketsRequest, GetBucketsRequestParameters, GetBucketsResponse, IGetBucketsResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlGetBucketsDispatchAsync<GetBucketsResponse>
+				LowLevelDispatch.XpackMlGetBucketsDispatchAsync<GetBucketsResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetBuckets/GetBucketsRequest.cs b/src/Nest/XPack/MachineLearning/GetBuckets/GetBucketsRequest.cs
index 4386004f68f..5829da543c8 100644
--- a/src/Nest/XPack/MachineLearning/GetBuckets/GetBucketsRequest.cs
+++ b/src/Nest/XPack/MachineLearning/GetBuckets/GetBucketsRequest.cs
@@ -75,20 +75,28 @@ public partial class GetBucketsRequest
 	{
 		/// <inheritdoc />
 		public double? AnomalyScore { get; set; }
+
 		/// <inheritdoc />
 		public bool? Descending { get; set; }
+
 		/// <inheritdoc />
 		public DateTimeOffset? End { get; set; }
+
 		/// <inheritdoc />
 		public bool? ExcludeInterim { get; set; }
+
 		/// <inheritdoc />
 		public bool? Expand { get; set; }
+
 		/// <inheritdoc />
 		public IPage Page { get; set; }
+
 		/// <inheritdoc />
 		public Field Sort { get; set; }
+
 		/// <inheritdoc />
 		public DateTimeOffset? Start { get; set; }
+
 		/// <inheritdoc />
 		public DateTimeOffset? Timestamp { get; set; }
 	}
diff --git a/src/Nest/XPack/MachineLearning/GetBuckets/GetBucketsResponse.cs b/src/Nest/XPack/MachineLearning/GetBuckets/GetBucketsResponse.cs
index 69b599dbfcf..ca022ae6847 100644
--- a/src/Nest/XPack/MachineLearning/GetBuckets/GetBucketsResponse.cs
+++ b/src/Nest/XPack/MachineLearning/GetBuckets/GetBucketsResponse.cs
@@ -5,17 +5,16 @@ namespace Nest
 {
 	public interface IGetBucketsResponse : IResponse
 	{
-		[JsonProperty("count")]
-		long Count { get; }
-
 		[JsonProperty("buckets")]
 		IReadOnlyCollection<Bucket> Buckets { get; }
+
+		[JsonProperty("count")]
+		long Count { get; }
 	}
 
 	public class GetBucketsResponse : ResponseBase, IGetBucketsResponse
 	{
-		public long Count { get; internal set; }
-
 		public IReadOnlyCollection<Bucket> Buckets { get; internal set; } = EmptyReadOnly<Bucket>.Collection;
+		public long Count { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetCategories/ElasticClient-GetCategories.cs b/src/Nest/XPack/MachineLearning/GetCategories/ElasticClient-GetCategories.cs
index c4f23a2424c..4e6cea65531 100644
--- a/src/Nest/XPack/MachineLearning/GetCategories/ElasticClient-GetCategories.cs
+++ b/src/Nest/XPack/MachineLearning/GetCategories/ElasticClient-GetCategories.cs
@@ -12,39 +12,47 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetCategoriesResponse GetCategories(Id jobId, Func<GetCategoriesDescriptor, IGetCategoriesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetCategoriesResponse GetCategories(IGetCategoriesRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetCategoriesResponse> GetCategoriesAsync(Id jobId, Func<GetCategoriesDescriptor, IGetCategoriesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetCategoriesResponse> GetCategoriesAsync(Id jobId, Func<GetCategoriesDescriptor, IGetCategoriesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetCategoriesResponse> GetCategoriesAsync(IGetCategoriesRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetCategoriesResponse> GetCategoriesAsync(IGetCategoriesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetCategoriesResponse GetCategories(Id jobId, Func<GetCategoriesDescriptor, IGetCategoriesRequest> selector = null) =>
-			this.GetCategories(selector.InvokeOrDefault(new GetCategoriesDescriptor(jobId)));
+			GetCategories(selector.InvokeOrDefault(new GetCategoriesDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetCategoriesResponse GetCategories(IGetCategoriesRequest request) =>
-			this.Dispatcher.Dispatch<IGetCategoriesRequest, GetCategoriesRequestParameters, GetCategoriesResponse>(
+			Dispatcher.Dispatch<IGetCategoriesRequest, GetCategoriesRequestParameters, GetCategoriesResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlGetCategoriesDispatch<GetCategoriesResponse>
+				LowLevelDispatch.XpackMlGetCategoriesDispatch<GetCategoriesResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetCategoriesResponse> GetCategoriesAsync(Id jobId, Func<GetCategoriesDescriptor, IGetCategoriesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetCategoriesAsync(selector.InvokeOrDefault(new GetCategoriesDescriptor(jobId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetCategoriesResponse> GetCategoriesAsync(IGetCategoriesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetCategoriesRequest, GetCategoriesRequestParameters, GetCategoriesResponse, IGetCategoriesResponse>(
+		/// <inheritdoc />
+		public Task<IGetCategoriesResponse> GetCategoriesAsync(Id jobId, Func<GetCategoriesDescriptor, IGetCategoriesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetCategoriesAsync(selector.InvokeOrDefault(new GetCategoriesDescriptor(jobId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetCategoriesResponse> GetCategoriesAsync(IGetCategoriesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetCategoriesRequest, GetCategoriesRequestParameters, GetCategoriesResponse, IGetCategoriesResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlGetCategoriesDispatchAsync<GetCategoriesResponse>
+				LowLevelDispatch.XpackMlGetCategoriesDispatchAsync<GetCategoriesResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetCategories/GetCategoriesResponse.cs b/src/Nest/XPack/MachineLearning/GetCategories/GetCategoriesResponse.cs
index 652425421e9..d6fccf5ccc7 100644
--- a/src/Nest/XPack/MachineLearning/GetCategories/GetCategoriesResponse.cs
+++ b/src/Nest/XPack/MachineLearning/GetCategories/GetCategoriesResponse.cs
@@ -5,17 +5,16 @@ namespace Nest
 {
 	public interface IGetCategoriesResponse : IResponse
 	{
-		[JsonProperty("count")]
-		long Count { get; }
-
 		[JsonProperty("categories")]
 		IReadOnlyCollection<CategoryDefinition> Categories { get; }
+
+		[JsonProperty("count")]
+		long Count { get; }
 	}
 
 	public class GetCategoriesResponse : ResponseBase, IGetCategoriesResponse
 	{
-		public long Count { get; internal set; }
-
 		public IReadOnlyCollection<CategoryDefinition> Categories { get; internal set; } = EmptyReadOnly<CategoryDefinition>.Collection;
+		public long Count { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetDatafeedStats/ElasticClient-GetDatafeedStats.cs b/src/Nest/XPack/MachineLearning/GetDatafeedStats/ElasticClient-GetDatafeedStats.cs
index 76ecfe373d9..aaffae8d1e2 100644
--- a/src/Nest/XPack/MachineLearning/GetDatafeedStats/ElasticClient-GetDatafeedStats.cs
+++ b/src/Nest/XPack/MachineLearning/GetDatafeedStats/ElasticClient-GetDatafeedStats.cs
@@ -12,39 +12,48 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetDatafeedStatsResponse GetDatafeedStats(Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetDatafeedStatsResponse GetDatafeedStats(IGetDatafeedStatsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetDatafeedStatsResponse> GetDatafeedStatsAsync(Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetDatafeedStatsResponse> GetDatafeedStatsAsync(Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetDatafeedStatsResponse> GetDatafeedStatsAsync(IGetDatafeedStatsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetDatafeedStatsResponse> GetDatafeedStatsAsync(IGetDatafeedStatsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetDatafeedStatsResponse GetDatafeedStats(Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> selector = null) =>
-			this.GetDatafeedStats(selector.InvokeOrDefault(new GetDatafeedStatsDescriptor()));
+			GetDatafeedStats(selector.InvokeOrDefault(new GetDatafeedStatsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetDatafeedStatsResponse GetDatafeedStats(IGetDatafeedStatsRequest request) =>
-			this.Dispatcher.Dispatch<IGetDatafeedStatsRequest, GetDatafeedStatsRequestParameters, GetDatafeedStatsResponse>(
+			Dispatcher.Dispatch<IGetDatafeedStatsRequest, GetDatafeedStatsRequestParameters, GetDatafeedStatsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlGetDatafeedStatsDispatch<GetDatafeedStatsResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlGetDatafeedStatsDispatch<GetDatafeedStatsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetDatafeedStatsResponse> GetDatafeedStatsAsync(Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetDatafeedStatsAsync(selector.InvokeOrDefault(new GetDatafeedStatsDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetDatafeedStatsResponse> GetDatafeedStatsAsync(IGetDatafeedStatsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetDatafeedStatsRequest, GetDatafeedStatsRequestParameters, GetDatafeedStatsResponse, IGetDatafeedStatsResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlGetDatafeedStatsDispatchAsync<GetDatafeedStatsResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IGetDatafeedStatsResponse> GetDatafeedStatsAsync(Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetDatafeedStatsAsync(selector.InvokeOrDefault(new GetDatafeedStatsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetDatafeedStatsResponse> GetDatafeedStatsAsync(IGetDatafeedStatsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetDatafeedStatsRequest, GetDatafeedStatsRequestParameters, GetDatafeedStatsResponse, IGetDatafeedStatsResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackMlGetDatafeedStatsDispatchAsync<GetDatafeedStatsResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsRequest.cs b/src/Nest/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsRequest.cs
index e25af8ebe99..ba9ed5885c5 100644
--- a/src/Nest/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsRequest.cs
+++ b/src/Nest/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsRequest.cs
@@ -3,12 +3,12 @@ namespace Nest
 	/// <summary>
 	/// Retrieve configuration information for machine learning datafeeds.
 	/// </summary>
-	public partial interface IGetDatafeedStatsRequest {}
+	public partial interface IGetDatafeedStatsRequest { }
 
 	/// <inheritdoc />
-	public partial class GetDatafeedStatsRequest {}
+	public partial class GetDatafeedStatsRequest { }
 
 	/// <inheritdoc />
 	[DescriptorFor("XpackMlGetDatafeedStats")]
-	public partial class GetDatafeedStatsDescriptor {}
+	public partial class GetDatafeedStatsDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsResponse.cs b/src/Nest/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsResponse.cs
index fd091facc27..64d636cfd94 100644
--- a/src/Nest/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsResponse.cs
+++ b/src/Nest/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsResponse.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/XPack/MachineLearning/GetDatafeeds/ElasticClient-GetDatafeeds.cs b/src/Nest/XPack/MachineLearning/GetDatafeeds/ElasticClient-GetDatafeeds.cs
index da31cd64a17..62893099f19 100644
--- a/src/Nest/XPack/MachineLearning/GetDatafeeds/ElasticClient-GetDatafeeds.cs
+++ b/src/Nest/XPack/MachineLearning/GetDatafeeds/ElasticClient-GetDatafeeds.cs
@@ -12,39 +12,45 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetDatafeedsResponse GetDatafeeds(Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetDatafeedsResponse GetDatafeeds(IGetDatafeedsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetDatafeedsResponse> GetDatafeedsAsync(Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetDatafeedsResponse> GetDatafeedsAsync(Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetDatafeedsResponse> GetDatafeedsAsync(IGetDatafeedsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetDatafeedsResponse GetDatafeeds(Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> selector = null) =>
-			this.GetDatafeeds(selector.InvokeOrDefault(new GetDatafeedsDescriptor()));
+			GetDatafeeds(selector.InvokeOrDefault(new GetDatafeedsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetDatafeedsResponse GetDatafeeds(IGetDatafeedsRequest request) =>
-			this.Dispatcher.Dispatch<IGetDatafeedsRequest, GetDatafeedsRequestParameters, GetDatafeedsResponse>(
+			Dispatcher.Dispatch<IGetDatafeedsRequest, GetDatafeedsRequestParameters, GetDatafeedsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlGetDatafeedsDispatch<GetDatafeedsResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlGetDatafeedsDispatch<GetDatafeedsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetDatafeedsResponse> GetDatafeedsAsync(Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetDatafeedsAsync(selector.InvokeOrDefault(new GetDatafeedsDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetDatafeedsResponse> GetDatafeedsAsync(IGetDatafeedsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetDatafeedsRequest, GetDatafeedsRequestParameters, GetDatafeedsResponse, IGetDatafeedsResponse>(
+		/// <inheritdoc />
+		public Task<IGetDatafeedsResponse> GetDatafeedsAsync(Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetDatafeedsAsync(selector.InvokeOrDefault(new GetDatafeedsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetDatafeedsResponse> GetDatafeedsAsync(IGetDatafeedsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetDatafeedsRequest, GetDatafeedsRequestParameters, GetDatafeedsResponse, IGetDatafeedsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlGetDatafeedsDispatchAsync<GetDatafeedsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlGetDatafeedsDispatchAsync<GetDatafeedsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetDatafeeds/GetDatafeedsRequest.cs b/src/Nest/XPack/MachineLearning/GetDatafeeds/GetDatafeedsRequest.cs
index 0a5651f9616..e52e734d9d6 100644
--- a/src/Nest/XPack/MachineLearning/GetDatafeeds/GetDatafeedsRequest.cs
+++ b/src/Nest/XPack/MachineLearning/GetDatafeeds/GetDatafeedsRequest.cs
@@ -3,12 +3,12 @@ namespace Nest
 	/// <summary>
 	/// Retrieve configuration information for machine learning datafeeds.
 	/// </summary>
-	public partial interface IGetDatafeedsRequest {}
+	public partial interface IGetDatafeedsRequest { }
 
 	/// <inheritdoc />
-	public partial class GetDatafeedsRequest {}
+	public partial class GetDatafeedsRequest { }
 
 	/// <inheritdoc />
 	[DescriptorFor("XpackMlGetDatafeeds")]
-	public partial class GetDatafeedsDescriptor {}
+	public partial class GetDatafeedsDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/GetInfluencers/ElasticClient-GetInfluencers.cs b/src/Nest/XPack/MachineLearning/GetInfluencers/ElasticClient-GetInfluencers.cs
index faf09a2efe4..ff5580de530 100644
--- a/src/Nest/XPack/MachineLearning/GetInfluencers/ElasticClient-GetInfluencers.cs
+++ b/src/Nest/XPack/MachineLearning/GetInfluencers/ElasticClient-GetInfluencers.cs
@@ -12,39 +12,47 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetInfluencersResponse GetInfluencers(Id jobId, Func<GetInfluencersDescriptor, IGetInfluencersRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetInfluencersResponse GetInfluencers(IGetInfluencersRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetInfluencersResponse> GetInfluencersAsync(Id jobId, Func<GetInfluencersDescriptor, IGetInfluencersRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetInfluencersResponse> GetInfluencersAsync(Id jobId, Func<GetInfluencersDescriptor, IGetInfluencersRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetInfluencersResponse> GetInfluencersAsync(IGetInfluencersRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetInfluencersResponse> GetInfluencersAsync(IGetInfluencersRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetInfluencersResponse GetInfluencers(Id jobId, Func<GetInfluencersDescriptor, IGetInfluencersRequest> selector = null) =>
-			this.GetInfluencers(selector.InvokeOrDefault(new GetInfluencersDescriptor(jobId)));
+			GetInfluencers(selector.InvokeOrDefault(new GetInfluencersDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetInfluencersResponse GetInfluencers(IGetInfluencersRequest request) =>
-			this.Dispatcher.Dispatch<IGetInfluencersRequest, GetInfluencersRequestParameters, GetInfluencersResponse>(
+			Dispatcher.Dispatch<IGetInfluencersRequest, GetInfluencersRequestParameters, GetInfluencersResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlGetInfluencersDispatch<GetInfluencersResponse>
+				LowLevelDispatch.XpackMlGetInfluencersDispatch<GetInfluencersResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetInfluencersResponse> GetInfluencersAsync(Id jobId, Func<GetInfluencersDescriptor, IGetInfluencersRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetInfluencersAsync(selector.InvokeOrDefault(new GetInfluencersDescriptor(jobId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetInfluencersResponse> GetInfluencersAsync(IGetInfluencersRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetInfluencersRequest, GetInfluencersRequestParameters, GetInfluencersResponse, IGetInfluencersResponse>(
+		/// <inheritdoc />
+		public Task<IGetInfluencersResponse> GetInfluencersAsync(Id jobId, Func<GetInfluencersDescriptor, IGetInfluencersRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetInfluencersAsync(selector.InvokeOrDefault(new GetInfluencersDescriptor(jobId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetInfluencersResponse> GetInfluencersAsync(IGetInfluencersRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetInfluencersRequest, GetInfluencersRequestParameters, GetInfluencersResponse, IGetInfluencersResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlGetInfluencersDispatchAsync<GetInfluencersResponse>
+				LowLevelDispatch.XpackMlGetInfluencersDispatchAsync<GetInfluencersResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetInfluencers/GetInfluencersRequest.cs b/src/Nest/XPack/MachineLearning/GetInfluencers/GetInfluencersRequest.cs
index 64fadee7caf..ceb25010511 100644
--- a/src/Nest/XPack/MachineLearning/GetInfluencers/GetInfluencersRequest.cs
+++ b/src/Nest/XPack/MachineLearning/GetInfluencers/GetInfluencersRequest.cs
@@ -39,7 +39,7 @@ public partial interface IGetInfluencersRequest
 		IPage Page { get; set; }
 
 		/// <summary>
-		/// Specifies the sort field for the requested influencers. By default, the influencers are sorted by the <see cref="InfluencerScore"/> value.
+		/// Specifies the sort field for the requested influencers. By default, the influencers are sorted by the <see cref="InfluencerScore" /> value.
 		/// </summary>
 		[JsonProperty("sort")]
 		Field Sort { get; set; }
@@ -81,7 +81,7 @@ public partial class GetInfluencersRequest
 	[DescriptorFor("XpackMlGetInfluencers")]
 	public partial class GetInfluencersDescriptor
 	{
-		public GetInfluencersDescriptor() {}
+		public GetInfluencersDescriptor() { }
 
 		bool? IGetInfluencersRequest.Descending { get; set; }
 		DateTimeOffset? IGetInfluencersRequest.End { get; set; }
diff --git a/src/Nest/XPack/MachineLearning/GetJobStats/ElasticClient-GetJobStats.cs b/src/Nest/XPack/MachineLearning/GetJobStats/ElasticClient-GetJobStats.cs
index 166c7dd457a..2b1cd4e91c5 100644
--- a/src/Nest/XPack/MachineLearning/GetJobStats/ElasticClient-GetJobStats.cs
+++ b/src/Nest/XPack/MachineLearning/GetJobStats/ElasticClient-GetJobStats.cs
@@ -12,39 +12,45 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetJobStatsResponse GetJobStats(Func<GetJobStatsDescriptor, IGetJobStatsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetJobStatsResponse GetJobStats(IGetJobStatsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetJobStatsResponse> GetJobStatsAsync(Func<GetJobStatsDescriptor, IGetJobStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetJobStatsResponse> GetJobStatsAsync(Func<GetJobStatsDescriptor, IGetJobStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetJobStatsResponse> GetJobStatsAsync(IGetJobStatsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetJobStatsResponse GetJobStats(Func<GetJobStatsDescriptor, IGetJobStatsRequest> selector = null) =>
-			this.GetJobStats(selector.InvokeOrDefault(new GetJobStatsDescriptor()));
+			GetJobStats(selector.InvokeOrDefault(new GetJobStatsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetJobStatsResponse GetJobStats(IGetJobStatsRequest request) =>
-			this.Dispatcher.Dispatch<IGetJobStatsRequest, GetJobStatsRequestParameters, GetJobStatsResponse>(
+			Dispatcher.Dispatch<IGetJobStatsRequest, GetJobStatsRequestParameters, GetJobStatsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlGetJobStatsDispatch<GetJobStatsResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlGetJobStatsDispatch<GetJobStatsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetJobStatsResponse> GetJobStatsAsync(Func<GetJobStatsDescriptor, IGetJobStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetJobStatsAsync(selector.InvokeOrDefault(new GetJobStatsDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetJobStatsResponse> GetJobStatsAsync(IGetJobStatsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetJobStatsRequest, GetJobStatsRequestParameters, GetJobStatsResponse, IGetJobStatsResponse>(
+		/// <inheritdoc />
+		public Task<IGetJobStatsResponse> GetJobStatsAsync(Func<GetJobStatsDescriptor, IGetJobStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetJobStatsAsync(selector.InvokeOrDefault(new GetJobStatsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetJobStatsResponse> GetJobStatsAsync(IGetJobStatsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetJobStatsRequest, GetJobStatsRequestParameters, GetJobStatsResponse, IGetJobStatsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlGetJobStatsDispatchAsync<GetJobStatsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlGetJobStatsDispatchAsync<GetJobStatsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetJobStats/GetJobStatsRequest.cs b/src/Nest/XPack/MachineLearning/GetJobStats/GetJobStatsRequest.cs
index 78a022a0dff..71ff750af64 100644
--- a/src/Nest/XPack/MachineLearning/GetJobStats/GetJobStatsRequest.cs
+++ b/src/Nest/XPack/MachineLearning/GetJobStats/GetJobStatsRequest.cs
@@ -3,12 +3,12 @@ namespace Nest
 	/// <summary>
 	/// Retrieve usage information for machine learning jobs.
 	/// </summary>
-	public partial interface IGetJobStatsRequest {}
+	public partial interface IGetJobStatsRequest { }
 
 	/// <inheritdoc />
-	public partial class GetJobStatsRequest {}
+	public partial class GetJobStatsRequest { }
 
 	/// <inheritdoc />
 	[DescriptorFor("XpackMlGetJobStats")]
-	public partial class GetJobStatsDescriptor {}
+	public partial class GetJobStatsDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/GetJobs/ElasticClient-GetJobs.cs b/src/Nest/XPack/MachineLearning/GetJobs/ElasticClient-GetJobs.cs
index 5e27651c1d6..0a7f50e56ee 100644
--- a/src/Nest/XPack/MachineLearning/GetJobs/ElasticClient-GetJobs.cs
+++ b/src/Nest/XPack/MachineLearning/GetJobs/ElasticClient-GetJobs.cs
@@ -12,39 +12,43 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetJobsResponse GetJobs(Func<GetJobsDescriptor, IGetJobsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetJobsResponse GetJobs(IGetJobsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetJobsResponse> GetJobsAsync(Func<GetJobsDescriptor, IGetJobsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetJobsResponse> GetJobsAsync(Func<GetJobsDescriptor, IGetJobsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetJobsResponse> GetJobsAsync(IGetJobsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetJobsResponse GetJobs(Func<GetJobsDescriptor, IGetJobsRequest> selector = null) =>
-			this.GetJobs(selector.InvokeOrDefault(new GetJobsDescriptor()));
+			GetJobs(selector.InvokeOrDefault(new GetJobsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetJobsResponse GetJobs(IGetJobsRequest request) =>
-			this.Dispatcher.Dispatch<IGetJobsRequest, GetJobsRequestParameters, GetJobsResponse>(
+			Dispatcher.Dispatch<IGetJobsRequest, GetJobsRequestParameters, GetJobsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlGetJobsDispatch<GetJobsResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlGetJobsDispatch<GetJobsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetJobsResponse> GetJobsAsync(Func<GetJobsDescriptor, IGetJobsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetJobsAsync(selector.InvokeOrDefault(new GetJobsDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetJobsResponse> GetJobsAsync(Func<GetJobsDescriptor, IGetJobsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetJobsAsync(selector.InvokeOrDefault(new GetJobsDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetJobsResponse> GetJobsAsync(IGetJobsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetJobsRequest, GetJobsRequestParameters, GetJobsResponse, IGetJobsResponse>(
+			Dispatcher.DispatchAsync<IGetJobsRequest, GetJobsRequestParameters, GetJobsResponse, IGetJobsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlGetJobsDispatchAsync<GetJobsResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlGetJobsDispatchAsync<GetJobsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetJobs/GetJobsRequest.cs b/src/Nest/XPack/MachineLearning/GetJobs/GetJobsRequest.cs
index ee656dafd68..7c2bd896387 100644
--- a/src/Nest/XPack/MachineLearning/GetJobs/GetJobsRequest.cs
+++ b/src/Nest/XPack/MachineLearning/GetJobs/GetJobsRequest.cs
@@ -3,12 +3,12 @@ namespace Nest
 	/// <summary>
 	/// Retrieve usage information for machine learning jobs.
 	/// </summary>
-	public partial interface IGetJobsRequest {}
+	public partial interface IGetJobsRequest { }
 
 	/// <inheritdoc />
-	public partial class GetJobsRequest {}
+	public partial class GetJobsRequest { }
 
 	/// <inheritdoc />
 	[DescriptorFor("XpackMlGetJobs")]
-	public partial class GetJobsDescriptor {}
+	public partial class GetJobsDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/GetModelSnapshots/ElasticClient-GetModelSnapshots.cs b/src/Nest/XPack/MachineLearning/GetModelSnapshots/ElasticClient-GetModelSnapshots.cs
index 8e765fddf88..8b6fb128ba8 100644
--- a/src/Nest/XPack/MachineLearning/GetModelSnapshots/ElasticClient-GetModelSnapshots.cs
+++ b/src/Nest/XPack/MachineLearning/GetModelSnapshots/ElasticClient-GetModelSnapshots.cs
@@ -12,39 +12,50 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetModelSnapshotsResponse GetModelSnapshots(Id jobId, Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetModelSnapshotsResponse GetModelSnapshots(IGetModelSnapshotsRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetModelSnapshotsResponse> GetModelSnapshotsAsync(Id jobId, Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetModelSnapshotsResponse> GetModelSnapshotsAsync(Id jobId,
+			Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetModelSnapshotsResponse> GetModelSnapshotsAsync(IGetModelSnapshotsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetModelSnapshotsResponse> GetModelSnapshotsAsync(IGetModelSnapshotsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetModelSnapshotsResponse GetModelSnapshots(Id jobId, Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> selector = null) =>
-			this.GetModelSnapshots(selector.InvokeOrDefault(new GetModelSnapshotsDescriptor(jobId)));
+			GetModelSnapshots(selector.InvokeOrDefault(new GetModelSnapshotsDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetModelSnapshotsResponse GetModelSnapshots(IGetModelSnapshotsRequest request) =>
-			this.Dispatcher.Dispatch<IGetModelSnapshotsRequest, GetModelSnapshotsRequestParameters, GetModelSnapshotsResponse>(
+			Dispatcher.Dispatch<IGetModelSnapshotsRequest, GetModelSnapshotsRequestParameters, GetModelSnapshotsResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlGetModelSnapshotsDispatch<GetModelSnapshotsResponse>
+				LowLevelDispatch.XpackMlGetModelSnapshotsDispatch<GetModelSnapshotsResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetModelSnapshotsResponse> GetModelSnapshotsAsync(Id jobId, Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetModelSnapshotsAsync(selector.InvokeOrDefault(new GetModelSnapshotsDescriptor(jobId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetModelSnapshotsResponse> GetModelSnapshotsAsync(IGetModelSnapshotsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetModelSnapshotsRequest, GetModelSnapshotsRequestParameters, GetModelSnapshotsResponse, IGetModelSnapshotsResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.XpackMlGetModelSnapshotsDispatchAsync<GetModelSnapshotsResponse>
-			);
+		/// <inheritdoc />
+		public Task<IGetModelSnapshotsResponse> GetModelSnapshotsAsync(Id jobId,
+			Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetModelSnapshotsAsync(selector.InvokeOrDefault(new GetModelSnapshotsDescriptor(jobId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetModelSnapshotsResponse> GetModelSnapshotsAsync(IGetModelSnapshotsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetModelSnapshotsRequest, GetModelSnapshotsRequestParameters, GetModelSnapshotsResponse, IGetModelSnapshotsResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.XpackMlGetModelSnapshotsDispatchAsync<GetModelSnapshotsResponse>
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsResponse.cs b/src/Nest/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsResponse.cs
index 7ac1db193ca..080a7c82f25 100644
--- a/src/Nest/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsResponse.cs
+++ b/src/Nest/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsResponse.cs
@@ -14,7 +14,7 @@ public interface IGetModelSnapshotsResponse : IResponse
 
 	public class GetModelSnapshotsResponse : ResponseBase, IGetModelSnapshotsResponse
 	{
-		public long Count { get; internal set;  }
+		public long Count { get; internal set; }
 
 		public IReadOnlyCollection<ModelSnapshot> ModelSnapshots { get; internal set; } = EmptyReadOnly<ModelSnapshot>.Collection;
 	}
diff --git a/src/Nest/XPack/MachineLearning/GetOverallBuckets/ElasticClient-GetOverallBuckets.cs b/src/Nest/XPack/MachineLearning/GetOverallBuckets/ElasticClient-GetOverallBuckets.cs
index 85654b994df..ea739282c9b 100644
--- a/src/Nest/XPack/MachineLearning/GetOverallBuckets/ElasticClient-GetOverallBuckets.cs
+++ b/src/Nest/XPack/MachineLearning/GetOverallBuckets/ElasticClient-GetOverallBuckets.cs
@@ -20,37 +20,48 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Retrieves machine learning job results for one or more buckets.
 		/// </summary>
-		Task<IGetOverallBucketsResponse> GetOverallBucketsAsync(Id jobId, Func<GetOverallBucketsDescriptor, IGetOverallBucketsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IGetOverallBucketsResponse> GetOverallBucketsAsync(Id jobId,
+			Func<GetOverallBucketsDescriptor, IGetOverallBucketsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Retrieves machine learning job results for one or more buckets.
 		/// </summary>
-		Task<IGetOverallBucketsResponse> GetOverallBucketsAsync(IGetOverallBucketsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IGetOverallBucketsResponse> GetOverallBucketsAsync(IGetOverallBucketsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetOverallBucketsResponse GetOverallBuckets(Id jobId, Func<GetOverallBucketsDescriptor, IGetOverallBucketsRequest> selector = null) =>
-			this.GetOverallBuckets(selector.InvokeOrDefault(new GetOverallBucketsDescriptor(jobId)));
+			GetOverallBuckets(selector.InvokeOrDefault(new GetOverallBucketsDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetOverallBucketsResponse GetOverallBuckets(IGetOverallBucketsRequest request) =>
-			this.Dispatcher.Dispatch<IGetOverallBucketsRequest, GetOverallBucketsRequestParameters, GetOverallBucketsResponse>(
+			Dispatcher.Dispatch<IGetOverallBucketsRequest, GetOverallBucketsRequestParameters, GetOverallBucketsResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlGetOverallBucketsDispatch<GetOverallBucketsResponse>
+				LowLevelDispatch.XpackMlGetOverallBucketsDispatch<GetOverallBucketsResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetOverallBucketsResponse> GetOverallBucketsAsync(Id jobId, Func<GetOverallBucketsDescriptor, IGetOverallBucketsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetOverallBucketsAsync(selector.InvokeOrDefault(new GetOverallBucketsDescriptor(jobId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetOverallBucketsResponse> GetOverallBucketsAsync(Id jobId,
+			Func<GetOverallBucketsDescriptor, IGetOverallBucketsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetOverallBucketsAsync(selector.InvokeOrDefault(new GetOverallBucketsDescriptor(jobId)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetOverallBucketsResponse> GetOverallBucketsAsync(IGetOverallBucketsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetOverallBucketsRequest, GetOverallBucketsRequestParameters, GetOverallBucketsResponse, IGetOverallBucketsResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.XpackMlGetOverallBucketsDispatchAsync<GetOverallBucketsResponse>
-			);
+		/// <inheritdoc />
+		public Task<IGetOverallBucketsResponse> GetOverallBucketsAsync(IGetOverallBucketsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetOverallBucketsRequest, GetOverallBucketsRequestParameters, GetOverallBucketsResponse, IGetOverallBucketsResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.XpackMlGetOverallBucketsDispatchAsync<GetOverallBucketsResponse>
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsRequest.cs b/src/Nest/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsRequest.cs
index e603b539a40..a7353ba5ca9 100644
--- a/src/Nest/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsRequest.cs
+++ b/src/Nest/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsRequest.cs
@@ -53,28 +53,34 @@ public partial interface IGetOverallBucketsRequest
 
 		/// <summary>
 		/// The number of top job bucket scores to be used in the
-		/// <see cref="OverallBucket.OverallScore"/> calculation on the response.
+		/// <see cref="OverallBucket.OverallScore" /> calculation on the response.
 		/// The default value is <c>1</c>.
 		/// </summary>
 		[JsonProperty("top_n")]
 		int? TopN { get; set; }
 	}
 
-	/// <inheritdoc cref="IGetOverallBucketsRequest"/>
+	/// <inheritdoc cref="IGetOverallBucketsRequest" />
 	public partial class GetOverallBucketsRequest : IGetOverallBucketsRequest
 	{
 		/// <inheritdoc />
 		public bool? AllowNoJobs { get; set; }
+
 		/// <inheritdoc />
 		public Time BucketSpan { get; set; }
+
 		/// <inheritdoc />
 		public DateTimeOffset? End { get; set; }
+
 		/// <inheritdoc />
 		public bool? ExcludeInterim { get; set; }
+
 		/// <inheritdoc />
 		public double? OverallScore { get; set; }
+
 		/// <inheritdoc />
 		public DateTimeOffset? Start { get; set; }
+
 		/// <inheritdoc />
 		public int? TopN { get; set; }
 	}
diff --git a/src/Nest/XPack/MachineLearning/Job/Config/AnalysisConfig.cs b/src/Nest/XPack/MachineLearning/Job/Config/AnalysisConfig.cs
index d735004e68f..b6aab57ffdb 100644
--- a/src/Nest/XPack/MachineLearning/Job/Config/AnalysisConfig.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Config/AnalysisConfig.cs
@@ -75,18 +75,25 @@ public class AnalysisConfig : IAnalysisConfig
 	{
 		/// <inheritdoc />
 		public Time BucketSpan { get; set; }
+
 		/// <inheritdoc />
 		public Field CategorizationFieldName { get; set; }
+
 		/// <inheritdoc />
 		public IEnumerable<string> CategorizationFilters { get; set; }
+
 		/// <inheritdoc />
 		public IEnumerable<IDetector> Detectors { get; set; }
+
 		/// <inheritdoc />
 		public Fields Influencers { get; set; }
+
 		/// <inheritdoc />
 		public Time Latency { get; set; }
+
 		/// <inheritdoc />
 		public bool? MultivariateByFields { get; set; }
+
 		/// <inheritdoc />
 		public Field SummaryCountFieldName { get; set; }
 	}
@@ -134,12 +141,15 @@ public AnalysisConfigDescriptor<T> Influencers(Func<FieldsDescriptor<T>, IPromis
 		public AnalysisConfigDescriptor<T> Latency(Time latency) => Assign(a => a.Latency = latency);
 
 		/// <inheritdoc />
-		public AnalysisConfigDescriptor<T> MultivariateByFields(bool? multivariateByFields = true) => Assign(a => a.MultivariateByFields = multivariateByFields);
+		public AnalysisConfigDescriptor<T> MultivariateByFields(bool? multivariateByFields = true) =>
+			Assign(a => a.MultivariateByFields = multivariateByFields);
 
 		/// <inheritdoc />
-		public AnalysisConfigDescriptor<T> SummaryCountFieldName(Field summaryCountFieldName) => Assign(a => a.SummaryCountFieldName = summaryCountFieldName);
+		public AnalysisConfigDescriptor<T> SummaryCountFieldName(Field summaryCountFieldName) =>
+			Assign(a => a.SummaryCountFieldName = summaryCountFieldName);
 
 		/// <inheritdoc />
-		public AnalysisConfigDescriptor<T> SummaryCountFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.SummaryCountFieldName = objectPath);
+		public AnalysisConfigDescriptor<T> SummaryCountFieldName(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.SummaryCountFieldName = objectPath);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Config/AnalysisLimits.cs b/src/Nest/XPack/MachineLearning/Job/Config/AnalysisLimits.cs
index 750b0ef59cf..ef49fff9ed6 100644
--- a/src/Nest/XPack/MachineLearning/Job/Config/AnalysisLimits.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Config/AnalysisLimits.cs
@@ -34,6 +34,7 @@ public class AnalysisLimits : IAnalysisLimits
 	{
 		/// <inheritdoc />
 		public long? CategorizationExamplesLimit { get; set; }
+
 		/// <inheritdoc />
 		public string ModelMemoryLimit { get; set; }
 	}
diff --git a/src/Nest/XPack/MachineLearning/Job/Config/DataDescription.cs b/src/Nest/XPack/MachineLearning/Job/Config/DataDescription.cs
index 28b41b5a57a..31298bec206 100644
--- a/src/Nest/XPack/MachineLearning/Job/Config/DataDescription.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Config/DataDescription.cs
@@ -35,8 +35,10 @@ public class DataDescription : IDataDescription
 	{
 		/// <inheritdoc />
 		public string Format { get; set; }
+
 		/// <inheritdoc />
 		public Field TimeField { get; set; }
+
 		/// <inheritdoc />
 		public string TimeFormat { get; set; }
 	}
diff --git a/src/Nest/XPack/MachineLearning/Job/Config/Job.cs b/src/Nest/XPack/MachineLearning/Job/Config/Job.cs
index 6236de75681..0edd3a85b60 100644
--- a/src/Nest/XPack/MachineLearning/Job/Config/Job.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Config/Job.cs
@@ -6,41 +6,6 @@ namespace Nest
 	[JsonObject]
 	public class Job
 	{
-		/// <summary>
-		/// The unique identifier for the job.
-		/// </summary>
-		[JsonProperty("job_id")]
-		public string JobId { get; set; }
-
-		/// <summary>
-		/// The job type.
-		/// </summary>
-		/// <remarks>
-		/// Reserved for future use.
-		/// </remarks>
-		[JsonProperty("job_type")]
-		public string JobType { get; set; }
-
-		/// <summary>
-		/// An optional description of the job.
-		/// </summary>
-		[JsonProperty("description")]
-		public string Description { get; set; }
-
-		/// <summary>
-		/// The time the job was created.
-		/// </summary>
-		[JsonProperty("create_time")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset CreateTime { get; set; }
-
-		/// <summary>
-		/// If the job closed or failed, this is the time the job finished, otherwise it is null.
-		/// </summary>
-		[JsonProperty("finished_time")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset? FinishedTime { get; set; }
-
 		/// <summary>
 		/// The analysis configuration, which specifies how to analyze the data.
 		/// </summary>
@@ -64,6 +29,13 @@ public class Job
 		[JsonProperty("background_persist_interval")]
 		public Time BackgroundPersistInterval { get; set; }
 
+		/// <summary>
+		/// The time the job was created.
+		/// </summary>
+		[JsonProperty("create_time")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset CreateTime { get; set; }
+
 		/// <summary>
 		/// Describes the format of the input data. This object is required, but it can be empty.
 		/// </summary>
@@ -71,24 +43,32 @@ public class Job
 		public IDataDescription DataDescription { get; set; }
 
 		/// <summary>
-		/// The time in days that model snapshots are retained for the job.
-		/// Older snapshots are deleted. The default value is 1 day.
+		/// An optional description of the job.
 		/// </summary>
-		[JsonProperty("model_snapshot_retention_days")]
-		public long? ModelSnapshotRetentionDays { get; set; }
+		[JsonProperty("description")]
+		public string Description { get; set; }
 
 		/// <summary>
-		/// A numerical character string that uniquely identifies the model snapshot.
+		/// If the job closed or failed, this is the time the job finished, otherwise it is null.
 		/// </summary>
-		[JsonProperty("model_snapshot_id")]
-		public string ModelSnapshotId { get; set; }
+		[JsonProperty("finished_time")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset? FinishedTime { get; set; }
 
 		/// <summary>
-		/// The name of the index in which to store the machine learning results.
-		/// The default value is shared (which corresponds to the index name .ml-anomalies-shared).
+		/// The unique identifier for the job.
 		/// </summary>
-		[JsonProperty("results_index_name")]
-		public string ResultsIndexName { get; set; }
+		[JsonProperty("job_id")]
+		public string JobId { get; set; }
+
+		/// <summary>
+		/// The job type.
+		/// </summary>
+		/// <remarks>
+		/// Reserved for future use.
+		/// </remarks>
+		[JsonProperty("job_type")]
+		public string JobType { get; set; }
 
 		/// <summary>
 		/// This advanced configuration option stores model information along with the results.
@@ -97,6 +77,19 @@ public class Job
 		[JsonProperty("model_plot")]
 		public IModelPlotConfig ModelPlotConfig { get; set; }
 
+		/// <summary>
+		/// A numerical character string that uniquely identifies the model snapshot.
+		/// </summary>
+		[JsonProperty("model_snapshot_id")]
+		public string ModelSnapshotId { get; set; }
+
+		/// <summary>
+		/// The time in days that model snapshots are retained for the job.
+		/// Older snapshots are deleted. The default value is 1 day.
+		/// </summary>
+		[JsonProperty("model_snapshot_retention_days")]
+		public long? ModelSnapshotRetentionDays { get; set; }
+
 		/// <summary>
 		/// Advanced configuration option. The period over which adjustments to the score are applied, as new data
 		/// is seen. The default value is the longer of 30 days or 100 bucket spans.
@@ -104,6 +97,13 @@ public class Job
 		[JsonProperty("renormalization_window_days")]
 		public long? RenormalizationWindowDays { get; set; }
 
+		/// <summary>
+		/// The name of the index in which to store the machine learning results.
+		/// The default value is shared (which corresponds to the index name .ml-anomalies-shared).
+		/// </summary>
+		[JsonProperty("results_index_name")]
+		public string ResultsIndexName { get; set; }
+
 		/// <summary>
 		/// Advanced configuration option. The number of days for which job results are retained.
 		/// Once per day at 00:30 (server time), results older than this period are deleted from Elasticsearch.
diff --git a/src/Nest/XPack/MachineLearning/Job/Config/JobState.cs b/src/Nest/XPack/MachineLearning/Job/Config/JobState.cs
index a1a324676af..18e67027d7f 100644
--- a/src/Nest/XPack/MachineLearning/Job/Config/JobState.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Config/JobState.cs
@@ -15,17 +15,20 @@ public enum JobState
 		/// </summary>
 		[EnumMember(Value = "closing")]
 		Closing,
+
 		/// <summary>
 		/// The job finished successfully with its model state persisted.
 		/// The job must be opened before it can accept further data.
 		/// </summary>
 		[EnumMember(Value = "closed")]
 		Closed,
+
 		/// <summary>
 		/// The job is available to receive and process data.
 		/// </summary>
 		[EnumMember(Value = "opened")]
 		Opened,
+
 		/// <summary>
 		/// The job did not finish successfully due to an error. This situation can occur due to invalid input data.
 		/// If the job had irrevocably failed, it must be force closed and then deleted.
@@ -33,6 +36,7 @@ public enum JobState
 		/// </summary>
 		[EnumMember(Value = "failed")]
 		Failed,
+
 		/// <summary>
 		/// The job open action is in progress and has not yet completed.
 		/// </summary>
diff --git a/src/Nest/XPack/MachineLearning/Job/Config/JobStats.cs b/src/Nest/XPack/MachineLearning/Job/Config/JobStats.cs
index 708e4ba20a2..573d3cfe85f 100644
--- a/src/Nest/XPack/MachineLearning/Job/Config/JobStats.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Config/JobStats.cs
@@ -14,12 +14,6 @@ public class JobStats
 		[JsonProperty("assignment_explanation")]
 		public string AssignmentExplanation { get; internal set; }
 
-		/// <summary>
-		/// A unique identifier for the job.
-		/// </summary>
-		[JsonProperty("job_id")]
-		public string JobId { get; internal set; }
-
 		/// <summary>
 		/// Describes the number of records processed and any related error counts.
 		/// </summary>
@@ -27,16 +21,16 @@ public class JobStats
 		public DataCounts DataCounts { get; internal set; }
 
 		/// <summary>
-		/// Provides information about the size and contents of the model.
+		/// A unique identifier for the job.
 		/// </summary>
-		[JsonProperty("model_size_stats")]
-		public ModelSizeStats ModelSizeStats { get; internal set; }
+		[JsonProperty("job_id")]
+		public string JobId { get; internal set; }
 
 		/// <summary>
-		/// The status of the job.
+		/// Provides information about the size and contents of the model.
 		/// </summary>
-		[JsonProperty("state")]
-		public JobState State { get; internal set; }
+		[JsonProperty("model_size_stats")]
+		public ModelSizeStats ModelSizeStats { get; internal set; }
 
 		/// <summary>
 		/// For open jobs only, contains information about the node where the job runs.
@@ -49,5 +43,11 @@ public class JobStats
 		/// </summary>
 		[JsonProperty("open_time")]
 		public Time OpenTime { get; internal set; }
+
+		/// <summary>
+		/// The status of the job.
+		/// </summary>
+		[JsonProperty("state")]
+		public JobState State { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Config/MemoryStatus.cs b/src/Nest/XPack/MachineLearning/Job/Config/MemoryStatus.cs
index 1aee8171f3a..9edd8209b52 100644
--- a/src/Nest/XPack/MachineLearning/Job/Config/MemoryStatus.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Config/MemoryStatus.cs
@@ -30,4 +30,4 @@ public enum MemoryStatus
 		[EnumMember(Value = "hard_limit")]
 		HardLimit
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/MachineLearning/Job/Config/ModelPlotConfig.cs b/src/Nest/XPack/MachineLearning/Job/Config/ModelPlotConfig.cs
index dfe27b7fb81..16107c87510 100644
--- a/src/Nest/XPack/MachineLearning/Job/Config/ModelPlotConfig.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Config/ModelPlotConfig.cs
@@ -26,6 +26,7 @@ public class ModelPlotConfig : IModelPlotConfig
 	{
 		/// <inheritdoc />
 		public bool? Enabled { get; set; }
+
 		/// <inheritdoc />
 		public Fields Terms { get; set; }
 	}
@@ -70,7 +71,8 @@ public class ModelPlotConfigEnabled : IModelPlotConfigEnabled
 	}
 
 	/// <inheritdoc />
-	public class ModelPlotConfigEnabledDescriptor<T> : DescriptorBase<ModelPlotConfigEnabledDescriptor<T>, IModelPlotConfigEnabled>, IModelPlotConfigEnabled where T : class
+	public class ModelPlotConfigEnabledDescriptor<T>
+		: DescriptorBase<ModelPlotConfigEnabledDescriptor<T>, IModelPlotConfigEnabled>, IModelPlotConfigEnabled where T : class
 	{
 		bool? IModelPlotConfigEnabled.Enabled { get; set; }
 
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/CountDetector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/CountDetector.cs
index 7eb847425aa..076a033aa01 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/CountDetector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/CountDetector.cs
@@ -72,61 +72,51 @@ public static string GetStringValue(this DistinctCountFunction distinctCountFunc
 		}
 	}
 
-	public interface ICountDetector : IDetector, IByFieldNameDetector, IOverFieldNameDetector,
-		IPartitionFieldNameDetector
-	{
-	}
+	public interface ICountDetector
+		: IDetector, IByFieldNameDetector, IOverFieldNameDetector,
+			IPartitionFieldNameDetector { }
 
-	public interface INonZeroCountDetector : IDetector, IByFieldNameDetector, IPartitionFieldNameDetector
-	{
-	}
+	public interface INonZeroCountDetector : IDetector, IByFieldNameDetector, IPartitionFieldNameDetector { }
 
-	public interface IDistinctCountDetector : IDetector, IByFieldNameDetector, IOverFieldNameDetector,
-		IPartitionFieldNameDetector, IFieldNameDetector
-	{
-	}
+	public interface IDistinctCountDetector
+		: IDetector, IByFieldNameDetector, IOverFieldNameDetector,
+			IPartitionFieldNameDetector, IFieldNameDetector { }
 
 	public abstract class CountDetectorBase : DetectorBase, ICountDetector
 	{
+		protected CountDetectorBase(CountFunction function) : base(function.GetStringValue()) { }
+
 		public Field ByFieldName { get; set; }
 		public Field OverFieldName { get; set; }
 		public Field PartitionFieldName { get; set; }
-
-		protected CountDetectorBase(CountFunction function) : base(function.GetStringValue())
-		{
-		}
 	}
 
 	public abstract class NonZeroCountDetectorBase : DetectorBase, INonZeroCountDetector
 	{
+		protected NonZeroCountDetectorBase(NonZeroCountFunction function) : base(function.GetStringValue()) { }
+
 		public Field ByFieldName { get; set; }
 		public Field PartitionFieldName { get; set; }
-
-		protected NonZeroCountDetectorBase(NonZeroCountFunction function) : base(function.GetStringValue())
-		{
-		}
 	}
 
 	public abstract class DistinctCountDetectorBase : DetectorBase, IDistinctCountDetector
 	{
+		protected DistinctCountDetectorBase(DistinctCountFunction function) : base(function.GetStringValue()) { }
+
 		public Field ByFieldName { get; set; }
-		public Field PartitionFieldName { get; set; }
-		public Field OverFieldName { get; set; }
 		public Field FieldName { get; set; }
-
-		protected DistinctCountDetectorBase(DistinctCountFunction function) : base(function.GetStringValue())
-		{
-		}
+		public Field OverFieldName { get; set; }
+		public Field PartitionFieldName { get; set; }
 	}
 
 	public class CountDetectorDescriptor<T> : DetectorDescriptorBase<CountDetectorDescriptor<T>, ICountDetector>, ICountDetector where T : class
 	{
+		public CountDetectorDescriptor(CountFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
 		Field IOverFieldNameDetector.OverFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
 
-		public CountDetectorDescriptor(CountFunction function) : base(function.GetStringValue()) {}
-
 		public CountDetectorDescriptor<T> ByFieldName(Field byFieldName) => Assign(a => a.ByFieldName = byFieldName);
 
 		public CountDetectorDescriptor<T> ByFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.ByFieldName = objectPath);
@@ -137,33 +127,38 @@ public CountDetectorDescriptor(CountFunction function) : base(function.GetString
 
 		public CountDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) => Assign(a => a.PartitionFieldName = partitionFieldName);
 
-		public CountDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.PartitionFieldName = objectPath);
+		public CountDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.PartitionFieldName = objectPath);
 	}
 
-	public class NonZeroCountDetectorDescriptor<T> : DetectorDescriptorBase<NonZeroCountDetectorDescriptor<T>, INonZeroCountDetector>, INonZeroCountDetector where T : class
+	public class NonZeroCountDetectorDescriptor<T>
+		: DetectorDescriptorBase<NonZeroCountDetectorDescriptor<T>, INonZeroCountDetector>, INonZeroCountDetector where T : class
 	{
+		public NonZeroCountDetectorDescriptor(NonZeroCountFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
 
-		public NonZeroCountDetectorDescriptor(NonZeroCountFunction function) : base(function.GetStringValue()) {}
-
 		public NonZeroCountDetectorDescriptor<T> ByFieldName(Field byFieldName) => Assign(a => a.ByFieldName = byFieldName);
 
 		public NonZeroCountDetectorDescriptor<T> ByFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.ByFieldName = objectPath);
 
-		public NonZeroCountDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) => Assign(a => a.PartitionFieldName = partitionFieldName);
+		public NonZeroCountDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) =>
+			Assign(a => a.PartitionFieldName = partitionFieldName);
 
-		public NonZeroCountDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.PartitionFieldName = objectPath);
+		public NonZeroCountDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.PartitionFieldName = objectPath);
 	}
 
-	public class DistinctCountDetectorDescriptor<T> : DetectorDescriptorBase<DistinctCountDetectorDescriptor<T>, IDistinctCountDetector>, IDistinctCountDetector where T : class
+	public class DistinctCountDetectorDescriptor<T>
+		: DetectorDescriptorBase<DistinctCountDetectorDescriptor<T>, IDistinctCountDetector>, IDistinctCountDetector where T : class
 	{
+		public DistinctCountDetectorDescriptor(DistinctCountFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
+		Field IFieldNameDetector.FieldName { get; set; }
 		Field IOverFieldNameDetector.OverFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
-		Field IFieldNameDetector.FieldName { get; set; }
-
-		public DistinctCountDetectorDescriptor(DistinctCountFunction function) : base(function.GetStringValue()) {}
 
 		public DistinctCountDetectorDescriptor<T> FieldName(Field fieldName) => Assign(a => a.FieldName = fieldName);
 
@@ -177,24 +172,26 @@ public DistinctCountDetectorDescriptor(DistinctCountFunction function) : base(fu
 
 		public DistinctCountDetectorDescriptor<T> OverFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.OverFieldName = objectPath);
 
-		public DistinctCountDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) => Assign(a => a.PartitionFieldName = partitionFieldName);
+		public DistinctCountDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) =>
+			Assign(a => a.PartitionFieldName = partitionFieldName);
 
-		public DistinctCountDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.PartitionFieldName = objectPath);
+		public DistinctCountDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.PartitionFieldName = objectPath);
 	}
 
 	public class CountDetector : CountDetectorBase
 	{
-		public CountDetector() : base(CountFunction.Count) {}
+		public CountDetector() : base(CountFunction.Count) { }
 	}
 
 	public class HighCountDetector : CountDetectorBase
 	{
-		public HighCountDetector() : base(CountFunction.HighCount) {}
+		public HighCountDetector() : base(CountFunction.HighCount) { }
 	}
 
 	public class LowCountDetector : CountDetectorBase
 	{
-		public LowCountDetector() : base(CountFunction.LowCount) {}
+		public LowCountDetector() : base(CountFunction.LowCount) { }
 	}
 
 	/// <summary>
@@ -203,7 +200,7 @@ public LowCountDetector() : base(CountFunction.LowCount) {}
 	/// </summary>
 	public class NonZeroCountDetector : NonZeroCountDetectorBase
 	{
-		public NonZeroCountDetector() : base(NonZeroCountFunction.NonZeroCount) {}
+		public NonZeroCountDetector() : base(NonZeroCountFunction.NonZeroCount) { }
 	}
 
 	/// <summary>
@@ -211,22 +208,22 @@ public NonZeroCountDetector() : base(NonZeroCountFunction.NonZeroCount) {}
 	/// </summary>
 	public class HighNonZeroCountDetector : NonZeroCountDetectorBase
 	{
-		public HighNonZeroCountDetector() : base(NonZeroCountFunction.HighNonZeroCount) {}
+		public HighNonZeroCountDetector() : base(NonZeroCountFunction.HighNonZeroCount) { }
 	}
 
 	public class DistinctCountDetector : DistinctCountDetectorBase
 	{
-		public DistinctCountDetector() : base(DistinctCountFunction.DistinctCount) {}
+		public DistinctCountDetector() : base(DistinctCountFunction.DistinctCount) { }
 	}
 
 	public class HighDistinctCountDetector : DistinctCountDetectorBase
 	{
-		public HighDistinctCountDetector() : base(DistinctCountFunction.HighDistinctCount) {}
+		public HighDistinctCountDetector() : base(DistinctCountFunction.HighDistinctCount) { }
 	}
 
 	public class LowDistinctCountDetector : DistinctCountDetectorBase
 	{
-		public LowDistinctCountDetector() : base(DistinctCountFunction.LowDistinctCount) {}
+		public LowDistinctCountDetector() : base(DistinctCountFunction.LowDistinctCount) { }
 	}
 
 	/// <summary>
@@ -234,6 +231,6 @@ public LowDistinctCountDetector() : base(DistinctCountFunction.LowDistinctCount)
 	/// </summary>
 	public class LowNonZeroCountDetector : NonZeroCountDetectorBase
 	{
-		public LowNonZeroCountDetector() : base(NonZeroCountFunction.LowNonZeroCount) {}
+		public LowNonZeroCountDetector() : base(NonZeroCountFunction.LowNonZeroCount) { }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs
index c5bb1069718..aa0e547752f 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs
@@ -11,6 +11,9 @@ public interface IDetector
 		[JsonProperty("detector_description")]
 		string DetectorDescription { get; set; }
 
+		[JsonProperty("detector_index")]
+		int? DetectorIndex { get; set; }
+
 		[JsonProperty("exclude_frequent")]
 		ExcludeFrequent? ExcludeFrequent { get; set; }
 
@@ -19,9 +22,6 @@ public interface IDetector
 
 		[JsonProperty("use_null")]
 		bool? UseNull { get; set; }
-
-		[JsonProperty("detector_index")]
-		int? DetectorIndex { get; set; }
 	}
 
 	internal class DetectorConverter : JsonConverter
@@ -96,7 +96,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				case "freq_rare":
 					return jObject.ToObject<FreqRareDetector>(ElasticContractResolver.Empty);
 				case "sum":
-					 return jObject.ToObject<SumDetector>(ElasticContractResolver.Empty);
+					return jObject.ToObject<SumDetector>(ElasticContractResolver.Empty);
 				case "high_sum":
 					return jObject.ToObject<HighSumDetector>(ElasticContractResolver.Empty);
 				case "low_sum":
@@ -145,31 +145,29 @@ public interface IPartitionFieldNameDetector : IDetector
 
 	public abstract class DetectorBase : IDetector
 	{
-		protected DetectorBase(string function)
-		{
-			Function = function;
-		}
+		protected DetectorBase(string function) => Function = function;
 
 		public string DetectorDescription { get; set; }
+		public int? DetectorIndex { get; set; }
 		public ExcludeFrequent? ExcludeFrequent { get; set; }
 		public string Function { get; }
 		public bool? UseNull { get; set; }
-		public int? DetectorIndex { get; set; }
 	}
 
-	public abstract class DetectorDescriptorBase<TDetectorDescriptor, TDetectorInterface> : DescriptorBase<TDetectorDescriptor, TDetectorInterface>, IDetector
+	public abstract class DetectorDescriptorBase<TDetectorDescriptor, TDetectorInterface>
+		: DescriptorBase<TDetectorDescriptor, TDetectorInterface>, IDetector
 		where TDetectorDescriptor : DetectorDescriptorBase<TDetectorDescriptor, TDetectorInterface>, TDetectorInterface
 		where TDetectorInterface : class, IDetector
 	{
 		private readonly string _function;
 
+		protected DetectorDescriptorBase(string function) => _function = function;
+
 		string IDetector.DetectorDescription { get; set; }
+		int? IDetector.DetectorIndex { get; set; }
 		ExcludeFrequent? IDetector.ExcludeFrequent { get; set; }
 		string IDetector.Function => _function;
 		bool? IDetector.UseNull { get; set; }
-		int? IDetector.DetectorIndex { get; set; }
-
-		protected DetectorDescriptorBase(string function) => _function = function;
 
 		public TDetectorDescriptor DetectorDescription(string description) => Assign(a => a.DetectorDescription = description);
 
@@ -182,7 +180,7 @@ public abstract class DetectorDescriptorBase<TDetectorDescriptor, TDetectorInter
 
 	public class DetectorsDescriptor<T> : DescriptorPromiseBase<DetectorsDescriptor<T>, IList<IDetector>> where T : class
 	{
-		public DetectorsDescriptor() : base(new List<IDetector>()) {}
+		public DetectorsDescriptor() : base(new List<IDetector>()) { }
 
 		public DetectorsDescriptor<T> Count(Func<CountDetectorDescriptor<T>, ICountDetector> selector = null) =>
 			Assign(a => a.AddIfNotNull(selector.InvokeOrDefault(new CountDetectorDescriptor<T>(CountFunction.Count))));
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/GeographicDetector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/GeographicDetector.cs
index 6dd01ffb28e..d9b01c0a00c 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/GeographicDetector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/GeographicDetector.cs
@@ -22,32 +22,32 @@ public static string GetStringValue(this GeographicFunction geographicFunction)
 		}
 	}
 
-	public interface IGeographicDetector : IDetector, IByFieldNameDetector, IOverFieldNameDetector,
-		IPartitionFieldNameDetector, IFieldNameDetector
-	{
-	}
+	public interface IGeographicDetector
+		: IDetector, IByFieldNameDetector, IOverFieldNameDetector,
+			IPartitionFieldNameDetector, IFieldNameDetector { }
 
 	public class LatLongDetector : DetectorBase, IGeographicDetector
 	{
-		public LatLongDetector() : base(GeographicFunction.LatLong.GetStringValue()) {}
+		public LatLongDetector() : base(GeographicFunction.LatLong.GetStringValue()) { }
 
 		public Field ByFieldName { get; set; }
+		public Field FieldName { get; set; }
 		public Field OverFieldName { get; set; }
 		public Field PartitionFieldName { get; set; }
-		public Field FieldName { get; set; }
 	}
 
-	public class LatLongDetectorDescriptor<T> : DetectorDescriptorBase<LatLongDetectorDescriptor<T>, IGeographicDetector>, IGeographicDetector where T : class
+	public class LatLongDetectorDescriptor<T> : DetectorDescriptorBase<LatLongDetectorDescriptor<T>, IGeographicDetector>, IGeographicDetector
+		where T : class
 	{
+		[Obsolete("Use parameterless constructor")]
+		public LatLongDetectorDescriptor(string function) : base(function) { }
+
+		public LatLongDetectorDescriptor() : base(GeographicFunction.LatLong.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
+		Field IFieldNameDetector.FieldName { get; set; }
 		Field IOverFieldNameDetector.OverFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
-		Field IFieldNameDetector.FieldName { get; set; }
-
-		[Obsolete("Use parameterless constructor")]
-		public LatLongDetectorDescriptor(string function) : base(function) {}
-
-		public LatLongDetectorDescriptor() : base(GeographicFunction.LatLong.GetStringValue()) {}
 
 		public LatLongDetectorDescriptor<T> FieldName(Field fieldName) => Assign(a => a.FieldName = fieldName);
 
@@ -63,6 +63,7 @@ public LatLongDetectorDescriptor() : base(GeographicFunction.LatLong.GetStringVa
 
 		public LatLongDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) => Assign(a => a.PartitionFieldName = partitionFieldName);
 
-		public LatLongDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.PartitionFieldName = objectPath);
+		public LatLongDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.PartitionFieldName = objectPath);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/InfoContentDetector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/InfoContentDetector.cs
index 475c86f9a97..a080f552b22 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/InfoContentDetector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/InfoContentDetector.cs
@@ -28,44 +28,44 @@ public static string GetStringValue(this InfoContentFunction infoContentFunction
 		}
 	}
 
-	public interface IInfoContentDetector : IDetector, IByFieldNameDetector, IOverFieldNameDetector,
-		IPartitionFieldNameDetector, IFieldNameDetector
-	{
-	}
+	public interface IInfoContentDetector
+		: IDetector, IByFieldNameDetector, IOverFieldNameDetector,
+			IPartitionFieldNameDetector, IFieldNameDetector { }
 
 	public abstract class InfoContentDetectorBase : DetectorBase, IInfoContentDetector
 	{
-		protected InfoContentDetectorBase(InfoContentFunction function) : base(function.GetStringValue()) {}
+		protected InfoContentDetectorBase(InfoContentFunction function) : base(function.GetStringValue()) { }
 
 		public Field ByFieldName { get; set; }
+		public Field FieldName { get; set; }
 		public Field OverFieldName { get; set; }
 		public Field PartitionFieldName { get; set; }
-		public Field FieldName { get; set; }
 	}
 
 	public class InfoContentDetector : InfoContentDetectorBase
 	{
-		public InfoContentDetector() : base(InfoContentFunction.InfoContent) {}
+		public InfoContentDetector() : base(InfoContentFunction.InfoContent) { }
 	}
 
 	public class HighInfoContentDetector : InfoContentDetectorBase
 	{
-		public HighInfoContentDetector() : base(InfoContentFunction.HighInfoContent) {}
+		public HighInfoContentDetector() : base(InfoContentFunction.HighInfoContent) { }
 	}
 
 	public class LowInfoContentDetector : InfoContentDetectorBase
 	{
-		public LowInfoContentDetector() : base(InfoContentFunction.LowInfoContent) {}
+		public LowInfoContentDetector() : base(InfoContentFunction.LowInfoContent) { }
 	}
 
-	public class InfoContentDetectorDescriptor<T> : DetectorDescriptorBase<InfoContentDetectorDescriptor<T>, IInfoContentDetector>, IInfoContentDetector where T : class
+	public class InfoContentDetectorDescriptor<T>
+		: DetectorDescriptorBase<InfoContentDetectorDescriptor<T>, IInfoContentDetector>, IInfoContentDetector where T : class
 	{
+		public InfoContentDetectorDescriptor(InfoContentFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
+		Field IFieldNameDetector.FieldName { get; set; }
 		Field IOverFieldNameDetector.OverFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
-		Field IFieldNameDetector.FieldName { get; set; }
-
-		public InfoContentDetectorDescriptor(InfoContentFunction function) : base(function.GetStringValue()) {}
 
 		public InfoContentDetectorDescriptor<T> FieldName(Field fieldName) => Assign(a => a.FieldName = fieldName);
 
@@ -79,8 +79,10 @@ public InfoContentDetectorDescriptor(InfoContentFunction function) : base(functi
 
 		public InfoContentDetectorDescriptor<T> OverFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.OverFieldName = objectPath);
 
-		public InfoContentDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) => Assign(a => a.PartitionFieldName = partitionFieldName);
+		public InfoContentDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) =>
+			Assign(a => a.PartitionFieldName = partitionFieldName);
 
-		public InfoContentDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.PartitionFieldName = objectPath);
+		public InfoContentDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.PartitionFieldName = objectPath);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/MetricDetector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/MetricDetector.cs
index 3c702eac713..a8f6af98b5e 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/MetricDetector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/MetricDetector.cs
@@ -60,89 +60,88 @@ public static string GetStringValue(this MetricFunction metricFunction)
 		}
 	}
 
-	public interface IMetricDetector : IDetector, IByFieldNameDetector, IOverFieldNameDetector,
-		IPartitionFieldNameDetector, IFieldNameDetector
-	{
-	}
+	public interface IMetricDetector
+		: IDetector, IByFieldNameDetector, IOverFieldNameDetector,
+			IPartitionFieldNameDetector, IFieldNameDetector { }
 
 	public abstract class MetricDetectorBase : DetectorBase, IGeographicDetector
 	{
-		protected MetricDetectorBase(MetricFunction function) : base(function.GetStringValue()) {}
+		protected MetricDetectorBase(MetricFunction function) : base(function.GetStringValue()) { }
 
 		public Field ByFieldName { get; set; }
+		public Field FieldName { get; set; }
 		public Field OverFieldName { get; set; }
 		public Field PartitionFieldName { get; set; }
-		public Field FieldName { get; set; }
 	}
 
 	public class MinDetector : MetricDetectorBase
 	{
-		public MinDetector() : base(MetricFunction.Min) {}
+		public MinDetector() : base(MetricFunction.Min) { }
 	}
 
 	public class MaxDetector : MetricDetectorBase
 	{
-		public MaxDetector() : base(MetricFunction.Max) {}
+		public MaxDetector() : base(MetricFunction.Max) { }
 	}
 
 	public class MedianDetector : MetricDetectorBase
 	{
-		public MedianDetector() : base(MetricFunction.Median) {}
+		public MedianDetector() : base(MetricFunction.Median) { }
 	}
 
 	public class HighMedianDetector : MetricDetectorBase
 	{
-		public HighMedianDetector() : base(MetricFunction.HighMedian) {}
+		public HighMedianDetector() : base(MetricFunction.HighMedian) { }
 	}
 
 	public class LowMedianDetector : MetricDetectorBase
 	{
-		public LowMedianDetector() : base(MetricFunction.LowMedian) {}
+		public LowMedianDetector() : base(MetricFunction.LowMedian) { }
 	}
 
 	public class MeanDetector : MetricDetectorBase
 	{
-		public MeanDetector() : base(MetricFunction.Mean) {}
+		public MeanDetector() : base(MetricFunction.Mean) { }
 	}
 
 	public class HighMeanDetector : MetricDetectorBase
 	{
-		public HighMeanDetector() : base(MetricFunction.HighMean) {}
+		public HighMeanDetector() : base(MetricFunction.HighMean) { }
 	}
 
 	public class LowMeanDetector : MetricDetectorBase
 	{
-		public LowMeanDetector() : base(MetricFunction.LowMean) {}
+		public LowMeanDetector() : base(MetricFunction.LowMean) { }
 	}
 
 	public class MetricDetector : MetricDetectorBase
 	{
-		public MetricDetector() : base(MetricFunction.Metric) {}
+		public MetricDetector() : base(MetricFunction.Metric) { }
 	}
 
 	public class VarpDetector : MetricDetectorBase
 	{
-		public VarpDetector() : base(MetricFunction.Varp) {}
+		public VarpDetector() : base(MetricFunction.Varp) { }
 	}
 
 	public class HighVarpDetector : MetricDetectorBase
 	{
-		public HighVarpDetector() : base(MetricFunction.HighVarp) {}
+		public HighVarpDetector() : base(MetricFunction.HighVarp) { }
 	}
 
 	public class LowVarpDetector : MetricDetectorBase
 	{
-		public LowVarpDetector() : base(MetricFunction.LowVarp) {}
+		public LowVarpDetector() : base(MetricFunction.LowVarp) { }
 	}
 
 	public class MetricDetectorDescriptor<T> : DetectorDescriptorBase<MetricDetectorDescriptor<T>, IMetricDetector>, IMetricDetector where T : class
 	{
+		public MetricDetectorDescriptor(MetricFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
+		Field IFieldNameDetector.FieldName { get; set; }
 		Field IOverFieldNameDetector.OverFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
-		Field IFieldNameDetector.FieldName { get; set; }
-
-		public MetricDetectorDescriptor(MetricFunction function) : base(function.GetStringValue()) {}
 
 		public MetricDetectorDescriptor<T> FieldName(Field fieldName) => Assign(a => a.FieldName = fieldName);
 
@@ -158,6 +157,7 @@ public MetricDetectorDescriptor(MetricFunction function) : base(function.GetStri
 
 		public MetricDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) => Assign(a => a.PartitionFieldName = partitionFieldName);
 
-		public MetricDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.PartitionFieldName = objectPath);
+		public MetricDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.PartitionFieldName = objectPath);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/RareDetector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/RareDetector.cs
index 0c31c34115e..d16a4552505 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/RareDetector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/RareDetector.cs
@@ -25,30 +25,27 @@ public static string GetStringValue(this RareFunction rareFunction)
 		}
 	}
 
-	public interface IRareDetector : IDetector, IByFieldNameDetector, IOverFieldNameDetector,
-		IPartitionFieldNameDetector
-	{
-	}
+	public interface IRareDetector
+		: IDetector, IByFieldNameDetector, IOverFieldNameDetector,
+			IPartitionFieldNameDetector { }
 
 	public abstract class RareDetectorBase : DetectorBase, IRareDetector
 	{
+		protected RareDetectorBase(RareFunction function) : base(function.GetStringValue()) { }
+
 		public Field ByFieldName { get; set; }
 		public Field OverFieldName { get; set; }
 		public Field PartitionFieldName { get; set; }
-
-		protected RareDetectorBase(RareFunction function) : base(function.GetStringValue())
-		{
-		}
 	}
 
 	public class RareDetectorDescriptor<T> : DetectorDescriptorBase<RareDetectorDescriptor<T>, IRareDetector>, IRareDetector where T : class
 	{
+		public RareDetectorDescriptor(RareFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
 		Field IOverFieldNameDetector.OverFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
 
-		public RareDetectorDescriptor(RareFunction function) : base(function.GetStringValue()) {}
-
 		public RareDetectorDescriptor<T> ByFieldName(Field byFieldName) => Assign(a => a.ByFieldName = byFieldName);
 
 		public RareDetectorDescriptor<T> ByFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.ByFieldName = objectPath);
@@ -64,11 +61,11 @@ public RareDetectorDescriptor(RareFunction function) : base(function.GetStringVa
 
 	public class RareDetector : RareDetectorBase
 	{
-		public RareDetector() : base(RareFunction.Rare) {}
+		public RareDetector() : base(RareFunction.Rare) { }
 	}
 
 	public class FreqRareDetector : RareDetectorBase
 	{
-		public FreqRareDetector() : base(RareFunction.FreqRare) {}
+		public FreqRareDetector() : base(RareFunction.FreqRare) { }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/SumDetector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/SumDetector.cs
index db41e1ffb6a..828ad3d3e3a 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/SumDetector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/SumDetector.cs
@@ -50,76 +50,69 @@ public static string GetStringValue(this NonNullSumFunction nonNullSumFunction)
 		}
 	}
 
-	public interface ISumDetector : IDetector, IFieldNameDetector, IByFieldNameDetector, IOverFieldNameDetector,
-		IPartitionFieldNameDetector
-	{
-	}
+	public interface ISumDetector
+		: IDetector, IFieldNameDetector, IByFieldNameDetector, IOverFieldNameDetector,
+			IPartitionFieldNameDetector { }
 
-	public interface INonNullSumDetector : IDetector, IFieldNameDetector, IByFieldNameDetector, IPartitionFieldNameDetector
-	{
-	}
+	public interface INonNullSumDetector : IDetector, IFieldNameDetector, IByFieldNameDetector, IPartitionFieldNameDetector { }
 
 	public abstract class SumDetectorBase : DetectorBase, ISumDetector
 	{
-		public Field FieldName { get; set; }
+		protected SumDetectorBase(SumFunction function) : base(function.GetStringValue()) { }
+
 		public Field ByFieldName { get; set; }
+		public Field FieldName { get; set; }
 		public Field OverFieldName { get; set; }
 		public Field PartitionFieldName { get; set; }
-
-		protected SumDetectorBase(SumFunction function) : base(function.GetStringValue())
-		{
-		}
 	}
 
 	public abstract class NonNullSumDetectorBase : DetectorBase, INonNullSumDetector
 	{
-		public Field FieldName { get; set; }
+		protected NonNullSumDetectorBase(NonNullSumFunction function) : base(function.GetStringValue()) { }
+
 		public Field ByFieldName { get; set; }
+		public Field FieldName { get; set; }
 		public Field PartitionFieldName { get; set; }
-
-		protected NonNullSumDetectorBase(NonNullSumFunction function) : base(function.GetStringValue())
-		{
-		}
 	}
 
 	public class SumDetector : SumDetectorBase
 	{
-		public SumDetector() : base(SumFunction.Sum) {}
+		public SumDetector() : base(SumFunction.Sum) { }
 	}
 
 	public class HighSumDetector : SumDetectorBase
 	{
-		public HighSumDetector() : base(SumFunction.HighSum) {}
+		public HighSumDetector() : base(SumFunction.HighSum) { }
 	}
 
 	public class LowSumDetector : SumDetectorBase
 	{
-		public LowSumDetector() : base(SumFunction.LowSum) {}
+		public LowSumDetector() : base(SumFunction.LowSum) { }
 	}
 
 	public class NonNullSumDetector : NonNullSumDetectorBase
 	{
-		public NonNullSumDetector() : base(NonNullSumFunction.NonNullSum) {}
+		public NonNullSumDetector() : base(NonNullSumFunction.NonNullSum) { }
 	}
 
 	public class HighNonNullSumDetector : NonNullSumDetectorBase
 	{
-		public HighNonNullSumDetector() : base(NonNullSumFunction.HighNonNullSum) {}
+		public HighNonNullSumDetector() : base(NonNullSumFunction.HighNonNullSum) { }
 	}
 
 	public class LowNonNullSumDetector : NonNullSumDetectorBase
 	{
-		public LowNonNullSumDetector() : base(NonNullSumFunction.LowNonNullSum) {}
+		public LowNonNullSumDetector() : base(NonNullSumFunction.LowNonNullSum) { }
 	}
 
 	public class SumDetectorDescriptor<T> : DetectorDescriptorBase<SumDetectorDescriptor<T>, ISumDetector>, ISumDetector where T : class
 	{
+		public SumDetectorDescriptor(SumFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
+		Field IFieldNameDetector.FieldName { get; set; }
 		Field IOverFieldNameDetector.OverFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
-		Field IFieldNameDetector.FieldName { get; set; }
-
-		public SumDetectorDescriptor(SumFunction function) : base(function.GetStringValue()) {}
 
 		public SumDetectorDescriptor<T> FieldName(Field fieldName) => Assign(a => a.FieldName = fieldName);
 
@@ -138,13 +131,14 @@ public SumDetectorDescriptor(SumFunction function) : base(function.GetStringValu
 		public SumDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.PartitionFieldName = objectPath);
 	}
 
-	public class NonNullSumDetectorDescriptor<T> : DetectorDescriptorBase<NonNullSumDetectorDescriptor<T>, INonNullSumDetector>, INonNullSumDetector where T : class
+	public class NonNullSumDetectorDescriptor<T> : DetectorDescriptorBase<NonNullSumDetectorDescriptor<T>, INonNullSumDetector>, INonNullSumDetector
+		where T : class
 	{
+		public NonNullSumDetectorDescriptor(NonNullSumFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
-		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
 		Field IFieldNameDetector.FieldName { get; set; }
-
-		public NonNullSumDetectorDescriptor(NonNullSumFunction function) : base(function.GetStringValue()) {}
+		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
 
 		public NonNullSumDetectorDescriptor<T> FieldName(Field fieldName) => Assign(a => a.FieldName = fieldName);
 
@@ -156,6 +150,7 @@ public NonNullSumDetectorDescriptor(NonNullSumFunction function) : base(function
 
 		public NonNullSumDetectorDescriptor<T> PartitionFieldName(Field partitionFieldName) => Assign(a => a.PartitionFieldName = partitionFieldName);
 
-		public NonNullSumDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.PartitionFieldName = objectPath);
+		public NonNullSumDetectorDescriptor<T> PartitionFieldName(Expression<Func<T, object>> objectPath) =>
+			Assign(a => a.PartitionFieldName = objectPath);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/TimeDetector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/TimeDetector.cs
index 99b3512432d..ed7ce574681 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/TimeDetector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/TimeDetector.cs
@@ -13,7 +13,7 @@ public static class TimeFunctionsExtensions
 	{
 		public static string GetStringValue(this TimeFunction timeFunction)
 		{
-			switch(timeFunction)
+			switch (timeFunction)
 			{
 				case TimeFunction.TimeOfDay:
 					return "time_of_day";
@@ -25,14 +25,13 @@ public static string GetStringValue(this TimeFunction timeFunction)
 		}
 	}
 
-	public interface ITimeDetector : IDetector, IByFieldNameDetector, IOverFieldNameDetector,
-		IPartitionFieldNameDetector
-	{
-	}
+	public interface ITimeDetector
+		: IDetector, IByFieldNameDetector, IOverFieldNameDetector,
+			IPartitionFieldNameDetector { }
 
 	public abstract class TimeDetectorBase : DetectorBase, ITimeDetector
 	{
-		protected TimeDetectorBase(TimeFunction function) : base(function.GetStringValue()) {}
+		protected TimeDetectorBase(TimeFunction function) : base(function.GetStringValue()) { }
 
 		public Field ByFieldName { get; set; }
 		public Field OverFieldName { get; set; }
@@ -41,22 +40,22 @@ protected TimeDetectorBase(TimeFunction function) : base(function.GetStringValue
 
 	public class TimeOfDayDetector : TimeDetectorBase
 	{
-		public TimeOfDayDetector() : base(TimeFunction.TimeOfDay) {}
+		public TimeOfDayDetector() : base(TimeFunction.TimeOfDay) { }
 	}
 
 	public class TimeOfWeekDetector : TimeDetectorBase
 	{
-		public TimeOfWeekDetector() : base(TimeFunction.TimeOfWeek) {}
+		public TimeOfWeekDetector() : base(TimeFunction.TimeOfWeek) { }
 	}
 
 	public class TimeDetectorDescriptor<T> : DetectorDescriptorBase<TimeDetectorDescriptor<T>, ITimeDetector>, ITimeDetector where T : class
 	{
+		public TimeDetectorDescriptor(TimeFunction function) : base(function.GetStringValue()) { }
+
 		Field IByFieldNameDetector.ByFieldName { get; set; }
 		Field IOverFieldNameDetector.OverFieldName { get; set; }
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
 
-		public TimeDetectorDescriptor(TimeFunction function) : base(function.GetStringValue()) {}
-
 		public TimeDetectorDescriptor<T> ByFieldName(Field byFieldName) => Assign(a => a.ByFieldName = byFieldName);
 
 		public TimeDetectorDescriptor<T> ByFieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.ByFieldName = objectPath);
diff --git a/src/Nest/XPack/MachineLearning/Job/Process/DataCounts.cs b/src/Nest/XPack/MachineLearning/Job/Process/DataCounts.cs
index 4cbb7e5ab75..70d0d9d12ac 100644
--- a/src/Nest/XPack/MachineLearning/Job/Process/DataCounts.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Process/DataCounts.cs
@@ -7,28 +7,25 @@ namespace Nest
 	public class DataCounts
 	{
 		/// <summary>
-		///  A unique identifier for the job.
+		/// The number of bucket results produced by the job.
 		/// </summary>
-		[JsonProperty("job_id")]
-		public string JobId { get; internal set; }
+		[JsonProperty("bucket_count")]
+		public long BucketCount { get; internal set; }
 
 		/// <summary>
-		/// The number of records that have been processed by the job. This value includes records with missing fields,
-		/// since they are nonetheless analyzed.
-		///
-		/// If you use datafeeds and have aggregations in your search query, the <see cref="ProcessedRecordCount"/>
-		/// will be the number of aggregated records processed, not the number of Elasticsearch documents.
+		/// The timestamp of the earliest chronologically ordered record.
 		/// </summary>
-		[JsonProperty("processed_record_count")]
-		public long ProcessedRecordCount { get; internal set; }
+		[JsonProperty("earliest_record_timestamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset? EarliestRecordTimestamp { get; internal set; }
 
 		/// <summary>
-		/// The total number of fields in all the records that have been processed by the job.
-		/// Only fields that are specified in the detector configuration contribute to this count.
-		/// The time stamp is not included in this count.
+		/// The number of buckets which did not contain any data. If your data contains many empty buckets,
+		/// consider increasing your bucket_span or using functions that are tolerant to gaps in
+		/// data such as mean, non_null_sum or non_zero_count.
 		/// </summary>
-		[JsonProperty("processed_field_count")]
-		public long ProcessedFieldCount { get; internal set; }
+		[JsonProperty("empty_bucket_count")]
+		public long EmptyBucketCount { get; internal set; }
 
 		/// <summary>
 		/// The number of raw bytes read by the job.
@@ -44,50 +41,36 @@ public class DataCounts
 		public long InputFieldCount { get; internal set; }
 
 		/// <summary>
-		/// The number of records with either a missing date field or a date that could not be parsed.
-		/// </summary>
-		[JsonProperty("invalid_date_count")]
-		public long InvalidDateCount { get; internal set; }
-
-		/// <summary>
-		/// The number of records that are missing a field that the job is configured to analyze.
-		/// Records with missing fields are still processed because it is possible that not all fields are missing.
-		/// The value of <see cref="ProcessedRecordCount"/> includes this count.
+		/// The number of data records read by the job.
 		/// </summary>
-		[JsonProperty("missing_field_count")]
-		public long MissingFieldCount { get; internal set; }
+		[JsonProperty("input_record_count")]
+		public long InputRecordCount { get; internal set; }
 
 		/// <summary>
-		/// The number of records that are out of time sequence and outside of the latency window.
-		/// These out of order records are discarded, since jobs require time series data to be in
-		/// ascending chronological order.
+		/// The number of records with either a missing date field or a date that could not be parsed.
 		/// </summary>
-		[JsonProperty("out_of_order_timestamp_count")]
-		public long OutOfOrderTimestampCount { get; internal set; }
+		[JsonProperty("invalid_date_count")]
+		public long InvalidDateCount { get; internal set; }
 
 		/// <summary>
-		/// The number of buckets which did not contain any data. If your data contains many empty buckets,
-		/// consider increasing your bucket_span or using functions that are tolerant to gaps in
-		/// data such as mean, non_null_sum or non_zero_count.
+		///  A unique identifier for the job.
 		/// </summary>
-		[JsonProperty("empty_bucket_count")]
-		public long EmptyBucketCount { get; internal set; }
-
-		[JsonProperty("sparse_bucket_count")]
-		public long SparseBucketCount { get; internal set; }
+		[JsonProperty("job_id")]
+		public string JobId { get; internal set; }
 
 		/// <summary>
-		/// The number of bucket results produced by the job.
+		/// The timestamp at which data was last analyzed, according to server time.
 		/// </summary>
-		[JsonProperty("bucket_count")]
-		public long BucketCount { get; internal set; }
+		[JsonProperty("last_data_time")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset LastDataTime { get; internal set; }
 
 		/// <summary>
-		/// The timestamp of the earliest chronologically ordered record.
+		/// The timestamp of the last bucket that did not contain any data.
 		/// </summary>
-		[JsonProperty("earliest_record_timestamp")]
+		[JsonProperty("latest_empty_bucket_timestamp")]
 		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset? EarliestRecordTimestamp { get; internal set; }
+		public DateTimeOffset LatestEmptyBucketTimestamp { get; internal set; }
 
 		/// <summary>
 		/// The timestamp of the last processed record.
@@ -97,30 +80,46 @@ public class DataCounts
 		public DateTimeOffset LatestRecordTimestamp { get; internal set; }
 
 		/// <summary>
-		/// The timestamp of the last bucket that did not contain any data.
+		/// The timestamp of the last bucket that was considered sparse.
 		/// </summary>
-		[JsonProperty("latest_empty_bucket_timestamp")]
+		[JsonProperty("latest_sparse_bucket_timestamp")]
 		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset LatestEmptyBucketTimestamp { get; internal set; }
+		public DateTimeOffset LatestSparseBucketTimestamp { get; internal set; }
 
 		/// <summary>
-		/// The timestamp at which data was last analyzed, according to server time.
+		/// The number of records that are missing a field that the job is configured to analyze.
+		/// Records with missing fields are still processed because it is possible that not all fields are missing.
+		/// The value of <see cref="ProcessedRecordCount" /> includes this count.
 		/// </summary>
-		[JsonProperty("last_data_time")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset LastDataTime { get; internal set; }
+		[JsonProperty("missing_field_count")]
+		public long MissingFieldCount { get; internal set; }
 
 		/// <summary>
-		/// The timestamp of the last bucket that was considered sparse.
+		/// The number of records that are out of time sequence and outside of the latency window.
+		/// These out of order records are discarded, since jobs require time series data to be in
+		/// ascending chronological order.
 		/// </summary>
-		[JsonProperty("latest_sparse_bucket_timestamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset LatestSparseBucketTimestamp { get; internal set; }
+		[JsonProperty("out_of_order_timestamp_count")]
+		public long OutOfOrderTimestampCount { get; internal set; }
 
 		/// <summary>
-		/// The number of data records read by the job.
+		/// The total number of fields in all the records that have been processed by the job.
+		/// Only fields that are specified in the detector configuration contribute to this count.
+		/// The time stamp is not included in this count.
 		/// </summary>
-		[JsonProperty("input_record_count")]
-		public long InputRecordCount { get; internal set; }
+		[JsonProperty("processed_field_count")]
+		public long ProcessedFieldCount { get; internal set; }
+
+		/// <summary>
+		///  The number of records that have been processed by the job. This value includes records with missing fields,
+		///  since they are nonetheless analyzed.
+		///  If you use datafeeds and have aggregations in your search query, the <see cref="ProcessedRecordCount" />
+		/// will be the number of aggregated records processed, not the number of Elasticsearch documents.
+		/// </summary>
+		[JsonProperty("processed_record_count")]
+		public long ProcessedRecordCount { get; internal set; }
+
+		[JsonProperty("sparse_bucket_count")]
+		public long SparseBucketCount { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Process/ModelSizeStats.cs b/src/Nest/XPack/MachineLearning/Job/Process/ModelSizeStats.cs
index 1c0b377fd46..04ab858c325 100644
--- a/src/Nest/XPack/MachineLearning/Job/Process/ModelSizeStats.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Process/ModelSizeStats.cs
@@ -9,6 +9,13 @@ namespace Nest
 	[JsonObject]
 	public class ModelSizeStats
 	{
+		/// <summary>
+		/// The number of buckets for which new entities in incoming data were not processed due to
+		/// insufficient model memory.
+		/// </summary>
+		[JsonProperty("bucket_allocation_failures_count")]
+		public long BucketAllocationFailuresCount { get; internal set; }
+
 		/// <summary>
 		///  A unique identifier for the job.
 		/// </summary>
@@ -16,10 +23,17 @@ public class ModelSizeStats
 		public string JobId { get; internal set; }
 
 		/// <summary>
-		/// For internal use. The type of result.
+		/// The timestamp according to server time.
 		/// </summary>
-		[JsonProperty("result_type")]
-		public string ResultType { get; internal set; }
+		[JsonProperty("log_time")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset LogTime { get; internal set; }
+
+		/// <summary>
+		/// The status of the mathematical models.
+		/// </summary>
+		[JsonProperty("memory_status")]
+		public MemoryStatus MemoryStatus { get; internal set; }
 
 		/// <summary>
 		/// The number of bytes of memory used by the models. This is the maximum value since the last time the
@@ -28,6 +42,19 @@ public class ModelSizeStats
 		[JsonProperty("model_bytes")]
 		public long ModelBytes { get; internal set; }
 
+		/// <summary>
+		/// For internal use. The type of result.
+		/// </summary>
+		[JsonProperty("result_type")]
+		public string ResultType { get; internal set; }
+
+		/// <summary>
+		/// The timestamp according to the timestamp of the data.
+		/// </summary>
+		[JsonProperty("timestamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset? Timestamp { get; internal set; }
+
 		/// <summary>
 		/// The number of by field values that were analyzed by the models.
 		/// </summary>
@@ -45,32 +72,5 @@ public class ModelSizeStats
 		/// </summary>
 		[JsonProperty("total_partition_field_count")]
 		public long TotalPartitionFieldCount { get; internal set; }
-
-		/// <summary>
-		/// The number of buckets for which new entities in incoming data were not processed due to
-		/// insufficient model memory.
-		/// </summary>
-		[JsonProperty("bucket_allocation_failures_count")]
-		public long BucketAllocationFailuresCount { get; internal set; }
-
-		/// <summary>
-		/// The status of the mathematical models.
-		/// </summary>
-		[JsonProperty("memory_status")]
-		public MemoryStatus MemoryStatus { get; internal set; }
-
-		/// <summary>
-		/// The timestamp according to server time.
-		/// </summary>
-		[JsonProperty("log_time")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset LogTime { get; internal set; }
-
-		/// <summary>
-		/// The timestamp according to the timestamp of the data.
-		/// </summary>
-		[JsonProperty("timestamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset? Timestamp { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Process/ModelSnapshot.cs b/src/Nest/XPack/MachineLearning/Job/Process/ModelSnapshot.cs
index c97e299b8a9..5e11d43eca1 100644
--- a/src/Nest/XPack/MachineLearning/Job/Process/ModelSnapshot.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Process/ModelSnapshot.cs
@@ -6,6 +6,12 @@ namespace Nest
 	[JsonObject]
 	public class ModelSnapshot
 	{
+		/// <summary>
+		/// An optional description of the job.
+		/// </summary>
+		[JsonProperty("description")]
+		public string Description { get; internal set; }
+
 		/// <summary>
 		/// The unique identifier for the job
 		/// </summary>
@@ -13,56 +19,50 @@ public class ModelSnapshot
 		public string JobId { get; internal set; }
 
 		/// <summary>
-		/// The creation timestamp for the snapshot.
+		/// The timestamp of the latest processed record.
 		/// </summary>
-		[JsonProperty("timestamp")]
+		[JsonProperty("latest_record_time_stamp")]
 		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset Timestamp { get; internal set; }
+		public DateTimeOffset? LatestRecordTimeStamp { get; internal set; }
 
 		/// <summary>
-		/// An optional description of the job.
+		/// The timestamp of the latest bucket result.
 		/// </summary>
-		[JsonProperty("description")]
-		public string Description { get; internal set; }
+		[JsonProperty("latest_result_time_stamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset? LatestResultTimeStamp { get; internal set; }
 
 		/// <summary>
-		/// A numerical character string that uniquely identifies the model snapshot.
+		/// Summary information describing the model.
 		/// </summary>
-		[JsonProperty("snapshot_id")]
-		public string SnapshotId { get; internal set; }
+		[JsonProperty("model_size_stats")]
+		public ModelSizeStats ModelSizeStats { get; internal set; }
 
 		/// <summary>
-		/// For internal use only.
+		/// If true, this snapshot will not be deleted during automatic cleanup of snapshots older than
+		/// the model snapshot retention days. However, this snapshot will be deleted when the
+		/// job is deleted. The default value is false.
 		/// </summary>
-		[JsonProperty("snapshot_doc_count")]
-		public long SnapshotDocCount { get; internal set; }
+		[JsonProperty("retain")]
+		public bool Retain { get; internal set; }
 
 		/// <summary>
-		/// Summary information describing the model.
+		/// For internal use only.
 		/// </summary>
-		[JsonProperty("model_size_stats")]
-		public ModelSizeStats ModelSizeStats { get; internal set; }
+		[JsonProperty("snapshot_doc_count")]
+		public long SnapshotDocCount { get; internal set; }
 
 		/// <summary>
-		/// The timestamp of the latest processed record.
+		/// A numerical character string that uniquely identifies the model snapshot.
 		/// </summary>
-		[JsonProperty("latest_record_time_stamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset? LatestRecordTimeStamp{ get; internal set; }
+		[JsonProperty("snapshot_id")]
+		public string SnapshotId { get; internal set; }
 
 		/// <summary>
-		/// The timestamp of the latest bucket result.
+		/// The creation timestamp for the snapshot.
 		/// </summary>
-		[JsonProperty("latest_result_time_stamp")]
+		[JsonProperty("timestamp")]
 		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset? LatestResultTimeStamp{ get; internal set; }
-
-		/// <summary>
-		/// If true, this snapshot will not be deleted during automatic cleanup of snapshots older than
-		/// the model snapshot retention days. However, this snapshot will be deleted when the
-		/// job is deleted. The default value is false.
-		/// </summary>
-		[JsonProperty("retain")]
-		public bool Retain{ get; internal set; }
+		public DateTimeOffset Timestamp { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Results/AnomalyCause.cs b/src/Nest/XPack/MachineLearning/Job/Results/AnomalyCause.cs
index 7b84bdb1227..3d5ea463287 100644
--- a/src/Nest/XPack/MachineLearning/Job/Results/AnomalyCause.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Results/AnomalyCause.cs
@@ -9,46 +9,46 @@ namespace Nest
 	[JsonObject]
 	public class AnomalyCause
 	{
-		[JsonProperty("probability")]
-		public double Probability { get; internal set; }
-
-		[JsonProperty("over_field_name")]
-		public string OverFieldName  { get; internal set; }
-
-		[JsonProperty("over_field_value")]
-		public string OverFieldValue  { get; internal set; }
+		[JsonProperty("actual")]
+		public IReadOnlyCollection<double> Actual { get; internal set; } = EmptyReadOnly<double>.Collection;
 
 		[JsonProperty("by_field_name")]
-		public string ByFieldName  { get; internal set; }
+		public string ByFieldName { get; internal set; }
 
 		[JsonProperty("by_field_value")]
-		public string ByFieldValue  { get; internal set; }
+		public string ByFieldValue { get; internal set; }
 
 		[JsonProperty("correlated_by_field_value")]
-		public string CorrelatedByFieldValue  { get; internal set; }
+		public string CorrelatedByFieldValue { get; internal set; }
 
-		[JsonProperty("partition_field_name")]
-		public string PartitionFieldName  { get; internal set; }
-
-		[JsonProperty("partition_field_value")]
-		public string PartitionFieldValue  { get; internal set; }
+		[JsonProperty("field_name")]
+		public string FieldName { get; internal set; }
 
 		[JsonProperty("function")]
-		public string Function  { get; internal set; }
+		public string Function { get; internal set; }
 
 		[JsonProperty("function_description")]
 		public string FunctionDescription { get; internal set; }
 
-		[JsonProperty("typical")]
-		public IReadOnlyCollection<double> Typical { get; internal set; } = EmptyReadOnly<double>.Collection;
-
-		[JsonProperty("actual")]
-		public IReadOnlyCollection<double> Actual { get; internal set; } = EmptyReadOnly<double>.Collection;
-
 		[JsonProperty("influencers")]
 		public IReadOnlyCollection<Influence> Influencers { get; internal set; } = EmptyReadOnly<Influence>.Collection;
 
-		[JsonProperty("field_name")]
-		public string FieldName  { get; internal set; }
+		[JsonProperty("over_field_name")]
+		public string OverFieldName { get; internal set; }
+
+		[JsonProperty("over_field_value")]
+		public string OverFieldValue { get; internal set; }
+
+		[JsonProperty("partition_field_name")]
+		public string PartitionFieldName { get; internal set; }
+
+		[JsonProperty("partition_field_value")]
+		public string PartitionFieldValue { get; internal set; }
+
+		[JsonProperty("probability")]
+		public double Probability { get; internal set; }
+
+		[JsonProperty("typical")]
+		public IReadOnlyCollection<double> Typical { get; internal set; } = EmptyReadOnly<double>.Collection;
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Results/AnomalyRecord.cs b/src/Nest/XPack/MachineLearning/Job/Results/AnomalyRecord.cs
index 8572f2a40ee..93bb0aea92e 100644
--- a/src/Nest/XPack/MachineLearning/Job/Results/AnomalyRecord.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Results/AnomalyRecord.cs
@@ -12,46 +12,40 @@ namespace Nest
 	public class AnomalyRecord
 	{
 		/// <summary>
-		/// The unique identifier for the job that these results belong to.
-		/// </summary>
-		[JsonProperty("job_id")]
-		public string JobId { get; internal set; }
-
-		/// <summary>
-		/// Internal. This is always set to record.
+		/// The actual value for the bucket.
 		/// </summary>
-		[JsonProperty("result_type")]
-		public string ResultType { get; internal set; }
+		[JsonProperty("actual")]
+		public IReadOnlyCollection<double> Actual { get; internal set; } = EmptyReadOnly<double>.Collection;
 
 		/// <summary>
-		/// The probability of the individual anomaly occurring, in the range 0 to 1.
-		/// This value can be held to a high precision of over 300 decimal places, so the <see cref="RecordScore"/>
-		/// is provided as a human-readable and friendly interpretation of this.
+		/// The length of the bucket. This value matches the <see cref="AnalysisConfig.BucketSpan" /> that is specified in the job.
 		/// </summary>
-		/// <example>0.0000772031</example>
-		[JsonProperty("probability")]
-		public double Probability { get; internal set; }
+		[JsonProperty("bucket_span")]
+		public Time BucketSpan { get; internal set; }
 
 		/// <summary>
-		/// A normalized score between 0-100, which is based on the probability of the anomalousness of this record.
-		/// Unlike <see cref="InitialRecordScore"/>, this value will be updated by a re-normalization process
-		/// as new data is analyzed.
+		/// The name of the analyzed field. This value is present only if it is specified in the detector.
 		/// </summary>
-		[JsonProperty("record_score")]
-		public double RecordScore { get; internal set; }
+		[JsonProperty("by_field_name")]
+		public string ByFieldName { get; internal set; }
 
 		/// <summary>
-		/// A normalized score between 0-100, which is based on the probability of the anomalousness of this record.
-		/// This is the initial value that was calculated at the time the bucket was processed.
+		/// The value of <see cref="ByFieldName" />. This value is present only if it is specified in the detector.
 		/// </summary>
-		[JsonProperty("initial_record_score")]
-		public double InitialRecordScore { get; internal set; }
+		[JsonProperty("by_field_value")]
+		public string ByFieldValue { get; internal set; }
 
 		/// <summary>
-		/// The length of the bucket. This value matches the <see cref="AnalysisConfig.BucketSpan"/> that is specified in the job.
+		/// For population analysis, an over field must be specified in the detector.
+		/// This property contains an array of anomaly records that are the causes for the anomaly that has been
+		/// identified for the over field. If no over fields exist, this field is not present.
+		/// Contains the most anomalous records for the <see cref="OverFieldName" />. For scalability reasons,
+		/// a maximum of the 10 most significant causes of the anomaly are returned.
+		/// As part of the core analytical modeling, these low-level anomaly records are aggregated for their
+		/// parent over field record.
 		/// </summary>
-		[JsonProperty("bucket_span")]
-		public Time BucketSpan { get; internal set; }
+		[JsonProperty("causes")]
+		public IReadOnlyCollection<AnomalyCause> Causes { get; internal set; } = EmptyReadOnly<AnomalyCause>.Collection;
 
 		/// <summary>
 		/// A unique identifier for the detector.
@@ -60,18 +54,11 @@ public class AnomalyRecord
 		public int DetectorIndex { get; internal set; }
 
 		/// <summary>
-		/// If true, this is an interim result. In other words, the anomaly record is calculated
-		/// based on partial input data.
-		/// </summary>
-		[JsonProperty("is_interim")]
-		public bool IsInterim { get; internal set; }
-
-		/// <summary>
-		/// The start time of the bucket for which these results were calculated.
+		/// Certain functions require a field to operate on, for example, sum().
+		/// For those functions, this value is the name of the field to be analyzed.
 		/// </summary>
-		[JsonProperty("timestamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset Timestamp { get; internal set; }
+		[JsonProperty("field_name")]
+		public string FieldName { get; internal set; }
 
 		/// <summary>
 		/// The function in which the anomaly occurs, as specified in the detector configuration.
@@ -86,59 +73,31 @@ public class AnomalyRecord
 		public string FunctionDescription { get; internal set; }
 
 		/// <summary>
-		/// The typical value for the bucket, according to analytical modeling.
-		/// </summary>
-		/// <remarks>
-		/// Additional record properties are added, depending on the fields being analyzed.
-		/// For example, if it’s analyzing hostname as a by field, then a field hostname is added to the
-		/// result document. This information enables you to filter the anomaly results more easily.
-		/// </remarks>
-		[JsonProperty("typical")]
-		public IReadOnlyCollection<double> Typical { get; internal set; } = EmptyReadOnly<double>.Collection;
-
-		/// <summary>
-		/// The actual value for the bucket.
-		/// </summary>
-		[JsonProperty("actual")]
-		public IReadOnlyCollection<double> Actual { get; internal set; } = EmptyReadOnly<double>.Collection;
-
-		/// <summary>
-		/// Certain functions require a field to operate on, for example, sum().
-		/// For those functions, this value is the name of the field to be analyzed.
-		/// </summary>
-		[JsonProperty("field_name")]
-		public string FieldName { get; internal set; }
-
-		/// <summary>
-		/// The name of the analyzed field. This value is present only if it is specified in the detector.
+		/// If influencers was specified in the detector configuration, then this
+		/// contains influencers that contributed to or were to blame for an anomaly.
 		/// </summary>
-		[JsonProperty("by_field_name")]
-		public string ByFieldName { get; internal set; }
+		[JsonProperty("influencers")]
+		public IReadOnlyCollection<Influence> Influencers { get; internal set; } = EmptyReadOnly<Influence>.Collection;
 
 		/// <summary>
-		/// The value of <see cref="ByFieldName"/>. This value is present only if it is specified in the detector.
+		/// A normalized score between 0-100, which is based on the probability of the anomalousness of this record.
+		/// This is the initial value that was calculated at the time the bucket was processed.
 		/// </summary>
-		[JsonProperty("by_field_value")]
-		public string ByFieldValue { get; internal set; }
+		[JsonProperty("initial_record_score")]
+		public double InitialRecordScore { get; internal set; }
 
 		/// <summary>
-		/// For population analysis, an over field must be specified in the detector.
-		/// This property contains an array of anomaly records that are the causes for the anomaly that has been
-		/// identified for the over field. If no over fields exist, this field is not present.
-		/// Contains the most anomalous records for the <see cref="OverFieldName"/>. For scalability reasons,
-		/// a maximum of the 10 most significant causes of the anomaly are returned.
-		/// As part of the core analytical modeling, these low-level anomaly records are aggregated for their
-		/// parent over field record.
+		/// If true, this is an interim result. In other words, the anomaly record is calculated
+		/// based on partial input data.
 		/// </summary>
-		[JsonProperty("causes")]
-		public IReadOnlyCollection<AnomalyCause> Causes { get; internal set; } = EmptyReadOnly<AnomalyCause>.Collection;
+		[JsonProperty("is_interim")]
+		public bool IsInterim { get; internal set; }
 
 		/// <summary>
-		/// If influencers was specified in the detector configuration, then this
-		/// contains influencers that contributed to or were to blame for an anomaly.
+		/// The unique identifier for the job that these results belong to.
 		/// </summary>
-		[JsonProperty("influencers")]
-		public IReadOnlyCollection<Influence> Influencers { get; internal set; } = EmptyReadOnly<Influence>.Collection;
+		[JsonProperty("job_id")]
+		public string JobId { get; internal set; }
 
 		/// <summary>
 		/// The name of the over field that was used in the analysis. This value is present only if it was
@@ -148,7 +107,7 @@ public class AnomalyRecord
 		public string OverFieldName { get; internal set; }
 
 		/// <summary>
-		/// The value of <see cref="OverFieldName"/>. This value is present only if it is specified in the detector.
+		/// The value of <see cref="OverFieldName" />. This value is present only if it is specified in the detector.
 		/// </summary>
 		[JsonProperty("over_field_value")]
 		public string OverFieldValue { get; internal set; }
@@ -161,9 +120,50 @@ public class AnomalyRecord
 		public string PartitionFieldName { get; internal set; }
 
 		/// <summary>
-		/// The value of <see cref="PartitionFieldName"/>. This value is present only if it is specified in the detector.
+		/// The value of <see cref="PartitionFieldName" />. This value is present only if it is specified in the detector.
 		/// </summary>
 		[JsonProperty("partition_field_value")]
 		public string PartitionFieldValue { get; internal set; }
+
+		/// <summary>
+		/// The probability of the individual anomaly occurring, in the range 0 to 1.
+		/// This value can be held to a high precision of over 300 decimal places, so the <see cref="RecordScore" />
+		/// is provided as a human-readable and friendly interpretation of this.
+		/// </summary>
+		/// <example>0.0000772031</example>
+		[JsonProperty("probability")]
+		public double Probability { get; internal set; }
+
+		/// <summary>
+		/// A normalized score between 0-100, which is based on the probability of the anomalousness of this record.
+		/// Unlike <see cref="InitialRecordScore" />, this value will be updated by a re-normalization process
+		/// as new data is analyzed.
+		/// </summary>
+		[JsonProperty("record_score")]
+		public double RecordScore { get; internal set; }
+
+		/// <summary>
+		/// Internal. This is always set to record.
+		/// </summary>
+		[JsonProperty("result_type")]
+		public string ResultType { get; internal set; }
+
+		/// <summary>
+		/// The start time of the bucket for which these results were calculated.
+		/// </summary>
+		[JsonProperty("timestamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset Timestamp { get; internal set; }
+
+		/// <summary>
+		/// The typical value for the bucket, according to analytical modeling.
+		/// </summary>
+		/// <remarks>
+		/// Additional record properties are added, depending on the fields being analyzed.
+		/// For example, if it’s analyzing hostname as a by field, then a field hostname is added to the
+		/// result document. This information enables you to filter the anomaly results more easily.
+		/// </remarks>
+		[JsonProperty("typical")]
+		public IReadOnlyCollection<double> Typical { get; internal set; } = EmptyReadOnly<double>.Collection;
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Results/Bucket.cs b/src/Nest/XPack/MachineLearning/Job/Results/Bucket.cs
index cb92981d03b..4e8f98e684f 100644
--- a/src/Nest/XPack/MachineLearning/Job/Results/Bucket.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Results/Bucket.cs
@@ -7,23 +7,17 @@ namespace Nest
 	public class Bucket
 	{
 		/// <summary>
-		/// The unique identifier for the job that these results belong to.
-		/// </summary>
-		[JsonProperty("job_id")]
-		public string JobId { get; internal set; }
-
-		/// <summary>
-		/// The start time of the bucket. This timestamp uniquely identifies the bucket.
+		/// The maximum anomaly score, between 0-100, for any of the bucket influencers. This is an overall, rate-limited score for the job. All the
+		/// anomaly records in the bucket contribute to this score. This value might be updated as new data is analyzed.
 		/// </summary>
-		[JsonProperty("timestamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset Timestamp { get; internal set; }
+		[JsonProperty("anomaly_score")]
+		public double AnomalyScore { get; internal set; }
 
 		/// <summary>
-		/// The maximum anomaly score, between 0-100, for any of the bucket influencers. This is an overall, rate-limited score for the job. All the anomaly records in the bucket contribute to this score. This value might be updated as new data is analyzed.
+		/// An array of bucket influencer objects.
 		/// </summary>
-		[JsonProperty("anomaly_score")]
-		public double AnomalyScore { get; internal set; }
+		[JsonProperty("bucket_influencers")]
+		public IReadOnlyCollection<BucketInfluencer> BucketInfluencers { get; internal set; } = EmptyReadOnly<BucketInfluencer>.Collection;
 
 		/// <summary>
 		/// The length of the bucket. This value matches the bucket_span that is specified in the job.
@@ -31,12 +25,6 @@ public class Bucket
 		[JsonProperty("bucket_span")]
 		public Time BucketSpan { get; internal set; }
 
-		/// <summary>
-		/// The maximum anomaly_score for any of the bucket influencers. This is the initial value that was calculated at the time the bucket was processed.
-		/// </summary>
-		[JsonProperty("initial_anomaly_score")]
-		public double InitialAnomalyScore { get; internal set; }
-
 		/// <summary>
 		/// The number of input data records processed in this bucket.
 		/// </summary>
@@ -44,22 +32,23 @@ public class Bucket
 		public long EventCount { get; internal set; }
 
 		/// <summary>
-		/// If true, this is an interim result. In other words, the bucket results are calculated based on partial input data.
+		/// The maximum anomaly_score for any of the bucket influencers. This is the initial value that was calculated at the time the bucket was
+		/// processed.
 		/// </summary>
-		[JsonProperty("is_interim")]
-		public bool IsInterim { get; internal set; }
+		[JsonProperty("initial_anomaly_score")]
+		public double InitialAnomalyScore { get; internal set; }
 
 		/// <summary>
-		/// An array of bucket influencer objects.
+		/// If true, this is an interim result. In other words, the bucket results are calculated based on partial input data.
 		/// </summary>
-		[JsonProperty("bucket_influencers")]
-		public IReadOnlyCollection<BucketInfluencer> BucketInfluencers { get; internal set; } = EmptyReadOnly<BucketInfluencer>.Collection;
+		[JsonProperty("is_interim")]
+		public bool IsInterim { get; internal set; }
 
 		/// <summary>
-		/// The amount of time, in milliseconds, that it took to analyze the bucket contents and calculate results.
+		/// The unique identifier for the job that these results belong to.
 		/// </summary>
-		[JsonProperty("processing_time_ms")]
-		public double ProcessingTimeMilliseconds { get; internal set; }
+		[JsonProperty("job_id")]
+		public string JobId { get; internal set; }
 
 		/// <summary>
 		/// An array of partition score objects.
@@ -67,10 +56,23 @@ public class Bucket
 		[JsonProperty("partition_scores")]
 		public IReadOnlyCollection<PartitionScore> PartitionScores { get; internal set; } = EmptyReadOnly<PartitionScore>.Collection;
 
+		/// <summary>
+		/// The amount of time, in milliseconds, that it took to analyze the bucket contents and calculate results.
+		/// </summary>
+		[JsonProperty("processing_time_ms")]
+		public double ProcessingTimeMilliseconds { get; internal set; }
+
 		/// <summary>
 		/// Internal. This value is always set to bucket.
 		/// </summary>
 		[JsonProperty("result_type")]
 		public string ResultType { get; internal set; }
+
+		/// <summary>
+		/// The start time of the bucket. This timestamp uniquely identifies the bucket.
+		/// </summary>
+		[JsonProperty("timestamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset Timestamp { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Results/BucketInfluencer.cs b/src/Nest/XPack/MachineLearning/Job/Results/BucketInfluencer.cs
index 7c21c032e1f..2b6b4586115 100644
--- a/src/Nest/XPack/MachineLearning/Job/Results/BucketInfluencer.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Results/BucketInfluencer.cs
@@ -6,17 +6,11 @@ namespace Nest
 	[JsonObject]
 	public class BucketInfluencer
 	{
-		// <summary>
-		/// The unique identifier for the job that these results belong to.
-		/// </summary>
-		[JsonProperty("job_id")]
-		public string JobId { get; internal set; }
-
 		/// <summary>
-		/// Internal. This value is always set to influencer.
+		/// The length of the bucket. This value matches the bucket_span that is specified in the job.
 		/// </summary>
-		[JsonProperty("result_type")]
-		public string ResultType { get; internal set; }
+		[JsonProperty("bucket_span")]
+		public long BucketSpan { get; internal set; }
 
 		/// <summary>
 		/// The field name of the influencer.
@@ -30,6 +24,13 @@ public class BucketInfluencer
 		[JsonProperty("influencer_field_value")]
 		public string InfluencerFieldValue { get; internal set; }
 
+		/// <summary>
+		/// A normalized score between 0-100, which is based on the probability of the influencer in this bucket aggregated across detectors. Updated
+		/// by a re-normalization process as new data is analyzed.
+		/// </summary>
+		[JsonProperty("influencer_score")]
+		public double InfluencerScore { get; internal set; }
+
 		/// <summary>
 		/// A normalized score between 0-100, which is based on the probability of the influencer in this bucket aggregated across detectors.
 		/// </summary>
@@ -37,28 +38,29 @@ public class BucketInfluencer
 		public double InitialInfluencerScore { get; internal set; }
 
 		/// <summary>
-		/// A normalized score between 0-100, which is based on the probability of the influencer in this bucket aggregated across detectors. Updated by a re-normalization process as new data is analyzed.
+		/// If true, this is an interim result. In other words, the influencer results are calculated based on partial input data.
 		/// </summary>
-		[JsonProperty("influencer_score")]
-		public double InfluencerScore { get; internal set; }
+		[JsonProperty("is_interim")]
+		public bool IsInterim { get; internal set; }
 
-		/// <summary>
-		/// The probability that the influencer has this behavior, in the range 0 to 1. This value can be held to a high precision of over 300 decimal places.
+		// <summary>
+		/// The unique identifier for the job that these results belong to.
 		/// </summary>
-		[JsonProperty("probability")]
-		public double Probability { get; internal set; }
+		[JsonProperty("job_id")]
+		public string JobId { get; internal set; }
 
 		/// <summary>
-		/// The length of the bucket. This value matches the bucket_span that is specified in the job.
+		/// The probability that the influencer has this behavior, in the range 0 to 1. This value can be held to a high precision of over 300 decimal
+		/// places.
 		/// </summary>
-		[JsonProperty("bucket_span")]
-		public long BucketSpan { get; internal set; }
+		[JsonProperty("probability")]
+		public double Probability { get; internal set; }
 
 		/// <summary>
-		/// If true, this is an interim result. In other words, the influencer results are calculated based on partial input data.
+		/// Internal. This value is always set to influencer.
 		/// </summary>
-		[JsonProperty("is_interim")]
-		public bool IsInterim { get; internal set; }
+		[JsonProperty("result_type")]
+		public string ResultType { get; internal set; }
 
 		/// <summary>
 		/// The start time of the bucket for which these results were calculated.
diff --git a/src/Nest/XPack/MachineLearning/Job/Results/CategoryDefinition.cs b/src/Nest/XPack/MachineLearning/Job/Results/CategoryDefinition.cs
index 97c531fb58e..e7266b3b58d 100644
--- a/src/Nest/XPack/MachineLearning/Job/Results/CategoryDefinition.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Results/CategoryDefinition.cs
@@ -6,12 +6,6 @@ namespace Nest
 	[JsonObject]
 	public class CategoryDefinition
 	{
-		/// <summary>
-		/// The unique identifier for the job that these results belong to.
-		/// </summary>
-		[JsonProperty("job_id")]
-		public string JobId { get; internal set; }
-
 		/// <summary>
 		/// A unique identifier for the category.
 		/// </summary>
@@ -19,27 +13,34 @@ public class CategoryDefinition
 		public long CategoryId { get; internal set; }
 
 		/// <summary>
-		/// A space separated list of the common tokens that are matched in values of the category.
+		/// A list of examples of actual values that matched the category.
 		/// </summary>
-		[JsonProperty("terms")]
-		public string Terms { get; internal set; }
+		[JsonProperty("examples")]
+		public IReadOnlyCollection<string> Examples { get; internal set; } = EmptyReadOnly<string>.Collection;
 
 		/// <summary>
-		/// A regular expression that is used to search for values that match the category.
+		/// The unique identifier for the job that these results belong to.
 		/// </summary>
-		[JsonProperty("regex")]
-		public string Regex { get; internal set; }
+		[JsonProperty("job_id")]
+		public string JobId { get; internal set; }
 
 		/// <summary>
-		/// The maximum length of the fields that matched the category. The value is increased by 10% to enable matching for similar fields that have not been analyzed.
+		/// The maximum length of the fields that matched the category. The value is increased by 10% to enable matching for similar fields that have
+		/// not been analyzed.
 		/// </summary>
 		[JsonProperty("max_matching_length")]
 		public long MaxMatchingLength { get; internal set; }
 
 		/// <summary>
-		/// A list of examples of actual values that matched the category.
+		/// A regular expression that is used to search for values that match the category.
 		/// </summary>
-		[JsonProperty("examples")]
-		public IReadOnlyCollection<string> Examples { get; internal set; } = EmptyReadOnly<string>.Collection;
+		[JsonProperty("regex")]
+		public string Regex { get; internal set; }
+
+		/// <summary>
+		/// A space separated list of the common tokens that are matched in values of the category.
+		/// </summary>
+		[JsonProperty("terms")]
+		public string Terms { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Results/OverallBucket.cs b/src/Nest/XPack/MachineLearning/Job/Results/OverallBucket.cs
index 2123103cdb3..3b4cfd7e929 100644
--- a/src/Nest/XPack/MachineLearning/Job/Results/OverallBucket.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Results/OverallBucket.cs
@@ -6,13 +6,6 @@ namespace Nest
 {
 	public class OverallBucket
 	{
-		/// <summary>
-		/// The start time of the bucket. This timestamp uniquely identifies the bucket.
-		/// </summary>
-		[JsonProperty("timestamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		public DateTimeOffset Timestamp { get; internal set; }
-
 		/// <summary>
 		/// The length of the bucket. This value matches the bucket_span that is specified in the job.
 		/// </summary>
@@ -20,10 +13,10 @@ public class OverallBucket
 		public long BucketSpan { get; internal set; }
 
 		/// <summary>
-		/// The overall score
+		/// If true, this is an interim result. In other words, the bucket results are calculated based on partial input data.
 		/// </summary>
-		[JsonProperty("overall_score")]
-		public double OverallScore { get; internal set; }
+		[JsonProperty("is_interim")]
+		public bool IsInterim { get; internal set; }
 
 		/// <summary>
 		/// An array of partition score objects.
@@ -33,16 +26,23 @@ public class OverallBucket
 			EmptyReadOnly<OverallBucketJobInfo>.Collection;
 
 		/// <summary>
-		/// If true, this is an interim result. In other words, the bucket results are calculated based on partial input data.
+		/// The overall score
 		/// </summary>
-		[JsonProperty("is_interim")]
-		public bool IsInterim { get; internal set; }
+		[JsonProperty("overall_score")]
+		public double OverallScore { get; internal set; }
 
 		/// <summary>
 		/// Internal. This value is always set to overall_bucket.
 		/// </summary>
 		[JsonProperty("result_type")]
 		public string ResultType { get; internal set; }
+
+		/// <summary>
+		/// The start time of the bucket. This timestamp uniquely identifies the bucket.
+		/// </summary>
+		[JsonProperty("timestamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		public DateTimeOffset Timestamp { get; internal set; }
 	}
 
 	public class OverallBucketJobInfo
diff --git a/src/Nest/XPack/MachineLearning/Job/Results/PartitionScore.cs b/src/Nest/XPack/MachineLearning/Job/Results/PartitionScore.cs
index 3366ee80c8d..b4e84689810 100644
--- a/src/Nest/XPack/MachineLearning/Job/Results/PartitionScore.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Results/PartitionScore.cs
@@ -5,6 +5,13 @@ namespace Nest
 	[JsonObject]
 	public class PartitionScore
 	{
+		/// <summary>
+		/// A normalized score between 0-100, which is based on the probability of the anomalousness of this record. This is the initial value that was
+		/// calculated at the time the bucket was processed.
+		/// </summary>
+		[JsonProperty("initial_record_score")]
+		public double InitialRecordScore { get; internal set; }
+
 		/// <summary>
 		/// The name of the partition field that was used in the analysis. This value is present only if it was specified in the detector.
 		/// </summary>
@@ -18,21 +25,17 @@ public class PartitionScore
 		public string PartitionFieldValue { get; internal set; }
 
 		/// <summary>
-		/// A normalized score between 0-100, which is based on the probability of the anomalousness of this record. This is the initial value that was calculated at the time the bucket was processed.
+		/// The probability of the individual anomaly occurring, in the range 0 to 1. This value can be held to a high precision of over 300 decimal
+		/// places.
 		/// </summary>
-		[JsonProperty("initial_record_score")]
-		public double InitialRecordScore { get; internal set; }
+		[JsonProperty("probability")]
+		public double Probability { get; internal set; }
 
 		/// <summary>
-		/// A normalized score between 0-100, which is based on the probability of the anomalousness of this record. Unlike initial_record_score, this value will be updated by a re-normalization process as new data is analyzed.
+		/// A normalized score between 0-100, which is based on the probability of the anomalousness of this record. Unlike initial_record_score, this
+		/// value will be updated by a re-normalization process as new data is analyzed.
 		/// </summary>
 		[JsonProperty("record_score")]
 		public double RecordScore { get; internal set; }
-
-		/// <summary>
-		/// The probability of the individual anomaly occurring, in the range 0 to 1. This value can be held to a high precision of over 300 decimal places.
-		/// </summary>
-		[JsonProperty("probability")]
-		public double Probability { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/OpenJob/ElasticClient-OpenJob.cs b/src/Nest/XPack/MachineLearning/OpenJob/ElasticClient-OpenJob.cs
index 6f01d9d93d4..2aa1bc8b949 100644
--- a/src/Nest/XPack/MachineLearning/OpenJob/ElasticClient-OpenJob.cs
+++ b/src/Nest/XPack/MachineLearning/OpenJob/ElasticClient-OpenJob.cs
@@ -14,39 +14,43 @@ public partial interface IElasticClient
 		/// </summary>
 		IOpenJobResponse OpenJob(Id jobId, Func<OpenJobDescriptor, IOpenJobRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IOpenJobResponse OpenJob(IOpenJobRequest request);
 
-		/// <inheritdoc/>
-		Task<IOpenJobResponse> OpenJobAsync(Id jobId, Func<OpenJobDescriptor, IOpenJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IOpenJobResponse> OpenJobAsync(Id jobId, Func<OpenJobDescriptor, IOpenJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IOpenJobResponse> OpenJobAsync(IOpenJobRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IOpenJobResponse OpenJob(Id jobId, Func<OpenJobDescriptor, IOpenJobRequest> selector = null) =>
-			this.OpenJob(selector.InvokeOrDefault(new OpenJobDescriptor(jobId)));
+			OpenJob(selector.InvokeOrDefault(new OpenJobDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IOpenJobResponse OpenJob(IOpenJobRequest request) =>
-			this.Dispatcher.Dispatch<IOpenJobRequest, OpenJobRequestParameters, OpenJobResponse>(
+			Dispatcher.Dispatch<IOpenJobRequest, OpenJobRequestParameters, OpenJobResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlOpenJobDispatch<OpenJobResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlOpenJobDispatch<OpenJobResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IOpenJobResponse> OpenJobAsync(Id jobId, Func<OpenJobDescriptor, IOpenJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.OpenJobAsync(selector.InvokeOrDefault(new OpenJobDescriptor(jobId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IOpenJobResponse> OpenJobAsync(Id jobId, Func<OpenJobDescriptor, IOpenJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			OpenJobAsync(selector.InvokeOrDefault(new OpenJobDescriptor(jobId)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IOpenJobResponse> OpenJobAsync(IOpenJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IOpenJobRequest, OpenJobRequestParameters, OpenJobResponse, IOpenJobResponse>(
+			Dispatcher.DispatchAsync<IOpenJobRequest, OpenJobRequestParameters, OpenJobResponse, IOpenJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlOpenJobDispatchAsync<OpenJobResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlOpenJobDispatchAsync<OpenJobResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/PostJobData/ElasticClient-PostJobData.cs b/src/Nest/XPack/MachineLearning/PostJobData/ElasticClient-PostJobData.cs
index 86038568dfe..e2688ea80cd 100644
--- a/src/Nest/XPack/MachineLearning/PostJobData/ElasticClient-PostJobData.cs
+++ b/src/Nest/XPack/MachineLearning/PostJobData/ElasticClient-PostJobData.cs
@@ -12,39 +12,45 @@ public partial interface IElasticClient
 		/// </summary>
 		IPostJobDataResponse PostJobData(Id jobId, Func<PostJobDataDescriptor, IPostJobDataRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPostJobDataResponse PostJobData(IPostJobDataRequest request);
 
-		/// <inheritdoc/>
-		Task<IPostJobDataResponse> PostJobDataAsync(Id jobId, Func<PostJobDataDescriptor, IPostJobDataRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPostJobDataResponse> PostJobDataAsync(Id jobId, Func<PostJobDataDescriptor, IPostJobDataRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPostJobDataResponse> PostJobDataAsync(IPostJobDataRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPostJobDataResponse PostJobData(Id jobId, Func<PostJobDataDescriptor, IPostJobDataRequest> selector) =>
-			this.PostJobData(selector.InvokeOrDefault(new PostJobDataDescriptor(jobId)));
+			PostJobData(selector.InvokeOrDefault(new PostJobDataDescriptor(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPostJobDataResponse PostJobData(IPostJobDataRequest request) =>
-			this.Dispatcher.Dispatch<IPostJobDataRequest, PostJobDataRequestParameters, PostJobDataResponse>(
+			Dispatcher.Dispatch<IPostJobDataRequest, PostJobDataRequestParameters, PostJobDataResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlPostDataDispatch<PostJobDataResponse>
+				LowLevelDispatch.XpackMlPostDataDispatch<PostJobDataResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPostJobDataResponse> PostJobDataAsync(Id jobId, Func<PostJobDataDescriptor, IPostJobDataRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PostJobDataAsync(selector.InvokeOrDefault(new PostJobDataDescriptor(jobId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IPostJobDataResponse> PostJobDataAsync(IPostJobDataRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPostJobDataRequest, PostJobDataRequestParameters, PostJobDataResponse, IPostJobDataResponse>(
+		/// <inheritdoc />
+		public Task<IPostJobDataResponse> PostJobDataAsync(Id jobId, Func<PostJobDataDescriptor, IPostJobDataRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PostJobDataAsync(selector.InvokeOrDefault(new PostJobDataDescriptor(jobId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IPostJobDataResponse> PostJobDataAsync(IPostJobDataRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IPostJobDataRequest, PostJobDataRequestParameters, PostJobDataResponse, IPostJobDataResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlPostDataDispatchAsync<PostJobDataResponse>
+				LowLevelDispatch.XpackMlPostDataDispatchAsync<PostJobDataResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataRequest.cs b/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataRequest.cs
index 8c220c2ef2e..72f73f717c1 100644
--- a/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataRequest.cs
+++ b/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataRequest.cs
@@ -40,10 +40,8 @@ public partial class PostJobDataDescriptor
 		/// <inheritdoc />
 		public PostJobDataDescriptor Data(params object[] data) => Assign(a =>
 		{
-			if(data != null && data.Length == 1 && data[0] is IEnumerable)
-			{
+			if (data != null && data.Length == 1 && data[0] is IEnumerable)
 				a.Data = ((IEnumerable)data[0]).Cast<object>();
-			}
 			else a.Data = data;
 		});
 	}
@@ -54,7 +52,7 @@ internal class PostJobDataConverter : JsonConverter
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
-			var request = (IPostJobDataRequest) value;
+			var request = (IPostJobDataRequest)value;
 			if (request?.Data == null)
 			{
 				writer.WriteNull();
diff --git a/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataResponse.cs b/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataResponse.cs
index 0d63d8c9e18..4b6667257bc 100644
--- a/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataResponse.cs
+++ b/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataResponse.cs
@@ -9,22 +9,23 @@ namespace Nest
 	public interface IPostJobDataResponse : IResponse
 	{
 		/// <summary>
-		/// The unique identifier for the job.
+		/// The count of buckets.
 		/// </summary>
-		[JsonProperty("job_id")]
-		string JobId { get; }
+		[JsonProperty("bucket_count")]
+		long BucketCount { get; }
 
 		/// <summary>
-		/// The count of processed records.
+		/// The earliest record timestamp
 		/// </summary>
-		[JsonProperty("processed_record_count")]
-		long ProcessedRecordCount { get; }
+		[JsonProperty("earliest_record_timestamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		DateTimeOffset? EarliestRecordTimestamp { get; }
 
 		/// <summary>
-		/// The count of processed fields.
+		/// The count of empty buckets.
 		/// </summary>
-		[JsonProperty("processed_field_count")]
-		long ProcessedFieldCount { get; }
+		[JsonProperty("empty_bucket_count")]
+		long EmptyBucketCount { get; }
 
 		/// <summary>
 		/// Total input bytes.
@@ -39,80 +40,79 @@ public interface IPostJobDataResponse : IResponse
 		long InputFieldCount { get; }
 
 		/// <summary>
-		/// The count of invalid dates.
+		/// The count of input records.
 		/// </summary>
-		[JsonProperty("invalid_date_count")]
-		long InvalidDateCount { get; }
+		[JsonProperty("input_record_count")]
+		long InputRecordCount { get; }
 
 		/// <summary>
-		/// The count of missing fields.
+		/// The count of invalid dates.
 		/// </summary>
-		[JsonProperty("missing_field_count")]
-		long MissingFieldCount { get; }
+		[JsonProperty("invalid_date_count")]
+		long InvalidDateCount { get; }
 
 		/// <summary>
-		/// The count of out of order timestamps.
+		/// The unique identifier for the job.
 		/// </summary>
-		[JsonProperty("out_of_order_timestamp_count")]
-		long OutOfOrderTimestampCount { get; }
+		[JsonProperty("job_id")]
+		string JobId { get; }
 
 		/// <summary>
-		/// The count of empty buckets.
+		/// The time of the last data item.
 		/// </summary>
-		[JsonProperty("empty_bucket_count")]
-		long EmptyBucketCount { get; }
+		[JsonProperty("last_data_time")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		DateTimeOffset LastDataTime { get; }
 
 		/// <summary>
-		/// The count of sparse buckets.
+		/// The latest record timestamp
 		/// </summary>
-		[JsonProperty("sparse_bucket_count")]
-		long SparseBucketCount { get; }
+		[JsonProperty("latest_record_timestamp")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		DateTimeOffset? LatestRecordTimestamp { get; }
 
 		/// <summary>
-		/// The count of buckets.
+		/// The count of missing fields.
 		/// </summary>
-		[JsonProperty("bucket_count")]
-		long BucketCount { get; }
+		[JsonProperty("missing_field_count")]
+		long MissingFieldCount { get; }
 
 		/// <summary>
-		/// The time of the last data item.
+		/// The count of out of order timestamps.
 		/// </summary>
-		[JsonProperty("last_data_time")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		DateTimeOffset LastDataTime { get; }
+		[JsonProperty("out_of_order_timestamp_count")]
+		long OutOfOrderTimestampCount { get; }
 
 		/// <summary>
-		/// The count of input records.
+		/// The count of processed fields.
 		/// </summary>
-		[JsonProperty("input_record_count")]
-		long InputRecordCount { get; }
+		[JsonProperty("processed_field_count")]
+		long ProcessedFieldCount { get; }
 
 		/// <summary>
-		/// The earliest record timestamp
+		/// The count of processed records.
 		/// </summary>
-		[JsonProperty("earliest_record_timestamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		DateTimeOffset? EarliestRecordTimestamp { get; }
+		[JsonProperty("processed_record_count")]
+		long ProcessedRecordCount { get; }
 
 		/// <summary>
-		/// The latest record timestamp
+		/// The count of sparse buckets.
 		/// </summary>
-		[JsonProperty("latest_record_timestamp")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		DateTimeOffset? LatestRecordTimestamp { get; }
+		[JsonProperty("sparse_bucket_count")]
+		long SparseBucketCount { get; }
 	}
 
 	/// <inheritdoc cref="IPostJobDataResponse" />
 	public class PostJobDataResponse : ResponseBase, IPostJobDataResponse
 	{
 		/// <inheritdoc />
-		public string JobId { get; internal set; }
+		public long BucketCount { get; internal set; }
 
 		/// <inheritdoc />
-		public long ProcessedRecordCount { get; internal set; }
+		public DateTimeOffset? EarliestRecordTimestamp { get; internal set; }
 
 		/// <inheritdoc />
-		public long ProcessedFieldCount { get; internal set; }
+		public long EmptyBucketCount { get; internal set; }
 
 		/// <inheritdoc />
 		public long InputBytes { get; internal set; }
@@ -121,33 +121,33 @@ public class PostJobDataResponse : ResponseBase, IPostJobDataResponse
 		public long InputFieldCount { get; internal set; }
 
 		/// <inheritdoc />
-		public long InvalidDateCount { get; internal set; }
+		public long InputRecordCount { get; internal set; }
 
 		/// <inheritdoc />
-		public long MissingFieldCount { get; internal set; }
+		public long InvalidDateCount { get; internal set; }
 
 		/// <inheritdoc />
-		public long OutOfOrderTimestampCount { get; internal set; }
+		public string JobId { get; internal set; }
 
 		/// <inheritdoc />
-		public long EmptyBucketCount { get; internal set; }
+		public DateTimeOffset LastDataTime { get; internal set; }
 
 		/// <inheritdoc />
-		public long SparseBucketCount { get; internal set; }
+		public DateTimeOffset? LatestRecordTimestamp { get; internal set; }
 
 		/// <inheritdoc />
-		public long BucketCount { get; internal set; }
+		public long MissingFieldCount { get; internal set; }
 
 		/// <inheritdoc />
-		public DateTimeOffset LastDataTime { get; internal set; }
+		public long OutOfOrderTimestampCount { get; internal set; }
 
 		/// <inheritdoc />
-		public long InputRecordCount { get; internal set; }
+		public long ProcessedFieldCount { get; internal set; }
 
 		/// <inheritdoc />
-		public DateTimeOffset? EarliestRecordTimestamp { get; internal set;}
+		public long ProcessedRecordCount { get; internal set; }
 
 		/// <inheritdoc />
-		public DateTimeOffset? LatestRecordTimestamp { get; internal set; }
+		public long SparseBucketCount { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/PreviewDatafeed/ElasticClient-PreviewDatafeed.cs b/src/Nest/XPack/MachineLearning/PreviewDatafeed/ElasticClient-PreviewDatafeed.cs
index 400d3ef9726..59376d0eb39 100644
--- a/src/Nest/XPack/MachineLearning/PreviewDatafeed/ElasticClient-PreviewDatafeed.cs
+++ b/src/Nest/XPack/MachineLearning/PreviewDatafeed/ElasticClient-PreviewDatafeed.cs
@@ -15,45 +15,55 @@ public partial interface IElasticClient
 		/// </summary>
 		IPreviewDatafeedResponse<T> PreviewDatafeed<T>(Id datafeedId, Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPreviewDatafeedResponse<T> PreviewDatafeed<T>(IPreviewDatafeedRequest request);
 
-		/// <inheritdoc/>
-		Task<IPreviewDatafeedResponse<T>> PreviewDatafeedAsync<T>(Id datafeedId, Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPreviewDatafeedResponse<T>> PreviewDatafeedAsync<T>(Id datafeedId,
+			Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IPreviewDatafeedResponse<T>> PreviewDatafeedAsync<T>(IPreviewDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPreviewDatafeedResponse<T>> PreviewDatafeedAsync<T>(IPreviewDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IPreviewDatafeedResponse<T> PreviewDatafeed<T>(Id datafeedId, Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> selector = null) =>
-			this.PreviewDatafeed<T>(selector.InvokeOrDefault(new PreviewDatafeedDescriptor(datafeedId)));
+		/// <inheritdoc />
+		public IPreviewDatafeedResponse<T>
+			PreviewDatafeed<T>(Id datafeedId, Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> selector = null) =>
+			PreviewDatafeed<T>(selector.InvokeOrDefault(new PreviewDatafeedDescriptor(datafeedId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPreviewDatafeedResponse<T> PreviewDatafeed<T>(IPreviewDatafeedRequest request) =>
-			this.Dispatcher.Dispatch<IPreviewDatafeedRequest, PreviewDatafeedRequestParameters, PreviewDatafeedResponse<T>>(
+			Dispatcher.Dispatch<IPreviewDatafeedRequest, PreviewDatafeedRequestParameters, PreviewDatafeedResponse<T>>(
 				request,
-				this.PreviewDatafeedResponse<T>,
-				(p, d) => this.LowLevelDispatch.XpackMlPreviewDatafeedDispatch<PreviewDatafeedResponse<T>>(p)
+				PreviewDatafeedResponse<T>,
+				(p, d) => LowLevelDispatch.XpackMlPreviewDatafeedDispatch<PreviewDatafeedResponse<T>>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IPreviewDatafeedResponse<T>> PreviewDatafeedAsync<T>(Id datafeedId, Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PreviewDatafeedAsync<T>(selector.InvokeOrDefault(new PreviewDatafeedDescriptor(datafeedId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IPreviewDatafeedResponse<T>> PreviewDatafeedAsync<T>(Id datafeedId,
+			Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PreviewDatafeedAsync<T>(selector.InvokeOrDefault(new PreviewDatafeedDescriptor(datafeedId)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IPreviewDatafeedResponse<T>> PreviewDatafeedAsync<T>(IPreviewDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPreviewDatafeedRequest, PreviewDatafeedRequestParameters, PreviewDatafeedResponse<T>, IPreviewDatafeedResponse<T>>(
-				request,
-				cancellationToken,
-				this.PreviewDatafeedResponse<T>,
-				(p, d, c) => this.LowLevelDispatch.XpackMlPreviewDatafeedDispatchAsync<PreviewDatafeedResponse<T>>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IPreviewDatafeedResponse<T>> PreviewDatafeedAsync<T>(IPreviewDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IPreviewDatafeedRequest, PreviewDatafeedRequestParameters, PreviewDatafeedResponse<T>, IPreviewDatafeedResponse<T>>(
+					request,
+					cancellationToken,
+					PreviewDatafeedResponse<T>,
+					(p, d, c) => LowLevelDispatch.XpackMlPreviewDatafeedDispatchAsync<PreviewDatafeedResponse<T>>(p, c)
+				);
 
 		private PreviewDatafeedResponse<T> PreviewDatafeedResponse<T>(IApiCallDetails response, Stream stream) => response.Success
-			? new PreviewDatafeedResponse<T> { Data = this.ConnectionSettings.RequestResponseSerializer.Deserialize<IReadOnlyCollection<T>>(stream) }
+			? new PreviewDatafeedResponse<T> { Data = ConnectionSettings.RequestResponseSerializer.Deserialize<IReadOnlyCollection<T>>(stream) }
 			: null; //ResponseBuilder can handle null, consolidate null coalescing there.
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/PreviewDatafeed/PreviewDatafeedRequest.cs b/src/Nest/XPack/MachineLearning/PreviewDatafeed/PreviewDatafeedRequest.cs
index 4005152d8e7..b34566b604c 100644
--- a/src/Nest/XPack/MachineLearning/PreviewDatafeed/PreviewDatafeedRequest.cs
+++ b/src/Nest/XPack/MachineLearning/PreviewDatafeed/PreviewDatafeedRequest.cs
@@ -1,11 +1,11 @@
 namespace Nest
 {
-	public partial interface IPreviewDatafeedRequest {}
+	public partial interface IPreviewDatafeedRequest { }
 
 	/// <inheritdoc />
-	public partial class PreviewDatafeedRequest {}
+	public partial class PreviewDatafeedRequest { }
 
 	/// <inheritdoc />
 	[DescriptorFor("XpackMlPreviewDatafeed")]
-	public partial class PreviewDatafeedDescriptor {}
+	public partial class PreviewDatafeedDescriptor { }
 }
diff --git a/src/Nest/XPack/MachineLearning/PutDatafeed/ElasticClient-PutDatafeed.cs b/src/Nest/XPack/MachineLearning/PutDatafeed/ElasticClient-PutDatafeed.cs
index 5d7080e7363..7cad587c4df 100644
--- a/src/Nest/XPack/MachineLearning/PutDatafeed/ElasticClient-PutDatafeed.cs
+++ b/src/Nest/XPack/MachineLearning/PutDatafeed/ElasticClient-PutDatafeed.cs
@@ -13,39 +13,46 @@ public partial interface IElasticClient
 		/// </summary>
 		IPutDatafeedResponse PutDatafeed<T>(Id datafeedId, Func<PutDatafeedDescriptor<T>, IPutDatafeedRequest> selector = null) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutDatafeedResponse PutDatafeed(IPutDatafeedRequest request);
 
-		/// <inheritdoc/>
-		Task<IPutDatafeedResponse> PutDatafeedAsync<T>(Id datafeedId, Func<PutDatafeedDescriptor<T>, IPutDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		/// <inheritdoc />
+		Task<IPutDatafeedResponse> PutDatafeedAsync<T>(Id datafeedId, Func<PutDatafeedDescriptor<T>, IPutDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutDatafeedResponse> PutDatafeedAsync(IPutDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IPutDatafeedResponse PutDatafeed<T>(Id datafeedId, Func<PutDatafeedDescriptor<T>, IPutDatafeedRequest> selector = null) where T : class =>
-			this.PutDatafeed(selector.InvokeOrDefault(new PutDatafeedDescriptor<T>(datafeedId)));
+		/// <inheritdoc />
+		public IPutDatafeedResponse PutDatafeed<T>(Id datafeedId, Func<PutDatafeedDescriptor<T>, IPutDatafeedRequest> selector = null)
+			where T : class =>
+			PutDatafeed(selector.InvokeOrDefault(new PutDatafeedDescriptor<T>(datafeedId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutDatafeedResponse PutDatafeed(IPutDatafeedRequest request) =>
-			this.Dispatcher.Dispatch<IPutDatafeedRequest, PutDatafeedRequestParameters, PutDatafeedResponse>(
+			Dispatcher.Dispatch<IPutDatafeedRequest, PutDatafeedRequestParameters, PutDatafeedResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlPutDatafeedDispatch<PutDatafeedResponse>
+				LowLevelDispatch.XpackMlPutDatafeedDispatch<PutDatafeedResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPutDatafeedResponse> PutDatafeedAsync<T>(Id datafeedId, Func<PutDatafeedDescriptor<T>, IPutDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.PutDatafeedAsync(selector.InvokeOrDefault(new PutDatafeedDescriptor<T>(datafeedId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IPutDatafeedResponse> PutDatafeedAsync(IPutDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutDatafeedRequest, PutDatafeedRequestParameters, PutDatafeedResponse, IPutDatafeedResponse>(
+		/// <inheritdoc />
+		public Task<IPutDatafeedResponse> PutDatafeedAsync<T>(Id datafeedId, Func<PutDatafeedDescriptor<T>, IPutDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			PutDatafeedAsync(selector.InvokeOrDefault(new PutDatafeedDescriptor<T>(datafeedId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IPutDatafeedResponse> PutDatafeedAsync(IPutDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IPutDatafeedRequest, PutDatafeedRequestParameters, PutDatafeedResponse, IPutDatafeedResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlPutDatafeedDispatchAsync<PutDatafeedResponse>
+				LowLevelDispatch.XpackMlPutDatafeedDispatchAsync<PutDatafeedResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/PutDatafeed/PutDatafeedRequest.cs b/src/Nest/XPack/MachineLearning/PutDatafeed/PutDatafeedRequest.cs
index d1aefa108d1..272ae1316f1 100644
--- a/src/Nest/XPack/MachineLearning/PutDatafeed/PutDatafeedRequest.cs
+++ b/src/Nest/XPack/MachineLearning/PutDatafeed/PutDatafeedRequest.cs
@@ -28,8 +28,8 @@ public partial interface IPutDatafeedRequest
 		[JsonProperty("frequency")]
 		Time Frequency { get; set; }
 
-		///<summary>
-		/// A list of index names to search within, wildcards are supported.
+		/// <summary>
+		///  A list of index names to search within, wildcards are supported.
 		/// </summary>
 		[JsonProperty("indices")]
 		[JsonConverter(typeof(IndicesJsonConverter))]
@@ -68,8 +68,8 @@ public partial interface IPutDatafeedRequest
 		[JsonProperty("scroll_size")]
 		int? ScrollSize { get; set; }
 
-		///<summary>
-		/// A list of types to search for within the specified indices.
+		/// <summary>
+		///  A list of types to search for within the specified indices.
 		/// </summary>
 		[JsonProperty("types")]
 		[JsonConverter(typeof(TypesJsonConverter))]
@@ -142,13 +142,14 @@ public PutDatafeedDescriptor<T> ChunkingConfig(Func<ChunkingConfigDescriptor, IC
 		public PutDatafeedDescriptor<T> Indices<TOther>() => Assign(a => a.Indices = typeof(TOther));
 
 		///<summary>A shortcut into calling Indices(Indices.All)</summary>
-		public PutDatafeedDescriptor<T> AllIndices() => this.Indices(Nest.Indices.All);
+		public PutDatafeedDescriptor<T> AllIndices() => Indices(Nest.Indices.All);
 
 		/// <inheritdoc />
 		public PutDatafeedDescriptor<T> JobId(Id jobId) => Assign(a => a.JobId = jobId);
 
 		/// <inheritdoc />
-		public PutDatafeedDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> query) => Assign(a => a.Query = query?.Invoke(new QueryContainerDescriptor<T>()));
+		public PutDatafeedDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> query) =>
+			Assign(a => a.Query = query?.Invoke(new QueryContainerDescriptor<T>()));
 
 		/// <inheritdoc />
 		public PutDatafeedDescriptor<T> QueryDelay(Time queryDelay) => Assign(a => a.QueryDelay = queryDelay);
@@ -167,6 +168,6 @@ public PutDatafeedDescriptor<T> ScriptFields(Func<ScriptFieldsDescriptor, IPromi
 		public PutDatafeedDescriptor<T> Types<TOther>() => Assign(a => a.Types = typeof(TOther));
 
 		///<summary>a shortcut into calling Types(Types.All)</summary>
-		public PutDatafeedDescriptor<T> AllTypes() => this.Types(Nest.Types.All);
+		public PutDatafeedDescriptor<T> AllTypes() => Types(Nest.Types.All);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/PutDatafeed/PutDatafeedResponse.cs b/src/Nest/XPack/MachineLearning/PutDatafeed/PutDatafeedResponse.cs
index f4405ea15bb..b0952b31860 100644
--- a/src/Nest/XPack/MachineLearning/PutDatafeed/PutDatafeedResponse.cs
+++ b/src/Nest/XPack/MachineLearning/PutDatafeed/PutDatafeedResponse.cs
@@ -7,12 +7,6 @@ namespace Nest
 	/// </summary>
 	public partial interface IPutDatafeedResponse : IResponse
 	{
-		/// <summary>
-		/// The datafeed id.
-		/// </summary>
-		[JsonProperty("datafeed_id")]
-		string DatafeedId { get; }
-
 		/// <summary>
 		/// The aggregation searches to perform for the datafeed.
 		/// </summary>
@@ -25,6 +19,12 @@ public partial interface IPutDatafeedResponse : IResponse
 		[JsonProperty("chunking_config")]
 		IChunkingConfig ChunkingConfig { get; }
 
+		/// <summary>
+		/// The datafeed id.
+		/// </summary>
+		[JsonProperty("datafeed_id")]
+		string DatafeedId { get; }
+
 		/// <summary>
 		/// The interval at which scheduled queries are made while the datafeed runs in real time.
 		/// The default value is either the bucket span for short bucket spans, or, for longer bucket spans,
@@ -33,8 +33,8 @@ public partial interface IPutDatafeedResponse : IResponse
 		[JsonProperty("frequency")]
 		Time Frequency { get; }
 
-		///<summary>
-		/// A list of index names to search within, wildcards are supported.
+		/// <summary>
+		///  A list of index names to search within, wildcards are supported.
 		/// </summary>
 		[JsonProperty("indices")]
 		[JsonConverter(typeof(IndicesJsonConverter))]
@@ -44,7 +44,7 @@ public partial interface IPutDatafeedResponse : IResponse
 		/// A numerical character string that uniquely identifies the job.
 		/// </summary>
 		[JsonProperty("job_id")]
-		string JobId { get;  }
+		string JobId { get; }
 
 		/// <summary>
 		/// Describe the query to perform using a query descriptor lambda
@@ -76,32 +76,42 @@ public partial interface IPutDatafeedResponse : IResponse
 		///<summary>A list of types to search for within the specified indices</summary>
 		[JsonProperty("types")]
 		[JsonConverter(typeof(TypesJsonConverter))]
-		Types Types { get;  }
+		Types Types { get; }
 	}
 
 	/// <inheritdoc />
 	public class PutDatafeedResponse : ResponseBase, IPutDatafeedResponse
 	{
-		/// <inheritdoc />
-		public string DatafeedId { get; internal set; }
 		/// <inheritdoc />
 		public AggregationDictionary Aggregations { get; internal set; }
+
 		/// <inheritdoc />
 		public IChunkingConfig ChunkingConfig { get; internal set; }
+
+		/// <inheritdoc />
+		public string DatafeedId { get; internal set; }
+
 		/// <inheritdoc />
 		public Time Frequency { get; internal set; }
+
 		/// <inheritdoc />
 		public Indices Indices { get; internal set; }
+
 		/// <inheritdoc />
 		public string JobId { get; internal set; }
+
 		/// <inheritdoc />
 		public QueryContainer Query { get; internal set; }
+
 		/// <inheritdoc />
 		public Time QueryDelay { get; internal set; }
+
 		/// <inheritdoc />
 		public IScriptFields ScriptFields { get; internal set; }
+
 		/// <inheritdoc />
 		public int? ScrollSize { get; internal set; }
+
 		/// <inheritdoc />
 		public Types Types { get; internal set; }
 	}
diff --git a/src/Nest/XPack/MachineLearning/PutJob/ElasticClient-PutJob.cs b/src/Nest/XPack/MachineLearning/PutJob/ElasticClient-PutJob.cs
index 47cec567632..267ac2d4d68 100644
--- a/src/Nest/XPack/MachineLearning/PutJob/ElasticClient-PutJob.cs
+++ b/src/Nest/XPack/MachineLearning/PutJob/ElasticClient-PutJob.cs
@@ -12,39 +12,43 @@ public partial interface IElasticClient
 		/// </summary>
 		IPutJobResponse PutJob<T>(Id jobId, Func<PutJobDescriptor<T>, IPutJobRequest> selector) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutJobResponse PutJob(IPutJobRequest request);
 
-		/// <inheritdoc/>
-		Task<IPutJobResponse> PutJobAsync<T>(Id jobId, Func<PutJobDescriptor<T>, IPutJobRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		/// <inheritdoc />
+		Task<IPutJobResponse> PutJobAsync<T>(Id jobId, Func<PutJobDescriptor<T>, IPutJobRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutJobResponse> PutJobAsync(IPutJobRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutJobResponse PutJob<T>(Id jobId, Func<PutJobDescriptor<T>, IPutJobRequest> selector) where T : class =>
-			this.PutJob(selector.InvokeOrDefault(new PutJobDescriptor<T>(jobId)));
+			PutJob(selector.InvokeOrDefault(new PutJobDescriptor<T>(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutJobResponse PutJob(IPutJobRequest request) =>
-			this.Dispatcher.Dispatch<IPutJobRequest, PutJobRequestParameters, PutJobResponse>(
+			Dispatcher.Dispatch<IPutJobRequest, PutJobRequestParameters, PutJobResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlPutJobDispatch<PutJobResponse>
+				LowLevelDispatch.XpackMlPutJobDispatch<PutJobResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPutJobResponse> PutJobAsync<T>(Id jobId, Func<PutJobDescriptor<T>, IPutJobRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.PutJobAsync(selector.InvokeOrDefault(new PutJobDescriptor<T>(jobId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IPutJobResponse> PutJobAsync<T>(Id jobId, Func<PutJobDescriptor<T>, IPutJobRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			PutJobAsync(selector.InvokeOrDefault(new PutJobDescriptor<T>(jobId)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IPutJobResponse> PutJobAsync(IPutJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutJobRequest, PutJobRequestParameters, PutJobResponse, IPutJobResponse>(
+			Dispatcher.DispatchAsync<IPutJobRequest, PutJobRequestParameters, PutJobResponse, IPutJobResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlPutJobDispatchAsync<PutJobResponse>
+				LowLevelDispatch.XpackMlPutJobDispatchAsync<PutJobResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/PutJob/PutJobRequest.cs b/src/Nest/XPack/MachineLearning/PutJob/PutJobRequest.cs
index 354aef79233..28475050d19 100644
--- a/src/Nest/XPack/MachineLearning/PutJob/PutJobRequest.cs
+++ b/src/Nest/XPack/MachineLearning/PutJob/PutJobRequest.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -63,16 +61,22 @@ public partial class PutJobRequest
 	{
 		/// <inheritdoc />
 		public IAnalysisConfig AnalysisConfig { get; set; }
+
 		/// <inheritdoc />
 		public IAnalysisLimits AnalysisLimits { get; set; }
+
 		/// <inheritdoc />
 		public IDataDescription DataDescription { get; set; }
+
 		/// <inheritdoc />
 		public string Description { get; set; }
+
 		/// <inheritdoc />
 		public IModelPlotConfig ModelPlotConfig { get; set; }
+
 		/// <inheritdoc />
 		public long? ModelSnapshotRetentionDays { get; set; }
+
 		/// <inheritdoc />
 		public IndexName ResultsIndexName { get; set; }
 	}
@@ -126,10 +130,13 @@ public enum ExcludeFrequent
 	{
 		[EnumMember(Value = "all")]
 		All,
+
 		[EnumMember(Value = "none")]
 		None,
+
 		[EnumMember(Value = "by")]
 		By,
+
 		[EnumMember(Value = "over")]
 		Over
 	}
diff --git a/src/Nest/XPack/MachineLearning/PutJob/PutJobResponse.cs b/src/Nest/XPack/MachineLearning/PutJob/PutJobResponse.cs
index a6766a721f5..cadbaec752f 100644
--- a/src/Nest/XPack/MachineLearning/PutJob/PutJobResponse.cs
+++ b/src/Nest/XPack/MachineLearning/PutJob/PutJobResponse.cs
@@ -5,34 +5,6 @@ namespace Nest
 {
 	public interface IPutJobResponse : IResponse
 	{
-		/// <summary>
-		/// The unique identifier for the job.
-		/// </summary>
-		[JsonProperty("job_id")]
-		string JobId { get; }
-
-		/// <summary>
-		/// The job type.
-		/// </summary>
-		/// <remarks>
-		/// Reserved for future use.
-		/// </remarks>
-		[JsonProperty("job_type")]
-		string JobType { get; }
-
-		/// <summary>
-		/// An optional description of the job.
-		/// </summary>
-		[JsonProperty("description")]
-		string Description { get; }
-
-		/// <summary>
-		/// The time the job was created.
-		/// </summary>
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		[JsonProperty("create_time")]
-		DateTimeOffset CreateTime { get; }
-
 		/// <summary>
 		/// The analysis configuration, which specifies how to analyze the data.
 		/// </summary>
@@ -57,6 +29,13 @@ public interface IPutJobResponse : IResponse
 		[JsonProperty("background_persist_interval")]
 		Time BackgroundPersistInterval { get; }
 
+		/// <summary>
+		/// The time the job was created.
+		/// </summary>
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		[JsonProperty("create_time")]
+		DateTimeOffset CreateTime { get; }
+
 		/// <summary>
 		/// Describes the format of the input data. This object is required, but it can be empty.
 		/// </summary>
@@ -64,24 +43,25 @@ public interface IPutJobResponse : IResponse
 		IDataDescription DataDescription { get; }
 
 		/// <summary>
-		/// The time in days that model snapshots are retained for the job.
-		/// Older snapshots are deleted. The default value is 1 day.
+		/// An optional description of the job.
 		/// </summary>
-		[JsonProperty("model_snapshot_retention_days")]
-		long? ModelSnapshotRetentionDays { get; }
+		[JsonProperty("description")]
+		string Description { get; }
 
 		/// <summary>
-		/// A numerical character string that uniquely identifies the model snapshot.
+		/// The unique identifier for the job.
 		/// </summary>
-		[JsonProperty("model_snapshot_id")]
-		string ModelSnapshotId { get; }
+		[JsonProperty("job_id")]
+		string JobId { get; }
 
 		/// <summary>
-		/// The name of the index in which to store the machine learning results.
-		/// The default value is shared, which corresponds to the index name .ml-anomalies-shared.
+		/// The job type.
 		/// </summary>
-		[JsonProperty("results_index_name")]
-		string ResultsIndexName { get; }
+		/// <remarks>
+		/// Reserved for future use.
+		/// </remarks>
+		[JsonProperty("job_type")]
+		string JobType { get; }
 
 		/// <summary>
 		/// This advanced configuration option stores model information along with the results.
@@ -90,12 +70,32 @@ public interface IPutJobResponse : IResponse
 		[JsonProperty("model_plot")]
 		IModelPlotConfig ModelPlotConfig { get; }
 
+		/// <summary>
+		/// A numerical character string that uniquely identifies the model snapshot.
+		/// </summary>
+		[JsonProperty("model_snapshot_id")]
+		string ModelSnapshotId { get; }
+
+		/// <summary>
+		/// The time in days that model snapshots are retained for the job.
+		/// Older snapshots are deleted. The default value is 1 day.
+		/// </summary>
+		[JsonProperty("model_snapshot_retention_days")]
+		long? ModelSnapshotRetentionDays { get; }
+
 		/// <summary>
 		/// Advanced configuration option. The period over which adjustments to the score are applied, as new data
 		/// is seen. The default value is the longer of 30 days or 100 bucket_spans.
 		/// </summary>
 		[JsonProperty("renormalization_window_days")]
-		long? RenormalizationWindowDays { get;}
+		long? RenormalizationWindowDays { get; }
+
+		/// <summary>
+		/// The name of the index in which to store the machine learning results.
+		/// The default value is shared, which corresponds to the index name .ml-anomalies-shared.
+		/// </summary>
+		[JsonProperty("results_index_name")]
+		string ResultsIndexName { get; }
 
 		/// <summary>
 		/// Advanced configuration option. The number of days for which job results are retained.
@@ -110,43 +110,43 @@ public interface IPutJobResponse : IResponse
 	public class PutJobResponse : ResponseBase, IPutJobResponse
 	{
 		/// <inheritdoc />
-		public string JobId { get; internal set; }
+		public IAnalysisConfig AnalysisConfig { get; internal set; }
 
 		/// <inheritdoc />
-		public string JobType { get; internal set; }
+		public IAnalysisLimits AnalysisLimits { get; internal set; }
 
 		/// <inheritdoc />
-		public string Description { get; internal set; }
+		public Time BackgroundPersistInterval { get; internal set; }
 
 		/// <inheritdoc />
 		public DateTimeOffset CreateTime { get; internal set; }
 
 		/// <inheritdoc />
-		public IAnalysisConfig AnalysisConfig { get; internal set; }
+		public IDataDescription DataDescription { get; internal set; }
 
 		/// <inheritdoc />
-		public IAnalysisLimits AnalysisLimits { get; internal set; }
+		public string Description { get; internal set; }
 
 		/// <inheritdoc />
-		public Time BackgroundPersistInterval { get; internal set; }
+		public string JobId { get; internal set; }
 
 		/// <inheritdoc />
-		public IDataDescription DataDescription { get; internal set; }
+		public string JobType { get; internal set; }
 
 		/// <inheritdoc />
-		public long? ModelSnapshotRetentionDays { get; internal set; }
+		public IModelPlotConfig ModelPlotConfig { get; internal set; }
 
 		/// <inheritdoc />
 		public string ModelSnapshotId { get; internal set; }
 
 		/// <inheritdoc />
-		public string ResultsIndexName { get; internal set; }
+		public long? ModelSnapshotRetentionDays { get; internal set; }
 
 		/// <inheritdoc />
-		public IModelPlotConfig ModelPlotConfig { get; internal set; }
+		public long? RenormalizationWindowDays { get; internal set; }
 
 		/// <inheritdoc />
-		public long? RenormalizationWindowDays { get; internal set; }
+		public string ResultsIndexName { get; internal set; }
 
 		/// <inheritdoc />
 		public long? ResultsRetentionDays { get; internal set; }
diff --git a/src/Nest/XPack/MachineLearning/RevertModelSnapshot/ElasticClient-RevertModelSnapshot.cs b/src/Nest/XPack/MachineLearning/RevertModelSnapshot/ElasticClient-RevertModelSnapshot.cs
index a36dc1d53e4..6e0ae7736a4 100644
--- a/src/Nest/XPack/MachineLearning/RevertModelSnapshot/ElasticClient-RevertModelSnapshot.cs
+++ b/src/Nest/XPack/MachineLearning/RevertModelSnapshot/ElasticClient-RevertModelSnapshot.cs
@@ -10,41 +10,57 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Reverts a specific snapshot for a machine learning job
 		/// </summary>
-		IRevertModelSnapshotResponse RevertModelSnapshot(Id jobId, Id snapshotId, Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> selector = null);
+		IRevertModelSnapshotResponse RevertModelSnapshot(Id jobId, Id snapshotId,
+			Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRevertModelSnapshotResponse RevertModelSnapshot(IRevertModelSnapshotRequest request);
 
-		/// <inheritdoc/>
-		Task<IRevertModelSnapshotResponse> RevertModelSnapshotAsync(Id jobId, Id snapshotId, Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRevertModelSnapshotResponse> RevertModelSnapshotAsync(Id jobId, Id snapshotId,
+			Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IRevertModelSnapshotResponse> RevertModelSnapshotAsync(IRevertModelSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRevertModelSnapshotResponse> RevertModelSnapshotAsync(IRevertModelSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IRevertModelSnapshotResponse RevertModelSnapshot(Id jobId, Id snapshotId, Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> selector = null) =>
-			this.RevertModelSnapshot(selector.InvokeOrDefault(new RevertModelSnapshotDescriptor(jobId, snapshotId)));
+		/// <inheritdoc />
+		public IRevertModelSnapshotResponse RevertModelSnapshot(Id jobId, Id snapshotId,
+			Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> selector = null
+		) =>
+			RevertModelSnapshot(selector.InvokeOrDefault(new RevertModelSnapshotDescriptor(jobId, snapshotId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRevertModelSnapshotResponse RevertModelSnapshot(IRevertModelSnapshotRequest request) =>
-			this.Dispatcher.Dispatch<IRevertModelSnapshotRequest, RevertModelSnapshotRequestParameters, RevertModelSnapshotResponse>(
+			Dispatcher.Dispatch<IRevertModelSnapshotRequest, RevertModelSnapshotRequestParameters, RevertModelSnapshotResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlRevertModelSnapshotDispatch<RevertModelSnapshotResponse>
+				LowLevelDispatch.XpackMlRevertModelSnapshotDispatch<RevertModelSnapshotResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IRevertModelSnapshotResponse> RevertModelSnapshotAsync(Id jobId, Id snapshotId, Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RevertModelSnapshotAsync(selector.InvokeOrDefault(new RevertModelSnapshotDescriptor(jobId, snapshotId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IRevertModelSnapshotResponse> RevertModelSnapshotAsync(Id jobId, Id snapshotId,
+			Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RevertModelSnapshotAsync(selector.InvokeOrDefault(new RevertModelSnapshotDescriptor(jobId, snapshotId)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IRevertModelSnapshotResponse> RevertModelSnapshotAsync(IRevertModelSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRevertModelSnapshotRequest, RevertModelSnapshotRequestParameters, RevertModelSnapshotResponse, IRevertModelSnapshotResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.XpackMlRevertModelSnapshotDispatchAsync<RevertModelSnapshotResponse>
-			);
+		/// <inheritdoc />
+		public Task<IRevertModelSnapshotResponse> RevertModelSnapshotAsync(IRevertModelSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IRevertModelSnapshotRequest, RevertModelSnapshotRequestParameters, RevertModelSnapshotResponse,
+					IRevertModelSnapshotResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.XpackMlRevertModelSnapshotDispatchAsync<RevertModelSnapshotResponse>
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/StartDatafeed/ElasticClient-StartDatafeed.cs b/src/Nest/XPack/MachineLearning/StartDatafeed/ElasticClient-StartDatafeed.cs
index 86eec344b0d..bf41702284f 100644
--- a/src/Nest/XPack/MachineLearning/StartDatafeed/ElasticClient-StartDatafeed.cs
+++ b/src/Nest/XPack/MachineLearning/StartDatafeed/ElasticClient-StartDatafeed.cs
@@ -9,43 +9,52 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Start a machine learning datafeed.
-		/// A datafeed must be started in order to retrieve data from Elasticsearch. A datafeed can be started and stopped multiple times throughout its lifecycle.
+		/// A datafeed must be started in order to retrieve data from Elasticsearch. A datafeed can be started and stopped multiple times throughout
+		/// its lifecycle.
 		/// </summary>
 		IStartDatafeedResponse StartDatafeed(Id datafeedId, Func<StartDatafeedDescriptor, IStartDatafeedRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IStartDatafeedResponse StartDatafeed(IStartDatafeedRequest request);
 
-		/// <inheritdoc/>
-		Task<IStartDatafeedResponse> StartDatafeedAsync(Id datafeedId, Func<StartDatafeedDescriptor, IStartDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IStartDatafeedResponse> StartDatafeedAsync(Id datafeedId, Func<StartDatafeedDescriptor, IStartDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IStartDatafeedResponse> StartDatafeedAsync(IStartDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IStartDatafeedResponse> StartDatafeedAsync(IStartDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStartDatafeedResponse StartDatafeed(Id datafeedId, Func<StartDatafeedDescriptor, IStartDatafeedRequest> selector = null) =>
-			this.StartDatafeed(selector.InvokeOrDefault(new StartDatafeedDescriptor(datafeedId)));
+			StartDatafeed(selector.InvokeOrDefault(new StartDatafeedDescriptor(datafeedId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStartDatafeedResponse StartDatafeed(IStartDatafeedRequest request) =>
-			this.Dispatcher.Dispatch<IStartDatafeedRequest, StartDatafeedRequestParameters, StartDatafeedResponse>(
+			Dispatcher.Dispatch<IStartDatafeedRequest, StartDatafeedRequestParameters, StartDatafeedResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlStartDatafeedDispatch<StartDatafeedResponse>
+				LowLevelDispatch.XpackMlStartDatafeedDispatch<StartDatafeedResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IStartDatafeedResponse> StartDatafeedAsync(Id datafeedId, Func<StartDatafeedDescriptor, IStartDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.StartDatafeedAsync(selector.InvokeOrDefault(new StartDatafeedDescriptor(datafeedId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IStartDatafeedResponse> StartDatafeedAsync(IStartDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IStartDatafeedRequest, StartDatafeedRequestParameters, StartDatafeedResponse, IStartDatafeedResponse>(
+		/// <inheritdoc />
+		public Task<IStartDatafeedResponse> StartDatafeedAsync(Id datafeedId, Func<StartDatafeedDescriptor, IStartDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			StartDatafeedAsync(selector.InvokeOrDefault(new StartDatafeedDescriptor(datafeedId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IStartDatafeedResponse> StartDatafeedAsync(IStartDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IStartDatafeedRequest, StartDatafeedRequestParameters, StartDatafeedResponse, IStartDatafeedResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlStartDatafeedDispatchAsync<StartDatafeedResponse>
+				LowLevelDispatch.XpackMlStartDatafeedDispatchAsync<StartDatafeedResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/StartDatafeed/StartDatafeedRequest.cs b/src/Nest/XPack/MachineLearning/StartDatafeed/StartDatafeedRequest.cs
index cbe451c61fb..ebb4104a3cf 100644
--- a/src/Nest/XPack/MachineLearning/StartDatafeed/StartDatafeedRequest.cs
+++ b/src/Nest/XPack/MachineLearning/StartDatafeed/StartDatafeedRequest.cs
@@ -6,10 +6,11 @@ namespace Nest
 	public partial interface IStartDatafeedRequest
 	{
 		/// <summary>
-		/// Controls the amount of time to wait until a datafeed starts.
+		/// The time that the datafeed should end. This value is exclusive.
 		/// </summary>
-		[JsonProperty("timeout")]
-		Time Timeout { get; set; }
+		[JsonProperty("end")]
+		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
+		DateTimeOffset? End { get; set; }
 
 		/// <summary>
 		/// The time that the datafeed should begin. This value is inclusive.
@@ -19,33 +20,32 @@ public partial interface IStartDatafeedRequest
 		DateTimeOffset? Start { get; set; }
 
 		/// <summary>
-		/// The time that the datafeed should end. This value is exclusive.
+		/// Controls the amount of time to wait until a datafeed starts.
 		/// </summary>
-		[JsonProperty("end")]
-		[JsonConverter(typeof(EpochMillisecondsDateTimeJsonConverter))]
-		DateTimeOffset? End { get; set; }
+		[JsonProperty("timeout")]
+		Time Timeout { get; set; }
 	}
 
 	/// <inheritdoc />
 	public partial class StartDatafeedRequest
 	{
 		/// <inheritdoc />
-		public Time Timeout { get; set; }
+		public DateTimeOffset? End { get; set; }
 
 		/// <inheritdoc />
 		public DateTimeOffset? Start { get; set; }
 
 		/// <inheritdoc />
-		public DateTimeOffset? End { get; set; }
+		public Time Timeout { get; set; }
 	}
 
 	/// <inheritdoc />
 	[DescriptorFor("XpackMlStartDatafeed")]
 	public partial class StartDatafeedDescriptor
 	{
-		Time IStartDatafeedRequest.Timeout { get; set; }
-		DateTimeOffset? IStartDatafeedRequest.Start { get; set; }
 		DateTimeOffset? IStartDatafeedRequest.End { get; set; }
+		DateTimeOffset? IStartDatafeedRequest.Start { get; set; }
+		Time IStartDatafeedRequest.Timeout { get; set; }
 
 		/// <inheritdoc />
 		public StartDatafeedDescriptor Timeout(Time timeout) => Assign(a => a.Timeout = timeout);
diff --git a/src/Nest/XPack/MachineLearning/StopDatafeed/ElasticClient-StopDatafeed.cs b/src/Nest/XPack/MachineLearning/StopDatafeed/ElasticClient-StopDatafeed.cs
index f6ffaf12f51..22f306296fe 100644
--- a/src/Nest/XPack/MachineLearning/StopDatafeed/ElasticClient-StopDatafeed.cs
+++ b/src/Nest/XPack/MachineLearning/StopDatafeed/ElasticClient-StopDatafeed.cs
@@ -9,43 +9,50 @@ public partial interface IElasticClient
 	{
 		/// <summary>
 		/// Stop a machine learning data feed.
-		/// A datafeed that is stopped ceases to retrieve data from Elasticsearch. A datafeed can be started and stopped multiple times throughout its lifecycle.
+		/// A datafeed that is stopped ceases to retrieve data from Elasticsearch. A datafeed can be started and stopped multiple times throughout its
+		/// lifecycle.
 		/// </summary>
 		IStopDatafeedResponse StopDatafeed(Id datafeedId, Func<StopDatafeedDescriptor, IStopDatafeedRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IStopDatafeedResponse StopDatafeed(IStopDatafeedRequest request);
 
-		/// <inheritdoc/>
-		Task<IStopDatafeedResponse> StopDatafeedAsync(Id datafeedId, Func<StopDatafeedDescriptor, IStopDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IStopDatafeedResponse> StopDatafeedAsync(Id datafeedId, Func<StopDatafeedDescriptor, IStopDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IStopDatafeedResponse> StopDatafeedAsync(IStopDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStopDatafeedResponse StopDatafeed(Id datafeedId, Func<StopDatafeedDescriptor, IStopDatafeedRequest> selector = null) =>
-			this.StopDatafeed(selector.InvokeOrDefault(new StopDatafeedDescriptor(datafeedId)));
+			StopDatafeed(selector.InvokeOrDefault(new StopDatafeedDescriptor(datafeedId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStopDatafeedResponse StopDatafeed(IStopDatafeedRequest request) =>
-			this.Dispatcher.Dispatch<IStopDatafeedRequest, StopDatafeedRequestParameters, StopDatafeedResponse>(
+			Dispatcher.Dispatch<IStopDatafeedRequest, StopDatafeedRequestParameters, StopDatafeedResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackMlStopDatafeedDispatch<StopDatafeedResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMlStopDatafeedDispatch<StopDatafeedResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IStopDatafeedResponse> StopDatafeedAsync(Id datafeedId, Func<StopDatafeedDescriptor, IStopDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.StopDatafeedAsync(selector.InvokeOrDefault(new StopDatafeedDescriptor(datafeedId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IStopDatafeedResponse> StopDatafeedAsync(IStopDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IStopDatafeedRequest, StopDatafeedRequestParameters, StopDatafeedResponse, IStopDatafeedResponse>(
+		/// <inheritdoc />
+		public Task<IStopDatafeedResponse> StopDatafeedAsync(Id datafeedId, Func<StopDatafeedDescriptor, IStopDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			StopDatafeedAsync(selector.InvokeOrDefault(new StopDatafeedDescriptor(datafeedId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IStopDatafeedResponse> StopDatafeedAsync(IStopDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IStopDatafeedRequest, StopDatafeedRequestParameters, StopDatafeedResponse, IStopDatafeedResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMlStopDatafeedDispatchAsync<StopDatafeedResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMlStopDatafeedDispatchAsync<StopDatafeedResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/StopDatafeed/StopDatafeedRequest.cs b/src/Nest/XPack/MachineLearning/StopDatafeed/StopDatafeedRequest.cs
index e7e1b662204..917fb2cf036 100644
--- a/src/Nest/XPack/MachineLearning/StopDatafeed/StopDatafeedRequest.cs
+++ b/src/Nest/XPack/MachineLearning/StopDatafeed/StopDatafeedRequest.cs
@@ -4,35 +4,35 @@ namespace Nest
 {
 	public partial interface IStopDatafeedRequest
 	{
-		/// <summary>
-		/// Controls the amount of time to wait until a datafeed stops.
-		/// </summary>
-		[JsonProperty("timeout")]
-		Time Timeout { get; set; }
-
 		/// <summary>
 		/// If true, the datafeed is stopped forcefully.
 		/// </summary>
 		[JsonProperty("force")]
 		bool? Force { get; set; }
+
+		/// <summary>
+		/// Controls the amount of time to wait until a datafeed stops.
+		/// </summary>
+		[JsonProperty("timeout")]
+		Time Timeout { get; set; }
 	}
 
 	/// <inheritdoc />
 	public partial class StopDatafeedRequest
 	{
 		/// <inheritdoc />
-		public Time Timeout { get; set; }
+		public bool? Force { get; set; }
 
 		/// <inheritdoc />
-		public bool? Force { get; set; }
+		public Time Timeout { get; set; }
 	}
 
 	/// <inheritdoc />
 	[DescriptorFor("XpackMlStopDatafeed")]
 	public partial class StopDatafeedDescriptor
 	{
-		Time IStopDatafeedRequest.Timeout { get; set; }
 		bool? IStopDatafeedRequest.Force { get; set; }
+		Time IStopDatafeedRequest.Timeout { get; set; }
 
 		/// <inheritdoc />
 		public StopDatafeedDescriptor Timeout(Time timeout) => Assign(a => a.Timeout = timeout);
diff --git a/src/Nest/XPack/MachineLearning/UpdateDataFeed/ElasticClient-UpdateDatafeed.cs b/src/Nest/XPack/MachineLearning/UpdateDataFeed/ElasticClient-UpdateDatafeed.cs
index 59ff6554568..cd8a68be5c1 100644
--- a/src/Nest/XPack/MachineLearning/UpdateDataFeed/ElasticClient-UpdateDatafeed.cs
+++ b/src/Nest/XPack/MachineLearning/UpdateDataFeed/ElasticClient-UpdateDatafeed.cs
@@ -10,41 +10,52 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Update a machine learning datafeed.
 		/// </summary>
-		IUpdateDatafeedResponse UpdateDatafeed<T>(Id datafeedId, Func<UpdateDatafeedDescriptor<T>, IUpdateDatafeedRequest> selector = null) where T : class;
+		IUpdateDatafeedResponse UpdateDatafeed<T>(Id datafeedId, Func<UpdateDatafeedDescriptor<T>, IUpdateDatafeedRequest> selector = null)
+			where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpdateDatafeedResponse UpdateDatafeed(IUpdateDatafeedRequest request);
 
-		/// <inheritdoc/>
-		Task<IUpdateDatafeedResponse> UpdateDatafeedAsync<T>(Id datafeedId, Func<UpdateDatafeedDescriptor<T>, IUpdateDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		/// <inheritdoc />
+		Task<IUpdateDatafeedResponse> UpdateDatafeedAsync<T>(Id datafeedId, Func<UpdateDatafeedDescriptor<T>, IUpdateDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class;
 
-		/// <inheritdoc/>
-		Task<IUpdateDatafeedResponse> UpdateDatafeedAsync(IUpdateDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IUpdateDatafeedResponse> UpdateDatafeedAsync(IUpdateDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IUpdateDatafeedResponse UpdateDatafeed<T>(Id datafeedId, Func<UpdateDatafeedDescriptor<T>, IUpdateDatafeedRequest> selector = null) where T : class =>
-			this.UpdateDatafeed(selector.InvokeOrDefault(new UpdateDatafeedDescriptor<T>(datafeedId)));
+		/// <inheritdoc />
+		public IUpdateDatafeedResponse UpdateDatafeed<T>(Id datafeedId, Func<UpdateDatafeedDescriptor<T>, IUpdateDatafeedRequest> selector = null)
+			where T : class =>
+			UpdateDatafeed(selector.InvokeOrDefault(new UpdateDatafeedDescriptor<T>(datafeedId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateDatafeedResponse UpdateDatafeed(IUpdateDatafeedRequest request) =>
-			this.Dispatcher.Dispatch<IUpdateDatafeedRequest, UpdateDatafeedRequestParameters, UpdateDatafeedResponse>(
+			Dispatcher.Dispatch<IUpdateDatafeedRequest, UpdateDatafeedRequestParameters, UpdateDatafeedResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlUpdateDatafeedDispatch<UpdateDatafeedResponse>
+				LowLevelDispatch.XpackMlUpdateDatafeedDispatch<UpdateDatafeedResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IUpdateDatafeedResponse> UpdateDatafeedAsync<T>(Id datafeedId, Func<UpdateDatafeedDescriptor<T>, IUpdateDatafeedRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.UpdateDatafeedAsync(selector.InvokeOrDefault(new UpdateDatafeedDescriptor<T>(datafeedId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IUpdateDatafeedResponse> UpdateDatafeedAsync(IUpdateDatafeedRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IUpdateDatafeedRequest, UpdateDatafeedRequestParameters, UpdateDatafeedResponse, IUpdateDatafeedResponse>(
+		/// <inheritdoc />
+		public Task<IUpdateDatafeedResponse> UpdateDatafeedAsync<T>(Id datafeedId,
+			Func<UpdateDatafeedDescriptor<T>, IUpdateDatafeedRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			UpdateDatafeedAsync(selector.InvokeOrDefault(new UpdateDatafeedDescriptor<T>(datafeedId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IUpdateDatafeedResponse> UpdateDatafeedAsync(IUpdateDatafeedRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IUpdateDatafeedRequest, UpdateDatafeedRequestParameters, UpdateDatafeedResponse, IUpdateDatafeedResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlUpdateDatafeedDispatchAsync<UpdateDatafeedResponse>
+				LowLevelDispatch.XpackMlUpdateDatafeedDispatchAsync<UpdateDatafeedResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/UpdateDataFeed/UpdateDatafeedRequest.cs b/src/Nest/XPack/MachineLearning/UpdateDataFeed/UpdateDatafeedRequest.cs
index 77a5c4eacc7..ae440869e17 100644
--- a/src/Nest/XPack/MachineLearning/UpdateDataFeed/UpdateDatafeedRequest.cs
+++ b/src/Nest/XPack/MachineLearning/UpdateDataFeed/UpdateDatafeedRequest.cs
@@ -140,7 +140,7 @@ public UpdateDatafeedDescriptor<T> ChunkingConfig(Func<ChunkingConfigDescriptor,
 		public UpdateDatafeedDescriptor<T> Indices<TOther>() => Assign(a => a.Indices = typeof(TOther));
 
 		///<summary>A shortcut into calling Indices(Indices.All)</summary>
-		public UpdateDatafeedDescriptor<T> AllIndices() => this.Indices(Nest.Indices.All);
+		public UpdateDatafeedDescriptor<T> AllIndices() => Indices(Nest.Indices.All);
 
 		/// <inheritdoc />
 		public UpdateDatafeedDescriptor<T> JobId(Id jobId) => Assign(a => a.JobId = jobId);
@@ -166,6 +166,6 @@ public UpdateDatafeedDescriptor<T> ScriptFields(Func<ScriptFieldsDescriptor, IPr
 		public UpdateDatafeedDescriptor<T> Types<TOther>() => Assign(a => a.Types = typeof(TOther));
 
 		///<summary>a shortcut into calling Types(Types.All)</summary>
-		public UpdateDatafeedDescriptor<T> AllTypes() => this.Types(Nest.Types.All);
+		public UpdateDatafeedDescriptor<T> AllTypes() => Types(Nest.Types.All);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/UpdateDataFeed/UpdateDatafeedResponse.cs b/src/Nest/XPack/MachineLearning/UpdateDataFeed/UpdateDatafeedResponse.cs
index 566f04622ad..93cf0b25b00 100644
--- a/src/Nest/XPack/MachineLearning/UpdateDataFeed/UpdateDatafeedResponse.cs
+++ b/src/Nest/XPack/MachineLearning/UpdateDataFeed/UpdateDatafeedResponse.cs
@@ -7,12 +7,6 @@ namespace Nest
 	/// </summary>
 	public partial interface IUpdateDatafeedResponse : IResponse
 	{
-		/// <summary>
-		/// The datafeed id.
-		/// </summary>
-		[JsonProperty("datafeed_id")]
-		string DatafeedId { get; }
-
 		/// <summary>
 		/// The aggregation searches to perform for the datafeed.
 		/// </summary>
@@ -25,6 +19,12 @@ public partial interface IUpdateDatafeedResponse : IResponse
 		[JsonProperty("chunking_config")]
 		IChunkingConfig ChunkingConfig { get; }
 
+		/// <summary>
+		/// The datafeed id.
+		/// </summary>
+		[JsonProperty("datafeed_id")]
+		string DatafeedId { get; }
+
 		/// <summary>
 		/// The interval at which scheduled queries are made while the datafeed runs in real time.
 		/// The default value is either the bucket span for short bucket spans, or, for longer bucket spans,
@@ -42,7 +42,7 @@ public partial interface IUpdateDatafeedResponse : IResponse
 		/// A numerical character string that uniquely identifies the job.
 		/// </summary>
 		[JsonProperty("job_id")]
-		string JobId { get;  }
+		string JobId { get; }
 
 		/// <summary>
 		/// Describe the query to perform using a query descriptor lambda
@@ -74,14 +74,14 @@ public partial interface IUpdateDatafeedResponse : IResponse
 		///<summary>A list of types to search for within the specified indices</summary>
 		[JsonProperty("types")]
 		[JsonConverter(typeof(TypesJsonConverter))]
-		Types Types { get;  }
+		Types Types { get; }
 	}
 
 	public class UpdateDatafeedResponse : ResponseBase, IUpdateDatafeedResponse
 	{
-		public string DatafeedId { get; internal set; }
 		public AggregationDictionary Aggregations { get; internal set; }
 		public IChunkingConfig ChunkingConfig { get; internal set; }
+		public string DatafeedId { get; internal set; }
 		public Time Frequency { get; internal set; }
 		public Indices Indices { get; internal set; }
 		public string JobId { get; internal set; }
diff --git a/src/Nest/XPack/MachineLearning/UpdateJob/ElasticClient-UpdateJob.cs b/src/Nest/XPack/MachineLearning/UpdateJob/ElasticClient-UpdateJob.cs
index 35a65af6e83..59f4d0197d0 100644
--- a/src/Nest/XPack/MachineLearning/UpdateJob/ElasticClient-UpdateJob.cs
+++ b/src/Nest/XPack/MachineLearning/UpdateJob/ElasticClient-UpdateJob.cs
@@ -12,39 +12,43 @@ public partial interface IElasticClient
 		/// </summary>
 		IUpdateJobResponse UpdateJob<T>(Id jobId, Func<UpdateJobDescriptor<T>, IUpdateJobRequest> selector = null) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpdateJobResponse UpdateJob(IUpdateJobRequest request);
 
-		/// <inheritdoc/>
-		Task<IUpdateJobResponse> UpdateJobAsync<T>(Id jobId, Func<UpdateJobDescriptor<T>, IUpdateJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		/// <inheritdoc />
+		Task<IUpdateJobResponse> UpdateJobAsync<T>(Id jobId, Func<UpdateJobDescriptor<T>, IUpdateJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IUpdateJobResponse> UpdateJobAsync(IUpdateJobRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateJobResponse UpdateJob<T>(Id jobId, Func<UpdateJobDescriptor<T>, IUpdateJobRequest> selector = null) where T : class =>
-			this.UpdateJob(selector.InvokeOrDefault(new UpdateJobDescriptor<T>(jobId)));
+			UpdateJob(selector.InvokeOrDefault(new UpdateJobDescriptor<T>(jobId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateJobResponse UpdateJob(IUpdateJobRequest request) =>
-			this.Dispatcher.Dispatch<IUpdateJobRequest, UpdateJobRequestParameters, UpdateJobResponse>(
+			Dispatcher.Dispatch<IUpdateJobRequest, UpdateJobRequestParameters, UpdateJobResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlUpdateJobDispatch<UpdateJobResponse>
+				LowLevelDispatch.XpackMlUpdateJobDispatch<UpdateJobResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IUpdateJobResponse> UpdateJobAsync<T>(Id jobId, Func<UpdateJobDescriptor<T>, IUpdateJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.UpdateJobAsync(selector.InvokeOrDefault(new UpdateJobDescriptor<T>(jobId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IUpdateJobResponse> UpdateJobAsync<T>(Id jobId, Func<UpdateJobDescriptor<T>, IUpdateJobRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			UpdateJobAsync(selector.InvokeOrDefault(new UpdateJobDescriptor<T>(jobId)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IUpdateJobResponse> UpdateJobAsync(IUpdateJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IUpdateJobRequest, UpdateJobRequestParameters, UpdateJobResponse, IUpdateJobResponse>(
+			Dispatcher.DispatchAsync<IUpdateJobRequest, UpdateJobRequestParameters, UpdateJobResponse, IUpdateJobResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlUpdateJobDispatchAsync<UpdateJobResponse>
+				LowLevelDispatch.XpackMlUpdateJobDispatchAsync<UpdateJobResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/UpdateJob/UpdateJobRequest.cs b/src/Nest/XPack/MachineLearning/UpdateJob/UpdateJobRequest.cs
index c9dabd9e912..ced68154db6 100644
--- a/src/Nest/XPack/MachineLearning/UpdateJob/UpdateJobRequest.cs
+++ b/src/Nest/XPack/MachineLearning/UpdateJob/UpdateJobRequest.cs
@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -97,10 +97,12 @@ public UpdateJobDescriptor<T> AnalysisLimits(Func<AnalysisMemoryLimitDescriptor,
 			Assign(a => a.AnalysisLimits = selector?.Invoke(new AnalysisMemoryLimitDescriptor()));
 
 		/// <inheritdoc />
-		public UpdateJobDescriptor<T> BackgroundPersistInterval(Time backgroundPersistInterval) => Assign(a => a.BackgroundPersistInterval = backgroundPersistInterval);
+		public UpdateJobDescriptor<T> BackgroundPersistInterval(Time backgroundPersistInterval) =>
+			Assign(a => a.BackgroundPersistInterval = backgroundPersistInterval);
 
 		/// <inheritdoc />
-		public UpdateJobDescriptor<T> CustomSettings(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> customSettingsDictionary) =>
+		public UpdateJobDescriptor<T> CustomSettings(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> customSettingsDictionary
+		) =>
 			Assign(a => a.CustomSettings = customSettingsDictionary(new FluentDictionary<string, object>()));
 
 		/// <inheritdoc />
@@ -111,10 +113,12 @@ public UpdateJobDescriptor<T> ModelPlot(Func<ModelPlotConfigEnabledDescriptor<T>
 			Assign(a => a.ModelPlotConfig = selector?.Invoke(new ModelPlotConfigEnabledDescriptor<T>()));
 
 		/// <inheritdoc />
-		public UpdateJobDescriptor<T> ModelSnapshotRetentionDays(long? modelSnapshotRetentionDays) => Assign(a => a.ModelSnapshotRetentionDays = modelSnapshotRetentionDays);
+		public UpdateJobDescriptor<T> ModelSnapshotRetentionDays(long? modelSnapshotRetentionDays) =>
+			Assign(a => a.ModelSnapshotRetentionDays = modelSnapshotRetentionDays);
 
 		/// <inheritdoc />
-		public UpdateJobDescriptor<T> RenormalizationWindowDays(long? renormalizationWindowDays) => Assign(a => a.RenormalizationWindowDays = renormalizationWindowDays);
+		public UpdateJobDescriptor<T> RenormalizationWindowDays(long? renormalizationWindowDays) =>
+			Assign(a => a.RenormalizationWindowDays = renormalizationWindowDays);
 
 		/// <inheritdoc />
 		public UpdateJobDescriptor<T> ResultsRetentionDays(long? resultsRetentionDays) => Assign(a => a.ResultsRetentionDays = resultsRetentionDays);
diff --git a/src/Nest/XPack/MachineLearning/UpdateJob/UpdateJobResponse.cs b/src/Nest/XPack/MachineLearning/UpdateJob/UpdateJobResponse.cs
index 3df45bf28cf..8d3ddcf3588 100644
--- a/src/Nest/XPack/MachineLearning/UpdateJob/UpdateJobResponse.cs
+++ b/src/Nest/XPack/MachineLearning/UpdateJob/UpdateJobResponse.cs
@@ -1,10 +1,6 @@
 namespace Nest
 {
-	public interface IUpdateJobResponse : IResponse
-	{
-	}
+	public interface IUpdateJobResponse : IResponse { }
 
-	public class UpdateJobResponse : ResponseBase, IUpdateJobResponse
-	{
-	}
+	public class UpdateJobResponse : ResponseBase, IUpdateJobResponse { }
 }
diff --git a/src/Nest/XPack/MachineLearning/UpdateModelSnapshot/ElasticClient-UpdateModelSnapshot.cs b/src/Nest/XPack/MachineLearning/UpdateModelSnapshot/ElasticClient-UpdateModelSnapshot.cs
index 91380635a6e..c4df77a0757 100644
--- a/src/Nest/XPack/MachineLearning/UpdateModelSnapshot/ElasticClient-UpdateModelSnapshot.cs
+++ b/src/Nest/XPack/MachineLearning/UpdateModelSnapshot/ElasticClient-UpdateModelSnapshot.cs
@@ -10,41 +10,57 @@ public partial interface IElasticClient
 		/// <summary>
 		/// Updates a machine learning model snapshot.
 		/// </summary>
-		IUpdateModelSnapshotResponse UpdateModelSnapshot(Id jobId, Id snapshotId, Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> selector = null);
+		IUpdateModelSnapshotResponse UpdateModelSnapshot(Id jobId, Id snapshotId,
+			Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IUpdateModelSnapshotResponse UpdateModelSnapshot(IUpdateModelSnapshotRequest request);
 
-		/// <inheritdoc/>
-		Task<IUpdateModelSnapshotResponse> UpdateModelSnapshotAsync(Id jobId, Id snapshotId, Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IUpdateModelSnapshotResponse> UpdateModelSnapshotAsync(Id jobId, Id snapshotId,
+			Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IUpdateModelSnapshotResponse> UpdateModelSnapshotAsync(IUpdateModelSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IUpdateModelSnapshotResponse> UpdateModelSnapshotAsync(IUpdateModelSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IUpdateModelSnapshotResponse UpdateModelSnapshot(Id jobId, Id snapshotId, Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> selector = null) =>
-			this.UpdateModelSnapshot(selector.InvokeOrDefault(new UpdateModelSnapshotDescriptor(jobId, snapshotId)));
+		/// <inheritdoc />
+		public IUpdateModelSnapshotResponse UpdateModelSnapshot(Id jobId, Id snapshotId,
+			Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> selector = null
+		) =>
+			UpdateModelSnapshot(selector.InvokeOrDefault(new UpdateModelSnapshotDescriptor(jobId, snapshotId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IUpdateModelSnapshotResponse UpdateModelSnapshot(IUpdateModelSnapshotRequest request) =>
-			this.Dispatcher.Dispatch<IUpdateModelSnapshotRequest, UpdateModelSnapshotRequestParameters, UpdateModelSnapshotResponse>(
+			Dispatcher.Dispatch<IUpdateModelSnapshotRequest, UpdateModelSnapshotRequestParameters, UpdateModelSnapshotResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlUpdateModelSnapshotDispatch<UpdateModelSnapshotResponse>
+				LowLevelDispatch.XpackMlUpdateModelSnapshotDispatch<UpdateModelSnapshotResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IUpdateModelSnapshotResponse> UpdateModelSnapshotAsync(Id jobId, Id snapshotId, Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.UpdateModelSnapshotAsync(selector.InvokeOrDefault(new UpdateModelSnapshotDescriptor(jobId, snapshotId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IUpdateModelSnapshotResponse> UpdateModelSnapshotAsync(Id jobId, Id snapshotId,
+			Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			UpdateModelSnapshotAsync(selector.InvokeOrDefault(new UpdateModelSnapshotDescriptor(jobId, snapshotId)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IUpdateModelSnapshotResponse> UpdateModelSnapshotAsync(IUpdateModelSnapshotRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IUpdateModelSnapshotRequest, UpdateModelSnapshotRequestParameters, UpdateModelSnapshotResponse, IUpdateModelSnapshotResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.XpackMlUpdateModelSnapshotDispatchAsync<UpdateModelSnapshotResponse>
-			);
+		/// <inheritdoc />
+		public Task<IUpdateModelSnapshotResponse> UpdateModelSnapshotAsync(IUpdateModelSnapshotRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IUpdateModelSnapshotRequest, UpdateModelSnapshotRequestParameters, UpdateModelSnapshotResponse,
+					IUpdateModelSnapshotResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.XpackMlUpdateModelSnapshotDispatchAsync<UpdateModelSnapshotResponse>
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/ValidateDetector/ElasticClient-ValidateDetector.cs b/src/Nest/XPack/MachineLearning/ValidateDetector/ElasticClient-ValidateDetector.cs
index 0b0c232fa9f..e1f3d160589 100644
--- a/src/Nest/XPack/MachineLearning/ValidateDetector/ElasticClient-ValidateDetector.cs
+++ b/src/Nest/XPack/MachineLearning/ValidateDetector/ElasticClient-ValidateDetector.cs
@@ -12,39 +12,49 @@ public partial interface IElasticClient
 		/// </summary>
 		IValidateDetectorResponse ValidateDetector<T>(Func<ValidateDetectorDescriptor<T>, IValidateDetectorRequest> selector) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IValidateDetectorResponse ValidateDetector(IValidateDetectorRequest request);
 
-		/// <inheritdoc/>
-		Task<IValidateDetectorResponse> ValidateDetectorAsync<T>(Func<ValidateDetectorDescriptor<T>, IValidateDetectorRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		/// <inheritdoc />
+		Task<IValidateDetectorResponse> ValidateDetectorAsync<T>(Func<ValidateDetectorDescriptor<T>, IValidateDetectorRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class;
 
-		/// <inheritdoc/>
-		Task<IValidateDetectorResponse> ValidateDetectorAsync(IValidateDetectorRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IValidateDetectorResponse> ValidateDetectorAsync(IValidateDetectorRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IValidateDetectorResponse ValidateDetector<T>(Func<ValidateDetectorDescriptor<T>, IValidateDetectorRequest> selector) where T : class =>
-			this.ValidateDetector(selector.InvokeOrDefault(new ValidateDetectorDescriptor<T>()));
+		/// <inheritdoc />
+		public IValidateDetectorResponse ValidateDetector<T>(Func<ValidateDetectorDescriptor<T>, IValidateDetectorRequest> selector)
+			where T : class =>
+			ValidateDetector(selector.InvokeOrDefault(new ValidateDetectorDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IValidateDetectorResponse ValidateDetector(IValidateDetectorRequest request) =>
-			this.Dispatcher.Dispatch<IValidateDetectorRequest, ValidateDetectorRequestParameters, ValidateDetectorResponse>(
+			Dispatcher.Dispatch<IValidateDetectorRequest, ValidateDetectorRequestParameters, ValidateDetectorResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlValidateDetectorDispatch<ValidateDetectorResponse>
+				LowLevelDispatch.XpackMlValidateDetectorDispatch<ValidateDetectorResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IValidateDetectorResponse> ValidateDetectorAsync<T>(Func<ValidateDetectorDescriptor<T>, IValidateDetectorRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class =>
-			this.ValidateDetectorAsync(selector.InvokeOrDefault(new ValidateDetectorDescriptor<T>()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IValidateDetectorResponse> ValidateDetectorAsync(IValidateDetectorRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IValidateDetectorRequest, ValidateDetectorRequestParameters, ValidateDetectorResponse, IValidateDetectorResponse>(
-				request,
-				cancellationToken,
-				this.LowLevelDispatch.XpackMlValidateDetectorDispatchAsync<ValidateDetectorResponse>
-			);
+		/// <inheritdoc />
+		public Task<IValidateDetectorResponse> ValidateDetectorAsync<T>(Func<ValidateDetectorDescriptor<T>, IValidateDetectorRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			ValidateDetectorAsync(selector.InvokeOrDefault(new ValidateDetectorDescriptor<T>()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IValidateDetectorResponse> ValidateDetectorAsync(IValidateDetectorRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IValidateDetectorRequest, ValidateDetectorRequestParameters, ValidateDetectorResponse, IValidateDetectorResponse>(
+					request,
+					cancellationToken,
+					LowLevelDispatch.XpackMlValidateDetectorDispatchAsync<ValidateDetectorResponse>
+				);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/ValidateDetector/ValidateDetectorResponse.cs b/src/Nest/XPack/MachineLearning/ValidateDetector/ValidateDetectorResponse.cs
index a81264f1253..f8c542e4975 100644
--- a/src/Nest/XPack/MachineLearning/ValidateDetector/ValidateDetectorResponse.cs
+++ b/src/Nest/XPack/MachineLearning/ValidateDetector/ValidateDetectorResponse.cs
@@ -1,8 +1,6 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public interface IValidateDetectorResponse : IAcknowledgedResponse {}
+	public interface IValidateDetectorResponse : IAcknowledgedResponse { }
 
-	public class ValidateDetectorResponse : AcknowledgedResponseBase, IValidateDetectorResponse {}
+	public class ValidateDetectorResponse : AcknowledgedResponseBase, IValidateDetectorResponse { }
 }
diff --git a/src/Nest/XPack/MachineLearning/ValidateJob/ElasticClient-ValidateJob.cs b/src/Nest/XPack/MachineLearning/ValidateJob/ElasticClient-ValidateJob.cs
index 94959ec533c..665b8e07274 100644
--- a/src/Nest/XPack/MachineLearning/ValidateJob/ElasticClient-ValidateJob.cs
+++ b/src/Nest/XPack/MachineLearning/ValidateJob/ElasticClient-ValidateJob.cs
@@ -12,39 +12,45 @@ public partial interface IElasticClient
 		/// </summary>
 		IValidateJobResponse ValidateJob<T>(Func<ValidateJobDescriptor<T>, IValidateJobRequest> selector) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IValidateJobResponse ValidateJob(IValidateJobRequest request);
 
-		/// <inheritdoc/>
-		Task<IValidateJobResponse> ValidateJobAsync<T>(Func<ValidateJobDescriptor<T>, IValidateJobRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		/// <inheritdoc />
+		Task<IValidateJobResponse> ValidateJobAsync<T>(Func<ValidateJobDescriptor<T>, IValidateJobRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class;
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IValidateJobResponse> ValidateJobAsync(IValidateJobRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IValidateJobResponse ValidateJob<T>(Func<ValidateJobDescriptor<T>, IValidateJobRequest> selector) where T : class =>
-			this.ValidateJob(selector.InvokeOrDefault(new ValidateJobDescriptor<T>()));
+			ValidateJob(selector.InvokeOrDefault(new ValidateJobDescriptor<T>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IValidateJobResponse ValidateJob(IValidateJobRequest request) =>
-			this.Dispatcher.Dispatch<IValidateJobRequest, ValidateJobRequestParameters, ValidateJobResponse>(
+			Dispatcher.Dispatch<IValidateJobRequest, ValidateJobRequestParameters, ValidateJobResponse>(
 				request,
-				this.LowLevelDispatch.XpackMlValidateDispatch<ValidateJobResponse>
+				LowLevelDispatch.XpackMlValidateDispatch<ValidateJobResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IValidateJobResponse> ValidateJobAsync<T>(Func<ValidateJobDescriptor<T>, IValidateJobRequest> selector, CancellationToken cancellationToken = default(CancellationToken))  where T : class =>
-			this.ValidateJobAsync(selector.InvokeOrDefault(new ValidateJobDescriptor<T>()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IValidateJobResponse> ValidateJobAsync(IValidateJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IValidateJobRequest, ValidateJobRequestParameters, ValidateJobResponse, IValidateJobResponse>(
+		/// <inheritdoc />
+		public Task<IValidateJobResponse> ValidateJobAsync<T>(Func<ValidateJobDescriptor<T>, IValidateJobRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) where T : class =>
+			ValidateJobAsync(selector.InvokeOrDefault(new ValidateJobDescriptor<T>()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IValidateJobResponse> ValidateJobAsync(IValidateJobRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IValidateJobRequest, ValidateJobRequestParameters, ValidateJobResponse, IValidateJobResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackMlValidateDispatchAsync<ValidateJobResponse>
+				LowLevelDispatch.XpackMlValidateDispatchAsync<ValidateJobResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/ValidateJob/ValidateJobRequest.cs b/src/Nest/XPack/MachineLearning/ValidateJob/ValidateJobRequest.cs
index c0a6fbbb96e..3f38312a0c7 100644
--- a/src/Nest/XPack/MachineLearning/ValidateJob/ValidateJobRequest.cs
+++ b/src/Nest/XPack/MachineLearning/ValidateJob/ValidateJobRequest.cs
@@ -59,16 +59,22 @@ public partial class ValidateJobRequest
 	{
 		/// <inheritdoc />
 		public IAnalysisConfig AnalysisConfig { get; set; }
+
 		/// <inheritdoc />
 		public IAnalysisLimits AnalysisLimits { get; set; }
+
 		/// <inheritdoc />
 		public IDataDescription DataDescription { get; set; }
+
 		/// <inheritdoc />
 		public string Description { get; set; }
+
 		/// <inheritdoc />
 		public IModelPlotConfig ModelPlotConfig { get; set; }
+
 		/// <inheritdoc />
 		public long? ModelSnapshotRetentionDays { get; set; }
+
 		/// <inheritdoc />
 		public IndexName ResultsIndexName { get; set; }
 	}
@@ -90,7 +96,8 @@ public ValidateJobDescriptor<T> AnalysisConfig(Func<AnalysisConfigDescriptor<T>,
 			Assign(a => a.AnalysisConfig = selector?.Invoke(new AnalysisConfigDescriptor<T>()));
 
 		/// <inheritdoc />
-		public ValidateJobDescriptor<T> AnalysisLimits(Func<AnalysisLimitsDescriptor, IAnalysisLimits> selector) => Assign(a => a.AnalysisLimits = selector?.Invoke(new AnalysisLimitsDescriptor()));
+		public ValidateJobDescriptor<T> AnalysisLimits(Func<AnalysisLimitsDescriptor, IAnalysisLimits> selector) =>
+			Assign(a => a.AnalysisLimits = selector?.Invoke(new AnalysisLimitsDescriptor()));
 
 		/// <inheritdoc />
 		public ValidateJobDescriptor<T> DataDescription(Func<DataDescriptionDescriptor<T>, IDataDescription> selector) =>
@@ -100,10 +107,12 @@ public ValidateJobDescriptor<T> DataDescription(Func<DataDescriptionDescriptor<T
 		public ValidateJobDescriptor<T> Description(string description) => Assign(a => a.Description = description);
 
 		/// <inheritdoc />
-		public ValidateJobDescriptor<T> ModelPlot(Func<ModelPlotConfigDescriptor<T>, IModelPlotConfig> selector) => Assign(a => a.ModelPlotConfig = selector?.Invoke(new ModelPlotConfigDescriptor<T>()));
+		public ValidateJobDescriptor<T> ModelPlot(Func<ModelPlotConfigDescriptor<T>, IModelPlotConfig> selector) =>
+			Assign(a => a.ModelPlotConfig = selector?.Invoke(new ModelPlotConfigDescriptor<T>()));
 
 		/// <inheritdoc />
-		public ValidateJobDescriptor<T> ModelSnapshotRetentionDays(long? modelSnapshotRetentionDays) => Assign(a => a.ModelSnapshotRetentionDays = modelSnapshotRetentionDays);
+		public ValidateJobDescriptor<T> ModelSnapshotRetentionDays(long? modelSnapshotRetentionDays) =>
+			Assign(a => a.ModelSnapshotRetentionDays = modelSnapshotRetentionDays);
 
 		/// <inheritdoc />
 		public ValidateJobDescriptor<T> ResultsIndexName(IndexName indexName) => Assign(a => a.ResultsIndexName = indexName);
diff --git a/src/Nest/XPack/MachineLearning/ValidateJob/ValidateJobResponse.cs b/src/Nest/XPack/MachineLearning/ValidateJob/ValidateJobResponse.cs
index 760995d97fa..a9120fbd5be 100644
--- a/src/Nest/XPack/MachineLearning/ValidateJob/ValidateJobResponse.cs
+++ b/src/Nest/XPack/MachineLearning/ValidateJob/ValidateJobResponse.cs
@@ -1,6 +1,6 @@
 namespace Nest
 {
-	public interface IValidateJobResponse : IAcknowledgedResponse {}
+	public interface IValidateJobResponse : IAcknowledgedResponse { }
 
-	public class ValidateJobResponse : AcknowledgedResponseBase, IValidateJobResponse {}
+	public class ValidateJobResponse : AcknowledgedResponseBase, IValidateJobResponse { }
 }
diff --git a/src/Nest/XPack/Migration/DeprecationInfo/DeprecationInfoResponse.cs b/src/Nest/XPack/Migration/DeprecationInfo/DeprecationInfoResponse.cs
index 1192d354324..027405ded56 100644
--- a/src/Nest/XPack/Migration/DeprecationInfo/DeprecationInfoResponse.cs
+++ b/src/Nest/XPack/Migration/DeprecationInfo/DeprecationInfoResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -18,17 +16,20 @@ public enum DeprecationWarningLevel
 		/// </summary>
 		[EnumMember(Value = "none")]
 		None,
+
 		/// <summary>
 		/// An advisory note that something has changed. No action needed.
 		/// </summary>
 		[EnumMember(Value = "info")]
 		Information,
+
 		/// <summary>
 		/// You can upgrade directly, but you are using deprecated functionality
 		/// which will not be available in the next major version.
 		/// </summary>
 		[EnumMember(Value = "warning")]
 		Warning,
+
 		/// <summary>
 		/// You cannot upgrade without fixing this problem.
 		/// </summary>
@@ -41,17 +42,17 @@ public enum DeprecationWarningLevel
 	/// </summary>
 	public class DeprecationInfo
 	{
+		[JsonProperty("details")]
+		public string Details { get; internal set; }
+
 		[JsonProperty("level")]
-		public DeprecationWarningLevel Level { get; internal set;  }
+		public DeprecationWarningLevel Level { get; internal set; }
 
 		[JsonProperty("message")]
 		public string Message { get; internal set; }
 
 		[JsonProperty("url")]
 		public string Url { get; internal set; }
-
-		[JsonProperty("details")]
-		public string Details { get; internal set; }
 	}
 
 	public interface IDeprecationInfoResponse : IResponse
@@ -59,20 +60,22 @@ public interface IDeprecationInfoResponse : IResponse
 		[JsonProperty("cluster_settings")]
 		IReadOnlyCollection<DeprecationInfo> ClusterSettings { get; }
 
-		[JsonProperty("node_settings")]
-		IReadOnlyCollection<DeprecationInfo> NodeSettings { get; }
-
 		[JsonProperty("index_settings")]
 		IReadOnlyDictionary<string, IReadOnlyCollection<DeprecationInfo>> IndexSettings { get; }
+
+		[JsonProperty("node_settings")]
+		IReadOnlyCollection<DeprecationInfo> NodeSettings { get; }
 	}
 
 	public class DeprecationInfoResponse : ResponseBase, IDeprecationInfoResponse
 	{
 		public IReadOnlyCollection<DeprecationInfo> ClusterSettings { get; internal set; } =
 			EmptyReadOnly<DeprecationInfo>.Collection;
-		public IReadOnlyCollection<DeprecationInfo> NodeSettings { get; internal set; } =
-			EmptyReadOnly<DeprecationInfo>.Collection;
+
 		public IReadOnlyDictionary<string, IReadOnlyCollection<DeprecationInfo>> IndexSettings { get; internal set; } =
 			EmptyReadOnly<string, IReadOnlyCollection<DeprecationInfo>>.Dictionary;
+
+		public IReadOnlyCollection<DeprecationInfo> NodeSettings { get; internal set; } =
+			EmptyReadOnly<DeprecationInfo>.Collection;
 	}
 }
diff --git a/src/Nest/XPack/Migration/DeprecationInfo/ElasticClient-DeprecationInfo.cs b/src/Nest/XPack/Migration/DeprecationInfo/ElasticClient-DeprecationInfo.cs
index 9d708a5b157..5780d4c8a26 100644
--- a/src/Nest/XPack/Migration/DeprecationInfo/ElasticClient-DeprecationInfo.cs
+++ b/src/Nest/XPack/Migration/DeprecationInfo/ElasticClient-DeprecationInfo.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -23,38 +23,46 @@ public partial interface IElasticClient
 		/// Retrieves information about different cluster, node, and index level settings that use deprecated
 		/// features that will be removed or changed in the next major version.
 		/// </summary>
-		Task<IDeprecationInfoResponse> DeprecationInfoAsync(Func<DeprecationInfoDescriptor, IDeprecationInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IDeprecationInfoResponse> DeprecationInfoAsync(Func<DeprecationInfoDescriptor, IDeprecationInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Retrieves information about different cluster, node, and index level settings that use deprecated
 		/// features that will be removed or changed in the next major version.
 		/// </summary>
-		Task<IDeprecationInfoResponse> DeprecationInfoAsync(IDeprecationInfoRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IDeprecationInfoResponse> DeprecationInfoAsync(IDeprecationInfoRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeprecationInfoResponse DeprecationInfo(Func<DeprecationInfoDescriptor, IDeprecationInfoRequest> selector = null) =>
-			this.DeprecationInfo(selector.InvokeOrDefault(new DeprecationInfoDescriptor()));
+			DeprecationInfo(selector.InvokeOrDefault(new DeprecationInfoDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeprecationInfoResponse DeprecationInfo(IDeprecationInfoRequest request) =>
-			this.Dispatcher.Dispatch<IDeprecationInfoRequest, DeprecationInfoRequestParameters, DeprecationInfoResponse>(
+			Dispatcher.Dispatch<IDeprecationInfoRequest, DeprecationInfoRequestParameters, DeprecationInfoResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackMigrationDeprecationsDispatch<DeprecationInfoResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMigrationDeprecationsDispatch<DeprecationInfoResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeprecationInfoResponse> DeprecationInfoAsync(Func<DeprecationInfoDescriptor, IDeprecationInfoRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeprecationInfoAsync(selector.InvokeOrDefault(new DeprecationInfoDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IDeprecationInfoResponse> DeprecationInfoAsync(Func<DeprecationInfoDescriptor, IDeprecationInfoRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeprecationInfoAsync(selector.InvokeOrDefault(new DeprecationInfoDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeprecationInfoResponse> DeprecationInfoAsync(IDeprecationInfoRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeprecationInfoRequest, DeprecationInfoRequestParameters, DeprecationInfoResponse, IDeprecationInfoResponse>(
+		/// <inheritdoc />
+		public Task<IDeprecationInfoResponse> DeprecationInfoAsync(IDeprecationInfoRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeprecationInfoRequest, DeprecationInfoRequestParameters, DeprecationInfoResponse, IDeprecationInfoResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMigrationDeprecationsDispatchAsync<DeprecationInfoResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackMigrationDeprecationsDispatchAsync<DeprecationInfoResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Migration/MigrationAssistance/ElasticClient-MigrationAssistance.cs b/src/Nest/XPack/Migration/MigrationAssistance/ElasticClient-MigrationAssistance.cs
index 054e8f77eb3..0561557399b 100644
--- a/src/Nest/XPack/Migration/MigrationAssistance/ElasticClient-MigrationAssistance.cs
+++ b/src/Nest/XPack/Migration/MigrationAssistance/ElasticClient-MigrationAssistance.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -23,38 +23,49 @@ public partial interface IElasticClient
 		/// Analyzes existing indices in the cluster and returns the information about indices that
 		/// require some changes before the cluster can be upgraded to the next major version.
 		/// </summary>
-		Task<IMigrationAssistanceResponse> MigrationAssistanceAsync(Func<MigrationAssistanceDescriptor, IMigrationAssistanceRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IMigrationAssistanceResponse> MigrationAssistanceAsync(Func<MigrationAssistanceDescriptor, IMigrationAssistanceRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Analyzes existing indices in the cluster and returns the information about indices that
 		/// require some changes before the cluster can be upgraded to the next major version.
 		/// </summary>
-		Task<IMigrationAssistanceResponse> MigrationAssistanceAsync(IMigrationAssistanceRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IMigrationAssistanceResponse> MigrationAssistanceAsync(IMigrationAssistanceRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IMigrationAssistanceResponse MigrationAssistance(Func<MigrationAssistanceDescriptor, IMigrationAssistanceRequest> selector = null) =>
-			this.MigrationAssistance(selector.InvokeOrDefault(new MigrationAssistanceDescriptor()));
+			MigrationAssistance(selector.InvokeOrDefault(new MigrationAssistanceDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IMigrationAssistanceResponse MigrationAssistance(IMigrationAssistanceRequest request) =>
-			this.Dispatcher.Dispatch<IMigrationAssistanceRequest, MigrationAssistanceRequestParameters, MigrationAssistanceResponse>(
+			Dispatcher.Dispatch<IMigrationAssistanceRequest, MigrationAssistanceRequestParameters, MigrationAssistanceResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackMigrationGetAssistanceDispatch<MigrationAssistanceResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMigrationGetAssistanceDispatch<MigrationAssistanceResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IMigrationAssistanceResponse> MigrationAssistanceAsync(Func<MigrationAssistanceDescriptor, IMigrationAssistanceRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.MigrationAssistanceAsync(selector.InvokeOrDefault(new MigrationAssistanceDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IMigrationAssistanceResponse> MigrationAssistanceAsync(
+			Func<MigrationAssistanceDescriptor, IMigrationAssistanceRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			MigrationAssistanceAsync(selector.InvokeOrDefault(new MigrationAssistanceDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IMigrationAssistanceResponse> MigrationAssistanceAsync(IMigrationAssistanceRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IMigrationAssistanceRequest, MigrationAssistanceRequestParameters, MigrationAssistanceResponse, IMigrationAssistanceResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMigrationGetAssistanceDispatchAsync<MigrationAssistanceResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IMigrationAssistanceResponse> MigrationAssistanceAsync(IMigrationAssistanceRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IMigrationAssistanceRequest, MigrationAssistanceRequestParameters, MigrationAssistanceResponse,
+					IMigrationAssistanceResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackMigrationGetAssistanceDispatchAsync<MigrationAssistanceResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/Migration/MigrationAssistance/MigrationAssistanceResponse.cs b/src/Nest/XPack/Migration/MigrationAssistance/MigrationAssistanceResponse.cs
index 483f5cb0977..58d6a60088f 100644
--- a/src/Nest/XPack/Migration/MigrationAssistance/MigrationAssistanceResponse.cs
+++ b/src/Nest/XPack/Migration/MigrationAssistance/MigrationAssistanceResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -22,7 +20,7 @@ public class MigrationAssistanceResponse : ResponseBase, IMigrationAssistanceRes
 	public class IndexUpgradeCheck
 	{
 		[JsonProperty("action_required")]
-		public UpgradeActionRequired ActionRequired { get; internal set;  }
+		public UpgradeActionRequired ActionRequired { get; internal set; }
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
diff --git a/src/Nest/XPack/Migration/MigrationUpgrade/ElasticClient-MigrationUpgrade.cs b/src/Nest/XPack/Migration/MigrationUpgrade/ElasticClient-MigrationUpgrade.cs
index 53ffe042b0c..b67c81dc354 100644
--- a/src/Nest/XPack/Migration/MigrationUpgrade/ElasticClient-MigrationUpgrade.cs
+++ b/src/Nest/XPack/Migration/MigrationUpgrade/ElasticClient-MigrationUpgrade.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -23,38 +23,50 @@ public partial interface IElasticClient
 		/// Performs the upgrade of internal indices to make them compatible with the next major version.
 		/// Indices must be upgraded one at a time.
 		/// </summary>
-		Task<IMigrationUpgradeResponse> MigrationUpgradeAsync(IndexName index, Func<MigrationUpgradeDescriptor, IMigrationUpgradeRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IMigrationUpgradeResponse> MigrationUpgradeAsync(IndexName index,
+			Func<MigrationUpgradeDescriptor, IMigrationUpgradeRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
 		/// <summary>
 		/// Performs the upgrade of internal indices to make them compatible with the next major version.
 		/// Indices must be upgraded one at a time.
 		/// </summary>
-		Task<IMigrationUpgradeResponse> MigrationUpgradeAsync(IMigrationUpgradeRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		Task<IMigrationUpgradeResponse> MigrationUpgradeAsync(IMigrationUpgradeRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IMigrationUpgradeResponse MigrationUpgrade(IndexName index, Func<MigrationUpgradeDescriptor, IMigrationUpgradeRequest> selector = null) =>
-			this.MigrationUpgrade(selector.InvokeOrDefault(new MigrationUpgradeDescriptor(index)));
+		/// <inheritdoc />
+		public IMigrationUpgradeResponse MigrationUpgrade(IndexName index, Func<MigrationUpgradeDescriptor, IMigrationUpgradeRequest> selector = null
+		) =>
+			MigrationUpgrade(selector.InvokeOrDefault(new MigrationUpgradeDescriptor(index)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IMigrationUpgradeResponse MigrationUpgrade(IMigrationUpgradeRequest request) =>
-			this.Dispatcher.Dispatch<IMigrationUpgradeRequest, MigrationUpgradeRequestParameters, MigrationUpgradeResponse>(
+			Dispatcher.Dispatch<IMigrationUpgradeRequest, MigrationUpgradeRequestParameters, MigrationUpgradeResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackMigrationUpgradeDispatch<MigrationUpgradeResponse>(p)
+				(p, d) => LowLevelDispatch.XpackMigrationUpgradeDispatch<MigrationUpgradeResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IMigrationUpgradeResponse> MigrationUpgradeAsync(IndexName index, Func<MigrationUpgradeDescriptor, IMigrationUpgradeRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.MigrationUpgradeAsync(selector.InvokeOrDefault(new MigrationUpgradeDescriptor(index)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IMigrationUpgradeResponse> MigrationUpgradeAsync(IndexName index,
+			Func<MigrationUpgradeDescriptor, IMigrationUpgradeRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			MigrationUpgradeAsync(selector.InvokeOrDefault(new MigrationUpgradeDescriptor(index)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IMigrationUpgradeResponse> MigrationUpgradeAsync(IMigrationUpgradeRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IMigrationUpgradeRequest, MigrationUpgradeRequestParameters, MigrationUpgradeResponse, IMigrationUpgradeResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackMigrationUpgradeDispatchAsync<MigrationUpgradeResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IMigrationUpgradeResponse> MigrationUpgradeAsync(IMigrationUpgradeRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IMigrationUpgradeRequest, MigrationUpgradeRequestParameters, MigrationUpgradeResponse, IMigrationUpgradeResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackMigrationUpgradeDispatchAsync<MigrationUpgradeResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/Migration/MigrationUpgrade/MigrationUpgradeResponse.cs b/src/Nest/XPack/Migration/MigrationUpgrade/MigrationUpgradeResponse.cs
index be463894264..a1cc86d3de8 100644
--- a/src/Nest/XPack/Migration/MigrationUpgrade/MigrationUpgradeResponse.cs
+++ b/src/Nest/XPack/Migration/MigrationUpgrade/MigrationUpgradeResponse.cs
@@ -1,75 +1,71 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Serialization;
+using System.Collections.Generic;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
 	public interface IMigrationUpgradeResponse : IResponse
 	{
+		[JsonProperty("batches")]
+		long Batches { get; }
+
+		[JsonProperty("created")]
+		long Created { get; }
+
+		[JsonProperty("deleted")]
+		long Deleted { get; }
+
+		[JsonProperty("failures")]
+		IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; }
+
+		[JsonProperty("noops")]
+		long Noops { get; }
+
+		[JsonProperty("retries")]
+		Retries Retries { get; }
+
 		/// <summary>
-		/// The id of the task if <see cref="MigrationUpgradeRequestParameters.WaitForCompletion"/>
+		/// The id of the task if <see cref="MigrationUpgradeRequestParameters.WaitForCompletion" />
 		/// is set to <c>false</c> on the request
 		/// </summary>
 		[JsonProperty("task")]
 		TaskId Task { get; }
 
-		[JsonProperty("took")]
-		long Took { get; }
+		[JsonProperty("throttled_millis")]
+		long ThrottledMilliseconds { get; }
 
 		[JsonProperty("timed_out")]
 		bool TimedOut { get; }
 
+		[JsonProperty("took")]
+		long Took { get; }
+
 		[JsonProperty("total")]
 		long Total { get; }
 
 		[JsonProperty("updated")]
 		long Updated { get; }
 
-		[JsonProperty("created")]
-		long Created { get; }
-
-		[JsonProperty("deleted")]
-		long Deleted { get; }
-
-		[JsonProperty("batches")]
-		long Batches { get; }
-
 		[JsonProperty("version_conflicts")]
 		long VersionConflicts { get; }
-
-		[JsonProperty("noops")]
-		long Noops { get; }
-
-		[JsonProperty("retries")]
-		Retries Retries { get; }
-
-		[JsonProperty("throttled_millis")]
-		long ThrottledMilliseconds { get; }
-
-		[JsonProperty("failures")]
-		IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; }
 	}
 
 	public class MigrationUpgradeResponse : ResponseBase, IMigrationUpgradeResponse
 	{
-		public override bool IsValid => this.ApiCall?.HttpStatusCode == 200 && !this.Failures.HasAny();
+		public long Batches { get; internal set; }
+		public long Created { get; internal set; }
+		public long Deleted { get; internal set; }
+		public IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; internal set; }
+		public override bool IsValid => ApiCall?.HttpStatusCode == 200 && !Failures.HasAny();
+		public long Noops { get; internal set; }
+		public Retries Retries { get; internal set; }
 
 		public TaskId Task { get; internal set; }
-		public long Took { get; internal set; }
+		public long ThrottledMilliseconds { get; internal set; }
 		public bool TimedOut { get; internal set; }
+		public long Took { get; internal set; }
 		public long Total { get; internal set; }
 		public long Updated { get; internal set; }
-		public long Created { get; internal set; }
-		public long Deleted { get; internal set; }
-		public long Batches { get; internal set; }
 		public long VersionConflicts { get; internal set; }
-		public long Noops { get; internal set; }
-		public Retries Retries { get; internal set; }
-		public long ThrottledMilliseconds { get; internal set; }
-		public IReadOnlyCollection<BulkIndexByScrollFailure> Failures { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/RollUp/CreateRollupJob/CreateRollupJobRequest.cs b/src/Nest/XPack/RollUp/CreateRollupJob/CreateRollupJobRequest.cs
index 8799355582d..e86957239bc 100644
--- a/src/Nest/XPack/RollUp/CreateRollupJob/CreateRollupJobRequest.cs
+++ b/src/Nest/XPack/RollUp/CreateRollupJob/CreateRollupJobRequest.cs
@@ -12,17 +12,21 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<CreateRollupJobRequest>))]
 	public partial interface ICreateRollupJobRequest
 	{
+		/// <summary> A cron string which defines when the rollup job should be executed. </summary>
+		[JsonProperty("cron")]
+		string Cron { get; set; }
+
+		/// <summary> Defines the grouping fields that are defined for this rollup job </summary>
+		[JsonProperty("groups")]
+		IRollupGroupings Groups { get; set; }
+
 		/// <summary> The index, or index pattern, that you wish to rollup. Supports wildcard-style patterns (logstash-*). </summary>
 		[JsonProperty("index_pattern")]
 		string IndexPattern { get; set; }
 
-		/// <summary> The index that you wish to store rollup results into. Can be shared with other rollup jobs. </summary>
-		[JsonProperty("rollup_index")]
-		IndexName RollupIndex { get; set; }
-
-		/// <summary> A cron string which defines when the rollup job should be executed. </summary>
-		[JsonProperty("cron")]
-		string Cron { get; set; }
+		/// <summary> Defines the metrics that should be collected for each grouping tuple </summary>
+		[JsonProperty("metrics")]
+		IEnumerable<IRollupFieldMetric> Metrics { get; set; }
 
 		/// <summary>
 		/// The number of bucket results that should be processed on each iteration of the rollup indexer.
@@ -31,41 +35,43 @@ public partial interface ICreateRollupJobRequest
 		[JsonProperty("page_size")]
 		long? PageSize { get; set; }
 
-		/// <summary> Defines the grouping fields that are defined for this rollup job </summary>
-		[JsonProperty("groups")]
-		IRollupGroupings Groups { get; set; }
-
-		/// <summary> Defines the metrics that should be collected for each grouping tuple </summary>
-		[JsonProperty("metrics")]
-		IEnumerable<IRollupFieldMetric> Metrics { get; set; }
+		/// <summary> The index that you wish to store rollup results into. Can be shared with other rollup jobs. </summary>
+		[JsonProperty("rollup_index")]
+		IndexName RollupIndex { get; set; }
 	}
 
-	/// <inheritdoc cref="ICreateRollupJobRequest"/>
+	/// <inheritdoc cref="ICreateRollupJobRequest" />
 	public partial class CreateRollupJobRequest
 	{
-		/// <inheritdoc cref="ICreateRollupJobRequest.IndexPattern">
-		public string IndexPattern { get; set; }
-		/// <inheritdoc cref="ICreateRollupJobRequest.RollupIndex">
-		public IndexName RollupIndex { get; set; }
 		/// <inheritdoc cref="ICreateRollupJobRequest.Cron">
 		public string Cron { get; set; }
-		/// <inheritdoc cref="ICreateRollupJobRequest.PageSize">
-		public long? PageSize { get; set; }
+
 		/// <inheritdoc cref="ICreateRollupJobRequest.Groups">
 		public IRollupGroupings Groups { get; set; }
+
+		/// <inheritdoc cref="ICreateRollupJobRequest.IndexPattern">
+		public string IndexPattern { get; set; }
+
 		/// <inheritdoc cref="ICreateRollupJobRequest.Metrics">
 		public IEnumerable<IRollupFieldMetric> Metrics { get; set; }
+
+		/// <inheritdoc cref="ICreateRollupJobRequest.PageSize">
+		public long? PageSize { get; set; }
+
+		/// <inheritdoc cref="ICreateRollupJobRequest.RollupIndex">
+		public IndexName RollupIndex { get; set; }
 	}
 
-	/// <inheritdoc cref="ICreateRollupJobRequest"/>>
+	/// <inheritdoc cref="ICreateRollupJobRequest" />
+	/// >
 	public partial class CreateRollupJobDescriptor<T> where T : class
 	{
-		string ICreateRollupJobRequest.IndexPattern { get; set; }
-		IndexName ICreateRollupJobRequest.RollupIndex { get; set; }
 		string ICreateRollupJobRequest.Cron { get; set; }
-		long? ICreateRollupJobRequest.PageSize { get; set; }
 		IRollupGroupings ICreateRollupJobRequest.Groups { get; set; }
+		string ICreateRollupJobRequest.IndexPattern { get; set; }
 		IEnumerable<IRollupFieldMetric> ICreateRollupJobRequest.Metrics { get; set; }
+		long? ICreateRollupJobRequest.PageSize { get; set; }
+		IndexName ICreateRollupJobRequest.RollupIndex { get; set; }
 
 		/// <inheritdoc cref="ICreateRollupJobRequest.IndexPattern">
 		public CreateRollupJobDescriptor<T> IndexPattern(string indexPattern) => Assign(a => a.IndexPattern = indexPattern);
@@ -84,7 +90,7 @@ public CreateRollupJobDescriptor<T> Groups(Func<RollupGroupingsDescriptor<T>, IR
 			Assign(a => a.Groups = selector?.Invoke(new RollupGroupingsDescriptor<T>()));
 
 		/// <inheritdoc cref="ICreateRollupJobRequest.Metrics">
-		public CreateRollupJobDescriptor<T> Metrics(Func<RollupFieldMetricsDescriptor<T>, IPromise<IList<IRollupFieldMetric> >> selector) =>
+		public CreateRollupJobDescriptor<T> Metrics(Func<RollupFieldMetricsDescriptor<T>, IPromise<IList<IRollupFieldMetric>>> selector) =>
 			Assign(a => a.Metrics = selector?.Invoke(new RollupFieldMetricsDescriptor<T>())?.Value);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/CreateRollupJob/CreateRollupJobResponse.cs b/src/Nest/XPack/RollUp/CreateRollupJob/CreateRollupJobResponse.cs
index 925573f2dea..55f5ed2230b 100644
--- a/src/Nest/XPack/RollUp/CreateRollupJob/CreateRollupJobResponse.cs
+++ b/src/Nest/XPack/RollUp/CreateRollupJob/CreateRollupJobResponse.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface ICreateRollupJobResponse : IAcknowledgedResponse {}
+	public interface ICreateRollupJobResponse : IAcknowledgedResponse { }
 
-	public class CreateRollupJobResponse : AcknowledgedResponseBase, ICreateRollupJobResponse {}
+	public class CreateRollupJobResponse : AcknowledgedResponseBase, ICreateRollupJobResponse { }
 }
diff --git a/src/Nest/XPack/RollUp/CreateRollupJob/ElasticClient-CreateRollupJob.cs b/src/Nest/XPack/RollUp/CreateRollupJob/ElasticClient-CreateRollupJob.cs
index 4b1760bcc38..03bc07d54d3 100644
--- a/src/Nest/XPack/RollUp/CreateRollupJob/ElasticClient-CreateRollupJob.cs
+++ b/src/Nest/XPack/RollUp/CreateRollupJob/ElasticClient-CreateRollupJob.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -13,43 +13,44 @@ public partial interface IElasticClient
 		ICreateRollupJobResponse CreateRollupJob<T>(Id id, Func<CreateRollupJobDescriptor<T>, ICreateRollupJobRequest> selector)
 			where T : class;
 
-		/// <inheritdoc cref="CreateRollupJob{T}"/>
+		/// <inheritdoc cref="CreateRollupJob{T}" />
 		ICreateRollupJobResponse CreateRollupJob(ICreateRollupJobRequest request);
 
-		/// <inheritdoc cref="CreateRollupJob{T}"/>
+		/// <inheritdoc cref="CreateRollupJob{T}" />
 		Task<ICreateRollupJobResponse> CreateRollupJobAsync<T>(Id id,
-			Func<CreateRollupJobDescriptor<T>, ICreateRollupJobRequest> selector, CancellationToken cancellationToken = default)
+			Func<CreateRollupJobDescriptor<T>, ICreateRollupJobRequest> selector, CancellationToken cancellationToken = default
+		)
 			where T : class;
 
-		/// <inheritdoc cref="CreateRollupJob{T}"/>
+		/// <inheritdoc cref="CreateRollupJob{T}" />
 		Task<ICreateRollupJobResponse> CreateRollupJobAsync(ICreateRollupJobRequest request, CancellationToken cancellationToken = default);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICreateRollupJobResponse CreateRollupJob<T>(Id id, Func<CreateRollupJobDescriptor<T>, ICreateRollupJobRequest> selector)
-			where T : class => this.CreateRollupJob(selector.InvokeOrDefault(new CreateRollupJobDescriptor<T>(id)));
+			where T : class => CreateRollupJob(selector.InvokeOrDefault(new CreateRollupJobDescriptor<T>(id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public ICreateRollupJobResponse CreateRollupJob(ICreateRollupJobRequest request) =>
-			this.Dispatcher.Dispatch<ICreateRollupJobRequest, CreateRollupJobRequestParameters, CreateRollupJobResponse>(
+			Dispatcher.Dispatch<ICreateRollupJobRequest, CreateRollupJobRequestParameters, CreateRollupJobResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackRollupPutJobDispatch<CreateRollupJobResponse>(p, d)
+				(p, d) => LowLevelDispatch.XpackRollupPutJobDispatch<CreateRollupJobResponse>(p, d)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICreateRollupJobResponse> CreateRollupJobAsync<T>(
 			Id id, Func<CreateRollupJobDescriptor<T>, ICreateRollupJobRequest> selector, CancellationToken cancellationToken = default
 		) where T : class =>
-			this.CreateRollupJobAsync(selector.InvokeOrDefault(new CreateRollupJobDescriptor<T>(id)), cancellationToken);
+			CreateRollupJobAsync(selector.InvokeOrDefault(new CreateRollupJobDescriptor<T>(id)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<ICreateRollupJobResponse> CreateRollupJobAsync(ICreateRollupJobRequest request, CancellationToken cancellationToken = default) =>
-			this.Dispatcher.DispatchAsync<ICreateRollupJobRequest, CreateRollupJobRequestParameters, CreateRollupJobResponse, ICreateRollupJobResponse>(
+			Dispatcher.DispatchAsync<ICreateRollupJobRequest, CreateRollupJobRequestParameters, CreateRollupJobResponse, ICreateRollupJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackRollupPutJobDispatchAsync<CreateRollupJobResponse>(p, d, c)
+				(p, d, c) => LowLevelDispatch.XpackRollupPutJobDispatchAsync<CreateRollupJobResponse>(p, d, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/DeleteRollupJob/DeleteRollupJobRequest.cs b/src/Nest/XPack/RollUp/DeleteRollupJob/DeleteRollupJobRequest.cs
index f2e183d7a9a..8ebb632c338 100644
--- a/src/Nest/XPack/RollUp/DeleteRollupJob/DeleteRollupJobRequest.cs
+++ b/src/Nest/XPack/RollUp/DeleteRollupJob/DeleteRollupJobRequest.cs
@@ -1,15 +1,9 @@
 namespace Nest
 {
 	[MapsApi("xpack.rollup.delete_job.json")]
-	public partial interface IDeleteRollupJobRequest
-	{
-	}
+	public partial interface IDeleteRollupJobRequest { }
 
-	public partial class DeleteRollupJobRequest
-	{
-	}
+	public partial class DeleteRollupJobRequest { }
 
-	public partial class DeleteRollupJobDescriptor
-	{
-	}
+	public partial class DeleteRollupJobDescriptor { }
 }
diff --git a/src/Nest/XPack/RollUp/DeleteRollupJob/DeleteRollupJobResponse.cs b/src/Nest/XPack/RollUp/DeleteRollupJob/DeleteRollupJobResponse.cs
index c23ce78dc1b..c731b19a183 100644
--- a/src/Nest/XPack/RollUp/DeleteRollupJob/DeleteRollupJobResponse.cs
+++ b/src/Nest/XPack/RollUp/DeleteRollupJob/DeleteRollupJobResponse.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface IDeleteRollupJobResponse : IAcknowledgedResponse {}
+	public interface IDeleteRollupJobResponse : IAcknowledgedResponse { }
 
-	public class DeleteRollupJobResponse : AcknowledgedResponseBase, IDeleteRollupJobResponse {}
+	public class DeleteRollupJobResponse : AcknowledgedResponseBase, IDeleteRollupJobResponse { }
 }
diff --git a/src/Nest/XPack/RollUp/DeleteRollupJob/ElasticClient-DeleteRollupJob.cs b/src/Nest/XPack/RollUp/DeleteRollupJob/ElasticClient-DeleteRollupJob.cs
index 9d5c92a089b..672badd5850 100644
--- a/src/Nest/XPack/RollUp/DeleteRollupJob/ElasticClient-DeleteRollupJob.cs
+++ b/src/Nest/XPack/RollUp/DeleteRollupJob/ElasticClient-DeleteRollupJob.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -18,7 +18,8 @@ public partial interface IElasticClient
 
 		/// <inheritdoc cref="DeleteRollupJob(Nest.Id,System.Func{Nest.DeleteRollupJobDescriptor,Nest.IDeleteRollupJobRequest})" />
 		Task<IDeleteRollupJobResponse> DeleteRollupJobAsync(Id id,
-			Func<DeleteRollupJobDescriptor, IDeleteRollupJobRequest> selector = null, CancellationToken cancellationToken = default);
+			Func<DeleteRollupJobDescriptor, IDeleteRollupJobRequest> selector = null, CancellationToken cancellationToken = default
+		);
 
 		/// <inheritdoc cref="DeleteRollupJob(Nest.Id,System.Func{Nest.DeleteRollupJobDescriptor,Nest.IDeleteRollupJobRequest})" />
 		Task<IDeleteRollupJobResponse> DeleteRollupJobAsync(IDeleteRollupJobRequest request, CancellationToken cancellationToken = default);
@@ -26,29 +27,29 @@ Task<IDeleteRollupJobResponse> DeleteRollupJobAsync(Id id,
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteRollupJobResponse DeleteRollupJob(Id id, Func<DeleteRollupJobDescriptor, IDeleteRollupJobRequest> selector = null) =>
-			this.DeleteRollupJob(selector.InvokeOrDefault(new DeleteRollupJobDescriptor(id)));
+			DeleteRollupJob(selector.InvokeOrDefault(new DeleteRollupJobDescriptor(id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteRollupJobResponse DeleteRollupJob(IDeleteRollupJobRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteRollupJobRequest, DeleteRollupJobRequestParameters, DeleteRollupJobResponse>(
+			Dispatcher.Dispatch<IDeleteRollupJobRequest, DeleteRollupJobRequestParameters, DeleteRollupJobResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackRollupDeleteJobDispatch<DeleteRollupJobResponse>(p)
+				(p, d) => LowLevelDispatch.XpackRollupDeleteJobDispatch<DeleteRollupJobResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IDeleteRollupJobResponse> DeleteRollupJobAsync(
 			Id id, Func<DeleteRollupJobDescriptor, IDeleteRollupJobRequest> selector = null, CancellationToken cancellationToken = default
-		)  =>
-			this.DeleteRollupJobAsync(selector.InvokeOrDefault(new DeleteRollupJobDescriptor(id)), cancellationToken);
+		) =>
+			DeleteRollupJobAsync(selector.InvokeOrDefault(new DeleteRollupJobDescriptor(id)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IDeleteRollupJobResponse> DeleteRollupJobAsync(IDeleteRollupJobRequest request, CancellationToken cancellationToken = default) =>
-			this.Dispatcher.DispatchAsync<IDeleteRollupJobRequest, DeleteRollupJobRequestParameters, DeleteRollupJobResponse, IDeleteRollupJobResponse>(
+			Dispatcher.DispatchAsync<IDeleteRollupJobRequest, DeleteRollupJobRequestParameters, DeleteRollupJobResponse, IDeleteRollupJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackRollupDeleteJobDispatchAsync<DeleteRollupJobResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackRollupDeleteJobDispatchAsync<DeleteRollupJobResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/GetRollupCapabilities/ElasticClient-GetRollupCapabilities.cs b/src/Nest/XPack/RollUp/GetRollupCapabilities/ElasticClient-GetRollupCapabilities.cs
index 09b3fcb019c..5df70ce92aa 100644
--- a/src/Nest/XPack/RollUp/GetRollupCapabilities/ElasticClient-GetRollupCapabilities.cs
+++ b/src/Nest/XPack/RollUp/GetRollupCapabilities/ElasticClient-GetRollupCapabilities.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -22,41 +22,53 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetRollupCapabilitiesResponse GetRollupCapabilities(Func<GetRollupCapabilitiesDescriptor, IGetRollupCapabilitiesRequest> selector = null);
 
-		/// <inheritdoc cref="GetRollupCapabilities(System.Func{Nest.GetRollupCapabilitiesDescriptor,Nest.IGetRollupCapabilitiesRequest})"/>
+		/// <inheritdoc cref="GetRollupCapabilities(System.Func{Nest.GetRollupCapabilitiesDescriptor,Nest.IGetRollupCapabilitiesRequest})" />
 		IGetRollupCapabilitiesResponse GetRollupCapabilities(IGetRollupCapabilitiesRequest request);
 
-		/// <inheritdoc cref="GetRollupCapabilities(System.Func{Nest.GetRollupCapabilitiesDescriptor,Nest.IGetRollupCapabilitiesRequest})"/>
+		/// <inheritdoc cref="GetRollupCapabilities(System.Func{Nest.GetRollupCapabilitiesDescriptor,Nest.IGetRollupCapabilitiesRequest})" />
 		Task<IGetRollupCapabilitiesResponse> GetRollupCapabilitiesAsync(
-			Func<GetRollupCapabilitiesDescriptor, IGetRollupCapabilitiesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+			Func<GetRollupCapabilitiesDescriptor, IGetRollupCapabilitiesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc cref="GetRollupCapabilities(System.Func{Nest.GetRollupCapabilitiesDescriptor,Nest.IGetRollupCapabilitiesRequest})"/>
-		Task<IGetRollupCapabilitiesResponse> GetRollupCapabilitiesAsync(IGetRollupCapabilitiesRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="GetRollupCapabilities(System.Func{Nest.GetRollupCapabilitiesDescriptor,Nest.IGetRollupCapabilitiesRequest})" />
+		Task<IGetRollupCapabilitiesResponse> GetRollupCapabilitiesAsync(IGetRollupCapabilitiesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IGetRollupCapabilitiesResponse GetRollupCapabilities(Func<GetRollupCapabilitiesDescriptor, IGetRollupCapabilitiesRequest> selector = null) =>
-			this.GetRollupCapabilities(selector.InvokeOrDefault(new GetRollupCapabilitiesDescriptor()));
+		/// <inheritdoc />
+		public IGetRollupCapabilitiesResponse GetRollupCapabilities(
+			Func<GetRollupCapabilitiesDescriptor, IGetRollupCapabilitiesRequest> selector = null
+		) =>
+			GetRollupCapabilities(selector.InvokeOrDefault(new GetRollupCapabilitiesDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRollupCapabilitiesResponse GetRollupCapabilities(IGetRollupCapabilitiesRequest request) =>
-			this.Dispatcher.Dispatch<IGetRollupCapabilitiesRequest, GetRollupCapabilitiesRequestParameters, GetRollupCapabilitiesResponse>(
+			Dispatcher.Dispatch<IGetRollupCapabilitiesRequest, GetRollupCapabilitiesRequestParameters, GetRollupCapabilitiesResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackRollupGetRollupCapsDispatch<GetRollupCapabilitiesResponse>(p)
+				(p, d) => LowLevelDispatch.XpackRollupGetRollupCapsDispatch<GetRollupCapabilitiesResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetRollupCapabilitiesResponse> GetRollupCapabilitiesAsync(
-			Func<GetRollupCapabilitiesDescriptor, IGetRollupCapabilitiesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))  =>
-			this.GetRollupCapabilitiesAsync(selector.InvokeOrDefault(new GetRollupCapabilitiesDescriptor()), cancellationToken);
+			Func<GetRollupCapabilitiesDescriptor, IGetRollupCapabilitiesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetRollupCapabilitiesAsync(selector.InvokeOrDefault(new GetRollupCapabilitiesDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetRollupCapabilitiesResponse> GetRollupCapabilitiesAsync(IGetRollupCapabilitiesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetRollupCapabilitiesRequest, GetRollupCapabilitiesRequestParameters, GetRollupCapabilitiesResponse, IGetRollupCapabilitiesResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackRollupGetRollupCapsDispatchAsync<GetRollupCapabilitiesResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IGetRollupCapabilitiesResponse> GetRollupCapabilitiesAsync(IGetRollupCapabilitiesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetRollupCapabilitiesRequest, GetRollupCapabilitiesRequestParameters, GetRollupCapabilitiesResponse,
+					IGetRollupCapabilitiesResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackRollupGetRollupCapsDispatchAsync<GetRollupCapabilitiesResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/GetRollupCapabilities/GetRollupCapabilitiesRequest.cs b/src/Nest/XPack/RollUp/GetRollupCapabilities/GetRollupCapabilitiesRequest.cs
index 58c928a7c70..fc2dbbc4fe5 100644
--- a/src/Nest/XPack/RollUp/GetRollupCapabilities/GetRollupCapabilitiesRequest.cs
+++ b/src/Nest/XPack/RollUp/GetRollupCapabilities/GetRollupCapabilitiesRequest.cs
@@ -1,15 +1,9 @@
 namespace Nest
 {
 	[MapsApi("xpack.rollup.get_rollup_caps.json")]
-	public partial interface IGetRollupCapabilitiesRequest
-	{
-	}
+	public partial interface IGetRollupCapabilitiesRequest { }
 
-	public partial class GetRollupCapabilitiesRequest
-	{
-	}
+	public partial class GetRollupCapabilitiesRequest { }
 
-	public partial class GetRollupCapabilitiesDescriptor
-	{
-	}
+	public partial class GetRollupCapabilitiesDescriptor { }
 }
diff --git a/src/Nest/XPack/RollUp/GetRollupCapabilities/GetRollupCapabilitiesResponse.cs b/src/Nest/XPack/RollUp/GetRollupCapabilities/GetRollupCapabilitiesResponse.cs
index 96088aa31b6..f5bf5c55967 100644
--- a/src/Nest/XPack/RollUp/GetRollupCapabilities/GetRollupCapabilitiesResponse.cs
+++ b/src/Nest/XPack/RollUp/GetRollupCapabilities/GetRollupCapabilitiesResponse.cs
@@ -21,42 +21,41 @@ public class RollupCapabilities
 	{
 		[JsonProperty("rollup_jobs")]
 		public IReadOnlyCollection<RollupCapabilitiesJob> RollupJobs { get; internal set; }
-
 	}
 
 	public class RollupCapabilitiesJob
 	{
+		[JsonProperty("fields")]
+		public RollupFieldsCapabilitiesDictionary Fields { get; internal set; }
+
+		[JsonProperty("index_pattern")]
+		public string IndexPattern { get; internal set; }
+
 		[JsonProperty("job_id")]
 		public string JobId { get; internal set; }
 
 		[JsonProperty("rollup_index")]
 		public string RollupIndex { get; internal set; }
-
-		[JsonProperty("index_pattern")]
-		public string IndexPattern { get; internal set; }
-
-		[JsonProperty("fields")]
-		public RollupFieldsCapabilitiesDictionary Fields { get; internal set; }
 	}
 
 	public class RollupFieldsCapabilities : IsADictionaryBase<string, string> { }
 
-	[JsonConverter(typeof(RollupFieldsCapabilitiesDictionary.Converter))]
+	[JsonConverter(typeof(Converter))]
 	public class RollupFieldsCapabilitiesDictionary : ResolvableDictionaryProxy<Field, IReadOnlyCollection<RollupFieldsCapabilities>>
 	{
 		internal RollupFieldsCapabilitiesDictionary(IConnectionConfigurationValues c,
-			IReadOnlyDictionary<Field, IReadOnlyCollection<RollupFieldsCapabilities>> b) : base(c, b) { }
+			IReadOnlyDictionary<Field, IReadOnlyCollection<RollupFieldsCapabilities>> b
+		) : base(c, b) { }
+
+		public IReadOnlyCollection<RollupFieldsCapabilities> Field<T>(Expression<Func<T, object>> selector) => this[selector];
 
-		internal class Converter : ResolvableDictionaryJsonConverterBase
-			<RollupFieldsCapabilitiesDictionary, Field, IReadOnlyCollection<RollupFieldsCapabilities>>
+		internal class Converter
+			: ResolvableDictionaryJsonConverterBase
+				<RollupFieldsCapabilitiesDictionary, Field, IReadOnlyCollection<RollupFieldsCapabilities>>
 		{
 			protected override RollupFieldsCapabilitiesDictionary Create(
 				IConnectionSettingsValues s, Dictionary<Field, IReadOnlyCollection<RollupFieldsCapabilities>> d
 			) => new RollupFieldsCapabilitiesDictionary(s, d);
 		}
-
-		public IReadOnlyCollection<RollupFieldsCapabilities> Field<T>(Expression<Func<T, object>> selector) => this[selector];
-
 	}
 }
-
diff --git a/src/Nest/XPack/RollUp/GetRollupJob/ElasticClient-GetRollupJob.cs b/src/Nest/XPack/RollUp/GetRollupJob/ElasticClient-GetRollupJob.cs
index e8d5d17a06a..898788d7baa 100644
--- a/src/Nest/XPack/RollUp/GetRollupJob/ElasticClient-GetRollupJob.cs
+++ b/src/Nest/XPack/RollUp/GetRollupJob/ElasticClient-GetRollupJob.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -11,46 +11,50 @@ public partial interface IElasticClient
 		/// Gets the configuration, stats and status of rollup jobs.
 		/// It can return the details for a single job, or for all jobs.
 		/// <para />
- 		/// This API only returns active (both STARTED and STOPPED) jobs. If a job was created,
- 		/// ran for a while then deleted, this API will not return any details about that job.
+		/// This API only returns active (both STARTED and STOPPED) jobs. If a job was created,
+		/// ran for a while then deleted, this API will not return any details about that job.
 		/// </summary>
 		IGetRollupJobResponse GetRollupJob(Func<GetRollupJobDescriptor, IGetRollupJobRequest> selector = null);
 
-		/// <inheritdoc cref="GetRollupJob(System.Func{Nest.GetRollupJobDescriptor,Nest.IGetRollupJobRequest})"/>
+		/// <inheritdoc cref="GetRollupJob(System.Func{Nest.GetRollupJobDescriptor,Nest.IGetRollupJobRequest})" />
 		IGetRollupJobResponse GetRollupJob(IGetRollupJobRequest request);
 
-		/// <inheritdoc cref="GetRollupJob(System.Func{Nest.GetRollupJobDescriptor,Nest.IGetRollupJobRequest})"/>
+		/// <inheritdoc cref="GetRollupJob(System.Func{Nest.GetRollupJobDescriptor,Nest.IGetRollupJobRequest})" />
 		Task<IGetRollupJobResponse> GetRollupJobAsync(
-			Func<GetRollupJobDescriptor, IGetRollupJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+			Func<GetRollupJobDescriptor, IGetRollupJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc cref="GetRollupJob(System.Func{Nest.GetRollupJobDescriptor,Nest.IGetRollupJobRequest})"/>
+		/// <inheritdoc cref="GetRollupJob(System.Func{Nest.GetRollupJobDescriptor,Nest.IGetRollupJobRequest})" />
 		Task<IGetRollupJobResponse> GetRollupJobAsync(IGetRollupJobRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRollupJobResponse GetRollupJob(Func<GetRollupJobDescriptor, IGetRollupJobRequest> selector = null) =>
-			this.GetRollupJob(selector.InvokeOrDefault(new GetRollupJobDescriptor()));
+			GetRollupJob(selector.InvokeOrDefault(new GetRollupJobDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRollupJobResponse GetRollupJob(IGetRollupJobRequest request) =>
-			this.Dispatcher.Dispatch<IGetRollupJobRequest, GetRollupJobRequestParameters, GetRollupJobResponse>(
+			Dispatcher.Dispatch<IGetRollupJobRequest, GetRollupJobRequestParameters, GetRollupJobResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackRollupGetJobsDispatch<GetRollupJobResponse>(p)
+				(p, d) => LowLevelDispatch.XpackRollupGetJobsDispatch<GetRollupJobResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetRollupJobResponse> GetRollupJobAsync(
-			Func<GetRollupJobDescriptor, IGetRollupJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken))  =>
-			this.GetRollupJobAsync(selector.InvokeOrDefault(new GetRollupJobDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetRollupJobResponse> GetRollupJobAsync(IGetRollupJobRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetRollupJobRequest, GetRollupJobRequestParameters, GetRollupJobResponse, IGetRollupJobResponse>(
+			Func<GetRollupJobDescriptor, IGetRollupJobRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetRollupJobAsync(selector.InvokeOrDefault(new GetRollupJobDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetRollupJobResponse> GetRollupJobAsync(IGetRollupJobRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetRollupJobRequest, GetRollupJobRequestParameters, GetRollupJobResponse, IGetRollupJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackRollupGetJobsDispatchAsync<GetRollupJobResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackRollupGetJobsDispatchAsync<GetRollupJobResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/GetRollupJob/GetRollupJobRequest.cs b/src/Nest/XPack/RollUp/GetRollupJob/GetRollupJobRequest.cs
index 528d53bfa59..236b2f4565a 100644
--- a/src/Nest/XPack/RollUp/GetRollupJob/GetRollupJobRequest.cs
+++ b/src/Nest/XPack/RollUp/GetRollupJob/GetRollupJobRequest.cs
@@ -1,15 +1,9 @@
 namespace Nest
 {
 	[MapsApi("xpack.rollup.get_jobs.json")]
-	public partial interface IGetRollupJobRequest
-	{
-	}
+	public partial interface IGetRollupJobRequest { }
 
-	public partial class GetRollupJobRequest
-	{
-	}
+	public partial class GetRollupJobRequest { }
 
-	public partial class GetRollupJobDescriptor
-	{
-	}
+	public partial class GetRollupJobDescriptor { }
 }
diff --git a/src/Nest/XPack/RollUp/GetRollupJob/GetRollupJobResponse.cs b/src/Nest/XPack/RollUp/GetRollupJob/GetRollupJobResponse.cs
index 0a266cbb045..cb13198fae5 100644
--- a/src/Nest/XPack/RollUp/GetRollupJob/GetRollupJobResponse.cs
+++ b/src/Nest/XPack/RollUp/GetRollupJob/GetRollupJobResponse.cs
@@ -14,4 +14,3 @@ public class GetRollupJobResponse : ResponseBase, IGetRollupJobResponse
 		public IReadOnlyCollection<RollupJobInformation> Jobs { get; internal set; } = EmptyReadOnly<RollupJobInformation>.Collection;
 	}
 }
-
diff --git a/src/Nest/XPack/RollUp/GetRollupJob/IndexingJobState.cs b/src/Nest/XPack/RollUp/GetRollupJob/IndexingJobState.cs
index d30a5692ed7..3334d8e47b0 100644
--- a/src/Nest/XPack/RollUp/GetRollupJob/IndexingJobState.cs
+++ b/src/Nest/XPack/RollUp/GetRollupJob/IndexingJobState.cs
@@ -8,18 +8,18 @@ namespace Nest
 	public enum IndexingJobState
 	{
 		/// <summary> Indexer is running, but not actively indexing data (e.g. it's idle) </summary>
-		[EnumMember(Value="started")] Started,
+		[EnumMember(Value = "started")] Started,
 
 		/// <summary> Indexer is actively indexing data </summary>
-		[EnumMember(Value="indexing")] Indexing,
+		[EnumMember(Value = "indexing")] Indexing,
 
 		/// <summary> Transition state to where an indexer has acknowledged the stop but is still in process of halting </summary>
-		[EnumMember(Value="stopping")] Stopping,
+		[EnumMember(Value = "stopping")] Stopping,
 
 		/// <summary> Indexer is "paused" and ignoring scheduled triggers </summary>
-		[EnumMember(Value="stopped")] Stopped,
+		[EnumMember(Value = "stopped")] Stopped,
 
 		/// <summary> Something (internal or external) has requested the indexer abort and shutdown </summary>
-		[EnumMember(Value="aborting")] Aborting
+		[EnumMember(Value = "aborting")] Aborting
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/RollUp/GetRollupJob/RollupJobConfiguration.cs b/src/Nest/XPack/RollUp/GetRollupJob/RollupJobConfiguration.cs
index f8a4379459b..e7a5eab1363 100644
--- a/src/Nest/XPack/RollUp/GetRollupJob/RollupJobConfiguration.cs
+++ b/src/Nest/XPack/RollUp/GetRollupJob/RollupJobConfiguration.cs
@@ -5,35 +5,34 @@ namespace Nest
 {
 	public class RollupJobConfiguration
 	{
+		/// <inheritdoc cref="ICreateRollupJobRequest.Cron" />
+		[JsonProperty("cron")]
+		public string Cron { get; internal set; }
+
+		/// <inheritdoc cref="ICreateRollupJobRequest.Groups" />
+		[JsonProperty("groups")]
+		public IRollupGroupings Groups { get; internal set; }
+
 		[JsonProperty("id")]
 		public string Id { get; internal set; }
 
-		[JsonProperty("timeout")]
-		public Time Timeout { get; internal set; }
-
 		/// <inheritdoc cref="ICreateRollupJobRequest.IndexPattern" />
 		[JsonProperty("index_pattern")]
 		public string IndexPattern { get; internal set; }
 
-		/// <inheritdoc cref="ICreateRollupJobRequest.RollupIndex" />
-		[JsonProperty("rollup_index")]
-		public IndexName RollupIndex { get; internal set; }
-
-		/// <inheritdoc cref="ICreateRollupJobRequest.Cron" />
-		[JsonProperty("cron")]
-		public string Cron { get; internal set; }
+		/// <inheritdoc cref="ICreateRollupJobRequest.Metrics" />
+		[JsonProperty("metrics")]
+		public IEnumerable<IRollupFieldMetric> Metrics { get; internal set; }
 
 		/// <inheritdoc cref="ICreateRollupJobRequest.PageSize" />
 		[JsonProperty("page_size")]
 		public long? PageSize { get; internal set; }
 
-		/// <inheritdoc cref="ICreateRollupJobRequest.Groups" />
-		[JsonProperty("groups")]
-		public IRollupGroupings Groups { get; internal set; }
-
-		/// <inheritdoc cref="ICreateRollupJobRequest.Metrics" />
-		[JsonProperty("metrics")]
-		public IEnumerable<IRollupFieldMetric> Metrics { get; internal set; }
+		/// <inheritdoc cref="ICreateRollupJobRequest.RollupIndex" />
+		[JsonProperty("rollup_index")]
+		public IndexName RollupIndex { get; internal set; }
 
+		[JsonProperty("timeout")]
+		public Time Timeout { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/RollUp/GetRollupJob/RollupJobInformation.cs b/src/Nest/XPack/RollUp/GetRollupJob/RollupJobInformation.cs
index 59581781ed5..bd68e917bee 100644
--- a/src/Nest/XPack/RollUp/GetRollupJob/RollupJobInformation.cs
+++ b/src/Nest/XPack/RollUp/GetRollupJob/RollupJobInformation.cs
@@ -7,10 +7,10 @@ public class RollupJobInformation
 		[JsonProperty("config")]
 		public RollupJobConfiguration Config { get; internal set; }
 
-		[JsonProperty("status")]
-		public RollupJobStatus Status { get; internal set; }
-
 		[JsonProperty("stats")]
 		public RollupJobStats Stats { get; internal set; }
+
+		[JsonProperty("status")]
+		public RollupJobStatus Status { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/RollUp/GetRollupJob/RollupJobStats.cs b/src/Nest/XPack/RollUp/GetRollupJob/RollupJobStats.cs
index d68f89f5293..547f5b1a8c0 100644
--- a/src/Nest/XPack/RollUp/GetRollupJob/RollupJobStats.cs
+++ b/src/Nest/XPack/RollUp/GetRollupJob/RollupJobStats.cs
@@ -4,14 +4,14 @@ namespace Nest
 {
 	public class RollupJobStats
 	{
-		[JsonProperty("pages_processed")]
-		public long PagesProcessed { get; internal set; }
-
 		[JsonProperty("documents_processed")]
 		public long DocumentsProcessed { get; internal set; }
 
+		[JsonProperty("pages_processed")]
+		public long PagesProcessed { get; internal set; }
+
 		[JsonProperty("rollups_indexed")]
-		public long RollupsIndexed { get;  internal set; }
+		public long RollupsIndexed { get; internal set; }
 
 		[JsonProperty("trigger_count")]
 		public long TriggerCount { get; internal set; }
diff --git a/src/Nest/XPack/RollUp/GetRollupJob/RollupJobStatus.cs b/src/Nest/XPack/RollUp/GetRollupJob/RollupJobStatus.cs
index d2ce154c755..8a59b747a49 100644
--- a/src/Nest/XPack/RollUp/GetRollupJob/RollupJobStatus.cs
+++ b/src/Nest/XPack/RollUp/GetRollupJob/RollupJobStatus.cs
@@ -5,13 +5,13 @@ namespace Nest
 {
 	public class RollupJobStatus
 	{
-		[JsonProperty("job_state")]
-		public IndexingJobState JobState { get; internal set; }
-
 		[JsonProperty("current_position")]
 		public IReadOnlyDictionary<string, object> CurrentPosition { get; internal set; } =
 			EmptyReadOnly<string, object>.Dictionary;
 
+		[JsonProperty("job_state")]
+		public IndexingJobState JobState { get; internal set; }
+
 		[JsonProperty("upgraded_doc_id")]
 		public bool UpgradedDocId { get; internal set; }
 	}
diff --git a/src/Nest/XPack/RollUp/RollupConfiguration/DateHistogramRollupGrouping.cs b/src/Nest/XPack/RollUp/RollupConfiguration/DateHistogramRollupGrouping.cs
index 9abfb6ee3a9..a53027c5ea6 100644
--- a/src/Nest/XPack/RollUp/RollupConfiguration/DateHistogramRollupGrouping.cs
+++ b/src/Nest/XPack/RollUp/RollupConfiguration/DateHistogramRollupGrouping.cs
@@ -11,6 +11,12 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<DateHistogramRollupGrouping>))]
 	public interface IDateHistogramRollupGrouping
 	{
+		/// <summary>
+		/// How long to wait before rolling up new documents. By default, the indexer attempts to roll up all data that is available.
+		/// </summary>
+		[JsonProperty("delay")]
+		Time Delay { get; set; }
+
 		/// <summary>
 		/// The date field that is to be rolled up
 		/// </summary>
@@ -24,12 +30,6 @@ public interface IDateHistogramRollupGrouping
 		[JsonProperty("interval")]
 		Time Interval { get; set; }
 
-		/// <summary>
-		/// How long to wait before rolling up new documents. By default, the indexer attempts to roll up all data that is available.
-		/// </summary>
-		[JsonProperty("delay")]
-		Time Delay { get; set; }
-
 		/// <summary>
 		/// Defines what time_zone the rollup documents are stored as. Unlike raw data, which can shift timezones on the fly, rolled
 		/// documents have to be stored with a specific timezone. By default, rollup documents are stored in UT
@@ -42,41 +42,41 @@ public interface IDateHistogramRollupGrouping
 	public class DateHistogramRollupGrouping : IDateHistogramRollupGrouping
 	{
 		/// <inheritdoc />
-		public Field Field { get; set; }
+		public Time Delay { get; set; }
 
 		/// <inheritdoc />
-		public Time Interval { get; set; }
+		public Field Field { get; set; }
 
 		/// <inheritdoc />
-		public Time Delay { get; set; }
+		public Time Interval { get; set; }
 
 		/// <inheritdoc />
 		public string TimeZone { get; set; }
 	}
 
-	/// <inheritdoc cref="IDateHistogramRollupGrouping"/>
+	/// <inheritdoc cref="IDateHistogramRollupGrouping" />
 	public class DateHistogramRollupGroupingDescriptor<T>
 		: DescriptorBase<DateHistogramRollupGroupingDescriptor<T>, IDateHistogramRollupGrouping>, IDateHistogramRollupGrouping
 		where T : class
 	{
+		Time IDateHistogramRollupGrouping.Delay { get; set; }
 		Field IDateHistogramRollupGrouping.Field { get; set; }
 		Time IDateHistogramRollupGrouping.Interval { get; set; }
-		Time IDateHistogramRollupGrouping.Delay { get; set; }
 		string IDateHistogramRollupGrouping.TimeZone { get; set; }
 
-		/// <inheritdoc cref="IDateHistogramRollupGrouping.Field"/>
+		/// <inheritdoc cref="IDateHistogramRollupGrouping.Field" />
 		public DateHistogramRollupGroupingDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="IDateHistogramRollupGrouping.Field"/>
+		/// <inheritdoc cref="IDateHistogramRollupGrouping.Field" />
 		public DateHistogramRollupGroupingDescriptor<T> Field(Expression<Func<T, object>> field) => Assign(a => a.Field = field);
 
-		/// <inheritdoc cref="IDateHistogramRollupGrouping.Interval"/>
+		/// <inheritdoc cref="IDateHistogramRollupGrouping.Interval" />
 		public DateHistogramRollupGroupingDescriptor<T> Interval(Time interval) => Assign(a => a.Interval = interval);
 
-		/// <inheritdoc cref="IDateHistogramRollupGrouping.Delay"/>
+		/// <inheritdoc cref="IDateHistogramRollupGrouping.Delay" />
 		public DateHistogramRollupGroupingDescriptor<T> Delay(Time delay) => Assign(a => a.Delay = delay);
 
-		/// <inheritdoc cref="IDateHistogramRollupGrouping.TimeZone"/>
+		/// <inheritdoc cref="IDateHistogramRollupGrouping.TimeZone" />
 		public DateHistogramRollupGroupingDescriptor<T> TimeZone(string timeZone) => Assign(a => a.TimeZone = timeZone);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/RollupConfiguration/HistogramRollupGrouping.cs b/src/Nest/XPack/RollUp/RollupConfiguration/HistogramRollupGrouping.cs
index 95fa229fbb7..fcbe1b05d09 100644
--- a/src/Nest/XPack/RollUp/RollupConfiguration/HistogramRollupGrouping.cs
+++ b/src/Nest/XPack/RollUp/RollupConfiguration/HistogramRollupGrouping.cs
@@ -31,7 +31,7 @@ public class HistogramRollupGrouping : IHistogramRollupGrouping
 		public long? Interval { get; set; }
 	}
 
-	/// <inheritdoc cref="IHistogramRollupGrouping"/>
+	/// <inheritdoc cref="IHistogramRollupGrouping" />
 	public class HistogramRollupGroupingDescriptor<T>
 		: DescriptorBase<HistogramRollupGroupingDescriptor<T>, IHistogramRollupGrouping>, IHistogramRollupGrouping
 		where T : class
@@ -39,14 +39,14 @@ public class HistogramRollupGroupingDescriptor<T>
 		Fields IHistogramRollupGrouping.Fields { get; set; }
 		long? IHistogramRollupGrouping.Interval { get; set; }
 
-		/// <inheritdoc cref="IHistogramRollupGrouping.Fields"/>
+		/// <inheritdoc cref="IHistogramRollupGrouping.Fields" />
 		public HistogramRollupGroupingDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="IHistogramRollupGrouping.Fields"/>
+		/// <inheritdoc cref="IHistogramRollupGrouping.Fields" />
 		public HistogramRollupGroupingDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
 
-		/// <inheritdoc cref="IHistogramRollupGrouping.Interval"/>
+		/// <inheritdoc cref="IHistogramRollupGrouping.Interval" />
 		public HistogramRollupGroupingDescriptor<T> Interval(long? interval) => Assign(a => a.Interval = interval);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/RollupConfiguration/IRollupGroupings.cs b/src/Nest/XPack/RollUp/RollupConfiguration/IRollupGroupings.cs
index 0b3f422b255..f24c2fa66e6 100644
--- a/src/Nest/XPack/RollUp/RollupConfiguration/IRollupGroupings.cs
+++ b/src/Nest/XPack/RollUp/RollupConfiguration/IRollupGroupings.cs
@@ -10,31 +10,33 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<RollupGroupings>))]
 	public interface IRollupGroupings
 	{
-		/// <inheritdoc cref="IDateHistogramRollupGrouping"/>
+		/// <inheritdoc cref="IDateHistogramRollupGrouping" />
 		[JsonProperty("date_histogram")]
 		IDateHistogramRollupGrouping DateHistogram { get; set; }
 
-		/// <inheritdoc cref="IHistogramRollupGrouping"/>
+		/// <inheritdoc cref="IHistogramRollupGrouping" />
 		[JsonProperty("histogram")]
 		IHistogramRollupGrouping Histogram { get; set; }
 
-		/// <inheritdoc cref="ITermsRollupGrouping"/>
+		/// <inheritdoc cref="ITermsRollupGrouping" />
 		[JsonProperty("terms")]
 		ITermsRollupGrouping Terms { get; set; }
 	}
 
-	/// <inheritdoc cref="IRollupGroupings"/>
+	/// <inheritdoc cref="IRollupGroupings" />
 	public class RollupGroupings : IRollupGroupings
 	{
 		/// <inheritdoc />
 		public IDateHistogramRollupGrouping DateHistogram { get; set; }
+
 		/// <inheritdoc />
 		public IHistogramRollupGrouping Histogram { get; set; }
+
 		/// <inheritdoc />
 		public ITermsRollupGrouping Terms { get; set; }
 	}
 
-	/// <inheritdoc cref="IRollupGroupings"/>
+	/// <inheritdoc cref="IRollupGroupings" />
 	public class RollupGroupingsDescriptor<T> : DescriptorBase<RollupGroupingsDescriptor<T>, IRollupGroupings>, IRollupGroupings
 		where T : class
 	{
@@ -42,16 +44,17 @@ public class RollupGroupingsDescriptor<T> : DescriptorBase<RollupGroupingsDescri
 		IHistogramRollupGrouping IRollupGroupings.Histogram { get; set; }
 		ITermsRollupGrouping IRollupGroupings.Terms { get; set; }
 
-		/// <inheritdoc cref="IDateHistogramRollupGrouping"/>
+		/// <inheritdoc cref="IDateHistogramRollupGrouping" />
 		public RollupGroupingsDescriptor<T> DateHistogram(
-			Func<DateHistogramRollupGroupingDescriptor<T>, IDateHistogramRollupGrouping> selector) =>
+			Func<DateHistogramRollupGroupingDescriptor<T>, IDateHistogramRollupGrouping> selector
+		) =>
 			Assign(a => a.DateHistogram = selector?.Invoke(new DateHistogramRollupGroupingDescriptor<T>()));
 
-		/// <inheritdoc cref="IHistogramRollupGrouping"/>
+		/// <inheritdoc cref="IHistogramRollupGrouping" />
 		public RollupGroupingsDescriptor<T> Histogram(Func<HistogramRollupGroupingDescriptor<T>, IHistogramRollupGrouping> selector) =>
 			Assign(a => a.Histogram = selector?.Invoke(new HistogramRollupGroupingDescriptor<T>()));
 
-		/// <inheritdoc cref="ITermsRollupGrouping"/>
+		/// <inheritdoc cref="ITermsRollupGrouping" />
 		public RollupGroupingsDescriptor<T> Terms(Func<TermsRollupGroupingDescriptor<T>, ITermsRollupGrouping> selector) =>
 			Assign(a => a.Terms = selector?.Invoke(new TermsRollupGroupingDescriptor<T>()));
 	}
diff --git a/src/Nest/XPack/RollUp/RollupConfiguration/RollupFieldMetric.cs b/src/Nest/XPack/RollUp/RollupConfiguration/RollupFieldMetric.cs
index cfc9910f774..68f99f19ac6 100644
--- a/src/Nest/XPack/RollUp/RollupConfiguration/RollupFieldMetric.cs
+++ b/src/Nest/XPack/RollUp/RollupConfiguration/RollupFieldMetric.cs
@@ -10,6 +10,7 @@ public interface IRollupFieldMetric
 	{
 		[JsonProperty("field")]
 		Field Field { get; set; }
+
 		[JsonProperty("metrics")]
 		IEnumerable<RollupMetric> Metrics { get; set; }
 	}
@@ -26,15 +27,15 @@ public class RollupFieldMetricsDescriptor<T> : DescriptorPromiseBase<RollupField
 		public RollupFieldMetricsDescriptor() : base(new List<IRollupFieldMetric>()) { }
 
 		public RollupFieldMetricsDescriptor<T> Field(Expression<Func<T, object>> field, params RollupMetric[] metrics) =>
-			Assign(a => a.Add(new RollupFieldMetric{ Field = field, Metrics = metrics}));
+			Assign(a => a.Add(new RollupFieldMetric { Field = field, Metrics = metrics }));
 
 		public RollupFieldMetricsDescriptor<T> Field(Field field, params RollupMetric[] metrics) =>
-			Assign(a => a.Add(new RollupFieldMetric{ Field = field, Metrics = metrics}));
+			Assign(a => a.Add(new RollupFieldMetric { Field = field, Metrics = metrics }));
 
 		public RollupFieldMetricsDescriptor<T> Field(Expression<Func<T, object>> field, IEnumerable<RollupMetric> metrics) =>
-			Assign(a => a.Add(new RollupFieldMetric{ Field = field, Metrics = metrics}));
+			Assign(a => a.Add(new RollupFieldMetric { Field = field, Metrics = metrics }));
 
 		public RollupFieldMetricsDescriptor<T> Field(Field field, IEnumerable<RollupMetric> metrics) =>
-			Assign(a => a.Add(new RollupFieldMetric{ Field = field, Metrics = metrics}));
+			Assign(a => a.Add(new RollupFieldMetric { Field = field, Metrics = metrics }));
 	}
 }
diff --git a/src/Nest/XPack/RollUp/RollupConfiguration/TermsRollupGrouping.cs b/src/Nest/XPack/RollUp/RollupConfiguration/TermsRollupGrouping.cs
index 14317a542ab..2e936f22989 100644
--- a/src/Nest/XPack/RollUp/RollupConfiguration/TermsRollupGrouping.cs
+++ b/src/Nest/XPack/RollUp/RollupConfiguration/TermsRollupGrouping.cs
@@ -26,18 +26,18 @@ public class TermsRollupGrouping : ITermsRollupGrouping
 		public Fields Fields { get; set; }
 	}
 
-	/// <inheritdoc cref="ITermsRollupGrouping"/>
+	/// <inheritdoc cref="ITermsRollupGrouping" />
 	public class TermsRollupGroupingDescriptor<T>
 		: DescriptorBase<TermsRollupGroupingDescriptor<T>, ITermsRollupGrouping>, ITermsRollupGrouping
 		where T : class
 	{
 		Fields ITermsRollupGrouping.Fields { get; set; }
 
-		/// <inheritdoc cref="ITermsRollupGrouping.Fields"/>
+		/// <inheritdoc cref="ITermsRollupGrouping.Fields" />
 		public TermsRollupGroupingDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		/// <inheritdoc cref="ITermsRollupGrouping.Fields"/>
+		/// <inheritdoc cref="ITermsRollupGrouping.Fields" />
 		public TermsRollupGroupingDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/RollupSearch/ElasticClient-RollupSearch.cs b/src/Nest/XPack/RollUp/RollupSearch/ElasticClient-RollupSearch.cs
index 272262ee1ba..3a5055edab8 100644
--- a/src/Nest/XPack/RollUp/RollupSearch/ElasticClient-RollupSearch.cs
+++ b/src/Nest/XPack/RollUp/RollupSearch/ElasticClient-RollupSearch.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -16,71 +16,77 @@ public partial interface IElasticClient
 		IRollupSearchResponse<THit> RollupSearch<THit>(Indices indices, Func<RollupSearchDescriptor<THit>, IRollupSearchRequest> selector = null)
 			where THit : class;
 
-		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})"/>
+		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})" />
 		IRollupSearchResponse<THit> RollupSearch<T, THit>(Indices indices, Func<RollupSearchDescriptor<T>, IRollupSearchRequest> selector = null)
 			where THit : class
 			where T : class;
 
-		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})"/>
+		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})" />
 		IRollupSearchResponse<THit> RollupSearch<THit>(IRollupSearchRequest request) where THit : class;
 
-		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})"/>
+		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})" />
 		Task<IRollupSearchResponse<THit>> RollupSearchAsync<THit>(Indices indices,
-			Func<RollupSearchDescriptor<THit>, IRollupSearchRequest> selector = null, CancellationToken cancellationToken = default)
+			Func<RollupSearchDescriptor<THit>, IRollupSearchRequest> selector = null, CancellationToken cancellationToken = default
+		)
 			where THit : class;
 
-		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})"/>
+		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})" />
 		Task<IRollupSearchResponse<THit>> RollupSearchAsync<T, THit>(Indices indices,
-			Func<RollupSearchDescriptor<T>, IRollupSearchRequest> selector = null, CancellationToken cancellationToken = default)
+			Func<RollupSearchDescriptor<T>, IRollupSearchRequest> selector = null, CancellationToken cancellationToken = default
+		)
 			where THit : class
 			where T : class;
 
-		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})"/>
+		/// <inheritdoc cref="RollupSearch{THit}(Nest.Indices,System.Func{Nest.RollupSearchDescriptor{THit},Nest.IRollupSearchRequest})" />
 		Task<IRollupSearchResponse<THit>> RollupSearchAsync<THit>(IRollupSearchRequest request, CancellationToken cancellationToken = default)
 			where THit : class;
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IRollupSearchResponse<THit> RollupSearch<THit>(Indices indices, Func<RollupSearchDescriptor<THit>, IRollupSearchRequest> selector = null)
+		/// <inheritdoc />
+		public IRollupSearchResponse<THit> RollupSearch<THit>(Indices indices,
+			Func<RollupSearchDescriptor<THit>, IRollupSearchRequest> selector = null
+		)
 			where THit : class =>
-			this.RollupSearch<THit>(selector.InvokeOrDefault(new RollupSearchDescriptor<THit>(indices)));
+			RollupSearch<THit>(selector.InvokeOrDefault(new RollupSearchDescriptor<THit>(indices)));
 
-		/// <inheritdoc/>
-		public IRollupSearchResponse<THit> RollupSearch<T, THit>(Indices indices, Func<RollupSearchDescriptor<T>, IRollupSearchRequest> selector = null)
+		/// <inheritdoc />
+		public IRollupSearchResponse<THit> RollupSearch<T, THit>(Indices indices,
+			Func<RollupSearchDescriptor<T>, IRollupSearchRequest> selector = null
+		)
 			where T : class
 			where THit : class =>
-			this.RollupSearch<THit>(selector.InvokeOrDefault(new RollupSearchDescriptor<T>(indices)));
+			RollupSearch<THit>(selector.InvokeOrDefault(new RollupSearchDescriptor<T>(indices)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRollupSearchResponse<THit> RollupSearch<THit>(IRollupSearchRequest request) where THit : class =>
-			this.Dispatcher.Dispatch<IRollupSearchRequest, RollupSearchRequestParameters, RollupSearchResponse<THit>>(
+			Dispatcher.Dispatch<IRollupSearchRequest, RollupSearchRequestParameters, RollupSearchResponse<THit>>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackRollupRollupSearchDispatch<RollupSearchResponse<THit>>(p, d)
+				(p, d) => LowLevelDispatch.XpackRollupRollupSearchDispatch<RollupSearchResponse<THit>>(p, d)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IRollupSearchResponse<THit>> RollupSearchAsync<THit>(
 			Indices indices, Func<RollupSearchDescriptor<THit>, IRollupSearchRequest> selector = null, CancellationToken cancellationToken = default
 		) where THit : class =>
-			this.RollupSearchAsync<THit>(selector.InvokeOrDefault(new RollupSearchDescriptor<THit>(indices)), cancellationToken);
+			RollupSearchAsync<THit>(selector.InvokeOrDefault(new RollupSearchDescriptor<THit>(indices)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IRollupSearchResponse<THit>> RollupSearchAsync<T, THit>(
 			Indices indices, Func<RollupSearchDescriptor<T>, IRollupSearchRequest> selector = null, CancellationToken cancellationToken = default
 		)
 			where T : class
 			where THit : class =>
-			this.RollupSearchAsync<THit>(selector.InvokeOrDefault(new RollupSearchDescriptor<T>(indices)), cancellationToken);
+			RollupSearchAsync<THit>(selector.InvokeOrDefault(new RollupSearchDescriptor<T>(indices)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IRollupSearchResponse<THit>> RollupSearchAsync<THit>(IRollupSearchRequest request, CancellationToken cancellationToken = default)
 			where THit : class =>
-			this.Dispatcher.DispatchAsync<IRollupSearchRequest, RollupSearchRequestParameters, RollupSearchResponse<THit>, IRollupSearchResponse<THit>>(
+			Dispatcher.DispatchAsync<IRollupSearchRequest, RollupSearchRequestParameters, RollupSearchResponse<THit>, IRollupSearchResponse<THit>>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackRollupRollupSearchDispatchAsync<RollupSearchResponse<THit>>(p, d, c)
+				(p, d, c) => LowLevelDispatch.XpackRollupRollupSearchDispatchAsync<RollupSearchResponse<THit>>(p, d, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/RollupSearch/RollupSearchRequest.cs b/src/Nest/XPack/RollUp/RollupSearch/RollupSearchRequest.cs
index cfe0cc132f8..356e87a7538 100644
--- a/src/Nest/XPack/RollUp/RollupSearch/RollupSearchRequest.cs
+++ b/src/Nest/XPack/RollUp/RollupSearch/RollupSearchRequest.cs
@@ -6,33 +6,35 @@ namespace Nest
 	[MapsApi("xpack.rollup.rollup_search.json")]
 	public partial interface IRollupSearchRequest
 	{
-		/// <summary>When doing rollup searches against rolled up and live indices size needs to be set to 0 explicitly </summary>
-		[JsonProperty("size")]
-		int? Size { get; set; }
+		/// <summary> Describe the aggregations to perform</summary>
+		[JsonProperty("aggs")]
+		AggregationDictionary Aggregations { get; set; }
 
 		/// <summary> Describe the query to perform using a query descriptor lambda</summary>
 		[JsonProperty("query")]
 		QueryContainer Query { get; set; }
 
-		/// <summary> Describe the aggregations to perform</summary>
-		[JsonProperty("aggs")]
-		AggregationDictionary Aggregations { get; set; }
+		/// <summary>When doing rollup searches against rolled up and live indices size needs to be set to 0 explicitly </summary>
+		[JsonProperty("size")]
+		int? Size { get; set; }
 	}
 
 	public partial class RollupSearchRequest
 	{
 		/// <inheritdoc />
-		public int? Size { get; set; }
+		public AggregationDictionary Aggregations { get; set; }
+
 		/// <inheritdoc />
 		public QueryContainer Query { get; set; }
+
 		/// <inheritdoc />
-		public AggregationDictionary Aggregations { get; set; }
+		public int? Size { get; set; }
 	}
 
 	public partial class RollupSearchDescriptor<T> where T : class
 	{
-		QueryContainer IRollupSearchRequest.Query { get; set; }
 		AggregationDictionary IRollupSearchRequest.Aggregations { get; set; }
+		QueryContainer IRollupSearchRequest.Query { get; set; }
 		int? IRollupSearchRequest.Size { get; set; }
 
 		/// <inheritdoc cref="IRollupSearchRequest.Size" />
diff --git a/src/Nest/XPack/RollUp/RollupSearch/RollupSearchResponse.cs b/src/Nest/XPack/RollUp/RollupSearch/RollupSearchResponse.cs
index 14558bfeda6..2c08ecbd4df 100644
--- a/src/Nest/XPack/RollUp/RollupSearch/RollupSearchResponse.cs
+++ b/src/Nest/XPack/RollUp/RollupSearch/RollupSearchResponse.cs
@@ -1,13 +1,7 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public interface IRollupSearchResponse<T> : ISearchResponse<T> where T : class
-	{
-	}
+	public interface IRollupSearchResponse<T> : ISearchResponse<T> where T : class { }
 
 	public class RollupSearchResponse<T> : SearchResponse<T>, IRollupSearchResponse<T>
-		where T : class
-	{
-	}
+		where T : class { }
 }
diff --git a/src/Nest/XPack/RollUp/StartRollupJob/ElasticClient-StartRollupJob.cs b/src/Nest/XPack/RollUp/StartRollupJob/ElasticClient-StartRollupJob.cs
index c9e41d11936..c58b0e245d5 100644
--- a/src/Nest/XPack/RollUp/StartRollupJob/ElasticClient-StartRollupJob.cs
+++ b/src/Nest/XPack/RollUp/StartRollupJob/ElasticClient-StartRollupJob.cs
@@ -1,53 +1,55 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <summary>Starts an existing, stopped rollup job. If the job does not exist an exception will be thrown.
+		/// <summary>
+		/// Starts an existing, stopped rollup job. If the job does not exist an exception will be thrown.
 		/// Starting an already started job has no action.
 		/// </summary>
 		IStartRollupJobResponse StartRollupJob(Id id, Func<StartRollupJobDescriptor, IStartRollupJobRequest> selector = null);
 
-		/// <inheritdoc cref="StartRollupJob(Nest.Id,System.Func{Nest.StartRollupJobDescriptor,Nest.IStartRollupJobRequest})"/>
+		/// <inheritdoc cref="StartRollupJob(Nest.Id,System.Func{Nest.StartRollupJobDescriptor,Nest.IStartRollupJobRequest})" />
 		IStartRollupJobResponse StartRollupJob(IStartRollupJobRequest request);
 
-		/// <inheritdoc cref="StartRollupJob(Nest.Id,System.Func{Nest.StartRollupJobDescriptor,Nest.IStartRollupJobRequest})"/>
+		/// <inheritdoc cref="StartRollupJob(Nest.Id,System.Func{Nest.StartRollupJobDescriptor,Nest.IStartRollupJobRequest})" />
 		Task<IStartRollupJobResponse> StartRollupJobAsync(Id id,
-			Func<StartRollupJobDescriptor, IStartRollupJobRequest> selector = null, CancellationToken cancellationToken = default);
+			Func<StartRollupJobDescriptor, IStartRollupJobRequest> selector = null, CancellationToken cancellationToken = default
+		);
 
-		/// <inheritdoc cref="StartRollupJob(Nest.Id,System.Func{Nest.StartRollupJobDescriptor,Nest.IStartRollupJobRequest})"/>
+		/// <inheritdoc cref="StartRollupJob(Nest.Id,System.Func{Nest.StartRollupJobDescriptor,Nest.IStartRollupJobRequest})" />
 		Task<IStartRollupJobResponse> StartRollupJobAsync(IStartRollupJobRequest request, CancellationToken cancellationToken = default);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStartRollupJobResponse StartRollupJob(Id id, Func<StartRollupJobDescriptor, IStartRollupJobRequest> selector = null) =>
-			this.StartRollupJob(selector.InvokeOrDefault(new StartRollupJobDescriptor(id)));
+			StartRollupJob(selector.InvokeOrDefault(new StartRollupJobDescriptor(id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStartRollupJobResponse StartRollupJob(IStartRollupJobRequest request) =>
-			this.Dispatcher.Dispatch<IStartRollupJobRequest, StartRollupJobRequestParameters, StartRollupJobResponse>(
+			Dispatcher.Dispatch<IStartRollupJobRequest, StartRollupJobRequestParameters, StartRollupJobResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackRollupStartJobDispatch<StartRollupJobResponse>(p)
+				(p, d) => LowLevelDispatch.XpackRollupStartJobDispatch<StartRollupJobResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IStartRollupJobResponse> StartRollupJobAsync(
 			Id id, Func<StartRollupJobDescriptor, IStartRollupJobRequest> selector = null, CancellationToken cancellationToken = default
-		)  =>
-			this.StartRollupJobAsync(selector.InvokeOrDefault(new StartRollupJobDescriptor(id)), cancellationToken);
+		) =>
+			StartRollupJobAsync(selector.InvokeOrDefault(new StartRollupJobDescriptor(id)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IStartRollupJobResponse> StartRollupJobAsync(IStartRollupJobRequest request, CancellationToken cancellationToken = default) =>
-			this.Dispatcher.DispatchAsync<IStartRollupJobRequest, StartRollupJobRequestParameters, StartRollupJobResponse, IStartRollupJobResponse>(
+			Dispatcher.DispatchAsync<IStartRollupJobRequest, StartRollupJobRequestParameters, StartRollupJobResponse, IStartRollupJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackRollupStartJobDispatchAsync<StartRollupJobResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackRollupStartJobDispatchAsync<StartRollupJobResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/StartRollupJob/StartRollupJobRequest.cs b/src/Nest/XPack/RollUp/StartRollupJob/StartRollupJobRequest.cs
index 609de02458f..8319acc05d5 100644
--- a/src/Nest/XPack/RollUp/StartRollupJob/StartRollupJobRequest.cs
+++ b/src/Nest/XPack/RollUp/StartRollupJob/StartRollupJobRequest.cs
@@ -1,15 +1,9 @@
 namespace Nest
 {
 	[MapsApi("xpack.rollup.start_job.json")]
-	public partial interface IStartRollupJobRequest
-	{
-	}
+	public partial interface IStartRollupJobRequest { }
 
-	public partial class StartRollupJobRequest
-	{
-	}
+	public partial class StartRollupJobRequest { }
 
-	public partial class StartRollupJobDescriptor
-	{
-	}
+	public partial class StartRollupJobDescriptor { }
 }
diff --git a/src/Nest/XPack/RollUp/StopRollupJob/ElasticClient-StopRollupJob.cs b/src/Nest/XPack/RollUp/StopRollupJob/ElasticClient-StopRollupJob.cs
index c83e78f60f3..95fc6d2121d 100644
--- a/src/Nest/XPack/RollUp/StopRollupJob/ElasticClient-StopRollupJob.cs
+++ b/src/Nest/XPack/RollUp/StopRollupJob/ElasticClient-StopRollupJob.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -13,42 +13,43 @@ public partial interface IElasticClient
 		/// </summary>
 		IStopRollupJobResponse StopRollupJob(Id id, Func<StopRollupJobDescriptor, IStopRollupJobRequest> selector = null);
 
-		/// <inheritdoc cref="StopRollupJob(Nest.Id,System.Func{Nest.StopRollupJobDescriptor,Nest.IStopRollupJobRequest})"/>
+		/// <inheritdoc cref="StopRollupJob(Nest.Id,System.Func{Nest.StopRollupJobDescriptor,Nest.IStopRollupJobRequest})" />
 		IStopRollupJobResponse StopRollupJob(IStopRollupJobRequest request);
 
-		/// <inheritdoc cref="StopRollupJob(Nest.Id,System.Func{Nest.StopRollupJobDescriptor,Nest.IStopRollupJobRequest})"/>
+		/// <inheritdoc cref="StopRollupJob(Nest.Id,System.Func{Nest.StopRollupJobDescriptor,Nest.IStopRollupJobRequest})" />
 		Task<IStopRollupJobResponse> StopRollupJobAsync(Id id,
-			Func<StopRollupJobDescriptor, IStopRollupJobRequest> selector = null, CancellationToken cancellationToken = default);
+			Func<StopRollupJobDescriptor, IStopRollupJobRequest> selector = null, CancellationToken cancellationToken = default
+		);
 
-		/// <inheritdoc cref="StopRollupJob(Nest.Id,System.Func{Nest.StopRollupJobDescriptor,Nest.IStopRollupJobRequest})"/>
+		/// <inheritdoc cref="StopRollupJob(Nest.Id,System.Func{Nest.StopRollupJobDescriptor,Nest.IStopRollupJobRequest})" />
 		Task<IStopRollupJobResponse> StopRollupJobAsync(IStopRollupJobRequest request, CancellationToken cancellationToken = default);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStopRollupJobResponse StopRollupJob(Id id, Func<StopRollupJobDescriptor, IStopRollupJobRequest> selector = null) =>
-			this.StopRollupJob(selector.InvokeOrDefault(new StopRollupJobDescriptor(id)));
+			StopRollupJob(selector.InvokeOrDefault(new StopRollupJobDescriptor(id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStopRollupJobResponse StopRollupJob(IStopRollupJobRequest request) =>
-			this.Dispatcher.Dispatch<IStopRollupJobRequest, StopRollupJobRequestParameters, StopRollupJobResponse>(
+			Dispatcher.Dispatch<IStopRollupJobRequest, StopRollupJobRequestParameters, StopRollupJobResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackRollupStopJobDispatch<StopRollupJobResponse>(p)
+				(p, d) => LowLevelDispatch.XpackRollupStopJobDispatch<StopRollupJobResponse>(p)
 			);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IStopRollupJobResponse> StopRollupJobAsync(
 			Id id, Func<StopRollupJobDescriptor, IStopRollupJobRequest> selector = null, CancellationToken cancellationToken = default
-		)  =>
-			this.StopRollupJobAsync(selector.InvokeOrDefault(new StopRollupJobDescriptor(id)), cancellationToken);
+		) =>
+			StopRollupJobAsync(selector.InvokeOrDefault(new StopRollupJobDescriptor(id)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IStopRollupJobResponse> StopRollupJobAsync(IStopRollupJobRequest request, CancellationToken cancellationToken = default) =>
-			this.Dispatcher.DispatchAsync<IStopRollupJobRequest, StopRollupJobRequestParameters, StopRollupJobResponse, IStopRollupJobResponse>(
+			Dispatcher.DispatchAsync<IStopRollupJobRequest, StopRollupJobRequestParameters, StopRollupJobResponse, IStopRollupJobResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackRollupStopJobDispatchAsync<StopRollupJobResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackRollupStopJobDispatchAsync<StopRollupJobResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/RollUp/StopRollupJob/StopRollupJobRequest.cs b/src/Nest/XPack/RollUp/StopRollupJob/StopRollupJobRequest.cs
index ef92835be2f..4902050c3e4 100644
--- a/src/Nest/XPack/RollUp/StopRollupJob/StopRollupJobRequest.cs
+++ b/src/Nest/XPack/RollUp/StopRollupJob/StopRollupJobRequest.cs
@@ -1,18 +1,9 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	[MapsApi("xpack.rollup.stop_job.json")]
-	public partial interface IStopRollupJobRequest
-	{
-	}
+	public partial interface IStopRollupJobRequest { }
 
-	public partial class StopRollupJobRequest
-	{
-	}
+	public partial class StopRollupJobRequest { }
 
-	public partial class StopRollupJobDescriptor
-	{
-	}
+	public partial class StopRollupJobDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/Authenticate/AuthenticateRequest.cs b/src/Nest/XPack/Security/Authenticate/AuthenticateRequest.cs
index 4c4c488fe4d..ede26265d66 100644
--- a/src/Nest/XPack/Security/Authenticate/AuthenticateRequest.cs
+++ b/src/Nest/XPack/Security/Authenticate/AuthenticateRequest.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IAuthenticateRequest
-	{
-	}
+	public partial interface IAuthenticateRequest { }
 
-	public partial class AuthenticateRequest
-	{
-	}
+	public partial class AuthenticateRequest { }
 
 	[DescriptorFor("XpackSecurityAuthenticate")]
-	public partial class AuthenticateDescriptor
-	{
-	}
+	public partial class AuthenticateDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/Authenticate/AuthenticateResponse.cs b/src/Nest/XPack/Security/Authenticate/AuthenticateResponse.cs
index 955e85e1bef..cd856b978c1 100644
--- a/src/Nest/XPack/Security/Authenticate/AuthenticateResponse.cs
+++ b/src/Nest/XPack/Security/Authenticate/AuthenticateResponse.cs
@@ -5,33 +5,31 @@ namespace Nest
 {
 	public interface IAuthenticateResponse : IResponse
 	{
-		[JsonProperty("username")]
-		string Username { get; }
-
-		[JsonProperty("roles")]
-		IReadOnlyCollection<string> Roles { get; }
+		[JsonProperty("email")]
+		string Email { get; }
 
 		[JsonProperty("full_name")]
 		string FullName { get; }
 
-		[JsonProperty("email")]
-		string Email { get; }
-
 		[JsonProperty("metadata")]
 		IReadOnlyDictionary<string, object> Metadata { get; }
 
+		[JsonProperty("roles")]
+		IReadOnlyCollection<string> Roles { get; }
+
+		[JsonProperty("username")]
+		string Username { get; }
 	}
 
 	public class AuthenticateResponse : ResponseBase, IAuthenticateResponse
 	{
-		public string Username { get; internal set; }
+		public string Email { get; internal set; }
 
-		public IReadOnlyCollection<string> Roles { get; internal set; } = EmptyReadOnly<string>.Collection;
-
-		public string FullName { get; internal set;  }
-
-		public string Email { get; internal set;  }
+		public string FullName { get; internal set; }
 
 		public IReadOnlyDictionary<string, object> Metadata { get; internal set; } = EmptyReadOnly<string, object>.Dictionary;
+
+		public IReadOnlyCollection<string> Roles { get; internal set; } = EmptyReadOnly<string>.Collection;
+		public string Username { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/Security/Authenticate/ElasticClient-Authenticate.cs b/src/Nest/XPack/Security/Authenticate/ElasticClient-Authenticate.cs
index 44d393f223b..57ffb1f9703 100644
--- a/src/Nest/XPack/Security/Authenticate/ElasticClient-Authenticate.cs
+++ b/src/Nest/XPack/Security/Authenticate/ElasticClient-Authenticate.cs
@@ -1,48 +1,54 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IAuthenticateResponse Authenticate(Func<AuthenticateDescriptor, IAuthenticateRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IAuthenticateResponse Authenticate(IAuthenticateRequest request);
 
-		/// <inheritdoc/>
-		Task<IAuthenticateResponse> AuthenticateAsync(Func<AuthenticateDescriptor, IAuthenticateRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IAuthenticateResponse> AuthenticateAsync(Func<AuthenticateDescriptor, IAuthenticateRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IAuthenticateResponse> AuthenticateAsync(IAuthenticateRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAuthenticateResponse Authenticate(Func<AuthenticateDescriptor, IAuthenticateRequest> selector = null) =>
-			this.Authenticate(selector.InvokeOrDefault(new AuthenticateDescriptor()));
+			Authenticate(selector.InvokeOrDefault(new AuthenticateDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAuthenticateResponse Authenticate(IAuthenticateRequest request) =>
-			this.Dispatcher.Dispatch<IAuthenticateRequest, AuthenticateRequestParameters, AuthenticateResponse>(
+			Dispatcher.Dispatch<IAuthenticateRequest, AuthenticateRequestParameters, AuthenticateResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityAuthenticateDispatch<AuthenticateResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityAuthenticateDispatch<AuthenticateResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IAuthenticateResponse> AuthenticateAsync(Func<AuthenticateDescriptor, IAuthenticateRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.AuthenticateAsync(selector.InvokeOrDefault(new AuthenticateDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IAuthenticateResponse> AuthenticateAsync(IAuthenticateRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IAuthenticateRequest, AuthenticateRequestParameters, AuthenticateResponse, IAuthenticateResponse>(
+		/// <inheritdoc />
+		public Task<IAuthenticateResponse> AuthenticateAsync(Func<AuthenticateDescriptor, IAuthenticateRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			AuthenticateAsync(selector.InvokeOrDefault(new AuthenticateDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IAuthenticateResponse> AuthenticateAsync(IAuthenticateRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IAuthenticateRequest, AuthenticateRequestParameters, AuthenticateResponse, IAuthenticateResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityAuthenticateDispatchAsync<AuthenticateResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityAuthenticateDispatchAsync<AuthenticateResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/ClearCachedRealms/ClearCachedRealmsRequest.cs b/src/Nest/XPack/Security/ClearCachedRealms/ClearCachedRealmsRequest.cs
index 2bf975e2faa..a3277ab1a85 100644
--- a/src/Nest/XPack/Security/ClearCachedRealms/ClearCachedRealmsRequest.cs
+++ b/src/Nest/XPack/Security/ClearCachedRealms/ClearCachedRealmsRequest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface IClearCachedRealmsRequest { }
 
diff --git a/src/Nest/XPack/Security/ClearCachedRealms/ClearCachedRealmsResponse.cs b/src/Nest/XPack/Security/ClearCachedRealms/ClearCachedRealmsResponse.cs
index 48f4829ce24..a026d50664f 100644
--- a/src/Nest/XPack/Security/ClearCachedRealms/ClearCachedRealmsResponse.cs
+++ b/src/Nest/XPack/Security/ClearCachedRealms/ClearCachedRealmsResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -11,7 +9,7 @@ public interface IClearCachedRealmsResponse : IResponse
 		string ClusterName { get; }
 
 		[JsonProperty("nodes")]
-		IReadOnlyDictionary<string, SecurityNode>  Nodes { get; }
+		IReadOnlyDictionary<string, SecurityNode> Nodes { get; }
 	}
 
 	public class ClearCachedRealmsResponse : ResponseBase, IClearCachedRealmsResponse
diff --git a/src/Nest/XPack/Security/ClearCachedRealms/ElasticClient-ClearCachedRealms.cs b/src/Nest/XPack/Security/ClearCachedRealms/ElasticClient-ClearCachedRealms.cs
index 3baa0b9f315..10159341a2c 100644
--- a/src/Nest/XPack/Security/ClearCachedRealms/ElasticClient-ClearCachedRealms.cs
+++ b/src/Nest/XPack/Security/ClearCachedRealms/ElasticClient-ClearCachedRealms.cs
@@ -1,48 +1,60 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClearCachedRealmsResponse ClearCachedRealms(Names realms, Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClearCachedRealmsResponse ClearCachedRealms(IClearCachedRealmsRequest request);
 
-		/// <inheritdoc/>
-		Task<IClearCachedRealmsResponse> ClearCachedRealmsAsync(Names realms, Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClearCachedRealmsResponse> ClearCachedRealmsAsync(Names realms,
+			Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IClearCachedRealmsResponse> ClearCachedRealmsAsync(IClearCachedRealmsRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClearCachedRealmsResponse> ClearCachedRealmsAsync(IClearCachedRealmsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IClearCachedRealmsResponse ClearCachedRealms(Names realms, Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> selector = null) =>
-			this.ClearCachedRealms(selector.InvokeOrDefault(new ClearCachedRealmsDescriptor(realms)));
+		/// <inheritdoc />
+		public IClearCachedRealmsResponse ClearCachedRealms(Names realms, Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> selector = null
+		) =>
+			ClearCachedRealms(selector.InvokeOrDefault(new ClearCachedRealmsDescriptor(realms)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClearCachedRealmsResponse ClearCachedRealms(IClearCachedRealmsRequest request) =>
-			this.Dispatcher.Dispatch<IClearCachedRealmsRequest, ClearCachedRealmsRequestParameters, ClearCachedRealmsResponse>(
+			Dispatcher.Dispatch<IClearCachedRealmsRequest, ClearCachedRealmsRequestParameters, ClearCachedRealmsResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityClearCachedRealmsDispatch<ClearCachedRealmsResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityClearCachedRealmsDispatch<ClearCachedRealmsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IClearCachedRealmsResponse> ClearCachedRealmsAsync(Names realms, Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClearCachedRealmsAsync(selector.InvokeOrDefault(new ClearCachedRealmsDescriptor(realms)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IClearCachedRealmsResponse> ClearCachedRealmsAsync(IClearCachedRealmsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClearCachedRealmsRequest, ClearCachedRealmsRequestParameters, ClearCachedRealmsResponse, IClearCachedRealmsResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityClearCachedRealmsDispatchAsync<ClearCachedRealmsResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IClearCachedRealmsResponse> ClearCachedRealmsAsync(Names realms,
+			Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClearCachedRealmsAsync(selector.InvokeOrDefault(new ClearCachedRealmsDescriptor(realms)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClearCachedRealmsResponse> ClearCachedRealmsAsync(IClearCachedRealmsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IClearCachedRealmsRequest, ClearCachedRealmsRequestParameters, ClearCachedRealmsResponse, IClearCachedRealmsResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackSecurityClearCachedRealmsDispatchAsync<ClearCachedRealmsResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesRequest.cs b/src/Nest/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesRequest.cs
index 535f8be7d58..01019e2734f 100644
--- a/src/Nest/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesRequest.cs
+++ b/src/Nest/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesRequest.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IClearCachedRolesRequest
-	{
-	}
+	public partial interface IClearCachedRolesRequest { }
 
-	public partial class ClearCachedRolesRequest
-	{
-	}
+	public partial class ClearCachedRolesRequest { }
 
 	[DescriptorFor("XpackSecurityClearCachedRoles")]
-	public partial class ClearCachedRolesDescriptor
-	{
-	}
+	public partial class ClearCachedRolesDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesResponse.cs b/src/Nest/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesResponse.cs
index 5608c6ad3e4..1f4630ebe55 100644
--- a/src/Nest/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesResponse.cs
+++ b/src/Nest/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -11,7 +9,7 @@ public interface IClearCachedRolesResponse : IResponse
 		string ClusterName { get; }
 
 		[JsonProperty("nodes")]
-		IReadOnlyDictionary<string, SecurityNode>  Nodes { get; }
+		IReadOnlyDictionary<string, SecurityNode> Nodes { get; }
 	}
 
 	public class ClearCachedRolesResponse : ResponseBase, IClearCachedRolesResponse
diff --git a/src/Nest/XPack/Security/Role/ClearCachedRoles/ElasticClient-ClearCachedRoles.cs b/src/Nest/XPack/Security/Role/ClearCachedRoles/ElasticClient-ClearCachedRoles.cs
index b14b18b82f6..8cc42e8b0af 100644
--- a/src/Nest/XPack/Security/Role/ClearCachedRoles/ElasticClient-ClearCachedRoles.cs
+++ b/src/Nest/XPack/Security/Role/ClearCachedRoles/ElasticClient-ClearCachedRoles.cs
@@ -1,48 +1,58 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClearCachedRolesResponse ClearCachedRoles(Names roles, Func<ClearCachedRolesDescriptor, IClearCachedRolesRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IClearCachedRolesResponse ClearCachedRoles(IClearCachedRolesRequest request);
 
-		/// <inheritdoc/>
-		Task<IClearCachedRolesResponse> ClearCachedRolesAsync(Names roles, Func<ClearCachedRolesDescriptor, IClearCachedRolesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClearCachedRolesResponse> ClearCachedRolesAsync(Names roles, Func<ClearCachedRolesDescriptor, IClearCachedRolesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IClearCachedRolesResponse> ClearCachedRolesAsync(IClearCachedRolesRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IClearCachedRolesResponse> ClearCachedRolesAsync(IClearCachedRolesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClearCachedRolesResponse ClearCachedRoles(Names roles, Func<ClearCachedRolesDescriptor, IClearCachedRolesRequest> selector = null) =>
-			this.ClearCachedRoles(selector.InvokeOrDefault(new ClearCachedRolesDescriptor(roles)));
+			ClearCachedRoles(selector.InvokeOrDefault(new ClearCachedRolesDescriptor(roles)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IClearCachedRolesResponse ClearCachedRoles(IClearCachedRolesRequest request) =>
-			this.Dispatcher.Dispatch<IClearCachedRolesRequest, ClearCachedRolesRequestParameters, ClearCachedRolesResponse>(
+			Dispatcher.Dispatch<IClearCachedRolesRequest, ClearCachedRolesRequestParameters, ClearCachedRolesResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityClearCachedRolesDispatch<ClearCachedRolesResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityClearCachedRolesDispatch<ClearCachedRolesResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IClearCachedRolesResponse> ClearCachedRolesAsync(Names roles, Func<ClearCachedRolesDescriptor, IClearCachedRolesRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClearCachedRolesAsync(selector.InvokeOrDefault(new ClearCachedRolesDescriptor(roles)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IClearCachedRolesResponse> ClearCachedRolesAsync(IClearCachedRolesRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClearCachedRolesRequest, ClearCachedRolesRequestParameters, ClearCachedRolesResponse, IClearCachedRolesResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityClearCachedRolesDispatchAsync<ClearCachedRolesResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IClearCachedRolesResponse> ClearCachedRolesAsync(Names roles,
+			Func<ClearCachedRolesDescriptor, IClearCachedRolesRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClearCachedRolesAsync(selector.InvokeOrDefault(new ClearCachedRolesDescriptor(roles)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IClearCachedRolesResponse> ClearCachedRolesAsync(IClearCachedRolesRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IClearCachedRolesRequest, ClearCachedRolesRequestParameters, ClearCachedRolesResponse, IClearCachedRolesResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackSecurityClearCachedRolesDispatchAsync<ClearCachedRolesResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/Security/Role/DeleteRole/DeleteRoleRequest.cs b/src/Nest/XPack/Security/Role/DeleteRole/DeleteRoleRequest.cs
index 123c075470d..9a8df6f578f 100644
--- a/src/Nest/XPack/Security/Role/DeleteRole/DeleteRoleRequest.cs
+++ b/src/Nest/XPack/Security/Role/DeleteRole/DeleteRoleRequest.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IDeleteRoleRequest
-	{
-	}
+	public partial interface IDeleteRoleRequest { }
 
-	public partial class DeleteRoleRequest
-	{
-	}
+	public partial class DeleteRoleRequest { }
 
 	[DescriptorFor("XpackSecurityDeleteRole")]
-	public partial class DeleteRoleDescriptor
-	{
-	}
+	public partial class DeleteRoleDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/Role/DeleteRole/DeleteRoleResponse.cs b/src/Nest/XPack/Security/Role/DeleteRole/DeleteRoleResponse.cs
index 4946d05f233..ee702787f4c 100644
--- a/src/Nest/XPack/Security/Role/DeleteRole/DeleteRoleResponse.cs
+++ b/src/Nest/XPack/Security/Role/DeleteRole/DeleteRoleResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Security/Role/DeleteRole/ElasticClient-DeleteRole.cs b/src/Nest/XPack/Security/Role/DeleteRole/ElasticClient-DeleteRole.cs
index aabc644ab34..112dda7ca67 100644
--- a/src/Nest/XPack/Security/Role/DeleteRole/ElasticClient-DeleteRole.cs
+++ b/src/Nest/XPack/Security/Role/DeleteRole/ElasticClient-DeleteRole.cs
@@ -1,48 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteRoleResponse DeleteRole(Name role, Func<DeleteRoleDescriptor, IDeleteRoleRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteRoleResponse DeleteRole(IDeleteRoleRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteRoleResponse> DeleteRoleAsync(Name role, Func<DeleteRoleDescriptor, IDeleteRoleRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteRoleResponse> DeleteRoleAsync(Name role, Func<DeleteRoleDescriptor, IDeleteRoleRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteRoleResponse> DeleteRoleAsync(IDeleteRoleRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteRoleResponse DeleteRole(Name role, Func<DeleteRoleDescriptor, IDeleteRoleRequest> selector = null) =>
-			this.DeleteRole(selector.InvokeOrDefault(new DeleteRoleDescriptor(role)));
+			DeleteRole(selector.InvokeOrDefault(new DeleteRoleDescriptor(role)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteRoleResponse DeleteRole(IDeleteRoleRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteRoleRequest, DeleteRoleRequestParameters, DeleteRoleResponse>(
+			Dispatcher.Dispatch<IDeleteRoleRequest, DeleteRoleRequestParameters, DeleteRoleResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityDeleteRoleDispatch<DeleteRoleResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityDeleteRoleDispatch<DeleteRoleResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteRoleResponse> DeleteRoleAsync(Name role, Func<DeleteRoleDescriptor, IDeleteRoleRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteRoleAsync(selector.InvokeOrDefault(new DeleteRoleDescriptor(role)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IDeleteRoleResponse> DeleteRoleAsync(Name role, Func<DeleteRoleDescriptor, IDeleteRoleRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteRoleAsync(selector.InvokeOrDefault(new DeleteRoleDescriptor(role)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeleteRoleResponse> DeleteRoleAsync(IDeleteRoleRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteRoleRequest, DeleteRoleRequestParameters, DeleteRoleResponse, IDeleteRoleResponse>(
+		/// <inheritdoc />
+		public Task<IDeleteRoleResponse> DeleteRoleAsync(IDeleteRoleRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteRoleRequest, DeleteRoleRequestParameters, DeleteRoleResponse, IDeleteRoleResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityDeleteRoleDispatchAsync<DeleteRoleResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityDeleteRoleDispatchAsync<DeleteRoleResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/Role/FieldSecurity.cs b/src/Nest/XPack/Security/Role/FieldSecurity.cs
index 6635c4d176a..bc7b08d55f1 100644
--- a/src/Nest/XPack/Security/Role/FieldSecurity.cs
+++ b/src/Nest/XPack/Security/Role/FieldSecurity.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -8,23 +6,24 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<FieldSecurity>))]
 	public interface IFieldSecurity
 	{
-		[JsonProperty("grant")]
-		Fields Grant { get; set; }
-
 		[JsonProperty("except")]
 		Fields Except { get; set; }
+
+		[JsonProperty("grant")]
+		Fields Grant { get; set; }
 	}
+
 	public class FieldSecurity : IFieldSecurity
 	{
-		public Fields Grant { get; set; }
 		public Fields Except { get; set; }
+		public Fields Grant { get; set; }
 	}
 
-	public class FieldSecurityDescriptor<T>: DescriptorBase<FieldSecurityDescriptor<T>, IFieldSecurity>, IFieldSecurity
-		where T :class
+	public class FieldSecurityDescriptor<T> : DescriptorBase<FieldSecurityDescriptor<T>, IFieldSecurity>, IFieldSecurity
+		where T : class
 	{
-		Fields IFieldSecurity.Grant { get; set; }
 		Fields IFieldSecurity.Except { get; set; }
+		Fields IFieldSecurity.Grant { get; set; }
 
 		public FieldSecurityDescriptor<T> Grant(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Grant = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
@@ -35,6 +34,5 @@ public FieldSecurityDescriptor<T> Except(Func<FieldsDescriptor<T>, IPromise<Fiel
 			Assign(a => a.Except = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
 		public FieldSecurityDescriptor<T> Except(Fields fields) => Assign(a => a.Except = fields);
-
 	}
 }
diff --git a/src/Nest/XPack/Security/Role/GetRole/ElasticClient-GetRole.cs b/src/Nest/XPack/Security/Role/GetRole/ElasticClient-GetRole.cs
index b4c24c27da7..bcaf6a084df 100644
--- a/src/Nest/XPack/Security/Role/GetRole/ElasticClient-GetRole.cs
+++ b/src/Nest/XPack/Security/Role/GetRole/ElasticClient-GetRole.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetRoleResponse GetRole(Func<GetRoleDescriptor, IGetRoleRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetRoleResponse GetRole(IGetRoleRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetRoleResponse> GetRoleAsync(Func<GetRoleDescriptor, IGetRoleRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetRoleResponse> GetRoleAsync(Func<GetRoleDescriptor, IGetRoleRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetRoleResponse> GetRoleAsync(IGetRoleRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRoleResponse GetRole(Func<GetRoleDescriptor, IGetRoleRequest> selector = null) =>
-			this.GetRole(selector.InvokeOrDefault(new GetRoleDescriptor()));
+			GetRole(selector.InvokeOrDefault(new GetRoleDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRoleResponse GetRole(IGetRoleRequest request) =>
-			this.Dispatcher.Dispatch<IGetRoleRequest, GetRoleRequestParameters, GetRoleResponse>(
+			Dispatcher.Dispatch<IGetRoleRequest, GetRoleRequestParameters, GetRoleResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityGetRoleDispatch<GetRoleResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityGetRoleDispatch<GetRoleResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetRoleResponse> GetRoleAsync(Func<GetRoleDescriptor, IGetRoleRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetRoleAsync(selector.InvokeOrDefault(new GetRoleDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetRoleResponse> GetRoleAsync(Func<GetRoleDescriptor, IGetRoleRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetRoleAsync(selector.InvokeOrDefault(new GetRoleDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetRoleResponse> GetRoleAsync(IGetRoleRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetRoleRequest, GetRoleRequestParameters, GetRoleResponse, IGetRoleResponse>(
+			Dispatcher.DispatchAsync<IGetRoleRequest, GetRoleRequestParameters, GetRoleResponse, IGetRoleResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityGetRoleDispatchAsync<GetRoleResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityGetRoleDispatchAsync<GetRoleResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/Role/GetRole/GetRoleRequest.cs b/src/Nest/XPack/Security/Role/GetRole/GetRoleRequest.cs
index e4f1c895d83..af0bec0c8ec 100644
--- a/src/Nest/XPack/Security/Role/GetRole/GetRoleRequest.cs
+++ b/src/Nest/XPack/Security/Role/GetRole/GetRoleRequest.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IGetRoleRequest
-	{
-	}
+	public partial interface IGetRoleRequest { }
 
-	public partial class GetRoleRequest
-	{
-	}
+	public partial class GetRoleRequest { }
 
 	[DescriptorFor("XpackSecurityGetRole")]
-	public partial class GetRoleDescriptor
-	{
-	}
+	public partial class GetRoleDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/Role/GetRole/GetRoleResponse.cs b/src/Nest/XPack/Security/Role/GetRole/GetRoleResponse.cs
index da7b498e72d..bf108bf50aa 100644
--- a/src/Nest/XPack/Security/Role/GetRole/GetRoleResponse.cs
+++ b/src/Nest/XPack/Security/Role/GetRole/GetRoleResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/XPack/Security/Role/GetRole/Role.cs b/src/Nest/XPack/Security/Role/GetRole/Role.cs
index f21c974d417..83e54fe8efd 100644
--- a/src/Nest/XPack/Security/Role/GetRole/Role.cs
+++ b/src/Nest/XPack/Security/Role/GetRole/Role.cs
@@ -9,13 +9,13 @@ public class XPackRole
 		[JsonProperty("cluster")]
 		public IReadOnlyCollection<string> Cluster { get; private set; } = EmptyReadOnly<string>.Collection;
 
-		[JsonProperty("run_as")]
-		public IReadOnlyCollection<string> RunAs { get; private set; }= EmptyReadOnly<string>.Collection;
-
 		[JsonProperty("indices")]
 		public IReadOnlyCollection<IIndicesPrivileges> Indices { get; private set; } = EmptyReadOnly<IIndicesPrivileges>.Collection;
 
 		[JsonProperty("metadata")]
 		public IReadOnlyDictionary<string, object> Metadata { get; internal set; } = EmptyReadOnly<string, object>.Dictionary;
+
+		[JsonProperty("run_as")]
+		public IReadOnlyCollection<string> RunAs { get; private set; } = EmptyReadOnly<string>.Collection;
 	}
 }
diff --git a/src/Nest/XPack/Security/Role/PutRole/ElasticClient-PutRole.cs b/src/Nest/XPack/Security/Role/PutRole/ElasticClient-PutRole.cs
index aa66df4e898..4660bce58fd 100644
--- a/src/Nest/XPack/Security/Role/PutRole/ElasticClient-PutRole.cs
+++ b/src/Nest/XPack/Security/Role/PutRole/ElasticClient-PutRole.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutRoleResponse PutRole(Name role, Func<PutRoleDescriptor, IPutRoleRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutRoleResponse PutRole(IPutRoleRequest request);
 
-		/// <inheritdoc/>
-		Task<IPutRoleResponse> PutRoleAsync(Name role, Func<PutRoleDescriptor, IPutRoleRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPutRoleResponse> PutRoleAsync(Name role, Func<PutRoleDescriptor, IPutRoleRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutRoleResponse> PutRoleAsync(IPutRoleRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutRoleResponse PutRole(Name role, Func<PutRoleDescriptor, IPutRoleRequest> selector = null) =>
-			this.PutRole(selector.InvokeOrDefault(new PutRoleDescriptor(role)));
+			PutRole(selector.InvokeOrDefault(new PutRoleDescriptor(role)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutRoleResponse PutRole(IPutRoleRequest request) =>
-			this.Dispatcher.Dispatch<IPutRoleRequest, PutRoleRequestParameters, PutRoleResponse>(
+			Dispatcher.Dispatch<IPutRoleRequest, PutRoleRequestParameters, PutRoleResponse>(
 				request,
-				this.LowLevelDispatch.XpackSecurityPutRoleDispatch<PutRoleResponse>
+				LowLevelDispatch.XpackSecurityPutRoleDispatch<PutRoleResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPutRoleResponse> PutRoleAsync(Name role, Func<PutRoleDescriptor, IPutRoleRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PutRoleAsync(selector.InvokeOrDefault(new PutRoleDescriptor(role)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IPutRoleResponse> PutRoleAsync(Name role, Func<PutRoleDescriptor, IPutRoleRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PutRoleAsync(selector.InvokeOrDefault(new PutRoleDescriptor(role)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IPutRoleResponse> PutRoleAsync(IPutRoleRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutRoleRequest, PutRoleRequestParameters, PutRoleResponse, IPutRoleResponse>(
+			Dispatcher.DispatchAsync<IPutRoleRequest, PutRoleRequestParameters, PutRoleResponse, IPutRoleResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackSecurityPutRoleDispatchAsync<PutRoleResponse>
+				LowLevelDispatch.XpackSecurityPutRoleDispatchAsync<PutRoleResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/Role/PutRole/IApplicationPrivileges.cs b/src/Nest/XPack/Security/Role/PutRole/IApplicationPrivileges.cs
index 5246338e566..d4ab4b1d055 100644
--- a/src/Nest/XPack/Security/Role/PutRole/IApplicationPrivileges.cs
+++ b/src/Nest/XPack/Security/Role/PutRole/IApplicationPrivileges.cs
@@ -34,8 +34,10 @@ public class ApplicationPrivileges : IApplicationPrivileges
 	{
 		/// <inheritdoc />
 		public string Application { get; set; }
+
 		/// <inheritdoc />
 		public IEnumerable<string> Privileges { get; set; }
+
 		/// <inheritdoc />
 		public IEnumerable<string> Resources { get; set; }
 	}
@@ -47,18 +49,21 @@ public ApplicationPrivilegesDescriptor() : base(new List<IApplicationPrivileges>
 		/// <summary>
 		/// Adds an application privilege
 		/// </summary>
-		public ApplicationPrivilegesDescriptor Add<T>(Func<ApplicationPrivilegesDescriptor<T>, IApplicationPrivileges> selector) where T : class  =>
+		public ApplicationPrivilegesDescriptor Add<T>(Func<ApplicationPrivilegesDescriptor<T>, IApplicationPrivileges> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new ApplicationPrivilegesDescriptor<T>())));
 	}
 
 	/// <inheritdoc cref="IApplicationPrivileges" />
-	public class ApplicationPrivilegesDescriptor<T>: DescriptorBase<ApplicationPrivilegesDescriptor<T>, IApplicationPrivileges>, IApplicationPrivileges
-		where T :class
+	public class ApplicationPrivilegesDescriptor<T>
+		: DescriptorBase<ApplicationPrivilegesDescriptor<T>, IApplicationPrivileges>, IApplicationPrivileges
+		where T : class
 	{
 		/// <inheritdoc />
 		string IApplicationPrivileges.Application { get; set; }
+
 		/// <inheritdoc />
 		IEnumerable<string> IApplicationPrivileges.Privileges { get; set; }
+
 		/// <inheritdoc />
 		IEnumerable<string> IApplicationPrivileges.Resources { get; set; }
 
@@ -67,11 +72,13 @@ public class ApplicationPrivilegesDescriptor<T>: DescriptorBase<ApplicationPrivi
 
 		/// <inheritdoc cref="IApplicationPrivileges.Privileges" />
 		public ApplicationPrivilegesDescriptor<T> Privileges(params string[] privileges) => Assign(a => a.Privileges = privileges);
+
 		/// <inheritdoc cref="IApplicationPrivileges.Privileges" />
 		public ApplicationPrivilegesDescriptor<T> Privileges(IEnumerable<string> privileges) => Assign(a => a.Privileges = privileges);
 
 		/// <inheritdoc cref="IApplicationPrivileges.Resources" />
 		public ApplicationPrivilegesDescriptor<T> Resources(params string[] resources) => Assign(a => a.Resources = resources);
+
 		/// <inheritdoc cref="IApplicationPrivileges.Resources" />
 		public ApplicationPrivilegesDescriptor<T> Resources(IEnumerable<string> resources) => Assign(a => a.Resources = resources);
 	}
diff --git a/src/Nest/XPack/Security/Role/PutRole/IndicesPrivileges.cs b/src/Nest/XPack/Security/Role/PutRole/IndicesPrivileges.cs
index 5d16f01674a..1fa74c93d1b 100644
--- a/src/Nest/XPack/Security/Role/PutRole/IndicesPrivileges.cs
+++ b/src/Nest/XPack/Security/Role/PutRole/IndicesPrivileges.cs
@@ -8,6 +8,9 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<IndicesPrivileges>))]
 	public interface IIndicesPrivileges
 	{
+		[JsonProperty("field_security")]
+		IFieldSecurity FieldSecurity { get; set; }
+
 		[JsonProperty("names")]
 		[JsonConverter(typeof(IndicesJsonConverter))]
 		Indices Names { get; set; }
@@ -15,19 +18,18 @@ public interface IIndicesPrivileges
 		[JsonProperty("privileges")]
 		IEnumerable<string> Privileges { get; set; }
 
-		[JsonProperty("field_security")]
-		IFieldSecurity FieldSecurity { get; set; }
-
 		[JsonProperty("query")]
 		QueryContainer Query { get; set; }
 	}
 
 	public class IndicesPrivileges : IIndicesPrivileges
 	{
+		public IFieldSecurity FieldSecurity { get; set; }
+
 		[JsonConverter(typeof(IndicesJsonConverter))]
 		public Indices Names { get; set; }
+
 		public IEnumerable<string> Privileges { get; set; }
-		public IFieldSecurity FieldSecurity { get; set; }
 		public QueryContainer Query { get; set; }
 	}
 
@@ -35,23 +37,26 @@ public class IndicesPrivilegesDescriptor : DescriptorPromiseBase<IndicesPrivileg
 	{
 		public IndicesPrivilegesDescriptor() : base(new List<IIndicesPrivileges>()) { }
 
-		public IndicesPrivilegesDescriptor Add<T>(Func<IndicesPrivilegesDescriptor<T>, IIndicesPrivileges> selector) where T : class  =>
+		public IndicesPrivilegesDescriptor Add<T>(Func<IndicesPrivilegesDescriptor<T>, IIndicesPrivileges> selector) where T : class =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new IndicesPrivilegesDescriptor<T>())));
 	}
 
-	public class IndicesPrivilegesDescriptor<T>: DescriptorBase<IndicesPrivilegesDescriptor<T>, IIndicesPrivileges>, IIndicesPrivileges
-		where T :class
+	public class IndicesPrivilegesDescriptor<T> : DescriptorBase<IndicesPrivilegesDescriptor<T>, IIndicesPrivileges>, IIndicesPrivileges
+		where T : class
 	{
+		IFieldSecurity IIndicesPrivileges.FieldSecurity { get; set; }
 		Indices IIndicesPrivileges.Names { get; set; }
 		IEnumerable<string> IIndicesPrivileges.Privileges { get; set; }
-		IFieldSecurity IIndicesPrivileges.FieldSecurity { get; set; }
 		QueryContainer IIndicesPrivileges.Query { get; set; }
 
 		public IndicesPrivilegesDescriptor<T> Names(Indices indices) => Assign(a => a.Names = indices);
+
 		public IndicesPrivilegesDescriptor<T> Names(params IndexName[] indices) => Assign(a => a.Names = indices);
+
 		public IndicesPrivilegesDescriptor<T> Names(IEnumerable<IndexName> indices) => Assign(a => a.Names = indices.ToArray());
 
 		public IndicesPrivilegesDescriptor<T> Privileges(params string[] privileges) => Assign(a => a.Privileges = privileges);
+
 		public IndicesPrivilegesDescriptor<T> Privileges(IEnumerable<string> privileges) => Assign(a => a.Privileges = privileges);
 
 		public IndicesPrivilegesDescriptor<T> FieldSecurity(Func<FieldSecurityDescriptor<T>, IFieldSecurity> fields) =>
diff --git a/src/Nest/XPack/Security/Role/PutRole/PutRoleRequest.cs b/src/Nest/XPack/Security/Role/PutRole/PutRoleRequest.cs
index a1c42e20538..19e4f59b62d 100644
--- a/src/Nest/XPack/Security/Role/PutRole/PutRoleRequest.cs
+++ b/src/Nest/XPack/Security/Role/PutRole/PutRoleRequest.cs
@@ -30,12 +30,6 @@ public partial interface IPutRoleRequest
 		[JsonConverter(typeof(VerbatimDictionaryKeysPreservingNullJsonConverter<string, object>))]
 		IDictionary<string, object> Global { get; set; }
 
-		/// <summary>
-		/// A list of users that the owners of this role can impersonate.
-		/// </summary>
-		[JsonProperty("run_as")]
-		IEnumerable<string> RunAs { get; set; }
-
 		/// <summary>
 		/// A list of indices permissions entries
 		/// </summary>
@@ -49,81 +43,95 @@ public partial interface IPutRoleRequest
 		[JsonConverter(typeof(VerbatimDictionaryKeysPreservingNullJsonConverter<string, object>))]
 		IDictionary<string, object> Metadata { get; set; }
 
+		/// <summary>
+		/// A list of users that the owners of this role can impersonate.
+		/// </summary>
+		[JsonProperty("run_as")]
+		IEnumerable<string> RunAs { get; set; }
 	}
 
-	/// <inheritdoc cref="IPutRoleRequest"/>
+	/// <inheritdoc cref="IPutRoleRequest" />
 	public partial class PutRoleRequest
 	{
-		/// <inheritdoc cref="IPutRoleRequest.Applications"/>
+		/// <inheritdoc cref="IPutRoleRequest.Applications" />
 		public IEnumerable<IApplicationPrivileges> Applications { get; set; }
 
-		/// <inheritdoc cref="IPutRoleRequest.Cluster"/>
+		/// <inheritdoc cref="IPutRoleRequest.Cluster" />
 		public IEnumerable<string> Cluster { get; set; }
 
-		/// <inheritdoc cref="IPutRoleRequest.Global"/>
+		/// <inheritdoc cref="IPutRoleRequest.Global" />
 		public IDictionary<string, object> Global { get; set; }
 
-		/// <inheritdoc cref="IPutRoleRequest.RunAs"/>
-		public IEnumerable<string> RunAs { get; set; }
-
-		/// <inheritdoc cref="IPutRoleRequest.Indices"/>
+		/// <inheritdoc cref="IPutRoleRequest.Indices" />
 		public IEnumerable<IIndicesPrivileges> Indices { get; set; }
 
-		/// <inheritdoc cref="IPutRoleRequest.Metadata"/>
+		/// <inheritdoc cref="IPutRoleRequest.Metadata" />
 		public IDictionary<string, object> Metadata { get; set; }
+
+		/// <inheritdoc cref="IPutRoleRequest.RunAs" />
+		public IEnumerable<string> RunAs { get; set; }
 	}
 
-	/// <inheritdoc cref="IPutRoleRequest"/>
+	/// <inheritdoc cref="IPutRoleRequest" />
 	[DescriptorFor("XpackSecurityPutRole")]
 	public partial class PutRoleDescriptor
 	{
-		/// <inheritdoc cref="IPutRoleRequest.Applications"/>
+		/// <inheritdoc cref="IPutRoleRequest.Applications" />
 		IEnumerable<IApplicationPrivileges> IPutRoleRequest.Applications { get; set; }
-		/// <inheritdoc cref="IPutRoleRequest.Cluster"/>
+
+		/// <inheritdoc cref="IPutRoleRequest.Cluster" />
 		IEnumerable<string> IPutRoleRequest.Cluster { get; set; }
-		/// <inheritdoc cref="IPutRoleRequest.Global"/>
+
+		/// <inheritdoc cref="IPutRoleRequest.Global" />
 		IDictionary<string, object> IPutRoleRequest.Global { get; set; }
-		/// <inheritdoc cref="IPutRoleRequest.RunAs"/>
-		IEnumerable<string> IPutRoleRequest.RunAs { get; set; }
-		/// <inheritdoc cref="IPutRoleRequest.Indices"/>
+
+		/// <inheritdoc cref="IPutRoleRequest.Indices" />
 		IEnumerable<IIndicesPrivileges> IPutRoleRequest.Indices { get; set; }
-		/// <inheritdoc cref="IPutRoleRequest.Metadata"/>
+
+		/// <inheritdoc cref="IPutRoleRequest.Metadata" />
 		IDictionary<string, object> IPutRoleRequest.Metadata { get; set; }
 
-		/// <inheritdoc cref="IPutRoleRequest.Applications"/>
+		/// <inheritdoc cref="IPutRoleRequest.RunAs" />
+		IEnumerable<string> IPutRoleRequest.RunAs { get; set; }
+
+		/// <inheritdoc cref="IPutRoleRequest.Applications" />
 		public PutRoleDescriptor Applications(IEnumerable<IApplicationPrivileges> privileges) =>
 			Assign(a => a.Applications = privileges.ToListOrNullIfEmpty());
-		/// <inheritdoc cref="IPutRoleRequest.Applications"/>
+
+		/// <inheritdoc cref="IPutRoleRequest.Applications" />
 		public PutRoleDescriptor Applications(Func<ApplicationPrivilegesDescriptor, IPromise<IList<IApplicationPrivileges>>> selector) =>
 			Assign(a => a.Applications = selector?.Invoke(new ApplicationPrivilegesDescriptor())?.Value);
 
-		/// <inheritdoc cref="IPutRoleRequest.Cluster"/>
+		/// <inheritdoc cref="IPutRoleRequest.Cluster" />
 		public PutRoleDescriptor Cluster(IEnumerable<string> clusters) => Assign(a => a.Cluster = clusters);
-		/// <inheritdoc cref="IPutRoleRequest.Cluster"/>
+
+		/// <inheritdoc cref="IPutRoleRequest.Cluster" />
 		public PutRoleDescriptor Cluster(params string[] clusters) => Assign(a => a.Cluster = clusters);
 
-		/// <inheritdoc cref="IPutRoleRequest.Global"/>
+		/// <inheritdoc cref="IPutRoleRequest.Global" />
 		public PutRoleDescriptor Global(IDictionary<string, object> global) => Assign(a => a.Global = global);
-		/// <inheritdoc cref="IPutRoleRequest.Global"/>
+
+		/// <inheritdoc cref="IPutRoleRequest.Global" />
 		public PutRoleDescriptor Global(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector) =>
 			Assign(a => a.Global = selector?.Invoke(new FluentDictionary<string, object>()));
 
-		/// <inheritdoc cref="IPutRoleRequest.RunAs"/>
+		/// <inheritdoc cref="IPutRoleRequest.RunAs" />
 		public PutRoleDescriptor RunAs(IEnumerable<string> users) => Assign(a => a.RunAs = users);
-		/// <inheritdoc cref="IPutRoleRequest.RunAs"/>
+
+		/// <inheritdoc cref="IPutRoleRequest.RunAs" />
 		public PutRoleDescriptor RunAs(params string[] users) => Assign(a => a.RunAs = users);
 
-		/// <inheritdoc cref="IPutRoleRequest.Indices"/>
+		/// <inheritdoc cref="IPutRoleRequest.Indices" />
 		public PutRoleDescriptor Indices(IEnumerable<IIndicesPrivileges> privileges) => Assign(a => a.Indices = privileges.ToListOrNullIfEmpty());
 
-		/// <inheritdoc cref="IPutRoleRequest.Indices"/>
+		/// <inheritdoc cref="IPutRoleRequest.Indices" />
 		public PutRoleDescriptor Indices(Func<IndicesPrivilegesDescriptor, IPromise<IList<IIndicesPrivileges>>> selector) =>
 			Assign(a => a.Indices = selector?.Invoke(new IndicesPrivilegesDescriptor())?.Value);
 
-		/// <inheritdoc cref="IPutRoleRequest.Metadata"/>
+		/// <inheritdoc cref="IPutRoleRequest.Metadata" />
 		public PutRoleDescriptor Metadata(IDictionary<string, object> metadata) => Assign(a => a.Metadata = metadata);
 
-		/// <inheritdoc cref="IPutRoleRequest.Metadata"/>
+		/// <inheritdoc cref="IPutRoleRequest.Metadata" />
 		public PutRoleDescriptor Metadata(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector) =>
 			Assign(a => a.Metadata = selector?.Invoke(new FluentDictionary<string, object>()));
 	}
diff --git a/src/Nest/XPack/Security/Role/PutRole/PutRoleResponse.cs b/src/Nest/XPack/Security/Role/PutRole/PutRoleResponse.cs
index 4c71af59bc3..bc7adf1d0aa 100644
--- a/src/Nest/XPack/Security/Role/PutRole/PutRoleResponse.cs
+++ b/src/Nest/XPack/Security/Role/PutRole/PutRoleResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingRequest.cs b/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingRequest.cs
index 5097c1d3f2c..04e690a87f3 100644
--- a/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingRequest.cs
+++ b/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingRequest.cs
@@ -1,20 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IDeleteRoleMappingRequest
-	{
-
-	}
+	public partial interface IDeleteRoleMappingRequest { }
 
-	public partial class DeleteRoleMappingRequest
-	{
-	}
+	public partial class DeleteRoleMappingRequest { }
 
 	[DescriptorFor("XpackSecurityDeleteRoleMapping")]
-	public partial class DeleteRoleMappingDescriptor
-	{
-	}
+	public partial class DeleteRoleMappingDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingResponse.cs b/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingResponse.cs
index a8dbdc38dc7..97875180f74 100644
--- a/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingResponse.cs
+++ b/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -15,5 +12,4 @@ public class DeleteRoleMappingResponse : ResponseBase, IDeleteRoleMappingRespons
 	{
 		public bool Found { get; internal set; }
 	}
-
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/ElasticClient-DeleteRoleMapping.cs b/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/ElasticClient-DeleteRoleMapping.cs
index 65e31b90c3e..2f383f508aa 100644
--- a/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/ElasticClient-DeleteRoleMapping.cs
+++ b/src/Nest/XPack/Security/RoleMapping/DeleteRoleMapping/ElasticClient-DeleteRoleMapping.cs
@@ -1,48 +1,60 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteRoleMappingResponse DeleteRoleMapping(Name role, Func<DeleteRoleMappingDescriptor, IDeleteRoleMappingRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteRoleMappingResponse DeleteRoleMapping(IDeleteRoleMappingRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteRoleMappingResponse> DeleteRoleMappingAsync(Name role, Func<DeleteRoleMappingDescriptor, IDeleteRoleMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteRoleMappingResponse> DeleteRoleMappingAsync(Name role,
+			Func<DeleteRoleMappingDescriptor, IDeleteRoleMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IDeleteRoleMappingResponse> DeleteRoleMappingAsync(IDeleteRoleMappingRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteRoleMappingResponse> DeleteRoleMappingAsync(IDeleteRoleMappingRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IDeleteRoleMappingResponse DeleteRoleMapping(Name role, Func<DeleteRoleMappingDescriptor, IDeleteRoleMappingRequest> selector = null) =>
-			this.DeleteRoleMapping(selector.InvokeOrDefault(new DeleteRoleMappingDescriptor(role)));
+		/// <inheritdoc />
+		public IDeleteRoleMappingResponse
+			DeleteRoleMapping(Name role, Func<DeleteRoleMappingDescriptor, IDeleteRoleMappingRequest> selector = null) =>
+			DeleteRoleMapping(selector.InvokeOrDefault(new DeleteRoleMappingDescriptor(role)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteRoleMappingResponse DeleteRoleMapping(IDeleteRoleMappingRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteRoleMappingRequest, DeleteRoleMappingRequestParameters, DeleteRoleMappingResponse>(
+			Dispatcher.Dispatch<IDeleteRoleMappingRequest, DeleteRoleMappingRequestParameters, DeleteRoleMappingResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackSecurityDeleteRoleMappingDispatch<DeleteRoleMappingResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityDeleteRoleMappingDispatch<DeleteRoleMappingResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteRoleMappingResponse> DeleteRoleMappingAsync(Name role, Func<DeleteRoleMappingDescriptor, IDeleteRoleMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteRoleMappingAsync(selector.InvokeOrDefault(new DeleteRoleMappingDescriptor(role)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDeleteRoleMappingResponse> DeleteRoleMappingAsync(IDeleteRoleMappingRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteRoleMappingRequest, DeleteRoleMappingRequestParameters, DeleteRoleMappingResponse, IDeleteRoleMappingResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityDeleteRoleMappingDispatchAsync<DeleteRoleMappingResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IDeleteRoleMappingResponse> DeleteRoleMappingAsync(Name role,
+			Func<DeleteRoleMappingDescriptor, IDeleteRoleMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteRoleMappingAsync(selector.InvokeOrDefault(new DeleteRoleMappingDescriptor(role)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDeleteRoleMappingResponse> DeleteRoleMappingAsync(IDeleteRoleMappingRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IDeleteRoleMappingRequest, DeleteRoleMappingRequestParameters, DeleteRoleMappingResponse, IDeleteRoleMappingResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackSecurityDeleteRoleMappingDispatchAsync<DeleteRoleMappingResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/ElasticClient-GetRoleMapping.cs b/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/ElasticClient-GetRoleMapping.cs
index 4799406063f..4431f577600 100644
--- a/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/ElasticClient-GetRoleMapping.cs
+++ b/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/ElasticClient-GetRoleMapping.cs
@@ -1,48 +1,56 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetRoleMappingResponse GetRoleMapping(Func<GetRoleMappingDescriptor, IGetRoleMappingRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetRoleMappingResponse GetRoleMapping(IGetRoleMappingRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetRoleMappingResponse> GetRoleMappingAsync(Func<GetRoleMappingDescriptor, IGetRoleMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetRoleMappingResponse> GetRoleMappingAsync(Func<GetRoleMappingDescriptor, IGetRoleMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetRoleMappingResponse> GetRoleMappingAsync(IGetRoleMappingRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetRoleMappingResponse> GetRoleMappingAsync(IGetRoleMappingRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRoleMappingResponse GetRoleMapping(Func<GetRoleMappingDescriptor, IGetRoleMappingRequest> selector = null) =>
-			this.GetRoleMapping(selector.InvokeOrDefault(new GetRoleMappingDescriptor()));
+			GetRoleMapping(selector.InvokeOrDefault(new GetRoleMappingDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetRoleMappingResponse GetRoleMapping(IGetRoleMappingRequest request) =>
-			this.Dispatcher.Dispatch<IGetRoleMappingRequest, GetRoleMappingRequestParameters, GetRoleMappingResponse>(
+			Dispatcher.Dispatch<IGetRoleMappingRequest, GetRoleMappingRequestParameters, GetRoleMappingResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackSecurityGetRoleMappingDispatch<GetRoleMappingResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityGetRoleMappingDispatch<GetRoleMappingResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetRoleMappingResponse> GetRoleMappingAsync(Func<GetRoleMappingDescriptor, IGetRoleMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetRoleMappingAsync(selector.InvokeOrDefault(new GetRoleMappingDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IGetRoleMappingResponse> GetRoleMappingAsync(IGetRoleMappingRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetRoleMappingRequest, GetRoleMappingRequestParameters, GetRoleMappingResponse, IGetRoleMappingResponse>(
+		/// <inheritdoc />
+		public Task<IGetRoleMappingResponse> GetRoleMappingAsync(Func<GetRoleMappingDescriptor, IGetRoleMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetRoleMappingAsync(selector.InvokeOrDefault(new GetRoleMappingDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IGetRoleMappingResponse> GetRoleMappingAsync(IGetRoleMappingRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IGetRoleMappingRequest, GetRoleMappingRequestParameters, GetRoleMappingResponse, IGetRoleMappingResponse>(
 				request,
 				cancellationToken,
-				(p,d,c) => this.LowLevelDispatch.XpackSecurityGetRoleMappingDispatchAsync<GetRoleMappingResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityGetRoleMappingDispatchAsync<GetRoleMappingResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingRequest.cs b/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingRequest.cs
index 64b02c89c3b..1ffd13e0627 100644
--- a/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingRequest.cs
+++ b/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingRequest.cs
@@ -1,20 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IGetRoleMappingRequest
-	{
-
-	}
+	public partial interface IGetRoleMappingRequest { }
 
-	public partial class GetRoleMappingRequest
-	{
-	}
+	public partial class GetRoleMappingRequest { }
 
 	[DescriptorFor("XpackSecurityGetRoleMapping")]
-	public partial class GetRoleMappingDescriptor
-	{
-	}
+	public partial class GetRoleMappingDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingResponse.cs b/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingResponse.cs
index 8261c8f67a9..136b325f7f1 100644
--- a/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingResponse.cs
+++ b/src/Nest/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -21,17 +19,16 @@ public class GetRoleMappingResponse : DictionaryResponseBase<string, XPackRoleMa
 	//only used by GetRoleMappingResponse thus private setters and IReadOnlyCollection
 	public class XPackRoleMapping
 	{
-		[JsonProperty("metadata")]
-		public IDictionary<string, object> Metadata { get; private set; }
-
 		[JsonProperty("enabled")]
 		public bool Enabled { get; private set; }
 
+		[JsonProperty("metadata")]
+		public IDictionary<string, object> Metadata { get; private set; }
+
 		[JsonProperty("roles")]
 		public IReadOnlyCollection<string> Roles { get; private set; } = EmptyReadOnly<string>.Collection;
 
 		[JsonProperty("rules")]
 		public RoleMappingRuleBase Rules { get; private set; }
 	}
-
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/ElasticClient-PutRoleMapping.cs b/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/ElasticClient-PutRoleMapping.cs
index c42c9a35969..a6552c44892 100644
--- a/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/ElasticClient-PutRoleMapping.cs
+++ b/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/ElasticClient-PutRoleMapping.cs
@@ -1,48 +1,56 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutRoleMappingResponse PutRoleMapping(Name role, Func<PutRoleMappingDescriptor, IPutRoleMappingRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutRoleMappingResponse PutRoleMapping(IPutRoleMappingRequest request);
 
-		/// <inheritdoc/>
-		Task<IPutRoleMappingResponse> PutRoleMappingAsync(Name role, Func<PutRoleMappingDescriptor, IPutRoleMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPutRoleMappingResponse> PutRoleMappingAsync(Name role, Func<PutRoleMappingDescriptor, IPutRoleMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IPutRoleMappingResponse> PutRoleMappingAsync(IPutRoleMappingRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPutRoleMappingResponse> PutRoleMappingAsync(IPutRoleMappingRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutRoleMappingResponse PutRoleMapping(Name role, Func<PutRoleMappingDescriptor, IPutRoleMappingRequest> selector = null) =>
-			this.PutRoleMapping(selector.InvokeOrDefault(new PutRoleMappingDescriptor(role)));
+			PutRoleMapping(selector.InvokeOrDefault(new PutRoleMappingDescriptor(role)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutRoleMappingResponse PutRoleMapping(IPutRoleMappingRequest request) =>
-			this.Dispatcher.Dispatch<IPutRoleMappingRequest, PutRoleMappingRequestParameters, PutRoleMappingResponse>(
+			Dispatcher.Dispatch<IPutRoleMappingRequest, PutRoleMappingRequestParameters, PutRoleMappingResponse>(
 				request,
-				this.LowLevelDispatch.XpackSecurityPutRoleMappingDispatch<PutRoleMappingResponse>
+				LowLevelDispatch.XpackSecurityPutRoleMappingDispatch<PutRoleMappingResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPutRoleMappingResponse> PutRoleMappingAsync(Name role, Func<PutRoleMappingDescriptor, IPutRoleMappingRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PutRoleMappingAsync(selector.InvokeOrDefault(new PutRoleMappingDescriptor(role)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IPutRoleMappingResponse> PutRoleMappingAsync(IPutRoleMappingRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutRoleMappingRequest, PutRoleMappingRequestParameters, PutRoleMappingResponse, IPutRoleMappingResponse>(
+		/// <inheritdoc />
+		public Task<IPutRoleMappingResponse> PutRoleMappingAsync(Name role, Func<PutRoleMappingDescriptor, IPutRoleMappingRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PutRoleMappingAsync(selector.InvokeOrDefault(new PutRoleMappingDescriptor(role)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IPutRoleMappingResponse> PutRoleMappingAsync(IPutRoleMappingRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IPutRoleMappingRequest, PutRoleMappingRequestParameters, PutRoleMappingResponse, IPutRoleMappingResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackSecurityPutRoleMappingDispatchAsync<PutRoleMappingResponse>
+				LowLevelDispatch.XpackSecurityPutRoleMappingDispatchAsync<PutRoleMappingResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingRequest.cs b/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingRequest.cs
index a03b079a853..002c1bb17c6 100644
--- a/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingRequest.cs
+++ b/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingRequest.cs
@@ -6,77 +6,74 @@ namespace Nest
 {
 	public partial interface IPutRoleMappingRequest
 	{
-		[JsonProperty("run_as")]
-		IEnumerable<string> RunAs { get; set; }
+		[JsonProperty("enabled")]
+		bool? Enabled { get; set; }
 
 		[JsonProperty("metadata")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysPreservingNullJsonConverter<string, object>))]
 		IDictionary<string, object> Metadata { get; set; }
 
-		[JsonProperty("enabled")]
-		bool? Enabled { get; set; }
-
 		[JsonProperty("roles")]
 		IEnumerable<string> Roles { get; set; }
 
 		[JsonProperty("rules")]
 		RoleMappingRuleBase Rules { get; set; }
+
+		[JsonProperty("run_as")]
+		IEnumerable<string> RunAs { get; set; }
 	}
 
 	public partial class PutRoleMappingRequest
 	{
-		public IEnumerable<string> RunAs { get; set; }
+		public bool? Enabled { get; set; }
 
 		public IDictionary<string, object> Metadata { get; set; }
 
-		public bool? Enabled { get; set; }
-
 		public IEnumerable<string> Roles { get; set; }
 
 		public RoleMappingRuleBase Rules { get; set; }
+		public IEnumerable<string> RunAs { get; set; }
 	}
 
 	[DescriptorFor("XpackSecurityPutRoleMapping")]
 	public partial class PutRoleMappingDescriptor
 	{
-		IEnumerable<string> IPutRoleMappingRequest.Roles { get; set; }
-		IEnumerable<string> IPutRoleMappingRequest.RunAs { get; set; }
-		IDictionary<string, object> IPutRoleMappingRequest.Metadata { get; set; }
 		bool? IPutRoleMappingRequest.Enabled { get; set; }
+		IDictionary<string, object> IPutRoleMappingRequest.Metadata { get; set; }
+		IEnumerable<string> IPutRoleMappingRequest.Roles { get; set; }
 		RoleMappingRuleBase IPutRoleMappingRequest.Rules { get; set; }
+		IEnumerable<string> IPutRoleMappingRequest.RunAs { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor Roles(RoleMappingRuleBase rules) => Assign(a => a.Rules = rules);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor Roles(IEnumerable<string> roles) => Assign(a => a.Roles = roles);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor Roles(params string[] roles) => Assign(a => a.Roles = roles);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor Rules(Func<RoleMappingRuleDescriptor, RoleMappingRuleBase> selector) =>
 			Assign(a => a.Rules = selector?.Invoke(new RoleMappingRuleDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor Rules(RoleMappingRuleBase rules) => Assign(a => a.Rules = rules);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor RunAs(IEnumerable<string> users) => Assign(a => a.RunAs = users);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor RunAs(params string[] users) => Assign(a => a.RunAs = users);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor Enabled(bool? enabled = true) => Assign(a => a.Enabled = enabled);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor Metadata(IDictionary<string, object> metadata) => Assign(a => a.Metadata = metadata);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public PutRoleMappingDescriptor Metadata(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector) =>
 			Assign(a => a.Metadata = selector?.Invoke(new FluentDictionary<string, object>()));
 	}
-
-
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingResponse.cs b/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingResponse.cs
index cf71e954ba0..6c315cf7c06 100644
--- a/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingResponse.cs
+++ b/src/Nest/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -13,9 +10,8 @@ public interface IPutRoleMappingResponse : IResponse
 
 	public class PutRoleMappingResponse : ResponseBase, IPutRoleMappingResponse
 	{
+		public bool Created => RoleMapping?.Created ?? false;
 		public PutRoleMappingStatus RoleMapping { get; internal set; }
-
-		public bool Created => this.RoleMapping?.Created ?? false;
 	}
 
 	public class PutRoleMappingStatus
@@ -23,5 +19,4 @@ public class PutRoleMappingStatus
 		[JsonProperty("created")]
 		public bool Created { get; set; }
 	}
-
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Field/DistinguishedNameRule.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Field/DistinguishedNameRule.cs
index dca787ff7be..281c765acda 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Field/DistinguishedNameRule.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Field/DistinguishedNameRule.cs
@@ -2,9 +2,6 @@
 {
 	public class DistinguishedNameRule : FieldRuleBase
 	{
-		public DistinguishedNameRule(string name)
-		{
-			this.DistinguishedName = name;
-		}
+		public DistinguishedNameRule(string name) => DistinguishedName = name;
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Field/FieldRuleBase.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Field/FieldRuleBase.cs
index bfc72776ef6..3ccea078534 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Field/FieldRuleBase.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Field/FieldRuleBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
@@ -10,39 +9,42 @@ namespace Nest
 	public abstract class FieldRuleBase : IsADictionaryBase<string, object>
 	{
 		[JsonIgnore]
-		protected string Username
+		protected string DistinguishedName
 		{
-			get => (this.BackingDictionary.TryGetValue("username", out object o) ? (string) o : null);
-			set => this.BackingDictionary.Add("username", value);
+			get => BackingDictionary.TryGetValue("dn", out var o) ? (string)o : null;
+			set => BackingDictionary.Add("dn", value);
 		}
 
 		[JsonIgnore]
-		protected string DistinguishedName
+		protected IEnumerable<string> Groups
 		{
-			get => (this.BackingDictionary.TryGetValue("dn", out object o) ? (string) o : null);
-			set => this.BackingDictionary.Add("dn", value);
+			get => BackingDictionary.TryGetValue("groups", out var o) ? (IEnumerable<string>)o : null;
+			set => BackingDictionary.Add("groups", value);
 		}
+
 		[JsonIgnore]
 		protected Tuple<string, object> Metadata
 		{
 			get
 			{
-				var metaKey = this.BackingDictionary.Keys.FirstOrDefault(k => k.StartsWith("metadata."));
-				return string.IsNullOrEmpty(metaKey) ? null : Tuple.Create(metaKey, this.BackingDictionary[metaKey]);
+				var metaKey = BackingDictionary.Keys.FirstOrDefault(k => k.StartsWith("metadata."));
+				return string.IsNullOrEmpty(metaKey) ? null : Tuple.Create(metaKey, BackingDictionary[metaKey]);
 			}
-			set => this.BackingDictionary.Add("metadata." + value.Item1, value.Item2);
+			set => BackingDictionary.Add("metadata." + value.Item1, value.Item2);
 		}
+
 		[JsonIgnore]
 		protected string Realm
 		{
-			get => (this.BackingDictionary.TryGetValue("realm.name", out object o) ? (string) o : null);
-			set => this.BackingDictionary.Add("realm.name", value);
+			get => BackingDictionary.TryGetValue("realm.name", out var o) ? (string)o : null;
+			set => BackingDictionary.Add("realm.name", value);
 		}
+
 		[JsonIgnore]
-		protected IEnumerable<string> Groups
+		protected string Username
 		{
-			get => (this.BackingDictionary.TryGetValue("groups", out object o) ? (IEnumerable<string>) o : null);
-			set => this.BackingDictionary.Add("groups", value);
+			get => BackingDictionary.TryGetValue("username", out var o) ? (string)o : null;
+			set => BackingDictionary.Add("username", value);
 		}
 
 		public static AnyRoleMappingRule operator |(FieldRuleBase leftContainer, FieldRuleBase rightContainer) =>
@@ -60,6 +62,5 @@ protected IEnumerable<string> Groups
 		public static bool operator false(FieldRuleBase a) => false;
 
 		public static bool operator true(FieldRuleBase a) => false;
-
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Field/FieldRuleBaseJsonConverter.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Field/FieldRuleBaseJsonConverter.cs
index 2fd4a310c3a..e53d18039bf 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Field/FieldRuleBaseJsonConverter.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Field/FieldRuleBaseJsonConverter.cs
@@ -1,24 +1,23 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
 {
-	internal class FieldRuleBaseJsonConverter: VerbatimDictionaryKeysJsonConverter<string, object>
+	internal class FieldRuleBaseJsonConverter : VerbatimDictionaryKeysJsonConverter<string, object>
 	{
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
-			return ReadFieldRule(reader, objectType, existingValue, serializer);
-		}
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
+			ReadFieldRule(reader, objectType, existingValue, serializer);
 
 		public static FieldRuleBase ReadFieldRule(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var depth = reader.Depth;
 			if (reader.TokenType != JsonToken.StartObject) return reader.ReadToEnd<FieldRuleBase>(depth);
+
 			reader.Read();
 			if (reader.TokenType != JsonToken.PropertyName) return reader.ReadToEnd<FieldRuleBase>(depth);
-			var propertyName = (string) reader.Value;
+
+			var propertyName = (string)reader.Value;
 			switch (propertyName)
 			{
 				case "username":
@@ -37,12 +36,12 @@ public static FieldRuleBase ReadFieldRule(JsonReader reader, Type objectType, ob
 				default:
 					if (!propertyName.StartsWith("metadata."))
 						return reader.ReadToEnd<FieldRuleBase>(depth, null);
+
 					reader.Read(); //
 					var key = propertyName.Replace("metadata.", "");
 					var metadata = serializer.Deserialize<object>(reader);
 					return reader.ExhaustTo(depth, new MetadataRule(key, metadata));
 			}
-
 		}
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Field/GroupsRule.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Field/GroupsRule.cs
index 6d50f65d450..c4c62c5abee 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Field/GroupsRule.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Field/GroupsRule.cs
@@ -4,13 +4,8 @@ namespace Nest
 {
 	public class GroupsRule : FieldRuleBase
 	{
-		public GroupsRule(params string[] groups)
-		{
-			this.Groups = groups;
-		}
-		public GroupsRule(IEnumerable<string> groups)
-		{
-			this.Groups = groups;
-		}
+		public GroupsRule(params string[] groups) => Groups = groups;
+
+		public GroupsRule(IEnumerable<string> groups) => Groups = groups;
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Field/MetadataRule.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Field/MetadataRule.cs
index b2b6e7c280b..56de26a5086 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Field/MetadataRule.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Field/MetadataRule.cs
@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
 
 namespace Nest
 {
 	public class MetadataRule : FieldRuleBase
 	{
-		public MetadataRule(string key, object value)
-		{
-			this.Metadata = Tuple.Create(key, value);
-		}
+		public MetadataRule(string key, object value) => Metadata = Tuple.Create(key, value);
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Field/RealmRule.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Field/RealmRule.cs
index 60ab406285b..a3e5861e38c 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Field/RealmRule.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Field/RealmRule.cs
@@ -1,12 +1,7 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	public class RealmRule : FieldRuleBase
 	{
-		public RealmRule(string realm)
-		{
-			this.Realm = realm;
-		}
+		public RealmRule(string realm) => Realm = realm;
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Field/UsernameRule.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Field/UsernameRule.cs
index 2e54dcf8c58..4452d9dd7f3 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Field/UsernameRule.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Field/UsernameRule.cs
@@ -2,9 +2,6 @@
 {
 	public class UsernameRule : FieldRuleBase
 	{
-		public UsernameRule(string username)
-		{
-			this.Username = username;
-		}
+		public UsernameRule(string username) => Username = username;
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Role/AllRoleMappingRule.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Role/AllRoleMappingRule.cs
index 026c3f3449d..36696588cc6 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Role/AllRoleMappingRule.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Role/AllRoleMappingRule.cs
@@ -4,14 +4,10 @@ namespace Nest
 {
 	public class AllRoleMappingRule : RoleMappingRuleBase
 	{
-		public IEnumerable<RoleMappingRuleBase> All => this.AllRules;
-		public AllRoleMappingRule(params RoleMappingRuleBase[] rules)
-		{
-			this.AllRules = rules;
-		}
-		public AllRoleMappingRule(IEnumerable<RoleMappingRuleBase> rules)
-		{
-			this.AllRules = rules;
-		}
+		public AllRoleMappingRule(params RoleMappingRuleBase[] rules) => AllRules = rules;
+
+		public AllRoleMappingRule(IEnumerable<RoleMappingRuleBase> rules) => AllRules = rules;
+
+		public IEnumerable<RoleMappingRuleBase> All => AllRules;
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Role/AnyRoleMappingRule.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Role/AnyRoleMappingRule.cs
index c76dfceb3bd..95565322907 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Role/AnyRoleMappingRule.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Role/AnyRoleMappingRule.cs
@@ -4,14 +4,10 @@ namespace Nest
 {
 	public class AnyRoleMappingRule : RoleMappingRuleBase
 	{
-		public IEnumerable<RoleMappingRuleBase> Any => this.AnyRules;
-		public AnyRoleMappingRule(params RoleMappingRuleBase[] rules)
-		{
-			this.AnyRules = rules;
-		}
-		public AnyRoleMappingRule(IEnumerable<RoleMappingRuleBase> rules)
-		{
-			this.AnyRules = rules;
-		}
+		public AnyRoleMappingRule(params RoleMappingRuleBase[] rules) => AnyRules = rules;
+
+		public AnyRoleMappingRule(IEnumerable<RoleMappingRuleBase> rules) => AnyRules = rules;
+
+		public IEnumerable<RoleMappingRuleBase> Any => AnyRules;
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Role/ExceptRoleMappingRole.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Role/ExceptRoleMappingRole.cs
index 4b7b57b9db7..b9e743421f6 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Role/ExceptRoleMappingRole.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Role/ExceptRoleMappingRole.cs
@@ -2,10 +2,8 @@ namespace Nest
 {
 	public class ExceptRoleMappingRole : RoleMappingRuleBase
 	{
-		public RoleMappingRuleBase Except => this.ExceptRule;
-		public ExceptRoleMappingRole(RoleMappingRuleBase except)
-		{
-			this.ExceptRule = except;
-		}
+		public ExceptRoleMappingRole(RoleMappingRuleBase except) => ExceptRule = except;
+
+		public RoleMappingRuleBase Except => ExceptRule;
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Role/FieldRoleMappingRule.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Role/FieldRoleMappingRule.cs
index f3d58fe569e..8ab35ec0181 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Role/FieldRoleMappingRule.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Role/FieldRoleMappingRule.cs
@@ -2,11 +2,8 @@
 {
 	public class FieldRoleMappingRule : RoleMappingRuleBase
 	{
-		public FieldRuleBase Field => this.FieldRule;
-		public FieldRoleMappingRule(FieldRuleBase field)
-		{
-			this.FieldRule = field;
-		}
+		public FieldRoleMappingRule(FieldRuleBase field) => FieldRule = field;
 
+		public FieldRuleBase Field => FieldRule;
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleBase.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleBase.cs
index 996564fc3ae..048ab5fde74 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleBase.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleBase.cs
@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.IO;
-using System.Linq.Expressions;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -8,18 +6,18 @@ namespace Nest
 	[JsonConverter(typeof(RoleMappingRuleBaseJsonConverter))]
 	public abstract class RoleMappingRuleBase
 	{
-		[JsonProperty("any")]
-		protected internal IEnumerable<RoleMappingRuleBase> AnyRules { get; set; }
-
 		[JsonProperty("all")]
 		protected internal IEnumerable<RoleMappingRuleBase> AllRules { get; set; }
 
-		[JsonProperty("field")]
-		protected FieldRuleBase FieldRule { get; set; }
+		[JsonProperty("any")]
+		protected internal IEnumerable<RoleMappingRuleBase> AnyRules { get; set; }
 
 		[JsonProperty("except")]
 		protected RoleMappingRuleBase ExceptRule { get; set; }
 
+		[JsonProperty("field")]
+		protected FieldRuleBase FieldRule { get; set; }
+
 		public static AnyRoleMappingRule operator |(RoleMappingRuleBase leftContainer, RoleMappingRuleBase rightContainer) =>
 			CombineAny(leftContainer, rightContainer);
 
@@ -51,19 +49,23 @@ private static AllRoleMappingRule CombineAll(RoleMappingRuleBase left, RoleMappi
 		public static IEnumerable<RoleMappingRuleBase> AllOrSelf(RoleMappingRuleBase rule)
 		{
 			var all = rule as AllRoleMappingRule;
-			return all != null ? all.AllRules : new[] {rule};
+			return all != null ? all.AllRules : new[] { rule };
 		}
 
 		public static IEnumerable<RoleMappingRuleBase> AnyOrSelf(RoleMappingRuleBase rule)
 		{
 			var all = rule as AnyRoleMappingRule;
-			return all != null ? all.AnyRules : new[] {rule};
+			return all != null ? all.AnyRules : new[] { rule };
 		}
 
 		public static implicit operator RoleMappingRuleBase(UsernameRule rule) => new FieldRoleMappingRule(rule);
+
 		public static implicit operator RoleMappingRuleBase(DistinguishedNameRule rule) => new FieldRoleMappingRule(rule);
+
 		public static implicit operator RoleMappingRuleBase(GroupsRule rule) => new FieldRoleMappingRule(rule);
+
 		public static implicit operator RoleMappingRuleBase(MetadataRule rule) => new FieldRoleMappingRule(rule);
+
 		public static implicit operator RoleMappingRuleBase(RealmRule rule) => new FieldRoleMappingRule(rule);
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleBaseJsonConverter.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleBaseJsonConverter.cs
index 38e4a7b210b..ff6ab94e977 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleBaseJsonConverter.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleBaseJsonConverter.cs
@@ -5,23 +5,25 @@
 
 namespace Nest
 {
-	internal class RoleMappingRuleBaseJsonConverter: ReserializeJsonConverter<RoleMappingRuleBase, RoleMappingRuleBase>
+	internal class RoleMappingRuleBaseJsonConverter : ReserializeJsonConverter<RoleMappingRuleBase, RoleMappingRuleBase>
 	{
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			var depth = reader.Depth;
 			if (reader.TokenType != JsonToken.StartObject) return reader.ReadToEnd<object>(depth);
+
 			reader.Read();
 			if (reader.TokenType != JsonToken.PropertyName) return reader.ExhaustTo(depth);
-			var propertyName = (string) reader.Value;
+
+			var propertyName = (string)reader.Value;
 			switch (propertyName)
 			{
 				case "all":
-					return TryReadArray(reader, objectType, existingValue, serializer, out IEnumerable<RoleMappingRuleBase> all)
-						? reader.ExhaustTo(depth, new AllRoleMappingRule(all) )
+					return TryReadArray(reader, objectType, existingValue, serializer, out var all)
+						? reader.ExhaustTo(depth, new AllRoleMappingRule(all))
 						: reader.ExhaustTo(depth);
 				case "any":
-					return TryReadArray(reader, objectType, existingValue, serializer, out IEnumerable<RoleMappingRuleBase> any)
+					return TryReadArray(reader, objectType, existingValue, serializer, out var any)
 						? reader.ExhaustTo(depth, new AnyRoleMappingRule(any))
 						: reader.ExhaustTo(depth);
 				case "field":
@@ -50,8 +52,10 @@ private bool TryReadArray(JsonReader reader, Type t, object v, JsonSerializer s,
 			{
 				reader.Read();
 				if (reader.Depth == anyDepth && reader.TokenType == JsonToken.EndArray) break;
+
 				var subRule = ReadJson(reader, t, v, s) as RoleMappingRuleBase;
 				if (subRule == null) break;
+
 				l.Add(subRule);
 			}
 			rules = l;
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleDescriptor.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleDescriptor.cs
index 6e1c1fa3b27..5391d74131c 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleDescriptor.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRuleDescriptor.cs
@@ -25,6 +25,5 @@ public RoleMappingRuleBase All(Func<RoleMappingRulesDescriptor, IPromise<List<Ro
 
 		public RoleMappingRuleBase Except(Func<RoleMappingRuleDescriptor, RoleMappingRuleBase> selector) =>
 			new ExceptRoleMappingRole(selector?.Invoke(new RoleMappingRuleDescriptor()));
-
 	}
 }
diff --git a/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRulesDescriptor.cs b/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRulesDescriptor.cs
index 99808c6c18d..44e17cfb24b 100644
--- a/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRulesDescriptor.cs
+++ b/src/Nest/XPack/Security/RoleMapping/Rules/Role/RoleMappingRulesDescriptor.cs
@@ -3,14 +3,13 @@
 
 namespace Nest
 {
-	public class RoleMappingRulesDescriptor :
-		DescriptorPromiseBase<RoleMappingRulesDescriptor, List<RoleMappingRuleBase>>, IPromise<List<RoleMappingRuleBase>>
+	public class RoleMappingRulesDescriptor
+		: DescriptorPromiseBase<RoleMappingRulesDescriptor, List<RoleMappingRuleBase>>, IPromise<List<RoleMappingRuleBase>>
 	{
-		List<RoleMappingRuleBase> IPromise<List<RoleMappingRuleBase>>.Value { get; } = new List<RoleMappingRuleBase>();
-
 		public RoleMappingRulesDescriptor() : base(new List<RoleMappingRuleBase>()) { }
 
 		private IPromise<List<RoleMappingRuleBase>> Self => this;
+		List<RoleMappingRuleBase> IPromise<List<RoleMappingRuleBase>>.Value { get; } = new List<RoleMappingRuleBase>();
 
 		private RoleMappingRulesDescriptor Add(RoleMappingRuleBase m)
 		{
@@ -28,7 +27,7 @@ private RoleMappingRulesDescriptor Add(RoleMappingRuleBase m)
 
 		public RoleMappingRulesDescriptor Realm(string realm) => Add(new RealmRule(realm));
 
-		public RoleMappingRulesDescriptor Metadata(string key, object value) => Add(new MetadataRule(key,value));
+		public RoleMappingRulesDescriptor Metadata(string key, object value) => Add(new MetadataRule(key, value));
 
 		public RoleMappingRulesDescriptor Any(Func<RoleMappingRulesDescriptor, IPromise<List<RoleMappingRuleBase>>> selector) =>
 			Add(new AnyRoleMappingRule(selector?.Invoke(new RoleMappingRulesDescriptor())?.Value));
@@ -38,6 +37,5 @@ public RoleMappingRulesDescriptor All(Func<RoleMappingRulesDescriptor, IPromise<
 
 		public RoleMappingRulesDescriptor Except(Func<RoleMappingRuleDescriptor, RoleMappingRuleBase> selector) =>
 			Add(new ExceptRoleMappingRole(selector?.Invoke(new RoleMappingRuleDescriptor())));
-
 	}
 }
diff --git a/src/Nest/XPack/Security/SecurityNode.cs b/src/Nest/XPack/Security/SecurityNode.cs
index 1a128699abd..ecf7f367dfa 100644
--- a/src/Nest/XPack/Security/SecurityNode.cs
+++ b/src/Nest/XPack/Security/SecurityNode.cs
@@ -7,4 +7,4 @@ public class SecurityNode
 		[JsonProperty("name")]
 		public string Name { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Security/User/ChangePassword/ChangePasswordRequest.cs b/src/Nest/XPack/Security/User/ChangePassword/ChangePasswordRequest.cs
index 9f7705dcd04..f0433286c5e 100644
--- a/src/Nest/XPack/Security/User/ChangePassword/ChangePasswordRequest.cs
+++ b/src/Nest/XPack/Security/User/ChangePassword/ChangePasswordRequest.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Security/User/ChangePassword/ElasticClient-ChangePassword.cs b/src/Nest/XPack/Security/User/ChangePassword/ElasticClient-ChangePassword.cs
index 4efb212fc96..5f3de907968 100644
--- a/src/Nest/XPack/Security/User/ChangePassword/ElasticClient-ChangePassword.cs
+++ b/src/Nest/XPack/Security/User/ChangePassword/ElasticClient-ChangePassword.cs
@@ -1,51 +1,56 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IChangePasswordResponse ChangePassword(Func<ChangePasswordDescriptor, IChangePasswordRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IChangePasswordResponse ChangePassword(IChangePasswordRequest request);
 
-		/// <inheritdoc/>
-		Task<IChangePasswordResponse> ChangePasswordAsync(Func<ChangePasswordDescriptor, IChangePasswordRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IChangePasswordResponse> ChangePasswordAsync(Func<ChangePasswordDescriptor, IChangePasswordRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IChangePasswordResponse> ChangePasswordAsync(IChangePasswordRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IChangePasswordResponse> ChangePasswordAsync(IChangePasswordRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IChangePasswordResponse ChangePassword(Func<ChangePasswordDescriptor, IChangePasswordRequest> selector) =>
-			this.ChangePassword(selector.InvokeOrDefault(new ChangePasswordDescriptor()));
+			ChangePassword(selector.InvokeOrDefault(new ChangePasswordDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IChangePasswordResponse ChangePassword(IChangePasswordRequest request) =>
-			this.Dispatcher.Dispatch<IChangePasswordRequest, ChangePasswordRequestParameters, ChangePasswordResponse>(
+			Dispatcher.Dispatch<IChangePasswordRequest, ChangePasswordRequestParameters, ChangePasswordResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackSecurityChangePasswordDispatch<ChangePasswordResponse>(p, d)
+				(p, d) => LowLevelDispatch.XpackSecurityChangePasswordDispatch<ChangePasswordResponse>(p, d)
 			);
 
-		/// <inheritdoc/>
-		public Task<IChangePasswordResponse> ChangePasswordAsync(Func<ChangePasswordDescriptor, IChangePasswordRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ChangePasswordAsync(selector.InvokeOrDefault(new ChangePasswordDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IChangePasswordResponse> ChangePasswordAsync(IChangePasswordRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IChangePasswordRequest, ChangePasswordRequestParameters, ChangePasswordResponse, IChangePasswordResponse>(
+		/// <inheritdoc />
+		public Task<IChangePasswordResponse> ChangePasswordAsync(Func<ChangePasswordDescriptor, IChangePasswordRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ChangePasswordAsync(selector.InvokeOrDefault(new ChangePasswordDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IChangePasswordResponse> ChangePasswordAsync(IChangePasswordRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IChangePasswordRequest, ChangePasswordRequestParameters, ChangePasswordResponse, IChangePasswordResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityChangePasswordDispatchAsync<ChangePasswordResponse>(p, d, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityChangePasswordDispatchAsync<ChangePasswordResponse>(p, d, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/DeleteUser/DeleteUserRequest.cs b/src/Nest/XPack/Security/User/DeleteUser/DeleteUserRequest.cs
index edeb190456f..fee0c61820d 100644
--- a/src/Nest/XPack/Security/User/DeleteUser/DeleteUserRequest.cs
+++ b/src/Nest/XPack/Security/User/DeleteUser/DeleteUserRequest.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IDeleteUserRequest
-	{
-	}
+	public partial interface IDeleteUserRequest { }
 
-	public partial class DeleteUserRequest
-	{
-	}
+	public partial class DeleteUserRequest { }
 
 	[DescriptorFor("XpackSecurityDeleteUser")]
-	public partial class DeleteUserDescriptor
-	{
-	}
+	public partial class DeleteUserDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/User/DeleteUser/DeleteUserResponse.cs b/src/Nest/XPack/Security/User/DeleteUser/DeleteUserResponse.cs
index 4e619875911..c3ce98a51c7 100644
--- a/src/Nest/XPack/Security/User/DeleteUser/DeleteUserResponse.cs
+++ b/src/Nest/XPack/Security/User/DeleteUser/DeleteUserResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Security/User/DeleteUser/ElasticClient-DeleteUser.cs b/src/Nest/XPack/Security/User/DeleteUser/ElasticClient-DeleteUser.cs
index e18e96e72c1..4f16a215f2b 100644
--- a/src/Nest/XPack/Security/User/DeleteUser/ElasticClient-DeleteUser.cs
+++ b/src/Nest/XPack/Security/User/DeleteUser/ElasticClient-DeleteUser.cs
@@ -1,48 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteUserResponse DeleteUser(Name username, Func<DeleteUserDescriptor, IDeleteUserRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteUserResponse DeleteUser(IDeleteUserRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteUserResponse> DeleteUserAsync(Name username, Func<DeleteUserDescriptor, IDeleteUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteUserResponse> DeleteUserAsync(Name username, Func<DeleteUserDescriptor, IDeleteUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteUserResponse> DeleteUserAsync(IDeleteUserRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteUserResponse DeleteUser(Name username, Func<DeleteUserDescriptor, IDeleteUserRequest> selector = null) =>
-			this.DeleteUser(selector.InvokeOrDefault(new DeleteUserDescriptor(username)));
+			DeleteUser(selector.InvokeOrDefault(new DeleteUserDescriptor(username)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteUserResponse DeleteUser(IDeleteUserRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteUserRequest, DeleteUserRequestParameters, DeleteUserResponse>(
+			Dispatcher.Dispatch<IDeleteUserRequest, DeleteUserRequestParameters, DeleteUserResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityDeleteUserDispatch<DeleteUserResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityDeleteUserDispatch<DeleteUserResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteUserResponse> DeleteUserAsync(Name username, Func<DeleteUserDescriptor, IDeleteUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteUserAsync(selector.InvokeOrDefault(new DeleteUserDescriptor(username)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IDeleteUserResponse> DeleteUserAsync(Name username, Func<DeleteUserDescriptor, IDeleteUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteUserAsync(selector.InvokeOrDefault(new DeleteUserDescriptor(username)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IDeleteUserResponse> DeleteUserAsync(IDeleteUserRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteUserRequest, DeleteUserRequestParameters, DeleteUserResponse, IDeleteUserResponse>(
+		/// <inheritdoc />
+		public Task<IDeleteUserResponse> DeleteUserAsync(IDeleteUserRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteUserRequest, DeleteUserRequestParameters, DeleteUserResponse, IDeleteUserResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityDeleteUserDispatchAsync<DeleteUserResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityDeleteUserDispatchAsync<DeleteUserResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/DisableUser/DisableUserRequest.cs b/src/Nest/XPack/Security/User/DisableUser/DisableUserRequest.cs
index c7fd8994042..d2b466f4b6e 100644
--- a/src/Nest/XPack/Security/User/DisableUser/DisableUserRequest.cs
+++ b/src/Nest/XPack/Security/User/DisableUser/DisableUserRequest.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface IDisableUserRequest { }
 
diff --git a/src/Nest/XPack/Security/User/DisableUser/ElasticClient-DisableUser.cs b/src/Nest/XPack/Security/User/DisableUser/ElasticClient-DisableUser.cs
index 403c275f94a..d4fbefcf5af 100644
--- a/src/Nest/XPack/Security/User/DisableUser/ElasticClient-DisableUser.cs
+++ b/src/Nest/XPack/Security/User/DisableUser/ElasticClient-DisableUser.cs
@@ -1,48 +1,54 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDisableUserResponse DisableUser(Name username, Func<DisableUserDescriptor, IDisableUserRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDisableUserResponse DisableUser(IDisableUserRequest request);
 
-		/// <inheritdoc/>
-		Task<IDisableUserResponse> DisableUserAsync(Name username, Func<DisableUserDescriptor, IDisableUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDisableUserResponse> DisableUserAsync(Name username, Func<DisableUserDescriptor, IDisableUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDisableUserResponse> DisableUserAsync(IDisableUserRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDisableUserResponse DisableUser(Name username, Func<DisableUserDescriptor, IDisableUserRequest> selector = null) =>
-			this.DisableUser(selector.InvokeOrDefault(new DisableUserDescriptor().Username(username)));
+			DisableUser(selector.InvokeOrDefault(new DisableUserDescriptor().Username(username)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDisableUserResponse DisableUser(IDisableUserRequest request) =>
-			this.Dispatcher.Dispatch<IDisableUserRequest, DisableUserRequestParameters, DisableUserResponse>(
+			Dispatcher.Dispatch<IDisableUserRequest, DisableUserRequestParameters, DisableUserResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityDisableUserDispatch<DisableUserResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityDisableUserDispatch<DisableUserResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDisableUserResponse> DisableUserAsync(Name username, Func<DisableUserDescriptor, IDisableUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DisableUserAsync(selector.InvokeOrDefault(new DisableUserDescriptor().Username(username)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDisableUserResponse> DisableUserAsync(IDisableUserRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDisableUserRequest, DisableUserRequestParameters, DisableUserResponse, IDisableUserResponse>(
+		/// <inheritdoc />
+		public Task<IDisableUserResponse> DisableUserAsync(Name username, Func<DisableUserDescriptor, IDisableUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DisableUserAsync(selector.InvokeOrDefault(new DisableUserDescriptor().Username(username)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDisableUserResponse> DisableUserAsync(IDisableUserRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDisableUserRequest, DisableUserRequestParameters, DisableUserResponse, IDisableUserResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityDisableUserDispatchAsync<DisableUserResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityDisableUserDispatchAsync<DisableUserResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/EnableUser/ElasticClient-EnableUser.cs b/src/Nest/XPack/Security/User/EnableUser/ElasticClient-EnableUser.cs
index dba7d36b296..909b147913a 100644
--- a/src/Nest/XPack/Security/User/EnableUser/ElasticClient-EnableUser.cs
+++ b/src/Nest/XPack/Security/User/EnableUser/ElasticClient-EnableUser.cs
@@ -1,48 +1,53 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IEnableUserResponse EnableUser(Name username, Func<EnableUserDescriptor, IEnableUserRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IEnableUserResponse EnableUser(IEnableUserRequest request);
 
-		/// <inheritdoc/>
-		Task<IEnableUserResponse> EnableUserAsync(Name username, Func<EnableUserDescriptor, IEnableUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IEnableUserResponse> EnableUserAsync(Name username, Func<EnableUserDescriptor, IEnableUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IEnableUserResponse> EnableUserAsync(IEnableUserRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnableUserResponse EnableUser(Name username, Func<EnableUserDescriptor, IEnableUserRequest> selector = null) =>
-			this.EnableUser(selector.InvokeOrDefault(new EnableUserDescriptor().Username(username)));
+			EnableUser(selector.InvokeOrDefault(new EnableUserDescriptor().Username(username)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IEnableUserResponse EnableUser(IEnableUserRequest request) =>
-			this.Dispatcher.Dispatch<IEnableUserRequest, EnableUserRequestParameters, EnableUserResponse>(
+			Dispatcher.Dispatch<IEnableUserRequest, EnableUserRequestParameters, EnableUserResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityEnableUserDispatch<EnableUserResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityEnableUserDispatch<EnableUserResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IEnableUserResponse> EnableUserAsync(Name username, Func<EnableUserDescriptor, IEnableUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.EnableUserAsync(selector.InvokeOrDefault(new EnableUserDescriptor().Username(username)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IEnableUserResponse> EnableUserAsync(Name username, Func<EnableUserDescriptor, IEnableUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			EnableUserAsync(selector.InvokeOrDefault(new EnableUserDescriptor().Username(username)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IEnableUserResponse> EnableUserAsync(IEnableUserRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IEnableUserRequest, EnableUserRequestParameters, EnableUserResponse, IEnableUserResponse>(
+		/// <inheritdoc />
+		public Task<IEnableUserResponse> EnableUserAsync(IEnableUserRequest request, CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IEnableUserRequest, EnableUserRequestParameters, EnableUserResponse, IEnableUserResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityEnableUserDispatchAsync<EnableUserResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityEnableUserDispatchAsync<EnableUserResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/EnableUser/EnableUserRequest.cs b/src/Nest/XPack/Security/User/EnableUser/EnableUserRequest.cs
index 220a9c023e7..3c8090252a0 100644
--- a/src/Nest/XPack/Security/User/EnableUser/EnableUserRequest.cs
+++ b/src/Nest/XPack/Security/User/EnableUser/EnableUserRequest.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Nest
+namespace Nest
 {
 	public partial interface IEnableUserRequest { }
 
diff --git a/src/Nest/XPack/Security/User/GetUser/ElasticClient-GetUser.cs b/src/Nest/XPack/Security/User/GetUser/ElasticClient-GetUser.cs
index 12d41e897b9..540d47da151 100644
--- a/src/Nest/XPack/Security/User/GetUser/ElasticClient-GetUser.cs
+++ b/src/Nest/XPack/Security/User/GetUser/ElasticClient-GetUser.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetUserResponse GetUser(Func<GetUserDescriptor, IGetUserRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetUserResponse GetUser(IGetUserRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetUserResponse> GetUserAsync(Func<GetUserDescriptor, IGetUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetUserResponse> GetUserAsync(Func<GetUserDescriptor, IGetUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetUserResponse> GetUserAsync(IGetUserRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetUserResponse GetUser(Func<GetUserDescriptor, IGetUserRequest> selector = null) =>
-			this.GetUser(selector.InvokeOrDefault(new GetUserDescriptor()));
+			GetUser(selector.InvokeOrDefault(new GetUserDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetUserResponse GetUser(IGetUserRequest request) =>
-			this.Dispatcher.Dispatch<IGetUserRequest, GetUserRequestParameters, GetUserResponse>(
+			Dispatcher.Dispatch<IGetUserRequest, GetUserRequestParameters, GetUserResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityGetUserDispatch<GetUserResponse>(p)
+				(p, d) => LowLevelDispatch.XpackSecurityGetUserDispatch<GetUserResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetUserResponse> GetUserAsync(Func<GetUserDescriptor, IGetUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetUserAsync(selector.InvokeOrDefault(new GetUserDescriptor()), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetUserResponse> GetUserAsync(Func<GetUserDescriptor, IGetUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetUserAsync(selector.InvokeOrDefault(new GetUserDescriptor()), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetUserResponse> GetUserAsync(IGetUserRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetUserRequest, GetUserRequestParameters, GetUserResponse, IGetUserResponse>(
+			Dispatcher.DispatchAsync<IGetUserRequest, GetUserRequestParameters, GetUserResponse, IGetUserResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityGetUserDispatchAsync<GetUserResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackSecurityGetUserDispatchAsync<GetUserResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/GetUser/GetUserRequest.cs b/src/Nest/XPack/Security/User/GetUser/GetUserRequest.cs
index a345ec0f64f..a2d61e86376 100644
--- a/src/Nest/XPack/Security/User/GetUser/GetUserRequest.cs
+++ b/src/Nest/XPack/Security/User/GetUser/GetUserRequest.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
-	public partial interface IGetUserRequest
-	{
-	}
+	public partial interface IGetUserRequest { }
 
-	public partial class GetUserRequest
-	{
-	}
+	public partial class GetUserRequest { }
 
 	[DescriptorFor("XpackSecurityGetUser")]
-	public partial class GetUserDescriptor
-	{
-	}
+	public partial class GetUserDescriptor { }
 }
diff --git a/src/Nest/XPack/Security/User/GetUser/GetUserResponse.cs b/src/Nest/XPack/Security/User/GetUser/GetUserResponse.cs
index d2cdf447aa9..8b507d6ea38 100644
--- a/src/Nest/XPack/Security/User/GetUser/GetUserResponse.cs
+++ b/src/Nest/XPack/Security/User/GetUser/GetUserResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -20,19 +18,19 @@ public class GetUserResponse : DictionaryResponseBase<string, XPackUser>, IGetUs
 
 	public class XPackUser
 	{
-		[JsonProperty("username")]
-		public string Username { get; internal set; }
-
-		[JsonProperty("roles")]
-		public IReadOnlyCollection<string> Roles { get; internal set; } = EmptyReadOnly<string>.Collection;
+		[JsonProperty("email")]
+		public string Email { get; internal set; }
 
 		[JsonProperty("full_name")]
 		public string FullName { get; internal set; }
 
-		[JsonProperty("email")]
-		public string Email { get; internal set; }
-
 		[JsonProperty("metadata")]
 		public IReadOnlyDictionary<string, object> Metadata { get; internal set; } = EmptyReadOnly<string, object>.Dictionary;
+
+		[JsonProperty("roles")]
+		public IReadOnlyCollection<string> Roles { get; internal set; } = EmptyReadOnly<string>.Collection;
+
+		[JsonProperty("username")]
+		public string Username { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/Security/User/GetUserAccessToken/ElasticClient-GetUserAccessToken.cs b/src/Nest/XPack/Security/User/GetUserAccessToken/ElasticClient-GetUserAccessToken.cs
index 15737835475..fc8023e1201 100644
--- a/src/Nest/XPack/Security/User/GetUserAccessToken/ElasticClient-GetUserAccessToken.cs
+++ b/src/Nest/XPack/Security/User/GetUserAccessToken/ElasticClient-GetUserAccessToken.cs
@@ -1,48 +1,64 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
-		IGetUserAccessTokenResponse GetUserAccessToken(string username, string password, Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null);
+		/// <inheritdoc />
+		IGetUserAccessTokenResponse GetUserAccessToken(string username, string password,
+			Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetUserAccessTokenResponse GetUserAccessToken(IGetUserAccessTokenRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(string username, string password, Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(string username, string password,
+			Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(IGetUserAccessTokenRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(IGetUserAccessTokenRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IGetUserAccessTokenResponse GetUserAccessToken(string username, string password, Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null) =>
-			this.GetUserAccessToken(selector.InvokeOrDefault(new GetUserAccessTokenDescriptor(username, password)));
+		/// <inheritdoc />
+		public IGetUserAccessTokenResponse GetUserAccessToken(string username, string password,
+			Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null
+		) =>
+			GetUserAccessToken(selector.InvokeOrDefault(new GetUserAccessTokenDescriptor(username, password)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetUserAccessTokenResponse GetUserAccessToken(IGetUserAccessTokenRequest request) =>
-			this.Dispatcher.Dispatch<IGetUserAccessTokenRequest, GetUserAccessTokenRequestParameters, GetUserAccessTokenResponse>(
+			Dispatcher.Dispatch<IGetUserAccessTokenRequest, GetUserAccessTokenRequestParameters, GetUserAccessTokenResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityGetTokenDispatch<GetUserAccessTokenResponse>(p, d)
+				(p, d) => LowLevelDispatch.XpackSecurityGetTokenDispatch<GetUserAccessTokenResponse>(p, d)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(string username, string password, Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetUserAccessTokenAsync(selector.InvokeOrDefault(new GetUserAccessTokenDescriptor(username, password)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(string username, string password,
+			Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetUserAccessTokenAsync(selector.InvokeOrDefault(new GetUserAccessTokenDescriptor(username, password)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(IGetUserAccessTokenRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetUserAccessTokenRequest, GetUserAccessTokenRequestParameters, GetUserAccessTokenResponse, IGetUserAccessTokenResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityGetTokenDispatchAsync<GetUserAccessTokenResponse>(p, d, c)
-			);
+		/// <inheritdoc />
+		public Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(IGetUserAccessTokenRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IGetUserAccessTokenRequest, GetUserAccessTokenRequestParameters, GetUserAccessTokenResponse,
+					IGetUserAccessTokenResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackSecurityGetTokenDispatchAsync<GetUserAccessTokenResponse>(p, d, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenRequest.cs b/src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenRequest.cs
index c8ac6f2595e..6c092d6b218 100644
--- a/src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenRequest.cs
+++ b/src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenRequest.cs
@@ -1,31 +1,27 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	public partial interface IGetUserAccessTokenRequest
 	{
-		[JsonProperty("username")]
-		string Username { get; set; }
+		[JsonProperty("grant_type")]
+		AccessTokenGrantType? GrantType { get; set; }
+
 		[JsonProperty("password")]
 		string Password { get; set; }
+
 		[JsonProperty("scope")]
 		string Scope { get; set; }
-		[JsonProperty("grant_type")]
-		AccessTokenGrantType? GrantType { get; set; }
+
+		[JsonProperty("username")]
+		string Username { get; set; }
 	}
 
 	public partial class GetUserAccessTokenRequest
 	{
-		[JsonProperty("username")]
-		string IGetUserAccessTokenRequest.Username { get; set; }
-		[JsonProperty("password")]
-		string IGetUserAccessTokenRequest.Password { get; set; }
-
 		public GetUserAccessTokenRequest(string username, string password)
 		{
-			var self = (IGetUserAccessTokenRequest) this;
+			var self = (IGetUserAccessTokenRequest)this;
 			self.Username = username;
 			self.Password = password;
 		}
@@ -33,24 +29,31 @@ public GetUserAccessTokenRequest(string username, string password)
 		public AccessTokenGrantType? GrantType { get; set; } = AccessTokenGrantType.Password;
 
 		public string Scope { get; set; }
+
+		[JsonProperty("password")]
+		string IGetUserAccessTokenRequest.Password { get; set; }
+
+		[JsonProperty("username")]
+		string IGetUserAccessTokenRequest.Username { get; set; }
 	}
 
 	[DescriptorFor("XpackSecurityGetToken")]
 	public partial class GetUserAccessTokenDescriptor
 	{
-		AccessTokenGrantType? IGetUserAccessTokenRequest.GrantType { get; set; } = AccessTokenGrantType.Password;
-		string IGetUserAccessTokenRequest.Username { get; set; }
-		string IGetUserAccessTokenRequest.Password { get; set; }
-		string IGetUserAccessTokenRequest.Scope { get; set; }
-
 		public GetUserAccessTokenDescriptor(string username, string password)
 		{
-			var self = (IGetUserAccessTokenRequest) this;
+			var self = (IGetUserAccessTokenRequest)this;
 			self.Username = username;
 			self.Password = password;
 		}
 
-		public GetUserAccessTokenDescriptor GrantType(AccessTokenGrantType? type) => Assign(a=>a.GrantType = type);
-		public GetUserAccessTokenDescriptor Scope(string scope) => Assign(a=>a.Scope = scope);
+		AccessTokenGrantType? IGetUserAccessTokenRequest.GrantType { get; set; } = AccessTokenGrantType.Password;
+		string IGetUserAccessTokenRequest.Password { get; set; }
+		string IGetUserAccessTokenRequest.Scope { get; set; }
+		string IGetUserAccessTokenRequest.Username { get; set; }
+
+		public GetUserAccessTokenDescriptor GrantType(AccessTokenGrantType? type) => Assign(a => a.GrantType = type);
+
+		public GetUserAccessTokenDescriptor Scope(string scope) => Assign(a => a.Scope = scope);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenResponse.cs b/src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenResponse.cs
index fd803a2d2a8..ce39805d83b 100644
--- a/src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenResponse.cs
+++ b/src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -9,19 +6,22 @@ public interface IGetUserAccessTokenResponse : IResponse
 	{
 		[JsonProperty("access_token")]
 		string AccessToken { get; set; }
-		[JsonProperty("type")]
-		string Type { get; set; }
+
 		[JsonProperty("expires_in")]
 		long ExpiresIn { get; set; }
+
 		[JsonProperty("scope")]
 		string Scope { get; set; }
+
+		[JsonProperty("type")]
+		string Type { get; set; }
 	}
 
 	public class GetUserAccessTokenResponse : ResponseBase, IGetUserAccessTokenResponse
 	{
 		public string AccessToken { get; set; }
-		public string Type { get; set; }
 		public long ExpiresIn { get; set; }
 		public string Scope { get; set; }
+		public string Type { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/ElasticClient-InvalidateUserAccessToken.cs b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/ElasticClient-InvalidateUserAccessToken.cs
index 735066194db..73766f1a5ba 100644
--- a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/ElasticClient-InvalidateUserAccessToken.cs
+++ b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/ElasticClient-InvalidateUserAccessToken.cs
@@ -1,48 +1,64 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
-		IInvalidateUserAccessTokenResponse InvalidateUserAccessToken(string token, Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> selector = null);
+		/// <inheritdoc />
+		IInvalidateUserAccessTokenResponse InvalidateUserAccessToken(string token,
+			Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> selector = null
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IInvalidateUserAccessTokenResponse InvalidateUserAccessToken(IInvalidateUserAccessTokenRequest request);
 
-		/// <inheritdoc/>
-		Task<IInvalidateUserAccessTokenResponse> InvalidateUserAccessTokenAsync(string token, Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IInvalidateUserAccessTokenResponse> InvalidateUserAccessTokenAsync(string token,
+			Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IInvalidateUserAccessTokenResponse> InvalidateUserAccessTokenAsync(IInvalidateUserAccessTokenRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IInvalidateUserAccessTokenResponse> InvalidateUserAccessTokenAsync(IInvalidateUserAccessTokenRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
-		public IInvalidateUserAccessTokenResponse InvalidateUserAccessToken(string token, Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> selector = null) =>
-			this.InvalidateUserAccessToken(selector.InvokeOrDefault(new InvalidateUserAccessTokenDescriptor(token)));
+		/// <inheritdoc />
+		public IInvalidateUserAccessTokenResponse InvalidateUserAccessToken(string token,
+			Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> selector = null
+		) =>
+			InvalidateUserAccessToken(selector.InvokeOrDefault(new InvalidateUserAccessTokenDescriptor(token)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IInvalidateUserAccessTokenResponse InvalidateUserAccessToken(IInvalidateUserAccessTokenRequest request) =>
-			this.Dispatcher.Dispatch<IInvalidateUserAccessTokenRequest, InvalidateUserAccessTokenRequestParameters, InvalidateUserAccessTokenResponse>(
+			Dispatcher.Dispatch<IInvalidateUserAccessTokenRequest, InvalidateUserAccessTokenRequestParameters, InvalidateUserAccessTokenResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSecurityInvalidateTokenDispatch<InvalidateUserAccessTokenResponse>(p, d)
+				(p, d) => LowLevelDispatch.XpackSecurityInvalidateTokenDispatch<InvalidateUserAccessTokenResponse>(p, d)
 			);
 
-		/// <inheritdoc/>
-		public Task<IInvalidateUserAccessTokenResponse> InvalidateUserAccessTokenAsync(string token, Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.InvalidateUserAccessTokenAsync(selector.InvokeOrDefault(new InvalidateUserAccessTokenDescriptor(token)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IInvalidateUserAccessTokenResponse> InvalidateUserAccessTokenAsync(string token,
+			Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			InvalidateUserAccessTokenAsync(selector.InvokeOrDefault(new InvalidateUserAccessTokenDescriptor(token)), cancellationToken);
 
-		/// <inheritdoc/>
-		public Task<IInvalidateUserAccessTokenResponse> InvalidateUserAccessTokenAsync(IInvalidateUserAccessTokenRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IInvalidateUserAccessTokenRequest, InvalidateUserAccessTokenRequestParameters, InvalidateUserAccessTokenResponse, IInvalidateUserAccessTokenResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSecurityInvalidateTokenDispatchAsync<InvalidateUserAccessTokenResponse>(p, d, c)
-			);
+		/// <inheritdoc />
+		public Task<IInvalidateUserAccessTokenResponse> InvalidateUserAccessTokenAsync(IInvalidateUserAccessTokenRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IInvalidateUserAccessTokenRequest, InvalidateUserAccessTokenRequestParameters, InvalidateUserAccessTokenResponse,
+					IInvalidateUserAccessTokenResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackSecurityInvalidateTokenDispatchAsync<InvalidateUserAccessTokenResponse>(p, d, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs
index f99f6c16d40..a822d3bdf17 100644
--- a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs
+++ b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -12,24 +10,17 @@ public partial interface IInvalidateUserAccessTokenRequest
 
 	public partial class InvalidateUserAccessTokenRequest
 	{
+		public InvalidateUserAccessTokenRequest(string token) => ((IInvalidateUserAccessTokenRequest)this).Token = token;
+
 		[JsonProperty("token")]
 		string IInvalidateUserAccessTokenRequest.Token { get; set; }
-
-		public InvalidateUserAccessTokenRequest(string token)
-		{
-			((IInvalidateUserAccessTokenRequest) this).Token = token;
-		}
 	}
 
 	[DescriptorFor("XpackSecurityInvalidateToken")]
 	public partial class InvalidateUserAccessTokenDescriptor
 	{
-		string IInvalidateUserAccessTokenRequest.Token { get; set; }
-
-		public InvalidateUserAccessTokenDescriptor(string token)
-		{
-			((IInvalidateUserAccessTokenRequest) this).Token = token;
-		}
+		public InvalidateUserAccessTokenDescriptor(string token) => ((IInvalidateUserAccessTokenRequest)this).Token = token;
 
+		string IInvalidateUserAccessTokenRequest.Token { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenResponse.cs b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenResponse.cs
index b50b0d85295..6a21f95f827 100644
--- a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenResponse.cs
+++ b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Security/User/PutUser/ElasticClient-PutUser.cs b/src/Nest/XPack/Security/User/PutUser/ElasticClient-PutUser.cs
index b86ecac0d41..ee935b3c9b2 100644
--- a/src/Nest/XPack/Security/User/PutUser/ElasticClient-PutUser.cs
+++ b/src/Nest/XPack/Security/User/PutUser/ElasticClient-PutUser.cs
@@ -1,48 +1,52 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutUserResponse PutUser(Name username, Func<PutUserDescriptor, IPutUserRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IPutUserResponse PutUser(IPutUserRequest request);
 
-		/// <inheritdoc/>
-		Task<IPutUserResponse> PutUserAsync(Name username, Func<PutUserDescriptor, IPutUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IPutUserResponse> PutUserAsync(Name username, Func<PutUserDescriptor, IPutUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IPutUserResponse> PutUserAsync(IPutUserRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutUserResponse PutUser(Name username, Func<PutUserDescriptor, IPutUserRequest> selector = null) =>
-			this.PutUser(selector.InvokeOrDefault(new PutUserDescriptor(username)));
+			PutUser(selector.InvokeOrDefault(new PutUserDescriptor(username)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutUserResponse PutUser(IPutUserRequest request) =>
-			this.Dispatcher.Dispatch<IPutUserRequest, PutUserRequestParameters, PutUserResponse>(
+			Dispatcher.Dispatch<IPutUserRequest, PutUserRequestParameters, PutUserResponse>(
 				request,
-				this.LowLevelDispatch.XpackSecurityPutUserDispatch<PutUserResponse>
+				LowLevelDispatch.XpackSecurityPutUserDispatch<PutUserResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPutUserResponse> PutUserAsync(Name username, Func<PutUserDescriptor, IPutUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PutUserAsync(selector.InvokeOrDefault(new PutUserDescriptor(username)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IPutUserResponse> PutUserAsync(Name username, Func<PutUserDescriptor, IPutUserRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PutUserAsync(selector.InvokeOrDefault(new PutUserDescriptor(username)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IPutUserResponse> PutUserAsync(IPutUserRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutUserRequest, PutUserRequestParameters, PutUserResponse, IPutUserResponse>(
+			Dispatcher.DispatchAsync<IPutUserRequest, PutUserRequestParameters, PutUserResponse, IPutUserResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackSecurityPutUserDispatchAsync<PutUserResponse>
+				LowLevelDispatch.XpackSecurityPutUserDispatchAsync<PutUserResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/Security/User/PutUser/PutUserRequest.cs b/src/Nest/XPack/Security/User/PutUser/PutUserRequest.cs
index acb68d8d95e..7b8122bcce3 100644
--- a/src/Nest/XPack/Security/User/PutUser/PutUserRequest.cs
+++ b/src/Nest/XPack/Security/User/PutUser/PutUserRequest.cs
@@ -6,46 +6,52 @@ namespace Nest
 {
 	public partial interface IPutUserRequest
 	{
-		[JsonProperty("password")]
-		string Password { get; set; }
-
-		[JsonProperty("roles")]
-		IEnumerable<string> Roles { get; set; }
+		[JsonProperty("email")]
+		string Email { get; set; }
 
 		[JsonProperty("full_name")]
 		string FullName { get; set; }
 
-		[JsonProperty("email")]
-		string Email { get; set; }
-
 		[JsonProperty("metadata")]
 		IDictionary<string, object> Metadata { get; set; }
+
+		[JsonProperty("password")]
+		string Password { get; set; }
+
+		[JsonProperty("roles")]
+		IEnumerable<string> Roles { get; set; }
 	}
 
 	public partial class PutUserRequest
 	{
-		public string Password { get; set; }
-		public IEnumerable<string> Roles { get; set; }
-		public string FullName { get; set; }
 		public string Email { get; set; }
+		public string FullName { get; set; }
 		public IDictionary<string, object> Metadata { get; set; }
+		public string Password { get; set; }
+		public IEnumerable<string> Roles { get; set; }
 	}
 
 	[DescriptorFor("XpackSecurityPutUser")]
 	public partial class PutUserDescriptor
 	{
-		string IPutUserRequest.Password { get; set; }
-		IEnumerable<string> IPutUserRequest.Roles { get; set; }
-		string IPutUserRequest.FullName { get; set; }
 		string IPutUserRequest.Email { get; set; }
+		string IPutUserRequest.FullName { get; set; }
 		IDictionary<string, object> IPutUserRequest.Metadata { get; set; }
+		string IPutUserRequest.Password { get; set; }
+		IEnumerable<string> IPutUserRequest.Roles { get; set; }
 
 		public PutUserDescriptor Password(string password) => Assign(a => a.Password = password);
+
 		public PutUserDescriptor Roles(IEnumerable<string> roles) => Assign(a => a.Roles = roles);
+
 		public PutUserDescriptor Roles(params string[] roles) => Assign(a => a.Roles = roles);
+
 		public PutUserDescriptor FullName(string fullName) => Assign(a => a.FullName = fullName);
+
 		public PutUserDescriptor Email(string email) => Assign(a => a.Email = email);
+
 		public PutUserDescriptor Metadata(IDictionary<string, object> metadata) => Assign(a => a.Metadata = metadata);
+
 		public PutUserDescriptor Metadata(Func<FluentDictionary<string, object>, IDictionary<string, object>> selector) =>
 			Assign(a => a.Metadata = selector?.Invoke(new FluentDictionary<string, object>()));
 	}
diff --git a/src/Nest/XPack/Security/User/PutUser/PutUserResponse.cs b/src/Nest/XPack/Security/User/PutUser/PutUserResponse.cs
index 342f2f1f5ca..72571134a3e 100644
--- a/src/Nest/XPack/Security/User/PutUser/PutUserResponse.cs
+++ b/src/Nest/XPack/Security/User/PutUser/PutUserResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Sql/ClearSqlCursor/ClearSqlCursorRequest.cs b/src/Nest/XPack/Sql/ClearSqlCursor/ClearSqlCursorRequest.cs
index 4e825bc622a..374b5b91848 100644
--- a/src/Nest/XPack/Sql/ClearSqlCursor/ClearSqlCursorRequest.cs
+++ b/src/Nest/XPack/Sql/ClearSqlCursor/ClearSqlCursorRequest.cs
@@ -7,7 +7,8 @@ namespace Nest
 	public partial interface IClearSqlCursorRequest
 	{
 		/// <summary>
-		/// <para>You’ve reached the last page when there is no cursor returned in the results. Like Elasticsearch’s scroll,
+		/// <para>
+		/// You’ve reached the last page when there is no cursor returned in the results. Like Elasticsearch’s scroll,
 		/// SQL may keep state in Elasticsearch to support the cursor.
 		/// Unlike scroll, receiving the last page is enough to guarantee that the Elasticsearch state is cleared.
 		/// </para>
@@ -18,7 +19,8 @@ public partial interface IClearSqlCursorRequest
 
 	public partial class ClearSqlCursorRequest
 	{
-		/// <inheritdoc cref="IQuerySqlRequest.Cursor"/>>
+		/// <inheritdoc cref="IQuerySqlRequest.Cursor" />
+		/// >
 		public string Cursor { get; set; }
 	}
 
@@ -26,7 +28,8 @@ public partial class ClearSqlCursorDescriptor
 	{
 		string IClearSqlCursorRequest.Cursor { get; set; }
 
-		/// <inheritdoc cref="IQuerySqlRequest.Cursor"/>>
+		/// <inheritdoc cref="IQuerySqlRequest.Cursor" />
+		/// >
 		public ClearSqlCursorDescriptor Cursor(string cursor) => Assign(a => a.Cursor = cursor);
 	}
 }
diff --git a/src/Nest/XPack/Sql/ClearSqlCursor/ClearSqlCursorResponse.cs b/src/Nest/XPack/Sql/ClearSqlCursor/ClearSqlCursorResponse.cs
index 061fc3143e6..f941d329678 100644
--- a/src/Nest/XPack/Sql/ClearSqlCursor/ClearSqlCursorResponse.cs
+++ b/src/Nest/XPack/Sql/ClearSqlCursor/ClearSqlCursorResponse.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Sql/ClearSqlCursor/ElasticClient-ClearSqlCursor.cs b/src/Nest/XPack/Sql/ClearSqlCursor/ElasticClient-ClearSqlCursor.cs
index 4934c3e542c..8294f63d6af 100644
--- a/src/Nest/XPack/Sql/ClearSqlCursor/ElasticClient-ClearSqlCursor.cs
+++ b/src/Nest/XPack/Sql/ClearSqlCursor/ElasticClient-ClearSqlCursor.cs
@@ -1,50 +1,58 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
 	public partial interface IElasticClient
 	{
 		/// <summary>
-		/// Clear a cursor returned by <see cref="IQuerySqlResponse.Cursor"/>. Not that this is only necessary if you wish to bail out early
+		/// Clear a cursor returned by <see cref="IQuerySqlResponse.Cursor" />. Not that this is only necessary if you wish to bail out early
 		/// </summary>
 		IClearSqlCursorResponse ClearSqlCursor(Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> selector = null);
 
-		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})"/>
+		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})" />
 		IClearSqlCursorResponse ClearSqlCursor(IClearSqlCursorRequest request);
 
-		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})"/>
-		Task<IClearSqlCursorResponse> ClearSqlCursorAsync(Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})" />
+		Task<IClearSqlCursorResponse> ClearSqlCursorAsync(Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})"/>
-		Task<IClearSqlCursorResponse> ClearSqlCursorAsync(IClearSqlCursorRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})" />
+		Task<IClearSqlCursorResponse> ClearSqlCursorAsync(IClearSqlCursorRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})"/>
+		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})" />
 		public IClearSqlCursorResponse ClearSqlCursor(Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> selector = null) =>
-			this.ClearSqlCursor(selector.InvokeOrDefault(new ClearSqlCursorDescriptor()));
+			ClearSqlCursor(selector.InvokeOrDefault(new ClearSqlCursorDescriptor()));
 
-		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})"/>
+		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})" />
 		public IClearSqlCursorResponse ClearSqlCursor(IClearSqlCursorRequest request) =>
-			this.Dispatcher.Dispatch<IClearSqlCursorRequest, ClearSqlCursorRequestParameters, ClearSqlCursorResponse>(
+			Dispatcher.Dispatch<IClearSqlCursorRequest, ClearSqlCursorRequestParameters, ClearSqlCursorResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSqlClearCursorDispatch<ClearSqlCursorResponse>(p, d)
+				(p, d) => LowLevelDispatch.XpackSqlClearCursorDispatch<ClearSqlCursorResponse>(p, d)
 			);
 
-		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})"/>
-		public Task<IClearSqlCursorResponse> ClearSqlCursorAsync(Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ClearSqlCursorAsync(selector.InvokeOrDefault(new ClearSqlCursorDescriptor()), cancellationToken);
-
-		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})"/>
-		public Task<IClearSqlCursorResponse> ClearSqlCursorAsync(IClearSqlCursorRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IClearSqlCursorRequest, ClearSqlCursorRequestParameters, ClearSqlCursorResponse, IClearSqlCursorResponse>(
+		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})" />
+		public Task<IClearSqlCursorResponse> ClearSqlCursorAsync(Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ClearSqlCursorAsync(selector.InvokeOrDefault(new ClearSqlCursorDescriptor()), cancellationToken);
+
+		/// <inheritdoc cref="ClearSqlCursor(System.Func{Nest.ClearSqlCursorDescriptor,Nest.IClearSqlCursorRequest})" />
+		public Task<IClearSqlCursorResponse> ClearSqlCursorAsync(IClearSqlCursorRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IClearSqlCursorRequest, ClearSqlCursorRequestParameters, ClearSqlCursorResponse, IClearSqlCursorResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSqlClearCursorDispatchAsync<ClearSqlCursorResponse>(p, d, c)
+				(p, d, c) => LowLevelDispatch.XpackSqlClearCursorDispatchAsync<ClearSqlCursorResponse>(p, d, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Sql/ISqlRequest.cs b/src/Nest/XPack/Sql/ISqlRequest.cs
index 519fec6faac..d00fd9f8753 100644
--- a/src/Nest/XPack/Sql/ISqlRequest.cs
+++ b/src/Nest/XPack/Sql/ISqlRequest.cs
@@ -2,9 +2,19 @@
 
 namespace Nest
 {
-	/// <summary> Shared properties of <see cref="IQuerySqlRequest"/> and <see cref="ITranslateSqlRequest"/> </summary>
+	/// <summary> Shared properties of <see cref="IQuerySqlRequest" /> and <see cref="ITranslateSqlRequest" /> </summary>
 	public interface ISqlRequest
 	{
+		/// <summary>
+		/// fetch_size is a hint for how many results to return in each page. SQL might chose to return more or fewer results though.
+		/// </summary>
+		[JsonProperty("fetch_size")]
+		int? FetchSize { get; set; }
+
+		/// <summary> Further filter the results returned by the SQL query provided on <see cref="Query" /> </summary>
+		[JsonProperty("filter")]
+		QueryContainer Filter { get; set; }
+
 		/// <summary> The SQL query you want Elasticsearch to execute </summary>
 		[JsonProperty("query")]
 		string Query { get; set; }
@@ -15,15 +25,5 @@ public interface ISqlRequest
 		/// </summary>
 		[JsonProperty("time_zone")]
 		string TimeZone { get; set; }
-
-		/// <summary>
-		/// fetch_size is a hint for how many results to return in each page. SQL might chose to return more or fewer results though.
-		/// </summary>
-		[JsonProperty("fetch_size")]
-		int? FetchSize { get; set; }
-
-		/// <summary> Further filter the results returned by the SQL query provided on <see cref="Query" /> </summary>
-		[JsonProperty("filter")]
-		QueryContainer Filter { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Sql/QuerySql/ElasticClient-QuerySql.cs b/src/Nest/XPack/Sql/QuerySql/ElasticClient-QuerySql.cs
index efc7fe63f4b..60e8d2ccd18 100644
--- a/src/Nest/XPack/Sql/QuerySql/ElasticClient-QuerySql.cs
+++ b/src/Nest/XPack/Sql/QuerySql/ElasticClient-QuerySql.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -10,39 +10,43 @@ public partial interface IElasticClient
 		/// <summary> The SQL REST API accepts SQL in a JSON document, executes it, and returns the results. </summary>
 		IQuerySqlResponse QuerySql(Func<QuerySqlDescriptor, IQuerySqlRequest> selector = null);
 
-		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})"/>
+		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})" />
 		IQuerySqlResponse QuerySql(IQuerySqlRequest request);
 
-		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})"/>
-		Task<IQuerySqlResponse> QuerySqlAsync(Func<QuerySqlDescriptor, IQuerySqlRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})" />
+		Task<IQuerySqlResponse> QuerySqlAsync(Func<QuerySqlDescriptor, IQuerySqlRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})"/>
+		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})" />
 		Task<IQuerySqlResponse> QuerySqlAsync(IQuerySqlRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})"/>
+		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})" />
 		public IQuerySqlResponse QuerySql(Func<QuerySqlDescriptor, IQuerySqlRequest> selector = null) =>
-			this.QuerySql(selector.InvokeOrDefault(new QuerySqlDescriptor()));
+			QuerySql(selector.InvokeOrDefault(new QuerySqlDescriptor()));
 
-		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})"/>
+		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})" />
 		public IQuerySqlResponse QuerySql(IQuerySqlRequest request) =>
-			this.Dispatcher.Dispatch<IQuerySqlRequest, QuerySqlRequestParameters, QuerySqlResponse>(
+			Dispatcher.Dispatch<IQuerySqlRequest, QuerySqlRequestParameters, QuerySqlResponse>(
 				request,
-				(p, d) =>this.LowLevelDispatch.XpackSqlQueryDispatch<QuerySqlResponse>(p, d)
+				(p, d) => LowLevelDispatch.XpackSqlQueryDispatch<QuerySqlResponse>(p, d)
 			);
 
-		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})"/>
-		public Task<IQuerySqlResponse> QuerySqlAsync(Func<QuerySqlDescriptor, IQuerySqlRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.QuerySqlAsync(selector.InvokeOrDefault(new QuerySqlDescriptor()), cancellationToken);
+		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})" />
+		public Task<IQuerySqlResponse> QuerySqlAsync(Func<QuerySqlDescriptor, IQuerySqlRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			QuerySqlAsync(selector.InvokeOrDefault(new QuerySqlDescriptor()), cancellationToken);
 
-		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})"/>
+		/// <inheritdoc cref="QuerySql(System.Func{Nest.QuerySqlDescriptor,Nest.IQuerySqlRequest})" />
 		public Task<IQuerySqlResponse> QuerySqlAsync(IQuerySqlRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IQuerySqlRequest, QuerySqlRequestParameters, QuerySqlResponse, IQuerySqlResponse>(
+			Dispatcher.DispatchAsync<IQuerySqlRequest, QuerySqlRequestParameters, QuerySqlResponse, IQuerySqlResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackSqlQueryDispatchAsync<QuerySqlResponse>(p, d, c)
+				(p, d, c) => LowLevelDispatch.XpackSqlQueryDispatchAsync<QuerySqlResponse>(p, d, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs b/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
index bce57f42c8b..8b2ab286a79 100644
--- a/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
+++ b/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -13,57 +9,66 @@ public partial interface IQuerySqlRequest : ISqlRequest
 	{
 		/// <summary>
 		/// Continue to the next page by sending back the cursor field returned in the previous response.
-		/// <para>You’ve reached the last page when there is no cursor returned in the results. Like Elasticsearch’s scroll,
+		/// <para>
+		/// You’ve reached the last page when there is no cursor returned in the results. Like Elasticsearch’s scroll,
 		/// SQL may keep state in Elasticsearch to support the cursor.
 		/// Unlike scroll, receiving the last page is enough to guarantee that the Elasticsearch state is cleared.
 		/// </para>
 		/// </summary>
 		[JsonProperty("cursor")]
 		string Cursor { get; set; }
-
 	}
 
 	public partial class QuerySqlRequest
 	{
-		/// <inheritdoc cref="ISqlRequest.Query"/>>
-		public string Query { get; set; }
-
-		/// <inheritdoc cref="ISqlRequest.TimeZone"/>>
-		public string TimeZone { get; set; }
+		/// <inheritdoc cref="IQuerySqlRequest.Cursor" />
+		/// >
+		public string Cursor { get; set; }
 
-		/// <inheritdoc cref="ISqlRequest.FetchSize"/>>
+		/// <inheritdoc cref="ISqlRequest.FetchSize" />
+		/// >
 		public int? FetchSize { get; set; }
 
-		/// <inheritdoc cref="ISqlRequest.Filter"/>>
+		/// <inheritdoc cref="ISqlRequest.Filter" />
+		/// >
 		public QueryContainer Filter { get; set; }
 
-		/// <inheritdoc cref="IQuerySqlRequest.Cursor"/>>
-		public string Cursor { get; set; }
+		/// <inheritdoc cref="ISqlRequest.Query" />
+		/// >
+		public string Query { get; set; }
+
+		/// <inheritdoc cref="ISqlRequest.TimeZone" />
+		/// >
+		public string TimeZone { get; set; }
 	}
 
 	public partial class QuerySqlDescriptor
 	{
-		string ISqlRequest.Query { get; set; }
-		string ISqlRequest.TimeZone { get; set; }
+		string IQuerySqlRequest.Cursor { get; set; }
 		int? ISqlRequest.FetchSize { get; set; }
 		QueryContainer ISqlRequest.Filter { get; set; }
-		string IQuerySqlRequest.Cursor { get; set; }
+		string ISqlRequest.Query { get; set; }
+		string ISqlRequest.TimeZone { get; set; }
 
-		/// <inheritdoc cref="ISqlRequest.Query"/>>
+		/// <inheritdoc cref="ISqlRequest.Query" />
+		/// >
 		public QuerySqlDescriptor Query(string query) => Assign(a => a.Query = query);
 
-		/// <inheritdoc cref="ISqlRequest.TimeZone"/>>
+		/// <inheritdoc cref="ISqlRequest.TimeZone" />
+		/// >
 		public QuerySqlDescriptor TimeZone(string timeZone) => Assign(a => a.TimeZone = timeZone);
 
-		/// <inheritdoc cref="ISqlRequest.FetchSize"/>>
+		/// <inheritdoc cref="ISqlRequest.FetchSize" />
+		/// >
 		public QuerySqlDescriptor FetchSize(int? fetchSize) => Assign(a => a.FetchSize = fetchSize);
 
-		/// <inheritdoc cref="ISqlRequest.Filter"/>>
+		/// <inheritdoc cref="ISqlRequest.Filter" />
+		/// >
 		public QuerySqlDescriptor Filter<T>(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector)
 			where T : class => Assign(a => a.Filter = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
 
-		/// <inheritdoc cref="IQuerySqlRequest.Cursor"/>>
+		/// <inheritdoc cref="IQuerySqlRequest.Cursor" />
+		/// >
 		public QuerySqlDescriptor Cursor(string cursor) => Assign(a => a.Cursor = cursor);
-
 	}
 }
diff --git a/src/Nest/XPack/Sql/QuerySql/QuerySqlResponse.cs b/src/Nest/XPack/Sql/QuerySql/QuerySqlResponse.cs
index 93505aa818c..d4dc742aca7 100644
--- a/src/Nest/XPack/Sql/QuerySql/QuerySqlResponse.cs
+++ b/src/Nest/XPack/Sql/QuerySql/QuerySqlResponse.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -11,24 +10,31 @@ public interface IQuerySqlResponse : IResponse
 		/// </summary>
 		[JsonProperty("columns")]
 		IReadOnlyCollection<SqlColumn> Columns { get; }
-		[JsonProperty("rows")]
-		IReadOnlyCollection<SqlRow> Rows { get; }
+
 		/// <summary>
-		/// <para>You’ve reached the last page when there is no cursor returned in the results. Like Elasticsearch’s scroll,
+		/// <para>
+		/// You’ve reached the last page when there is no cursor returned in the results. Like Elasticsearch’s scroll,
 		/// SQL may keep state in Elasticsearch to support the cursor.
 		/// Unlike scroll, receiving the last page is enough to guarantee that the Elasticsearch state is cleared.
 		/// </para>
 		/// </summary>
 		[JsonProperty("cursor")]
 		string Cursor { get; }
+
+		[JsonProperty("rows")]
+		IReadOnlyCollection<SqlRow> Rows { get; }
 	}
 
 	public class QuerySqlResponse : ResponseBase, IQuerySqlResponse
 	{
-		/// <inheritdoc cref="IQuerySqlResponse.Columns"/>>
+		/// <inheritdoc cref="IQuerySqlResponse.Columns" />
+		/// >
 		public IReadOnlyCollection<SqlColumn> Columns { get; internal set; } = EmptyReadOnly<SqlColumn>.Collection;
-		public IReadOnlyCollection<SqlRow> Rows { get; internal set; } = EmptyReadOnly<SqlRow>.Collection;
-		/// <inheritdoc cref="IQuerySqlResponse.Cursor"/>>
+
+		/// <inheritdoc cref="IQuerySqlResponse.Cursor" />
+		/// >
 		public string Cursor { get; internal set; }
+
+		public IReadOnlyCollection<SqlRow> Rows { get; internal set; } = EmptyReadOnly<SqlRow>.Collection;
 	}
 }
diff --git a/src/Nest/XPack/Sql/QuerySql/SqlColumn.cs b/src/Nest/XPack/Sql/QuerySql/SqlColumn.cs
index 6584f027b60..290f0ee2fcf 100644
--- a/src/Nest/XPack/Sql/QuerySql/SqlColumn.cs
+++ b/src/Nest/XPack/Sql/QuerySql/SqlColumn.cs
@@ -6,7 +6,8 @@ public class SqlColumn
 	{
 		[JsonProperty("name")]
 		public string Name { get; set; }
+
 		[JsonProperty("type")]
 		public string Type { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Sql/QuerySql/SqlValue.cs b/src/Nest/XPack/Sql/QuerySql/SqlValue.cs
index 5a6c93b1a1f..b8cee689cb1 100644
--- a/src/Nest/XPack/Sql/QuerySql/SqlValue.cs
+++ b/src/Nest/XPack/Sql/QuerySql/SqlValue.cs
@@ -20,5 +20,4 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return new SqlValue(token, sourceSerializer);
 		}
 	}
-
 }
diff --git a/src/Nest/XPack/Sql/TranslateSql/ElasticClient-TranslateSql.cs b/src/Nest/XPack/Sql/TranslateSql/ElasticClient-TranslateSql.cs
index 94a5e9368e2..6a59a8e8a1a 100644
--- a/src/Nest/XPack/Sql/TranslateSql/ElasticClient-TranslateSql.cs
+++ b/src/Nest/XPack/Sql/TranslateSql/ElasticClient-TranslateSql.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using System.Threading;
 
 namespace Nest
 {
@@ -11,48 +11,53 @@ public partial interface IElasticClient
 		/// <summary> The SQL Translate API accepts SQL in a JSON document and translates it into a native Elasticsearch search request</summary>
 		ITranslateSqlResponse TranslateSql(Func<TranslateSqlDescriptor, ITranslateSqlRequest> selector = null);
 
-		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})"/>
+		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})" />
 		ITranslateSqlResponse TranslateSql(ITranslateSqlRequest request);
 
-		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})"/>
-		Task<ITranslateSqlResponse> TranslateSqlAsync(Func<TranslateSqlDescriptor, ITranslateSqlRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})" />
+		Task<ITranslateSqlResponse> TranslateSqlAsync(Func<TranslateSqlDescriptor, ITranslateSqlRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})"/>
+		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})" />
 		Task<ITranslateSqlResponse> TranslateSqlAsync(ITranslateSqlRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})"/>
+		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})" />
 		public ITranslateSqlResponse TranslateSql(Func<TranslateSqlDescriptor, ITranslateSqlRequest> selector = null) =>
-			this.TranslateSql(selector.InvokeOrDefault(new TranslateSqlDescriptor()));
+			TranslateSql(selector.InvokeOrDefault(new TranslateSqlDescriptor()));
 
-		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})"/>
+		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})" />
 		public ITranslateSqlResponse TranslateSql(ITranslateSqlRequest request) =>
-			this.Dispatcher.Dispatch<ITranslateSqlRequest, TranslateSqlRequestParameters, TranslateSqlResponse>(
+			Dispatcher.Dispatch<ITranslateSqlRequest, TranslateSqlRequestParameters, TranslateSqlResponse>(
 				request,
-				this.ToTranslateSqlResponse,
-				(p, d) =>this.LowLevelDispatch.XpackSqlTranslateDispatch<TranslateSqlResponse>(p, d)
+				ToTranslateSqlResponse,
+				(p, d) => LowLevelDispatch.XpackSqlTranslateDispatch<TranslateSqlResponse>(p, d)
 			);
 
-		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})"/>
-		public Task<ITranslateSqlResponse> TranslateSqlAsync(Func<TranslateSqlDescriptor, ITranslateSqlRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.TranslateSqlAsync(selector.InvokeOrDefault(new TranslateSqlDescriptor()), cancellationToken);
-
-		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})"/>
-		public Task<ITranslateSqlResponse> TranslateSqlAsync(ITranslateSqlRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<ITranslateSqlRequest, TranslateSqlRequestParameters, TranslateSqlResponse, ITranslateSqlResponse>(
+		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})" />
+		public Task<ITranslateSqlResponse> TranslateSqlAsync(Func<TranslateSqlDescriptor, ITranslateSqlRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			TranslateSqlAsync(selector.InvokeOrDefault(new TranslateSqlDescriptor()), cancellationToken);
+
+		/// <inheritdoc cref="TranslateSql(System.Func{Nest.TranslateSqlDescriptor,Nest.ITranslateSqlRequest})" />
+		public Task<ITranslateSqlResponse> TranslateSqlAsync(ITranslateSqlRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<ITranslateSqlRequest, TranslateSqlRequestParameters, TranslateSqlResponse, ITranslateSqlResponse>(
 				request,
 				cancellationToken,
-				this.ToTranslateSqlResponse,
-				(p, d, c) => this.LowLevelDispatch.XpackSqlTranslateDispatchAsync<TranslateSqlResponse>(p, d, c)
+				ToTranslateSqlResponse,
+				(p, d, c) => LowLevelDispatch.XpackSqlTranslateDispatchAsync<TranslateSqlResponse>(p, d, c)
 			);
 
 		private TranslateSqlResponse ToTranslateSqlResponse(IApiCallDetails apiCallDetails, Stream stream)
 		{
-			var result = this.RequestResponseSerializer.Deserialize<ISearchRequest>(stream);
+			var result = RequestResponseSerializer.Deserialize<ISearchRequest>(stream);
 			return new TranslateSqlResponse { Result = result };
 		}
 	}
-
 }
diff --git a/src/Nest/XPack/Sql/TranslateSql/TranslateSqlRequest.cs b/src/Nest/XPack/Sql/TranslateSql/TranslateSqlRequest.cs
index ab9bc0b854d..c9228ab6888 100644
--- a/src/Nest/XPack/Sql/TranslateSql/TranslateSqlRequest.cs
+++ b/src/Nest/XPack/Sql/TranslateSql/TranslateSqlRequest.cs
@@ -8,36 +8,44 @@ public partial interface ITranslateSqlRequest : ISqlRequest { }
 
 	public partial class TranslateSqlRequest
 	{
-		/// <inheritdoc cref="ISqlRequest.Query"/>>
-		public string Query { get; set; }
-
-		/// <inheritdoc cref="ISqlRequest.TimeZone"/>>
-		public string TimeZone { get; set; }
-
-		/// <inheritdoc cref="ISqlRequest.FetchSize"/>>
+		/// <inheritdoc cref="ISqlRequest.FetchSize" />
+		/// >
 		public int? FetchSize { get; set; }
 
-		/// <inheritdoc cref="ISqlRequest.Filter"/>>
+		/// <inheritdoc cref="ISqlRequest.Filter" />
+		/// >
 		public QueryContainer Filter { get; set; }
+
+		/// <inheritdoc cref="ISqlRequest.Query" />
+		/// >
+		public string Query { get; set; }
+
+		/// <inheritdoc cref="ISqlRequest.TimeZone" />
+		/// >
+		public string TimeZone { get; set; }
 	}
 
 	public partial class TranslateSqlDescriptor
 	{
-		string ISqlRequest.Query { get; set; }
-		string ISqlRequest.TimeZone { get; set; }
 		int? ISqlRequest.FetchSize { get; set; }
 		QueryContainer ISqlRequest.Filter { get; set; }
+		string ISqlRequest.Query { get; set; }
+		string ISqlRequest.TimeZone { get; set; }
 
-		/// <inheritdoc cref="ISqlRequest.Query"/>>
+		/// <inheritdoc cref="ISqlRequest.Query" />
+		/// >
 		public TranslateSqlDescriptor Query(string query) => Assign(a => a.Query = query);
 
-		/// <inheritdoc cref="ISqlRequest.TimeZone"/>>
+		/// <inheritdoc cref="ISqlRequest.TimeZone" />
+		/// >
 		public TranslateSqlDescriptor TimeZone(string timeZone) => Assign(a => a.TimeZone = timeZone);
 
-		/// <inheritdoc cref="ISqlRequest.FetchSize"/>>
+		/// <inheritdoc cref="ISqlRequest.FetchSize" />
+		/// >
 		public TranslateSqlDescriptor FetchSize(int? fetchSize) => Assign(a => a.FetchSize = fetchSize);
 
-		/// <inheritdoc cref="ISqlRequest.Filter"/>>
+		/// <inheritdoc cref="ISqlRequest.Filter" />
+		/// >
 		public TranslateSqlDescriptor Filter<T>(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector)
 			where T : class => Assign(a => a.Filter = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
 	}
diff --git a/src/Nest/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchRequest.cs b/src/Nest/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchRequest.cs
index 8942c11e02d..b7c7f54cddb 100644
--- a/src/Nest/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchRequest.cs
+++ b/src/Nest/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IAcknowledgeWatchRequest {}
+	public partial interface IAcknowledgeWatchRequest { }
 
-	public partial class AcknowledgeWatchRequest {}
+	public partial class AcknowledgeWatchRequest { }
 
 	[DescriptorFor("XpackWatcherAckWatch")]
-	public partial class AcknowledgeWatchDescriptor {}
+	public partial class AcknowledgeWatchDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchResponse.cs b/src/Nest/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchResponse.cs
index 9d0cde9c721..40dfb819644 100644
--- a/src/Nest/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchResponse.cs
+++ b/src/Nest/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchResponse.cs
@@ -20,11 +20,8 @@ public class AcknowledgeWatchResponse : ResponseBase, IAcknowledgeWatchResponse
 	[JsonObject]
 	public class WatchStatus
 	{
-		[JsonProperty("version")]
-		public int? Version { get; set; }
-
-		[JsonProperty("state")]
-		public ActivationState State { get; set; }
+		[JsonProperty("actions")]
+		public IReadOnlyDictionary<string, ActionStatus> Actions { get; set; }
 
 		[JsonProperty("last_checked")]
 		public DateTimeOffset? LastChecked { get; set; }
@@ -32,8 +29,11 @@ public class WatchStatus
 		[JsonProperty("last_met_condition")]
 		public DateTimeOffset? LastMetCondition { get; set; }
 
-		[JsonProperty("actions")]
-		public IReadOnlyDictionary<string, ActionStatus> Actions { get; set; }
+		[JsonProperty("state")]
+		public ActivationState State { get; set; }
+
+		[JsonProperty("version")]
+		public int? Version { get; set; }
 	}
 
 	public class ActionStatus
@@ -54,41 +54,41 @@ public class ActionStatus
 	[JsonObject]
 	public class ActivationState
 	{
-		[JsonProperty("timestamp")]
-		public DateTimeOffset Timestamp { get; set; }
-
 		[JsonProperty("active")]
 		public bool Active { get; set; }
+
+		[JsonProperty("timestamp")]
+		public DateTimeOffset Timestamp { get; set; }
 	}
 
 	[JsonObject]
 	public class AcknowledgeState
 	{
-		[JsonProperty("timestamp")]
-		public DateTimeOffset Timestamp { get; set; }
-
 		[JsonProperty("state")]
 		public AcknowledgementState State { get; set; }
+
+		[JsonProperty("timestamp")]
+		public DateTimeOffset Timestamp { get; set; }
 	}
 
 	[JsonObject]
 	public class ExecutionState
 	{
-		[JsonProperty("timestamp")]
-		public DateTimeOffset Timestamp { get; set; }
-
 		[JsonProperty("successful")]
 		public bool Successful { get; set; }
+
+		[JsonProperty("timestamp")]
+		public DateTimeOffset Timestamp { get; set; }
 	}
 
 	[JsonObject]
 	public class ThrottleState
 	{
-		[JsonProperty("timestamp")]
-		public DateTimeOffset Timestamp { get; set; }
-
 		[JsonProperty("reason")]
 		public string Reason { get; set; }
+
+		[JsonProperty("timestamp")]
+		public DateTimeOffset Timestamp { get; set; }
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
diff --git a/src/Nest/XPack/Watcher/AcknowledgeWatch/ElasticClient-AcknowledgeWatch.cs b/src/Nest/XPack/Watcher/AcknowledgeWatch/ElasticClient-AcknowledgeWatch.cs
index 8328f671b87..6a0fa8bc13e 100644
--- a/src/Nest/XPack/Watcher/AcknowledgeWatch/ElasticClient-AcknowledgeWatch.cs
+++ b/src/Nest/XPack/Watcher/AcknowledgeWatch/ElasticClient-AcknowledgeWatch.cs
@@ -15,39 +15,49 @@ public partial interface IElasticClient
 		/// </summary>
 		IAcknowledgeWatchResponse AcknowledgeWatch(Id id, Func<AcknowledgeWatchDescriptor, IAcknowledgeWatchRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IAcknowledgeWatchResponse AcknowledgeWatch(IAcknowledgeWatchRequest request);
 
-		/// <inheritdoc/>
-		Task<IAcknowledgeWatchResponse> AcknowledgeWatchAsync(Id id, Func<AcknowledgeWatchDescriptor, IAcknowledgeWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IAcknowledgeWatchResponse> AcknowledgeWatchAsync(Id id, Func<AcknowledgeWatchDescriptor, IAcknowledgeWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IAcknowledgeWatchResponse> AcknowledgeWatchAsync(IAcknowledgeWatchRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IAcknowledgeWatchResponse> AcknowledgeWatchAsync(IAcknowledgeWatchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAcknowledgeWatchResponse AcknowledgeWatch(Id id, Func<AcknowledgeWatchDescriptor, IAcknowledgeWatchRequest> selector = null) =>
-			this.AcknowledgeWatch(selector.InvokeOrDefault(new AcknowledgeWatchDescriptor(id)));
+			AcknowledgeWatch(selector.InvokeOrDefault(new AcknowledgeWatchDescriptor(id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IAcknowledgeWatchResponse AcknowledgeWatch(IAcknowledgeWatchRequest request) =>
-			this.Dispatcher.Dispatch<IAcknowledgeWatchRequest, AcknowledgeWatchRequestParameters, AcknowledgeWatchResponse>(
+			Dispatcher.Dispatch<IAcknowledgeWatchRequest, AcknowledgeWatchRequestParameters, AcknowledgeWatchResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackWatcherAckWatchDispatch<AcknowledgeWatchResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherAckWatchDispatch<AcknowledgeWatchResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IAcknowledgeWatchResponse> AcknowledgeWatchAsync(Id id, Func<AcknowledgeWatchDescriptor, IAcknowledgeWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.AcknowledgeWatchAsync(selector.InvokeOrDefault(new AcknowledgeWatchDescriptor(id)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IAcknowledgeWatchResponse> AcknowledgeWatchAsync(IAcknowledgeWatchRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IAcknowledgeWatchRequest, AcknowledgeWatchRequestParameters, AcknowledgeWatchResponse, IAcknowledgeWatchResponse>(
-				request,
-				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackWatcherAckWatchDispatchAsync<AcknowledgeWatchResponse>(p, c)
-			);
+		/// <inheritdoc />
+		public Task<IAcknowledgeWatchResponse> AcknowledgeWatchAsync(Id id,
+			Func<AcknowledgeWatchDescriptor, IAcknowledgeWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			AcknowledgeWatchAsync(selector.InvokeOrDefault(new AcknowledgeWatchDescriptor(id)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IAcknowledgeWatchResponse> AcknowledgeWatchAsync(IAcknowledgeWatchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher
+				.DispatchAsync<IAcknowledgeWatchRequest, AcknowledgeWatchRequestParameters, AcknowledgeWatchResponse, IAcknowledgeWatchResponse>(
+					request,
+					cancellationToken,
+					(p, d, c) => LowLevelDispatch.XpackWatcherAckWatchDispatchAsync<AcknowledgeWatchResponse>(p, c)
+				);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Action/ActionBase.cs b/src/Nest/XPack/Watcher/Action/ActionBase.cs
index 3f1262ad44a..e29a7973f00 100644
--- a/src/Nest/XPack/Watcher/Action/ActionBase.cs
+++ b/src/Nest/XPack/Watcher/Action/ActionBase.cs
@@ -10,33 +10,33 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IAction
 	{
+		[JsonIgnore]
+		ActionType ActionType { get; }
+
 		[JsonIgnore]
 		string Name { get; set; }
 
 		[JsonIgnore]
-		ActionType ActionType { get; }
+		Time ThrottlePeriod { get; set; }
 
 		[JsonProperty("transform")]
 		TransformContainer Transform { get; set; }
-
-		[JsonIgnore]
-		Time ThrottlePeriod { get; set; }
 	}
 
 	public abstract class ActionBase : IAction
 	{
-		internal ActionBase() {}
-
-		protected ActionBase(string name) => this.Name = name;
+		internal ActionBase() { }
 
-		public string Name { get; set; }
+		protected ActionBase(string name) => Name = name;
 
 		public abstract ActionType ActionType { get; }
 
-		public TransformContainer Transform { get; set; }
+		public string Name { get; set; }
 
 		public Time ThrottlePeriod { get; set; }
 
+		public TransformContainer Transform { get; set; }
+
 		public static bool operator false(ActionBase a) => false;
 
 		public static bool operator true(ActionBase a) => false;
@@ -47,26 +47,24 @@ internal ActionBase() {}
 
 	internal class ActionCombinator : ActionBase, IAction
 	{
-		internal List<ActionBase> Actions { get; } = new List<ActionBase>();
-
 		public ActionCombinator(ActionBase left, ActionBase right) : base(null)
 		{
-			this.AddAction(left);
-			this.AddAction(right);
+			AddAction(left);
+			AddAction(right);
 		}
 
+		public override ActionType ActionType => (ActionType)10;
+		internal List<ActionBase> Actions { get; } = new List<ActionBase>();
+
 		private void AddAction(ActionBase agg)
 		{
 			if (agg == null) return;
+
 			var combinator = agg as ActionCombinator;
 			if ((combinator?.Actions.HasAny()).GetValueOrDefault(false))
-			{
-				this.Actions.AddRange(combinator.Actions);
-			}
-			else this.Actions.Add(agg);
+				Actions.AddRange(combinator.Actions);
+			else Actions.Add(agg);
 		}
-
-		public override ActionType ActionType => (ActionType)10;
 	}
 
 	internal class ActionsJsonConverter : JsonConverter
@@ -81,6 +79,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			{
 				var property = child as JProperty;
 				if (property == null) continue;
+
 				var name = property.Name;
 
 				var actionJson = property.Value as JObject;
diff --git a/src/Nest/XPack/Watcher/Action/ActionType.cs b/src/Nest/XPack/Watcher/Action/ActionType.cs
index 04dc4a0794e..1ec24cf93ed 100644
--- a/src/Nest/XPack/Watcher/Action/ActionType.cs
+++ b/src/Nest/XPack/Watcher/Action/ActionType.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.Runtime.Serialization;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Watcher/Action/Actions.cs b/src/Nest/XPack/Watcher/Action/Actions.cs
index 8e26d3ec908..ffc368afcff 100644
--- a/src/Nest/XPack/Watcher/Action/Actions.cs
+++ b/src/Nest/XPack/Watcher/Action/Actions.cs
@@ -5,11 +5,15 @@
 
 namespace Nest
 {
-	public interface IActions : IIsADictionary<string, IAction> {}
+	public interface IActions : IIsADictionary<string, IAction> { }
 
 	[JsonConverter(typeof(ActionsJsonConverter))]
 	public class Actions : IsADictionaryBase<string, IAction>, IActions
 	{
+		public Actions() { }
+
+		public Actions(IDictionary<string, IAction> actions) : base(ReduceCombinators(actions)) { }
+
 		private static IDictionary<string, IAction> ReduceCombinators(IDictionary<string, IAction> actions)
 		{
 			if (!actions.Values.OfType<ActionCombinator>().Any())
@@ -25,6 +29,7 @@ private static IDictionary<string, IAction> ReduceCombinators(IDictionary<string
 					{
 						if (combinatorAction.Name.IsNullOrEmpty())
 							throw new ArgumentException($"{combinatorAction.GetType().Name}.Name is not set!");
+
 						reducedActions.Add(combinatorAction.Name, combinatorAction);
 					}
 				}
@@ -34,10 +39,6 @@ private static IDictionary<string, IAction> ReduceCombinators(IDictionary<string
 			return reducedActions;
 		}
 
-		public Actions() {}
-
-		public Actions(IDictionary<string, IAction> actions) : base(ReduceCombinators(actions)) {}
-
 		public static implicit operator Actions(ActionBase action)
 		{
 			if (action == null) return null;
@@ -51,6 +52,7 @@ public static implicit operator Actions(ActionBase action)
 				{
 					if (actionBase.Name.IsNullOrEmpty())
 						throw new ArgumentException($"{actionBase.GetType().Name}.Name is not set!");
+
 					actions.Add(actionBase.Name, actionBase);
 				}
 				return new Actions(actions);
@@ -59,14 +61,14 @@ public static implicit operator Actions(ActionBase action)
 			if (action.Name.IsNullOrEmpty())
 				throw new ArgumentException($"{action.GetType().Name}.Name is not set!");
 
-			actions = new Dictionary<string, IAction>{{ action.Name, action }};
+			actions = new Dictionary<string, IAction> { { action.Name, action } };
 			return new Actions(actions);
 		}
 	}
 
 	public class ActionsDescriptor : IsADictionaryDescriptorBase<ActionsDescriptor, Actions, string, IAction>
 	{
-		public ActionsDescriptor() : base(new Actions()) {}
+		public ActionsDescriptor() : base(new Actions()) { }
 
 		public ActionsDescriptor Email(string name, Func<EmailActionDescriptor, IEmailAction> selector) =>
 			Assign(name, selector.InvokeOrDefault(new EmailActionDescriptor(name)));
diff --git a/src/Nest/XPack/Watcher/Action/ActionsDescriptorBase.cs b/src/Nest/XPack/Watcher/Action/ActionsDescriptorBase.cs
index 9e0bbcc2c16..7b94006a518 100644
--- a/src/Nest/XPack/Watcher/Action/ActionsDescriptorBase.cs
+++ b/src/Nest/XPack/Watcher/Action/ActionsDescriptorBase.cs
@@ -14,24 +14,25 @@ protected ActionsDescriptorBase(string name)
 			if (name == null) throw new ArgumentNullException(nameof(name));
 			if (name.Length == 0) throw new ArgumentException("cannot be empty");
 
-			this._name = name;
+			_name = name;
 		}
 
+		protected abstract ActionType ActionType { get; }
+
+		ActionType IAction.ActionType => ActionType;
+
 		string IAction.Name
 		{
-			get { return this._name; }
-			set { this._name = value; }
+			get => _name;
+			set => _name = value;
 		}
 
-		ActionType IAction.ActionType => this.ActionType;
-		TransformContainer IAction.Transform { get; set; }
 		Time IAction.ThrottlePeriod { get; set; }
-
-		protected abstract ActionType ActionType { get; }
+		TransformContainer IAction.Transform { get; set; }
 
 		public TDescriptor Transform(Func<TransformDescriptor, TransformContainer> selector) =>
 			Assign(a => a.Transform = selector.InvokeOrDefault(new TransformDescriptor()));
 
 		public TDescriptor ThrottlePeriod(Time throttlePeriod) => Assign(a => a.ThrottlePeriod = throttlePeriod);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Action/Email/DataAttachment.cs b/src/Nest/XPack/Watcher/Action/Email/DataAttachment.cs
index 1adf27e4c51..990655b6d26 100644
--- a/src/Nest/XPack/Watcher/Action/Email/DataAttachment.cs
+++ b/src/Nest/XPack/Watcher/Action/Email/DataAttachment.cs
@@ -29,6 +29,7 @@ public enum DataAttachmentFormat
 	{
 		[EnumMember(Value = "json")]
 		Json,
+
 		[EnumMember(Value = "yaml")]
 		Yaml
 	}
diff --git a/src/Nest/XPack/Watcher/Action/Email/EmailAction.cs b/src/Nest/XPack/Watcher/Action/Email/EmailAction.cs
index 28f9ce7b1ab..2070c0a0a50 100644
--- a/src/Nest/XPack/Watcher/Action/Email/EmailAction.cs
+++ b/src/Nest/XPack/Watcher/Action/Email/EmailAction.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -10,17 +10,23 @@ public interface IEmailAction : IAction
 		[JsonProperty("account")]
 		string Account { get; set; }
 
-		[JsonProperty("from")]
-		string From { get; set; }
+		[JsonProperty("attachments")]
+		IEmailAttachments Attachments { get; set; }
 
-		[JsonProperty("to")]
-		IEnumerable<string> To { get; set; }
+		[JsonProperty("bcc")]
+		IEnumerable<string> Bcc { get; set; }
+
+		[JsonProperty("body")]
+		IEmailBody Body { get; set; }
 
 		[JsonProperty("cc")]
 		IEnumerable<string> Cc { get; set; }
 
-		[JsonProperty("bcc")]
-		IEnumerable<string> Bcc { get; set; }
+		[JsonProperty("from")]
+		string From { get; set; }
+
+		[JsonProperty("priority")]
+		EmailPriority? Priority { get; set; }
 
 		[JsonProperty("reply_to")]
 		IEnumerable<string> ReplyTo { get; set; }
@@ -28,59 +34,52 @@ public interface IEmailAction : IAction
 		[JsonProperty("subject")]
 		string Subject { get; set; }
 
-		[JsonProperty("body")]
-		IEmailBody Body { get; set; }
-
-		[JsonProperty("priority")]
-		EmailPriority? Priority { get; set; }
-
-		[JsonProperty("attachments")]
-		IEmailAttachments Attachments { get; set; }
+		[JsonProperty("to")]
+		IEnumerable<string> To { get; set; }
 	}
 
 	public class EmailAction : ActionBase, IEmailAction
 	{
-		public override ActionType ActionType => ActionType.Email;
-
-		public EmailAction(string name) : base(name) {}
+		public EmailAction(string name) : base(name) { }
 
 		public string Account { get; set; }
+		public override ActionType ActionType => ActionType.Email;
 
-		public string From { get; set; }
+		public IEmailAttachments Attachments { get; set; }
 
-		public IEnumerable<string> To { get; set; }
+		public IEnumerable<string> Bcc { get; set; }
+
+		public IEmailBody Body { get; set; }
 
 		public IEnumerable<string> Cc { get; set; }
 
-		public IEnumerable<string> Bcc { get; set; }
+		public string From { get; set; }
+
+		public EmailPriority? Priority { get; set; }
 
 		public IEnumerable<string> ReplyTo { get; set; }
 
 		public string Subject { get; set; }
 
-		public IEmailBody Body { get; set; }
-
-		public EmailPriority? Priority { get; set; }
-
-		public IEmailAttachments Attachments { get; set; }
+		public IEnumerable<string> To { get; set; }
 	}
 
 	public class EmailActionDescriptor : ActionsDescriptorBase<EmailActionDescriptor, IEmailAction>, IEmailAction
 	{
-		public EmailActionDescriptor(string name) : base(name) {}
+		public EmailActionDescriptor(string name) : base(name) { }
 
 		protected override ActionType ActionType => ActionType.Email;
 
 		string IEmailAction.Account { get; set; }
-		string IEmailAction.From { get; set; }
-		IEnumerable<string> IEmailAction.To { get; set; }
-		IEnumerable<string> IEmailAction.Cc { get; set; }
+		IEmailAttachments IEmailAction.Attachments { get; set; }
 		IEnumerable<string> IEmailAction.Bcc { get; set; }
-		IEnumerable<string> IEmailAction.ReplyTo { get; set; }
-		string IEmailAction.Subject { get; set; }
 		IEmailBody IEmailAction.Body { get; set; }
+		IEnumerable<string> IEmailAction.Cc { get; set; }
+		string IEmailAction.From { get; set; }
 		EmailPriority? IEmailAction.Priority { get; set; }
-		IEmailAttachments IEmailAction.Attachments { get; set; }
+		IEnumerable<string> IEmailAction.ReplyTo { get; set; }
+		string IEmailAction.Subject { get; set; }
+		IEnumerable<string> IEmailAction.To { get; set; }
 
 		public EmailActionDescriptor Account(string account) => Assign(a => a.Account = account);
 
diff --git a/src/Nest/XPack/Watcher/Action/Email/EmailAttachments.cs b/src/Nest/XPack/Watcher/Action/Email/EmailAttachments.cs
index 317aede5408..0175a8f1445 100644
--- a/src/Nest/XPack/Watcher/Action/Email/EmailAttachments.cs
+++ b/src/Nest/XPack/Watcher/Action/Email/EmailAttachments.cs
@@ -1,24 +1,24 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonConverter(typeof(EmailAttachmentsJsonConverter))]
-	public interface IEmailAttachments : IIsADictionary<string, IEmailAttachment> {}
+	public interface IEmailAttachments : IIsADictionary<string, IEmailAttachment> { }
 
 	public class EmailAttachments : IsADictionaryBase<string, IEmailAttachment>, IEmailAttachments
 	{
-		public EmailAttachments() {}
+		public EmailAttachments() { }
 
-		public EmailAttachments(IDictionary<string, IEmailAttachment> attachments) : base(attachments) {}
+		public EmailAttachments(IDictionary<string, IEmailAttachment> attachments) : base(attachments) { }
 
-		public void Add(string name, IEmailAttachment attachment) => this.BackingDictionary.Add(name, attachment);
+		public void Add(string name, IEmailAttachment attachment) => BackingDictionary.Add(name, attachment);
 	}
 
 	public class EmailAttachmentsDescriptor : DescriptorPromiseBase<EmailAttachmentsDescriptor, IEmailAttachments>
 	{
-		public EmailAttachmentsDescriptor() : base(new EmailAttachments()) {}
+		public EmailAttachmentsDescriptor() : base(new EmailAttachments()) { }
 
 		public EmailAttachmentsDescriptor HttpAttachment(string name, Func<HttpAttachmentDescriptor, IHttpAttachment> selector) =>
 			Assign(a => a.Add(name, selector?.Invoke(new HttpAttachmentDescriptor())));
@@ -27,7 +27,7 @@ public EmailAttachmentsDescriptor DataAttachment(string name, Func<DataAttachmen
 			Assign(a => a.Add(name, selector?.Invoke(new DataAttachmentDescriptor())));
 	}
 
-	public interface IEmailAttachment {}
+	public interface IEmailAttachment { }
 
 	internal class EmailAttachmentsJsonConverter : JsonConverter
 	{
@@ -60,6 +60,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject) return null;
+
 			var attachments = new Dictionary<string, IEmailAttachment>();
 			while (reader.Read())
 			{
diff --git a/src/Nest/XPack/Watcher/Action/Email/EmailBody.cs b/src/Nest/XPack/Watcher/Action/Email/EmailBody.cs
index ed5bd54da3b..142aa5e7961 100644
--- a/src/Nest/XPack/Watcher/Action/Email/EmailBody.cs
+++ b/src/Nest/XPack/Watcher/Action/Email/EmailBody.cs
@@ -6,24 +6,23 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<EmailBody>))]
 	public interface IEmailBody
 	{
-		[JsonProperty("text")]
-		string Text { get; set; }
-
 		[JsonProperty("html")]
 		string Html { get; set; }
+
+		[JsonProperty("text")]
+		string Text { get; set; }
 	}
 
 	public class EmailBody : IEmailBody
 	{
-		public string Text { get; set; }
-
 		public string Html { get; set; }
+		public string Text { get; set; }
 	}
 
 	public class EmailBodyDescriptor : DescriptorBase<EmailBodyDescriptor, IEmailBody>, IEmailBody
 	{
-		string IEmailBody.Text { get; set; }
 		string IEmailBody.Html { get; set; }
+		string IEmailBody.Text { get; set; }
 
 		public EmailBodyDescriptor Text(string text) => Assign(a => a.Text = text);
 
diff --git a/src/Nest/XPack/Watcher/Action/Email/EmailPriority.cs b/src/Nest/XPack/Watcher/Action/Email/EmailPriority.cs
index 257b91e5612..33af19e35b1 100644
--- a/src/Nest/XPack/Watcher/Action/Email/EmailPriority.cs
+++ b/src/Nest/XPack/Watcher/Action/Email/EmailPriority.cs
@@ -9,13 +9,17 @@ public enum EmailPriority
 	{
 		[EnumMember(Value = "lowest")]
 		Lowest,
+
 		[EnumMember(Value = "low")]
 		Low,
+
 		[EnumMember(Value = "normal")]
 		Normal,
+
 		[EnumMember(Value = "high")]
 		High,
+
 		[EnumMember(Value = "highest")]
 		Highest
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Action/HipChat/HipChatAction.cs b/src/Nest/XPack/Watcher/Action/HipChat/HipChatAction.cs
index 2a79c906851..12076bdfded 100644
--- a/src/Nest/XPack/Watcher/Action/HipChat/HipChatAction.cs
+++ b/src/Nest/XPack/Watcher/Action/HipChat/HipChatAction.cs
@@ -15,23 +15,21 @@ public interface IHipChatAction : IAction
 
 	public class HipChatAction : ActionBase, IHipChatAction
 	{
-		public override ActionType ActionType => ActionType.HipChat;
-
-		public HipChatAction(string name) : base(name) {}
+		public HipChatAction(string name) : base(name) { }
 
 		public string Account { get; set; }
+		public override ActionType ActionType => ActionType.HipChat;
 
 		public IHipChatMessage Message { get; set; }
 	}
 
 	public class HipChatActionDescriptor : ActionsDescriptorBase<HipChatActionDescriptor, IHipChatAction>, IHipChatAction
 	{
-		string IHipChatAction.Account { get; set; }
-		IHipChatMessage IHipChatAction.Message { get; set; }
+		public HipChatActionDescriptor(string name) : base(name) { }
 
 		protected override ActionType ActionType => ActionType.HipChat;
-
-		public HipChatActionDescriptor(string name) : base(name) {}
+		string IHipChatAction.Account { get; set; }
+		IHipChatMessage IHipChatAction.Message { get; set; }
 
 		public HipChatActionDescriptor Account(string account) => Assign(a => a.Account = account);
 
diff --git a/src/Nest/XPack/Watcher/Action/HipChat/HipChatMessage.cs b/src/Nest/XPack/Watcher/Action/HipChat/HipChatMessage.cs
index c288f8b1060..c888ad83806 100644
--- a/src/Nest/XPack/Watcher/Action/HipChat/HipChatMessage.cs
+++ b/src/Nest/XPack/Watcher/Action/HipChat/HipChatMessage.cs
@@ -12,18 +12,18 @@ public interface IHipChatMessage
 		[JsonProperty("body")]
 		string Body { get; set; }
 
-		[JsonProperty("format")]
-		HipChatMessageFormat? Format { get; set; }
-
 		[JsonProperty("color")]
 		HipChatMessageColor? Color { get; set; }
 
-		[JsonProperty("notify")]
-		bool? Notify { get; set; }
+		[JsonProperty("format")]
+		HipChatMessageFormat? Format { get; set; }
 
 		[JsonProperty("from")]
 		string From { get; set; }
 
+		[JsonProperty("notify")]
+		bool? Notify { get; set; }
+
 		[JsonProperty("room")]
 		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<string>))]
 		IEnumerable<string> Room { get; set; }
@@ -37,14 +37,14 @@ public class HipChatMessage : IHipChatMessage
 	{
 		public string Body { get; set; }
 
-		public HipChatMessageFormat? Format { get; set; }
-
 		public HipChatMessageColor? Color { get; set; }
 
-		public bool? Notify { get; set; }
+		public HipChatMessageFormat? Format { get; set; }
 
 		public string From { get; set; }
 
+		public bool? Notify { get; set; }
+
 		public IEnumerable<string> Room { get; set; }
 
 		public IEnumerable<string> User { get; set; }
@@ -53,10 +53,10 @@ public class HipChatMessage : IHipChatMessage
 	public class HipChatMessageDescriptor : DescriptorBase<HipChatMessageDescriptor, IHipChatMessage>, IHipChatMessage
 	{
 		string IHipChatMessage.Body { get; set; }
-		HipChatMessageFormat? IHipChatMessage.Format { get; set; }
 		HipChatMessageColor? IHipChatMessage.Color { get; set; }
-		bool? IHipChatMessage.Notify { get; set; }
+		HipChatMessageFormat? IHipChatMessage.Format { get; set; }
 		string IHipChatMessage.From { get; set; }
+		bool? IHipChatMessage.Notify { get; set; }
 		IEnumerable<string> IHipChatMessage.Room { get; set; }
 		IEnumerable<string> IHipChatMessage.User { get; set; }
 
diff --git a/src/Nest/XPack/Watcher/Action/Index/IndexAction.cs b/src/Nest/XPack/Watcher/Action/Index/IndexAction.cs
index 70e0ea71a41..57d74279c7d 100644
--- a/src/Nest/XPack/Watcher/Action/Index/IndexAction.cs
+++ b/src/Nest/XPack/Watcher/Action/Index/IndexAction.cs
@@ -7,45 +7,44 @@ namespace Nest
 	[JsonObject]
 	public interface IIndexAction : IAction
 	{
-		[JsonProperty("index")]
-		IndexName Index { get; set; }
-
 		[JsonProperty("doc_type")]
 		TypeName DocType { get; set; }
 
 		[JsonProperty("execution_time_field")]
 		Field ExecutionTimeField { get; set; }
 
+		[JsonProperty("index")]
+		IndexName Index { get; set; }
+
 		[JsonProperty("timeout")]
 		Time Timeout { get; set; }
 	}
 
 	public class IndexAction : ActionBase, IIndexAction
 	{
-		public override ActionType ActionType => ActionType.Index;
+		public IndexAction(string name) : base(name) { }
 
-		public IndexName Index { get; set; }
+		public override ActionType ActionType => ActionType.Index;
 
 		public TypeName DocType { get; set; }
 
 		public Field ExecutionTimeField { get; set; }
 
-		public Time Timeout { get; set; }
+		public IndexName Index { get; set; }
 
-		public IndexAction(string name) : base(name) {}
+		public Time Timeout { get; set; }
 	}
 
 	public class IndexActionDescriptor : ActionsDescriptorBase<IndexActionDescriptor, IIndexAction>, IIndexAction
 	{
-		IndexName IIndexAction.Index { get; set; }
+		public IndexActionDescriptor(string name) : base(name) { }
+
+		protected override ActionType ActionType => ActionType.Index;
 		TypeName IIndexAction.DocType { get; set; }
 		Field IIndexAction.ExecutionTimeField { get; set; }
+		IndexName IIndexAction.Index { get; set; }
 		Time IIndexAction.Timeout { get; set; }
 
-		protected override ActionType ActionType => ActionType.Index;
-
-		public IndexActionDescriptor(string name) : base(name) {}
-
 		public IndexActionDescriptor Index(IndexName index) => Assign(a => a.Index = index);
 
 		public IndexActionDescriptor Index<T>() => Assign(a => a.Index = typeof(T));
diff --git a/src/Nest/XPack/Watcher/Action/Logging/LoggingAction.cs b/src/Nest/XPack/Watcher/Action/Logging/LoggingAction.cs
index e744d1432c6..1785765aac7 100644
--- a/src/Nest/XPack/Watcher/Action/Logging/LoggingAction.cs
+++ b/src/Nest/XPack/Watcher/Action/Logging/LoggingAction.cs
@@ -5,35 +5,35 @@ namespace Nest
 	[JsonObject]
 	public interface ILoggingAction : IAction
 	{
-		[JsonProperty("text")]
-		string Text { get; set; }
-
 		[JsonProperty("category")]
 		string Category { get; set; }
 
 		[JsonProperty("level")]
 		LogLevel? Level { get; set; }
+
+		[JsonProperty("text")]
+		string Text { get; set; }
 	}
 
 	public class LoggingAction : ActionBase, ILoggingAction
 	{
+		public LoggingAction(string name) : base(name) { }
+
 		public override ActionType ActionType => ActionType.Logging;
-		public string Text { get; set; }
 		public string Category { get; set; }
 		public LogLevel? Level { get; set; }
-
-		public LoggingAction(string name) : base(name) {}
+		public string Text { get; set; }
 	}
 
 	public class LoggingActionDescriptor : ActionsDescriptorBase<LoggingActionDescriptor, ILoggingAction>, ILoggingAction
 	{
+		public LoggingActionDescriptor(string name) : base(name) { }
+
 		protected override ActionType ActionType => ActionType.Logging;
+		string ILoggingAction.Category { get; set; }
 
 		LogLevel? ILoggingAction.Level { get; set; }
 		string ILoggingAction.Text { get; set; }
-		string ILoggingAction.Category { get; set; }
-
-		public LoggingActionDescriptor(string name) : base(name) {}
 
 		public LoggingActionDescriptor Level(LogLevel? level) => Assign(a => a.Level = level);
 
diff --git a/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyAction.cs b/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyAction.cs
index 21edaefb16c..400a13b8ffb 100644
--- a/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyAction.cs
+++ b/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyAction.cs
@@ -12,43 +12,40 @@ public interface IPagerDutyAction : IAction, IPagerDutyEvent { }
 
 	public class PagerDutyAction : ActionBase, IPagerDutyAction
 	{
-		public override ActionType ActionType => ActionType.PagerDuty;
+		public PagerDutyAction(string name) : base(name) { }
 
 		public string Account { get; set; }
+		public override ActionType ActionType => ActionType.PagerDuty;
 
-		public string Description { get; set; }
-
-		public PagerDutyEventType? EventType { get; set; }
-
-		public string IncidentKey { get; set; }
+		public bool? AttachPayload { get; set; }
 
 		public string Client { get; set; }
 
 		public string ClientUrl { get; set; }
 
-		public bool? AttachPayload { get; set; }
-
 		public IEnumerable<IPagerDutyContext> Context { get; set; }
 
-		public PagerDutyAction(string name) : base(name) {}
+		public string Description { get; set; }
+
+		public PagerDutyEventType? EventType { get; set; }
+
+		public string IncidentKey { get; set; }
 	}
 
 	public class PagerDutyActionDescriptor : ActionsDescriptorBase<PagerDutyActionDescriptor, IPagerDutyAction>, IPagerDutyAction
 	{
+		public PagerDutyActionDescriptor(string name) : base(name) { }
+
 		protected override ActionType ActionType => ActionType.PagerDuty;
 
 		string IPagerDutyEvent.Account { get; set; }
-		string IPagerDutyEvent.Description { get; set; }
-		PagerDutyEventType? IPagerDutyEvent.EventType { get; set; }
-		string IPagerDutyEvent.IncidentKey { get; set; }
+		bool? IPagerDutyEvent.AttachPayload { get; set; }
 		string IPagerDutyEvent.Client { get; set; }
 		string IPagerDutyEvent.ClientUrl { get; set; }
-		bool? IPagerDutyEvent.AttachPayload { get; set; }
 		IEnumerable<IPagerDutyContext> IPagerDutyEvent.Context { get; set; }
-
-		public PagerDutyActionDescriptor(string name) : base(name)
-		{
-		}
+		string IPagerDutyEvent.Description { get; set; }
+		PagerDutyEventType? IPagerDutyEvent.EventType { get; set; }
+		string IPagerDutyEvent.IncidentKey { get; set; }
 
 		public PagerDutyActionDescriptor Account(string account) => Assign(a => a.Account = account);
 
@@ -69,12 +66,12 @@ public PagerDutyActionDescriptor Context(Func<PagerDutyContextsDescriptor, IProm
 	}
 
 	public class PagerDutyContextsDescriptor
-	: DescriptorPromiseBase<PagerDutyContextsDescriptor, IList<IPagerDutyContext>>
+		: DescriptorPromiseBase<PagerDutyContextsDescriptor, IList<IPagerDutyContext>>
 	{
 		public PagerDutyContextsDescriptor() : base(new List<IPagerDutyContext>()) { }
 
 		public PagerDutyContextsDescriptor Context(PagerDutyContextType type, Func<PagerDutyContextDescriptor, IPagerDutyContext> selector) =>
-			this.Assign(a => a.AddIfNotNull(selector?.Invoke(new PagerDutyContextDescriptor(type))));
+			Assign(a => a.AddIfNotNull(selector?.Invoke(new PagerDutyContextDescriptor(type))));
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
diff --git a/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyContext.cs b/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyContext.cs
index 3316ab27820..3fa9cb32d0f 100644
--- a/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyContext.cs
+++ b/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyContext.cs
@@ -8,42 +8,36 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<PagerDutyContext>))]
 	public interface IPagerDutyContext
 	{
-		[JsonProperty("type")]
-		PagerDutyContextType Type { get; set; }
-
 		[JsonProperty("href")]
 		string Href { get; set; }
 
 		[JsonProperty("src")]
 		string Src { get; set; }
+
+		[JsonProperty("type")]
+		PagerDutyContextType Type { get; set; }
 	}
 
 	public class PagerDutyContext : IPagerDutyContext
 	{
-		public PagerDutyContext(PagerDutyContextType type)
-		{
-			this.Type = type;
-		}
+		public PagerDutyContext(PagerDutyContextType type) => Type = type;
 
 		internal PagerDutyContext() { }
 
-		public PagerDutyContextType Type { get; set; }
-
 		public string Href { get; set; }
 
 		public string Src { get; set; }
+
+		public PagerDutyContextType Type { get; set; }
 	}
 
 	public class PagerDutyContextDescriptor : DescriptorBase<PagerDutyContextDescriptor, IPagerDutyContext>, IPagerDutyContext
 	{
-		PagerDutyContextType IPagerDutyContext.Type { get; set; }
+		public PagerDutyContextDescriptor(PagerDutyContextType type) => Self.Type = type;
+
 		string IPagerDutyContext.Href { get; set; }
 		string IPagerDutyContext.Src { get; set; }
-
-		public PagerDutyContextDescriptor(PagerDutyContextType type)
-		{
-			Self.Type = type;
-		}
+		PagerDutyContextType IPagerDutyContext.Type { get; set; }
 
 		public PagerDutyContextDescriptor Href(string href) => Assign(a => a.Href = href);
 
diff --git a/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyEvent.cs b/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyEvent.cs
index 34fa42f9182..384e3082ce5 100644
--- a/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyEvent.cs
+++ b/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyEvent.cs
@@ -10,14 +10,8 @@ public interface IPagerDutyEvent
 		[JsonProperty("account")]
 		string Account { get; set; }
 
-		[JsonProperty("description")]
-		string Description { get; set; }
-
-		[JsonProperty("event_type")]
-		PagerDutyEventType? EventType { get; set; }
-
-		[JsonProperty("incident_key")]
-		string IncidentKey { get; set; }
+		[JsonProperty("attach_payload")]
+		bool? AttachPayload { get; set; }
 
 		[JsonProperty("client")]
 		string Client { get; set; }
@@ -25,29 +19,35 @@ public interface IPagerDutyEvent
 		[JsonProperty("client_url")]
 		string ClientUrl { get; set; }
 
-		[JsonProperty("attach_payload")]
-		bool? AttachPayload { get; set; }
-
 		[JsonProperty("context")]
 		IEnumerable<IPagerDutyContext> Context { get; set; }
+
+		[JsonProperty("description")]
+		string Description { get; set; }
+
+		[JsonProperty("event_type")]
+		PagerDutyEventType? EventType { get; set; }
+
+		[JsonProperty("incident_key")]
+		string IncidentKey { get; set; }
 	}
 
 	public class PagerDutyEvent : IPagerDutyEvent
 	{
 		public string Account { get; set; }
 
-		public string Description { get; set; }
-
-		public PagerDutyEventType? EventType { get; set; }
-
-		public string IncidentKey { get; set; }
+		public bool? AttachPayload { get; set; }
 
 		public string Client { get; set; }
 
 		public string ClientUrl { get; set; }
 
-		public bool? AttachPayload { get; set; }
-
 		public IEnumerable<IPagerDutyContext> Context { get; set; }
+
+		public string Description { get; set; }
+
+		public PagerDutyEventType? EventType { get; set; }
+
+		public string IncidentKey { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Action/Slack/SlackAction.cs b/src/Nest/XPack/Watcher/Action/Slack/SlackAction.cs
index 4c6369c0d9a..08dda2258c9 100644
--- a/src/Nest/XPack/Watcher/Action/Slack/SlackAction.cs
+++ b/src/Nest/XPack/Watcher/Action/Slack/SlackAction.cs
@@ -15,29 +15,26 @@ public interface ISlackAction : IAction
 
 	public class SlackAction : ActionBase, ISlackAction
 	{
-		public SlackAction(string name) : base(name) {}
-
-		public override ActionType ActionType => ActionType.Slack;
+		public SlackAction(string name) : base(name) { }
 
 		public string Account { get; set; }
 
+		public override ActionType ActionType => ActionType.Slack;
+
 		public ISlackMessage Message { get; set; }
 	}
 
 	public class SlackActionDescriptor : ActionsDescriptorBase<SlackActionDescriptor, ISlackAction>, ISlackAction
 	{
-		string ISlackAction.Account { get; set; }
-		ISlackMessage ISlackAction.Message { get; set; }
+		public SlackActionDescriptor(string name) : base(name) { }
 
 		protected override ActionType ActionType => ActionType.Slack;
-
-		public SlackActionDescriptor(string name) : base(name) {}
+		string ISlackAction.Account { get; set; }
+		ISlackMessage ISlackAction.Message { get; set; }
 
 		public SlackActionDescriptor Account(string account) => Assign(a => a.Account = account);
 
 		public SlackActionDescriptor Message(Func<SlackMessageDescriptor, ISlackMessage> selector) =>
 			Assign(a => a.Message = selector.InvokeOrDefault(new SlackMessageDescriptor()));
 	}
-
-
 }
diff --git a/src/Nest/XPack/Watcher/Action/Slack/SlackAttachment.cs b/src/Nest/XPack/Watcher/Action/Slack/SlackAttachment.cs
index a00eb2f2573..210f9c9747b 100644
--- a/src/Nest/XPack/Watcher/Action/Slack/SlackAttachment.cs
+++ b/src/Nest/XPack/Watcher/Action/Slack/SlackAttachment.cs
@@ -8,47 +8,47 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SlackAttachment>))]
 	public interface ISlackAttachment
 	{
-		[JsonProperty("fallback")]
-		string Fallback { get; set; }
-
-		[JsonProperty("color")]
-		string Color { get; set; }
-
-		[JsonProperty("pretext")]
-		string Pretext { get; set; }
-
-		[JsonProperty("author_name")]
-		string AuthorName { get; set; }
+		[JsonProperty("author_icon")]
+		string AuthorIcon { get; set; }
 
 		[JsonProperty("author_link")]
 		string AuthorLink { get; set; }
 
-		[JsonProperty("author_icon")]
-		string AuthorIcon { get; set; }
-
-		[JsonProperty("title")]
-		string Title { get; set; }
+		[JsonProperty("author_name")]
+		string AuthorName { get; set; }
 
-		[JsonProperty("title_link")]
-		string TitleLink { get; set; }
+		[JsonProperty("color")]
+		string Color { get; set; }
 
-		[JsonProperty("text")]
-		string Text { get; set; }
+		[JsonProperty("fallback")]
+		string Fallback { get; set; }
 
 		[JsonProperty("fields")]
 		IEnumerable<ISlackAttachmentField> Fields { get; set; }
 
+		[JsonProperty("footer")]
+		string Footer { get; set; }
+
+		[JsonProperty("footer_icon")]
+		string FooterIcon { get; set; }
+
 		[JsonProperty("image_url")]
 		string ImageUrl { get; set; }
 
+		[JsonProperty("pretext")]
+		string Pretext { get; set; }
+
+		[JsonProperty("text")]
+		string Text { get; set; }
+
 		[JsonProperty("thumb_url")]
 		string ThumbUrl { get; set; }
 
-		[JsonProperty("footer")]
-		string Footer { get; set; }
+		[JsonProperty("title")]
+		string Title { get; set; }
 
-		[JsonProperty("footer_icon")]
-		string FooterIcon { get; set; }
+		[JsonProperty("title_link")]
+		string TitleLink { get; set; }
 
 		[JsonProperty("ts")]
 		[JsonConverter(typeof(EpochSecondsDateTimeJsonConverter))]
@@ -57,42 +57,39 @@ public interface ISlackAttachment
 
 	public class SlackAttachment : ISlackAttachment
 	{
-		public string Fallback { get; set; }
-
-		public string Color { get; set; }
+		public string AuthorIcon { get; set; }
 
-		public string Pretext { get; set; }
+		public string AuthorLink { get; set; }
 
 		public string AuthorName { get; set; }
 
-		public string AuthorLink { get; set; }
+		public string Color { get; set; }
+		public string Fallback { get; set; }
 
-		public string AuthorIcon { get; set; }
+		public IEnumerable<ISlackAttachmentField> Fields { get; set; }
 
-		public string Title { get; set; }
+		public string Footer { get; set; }
 
-		public string TitleLink { get; set; }
+		public string FooterIcon { get; set; }
 
-		public string Text { get; set; }
+		public string ImageUrl { get; set; }
 
-		public IEnumerable<ISlackAttachmentField> Fields { get; set; }
+		public string Pretext { get; set; }
 
-		public string ImageUrl { get; set; }
+		public string Text { get; set; }
 
 		public string ThumbUrl { get; set; }
 
-		public string Footer { get; set; }
+		public string Title { get; set; }
 
-		public string FooterIcon { get; set; }
+		public string TitleLink { get; set; }
 
 		public DateTimeOffset? Ts { get; set; }
 	}
 
 	public class SlackAttachmentsDescriptor : DescriptorPromiseBase<SlackAttachmentsDescriptor, IList<ISlackAttachment>>
 	{
-		public SlackAttachmentsDescriptor() : base(new List<ISlackAttachment>())
-		{
-		}
+		public SlackAttachmentsDescriptor() : base(new List<ISlackAttachment>()) { }
 
 		public SlackAttachmentsDescriptor Attachment(Func<SlackAttachmentDescriptor, ISlackAttachment> selector) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new SlackAttachmentDescriptor())));
@@ -100,20 +97,20 @@ public SlackAttachmentsDescriptor Attachment(Func<SlackAttachmentDescriptor, ISl
 
 	public class SlackAttachmentDescriptor : DescriptorBase<SlackAttachmentDescriptor, ISlackAttachment>, ISlackAttachment
 	{
-		string ISlackAttachment.Fallback { get; set; }
-		string ISlackAttachment.Color { get; set; }
-		string ISlackAttachment.Pretext { get; set; }
-		string ISlackAttachment.AuthorName { get; set; }
-		string ISlackAttachment.AuthorLink { get; set; }
 		string ISlackAttachment.AuthorIcon { get; set; }
-		string ISlackAttachment.Title { get; set; }
-		string ISlackAttachment.TitleLink { get; set; }
-		string ISlackAttachment.Text { get; set; }
+		string ISlackAttachment.AuthorLink { get; set; }
+		string ISlackAttachment.AuthorName { get; set; }
+		string ISlackAttachment.Color { get; set; }
+		string ISlackAttachment.Fallback { get; set; }
 		IEnumerable<ISlackAttachmentField> ISlackAttachment.Fields { get; set; }
-		string ISlackAttachment.ImageUrl { get; set; }
-		string ISlackAttachment.ThumbUrl { get; set; }
 		string ISlackAttachment.Footer { get; set; }
 		string ISlackAttachment.FooterIcon { get; set; }
+		string ISlackAttachment.ImageUrl { get; set; }
+		string ISlackAttachment.Pretext { get; set; }
+		string ISlackAttachment.Text { get; set; }
+		string ISlackAttachment.ThumbUrl { get; set; }
+		string ISlackAttachment.Title { get; set; }
+		string ISlackAttachment.TitleLink { get; set; }
 		DateTimeOffset? ISlackAttachment.Ts { get; set; }
 
 		public SlackAttachmentDescriptor Fallback(string fallback) => Assign(a => a.Fallback = fallback);
diff --git a/src/Nest/XPack/Watcher/Action/Slack/SlackAttachmentField.cs b/src/Nest/XPack/Watcher/Action/Slack/SlackAttachmentField.cs
index 6ccc4a131ea..6541202bf79 100644
--- a/src/Nest/XPack/Watcher/Action/Slack/SlackAttachmentField.cs
+++ b/src/Nest/XPack/Watcher/Action/Slack/SlackAttachmentField.cs
@@ -8,28 +8,27 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SlackAttachmentField>))]
 	public interface ISlackAttachmentField
 	{
+		[JsonProperty("short")]
+		bool? Short { get; set; }
+
 		[JsonProperty("title")]
 		string Title { get; set; }
 
 		[JsonProperty("value")]
 		string Value { get; set; }
-
-		[JsonProperty("short")]
-		bool? Short { get; set; }
 	}
 
 	public class SlackAttachmentField : ISlackAttachmentField
 	{
+		public bool? Short { get; set; }
 		public string Title { get; set; }
 
 		public string Value { get; set; }
-
-		public bool? Short { get; set; }
 	}
 
 	public class SlackAttachmentFieldsDescriptor : DescriptorPromiseBase<SlackAttachmentFieldsDescriptor, IList<ISlackAttachmentField>>
 	{
-		public SlackAttachmentFieldsDescriptor() : base(new List<ISlackAttachmentField>()) {}
+		public SlackAttachmentFieldsDescriptor() : base(new List<ISlackAttachmentField>()) { }
 
 		public SlackAttachmentFieldsDescriptor Field(Func<SlackAttachmentFieldDescriptor, ISlackAttachmentField> selector) =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new SlackAttachmentFieldDescriptor())));
@@ -37,12 +36,11 @@ public SlackAttachmentFieldsDescriptor Field(Func<SlackAttachmentFieldDescriptor
 
 	public class SlackAttachmentFieldDescriptor : DescriptorBase<SlackAttachmentFieldDescriptor, ISlackAttachmentField>, ISlackAttachmentField
 	{
+		bool? ISlackAttachmentField.Short { get; set; }
 		string ISlackAttachmentField.Title { get; set; }
 
 		string ISlackAttachmentField.Value { get; set; }
 
-		bool? ISlackAttachmentField.Short { get; set; }
-
 		public SlackAttachmentFieldDescriptor Title(string title) => Assign(a => a.Title = title);
 
 		public SlackAttachmentFieldDescriptor Value(string value) => Assign(a => a.Value = value);
diff --git a/src/Nest/XPack/Watcher/Action/Slack/SlackDynamicAttachment.cs b/src/Nest/XPack/Watcher/Action/Slack/SlackDynamicAttachment.cs
index a5090a9c288..ba1fc1dae86 100644
--- a/src/Nest/XPack/Watcher/Action/Slack/SlackDynamicAttachment.cs
+++ b/src/Nest/XPack/Watcher/Action/Slack/SlackDynamicAttachment.cs
@@ -7,24 +7,23 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SlackDynamicAttachment>))]
 	public interface ISlackDynamicAttachment
 	{
-		[JsonProperty("list_path")]
-		string ListPath { get; set; }
-
 		[JsonProperty("attachment_template")]
 		ISlackAttachment AttachmentTemplate { get; set; }
+
+		[JsonProperty("list_path")]
+		string ListPath { get; set; }
 	}
 
 	public class SlackDynamicAttachment : ISlackDynamicAttachment
 	{
-		public string ListPath { get; set; }
-
 		public ISlackAttachment AttachmentTemplate { get; set; }
+		public string ListPath { get; set; }
 	}
 
 	public class SlackDynamicAttachmentDescriptor : DescriptorBase<SlackDynamicAttachmentDescriptor, ISlackDynamicAttachment>, ISlackDynamicAttachment
 	{
-		string ISlackDynamicAttachment.ListPath { get; set; }
 		ISlackAttachment ISlackDynamicAttachment.AttachmentTemplate { get; set; }
+		string ISlackDynamicAttachment.ListPath { get; set; }
 
 		public SlackDynamicAttachmentDescriptor ListPath(string listPath) => Assign(a => a.ListPath = listPath);
 
diff --git a/src/Nest/XPack/Watcher/Action/Slack/SlackMessage.cs b/src/Nest/XPack/Watcher/Action/Slack/SlackMessage.cs
index c628956ed9e..8836be5ef28 100644
--- a/src/Nest/XPack/Watcher/Action/Slack/SlackMessage.cs
+++ b/src/Nest/XPack/Watcher/Action/Slack/SlackMessage.cs
@@ -8,48 +8,47 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SlackMessage>))]
 	public interface ISlackMessage
 	{
+		[JsonProperty("attachments")]
+		IEnumerable<ISlackAttachment> Attachments { get; set; }
+
+		[JsonProperty("dynamic_attachments")]
+		ISlackDynamicAttachment DynamicAttachments { get; set; }
+
 		[JsonProperty("from")]
 		string From { get; set; }
 
-		[JsonProperty("to")]
-		IEnumerable<string> To { get; set; }
-
 		[JsonProperty("icon")]
 		string Icon { get; set; }
 
 		[JsonProperty("text")]
 		string Text { get; set; }
 
-		[JsonProperty("attachments")]
-		IEnumerable<ISlackAttachment> Attachments { get; set; }
-
-		[JsonProperty("dynamic_attachments")]
-		ISlackDynamicAttachment DynamicAttachments { get; set; }
+		[JsonProperty("to")]
+		IEnumerable<string> To { get; set; }
 	}
 
 	public class SlackMessage : ISlackMessage
 	{
-		public string From { get; set; }
+		public IEnumerable<ISlackAttachment> Attachments { get; set; }
 
-		public IEnumerable<string> To { get; set; }
+		public ISlackDynamicAttachment DynamicAttachments { get; set; }
+		public string From { get; set; }
 
 		public string Icon { get; set; }
 
 		public string Text { get; set; }
 
-		public IEnumerable<ISlackAttachment> Attachments { get; set; }
-
-		public ISlackDynamicAttachment DynamicAttachments { get; set; }
+		public IEnumerable<string> To { get; set; }
 	}
 
 	public class SlackMessageDescriptor : DescriptorBase<SlackMessageDescriptor, ISlackMessage>, ISlackMessage
 	{
+		IEnumerable<ISlackAttachment> ISlackMessage.Attachments { get; set; }
+		ISlackDynamicAttachment ISlackMessage.DynamicAttachments { get; set; }
 		string ISlackMessage.From { get; set; }
-		IEnumerable<string> ISlackMessage.To { get; set; }
 		string ISlackMessage.Icon { get; set; }
 		string ISlackMessage.Text { get; set; }
-		IEnumerable<ISlackAttachment> ISlackMessage.Attachments { get; set; }
-		ISlackDynamicAttachment ISlackMessage.DynamicAttachments { get; set; }
+		IEnumerable<string> ISlackMessage.To { get; set; }
 
 		public SlackMessageDescriptor From(string from) => Assign(a => a.From = from);
 
diff --git a/src/Nest/XPack/Watcher/Action/Webhook/WebhookAction.cs b/src/Nest/XPack/Watcher/Action/Webhook/WebhookAction.cs
index 4e06e94c657..fb15ead8d88 100644
--- a/src/Nest/XPack/Watcher/Action/Webhook/WebhookAction.cs
+++ b/src/Nest/XPack/Watcher/Action/Webhook/WebhookAction.cs
@@ -1,67 +1,65 @@
 using System;
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject]
 	[ExactContractJsonConverter(typeof(ReadAsTypeJsonConverter<WebhookAction>))]
-	public interface IWebhookAction : IAction, IHttpInputRequest
-	{
-	}
+	public interface IWebhookAction : IAction, IHttpInputRequest { }
 
 	public class WebhookAction : ActionBase, IWebhookAction
 	{
+		public WebhookAction(string name) : base(name) { }
+
 		public override ActionType ActionType => ActionType.Webhook;
 
-		public ConnectionScheme? Scheme { get; set; }
+		public IHttpInputAuthentication Authentication { get; set; }
 
-		public int? Port { get; set; }
+		public string Body { get; set; }
 
-		public string Host { get; set; }
+		public Time ConnectionTimeout { get; set; }
 
-		public string Path { get; set; }
+		public IDictionary<string, string> Headers { get; set; }
 
-		public HttpInputMethod? Method { get; set; }
+		public string Host { get; set; }
 
-		public IDictionary<string, string> Headers { get; set; }
+		public HttpInputMethod? Method { get; set; }
 
 		public IDictionary<string, string> Params { get; set; }
 
-		public string Url { get; set; }
+		public string Path { get; set; }
 
-		public IHttpInputAuthentication Authentication { get; set; }
+		public int? Port { get; set; }
 
 		public IHttpInputProxy Proxy { get; set; }
 
-		public Time ConnectionTimeout { get; set; }
-
 		public Time ReadTimeout { get; set; }
 
-		public string Body { get; set; }
+		public ConnectionScheme? Scheme { get; set; }
 
-		public WebhookAction(string name) : base(name) {}
+		public string Url { get; set; }
 	}
 
 	public class WebhookActionDescriptor : ActionsDescriptorBase<WebhookActionDescriptor, IWebhookAction>, IWebhookAction
 	{
-		protected override ActionType ActionType => ActionType.Webhook;
+		public WebhookActionDescriptor(string name) : base(name) { }
 
-		ConnectionScheme? IHttpInputRequest.Scheme { get; set; }
-		int? IHttpInputRequest.Port { get; set; }
+		protected override ActionType ActionType => ActionType.Webhook;
+		IHttpInputAuthentication IHttpInputRequest.Authentication { get; set; }
+		string IHttpInputRequest.Body { get; set; }
+		Time IHttpInputRequest.ConnectionTimeout { get; set; }
+		IDictionary<string, string> IHttpInputRequest.Headers { get; set; }
 		string IHttpInputRequest.Host { get; set; }
-		string IHttpInputRequest.Path { get; set; }
 		HttpInputMethod? IHttpInputRequest.Method { get; set; }
-		IDictionary<string, string> IHttpInputRequest.Headers { get; set; }
 		IDictionary<string, string> IHttpInputRequest.Params { get; set; }
-		string IHttpInputRequest.Url { get; set; }
-		IHttpInputAuthentication IHttpInputRequest.Authentication { get; set; }
+		string IHttpInputRequest.Path { get; set; }
+		int? IHttpInputRequest.Port { get; set; }
 		IHttpInputProxy IHttpInputRequest.Proxy { get; set; }
-		Time IHttpInputRequest.ConnectionTimeout { get; set; }
 		Time IHttpInputRequest.ReadTimeout { get; set; }
-		string IHttpInputRequest.Body { get; set; }
 
-		public WebhookActionDescriptor(string name) : base(name) {}
+		ConnectionScheme? IHttpInputRequest.Scheme { get; set; }
+		string IHttpInputRequest.Url { get; set; }
 
 		/// <inheritdoc />
 		public WebhookActionDescriptor Authentication(Func<HttpInputAuthenticationDescriptor, IHttpInputAuthentication> selector) =>
diff --git a/src/Nest/XPack/Watcher/ActivateWatch/ActivateWatchRequest.cs b/src/Nest/XPack/Watcher/ActivateWatch/ActivateWatchRequest.cs
index 5e2669d5ea3..35df629ddff 100644
--- a/src/Nest/XPack/Watcher/ActivateWatch/ActivateWatchRequest.cs
+++ b/src/Nest/XPack/Watcher/ActivateWatch/ActivateWatchRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IActivateWatchRequest {}
+	public partial interface IActivateWatchRequest { }
 
-	public partial class ActivateWatchRequest {}
+	public partial class ActivateWatchRequest { }
 
 	[DescriptorFor("XpackWatcherActivateWatch")]
-	public partial class ActivateWatchDescriptor {}
+	public partial class ActivateWatchDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/ActivateWatch/ActivateWatchResponse.cs b/src/Nest/XPack/Watcher/ActivateWatch/ActivateWatchResponse.cs
index b2281774728..3debbe8c9fd 100644
--- a/src/Nest/XPack/Watcher/ActivateWatch/ActivateWatchResponse.cs
+++ b/src/Nest/XPack/Watcher/ActivateWatch/ActivateWatchResponse.cs
@@ -18,10 +18,10 @@ public class ActivateWatchResponse : ResponseBase, IActivateWatchResponse
 	[JsonObject]
 	public class ActivationStatus
 	{
-		[JsonProperty("state")]
-		public ActivationState State { get; internal set; }
-
 		[JsonProperty("actions")]
 		public IReadOnlyDictionary<string, ActionStatus> Actions { get; set; }
+
+		[JsonProperty("state")]
+		public ActivationState State { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/ActivateWatch/ElasticClient-ActivateWatch.cs b/src/Nest/XPack/Watcher/ActivateWatch/ElasticClient-ActivateWatch.cs
index ac69de14ac6..cbd2219889f 100644
--- a/src/Nest/XPack/Watcher/ActivateWatch/ElasticClient-ActivateWatch.cs
+++ b/src/Nest/XPack/Watcher/ActivateWatch/ElasticClient-ActivateWatch.cs
@@ -12,39 +12,47 @@ public partial interface IElasticClient
 		/// </summary>
 		IActivateWatchResponse ActivateWatch(Id id, Func<ActivateWatchDescriptor, IActivateWatchRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IActivateWatchResponse ActivateWatch(IActivateWatchRequest request);
 
-		/// <inheritdoc/>
-		Task<IActivateWatchResponse> ActivateWatchAsync(Id id, Func<ActivateWatchDescriptor, IActivateWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IActivateWatchResponse> ActivateWatchAsync(Id id, Func<ActivateWatchDescriptor, IActivateWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IActivateWatchResponse> ActivateWatchAsync(IActivateWatchRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IActivateWatchResponse> ActivateWatchAsync(IActivateWatchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IActivateWatchResponse ActivateWatch(Id id, Func<ActivateWatchDescriptor, IActivateWatchRequest> selector = null) =>
-			this.ActivateWatch(selector.InvokeOrDefault(new ActivateWatchDescriptor(id)));
+			ActivateWatch(selector.InvokeOrDefault(new ActivateWatchDescriptor(id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IActivateWatchResponse ActivateWatch(IActivateWatchRequest request) =>
-			this.Dispatcher.Dispatch<IActivateWatchRequest, ActivateWatchRequestParameters, ActivateWatchResponse>(
+			Dispatcher.Dispatch<IActivateWatchRequest, ActivateWatchRequestParameters, ActivateWatchResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackWatcherActivateWatchDispatch<ActivateWatchResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherActivateWatchDispatch<ActivateWatchResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IActivateWatchResponse> ActivateWatchAsync(Id id, Func<ActivateWatchDescriptor, IActivateWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ActivateWatchAsync(selector.InvokeOrDefault(new ActivateWatchDescriptor(id)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IActivateWatchResponse> ActivateWatchAsync(IActivateWatchRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IActivateWatchRequest, ActivateWatchRequestParameters, ActivateWatchResponse, IActivateWatchResponse>(
+		/// <inheritdoc />
+		public Task<IActivateWatchResponse> ActivateWatchAsync(Id id, Func<ActivateWatchDescriptor, IActivateWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ActivateWatchAsync(selector.InvokeOrDefault(new ActivateWatchDescriptor(id)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IActivateWatchResponse> ActivateWatchAsync(IActivateWatchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IActivateWatchRequest, ActivateWatchRequestParameters, ActivateWatchResponse, IActivateWatchResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackWatcherActivateWatchDispatchAsync<ActivateWatchResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackWatcherActivateWatchDispatchAsync<ActivateWatchResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Condition/AlwaysCondition.cs b/src/Nest/XPack/Watcher/Condition/AlwaysCondition.cs
index 7203f0fd56f..007fdee4307 100644
--- a/src/Nest/XPack/Watcher/Condition/AlwaysCondition.cs
+++ b/src/Nest/XPack/Watcher/Condition/AlwaysCondition.cs
@@ -4,7 +4,7 @@ namespace Nest
 {
 	[JsonObject]
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<AlwaysCondition>))]
-	public interface IAlwaysCondition : ICondition {}
+	public interface IAlwaysCondition : ICondition { }
 
 	public class AlwaysCondition : ConditionBase, IAlwaysCondition
 	{
diff --git a/src/Nest/XPack/Watcher/Condition/ArrayCompareConditionBase.cs b/src/Nest/XPack/Watcher/Condition/ArrayCompareConditionBase.cs
index 2126599e78f..3e9dfdc746b 100644
--- a/src/Nest/XPack/Watcher/Condition/ArrayCompareConditionBase.cs
+++ b/src/Nest/XPack/Watcher/Condition/ArrayCompareConditionBase.cs
@@ -10,10 +10,10 @@ namespace Nest
 	public interface IArrayCompareCondition
 	{
 		string ArrayPath { get; set; }
-		string Path { get; set; }
 		string Comparison { get; }
-		object Value { get; set; }
+		string Path { get; set; }
 		Quantifier? Quantifier { get; set; }
+		object Value { get; set; }
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
@@ -21,19 +21,13 @@ public enum Quantifier
 	{
 		[EnumMember(Value = "some")]
 		Some,
+
 		[EnumMember(Value = "all")]
 		All
 	}
 
 	public abstract class ArrayCompareConditionBase : ConditionBase, IArrayCompareCondition
 	{
-		private IArrayCompareCondition Self => this;
-
-		string IArrayCompareCondition.Path { get; set; }
-		object IArrayCompareCondition.Value { get; set; }
-		string IArrayCompareCondition.ArrayPath { get; set; }
-		string IArrayCompareCondition.Comparison => this.Comparison;
-
 		protected ArrayCompareConditionBase(string arrayPath, string path, object value)
 		{
 			Self.ArrayPath = arrayPath;
@@ -44,6 +38,12 @@ protected ArrayCompareConditionBase(string arrayPath, string path, object value)
 		public Quantifier? Quantifier { get; set; }
 
 		protected abstract string Comparison { get; }
+		string IArrayCompareCondition.ArrayPath { get; set; }
+		string IArrayCompareCondition.Comparison => Comparison;
+
+		string IArrayCompareCondition.Path { get; set; }
+		private IArrayCompareCondition Self => this;
+		object IArrayCompareCondition.Value { get; set; }
 
 		internal override void WrapInContainer(IConditionContainer container) => container.ArrayCompare = this;
 	}
@@ -51,7 +51,7 @@ protected ArrayCompareConditionBase(string arrayPath, string path, object value)
 	public class ArrayCompareConditionDescriptor : IDescriptor
 	{
 		public IArrayCompareCondition EqualTo(string arrayPath, string path, object value, Quantifier? quantifier = null) =>
-			new EqualArrayCondition(arrayPath, path, value) { Quantifier = quantifier};
+			new EqualArrayCondition(arrayPath, path, value) { Quantifier = quantifier };
 
 		public IArrayCompareCondition NotEqualTo(string arrayPath, string path, object value, Quantifier? quantifier = null) =>
 			new NotEqualArrayCondition(arrayPath, path, value) { Quantifier = quantifier };
@@ -71,50 +71,50 @@ public IArrayCompareCondition LowerThanOrEqualTo(string arrayPath, string path,
 
 	public class EqualArrayCondition : ArrayCompareConditionBase
 	{
-		protected override string Comparison => "eq";
-
 		public EqualArrayCondition(string arrayPath, string path, object value)
 			: base(arrayPath, path, value) { }
+
+		protected override string Comparison => "eq";
 	}
 
 	public class NotEqualArrayCondition : ArrayCompareConditionBase
 	{
-		protected override string Comparison => "not_eq";
-
 		public NotEqualArrayCondition(string arrayPath, string path, object value)
 			: base(arrayPath, path, value) { }
+
+		protected override string Comparison => "not_eq";
 	}
 
 	public class GreaterThanArrayCondition : ArrayCompareConditionBase
 	{
-		protected override string Comparison => "gt";
-
 		public GreaterThanArrayCondition(string arrayPath, string path, object value)
 			: base(arrayPath, path, value) { }
+
+		protected override string Comparison => "gt";
 	}
 
 	public class GreaterThanOrEqualArrayCondition : ArrayCompareConditionBase
 	{
-		protected override string Comparison => "gte";
-
 		public GreaterThanOrEqualArrayCondition(string arrayPath, string path, object value)
 			: base(arrayPath, path, value) { }
+
+		protected override string Comparison => "gte";
 	}
 
 	public class LowerThanArrayCondition : ArrayCompareConditionBase
 	{
-		protected override string Comparison => "lt";
-
 		public LowerThanArrayCondition(string arrayPath, string path, object value)
 			: base(arrayPath, path, value) { }
+
+		protected override string Comparison => "lt";
 	}
 
 	public class LowerThanOrEqualArrayCondition : ArrayCompareConditionBase
 	{
-		protected override string Comparison => "lte";
-
 		public LowerThanOrEqualArrayCondition(string arrayPath, string path, object value)
 			: base(arrayPath, path, value) { }
+
+		protected override string Comparison => "lte";
 	}
 
 	internal class ArrayCompareConditionConverter : JsonConverter
@@ -158,14 +158,13 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			while (reader.Read())
 			{
 				if (reader.TokenType == JsonToken.EndObject) break;
+
 				if (reader.TokenType != JsonToken.PropertyName) continue;
 
 				var property = (string)reader.Value;
 
 				if (property == "path")
-				{
 					path = reader.ReadAsString();
-				}
 				else
 				{
 					comparison = property;
@@ -173,6 +172,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 					while (reader.Read())
 					{
 						if (reader.TokenType == JsonToken.EndObject) break;
+
 						if (reader.TokenType != JsonToken.PropertyName) continue;
 
 						var innerProperty = (string)reader.Value;
@@ -187,7 +187,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 								break;
 						}
 					}
-				}				
+				}
 			}
 
 			switch (comparison)
diff --git a/src/Nest/XPack/Watcher/Condition/CompareConditionBase.cs b/src/Nest/XPack/Watcher/Condition/CompareConditionBase.cs
index 9e98cc7cedb..8620a91ff39 100644
--- a/src/Nest/XPack/Watcher/Condition/CompareConditionBase.cs
+++ b/src/Nest/XPack/Watcher/Condition/CompareConditionBase.cs
@@ -9,19 +9,13 @@ namespace Nest
 	[JsonConverter(typeof(CompareConditionConverter))]
 	public interface ICompareCondition : ICondition
 	{
-		string Path { get; set; }
 		string Comparison { get; }
+		string Path { get; set; }
 		object Value { get; set; }
 	}
 
 	public abstract class CompareConditionBase : ConditionBase, ICompareCondition
 	{
-		private ICompareCondition Self => this;
-
-		string ICompareCondition.Path { get; set; }
-		object ICompareCondition.Value { get; set; }
-		string ICompareCondition.Comparison => this.Comparison;
-
 		protected CompareConditionBase(string path, object value)
 		{
 			Self.Path = path;
@@ -29,6 +23,11 @@ protected CompareConditionBase(string path, object value)
 		}
 
 		protected abstract string Comparison { get; }
+		string ICompareCondition.Comparison => Comparison;
+
+		string ICompareCondition.Path { get; set; }
+		private ICompareCondition Self => this;
+		object ICompareCondition.Value { get; set; }
 
 		internal override void WrapInContainer(IConditionContainer container) => container.Compare = this;
 	}
@@ -56,54 +55,54 @@ public ICompareCondition LowerThanOrEqualTo(string path, object value) =>
 
 	public class EqualCondition : CompareConditionBase
 	{
-		protected override string Comparison => "eq";
-
 		public EqualCondition(string path, object value) : base(path, value) { }
+
+		protected override string Comparison => "eq";
 	}
 
 	public class NotEqualCondition : CompareConditionBase
 	{
-		protected override string Comparison => "not_eq";
-
 		public NotEqualCondition(string path, object value) : base(path, value) { }
+
+		protected override string Comparison => "not_eq";
 	}
 
 	public class GreaterThanCondition : CompareConditionBase
 	{
-		protected override string Comparison => "gt";
-
 		public GreaterThanCondition(string path, object value) : base(path, value) { }
+
+		protected override string Comparison => "gt";
 	}
 
 	public class GreaterThanOrEqualCondition : CompareConditionBase
 	{
-		protected override string Comparison => "gte";
-
 		public GreaterThanOrEqualCondition(string path, object value) : base(path, value) { }
+
+		protected override string Comparison => "gte";
 	}
 
 	public class LowerThanCondition : CompareConditionBase
 	{
-		protected override string Comparison => "lt";
-
 		public LowerThanCondition(string path, object value) : base(path, value) { }
+
+		protected override string Comparison => "lt";
 	}
 
 	public class LowerThanOrEqualCondition : CompareConditionBase
 	{
-		protected override string Comparison => "lte";
-
 		public LowerThanOrEqualCondition(string path, object value) : base(path, value) { }
+
+		protected override string Comparison => "lte";
 	}
 
 	internal class CompareConditionConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-
 		public override bool CanRead => true;
 
 		public override bool CanWrite => true;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject) return null;
@@ -113,10 +112,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 			var pathProperty = compare.Children<JProperty>().First();
 			if (pathProperty.Count == 0) return null;
+
 			var path = pathProperty.Name;
 
 			var conditionProperty = pathProperty.Value.Children<JProperty>().First();
 			if (conditionProperty.Count == 0) return null;
+
 			var condition = conditionProperty.Name;
 			var value = serializer.Deserialize<object>(conditionProperty.Value.CreateReader());
 
@@ -146,5 +147,4 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			writer.WriteEndObject();
 		}
 	}
-
 }
diff --git a/src/Nest/XPack/Watcher/Condition/ConditionBase.cs b/src/Nest/XPack/Watcher/Condition/ConditionBase.cs
index 7d57c122261..fa301bfce60 100644
--- a/src/Nest/XPack/Watcher/Condition/ConditionBase.cs
+++ b/src/Nest/XPack/Watcher/Condition/ConditionBase.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface ICondition {}
+	public interface ICondition { }
 
 	public abstract class ConditionBase : ICondition
 	{
diff --git a/src/Nest/XPack/Watcher/Condition/ConditionContainer.cs b/src/Nest/XPack/Watcher/Condition/ConditionContainer.cs
index a288ce3c26d..3d8fff95c0d 100644
--- a/src/Nest/XPack/Watcher/Condition/ConditionContainer.cs
+++ b/src/Nest/XPack/Watcher/Condition/ConditionContainer.cs
@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
-using System;
+using System;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -17,15 +17,10 @@ public interface IConditionContainer
 		IAlwaysCondition Always { get; set; }
 
 		/// <summary>
-		/// Watch actions are never executed when the watch is triggered.
-		/// The watch input is executed, a record is added to the watch history,
-		/// and the watch execution ends.
+		/// Compares an array of values in the execution context to a given value.
 		/// </summary>
-		/// <remarks>
-		/// This condition is generally used for testing.
-		/// </remarks>
-		[JsonProperty("never")]
-		INeverCondition Never { get; set; }
+		[JsonProperty("array_compare")]
+		IArrayCompareCondition ArrayCompare { get; set; }
 
 		/// <summary>
 		/// Performs a simple comparison against a value in the watch payload.
@@ -34,10 +29,15 @@ public interface IConditionContainer
 		ICompareCondition Compare { get; set; }
 
 		/// <summary>
-		/// Compares an array of values in the execution context to a given value.
+		/// Watch actions are never executed when the watch is triggered.
+		/// The watch input is executed, a record is added to the watch history,
+		/// and the watch execution ends.
 		/// </summary>
-		[JsonProperty("array_compare")]
-		IArrayCompareCondition ArrayCompare { get; set; }
+		/// <remarks>
+		/// This condition is generally used for testing.
+		/// </remarks>
+		[JsonProperty("never")]
+		INeverCondition Never { get; set; }
 
 		/// <summary>
 		/// A watch condition that evaluates a script.
@@ -59,28 +59,28 @@ public interface IConditionContainer
 	/// <inheritdoc />
 	public class ConditionContainer : IConditionContainer, IDescriptor
 	{
-		/// <inheritdoc />
-		IAlwaysCondition IConditionContainer.Always { get; set; }
+		internal ConditionContainer() { }
+
+		public ConditionContainer(ConditionBase condition)
+		{
+			condition.ThrowIfNull(nameof(condition));
+			condition.WrapInContainer(this);
+		}
 
 		/// <inheritdoc />
-		INeverCondition IConditionContainer.Never { get; set; }
+		IAlwaysCondition IConditionContainer.Always { get; set; }
 
 		/// <inheritdoc />
-		IScriptCondition IConditionContainer.Script { get; set; }
+		IArrayCompareCondition IConditionContainer.ArrayCompare { get; set; }
 
 		/// <inheritdoc />
 		ICompareCondition IConditionContainer.Compare { get; set; }
 
 		/// <inheritdoc />
-		IArrayCompareCondition IConditionContainer.ArrayCompare { get; set; }
-
-		internal ConditionContainer() {}
+		INeverCondition IConditionContainer.Never { get; set; }
 
-		public ConditionContainer(ConditionBase condition)
-		{
-			condition.ThrowIfNull(nameof(condition));
-			condition.WrapInContainer(this);
-		}
+		/// <inheritdoc />
+		IScriptCondition IConditionContainer.Script { get; set; }
 
 		public static implicit operator ConditionContainer(ConditionBase condition) => condition == null
 			? null
diff --git a/src/Nest/XPack/Watcher/Condition/ConditionType.cs b/src/Nest/XPack/Watcher/Condition/ConditionType.cs
index ea7bca10970..7bb81dc056c 100644
--- a/src/Nest/XPack/Watcher/Condition/ConditionType.cs
+++ b/src/Nest/XPack/Watcher/Condition/ConditionType.cs
@@ -1,20 +1,24 @@
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.Runtime.Serialization;
 
 namespace Nest
 {
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum ConditionType
 	{
-		[EnumMember(Value="always")]
+		[EnumMember(Value = "always")]
 		Always,
-		[EnumMember(Value="never")]
+
+		[EnumMember(Value = "never")]
 		Never,
-		[EnumMember(Value="script")]
+
+		[EnumMember(Value = "script")]
 		Script,
+
 		[EnumMember(Value = "compare")]
 		Compare,
+
 		[EnumMember(Value = "array_compare")]
 		ArrayCompare
 	}
diff --git a/src/Nest/XPack/Watcher/Condition/IndexedScriptCondition.cs b/src/Nest/XPack/Watcher/Condition/IndexedScriptCondition.cs
index e2c5954d55e..10d06665997 100644
--- a/src/Nest/XPack/Watcher/Condition/IndexedScriptCondition.cs
+++ b/src/Nest/XPack/Watcher/Condition/IndexedScriptCondition.cs
@@ -11,21 +11,15 @@ public interface IIndexedScriptCondition : IScriptCondition
 
 	public class IndexedScriptCondition : ScriptConditionBase, IIndexedScriptCondition
 	{
-		public IndexedScriptCondition(string id)
-		{
-			this.Id = id;
-		}
+		public IndexedScriptCondition(string id) => Id = id;
 
 		public string Id { get; set; }
 	}
 
-	public class IndexedScriptConditionDescriptor :
-		ScriptConditionDescriptorBase<IndexedScriptConditionDescriptor, IIndexedScriptCondition>, IIndexedScriptCondition
+	public class IndexedScriptConditionDescriptor
+		: ScriptConditionDescriptorBase<IndexedScriptConditionDescriptor, IIndexedScriptCondition>, IIndexedScriptCondition
 	{
-		public IndexedScriptConditionDescriptor(string id)
-		{
-			Self.Id = id;
-		}
+		public IndexedScriptConditionDescriptor(string id) => Self.Id = id;
 
 		string IIndexedScriptCondition.Id { get; set; }
 	}
diff --git a/src/Nest/XPack/Watcher/Condition/InlineScriptCondition.cs b/src/Nest/XPack/Watcher/Condition/InlineScriptCondition.cs
index b93092b843e..231d2c2f3f4 100644
--- a/src/Nest/XPack/Watcher/Condition/InlineScriptCondition.cs
+++ b/src/Nest/XPack/Watcher/Condition/InlineScriptCondition.cs
@@ -5,34 +5,38 @@ namespace Nest
 {
 	public interface IInlineScriptCondition : IScriptCondition
 	{
-		[JsonProperty("source")]
-		string Source { get; set; }
-
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		[JsonIgnore]
 		string Inline { get; set; }
+
+		[JsonProperty("source")]
+		string Source { get; set; }
 	}
 
 	public class InlineScriptCondition : ScriptConditionBase, IInlineScriptCondition
 	{
-		public InlineScriptCondition(string script)
+		public InlineScriptCondition(string script) => Source = script;
+
+		public string Inline
 		{
-			this.Source = script;
+			get => Source;
+			set => Source = value;
 		}
 
 		public string Source { get; set; }
-		public string Inline { get => this.Source; set => this.Source = value; }
 	}
 
-	public class InlineScriptConditionDescriptor :
-		ScriptConditionDescriptorBase<InlineScriptConditionDescriptor, IInlineScriptCondition>, IInlineScriptCondition
+	public class InlineScriptConditionDescriptor
+		: ScriptConditionDescriptorBase<InlineScriptConditionDescriptor, IInlineScriptCondition>, IInlineScriptCondition
 	{
-		public InlineScriptConditionDescriptor(string script)
+		public InlineScriptConditionDescriptor(string script) => Self.Source = script;
+
+		string IInlineScriptCondition.Inline
 		{
-			Self.Source = script;
+			get => Self.Source;
+			set => Self.Source = value;
 		}
 
-		string IInlineScriptCondition.Inline { get => Self.Source; set => Self.Source = value; }
 		string IInlineScriptCondition.Source { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Condition/NeverCondition.cs b/src/Nest/XPack/Watcher/Condition/NeverCondition.cs
index 7a08939fa61..7d54e5f4eeb 100644
--- a/src/Nest/XPack/Watcher/Condition/NeverCondition.cs
+++ b/src/Nest/XPack/Watcher/Condition/NeverCondition.cs
@@ -4,7 +4,7 @@ namespace Nest
 {
 	[JsonObject]
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<NeverCondition>))]
-	public interface INeverCondition : ICondition {}
+	public interface INeverCondition : ICondition { }
 
 	public class NeverCondition : ConditionBase, INeverCondition
 	{
diff --git a/src/Nest/XPack/Watcher/Condition/ScriptConditionBase.cs b/src/Nest/XPack/Watcher/Condition/ScriptConditionBase.cs
index 688f8502d3b..a3f2973c897 100644
--- a/src/Nest/XPack/Watcher/Condition/ScriptConditionBase.cs
+++ b/src/Nest/XPack/Watcher/Condition/ScriptConditionBase.cs
@@ -1,7 +1,7 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Nest
@@ -28,6 +28,7 @@ public abstract class ScriptConditionBase : ConditionBase, IScriptCondition
 	public class ScriptConditionDescriptor : DescriptorBase<ScriptConditionDescriptor, IDescriptor>
 	{
 		public IndexedScriptConditionDescriptor Id(string id) => new IndexedScriptConditionDescriptor(id);
+
 		[Obsolete("Indexed() sets a property named id, this is confusing and thats why we intent to remove this in NEST 7.x please use Id()")]
 		public IndexedScriptConditionDescriptor Indexed(string id) => new IndexedScriptConditionDescriptor(id);
 
@@ -58,10 +59,7 @@ internal class ScriptConditionJsonConverter : JsonConverter
 	{
 		public override bool CanWrite => false;
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
diff --git a/src/Nest/XPack/Watcher/DeactivateWatch/DeactivateWatchRequest.cs b/src/Nest/XPack/Watcher/DeactivateWatch/DeactivateWatchRequest.cs
index c68dbd8d403..e08c50c3463 100644
--- a/src/Nest/XPack/Watcher/DeactivateWatch/DeactivateWatchRequest.cs
+++ b/src/Nest/XPack/Watcher/DeactivateWatch/DeactivateWatchRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IDeactivateWatchRequest {}
+	public partial interface IDeactivateWatchRequest { }
 
-	public partial class DeactivateWatchRequest {}
+	public partial class DeactivateWatchRequest { }
 
 	[DescriptorFor("XpackWatcherDeactivateWatch")]
-	public partial class DeactivateWatchDescriptor {}
+	public partial class DeactivateWatchDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/DeactivateWatch/ElasticClient-DeactivateWatch.cs b/src/Nest/XPack/Watcher/DeactivateWatch/ElasticClient-DeactivateWatch.cs
index 32017dd7228..baec1e69648 100644
--- a/src/Nest/XPack/Watcher/DeactivateWatch/ElasticClient-DeactivateWatch.cs
+++ b/src/Nest/XPack/Watcher/DeactivateWatch/ElasticClient-DeactivateWatch.cs
@@ -12,39 +12,47 @@ public partial interface IElasticClient
 		/// </summary>
 		IDeactivateWatchResponse DeactivateWatch(Id id, Func<DeactivateWatchDescriptor, IDeactivateWatchRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeactivateWatchResponse DeactivateWatch(IDeactivateWatchRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeactivateWatchResponse> DeactivateWatchAsync(Id id, Func<DeactivateWatchDescriptor, IDeactivateWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeactivateWatchResponse> DeactivateWatchAsync(Id id, Func<DeactivateWatchDescriptor, IDeactivateWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IDeactivateWatchResponse> DeactivateWatchAsync(IDeactivateWatchRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeactivateWatchResponse> DeactivateWatchAsync(IDeactivateWatchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeactivateWatchResponse DeactivateWatch(Id id, Func<DeactivateWatchDescriptor, IDeactivateWatchRequest> selector = null) =>
-			this.DeactivateWatch(selector.InvokeOrDefault(new DeactivateWatchDescriptor(id)));
+			DeactivateWatch(selector.InvokeOrDefault(new DeactivateWatchDescriptor(id)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeactivateWatchResponse DeactivateWatch(IDeactivateWatchRequest request) =>
-			this.Dispatcher.Dispatch<IDeactivateWatchRequest, DeactivateWatchRequestParameters, DeactivateWatchResponse>(
+			Dispatcher.Dispatch<IDeactivateWatchRequest, DeactivateWatchRequestParameters, DeactivateWatchResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackWatcherDeactivateWatchDispatch<DeactivateWatchResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherDeactivateWatchDispatch<DeactivateWatchResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeactivateWatchResponse> DeactivateWatchAsync(Id id, Func<DeactivateWatchDescriptor, IDeactivateWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeactivateWatchAsync(selector.InvokeOrDefault(new DeactivateWatchDescriptor(id)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDeactivateWatchResponse> DeactivateWatchAsync(IDeactivateWatchRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeactivateWatchRequest, DeactivateWatchRequestParameters, DeactivateWatchResponse, IDeactivateWatchResponse>(
+		/// <inheritdoc />
+		public Task<IDeactivateWatchResponse> DeactivateWatchAsync(Id id, Func<DeactivateWatchDescriptor, IDeactivateWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeactivateWatchAsync(selector.InvokeOrDefault(new DeactivateWatchDescriptor(id)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDeactivateWatchResponse> DeactivateWatchAsync(IDeactivateWatchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeactivateWatchRequest, DeactivateWatchRequestParameters, DeactivateWatchResponse, IDeactivateWatchResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackWatcherDeactivateWatchDispatchAsync<DeactivateWatchResponse>(p, c)
+				(p, d, c) => LowLevelDispatch.XpackWatcherDeactivateWatchDispatchAsync<DeactivateWatchResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/DeleteWatch/DeleteWatchRequest.cs b/src/Nest/XPack/Watcher/DeleteWatch/DeleteWatchRequest.cs
index 66300f5714d..5dab5270250 100644
--- a/src/Nest/XPack/Watcher/DeleteWatch/DeleteWatchRequest.cs
+++ b/src/Nest/XPack/Watcher/DeleteWatch/DeleteWatchRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IDeleteWatchRequest {}
+	public partial interface IDeleteWatchRequest { }
 
-	public partial class DeleteWatchRequest {}
+	public partial class DeleteWatchRequest { }
 
 	[DescriptorFor("XpackWatcherDeleteWatch")]
-	public partial class DeleteWatchDescriptor {}
+	public partial class DeleteWatchDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/DeleteWatch/DeleteWatchResponse.cs b/src/Nest/XPack/Watcher/DeleteWatch/DeleteWatchResponse.cs
index 3bfd9571c43..968ffda7c48 100644
--- a/src/Nest/XPack/Watcher/DeleteWatch/DeleteWatchResponse.cs
+++ b/src/Nest/XPack/Watcher/DeleteWatch/DeleteWatchResponse.cs
@@ -4,20 +4,20 @@ namespace Nest
 {
 	public interface IDeleteWatchResponse : IResponse
 	{
+		[JsonProperty("found")]
+		bool Found { get; }
+
 		[JsonProperty("_id")]
 		string Id { get; }
 
 		[JsonProperty("_version")]
 		int Version { get; }
-
-		[JsonProperty("found")]
-		bool Found { get; }
 	}
 
 	public class DeleteWatchResponse : ResponseBase, IDeleteWatchResponse
 	{
+		public bool Found { get; internal set; }
 		public string Id { get; internal set; }
 		public int Version { get; internal set; }
-		public bool Found { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/DeleteWatch/ElasticClient-DeleteWatch.cs b/src/Nest/XPack/Watcher/DeleteWatch/ElasticClient-DeleteWatch.cs
index 8e1d04651b3..4bc09092326 100644
--- a/src/Nest/XPack/Watcher/DeleteWatch/ElasticClient-DeleteWatch.cs
+++ b/src/Nest/XPack/Watcher/DeleteWatch/ElasticClient-DeleteWatch.cs
@@ -16,39 +16,45 @@ public partial interface IElasticClient
 		/// </remarks>
 		IDeleteWatchResponse DeleteWatch(Id watchId, Func<DeleteWatchDescriptor, IDeleteWatchRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IDeleteWatchResponse DeleteWatch(IDeleteWatchRequest request);
 
-		/// <inheritdoc/>
-		Task<IDeleteWatchResponse> DeleteWatchAsync(Id watchId, Func<DeleteWatchDescriptor, IDeleteWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IDeleteWatchResponse> DeleteWatchAsync(Id watchId, Func<DeleteWatchDescriptor, IDeleteWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IDeleteWatchResponse> DeleteWatchAsync(IDeleteWatchRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteWatchResponse DeleteWatch(Id watchId, Func<DeleteWatchDescriptor, IDeleteWatchRequest> selector = null) =>
-			this.DeleteWatch(selector.InvokeOrDefault(new DeleteWatchDescriptor(watchId)));
+			DeleteWatch(selector.InvokeOrDefault(new DeleteWatchDescriptor(watchId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IDeleteWatchResponse DeleteWatch(IDeleteWatchRequest request) =>
-			this.Dispatcher.Dispatch<IDeleteWatchRequest, DeleteWatchRequestParameters, DeleteWatchResponse>(
+			Dispatcher.Dispatch<IDeleteWatchRequest, DeleteWatchRequestParameters, DeleteWatchResponse>(
 				request,
-				(p,d) => this.LowLevelDispatch.XpackWatcherDeleteWatchDispatch<DeleteWatchResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherDeleteWatchDispatch<DeleteWatchResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IDeleteWatchResponse> DeleteWatchAsync(Id watchId, Func<DeleteWatchDescriptor, IDeleteWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DeleteWatchAsync(selector.InvokeOrDefault(new DeleteWatchDescriptor(watchId)), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IDeleteWatchResponse> DeleteWatchAsync(IDeleteWatchRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IDeleteWatchRequest, DeleteWatchRequestParameters, DeleteWatchResponse, IDeleteWatchResponse>(
+		/// <inheritdoc />
+		public Task<IDeleteWatchResponse> DeleteWatchAsync(Id watchId, Func<DeleteWatchDescriptor, IDeleteWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			DeleteWatchAsync(selector.InvokeOrDefault(new DeleteWatchDescriptor(watchId)), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IDeleteWatchResponse> DeleteWatchAsync(IDeleteWatchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IDeleteWatchRequest, DeleteWatchRequestParameters, DeleteWatchResponse, IDeleteWatchResponse>(
 				request,
 				cancellationToken,
-				(p,d,c) => this.LowLevelDispatch.XpackWatcherDeleteWatchDispatchAsync<DeleteWatchResponse>(p,c)
+				(p, d, c) => LowLevelDispatch.XpackWatcherDeleteWatchDispatchAsync<DeleteWatchResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/ExecuteWatch/ElasticClient-ExecuteWatch.cs b/src/Nest/XPack/Watcher/ExecuteWatch/ElasticClient-ExecuteWatch.cs
index 4446238c9d6..93d2e85992a 100644
--- a/src/Nest/XPack/Watcher/ExecuteWatch/ElasticClient-ExecuteWatch.cs
+++ b/src/Nest/XPack/Watcher/ExecuteWatch/ElasticClient-ExecuteWatch.cs
@@ -13,39 +13,45 @@ public partial interface IElasticClient
 		/// </summary>
 		IExecuteWatchResponse ExecuteWatch(Func<ExecuteWatchDescriptor, IExecuteWatchRequest> selector);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IExecuteWatchResponse ExecuteWatch(IExecuteWatchRequest request);
 
-		/// <inheritdoc/>
-		Task<IExecuteWatchResponse> ExecuteWatchAsync(Func<ExecuteWatchDescriptor, IExecuteWatchRequest> selector, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IExecuteWatchResponse> ExecuteWatchAsync(Func<ExecuteWatchDescriptor, IExecuteWatchRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IExecuteWatchResponse> ExecuteWatchAsync(IExecuteWatchRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExecuteWatchResponse ExecuteWatch(Func<ExecuteWatchDescriptor, IExecuteWatchRequest> selector) =>
-			this.ExecuteWatch(selector.InvokeOrDefault(new ExecuteWatchDescriptor()));
+			ExecuteWatch(selector.InvokeOrDefault(new ExecuteWatchDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IExecuteWatchResponse ExecuteWatch(IExecuteWatchRequest request) =>
-			this.Dispatcher.Dispatch<IExecuteWatchRequest, ExecuteWatchRequestParameters, ExecuteWatchResponse>(
+			Dispatcher.Dispatch<IExecuteWatchRequest, ExecuteWatchRequestParameters, ExecuteWatchResponse>(
 				request,
-				this.LowLevelDispatch.XpackWatcherExecuteWatchDispatch<ExecuteWatchResponse>
+				LowLevelDispatch.XpackWatcherExecuteWatchDispatch<ExecuteWatchResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IExecuteWatchResponse> ExecuteWatchAsync(Func<ExecuteWatchDescriptor, IExecuteWatchRequest> selector, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.ExecuteWatchAsync(selector?.InvokeOrDefault(new ExecuteWatchDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IExecuteWatchResponse> ExecuteWatchAsync(IExecuteWatchRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IExecuteWatchRequest, ExecuteWatchRequestParameters, ExecuteWatchResponse, IExecuteWatchResponse>(
+		/// <inheritdoc />
+		public Task<IExecuteWatchResponse> ExecuteWatchAsync(Func<ExecuteWatchDescriptor, IExecuteWatchRequest> selector,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			ExecuteWatchAsync(selector?.InvokeOrDefault(new ExecuteWatchDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IExecuteWatchResponse> ExecuteWatchAsync(IExecuteWatchRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IExecuteWatchRequest, ExecuteWatchRequestParameters, ExecuteWatchResponse, IExecuteWatchResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackWatcherExecuteWatchDispatchAsync<ExecuteWatchResponse>
+				LowLevelDispatch.XpackWatcherExecuteWatchDispatchAsync<ExecuteWatchResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/ExecuteWatch/ExecuteWatchRequest.cs b/src/Nest/XPack/Watcher/ExecuteWatch/ExecuteWatchRequest.cs
index cb984e28fb7..a8d2dfc1284 100644
--- a/src/Nest/XPack/Watcher/ExecuteWatch/ExecuteWatchRequest.cs
+++ b/src/Nest/XPack/Watcher/ExecuteWatch/ExecuteWatchRequest.cs
@@ -7,10 +7,19 @@ namespace Nest
 	public partial interface IExecuteWatchRequest
 	{
 		/// <summary>
-		/// This structure will be parsed as a trigger event and used for the watch execution.
+		/// Determines how to handle the watch actions as part of the watch execution.
 		/// </summary>
-		[JsonProperty("trigger_data")]
-		IScheduleTriggerEvent TriggerData { get; set; }
+		[JsonProperty("action_modes")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, ActionExecutionMode>))]
+		IDictionary<string, ActionExecutionMode> ActionModes { get; set; }
+
+		/// <summary>
+		/// When present, the watch uses this object as a payload
+		/// instead of executing its own input.
+		/// </summary>
+		[JsonProperty("alternative_input")]
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
+		IDictionary<string, object> AlternativeInput { get; set; }
 
 		/// <summary>
 		/// If this is set to true the watch execution will use the Always Condition.
@@ -28,27 +37,18 @@ public partial interface IExecuteWatchRequest
 		bool? RecordExecution { get; set; }
 
 		/// <summary>
-		/// When present, the watch uses this object as a payload
-		/// instead of executing its own input.
-		/// </summary>
-		[JsonProperty("alternative_input")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
-		IDictionary<string, object> AlternativeInput { get; set; }
-
-		/// <summary>
-		/// Determines how to handle the watch actions as part of the watch execution.
+		/// This field can either be a list of action ids or the string _all.
+		///  If _all is set or an action that is executed by the watch appears in this list
+		///  it will be executed in simulated mode.
 		/// </summary>
-		[JsonProperty("action_modes")]
-		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, ActionExecutionMode>))]
-		IDictionary<string, ActionExecutionMode> ActionModes { get; set; }
+		[JsonProperty("simulated_actions")]
+		SimulatedActions SimulatedActions { get; set; }
 
 		/// <summary>
-		///This field can either be a list of action ids or the string _all.
-		/// If _all is set or an action that is executed by the watch appears in this list
-		/// it will be executed in simulated mode.
+		/// This structure will be parsed as a trigger event and used for the watch execution.
 		/// </summary>
-		[JsonProperty("simulated_actions")]
-		SimulatedActions SimulatedActions { get; set; }
+		[JsonProperty("trigger_data")]
+		IScheduleTriggerEvent TriggerData { get; set; }
 
 		/// <summary>
 		/// When present, this watch is used instead of the one specified in the request.
@@ -60,17 +60,16 @@ public partial interface IExecuteWatchRequest
 
 	public partial class ExecuteWatchRequest
 	{
-		public IScheduleTriggerEvent TriggerData { get; set; }
+		public IDictionary<string, ActionExecutionMode> ActionModes { get; set; }
+
+		public IDictionary<string, object> AlternativeInput { get; set; }
 
 		public bool? IgnoreCondition { get; set; }
 
 		public bool? RecordExecution { get; set; }
 
-		public IDictionary<string, object> AlternativeInput { get; set; }
-
-		public IDictionary<string, ActionExecutionMode> ActionModes { get; set; }
-
 		public SimulatedActions SimulatedActions { get; set; }
+		public IScheduleTriggerEvent TriggerData { get; set; }
 
 		public IPutWatchRequest Watch { get; set; }
 	}
@@ -78,12 +77,12 @@ public partial class ExecuteWatchRequest
 	[DescriptorFor("XpackWatcherExecuteWatch")]
 	public partial class ExecuteWatchDescriptor
 	{
-		IScheduleTriggerEvent IExecuteWatchRequest.TriggerData { get; set; }
+		IDictionary<string, ActionExecutionMode> IExecuteWatchRequest.ActionModes { get; set; }
+		IDictionary<string, object> IExecuteWatchRequest.AlternativeInput { get; set; }
 		bool? IExecuteWatchRequest.IgnoreCondition { get; set; }
 		bool? IExecuteWatchRequest.RecordExecution { get; set; }
-		IDictionary<string, object> IExecuteWatchRequest.AlternativeInput { get; set; }
-		IDictionary<string, ActionExecutionMode> IExecuteWatchRequest.ActionModes { get; set; }
 		SimulatedActions IExecuteWatchRequest.SimulatedActions { get; set; }
+		IScheduleTriggerEvent IExecuteWatchRequest.TriggerData { get; set; }
 		IPutWatchRequest IExecuteWatchRequest.Watch { get; set; }
 
 		public ExecuteWatchDescriptor TriggerData(Func<ScheduleTriggerEventDescriptor, IScheduleTriggerEvent> selector) =>
@@ -95,13 +94,17 @@ public ExecuteWatchDescriptor IgnoreCondition(bool? ignore = true) =>
 		public ExecuteWatchDescriptor RecordExecution(bool? record = true) =>
 			Assign(a => a.RecordExecution = record);
 
-		public ExecuteWatchDescriptor ActionModes(Func<FluentDictionary<string, ActionExecutionMode>, FluentDictionary<string, ActionExecutionMode>> actionModesDictionary) =>
+		public ExecuteWatchDescriptor ActionModes(
+			Func<FluentDictionary<string, ActionExecutionMode>, FluentDictionary<string, ActionExecutionMode>> actionModesDictionary
+		) =>
 			Assign(a => a.ActionModes = actionModesDictionary(new FluentDictionary<string, ActionExecutionMode>()));
 
 		public ExecuteWatchDescriptor ActionModes(Dictionary<string, ActionExecutionMode> actionModesDictionary) =>
 			Assign(a => a.ActionModes = actionModesDictionary);
 
-		public ExecuteWatchDescriptor AlternativeInput(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> alternativeInputDictionary) =>
+		public ExecuteWatchDescriptor AlternativeInput(
+			Func<FluentDictionary<string, object>, FluentDictionary<string, object>> alternativeInputDictionary
+		) =>
 			Assign(a => a.AlternativeInput = alternativeInputDictionary(new FluentDictionary<string, object>()));
 
 		public ExecuteWatchDescriptor AlternativeInput(Dictionary<string, object> alternativeInputDictionary) =>
diff --git a/src/Nest/XPack/Watcher/ExecuteWatch/ExecuteWatchResponse.cs b/src/Nest/XPack/Watcher/ExecuteWatch/ExecuteWatchResponse.cs
index 6793808c155..53fc708859d 100644
--- a/src/Nest/XPack/Watcher/ExecuteWatch/ExecuteWatchResponse.cs
+++ b/src/Nest/XPack/Watcher/ExecuteWatch/ExecuteWatchResponse.cs
@@ -28,18 +28,25 @@ public enum ActionExecutionState
 	{
 		[EnumMember(Value = "awaits_execution")]
 		AwaitsExecution,
+
 		[EnumMember(Value = "checking")]
 		Checking,
+
 		[EnumMember(Value = "execution_not_needed")]
 		ExecutionNotNeeded,
+
 		[EnumMember(Value = "throttled")]
 		Throttled,
+
 		[EnumMember(Value = "executed")]
 		Executed,
+
 		[EnumMember(Value = "failed")]
 		Failed,
+
 		[EnumMember(Value = "deleted_while_queued")]
 		DeletedWhileQueued,
+
 		[EnumMember(Value = "not_executed_already_queued")]
 		NotExecutedAlreadyQueued
 	}
@@ -47,125 +54,125 @@ public enum ActionExecutionState
 	[JsonObject]
 	public class WatchRecord
 	{
-		[JsonProperty("watch_id")]
-		public string WatchId { get; set; }
+		[JsonProperty("condition")]
+		public ConditionContainer Condition { get; set; }
 
-		[JsonProperty("user")]
-		public string User { get; set; }
+		[JsonProperty("input")]
+		public InputContainer Input { get; set; }
 
 		[JsonProperty("messages")]
 		public IReadOnlyCollection<string> Messages { get; set; }
 
+		[JsonProperty("metadata")]
+		public IReadOnlyDictionary<string, object> Metadata { get; set; }
+
+		[JsonProperty("result")]
+		public ExecutionResult Result { get; set; }
+
 		[JsonProperty("state")]
 		public ActionExecutionState? State { get; set; }
 
 		[JsonProperty("trigger_event")]
 		public TriggerEventResult TriggerEvent { get; set; }
 
-		[JsonProperty("condition")]
-		public ConditionContainer Condition { get; set; }
-
-		[JsonProperty("input")]
-		public InputContainer Input { get; set; }
-
-		[JsonProperty("metadata")]
-		public IReadOnlyDictionary<string, object> Metadata { get; set; }
+		[JsonProperty("user")]
+		public string User { get; set; }
 
-		[JsonProperty("result")]
-		public ExecutionResult Result { get; set; }
+		[JsonProperty("watch_id")]
+		public string WatchId { get; set; }
 	}
 
 	[JsonObject]
 	public class TriggerEventResult
 	{
-		[JsonProperty("type")]
-		public string Type { get; set; }
+		[JsonProperty("manual")]
+		public ITriggerEventContainer Manual { get; set; }
 
 		[JsonProperty("triggered_time")]
 		public DateTimeOffset? TriggeredTime { get; set; }
 
-		[JsonProperty("manual")]
-		public ITriggerEventContainer Manual { get; set; }
+		[JsonProperty("type")]
+		public string Type { get; set; }
 	}
 
 	public class ExecutionResult
 	{
-		[JsonProperty("execution_time")]
-		public DateTimeOffset? ExecutionTime { get; set; }
+		[JsonProperty("actions")]
+		public IReadOnlyCollection<ExecutionResultAction> Actions { get; set; }
+
+		[JsonProperty("condition")]
+		public ExecutionResultCondition Condition { get; set; }
 
 		[JsonProperty("execution_duration")]
 		public int? ExecutionDuration { get; set; }
 
+		[JsonProperty("execution_time")]
+		public DateTimeOffset? ExecutionTime { get; set; }
+
 		[JsonProperty("input")]
 		public ExecutionResultInput Input { get; set; }
-
-		[JsonProperty("condition")]
-		public ExecutionResultCondition Condition { get; set; }
-
-		[JsonProperty("actions")]
-		public IReadOnlyCollection<ExecutionResultAction> Actions { get; set; }
 	}
 
 	[JsonObject]
 	public class ExecutionResultInput
 	{
-		[JsonProperty("type")]
-		public InputType Type { get; set; }
+		[JsonProperty("payload")]
+		public IReadOnlyDictionary<string, object> Payload { get; set; }
 
 		[JsonProperty("status")]
 		public Status Status { get; set; }
 
-		[JsonProperty("payload")]
-		public IReadOnlyDictionary<string, object> Payload { get; set; }
+		[JsonProperty("type")]
+		public InputType Type { get; set; }
 	}
 
 	[JsonObject]
 	public class ExecutionResultCondition
 	{
-		[JsonProperty("type")]
-		public ConditionType Type { get; set; }
+		[JsonProperty("met")]
+		public bool? Met { get; set; }
 
 		[JsonProperty("status")]
 		public Status Status { get; set; }
 
-		[JsonProperty("met")]
-		public bool? Met { get; set; }
+		[JsonProperty("type")]
+		public ConditionType Type { get; set; }
 	}
 
 	[JsonObject]
 	public class ExecutionResultAction
 	{
-		[JsonProperty("id")]
-		public string Id { get; set; }
-
-		[JsonProperty("type")]
-		public ActionType Type { get; set; }
-
-		[JsonProperty("status")]
-		public Status Status { get; set; }
-
 		[JsonProperty("email")]
 		public EmailActionResult Email { get; set; }
 
+		[JsonProperty("hipchat")]
+		public HipChatActionResult HipChat { get; set; }
+
+		[JsonProperty("id")]
+		public string Id { get; set; }
+
 		[JsonProperty("index")]
 		public IndexActionResult Index { get; set; }
 
-		[JsonProperty("webhook")]
-		public WebhookActionResult Webhook { get; set; }
-
 		[JsonProperty("logging")]
 		public LoggingActionResult Logging { get; set; }
 
 		[JsonProperty("pagerduty")]
 		public PagerDutyActionResult PagerDuty { get; set; }
 
-		[JsonProperty("hipchat")]
-		public HipChatActionResult HipChat { get; set; }
+		[JsonProperty("reason")]
+		public string Reason { get; set; }
 
 		[JsonProperty("slack")]
 		public SlackActionResult Slack { get; set; }
 
-		[JsonProperty("reason")]
-		public string Reason { get; set; }
+		[JsonProperty("status")]
+		public Status Status { get; set; }
+
+		[JsonProperty("type")]
+		public ActionType Type { get; set; }
+
+		[JsonProperty("webhook")]
+		public WebhookActionResult Webhook { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Execution/ActionExecutionMode.cs b/src/Nest/XPack/Watcher/Execution/ActionExecutionMode.cs
index 81ff609ce4e..b20d848f030 100644
--- a/src/Nest/XPack/Watcher/Execution/ActionExecutionMode.cs
+++ b/src/Nest/XPack/Watcher/Execution/ActionExecutionMode.cs
@@ -8,8 +8,8 @@ namespace Nest
 	public enum ActionExecutionMode
 	{
 		/// <summary>
-		///The action will be simulated (not actually executed)
-		/// and it will be throttled if needed.
+		/// The action will be simulated (not actually executed)
+		///  and it will be throttled if needed.
 		/// </summary>
 		[EnumMember(Value = "simulate")]
 		Simulate,
diff --git a/src/Nest/XPack/Watcher/Execution/Email/EmailActionResult.cs b/src/Nest/XPack/Watcher/Execution/Email/EmailActionResult.cs
index 49d1097b162..ecb62c70774 100644
--- a/src/Nest/XPack/Watcher/Execution/Email/EmailActionResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/Email/EmailActionResult.cs
@@ -5,13 +5,13 @@ namespace Nest
 	[JsonObject]
 	public class EmailActionResult
 	{
-		[JsonProperty("reason")]
-		public string Reason { get; set; }
-
 		[JsonProperty("account")]
 		public string Account { get; set; }
 
 		[JsonProperty("message")]
 		public EmailResult Message { get; set; }
+
+		[JsonProperty("reason")]
+		public string Reason { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Execution/Email/EmailResult.cs b/src/Nest/XPack/Watcher/Execution/Email/EmailResult.cs
index 5f9b7cee1a9..50efaed440f 100644
--- a/src/Nest/XPack/Watcher/Execution/Email/EmailResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/Email/EmailResult.cs
@@ -6,34 +6,34 @@ namespace Nest
 {
 	public class EmailResult
 	{
-		[JsonProperty("id")]
-		public string Id { get; set; }
+		[JsonProperty("bcc")]
+		public IEnumerable<string> Bcc { get; set; }
 
-		[JsonProperty("sent_date")]
-		public DateTime? SentDate { get; set; }
+		[JsonProperty("body")]
+		public EmailBody Body { get; set; }
+
+		[JsonProperty("cc")]
+		public IEnumerable<string> Cc { get; set; }
 
 		[JsonProperty("from")]
 		public string From { get; set; }
 
-		[JsonProperty("to")]
-		public IEnumerable<string> To { get; set; }
-
-		[JsonProperty("cc")]
-		public IEnumerable<string> Cc { get; set; }
+		[JsonProperty("id")]
+		public string Id { get; set; }
 
-		[JsonProperty("bcc")]
-		public IEnumerable<string> Bcc { get; set; }
+		[JsonProperty("priority")]
+		public EmailPriority? Priority { get; set; }
 
 		[JsonProperty("reply_to")]
 		public IEnumerable<string> ReplyTo { get; set; }
 
+		[JsonProperty("sent_date")]
+		public DateTime? SentDate { get; set; }
+
 		[JsonProperty("subject")]
 		public string Subject { get; set; }
 
-		[JsonProperty("body")]
-		public EmailBody Body { get; set; }
-
-		[JsonProperty("priority")]
-		public EmailPriority? Priority { get; set; }
+		[JsonProperty("to")]
+		public IEnumerable<string> To { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Execution/HipChat/HipChatActionMessageResult.cs b/src/Nest/XPack/Watcher/Execution/HipChat/HipChatActionMessageResult.cs
index fa752bdf2a2..e7e09c66364 100644
--- a/src/Nest/XPack/Watcher/Execution/HipChat/HipChatActionMessageResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/HipChat/HipChatActionMessageResult.cs
@@ -5,8 +5,8 @@ namespace Nest
 	[JsonObject]
 	public class HipChatActionMessageResult
 	{
-		[JsonProperty("status")]
-		public Status Status { get; set; }
+		[JsonProperty("message")]
+		public IHipChatMessage Message { get; set; }
 
 		[JsonProperty("reason")]
 		public string Reason { get; set; }
@@ -20,10 +20,10 @@ public class HipChatActionMessageResult
 		[JsonProperty("room")]
 		public string Room { get; set; }
 
+		[JsonProperty("status")]
+		public Status Status { get; set; }
+
 		[JsonProperty("user")]
 		public string User { get; set; }
-
-		[JsonProperty("message")]
-		public IHipChatMessage Message { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Execution/HipChat/HipChatActionResult.cs b/src/Nest/XPack/Watcher/Execution/HipChat/HipChatActionResult.cs
index 3cdffabfdcb..914cb4d40cc 100644
--- a/src/Nest/XPack/Watcher/Execution/HipChat/HipChatActionResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/HipChat/HipChatActionResult.cs
@@ -12,4 +12,4 @@ public class HipChatActionResult
 		[JsonProperty("sent_messages")]
 		public IEnumerable<HipChatActionMessageResult> SentMessages { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Execution/HttpInputRequestResult.cs b/src/Nest/XPack/Watcher/Execution/HttpInputRequestResult.cs
index 36a753b95a1..2d021842661 100644
--- a/src/Nest/XPack/Watcher/Execution/HttpInputRequestResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/HttpInputRequestResult.cs
@@ -4,5 +4,5 @@ namespace Nest
 {
 	[JsonObject]
 	[ExactContractJsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequestResult>))]
-	public class HttpInputRequestResult : HttpInputRequest {}
+	public class HttpInputRequestResult : HttpInputRequest { }
 }
diff --git a/src/Nest/XPack/Watcher/Execution/HttpInputResponseResult.cs b/src/Nest/XPack/Watcher/Execution/HttpInputResponseResult.cs
index d97452bbefe..176d1f0d0ec 100644
--- a/src/Nest/XPack/Watcher/Execution/HttpInputResponseResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/HttpInputResponseResult.cs
@@ -5,13 +5,13 @@ namespace Nest
 {
 	public class HttpInputResponseResult
 	{
-		[JsonProperty("status")]
-		public int StatusCode { get; set; }
+		[JsonProperty("body")]
+		public string Body { get; set; }
 
 		[JsonProperty("headers")]
 		public IDictionary<string, string[]> Headers { get; set; }
 
-		[JsonProperty("body")]
-		public string Body { get; set; }
+		[JsonProperty("status")]
+		public int StatusCode { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Execution/Index/IndexActionResultIndexResponse.cs b/src/Nest/XPack/Watcher/Execution/Index/IndexActionResultIndexResponse.cs
index 25ee070529d..9767d91d806 100644
--- a/src/Nest/XPack/Watcher/Execution/Index/IndexActionResultIndexResponse.cs
+++ b/src/Nest/XPack/Watcher/Execution/Index/IndexActionResultIndexResponse.cs
@@ -5,22 +5,22 @@ namespace Nest
 	[JsonObject]
 	public class IndexActionResultIndexResponse
 	{
+		[JsonProperty("created")]
+		public bool? Created { get; set; }
+
+		[JsonProperty("id")]
+		public string Id { get; set; }
+
 		[JsonProperty("index")]
 		public IndexName Index { get; set; }
 
+		[JsonProperty("result")]
+		public Result Result { get; set; }
+
 		[JsonProperty("type")]
 		public TypeName Type { get; set; }
 
 		[JsonProperty("version")]
 		public int Version { get; set; }
-
-		[JsonProperty("created")]
-		public bool? Created { get; set; }
-
-		[JsonProperty("result")]
-		public Result Result { get; set; }
-
-		[JsonProperty("id")]
-		public string Id { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Execution/Logging/LoggingActionResult.cs b/src/Nest/XPack/Watcher/Execution/Logging/LoggingActionResult.cs
index 462906e264f..918ceec0061 100644
--- a/src/Nest/XPack/Watcher/Execution/Logging/LoggingActionResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/Logging/LoggingActionResult.cs
@@ -8,4 +8,4 @@ public class LoggingActionResult
 		[JsonProperty("logged_text")]
 		public string LoggedText { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Execution/PagerDuty/PagerDutyActionResult.cs b/src/Nest/XPack/Watcher/Execution/PagerDuty/PagerDutyActionResult.cs
index e9a9d4f3b48..ad2882edd6e 100644
--- a/src/Nest/XPack/Watcher/Execution/PagerDuty/PagerDutyActionResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/PagerDuty/PagerDutyActionResult.cs
@@ -8,4 +8,4 @@ public class PagerDutyActionResult
 		[JsonProperty("sent_event")]
 		public PagerDutyActionEventResult SentEvent { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Execution/SimulatedActions.cs b/src/Nest/XPack/Watcher/Execution/SimulatedActions.cs
index 40e11965a5e..c051bce8874 100644
--- a/src/Nest/XPack/Watcher/Execution/SimulatedActions.cs
+++ b/src/Nest/XPack/Watcher/Execution/SimulatedActions.cs
@@ -7,13 +7,12 @@ namespace Nest
 	[JsonConverter(typeof(SimulatedActionsConverter))]
 	public class SimulatedActions
 	{
-		public bool UseAll { get; private set; }
+		private SimulatedActions() { }
 
 		public IEnumerable<string> Actions { get; private set; }
 
-		private SimulatedActions() { }
-
 		public static SimulatedActions All => new SimulatedActions { UseAll = true };
+		public bool UseAll { get; private set; }
 
 		public static SimulatedActions Some(params string[] actions) => new SimulatedActions { Actions = actions };
 
@@ -22,15 +21,16 @@ private SimulatedActions() { }
 
 	internal class SimulatedActionsConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-
 		public override bool CanRead => true;
 
 		public override bool CanWrite => true;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType == JsonToken.String) return SimulatedActions.All;
+
 			return SimulatedActions.Some(serializer.Deserialize<List<string>>(reader));
 		}
 
@@ -38,6 +38,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		{
 			var s = value as SimulatedActions;
 			if (s == null) return;
+
 			if (s.UseAll) writer.WriteValue("_all");
 			else serializer.Serialize(writer, s.Actions);
 		}
diff --git a/src/Nest/XPack/Watcher/Execution/Slack/SlackActionMessageResult.cs b/src/Nest/XPack/Watcher/Execution/Slack/SlackActionMessageResult.cs
index 187c7adfb06..375d0cbe523 100644
--- a/src/Nest/XPack/Watcher/Execution/Slack/SlackActionMessageResult.cs
+++ b/src/Nest/XPack/Watcher/Execution/Slack/SlackActionMessageResult.cs
@@ -5,8 +5,8 @@ namespace Nest
 	[JsonObject]
 	public class SlackActionMessageResult
 	{
-		[JsonProperty("status")]
-		public Status Status { get; set; }
+		[JsonProperty("message")]
+		public ISlackMessage Message { get; set; }
 
 		[JsonProperty("reason")]
 		public string Reason { get; set; }
@@ -17,10 +17,10 @@ public class SlackActionMessageResult
 		[JsonProperty("response")]
 		public HttpInputResponseResult Response { get; set; }
 
+		[JsonProperty("status")]
+		public Status Status { get; set; }
+
 		[JsonProperty("to")]
 		public string To { get; set; }
-
-		[JsonProperty("message")]
-		public ISlackMessage Message { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Execution/Status.cs b/src/Nest/XPack/Watcher/Execution/Status.cs
index d8f63aae06c..7a5ab91e102 100644
--- a/src/Nest/XPack/Watcher/Execution/Status.cs
+++ b/src/Nest/XPack/Watcher/Execution/Status.cs
@@ -19,4 +19,4 @@ public enum Status
 		[EnumMember(Value = "throttled")]
 		Throttled
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/GetWatch/ElasticClient-GetWatch.cs b/src/Nest/XPack/Watcher/GetWatch/ElasticClient-GetWatch.cs
index 9b6bf39cd9c..d23a51b9a47 100644
--- a/src/Nest/XPack/Watcher/GetWatch/ElasticClient-GetWatch.cs
+++ b/src/Nest/XPack/Watcher/GetWatch/ElasticClient-GetWatch.cs
@@ -12,39 +12,43 @@ public partial interface IElasticClient
 		/// </summary>
 		IGetWatchResponse GetWatch(Id watchId, Func<GetWatchDescriptor, IGetWatchRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IGetWatchResponse GetWatch(IGetWatchRequest request);
 
-		/// <inheritdoc/>
-		Task<IGetWatchResponse> GetWatchAsync(Id watchId, Func<GetWatchDescriptor, IGetWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IGetWatchResponse> GetWatchAsync(Id watchId, Func<GetWatchDescriptor, IGetWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IGetWatchResponse> GetWatchAsync(IGetWatchRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetWatchResponse GetWatch(Id watchId, Func<GetWatchDescriptor, IGetWatchRequest> selector = null) =>
-			this.GetWatch(selector.InvokeOrDefault(new GetWatchDescriptor(watchId)));
+			GetWatch(selector.InvokeOrDefault(new GetWatchDescriptor(watchId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IGetWatchResponse GetWatch(IGetWatchRequest request) =>
-			this.Dispatcher.Dispatch<IGetWatchRequest, GetWatchRequestParameters, GetWatchResponse>(
+			Dispatcher.Dispatch<IGetWatchRequest, GetWatchRequestParameters, GetWatchResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackWatcherGetWatchDispatch<GetWatchResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherGetWatchDispatch<GetWatchResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IGetWatchResponse> GetWatchAsync(Id watchId, Func<GetWatchDescriptor, IGetWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.GetWatchAsync(selector.InvokeOrDefault(new GetWatchDescriptor(watchId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IGetWatchResponse> GetWatchAsync(Id watchId, Func<GetWatchDescriptor, IGetWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			GetWatchAsync(selector.InvokeOrDefault(new GetWatchDescriptor(watchId)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IGetWatchResponse> GetWatchAsync(IGetWatchRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IGetWatchRequest, GetWatchRequestParameters, GetWatchResponse, IGetWatchResponse>(
+			Dispatcher.DispatchAsync<IGetWatchRequest, GetWatchRequestParameters, GetWatchResponse, IGetWatchResponse>(
 				request,
 				cancellationToken,
-				(p, d ,c) => this.LowLevelDispatch.XpackWatcherGetWatchDispatchAsync<GetWatchResponse>(p,c)
+				(p, d, c) => LowLevelDispatch.XpackWatcherGetWatchDispatchAsync<GetWatchResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/GetWatch/GetWatchRequest.cs b/src/Nest/XPack/Watcher/GetWatch/GetWatchRequest.cs
index cb7a21e36d0..e9921933c96 100644
--- a/src/Nest/XPack/Watcher/GetWatch/GetWatchRequest.cs
+++ b/src/Nest/XPack/Watcher/GetWatch/GetWatchRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IGetWatchRequest {}
+	public partial interface IGetWatchRequest { }
 
-	public partial class GetWatchRequest {}
+	public partial class GetWatchRequest { }
 
 	[DescriptorFor("XpackWatcherGetWatch")]
-	public partial class GetWatchDescriptor {}
+	public partial class GetWatchDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/Input/ChainInput.cs b/src/Nest/XPack/Watcher/Input/ChainInput.cs
index 2b063e9b30b..6faf7ee68dd 100644
--- a/src/Nest/XPack/Watcher/Input/ChainInput.cs
+++ b/src/Nest/XPack/Watcher/Input/ChainInput.cs
@@ -20,12 +20,9 @@ public interface IChainInput : IInput
 	/// <inheritdoc />
 	public class ChainInput : InputBase, IChainInput
 	{
-		public ChainInput() {}
+		public ChainInput() { }
 
-		public ChainInput(IDictionary<string, InputContainer> inputs)
-		{
-			this.Inputs = inputs;
-		}
+		public ChainInput(IDictionary<string, InputContainer> inputs) => Inputs = inputs;
 
 		/// <inheritdoc />
 		public IDictionary<string, InputContainer> Inputs { get; set; }
@@ -36,12 +33,9 @@ public ChainInput(IDictionary<string, InputContainer> inputs)
 	/// <inheritdoc />
 	public class ChainInputDescriptor : DescriptorBase<ChainInputDescriptor, IChainInput>, IChainInput
 	{
-		public ChainInputDescriptor() {}
+		public ChainInputDescriptor() { }
 
-		public ChainInputDescriptor(IDictionary<string, InputContainer> inputs)
-		{
-			Self.Inputs = inputs;
-		}
+		public ChainInputDescriptor(IDictionary<string, InputContainer> inputs) => Self.Inputs = inputs;
 
 		IDictionary<string, InputContainer> IChainInput.Inputs { get; set; }
 
diff --git a/src/Nest/XPack/Watcher/Input/ConnectionScheme.cs b/src/Nest/XPack/Watcher/Input/ConnectionScheme.cs
index 34c5e3fb972..da7b08fba03 100644
--- a/src/Nest/XPack/Watcher/Input/ConnectionScheme.cs
+++ b/src/Nest/XPack/Watcher/Input/ConnectionScheme.cs
@@ -9,7 +9,8 @@ public enum ConnectionScheme
 	{
 		[EnumMember(Value = "http")]
 		Http,
+
 		[EnumMember(Value = "https")]
 		Https
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Input/HttpInput.cs b/src/Nest/XPack/Watcher/Input/HttpInput.cs
index b9ead0d5da2..736e9d22b3b 100644
--- a/src/Nest/XPack/Watcher/Input/HttpInput.cs
+++ b/src/Nest/XPack/Watcher/Input/HttpInput.cs
@@ -27,7 +27,7 @@ public interface IHttpInput : IInput
 
 		/// <summary>
 		/// The expected content type the response body will contain.
-		/// If the format is text, <see cref="HttpInput.Extract"/> cannot exist.
+		/// If the format is text, <see cref="HttpInput.Extract" /> cannot exist.
 		/// Note that this overrides the header that is returned in the HTTP response.
 		/// </summary>
 		[JsonProperty("response_content_type")]
diff --git a/src/Nest/XPack/Watcher/Input/HttpInputAuthentication.cs b/src/Nest/XPack/Watcher/Input/HttpInputAuthentication.cs
index e37d43adc80..6374809320f 100644
--- a/src/Nest/XPack/Watcher/Input/HttpInputAuthentication.cs
+++ b/src/Nest/XPack/Watcher/Input/HttpInputAuthentication.cs
@@ -42,35 +42,36 @@ public HttpInputAuthenticationDescriptor Basic(Func<HttpInputBasicAuthentication
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputBasicAuthentication>))]
 	public interface IHttpInputBasicAuthentication
 	{
-		/// <summary>
-		/// Username for Basic Authentication
-		/// </summary>
-		[JsonProperty("username")]
-		string Username { get; set; }
-
 		/// <summary>
 		/// Password for Basic Authentication
 		/// </summary>
 		[JsonProperty("password")]
 		string Password { get; set; }
+
+		/// <summary>
+		/// Username for Basic Authentication
+		/// </summary>
+		[JsonProperty("username")]
+		string Username { get; set; }
 	}
 
 	/// <inheritdoc />
 	[JsonObject]
 	public class HttpInputBasicAuthentication : IHttpInputBasicAuthentication
 	{
-		/// <inheritdoc />
-		public string Username { get; set; }
 		/// <inheritdoc />
 		public string Password { get; set; }
+
+		/// <inheritdoc />
+		public string Username { get; set; }
 	}
 
 	/// <inheritdoc />
 	public class HttpInputBasicAuthenticationDescriptor
 		: DescriptorBase<HttpInputBasicAuthenticationDescriptor, IHttpInputBasicAuthentication>, IHttpInputBasicAuthentication
 	{
-		string IHttpInputBasicAuthentication.Username { get; set; }
 		string IHttpInputBasicAuthentication.Password { get; set; }
+		string IHttpInputBasicAuthentication.Username { get; set; }
 
 		/// <inheritdoc />
 		public HttpInputBasicAuthenticationDescriptor Username(string username) =>
diff --git a/src/Nest/XPack/Watcher/Input/HttpInputRequest.cs b/src/Nest/XPack/Watcher/Input/HttpInputRequest.cs
index 33e283e691e..b4c2a67bd98 100644
--- a/src/Nest/XPack/Watcher/Input/HttpInputRequest.cs
+++ b/src/Nest/XPack/Watcher/Input/HttpInputRequest.cs
@@ -10,66 +10,65 @@ namespace Nest
 	public interface IHttpInputRequest
 	{
 		/// <summary>
-		/// The url scheme
+		/// Authentication related HTTP headers.
 		/// </summary>
-		[JsonProperty("scheme")]
-		[JsonConverter(typeof(StringEnumConverter))]
-		ConnectionScheme? Scheme { get; set; }
+		[JsonProperty("auth")]
+		IHttpInputAuthentication Authentication { get; set; }
 
 		/// <summary>
-		/// The port that the http service is listening on.
-		/// This is required
+		/// The HTTP request body.
+		/// The body can be static text or include mustache templates.
 		/// </summary>
-		[JsonProperty("port")]
-		int? Port { get; set; }
+		[JsonProperty("body")]
+		string Body { get; set; }
 
 		/// <summary>
-		/// The host to connect to. This is required
+		/// The timeout for setting up the http connection.
+		/// If the connection could not be set up within this time,
+		/// the input will timeout and fail.
 		/// </summary>
-		[JsonProperty("host")]
-		string Host { get; set; }
+		[JsonProperty("connection_timeout")]
+		Time ConnectionTimeout { get; set; }
 
 		/// <summary>
-		/// The url path. The path can be static text or contain mustache templates.
-		/// Url query string parameters must be specified with <see cref="Params"/>
+		/// The HTTP request headers.
+		/// The header values can be static text or include mustache templates.
 		/// </summary>
-		[JsonProperty("path")]
-		string Path { get; set; }
+		[JsonProperty("headers")]
+		IDictionary<string, string> Headers { get; set; }
 
 		/// <summary>
-		/// The HTTP method. Defaults to <see cref="HttpInputMethod.Get"/>
+		/// The host to connect to. This is required
 		/// </summary>
-		[JsonProperty("method")]
-		HttpInputMethod? Method { get; set; }
+		[JsonProperty("host")]
+		string Host { get; set; }
 
 		/// <summary>
-		/// The HTTP request headers.
-		/// The header values can be static text or include mustache templates.
+		/// The HTTP method. Defaults to <see cref="HttpInputMethod.Get" />
 		/// </summary>
-		[JsonProperty("headers")]
-		IDictionary<string, string> Headers { get; set; }
+		[JsonProperty("method")]
+		HttpInputMethod? Method { get; set; }
 
 		/// <summary>
 		/// The url query string parameters.
 		/// The parameter values can be static text or contain mustache templates.
-	    /// </summary>
+		/// </summary>
 		[JsonProperty("params")]
 		IDictionary<string, string> Params { get; set; }
 
 		/// <summary>
-		/// Sets the scheme, host, port and params all at once by specifying a real URL.
-		/// May not be combined with <see cref="Scheme"/>, <see cref="Host"/>,
-		/// <see cref="Port"/> and <see cref="Params"/>.
-		/// As if parameters are set, specifying them individually might overwrite them.
+		/// The url path. The path can be static text or contain mustache templates.
+		/// Url query string parameters must be specified with <see cref="Params" />
 		/// </summary>
-		[JsonProperty("url")]
-		string Url { get; set; }
+		[JsonProperty("path")]
+		string Path { get; set; }
 
 		/// <summary>
-		/// Authentication related HTTP headers.
+		/// The port that the http service is listening on.
+		/// This is required
 		/// </summary>
-		[JsonProperty("auth")]
-		IHttpInputAuthentication Authentication { get; set; }
+		[JsonProperty("port")]
+		int? Port { get; set; }
 
 		/// <summary>
 		/// The proxy to use when connecting to the host.
@@ -77,14 +76,6 @@ public interface IHttpInputRequest
 		[JsonProperty("proxy")]
 		IHttpInputProxy Proxy { get; set; }
 
-		/// <summary>
-		/// The timeout for setting up the http connection.
-		/// If the connection could not be set up within this time,
-		/// the input will timeout and fail.
-		/// </summary>
-		[JsonProperty("connection_timeout")]
-		Time ConnectionTimeout { get; set; }
-
 		/// <summary>
 		/// The timeout for reading data from http connection.
 		/// If no response was received within this time,
@@ -94,71 +85,80 @@ public interface IHttpInputRequest
 		Time ReadTimeout { get; set; }
 
 		/// <summary>
-		/// The HTTP request body.
-		/// The body can be static text or include mustache templates.
+		/// The url scheme
 		/// </summary>
-		[JsonProperty("body")]
-		string Body { get; set; }
+		[JsonProperty("scheme")]
+		[JsonConverter(typeof(StringEnumConverter))]
+		ConnectionScheme? Scheme { get; set; }
+
+		/// <summary>
+		/// Sets the scheme, host, port and params all at once by specifying a real URL.
+		/// May not be combined with <see cref="Scheme" />, <see cref="Host" />,
+		/// <see cref="Port" /> and <see cref="Params" />.
+		/// As if parameters are set, specifying them individually might overwrite them.
+		/// </summary>
+		[JsonProperty("url")]
+		string Url { get; set; }
 	}
 
 	public class HttpInputRequest : IHttpInputRequest
 	{
 		/// <inheritdoc />
-		public ConnectionScheme? Scheme { get; set; }
+		public IHttpInputAuthentication Authentication { get; set; }
 
 		/// <inheritdoc />
-		public int? Port { get; set; }
+		public string Body { get; set; }
 
 		/// <inheritdoc />
-		public string Host { get; set; }
+		public Time ConnectionTimeout { get; set; }
 
 		/// <inheritdoc />
-		public string Path { get; set; }
+		public IDictionary<string, string> Headers { get; set; }
 
 		/// <inheritdoc />
-		public HttpInputMethod? Method { get; set; }
+		public string Host { get; set; }
 
 		/// <inheritdoc />
-		public IDictionary<string, string> Headers { get; set; }
+		public HttpInputMethod? Method { get; set; }
 
 		/// <inheritdoc />
 		public IDictionary<string, string> Params { get; set; }
 
 		/// <inheritdoc />
-		public string Url { get; set; }
+		public string Path { get; set; }
 
 		/// <inheritdoc />
-		public IHttpInputAuthentication Authentication { get; set; }
+		public int? Port { get; set; }
 
 		/// <inheritdoc />
 		public IHttpInputProxy Proxy { get; set; }
 
 		/// <inheritdoc />
-		public Time ConnectionTimeout { get; set; }
+		public Time ReadTimeout { get; set; }
 
 		/// <inheritdoc />
-		public Time ReadTimeout { get; set; }
+		public ConnectionScheme? Scheme { get; set; }
 
 		/// <inheritdoc />
-		public string Body { get; set; }
+		public string Url { get; set; }
 	}
 
 	public class HttpInputRequestDescriptor
 		: DescriptorBase<HttpInputRequestDescriptor, IHttpInputRequest>, IHttpInputRequest
 	{
-		ConnectionScheme? IHttpInputRequest.Scheme { get; set; }
-		int? IHttpInputRequest.Port { get; set; }
-		string IHttpInputRequest.Host { get; set; }
-		string IHttpInputRequest.Path { get; set; }
-		HttpInputMethod? IHttpInputRequest.Method { get; set; }
-		IDictionary<string, string> IHttpInputRequest.Headers { get; set; }
-		IDictionary<string, string> IHttpInputRequest.Params { get; set; }
 		IHttpInputAuthentication IHttpInputRequest.Authentication { get; set; }
 		string IHttpInputRequest.Body { get; set; }
-		string IHttpInputRequest.Url { get; set; }
-		Time IHttpInputRequest.ReadTimeout { get; set; }
 		Time IHttpInputRequest.ConnectionTimeout { get; set; }
+		IDictionary<string, string> IHttpInputRequest.Headers { get; set; }
+		string IHttpInputRequest.Host { get; set; }
+		HttpInputMethod? IHttpInputRequest.Method { get; set; }
+		IDictionary<string, string> IHttpInputRequest.Params { get; set; }
+		string IHttpInputRequest.Path { get; set; }
+		int? IHttpInputRequest.Port { get; set; }
 		IHttpInputProxy IHttpInputRequest.Proxy { get; set; }
+		Time IHttpInputRequest.ReadTimeout { get; set; }
+		ConnectionScheme? IHttpInputRequest.Scheme { get; set; }
+		string IHttpInputRequest.Url { get; set; }
 
 		/// <inheritdoc />
 		public HttpInputRequestDescriptor Authentication(Func<HttpInputAuthenticationDescriptor, IHttpInputAuthentication> authSelector) =>
diff --git a/src/Nest/XPack/Watcher/Input/HttpMethod.cs b/src/Nest/XPack/Watcher/Input/HttpMethod.cs
index fc807eace16..27d6418e5cd 100644
--- a/src/Nest/XPack/Watcher/Input/HttpMethod.cs
+++ b/src/Nest/XPack/Watcher/Input/HttpMethod.cs
@@ -9,12 +9,16 @@ public enum HttpInputMethod
 	{
 		[EnumMember(Value = "head")]
 		Head,
+
 		[EnumMember(Value = "get")]
 		Get,
+
 		[EnumMember(Value = "post")]
 		Post,
+
 		[EnumMember(Value = "put")]
 		Put,
+
 		[EnumMember(Value = "delete")]
 		Delete
 	}
diff --git a/src/Nest/XPack/Watcher/Input/IndicesOptions.cs b/src/Nest/XPack/Watcher/Input/IndicesOptions.cs
index ed16d19f721..f46065f34d7 100644
--- a/src/Nest/XPack/Watcher/Input/IndicesOptions.cs
+++ b/src/Nest/XPack/Watcher/Input/IndicesOptions.cs
@@ -8,32 +8,31 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<IndicesOptions>))]
 	public interface IIndicesOptions
 	{
+		[JsonProperty("allow_no_indices")]
+		bool? AllowNoIndices { get; set; }
+
 		[JsonProperty("expand_wildcards")]
 		[JsonConverter(typeof(StringEnumConverter))]
 		ExpandWildcards? ExpandWildcards { get; set; }
 
 		[JsonProperty("ignore_unavailable")]
 		bool? IgnoreUnavailable { get; set; }
-
-		[JsonProperty("allow_no_indices")]
-		bool? AllowNoIndices { get; set; }
 	}
 
 	[JsonObject]
 	public class IndicesOptions : IIndicesOptions
 	{
+		public bool? AllowNoIndices { get; set; }
 		public ExpandWildcards? ExpandWildcards { get; set; }
 
 		public bool? IgnoreUnavailable { get; set; }
-
-		public bool? AllowNoIndices { get; set; }
 	}
 
 	public class IndicesOptionsDescriptor : DescriptorBase<IndicesOptionsDescriptor, IIndicesOptions>, IIndicesOptions
 	{
+		bool? IIndicesOptions.AllowNoIndices { get; set; }
 		ExpandWildcards? IIndicesOptions.ExpandWildcards { get; set; }
 		bool? IIndicesOptions.IgnoreUnavailable { get; set; }
-		bool? IIndicesOptions.AllowNoIndices { get; set; }
 
 		public IndicesOptionsDescriptor ExpandWildcards(ExpandWildcards? expandWildcards) =>
 			Assign(a => a.ExpandWildcards = expandWildcards);
diff --git a/src/Nest/XPack/Watcher/Input/InputBase.cs b/src/Nest/XPack/Watcher/Input/InputBase.cs
index f325fbaf12e..c8af7cce0fd 100644
--- a/src/Nest/XPack/Watcher/Input/InputBase.cs
+++ b/src/Nest/XPack/Watcher/Input/InputBase.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface IInput {}
+	public interface IInput { }
 
 	public abstract class InputBase : IInput
 	{
diff --git a/src/Nest/XPack/Watcher/Input/InputContainer.cs b/src/Nest/XPack/Watcher/Input/InputContainer.cs
index 406d0f4da67..fb39e8a73e6 100644
--- a/src/Nest/XPack/Watcher/Input/InputContainer.cs
+++ b/src/Nest/XPack/Watcher/Input/InputContainer.cs
@@ -7,6 +7,9 @@ namespace Nest
 	[JsonConverter(typeof(ReserializeJsonConverter<InputContainer, IInputContainer>))]
 	public interface IInputContainer
 	{
+		[JsonProperty("chain")]
+		IChainInput Chain { get; set; }
+
 		[JsonProperty("http")]
 		IHttpInput Http { get; set; }
 
@@ -15,20 +18,12 @@ public interface IInputContainer
 
 		[JsonProperty("simple")]
 		ISimpleInput Simple { get; set; }
-
-		[JsonProperty("chain")]
-		IChainInput Chain { get; set; }
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
 	public class InputContainer : IInputContainer, IDescriptor
 	{
-		IHttpInput IInputContainer.Http { get; set; }
-		ISearchInput IInputContainer.Search { get; set; }
-		ISimpleInput IInputContainer.Simple { get; set; }
-		IChainInput IInputContainer.Chain { get; set; }
-
-		internal InputContainer() {}
+		internal InputContainer() { }
 
 		public InputContainer(InputBase input)
 		{
@@ -36,6 +31,11 @@ public InputContainer(InputBase input)
 			input.WrapInContainer(this);
 		}
 
+		IChainInput IInputContainer.Chain { get; set; }
+		IHttpInput IInputContainer.Http { get; set; }
+		ISearchInput IInputContainer.Search { get; set; }
+		ISimpleInput IInputContainer.Simple { get; set; }
+
 		public static implicit operator InputContainer(InputBase input) => input == null
 			? null
 			: new InputContainer(input);
diff --git a/src/Nest/XPack/Watcher/Input/InputType.cs b/src/Nest/XPack/Watcher/Input/InputType.cs
index d990973be80..26c755cb99a 100644
--- a/src/Nest/XPack/Watcher/Input/InputType.cs
+++ b/src/Nest/XPack/Watcher/Input/InputType.cs
@@ -9,8 +9,10 @@ public enum InputType
 	{
 		[EnumMember(Value = "http")]
 		Http,
+
 		[EnumMember(Value = "search")]
 		Search,
+
 		[EnumMember(Value = "simple")]
 		Simple
 	}
diff --git a/src/Nest/XPack/Watcher/Input/ResponseContentType.cs b/src/Nest/XPack/Watcher/Input/ResponseContentType.cs
index 32478c896a0..f73db44a468 100644
--- a/src/Nest/XPack/Watcher/Input/ResponseContentType.cs
+++ b/src/Nest/XPack/Watcher/Input/ResponseContentType.cs
@@ -9,9 +9,11 @@ public enum ResponseContentType
 	{
 		[EnumMember(Value = "json")]
 		Json,
+
 		[EnumMember(Value = "yaml")]
 		Yaml,
+
 		[EnumMember(Value = "text")]
 		Text
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Input/SearchInput.cs b/src/Nest/XPack/Watcher/Input/SearchInput.cs
index 96e0a5882d5..6514eb57a07 100644
--- a/src/Nest/XPack/Watcher/Input/SearchInput.cs
+++ b/src/Nest/XPack/Watcher/Input/SearchInput.cs
@@ -35,7 +35,7 @@ public interface ISearchInput : IInput
 		Time Timeout { get; set; }
 	}
 
-	/// <inheritdoc cref="ISearchInput"/>
+	/// <inheritdoc cref="ISearchInput" />
 	public class SearchInput : InputBase, ISearchInput
 	{
 		/// <inheritdoc />
@@ -50,7 +50,7 @@ public class SearchInput : InputBase, ISearchInput
 		internal override void WrapInContainer(IInputContainer container) => container.Search = this;
 	}
 
-	/// <inheritdoc cref="ISearchInput"/>
+	/// <inheritdoc cref="ISearchInput" />
 	public class SearchInputDescriptor
 		: DescriptorBase<SearchInputDescriptor, ISearchInput>, ISearchInput
 	{
@@ -58,17 +58,17 @@ public class SearchInputDescriptor
 		ISearchInputRequest ISearchInput.Request { get; set; }
 		Time ISearchInput.Timeout { get; set; }
 
-		/// <inheritdoc cref="ISearchInput.Request"/>
+		/// <inheritdoc cref="ISearchInput.Request" />
 		public SearchInputDescriptor Request(Func<SearchInputRequestDescriptor, ISearchInputRequest> selector) =>
 			Assign(a => a.Request = selector?.InvokeOrDefault(new SearchInputRequestDescriptor()));
 
-		/// <inheritdoc cref="ISearchInput.Extract"/>
+		/// <inheritdoc cref="ISearchInput.Extract" />
 		public SearchInputDescriptor Extract(IEnumerable<string> extract) => Assign(a => a.Extract = extract);
 
-		/// <inheritdoc cref="ISearchInput.Extract"/>
+		/// <inheritdoc cref="ISearchInput.Extract" />
 		public SearchInputDescriptor Extract(params string[] extract) => Assign(a => a.Extract = extract);
 
-		/// <inheritdoc cref="ISearchInput.Timeout"/>
+		/// <inheritdoc cref="ISearchInput.Timeout" />
 		public SearchInputDescriptor Timeout(Time timeout) => Assign(a => a.Timeout = timeout);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Input/SearchInputRequest.cs b/src/Nest/XPack/Watcher/Input/SearchInputRequest.cs
index 967ab3b3827..b75dcb2b7bc 100644
--- a/src/Nest/XPack/Watcher/Input/SearchInputRequest.cs
+++ b/src/Nest/XPack/Watcher/Input/SearchInputRequest.cs
@@ -10,52 +10,50 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<SearchInputRequest>))]
 	public interface ISearchInputRequest
 	{
+		[JsonProperty("body")]
+		[JsonConverter(typeof(ReadAsTypeJsonConverter<SearchRequest>))]
+		ISearchRequest Body { get; set; }
+
 		[JsonProperty("indices")]
 		IEnumerable<IndexName> Indices { get; set; }
 
-		[JsonProperty("types")]
-		IEnumerable<TypeName> Types { get; set; }
+		[JsonProperty("indices_options")]
+		IIndicesOptions IndicesOptions { get; set; }
 
 		[JsonProperty("search_type")]
 		[JsonConverter(typeof(StringEnumConverter))]
 		SearchType? SearchType { get; set; }
 
-		[JsonProperty("indices_options")]
-		IIndicesOptions IndicesOptions { get; set; }
-
-		[JsonProperty("body")]
-		[JsonConverter(typeof(ReadAsTypeJsonConverter<SearchRequest>))]
-		ISearchRequest Body { get; set; }
-
 		[JsonProperty("template")]
 		[JsonConverter(typeof(ReadAsTypeJsonConverter<SearchTemplateRequest>))]
 		ISearchTemplateRequest Template { get; set; }
+
+		[JsonProperty("types")]
+		IEnumerable<TypeName> Types { get; set; }
 	}
 
 	public class SearchInputRequest : ISearchInputRequest
 	{
+		public ISearchRequest Body { get; set; }
 		public IEnumerable<IndexName> Indices { get; set; }
 
-		public IEnumerable<TypeName> Types { get; set; }
-
-		public SearchType? SearchType { get; set; }
-
 		public IIndicesOptions IndicesOptions { get; set; }
 
-		public ISearchRequest Body { get; set; }
+		public SearchType? SearchType { get; set; }
 
 		public ISearchTemplateRequest Template { get; set; }
+
+		public IEnumerable<TypeName> Types { get; set; }
 	}
 
-	public class SearchInputRequestDescriptor :
-		DescriptorBase<SearchInputRequestDescriptor, ISearchInputRequest>, ISearchInputRequest
+	public class SearchInputRequestDescriptor : DescriptorBase<SearchInputRequestDescriptor, ISearchInputRequest>, ISearchInputRequest
 	{
+		ISearchRequest ISearchInputRequest.Body { get; set; }
 		IEnumerable<IndexName> ISearchInputRequest.Indices { get; set; }
-		IEnumerable<TypeName> ISearchInputRequest.Types { get; set; }
-		SearchType? ISearchInputRequest.SearchType { get; set; }
 		IIndicesOptions ISearchInputRequest.IndicesOptions { get; set; }
-		ISearchRequest ISearchInputRequest.Body { get; set; }
+		SearchType? ISearchInputRequest.SearchType { get; set; }
 		ISearchTemplateRequest ISearchInputRequest.Template { get; set; }
+		IEnumerable<TypeName> ISearchInputRequest.Types { get; set; }
 
 		public SearchInputRequestDescriptor Indices(IEnumerable<IndexName> indices) =>
 			Assign(a => a.Indices = indices);
@@ -64,7 +62,7 @@ public SearchInputRequestDescriptor Indices(params IndexName[] indices) =>
 			Assign(a => a.Indices = indices);
 
 		public SearchInputRequestDescriptor Indices<T>() =>
-			Assign(a => a.Indices = new [] { (IndexName)typeof(T) });
+			Assign(a => a.Indices = new[] { (IndexName)typeof(T) });
 
 		public SearchInputRequestDescriptor Types(IEnumerable<TypeName> types) =>
 			Assign(a => a.Types = types);
diff --git a/src/Nest/XPack/Watcher/Input/SimpleInput.cs b/src/Nest/XPack/Watcher/Input/SimpleInput.cs
index 46a3768dbf4..6336d45011c 100644
--- a/src/Nest/XPack/Watcher/Input/SimpleInput.cs
+++ b/src/Nest/XPack/Watcher/Input/SimpleInput.cs
@@ -14,54 +14,38 @@ public interface ISimpleInput : IInput
 
 	public class SimpleInput : InputBase, ISimpleInput, IEnumerable<KeyValuePair<string, object>>
 	{
-		private IDictionary<string, object> _payload;
+		public SimpleInput() { }
 
-		public IDictionary<string, object> Payload => _payload;
+		public SimpleInput(IDictionary<string, object> payload)
+			: this() => Payload = payload;
 
-		public SimpleInput() {}
+		public IDictionary<string, object> Payload { get; private set; }
 
-		public SimpleInput(IDictionary<string, object> payload)
-			: this()
-		{
-			this._payload = payload;
-		}
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+		public IEnumerator<KeyValuePair<string, object>> GetEnumerator() =>
+			Payload?.GetEnumerator() ?? Enumerable.Empty<KeyValuePair<string, object>>().GetEnumerator();
 
 		public void Add(string key, object value)
 		{
-			if (_payload == null) _payload = new Dictionary<string, object>();
-			_payload.Add(key, value);
+			if (Payload == null) Payload = new Dictionary<string, object>();
+			Payload.Add(key, value);
 		}
 
-		public void Remove(string key)
-		{
-			_payload?.Remove(key);
-		}
+		public void Remove(string key) => Payload?.Remove(key);
 
 		internal override void WrapInContainer(IInputContainer container) => container.Simple = this;
-
-		public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
-		{
-			return _payload?.GetEnumerator() ?? Enumerable.Empty<KeyValuePair<string, object>>().GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return this.GetEnumerator();
-		}
 	}
 
 	public class SimpleInputDescriptor : ISimpleInput, IDescriptor
 	{
 		private IDictionary<string, object> _payload;
 
-		IDictionary<string, object> ISimpleInput.Payload => _payload;
+		public SimpleInputDescriptor() { }
 
-		public SimpleInputDescriptor() {}
+		public SimpleInputDescriptor(IDictionary<string, object> payload) => _payload = payload;
 
-		public SimpleInputDescriptor(IDictionary<string, object> payload)
-		{
-			this._payload = payload;
-		}
+		IDictionary<string, object> ISimpleInput.Payload => _payload;
 
 		public SimpleInputDescriptor Add(string key, object value)
 		{
@@ -73,6 +57,7 @@ public SimpleInputDescriptor Add(string key, object value)
 		public SimpleInputDescriptor Remove(string key)
 		{
 			if (_payload == null) return this;
+
 			_payload.Remove(key);
 			return this;
 		}
@@ -80,15 +65,16 @@ public SimpleInputDescriptor Remove(string key)
 
 	internal class SimpleInputJsonConverter : JsonConverter
 	{
-		public override bool CanConvert(Type objectType) => true;
-
 		public override bool CanRead => true;
 
 		public override bool CanWrite => true;
 
+		public override bool CanConvert(Type objectType) => true;
+
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject) return null;
+
 			var dictionary = serializer.Deserialize<IDictionary<string, object>>(reader);
 			return new SimpleInput(dictionary);
 		}
@@ -97,6 +83,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		{
 			var s = value as ISimpleInput;
 			if (s?.Payload == null) return;
+
 			serializer.Serialize(writer, s.Payload);
 		}
 	}
diff --git a/src/Nest/XPack/Watcher/PutWatch/ElasticClient-PutWatch.cs b/src/Nest/XPack/Watcher/PutWatch/ElasticClient-PutWatch.cs
index 34504880a75..232f5f2d37f 100644
--- a/src/Nest/XPack/Watcher/PutWatch/ElasticClient-PutWatch.cs
+++ b/src/Nest/XPack/Watcher/PutWatch/ElasticClient-PutWatch.cs
@@ -14,39 +14,43 @@ public partial interface IElasticClient
 		/// </summary>
 		IPutWatchResponse PutWatch(Id watchId, Func<PutWatchDescriptor, IPutWatchRequest> selector = null);
 
-		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})"/>
+		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})" />
 		IPutWatchResponse PutWatch(IPutWatchRequest request);
 
-		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})"/>
-		Task<IPutWatchResponse> PutWatchAsync(Id watchId, Func<PutWatchDescriptor, IPutWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})" />
+		Task<IPutWatchResponse> PutWatchAsync(Id watchId, Func<PutWatchDescriptor, IPutWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})"/>
+		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})" />
 		Task<IPutWatchResponse> PutWatchAsync(IPutWatchRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutWatchResponse PutWatch(Id watchId, Func<PutWatchDescriptor, IPutWatchRequest> selector = null) =>
-			this.PutWatch(selector.InvokeOrDefault(new PutWatchDescriptor(watchId)));
+			PutWatch(selector.InvokeOrDefault(new PutWatchDescriptor(watchId)));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IPutWatchResponse PutWatch(IPutWatchRequest request) =>
-			this.Dispatcher.Dispatch<IPutWatchRequest, PutWatchRequestParameters, PutWatchResponse>(
+			Dispatcher.Dispatch<IPutWatchRequest, PutWatchRequestParameters, PutWatchResponse>(
 				request,
-				this.LowLevelDispatch.XpackWatcherPutWatchDispatch<PutWatchResponse>
+				LowLevelDispatch.XpackWatcherPutWatchDispatch<PutWatchResponse>
 			);
 
-		/// <inheritdoc/>
-		public Task<IPutWatchResponse> PutWatchAsync(Id watchId, Func<PutWatchDescriptor, IPutWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.PutWatchAsync(selector.InvokeOrDefault(new PutWatchDescriptor(watchId)), cancellationToken);
+		/// <inheritdoc />
+		public Task<IPutWatchResponse> PutWatchAsync(Id watchId, Func<PutWatchDescriptor, IPutWatchRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			PutWatchAsync(selector.InvokeOrDefault(new PutWatchDescriptor(watchId)), cancellationToken);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public Task<IPutWatchResponse> PutWatchAsync(IPutWatchRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IPutWatchRequest, PutWatchRequestParameters, PutWatchResponse, IPutWatchResponse>(
+			Dispatcher.DispatchAsync<IPutWatchRequest, PutWatchRequestParameters, PutWatchResponse, IPutWatchResponse>(
 				request,
 				cancellationToken,
-				this.LowLevelDispatch.XpackWatcherPutWatchDispatchAsync<PutWatchResponse>
+				LowLevelDispatch.XpackWatcherPutWatchDispatchAsync<PutWatchResponse>
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/PutWatch/PutWatchRequest.cs b/src/Nest/XPack/Watcher/PutWatch/PutWatchRequest.cs
index d48382f4505..2ef97cb983c 100644
--- a/src/Nest/XPack/Watcher/PutWatch/PutWatchRequest.cs
+++ b/src/Nest/XPack/Watcher/PutWatch/PutWatchRequest.cs
@@ -10,16 +10,10 @@ namespace Nest
 	public partial interface IPutWatchRequest
 	{
 		/// <summary>
-		/// Defines when the watch should run
-		/// </summary>
-		[JsonProperty("trigger")]
-		TriggerContainer Trigger { get; set; }
-
-		/// <summary>
-		/// Defines the input that loads the data for the watch
+		/// The actions that will be run if the condition matches
 		/// </summary>
-		[JsonProperty("input")]
-		InputContainer Input { get; set; }
+		[JsonProperty("actions")]
+		Actions Actions { get; set; }
 
 		/// <summary>
 		/// Defines if the actions should be run
@@ -28,10 +22,10 @@ public partial interface IPutWatchRequest
 		ConditionContainer Condition { get; set; }
 
 		/// <summary>
-		/// The actions that will be run if the condition matches
+		/// Defines the input that loads the data for the watch
 		/// </summary>
-		[JsonProperty("actions")]
-		Actions Actions { get; set; }
+		[JsonProperty("input")]
+		InputContainer Input { get; set; }
 
 		/// <summary>
 		/// Metadata that will be copied into the history entries
@@ -54,40 +48,46 @@ public partial interface IPutWatchRequest
 		/// </summary>
 		[JsonProperty("transform")]
 		TransformContainer Transform { get; set; }
+
+		/// <summary>
+		/// Defines when the watch should run
+		/// </summary>
+		[JsonProperty("trigger")]
+		TriggerContainer Trigger { get; set; }
 	}
 
-	/// <inheritdoc cref="IPutWatchRequest"/>
+	/// <inheritdoc cref="IPutWatchRequest" />
 	public partial class PutWatchRequest
 	{
-		public PutWatchRequest() {}
+		public PutWatchRequest() { }
 
-		/// <inheritdoc/>
-		public IDictionary<string, object> Metadata { get; set; }
+		/// <inheritdoc />
+		public Actions Actions { get; set; }
 
-		/// <inheritdoc/>
-		public TriggerContainer Trigger { get; set; }
+		/// <inheritdoc />
+		public ConditionContainer Condition { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public InputContainer Input { get; set; }
 
-		/// <inheritdoc/>
-		public string ThrottlePeriod { get; set; }
+		/// <inheritdoc />
+		public IDictionary<string, object> Metadata { get; set; }
 
-		/// <inheritdoc/>
-		public ConditionContainer Condition { get; set; }
+		/// <inheritdoc />
+		public string ThrottlePeriod { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public TransformContainer Transform { get; set; }
 
-		/// <inheritdoc/>
-		public Actions Actions { get; set; }
+		/// <inheritdoc />
+		public TriggerContainer Trigger { get; set; }
 	}
 
-	/// <inheritdoc cref="IPutWatchRequest"/>
+	/// <inheritdoc cref="IPutWatchRequest" />
 	[DescriptorFor("XpackWatcherPutWatch")]
 	public partial class PutWatchDescriptor
 	{
-		public PutWatchDescriptor() {}
+		public PutWatchDescriptor() { }
 
 		Actions IPutWatchRequest.Actions { get; set; }
 		ConditionContainer IPutWatchRequest.Condition { get; set; }
@@ -97,34 +97,34 @@ public PutWatchDescriptor() {}
 		TransformContainer IPutWatchRequest.Transform { get; set; }
 		TriggerContainer IPutWatchRequest.Trigger { get; set; }
 
-		/// <inheritdoc cref="IPutWatchRequest.Actions"/>
+		/// <inheritdoc cref="IPutWatchRequest.Actions" />
 		public PutWatchDescriptor Actions(Func<ActionsDescriptor, IPromise<Actions>> actions) =>
 			Assign(a => a.Actions = actions?.Invoke(new ActionsDescriptor())?.Value);
 
-		/// <inheritdoc cref="IPutWatchRequest.Condition"/>
+		/// <inheritdoc cref="IPutWatchRequest.Condition" />
 		public PutWatchDescriptor Condition(Func<ConditionDescriptor, ConditionContainer> selector) =>
 			Assign(a => a.Condition = selector.InvokeOrDefault(new ConditionDescriptor()));
 
-		/// <inheritdoc cref="IPutWatchRequest.Input"/>
+		/// <inheritdoc cref="IPutWatchRequest.Input" />
 		public PutWatchDescriptor Input(Func<InputDescriptor, InputContainer> selector) =>
 			Assign(a => a.Input = selector.InvokeOrDefault(new InputDescriptor()));
 
-		/// <inheritdoc cref="IPutWatchRequest.Metadata"/>
+		/// <inheritdoc cref="IPutWatchRequest.Metadata" />
 		public PutWatchDescriptor Metadata(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramsDictionary) =>
 			Assign(a => a.Metadata = paramsDictionary(new FluentDictionary<string, object>()));
 
-		/// <inheritdoc cref="IPutWatchRequest.Metadata"/>
+		/// <inheritdoc cref="IPutWatchRequest.Metadata" />
 		public PutWatchDescriptor Metadata(Dictionary<string, object> paramsDictionary) =>
 			Assign(a => a.Metadata = paramsDictionary);
 
-		/// <inheritdoc cref="IPutWatchRequest.ThrottlePeriod"/>
+		/// <inheritdoc cref="IPutWatchRequest.ThrottlePeriod" />
 		public PutWatchDescriptor ThrottlePeriod(string throttlePeriod) => Assign(a => a.ThrottlePeriod = throttlePeriod);
 
-		/// <inheritdoc cref="IPutWatchRequest.Transform"/>
+		/// <inheritdoc cref="IPutWatchRequest.Transform" />
 		public PutWatchDescriptor Transform(Func<TransformDescriptor, TransformContainer> selector) =>
 			Assign(a => a.Transform = selector.InvokeOrDefault(new TransformDescriptor()));
 
-		/// <inheritdoc cref="IPutWatchRequest.Trigger"/>
+		/// <inheritdoc cref="IPutWatchRequest.Trigger" />
 		public PutWatchDescriptor Trigger(Func<TriggerDescriptor, TriggerContainer> selector) =>
 			Assign(a => a.Trigger = selector.InvokeOrDefault(new TriggerDescriptor()));
 	}
diff --git a/src/Nest/XPack/Watcher/PutWatch/PutWatchResponse.cs b/src/Nest/XPack/Watcher/PutWatch/PutWatchResponse.cs
index cdfeaf6247d..31f013126a0 100644
--- a/src/Nest/XPack/Watcher/PutWatch/PutWatchResponse.cs
+++ b/src/Nest/XPack/Watcher/PutWatch/PutWatchResponse.cs
@@ -6,22 +6,21 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<PutWatchResponse>))]
 	public interface IPutWatchResponse : IResponse
 	{
+		[JsonProperty("created")]
+		bool Created { get; }
+
 		[JsonProperty("_id")]
 		string Id { get; }
 
 		[JsonProperty("_version")]
 		int Version { get; }
-
-		[JsonProperty("created")]
-		bool Created { get; }
 	}
 
 	public class PutWatchResponse : ResponseBase, IPutWatchResponse
 	{
+		public bool Created { get; internal set; }
 		public string Id { get; internal set; }
 
 		public int Version { get; internal set; }
-
-		public bool Created { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/RestartWatcher/ElasticClient-RestartWatcher.cs b/src/Nest/XPack/Watcher/RestartWatcher/ElasticClient-RestartWatcher.cs
index c712c3bf1da..d1e1beaae17 100644
--- a/src/Nest/XPack/Watcher/RestartWatcher/ElasticClient-RestartWatcher.cs
+++ b/src/Nest/XPack/Watcher/RestartWatcher/ElasticClient-RestartWatcher.cs
@@ -12,39 +12,47 @@ public partial interface IElasticClient
 		/// </summary>
 		IRestartWatcherResponse RestartWatcher(Func<RestartWatcherDescriptor, IRestartWatcherRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IRestartWatcherResponse RestartWatcher(IRestartWatcherRequest request);
 
-		/// <inheritdoc/>
-		Task<IRestartWatcherResponse> RestartWatcherAsync(Func<RestartWatcherDescriptor, IRestartWatcherRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRestartWatcherResponse> RestartWatcherAsync(Func<RestartWatcherDescriptor, IRestartWatcherRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
-		Task<IRestartWatcherResponse> RestartWatcherAsync(IRestartWatcherRequest request, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IRestartWatcherResponse> RestartWatcherAsync(IRestartWatcherRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRestartWatcherResponse RestartWatcher(Func<RestartWatcherDescriptor, IRestartWatcherRequest> selector = null) =>
-			this.RestartWatcher(selector.InvokeOrDefault(new RestartWatcherDescriptor()));
+			RestartWatcher(selector.InvokeOrDefault(new RestartWatcherDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IRestartWatcherResponse RestartWatcher(IRestartWatcherRequest request) =>
-			this.Dispatcher.Dispatch<IRestartWatcherRequest, RestartWatcherRequestParameters, RestartWatcherResponse>(
+			Dispatcher.Dispatch<IRestartWatcherRequest, RestartWatcherRequestParameters, RestartWatcherResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackWatcherRestartDispatch<RestartWatcherResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherRestartDispatch<RestartWatcherResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IRestartWatcherResponse> RestartWatcherAsync(Func<RestartWatcherDescriptor, IRestartWatcherRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.RestartWatcherAsync(selector.InvokeOrDefault(new RestartWatcherDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IRestartWatcherResponse> RestartWatcherAsync(IRestartWatcherRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IRestartWatcherRequest, RestartWatcherRequestParameters, RestartWatcherResponse, IRestartWatcherResponse>(
+		/// <inheritdoc />
+		public Task<IRestartWatcherResponse> RestartWatcherAsync(Func<RestartWatcherDescriptor, IRestartWatcherRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			RestartWatcherAsync(selector.InvokeOrDefault(new RestartWatcherDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IRestartWatcherResponse> RestartWatcherAsync(IRestartWatcherRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IRestartWatcherRequest, RestartWatcherRequestParameters, RestartWatcherResponse, IRestartWatcherResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackWatcherRestartDispatchAsync<RestartWatcherResponse>(p,c)
+				(p, d, c) => LowLevelDispatch.XpackWatcherRestartDispatchAsync<RestartWatcherResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/RestartWatcher/RestartWatcherRequest.cs b/src/Nest/XPack/Watcher/RestartWatcher/RestartWatcherRequest.cs
index 56ff1da4948..7c1c25aef29 100644
--- a/src/Nest/XPack/Watcher/RestartWatcher/RestartWatcherRequest.cs
+++ b/src/Nest/XPack/Watcher/RestartWatcher/RestartWatcherRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IRestartWatcherRequest {}
+	public partial interface IRestartWatcherRequest { }
 
-	public partial class RestartWatcherRequest {}
+	public partial class RestartWatcherRequest { }
 
 	[DescriptorFor("XpackWatcherRestart")]
-	public partial class RestartWatcherDescriptor {}
+	public partial class RestartWatcherDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/RestartWatcher/RestartWatcherResponse.cs b/src/Nest/XPack/Watcher/RestartWatcher/RestartWatcherResponse.cs
index 15afd654681..18dd0d77f6b 100644
--- a/src/Nest/XPack/Watcher/RestartWatcher/RestartWatcherResponse.cs
+++ b/src/Nest/XPack/Watcher/RestartWatcher/RestartWatcherResponse.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface IRestartWatcherResponse : IAcknowledgedResponse {}
+	public interface IRestartWatcherResponse : IAcknowledgedResponse { }
 
-	public class RestartWatcherResponse : AcknowledgedResponseBase, IRestartWatcherResponse {}
+	public class RestartWatcherResponse : AcknowledgedResponseBase, IRestartWatcherResponse { }
 }
diff --git a/src/Nest/XPack/Watcher/Schedule/CronExpression.cs b/src/Nest/XPack/Watcher/Schedule/CronExpression.cs
index 1432a403012..54123fa8440 100644
--- a/src/Nest/XPack/Watcher/Schedule/CronExpression.cs
+++ b/src/Nest/XPack/Watcher/Schedule/CronExpression.cs
@@ -6,52 +6,45 @@ namespace Nest
 	[JsonConverter(typeof(CronExpressionJsonConverter))]
 	public class CronExpression : ScheduleBase, IEquatable<CronExpression>
 	{
-		private string _expression;
+		private readonly string _expression;
 
 		public CronExpression(string expression)
 		{
 			if (expression == null) throw new ArgumentNullException(nameof(expression));
 			if (expression.Length == 0) throw new ArgumentException("must have a length", nameof(expression));
 
-			this._expression = expression;
+			_expression = expression;
 		}
 
-		public static implicit operator CronExpression(string expression) =>
-			new CronExpression(expression);
-
-		public override string ToString() => _expression;
-
-		internal override void WrapInContainer(IScheduleContainer container) => container.Cron = this;
-
 		public bool Equals(CronExpression other)
 		{
 			if (ReferenceEquals(null, other)) return false;
 			if (ReferenceEquals(this, other)) return true;
+
 			return string.Equals(_expression, other._expression);
 		}
 
+		public static implicit operator CronExpression(string expression) =>
+			new CronExpression(expression);
+
+		public override string ToString() => _expression;
+
+		internal override void WrapInContainer(IScheduleContainer container) => container.Cron = this;
+
 		public override bool Equals(object obj)
 		{
 			if (ReferenceEquals(null, obj)) return false;
 			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != this.GetType()) return false;
+			if (obj.GetType() != GetType()) return false;
+
 			return Equals((CronExpression)obj);
 		}
 
-		public override int GetHashCode()
-		{
-			return _expression?.GetHashCode() ?? 0;
-		}
+		public override int GetHashCode() => _expression?.GetHashCode() ?? 0;
 
-		public static bool operator ==(CronExpression left, CronExpression right)
-		{
-			return Equals(left, right);
-		}
+		public static bool operator ==(CronExpression left, CronExpression right) => Equals(left, right);
 
-		public static bool operator !=(CronExpression left, CronExpression right)
-		{
-			return !Equals(left, right);
-		}
+		public static bool operator !=(CronExpression left, CronExpression right) => !Equals(left, right);
 	}
 
 	internal class CronExpressionJsonConverter : JsonConverter
diff --git a/src/Nest/XPack/Watcher/Schedule/DailySchedule.cs b/src/Nest/XPack/Watcher/Schedule/DailySchedule.cs
index 9358ce651e3..1f0be67388c 100644
--- a/src/Nest/XPack/Watcher/Schedule/DailySchedule.cs
+++ b/src/Nest/XPack/Watcher/Schedule/DailySchedule.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -44,7 +44,7 @@ public interface IDailySchedule : ISchedule
 
 	public class DailySchedule : ScheduleBase, IDailySchedule
 	{
-		public Union<IEnumerable<string>,ITimeOfDay> At { get; set; }
+		public Union<IEnumerable<string>, ITimeOfDay> At { get; set; }
 
 		internal override void WrapInContainer(IScheduleContainer container) => container.Daily = this;
 	}
diff --git a/src/Nest/XPack/Watcher/Schedule/Day.cs b/src/Nest/XPack/Watcher/Schedule/Day.cs
index 0f1b4423aec..641942ab815 100644
--- a/src/Nest/XPack/Watcher/Schedule/Day.cs
+++ b/src/Nest/XPack/Watcher/Schedule/Day.cs
@@ -9,17 +9,23 @@ public enum Day
 	{
 		[EnumMember(Value = "sunday")]
 		Sunday,
+
 		[EnumMember(Value = "monday")]
 		Monday,
+
 		[EnumMember(Value = "tuesday")]
 		Tuesday,
+
 		[EnumMember(Value = "wednesday")]
 		Wednesday,
+
 		[EnumMember(Value = "thursday")]
 		Thursday,
+
 		[EnumMember(Value = "friday")]
 		Friday,
+
 		[EnumMember(Value = "saturday")]
 		Saturday
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Schedule/HourlySchedule.cs b/src/Nest/XPack/Watcher/Schedule/HourlySchedule.cs
index 90f0f895d43..b0bca74dc39 100644
--- a/src/Nest/XPack/Watcher/Schedule/HourlySchedule.cs
+++ b/src/Nest/XPack/Watcher/Schedule/HourlySchedule.cs
@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Watcher/Schedule/Interval.cs b/src/Nest/XPack/Watcher/Schedule/Interval.cs
index ec459189cd3..07692ca0a0e 100644
--- a/src/Nest/XPack/Watcher/Schedule/Interval.cs
+++ b/src/Nest/XPack/Watcher/Schedule/Interval.cs
@@ -13,12 +13,16 @@ public enum IntervalUnit
 	{
 		[EnumMember(Value = "s")]
 		Second,
+
 		[EnumMember(Value = "m")]
 		Minute,
+
 		[EnumMember(Value = "h")]
 		Hour,
+
 		[EnumMember(Value = "d")]
 		Day,
+
 		[EnumMember(Value = "w")]
 		Week,
 	}
@@ -26,23 +30,17 @@ public enum IntervalUnit
 	[JsonConverter(typeof(IntervalJsonConverter))]
 	public class Interval : ScheduleBase, IComparable<Interval>, IEquatable<Interval>
 	{
-		private static readonly Regex IntervalExpressionRegex = new Regex(@"^(?<factor>\d+)(?<unit>(?:w|d|h|m|s))?$", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-
-		private const long WeekSeconds = 604800;
 		private const long DaySeconds = 86400;
 		private const long HourSeconds = 3600;
 		private const long MinuteSeconds = 60;
 		private const long Second = 1;
 
-		private long _seconds;
-
-		public long Factor { get; }
+		private const long WeekSeconds = 604800;
 
-		public IntervalUnit? Unit { get; }
+		private static readonly Regex IntervalExpressionRegex =
+			new Regex(@"^(?<factor>\d+)(?<unit>(?:w|d|h|m|s))?$", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
 
-		public static implicit operator Interval(TimeSpan timeSpan) => new Interval(timeSpan);
-		public static implicit operator Interval(long seconds) => new Interval(seconds);
-		public static implicit operator Interval(string expression) => new Interval(expression);
+		private long _seconds;
 
 		public Interval(TimeSpan timeSpan)
 		{
@@ -53,44 +51,44 @@ public Interval(TimeSpan timeSpan)
 
 			if (totalSeconds >= WeekSeconds && totalSeconds % WeekSeconds == 0)
 			{
-				this.Factor = totalSeconds / WeekSeconds;
-				this.Unit = IntervalUnit.Week;
+				Factor = totalSeconds / WeekSeconds;
+				Unit = IntervalUnit.Week;
 			}
 			else if (totalSeconds >= DaySeconds && totalSeconds % DaySeconds == 0)
 			{
-				this.Factor = totalSeconds / DaySeconds;
-				this.Unit = IntervalUnit.Day;
+				Factor = totalSeconds / DaySeconds;
+				Unit = IntervalUnit.Day;
 			}
 			else if (totalSeconds >= HourSeconds && totalSeconds % HourSeconds == 0)
 			{
-				this.Factor = totalSeconds / HourSeconds;
-				this.Unit = IntervalUnit.Hour;
+				Factor = totalSeconds / HourSeconds;
+				Unit = IntervalUnit.Hour;
 			}
 			else if (totalSeconds >= MinuteSeconds && totalSeconds % MinuteSeconds == 0)
 			{
-				this.Factor = totalSeconds / MinuteSeconds;
-				this.Unit = IntervalUnit.Minute;
+				Factor = totalSeconds / MinuteSeconds;
+				Unit = IntervalUnit.Minute;
 			}
 			else
 			{
-				this.Factor = totalSeconds;
-				this.Unit = IntervalUnit.Second;
+				Factor = totalSeconds;
+				Unit = IntervalUnit.Second;
 			}
 
-			this._seconds = totalSeconds;
+			_seconds = totalSeconds;
 		}
 
 		public Interval(long seconds)
 		{
-			this.Factor = seconds;
-			this._seconds = seconds;
+			Factor = seconds;
+			_seconds = seconds;
 		}
 
 		public Interval(long factor, IntervalUnit unit)
 		{
-			this.Factor = factor;
-			this.Unit = unit;
-			SetSeconds(this.Factor, unit);
+			Factor = factor;
+			Unit = unit;
+			SetSeconds(Factor, unit);
 		}
 
 		public Interval(string intervalUnit)
@@ -102,28 +100,49 @@ public Interval(string intervalUnit)
 			if (!match.Success)
 				throw new ArgumentException($"Interval expression '{intervalUnit}' string is invalid", nameof(intervalUnit));
 
-			this.Factor = long.Parse(match.Groups["factor"].Value, CultureInfo.InvariantCulture);
+			Factor = long.Parse(match.Groups["factor"].Value, CultureInfo.InvariantCulture);
 
 			var unit = match.Groups["unit"].Success
 				? match.Groups["unit"].Value.ToEnum<IntervalUnit>().GetValueOrDefault(IntervalUnit.Second)
 				: IntervalUnit.Second;
 
-			this.Unit = unit;
-			SetSeconds(this.Factor, unit);
+			Unit = unit;
+			SetSeconds(Factor, unit);
 		}
 
+		public long Factor { get; }
+
+		public IntervalUnit? Unit { get; }
+
 		public int CompareTo(Interval other)
 		{
 			if (other == null) return 1;
-			if (this._seconds == other._seconds) return 0;
-			if (this._seconds < other._seconds) return -1;
+			if (_seconds == other._seconds) return 0;
+			if (_seconds < other._seconds) return -1;
+
 			return 1;
 		}
 
+		public bool Equals(Interval other)
+		{
+			if (ReferenceEquals(null, other)) return false;
+			if (ReferenceEquals(this, other)) return true;
+
+			return _seconds == other._seconds;
+		}
+
+		public static implicit operator Interval(TimeSpan timeSpan) => new Interval(timeSpan);
+
+		public static implicit operator Interval(long seconds) => new Interval(seconds);
+
+		public static implicit operator Interval(string expression) => new Interval(expression);
+
 		public static bool operator <(Interval left, Interval right) => left.CompareTo(right) < 0;
+
 		public static bool operator <=(Interval left, Interval right) => left.CompareTo(right) < 0 || left.Equals(right);
 
 		public static bool operator >(Interval left, Interval right) => left.CompareTo(right) > 0;
+
 		public static bool operator >=(Interval left, Interval right) => left.CompareTo(right) > 0 || left.Equals(right);
 
 		public static bool operator ==(Interval left, Interval right) =>
@@ -133,26 +152,20 @@ public int CompareTo(Interval other)
 
 		public override string ToString()
 		{
-			var factor = this.Factor.ToString(CultureInfo.InvariantCulture);
-			return (this.Unit.HasValue) ? factor + this.Unit.Value.GetStringValue() : factor;
-		}
-
-		public bool Equals(Interval other)
-		{
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return this._seconds == other._seconds;
+			var factor = Factor.ToString(CultureInfo.InvariantCulture);
+			return Unit.HasValue ? factor + Unit.Value.GetStringValue() : factor;
 		}
 
 		public override bool Equals(object obj)
 		{
 			if (ReferenceEquals(null, obj)) return false;
 			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != this.GetType()) return false;
+			if (obj.GetType() != GetType()) return false;
+
 			return Equals((Interval)obj);
 		}
 
-		public override int GetHashCode() => this._seconds.GetHashCode();
+		public override int GetHashCode() => _seconds.GetHashCode();
 
 		internal override void WrapInContainer(IScheduleContainer container) => container.Interval = this;
 
@@ -161,19 +174,19 @@ private void SetSeconds(long factor, IntervalUnit interval)
 			switch (interval)
 			{
 				case IntervalUnit.Week:
-					this._seconds = factor * WeekSeconds;
+					_seconds = factor * WeekSeconds;
 					break;
 				case IntervalUnit.Day:
-					this._seconds = factor * DaySeconds;
+					_seconds = factor * DaySeconds;
 					break;
 				case IntervalUnit.Hour:
-					this._seconds = factor * HourSeconds;
+					_seconds = factor * HourSeconds;
 					break;
 				case IntervalUnit.Minute:
-					this._seconds = factor * MinuteSeconds;
+					_seconds = factor * MinuteSeconds;
 					break;
 				case IntervalUnit.Second:
-					this._seconds = factor * Second;
+					_seconds = factor * Second;
 					break;
 			}
 		}
diff --git a/src/Nest/XPack/Watcher/Schedule/Month.cs b/src/Nest/XPack/Watcher/Schedule/Month.cs
index 860e9680c5d..8a91eb7c2fb 100644
--- a/src/Nest/XPack/Watcher/Schedule/Month.cs
+++ b/src/Nest/XPack/Watcher/Schedule/Month.cs
@@ -9,27 +9,38 @@ public enum Month
 	{
 		[EnumMember(Value = "january")]
 		January,
+
 		[EnumMember(Value = "february")]
 		February,
+
 		[EnumMember(Value = "march")]
 		March,
+
 		[EnumMember(Value = "april")]
 		April,
+
 		[EnumMember(Value = "may")]
 		May,
+
 		[EnumMember(Value = "june")]
 		June,
+
 		[EnumMember(Value = "july")]
 		July,
+
 		[EnumMember(Value = "august")]
 		August,
+
 		[EnumMember(Value = "september")]
 		September,
+
 		[EnumMember(Value = "october")]
 		October,
+
 		[EnumMember(Value = "november")]
 		November,
+
 		[EnumMember(Value = "december")]
 		December
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/XPack/Watcher/Schedule/MonthlySchedule.cs b/src/Nest/XPack/Watcher/Schedule/MonthlySchedule.cs
index 06c0e43f740..df6f0cf0376 100644
--- a/src/Nest/XPack/Watcher/Schedule/MonthlySchedule.cs
+++ b/src/Nest/XPack/Watcher/Schedule/MonthlySchedule.cs
@@ -1,30 +1,29 @@
 using System;
 using System.Collections;
-using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject]
 	[JsonConverter(typeof(ScheduleJsonConverter<IMonthlySchedule, MonthlySchedule, ITimeOfMonth>))]
-	public interface IMonthlySchedule : ISchedule, IEnumerable<ITimeOfMonth> {}
+	public interface IMonthlySchedule : ISchedule, IEnumerable<ITimeOfMonth> { }
 
 	public class MonthlySchedule : ScheduleBase, IMonthlySchedule
 	{
 		private List<ITimeOfMonth> _times;
 
-		public MonthlySchedule(IEnumerable<ITimeOfMonth> times)
-		{
-			this._times = times?.ToList();
-		}
+		public MonthlySchedule(IEnumerable<ITimeOfMonth> times) => _times = times?.ToList();
 
-		public MonthlySchedule(params ITimeOfMonth[] times)
-		{
-			this._times = times?.ToList();
-		}
+		public MonthlySchedule(params ITimeOfMonth[] times) => _times = times?.ToList();
+
+		public MonthlySchedule() { }
+
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-		public MonthlySchedule() {}
+		public IEnumerator<ITimeOfMonth> GetEnumerator() =>
+			_times?.GetEnumerator() ?? Enumerable.Empty<ITimeOfMonth>().GetEnumerator();
 
 		public void Add(ITimeOfMonth time)
 		{
@@ -32,23 +31,17 @@ public void Add(ITimeOfMonth time)
 			_times.Add(time);
 		}
 
-		public IEnumerator<ITimeOfMonth> GetEnumerator() =>
-			_times?.GetEnumerator() ?? Enumerable.Empty<ITimeOfMonth>().GetEnumerator();
-
-		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
 		internal override void WrapInContainer(IScheduleContainer container) => container.Monthly = this;
 
 		public static implicit operator MonthlySchedule(ITimeOfMonth[] timesOfMonth) =>
 			new MonthlySchedule(timesOfMonth);
 	}
 
-	public class MonthlyScheduleDescriptor :
-		DescriptorPromiseBase<MonthlyScheduleDescriptor, MonthlySchedule>
+	public class MonthlyScheduleDescriptor : DescriptorPromiseBase<MonthlyScheduleDescriptor, MonthlySchedule>
 	{
+		public MonthlyScheduleDescriptor() : base(new MonthlySchedule()) { }
+
 		public MonthlyScheduleDescriptor Add(Func<TimeOfMonthDescriptor, ITimeOfMonth> selector) =>
 			Assign(a => a.Add(selector.InvokeOrDefault(new TimeOfMonthDescriptor())));
-
-		public MonthlyScheduleDescriptor() : base(new MonthlySchedule()) {}
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Schedule/ScheduleBase.cs b/src/Nest/XPack/Watcher/Schedule/ScheduleBase.cs
index 72cb753e6e7..48559e9ce2c 100644
--- a/src/Nest/XPack/Watcher/Schedule/ScheduleBase.cs
+++ b/src/Nest/XPack/Watcher/Schedule/ScheduleBase.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface ISchedule {}
+	public interface ISchedule { }
 
 	public abstract class ScheduleBase : ISchedule
 	{
diff --git a/src/Nest/XPack/Watcher/Schedule/ScheduleContainer.cs b/src/Nest/XPack/Watcher/Schedule/ScheduleContainer.cs
index baa775e9a38..1fc4c6b0b18 100644
--- a/src/Nest/XPack/Watcher/Schedule/ScheduleContainer.cs
+++ b/src/Nest/XPack/Watcher/Schedule/ScheduleContainer.cs
@@ -7,31 +7,31 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<ScheduleContainer>))]
 	public interface IScheduleContainer
 	{
-		[JsonProperty("hourly")]
-		IHourlySchedule Hourly { get; set; }
+		[JsonProperty("cron")]
+		CronExpression Cron { get; set; }
 
 		[JsonProperty("daily")]
 		IDailySchedule Daily { get; set; }
 
-		[JsonProperty("weekly")]
-		IWeeklySchedule Weekly { get; set; }
+		[JsonProperty("hourly")]
+		IHourlySchedule Hourly { get; set; }
+
+		[JsonProperty("interval")]
+		Interval Interval { get; set; }
 
 		[JsonProperty("monthly")]
 		IMonthlySchedule Monthly { get; set; }
 
+		[JsonProperty("weekly")]
+		IWeeklySchedule Weekly { get; set; }
+
 		[JsonProperty("yearly")]
 		IYearlySchedule Yearly { get; set; }
-
-		[JsonProperty("cron")]
-		CronExpression Cron { get; set; }
-
-		[JsonProperty("interval")]
-		Interval Interval { get; set; }
 	}
 
 	public class ScheduleContainer : TriggerBase, IScheduleContainer
 	{
-		public ScheduleContainer() {}
+		public ScheduleContainer() { }
 
 		public ScheduleContainer(ScheduleBase schedule)
 		{
@@ -39,13 +39,14 @@ public ScheduleContainer(ScheduleBase schedule)
 			schedule.WrapInContainer(this);
 		}
 
+		public CronExpression Cron { get; set; }
+
 		public IDailySchedule Daily { get; set; }
-		public IMonthlySchedule Monthly { get; set; }
 		public IHourlySchedule Hourly { get; set; }
+		public Interval Interval { get; set; }
+		public IMonthlySchedule Monthly { get; set; }
 		public IWeeklySchedule Weekly { get; set; }
 		public IYearlySchedule Yearly { get; set; }
-		public CronExpression Cron { get; set; }
-		public Interval Interval { get; set; }
 
 		internal override void WrapInContainer(ITriggerContainer container) => container.Schedule = this;
 
@@ -54,16 +55,15 @@ public static implicit operator ScheduleContainer(ScheduleBase scheduleBase) =>
 			: new ScheduleContainer(scheduleBase);
 	}
 
-	public class ScheduleDescriptor :
-		DescriptorBase<ScheduleDescriptor, IScheduleContainer>, IScheduleContainer
+	public class ScheduleDescriptor : DescriptorBase<ScheduleDescriptor, IScheduleContainer>, IScheduleContainer
 	{
+		CronExpression IScheduleContainer.Cron { get; set; }
 		IDailySchedule IScheduleContainer.Daily { get; set; }
-		IMonthlySchedule IScheduleContainer.Monthly { get; set; }
 		IHourlySchedule IScheduleContainer.Hourly { get; set; }
+		Interval IScheduleContainer.Interval { get; set; }
+		IMonthlySchedule IScheduleContainer.Monthly { get; set; }
 		IWeeklySchedule IScheduleContainer.Weekly { get; set; }
 		IYearlySchedule IScheduleContainer.Yearly { get; set; }
-		CronExpression IScheduleContainer.Cron { get; set; }
-		Interval IScheduleContainer.Interval { get; set; }
 
 		public ScheduleDescriptor Daily(Func<DailyScheduleDescriptor, IDailySchedule> selector) =>
 			Assign(a => a.Daily = selector.Invoke(new DailyScheduleDescriptor()));
diff --git a/src/Nest/XPack/Watcher/Schedule/ScheduleTriggerEvent.cs b/src/Nest/XPack/Watcher/Schedule/ScheduleTriggerEvent.cs
index 51cf9a8267b..374f508acd7 100644
--- a/src/Nest/XPack/Watcher/Schedule/ScheduleTriggerEvent.cs
+++ b/src/Nest/XPack/Watcher/Schedule/ScheduleTriggerEvent.cs
@@ -7,18 +7,17 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<ScheduleTriggerEvent>))]
 	public interface IScheduleTriggerEvent : ITriggerEvent
 	{
-		[JsonProperty("triggered_time")]
-		Union<DateTimeOffset, string> TriggeredTime { get; set; }
-
 		[JsonProperty("scheduled_time")]
 		Union<DateTimeOffset, string> ScheduledTime { get; set; }
+
+		[JsonProperty("triggered_time")]
+		Union<DateTimeOffset, string> TriggeredTime { get; set; }
 	}
 
 	public class ScheduleTriggerEvent : TriggerEventBase, IScheduleTriggerEvent
 	{
-		public Union<DateTimeOffset,string> TriggeredTime { get; set; }
-
 		public Union<DateTimeOffset, string> ScheduledTime { get; set; }
+		public Union<DateTimeOffset, string> TriggeredTime { get; set; }
 
 		internal override void WrapInContainer(ITriggerEventContainer container) => container.Schedule = this;
 	}
@@ -26,8 +25,8 @@ public class ScheduleTriggerEvent : TriggerEventBase, IScheduleTriggerEvent
 	public class ScheduleTriggerEventDescriptor
 		: DescriptorBase<ScheduleTriggerEventDescriptor, IScheduleTriggerEvent>, IScheduleTriggerEvent
 	{
-		Union<DateTimeOffset, string> IScheduleTriggerEvent.TriggeredTime { get; set; }
 		Union<DateTimeOffset, string> IScheduleTriggerEvent.ScheduledTime { get; set; }
+		Union<DateTimeOffset, string> IScheduleTriggerEvent.TriggeredTime { get; set; }
 
 		public ScheduleTriggerEventDescriptor TriggeredTime(DateTimeOffset? triggeredTime) =>
 			Assign(a => a.TriggeredTime = triggeredTime);
diff --git a/src/Nest/XPack/Watcher/Schedule/TimeOfMonth.cs b/src/Nest/XPack/Watcher/Schedule/TimeOfMonth.cs
index 9cbd8911d42..4550acdedde 100644
--- a/src/Nest/XPack/Watcher/Schedule/TimeOfMonth.cs
+++ b/src/Nest/XPack/Watcher/Schedule/TimeOfMonth.cs
@@ -7,20 +7,18 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<TimeOfMonth>))]
 	public interface ITimeOfMonth
 	{
-		[JsonProperty("on")]
-		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<int>))]
-		IEnumerable<int> On { get; set; }
-
 		[JsonProperty("at")]
 		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<string>))]
 		IEnumerable<string> At { get; set; }
+
+		[JsonProperty("on")]
+		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<int>))]
+		IEnumerable<int> On { get; set; }
 	}
 
 	public class TimeOfMonth : ITimeOfMonth
 	{
-		public TimeOfMonth()
-		{
-		}
+		public TimeOfMonth() { }
 
 		public TimeOfMonth(int on, string at)
 		{
@@ -28,15 +26,15 @@ public TimeOfMonth(int on, string at)
 			At = new[] { at };
 		}
 
-		public IEnumerable<int> On { get; set; }
-
 		public IEnumerable<string> At { get; set; }
+
+		public IEnumerable<int> On { get; set; }
 	}
 
 	public class TimeOfMonthDescriptor : DescriptorBase<TimeOfMonthDescriptor, ITimeOfMonth>, ITimeOfMonth
 	{
-		IEnumerable<int> ITimeOfMonth.On { get; set; }
 		IEnumerable<string> ITimeOfMonth.At { get; set; }
+		IEnumerable<int> ITimeOfMonth.On { get; set; }
 
 		public TimeOfMonthDescriptor On(IEnumerable<int> dates) => Assign(a => a.On = dates);
 
diff --git a/src/Nest/XPack/Watcher/Schedule/TimeOfWeek.cs b/src/Nest/XPack/Watcher/Schedule/TimeOfWeek.cs
index c5590095d40..fed66e2cf5e 100644
--- a/src/Nest/XPack/Watcher/Schedule/TimeOfWeek.cs
+++ b/src/Nest/XPack/Watcher/Schedule/TimeOfWeek.cs
@@ -7,20 +7,18 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<TimeOfWeek>))]
 	public interface ITimeOfWeek
 	{
-		[JsonProperty("on")]
-		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<Day>))]
-		IEnumerable<Day> On { get; set; }
-
 		[JsonProperty("at")]
 		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<string>))]
 		IEnumerable<string> At { get; set; }
+
+		[JsonProperty("on")]
+		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<Day>))]
+		IEnumerable<Day> On { get; set; }
 	}
 
 	public class TimeOfWeek : ITimeOfWeek
 	{
-		public TimeOfWeek()
-		{
-		}
+		public TimeOfWeek() { }
 
 		public TimeOfWeek(Day on, string at)
 		{
@@ -28,15 +26,15 @@ public TimeOfWeek(Day on, string at)
 			At = new[] { at };
 		}
 
-		public IEnumerable<Day> On { get; set; }
-
 		public IEnumerable<string> At { get; set; }
+
+		public IEnumerable<Day> On { get; set; }
 	}
 
 	public class TimeOfWeekDescriptor : DescriptorBase<TimeOfWeekDescriptor, ITimeOfWeek>, ITimeOfWeek
 	{
-		IEnumerable<Day> ITimeOfWeek.On { get; set; }
 		IEnumerable<string> ITimeOfWeek.At { get; set; }
+		IEnumerable<Day> ITimeOfWeek.On { get; set; }
 
 		public TimeOfWeekDescriptor On(IEnumerable<Day> day) => Assign(a => a.On = day);
 
diff --git a/src/Nest/XPack/Watcher/Schedule/TimeOfYear.cs b/src/Nest/XPack/Watcher/Schedule/TimeOfYear.cs
index 93db1e361c0..8458101d9e2 100644
--- a/src/Nest/XPack/Watcher/Schedule/TimeOfYear.cs
+++ b/src/Nest/XPack/Watcher/Schedule/TimeOfYear.cs
@@ -7,6 +7,10 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<TimeOfYear>))]
 	public interface ITimeOfYear
 	{
+		[JsonProperty("at")]
+		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<string>))]
+		IEnumerable<string> At { get; set; }
+
 		[JsonProperty("int")]
 		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<Month>))]
 		IEnumerable<Month> In { get; set; }
@@ -14,26 +18,21 @@ public interface ITimeOfYear
 		[JsonProperty("on")]
 		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<int>))]
 		IEnumerable<int> On { get; set; }
-
-		[JsonProperty("at")]
-		[JsonConverter(typeof(ReadSingleOrEnumerableJsonConverter<string>))]
-		IEnumerable<string> At { get; set; }
 	}
 
 	public class TimeOfYear : ITimeOfYear
 	{
+		public IEnumerable<string> At { get; set; }
 		public IEnumerable<Month> In { get; set; }
 
 		public IEnumerable<int> On { get; set; }
-
-		public IEnumerable<string> At { get; set; }
 	}
 
 	public class TimeOfYearDescriptor : DescriptorBase<TimeOfYearDescriptor, ITimeOfYear>, ITimeOfYear
 	{
+		IEnumerable<string> ITimeOfYear.At { get; set; }
 		IEnumerable<Month> ITimeOfYear.In { get; set; }
 		IEnumerable<int> ITimeOfYear.On { get; set; }
-		IEnumerable<string> ITimeOfYear.At { get; set; }
 
 		public TimeOfYearDescriptor In(IEnumerable<Month> @in) => Assign(a => a.In = @in);
 
diff --git a/src/Nest/XPack/Watcher/Schedule/WeeklySchedule.cs b/src/Nest/XPack/Watcher/Schedule/WeeklySchedule.cs
index 4d791b73216..e5e37df68c5 100644
--- a/src/Nest/XPack/Watcher/Schedule/WeeklySchedule.cs
+++ b/src/Nest/XPack/Watcher/Schedule/WeeklySchedule.cs
@@ -1,30 +1,28 @@
 using System;
 using System.Collections;
-using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace Nest
 {
 	[JsonObject]
 	[JsonConverter(typeof(ScheduleJsonConverter<IWeeklySchedule, WeeklySchedule, ITimeOfWeek>))]
-	public interface IWeeklySchedule : ISchedule, IEnumerable<ITimeOfWeek> {}
+	public interface IWeeklySchedule : ISchedule, IEnumerable<ITimeOfWeek> { }
 
 	public class WeeklySchedule : ScheduleBase, IWeeklySchedule
 	{
 		private List<ITimeOfWeek> _times;
 
-		public WeeklySchedule(IEnumerable<ITimeOfWeek> times)
-		{
-			this._times = times?.ToList();
-		}
+		public WeeklySchedule(IEnumerable<ITimeOfWeek> times) => _times = times?.ToList();
 
-		public WeeklySchedule(params ITimeOfWeek[] times)
-		{
-			this._times = times?.ToList();
-		}
+		public WeeklySchedule(params ITimeOfWeek[] times) => _times = times?.ToList();
+
+		public WeeklySchedule() { }
+
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-		public WeeklySchedule() {}
+		public IEnumerator<ITimeOfWeek> GetEnumerator() => _times?.GetEnumerator() ?? Enumerable.Empty<ITimeOfWeek>().GetEnumerator();
 
 		public void Add(ITimeOfWeek time)
 		{
@@ -32,28 +30,18 @@ public void Add(ITimeOfWeek time)
 			_times.Add(time);
 		}
 
-		public IEnumerator<ITimeOfWeek> GetEnumerator()
-		{
-			return _times?.GetEnumerator() ?? Enumerable.Empty<ITimeOfWeek>().GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-
 		internal override void WrapInContainer(IScheduleContainer container) => container.Weekly = this;
 
 		public static implicit operator WeeklySchedule(ITimeOfWeek[] timesOfWeek) =>
 			new WeeklySchedule(timesOfWeek);
 	}
 
-	public class WeeklyScheduleDescriptor : DescriptorPromiseBase<WeeklyScheduleDescriptor,WeeklySchedule>
+	public class WeeklyScheduleDescriptor : DescriptorPromiseBase<WeeklyScheduleDescriptor, WeeklySchedule>
 	{
+		public WeeklyScheduleDescriptor() : base(new WeeklySchedule()) { }
+
 		public WeeklyScheduleDescriptor Add(Func<TimeOfWeekDescriptor, ITimeOfWeek> selector) =>
 			Assign(a => a.Add(selector.InvokeOrDefault(new TimeOfWeekDescriptor())));
-
-		public WeeklyScheduleDescriptor() : base(new WeeklySchedule()) {}
 	}
 
 	internal class ScheduleJsonConverter<TSchedule, TReadAsSchedule, TTime> : ReadSingleOrEnumerableJsonConverter<TTime>
diff --git a/src/Nest/XPack/Watcher/Schedule/YearlySchedule.cs b/src/Nest/XPack/Watcher/Schedule/YearlySchedule.cs
index 9aae647f0a5..d7e754c72b3 100644
--- a/src/Nest/XPack/Watcher/Schedule/YearlySchedule.cs
+++ b/src/Nest/XPack/Watcher/Schedule/YearlySchedule.cs
@@ -8,23 +8,22 @@ namespace Nest
 {
 	[JsonObject]
 	[JsonConverter(typeof(ScheduleJsonConverter<IYearlySchedule, YearlySchedule, ITimeOfYear>))]
-	public interface IYearlySchedule : ISchedule, IEnumerable<ITimeOfYear> {}
+	public interface IYearlySchedule : ISchedule, IEnumerable<ITimeOfYear> { }
 
 	public class YearlySchedule : ScheduleBase, IYearlySchedule
 	{
 		private List<ITimeOfYear> _times;
 
-		public YearlySchedule(IEnumerable<ITimeOfYear> times)
-		{
-			this._times = times?.ToList();
-		}
+		public YearlySchedule(IEnumerable<ITimeOfYear> times) => _times = times?.ToList();
 
-		public YearlySchedule(params ITimeOfYear[] times)
-		{
-			this._times = times?.ToList();
-		}
+		public YearlySchedule(params ITimeOfYear[] times) => _times = times?.ToList();
 
-		public YearlySchedule() {}
+		public YearlySchedule() { }
+
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+		public IEnumerator<ITimeOfYear> GetEnumerator() =>
+			_times?.GetEnumerator() ?? Enumerable.Empty<ITimeOfYear>().GetEnumerator();
 
 		public void Add(ITimeOfYear time)
 		{
@@ -34,19 +33,14 @@ public void Add(ITimeOfYear time)
 
 		internal override void WrapInContainer(IScheduleContainer container) => container.Yearly = this;
 
-		public IEnumerator<ITimeOfYear> GetEnumerator() =>
-			_times?.GetEnumerator() ?? Enumerable.Empty<ITimeOfYear>().GetEnumerator();
-
-		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
 		public static implicit operator YearlySchedule(ITimeOfYear[] times) => new YearlySchedule(times);
 	}
 
 	public class YearlyScheduleDescriptor : DescriptorPromiseBase<YearlyScheduleDescriptor, YearlySchedule>
 	{
+		public YearlyScheduleDescriptor() : base(new YearlySchedule()) { }
+
 		public YearlyScheduleDescriptor Add(Func<TimeOfYearDescriptor, ITimeOfYear> selector) =>
 			Assign(a => a.Add(selector.InvokeOrDefault(new TimeOfYearDescriptor())));
-
-		public YearlyScheduleDescriptor() : base(new YearlySchedule()) {}
 	}
 }
diff --git a/src/Nest/XPack/Watcher/StartWatcher/ElasticClient-StartWatcher.cs b/src/Nest/XPack/Watcher/StartWatcher/ElasticClient-StartWatcher.cs
index 64f1cb53600..2bb3e83b873 100644
--- a/src/Nest/XPack/Watcher/StartWatcher/ElasticClient-StartWatcher.cs
+++ b/src/Nest/XPack/Watcher/StartWatcher/ElasticClient-StartWatcher.cs
@@ -12,39 +12,45 @@ public partial interface IElasticClient
 		/// </summary>
 		IStartWatcherResponse StartWatcher(Func<StartWatcherDescriptor, IStartWatcherRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IStartWatcherResponse StartWatcher(IStartWatcherRequest request);
 
-		/// <inheritdoc/>
-		Task<IStartWatcherResponse> StartWatcherAsync(Func<StartWatcherDescriptor, IStartWatcherRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IStartWatcherResponse> StartWatcherAsync(Func<StartWatcherDescriptor, IStartWatcherRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IStartWatcherResponse> StartWatcherAsync(IStartWatcherRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStartWatcherResponse StartWatcher(Func<StartWatcherDescriptor, IStartWatcherRequest> selector = null) =>
-			this.StartWatcher(selector.InvokeOrDefault(new StartWatcherDescriptor()));
+			StartWatcher(selector.InvokeOrDefault(new StartWatcherDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStartWatcherResponse StartWatcher(IStartWatcherRequest request) =>
-			this.Dispatcher.Dispatch<IStartWatcherRequest, StartWatcherRequestParameters, StartWatcherResponse>(
+			Dispatcher.Dispatch<IStartWatcherRequest, StartWatcherRequestParameters, StartWatcherResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackWatcherStartDispatch<StartWatcherResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherStartDispatch<StartWatcherResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IStartWatcherResponse> StartWatcherAsync(Func<StartWatcherDescriptor, IStartWatcherRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.StartWatcherAsync(selector.InvokeOrDefault(new StartWatcherDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IStartWatcherResponse> StartWatcherAsync(IStartWatcherRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IStartWatcherRequest, StartWatcherRequestParameters, StartWatcherResponse, IStartWatcherResponse>(
+		/// <inheritdoc />
+		public Task<IStartWatcherResponse> StartWatcherAsync(Func<StartWatcherDescriptor, IStartWatcherRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			StartWatcherAsync(selector.InvokeOrDefault(new StartWatcherDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IStartWatcherResponse> StartWatcherAsync(IStartWatcherRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IStartWatcherRequest, StartWatcherRequestParameters, StartWatcherResponse, IStartWatcherResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackWatcherStartDispatchAsync<StartWatcherResponse>(p,c)
+				(p, d, c) => LowLevelDispatch.XpackWatcherStartDispatchAsync<StartWatcherResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/StartWatcher/StartWatcherRequest.cs b/src/Nest/XPack/Watcher/StartWatcher/StartWatcherRequest.cs
index 6a0afd9b691..ae798f1358f 100644
--- a/src/Nest/XPack/Watcher/StartWatcher/StartWatcherRequest.cs
+++ b/src/Nest/XPack/Watcher/StartWatcher/StartWatcherRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IStartWatcherRequest {}
+	public partial interface IStartWatcherRequest { }
 
-	public partial class StartWatcherRequest {}
+	public partial class StartWatcherRequest { }
 
 	[DescriptorFor("XpackWatcherStart")]
-	public partial class StartWatcherDescriptor {}
+	public partial class StartWatcherDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/StartWatcher/StartWatcherResponse.cs b/src/Nest/XPack/Watcher/StartWatcher/StartWatcherResponse.cs
index 83a0c6f4009..aee95123d89 100644
--- a/src/Nest/XPack/Watcher/StartWatcher/StartWatcherResponse.cs
+++ b/src/Nest/XPack/Watcher/StartWatcher/StartWatcherResponse.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface IStartWatcherResponse : IAcknowledgedResponse {}
+	public interface IStartWatcherResponse : IAcknowledgedResponse { }
 
-	public class StartWatcherResponse : AcknowledgedResponseBase, IStartWatcherResponse {}
+	public class StartWatcherResponse : AcknowledgedResponseBase, IStartWatcherResponse { }
 }
diff --git a/src/Nest/XPack/Watcher/StopWatcher/ElasticClient-StopWatcher.cs b/src/Nest/XPack/Watcher/StopWatcher/ElasticClient-StopWatcher.cs
index aadabf5441f..8f62a1964fe 100644
--- a/src/Nest/XPack/Watcher/StopWatcher/ElasticClient-StopWatcher.cs
+++ b/src/Nest/XPack/Watcher/StopWatcher/ElasticClient-StopWatcher.cs
@@ -12,39 +12,45 @@ public partial interface IElasticClient
 		/// </summary>
 		IStopWatcherResponse StopWatcher(Func<StopWatcherDescriptor, IStopWatcherRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IStopWatcherResponse StopWatcher(IStopWatcherRequest request);
 
-		/// <inheritdoc/>
-		Task<IStopWatcherResponse> StopWatcherAsync(Func<StopWatcherDescriptor, IStopWatcherRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IStopWatcherResponse> StopWatcherAsync(Func<StopWatcherDescriptor, IStopWatcherRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IStopWatcherResponse> StopWatcherAsync(IStopWatcherRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStopWatcherResponse StopWatcher(Func<StopWatcherDescriptor, IStopWatcherRequest> selector = null) =>
-			this.StopWatcher(selector.InvokeOrDefault(new StopWatcherDescriptor()));
+			StopWatcher(selector.InvokeOrDefault(new StopWatcherDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IStopWatcherResponse StopWatcher(IStopWatcherRequest request) =>
-			this.Dispatcher.Dispatch<IStopWatcherRequest, StopWatcherRequestParameters, StopWatcherResponse>(
+			Dispatcher.Dispatch<IStopWatcherRequest, StopWatcherRequestParameters, StopWatcherResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackWatcherStopDispatch<StopWatcherResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherStopDispatch<StopWatcherResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IStopWatcherResponse> StopWatcherAsync(Func<StopWatcherDescriptor, IStopWatcherRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.StopWatcherAsync(selector.InvokeOrDefault(new StopWatcherDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IStopWatcherResponse> StopWatcherAsync(IStopWatcherRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IStopWatcherRequest, StopWatcherRequestParameters, StopWatcherResponse, IStopWatcherResponse>(
+		/// <inheritdoc />
+		public Task<IStopWatcherResponse> StopWatcherAsync(Func<StopWatcherDescriptor, IStopWatcherRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			StopWatcherAsync(selector.InvokeOrDefault(new StopWatcherDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IStopWatcherResponse> StopWatcherAsync(IStopWatcherRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IStopWatcherRequest, StopWatcherRequestParameters, StopWatcherResponse, IStopWatcherResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackWatcherStopDispatchAsync<StopWatcherResponse>(p,c)
+				(p, d, c) => LowLevelDispatch.XpackWatcherStopDispatchAsync<StopWatcherResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/StopWatcher/StopWatcherRequest.cs b/src/Nest/XPack/Watcher/StopWatcher/StopWatcherRequest.cs
index 871e3e62232..7d48c41853a 100644
--- a/src/Nest/XPack/Watcher/StopWatcher/StopWatcherRequest.cs
+++ b/src/Nest/XPack/Watcher/StopWatcher/StopWatcherRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IStopWatcherRequest {}
+	public partial interface IStopWatcherRequest { }
 
-	public partial class StopWatcherRequest {}
+	public partial class StopWatcherRequest { }
 
 	[DescriptorFor("XpackWatcherStop")]
-	public partial class StopWatcherDescriptor {}
+	public partial class StopWatcherDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/StopWatcher/StopWatcherResponse.cs b/src/Nest/XPack/Watcher/StopWatcher/StopWatcherResponse.cs
index e27ef2722df..af9ac7dfa0a 100644
--- a/src/Nest/XPack/Watcher/StopWatcher/StopWatcherResponse.cs
+++ b/src/Nest/XPack/Watcher/StopWatcher/StopWatcherResponse.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface IStopWatcherResponse : IAcknowledgedResponse {}
+	public interface IStopWatcherResponse : IAcknowledgedResponse { }
 
-	public class StopWatcherResponse : AcknowledgedResponseBase, IStopWatcherResponse {}
+	public class StopWatcherResponse : AcknowledgedResponseBase, IStopWatcherResponse { }
 }
diff --git a/src/Nest/XPack/Watcher/Transform/ChainTransform.cs b/src/Nest/XPack/Watcher/Transform/ChainTransform.cs
index f0639d3a79a..ec93f7bf4a1 100644
--- a/src/Nest/XPack/Watcher/Transform/ChainTransform.cs
+++ b/src/Nest/XPack/Watcher/Transform/ChainTransform.cs
@@ -1,7 +1,7 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -14,12 +14,9 @@ public interface IChainTransform : ITransform
 
 	public class ChainTransform : TransformBase, IChainTransform
 	{
-		public ChainTransform() {}
+		public ChainTransform() { }
 
-		public ChainTransform(IEnumerable<TransformContainer> transforms)
-		{
-			this.Transforms = transforms?.ToList();
-		}
+		public ChainTransform(IEnumerable<TransformContainer> transforms) => Transforms = transforms?.ToList();
 
 		public ICollection<TransformContainer> Transforms { get; set; }
 
@@ -30,10 +27,7 @@ public class ChainTransformDescriptor : DescriptorBase<ChainTransformDescriptor,
 	{
 		public ChainTransformDescriptor() { }
 
-		public ChainTransformDescriptor(ICollection<TransformContainer> transforms)
-		{
-			Self.Transforms = transforms;
-		}
+		public ChainTransformDescriptor(ICollection<TransformContainer> transforms) => Self.Transforms = transforms;
 
 		ICollection<TransformContainer> IChainTransform.Transforms { get; set; }
 
@@ -54,12 +48,8 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var chainTransform = (IChainTransform)value;
 
 			if (chainTransform != null)
-			{
 				foreach (var transform in chainTransform.Transforms)
-				{
 					serializer.Serialize(writer, transform);
-				}
-			}
 
 			writer.WriteEndArray();
 		}
@@ -67,6 +57,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartArray) return null;
+
 			var transforms = serializer.Deserialize<ICollection<TransformContainer>>(reader);
 			return new ChainTransform(transforms);
 		}
diff --git a/src/Nest/XPack/Watcher/Transform/IndexedScriptTransform.cs b/src/Nest/XPack/Watcher/Transform/IndexedScriptTransform.cs
index 327b09525d0..bc68d303642 100644
--- a/src/Nest/XPack/Watcher/Transform/IndexedScriptTransform.cs
+++ b/src/Nest/XPack/Watcher/Transform/IndexedScriptTransform.cs
@@ -11,10 +11,7 @@ public interface IIndexedScriptTransform : IScriptTransform
 
 	public class IndexedScriptTransform : ScriptTransformBase, IIndexedScriptTransform
 	{
-		public IndexedScriptTransform(string id)
-		{
-			this.Id = id;
-		}
+		public IndexedScriptTransform(string id) => Id = id;
 
 		public string Id { get; set; }
 	}
@@ -22,12 +19,9 @@ public IndexedScriptTransform(string id)
 	public class IndexedScriptTransformDescriptor
 		: ScriptTransformDescriptorBase<IndexedScriptTransformDescriptor, IIndexedScriptTransform>, IIndexedScriptTransform
 	{
-		public IndexedScriptTransformDescriptor(string id)
-		{
-			Self.Id = id;
-		}
+		public IndexedScriptTransformDescriptor(string id) => Self.Id = id;
 
-		public IndexedScriptTransformDescriptor() {}
+		public IndexedScriptTransformDescriptor() { }
 
 		string IIndexedScriptTransform.Id { get; set; }
 	}
diff --git a/src/Nest/XPack/Watcher/Transform/InlineScriptTransform.cs b/src/Nest/XPack/Watcher/Transform/InlineScriptTransform.cs
index 5cbda80d382..3878dc83ca8 100644
--- a/src/Nest/XPack/Watcher/Transform/InlineScriptTransform.cs
+++ b/src/Nest/XPack/Watcher/Transform/InlineScriptTransform.cs
@@ -6,33 +6,38 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public interface IInlineScriptTransform : IScriptTransform
 	{
-		[JsonProperty("source")]
-		string Source { get; set; }
-
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		[JsonIgnore]
 		string Inline { get; set; }
+
+		[JsonProperty("source")]
+		string Source { get; set; }
 	}
 
 	public class InlineScriptTransform : ScriptTransformBase, IInlineScriptTransform
 	{
-		public InlineScriptTransform(string script)
+		public InlineScriptTransform(string script) => Source = script;
+
+		public string Inline
 		{
-			this.Source = script;
+			get => Source;
+			set => Source = value;
 		}
+
 		public string Source { get; set; }
-		public string Inline { get => this.Source; set => this.Source = value; }
 	}
 
 	public class InlineScriptTransformDescriptor
 		: ScriptTransformDescriptorBase<InlineScriptTransformDescriptor, IInlineScriptTransform>, IInlineScriptTransform
 	{
-		public InlineScriptTransformDescriptor(string inline)
+		public InlineScriptTransformDescriptor(string inline) => Self.Source = inline;
+
+		string IInlineScriptTransform.Inline
 		{
-			Self.Source = inline;
+			get => Self.Source;
+			set => Self.Source = value;
 		}
 
-		string IInlineScriptTransform.Inline { get => Self.Source; set => Self.Source = value; }
 		string IInlineScriptTransform.Source { get; set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Transform/ScriptTransformBase.cs b/src/Nest/XPack/Watcher/Transform/ScriptTransformBase.cs
index efbd83ef841..463651d0816 100644
--- a/src/Nest/XPack/Watcher/Transform/ScriptTransformBase.cs
+++ b/src/Nest/XPack/Watcher/Transform/ScriptTransformBase.cs
@@ -1,7 +1,7 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Nest
@@ -10,29 +10,28 @@ namespace Nest
 	[JsonConverter(typeof(ScriptTransformJsonConverter))]
 	public interface IScriptTransform : ITransform
 	{
+		[JsonProperty("lang")]
+		string Lang { get; set; }
+
 		[JsonProperty("params")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		Dictionary<string, object> Params { get; set; }
-
-		[JsonProperty("lang")]
-		string Lang { get; set; }
 	}
 
 	public abstract class ScriptTransformBase : TransformBase, IScriptTransform
 	{
-		public Dictionary<string, object> Params { get; set; }
-
 		public string Lang { get; set; }
+		public Dictionary<string, object> Params { get; set; }
 
 		internal override void WrapInContainer(ITransformContainer container) => container.Script = this;
 	}
 
 	public abstract class ScriptTransformDescriptorBase<TDescriptor, TInterface> : DescriptorBase<TDescriptor, TInterface>, IScriptTransform
-	where TDescriptor : ScriptTransformDescriptorBase<TDescriptor, TInterface>, TInterface, IScriptTransform
-	where TInterface : class, IScriptTransform
+		where TDescriptor : ScriptTransformDescriptorBase<TDescriptor, TInterface>, TInterface, IScriptTransform
+		where TInterface : class, IScriptTransform
 	{
-		Dictionary<string, object> IScriptTransform.Params { get; set; }
 		string IScriptTransform.Lang { get; set; }
+		Dictionary<string, object> IScriptTransform.Params { get; set; }
 
 		public TDescriptor Params(Dictionary<string, object> scriptParams) => Assign(a => a.Params = scriptParams);
 
@@ -59,10 +58,7 @@ internal class ScriptTransformJsonConverter : JsonConverter
 	{
 		public override bool CanWrite => false;
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
diff --git a/src/Nest/XPack/Watcher/Transform/SearchTransform.cs b/src/Nest/XPack/Watcher/Transform/SearchTransform.cs
index ae6613473ca..369860482e2 100644
--- a/src/Nest/XPack/Watcher/Transform/SearchTransform.cs
+++ b/src/Nest/XPack/Watcher/Transform/SearchTransform.cs
@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
-using System;
+using System;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/XPack/Watcher/Transform/TransformBase.cs b/src/Nest/XPack/Watcher/Transform/TransformBase.cs
index 39567978a3d..d5b66b62fc1 100644
--- a/src/Nest/XPack/Watcher/Transform/TransformBase.cs
+++ b/src/Nest/XPack/Watcher/Transform/TransformBase.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface ITransform {}
+	public interface ITransform { }
 
 	public abstract class TransformBase
 	{
diff --git a/src/Nest/XPack/Watcher/Transform/TransformContainer.cs b/src/Nest/XPack/Watcher/Transform/TransformContainer.cs
index 5cb384c3193..aa96eb5aca8 100644
--- a/src/Nest/XPack/Watcher/Transform/TransformContainer.cs
+++ b/src/Nest/XPack/Watcher/Transform/TransformContainer.cs
@@ -7,20 +7,20 @@ namespace Nest
 	[JsonConverter(typeof(ReserializeJsonConverter<TransformContainer, ITransformContainer>))]
 	public interface ITransformContainer
 	{
-		[JsonProperty("search")]
-		ISearchTransform Search { get; set; }
+		[JsonProperty("chain")]
+		IChainTransform Chain { get; set; }
 
 		[JsonProperty("script")]
 		IScriptTransform Script { get; set; }
 
-		[JsonProperty("chain")]
-		IChainTransform Chain { get; set; }
+		[JsonProperty("search")]
+		ISearchTransform Search { get; set; }
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]
 	public class TransformContainer : ITransformContainer, IDescriptor
 	{
-		internal TransformContainer() {}
+		internal TransformContainer() { }
 
 		public TransformContainer(TransformBase transform)
 		{
@@ -28,9 +28,10 @@ public TransformContainer(TransformBase transform)
 			transform.WrapInContainer(this);
 		}
 
-		ISearchTransform ITransformContainer.Search { get; set; }
-		IScriptTransform ITransformContainer.Script { get; set; }
 		IChainTransform ITransformContainer.Chain { get; set; }
+		IScriptTransform ITransformContainer.Script { get; set; }
+
+		ISearchTransform ITransformContainer.Search { get; set; }
 	}
 
 	public class TransformDescriptor : TransformContainer
diff --git a/src/Nest/XPack/Watcher/Trigger/TriggerBase.cs b/src/Nest/XPack/Watcher/Trigger/TriggerBase.cs
index f426f69b4af..d923505617e 100644
--- a/src/Nest/XPack/Watcher/Trigger/TriggerBase.cs
+++ b/src/Nest/XPack/Watcher/Trigger/TriggerBase.cs
@@ -1,6 +1,6 @@
 namespace Nest
 {
-	public interface ITrigger {}
+	public interface ITrigger { }
 
 	public abstract class TriggerBase : ITrigger
 	{
diff --git a/src/Nest/XPack/Watcher/Trigger/TriggerContainer.cs b/src/Nest/XPack/Watcher/Trigger/TriggerContainer.cs
index 1d6493099d6..2fa416fa12b 100644
--- a/src/Nest/XPack/Watcher/Trigger/TriggerContainer.cs
+++ b/src/Nest/XPack/Watcher/Trigger/TriggerContainer.cs
@@ -13,15 +13,15 @@ public interface ITriggerContainer
 
 	public class TriggerContainer : ITriggerContainer, IDescriptor
 	{
-		IScheduleContainer ITriggerContainer.Schedule { get; set; }
-
-		public TriggerContainer() {}
+		public TriggerContainer() { }
 
 		public TriggerContainer(TriggerBase trigger)
 		{
 			trigger.ThrowIfNull(nameof(trigger));
 			trigger.WrapInContainer(this);
 		}
+
+		IScheduleContainer ITriggerContainer.Schedule { get; set; }
 	}
 
 	public class TriggerDescriptor : TriggerContainer
diff --git a/src/Nest/XPack/Watcher/Trigger/TriggerEventBase.cs b/src/Nest/XPack/Watcher/Trigger/TriggerEventBase.cs
index 3b8f9153fc9..b9122e5210a 100644
--- a/src/Nest/XPack/Watcher/Trigger/TriggerEventBase.cs
+++ b/src/Nest/XPack/Watcher/Trigger/TriggerEventBase.cs
@@ -3,7 +3,7 @@
 namespace Nest
 {
 	[JsonObject]
-	public interface ITriggerEvent {}
+	public interface ITriggerEvent { }
 
 	public abstract class TriggerEventBase : ITriggerEvent
 	{
diff --git a/src/Nest/XPack/Watcher/Trigger/TriggerEventContainer.cs b/src/Nest/XPack/Watcher/Trigger/TriggerEventContainer.cs
index 26fb8b2aa54..b454de69697 100644
--- a/src/Nest/XPack/Watcher/Trigger/TriggerEventContainer.cs
+++ b/src/Nest/XPack/Watcher/Trigger/TriggerEventContainer.cs
@@ -13,7 +13,7 @@ public interface ITriggerEventContainer
 	[JsonObject]
 	public class TriggerEventContainer : ITriggerEventContainer, IDescriptor
 	{
-		public TriggerEventContainer() {}
+		public TriggerEventContainer() { }
 
 		public TriggerEventContainer(TriggerEventBase trigger)
 		{
diff --git a/src/Nest/XPack/Watcher/Watch.cs b/src/Nest/XPack/Watcher/Watch.cs
index b5469055006..f66ec94af81 100644
--- a/src/Nest/XPack/Watcher/Watch.cs
+++ b/src/Nest/XPack/Watcher/Watch.cs
@@ -6,29 +6,29 @@ namespace Nest
 	[JsonObject]
 	public class Watch
 	{
-		[JsonProperty("metadata")]
-		public IReadOnlyDictionary<string, object> Meta { get; internal set; }
-
-		[JsonProperty("input")]
-		public IInputContainer Input { get; internal set; }
+		[JsonProperty("actions")]
+		[JsonConverter(typeof(ActionsJsonConverter))]
+		public Actions Actions { get; internal set; }
 
 		[JsonProperty("condition")]
 		public IConditionContainer Condition { get; internal set; }
 
-		[JsonProperty("trigger")]
-		public ITriggerContainer Trigger { get; internal set; }
-
-		[JsonProperty("transform")]
-		public ITransformContainer Transform { get; internal set; }
+		[JsonProperty("input")]
+		public IInputContainer Input { get; internal set; }
 
-		[JsonProperty("actions")]
-		[JsonConverter(typeof(ActionsJsonConverter))]
-		public Actions Actions { get; internal set; }
+		[JsonProperty("metadata")]
+		public IReadOnlyDictionary<string, object> Meta { get; internal set; }
 
 		[JsonProperty("status")]
 		public WatchStatus Status { get; internal set; }
 
 		[JsonProperty("throttle_period")]
 		public string ThrottlePeriod { get; internal set; }
+
+		[JsonProperty("transform")]
+		public ITransformContainer Transform { get; internal set; }
+
+		[JsonProperty("trigger")]
+		public ITriggerContainer Trigger { get; internal set; }
 	}
 }
diff --git a/src/Nest/XPack/Watcher/WatcherStats/ElasticClient-WatcherStats.cs b/src/Nest/XPack/Watcher/WatcherStats/ElasticClient-WatcherStats.cs
index c9c5b73065c..62bde40ebd3 100644
--- a/src/Nest/XPack/Watcher/WatcherStats/ElasticClient-WatcherStats.cs
+++ b/src/Nest/XPack/Watcher/WatcherStats/ElasticClient-WatcherStats.cs
@@ -12,39 +12,45 @@ public partial interface IElasticClient
 		/// </summary>
 		IWatcherStatsResponse WatcherStats(Func<WatcherStatsDescriptor, IWatcherStatsRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		IWatcherStatsResponse WatcherStats(IWatcherStatsRequest request);
 
-		/// <inheritdoc/>
-		Task<IWatcherStatsResponse> WatcherStatsAsync(Func<WatcherStatsDescriptor, IWatcherStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+		/// <inheritdoc />
+		Task<IWatcherStatsResponse> WatcherStatsAsync(Func<WatcherStatsDescriptor, IWatcherStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		);
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		Task<IWatcherStatsResponse> WatcherStatsAsync(IWatcherStatsRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
 	public partial class ElasticClient
 	{
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IWatcherStatsResponse WatcherStats(Func<WatcherStatsDescriptor, IWatcherStatsRequest> selector = null) =>
-			this.WatcherStats(selector.InvokeOrDefault(new WatcherStatsDescriptor()));
+			WatcherStats(selector.InvokeOrDefault(new WatcherStatsDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc />
 		public IWatcherStatsResponse WatcherStats(IWatcherStatsRequest request) =>
-			this.Dispatcher.Dispatch<IWatcherStatsRequest, WatcherStatsRequestParameters, WatcherStatsResponse>(
+			Dispatcher.Dispatch<IWatcherStatsRequest, WatcherStatsRequestParameters, WatcherStatsResponse>(
 				request,
-				(p, d) => this.LowLevelDispatch.XpackWatcherStatsDispatch<WatcherStatsResponse>(p)
+				(p, d) => LowLevelDispatch.XpackWatcherStatsDispatch<WatcherStatsResponse>(p)
 			);
 
-		/// <inheritdoc/>
-		public Task<IWatcherStatsResponse> WatcherStatsAsync(Func<WatcherStatsDescriptor, IWatcherStatsRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.WatcherStatsAsync(selector.InvokeOrDefault(new WatcherStatsDescriptor()), cancellationToken);
-
-		/// <inheritdoc/>
-		public Task<IWatcherStatsResponse> WatcherStatsAsync(IWatcherStatsRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.Dispatcher.DispatchAsync<IWatcherStatsRequest, WatcherStatsRequestParameters, WatcherStatsResponse, IWatcherStatsResponse>(
+		/// <inheritdoc />
+		public Task<IWatcherStatsResponse> WatcherStatsAsync(Func<WatcherStatsDescriptor, IWatcherStatsRequest> selector = null,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			WatcherStatsAsync(selector.InvokeOrDefault(new WatcherStatsDescriptor()), cancellationToken);
+
+		/// <inheritdoc />
+		public Task<IWatcherStatsResponse> WatcherStatsAsync(IWatcherStatsRequest request,
+			CancellationToken cancellationToken = default(CancellationToken)
+		) =>
+			Dispatcher.DispatchAsync<IWatcherStatsRequest, WatcherStatsRequestParameters, WatcherStatsResponse, IWatcherStatsResponse>(
 				request,
 				cancellationToken,
-				(p, d, c) => this.LowLevelDispatch.XpackWatcherStatsDispatchAsync<WatcherStatsResponse>(p,c)
+				(p, d, c) => LowLevelDispatch.XpackWatcherStatsDispatchAsync<WatcherStatsResponse>(p, c)
 			);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/WatcherStats/WatcherStatsRequest.cs b/src/Nest/XPack/Watcher/WatcherStats/WatcherStatsRequest.cs
index df15838ee6e..b83dbf48713 100644
--- a/src/Nest/XPack/Watcher/WatcherStats/WatcherStatsRequest.cs
+++ b/src/Nest/XPack/Watcher/WatcherStats/WatcherStatsRequest.cs
@@ -1,9 +1,9 @@
 namespace Nest
 {
-	public partial interface IWatcherStatsRequest {}
+	public partial interface IWatcherStatsRequest { }
 
-	public partial class WatcherStatsRequest {}
+	public partial class WatcherStatsRequest { }
 
 	[DescriptorFor("XpackWatcherStats")]
-	public partial class WatcherStatsDescriptor {}
+	public partial class WatcherStatsDescriptor { }
 }
diff --git a/src/Nest/XPack/Watcher/WatcherStats/WatcherStatsResponse.cs b/src/Nest/XPack/Watcher/WatcherStats/WatcherStatsResponse.cs
index f2559572a9f..eb2b8654788 100644
--- a/src/Nest/XPack/Watcher/WatcherStats/WatcherStatsResponse.cs
+++ b/src/Nest/XPack/Watcher/WatcherStats/WatcherStatsResponse.cs
@@ -17,34 +17,32 @@ public interface IWatcherStatsResponse : IResponse
 
 		[JsonProperty("stats")]
 		IReadOnlyCollection<WatcherNodeStats> Stats { get; }
-
 	}
 
 	public class WatcherStatsResponse : ResponseBase, IWatcherStatsResponse
 	{
-		public IReadOnlyCollection<WatcherNodeStats> Stats { get; internal set; } = EmptyReadOnly<WatcherNodeStats>.Collection;
+		public string ClusterName { get; internal set; }
 
 		public bool ManuallyStopped { get; internal set; }
-
-		public string ClusterName { get; internal set; }
+		public IReadOnlyCollection<WatcherNodeStats> Stats { get; internal set; } = EmptyReadOnly<WatcherNodeStats>.Collection;
 	}
 
 	public class WatcherNodeStats
 	{
-		[JsonProperty("watcher_state")]
-		public WatcherState WatcherState { get; internal set; }
-
-		[JsonProperty("watch_count")]
-		public long WatchCount { get; internal set; }
+		[JsonProperty("current_watches")]
+		public IReadOnlyCollection<WatchRecordStats> CurrentWatches { get; internal set; } = EmptyReadOnly<WatchRecordStats>.Collection;
 
 		[JsonProperty("execution_thread_pool")]
 		public ExecutionThreadPool ExecutionThreadPool { get; internal set; }
 
-		[JsonProperty("current_watches")]
-		public IReadOnlyCollection<WatchRecordStats> CurrentWatches { get; internal set; } = EmptyReadOnly<WatchRecordStats>.Collection;
-
 		[JsonProperty("queued_watches")]
 		public IReadOnlyCollection<WatchRecordQueuedStats> QueuedWatches { get; internal set; } = EmptyReadOnly<WatchRecordQueuedStats>.Collection;
+
+		[JsonProperty("watch_count")]
+		public long WatchCount { get; internal set; }
+
+		[JsonProperty("watcher_state")]
+		public WatcherState WatcherState { get; internal set; }
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
@@ -65,19 +63,19 @@ public enum WatcherState
 
 	public class WatchRecordQueuedStats
 	{
-		[JsonProperty("watch_id")]
-		public string WatchId { get; internal set; }
-
-		[JsonProperty("watch_record_id")]
-		public string WatchRecordId { get; internal set; }
+		[JsonProperty("execution_time")]
+		public DateTimeOffset? ExecutionTime { get; internal set; }
 
 		[JsonProperty("triggered_time")]
 		public DateTimeOffset? TriggeredTime { get; internal set; }
 
-		[JsonProperty("execution_time")]
-		public DateTimeOffset? ExecutionTime { get; internal set; }
+		[JsonProperty("watch_id")]
+		public string WatchId { get; internal set; }
 
+		[JsonProperty("watch_record_id")]
+		public string WatchRecordId { get; internal set; }
 	}
+
 	public class WatchRecordStats : WatchRecordQueuedStats
 	{
 		[JsonProperty("execution_phase")]
@@ -87,11 +85,11 @@ public class WatchRecordStats : WatchRecordQueuedStats
 	[JsonObject]
 	public class ExecutionThreadPool
 	{
-		[JsonProperty("queue_size")]
-		public long QueueSize { get; internal set; }
-
 		[JsonProperty("max_size")]
 		public long MaxSize { get; internal set; }
+
+		[JsonProperty("queue_size")]
+		public long QueueSize { get; internal set; }
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]
diff --git a/src/Nest/_Generated/Requests.patched.cs b/src/Nest/_Generated/Requests.patched.cs
index 0d4b95bad53..8aca2d361a5 100644
--- a/src/Nest/_Generated/Requests.patched.cs
+++ b/src/Nest/_Generated/Requests.patched.cs
@@ -17,27 +17,27 @@ public partial class ForceMergeRequest : PlainRequestBase<ForceMergeRequestParam
 	public partial class IndicesShardStoresRequest : PlainRequestBase<IndicesShardStoresRequestParameters>, IIndicesShardStoresRequest
 	{
 		[Obsolete("Removed in NEST 7.x. Calling this is a no-op.")]
-		public string OperationThreading{ get; set; }
+		public string OperationThreading { get; set; }
 	}
 
 	// Patched parameters - Update REST API json specifications to 6.2 #3268
 	public partial class SegmentsRequest : PlainRequestBase<SegmentsRequestParameters>, ISegmentsRequest
 	{
 		[Obsolete("Removed in NEST 7.x. Calling this is a no-op.")]
-		public string OperationThreading{ get; set; }
+		public string OperationThreading { get; set; }
 	}
 
 	// Patched parameters - Update REST API json specifications to 6.2 #3268
 	public partial class ValidateQueryRequest<T> : PlainRequestBase<ValidateQueryRequestParameters>, IValidateQueryRequest
 	{
 		[Obsolete("Removed in NEST 7.x. Calling this is a no-op.")]
-		public string OperationThreading{ get; set; }
+		public string OperationThreading { get; set; }
 	}
 
 	// Patched parameters - Update REST API json specifications to 6.2 #3268
 	public partial class ValidateQueryRequest : PlainRequestBase<ValidateQueryRequestParameters>, IValidateQueryRequest
 	{
 		[Obsolete("Removed in NEST 7.x. Calling this is a no-op.")]
-		public string OperationThreading{ get; set; }
+		public string OperationThreading { get; set; }
 	}
 }
diff --git a/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs b/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs
index b6bc88836c0..7e18bf0f266 100644
--- a/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs
+++ b/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs
@@ -9,16 +9,14 @@ namespace Nest.JsonNetSerializer
 {
 	public class ConnectionSettingsAwareContractResolver : DefaultContractResolver
 	{
-		protected IConnectionSettingsValues ConnectionSettings { get; }
-
-		public ConnectionSettingsAwareContractResolver(IConnectionSettingsValues connectionSettings)
-		{
+		public ConnectionSettingsAwareContractResolver(IConnectionSettingsValues connectionSettings) =>
 			ConnectionSettings = connectionSettings ?? throw new ArgumentNullException(nameof(connectionSettings));
-		}
+
+		protected IConnectionSettingsValues ConnectionSettings { get; }
 
 		protected override string ResolvePropertyName(string fieldName) =>
-			this.ConnectionSettings.DefaultFieldNameInferrer != null
-				? this.ConnectionSettings.DefaultFieldNameInferrer(fieldName)
+			ConnectionSettings.DefaultFieldNameInferrer != null
+				? ConnectionSettings.DefaultFieldNameInferrer(fieldName)
 				: base.ResolvePropertyName(fieldName);
 
 		protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
@@ -32,10 +30,10 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
 		/// <summary> Renames/Ignores a property based on the connection settings mapping or custom attributes for the property </summary>
 		private void ApplyPropertyOverrides(MemberInfo member, JsonProperty property)
 		{
-			if (!this.ConnectionSettings.PropertyMappings.TryGetValue(member, out var propertyMapping))
+			if (!ConnectionSettings.PropertyMappings.TryGetValue(member, out var propertyMapping))
 				propertyMapping = ElasticsearchPropertyAttributeBase.From(member);
 
-			var serializerMapping = this.ConnectionSettings.PropertyMappingProvider?.CreatePropertyMapping(member);
+			var serializerMapping = ConnectionSettings.PropertyMappingProvider?.CreatePropertyMapping(member);
 
 			var nameOverride = propertyMapping?.Name ?? serializerMapping?.Name;
 			if (!string.IsNullOrWhiteSpace(nameOverride)) property.PropertyName = nameOverride;
@@ -57,6 +55,7 @@ private static bool ShouldSerializeQueryContainer(object o, JsonProperty prop)
 		{
 			if (o == null) return false;
 			if (!(prop.ValueProvider.GetValue(o) is IQueryContainer q)) return false;
+
 			return q.IsWritable;
 		}
 
@@ -64,9 +63,9 @@ private static bool ShouldSerializeQueryContainers(object o, JsonProperty prop)
 		{
 			if (o == null) return false;
 			if (!(prop.ValueProvider.GetValue(o) is IEnumerable<QueryContainer> q)) return false;
+
 			var queryContainers = q as QueryContainer[] ?? q.ToArray();
-			return queryContainers.Any(qq=>qq != null && ((IQueryContainer)qq).IsWritable);
+			return queryContainers.Any(qq => qq != null && ((IQueryContainer)qq).IsWritable);
 		}
-
 	}
 }
diff --git a/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Customization.cs b/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Customization.cs
index a6b1f526f43..0170aacbdb5 100644
--- a/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Customization.cs
+++ b/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Customization.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest.JsonNetSerializer
 {
@@ -15,11 +13,13 @@ public abstract partial class ConnectionSettingsAwareSerializerBase : IElasticse
 		// Default buffer size of StreamWriter, which is private :(
 		internal const int DefaultBufferSize = 1024;
 
+		private static readonly Task CompletedTask = Task.CompletedTask;
+
 		internal static readonly Encoding ExpectedEncoding = new UTF8Encoding(false);
-		protected virtual int BufferSize => DefaultBufferSize;
+		private readonly JsonSerializer _collapsedSerializer;
 
 		private readonly JsonSerializer _serializer;
-		private readonly JsonSerializer _collapsedSerializer;
+		protected virtual int BufferSize => DefaultBufferSize;
 
 		public T Deserialize<T>(Stream stream)
 		{
@@ -41,7 +41,7 @@ public object Deserialize(Type type, Stream stream)
 			using (var jsonTextReader = new JsonTextReader(streamReader))
 			{
 				var token = await jsonTextReader.ReadTokenWithDateParseHandlingNoneAsync(cancellationToken).ConfigureAwait(false);
-				return token.ToObject<T>(this._serializer);
+				return token.ToObject<T>(_serializer);
 			}
 		}
 
@@ -51,13 +51,13 @@ public object Deserialize(Type type, Stream stream)
 			using (var jsonTextReader = new JsonTextReader(streamReader))
 			{
 				var token = await jsonTextReader.ReadTokenWithDateParseHandlingNoneAsync(cancellationToken).ConfigureAwait(false);
-				return token.ToObject(type, this._serializer);
+				return token.ToObject(type, _serializer);
 			}
 		}
 
 		public void Serialize<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented)
 		{
-			using (var writer = new StreamWriter(stream, ExpectedEncoding, BufferSize, leaveOpen: true))
+			using (var writer = new StreamWriter(stream, ExpectedEncoding, BufferSize, true))
 			using (var jsonWriter = new JsonTextWriter(writer))
 			{
 				var serializer = formatting == SerializationFormatting.Indented ? _serializer : _collapsedSerializer;
@@ -65,14 +65,13 @@ public void Serialize<T>(T data, Stream stream, SerializationFormatting formatti
 			}
 		}
 
-		private static readonly Task CompletedTask = Task.CompletedTask;
-
 		public Task SerializeAsync<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented,
-			CancellationToken cancellationToken = default(CancellationToken))
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 		{
 			//This makes no sense now but we need the async method on the interface in 6.x so we can start swapping this out
 			//for an implementation that does make sense without having to wait for 7.x
-			this.Serialize(data, stream, formatting);
+			Serialize(data, stream, formatting);
 			return CompletedTask;
 		}
 	}
diff --git a/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs b/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs
index 058a6243b9b..600aa94a1f5 100644
--- a/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs
+++ b/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs
@@ -2,24 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
+using Nest.JsonNetSerializer.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using Nest.JsonNetSerializer.Converters;
 
 namespace Nest.JsonNetSerializer
 {
 	public abstract partial class ConnectionSettingsAwareSerializerBase
 	{
-		protected Func<JsonSerializerSettings> JsonSerializerSettingsFactory { get; }
-		protected Action<ConnectionSettingsAwareContractResolver> ModifyContractResolverCallback { get; }
-		protected IEnumerable<JsonConverter> ContractJsonConverters { get; }
-
-		protected IConnectionSettingsValues ConnectionSettings { get; }
-
-		protected IElasticsearchSerializer BuiltinSerializer { get; }
-
-		private List<JsonConverter> Converters { get; }
-
 		protected ConnectionSettingsAwareSerializerBase(IElasticsearchSerializer builtinSerializer, IConnectionSettingsValues connectionSettings)
 			: this(builtinSerializer, connectionSettings, null, null, null) { }
 
@@ -28,16 +18,16 @@ internal ConnectionSettingsAwareSerializerBase(
 			IConnectionSettingsValues connectionSettings,
 			Func<JsonSerializerSettings> jsonSerializerSettingsFactory,
 			Action<ConnectionSettingsAwareContractResolver> modifyContractResolver,
-			IEnumerable<JsonConverter> contractJsonConverters)
+			IEnumerable<JsonConverter> contractJsonConverters
+		)
 		{
-
 			JsonSerializerSettingsFactory = jsonSerializerSettingsFactory;
 			ModifyContractResolverCallback = modifyContractResolver;
 			ContractJsonConverters = contractJsonConverters ?? Enumerable.Empty<JsonConverter>();
 
 			ConnectionSettings = connectionSettings;
 			BuiltinSerializer = builtinSerializer;
-			this.Converters = new List<JsonConverter>
+			Converters = new List<JsonConverter>
 			{
 				new HandleNestTypesOnSourceJsonConverter(BuiltinSerializer),
 				new TimeSpanToStringConverter()
@@ -46,15 +36,25 @@ internal ConnectionSettingsAwareSerializerBase(
 			_collapsedSerializer = CreateSerializer(SerializationFormatting.None);
 		}
 
+		protected IElasticsearchSerializer BuiltinSerializer { get; }
+
+		protected IConnectionSettingsValues ConnectionSettings { get; }
+		protected IEnumerable<JsonConverter> ContractJsonConverters { get; }
+		protected Func<JsonSerializerSettings> JsonSerializerSettingsFactory { get; }
+		protected Action<ConnectionSettingsAwareContractResolver> ModifyContractResolverCallback { get; }
+
+		private List<JsonConverter> Converters { get; }
+
 
 		private JsonSerializer CreateSerializer(SerializationFormatting formatting)
 		{
-			var s = CreateJsonSerializerSettings() ?? new JsonSerializerSettings();;
+			var s = CreateJsonSerializerSettings() ?? new JsonSerializerSettings();
+			;
 			var converters = CreateJsonConverters() ?? Enumerable.Empty<JsonConverter>();
 			var contract = CreateContractResolver();
 			s.Formatting = formatting == SerializationFormatting.Indented ? Formatting.Indented : Formatting.None;
 			s.ContractResolver = contract;
-			foreach (var converter in converters.Concat(this.Converters))
+			foreach (var converter in converters.Concat(Converters))
 				s.Converters.Add(converter);
 
 			return JsonSerializer.Create(s);
@@ -62,7 +62,7 @@ private JsonSerializer CreateSerializer(SerializationFormatting formatting)
 
 		private IContractResolver CreateContractResolver()
 		{
-			var contract = new ConnectionSettingsAwareContractResolver(this.ConnectionSettings);
+			var contract = new ConnectionSettingsAwareContractResolver(ConnectionSettings);
 			ModifyContractResolver(contract);
 			return contract;
 		}
diff --git a/src/Serializers/Nest.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs b/src/Serializers/Nest.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs
index 67b5b0e04eb..a82a887d436 100644
--- a/src/Serializers/Nest.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs
+++ b/src/Serializers/Nest.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -12,15 +9,23 @@ namespace Nest.JsonNetSerializer.Converters
 {
 	public class HandleNestTypesOnSourceJsonConverter : JsonConverter
 	{
+		private static readonly HashSet<Type> NestTypesThatCanAppearInSource = new HashSet<Type>
+		{
+			typeof(JoinField),
+			typeof(QueryContainer),
+			typeof(CompletionField),
+			typeof(Attachment),
+			typeof(ILazyDocument),
+			typeof(GeoCoordinate)
+		};
+
 		private readonly IElasticsearchSerializer _builtInSerializer;
+
+		public HandleNestTypesOnSourceJsonConverter(IElasticsearchSerializer builtInSerializer) => _builtInSerializer = builtInSerializer;
+
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
 
-		public HandleNestTypesOnSourceJsonConverter(IElasticsearchSerializer builtInSerializer)
-		{
-			_builtInSerializer = builtInSerializer;
-		}
-
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var formatting = serializer.Formatting == Formatting.Indented
@@ -51,19 +56,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				return _builtInSerializer.Deserialize(objectType, ms);
 		}
 
-		private static readonly HashSet<Type> NestTypesThatCanAppearInSource = new HashSet<Type>
-		{
-			typeof(JoinField),
-			typeof(QueryContainer),
-			typeof(CompletionField),
-			typeof(Attachment),
-			typeof(ILazyDocument),
-			typeof(GeoCoordinate)
-		};
-
 		public override bool CanConvert(Type objectType) =>
 			NestTypesThatCanAppearInSource.Contains(objectType) ||
-		    typeof(IGeoShape).IsAssignableFrom(objectType) ||
-		    typeof(IGeometryCollection).IsAssignableFrom(objectType);
+			typeof(IGeoShape).IsAssignableFrom(objectType) ||
+			typeof(IGeometryCollection).IsAssignableFrom(objectType);
 	}
 }
diff --git a/src/Serializers/Nest.JsonNetSerializer/Converters/TimeSpanToStringConverter.cs b/src/Serializers/Nest.JsonNetSerializer/Converters/TimeSpanToStringConverter.cs
index 7f64792da2a..83254bc3886 100644
--- a/src/Serializers/Nest.JsonNetSerializer/Converters/TimeSpanToStringConverter.cs
+++ b/src/Serializers/Nest.JsonNetSerializer/Converters/TimeSpanToStringConverter.cs
@@ -14,7 +14,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				writer.WriteNull();
 			else
 			{
-				var timeSpan = (TimeSpan) value;
+				var timeSpan = (TimeSpan)value;
 				writer.WriteValue(timeSpan.Ticks);
 			}
 		}
@@ -24,12 +24,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			switch (reader.TokenType)
 			{
 				case JsonToken.Null: return null;
-				case JsonToken.String: return TimeSpan.Parse((string) reader.Value);
-				case JsonToken.Integer: return new TimeSpan((long) reader.Value);
+				case JsonToken.String: return TimeSpan.Parse((string)reader.Value);
+				case JsonToken.Integer: return new TimeSpan((long)reader.Value);
 			}
 			throw new JsonSerializationException($"Cannot convert token of type {reader.TokenType} to {objectType}.");
 		}
 
-		public override bool CanConvert(Type objectType) => objectType == typeof (TimeSpan) || objectType == typeof (TimeSpan?);
+		public override bool CanConvert(Type objectType) => objectType == typeof(TimeSpan) || objectType == typeof(TimeSpan?);
 	}
 }
diff --git a/src/Serializers/Nest.JsonNetSerializer/JTokenExtensions.cs b/src/Serializers/Nest.JsonNetSerializer/JTokenExtensions.cs
index c496130400d..5e7fc057c46 100644
--- a/src/Serializers/Nest.JsonNetSerializer/JTokenExtensions.cs
+++ b/src/Serializers/Nest.JsonNetSerializer/JTokenExtensions.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -10,12 +9,13 @@ namespace Nest.JsonNetSerializer
 	internal static class JTokenExtensions
 	{
 		/// <summary>
-		/// Writes a <see cref="JToken"/> to a <see cref="MemoryStream"/> using <see cref="ConnectionSettingsAwareSerializerBase.ExpectedEncoding"/>
+		/// Writes a <see cref="JToken" /> to a <see cref="MemoryStream" /> using <see cref="ConnectionSettingsAwareSerializerBase.ExpectedEncoding" />
 		/// </summary>
 		public static MemoryStream ToStream(this JToken token)
 		{
 			var ms = new MemoryStream();
-			using (var streamWriter = new StreamWriter(ms, ConnectionSettingsAwareSerializerBase.ExpectedEncoding, ConnectionSettingsAwareSerializerBase.DefaultBufferSize, leaveOpen: true))
+			using (var streamWriter = new StreamWriter(ms, ConnectionSettingsAwareSerializerBase.ExpectedEncoding,
+				ConnectionSettingsAwareSerializerBase.DefaultBufferSize, true))
 			using (var writer = new JsonTextWriter(streamWriter))
 			{
 				token.WriteTo(writer);
@@ -26,12 +26,14 @@ public static MemoryStream ToStream(this JToken token)
 		}
 
 		/// <summary>
-		/// Writes a <see cref="JToken"/> asynchronously to a <see cref="MemoryStream"/> using <see cref="ConnectionSettingsAwareSerializerBase.ExpectedEncoding"/>
+		/// Writes a <see cref="JToken" /> asynchronously to a <see cref="MemoryStream" /> using
+		/// <see cref="ConnectionSettingsAwareSerializerBase.ExpectedEncoding" />
 		/// </summary>
 		public static async Task<MemoryStream> ToStreamAsync(this JToken token, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			var ms = new MemoryStream();
-			using (var streamWriter = new StreamWriter(ms, ConnectionSettingsAwareSerializerBase.ExpectedEncoding, ConnectionSettingsAwareSerializerBase.DefaultBufferSize, leaveOpen: true))
+			using (var streamWriter = new StreamWriter(ms, ConnectionSettingsAwareSerializerBase.ExpectedEncoding,
+				ConnectionSettingsAwareSerializerBase.DefaultBufferSize, true))
 			using (var writer = new JsonTextWriter(streamWriter))
 			{
 				await token.WriteToAsync(writer, cancellationToken).ConfigureAwait(false);
diff --git a/src/Serializers/Nest.JsonNetSerializer/JsonNetSerializer.cs b/src/Serializers/Nest.JsonNetSerializer/JsonNetSerializer.cs
index 10e5f751a94..30ef1103782 100644
--- a/src/Serializers/Nest.JsonNetSerializer/JsonNetSerializer.cs
+++ b/src/Serializers/Nest.JsonNetSerializer/JsonNetSerializer.cs
@@ -7,17 +7,16 @@ namespace Nest.JsonNetSerializer
 {
 	public class JsonNetSerializer : ConnectionSettingsAwareSerializerBase
 	{
-		public static IElasticsearchSerializer Default(IElasticsearchSerializer builtin, IConnectionSettingsValues values)
-			=> new JsonNetSerializer(builtin, values);
-
 		public JsonNetSerializer(
 			IElasticsearchSerializer builtinSerializer,
 			IConnectionSettingsValues connectionSettings,
 			Func<JsonSerializerSettings> jsonSerializerSettingsFactory = null,
 			Action<ConnectionSettingsAwareContractResolver> modifyContractResolver = null,
-			IEnumerable<JsonConverter> contractJsonConverters = null)
-			: base(builtinSerializer, connectionSettings, jsonSerializerSettingsFactory, modifyContractResolver, contractJsonConverters)
-		{
-		}
+			IEnumerable<JsonConverter> contractJsonConverters = null
+		)
+			: base(builtinSerializer, connectionSettings, jsonSerializerSettingsFactory, modifyContractResolver, contractJsonConverters) { }
+
+		public static IElasticsearchSerializer Default(IElasticsearchSerializer builtin, IConnectionSettingsValues values)
+			=> new JsonNetSerializer(builtin, values);
 	}
 }
diff --git a/src/Serializers/Nest.JsonNetSerializer/JsonReaderExtensions.cs b/src/Serializers/Nest.JsonNetSerializer/JsonReaderExtensions.cs
index 2cca104d68b..38b8458de43 100644
--- a/src/Serializers/Nest.JsonNetSerializer/JsonReaderExtensions.cs
+++ b/src/Serializers/Nest.JsonNetSerializer/JsonReaderExtensions.cs
@@ -16,7 +16,9 @@ public static JToken ReadTokenWithDateParseHandlingNone(this JsonReader reader)
 			return token;
 		}
 
-		public static async Task<JToken> ReadTokenWithDateParseHandlingNoneAsync(this JsonReader reader, CancellationToken cancellationToken = default(CancellationToken))
+		public static async Task<JToken> ReadTokenWithDateParseHandlingNoneAsync(this JsonReader reader,
+			CancellationToken cancellationToken = default(CancellationToken)
+		)
 		{
 			var dateParseHandling = reader.DateParseHandling;
 			reader.DateParseHandling = DateParseHandling.None;
diff --git a/src/Tests/Tests.Benchmarking/BenchmarkProgram.cs b/src/Tests/Tests.Benchmarking/BenchmarkProgram.cs
index a1e463eb573..8ea77455bb5 100644
--- a/src/Tests/Tests.Benchmarking/BenchmarkProgram.cs
+++ b/src/Tests/Tests.Benchmarking/BenchmarkProgram.cs
@@ -15,10 +15,7 @@ public static int Main(string[] arguments)
 			if (arguments.Count() >= 1 && arguments[0].Equals("non-interactive", StringComparison.OrdinalIgnoreCase))
 			{
 				Console.WriteLine("Running in Non-Interactive mode.");
-				foreach (var benchmarkType in GetBenchmarkTypes())
-				{
-					BenchmarkRunner.Run(benchmarkType);
-				}
+				foreach (var benchmarkType in GetBenchmarkTypes()) BenchmarkRunner.Run(benchmarkType);
 
 				return 0;
 			}
diff --git a/src/Tests/Tests.Benchmarking/BulkDeserializationBenchmarkTests.cs b/src/Tests/Tests.Benchmarking/BulkDeserializationBenchmarkTests.cs
index 63ced68dcdc..ae985b452d9 100644
--- a/src/Tests/Tests.Benchmarking/BulkDeserializationBenchmarkTests.cs
+++ b/src/Tests/Tests.Benchmarking/BulkDeserializationBenchmarkTests.cs
@@ -7,9 +7,9 @@
 using Newtonsoft.Json;
 using Tests.Benchmarking.Framework;
 using Tests.Core.Client;
-
 #if !DOTNETCORE
 using System.Buffers;
+
 #endif
 
 namespace Tests.Benchmarking
@@ -18,11 +18,11 @@ namespace Tests.Benchmarking
 	public class BulkDeserializationBenchmarkTests
 	{
 		private static readonly IElasticClient Client = TestClient.DefaultInMemoryClient;
-		private byte[] _tinyResponse;
-		private byte[] _mediumResponse;
-		private byte[] _largeResponse;
 		private byte[] _hugeResponse;
 		private JsonSerializer _jsonSerializer;
+		private byte[] _largeResponse;
+		private byte[] _mediumResponse;
+		private byte[] _tinyResponse;
 
 		[GlobalSetup]
 		public void Setup()
@@ -95,9 +95,7 @@ public BulkResponse Baseline()
 		{
 			using (var reader = new JsonTextReader(new StreamReader(new MemoryStream(_hugeResponse))))
 			{
-				while (reader.Read())
-				{
-				}
+				while (reader.Read()) { }
 
 				return new BulkResponse();
 			}
@@ -122,34 +120,23 @@ public BulkResponse Baseline()
 			}
 		};
 
-		private static object ReturnBulkResponse(int numberOfItems)
+		private static object ReturnBulkResponse(int numberOfItems) => new
 		{
-			return new
-			{
-				took = 276,
-				errors = false,
-				items = Enumerable.Range(0, numberOfItems)
-					.Select(i => BulkItemResponse())
-					.ToArray()
-			};
-		}
+			took = 276,
+			errors = false,
+			items = Enumerable.Range(0, numberOfItems)
+				.Select(i => BulkItemResponse())
+				.ToArray()
+		};
 
 #if !DOTNETCORE
 		public class JsonArrayPool : IArrayPool<char>
 		{
 			public static readonly JsonArrayPool Instance = new JsonArrayPool();
 
-			public char[] Rent(int minimumLength)
-			{
-				// get char array from System.Buffers shared pool
-				return ArrayPool<char>.Shared.Rent(minimumLength);
-			}
+			public char[] Rent(int minimumLength) => ArrayPool<char>.Shared.Rent(minimumLength);
 
-			public void Return(char[] array)
-			{
-				// return char array to System.Buffers shared pool
-				ArrayPool<char>.Shared.Return(array);
-			}
+			public void Return(char[] array) => ArrayPool<char>.Shared.Return(array);
 		}
 #endif
 	}
diff --git a/src/Tests/Tests.Benchmarking/FieldResolverBenchmarkTests.cs b/src/Tests/Tests.Benchmarking/FieldResolverBenchmarkTests.cs
index df10fff4e82..575ece741df 100644
--- a/src/Tests/Tests.Benchmarking/FieldResolverBenchmarkTests.cs
+++ b/src/Tests/Tests.Benchmarking/FieldResolverBenchmarkTests.cs
@@ -8,15 +8,15 @@ namespace Tests.Benchmarking
 	[BenchmarkConfig(100)]
 	public class FieldResolverBenchmarkTests
 	{
+		private static readonly Field InferredField = Infer.Field<Project>(p => p.Name);
+		private static readonly Field PropertyField = typeof(Project).GetProperty(nameof(Project.Name));
+		private static readonly Field StringField = "Name";
 		private FieldResolver _expressionResolver;
-		private FieldResolver _propertyResolver;
-		private FieldResolver _stringResolver;
 		private NoncachingFieldResolver _nonCachingExpressionResolver;
 		private NoncachingFieldResolver _nonCachingPropertyResolver;
 		private NoncachingFieldResolver _nonCachingStringResolver;
-		private static readonly Field StringField = "Name";
-		private static readonly Field PropertyField = typeof(Project).GetProperty(nameof(Project.Name));
-		private static readonly Field InferredField = Infer.Field<Project>(p => p.Name);
+		private FieldResolver _propertyResolver;
+		private FieldResolver _stringResolver;
 
 		[GlobalSetup]
 		public void Setup()
@@ -30,39 +30,21 @@ public void Setup()
 		}
 
 		[Benchmark]
-		public string NonCachedFieldUsingExpression()
-		{
-			return _nonCachingExpressionResolver.Resolve(InferredField);
-		}
+		public string NonCachedFieldUsingExpression() => _nonCachingExpressionResolver.Resolve(InferredField);
 
 		[Benchmark]
-		public string CachedFieldUsingExpression()
-		{
-			return _expressionResolver.Resolve(InferredField);
-		}
+		public string CachedFieldUsingExpression() => _expressionResolver.Resolve(InferredField);
 
 		[Benchmark]
-		public string NonCachedFieldUsingPropertyInfo()
-		{
-			return _nonCachingPropertyResolver.Resolve(PropertyField);
-		}
+		public string NonCachedFieldUsingPropertyInfo() => _nonCachingPropertyResolver.Resolve(PropertyField);
 
 		[Benchmark]
-		public string CachedFieldUsingPropertyInfo()
-		{
-			return _propertyResolver.Resolve(PropertyField);
-		}
+		public string CachedFieldUsingPropertyInfo() => _propertyResolver.Resolve(PropertyField);
 
 		[Benchmark(Baseline = true)]
-		public string NonCachedFieldUsingString()
-		{
-			return _nonCachingStringResolver.Resolve(StringField);
-		}
+		public string NonCachedFieldUsingString() => _nonCachingStringResolver.Resolve(StringField);
 
 		[Benchmark]
-		public string CachedFieldUsingString()
-		{
-			return _stringResolver.Resolve(StringField);
-		}
+		public string CachedFieldUsingString() => _stringResolver.Resolve(StringField);
 	}
 }
diff --git a/src/Tests/Tests.Benchmarking/Framework/BenchmarkConfig.cs b/src/Tests/Tests.Benchmarking/Framework/BenchmarkConfig.cs
index fd1b3939fa4..87c153b4110 100644
--- a/src/Tests/Tests.Benchmarking/Framework/BenchmarkConfig.cs
+++ b/src/Tests/Tests.Benchmarking/Framework/BenchmarkConfig.cs
@@ -4,6 +4,7 @@
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Environments;
+using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Reports;
@@ -11,7 +12,7 @@
 
 namespace Tests.Benchmarking.Framework
 {
-	public class CustomJsonExporter : BenchmarkDotNet.Exporters.ExporterBase
+	public class CustomJsonExporter : ExporterBase
 	{
 		protected override string FileExtension => "json";
 
@@ -41,13 +42,13 @@ public override void ExportToLog(Summary summary, ILogger logger)
 			{
 				var data = new Dictionary<string, object>
 				{
-                    { "DisplayInfo", r.BenchmarkCase.DisplayInfo },
+					{ "DisplayInfo", r.BenchmarkCase.DisplayInfo },
 					{ "Namespace", r.BenchmarkCase.Descriptor.Type.Namespace },
 					{ "Type", r.BenchmarkCase.Descriptor.Type.Name },
 					{ "Method", r.BenchmarkCase.Descriptor.WorkloadMethod.Name },
 					{ "MethodTitle", r.BenchmarkCase.Descriptor.WorkloadMethod.Name },
 					{ "Parameters", r.BenchmarkCase.Parameters.PrintInfo },
-                    { "Statistics", r.ResultStatistics },
+					{ "Statistics", r.ResultStatistics },
 					{ "Memory", r.GcStats }
 				};
 
@@ -63,21 +64,23 @@ public override void ExportToLog(Summary summary, ILogger logger)
 			}));
 		}
 	}
+
 	public class BenchmarkConfigAttribute : Attribute, IConfigSource
 	{
-		public IConfig Config { get; }
-
 		public BenchmarkConfigAttribute(int runCount = 1)
 		{
-			var jobs = new[] {
+			var jobs = new[]
+			{
 				Job.Dry.With(Runtime.Core).With(Jit.RyuJit).WithIterationCount(runCount),
 				Job.Dry.With(Runtime.Clr).With(Jit.RyuJit).WithIterationCount(runCount),
 				Job.Dry.With(Runtime.Clr).With(Jit.LegacyJit).WithIterationCount(runCount)
 			};
-			this.Config = DefaultConfig.Instance
+			Config = DefaultConfig.Instance
 				.With(jobs)
 				.With(new CustomJsonExporter())
 				.With(MemoryDiagnoser.Default);
 		}
+
+		public IConfig Config { get; }
 	}
 }
diff --git a/src/Tests/Tests.Benchmarking/NoncachingFieldResolver.cs b/src/Tests/Tests.Benchmarking/NoncachingFieldResolver.cs
index 217d6ade6f2..8524768a044 100644
--- a/src/Tests/Tests.Benchmarking/NoncachingFieldResolver.cs
+++ b/src/Tests/Tests.Benchmarking/NoncachingFieldResolver.cs
@@ -16,27 +16,28 @@ public class NoncachingFieldResolver
 	{
 		private readonly IConnectionSettingsValues _settings;
 
-		public NoncachingFieldResolver(IConnectionSettingsValues settings) => this._settings = settings;
+		public NoncachingFieldResolver(IConnectionSettingsValues settings) => _settings = settings;
 
 		public string Resolve(Field field)
 		{
-			var name = this.ResolveFieldName(field);
+			var name = ResolveFieldName(field);
 			if (field.Boost.HasValue) name += $"^{field.Boost.Value.ToString(CultureInfo.InvariantCulture)}";
 			return name;
 		}
 
-		internal static bool IsConditionless(Field field) => field == null || (string.IsNullOrEmpty(field.Name) && field.Expression == null && field.Property == null);
+		internal static bool IsConditionless(Field field) =>
+			field == null || string.IsNullOrEmpty(field.Name) && field.Expression == null && field.Property == null;
 
 		internal static bool IsConditionless(PropertyName property) =>
-			property == null || (string.IsNullOrEmpty(property.Name) && property.Expression == null && property.Property == null);
+			property == null || string.IsNullOrEmpty(property.Name) && property.Expression == null && property.Property == null;
 
 		private string ResolveFieldName(Field field)
 		{
 			if (IsConditionless(field)) return null;
 			if (!string.IsNullOrEmpty(field.Name)) return field.Name;
-			if (field.Expression != null && !field.CachableExpression) return this.Resolve(field.Expression, field.Property);
+			if (field.Expression != null && !field.CachableExpression) return Resolve(field.Expression, field.Property);
 
-			var fieldName = this.Resolve(field.Expression, field.Property);
+			var fieldName = Resolve(field.Expression, field.Property);
 			return fieldName;
 		}
 
@@ -45,12 +46,9 @@ public string Resolve(PropertyName property)
 			if (IsConditionless(property)) return null;
 			if (!string.IsNullOrEmpty(property.Name)) return property.Name;
 
-			if (property.Expression != null && !property.CacheableExpression)
-			{
-				return this.Resolve(property.Expression, property.Property);
-			}
+			if (property.Expression != null && !property.CacheableExpression) return Resolve(property.Expression, property.Property);
 
-			var propertyName = this.Resolve(property.Expression, property.Property, true);
+			var propertyName = Resolve(property.Expression, property.Property, true);
 			return propertyName;
 		}
 
@@ -71,16 +69,16 @@ private string Resolve(Expression expression, MemberInfo member, bool toLastToke
 
 		internal class FieldExpressionVisitor : ExpressionVisitor
 		{
-			private readonly Stack<string> _stack = new Stack<string>();
-
 			private readonly IConnectionSettingsValues _settings;
+			private readonly Stack<string> _stack = new Stack<string>();
 
 			public FieldExpressionVisitor(IConnectionSettingsValues settings) => _settings = settings;
 
 			public string Resolve(Expression expression, bool toLastToken = false)
 			{
-				this.Visit(expression);
+				Visit(expression);
 				if (toLastToken) return Enumerable.Last<string>(_stack);
+
 				return Enumerable.Aggregate<string, StringBuilder>(_stack, new StringBuilder(),
 						(sb, name) =>
 							(sb.Length > 0 ? sb.Append(".") : sb).Append(name))
@@ -94,7 +92,7 @@ public string Resolve(MemberInfo info)
 
 				var name = info.Name;
 
-				if (this._settings.PropertyMappings.TryGetValue(info, out IPropertyMapping propertyMapping))
+				if (_settings.PropertyMappings.TryGetValue(info, out var propertyMapping))
 					return propertyMapping.Name;
 
 				var att = ElasticsearchPropertyAttributeBase.From(info);
@@ -107,7 +105,8 @@ public string Resolve(MemberInfo info)
 			protected override Expression VisitMember(MemberExpression expression)
 			{
 				if (_stack == null) return base.VisitMember(expression);
-				var name = this.Resolve(expression.Member);
+
+				var name = Resolve(expression.Member);
 				_stack.Push(name);
 				return base.VisitMember(expression);
 			}
@@ -120,7 +119,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCall)
 					var callingMember = new ReadOnlyCollection<Expression>(
 						new List<Expression> { { methodCall.Arguments.First() } }
 					);
-					base.Visit(callingMember);
+					Visit(callingMember);
 					return methodCall;
 				}
 				else if (methodCall.Method.Name == "get_Item" && methodCall.Arguments.Any())
@@ -129,23 +128,18 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCall)
 					var isDict =
 						typeof(IDictionary).IsAssignableFrom(t)
 						|| typeof(IDictionary<,>).IsAssignableFrom(t)
-						|| (t.GetTypeInfo().IsGenericType && t.GetGenericTypeDefinition() == typeof(IDictionary<,>));
+						|| t.GetTypeInfo().IsGenericType && t.GetGenericTypeDefinition() == typeof(IDictionary<,>);
+
+					if (!isDict) return base.VisitMethodCall(methodCall);
 
-					if (!isDict)
-					{
-						return base.VisitMethodCall(methodCall);
-					}
 					VisitConstantOrVariable(methodCall, _stack);
-					this.Visit(methodCall.Object);
+					Visit(methodCall.Object);
 					return methodCall;
 				}
 				else if (IsLinqOperator(methodCall.Method))
 				{
-					for (int i = 1; i < methodCall.Arguments.Count; i++)
-					{
-						this.Visit(methodCall.Arguments[i]);
-					}
-					this.Visit(methodCall.Arguments[0]);
+					for (var i = 1; i < methodCall.Arguments.Count; i++) Visit(methodCall.Arguments[i]);
+					Visit(methodCall.Arguments[0]);
 					return methodCall;
 				}
 				return base.VisitMethodCall(methodCall);
diff --git a/src/Tests/Tests.Benchmarking/PostDataBenchmarks.cs b/src/Tests/Tests.Benchmarking/PostDataBenchmarks.cs
index 4b2fbca8d0f..e0eac96196c 100644
--- a/src/Tests/Tests.Benchmarking/PostDataBenchmarks.cs
+++ b/src/Tests/Tests.Benchmarking/PostDataBenchmarks.cs
@@ -41,7 +41,7 @@ public class PostDataBenchmarks
 
 		public PostDataBenchmarks()
 		{
-			simpleObject = new {my_property = "value"};
+			simpleObject = new { my_property = "value" };
 			complexObject = new
 			{
 				input = new
@@ -92,7 +92,7 @@ public PostDataBenchmarks()
 												}
 											},
 											body =
-											"{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}",
+												"{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}",
 											headers = new
 											{
 												header1 = "value1"
@@ -118,7 +118,7 @@ public PostDataBenchmarks()
 									{
 										request = new
 										{
-											indices = new[] {"project"},
+											indices = new[] { "project" },
 											body = new
 											{
 												size = 0,
@@ -160,7 +160,7 @@ public PostDataBenchmarks()
 							{
 								request = new
 								{
-									indices = new[] {"project"},
+									indices = new[] { "project" },
 									indices_options = new
 									{
 										expand_wildcards = "open",
@@ -200,8 +200,8 @@ public PostDataBenchmarks()
 						{
 							"ctx.payload.search.aggregations.top_project_tags.buckets", new JObject
 							{
-								{"path", "doc_count"},
-								{"gte", new JObject {{"value", 1}}}
+								{ "path", "doc_count" },
+								{ "gte", new JObject { { "value", 1 } } }
 							}
 						}
 					}
@@ -212,8 +212,8 @@ public PostDataBenchmarks()
 					{
 						weekly = new[]
 						{
-							new {on = new[] {"monday"}, at = new[] {"noon"}},
-							new {on = new[] {"friday"}, at = new[] {"17:00"}}
+							new { on = new[] { "monday" }, at = new[] { "noon" } },
+							new { on = new[] { "friday" }, at = new[] { "17:00" } }
 						}
 					}
 				},
@@ -223,7 +223,7 @@ public PostDataBenchmarks()
 					{
 						email = new
 						{
-							to = new[] {"me@example.com"},
+							to = new[] { "me@example.com" },
 							subject = "Something's strange in the neighbourhood",
 							body = new
 							{
@@ -294,7 +294,7 @@ public PostDataBenchmarks()
 							message = new
 							{
 								from = "nest integration test",
-								to = new[] {"#nest"},
+								to = new[] { "#nest" },
 								text = "slack message",
 								attachments = new[]
 								{
@@ -316,7 +316,7 @@ public PostDataBenchmarks()
 							{
 								body = "hipchat message",
 								color = "purple",
-								room = new[] {"nest"},
+								room = new[] { "nest" },
 								notify = true
 							}
 						}
@@ -340,6 +340,7 @@ PostData DisableStreaming(PostData data)
 				data.DisableDirectStreaming = true;
 				return data;
 			}
+
 			_postDataOfStringDisableDirectStreaming = DisableStreaming(PostData.String(@string));
 			_postDataOfBytesDisableDirectStreaming = DisableStreaming(PostData.Bytes(bytes));
 			_postDataOfCollectionOfStringsDisableDirectStreaming = DisableStreaming(PostData.MultiJson(collectionOfStrings));
@@ -352,127 +353,85 @@ PostData DisableStreaming(PostData data)
 		[Benchmark]
 		public void PostString()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfString.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfString.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostBytes()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfBytes.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfBytes.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostCollectionOfStrings()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfCollectionOfStrings.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfCollectionOfStrings.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostCollectionOfSimpleObjects()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfCollectionOfSimpleObjects.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfCollectionOfSimpleObjects.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostCollectionOfComplexObjects()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfCollectionOfComplexObjects.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfCollectionOfComplexObjects.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostSimpleObject()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfSimpleObject.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfSimpleObject.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostComplexObject()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfComplexObject.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfComplexObject.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostStringDisableDirectStreaming()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfStringDisableDirectStreaming.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfStringDisableDirectStreaming.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostBytesDisableDirectStreaming()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfBytesDisableDirectStreaming.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfBytesDisableDirectStreaming.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostCollectionOfStringsDisableDirectStreaming()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfCollectionOfStringsDisableDirectStreaming.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfCollectionOfStringsDisableDirectStreaming.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostCollectionOfSimpleObjectsDisableDirectStreaming()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfCollectionOfSimpleObjectsDisableDirectStreaming.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfCollectionOfSimpleObjectsDisableDirectStreaming.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostCollectionOfComplexObjectsDisableDirectStreaming()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfCollectionOfComplexObjectsDisableDirectStreaming.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfCollectionOfComplexObjectsDisableDirectStreaming.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostSimpleObjectDisableDirectStreaming()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfSimpleObjectDisableDirectStreaming.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfSimpleObjectDisableDirectStreaming.Write(ms, connectionSettings);
 		}
 
 		[Benchmark]
 		public void PostComplexObjectDisableDirectStreaming()
 		{
-			using (var ms = new MemoryStream())
-			{
-				_postDataOfComplexObjectDisableDirectStreaming.Write(ms, connectionSettings);
-			}
+			using (var ms = new MemoryStream()) _postDataOfComplexObjectDisableDirectStreaming.Write(ms, connectionSettings);
 		}
 	}
 }
diff --git a/src/Tests/Tests.Benchmarking/PropertyNameResolverBenchmarkTests.cs b/src/Tests/Tests.Benchmarking/PropertyNameResolverBenchmarkTests.cs
index 6c5dbe96493..ced590b5906 100644
--- a/src/Tests/Tests.Benchmarking/PropertyNameResolverBenchmarkTests.cs
+++ b/src/Tests/Tests.Benchmarking/PropertyNameResolverBenchmarkTests.cs
@@ -8,15 +8,15 @@ namespace Tests.Benchmarking
 	[BenchmarkConfig(100)]
 	public class PropertyNameResolverBenchmarkTests
 	{
+		private static readonly PropertyName InferredPropertyName = Infer.Property<Project>(p => p.Name);
+		private static readonly PropertyName PropertyInfoPropertyName = typeof(Project).GetProperty(nameof(Project.Name));
+		private static readonly PropertyName StringPropertyName = "Name";
 		private FieldResolver _expressionResolver;
-		private FieldResolver _propertyResolver;
-		private FieldResolver _stringResolver;
 		private NoncachingFieldResolver _nonCachingExpressionResolver;
 		private NoncachingFieldResolver _nonCachingPropertyResolver;
 		private NoncachingFieldResolver _nonCachingStringResolver;
-		private static readonly PropertyName InferredPropertyName = Infer.Property<Project>(p => p.Name);
-		private static readonly PropertyName PropertyInfoPropertyName = typeof(Project).GetProperty(nameof(Project.Name));
-		private static readonly PropertyName StringPropertyName = "Name";
+		private FieldResolver _propertyResolver;
+		private FieldResolver _stringResolver;
 
 		[GlobalSetup]
 		public void Setup()
@@ -30,39 +30,21 @@ public void Setup()
 		}
 
 		[Benchmark]
-		public string NonCachedPropertyUsingExpression()
-		{
-			return _nonCachingExpressionResolver.Resolve(InferredPropertyName);
-		}
+		public string NonCachedPropertyUsingExpression() => _nonCachingExpressionResolver.Resolve(InferredPropertyName);
 
 		[Benchmark]
-		public string CachedPropertyUsingExpression()
-		{
-			return _expressionResolver.Resolve(InferredPropertyName);
-		}
+		public string CachedPropertyUsingExpression() => _expressionResolver.Resolve(InferredPropertyName);
 
 		[Benchmark]
-		public string NonCachedPropertyUsingPropertyInfo()
-		{
-			return _nonCachingPropertyResolver.Resolve(PropertyInfoPropertyName);
-		}
+		public string NonCachedPropertyUsingPropertyInfo() => _nonCachingPropertyResolver.Resolve(PropertyInfoPropertyName);
 
 		[Benchmark]
-		public string CachedPropertyUsingPropertyInfo()
-		{
-			return _propertyResolver.Resolve(PropertyInfoPropertyName);
-		}
+		public string CachedPropertyUsingPropertyInfo() => _propertyResolver.Resolve(PropertyInfoPropertyName);
 
 		[Benchmark(Baseline = true)]
-		public string NonCachedPropertyUsingString()
-		{
-			return _nonCachingStringResolver.Resolve(StringPropertyName);
-		}
+		public string NonCachedPropertyUsingString() => _nonCachingStringResolver.Resolve(StringPropertyName);
 
 		[Benchmark]
-		public string CachedPropertyUsingString()
-		{
-			return _stringResolver.Resolve(StringPropertyName);
-		}
+		public string CachedPropertyUsingString() => _stringResolver.Resolve(StringPropertyName);
 	}
 }
diff --git a/src/Tests/Tests.ClusterLauncher/ClusterLaunchProgram.cs b/src/Tests/Tests.ClusterLauncher/ClusterLaunchProgram.cs
index 4ebec1e8f29..ec69ff2c830 100644
--- a/src/Tests/Tests.ClusterLauncher/ClusterLaunchProgram.cs
+++ b/src/Tests/Tests.ClusterLauncher/ClusterLaunchProgram.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using Elastic.Managed;
 using Elastic.Managed.Ephemeral;
 using FluentAssertions.Common;
@@ -13,6 +12,8 @@ namespace Tests.ClusterLauncher
 {
 	public static class ClusterLaunchProgram
 	{
+		private static ICluster<EphemeralClusterConfiguration> Instance { get; set; }
+
 		public static int Main(string[] arguments)
 		{
 			if (arguments.Length < 1)
@@ -22,7 +23,7 @@ public static int Main(string[] arguments)
 			}
 
 			var clusterName = arguments[0];
-			if 	(arguments.Length > 1)
+			if (arguments.Length > 1)
 				Environment.SetEnvironmentVariable("NEST_INTEGRATION_VERSION", arguments[1], EnvironmentVariableTarget.Process);
 			Environment.SetEnvironmentVariable("NEST_INTEGRATION_SHOW_OUTPUT_AFTER_START", "1", EnvironmentVariableTarget.Process);
 
@@ -48,11 +49,10 @@ public static int Main(string[] arguments)
 			return 0;
 		}
 
-		private static ICluster<EphemeralClusterConfiguration> Instance { get; set; }
-
 		private static bool TryStartXPackClusterImplementation(Type cluster)
 		{
 			if (!(Activator.CreateInstance(cluster) is XPackCluster instance)) return false;
+
 			Instance = instance;
 			using (instance)
 				return Run(instance);
@@ -62,6 +62,7 @@ private static bool TryStartXPackClusterImplementation(Type cluster)
 		private static bool TryStartClientTestClusterBaseImplementation(Type cluster)
 		{
 			if (!(Activator.CreateInstance(cluster) is ClientTestClusterBase instance)) return false;
+
 			Instance = instance;
 			using (instance)
 				return Run(instance);
diff --git a/src/Tests/Tests.Configuration/ConfigurationLoader.cs b/src/Tests/Tests.Configuration/ConfigurationLoader.cs
index 2b5569fd116..16efea1488b 100644
--- a/src/Tests/Tests.Configuration/ConfigurationLoader.cs
+++ b/src/Tests/Tests.Configuration/ConfigurationLoader.cs
@@ -23,7 +23,8 @@ private static ITestConfiguration LoadConfiguration()
 				{
 					//load the test seed from the explicitly passed yaml file when running from FAKE
 					var tempYamlConfiguration = new YamlConfiguration(yamlFile);
-					Environment.SetEnvironmentVariable("NEST_TEST_SEED", tempYamlConfiguration.Seed.ToString(CultureInfo.InvariantCulture), EnvironmentVariableTarget.Process);
+					Environment.SetEnvironmentVariable("NEST_TEST_SEED", tempYamlConfiguration.Seed.ToString(CultureInfo.InvariantCulture),
+						EnvironmentVariableTarget.Process);
 					Console.WriteLine("--->" + tempYamlConfiguration.Seed);
 				}
 				return new EnvironmentConfiguration();
@@ -53,6 +54,7 @@ private static DirectoryInfo FindTestsConfigurationFolder(DirectoryInfo director
 				var yamlConfigDir = Path.Combine(directoryInfo.FullName, "Tests.Configuration");
 				if (directoryInfo.Name == "Tests" && Directory.Exists(yamlConfigDir))
 					return new DirectoryInfo(yamlConfigDir);
+
 				directoryInfo = directoryInfo.Parent;
 			} while (directoryInfo != null);
 			return null;
diff --git a/src/Tests/Tests.Configuration/EnvironmentConfiguration.cs b/src/Tests/Tests.Configuration/EnvironmentConfiguration.cs
index 4da72fae3b4..2b4b0c8092d 100644
--- a/src/Tests/Tests.Configuration/EnvironmentConfiguration.cs
+++ b/src/Tests/Tests.Configuration/EnvironmentConfiguration.cs
@@ -4,43 +4,44 @@ namespace Tests.Configuration
 {
 	public class EnvironmentConfiguration : TestConfigurationBase
 	{
-		public sealed override bool TestAgainstAlreadyRunningElasticsearch { get; protected set; } = false;
-		public sealed override bool ForceReseed { get; protected set; } = true;
-		public sealed override string ElasticsearchVersion { get; protected set; }
-		public sealed override TestMode Mode { get; protected set; } = TestMode.Unit;
-		public sealed override string ClusterFilter { get; protected set; }
-		public sealed override string TestFilter { get; protected set; }
-		public sealed override int Seed { get; protected set; }
-		public sealed override bool ShowElasticsearchOutputAfterStarted { get; protected set; }
-
 		public EnvironmentConfiguration()
 		{
 			//if env var NEST_INTEGRATION_VERSION is set assume integration mode
 			//used by the build script FAKE
 			var version = Environment.GetEnvironmentVariable("NEST_INTEGRATION_VERSION");
-			if (!string.IsNullOrEmpty(version)) this.Mode = TestMode.Integration;
+			if (!string.IsNullOrEmpty(version)) Mode = TestMode.Integration;
 
-			this.ElasticsearchVersion = string.IsNullOrWhiteSpace(version) ? DefaultVersion : version;
-			this.ClusterFilter = Environment.GetEnvironmentVariable("NEST_INTEGRATION_CLUSTER");
-			this.ShowElasticsearchOutputAfterStarted = Environment.GetEnvironmentVariable("NEST_INTEGRATION_SHOW_OUTPUT_AFTER_START") == "1";
-			this.TestFilter = Environment.GetEnvironmentVariable("NEST_TEST_FILTER");
+			ElasticsearchVersion = string.IsNullOrWhiteSpace(version) ? DefaultVersion : version;
+			ClusterFilter = Environment.GetEnvironmentVariable("NEST_INTEGRATION_CLUSTER");
+			ShowElasticsearchOutputAfterStarted = Environment.GetEnvironmentVariable("NEST_INTEGRATION_SHOW_OUTPUT_AFTER_START") == "1";
+			TestFilter = Environment.GetEnvironmentVariable("NEST_TEST_FILTER");
 
 			var newRandom = new Random().Next(1, 100000);
 
-			this.Seed = TryGetEnv("NEST_TEST_SEED", out var seed) ? int.Parse(seed) : newRandom;
-			var randomizer = new Random(this.Seed);
+			Seed = TryGetEnv("NEST_TEST_SEED", out var seed) ? int.Parse(seed) : newRandom;
+			var randomizer = new Random(Seed);
 
-			this.Random = new RandomConfiguration
+			Random = new RandomConfiguration
 			{
 				SourceSerializer = RandomBoolConfig("SOURCESERIALIZER", randomizer),
 				TypedKeys = RandomBoolConfig("TYPEDKEYS", randomizer),
 			};
 		}
 
+		public sealed override string ClusterFilter { get; protected set; }
+		public sealed override string ElasticsearchVersion { get; protected set; }
+		public sealed override bool ForceReseed { get; protected set; } = true;
+		public sealed override TestMode Mode { get; protected set; } = TestMode.Unit;
+		public sealed override int Seed { get; protected set; }
+		public sealed override bool ShowElasticsearchOutputAfterStarted { get; protected set; }
+		public sealed override bool TestAgainstAlreadyRunningElasticsearch { get; protected set; } = false;
+		public sealed override string TestFilter { get; protected set; }
+
 		private static bool RandomBoolConfig(string key, Random randomizer)
 		{
 			if (TryGetEnv("NEST_RANDOM_" + key, out var source) && bool.TryParse(source, out var b))
 				return b;
+
 			return randomizer.NextDouble() >= 0.5;
 		}
 
diff --git a/src/Tests/Tests.Configuration/ITestConfiguration.cs b/src/Tests/Tests.Configuration/ITestConfiguration.cs
index c5193b0690a..8bd24a3849f 100644
--- a/src/Tests/Tests.Configuration/ITestConfiguration.cs
+++ b/src/Tests/Tests.Configuration/ITestConfiguration.cs
@@ -1,24 +1,23 @@
 using System;
-using System.Collections.Generic;
 
 namespace Tests.Configuration
 {
 	public interface ITestConfiguration
 	{
-		TestMode Mode { get; }
-		string ElasticsearchVersion { get; }
 		string ClusterFilter { get; }
-		string TestFilter { get; }
+		string ElasticsearchVersion { get; }
 		bool ForceReseed { get; }
-		bool TestAgainstAlreadyRunningElasticsearch { get; }
+		TestMode Mode { get; }
 
-		int Seed { get; }
+		RandomConfiguration Random { get; }
 
 		bool RunIntegrationTests { get; }
 		bool RunUnitTests { get; }
 
-		RandomConfiguration Random { get; }
+		int Seed { get; }
 		bool ShowElasticsearchOutputAfterStarted { get; }
+		bool TestAgainstAlreadyRunningElasticsearch { get; }
+		string TestFilter { get; }
 	}
 
 	public class RandomConfiguration
@@ -42,7 +41,6 @@ public static void DumpConfiguration(this ITestConfiguration config)
 			{
 				Console.WriteLine($" - {nameof(config.ClusterFilter)}: {config.ClusterFilter}");
 				Console.WriteLine($" - {nameof(config.TestFilter)}: {config.TestFilter}");
-
 			}
 			Console.WriteLine($" - {nameof(config.RunIntegrationTests)}: {config.RunIntegrationTests}");
 			Console.WriteLine($" - {nameof(config.RunUnitTests)}: {config.RunUnitTests}");
diff --git a/src/Tests/Tests.Configuration/TestConfigurationBase.cs b/src/Tests/Tests.Configuration/TestConfigurationBase.cs
index 07b9ae675ee..345b37fecb4 100644
--- a/src/Tests/Tests.Configuration/TestConfigurationBase.cs
+++ b/src/Tests/Tests.Configuration/TestConfigurationBase.cs
@@ -3,19 +3,19 @@
 	public abstract class TestConfigurationBase : ITestConfiguration
 	{
 		protected const string DefaultVersion = "6.0.0";
-		public abstract bool TestAgainstAlreadyRunningElasticsearch { get; protected set; }
+		public abstract string ClusterFilter { get; protected set; }
 		public abstract string ElasticsearchVersion { get; protected set; }
 		public abstract bool ForceReseed { get; protected set; }
 		public abstract TestMode Mode { get; protected set; }
-		public abstract string ClusterFilter { get; protected set; }
-		public abstract string TestFilter { get; protected set; }
-		public abstract bool ShowElasticsearchOutputAfterStarted { get; protected set; }
+		public RandomConfiguration Random { get; protected set; }
 
 
-		public virtual bool RunIntegrationTests => this.Mode == TestMode.Mixed || this.Mode == TestMode.Integration;
-		public virtual bool RunUnitTests => this.Mode == TestMode.Mixed || this.Mode == TestMode.Unit;
+		public virtual bool RunIntegrationTests => Mode == TestMode.Mixed || Mode == TestMode.Integration;
+		public virtual bool RunUnitTests => Mode == TestMode.Mixed || Mode == TestMode.Unit;
 
 		public abstract int Seed { get; protected set; }
-		public RandomConfiguration Random { get; protected set; }
+		public abstract bool ShowElasticsearchOutputAfterStarted { get; protected set; }
+		public abstract bool TestAgainstAlreadyRunningElasticsearch { get; protected set; }
+		public abstract string TestFilter { get; protected set; }
 	}
 }
diff --git a/src/Tests/Tests.Configuration/YamlConfiguration.cs b/src/Tests/Tests.Configuration/YamlConfiguration.cs
index 46c9fa7be04..c7dfde1a916 100644
--- a/src/Tests/Tests.Configuration/YamlConfiguration.cs
+++ b/src/Tests/Tests.Configuration/YamlConfiguration.cs
@@ -8,14 +8,6 @@ namespace Tests.Configuration
 	public class YamlConfiguration : TestConfigurationBase
 	{
 		private readonly Dictionary<string, string> _config;
-		public sealed override bool TestAgainstAlreadyRunningElasticsearch { get; protected set; } = true;
-		public sealed override string ElasticsearchVersion { get; protected set; }
-		public sealed override bool ForceReseed { get; protected set; } = true;
-		public sealed override TestMode Mode { get; protected set; } = TestMode.Unit;
-		public sealed override string ClusterFilter { get; protected set; }
-		public sealed override string TestFilter { get; protected set; }
-		public sealed override int Seed { get; protected set; }
-		public sealed override bool ShowElasticsearchOutputAfterStarted { get; protected set; }
 
 		public YamlConfiguration(string configurationFile)
 		{
@@ -25,32 +17,43 @@ public YamlConfiguration(string configurationFile)
 				.Where(l => !l.Trim().StartsWith("#") && !string.IsNullOrWhiteSpace(l))
 				.ToDictionary(ConfigName, ConfigValue);
 
-			this.Mode = GetTestMode(_config["mode"]);
+			Mode = GetTestMode(_config["mode"]);
 			var version = _config["elasticsearch_version"];
-			this.ElasticsearchVersion = string.IsNullOrWhiteSpace(version) ? DefaultVersion : version;
-			this.ForceReseed = this.BoolConfig("force_reseed", false);
-			this.TestAgainstAlreadyRunningElasticsearch = this.BoolConfig("test_against_already_running_elasticsearch", false);
-			this.ShowElasticsearchOutputAfterStarted = this.BoolConfig("elasticsearch_out_after_started", false);
-			this.ClusterFilter = _config.ContainsKey("cluster_filter") ? _config["cluster_filter"] : null;
-			this.TestFilter = _config.ContainsKey("test_filter") ? _config["test_filter"] : null;
+			ElasticsearchVersion = string.IsNullOrWhiteSpace(version) ? DefaultVersion : version;
+			ForceReseed = BoolConfig("force_reseed", false);
+			TestAgainstAlreadyRunningElasticsearch = BoolConfig("test_against_already_running_elasticsearch", false);
+			ShowElasticsearchOutputAfterStarted = BoolConfig("elasticsearch_out_after_started", false);
+			ClusterFilter = _config.ContainsKey("cluster_filter") ? _config["cluster_filter"] : null;
+			TestFilter = _config.ContainsKey("test_filter") ? _config["test_filter"] : null;
 
 			var newRandom = new Random().Next(1, 100000);
-			this.Seed = _config.TryGetValue("seed", out var seed) ? int.Parse(seed) : newRandom;
-			var randomizer = new Random(this.Seed);
-			this.Random = new RandomConfiguration
+			Seed = _config.TryGetValue("seed", out var seed) ? int.Parse(seed) : newRandom;
+			var randomizer = new Random(Seed);
+			Random = new RandomConfiguration
 			{
-				SourceSerializer = this.RandomBool("source_serializer", randomizer),
-				TypedKeys = this.RandomBool("typed_keys", randomizer),
+				SourceSerializer = RandomBool("source_serializer", randomizer),
+				TypedKeys = RandomBool("typed_keys", randomizer),
 			};
 		}
 
+		public sealed override string ClusterFilter { get; protected set; }
+		public sealed override string ElasticsearchVersion { get; protected set; }
+		public sealed override bool ForceReseed { get; protected set; } = true;
+		public sealed override TestMode Mode { get; protected set; } = TestMode.Unit;
+		public sealed override int Seed { get; protected set; }
+		public sealed override bool ShowElasticsearchOutputAfterStarted { get; protected set; }
+		public sealed override bool TestAgainstAlreadyRunningElasticsearch { get; protected set; } = true;
+		public sealed override string TestFilter { get; protected set; }
+
 		private bool BoolConfig(string key, bool @default) => _config.TryGetValue(key, out var v) ? bool.Parse(v) : @default;
 
 		private bool RandomBool(string key, Random random) =>
 			_config.TryGetValue($"random_{key}", out var v) ? bool.Parse(v) : random.NextDouble() >= 0.5;
 
 		private static string ConfigName(string configLine) => Parse(configLine, 0);
+
 		private static string ConfigValue(string configLine) => Parse(configLine, 1);
+
 		private static string Parse(string configLine, int index) => configLine.Split(':')[index].Trim(' ');
 
 		private static TestMode GetTestMode(string mode)
diff --git a/src/Tests/Tests.Core/Client/FixedResponseClient.cs b/src/Tests/Tests.Core/Client/FixedResponseClient.cs
index 0b29d99200f..678d48f1ef1 100644
--- a/src/Tests/Tests.Core/Client/FixedResponseClient.cs
+++ b/src/Tests/Tests.Core/Client/FixedResponseClient.cs
@@ -12,7 +12,8 @@ public static IElasticClient Create(
 			int statusCode = 200,
 			Func<ConnectionSettings, ConnectionSettings> modifySettings = null,
 			string contentType = RequestData.MimeType,
-			Exception exception = null)
+			Exception exception = null
+		)
 		{
 			var settings = CreateConnectionSettings(response, statusCode, modifySettings, contentType, exception);
 			return new ElasticClient(settings);
@@ -23,7 +24,8 @@ public static ConnectionSettings CreateConnectionSettings(
 			int statusCode = 200,
 			Func<ConnectionSettings, ConnectionSettings> modifySettings = null,
 			string contentType = RequestData.MimeType,
-			Exception exception = null)
+			Exception exception = null
+		)
 		{
 			var serializer = TestClient.Default.RequestResponseSerializer;
 			byte[] fixedResult = null;
@@ -35,9 +37,8 @@ public static ConnectionSettings CreateConnectionSettings(
 			var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
 			var defaultSettings = new ConnectionSettings(connectionPool, connection)
 				.DefaultIndex("default-index");
-			var settings = (modifySettings != null) ? modifySettings(defaultSettings) : defaultSettings;
+			var settings = modifySettings != null ? modifySettings(defaultSettings) : defaultSettings;
 			return settings;
 		}
-
 	}
 }
diff --git a/src/Tests/Tests.Core/Client/Serializers/TestSourceSerializerBase.cs b/src/Tests/Tests.Core/Client/Serializers/TestSourceSerializerBase.cs
index e3129c196ec..e671d826c18 100644
--- a/src/Tests/Tests.Core/Client/Serializers/TestSourceSerializerBase.cs
+++ b/src/Tests/Tests.Core/Client/Serializers/TestSourceSerializerBase.cs
@@ -25,10 +25,7 @@ protected override IEnumerable<JsonConverter> CreateJsonConverters()
 			yield return new SourceOnlyUsingBuiltInConverter();
 		}
 
-		protected override void ModifyContractResolver(ConnectionSettingsAwareContractResolver resolver)
-		{
+		protected override void ModifyContractResolver(ConnectionSettingsAwareContractResolver resolver) =>
 			resolver.NamingStrategy = new CamelCaseNamingStrategy();
-		}
-
 	}
 }
diff --git a/src/Tests/Tests.Core/Client/Settings/AlwaysInMemoryConnectionSettings.cs b/src/Tests/Tests.Core/Client/Settings/AlwaysInMemoryConnectionSettings.cs
index 36447fb6390..2e4d6941222 100644
--- a/src/Tests/Tests.Core/Client/Settings/AlwaysInMemoryConnectionSettings.cs
+++ b/src/Tests/Tests.Core/Client/Settings/AlwaysInMemoryConnectionSettings.cs
@@ -17,13 +17,14 @@ public AlwaysInMemoryConnectionSettings(
 			Func<ICollection<Uri>, IConnectionPool> createPool = null,
 			SourceSerializerFactory sourceSerializerFactory = null,
 			IPropertyMappingProvider propertyMappingProvider = null,
-			int port = 9200)
+			int port = 9200
+		)
 			: base(
 				createPool,
 				sourceSerializerFactory,
 				propertyMappingProvider,
-				forceInMemory: true,
-				port: port
+				true,
+				port
 			) { }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests.Core/Client/Settings/TestConnectionSettings.cs b/src/Tests/Tests.Core/Client/Settings/TestConnectionSettings.cs
index 7b273d33e39..e2eb5d621a2 100644
--- a/src/Tests/Tests.Core/Client/Settings/TestConnectionSettings.cs
+++ b/src/Tests/Tests.Core/Client/Settings/TestConnectionSettings.cs
@@ -6,8 +6,8 @@
 using Nest;
 using Tests.Configuration;
 using Tests.Core.Client.Serializers;
-using Tests.Core.Xunit;
 using Tests.Core.Extensions;
+using Tests.Core.Xunit;
 
 namespace Tests.Core.Client.Settings
 {
@@ -15,29 +15,31 @@ public class TestConnectionSettings : ConnectionSettings
 	{
 		public static readonly bool RunningFiddler = Process.GetProcessesByName("fiddler").Any();
 
-		private static string LocalHost => "localhost";
-		public static string LocalOrProxyHost => (RunningFiddler) ? "ipv4.fiddler" : LocalHost;
-
 		public TestConnectionSettings(
 			Func<ICollection<Uri>, IConnectionPool> createPool = null,
 			SourceSerializerFactory sourceSerializerFactory = null,
 			IPropertyMappingProvider propertyMappingProvider = null,
 			bool forceInMemory = false,
-			int port = 9200)
+			int port = 9200
+		)
 			: base(
 				CreatePool(createPool, port),
 				TestConfiguration.Instance.CreateConnection(forceInMemory),
 				CreateSerializerFactory(sourceSerializerFactory),
 				propertyMappingProvider
 			) =>
-			this.ApplyTestSettings();
+			ApplyTestSettings();
+
+		public static string LocalOrProxyHost => RunningFiddler ? "ipv4.fiddler" : LocalHost;
 
 		private static int ConnectionLimitDefault =>
 			int.TryParse(Environment.GetEnvironmentVariable("NEST_NUMBER_OF_CONNECTIONS"), out var x)
 				? x
 				: ConnectionConfiguration.DefaultConnectionLimit;
 
-		internal ConnectionSettings ApplyTestSettings() => this
+		private static string LocalHost => "localhost";
+
+		internal ConnectionSettings ApplyTestSettings() => EnableDebugMode()
 			//TODO make this random
 			//.EnableHttpCompression()
 #if DEBUG
@@ -47,9 +49,11 @@ internal ConnectionSettings ApplyTestSettings() => this
 			.OnRequestCompleted(r =>
 			{
 				if (!r.DeprecationWarnings.Any()) return;
+
 				var q = r.Uri.Query;
 				//hack to prevent the deprecation warnings from the deprecation response test to be reported
 				if (!string.IsNullOrWhiteSpace(q) && q.Contains("routing=ignoredefaultcompletedhandler")) return;
+
 				foreach (var d in r.DeprecationWarnings) XunitRunState.SeenDeprecations.Add(d);
 			});
 
@@ -57,13 +61,14 @@ private static SourceSerializerFactory CreateSerializerFactory(SourceSerializerF
 		{
 			if (provided != null) return provided;
 			if (!TestConfiguration.Instance.Random.SourceSerializer) return null;
+
 			return (builtin, values) => new TestSourceSerializerBase(builtin, values);
 		}
 
 		private static IConnectionPool CreatePool(Func<ICollection<Uri>, IConnectionPool> createPool = null, int port = 9200)
 		{
 			createPool = createPool ?? (uris => new StaticConnectionPool(uris));
-			var connectionPool = createPool(new [] { CreateUri(port) });
+			var connectionPool = createPool(new[] { CreateUri(port) });
 			return connectionPool;
 		}
 
diff --git a/src/Tests/Tests.Core/Client/TestClient.cs b/src/Tests/Tests.Core/Client/TestClient.cs
index 3c7729113e9..c5a3896fb2d 100644
--- a/src/Tests/Tests.Core/Client/TestClient.cs
+++ b/src/Tests/Tests.Core/Client/TestClient.cs
@@ -8,12 +8,14 @@ namespace Tests.Core.Client
 {
 	public static class TestClient
 	{
+		public static readonly ITestConfiguration Configuration = TestConfiguration.Instance;
 		public static readonly IElasticClient Default = new ElasticClient(new TestConnectionSettings().ApplyDomainSettings());
 		public static readonly IElasticClient DefaultInMemoryClient = new ElasticClient(new AlwaysInMemoryConnectionSettings().ApplyDomainSettings());
+
+		public static readonly IElasticClient DisabledStreaming =
+			new ElasticClient(new TestConnectionSettings().ApplyDomainSettings().DisableDirectStreaming());
+
 		public static readonly IElasticClient InMemoryWithJsonNetSerializer = new ElasticClient(
 			new AlwaysInMemoryConnectionSettings(sourceSerializerFactory: JsonNetSerializer.Default).ApplyDomainSettings());
-		public static readonly IElasticClient DisabledStreaming = new ElasticClient(new TestConnectionSettings().ApplyDomainSettings().DisableDirectStreaming());
-
-		public static readonly ITestConfiguration Configuration = TestConfiguration.Instance;
 	}
 }
diff --git a/src/Tests/Tests.Core/Extensions/DiffExtensions.cs b/src/Tests/Tests.Core/Extensions/DiffExtensions.cs
index b87840bb5a4..794c3d1afef 100644
--- a/src/Tests/Tests.Core/Extensions/DiffExtensions.cs
+++ b/src/Tests/Tests.Core/Extensions/DiffExtensions.cs
@@ -15,10 +15,7 @@ public static void DeepSort(this JObject jObj)
 			if (jObj == null) return;
 
 			var props = jObj.Properties().ToList();
-			foreach (var prop in props)
-			{
-				prop.Remove();
-			}
+			foreach (var prop in props) prop.Remove();
 
 			foreach (var prop in props.OrderBy(p => p.Name))
 			{
@@ -31,8 +28,9 @@ public static void DeepSort(this JObject jObj)
 		public static string CreateCharacterDifference(this string expected, string actual, string message = null)
 		{
 			var d = new Differ();
-			var result = d.CreateCharacterDiffs(expected.Trim('"'), actual.Trim('"'), ignoreWhitespace: false);
+			var result = d.CreateCharacterDiffs(expected.Trim('"'), actual.Trim('"'), false);
 			if (!result.DiffBlocks.Any()) return string.Empty;
+
 			var builder = new StringBuilder()
 				.AppendLine(message)
 				.AppendLine($"expect: \"{expected}\"")
@@ -44,7 +42,8 @@ public static string CreateCharacterDifference(this string expected, string actu
 			return builder.ToString();
 		}
 
-		public static string DiffNoApproximation(this string expected, string actual, string message = null) => CreateDiff(expected, actual, message, new Differ());
+		public static string DiffNoApproximation(this string expected, string actual, string message = null) =>
+			CreateDiff(expected, actual, message, new Differ());
 
 		public static string Diff(this string expected, string actual, string message = null)
 		{
diff --git a/src/Tests/Tests.Core/Extensions/EnumerableExtensions.cs b/src/Tests/Tests.Core/Extensions/EnumerableExtensions.cs
index 382da71e648..e2f1bd4864b 100644
--- a/src/Tests/Tests.Core/Extensions/EnumerableExtensions.cs
+++ b/src/Tests/Tests.Core/Extensions/EnumerableExtensions.cs
@@ -9,19 +9,17 @@ public static class EnumerableExtensions
 		public static IEnumerable<IEnumerable<T>> Partition<T>(this IEnumerable<T> source, int size)
 		{
 			T[] array = null;
-			int count = 0;
+			var count = 0;
 
 			foreach (var item in source)
 			{
-				if (array == null)
-				{
-					array = new T[size];
-				}
+				if (array == null) array = new T[size];
 				array[count] = item;
 				count++;
 				if (count == size)
 				{
 					yield return new ReadOnlyCollection<T>(array);
+
 					array = null;
 					count = 0;
 				}
diff --git a/src/Tests/Tests.Core/Extensions/EphemeralClusterExtensions.cs b/src/Tests/Tests.Core/Extensions/EphemeralClusterExtensions.cs
index d5d1777ce02..ab3ec35bdab 100644
--- a/src/Tests/Tests.Core/Extensions/EphemeralClusterExtensions.cs
+++ b/src/Tests/Tests.Core/Extensions/EphemeralClusterExtensions.cs
@@ -20,7 +20,8 @@ public static ConnectionSettings CreateConnectionSettings<TConfig>(this IEphemer
 
 		public static IElasticClient GetOrAddClient<TConfig>(
 			this IEphemeralCluster<TConfig> cluster,
-			Func<ConnectionSettings, ConnectionSettings> modifySettings = null)
+			Func<ConnectionSettings, ConnectionSettings> modifySettings = null
+		)
 			where TConfig : EphemeralClusterConfiguration
 		{
 			modifySettings = modifySettings ?? (s => s);
@@ -28,7 +29,7 @@ public static IElasticClient GetOrAddClient<TConfig>(
 			{
 				var settings = modifySettings(cluster.CreateConnectionSettings());
 
-				var current = (IConnectionConfigurationValues) settings;
+				var current = (IConnectionConfigurationValues)settings;
 				var notAlreadyAuthenticated = current.BasicAuthenticationCredentials == null && current.ClientCertificates == null;
 				var noCertValidation = current.ServerCertificateValidationCallback == null;
 
diff --git a/src/Tests/Tests.Core/Extensions/NumericExtensions.cs b/src/Tests/Tests.Core/Extensions/NumericExtensions.cs
index 9c3fad501a3..84404985fb0 100644
--- a/src/Tests/Tests.Core/Extensions/NumericExtensions.cs
+++ b/src/Tests/Tests.Core/Extensions/NumericExtensions.cs
@@ -25,8 +25,6 @@ public static string ToOrdinal(this int num)
 				default:
 					return num + "th";
 			}
-
 		}
 	}
-
 }
diff --git a/src/Tests/Tests.Core/Extensions/ReadOnlyDictionaryAssertions.cs b/src/Tests/Tests.Core/Extensions/ReadOnlyDictionaryAssertions.cs
index 8998d306697..79e3becf030 100644
--- a/src/Tests/Tests.Core/Extensions/ReadOnlyDictionaryAssertions.cs
+++ b/src/Tests/Tests.Core/Extensions/ReadOnlyDictionaryAssertions.cs
@@ -13,45 +13,38 @@ namespace Tests.Core.Extensions
 {
 	public static class ReadOnlyDictionaryShouldExtensions
 	{
-		public static ReadOnlyDictionaryAssertions<TKey, TValue> Should<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue> actualValue)
-		{
-			return new ReadOnlyDictionaryAssertions<TKey, TValue>(actualValue);
-		}
+		public static ReadOnlyDictionaryAssertions<TKey, TValue> Should<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue> actualValue) =>
+			new ReadOnlyDictionaryAssertions<TKey, TValue>(actualValue);
 
-		public static GenericDictionaryAssertions<TKey, TValue> Should<TKey, TValue>(this Dictionary<TKey, TValue> actualValue)
-		{
-			return new GenericDictionaryAssertions<TKey, TValue>(actualValue);
-		}
+		public static GenericDictionaryAssertions<TKey, TValue> Should<TKey, TValue>(this Dictionary<TKey, TValue> actualValue) =>
+			new GenericDictionaryAssertions<TKey, TValue>(actualValue);
 	}
 
 	public class WhichValueConstraint<TKey, TValue> : AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>
 	{
+		public WhichValueConstraint(ReadOnlyDictionaryAssertions<TKey, TValue> parentConstraint, TValue value)
+			: base(parentConstraint) => WhichValue = value;
+
 		/// <summary>Gets the value of the object referred to by the key.</summary>
 		public TValue WhichValue { get; private set; }
-
-		public WhichValueConstraint(ReadOnlyDictionaryAssertions<TKey, TValue> parentConstraint, TValue value)
-			: base(parentConstraint)
-		{
-			this.WhichValue = value;
-		}
 	}
 
 	/// <summary>
-	/// Contains a number of methods to assert that an <see cref="IDictionary{TKey,TValue}"/> is in the expected state.
+	/// Contains a number of methods to assert that an <see cref="IDictionary{TKey,TValue}" /> is in the expected state.
 	/// </summary>
 	[DebuggerNonUserCode]
-	public class ReadOnlyDictionaryAssertions<TKey, TValue> :
-		ReferenceTypeAssertions<IReadOnlyDictionary<TKey, TValue>, ReadOnlyDictionaryAssertions<TKey, TValue>>
+	public class ReadOnlyDictionaryAssertions<TKey, TValue>
+		: ReferenceTypeAssertions<IReadOnlyDictionary<TKey, TValue>, ReadOnlyDictionaryAssertions<TKey, TValue>>
 	{
 		public ReadOnlyDictionaryAssertions(IReadOnlyDictionary<TKey, TValue> dictionary)
 		{
-			if (dictionary != null)
-			{
-				this.Subject = dictionary;
-			}
+			if (dictionary != null) Subject = dictionary;
 		}
 
-		#region HaveCount
+		/// <summary>
+		/// Returns the type of the subject the assertion applies on.
+		/// </summary>
+		protected override string Context => "dictionary";
 
 		/// <summary>
 		/// Asserts that the number of items in the dictionary matches the supplied <paramref name="expected" /> amount.
@@ -65,21 +58,20 @@ public ReadOnlyDictionaryAssertions(IReadOnlyDictionary<TKey, TValue> dictionary
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> HaveCount(int expected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {0} item(s){reason}, but found {1}.", expected, this.Subject);
-			}
+					.FailWith("Expected {0} item(s){reason}, but found {1}.", expected, Subject);
 
-			var actualCount = this.Subject.Count;
+			var actualCount = Subject.Count;
 
 			Execute.Assertion
-				.ForCondition((actualCount == expected))
+				.ForCondition(actualCount == expected)
 				.BecauseOf(because, becauseArgs)
-				.FailWith("Expected {context:dictionary} {0} to have {1} item(s){reason}, but found {2}.", this.Subject, expected, actualCount);
+				.FailWith("Expected {context:dictionary} {0} to have {1} item(s){reason}, but found {2}.", Subject, expected, actualCount);
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
@@ -96,39 +88,29 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> HaveCount(int e
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> HaveCount(Expression<Func<int, bool>> countPredicate,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (countPredicate == null)
-			{
-				throw new NullReferenceException("Cannot compare dictionary count against a <null> predicate.");
-			}
+			if (countPredicate == null) throw new NullReferenceException("Cannot compare dictionary count against a <null> predicate.");
 
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to have {0} items{reason}, but found {1}.", countPredicate.Body, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to have {0} items{reason}, but found {1}.", countPredicate.Body, Subject);
 
 			var compiledPredicate = countPredicate.Compile();
 
-			var actualCount = this.Subject.Count;
+			var actualCount = Subject.Count;
 
 			if (!compiledPredicate(actualCount))
-			{
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
 					.FailWith("Expected {context:dictionary} {0} to have a count {1}{reason}, but count is {2}.",
-						this.Subject, countPredicate.Body, actualCount);
-			}
+						Subject, countPredicate.Body, actualCount);
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
 
-		#endregion
-
-		#region BeEmpty
-
 		/// <summary>
 		/// Asserts that the dictionary does not contain any items.
 		/// </summary>
@@ -141,17 +123,15 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> HaveCount(Expre
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> BeEmpty(string because = "", params object[] becauseArgs)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to be empty{reason}, but found {0}.", this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to be empty{reason}, but found {0}.", Subject);
 
 			Execute.Assertion
-				.ForCondition(!this.Subject.Any())
+				.ForCondition(!Subject.Any())
 				.BecauseOf(because, becauseArgs)
-				.FailWith("Expected {context:dictionary} to not have any items{reason}, but found {0}.", this.Subject.Count);
+				.FailWith("Expected {context:dictionary} to not have any items{reason}, but found {0}.", Subject.Count);
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
@@ -167,30 +147,25 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> BeEmpty(string
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotBeEmpty(string because = "",
-			params object[] becauseArgs)
+			params object[] becauseArgs
+		)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} not to be empty{reason}, but found {0}.", this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} not to be empty{reason}, but found {0}.", Subject);
 
 			Execute.Assertion
-				.ForCondition(this.Subject.Any())
+				.ForCondition(Subject.Any())
 				.BecauseOf(because, becauseArgs)
 				.FailWith("Expected one or more items{reason}, but found none.");
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
 
-		#endregion
-
-		#region Equal
-
 		/// <summary>
 		/// Asserts that the current dictionary contains all the same key-value pairs as the
-		/// specified <paramref name="expected"/> dictionary. Keys and values are compared using
+		/// specified <paramref name="expected" /> dictionary. Keys and values are compared using
 		/// their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="expected">The expected dictionary</param>
@@ -202,54 +177,44 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotBeEmpty(stri
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Equal(IReadOnlyDictionary<TKey, TValue> expected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to be equal to {0}{reason}, but found {1}.", expected, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to be equal to {0}{reason}, but found {1}.", expected, Subject);
 
-			if (expected == null)
-			{
-				throw new ArgumentNullException("expected", "Cannot compare dictionary with <null>.");
-			}
+			if (expected == null) throw new ArgumentNullException("expected", "Cannot compare dictionary with <null>.");
 
-			var missingKeys = expected.Keys.Except(this.Subject.Keys);
-			var additionalKeys = this.Subject.Keys.Except(expected.Keys);
+			var missingKeys = expected.Keys.Except(Subject.Keys);
+			var additionalKeys = Subject.Keys.Except(expected.Keys);
 
 			if (missingKeys.Any())
-			{
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
 					.FailWith("Expected {context:dictionary} to be equal to {0}{reason}, but could not find keys {1}.", expected,
 						missingKeys);
-			}
 
 			if (additionalKeys.Any())
-			{
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
 					.FailWith("Expected {context:dictionary} to be equal to {0}{reason}, but found additional keys {1}.", expected,
 						additionalKeys);
-			}
 
 			foreach (var key in expected.Keys)
-			{
 				Execute.Assertion
-					.ForCondition(this.Subject[key].IsSameOrEqualTo(expected[key]))
+					.ForCondition(Subject[key].IsSameOrEqualTo(expected[key]))
 					.BecauseOf(because, becauseArgs)
 					.FailWith("Expected {context:dictionary} to be equal to {0}{reason}, but {1} differs at key {2}.",
-						expected, this.Subject, key);
-			}
+						expected, Subject, key);
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
 
 		/// <summary>
 		/// Asserts the current dictionary not to contain all the same key-value pairs as the
-		/// specified <paramref name="unexpected"/> dictionary. Keys and values are compared using
+		/// specified <paramref name="unexpected" /> dictionary. Keys and values are compared using
 		/// their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="unexpected">The unexpected dictionary</param>
@@ -261,41 +226,31 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Equal(IReadOnly
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotEqual(IReadOnlyDictionary<TKey, TValue> unexpected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected dictionaries not to be equal{reason}, but found {0}.", this.Subject);
-			}
+					.FailWith("Expected dictionaries not to be equal{reason}, but found {0}.", Subject);
 
-			if (unexpected == null)
-			{
-				throw new ArgumentNullException("unexpected", "Cannot compare dictionary with <null>.");
-			}
+			if (unexpected == null) throw new ArgumentNullException("unexpected", "Cannot compare dictionary with <null>.");
 
-			var missingKeys = unexpected.Keys.Except(this.Subject.Keys);
-			var additionalKeys = this.Subject.Keys.Except(unexpected.Keys);
+			var missingKeys = unexpected.Keys.Except(Subject.Keys);
+			var additionalKeys = Subject.Keys.Except(unexpected.Keys);
 
 			var foundDifference = missingKeys.Any()
-			                      || additionalKeys.Any()
-			                      || (this.Subject.Keys.Any(key => !this.Subject[key].IsSameOrEqualTo(unexpected[key])));
+				|| additionalKeys.Any()
+				|| Subject.Keys.Any(key => !Subject[key].IsSameOrEqualTo(unexpected[key]));
 
 			if (!foundDifference)
-			{
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Did not expect dictionaries {0} and {1} to be equal{reason}.", unexpected, this.Subject);
-			}
+					.FailWith("Did not expect dictionaries {0} and {1} to be equal{reason}.", unexpected, Subject);
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
 
-		#endregion
-
-		#region ContainKey
-
 		/// <summary>
 		/// Asserts that the dictionary contains the specified key. Keys are compared using
 		/// their <see cref="object.Equals(object)" /> implementation.
@@ -309,11 +264,12 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotEqual(IReadO
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public WhichValueConstraint<TKey, TValue> ContainKey(TKey expected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			var andConstraint = this.ContainKeys(new[] { expected }, because, becauseArgs);
+			var andConstraint = ContainKeys(new[] { expected }, because, becauseArgs);
 
-			return new WhichValueConstraint<TKey, TValue>(andConstraint.And, this.Subject[expected]);
+			return new WhichValueConstraint<TKey, TValue>(andConstraint.And, Subject[expected]);
 		}
 
 		/// <summary>
@@ -321,10 +277,7 @@ public WhichValueConstraint<TKey, TValue> ContainKey(TKey expected,
 		/// their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="expected">The expected keys</param>
-		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainKeys(params TKey[] expected)
-		{
-			return this.ContainKeys(expected, string.Empty);
-		}
+		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainKeys(params TKey[] expected) => ContainKeys(expected, string.Empty);
 
 		/// <summary>
 		/// Asserts that the dictionary contains all of the specified keys. Keys are compared using
@@ -339,54 +292,39 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainKeys(par
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainKeys(IEnumerable<TKey> expected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (expected == null)
-			{
-				throw new NullReferenceException("Cannot verify key containment against a <null> collection of keys");
-			}
+			if (expected == null) throw new NullReferenceException("Cannot verify key containment against a <null> collection of keys");
 
 			var expectedKeys = expected.ToArray();
 
-			if (!expectedKeys.Any())
-			{
-				throw new ArgumentException("Cannot verify key containment against an empty sequence");
-			}
+			if (!expectedKeys.Any()) throw new ArgumentException("Cannot verify key containment against an empty sequence");
 
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to contain keys {0}{reason}, but found {1}.", expected, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to contain keys {0}{reason}, but found {1}.", expected, Subject);
 
-			var missingKeys = expectedKeys.Where(key => !this.Subject.ContainsKey(key));
+			var missingKeys = expectedKeys.Where(key => !Subject.ContainsKey(key));
 
 			if (missingKeys.Any())
 			{
 				if (expectedKeys.Count() > 1)
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to contain key {1}{reason}, but could not find {2}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to contain key {1}{reason}, but could not find {2}.", Subject,
 							expected, missingKeys);
-				}
 				else
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to contain key {1}{reason}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to contain key {1}{reason}.", Subject,
 							expected.Cast<object>().First());
-				}
 			}
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
 
-		#endregion
-
-		#region NotContainKey
-
 		/// <summary>
 		/// Asserts that the current dictionary does not contain the specified <paramref name="unexpected" /> key.
 		/// Keys are compared using their <see cref="object.Equals(object)" /> implementation.
@@ -400,21 +338,18 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainKeys(IEn
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainKey(TKey unexpected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} not to contain key {0}{reason}, but found {1}.", unexpected, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} not to contain key {0}{reason}, but found {1}.", unexpected, Subject);
 
-			if (this.Subject.ContainsKey(unexpected))
-			{
+			if (Subject.ContainsKey(unexpected))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("{context:Dictionary} {0} should not contain key {1}{reason}, but found it anyhow.", this.Subject, unexpected);
-			}
+					.FailWith("{context:Dictionary} {0} should not contain key {1}{reason}, but found it anyhow.", Subject, unexpected);
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
@@ -424,10 +359,8 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainKey(T
 		/// their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="unexpected">The unexpected keys</param>
-		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainKeys(params TKey[] unexpected)
-		{
-			return this.NotContainKeys(unexpected, string.Empty);
-		}
+		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainKeys(params TKey[] unexpected) =>
+			NotContainKeys(unexpected, string.Empty);
 
 		/// <summary>
 		/// Asserts that the dictionary does not contain any of the specified keys. Keys are compared using
@@ -442,54 +375,39 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainKeys(
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainKeys(IEnumerable<TKey> unexpected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (unexpected == null)
-			{
-				throw new NullReferenceException("Cannot verify key containment against a <null> collection of keys");
-			}
+			if (unexpected == null) throw new NullReferenceException("Cannot verify key containment against a <null> collection of keys");
 
 			var unexpectedKeys = unexpected.ToArray();
 
-			if (!unexpectedKeys.Any())
-			{
-				throw new ArgumentException("Cannot verify key containment against an empty sequence");
-			}
+			if (!unexpectedKeys.Any()) throw new ArgumentException("Cannot verify key containment against an empty sequence");
 
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to contain keys {0}{reason}, but found {1}.", unexpected, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to contain keys {0}{reason}, but found {1}.", unexpected, Subject);
 
-			var foundKeys = unexpectedKeys.Intersect(this.Subject.Keys);
+			var foundKeys = unexpectedKeys.Intersect(Subject.Keys);
 
 			if (foundKeys.Any())
 			{
 				if (unexpectedKeys.Count() > 1)
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to not contain key {1}{reason}, but found {2}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to not contain key {1}{reason}, but found {2}.", Subject,
 							unexpected, foundKeys);
-				}
 				else
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to not contain key {1}{reason}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to not contain key {1}{reason}.", Subject,
 							unexpected.Cast<object>().First());
-				}
 			}
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
 
-		#endregion
-
-		#region ContainValue
-
 		/// <summary>
 		/// Asserts that the dictionary contains the specified value. Values are compared using
 		/// their <see cref="object.Equals(object)" /> implementation.
@@ -503,10 +421,11 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainKeys(
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndWhichConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>, TValue> ContainValue(TValue expected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
 			var innerConstraint =
-				this.ContainValuesAndWhich(new[] { expected }, because, becauseArgs);
+				ContainValuesAndWhich(new[] { expected }, because, becauseArgs);
 
 			return
 				new AndWhichConstraint
@@ -519,10 +438,8 @@ public AndWhichConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>, TValue> Co
 		/// their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="expected">The expected values</param>
-		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainValues(params TValue[] expected)
-		{
-			return this.ContainValues(expected, string.Empty);
-		}
+		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainValues(params TValue[] expected) =>
+			ContainValues(expected, string.Empty);
 
 		/// <summary>
 		/// Asserts that the dictionary contains all of the specified values. Values are compared using
@@ -537,57 +454,45 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainValues(p
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> ContainValues(IEnumerable<TValue> expected,
-			string because = "", params object[] becauseArgs)
-		{
-			return this.ContainValuesAndWhich(expected, because, becauseArgs);
-		}
+			string because = "", params object[] becauseArgs
+		) => ContainValuesAndWhich(expected, because, becauseArgs);
 
-		private AndWhichConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>, IEnumerable<TValue>> ContainValuesAndWhich(IEnumerable<TValue> expected, string because = "",
-			params object[] becauseArgs)
+		private AndWhichConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>, IEnumerable<TValue>> ContainValuesAndWhich(
+			IEnumerable<TValue> expected, string because = "",
+			params object[] becauseArgs
+		)
 		{
-			if (expected == null)
-			{
-				throw new NullReferenceException("Cannot verify value containment against a <null> collection of values");
-			}
+			if (expected == null) throw new NullReferenceException("Cannot verify value containment against a <null> collection of values");
 
 			var expectedValues = expected.ToArray();
 
-			if (!expectedValues.Any())
-			{
-				throw new ArgumentException("Cannot verify value containment with an empty sequence");
-			}
+			if (!expectedValues.Any()) throw new ArgumentException("Cannot verify value containment with an empty sequence");
 
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to contain value {0}{reason}, but found {1}.", expected, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to contain value {0}{reason}, but found {1}.", expected, Subject);
 
-			var missingValues = expectedValues.Except(this.Subject.Values);
+			var missingValues = expectedValues.Except(Subject.Values);
 			if (missingValues.Any())
 			{
 				if (expectedValues.Length > 1)
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to contain value {1}{reason}, but could not find {2}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to contain value {1}{reason}, but could not find {2}.", Subject,
 							expected, missingValues);
-				}
 				else
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to contain value {1}{reason}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to contain value {1}{reason}.", Subject,
 							expected.Cast<object>().First());
-				}
 			}
 
 			return
 				new AndWhichConstraint
 				<ReadOnlyDictionaryAssertions<TKey, TValue>,
 					IEnumerable<TValue>>(this,
-					this.RepetitionPreservingIntersect(this.Subject.Values, expectedValues));
+					RepetitionPreservingIntersect(Subject.Values, expectedValues));
 		}
 
 		/// <summary>
@@ -595,16 +500,13 @@ private AndWhichConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>, IEnumerab
 		/// </summary>
 		/// <remarks>Enumerable.Intersect is not suitable because it drops any repeated elements.</remarks>
 		private IEnumerable<TValue> RepetitionPreservingIntersect(
-			IEnumerable<TValue> first, IEnumerable<TValue> second)
+			IEnumerable<TValue> first, IEnumerable<TValue> second
+		)
 		{
 			var secondSet = new HashSet<TValue>(second);
 			return first.Where(secondSet.Contains);
 		}
 
-		#endregion
-
-		#region NotContainValue
-
 		/// <summary>
 		/// Asserts that the current dictionary does not contain the specified <paramref name="unexpected" /> value.
 		/// Values are compared using their <see cref="object.Equals(object)" /> implementation.
@@ -618,21 +520,18 @@ private IEnumerable<TValue> RepetitionPreservingIntersect(
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainValue(TValue unexpected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} not to contain value {0}{reason}, but found {1}.", unexpected, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} not to contain value {0}{reason}, but found {1}.", unexpected, Subject);
 
-			if (this.Subject.Values.Contains(unexpected))
-			{
+			if (Subject.Values.Contains(unexpected))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("{context:Dictionary} {0} should not contain value {1}{reason}, but found it anyhow.", this.Subject, unexpected);
-			}
+					.FailWith("{context:Dictionary} {0} should not contain value {1}{reason}, but found it anyhow.", Subject, unexpected);
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
@@ -642,10 +541,8 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainValue
 		/// their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="unexpected">The unexpected values</param>
-		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainValues(params TValue[] unexpected)
-		{
-			return this.NotContainValues(unexpected, string.Empty);
-		}
+		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainValues(params TValue[] unexpected) =>
+			NotContainValues(unexpected, string.Empty);
 
 		/// <summary>
 		/// Asserts that the dictionary does not contain any of the specified values. Values are compared using
@@ -660,55 +557,40 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainValue
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainValues(IEnumerable<TValue> unexpected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (unexpected == null)
-			{
-				throw new NullReferenceException("Cannot verify value containment against a <null> collection of values");
-			}
+			if (unexpected == null) throw new NullReferenceException("Cannot verify value containment against a <null> collection of values");
 
 			var unexpectedValues = unexpected.ToArray();
 
-			if (!unexpectedValues.Any())
-			{
-				throw new ArgumentException("Cannot verify value containment with an empty sequence");
-			}
+			if (!unexpectedValues.Any()) throw new ArgumentException("Cannot verify value containment with an empty sequence");
 
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to not contain value {0}{reason}, but found {1}.", unexpected, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to not contain value {0}{reason}, but found {1}.", unexpected, Subject);
 
-			var foundValues = unexpectedValues.Intersect(this.Subject.Values);
+			var foundValues = unexpectedValues.Intersect(Subject.Values);
 			if (foundValues.Any())
 			{
 				if (unexpectedValues.Length > 1)
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to not contain value {1}{reason}, but found {2}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to not contain value {1}{reason}, but found {2}.", Subject,
 							unexpected, foundValues);
-				}
 				else
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to not contain value {1}{reason}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to not contain value {1}{reason}.", Subject,
 							unexpected.Cast<object>().First());
-				}
 			}
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
 
-		#endregion
-
-		#region Contain
-
 		/// <summary>
-		/// Asserts that the current dictionary contains the specified <paramref name="expected"/>.
+		/// Asserts that the current dictionary contains the specified <paramref name="expected" />.
 		/// Keys and values are compared using their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="expected">The expected key/value pairs.</param>
@@ -720,67 +602,58 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContainValue
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Contain(IEnumerable<KeyValuePair<TKey, TValue>> expected,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (expected == null)
-			{
-				throw new ArgumentNullException("expected", "Cannot compare dictionary with <null>.");
-			}
+			if (expected == null) throw new ArgumentNullException("expected", "Cannot compare dictionary with <null>.");
 
 			var expectedKeyValuePairs = expected.ToArray();
 
 			if (!expectedKeyValuePairs.Any())
-			{
 				throw new ArgumentException("Cannot verify key containment against an empty collection of key/value pairs");
-			}
 
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to contain key/value pairs {0}{reason}, but dictionary is {1}.", expected, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to contain key/value pairs {0}{reason}, but dictionary is {1}.", expected, Subject);
 
 			var expectedKeys = expectedKeyValuePairs.Select(keyValuePair => keyValuePair.Key).ToArray();
-			var missingKeys = expectedKeys.Where(key => !this.Subject.ContainsKey(key));
+			var missingKeys = expectedKeys.Where(key => !Subject.ContainsKey(key));
 
 			if (missingKeys.Any())
 			{
 				if (expectedKeyValuePairs.Count() > 1)
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to contain key(s) {1}{reason}, but could not find keys {2}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to contain key(s) {1}{reason}, but could not find keys {2}.", Subject,
 							expectedKeys, missingKeys);
-				}
 				else
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} {0} to contain key {1}{reason}.", this.Subject,
+						.FailWith("Expected {context:dictionary} {0} to contain key {1}{reason}.", Subject,
 							expectedKeys.Cast<object>().First());
-				}
 			}
 
-			var keyValuePairsNotSameOrEqualInSubject = expectedKeyValuePairs.Where(keyValuePair => !this.Subject[keyValuePair.Key].IsSameOrEqualTo(keyValuePair.Value)).ToArray();
+			var keyValuePairsNotSameOrEqualInSubject = expectedKeyValuePairs
+				.Where(keyValuePair => !Subject[keyValuePair.Key].IsSameOrEqualTo(keyValuePair.Value))
+				.ToArray();
 
 			if (keyValuePairsNotSameOrEqualInSubject.Any())
 			{
 				if (keyValuePairsNotSameOrEqualInSubject.Count() > 1)
-				{
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
 						.FailWith("Expected {context:dictionary} to contain {0}{reason}, but {context:dictionary} differs at keys {1}.",
 							expectedKeyValuePairs, keyValuePairsNotSameOrEqualInSubject.Select(keyValuePair => keyValuePair.Key));
-				}
 				else
 				{
 					var expectedKeyValuePair = keyValuePairsNotSameOrEqualInSubject.First();
-					var actual = this.Subject[expectedKeyValuePair.Key];
+					var actual = Subject[expectedKeyValuePair.Key];
 
 					Execute.Assertion
 						.BecauseOf(because, becauseArgs)
-						.FailWith("Expected {context:dictionary} to contain value {0} at key {1}{reason}, but found {2}.", expectedKeyValuePair.Value, expectedKeyValuePair.Key, actual);
+						.FailWith("Expected {context:dictionary} to contain value {0} at key {1}{reason}, but found {2}.", expectedKeyValuePair.Value,
+							expectedKeyValuePair.Key, actual);
 				}
 			}
 
@@ -788,10 +661,10 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Contain(IEnumer
 		}
 
 		/// <summary>
-		/// Asserts that the current dictionary contains the specified <paramref name="expected"/>.
+		/// Asserts that the current dictionary contains the specified <paramref name="expected" />.
 		/// Keys and values are compared using their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
-		/// <param name="expected">The expected <see cref="KeyValuePair{TKey,TValue}"/></param>
+		/// <param name="expected">The expected <see cref="KeyValuePair{TKey,TValue}" /></param>
 		/// <param name="because">
 		/// A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
 		/// is needed. If the phrase does not start with the word <i>because</i>, it is prepended automatically.
@@ -800,14 +673,14 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Contain(IEnumer
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Contain(KeyValuePair<TKey, TValue> expected,
-			string because = "", params object[] becauseArgs)
-		{
-			return this.Contain(expected.Key, expected.Value, because, becauseArgs);
-		}
+			string because = "", params object[] becauseArgs
+		) => Contain(expected.Key, expected.Value, because, becauseArgs);
 
 		/// <summary>
-		/// Asserts that the current dictionary contains the specified <paramref name="value" /> for the supplied <paramref
-		/// name="key" />. Values are compared using their <see cref="object.Equals(object)" /> implementation.
+		/// Asserts that the current dictionary contains the specified <paramref name="value" /> for the supplied
+		/// <paramref
+		///     name="key" />
+		/// . Values are compared using their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="key">The key for which to validate the value</param>
 		/// <param name="value">The value to validate</param>
@@ -819,19 +692,18 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Contain(KeyValu
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Contain(TKey key, TValue value,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
 					.FailWith("Expected {context:dictionary} to contain value {0} at key {1}{reason}, but dictionary is {2}.", value, key,
-						this.Subject);
-			}
+						Subject);
 
-			if (this.Subject.ContainsKey(key))
+			if (Subject.ContainsKey(key))
 			{
-				var actual = this.Subject[key];
+				var actual = Subject[key];
 
 				Execute.Assertion
 					.ForCondition(actual.IsSameOrEqualTo(value))
@@ -839,22 +711,16 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Contain(TKey ke
 					.FailWith("Expected {context:dictionary} to contain value {0} at key {1}{reason}, but found {2}.", value, key, actual);
 			}
 			else
-			{
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
 					.FailWith("Expected {context:dictionary} to contain value {0} at key {1}{reason}, but the key was not found.", value,
 						key);
-			}
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
 
-		#endregion
-
-		#region NotContain
-
 		/// <summary>
-		/// Asserts that the current dictionary does not contain the specified <paramref name="items"/>.
+		/// Asserts that the current dictionary does not contain the specified <paramref name="items" />.
 		/// Keys and values are compared using their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
 		/// <param name="items">The unexpected key/value pairs</param>
@@ -866,48 +732,42 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> Contain(TKey ke
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContain(IEnumerable<KeyValuePair<TKey, TValue>> items,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (items == null)
-			{
-				throw new ArgumentNullException("items", "Cannot compare dictionary with <null>.");
-			}
+			if (items == null) throw new ArgumentNullException("items", "Cannot compare dictionary with <null>.");
 
 			var keyValuePairs = items.ToArray();
 
-			if (!keyValuePairs.Any())
-			{
-				throw new ArgumentException("Cannot verify key containment against an empty collection of key/value pairs");
-			}
+			if (!keyValuePairs.Any()) throw new ArgumentException("Cannot verify key containment against an empty collection of key/value pairs");
 
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
-					.FailWith("Expected {context:dictionary} to not contain key/value pairs {0}{reason}, but dictionary is {1}.", items, this.Subject);
-			}
+					.FailWith("Expected {context:dictionary} to not contain key/value pairs {0}{reason}, but dictionary is {1}.", items, Subject);
 
-			var keyValuePairsFound = keyValuePairs.Where(keyValuePair => this.Subject.ContainsKey(keyValuePair.Key)).ToArray();
+			var keyValuePairsFound = keyValuePairs.Where(keyValuePair => Subject.ContainsKey(keyValuePair.Key)).ToArray();
 
 			if (keyValuePairsFound.Any())
 			{
-				var keyValuePairsSameOrEqualInSubject = keyValuePairsFound.Where(keyValuePair => this.Subject[keyValuePair.Key].IsSameOrEqualTo(keyValuePair.Value)).ToArray();
+				var keyValuePairsSameOrEqualInSubject =
+					keyValuePairsFound.Where(keyValuePair => Subject[keyValuePair.Key].IsSameOrEqualTo(keyValuePair.Value)).ToArray();
 
 				if (keyValuePairsSameOrEqualInSubject.Any())
 				{
 					if (keyValuePairsSameOrEqualInSubject.Count() > 1)
-					{
 						Execute.Assertion
 							.BecauseOf(because, becauseArgs)
-							.FailWith("Expected {context:dictionary} to not contain key/value pairs {0}{reason}, but found them anyhow.", keyValuePairs);
-					}
+							.FailWith("Expected {context:dictionary} to not contain key/value pairs {0}{reason}, but found them anyhow.",
+								keyValuePairs);
 					else
 					{
 						var keyValuePair = keyValuePairsSameOrEqualInSubject.First();
 
 						Execute.Assertion
 							.BecauseOf(because, becauseArgs)
-							.FailWith("Expected {context:dictionary} to not contain value {0} at key {1}{reason}, but found it anyhow.", keyValuePair.Value, keyValuePair.Key);
+							.FailWith("Expected {context:dictionary} to not contain value {0} at key {1}{reason}, but found it anyhow.",
+								keyValuePair.Value, keyValuePair.Key);
 					}
 				}
 			}
@@ -916,10 +776,10 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContain(IEnu
 		}
 
 		/// <summary>
-		/// Asserts that the current dictionary does not contain the specified <paramref name="item"/>.
+		/// Asserts that the current dictionary does not contain the specified <paramref name="item" />.
 		/// Keys and values are compared using their <see cref="object.Equals(object)" /> implementation.
 		/// </summary>
-		/// <param name="item">The unexpected <see cref="KeyValuePair{TKey,TValue}"/></param>
+		/// <param name="item">The unexpected <see cref="KeyValuePair{TKey,TValue}" /></param>
 		/// <param name="because">
 		/// A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
 		/// is needed. If the phrase does not start with the word <i>because</i>, it is prepended automatically.
@@ -928,10 +788,8 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContain(IEnu
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContain(KeyValuePair<TKey, TValue> item,
-			string because = "", params object[] becauseArgs)
-		{
-			return this.NotContain(item.Key, item.Value, because, becauseArgs);
-		}
+			string because = "", params object[] becauseArgs
+		) => NotContain(item.Key, item.Value, because, becauseArgs);
 
 		/// <summary>
 		/// Asserts that the current dictionary does not contain the specified <paramref name="value" /> for the
@@ -947,19 +805,18 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContain(KeyV
 		/// Zero or more objects to format using the placeholders in <see cref="because" />.
 		/// </param>
 		public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContain(TKey key, TValue value,
-			string because = "", params object[] becauseArgs)
+			string because = "", params object[] becauseArgs
+		)
 		{
-			if (ReferenceEquals(this.Subject, null))
-			{
+			if (ReferenceEquals(Subject, null))
 				Execute.Assertion
 					.BecauseOf(because, becauseArgs)
 					.FailWith("Expected {context:dictionary} not to contain value {0} at key {1}{reason}, but dictionary is {2}.", value,
-						key, this.Subject);
-			}
+						key, Subject);
 
-			if (this.Subject.ContainsKey(key))
+			if (Subject.ContainsKey(key))
 			{
-				var actual = this.Subject[key];
+				var actual = Subject[key];
 
 				Execute.Assertion
 					.ForCondition(!actual.IsSameOrEqualTo(value))
@@ -969,15 +826,5 @@ public AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>> NotContain(TKey
 
 			return new AndConstraint<ReadOnlyDictionaryAssertions<TKey, TValue>>(this);
 		}
-
-		#endregion
-
-		/// <summary>
-		/// Returns the type of the subject the assertion applies on.
-		/// </summary>
-		protected override string Context
-		{
-			get { return "dictionary"; }
-		}
 	}
 }
diff --git a/src/Tests/Tests.Core/Extensions/SerializationTesterAssertionExtensions.cs b/src/Tests/Tests.Core/Extensions/SerializationTesterAssertionExtensions.cs
index 1c2af9eef38..81378948999 100644
--- a/src/Tests/Tests.Core/Extensions/SerializationTesterAssertionExtensions.cs
+++ b/src/Tests/Tests.Core/Extensions/SerializationTesterAssertionExtensions.cs
@@ -8,6 +8,7 @@ public static class SerializationTesterAssertionExtensions
 		public static void ShouldBeValid(this SerializationResult result, string message = null)
 		{
 			if (result.Success) return;
+
 			throw new Exception($@"Expected serialization to succeed but failed.
 {(message ?? string.Empty) + result}
 ");
@@ -15,11 +16,14 @@ public static void ShouldBeValid(this SerializationResult result, string message
 
 		public static T AssertRoundTrip<T>(this SerializationTester tester, T @object, string message = null, bool preserveNullInExpected = false)
 		{
-			var roundTripResult = tester.RoundTrips(@object, preserveNullInExpected: preserveNullInExpected);
+			var roundTripResult = tester.RoundTrips(@object, preserveNullInExpected);
 			roundTripResult.ShouldBeValid(message);
 			return roundTripResult.Result;
 		}
-		public static T AssertRoundTrip<T>(this SerializationTester tester, T @object, object expectedJson,  string message = null, bool preserveNullInExpected = false)
+
+		public static T AssertRoundTrip<T>(this SerializationTester tester, T @object, object expectedJson, string message = null,
+			bool preserveNullInExpected = false
+		)
 		{
 			var roundTripResult = tester.RoundTrips(@object, expectedJson, preserveNullInExpected);
 			roundTripResult.ShouldBeValid(message);
@@ -32,11 +36,13 @@ public static T AssertDeserialize<T>(this SerializationTester tester, object jso
 			roundTripResult.ShouldBeValid(message);
 			return roundTripResult.Result;
 		}
-		public static void AssertSerialize<T>(this SerializationTester tester, T @object, object expectedJson, string message = null, bool preserveNullInExpected = false)
+
+		public static void AssertSerialize<T>(this SerializationTester tester, T @object, object expectedJson, string message = null,
+			bool preserveNullInExpected = false
+		)
 		{
 			var roundTripResult = tester.Serializes(@object, expectedJson, preserveNullInExpected);
 			roundTripResult.ShouldBeValid(message);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests.Core/Extensions/ShouldExtensions.cs b/src/Tests/Tests.Core/Extensions/ShouldExtensions.cs
index 39e8b254b6c..f4d491fa223 100644
--- a/src/Tests/Tests.Core/Extensions/ShouldExtensions.cs
+++ b/src/Tests/Tests.Core/Extensions/ShouldExtensions.cs
@@ -34,6 +34,5 @@ public static void ShouldAdhereToSourceSerializerWhenSet(this Project project)
 
 		public static void ShouldBeTrue(this bool b, IUrlParameter p) =>
 			b.Should().BeTrue(p?.GetString(TestClient.DefaultInMemoryClient.ConnectionSettings) ?? "NULL");
-
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/ClusterTestClassBase.cs b/src/Tests/Tests.Core/ManagedElasticsearch/ClusterTestClassBase.cs
index d9a48f71a27..3245c5ca2b8 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/ClusterTestClassBase.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/ClusterTestClassBase.cs
@@ -8,14 +8,14 @@ namespace Tests.Core.ManagedElasticsearch
 	public abstract class ClusterTestClassBase<TCluster> : IClusterFixture<TCluster>
 		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
 	{
-		public TCluster Cluster { get; }
-		public IElasticClient Client => this.Cluster.Client;
-
 		protected ClusterTestClassBase(TCluster cluster)
 		{
-			this.Cluster = cluster;
-			this.Cluster.ClusterConfiguration.ShowElasticsearchOutputAfterStarted = false;
-			this.Cluster.ClusterConfiguration.CacheEsHomeInstallation = true;
+			Cluster = cluster;
+			Cluster.ClusterConfiguration.ShowElasticsearchOutputAfterStarted = false;
+			Cluster.ClusterConfiguration.CacheEsHomeInstallation = true;
 		}
+
+		public IElasticClient Client => Cluster.Client;
+		public TCluster Cluster { get; }
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs
index bfbf98cd2d4..24d8b871316 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using Elastic.Managed.Ephemeral;
 using Elastic.Managed.Ephemeral.Plugins;
 using Elastic.Xunit;
 using Nest;
 using Tests.Configuration;
 using Tests.Core.Client;
-using Tests.Core.Client.Settings;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Tasks;
 using Tests.Domain.Extensions;
@@ -20,45 +15,46 @@ public class ClientTestClusterBase : XunitClusterBase<ClientTestClusterConfigura
 	{
 		public ClientTestClusterBase() : this(new ClientTestClusterConfiguration()) { }
 
-		public ClientTestClusterBase(params ElasticsearchPlugin[] plugins) : this(new ClientTestClusterConfiguration(plugins: plugins)) { }
+		public ClientTestClusterBase(params ElasticsearchPlugin[] plugins) : this(new ClientTestClusterConfiguration(plugins)) { }
 
 		public ClientTestClusterBase(ClientTestClusterConfiguration configuration) : base(configuration) { }
 
-		public IElasticClient Client => this.GetOrAddClient(s=> this.ConnectionSettings(s.ApplyDomainSettings()));
+		public IElasticClient Client => this.GetOrAddClient(s => ConnectionSettings(s.ApplyDomainSettings()));
 
 		protected virtual ConnectionSettings ConnectionSettings(ConnectionSettings s) => s;
 	}
 
 	public class ClientTestClusterConfiguration : XunitClusterConfiguration
 	{
-		public ITestConfiguration TestConfiguration { get; }
-
 		public ClientTestClusterConfiguration(params ElasticsearchPlugin[] plugins) : this(numberOfNodes: 1, plugins: plugins) { }
 
-		public ClientTestClusterConfiguration(ClusterFeatures features = ClusterFeatures.None, int numberOfNodes = 1, params ElasticsearchPlugin[] plugins)
+		public ClientTestClusterConfiguration(ClusterFeatures features = ClusterFeatures.None, int numberOfNodes = 1,
+			params ElasticsearchPlugin[] plugins
+		)
 			: base(TestClient.Configuration.ElasticsearchVersion, features, new ElasticsearchPlugins(plugins), numberOfNodes)
 		{
-			this.TestConfiguration = TestClient.Configuration;
-			this.ShowElasticsearchOutputAfterStarted = true; //this.TestConfiguration.ShowElasticsearchOutputAfterStarted;
+			TestConfiguration = TestClient.Configuration;
+			ShowElasticsearchOutputAfterStarted = true; //this.TestConfiguration.ShowElasticsearchOutputAfterStarted;
 
-			this.CacheEsHomeInstallation = true;
-			this.TrialMode = XPackTrialMode.Trial;
+			CacheEsHomeInstallation = true;
+			TrialMode = XPackTrialMode.Trial;
 
-			this.Add(this.AttributeKey("testingcluster"), "true");
-			this.Add(this.AttributeKey("gateway"), "true");
-			this.Add("search.remote.connect", "true", ">=5.3.0");
+			Add(AttributeKey("testingcluster"), "true");
+			Add(AttributeKey("gateway"), "true");
+			Add("search.remote.connect", "true", ">=5.3.0");
 
-			this.Add($"script.max_compilations_per_minute", "10000", "<6.0.0-rc1");
-			this.Add($"script.max_compilations_rate", "10000/1m", ">=6.0.0-rc1");
+			Add($"script.max_compilations_per_minute", "10000", "<6.0.0-rc1");
+			Add($"script.max_compilations_rate", "10000/1m", ">=6.0.0-rc1");
 
-			this.Add($"script.inline", "true", "<6.0.0");
-			this.Add($"script.stored", "true", ">5.0.0-alpha1 <6.0.0");
-			this.Add($"script.indexed", "true", "<5.0.0-alpha1");
-			this.Add($"script.allowed_types", "inline,stored", ">=6.0.0");
+			Add($"script.inline", "true", "<6.0.0");
+			Add($"script.stored", "true", ">5.0.0-alpha1 <6.0.0");
+			Add($"script.indexed", "true", "<5.0.0-alpha1");
+			Add($"script.allowed_types", "inline,stored", ">=6.0.0");
 
-			this.AdditionalBeforeNodeStartedTasks.Add(new WriteAnalysisFiles());
+			AdditionalBeforeNodeStartedTasks.Add(new WriteAnalysisFiles());
 		}
 
-		public string AnalysisFolder => Path.Combine(this.FileSystem.ConfigPath, "analysis");
+		public string AnalysisFolder => Path.Combine(FileSystem.ConfigPath, "analysis");
+		public ITestConfiguration TestConfiguration { get; }
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/IntrusiveOperationCluster.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/IntrusiveOperationCluster.cs
index f2567ef4992..12b13eb90f8 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/IntrusiveOperationCluster.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/IntrusiveOperationCluster.cs
@@ -11,7 +11,7 @@ public IntrusiveOperationCluster() : base(new ClientTestClusterConfiguration(
 			ElasticsearchPlugin.IngestGeoIp, ElasticsearchPlugin.IngestAttachment
 		)
 		{
-			MaxConcurrency= 1
+			MaxConcurrency = 1
 		}) { }
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ReadOnlyCluster.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ReadOnlyCluster.cs
index 5e9be4db3d1..044b4c1f947 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ReadOnlyCluster.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ReadOnlyCluster.cs
@@ -7,6 +7,6 @@ public class ReadOnlyCluster : ClientTestClusterBase
 	{
 		public ReadOnlyCluster() : base(MapperMurmur3) { }
 
-		protected override void SeedCluster() => new DefaultSeeder(this.Client).SeedNode();
+		protected override void SeedCluster() => new DefaultSeeder(Client).SeedNode();
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/TimeSeriesCluster.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/TimeSeriesCluster.cs
index 8db45a34cb6..430c3a69632 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/TimeSeriesCluster.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/TimeSeriesCluster.cs
@@ -9,16 +9,15 @@ namespace Tests.Core.ManagedElasticsearch.Clusters
 	public class TimeSeriesCluster : XPackCluster
 	{
 		protected override void SeedCluster() =>
-			new TimeSeriesSeeder(this.Client).SeedNode();
+			new TimeSeriesSeeder(Client).SeedNode();
 	}
 
 	public class TimeSeriesSeeder
 	{
+		public static readonly string IndicesWildCard = "logs-*";
 		private readonly IElasticClient _client;
 
-		public TimeSeriesSeeder(IElasticClient client) => this._client = client;
-
-		public static readonly string IndicesWildCard = "logs-*";
+		public TimeSeriesSeeder(IElasticClient client) => _client = client;
 
 		public void SeedNode()
 		{
@@ -51,8 +50,6 @@ public void SeedNode()
 
 			var countResult = _client.Count<Log>(s => s.Index(IndicesWildCard));
 			Console.WriteLine($"Stored {countResult.Count} in {IndicesWildCard} indices");
-
-
 		}
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/UnbalancedCluster.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/UnbalancedCluster.cs
index 54662d59774..5df187e131b 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/UnbalancedCluster.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/UnbalancedCluster.cs
@@ -7,7 +7,7 @@ namespace Tests.Core.ManagedElasticsearch.Clusters
 	public class UnbalancedCluster : ClientTestClusterBase
 	{
 		protected override void SeedCluster() =>
-			new DefaultSeeder(this.Client, new IndexSettings { NumberOfShards = 3, NumberOfReplicas = 2 })
+			new DefaultSeeder(Client, new IndexSettings { NumberOfShards = 3, NumberOfReplicas = 2 })
 				.SeedNode();
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs
index 3e3688cb2ab..26e794755cf 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs
@@ -7,7 +7,10 @@
 
 namespace Tests.Core.ManagedElasticsearch.Clusters
 {
-	/// <summary> Use this cluster for APIs that do writes. If they are however intrusive or long running consider IntrusiveOperationCluster instead. </summary>
+	/// <summary>
+	/// Use this cluster for APIs that do writes. If they are however intrusive or long running consider IntrusiveOperationCluster
+	/// instead.
+	/// </summary>
 	public class WritableCluster : ClientTestClusterBase
 	{
 		public WritableCluster() : base(CreateConfiguration()) { }
@@ -26,10 +29,7 @@ private static ClientTestClusterConfiguration CreateConfiguration()
 
 			// TODO: temporary until https://github.com/elastic/elasticsearch-net-abstractions/commit/3977ccb6449870fb4f1e6059be960e12ec5e5125 is released
 			if (ElasticsearchVersion.From(TestClient.Configuration.ElasticsearchVersion) >= "6.4.0")
-			{
-				//TODO move this to elasticsearch-net abstractions
 				plugins.Add(new ElasticsearchPlugin("analysis-nori", v => v >= "6.4.0"));
-			}
 
 			return new ClientTestClusterConfiguration(plugins.ToArray())
 			{
@@ -39,7 +39,7 @@ private static ClientTestClusterConfiguration CreateConfiguration()
 
 		protected override void SeedCluster()
 		{
-			var seeder = new DefaultSeeder(this.Client);
+			var seeder = new DefaultSeeder(Client);
 			seeder.SeedNode();
 		}
 	}
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs
index e3f2b47146a..02d5277dcdb 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs
@@ -22,26 +22,27 @@ public XPackClusterConfiguration(ClusterFeatures features) : base(ClusterFeature
 			if (!string.IsNullOrEmpty(licenseFilePath) && File.Exists(licenseFilePath))
 			{
 				var licenseContents = File.ReadAllText(licenseFilePath);
-				this.XPackLicenseJson = licenseContents;
+				XPackLicenseJson = licenseContents;
 			}
-			this.AdditionalBeforeNodeStartedTasks.Add(new EnsureWatcherActionConfigurationInElasticsearchYaml());
-			this.ShowElasticsearchOutputAfterStarted = true; //this.TestConfiguration.ShowElasticsearchOutputAfterStarted;
+			AdditionalBeforeNodeStartedTasks.Add(new EnsureWatcherActionConfigurationInElasticsearchYaml());
+			ShowElasticsearchOutputAfterStarted = true; //this.TestConfiguration.ShowElasticsearchOutputAfterStarted;
 		}
 	}
 
 	public class XPackCluster : XunitClusterBase<XPackClusterConfiguration>, INestTestCluster
 	{
 		public XPackCluster() : this(new XPackClusterConfiguration()) { }
+
 		public XPackCluster(XPackClusterConfiguration configuration) : base(configuration) { }
 
+		public virtual IElasticClient Client => this.GetOrAddClient(s => Authenticate(ConnectionSettings(s.ApplyDomainSettings())));
+
 		protected virtual ConnectionSettings Authenticate(ConnectionSettings s) => s
 			.BasicAuthentication(ClusterAuthentication.Admin.Username, ClusterAuthentication.Admin.Password);
 
 		protected virtual ConnectionSettings ConnectionSettings(ConnectionSettings s) => s
 			.ServerCertificateValidationCallback(CertificateValidations.AllowAll);
 
-		public virtual IElasticClient Client => this.GetOrAddClient(s=> this.Authenticate(this.ConnectionSettings(s.ApplyDomainSettings())));
-
-		protected override void SeedCluster() => new DefaultSeeder(this.Client).SeedNode();
+		protected override void SeedCluster() => new DefaultSeeder(Client).SeedNode();
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs b/src/Tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs
index a8a8546f9c9..f38aac9dd2b 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Nest;
 using Tests.Configuration;
@@ -12,13 +11,11 @@ namespace Tests.Core.ManagedElasticsearch.NodeSeeders
 {
 	public class DefaultSeeder
 	{
-		public const string TestsIndexTemplateName = "nest_tests";
-
-		public const string ProjectsAliasName = "projects-alias";
-		public const string ProjectsAliasFilter = "projects-only";
 		public const string CommitsAliasFilter = "commits-only";
+		public const string ProjectsAliasFilter = "projects-only";
 
-		private IElasticClient Client { get; }
+		public const string ProjectsAliasName = "projects-alias";
+		public const string TestsIndexTemplateName = "nest_tests";
 
 		private readonly IIndexSettings _defaultIndexSettings = new IndexSettings()
 		{
@@ -26,29 +23,32 @@ public class DefaultSeeder
 			NumberOfReplicas = 0,
 		};
 
-		private IIndexSettings IndexSettings { get; }
-
 		public DefaultSeeder(IElasticClient client, IIndexSettings indexSettings)
 		{
-			this.Client = client;
-			this.IndexSettings = indexSettings ?? _defaultIndexSettings;
+			Client = client;
+			IndexSettings = indexSettings ?? _defaultIndexSettings;
 		}
 
 		public DefaultSeeder(IElasticClient client) : this(client, null) { }
 
+		private IElasticClient Client { get; }
+
+		private IIndexSettings IndexSettings { get; }
+
 		public void SeedNode()
 		{
-			if (!TestClient.Configuration.ForceReseed && this.AlreadySeeded()) return;
+			if (!TestClient.Configuration.ForceReseed && AlreadySeeded()) return;
 
-			var t = Task.Run(async () => await this.SeedNodeAsync());
+			var t = Task.Run(async () => await SeedNodeAsync());
 
 			t.Wait(TimeSpan.FromSeconds(40));
 		}
+
 		public void SeedNodeNoData()
 		{
-			if (!TestClient.Configuration.ForceReseed && this.AlreadySeeded()) return;
+			if (!TestClient.Configuration.ForceReseed && AlreadySeeded()) return;
 
-			var t = Task.Run(async () => await this.SeedNodeNoDataAsync());
+			var t = Task.Run(async () => await SeedNodeNoDataAsync());
 
 			t.Wait(TimeSpan.FromSeconds(40));
 		}
@@ -56,30 +56,32 @@ public void SeedNodeNoData()
 		// Sometimes we run against an manually started elasticsearch when
 		// writing tests to cut down on cluster startup times.
 		// If raw_fields exists assume this cluster is already seeded.
-		private bool AlreadySeeded() => this.Client.IndexTemplateExists(TestsIndexTemplateName).Exists;
+		private bool AlreadySeeded() => Client.IndexTemplateExists(TestsIndexTemplateName).Exists;
 
 		private async Task SeedNodeAsync()
 		{
 			// Ensure a clean slate by deleting everything regardless of whether they may already exist
-			await this.DeleteIndicesAndTemplatesAsync();
-			await this.ClusterSettingsAsync();
+			await DeleteIndicesAndTemplatesAsync();
+			await ClusterSettingsAsync();
 			// and now recreate everything
-			await this.CreateIndicesAndSeedIndexDataAsync();
+			await CreateIndicesAndSeedIndexDataAsync();
 		}
+
 		private async Task SeedNodeNoDataAsync()
 		{
 			// Ensure a clean slate by deleting everything regardless of whether they may already exist
-			await this.DeleteIndicesAndTemplatesAsync();
-			await this.ClusterSettingsAsync();
+			await DeleteIndicesAndTemplatesAsync();
+			await ClusterSettingsAsync();
 			// and now recreate everything
-			await this.CreateIndicesAsync();
+			await CreateIndicesAsync();
 		}
 
 		public async Task ClusterSettingsAsync()
 		{
 			if (TestConfiguration.Instance.InRange("<6.1.0")) return;
-			var putSettingsResponse = await this.Client.ClusterPutSettingsAsync(s=>s
-				.Transient(t=>t
+
+			var putSettingsResponse = await Client.ClusterPutSettingsAsync(s => s
+				.Transient(t => t
 					.Add("cluster.routing.use_adaptive_replica_selection", true)
 				)
 			);
@@ -91,50 +93,51 @@ public async Task DeleteIndicesAndTemplatesAsync()
 		{
 			var tasks = new Task[]
 			{
-				this.Client.DeleteIndexTemplateAsync(TestsIndexTemplateName),
-				this.Client.DeleteIndexAsync(typeof(Project)),
-				this.Client.DeleteIndexAsync(typeof(Developer)),
-				this.Client.DeleteIndexAsync(typeof(ProjectPercolation))
+				Client.DeleteIndexTemplateAsync(TestsIndexTemplateName),
+				Client.DeleteIndexAsync(typeof(Project)),
+				Client.DeleteIndexAsync(typeof(Developer)),
+				Client.DeleteIndexAsync(typeof(ProjectPercolation))
 			};
 			await Task.WhenAll(tasks);
 		}
 
 		private async Task CreateIndicesAndSeedIndexDataAsync()
 		{
-			await this.CreateIndicesAsync();
-			await this.SeedIndexDataAsync();
+			await CreateIndicesAsync();
+			await SeedIndexDataAsync();
 		}
 
 		public async Task CreateIndicesAsync()
 		{
-			var indexTemplateResponse = await this.CreateIndexTemplateAsync();
+			var indexTemplateResponse = await CreateIndexTemplateAsync();
 			indexTemplateResponse.ShouldBeValid();
 
-			var tasks = new []
+			var tasks = new[]
 			{
-				this.CreateProjectIndexAsync(),
-				this.CreateDeveloperIndexAsync(),
-				this.CreatePercolatorIndexAsync(),
+				CreateProjectIndexAsync(),
+				CreateDeveloperIndexAsync(),
+				CreatePercolatorIndexAsync(),
 			};
-			await Task.WhenAll(tasks).ContinueWith(t =>
-			{
-				foreach(var r in t.Result)
-					r.ShouldBeValid();
-			});
+			await Task.WhenAll(tasks)
+				.ContinueWith(t =>
+				{
+					foreach (var r in t.Result)
+						r.ShouldBeValid();
+				});
 		}
 
 		private async Task SeedIndexDataAsync()
 		{
 			var tasks = new Task[]
 			{
-				this.Client.IndexManyAsync(Project.Projects),
-				this.Client.IndexManyAsync(Developer.Developers),
-				this.Client.IndexDocumentAsync(new ProjectPercolation
+				Client.IndexManyAsync(Project.Projects),
+				Client.IndexManyAsync(Developer.Developers),
+				Client.IndexDocumentAsync(new ProjectPercolation
 				{
 					Id = "1",
 					Query = new MatchAllQuery()
 				}),
-				this.Client.BulkAsync(b => b
+				Client.BulkAsync(b => b
 					.IndexMany(
 						CommitActivity.CommitActivities,
 						(d, c) => d.Document(c).Routing(c.ProjectName)
@@ -142,16 +145,17 @@ private async Task SeedIndexDataAsync()
 				)
 			};
 			await Task.WhenAll(tasks);
-			await this.Client.RefreshAsync(Indices.Index(typeof(Project), typeof(Developer), typeof(ProjectPercolation)));
+			await Client.RefreshAsync(Indices.Index(typeof(Project), typeof(Developer), typeof(ProjectPercolation)));
 		}
 
-		private Task<IPutIndexTemplateResponse> CreateIndexTemplateAsync() => this.Client.PutIndexTemplateAsync(new PutIndexTemplateRequest(TestsIndexTemplateName)
-		{
-			IndexPatterns = new[] {"*"},
-			Settings = this.IndexSettings
-		});
+		private Task<IPutIndexTemplateResponse> CreateIndexTemplateAsync() => Client.PutIndexTemplateAsync(
+			new PutIndexTemplateRequest(TestsIndexTemplateName)
+			{
+				IndexPatterns = new[] { "*" },
+				Settings = IndexSettings
+			});
 
-		private Task<ICreateIndexResponse> CreateDeveloperIndexAsync() => this.Client.CreateIndexAsync(Infer.Index<Developer>(), c => c
+		private Task<ICreateIndexResponse> CreateDeveloperIndexAsync() => Client.CreateIndexAsync(Infer.Index<Developer>(), c => c
 			.Mappings(map => map
 				.Map<Developer>(m => m
 					.AutoMap()
@@ -160,7 +164,7 @@ private Task<ICreateIndexResponse> CreateDeveloperIndexAsync() => this.Client.Cr
 			)
 		);
 
-		private Task<ICreateIndexResponse> CreateProjectIndexAsync() => this.Client.CreateIndexAsync(typeof(Project), c => c
+		private Task<ICreateIndexResponse> CreateProjectIndexAsync() => Client.CreateIndexAsync(typeof(Project), c => c
 			.Settings(settings => settings
 				.Analysis(ProjectAnalysisSettings)
 			)
@@ -175,7 +179,7 @@ private Task<ICreateIndexResponse> CreateProjectIndexAsync() => this.Client.Crea
 			)
 			.Mappings(map => map
 				.Map<Project>(m => m
-					.RoutingField(r=>r.Required())
+					.RoutingField(r => r.Required())
 					.AutoMap()
 					.Properties(ProjectProperties)
 					.Properties<CommitActivity>(props => props
@@ -219,10 +223,10 @@ public static IAnalysis ProjectAnalysisSettings(AnalysisDescriptor analysis)
 		}
 
 
-		private Task<ICreateIndexResponse> CreatePercolatorIndexAsync() => this.Client.CreateIndexAsync(typeof(ProjectPercolation), c => c
+		private Task<ICreateIndexResponse> CreatePercolatorIndexAsync() => Client.CreateIndexAsync(typeof(ProjectPercolation), c => c
 			.Settings(s => s
 				.AutoExpandReplicas("0-all")
-				.Analysis(DefaultSeeder.ProjectAnalysisSettings)
+				.Analysis(ProjectAnalysisSettings)
 			)
 			.Mappings(map => map
 				.Map<ProjectPercolation>(m => m
@@ -236,7 +240,7 @@ public static PropertiesDescriptor<TProject> ProjectProperties<TProject>(Propert
 			where TProject : Project => props
 			.Join(j => j
 				.Name(n => n.Join)
-					.Relations(r => r
+				.Relations(r => r
 					.Join<Project, CommitActivity>()
 				)
 			)
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureWatcherActionConfigurationInElasticsearchYaml.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureWatcherActionConfigurationInElasticsearchYaml.cs
index 98a86b1f629..095809d7db2 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureWatcherActionConfigurationInElasticsearchYaml.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureWatcherActionConfigurationInElasticsearchYaml.cs
@@ -68,7 +68,8 @@ public override void Run(IEphemeralCluster<EphemeralClusterConfiguration> cluste
 			}
 
 			if (saveFile) File.WriteAllLines(configFile, lines);
-			cluster.Writer.WriteDiagnostic($"{{{nameof(EnsureWatcherActionConfigurationInElasticsearchYaml)}}} {(saveFile ? "saved" : "skipped saving")} watcher config [{configFile}]");
+			cluster.Writer.WriteDiagnostic(
+				$"{{{nameof(EnsureWatcherActionConfigurationInElasticsearchYaml)}}} {(saveFile ? "saved" : "skipped saving")} watcher config [{configFile}]");
 		}
 	}
 }
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Tasks/WriteAnalysisFiles.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Tasks/WriteAnalysisFiles.cs
index 623aee37dc1..c2bceb5beb8 100644
--- a/src/Tests/Tests.Core/ManagedElasticsearch/Tasks/WriteAnalysisFiles.cs
+++ b/src/Tests/Tests.Core/ManagedElasticsearch/Tasks/WriteAnalysisFiles.cs
@@ -36,6 +36,7 @@ private static void SetupHunspellFiles(string configPath)
 			var hunspellFolder = Path.Combine(configPath, "hunspell", "en_US");
 			var hunspellPrefix = Path.Combine(hunspellFolder, "en_US");
 			if (File.Exists(hunspellPrefix + ".dic")) return;
+
 			Directory.CreateDirectory(hunspellFolder);
 			File.WriteAllText(hunspellPrefix + ".dic", "1\r\nabcdegf");
 			File.WriteAllText(hunspellPrefix + ".aff", "SET UTF8\r\nSFX P Y 1\r\nSFX P 0 s");
@@ -49,6 +50,5 @@ private static void SetupIcuFiles(string configPath)
 			var icuFile = Path.Combine(icuFolder, "KeywordTokenizer") + ".rbbi";
 			if (!File.Exists(icuFile)) File.WriteAllText(icuFile, ".+ {200};");
 		}
-
 	}
 }
diff --git a/src/Tests/Tests.Core/Serialization/ExpectJsonTestBase.cs b/src/Tests/Tests.Core/Serialization/ExpectJsonTestBase.cs
index 3e0fbdf1327..48ba23bf696 100644
--- a/src/Tests/Tests.Core/Serialization/ExpectJsonTestBase.cs
+++ b/src/Tests/Tests.Core/Serialization/ExpectJsonTestBase.cs
@@ -5,24 +5,22 @@ namespace Tests.Core.Serialization
 {
 	public abstract class ExpectJsonTestBase
 	{
-		protected SerializationTester Tester { get; }
-
-		protected ExpectJsonTestBase(IElasticClient client) => this.Tester = new SerializationTester(client);
+		protected ExpectJsonTestBase(IElasticClient client) => Tester = new SerializationTester(client);
 
 		protected abstract object ExpectJson { get; }
+		protected virtual bool IncludeNullInExpected => true;
 
 		//TODO Validate all overrides for false whether they truly do not support deserialization
 		protected virtual bool SupportsDeserialization => true;
-		protected virtual bool IncludeNullInExpected => true;
+		protected SerializationTester Tester { get; }
 
 		protected void RoundTripsOrSerializes<T>(T @object)
 		{
 			if (@object == null) return;
-			if (this.ExpectJson == null) return;
+			if (ExpectJson == null) return;
 
-			if (this.SupportsDeserialization) this.Tester.AssertRoundTrip<T>(@object, this.ExpectJson, preserveNullInExpected: this.IncludeNullInExpected);
-			else this.Tester.AssertSerialize(@object, this.ExpectJson, preserveNullInExpected: this.IncludeNullInExpected);
+			if (SupportsDeserialization) Tester.AssertRoundTrip<T>(@object, ExpectJson, preserveNullInExpected: IncludeNullInExpected);
+			else Tester.AssertSerialize(@object, ExpectJson, preserveNullInExpected: IncludeNullInExpected);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests.Core/Serialization/GeoCoordinateJsonConverter.cs b/src/Tests/Tests.Core/Serialization/GeoCoordinateJsonConverter.cs
index 6f0de5050a7..4bd09e9d1c7 100644
--- a/src/Tests/Tests.Core/Serialization/GeoCoordinateJsonConverter.cs
+++ b/src/Tests/Tests.Core/Serialization/GeoCoordinateJsonConverter.cs
@@ -10,6 +10,7 @@ namespace Tests.Core.Serialization
 	internal class TestGeoCoordinateJsonConverter : JsonConverter
 	{
 		public override bool CanConvert(Type objectType) => objectType == typeof(GeoCoordinate);
+
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var p = (GeoCoordinate)value;
@@ -27,8 +28,10 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartArray) return null;
+
 			var doubles = serializer.Deserialize<double[]>(reader);
 			if (doubles.Length != 2) return null;
+
 			return new GeoCoordinate(doubles[1], doubles[0]);
 		}
 	}
diff --git a/src/Tests/Tests.Core/Serialization/RoundtripperDsl.cs b/src/Tests/Tests.Core/Serialization/RoundtripperDsl.cs
index 0b0a6814b30..a950bcf8bf0 100644
--- a/src/Tests/Tests.Core/Serialization/RoundtripperDsl.cs
+++ b/src/Tests/Tests.Core/Serialization/RoundtripperDsl.cs
@@ -13,97 +13,97 @@ namespace Tests.Core.Serialization
 {
 	public abstract class RoundTripperBase
 	{
-		protected SerializationTester Tester { get; }
-
-		protected bool PreserveNullInExpected { get; }
-
 		internal RoundTripperBase(
 			Func<ConnectionSettings, ConnectionSettings> settingsModifier = null,
 			ConnectionSettings.SourceSerializerFactory sourceSerializerFactory = null,
 			IPropertyMappingProvider propertyMappingProvider = null,
-			bool preserveNullInExpected = false)
+			bool preserveNullInExpected = false
+		)
 		{
-			this.PreserveNullInExpected = preserveNullInExpected;
+			PreserveNullInExpected = preserveNullInExpected;
 			if (settingsModifier == null && sourceSerializerFactory == null && propertyMappingProvider == null)
-				this.Tester = SerializationTester.Default;
+				Tester = SerializationTester.Default;
 			else
 			{
 				var settings =
-					new AlwaysInMemoryConnectionSettings(sourceSerializerFactory: sourceSerializerFactory, propertyMappingProvider: propertyMappingProvider)
+					new AlwaysInMemoryConnectionSettings(sourceSerializerFactory: sourceSerializerFactory,
+							propertyMappingProvider: propertyMappingProvider)
 						.ApplyDomainSettings();
 
 				if (settingsModifier != null) settings = settingsModifier(settings);
-				this.Tester = new SerializationTester(new ElasticClient(settings));
+				Tester = new SerializationTester(new ElasticClient(settings));
 			}
 		}
+
+		protected bool PreserveNullInExpected { get; }
+		protected SerializationTester Tester { get; }
 	}
 
 	public class ObjectRoundTripper<T> : RoundTripperBase
 	{
+		private readonly T _object;
+
 		internal ObjectRoundTripper(T @object,
 			Func<ConnectionSettings, ConnectionSettings> settingsModifier = null,
 			ConnectionSettings.SourceSerializerFactory sourceSerializerFactory = null,
-			IPropertyMappingProvider propertyMappingProvider = null)
-			: base(settingsModifier, sourceSerializerFactory, propertyMappingProvider, preserveNullInExpected: false)
-		{
-			_object = @object;
-		}
+			IPropertyMappingProvider propertyMappingProvider = null
+		)
+			: base(settingsModifier, sourceSerializerFactory, propertyMappingProvider, false) => _object = @object;
 
-		private readonly T _object;
+		public T RoundTrips() => Tester.AssertRoundTrip(_object);
 
-		public T RoundTrips() => this.Tester.AssertRoundTrip(_object);
-		public T RoundTrips(object expectedJson) => this.Tester.AssertRoundTrip(_object, expectedJson);
+		public T RoundTrips(object expectedJson) => Tester.AssertRoundTrip(_object, expectedJson);
 	}
 
 	public class JsonRoundTripper : RoundTripperBase
 	{
+		private readonly object _expectedJson;
+		private bool _noRoundTrip;
+
 		internal JsonRoundTripper(object expectedJson,
 			Func<ConnectionSettings, ConnectionSettings> settingsModifier = null,
 			ConnectionSettings.SourceSerializerFactory sourceSerializerFactory = null,
 			IPropertyMappingProvider propertyMappingProvider = null,
-			bool preserveNullInExpected = false)
-			: base(settingsModifier, sourceSerializerFactory, propertyMappingProvider, preserveNullInExpected)
+			bool preserveNullInExpected = false
+		)
+			: base(settingsModifier, sourceSerializerFactory, propertyMappingProvider, preserveNullInExpected) => _expectedJson = expectedJson;
+
+		public JsonRoundTripper NoRoundTrip()
 		{
-			this._expectedJson = expectedJson;
+			_noRoundTrip = true;
+			return this;
 		}
 
-		private readonly object _expectedJson;
-		private bool _noRoundTrip;
-
-	    public JsonRoundTripper NoRoundTrip()
-	    {
-	        this._noRoundTrip = true;
-	        return this;
-	    }
-
 		public T DeserializesTo<T>(Action<string, T> assert = null)
 		{
-			var origin = $"{nameof(JsonRoundTripper)}.{nameof(this.DeserializesTo)}";
-			var deserializationResult = this.Tester.Deserializes<T>(this._expectedJson, this.PreserveNullInExpected);
+			var origin = $"{nameof(JsonRoundTripper)}.{nameof(DeserializesTo)}";
+			var deserializationResult = Tester.Deserializes<T>(_expectedJson, PreserveNullInExpected);
 			deserializationResult.ShouldBeValid($"{origin} did not deserialize into {typeof(T).Name}");
 			assert?.Invoke("first deserialization", deserializationResult.Result);
-			if (this._noRoundTrip)
+			if (_noRoundTrip)
 				return deserializationResult.Result;
 
-			var serializationResult = this.Tester.Serializes(deserializationResult.Result, this._expectedJson, this.PreserveNullInExpected);
+			var serializationResult = Tester.Serializes(deserializationResult.Result, _expectedJson, PreserveNullInExpected);
 			deserializationResult.ShouldBeValid($"{origin} first serialization");
 			assert?.Invoke("first deserialization", deserializationResult.Result);
 
-			deserializationResult = this.Tester.Deserializes<T>(serializationResult.Serialized, this.PreserveNullInExpected);
+			deserializationResult = Tester.Deserializes<T>(serializationResult.Serialized, PreserveNullInExpected);
 			deserializationResult.ShouldBeValid($"{origin} did not deserialize into {typeof(T).Name} a 2nd time");
 			assert?.Invoke("seond deserialization", deserializationResult.Result);
 			return deserializationResult.Result;
 		}
 
-		public void FromRequest(IResponse response) => this.ToSerializeTo(response.ApiCall.RequestBodyInBytes);
-		public void FromRequest<T>(Func<IElasticClient, T> call) where T : IResponse => this.FromRequest(call(this.Tester.Client));
+		public void FromRequest(IResponse response) => ToSerializeTo(response.ApiCall.RequestBodyInBytes);
 
-		public void FromResponse(IResponse response) => this.ToSerializeTo(response.ApiCall.ResponseBodyInBytes);
-		public void FromResponse<T>(Func<IElasticClient, T> call) where T : IResponse => this.FromResponse(call(this.Tester.Client));
+		public void FromRequest<T>(Func<IElasticClient, T> call) where T : IResponse => FromRequest(call(Tester.Client));
+
+		public void FromResponse(IResponse response) => ToSerializeTo(response.ApiCall.ResponseBodyInBytes);
+
+		public void FromResponse<T>(Func<IElasticClient, T> call) where T : IResponse => FromResponse(call(Tester.Client));
 
 		private void ToSerializeTo(byte[] json)
 		{
-			var result = this.Tester.Serializes(json, this._expectedJson, this.PreserveNullInExpected);
+			var result = Tester.Serializes(json, _expectedJson, PreserveNullInExpected);
 			result.ShouldBeValid();
 		}
 
@@ -111,36 +111,37 @@ public JsonRoundTripperContinuation<T> WhenSerializing<T>(T actual)
 		{
 			switch ((object)actual)
 			{
-				case string s: throw new Exception($"{nameof(this.WhenSerializing)} was passed a string but it only expects objects");
-				case byte[] b: throw new Exception($"{nameof(this.WhenSerializing)} was passed a byte[] but it only expects objects");
+				case string s: throw new Exception($"{nameof(WhenSerializing)} was passed a string but it only expects objects");
+				case byte[] b: throw new Exception($"{nameof(WhenSerializing)} was passed a byte[] but it only expects objects");
 			}
-			var result = this.Tester.RoundTrips(actual, this._expectedJson, this.PreserveNullInExpected);
+			var result = Tester.RoundTrips(actual, _expectedJson, PreserveNullInExpected);
 			result.Success.Should().BeTrue(result.ToString());
-			return new JsonRoundTripperContinuation<T>(result.Serialized, result.Result, this.Tester);
+			return new JsonRoundTripperContinuation<T>(result.Serialized, result.Result, Tester);
 		}
 
 		public JsonRoundTripper WhenInferringIdOn<T>(T project) where T : class
 		{
-			this.Tester.Client.Infer.Id(project).Should().Be((string)this._expectedJson);
+			Tester.Client.Infer.Id(project).Should().Be((string)_expectedJson);
 			return this;
 		}
+
 		public JsonRoundTripper WhenInferringRoutingOn<T>(T project) where T : class
 		{
-			this.Tester.Client.Infer.Routing<T>(project).Should().Be((string)this._expectedJson);
+			Tester.Client.Infer.Routing<T>(project).Should().Be((string)_expectedJson);
 			return this;
 		}
 
 		public JsonRoundTripper ForField(Field field)
 		{
-			this.Tester.Client.Infer.Field(field).Should().Be((string)this._expectedJson);
+			Tester.Client.Infer.Field(field).Should().Be((string)_expectedJson);
 			return this;
 		}
 
 		public JsonRoundTripper AsPropertiesOf<T>(T document) where T : class
 		{
-			var jo = JObject.Parse(this.Tester.Client.RequestResponseSerializer.SerializeToString(document));
+			var jo = JObject.Parse(Tester.Client.RequestResponseSerializer.SerializeToString(document));
 			var serializedProperties = jo.Properties().Select(p => p.Name);
-			if (!(this._expectedJson is IEnumerable<string> sut))
+			if (!(_expectedJson is IEnumerable<string> sut))
 				throw new ArgumentException("Can not call AsPropertiesOf if sut is not IEnumerable<string>");
 
 			sut.Should().BeEquivalentTo(serializedProperties);
@@ -149,35 +150,36 @@ public JsonRoundTripper AsPropertiesOf<T>(T document) where T : class
 
 		public class JsonRoundTripperContinuation<T>
 		{
+			private readonly object _expectedJson;
+
 			internal JsonRoundTripperContinuation(object expectedJson, T result, SerializationTester tester)
 			{
-				this.Tester = tester;
-				this.Result = result;
-				this._expectedJson = expectedJson;
+				Tester = tester;
+				Result = result;
+				_expectedJson = expectedJson;
 			}
 
-			private readonly object _expectedJson;
 			private T Result { get; set; }
 			private SerializationTester Tester { get; }
 
 			public JsonRoundTripperContinuation<T> WhenSerializing(T actual)
 			{
-				var result = this.Tester.RoundTrips(actual, this._expectedJson);
+				var result = Tester.RoundTrips(actual, _expectedJson);
 				result.ShouldBeValid();
-				this.Result = result.Result;
+				Result = result.Result;
 				return this;
 			}
 
 			public JsonRoundTripperContinuation<TDifferent> WhenSerializing<TDifferent>(TDifferent actual)
 			{
-				var result = this.Tester.RoundTrips<TDifferent>(actual, expectedJson: this._expectedJson);
+				var result = Tester.RoundTrips<TDifferent>(actual, _expectedJson);
 				result.ShouldBeValid();
-				return new JsonRoundTripperContinuation<TDifferent>(result.Serialized, result.Result, this.Tester);
+				return new JsonRoundTripperContinuation<TDifferent>(result.Serialized, result.Result, Tester);
 			}
 
 			public JsonRoundTripperContinuation<T> AssertSubject(Action<T> assert)
 			{
-				assert(this.Result);
+				assert(Result);
 				return this;
 			}
 		}
diff --git a/src/Tests/Tests.Core/Serialization/SerializationTestHelper.cs b/src/Tests/Tests.Core/Serialization/SerializationTestHelper.cs
index 20789ee5626..08572cc5211 100644
--- a/src/Tests/Tests.Core/Serialization/SerializationTestHelper.cs
+++ b/src/Tests/Tests.Core/Serialization/SerializationTestHelper.cs
@@ -5,7 +5,8 @@ namespace Tests.Core.Serialization
 {
 	public static class SerializationTestHelper
 	{
-		public static JsonRoundTripper Expect(object expected, bool preserveNullInExpected = false) => new JsonRoundTripper(expected, preserveNullInExpected: preserveNullInExpected);
+		public static JsonRoundTripper Expect(object expected, bool preserveNullInExpected = false) =>
+			new JsonRoundTripper(expected, preserveNullInExpected: preserveNullInExpected);
 
 		public static ObjectRoundTripper<T> Object<T>(T expected) => new ObjectRoundTripper<T>(expected);
 
@@ -13,37 +14,34 @@ public static IntermediateChangedSettings WithConnectionSettings(Func<Connection
 			new IntermediateChangedSettings(settings);
 
 		public static IntermediateChangedSettings WithSourceSerializer(ConnectionSettings.SourceSerializerFactory factory) =>
-			new IntermediateChangedSettings(s=>s.EnableDebugMode()).WithSourceSerializer(factory);
+			new IntermediateChangedSettings(s => s.EnableDebugMode()).WithSourceSerializer(factory);
 
 		public class IntermediateChangedSettings
 		{
 			private readonly Func<ConnectionSettings, ConnectionSettings> _connectionSettingsModifier;
-			private ConnectionSettings.SourceSerializerFactory _sourceSerializerFactory;
 			private IPropertyMappingProvider _propertyMappingProvider;
+			private ConnectionSettings.SourceSerializerFactory _sourceSerializerFactory;
 
-			internal IntermediateChangedSettings(Func<ConnectionSettings, ConnectionSettings> settings)
-			{
-				this._connectionSettingsModifier = settings;
-			}
+			internal IntermediateChangedSettings(Func<ConnectionSettings, ConnectionSettings> settings) => _connectionSettingsModifier = settings;
 
 			public IntermediateChangedSettings WithSourceSerializer(ConnectionSettings.SourceSerializerFactory factory)
 			{
-				this._sourceSerializerFactory = factory;
+				_sourceSerializerFactory = factory;
 				return this;
 			}
 
 			public IntermediateChangedSettings WithPropertyMappingProvider(IPropertyMappingProvider propertyMappingProvider)
 			{
-				this._propertyMappingProvider = propertyMappingProvider;
+				_propertyMappingProvider = propertyMappingProvider;
 				return this;
 			}
 
 			public JsonRoundTripper Expect(object expected, bool preserveNullInExpected = false) =>
-				new JsonRoundTripper(expected, _connectionSettingsModifier, this._sourceSerializerFactory, this._propertyMappingProvider, preserveNullInExpected);
+				new JsonRoundTripper(expected, _connectionSettingsModifier, _sourceSerializerFactory, _propertyMappingProvider,
+					preserveNullInExpected);
 
 			public ObjectRoundTripper<T> Object<T>(T expected) =>
-				new ObjectRoundTripper<T>(expected, _connectionSettingsModifier, this._sourceSerializerFactory, this._propertyMappingProvider);
-
+				new ObjectRoundTripper<T>(expected, _connectionSettingsModifier, _sourceSerializerFactory, _propertyMappingProvider);
 		}
 	}
 }
diff --git a/src/Tests/Tests.Core/Serialization/SerializationTester.cs b/src/Tests/Tests.Core/Serialization/SerializationTester.cs
index d5acbad7bf6..6633b486acd 100644
--- a/src/Tests/Tests.Core/Serialization/SerializationTester.cs
+++ b/src/Tests/Tests.Core/Serialization/SerializationTester.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -16,32 +15,34 @@ namespace Tests.Core.Serialization
 {
 	public class SerializationResult
 	{
-		public bool Success { get; set; }
+		public string DiffFromExpected { get; set; }
 
 		public string Serialized { get; set; }
+		public bool Success { get; set; }
 
-		public string DiffFromExpected { get; set; }
+		private string DiffFromExpectedExcerpt =>
+			string.IsNullOrEmpty(DiffFromExpected)
+				? string.Empty
+				: DiffFromExpected?.Substring(0, DiffFromExpected.Length > 4896 ? 4896 : DiffFromExpected.Length);
 
 		public override string ToString()
 		{
-			var message = $"{this.GetType().Name} success: {(this.Success)}";
-			if (this.Success) return message;
+			var message = $"{GetType().Name} success: {Success}";
+			if (Success) return message;
+
 			message += Environment.NewLine;
-			message += this.DiffFromExpectedExcerpt;
+			message += DiffFromExpectedExcerpt;
 			return message;
 		}
-		private string DiffFromExpectedExcerpt =>
-			string.IsNullOrEmpty(this.DiffFromExpected)
-				? string.Empty
-				: this.DiffFromExpected?.Substring(0, this.DiffFromExpected.Length > 4896 ? 4896 : this.DiffFromExpected.Length);
 	}
+
 	public class DeserializationResult<T> : SerializationResult
 	{
 		public T Result { get; set; }
 
 		public override string ToString()
 		{
-			var s = $"Deserialization has result: {this.Result != null}";
+			var s = $"Deserialization has result: {Result != null}";
 			s += Environment.NewLine;
 			s += base.ToString();
 			return s;
@@ -54,7 +55,7 @@ public class RoundTripResult<T> : DeserializationResult<T>
 
 		public override string ToString()
 		{
-			var s = $"RoundTrip: {this.Itterations.ToOrdinal()} itteration";
+			var s = $"RoundTrip: {Itterations.ToOrdinal()} itteration";
 			s += Environment.NewLine;
 			s += base.ToString();
 			return s;
@@ -63,25 +64,24 @@ public override string ToString()
 
 	public class SerializationTester
 	{
+		public SerializationTester(IElasticClient client) => Client = client;
+
+		public IElasticClient Client { get; }
 		public static SerializationTester Default { get; } = new SerializationTester(TestClient.DefaultInMemoryClient);
 
 		public static SerializationTester DefaultWithJsonNetSerializer { get; } = new SerializationTester(TestClient.InMemoryWithJsonNetSerializer);
 
-		public SerializationTester(IElasticClient client) => this.Client = client;
-
-		public IElasticClient Client { get; }
-
-		protected IElasticsearchSerializer Serializer => this.Client.ConnectionSettings.RequestResponseSerializer;
+		protected IElasticsearchSerializer Serializer => Client.ConnectionSettings.RequestResponseSerializer;
 
 		public RoundTripResult<T> RoundTrips<T>(T @object, bool preserveNullInExpected = false)
 		{
-			var serialized = this.SerializeUsingClientDefault(@object);
-			return this.RoundTrips(@object, serialized);
+			var serialized = SerializeUsingClientDefault(@object);
+			return RoundTrips(@object, serialized);
 		}
 
 		public RoundTripResult<T> RoundTrips<T>(T @object, object expectedJson, bool preserveNullInExpected = false)
 		{
-            var expectedJsonToken = this.ExpectedJsonToJtoken(expectedJson, preserveNullInExpected);
+			var expectedJsonToken = ExpectedJsonToJtoken(expectedJson, preserveNullInExpected);
 
 			var result = new RoundTripResult<T>() { Success = false };
 			if (expectedJsonToken == null)
@@ -90,16 +90,16 @@ public RoundTripResult<T> RoundTrips<T>(T @object, object expectedJson, bool pre
 				return result;
 			}
 
-			if (!this.SerializesAndMatches(@object, expectedJsonToken, result))
+			if (!SerializesAndMatches(@object, expectedJsonToken, result))
 				return result;
 
-			@object = this.Deserialize<T>(result.Serialized);
+			@object = Deserialize<T>(result.Serialized);
 			result.Itterations += 1;
 
-			if (!this.SerializesAndMatches(@object, expectedJsonToken, result))
+			if (!SerializesAndMatches(@object, expectedJsonToken, result))
 				return result;
 
-			@object = this.Deserialize<T>(result.Serialized);
+			@object = Deserialize<T>(result.Serialized);
 
 			result.Result = @object;
 			result.Success = true;
@@ -108,17 +108,18 @@ public RoundTripResult<T> RoundTrips<T>(T @object, object expectedJson, bool pre
 
 		public SerializationResult Serializes<T>(T @object, object expectedJson, bool preserveNullInExpected = false)
 		{
-            var expectedJsonToken = this.ExpectedJsonToJtoken(expectedJson, preserveNullInExpected);
+			var expectedJsonToken = ExpectedJsonToJtoken(expectedJson, preserveNullInExpected);
 			var result = new RoundTripResult<T>() { Success = false };
-			if (this.SerializesAndMatches(@object, expectedJsonToken, result))
+			if (SerializesAndMatches(@object, expectedJsonToken, result))
 				result.Success = true;
 			return result;
 		}
+
 		public DeserializationResult<T> Deserializes<T>(object expectedJson, bool preserveNullInExpected = false)
 		{
-            var expectedJsonString = this.ExpectedJsonString(expectedJson, preserveNullInExpected);
+			var expectedJsonString = ExpectedJsonString(expectedJson, preserveNullInExpected);
 			var result = new RoundTripResult<T>() { Success = false };
-			var @object = this.Deserialize<T>(expectedJsonString);
+			var @object = Deserialize<T>(expectedJsonString);
 			if (@object != null) result.Success = true;
 			result.Result = @object;
 			return result;
@@ -131,7 +132,7 @@ private JToken ExpectedJsonToJtoken(object expectedJson, bool preserveNullInFrom
 				case string s: return new JValue(s);
 				case byte[] utf8: return new JValue(Encoding.UTF8.GetString(utf8));
 				default:
-					var expectedJsonString = this.ExpectedJsonString(expectedJson, preserveNullInFromJson);
+					var expectedJsonString = ExpectedJsonString(expectedJson, preserveNullInFromJson);
 					return JToken.Parse(expectedJsonString);
 			}
 		}
@@ -143,14 +144,14 @@ private string ExpectedJsonString(object expectedJson, bool preserveNullInFromJs
 				case string s: return s;
 				case byte[] utf8: return Encoding.UTF8.GetString(utf8);
 				default:
-					var expectedSerializerSettings = this.ExpectedJsonSerializerSettings(preserveNullInFromJson);
+					var expectedSerializerSettings = ExpectedJsonSerializerSettings(preserveNullInFromJson);
 					return JsonConvert.SerializeObject(expectedJson, Formatting.None, expectedSerializerSettings);
 			}
 		}
 
 		private bool SerializesAndMatches<T>(T @object, JToken expectedJsonToken, RoundTripResult<T> result)
 		{
-			result.Serialized = this.SerializeUsingClientDefault(@object);
+			result.Serialized = SerializeUsingClientDefault(@object);
 			return expectedJsonToken.Type == JTokenType.Array
 				? ArrayMatches((JArray)expectedJsonToken, result)
 				: TokenMatches(expectedJsonToken, result);
@@ -163,19 +164,20 @@ private string SerializeUsingClientDefault(object o)
 				case string s: return s;
 				case byte[] b: return Encoding.UTF8.GetString(b);
 				default:
-					return this.Serializer.SerializeToString(o);
+					return Serializer.SerializeToString(o);
 			}
 		}
+
 		private T Deserialize<T>(string json)
 		{
-			using(var ms = this.Client.ConnectionSettings.MemoryStreamFactory.Create(Encoding.UTF8.GetBytes(json)))
-				return this.Serializer.Deserialize<T>(ms);
+			using (var ms = Client.ConnectionSettings.MemoryStreamFactory.Create(Encoding.UTF8.GetBytes(json)))
+				return Serializer.Deserialize<T>(ms);
 		}
 
 		private static bool ArrayMatches<T>(JArray jArray, RoundTripResult<T> result)
 		{
-			var lines = result.Serialized.Split(new[] {'\n'}, StringSplitOptions.RemoveEmptyEntries).ToList();
-			var zipped = jArray.Children<JObject>().Zip(lines, (j, s) => new {j, s});
+			var lines = result.Serialized.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+			var zipped = jArray.Children<JObject>().Zip(lines, (j, s) => new { j, s });
 			var matches = zipped.Select((z, i) => TokenMatches(z.j, result, z.s, i)).ToList();
 			matches.Count.Should().Be(lines.Count);
 			var matchesAll = matches.All(b => b);
@@ -193,10 +195,8 @@ private static bool TokenMatches<T>(JToken expectedJson, RoundTripResult<T> resu
 				message = "This is the second time I am serializing, this usually indicates a problem when deserializing";
 			if (item > -1) message += $". This is while comparing the {item.ToOrdinal()} item";
 
-			if (expectedJson.Type == JTokenType.String)
-			{
-				return MatchString(expectedJson.Value<string>(), actualJson, result, message);
-			}
+			if (expectedJson.Type == JTokenType.String) return MatchString(expectedJson.Value<string>(), actualJson, result, message);
+
 			return MatchJson(expectedJson, actualJson, result, message);
 		}
 
@@ -205,6 +205,7 @@ private static bool MatchString<T>(string expected, string actual, RoundTripResu
 			//Serialize() returns quoted strings always.
 			var diff = expected.CreateCharacterDifference(actual, message);
 			if (string.IsNullOrWhiteSpace(diff)) return true;
+
 			result.DiffFromExpected = diff;
 			return false;
 		}
@@ -222,6 +223,7 @@ private static bool MatchJson<T>(JToken expectedJson, string actualJson, RoundTr
 			var sortedActual = actualJsonToken.ToString();
 			var diff = sortedExpected.Diff(sortedActual, message);
 			if (string.IsNullOrWhiteSpace(diff)) return true;
+
 			result.DiffFromExpected = diff;
 			return false;
 		}
@@ -229,11 +231,10 @@ private static bool MatchJson<T>(JToken expectedJson, string actualJson, RoundTr
 		private JsonSerializerSettings ExpectedJsonSerializerSettings(bool preserveNullInExpected = false) =>
 			new JsonSerializerSettings
 			{
-				ContractResolver = new DefaultContractResolver {NamingStrategy = new DefaultNamingStrategy()},
+				ContractResolver = new DefaultContractResolver { NamingStrategy = new DefaultNamingStrategy() },
 				NullValueHandling = preserveNullInExpected ? NullValueHandling.Include : NullValueHandling.Ignore,
 				//copied here because anonymyzing geocoordinates is too tedious
-				Converters = new List<JsonConverter> {new TestGeoCoordinateJsonConverter()}
+				Converters = new List<JsonConverter> { new TestGeoCoordinateJsonConverter() }
 			};
-
 	}
 }
diff --git a/src/Tests/Tests.Core/Xunit/IntegrationOnlyAttribute.cs b/src/Tests/Tests.Core/Xunit/IntegrationOnlyAttribute.cs
index 7d7373fcf2e..3e3d9439026 100644
--- a/src/Tests/Tests.Core/Xunit/IntegrationOnlyAttribute.cs
+++ b/src/Tests/Tests.Core/Xunit/IntegrationOnlyAttribute.cs
@@ -5,7 +5,7 @@ namespace Tests.Core.Xunit
 {
 	public class IntegrationOnlyAttribute : SkipTestAttributeBase
 	{
-		public override bool Skip => TestConfiguration.Instance.RunUnitTests;
 		public override string Reason { get; } = "Inherited unit tests are ignored on this integration test class";
+		public override bool Skip => TestConfiguration.Instance.RunUnitTests;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests.Core/Xunit/NeedsTypedKeysAttribute.cs b/src/Tests/Tests.Core/Xunit/NeedsTypedKeysAttribute.cs
index d866c71db22..63eecb1626c 100644
--- a/src/Tests/Tests.Core/Xunit/NeedsTypedKeysAttribute.cs
+++ b/src/Tests/Tests.Core/Xunit/NeedsTypedKeysAttribute.cs
@@ -5,7 +5,7 @@ namespace Tests.Core.Xunit
 {
 	public class NeedsTypedKeysAttribute : SkipTestAttributeBase
 	{
-		public override bool Skip => !TestConfiguration.Instance.Random.TypedKeys;
 		public override string Reason { get; } = "Random Configuration dictates no typed keys but this tests relies on it being set";
+		public override bool Skip => !TestConfiguration.Instance.Random.TypedKeys;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests.Core/Xunit/NestXunitRunOptions.cs b/src/Tests/Tests.Core/Xunit/NestXunitRunOptions.cs
index f1b742f4646..8eb3aa67eba 100644
--- a/src/Tests/Tests.Core/Xunit/NestXunitRunOptions.cs
+++ b/src/Tests/Tests.Core/Xunit/NestXunitRunOptions.cs
@@ -14,12 +14,12 @@ public class NestXunitRunOptions : ElasticXunitRunOptions
 	{
 		public NestXunitRunOptions()
 		{
-			this.RunIntegrationTests = TestConfiguration.Instance.RunIntegrationTests;
-			this.RunUnitTests = TestConfiguration.Instance.RunUnitTests;
-			this.ClusterFilter = TestConfiguration.Instance.ClusterFilter;
-			this.TestFilter = TestConfiguration.Instance.TestFilter;
-			this.Version = TestConfiguration.Instance.ElasticsearchVersion;
-			this.IntegrationTestsMayUseAlreadyRunningNode = TestConfiguration.Instance.TestAgainstAlreadyRunningElasticsearch;
+			RunIntegrationTests = TestConfiguration.Instance.RunIntegrationTests;
+			RunUnitTests = TestConfiguration.Instance.RunUnitTests;
+			ClusterFilter = TestConfiguration.Instance.ClusterFilter;
+			TestFilter = TestConfiguration.Instance.TestFilter;
+			Version = TestConfiguration.Instance.ElasticsearchVersion;
+			IntegrationTestsMayUseAlreadyRunningNode = TestConfiguration.Instance.TestAgainstAlreadyRunningElasticsearch;
 
 			Generators.Initialize();
 		}
@@ -41,6 +41,7 @@ private static void DumpClusterTotals(Dictionary<string, Stopwatch> clusterTotal
 			foreach (var kv in clusterTotals) Console.WriteLine($"- {kv.Key}: {kv.Value.Elapsed}");
 			Console.WriteLine("--------");
 		}
+
 		private static void DumpSeenDeprecations()
 		{
 			if (XunitRunState.SeenDeprecations.Count == 0) return;
@@ -81,7 +82,9 @@ private static void DumpReproduceFilters(ConcurrentBag<Tuple<string, string>> fa
 			Console.WriteLine("--------");
 		}
 
-		private static string ReproduceCommandLine(ConcurrentBag<Tuple<string, string>> failedCollections, ITestConfiguration config, bool runningIntegrations)
+		private static string ReproduceCommandLine(ConcurrentBag<Tuple<string, string>> failedCollections, ITestConfiguration config,
+			bool runningIntegrations
+		)
 		{
 			var sb = new StringBuilder("build.bat ")
 				.Append($"seed:{config.Seed} ");
@@ -98,18 +101,21 @@ private static string ReproduceCommandLine(ConcurrentBag<Tuple<string, string>>
 			if (runningIntegrations && failedCollections.Count > 0)
 			{
 				var clusters = string.Join(",", failedCollections
-					.Select(c => c.Item1.ToLowerInvariant()).Distinct());
+					.Select(c => c.Item1.ToLowerInvariant())
+					.Distinct());
 				sb.Append(" \"");
 				sb.Append(clusters);
 				sb.Append("\"");
 			}
 
-			if ((!runningIntegrations || (failedCollections.Count < 30)) && failedCollections.Count > 0)
+			if ((!runningIntegrations || failedCollections.Count < 30) && failedCollections.Count > 0)
 			{
 				sb.Append(" \"");
 				var tests = string.Join(",", failedCollections
 					.OrderBy(t => t.Item2)
-					.Select(c => c.Item2.ToLowerInvariant().Split('.').Last()
+					.Select(c => c.Item2.ToLowerInvariant()
+						.Split('.')
+						.Last()
 						.Replace("apitests", "")
 						.Replace("usagetests", "")
 						.Replace("tests", "")
@@ -128,6 +134,7 @@ private static string ReproduceCommandLine(ConcurrentBag<Tuple<string, string>>
 		private static void AppendExplictConfig(string key, StringBuilder sb)
 		{
 			if (!TryGetExplicitRandomConfig(key, out var b)) return;
+
 			sb.Append($"random:{key}{(b ? "" : ":false")} ");
 		}
 
@@ -137,6 +144,5 @@ private static bool TryGetExplicitRandomConfig(string key, out bool value)
 			var v = Environment.GetEnvironmentVariable($"NEST_RANDOM_{key.ToUpper()}");
 			return !string.IsNullOrWhiteSpace(v) && bool.TryParse(v, out value);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests.Core/Xunit/ProjectReferenceOnlyAttribute.cs b/src/Tests/Tests.Core/Xunit/ProjectReferenceOnlyAttribute.cs
index 866388ab84a..def63e606e5 100644
--- a/src/Tests/Tests.Core/Xunit/ProjectReferenceOnlyAttribute.cs
+++ b/src/Tests/Tests.Core/Xunit/ProjectReferenceOnlyAttribute.cs
@@ -5,7 +5,7 @@ namespace Tests.Core.Xunit
 {
 	public class ProjectReferenceOnlyAttribute : SkipTestAttributeBase
 	{
-		public override bool Skip => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TestPackageVersion"));
 		public override string Reason { get; } = "This test can only be run if client dependencies are project references";
+		public override bool Skip => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TestPackageVersion"));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests.Core/Xunit/SkipOnTeamCityAttribute.cs b/src/Tests/Tests.Core/Xunit/SkipOnTeamCityAttribute.cs
index 7c3d41bd55f..5f47787dec8 100644
--- a/src/Tests/Tests.Core/Xunit/SkipOnTeamCityAttribute.cs
+++ b/src/Tests/Tests.Core/Xunit/SkipOnTeamCityAttribute.cs
@@ -5,11 +5,9 @@ namespace Tests.Core.Xunit
 {
 	public class SkipOnTeamCityAttribute : SkipTestAttributeBase
 	{
-		public override bool Skip => RunningOnTeamCity;
+		public override string Reason { get; } = "Skip running this test on TeamCity, this is usually a sign this test is flakey?";
 
 		public static bool RunningOnTeamCity => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TEAMCITY_VERSION"));
-
-		public override string Reason { get; } = "Skip running this test on TeamCity, this is usually a sign this test is flakey?";
+		public override bool Skip => RunningOnTeamCity;
 	}
-
 }
diff --git a/src/Tests/Tests.Domain/CommitActivity.cs b/src/Tests/Tests.Domain/CommitActivity.cs
index d6aa9b3a5d1..5cecb4efbcc 100644
--- a/src/Tests/Tests.Domain/CommitActivity.cs
+++ b/src/Tests/Tests.Domain/CommitActivity.cs
@@ -12,42 +12,48 @@ namespace Tests.Domain
 	public class CommitActivity
 	{
 		public static string TypeName = "commit";
-		public string Type => TypeName;
 
 		private string _projectName;
-		public JoinField Join { get; set; }
+
+		public Developer Committer { get; set; }
+		public double ConfidenceFactor { get; set; }
+		public TimeSpan? Duration { get; set; }
+
 		public string Id { get; set; }
+		public JoinField Join { get; set; }
+
+		public string Message { get; set; }
 
 		public string ProjectName
 		{
 			get => _projectName;
 			set
 			{
-				this.Join = JoinField.Link<CommitActivity>(value);
+				Join = JoinField.Link<CommitActivity>(value);
 				_projectName = value;
 			}
 		}
 
-		public string Message { get; set; }
 		public long SizeInBytes { get; set; }
-		public double ConfidenceFactor { get; set; }
-		public Developer Committer { get; set; }
-		public TimeSpan? Duration { get; set; }
 
 		[Text]
-		[StringTimeSpan, JsonConverter(typeof(StringTimeSpanConverter))]
+		[StringTimeSpan]
+		[JsonConverter(typeof(StringTimeSpanConverter))]
 		public TimeSpan? StringDuration
 		{
-			get => this.Duration;
-			set => this.Duration = value;
+			get => Duration;
+			set => Duration = value;
 		}
 
+		public string Type => TypeName;
+
+		// @formatter:off — disable formatter after this line
 		public static Faker<CommitActivity> Generator { get; } =
 			new Faker<CommitActivity>()
 				.UseSeed(TestConfiguration.Instance.Seed)
 				.RuleFor(p => p.Id, p => Guid.NewGuid().ToString("N").Substring(0, 8))
-				.RuleFor(p => p.ProjectName, p => Project.Projects[Gimme.Random.Number(0, Project.Projects.Count -1)].Name)
-				.RuleFor(p => p.Committer, p => Developer.Developers[Gimme.Random.Number(0, Developer.Developers.Count -1)])
+				.RuleFor(p => p.ProjectName, p => Project.Projects[Gimme.Random.Number(0, Project.Projects.Count - 1)].Name)
+				.RuleFor(p => p.Committer, p => Developer.Developers[Gimme.Random.Number(0, Developer.Developers.Count - 1)])
 				.RuleFor(p => p.Message, p => p.Lorem.Paragraph(Gimme.Random.Number(1, 3)))
 				.RuleFor(p => p.SizeInBytes, p => p.Random.Number(0, 100000))
 				.RuleFor(p => p.ConfidenceFactor, p => p.Random.Double())
@@ -60,9 +66,8 @@ public TimeSpan? StringDuration
 					null,
 					TimeSpan.FromHours(4.23),
 					TimeSpan.FromDays(5),
-				}))
-			;
-
+				}));
 		public static IList<CommitActivity> CommitActivities { get; } = Generator.Clone().Generate(1000);
+		// @formatter:on — enable formatter after this line
 	}
 }
diff --git a/src/Tests/Tests.Domain/Developer.cs b/src/Tests/Tests.Domain/Developer.cs
index 28b8ac59acf..3070828a77c 100644
--- a/src/Tests/Tests.Domain/Developer.cs
+++ b/src/Tests/Tests.Domain/Developer.cs
@@ -9,15 +9,16 @@ namespace Tests.Domain
 {
 	public class Developer : Person
 	{
-		public string OnlineHandle { get; set; }
 		public Gender Gender { get; set; }
-		public string PrivateValue { get; set; }
-		public string IpAddress { get; set; }
 
 		// not populated by generator. Used by ingest geoip test
 		public GeoIp GeoIp { get; set; }
+		public string IpAddress { get; set; }
+		public string OnlineHandle { get; set; }
+		public string PrivateValue { get; set; }
 
-		public new static Faker<Developer> Generator { get; } =
+		// @formatter:off — disable formatter after this line
+		public static new Faker<Developer> Generator { get; } =
 			new Faker<Developer>()
 				.UseSeed(TestConfiguration.Instance.Seed)
 				.RuleFor(p => p.Id, p => Interlocked.Increment(ref IdState))
@@ -28,9 +29,8 @@ public class Developer : Person
 				.RuleFor(p => p.OnlineHandle, p => p.Internet.UserName())
 				.RuleFor(p => p.Gender, p => p.PickRandom<Gender>())
 				.RuleFor(p => p.PrivateValue, p => "THIS SHOULD NEVER BE INDEXED")
-				.RuleFor(p => p.IpAddress, p => p.Internet.Ip())
-			;
-
-		public static IList<Developer> Developers { get; } = Developer.Generator.Clone().Generate(1000);
+				.RuleFor(p => p.IpAddress, p => p.Internet.Ip());
+		public static IList<Developer> Developers { get; } = Generator.Clone().Generate(1000);
+		// @formatter:on — enable formatter after this line
 	}
 }
diff --git a/src/Tests/Tests.Domain/Extensions/AnonymizerExtensions.cs b/src/Tests/Tests.Domain/Extensions/AnonymizerExtensions.cs
index f74680c24e1..77c1df78f29 100644
--- a/src/Tests/Tests.Domain/Extensions/AnonymizerExtensions.cs
+++ b/src/Tests/Tests.Domain/Extensions/AnonymizerExtensions.cs
@@ -12,7 +12,6 @@ public static object ToAnonymousObject(this JoinField field) =>
 			{
 				parent = Infer.Id(c.Parent),
 				name = Infer.RelationName(c.Name)
-
 			});
 	}
 }
diff --git a/src/Tests/Tests.Domain/Gender.cs b/src/Tests/Tests.Domain/Gender.cs
index 9f20ec0b4d7..3e930140ff9 100644
--- a/src/Tests/Tests.Domain/Gender.cs
+++ b/src/Tests/Tests.Domain/Gender.cs
@@ -4,9 +4,11 @@
 
 namespace Tests.Domain
 {
-	[StringEnum, JsonConverter(typeof(StringEnumConverter))]
+	[StringEnum] [JsonConverter(typeof(StringEnumConverter))]
 	public enum Gender
 	{
-		Male, Female, NoneOfYourBeeswax
+		Male,
+		Female,
+		NoneOfYourBeeswax
 	}
 }
diff --git a/src/Tests/Tests.Domain/GeoIp.cs b/src/Tests/Tests.Domain/GeoIp.cs
index 5511cc442f9..0e02370a003 100644
--- a/src/Tests/Tests.Domain/GeoIp.cs
+++ b/src/Tests/Tests.Domain/GeoIp.cs
@@ -4,14 +4,13 @@ namespace Tests.Domain
 {
 	public class GeoIp
 	{
-		public string ContinentName { get; set; }
-
 		public string CityName { get; set; }
+		public string ContinentName { get; set; }
 
 		public string CountryIsoCode { get; set; }
 
-		public string RegionName { get; set; }
-
 		public GeoLocation Location { get; set; }
+
+		public string RegionName { get; set; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests.Domain/Helpers/TestValueHelper.cs b/src/Tests/Tests.Domain/Helpers/TestValueHelper.cs
index fefee2cccf0..c6d535809d2 100644
--- a/src/Tests/Tests.Domain/Helpers/TestValueHelper.cs
+++ b/src/Tests/Tests.Domain/Helpers/TestValueHelper.cs
@@ -6,15 +6,14 @@ namespace Tests.Domain.Helpers
 {
 	public static class TestValueHelper
 	{
-		private static bool InRange(string range) => ElasticsearchVersion.From(TestConfiguration.Instance.ElasticsearchVersion).InRange(range);
-
 		public const string ProjectsIndex = "project";
 
 		public static DateTime FixedDate { get; } = new DateTime(2015, 06, 06, 12, 01, 02, 123);
 
 		public static string PercolatorType => InRange("<5.0.0-alpha1") ? ".percolator" : "query";
 
-		public static object Dependant(object builtin, object source) => TestConfiguration.Instance.Random.SourceSerializer ? source : builtin;
+		private static bool InRange(string range) => ElasticsearchVersion.From(TestConfiguration.Instance.ElasticsearchVersion).InRange(range);
 
+		public static object Dependant(object builtin, object source) => TestConfiguration.Instance.Random.SourceSerializer ? source : builtin;
 	}
 }
diff --git a/src/Tests/Tests.Domain/JsonConverters/StringTimeSpanConverter.cs b/src/Tests/Tests.Domain/JsonConverters/StringTimeSpanConverter.cs
index be9aa5fb267..6f56936f0fb 100644
--- a/src/Tests/Tests.Domain/JsonConverters/StringTimeSpanConverter.cs
+++ b/src/Tests/Tests.Domain/JsonConverters/StringTimeSpanConverter.cs
@@ -26,10 +26,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 				return null;
 			}
-			if (reader.TokenType == JsonToken.String)
-			{
-				return TimeSpan.Parse((string)reader.Value);
-			}
+			if (reader.TokenType == JsonToken.String) return TimeSpan.Parse((string)reader.Value);
 
 			throw new JsonSerializationException($"Cannot convert token of type {reader.TokenType} to {objectType}.");
 		}
diff --git a/src/Tests/Tests.Domain/Log.cs b/src/Tests/Tests.Domain/Log.cs
index 42e5bb3f5d8..39a4a7454a7 100644
--- a/src/Tests/Tests.Domain/Log.cs
+++ b/src/Tests/Tests.Domain/Log.cs
@@ -9,38 +9,8 @@ namespace Tests.Domain
 {
 	public class Log
 	{
-		public DateTime Timestamp { get; set; }
-
-		public string Body { get; set; }
-		[Keyword] public string Tag { get; set; }
-		[Keyword] public string UserAgent { get; set; }
-		[Keyword] public string User { get; set; }
-		[Keyword] public string Url { get; set; }
-		[Keyword] public string Section { get; set; }
-		public long Temperature { get; set; }
-		public double Voltage { get; set; }
-		public double Load { get; set; }
-		public double NetIn { get; set; }
-		public double NetOut { get; set; }
-
-		public static Faker<Log> Generator { get; } =
-			new Faker<Log>()
-				.UseSeed(TestConfiguration.Instance.Seed)
-				.RuleFor(m => m.Timestamp, m => m.Date.Between(DateTime.UtcNow.AddDays(-7), DateTime.UtcNow))
-				.RuleFor(m => m.Body, m => GetMessageText())
-				.RuleFor(m => m.Tag, m => m.Hacker.Abbreviation())
-				.RuleFor(m => m.UserAgent, m => m.Internet.UserAgent())
-				.RuleFor(m => m.User, m => m.Internet.UserName())
-				.RuleFor(m => m.Url, m => m.Internet.UrlWithPath())
-				.RuleFor(m => m.Temperature, m => m.Random.Number(-10, 45))
-				.RuleFor(m => m.Voltage, m => m.Random.Double(0, 10.0))
-				.RuleFor(m => m.Section, m => m.PickRandom(Sections))
-				.RuleFor(m => m.Load, m => m.Random.Double(100, 500))
-				.RuleFor(m => m.NetIn, m => m.Random.Double(1000, 10000))
-				.RuleFor(m => m.NetOut, m => m.Random.Double(1000, 10000))
-			;
-
 		private static readonly Random Random = new Random(15842);
+
 		public static readonly string[] Words =
 		{
 			"molestie", "vel", "metus", "neque", "dui", "volutpat", "sollicitudin", "sociis", "ac", "imperdiet", "tristique", "et",
@@ -61,7 +31,38 @@ public class Log
 			"dictum", "elit", "sed"
 		};
 
-		public static readonly string[] Sections = Words.Where(w=>w.Length > 3).Take(10).ToArray();
+		public static readonly string[] Sections = Words.Where(w => w.Length > 3).Take(10).ToArray();
+
+
+		public string Body { get; set; }
+
+		public static Faker<Log> Generator { get; } =
+			new Faker<Log>()
+				.UseSeed(TestConfiguration.Instance.Seed)
+				.RuleFor(m => m.Timestamp, m => m.Date.Between(DateTime.UtcNow.AddDays(-7), DateTime.UtcNow))
+				.RuleFor(m => m.Body, m => GetMessageText())
+				.RuleFor(m => m.Tag, m => m.Hacker.Abbreviation())
+				.RuleFor(m => m.UserAgent, m => m.Internet.UserAgent())
+				.RuleFor(m => m.User, m => m.Internet.UserName())
+				.RuleFor(m => m.Url, m => m.Internet.UrlWithPath())
+				.RuleFor(m => m.Temperature, m => m.Random.Number(-10, 45))
+				.RuleFor(m => m.Voltage, m => m.Random.Double(0, 10.0))
+				.RuleFor(m => m.Section, m => m.PickRandom(Sections))
+				.RuleFor(m => m.Load, m => m.Random.Double(100, 500))
+				.RuleFor(m => m.NetIn, m => m.Random.Double(1000, 10000))
+				.RuleFor(m => m.NetOut, m => m.Random.Double(1000, 10000));
+
+		public double Load { get; set; }
+		public double NetIn { get; set; }
+		public double NetOut { get; set; }
+		[Keyword] public string Section { get; set; }
+		[Keyword] public string Tag { get; set; }
+		public long Temperature { get; set; }
+		public DateTime Timestamp { get; set; }
+		[Keyword] public string Url { get; set; }
+		[Keyword] public string User { get; set; }
+		[Keyword] public string UserAgent { get; set; }
+		public double Voltage { get; set; }
 
 		private static string GetMessageText()
 		{
@@ -69,10 +70,7 @@ private static string GetMessageText()
 
 			var sb = new StringBuilder();
 
-			for (var i = 0; i < numWords; i++)
-			{
-				sb.Append(Words[Random.Next(0, Words.Length)]).Append(" ");
-			}
+			for (var i = 0; i < numWords; i++) sb.Append(Words[Random.Next(0, Words.Length)]).Append(" ");
 
 			return sb.ToString().TrimEnd();
 		}
diff --git a/src/Tests/Tests.Domain/Metric.cs b/src/Tests/Tests.Domain/Metric.cs
index 2c8cb82151c..8946d78f6e4 100644
--- a/src/Tests/Tests.Domain/Metric.cs
+++ b/src/Tests/Tests.Domain/Metric.cs
@@ -7,10 +7,6 @@ namespace Tests.Domain
 {
 	public class Metric
 	{
-		[Date(Name="@timestamp")]
-		[MachineLearningDateTime, JsonConverter(typeof(MachineLearningDateTimeConverter))]
-		public DateTime Timestamp { get; set; }
-
 		public long Accept { get; set; }
 
 		public long Deny { get; set; }
@@ -21,6 +17,11 @@ public class Metric
 
 		public string Service { get; set; }
 
+		[Date(Name = "@timestamp")]
+		[MachineLearningDateTime]
+		[JsonConverter(typeof(MachineLearningDateTimeConverter))]
+		public DateTime Timestamp { get; set; }
+
 		public long Total { get; set; }
 	}
 
diff --git a/src/Tests/Tests.Domain/Person.cs b/src/Tests/Tests.Domain/Person.cs
index 463b7dae532..fb00c6824e5 100644
--- a/src/Tests/Tests.Domain/Person.cs
+++ b/src/Tests/Tests.Domain/Person.cs
@@ -9,13 +9,8 @@ namespace Tests.Domain
 {
 	public class Person
 	{
-		public long Id { get; set; }
-		public string FirstName { get; set; }
-		public string LastName { get; set; }
-		public string JobTitle { get; set; }
-		public GeoLocation Location { get; set; }
-
 		protected static int IdState = 0;
+		public string FirstName { get; set; }
 
 		public static Faker<Person> Generator { get; } =
 			new Faker<Person>()
@@ -24,9 +19,13 @@ public class Person
 				.RuleFor(p => p.FirstName, p => p.Name.FirstName())
 				.RuleFor(p => p.LastName, p => p.Name.LastName())
 				.RuleFor(p => p.JobTitle, p => p.Name.JobTitle())
-				.RuleFor(p => p.Location, p => new GeoLocation(Gimme.Random.Number(-90, 90), Gimme.Random.Number(-180, 180)))
-			;
+				.RuleFor(p => p.Location, p => new GeoLocation(Gimme.Random.Number(-90, 90), Gimme.Random.Number(-180, 180)));
+
+		public long Id { get; set; }
+		public string JobTitle { get; set; }
+		public string LastName { get; set; }
+		public GeoLocation Location { get; set; }
 
-		public static IList<Person> People { get; } = Person.Generator.Clone().Generate(1000);
+		public static IList<Person> People { get; } = Generator.Clone().Generate(1000);
 	}
 }
diff --git a/src/Tests/Tests.Domain/Project.cs b/src/Tests/Tests.Domain/Project.cs
index 62e20b06cc9..66654dcd258 100644
--- a/src/Tests/Tests.Domain/Project.cs
+++ b/src/Tests/Tests.Domain/Project.cs
@@ -14,32 +14,36 @@ namespace Tests.Domain
 	public class Project
 	{
 		public static string TypeName = "project";
-		public string Type => TypeName;
-		public JoinField Join => JoinField.Root<Project>();
-		public string Name { get; set; }
-		public string Description { get; set; }
-		public StateOfBeing State { get; set; }
 
-        //the first applies when using internal source serializer the latter when using JsonNetSourceSerializer
-        [StringEnum, JsonConverter(typeof(StringEnumConverter))]
-		public Visibility Visibility { get; set; }
-		public DateTime StartedOn { get; set; }
+		public IEnumerable<string> Branches { get; set; }
+		public IList<Tag> CuratedTags { get; set; }
 		public string DateString { get; set; }
+		public string Description { get; set; }
+
+		public JoinField Join => JoinField.Root<Project>();
 		public DateTime LastActivity { get; set; }
 		public Developer LeadDeveloper { get; set; }
-		public IEnumerable<Tag> Tags { get; set; }
-		public IList<Tag> CuratedTags { get; set; }
-		public Dictionary<string, Metadata> Metadata { get; set; }
 		public SimpleGeoPoint Location { get; set; }
+		public Dictionary<string, Metadata> Metadata { get; set; }
+		public string Name { get; set; }
 		public int? NumberOfCommits { get; set; }
 		public int NumberOfContributors { get; set; }
-		public CompletionField Suggest { get; set; }
-		public IEnumerable<string> Branches { get; set; }
+
 		public Ranges Ranges { get; set; }
-		public int? RequiredBranches => this.Branches?.Count();
+		public int? RequiredBranches => Branches?.Count();
 
 		public SourceOnlyObject SourceOnly { get; set; }
+		public DateTime StartedOn { get; set; }
+		public StateOfBeing State { get; set; }
+		public CompletionField Suggest { get; set; }
+		public IEnumerable<Tag> Tags { get; set; }
+		public string Type => TypeName;
+
+		//the first applies when using internal source serializer the latter when using JsonNetSourceSerializer
+		[StringEnum] [JsonConverter(typeof(StringEnumConverter))]
+		public Visibility Visibility { get; set; }
 
+		// @formatter:off — disable formatter after this line
 		public static Faker<Project> Generator { get; } =
 			new Faker<Project>()
 				.UseSeed(TestConfiguration.Instance.Seed)
@@ -50,7 +54,7 @@ public class Project
 				.RuleFor(p => p.StartedOn, p => p.Date.Past())
 				.RuleFor(p => p.DateString, (p, d) => d.StartedOn.ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"))
 				.RuleFor(p => p.LastActivity, p => p.Date.Recent())
-				.RuleFor(p => p.LeadDeveloper, p => Developer.Developers[Gimme.Random.Number(0, Developer.Developers.Count -1)])
+				.RuleFor(p => p.LeadDeveloper, p => Developer.Developers[Gimme.Random.Number(0, Developer.Developers.Count - 1)])
 				.RuleFor(p => p.Tags, f => Tag.Generator.Generate(Gimme.Random.Number(2, 50)))
 				.RuleFor(p => p.CuratedTags, f => Tag.Generator.Generate(Gimme.Random.Number(1, 5)))
 				.RuleFor(p => p.Location, f => SimpleGeoPoint.Generator.Generate())
@@ -66,14 +70,13 @@ public class Project
 					Input = new[] { f.Person.Company.Name },
 					Contexts = new Dictionary<string, IEnumerable<string>>
 					{
-						{ "color", new [] { "red", "blue", "green", "violet", "yellow" }.Take(Gimme.Random.Number(1, 4)) }
+						{ "color", new[] { "red", "blue", "green", "violet", "yellow" }.Take(Gimme.Random.Number(1, 4)) }
 					}
-				})
-			;
+				});
 
-		public static IList<Project> Projects { get; } = Project.Generator.Clone().Generate(100);
+		public static IList<Project> Projects { get; } = Generator.Clone().Generate(100);
 
-	    public static Project First { get; } = Projects.First();
+		public static Project First { get; } = Projects.First();
 
 		public static readonly Project Instance = new Project
 		{
@@ -85,16 +88,12 @@ public class Project
 			SourceOnly = TestConfiguration.Instance.Random.SourceSerializer ? new SourceOnlyObject() : null
 		};
 
-		public static readonly string Routing = Project.Instance.Name;
-
-		public static object InstanceAnonymous => TestConfiguration.Instance.Random.SourceSerializer
-			? InstanceAnonymousSourceSerializer
-			: InstanceAnonymousDefault;
+		public static readonly string Routing = Instance.Name;
 
 		private static readonly object InstanceAnonymousDefault = new
 		{
 			name = Projects.First().Name,
-			type = Project.TypeName,
+			type = TypeName,
 			join = Instance.Join.ToAnonymousObject(),
 			state = "BellyUp",
 			visibility = "Public",
@@ -105,10 +104,11 @@ public class Project
 			leadDeveloper = new { gender = "Male", id = 0, firstName = "Martijn", lastName = "Laarman" },
 			location = new { lat = Instance.Location.Lat, lon = Instance.Location.Lon }
 		};
+
 		private static readonly object InstanceAnonymousSourceSerializer = new
 		{
 			name = Projects.First().Name,
-			type = Project.TypeName,
+			type = TypeName,
 			join = Instance.Join.ToAnonymousObject(),
 			state = "BellyUp",
 			visibility = "Public",
@@ -121,10 +121,16 @@ public class Project
 			sourceOnly = new { notWrittenByDefaultSerializer = "written" }
 		};
 
+
+		public static object InstanceAnonymous => TestConfiguration.Instance.Random.SourceSerializer
+			? InstanceAnonymousSourceSerializer
+			: InstanceAnonymousDefault;
+
+		// @formatter:on — enable formatter after this line
 	}
 
 	//the first applies when using internal source serializer the latter when using JsonNetSourceSerializer
-	[StringEnum, JsonConverter(typeof(StringEnumConverter))]
+	[StringEnum] [JsonConverter(typeof(StringEnumConverter))]
 	public enum StateOfBeing
 	{
 		BellyUp,
diff --git a/src/Tests/Tests.Domain/Ranges.cs b/src/Tests/Tests.Domain/Ranges.cs
index 6c4b057956a..f03e5e4459a 100644
--- a/src/Tests/Tests.Domain/Ranges.cs
+++ b/src/Tests/Tests.Domain/Ranges.cs
@@ -8,27 +8,33 @@ namespace Tests.Domain
 {
 	public class Ranges
 	{
-		public DateRange Dates { get; set; }
-		public DoubleRange Doubles { get; set; }
-		public FloatRange Floats { get; set; }
-		public IntegerRange Integers { get; set; }
-		public LongRange Longs { get; set; }
-		public IpAddressRange Ips { get; set; }
-
 		//for deserialization
 		public Ranges() { }
 
 		private Ranges(Faker faker)
 		{
 			Func<bool> r = () => faker.Random.Bool();
-			this.SetDates(faker, r);
-			this.SetDoubles(faker, r);
-			this.SetFloats(faker, r);
-			this.SetIntegers(faker, r);
-			this.SetLongs(faker, r);
-			this.SetIps(faker, r);
+			SetDates(faker, r);
+			SetDoubles(faker, r);
+			SetFloats(faker, r);
+			SetIntegers(faker, r);
+			SetLongs(faker, r);
+			SetIps(faker, r);
 		}
 
+		public DateRange Dates { get; set; }
+		public DoubleRange Doubles { get; set; }
+		public FloatRange Floats { get; set; }
+
+		public static Faker<Ranges> Generator { get; } =
+			new Faker<Ranges>()
+				.UseSeed(TestConfiguration.Instance.Seed)
+				.CustomInstantiator((f) => new Ranges(f));
+
+		public IntegerRange Integers { get; set; }
+		public IpAddressRange Ips { get; set; }
+		public LongRange Longs { get; set; }
+
 		private void SetDates(Faker faker, Func<bool> r)
 		{
 			var past = faker.Date.Past(faker.Random.Int(1, 19));
@@ -36,8 +42,9 @@ private void SetDates(Faker faker, Func<bool> r)
 			var d = new DateRange();
 			SwapAssign(r(), past, v => d.GreaterThan = v, v => d.GreaterThanOrEqualTo = v);
 			SwapAssign(r(), future, v => d.LessThan = v, v => d.LessThanOrEqualTo = v);
-			this.Dates = d;
+			Dates = d;
 		}
+
 		private void SetDoubles(Faker faker, Func<bool> r)
 		{
 			var low = faker.Random.Double(-121, 10000);
@@ -45,8 +52,9 @@ private void SetDoubles(Faker faker, Func<bool> r)
 			var d = new DoubleRange();
 			SwapAssign(r(), low, v => d.GreaterThan = v, v => d.GreaterThanOrEqualTo = v);
 			SwapAssign(r(), high, v => d.LessThan = v, v => d.LessThanOrEqualTo = v);
-			this.Doubles = d;
+			Doubles = d;
 		}
+
 		private void SetFloats(Faker faker, Func<bool> r)
 		{
 			var low = faker.Random.Float(-2000, 10000);
@@ -54,8 +62,9 @@ private void SetFloats(Faker faker, Func<bool> r)
 			var d = new FloatRange();
 			SwapAssign(r(), low, v => d.GreaterThan = v, v => d.GreaterThanOrEqualTo = v);
 			SwapAssign(r(), high, v => d.LessThan = v, v => d.LessThanOrEqualTo = v);
-			this.Floats = d;
+			Floats = d;
 		}
+
 		private void SetIntegers(Faker faker, Func<bool> r)
 		{
 			var low = faker.Random.Int(-100, 10000);
@@ -63,8 +72,9 @@ private void SetIntegers(Faker faker, Func<bool> r)
 			var d = new FloatRange();
 			SwapAssign(r(), low, v => d.GreaterThan = v, v => d.GreaterThanOrEqualTo = v);
 			SwapAssign(r(), high, v => d.LessThan = v, v => d.LessThanOrEqualTo = v);
-			this.Floats = d;
+			Floats = d;
 		}
+
 		private void SetLongs(Faker faker, Func<bool> r)
 		{
 			var low = faker.Random.Long(-100, 10000);
@@ -72,18 +82,20 @@ private void SetLongs(Faker faker, Func<bool> r)
 			var d = new LongRange();
 			SwapAssign(r(), low, v => d.GreaterThan = v, v => d.GreaterThanOrEqualTo = v);
 			SwapAssign(r(), high, v => d.LessThan = v, v => d.LessThanOrEqualTo = v);
-			this.Longs = d;
+			Longs = d;
 		}
+
 		private void SetIps(Faker faker, Func<bool> r)
 		{
 			var low = faker.Internet.Ip();
 			var high = faker.Internet.Ip();
 			var lowBytes = IPAddress.Parse(low).GetAddressBytes();
 			var highBytes = IPAddress.Parse(high).GetAddressBytes();
-			for (int i = 0; i < lowBytes.Length; i++)
+			for (var i = 0; i < lowBytes.Length; i++)
 			{
 				var comparison = lowBytes[i].CompareTo(highBytes[i]);
 				if (comparison == 0) continue;
+
 				if (comparison > 0)
 				{
 					var s = low;
@@ -96,7 +108,7 @@ private void SetIps(Faker faker, Func<bool> r)
 			var d = new IpAddressRange();
 			SwapAssign(r(), low, v => d.GreaterThan = v, v => d.GreaterThanOrEqualTo = v);
 			SwapAssign(r(), high, v => d.LessThan = v, v => d.LessThanOrEqualTo = v);
-			this.Ips = d;
+			Ips = d;
 		}
 
 		private static void SwapAssign<T>(bool b, T value, Action<T> first, Action<T> second)
@@ -104,11 +116,5 @@ private static void SwapAssign<T>(bool b, T value, Action<T> first, Action<T> se
 			if (b) first(value);
 			else second(value);
 		}
-
-		public static Faker<Ranges> Generator { get; } =
-			new Faker<Ranges>()
-				.UseSeed(TestConfiguration.Instance.Seed)
-				.CustomInstantiator((f) => new Ranges(f))
-			;
 	}
 }
diff --git a/src/Tests/Tests.Domain/Shape.cs b/src/Tests/Tests.Domain/Shape.cs
index b92667e631a..f458b15d692 100644
--- a/src/Tests/Tests.Domain/Shape.cs
+++ b/src/Tests/Tests.Domain/Shape.cs
@@ -10,12 +10,8 @@ namespace Tests.Domain
 	public class Shape
 	{
 		private static int _idState = 0;
-
-		public int Id { get; set; }
-
-		public IGeometryCollection GeometryCollection { get; set; }
-		public IEnvelopeGeoShape Envelope { get; set; }
 		public ICircleGeoShape Circle { get; set; }
+		public IEnvelopeGeoShape Envelope { get; set; }
 
 		public static Faker<Shape> Generator { get; } =
 			new Faker<Shape>()
@@ -34,7 +30,7 @@ public class Shape
 							GenerateMultiPolygon(p)
 						}
 					})
-				.RuleFor(p => p.Envelope, p => new EnvelopeGeoShape(new []
+				.RuleFor(p => p.Envelope, p => new EnvelopeGeoShape(new[]
 				{
 					new GeoCoordinate(45, 0),
 					new GeoCoordinate(0, 45)
@@ -42,16 +38,19 @@ public class Shape
 				.RuleFor(p => p.Circle, p => new CircleGeoShape(GenerateGeoCoordinate(p))
 				{
 					Radius = $"{p.Random.Int(1, 100)}km"
-				})
-			;
+				});
+
+		public IGeometryCollection GeometryCollection { get; set; }
 
-		public static IList<Shape> Shapes { get; } = Shape.Generator.Clone().Generate(10);
+		public int Id { get; set; }
+
+		public static IList<Shape> Shapes { get; } = Generator.Clone().Generate(10);
 
 		private static IPointGeoShape GenerateRandomPoint(Faker p) =>
 			new PointGeoShape { Coordinates = GenerateGeoCoordinate(p) };
 
 		private static IMultiPointGeoShape GenerateRandomMultiPoint(Faker p) =>
-			new MultiPointGeoShape { Coordinates = GenerateGeoCoordinates(p,  p.Random.Int(1, 5)) };
+			new MultiPointGeoShape { Coordinates = GenerateGeoCoordinates(p, p.Random.Int(1, 5)) };
 
 		private static ILineStringGeoShape GenerateLineString(Faker p) =>
 			new LineStringGeoShape { Coordinates = GenerateGeoCoordinates(p, 3) };
@@ -62,30 +61,24 @@ private static IMultiLineStringGeoShape GenerateMultiLineString(Faker p)
 			for (var i = 0; i < p.Random.Int(1, 5); i++)
 				coordinates.Add(GenerateGeoCoordinates(p, 3));
 
-			return new MultiLineStringGeoShape {Coordinates = coordinates };
+			return new MultiLineStringGeoShape { Coordinates = coordinates };
 		}
 
-		private static IPolygonGeoShape GeneratePolygon(Faker p)
+		private static IPolygonGeoShape GeneratePolygon(Faker p) => new PolygonGeoShape
 		{
-			return new PolygonGeoShape
+			Coordinates = new List<IEnumerable<GeoCoordinate>>
 			{
-				Coordinates = new List<IEnumerable<GeoCoordinate>>
-				{
-					GeneratePolygonCoordinates(p, GenerateGeoCoordinate(p))
-				}
-			};
-		}
+				GeneratePolygonCoordinates(p, GenerateGeoCoordinate(p))
+			}
+		};
 
-		private static IMultiPolygonGeoShape GenerateMultiPolygon(Faker p)
+		private static IMultiPolygonGeoShape GenerateMultiPolygon(Faker p) => new MultiPolygonGeoShape
 		{
-			return new MultiPolygonGeoShape
+			Coordinates = new List<IEnumerable<IEnumerable<GeoCoordinate>>>
 			{
-				Coordinates = new List<IEnumerable<IEnumerable<GeoCoordinate>>>
-				{
-					new [] { GeneratePolygonCoordinates(p, GenerateGeoCoordinate(p)) }
-				}
-			};
-		}
+				new[] { GeneratePolygonCoordinates(p, GenerateGeoCoordinate(p)) }
+			}
+		};
 
 		private static GeoCoordinate GenerateGeoCoordinate(Faker p) =>
 			new GeoCoordinate(p.Address.Latitude(), p.Address.Longitude());
@@ -110,7 +103,7 @@ private static IEnumerable<GeoCoordinate> GeneratePolygonCoordinates(Faker p, Ge
 			for (var i = 0; i < maxPoints; i++)
 			{
 				var distance = p.Random.Double() * maxDistance;
-				points.Add(new GeoCoordinate(centroid.Latitude + Math.Sin(angle)*distance, centroid.Longitude + Math.Cos(angle)*distance));
+				points.Add(new GeoCoordinate(centroid.Latitude + Math.Sin(angle) * distance, centroid.Longitude + Math.Cos(angle) * distance));
 				angle = angle + p.Random.Double() * (2d / 3) * Math.PI;
 				if (angle > 2 * Math.PI) break;
 			}
diff --git a/src/Tests/Tests.Domain/SimpleGeoPoint.cs b/src/Tests/Tests.Domain/SimpleGeoPoint.cs
index 87237343ef1..289ae83709e 100644
--- a/src/Tests/Tests.Domain/SimpleGeoPoint.cs
+++ b/src/Tests/Tests.Domain/SimpleGeoPoint.cs
@@ -5,14 +5,14 @@ namespace Tests.Domain
 {
 	public class SimpleGeoPoint
 	{
-		public double Lat { get; set; }
-		public double Lon { get; set; }
-
 		public static Faker<SimpleGeoPoint> Generator { get; } =
 			new Faker<SimpleGeoPoint>()
 				.UseSeed(TestConfiguration.Instance.Seed)
 				.RuleFor(p => p.Lat, f => f.Address.Latitude())
 				.RuleFor(p => p.Lon, f => f.Address.Longitude())
-			.Clone();
+				.Clone();
+
+		public double Lat { get; set; }
+		public double Lon { get; set; }
 	}
 }
diff --git a/src/Tests/Tests.Domain/SourceOnlyObject.cs b/src/Tests/Tests.Domain/SourceOnlyObject.cs
index b44e1221f72..f056414452f 100644
--- a/src/Tests/Tests.Domain/SourceOnlyObject.cs
+++ b/src/Tests/Tests.Domain/SourceOnlyObject.cs
@@ -6,10 +6,11 @@ namespace Tests.Domain
 {
 	public class SourceOnlyObject
 	{
-		[Ignore, JsonIgnore]
-		public string NotWrittenByDefaultSerializer { get; set; }
-		[Ignore, JsonIgnore]
+		[Ignore] [JsonIgnore]
 		public string NotReadByDefaultSerializer { get; set; }
+
+		[Ignore] [JsonIgnore]
+		public string NotWrittenByDefaultSerializer { get; set; }
 	}
 
 	public class SourceOnlyUsingBuiltInConverter : JsonConverter
@@ -27,9 +28,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			//ignore json as provided
 			var depth = reader.Depth;
 			do
-			{
 				reader.Read();
-			} while (reader.Depth >= depth && reader.TokenType != JsonToken.EndObject);
+			while (reader.Depth >= depth && reader.TokenType != JsonToken.EndObject);
 			var p = new SourceOnlyObject
 			{
 				NotWrittenByDefaultSerializer = "written",
@@ -37,6 +37,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			};
 			return p;
 		}
+
 		public override bool CanConvert(Type objectType) => objectType == typeof(SourceOnlyObject);
 	}
 }
diff --git a/src/Tests/Tests.Domain/Tag.cs b/src/Tests/Tests.Domain/Tag.cs
index fed4ecc3873..55258595bc8 100644
--- a/src/Tests/Tests.Domain/Tag.cs
+++ b/src/Tests/Tests.Domain/Tag.cs
@@ -8,13 +8,14 @@ namespace Tests.Domain
 	public class Tag
 	{
 		public DateTime Added { get; set; }
-		public string Name { get; set; }
 
 		public static Faker<Tag> Generator { get; } =
 			new Faker<Tag>()
 				.UseSeed(TestConfiguration.Instance.Seed)
 				.RuleFor(p => p.Name, p => p.Lorem.Words(1).First())
 				.RuleFor(p => p.Added, p => p.Date.Recent())
-			.Clone();
+				.Clone();
+
+		public string Name { get; set; }
 	}
 }
diff --git a/src/Tests/Tests.Profiling/BulkProfileTests.cs b/src/Tests/Tests.Profiling/BulkProfileTests.cs
index 948bbc08838..02d847ed5d3 100644
--- a/src/Tests/Tests.Profiling/BulkProfileTests.cs
+++ b/src/Tests/Tests.Profiling/BulkProfileTests.cs
@@ -7,52 +7,57 @@
 
 namespace Tests.Profiling
 {
-    public class BulkProfileTests
-    {
-        private readonly IElasticClient _client;
-        private static readonly string IndexName = "bulk-profile";
-
-        public BulkProfileTests(ProfilingCluster cluster)
-        {
-            _client = cluster.Client;
-
-            if (_client.IndexExists(IndexName).Exists)
-                _client.DeleteIndex(IndexName);
-
-            var createIndexResponse = _client.CreateIndex(IndexName);
-
-            if (!createIndexResponse.IsValid)
-                Console.WriteLine($"invalid response creating index: {createIndexResponse.ServerError?.Error?.Reason}");
-        }
-
-        [Performance(Iterations = 10)]
-        public void Sync()
-        {
-            var bulkResponse = _client.Bulk(b => b
-                .IndexMany(Developer.Generator.Generate(1000), (bd, d) => bd
-                    .Index(IndexName)
-                    .Document(d)
-                ));
-
-            if (!bulkResponse.IsValid)
-                if (bulkResponse.Errors)
-                    foreach (var error in bulkResponse.ItemsWithErrors)
-                        Console.WriteLine($"error with id {error.Id}. message: {error.Error.Reason}");
-        }
-
-        [Performance(Iterations = 10)]
-        public async Task Async()
-        {
-            var bulkResponse = await _client.BulkAsync(b => b
-                .IndexMany(Developer.Generator.Generate(1000), (bd, d) => bd
-                    .Index(IndexName)
-                    .Document(d)
-                )).ConfigureAwait(false);
-
-            if (!bulkResponse.IsValid)
-                if (bulkResponse.Errors)
-                    foreach (var error in bulkResponse.ItemsWithErrors)
-                        Console.WriteLine($"error with id {error.Id}. message: {error.Error.Reason}");
-        }
-    }
+	public class BulkProfileTests
+	{
+		private static readonly string IndexName = "bulk-profile";
+		private readonly IElasticClient _client;
+
+		public BulkProfileTests(ProfilingCluster cluster)
+		{
+			_client = cluster.Client;
+
+			if (_client.IndexExists(IndexName).Exists)
+				_client.DeleteIndex(IndexName);
+
+			var createIndexResponse = _client.CreateIndex(IndexName);
+
+			if (!createIndexResponse.IsValid)
+				Console.WriteLine($"invalid response creating index: {createIndexResponse.ServerError?.Error?.Reason}");
+		}
+
+		[Performance(Iterations = 10)]
+		public void Sync()
+		{
+			var bulkResponse = _client.Bulk(b => b
+				.IndexMany(Developer.Generator.Generate(1000), (bd, d) => bd
+					.Index(IndexName)
+					.Document(d)
+				));
+
+			if (!bulkResponse.IsValid)
+			{
+				if (bulkResponse.Errors)
+					foreach (var error in bulkResponse.ItemsWithErrors)
+						Console.WriteLine($"error with id {error.Id}. message: {error.Error.Reason}");
+			}
+		}
+
+		[Performance(Iterations = 10)]
+		public async Task Async()
+		{
+			var bulkResponse = await _client.BulkAsync(b => b
+					.IndexMany(Developer.Generator.Generate(1000), (bd, d) => bd
+						.Index(IndexName)
+						.Document(d)
+					))
+				.ConfigureAwait(false);
+
+			if (!bulkResponse.IsValid)
+			{
+				if (bulkResponse.Errors)
+					foreach (var error in bulkResponse.ItemsWithErrors)
+						Console.WriteLine($"error with id {error.Id}. message: {error.Error.Reason}");
+			}
+		}
+	}
 }
diff --git a/src/Tests/Tests.Profiling/Framework/ColoredConsoleWriter.cs b/src/Tests/Tests.Profiling/Framework/ColoredConsoleWriter.cs
index 481cbffb86c..2a9f072cf6e 100644
--- a/src/Tests/Tests.Profiling/Framework/ColoredConsoleWriter.cs
+++ b/src/Tests/Tests.Profiling/Framework/ColoredConsoleWriter.cs
@@ -2,7 +2,7 @@
 
 namespace Tests.Profiling.Framework
 {
-	public class ColoredConsoleWriter  : IColoredWriter
+	public class ColoredConsoleWriter : IColoredWriter
 	{
 		public void Write(ConsoleColor color, string value)
 		{
diff --git a/src/Tests/Tests.Profiling/Framework/IColoredWriter.cs b/src/Tests/Tests.Profiling/Framework/IColoredWriter.cs
index 285f98e5e79..37186d1a69d 100644
--- a/src/Tests/Tests.Profiling/Framework/IColoredWriter.cs
+++ b/src/Tests/Tests.Profiling/Framework/IColoredWriter.cs
@@ -5,6 +5,7 @@ namespace Tests.Profiling.Framework
 	public interface IColoredWriter
 	{
 		void Write(ConsoleColor color, string value);
+
 		void WriteLine(ConsoleColor color, string value);
 	}
 }
diff --git a/src/Tests/Tests.Profiling/Framework/Memory/MemoryAttribute.cs b/src/Tests/Tests.Profiling/Framework/Memory/MemoryAttribute.cs
index 2b794334f46..b018e11f03d 100644
--- a/src/Tests/Tests.Profiling/Framework/Memory/MemoryAttribute.cs
+++ b/src/Tests/Tests.Profiling/Framework/Memory/MemoryAttribute.cs
@@ -1,6 +1,4 @@
 namespace Tests.Profiling.Framework.Memory
 {
-	public class MemoryAttribute : ProfilingAttribute
-	{
-	}
+	public class MemoryAttribute : ProfilingAttribute { }
 }
diff --git a/src/Tests/Tests.Profiling/Framework/Memory/MemoryProfile.cs b/src/Tests/Tests.Profiling/Framework/Memory/MemoryProfile.cs
index 099dafe9dfa..377ae07bfef 100644
--- a/src/Tests/Tests.Profiling/Framework/Memory/MemoryProfile.cs
+++ b/src/Tests/Tests.Profiling/Framework/Memory/MemoryProfile.cs
@@ -17,31 +17,22 @@ public MemoryProfile(string sdkPath, string resultsDirectory) : base(resultsDire
 				SaveDir = resultsDirectory,
 				RedistDir = sdkPath,
 				ProfilingType = ProfilingType.Memory,
-				ListFile = this.ListFile
+				ListFile = ListFile
 			};
 
-			while (SelfAttach.State != SelfApiState.None)
-			{
-				Thread.Sleep(250);
-			}
+			while (SelfAttach.State != SelfApiState.None) Thread.Sleep(250);
 
 			SelfAttach.Attach(saveSnapshotProfilingConfig);
-			this.WaitForProfilerToAttachToProcess();
+			WaitForProfilerToAttachToProcess();
 
-			if (MemoryProfiler.IsActive && MemoryProfiler.CanControlAllocations)
-			{
-				MemoryProfiler.EnableAllocations();
-			}
+			if (MemoryProfiler.IsActive && MemoryProfiler.CanControlAllocations) MemoryProfiler.EnableAllocations();
 		}
 
 		public override bool IsActive => MemoryProfiler.IsActive;
 
 		public override void Dispose()
 		{
-			if (MemoryProfiler.IsActive)
-			{
-				MemoryProfiler.Dump();
-			}
+			if (MemoryProfiler.IsActive) MemoryProfiler.Dump();
 
 			if (MemoryProfiler.CanDetach)
 				MemoryProfiler.Detach();
diff --git a/src/Tests/Tests.Profiling/Framework/Memory/MemoryProfileFactory.cs b/src/Tests/Tests.Profiling/Framework/Memory/MemoryProfileFactory.cs
index 87b430bf557..7312a476172 100644
--- a/src/Tests/Tests.Profiling/Framework/Memory/MemoryProfileFactory.cs
+++ b/src/Tests/Tests.Profiling/Framework/Memory/MemoryProfileFactory.cs
@@ -10,13 +10,9 @@ public MemoryProfileFactory(
 			string outputPath,
 			ProfilingCluster cluster,
 			Assembly assembly,
-			IColoredWriter output) : base(sdkPath, outputPath, cluster, assembly, output)
-		{
-		}
+			IColoredWriter output
+		) : base(sdkPath, outputPath, cluster, assembly, output) { }
 
-		protected override IDisposable BeginProfiling(string resultsDirectory)
-		{
-			return new MemoryProfile(this.SdkPath, resultsDirectory);
-		}
+		protected override IDisposable BeginProfiling(string resultsDirectory) => new MemoryProfile(SdkPath, resultsDirectory);
 	}
 }
diff --git a/src/Tests/Tests.Profiling/Framework/Performance/PerformanceAttribute.cs b/src/Tests/Tests.Profiling/Framework/Performance/PerformanceAttribute.cs
index 317f44bb80b..912c54d536c 100644
--- a/src/Tests/Tests.Profiling/Framework/Performance/PerformanceAttribute.cs
+++ b/src/Tests/Tests.Profiling/Framework/Performance/PerformanceAttribute.cs
@@ -3,7 +3,5 @@ namespace Tests.Profiling.Framework.Performance
 	/// <summary>
 	/// identifies a method that should be performance profiled
 	/// </summary>
-	public class PerformanceAttribute : ProfilingAttribute
-	{
-	}
+	public class PerformanceAttribute : ProfilingAttribute { }
 }
diff --git a/src/Tests/Tests.Profiling/Framework/Performance/PerformanceProfile.cs b/src/Tests/Tests.Profiling/Framework/Performance/PerformanceProfile.cs
index 1ddf5dce426..e26d6e27ef0 100644
--- a/src/Tests/Tests.Profiling/Framework/Performance/PerformanceProfile.cs
+++ b/src/Tests/Tests.Profiling/Framework/Performance/PerformanceProfile.cs
@@ -17,17 +17,14 @@ public PerformanceProfile(string sdkPath, string resultsDirectory) : base(result
 				SaveDir = resultsDirectory,
 				RedistDir = sdkPath,
 				ProfilingType = ProfilingType.Performance,
-				ListFile = this.ListFile,
+				ListFile = ListFile,
 				SnapshotFormat = SnapshotFormat.Uncompressed
 			};
 
-			while (SelfAttach.State != SelfApiState.None)
-			{
-				Thread.Sleep(250);
-			}
+			while (SelfAttach.State != SelfApiState.None) Thread.Sleep(250);
 
 			SelfAttach.Attach(saveSnapshotProfilingConfig);
-			this.WaitForProfilerToAttachToProcess();
+			WaitForProfilerToAttachToProcess();
 
 			if (PerformanceProfiler.IsActive)
 			{
diff --git a/src/Tests/Tests.Profiling/Framework/Performance/PerformanceProfileFactory.cs b/src/Tests/Tests.Profiling/Framework/Performance/PerformanceProfileFactory.cs
index fde6458b057..d419d895368 100644
--- a/src/Tests/Tests.Profiling/Framework/Performance/PerformanceProfileFactory.cs
+++ b/src/Tests/Tests.Profiling/Framework/Performance/PerformanceProfileFactory.cs
@@ -6,10 +6,8 @@ namespace Tests.Profiling.Framework.Performance
 	internal class PerformanceProfileFactory : ProfileFactory<PerformanceAttribute>
 	{
 		public PerformanceProfileFactory(string sdkPath, string outputPath, ProfilingCluster cluster, Assembly assembly, IColoredWriter output)
-			: base(sdkPath, outputPath, cluster, assembly, output)
-		{
-		}
+			: base(sdkPath, outputPath, cluster, assembly, output) { }
 
-		protected override IDisposable BeginProfiling(string resultsDirectory) => new PerformanceProfile(this.SdkPath, resultsDirectory);
+		protected override IDisposable BeginProfiling(string resultsDirectory) => new PerformanceProfile(SdkPath, resultsDirectory);
 	}
 }
diff --git a/src/Tests/Tests.Profiling/Framework/Profile.cs b/src/Tests/Tests.Profiling/Framework/Profile.cs
index 8fda021b504..09a70c461e4 100644
--- a/src/Tests/Tests.Profiling/Framework/Profile.cs
+++ b/src/Tests/Tests.Profiling/Framework/Profile.cs
@@ -15,37 +15,33 @@ protected Profile(string resultsDirectory)
 			if (!Directory.Exists(resultsDirectory))
 				Directory.CreateDirectory(resultsDirectory);
 
-			this.ListFile = Path.Combine(resultsDirectory, "snapshot_list.xml");
-			using (File.Create(this.ListFile)) { }
+			ListFile = Path.Combine(resultsDirectory, "snapshot_list.xml");
+			using (File.Create(ListFile)) { }
 
-			if (this.ProfileProcesses.Any())
+			if (ProfileProcesses.Any())
 			{
-				foreach (var profileProcess in this.ProfileProcesses)
-				{
-					profileProcess.Kill();
-				}
+				foreach (var profileProcess in ProfileProcesses) profileProcess.Kill();
 
 				Thread.Sleep(1000);
 			}
 		}
 
-		protected string ListFile { get; }
-
 		public abstract bool IsActive { get; }
 
+		protected string ListFile { get; }
+
 		private IEnumerable<Process> ProfileProcesses =>
-			Process.GetProcessesByName("ExternalLauncherProfiler.x64").Concat(
-			Process.GetProcessesByName("ExternalLauncherProfiler.x86")).ToArray();
+			Process.GetProcessesByName("ExternalLauncherProfiler.x64")
+				.Concat(
+					Process.GetProcessesByName("ExternalLauncherProfiler.x86"))
+				.ToArray();
 
 		private static TimeSpan WaitTime => TimeSpan.FromSeconds(60);
 
 		public virtual void Dispose()
 		{
 			// ensure running profiler process has chance to finish before starting next one
-			while (SelfAttach.State == SelfApiState.Active || this.IsActive || this.ProfileProcesses.Any())
-			{
-				Thread.Sleep(250);
-			}
+			while (SelfAttach.State == SelfApiState.Active || IsActive || ProfileProcesses.Any()) Thread.Sleep(250);
 		}
 
 		protected void WaitForProfilerToAttachToProcess()
@@ -59,13 +55,9 @@ protected void WaitForProfilerToAttachToProcess()
 				Thread.Sleep(timeout);
 
 				if (waitTime <= WaitTime)
-				{
 					waitTime = waitTime.Add(timeout);
-				}
 				else
-				{
 					throw new Exception($"Could not attach profiler to process after {WaitTime}");
-				}
 			}
 		}
 	}
diff --git a/src/Tests/Tests.Profiling/Framework/ProfileConfiguration.cs b/src/Tests/Tests.Profiling/Framework/ProfileConfiguration.cs
index c823a929b47..cbe68b9145b 100644
--- a/src/Tests/Tests.Profiling/Framework/ProfileConfiguration.cs
+++ b/src/Tests/Tests.Profiling/Framework/ProfileConfiguration.cs
@@ -5,7 +5,7 @@ namespace Tests.Profiling.Framework
 {
 	public class ProfileConfiguration
 	{
-		private ProfileConfiguration() {}
+		private ProfileConfiguration() { }
 
 		public IEnumerable<string> ClassNames { get; private set; }
 
@@ -16,12 +16,8 @@ public static ProfileConfiguration Parse(string[] args)
 			var classNames = new HashSet<string>();
 			var classIndex = Array.IndexOf(args, "Class");
 			if (classIndex > -1 && args.Length > classIndex + 1)
-			{
 				foreach (var className in args[classIndex + 1].Split(','))
-				{
 					classNames.Add(className);
-				}
-			}
 
 			configuration.ClassNames = classNames;
 			return configuration;
diff --git a/src/Tests/Tests.Profiling/Framework/ProfileFactory.cs b/src/Tests/Tests.Profiling/Framework/ProfileFactory.cs
index 6c6dbf2c498..4762137d2ca 100644
--- a/src/Tests/Tests.Profiling/Framework/ProfileFactory.cs
+++ b/src/Tests/Tests.Profiling/Framework/ProfileFactory.cs
@@ -15,18 +15,17 @@ protected ProfileFactory(string sdkPath,
 			string outputPath,
 			ProfilingCluster cluster,
 			Assembly assembly,
-			IColoredWriter output)
+			IColoredWriter output
+		)
 		{
-			this.Name = this.GetType().Name.Replace("ProfileFactory", string.Empty).ToLowerInvariant();
-			this.SdkPath = sdkPath;
-			this.OutputPath = Path.Combine(outputPath, this.Name);
-			this.Cluster = cluster;
-			this.Assembly = assembly;
-			this.Output = output;
+			Name = GetType().Name.Replace("ProfileFactory", string.Empty).ToLowerInvariant();
+			SdkPath = sdkPath;
+			OutputPath = Path.Combine(outputPath, Name);
+			Cluster = cluster;
+			Assembly = assembly;
+			Output = output;
 		}
 
-		private string Name { get; }
-
 		protected Assembly Assembly { get; }
 
 		protected ProfilingCluster Cluster { get; }
@@ -41,7 +40,7 @@ protected IEnumerable<ProfiledClass> ProfiledClasses
 			{
 				if (_profiledClasses == null)
 				{
-					_profiledClasses = this.Assembly
+					_profiledClasses = Assembly
 						.GetTypes()
 						.Where(t => t.GetTypeInfo().IsPublic && t.GetTypeInfo().IsClass)
 						.Where(t => t.GetMethods(BindingFlags.Instance | BindingFlags.Public)
@@ -67,72 +66,66 @@ protected IEnumerable<ProfiledClass> ProfiledClasses
 
 		protected string SdkPath { get; }
 
+		private string Name { get; }
+
 		public void Run(ProfileConfiguration configuration)
 		{
-			foreach (var profiledClass in this.ProfiledClasses
+			foreach (var profiledClass in ProfiledClasses
 				.Where(c => !configuration.ClassNames.Any() || configuration.ClassNames.Contains(c.Name))
 				.Where(c => c.Methods.Any(m => !m.IsAsync)))
 			{
-				var instance = profiledClass.CreateInstance(this.Cluster);
+				var instance = profiledClass.CreateInstance(Cluster);
 
 				if (profiledClass.SetupMethod != null)
 				{
 					var setup = profiledClass.SetupMethod.Compile(instance);
-					this.Output.WriteLine(ConsoleColor.Green, $"Running setup for {profiledClass.Type.Name}");
+					Output.WriteLine(ConsoleColor.Green, $"Running setup for {profiledClass.Type.Name}");
 					setup();
 				}
 
 				foreach (var profiledMethod in profiledClass.Methods.Where(m => !m.IsAsync))
 				{
-					var resultsDirectory = Path.Combine(this.OutputPath, profiledClass.Type.Name, profiledMethod.MethodInfo.Name);
+					var resultsDirectory = Path.Combine(OutputPath, profiledClass.Type.Name, profiledMethod.MethodInfo.Name);
 					var action = profiledMethod.Compile(instance);
 
-					this.Output.WriteLine(
+					Output.WriteLine(
 						ConsoleColor.Green,
-						$"{this.Name} profiling {profiledClass.Type.Name}.{profiledMethod.MethodInfo.Name}");
+						$"{Name} profiling {profiledClass.Type.Name}.{profiledMethod.MethodInfo.Name}");
 
-					using (this.BeginProfiling(resultsDirectory))
-					{
-						for (int i = 0; i < profiledMethod.Attribute.Iterations; i++)
-						{
+					using (BeginProfiling(resultsDirectory))
+						for (var i = 0; i < profiledMethod.Attribute.Iterations; i++)
 							action();
-						}
-					}
 				}
 			}
 		}
 
 		public async Task RunAsync(ProfileConfiguration configuration)
 		{
-			foreach (var profiledClass in this.ProfiledClasses
+			foreach (var profiledClass in ProfiledClasses
 				.Where(c => !configuration.ClassNames.Any() || configuration.ClassNames.Contains(c.Name))
 				.Where(c => c.Methods.Any(m => m.IsAsync)))
 			{
-				var instance = profiledClass.CreateInstance(this.Cluster);
+				var instance = profiledClass.CreateInstance(Cluster);
 
 				if (profiledClass.SetupMethod != null)
 				{
 					var setup = profiledClass.SetupMethod.Compile(instance);
-					this.Output.WriteLine(ConsoleColor.Green, $"Running setup for {profiledClass.Type.Name}");
+					Output.WriteLine(ConsoleColor.Green, $"Running setup for {profiledClass.Type.Name}");
 					setup();
 				}
 
 				foreach (var profiledMethod in profiledClass.Methods.Where(m => m.IsAsync))
 				{
-					var resultsDirectory = Path.Combine(this.OutputPath, profiledClass.Type.Name, profiledMethod.MethodInfo.Name);
+					var resultsDirectory = Path.Combine(OutputPath, profiledClass.Type.Name, profiledMethod.MethodInfo.Name);
 					var thunk = profiledMethod.CompileAsync(instance);
 
-					this.Output.WriteLine(
+					Output.WriteLine(
 						ConsoleColor.Green,
-						$"{this.Name} profiling {profiledClass.Type.Name}.{profiledMethod.MethodInfo.Name}");
+						$"{Name} profiling {profiledClass.Type.Name}.{profiledMethod.MethodInfo.Name}");
 
-					using (this.BeginProfiling(resultsDirectory))
-					{
-						for (int i = 0; i < profiledMethod.Attribute.Iterations; i++)
-						{
+					using (BeginProfiling(resultsDirectory))
+						for (var i = 0; i < profiledMethod.Attribute.Iterations; i++)
 							await thunk().ConfigureAwait(false);
-						}
-					}
 				}
 			}
 		}
diff --git a/src/Tests/Tests.Profiling/Framework/ProfiledClass.cs b/src/Tests/Tests.Profiling/Framework/ProfiledClass.cs
index 14dbf828440..370521496e8 100644
--- a/src/Tests/Tests.Profiling/Framework/ProfiledClass.cs
+++ b/src/Tests/Tests.Profiling/Framework/ProfiledClass.cs
@@ -9,37 +9,37 @@ public class ProfiledClass
 	{
 		private object _instance;
 
-		public string Name => this.Type.Name;
+		public ProfiledClass(Type type, ProfiledMethod setupMethod, IEnumerable<ProfiledMethod> methods)
+		{
+			Type = type;
+			Methods = methods;
+			SetupMethod = setupMethod;
+		}
 
-		public Type Type { get; set; }
+		public IEnumerable<ProfiledMethod> Methods { get; set; }
 
-		public ProfiledMethod SetupMethod { get; set; }
+		public string Name => Type.Name;
 
-		public IEnumerable<ProfiledMethod> Methods { get; set; }
+		public ProfiledMethod SetupMethod { get; set; }
 
-		public ProfiledClass(Type type, ProfiledMethod setupMethod, IEnumerable<ProfiledMethod> methods)
-		{
-			this.Type = type;
-			this.Methods = methods;
-			this.SetupMethod = setupMethod;
-		}
+		public Type Type { get; set; }
 
 		public object CreateInstance(ProfilingCluster cluster)
 		{
 			if (_instance == null)
 			{
-				var constructors = this.Type.GetTypeInfo().GetConstructors();
+				var constructors = Type.GetTypeInfo().GetConstructors();
 
 				var clusterConstructor = constructors.FirstOrDefault(c =>
 				{
 					var parameters = c.GetParameters();
 					return parameters.Length == 1 &&
-						   typeof(ProfilingCluster).IsAssignableFrom(parameters[0].ParameterType);
+						typeof(ProfilingCluster).IsAssignableFrom(parameters[0].ParameterType);
 				});
 
 				_instance = clusterConstructor != null
-					? Activator.CreateInstance(this.Type, cluster)
-					: Activator.CreateInstance(this.Type);
+					? Activator.CreateInstance(Type, cluster)
+					: Activator.CreateInstance(Type);
 			}
 
 			return _instance;
diff --git a/src/Tests/Tests.Profiling/Framework/ProfiledMethod.cs b/src/Tests/Tests.Profiling/Framework/ProfiledMethod.cs
index 02456057f18..abad4d9fc56 100644
--- a/src/Tests/Tests.Profiling/Framework/ProfiledMethod.cs
+++ b/src/Tests/Tests.Profiling/Framework/ProfiledMethod.cs
@@ -9,38 +9,32 @@ public class ProfiledMethod
 	{
 		public ProfiledMethod(MethodInfo methodInfo, ProfilingAttribute attribute)
 		{
-			this.MethodInfo = methodInfo;
-			this.Attribute = attribute;
+			MethodInfo = methodInfo;
+			Attribute = attribute;
 		}
 
-		public MethodInfo MethodInfo { get; }
-
 		public ProfilingAttribute Attribute { get; }
 
-		public bool IsAsync => this.MethodInfo.ReturnType == typeof(Task);
+		public bool IsAsync => MethodInfo.ReturnType == typeof(Task);
+
+		public MethodInfo MethodInfo { get; }
 
 		public Func<Task> CompileAsync(object instance)
 		{
-			if (this.MethodInfo.ReturnType != typeof(Task))
-			{
-				throw new ArgumentException("MethodInfo must return Task");
-			}
+			if (MethodInfo.ReturnType != typeof(Task)) throw new ArgumentException("MethodInfo must return Task");
 
 			var thisParam = Expression.Constant(instance);
-			var call = Expression.Call(thisParam, this.MethodInfo);
+			var call = Expression.Call(thisParam, MethodInfo);
 			var lambda = Expression.Lambda<Func<Task>>(call);
 			return lambda.Compile();
 		}
 
 		public Action Compile(object instance)
 		{
-			if (this.MethodInfo.ReturnType != typeof(void))
-			{
-				throw new ArgumentException("MethodInfo must return void");
-			}
+			if (MethodInfo.ReturnType != typeof(void)) throw new ArgumentException("MethodInfo must return void");
 
 			var thisParam = Expression.Constant(instance);
-			var call = Expression.Call(thisParam, this.MethodInfo);
+			var call = Expression.Call(thisParam, MethodInfo);
 			var lambda = Expression.Lambda<Action>(call);
 			return lambda.Compile();
 		}
diff --git a/src/Tests/Tests.Profiling/Framework/ProfilingCluster.cs b/src/Tests/Tests.Profiling/Framework/ProfilingCluster.cs
index b7caeb64ea6..b86af09e7df 100644
--- a/src/Tests/Tests.Profiling/Framework/ProfilingCluster.cs
+++ b/src/Tests/Tests.Profiling/Framework/ProfilingCluster.cs
@@ -5,6 +5,6 @@ namespace Tests.Profiling.Framework
 {
 	public class ProfilingCluster : ClientTestClusterBase
 	{
-		protected override void SeedCluster() => new DefaultSeeder(this.Client).SeedNodeNoData();
+		protected override void SeedCluster() => new DefaultSeeder(Client).SeedNodeNoData();
 	}
 }
diff --git a/src/Tests/Tests.Profiling/Framework/ProfilingSetupAttribute.cs b/src/Tests/Tests.Profiling/Framework/ProfilingSetupAttribute.cs
index 4d9e5dbab60..2a16ef5a9de 100644
--- a/src/Tests/Tests.Profiling/Framework/ProfilingSetupAttribute.cs
+++ b/src/Tests/Tests.Profiling/Framework/ProfilingSetupAttribute.cs
@@ -3,7 +3,5 @@
 namespace Tests.Profiling.Framework
 {
 	[AttributeUsage(AttributeTargets.Method)]
-	public class ProfilingSetupAttribute : ProfilingAttribute
-	{
-	}
+	public class ProfilingSetupAttribute : ProfilingAttribute { }
 }
diff --git a/src/Tests/Tests.Profiling/Framework/Timeline/TimelineAttribute.cs b/src/Tests/Tests.Profiling/Framework/Timeline/TimelineAttribute.cs
index 25bcdcdb02f..ba1209b0273 100644
--- a/src/Tests/Tests.Profiling/Framework/Timeline/TimelineAttribute.cs
+++ b/src/Tests/Tests.Profiling/Framework/Timeline/TimelineAttribute.cs
@@ -3,7 +3,5 @@ namespace Tests.Profiling.Framework.Timeline
 	/// <summary>
 	/// identifies a method that should be timeline profiled
 	/// </summary>
-	public class TimelineAttribute : ProfilingAttribute
-	{
-	}
+	public class TimelineAttribute : ProfilingAttribute { }
 }
diff --git a/src/Tests/Tests.Profiling/Framework/Timeline/TimelineProfile.cs b/src/Tests/Tests.Profiling/Framework/Timeline/TimelineProfile.cs
index 9e2714c80bc..6e349c16e40 100644
--- a/src/Tests/Tests.Profiling/Framework/Timeline/TimelineProfile.cs
+++ b/src/Tests/Tests.Profiling/Framework/Timeline/TimelineProfile.cs
@@ -16,12 +16,12 @@ public TimelineProfile(string sdkPath, string resultsDirectory) : base(resultsDi
 				SaveDir = resultsDirectory,
 				RedistDir = sdkPath,
 				ProfilingType = ProfilingType.Timeline,
-				ListFile = this.ListFile,
+				ListFile = ListFile,
 				SnapshotFormat = SnapshotFormat.Uncompressed
 			};
 
 			SelfAttach.Attach(saveSnapshotProfilingConfig);
-			this.WaitForProfilerToAttachToProcess();
+			WaitForProfilerToAttachToProcess();
 
 			if (TimelineProfiler.IsActive)
 				TimelineProfiler.Begin();
@@ -38,8 +38,6 @@ public override void Dispose()
 				TimelineProfiler.Detach();
 
 			base.Dispose();
-
-
 		}
 	}
 }
diff --git a/src/Tests/Tests.Profiling/Framework/Timeline/TimelineProfileFactory.cs b/src/Tests/Tests.Profiling/Framework/Timeline/TimelineProfileFactory.cs
index 0445929d59c..3d2a0aaf09a 100644
--- a/src/Tests/Tests.Profiling/Framework/Timeline/TimelineProfileFactory.cs
+++ b/src/Tests/Tests.Profiling/Framework/Timeline/TimelineProfileFactory.cs
@@ -6,9 +6,8 @@ namespace Tests.Profiling.Framework.Timeline
 	internal class TimelineProfileFactory : ProfileFactory<TimelineAttribute>
 	{
 		public TimelineProfileFactory(string sdkPath, string outputPath, ProfilingCluster cluster, Assembly assembly, IColoredWriter output)
-			: base(sdkPath, outputPath, cluster, assembly, output)
-			{ }
+			: base(sdkPath, outputPath, cluster, assembly, output) { }
 
-		protected override IDisposable BeginProfiling(string resultsDirectory) => new TimelineProfile(this.SdkPath, resultsDirectory);
+		protected override IDisposable BeginProfiling(string resultsDirectory) => new TimelineProfile(SdkPath, resultsDirectory);
 	}
 }
diff --git a/src/Tests/Tests.Profiling/ProfileProgram.cs b/src/Tests/Tests.Profiling/ProfileProgram.cs
index 2901dd67baf..09d18971e5e 100644
--- a/src/Tests/Tests.Profiling/ProfileProgram.cs
+++ b/src/Tests/Tests.Profiling/ProfileProgram.cs
@@ -12,9 +12,7 @@ namespace Tests.Profiling
 {
 	public static class Program
 	{
-
-		private static string SdkPath { get; }
-		private static string OutputPath { get; }
+		private const string SelfProfileSdkDirectory = "dottrace-selfprofile";
 
 		static Program()
 		{
@@ -27,6 +25,10 @@ static Program()
 			OutputPath = Path.Combine(sdkDir.Parent.Parent.FullName, "profiling");
 		}
 
+		private static string OutputPath { get; }
+
+		private static string SdkPath { get; }
+
 		public static int Main(string[] arguments)
 		{
 #if FEATURE_PROFILING
@@ -62,14 +64,13 @@ private static IEnumerable<IProfileFactory> CreateProfilingFactory(ProfilingClus
 			yield return new MemoryProfileFactory(SdkPath, OutputPath, cluster, Assembly.GetEntryAssembly(), new ColoredConsoleWriter());
 		}
 #endif
-
-		private const string SelfProfileSdkDirectory = "dottrace-selfprofile";
 		private static DirectoryInfo FindSelfProfileSdkDirectory(DirectoryInfo directoryInfo)
 		{
 			do
 			{
 				var sdkDir = Path.Combine(directoryInfo.FullName, "build", "tools", SelfProfileSdkDirectory);
 				if (Directory.Exists(sdkDir)) return new DirectoryInfo(sdkDir);
+
 				directoryInfo = directoryInfo.Parent;
 			} while (directoryInfo != null);
 			return null;
diff --git a/src/Tests/Tests.Profiling/ProfilingMissing.cs b/src/Tests/Tests.Profiling/ProfilingMissing.cs
index d17dc86cac3..4c04f947886 100644
--- a/src/Tests/Tests.Profiling/ProfilingMissing.cs
+++ b/src/Tests/Tests.Profiling/ProfilingMissing.cs
@@ -1,4 +1,4 @@
-using System;
+
 
 // declares the profiling attrbutes in the event that the jetBrains self host dlls have not yet been bootstrapped by our fake build
 
diff --git a/src/Tests/Tests.Reproduce/BytesResponseTests.cs b/src/Tests/Tests.Reproduce/BytesResponseTests.cs
index 027fb78008c..276e2ca2ffb 100644
--- a/src/Tests/Tests.Reproduce/BytesResponseTests.cs
+++ b/src/Tests/Tests.Reproduce/BytesResponseTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -26,7 +25,7 @@ [I] public void NonNullBytesResponse()
 
 		[I] public void NonNullBytesLowLevelResponse()
 		{
-			var settings  = new ConnectionConfiguration(new Uri($"http://localhost:{_cluster.Nodes.First().Port ?? 9200}"));
+			var settings = new ConnectionConfiguration(new Uri($"http://localhost:{_cluster.Nodes.First().Port ?? 9200}"));
 			var lowLevelClient = new ElasticLowLevelClient(settings);
 
 			var bytesResponse = lowLevelClient.Search<BytesResponse>("project", "project", PostData.Serializable(new { }));
diff --git a/src/Tests/Tests.Reproduce/ConnectionReuseAndBalancing.cs b/src/Tests/Tests.Reproduce/ConnectionReuseAndBalancing.cs
index 2081814e82d..42310b29b20 100644
--- a/src/Tests/Tests.Reproduce/ConnectionReuseAndBalancing.cs
+++ b/src/Tests/Tests.Reproduce/ConnectionReuseAndBalancing.cs
@@ -1,15 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
-using Nest;
 using FluentAssertions;
-using System.Threading;
-using System.Reactive.Linq;
-using System.Reflection;
-using Elastic.Xunit.XunitPlumbing;
+using Nest;
 using Tests.Core.ManagedElasticsearch;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
@@ -21,26 +19,25 @@ public class ConnectionReuseCluster : ClientTestClusterBase { }
 
 	public class ConnectionReuseAndBalancing : ClusterTestClassBase<ConnectionReuseCluster>
 	{
+		public ConnectionReuseAndBalancing(ConnectionReuseCluster cluster) : base(cluster) { }
 
 		private static bool IsCurlHandler { get; } =
-            #if DOTNETCORE
+#if DOTNETCORE
                 typeof(HttpClientHandler).Assembly().GetType("System.Net.Http.CurlHandler") != null;
             #else
-                 false;
-            #endif
-
-		public ConnectionReuseAndBalancing(ConnectionReuseCluster cluster) : base(cluster) { }
+			false;
+#endif
 
 		public IEnumerable<Project> MockDataGenerator(int numDocuments)
 		{
 			foreach (var i in Enumerable.Range(0, numDocuments))
-				yield return new Project {Name = $"project-{i}"};
+				yield return new Project { Name = $"project-{i}" };
 		}
 
 		[I] public async Task IndexAndSearchABunch()
 		{
 			const int requestsPerIteration = 1000;
-			var client = this.Client;
+			var client = Client;
 
 			await IndexMockData(client, requestsPerIteration);
 
@@ -84,7 +81,7 @@ private static void AssertHttpStats(IElasticClient c, INodesStatsResponse r, int
 				else
 				{
 					var m = Math.Max(2, i + 1) + 1;
-					iterationMax = ((maxCurrent * m) / 2) + leeWay;
+					iterationMax = maxCurrent * m / 2 + leeWay;
 					errorMessage =
 						$"Expected some socket bleeding but iteration {i} exceeded iteration specific max {iterationMax} = (({maxCurrent} * {m}) / 2) + {leeWay}";
 				}
@@ -100,7 +97,7 @@ private async Task IndexMockData(IElasticClient c, int requestsPerIteration)
 		{
 			var tokenSource = new CancellationTokenSource();
 			await c.DeleteIndexAsync(Index<Project>(), cancellationToken: tokenSource.Token);
-			var observableBulk = c.BulkAll(this.MockDataGenerator(100000), f => f
+			var observableBulk = c.BulkAll(MockDataGenerator(100000), f => f
 					.MaxDegreeOfParallelism(10)
 					.BackOffTime(TimeSpan.FromSeconds(10))
 					.BackOffRetries(2)
diff --git a/src/Tests/Tests.Reproduce/DateSerialization.cs b/src/Tests/Tests.Reproduce/DateSerialization.cs
index 08d0f9be3ed..b178d7e6e22 100644
--- a/src/Tests/Tests.Reproduce/DateSerialization.cs
+++ b/src/Tests/Tests.Reproduce/DateSerialization.cs
@@ -8,48 +8,48 @@
 
 namespace Tests.Reproduce
 {
-    public class DateSerialization
-    {
-        [U]
-        public void ShouldRoundtripDateTimeAndDateTimeOffsetWithSameKindAndOffset()
-        {
-            var dates = new Dates
-            {
-                DateTimeUtcKind = new DateTime(2016,1,1,1,1,1,DateTimeKind.Utc),
-                DateTimeOffset = new DateTimeOffset(1999, 1, 1, 1, 1, 1, 1, TimeSpan.FromHours(5)),
-                DateTimeOffsetUtc = new DateTimeOffset(1999, 1, 1, 1, 1, 1, 1, TimeSpan.Zero)
-            };
-
-            var client = new ElasticClient();
-            var serializedDates = client.RequestResponseSerializer.SerializeToString(dates,SerializationFormatting.None);
-
-            serializedDates.Should()
-                .Be("{\"dateTimeUtcKind\":\"2016-01-01T01:01:01Z\"," +
-                    "\"dateTimeOffset\":\"1999-01-01T01:01:01.001+05:00\"," +
-                    "\"dateTimeOffsetUtc\":\"1999-01-01T01:01:01.001+00:00\"}");
-
-            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(serializedDates)))
-            {
-                var deserializedDates = client.RequestResponseSerializer.Deserialize<Dates>(stream);
-
-                deserializedDates.DateTimeUtcKind.Should().Be(dates.DateTimeUtcKind);
-                deserializedDates.DateTimeUtcKind.Kind.Should().Be(dates.DateTimeUtcKind.Kind);
-
-                deserializedDates.DateTimeOffset.Should().Be(dates.DateTimeOffset);
-                deserializedDates.DateTimeOffset.Offset.Should().Be(dates.DateTimeOffset.Offset);
-                deserializedDates.DateTimeOffset.Date.Kind.Should().Be(dates.DateTimeOffset.Date.Kind);
+	public class DateSerialization
+	{
+		[U]
+		public void ShouldRoundtripDateTimeAndDateTimeOffsetWithSameKindAndOffset()
+		{
+			var dates = new Dates
+			{
+				DateTimeUtcKind = new DateTime(2016, 1, 1, 1, 1, 1, DateTimeKind.Utc),
+				DateTimeOffset = new DateTimeOffset(1999, 1, 1, 1, 1, 1, 1, TimeSpan.FromHours(5)),
+				DateTimeOffsetUtc = new DateTimeOffset(1999, 1, 1, 1, 1, 1, 1, TimeSpan.Zero)
+			};
+
+			var client = new ElasticClient();
+			var serializedDates = client.RequestResponseSerializer.SerializeToString(dates, SerializationFormatting.None);
+
+			serializedDates.Should()
+				.Be("{\"dateTimeUtcKind\":\"2016-01-01T01:01:01Z\"," +
+					"\"dateTimeOffset\":\"1999-01-01T01:01:01.001+05:00\"," +
+					"\"dateTimeOffsetUtc\":\"1999-01-01T01:01:01.001+00:00\"}");
+
+			using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(serializedDates)))
+			{
+				var deserializedDates = client.RequestResponseSerializer.Deserialize<Dates>(stream);
+
+				deserializedDates.DateTimeUtcKind.Should().Be(dates.DateTimeUtcKind);
+				deserializedDates.DateTimeUtcKind.Kind.Should().Be(dates.DateTimeUtcKind.Kind);
+
+				deserializedDates.DateTimeOffset.Should().Be(dates.DateTimeOffset);
+				deserializedDates.DateTimeOffset.Offset.Should().Be(dates.DateTimeOffset.Offset);
+				deserializedDates.DateTimeOffset.Date.Kind.Should().Be(dates.DateTimeOffset.Date.Kind);
 
 				deserializedDates.DateTimeOffsetUtc.Should().Be(dates.DateTimeOffsetUtc);
-                deserializedDates.DateTimeOffsetUtc.Offset.Should().Be(dates.DateTimeOffsetUtc.Offset);
-                deserializedDates.DateTimeOffsetUtc.Date.Kind.Should().Be(dates.DateTimeOffsetUtc.Date.Kind);
-            }
-        }
-
-        private class Dates
-        {
-            public DateTime DateTimeUtcKind { get; set; }
-            public DateTimeOffset DateTimeOffset { get; set; }
-            public DateTimeOffset DateTimeOffsetUtc { get; set; }
-        }
-    }
+				deserializedDates.DateTimeOffsetUtc.Offset.Should().Be(dates.DateTimeOffsetUtc.Offset);
+				deserializedDates.DateTimeOffsetUtc.Date.Kind.Should().Be(dates.DateTimeOffsetUtc.Date.Kind);
+			}
+		}
+
+		private class Dates
+		{
+			public DateTimeOffset DateTimeOffset { get; set; }
+			public DateTimeOffset DateTimeOffsetUtc { get; set; }
+			public DateTime DateTimeUtcKind { get; set; }
+		}
+	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue1901.cs b/src/Tests/Tests.Reproduce/GithubIssue1901.cs
index c5c770ae731..1c2bedbd8f2 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue1901.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue1901.cs
@@ -1,17 +1,14 @@
 using System;
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
-using Nest;
 using FluentAssertions;
-using Tests.Core;
+using Nest;
 using Tests.Core.Client;
 
 namespace Tests.Reproduce
 {
 	public class GithubIssue1901
 	{
-		private class Example { }
-
 		private const string ProxyAuthResponse = @"<html>
 <head><title>401 Authorization Required</title></head>
 <body bgcolor=""white"">
@@ -29,9 +26,9 @@ private class Example { }
 		[U] public async Task BadAuthResponseDoesNotThrowExceptionWhenAttemptingToDeserializeResponse()
 		{
 			var client = FixedResponseClient.Create(ProxyAuthResponse, 401,
-				modifySettings: s => s.SkipDeserializationForStatusCodes(401),
-				contentType: "text/html",
-				exception: new Exception("problem with the request as a result of 401")
+				s => s.SkipDeserializationForStatusCodes(401),
+				"text/html",
+				new Exception("problem with the request as a result of 401")
 			);
 			var source = await client.LowLevel.GetSourceAsync<GetResponse<Example>>("examples", "example", "1");
 			source.ApiCall.Success.Should().BeFalse();
@@ -40,14 +37,16 @@ [U] public async Task BadAuthResponseDoesNotThrowExceptionWhenAttemptingToDeseri
 		[U] public async Task BadAuthCarriesStatusCodeAndResponseBodyOverToResponse()
 		{
 			var client = FixedResponseClient.Create(ProxyAuthResponse, 401,
-				modifySettings: s => s.DisableDirectStreaming().SkipDeserializationForStatusCodes(401),
-				contentType: "text/html",
-				exception: new Exception("problem with the request as a result of 401")
+				s => s.DisableDirectStreaming().SkipDeserializationForStatusCodes(401),
+				"text/html",
+				new Exception("problem with the request as a result of 401")
 			);
 			var response = await client.LowLevel.GetAsync<GetResponse<Example>>("examples", "example", "1");
 			response.ApiCall.Success.Should().BeFalse();
 			response.ApiCall.ResponseBodyInBytes.Should().NotBeNullOrEmpty();
 			response.ApiCall.HttpStatusCode.Should().Be(401);
 		}
+
+		private class Example { }
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue1906.cs b/src/Tests/Tests.Reproduce/GithubIssue1906.cs
index dacbb397c58..698f915f84d 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue1906.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue1906.cs
@@ -1,23 +1,18 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
-using Nest;
 using FluentAssertions;
+using Nest;
 
 namespace Tests.Reproduce
 {
 	public class GithubIssue1906
 	{
-		private class ESLogEvent { }
-
 		[U] public void SearchDoesNotTakeDefaultIndexIntoAccount()
 		{
 			var node = new Uri("http://localhost:9200");
 			var connectionPool = new SingleNodeConnectionPool(node);
-			var connectionSettings = new ConnectionSettings(connectionPool, connection: new InMemoryConnection())
+			var connectionSettings = new ConnectionSettings(connectionPool, new InMemoryConnection())
 				.DefaultIndex("logstash-*")
 				.DefaultFieldNameInferrer(p => p)
 				.OnRequestCompleted(info =>
@@ -27,16 +22,17 @@ [U] public void SearchDoesNotTakeDefaultIndexIntoAccount()
 				});
 
 			var client = new ElasticClient(connectionSettings);
-			var response = client.Search<ESLogEvent>(s=>s);
+			var response = client.Search<ESLogEvent>(s => s);
 
 			response.ApiCall.Uri.AbsolutePath.Should().Be("/logstash-%2A/eslogevent/_search");
 
-			response = client.Search<ESLogEvent>(new SearchRequest<ESLogEvent>{ });
+			response = client.Search<ESLogEvent>(new SearchRequest<ESLogEvent> { });
 			response.ApiCall.Uri.AbsolutePath.Should().Be("/logstash-%2A/eslogevent/_search");
 
 			response = client.Search<ESLogEvent>(new SearchRequest { });
 			response.ApiCall.Uri.AbsolutePath.Should().Be("/_search");
-
 		}
+
+		private class ESLogEvent { }
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2052.cs b/src/Tests/Tests.Reproduce/GithubIssue2052.cs
index d68e4feabdc..7dc71361f32 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2052.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2052.cs
@@ -16,47 +16,47 @@ namespace Tests.Reproduce
 	public class GithubIssue2052
 	{
 		private const string _objectMessage = "My message";
-		private static object _bulkHeader =
-			 new { index = new { _index = "myIndex", _type = "myDocumentType" } };
+
+		private static readonly object _bulkHeader =
+			new { index = new { _index = "myIndex", _type = "myDocumentType" } };
+
 		private readonly ElasticLowLevelClient _client;
 
 		public GithubIssue2052()
 		{
 			var connectionSettings = TestClient.DisabledStreaming.ConnectionSettings;
-			this._client = new ElasticLowLevelClient(connectionSettings);
+			_client = new ElasticLowLevelClient(connectionSettings);
 		}
 
 		[U] public void SingleThrownExceptionCanBeSerializedUsingSimpleJson()
 		{
+			var ex = GimmeACaughtException();
 
-			var ex = this.GimmeACaughtException();
-
-			var request = this.CreateRequest(ex);
-			var postData = this.CreatePostData(ex);
+			var request = CreateRequest(ex);
+			var postData = CreatePostData(ex);
 
-			this.AssertRequestEquals(request, postData);
+			AssertRequestEquals(request, postData);
 		}
 
 		[U] public void MultipleThrownExceptionCanBeSerializedUsingSimpleJson()
 		{
+			var ex = GimmeAnExceptionWithInnerException();
 
-			var ex = this.GimmeAnExceptionWithInnerException();
+			var request = CreateRequest(ex);
+			var postData = CreatePostData(ex);
 
-			var request = this.CreateRequest(ex);
-			var postData = this.CreatePostData(ex);
-
-			this.AssertRequestEquals(request, postData);
+			AssertRequestEquals(request, postData);
 		}
 
 		private PostData CreatePostData(Exception e)
 		{
-			PostData postData = PostData.MultiJson(new List<object>
+			var postData = PostData.MultiJson(new List<object>
 			{
 				_bulkHeader,
 				new
 				{
 					message = "My message",
-					exception = this.ExceptionJson(e).ToArray(),
+					exception = ExceptionJson(e).ToArray(),
 				}
 			});
 			return postData;
@@ -64,8 +64,8 @@ private PostData CreatePostData(Exception e)
 
 		private IEnumerable<object> ExceptionJson(Exception e)
 		{
-			int depth = 0;
-			int maxExceptions = 20;
+			var depth = 0;
+			var maxExceptions = 20;
 			do
 			{
 #if !DOTNETCORE
@@ -104,14 +104,13 @@ private IEnumerable<object> ExceptionJson(Exception e)
 					HResult = hresult,
 					HelpURL = helpUrl,
 #if !DOTNETCORE && !__MonoCS__
-					ExceptionMethod = this.WriteStructuredExceptionMethod(exceptionMethod)
+					ExceptionMethod = WriteStructuredExceptionMethod(exceptionMethod)
 #endif
 				};
+
 				depth++;
 				e = e.InnerException;
-
-			}
-			while (depth < maxExceptions && e != null);
+			} while (depth < maxExceptions && e != null);
 		}
 
 		private object WriteStructuredExceptionMethod(string exceptionMethodString)
@@ -142,17 +141,19 @@ private object WriteStructuredExceptionMethod(string exceptionMethodString)
 
 		private string CreateRequest(Exception ex)
 		{
-			var document = new Dictionary<string, object>{
-				{ "message", _objectMessage},
+			var document = new Dictionary<string, object>
+			{
+				{ "message", _objectMessage },
 				{ "exception", ex }
 			};
 
 
-			var payload = new List<object>{
+			var payload = new List<object>
+			{
 				_bulkHeader,
 				document
 			};
-			var response = this._client.Bulk<BytesResponse>(PostData.MultiJson(payload));
+			var response = _client.Bulk<BytesResponse>(PostData.MultiJson(payload));
 
 
 			var request = Encoding.UTF8.GetString(response.RequestBodyInBytes);
@@ -163,7 +164,7 @@ private void AssertRequestEquals(string request, PostData postData)
 		{
 			using (var ms = new MemoryStream())
 			{
-				postData.Write(ms, this._client.Settings);
+				postData.Write(ms, _client.Settings);
 				var expectedString = Encoding.UTF8.GetString(ms.ToArray());
 				request.Should().Be(expectedString);
 			}
@@ -186,7 +187,7 @@ private Exception GimmeAnExceptionWithInnerException()
 		{
 			try
 			{
-				var e = this.GimmeACaughtException();
+				var e = GimmeACaughtException();
 				throw new Exception("Some exception", e);
 			}
 			catch (Exception e)
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2101.cs b/src/Tests/Tests.Reproduce/GithubIssue2101.cs
index 6be1601a83b..2fbd3df75c2 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2101.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2101.cs
@@ -1,17 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Elastic.Xunit.XunitPlumbing;
-using Elasticsearch.Net;
-using Nest;
+using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
+using Nest;
 
 namespace Tests.Reproduce
 {
 	public class GithubIssue2101
 	{
-
 		[U]
 		public void BoolClausesShouldEvaluateOnlyOnce()
 		{
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2152.cs b/src/Tests/Tests.Reproduce/GithubIssue2152.cs
index 54d08243876..129b6f5314a 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2152.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2152.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Linq;
 using System.Text;
 using Elastic.Xunit.XunitPlumbing;
@@ -58,7 +57,7 @@ public void CanDeserializeNestedBulkError()
 
 			ShouldDeserialize(firstOperation.Error);
 			ShouldDeserialize(firstOperation.Error.CausedBy);
-			ShouldDeserialize(firstOperation.Error.CausedBy.CausedBy, nullReason: true);
+			ShouldDeserialize(firstOperation.Error.CausedBy.CausedBy, true);
 			ShouldDeserialize(firstOperation.Error.CausedBy.CausedBy.CausedBy);
 		}
 
@@ -98,11 +97,11 @@ public void CanDeserializeNestedError()
 			se.Should().NotBeNull();
 			ShouldDeserialize(se.Error);
 			ShouldDeserialize(se.Error.CausedBy);
-			ShouldDeserialize(se.Error.CausedBy.CausedBy, nullReason: true);
+			ShouldDeserialize(se.Error.CausedBy.CausedBy, true);
 			ShouldDeserialize(se.Error.CausedBy.CausedBy.CausedBy);
 		}
 
-		private static void ShouldDeserialize(ErrorCause error,  bool nullReason = false)
+		private static void ShouldDeserialize(ErrorCause error, bool nullReason = false)
 		{
 			error.Should().NotBeNull();
 			error.Type.Should().NotBeNullOrEmpty();
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2173.cs b/src/Tests/Tests.Reproduce/GithubIssue2173.cs
index cbb41f67ce2..bf407d40329 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2173.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2173.cs
@@ -1,5 +1,4 @@
-using Elastic.Xunit.Sdk;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
@@ -9,16 +8,14 @@ namespace Tests.Reproduce
 	public class GithubIssue2173 : IClusterFixture<WritableCluster>
 	{
 		private readonly WritableCluster _cluster;
-		public GithubIssue2173(WritableCluster cluster)
-		{
-			_cluster = cluster;
-		}
+
+		public GithubIssue2173(WritableCluster cluster) => _cluster = cluster;
 
 		[I] public void UpdateByQueryWithInvalidScript()
 		{
 			var client = _cluster.Client;
 			var response = client.UpdateByQuery<Project>(u => u
-				.Script(ss=>ss.Source("invalid groovy").Lang("groovy"))
+				.Script(ss => ss.Source("invalid groovy").Lang("groovy"))
 			);
 			response.ShouldNotBeValid();
 		}
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2306.cs b/src/Tests/Tests.Reproduce/GithubIssue2306.cs
index 6ec4819e137..610ca32cd3e 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2306.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2306.cs
@@ -1,11 +1,9 @@
-using Elastic.Xunit.Sdk;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Xunit;
 
 namespace Tests.Reproduce
 {
@@ -13,10 +11,7 @@ public class GithubIssue2306 : IClusterFixture<ReadOnlyCluster>
 	{
 		private readonly ReadOnlyCluster _cluster;
 
-		public GithubIssue2306(ReadOnlyCluster cluster)
-		{
-			_cluster = cluster;
-		}
+		public GithubIssue2306(ReadOnlyCluster cluster) => _cluster = cluster;
 
 		[I]
 		public void DeleteNonExistentDocumentReturnsNotFound()
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2309.cs b/src/Tests/Tests.Reproduce/GithubIssue2309.cs
index e6db7d088be..97ea77e0af9 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2309.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2309.cs
@@ -53,14 +53,14 @@ public void FailedReIndexResponseMarkedAsInvalidAndContainFailures()
 			var client = new ElasticClient(settings);
 
 			var reindexResponse = client.ReindexOnServer(r => r
-					.Source(s => s
-							.Index("employees-v1")
-							.Type("employee")
-					)
-					.Destination(d => d
-							.Index("employees-v2")
-					)
-					.Conflicts(Conflicts.Proceed)
+				.Source(s => s
+					.Index("employees-v1")
+					.Type("employee")
+				)
+				.Destination(d => d
+					.Index("employees-v2")
+				)
+				.Conflicts(Conflicts.Proceed)
 			);
 
 			reindexResponse.ShouldNotBeValid();
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2323.cs b/src/Tests/Tests.Reproduce/GithubIssue2323.cs
index 1c2a2394b1b..9195b901960 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2323.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2323.cs
@@ -16,19 +16,19 @@ public GithubIssue2323(ReadOnlyCluster cluster) : base(cluster) { }
 		[I]
 		public void NestedInnerHitsShouldIncludedNestedProperty()
 		{
-			var client = this.Client;
+			var client = Client;
 			var response = client.Search<Project>(s => s
-					.Query(q => q
-							.Nested(n => n
-									.Path(p => p.Tags)
-									.Query(nq => nq
-											.MatchAll()
-									)
-									.InnerHits(i => i
-											.Source(false)
-									)
-							)
+				.Query(q => q
+					.Nested(n => n
+						.Path(p => p.Tags)
+						.Query(nq => nq
+							.MatchAll()
+						)
+						.InnerHits(i => i
+							.Source(false)
+						)
 					)
+				)
 			);
 
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2409.cs b/src/Tests/Tests.Reproduce/GithubIssue2409.cs
index 5b50c1f6670..3fccaf330a9 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2409.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2409.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Text;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
@@ -14,7 +13,8 @@ public class GithubIssue2409
 		[U]
 		public void CanDeserializeCopyTo()
 		{
-			var json = "{\"test-events-v1-201412\":{\"mappings\":{\"events\":{\"dynamic\":\"false\",\"_size\":{\"enabled\":true},\"properties\":{\"created_utc\":{\"type\":\"date\"},\"data\":{\"properties\":{\"@environment\":{\"properties\":{\"o_s_name\":{\"type\":\"text\",\"index\":false,\"copy_to\":[\"os\"]}}}}},\"id\":{\"type\":\"keyword\"},\"os\":{\"type\":\"text\",\"fields\":{\"keyword\":{\"type\":\"keyword\",\"ignore_above\":256}}}}}}},\"test-events-v1-201502\":{\"mappings\":{\"events\":{\"dynamic\":\"false\",\"_size\":{\"enabled\":true},\"properties\":{\"created_utc\":{\"type\":\"date\"},\"data\":{\"properties\":{\"@environment\":{\"properties\":{\"o_s_name\":{\"type\":\"text\",\"index\":false,\"copy_to\":[\"os\"]}}}}},\"id\":{\"type\":\"keyword\"},\"os\":{\"type\":\"text\",\"fields\":{\"keyword\":{\"type\":\"keyword\",\"ignore_above\":256}}}}}}}}";
+			var json =
+				"{\"test-events-v1-201412\":{\"mappings\":{\"events\":{\"dynamic\":\"false\",\"_size\":{\"enabled\":true},\"properties\":{\"created_utc\":{\"type\":\"date\"},\"data\":{\"properties\":{\"@environment\":{\"properties\":{\"o_s_name\":{\"type\":\"text\",\"index\":false,\"copy_to\":[\"os\"]}}}}},\"id\":{\"type\":\"keyword\"},\"os\":{\"type\":\"text\",\"fields\":{\"keyword\":{\"type\":\"keyword\",\"ignore_above\":256}}}}}}},\"test-events-v1-201502\":{\"mappings\":{\"events\":{\"dynamic\":\"false\",\"_size\":{\"enabled\":true},\"properties\":{\"created_utc\":{\"type\":\"date\"},\"data\":{\"properties\":{\"@environment\":{\"properties\":{\"o_s_name\":{\"type\":\"text\",\"index\":false,\"copy_to\":[\"os\"]}}}}},\"id\":{\"type\":\"keyword\"},\"os\":{\"type\":\"text\",\"fields\":{\"keyword\":{\"type\":\"keyword\",\"ignore_above\":256}}}}}}}}";
 
 			var pool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
 
@@ -34,15 +34,10 @@ public class CopyToVisitor : NoopMappingVisitor
 		{
 			public override void Visit(ITextProperty property)
 			{
-				if (property.Name == "o_s_name")
-				{
-					property.CopyTo.Should().NotBeNull();
-				}
+				if (property.Name == "o_s_name") property.CopyTo.Should().NotBeNull();
 			}
 		}
 
-		public class Events
-		{
-		}
+		public class Events { }
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2503.cs b/src/Tests/Tests.Reproduce/GithubIssue2503.cs
index 0aabb0850fa..b255e56a193 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2503.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2503.cs
@@ -1,6 +1,4 @@
-using System.IO;
-using System.Text;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using static Tests.Core.Serialization.SerializationTestHelper;
@@ -9,23 +7,22 @@ namespace Tests.Reproduce
 {
 	public class GithubIssue2503
 	{
-		[U] public void DeserializeTermsIncludeExcludeValues()
-		{
-			Expect(new
+		[U] public void DeserializeTermsIncludeExcludeValues() => Expect(new
 			{
 				aggs = new
 				{
 					sizes = new
 					{
-						terms =  new
+						terms = new
 						{
-							field= "size",
-							size= 20,
-							include= new [] { "35", "50", "70", "75", "100" }
+							field = "size",
+							size = 20,
+							include = new[] { "35", "50", "70", "75", "100" }
 						}
 					}
 				}
-			}).DeserializesTo<SearchRequest>((message, request) =>
+			})
+			.DeserializesTo<SearchRequest>((message, request) =>
 			{
 				request.Should().NotBeNull(message);
 				request.Aggregations.Should().NotBeNull(message).And.HaveCount(1, message);
@@ -34,11 +31,8 @@ [U] public void DeserializeTermsIncludeExcludeValues()
 				termsAggregation.Include.Should().NotBeNull(message);
 				termsAggregation.Include.Values.Should().NotBeNull(message).And.HaveCount(5, message);
 			});
-		}
 
-		[U] public void DeserializeTermsIncludeExcludePattern()
-		{
-			Expect(@"{
+		[U] public void DeserializeTermsIncludeExcludePattern() => Expect(@"{
 			  ""aggs"": {
 				""sizes"": {
 				  ""terms"": {
@@ -48,7 +42,8 @@ [U] public void DeserializeTermsIncludeExcludePattern()
 				  }
 				}
 			  }
-			}").DeserializesTo<SearchRequest>((message, request) =>
+			}")
+			.DeserializesTo<SearchRequest>((message, request) =>
 			{
 				request.Should().NotBeNull(message);
 				request.Aggregations.Should().NotBeNull(message).And.HaveCount(1, message);
@@ -57,6 +52,5 @@ [U] public void DeserializeTermsIncludeExcludePattern()
 				termsAggregation.Include.Should().NotBeNull(message);
 				termsAggregation.Include.Pattern.Should().NotBeNull(message);
 			});
-		}
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2690.cs b/src/Tests/Tests.Reproduce/GithubIssue2690.cs
index 031e2e9134d..7b3a949664d 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2690.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2690.cs
@@ -1,5 +1,4 @@
 using Elastic.Xunit.XunitPlumbing;
-using FluentAssertions;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
 
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2788.cs b/src/Tests/Tests.Reproduce/GithubIssue2788.cs
index c94e142db31..66b7bc8bb3a 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2788.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2788.cs
@@ -1,14 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
-using FluentAssertions.Common;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Reproduce
 {
@@ -16,24 +12,7 @@ public class GithubIssue2788 : IClusterFixture<WritableCluster>
 	{
 		private readonly WritableCluster _cluster;
 
-		public GithubIssue2788(WritableCluster cluster)
-		{
-			_cluster = cluster;
-		}
-
-		// sample mapping with nested objects with TimeSpan field
-		class Root
-		{
-			[Nested]
-			public Child[] Children { get; set; }
-		}
-
-		class Child
-		{
-			public TimeSpan StartTime { get; set; }
-
-			public TimeSpan EndTime { get; set; }
-		}
+		public GithubIssue2788(WritableCluster cluster) => _cluster = cluster;
 
 		public void CanDeserializeNumberToTimeSpanInInnerHits()
 		{
@@ -53,19 +32,18 @@ public void CanDeserializeNumberToTimeSpanInInnerHits()
 			var endTime = new TimeSpan(2, 3, 4);
 
 			client.Index(new Root
-			{
-				Children = new[]
 				{
-					new Child
+					Children = new[]
 					{
-						StartTime = startTime,
-						EndTime = endTime
-
+						new Child
+						{
+							StartTime = startTime,
+							EndTime = endTime
+						}
 					}
-				}
-			}, index => index
-				.Index(indexName)
-				.Refresh(Refresh.WaitFor)
+				}, index => index
+					.Index(indexName)
+					.Refresh(Refresh.WaitFor)
 			);
 
 			var result = client.Search<Root>(search => search
@@ -87,5 +65,18 @@ public void CanDeserializeNumberToTimeSpanInInnerHits()
 			child.StartTime.Should().Be(startTime);
 			child.EndTime.Should().Be(endTime);
 		}
+
+		// sample mapping with nested objects with TimeSpan field
+		private class Root
+		{
+			[Nested]
+			public Child[] Children { get; set; }
+		}
+
+		private class Child
+		{
+			public TimeSpan EndTime { get; set; }
+			public TimeSpan StartTime { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2871.cs b/src/Tests/Tests.Reproduce/GithubIssue2871.cs
index 72baf0ab3c8..b9305f842eb 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2871.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2871.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Linq;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -8,7 +6,6 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Xunit;
 
 namespace Tests.Reproduce
 {
@@ -26,7 +23,7 @@ public void IsValidFalseAndDeserializedErrorsWhenMultiGetDocHasErrors()
 			var alias = "my_alias";
 			var client = _cluster.Client;
 
-			client.CreateIndex(index1, c=> c
+			client.CreateIndex(index1, c => c
 				.Mappings(m => m
 					.Map<Project>(mm => mm
 						.AutoMap()
@@ -67,9 +64,10 @@ public void IsValidFalseAndDeserializedErrorsWhenMultiGetDocHasErrors()
 
 			var multiGetRequest = new MultiGetRequest
 			{
-				Documents = new[] {
-					new MultiGetOperation<Project>("project1") {Index = alias },
-					new MultiGetOperation<Project>("project2") {Index = alias }
+				Documents = new[]
+				{
+					new MultiGetOperation<Project>("project1") { Index = alias },
+					new MultiGetOperation<Project>("project2") { Index = alias }
 				}
 			};
 
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2875.cs b/src/Tests/Tests.Reproduce/GithubIssue2875.cs
index 13225ee143d..dcfdd60f611 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2875.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2875.cs
@@ -7,23 +7,20 @@ namespace Tests.Reproduce
 {
 	public class GithubIssue2875
 	{
-
-		[U] public void ReusingQueryDescriptorOutSideOfSelector()
-		{
-			Expect(new
+		[U] public void ReusingQueryDescriptorOutSideOfSelector() => Expect(new
 			{
-				query = new {
+				query = new
+				{
 					@bool = new
 					{
-						must = new []
+						must = new[]
 						{
-							new  { term = new { field = new { value = "value" } }}
+							new { term = new { field = new { value = "value" } } }
 						}
-
 					}
 				}
-			}).FromRequest(ReuseQueryDescriptorUnexpected);
-		}
+			})
+			.FromRequest(ReuseQueryDescriptorUnexpected);
 
 		private static ISearchResponse<Project> ReuseQueryDescriptorUnexpected(IElasticClient client) => client.Search<Project>(s => s
 			.Query(q => q
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2886.cs b/src/Tests/Tests.Reproduce/GithubIssue2886.cs
index f339a52f1d2..0972abb576a 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2886.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2886.cs
@@ -1,4 +1,3 @@
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
diff --git a/src/Tests/Tests.Reproduce/GithubIssue2985.cs b/src/Tests/Tests.Reproduce/GithubIssue2985.cs
index fa7d6920171..0907c9706b5 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue2985.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue2985.cs
@@ -1,5 +1,4 @@
 using System;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -20,11 +19,11 @@ public void BadRequestErrorShouldBeWrappedInElasticsearchClientException()
 		{
 			var client = _cluster.Client;
 			var index = $"gh2985-{RandomString()}";
-			var response = client.CreateIndex(index, i=> i
-				.Settings(s=>s
-					.Analysis(a=>a
-						.Analyzers(an=>an
-							.Custom("custom", c=>c.Filters("ascii_folding").Tokenizer("standard"))
+			var response = client.CreateIndex(index, i => i
+				.Settings(s => s
+					.Analysis(a => a
+						.Analyzers(an => an
+							.Custom("custom", c => c.Filters("ascii_folding").Tokenizer("standard"))
 						)
 					)
 				)
diff --git a/src/Tests/Tests.Reproduce/GithubIssue3084.cs b/src/Tests/Tests.Reproduce/GithubIssue3084.cs
index c4f9bf91b31..9a7d9f9bb4b 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue3084.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue3084.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
@@ -17,32 +16,33 @@ public class GithubIssue3084 : IClusterFixture<WritableCluster>
 
 		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
 
-		public class ObjectVersion1
-		{
-			public int Id { get; set; }
-			public double Numeric { get; set; }
-		}
-		public class ObjectVersion2
-		{
-			public int Id { get; set; }
-			public int Numeric { get; set; }
-		}
-
 		[I]
 		public void DeserializeErrorIsTheSameForAsync()
 		{
 			var client = _cluster.Client;
 			var index = $"gh3084-{RandomString()}";
-			var document = new ObjectVersion1 {Id = 1, Numeric = 0};
+			var document = new ObjectVersion1 { Id = 1, Numeric = 0 };
 
 			var indexResult = client.Index(document, i => i.Index(index).Type("doc"));
 			indexResult.ShouldBeValid();
 
-			Action getDoc = () =>client.Get<ObjectVersion2>(new GetRequest(index, "doc", 1));
+			Action getDoc = () => client.Get<ObjectVersion2>(new GetRequest(index, "doc", 1));
 			Func<Task<IGetResponse<ObjectVersion2>>> getDocAsync = async () => await client.GetAsync<ObjectVersion2>(new GetRequest(index, "doc", 1));
 
 			getDoc.ShouldThrow<Exception>("synchonous code path should throw");
 			getDocAsync.ShouldThrow<Exception>("async code path should throw");
 		}
+
+		public class ObjectVersion1
+		{
+			public int Id { get; set; }
+			public double Numeric { get; set; }
+		}
+
+		public class ObjectVersion2
+		{
+			public int Id { get; set; }
+			public int Numeric { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue3107.cs b/src/Tests/Tests.Reproduce/GithubIssue3107.cs
index 5fdb55688ea..a1526204a96 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue3107.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue3107.cs
@@ -39,11 +39,11 @@ [U] public void FieldResolverRespectsDataMemberAttributes()
 		[DataContract(Name = "source_entity")]
 		public class SourceEntity
 		{
-			[DataMember(Name = "name")]
-			public string Name { get; set; }
-
 			[DataMember(Name = "display_name")]
 			public string DisplayName { get; set; }
+
+			[DataMember(Name = "name")]
+			public string Name { get; set; }
 		}
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue3164.cs b/src/Tests/Tests.Reproduce/GithubIssue3164.cs
index 630eff0f67f..911e6c7d285 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue3164.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue3164.cs
@@ -53,29 +53,24 @@ public void SerializerRespectsDateTimeValuesFromElasticsearch()
 		public sealed class CustomSerializer : ConnectionSettingsAwareSerializerBase
 		{
 			public CustomSerializer(IElasticsearchSerializer builtinSerializer, IConnectionSettingsValues connectionSettings)
-				: base(builtinSerializer, connectionSettings)
-			{
-			}
+				: base(builtinSerializer, connectionSettings) { }
 
-			protected override JsonSerializerSettings CreateJsonSerializerSettings()
+			protected override JsonSerializerSettings CreateJsonSerializerSettings() => new JsonSerializerSettings
 			{
-				return new JsonSerializerSettings
-				{
-					DateFormatHandling = DateFormatHandling.IsoDateFormat,
-					DateParseHandling = DateParseHandling.DateTimeOffset,
-					DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind,
-					Formatting = Formatting.Indented
-				};
-			}
+				DateFormatHandling = DateFormatHandling.IsoDateFormat,
+				DateParseHandling = DateParseHandling.DateTimeOffset,
+				DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind,
+				Formatting = Formatting.Indented
+			};
 		}
 
 		private class Dates
 		{
 			public DateTime DateTimeLocal { get; set; }
-			public DateTime DateTimeUnspecified { get; set; }
-			public DateTime DateTimeUtc { get; set; }
 			public DateTimeOffset DateTimeOffset { get; set; }
 			public DateTimeOffset DateTimeOffsetUtc { get; set; }
+			public DateTime DateTimeUnspecified { get; set; }
+			public DateTime DateTimeUtc { get; set; }
 		}
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/GithubIssue3210.cs b/src/Tests/Tests.Reproduce/GithubIssue3210.cs
index 0c6c2c2d417..d5aca2f9743 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue3210.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue3210.cs
@@ -1,8 +1,7 @@
 using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
-using Nest;
 using FluentAssertions;
-using Tests.Core;
+using Nest;
 using Tests.Core.Client;
 
 namespace Tests.Reproduce
diff --git a/src/Tests/Tests.Reproduce/GithubIssue3220.cs b/src/Tests/Tests.Reproduce/GithubIssue3220.cs
index 06cb615f144..c7de8fa467f 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue3220.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue3220.cs
@@ -12,7 +12,10 @@ [U] public void CanExplicitCastTimeFromString()
 		{
 			var searchRequest = new SearchRequest<Project> { Scroll = "1s" };
 
-			Action getScroll = () => { var scroll = searchRequest.Scroll; };
+			Action getScroll = () =>
+			{
+				var scroll = searchRequest.Scroll;
+			};
 
 			getScroll.ShouldThrow<Exception>();
 			//getScroll.ShouldNotThrow();
diff --git a/src/Tests/Tests.Reproduce/GithubIssue3231.cs b/src/Tests/Tests.Reproduce/GithubIssue3231.cs
index 7f4c015c75b..1a8db9fd9e2 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue3231.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue3231.cs
@@ -1,11 +1,10 @@
-using Elasticsearch.Net;
-using FluentAssertions;
-using System;
+using System;
 using Elastic.Xunit.XunitPlumbing;
+using Elasticsearch.Net;
+using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Reproduce
 {
diff --git a/src/Tests/Tests.Reproduce/GithubIssue3412.cs b/src/Tests/Tests.Reproduce/GithubIssue3412.cs
index 270ad59b7fb..7bcb2b22889 100644
--- a/src/Tests/Tests.Reproduce/GithubIssue3412.cs
+++ b/src/Tests/Tests.Reproduce/GithubIssue3412.cs
@@ -1,6 +1,6 @@
-using FluentAssertions;
-using System.Linq;
+using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
+using FluentAssertions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 
@@ -21,7 +21,7 @@ public void WildcardBeingEscapedHasNoBarringsOnResult()
 			var search = _cluster.Client.Search<Project>(s => s.Index("prefixed-*"));
 			search.Total.Should().Be(2);
 			var queriedIndices = search.Hits.Select(h => h.Index).ToArray();
-			queriedIndices.Should().BeEquivalentTo(new[] {"prefixed-1", "prefixed-2"});
+			queriedIndices.Should().BeEquivalentTo(new[] { "prefixed-1", "prefixed-2" });
 		}
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/JsonNetSerializerConverters.cs b/src/Tests/Tests.Reproduce/JsonNetSerializerConverters.cs
index a09f4468c67..52d7c6d2694 100644
--- a/src/Tests/Tests.Reproduce/JsonNetSerializerConverters.cs
+++ b/src/Tests/Tests.Reproduce/JsonNetSerializerConverters.cs
@@ -14,6 +14,11 @@ namespace Tests.Reproduce
 	// from https://stackoverflow.com/questions/49224866/elasticsearch-nest-6-storing-enums-as-string
 	public class JsonNetSerializerConverters
 	{
+		public enum ProductType
+		{
+			Example
+		}
+
 		[U] public void JsonConvertersInJsonSerializerSettingsAreHonoured()
 		{
 			var pool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
@@ -34,10 +39,5 @@ public class Product
 		{
 			public ProductType ProductType { get; set; }
 		}
-
-		public enum ProductType
-		{
-			Example
-		}
 	}
 }
diff --git a/src/Tests/Tests.Reproduce/XunitBootstrap.cs b/src/Tests/Tests.Reproduce/XunitBootstrap.cs
index 8693f395b46..adbb931d6dd 100644
--- a/src/Tests/Tests.Reproduce/XunitBootstrap.cs
+++ b/src/Tests/Tests.Reproduce/XunitBootstrap.cs
@@ -1,5 +1,6 @@
 using Elastic.Xunit;
 using Tests.Core.Xunit;
+using Xunit;
 
-[assembly: Xunit.TestFrameworkAttribute("Elastic.Xunit.Sdk.ElasticTestFramework", "Elastic.Xunit")]
+[assembly: TestFramework("Elastic.Xunit.Sdk.ElasticTestFramework", "Elastic.Xunit")]
 [assembly: ElasticXunitConfiguration(typeof(NestXunitRunOptions))]
diff --git a/src/Tests/Tests.ScratchPad/DoNothingRunner.cs b/src/Tests/Tests.ScratchPad/DoNothingRunner.cs
index 8e6d160267e..c069618f8a8 100644
--- a/src/Tests/Tests.ScratchPad/DoNothingRunner.cs
+++ b/src/Tests/Tests.ScratchPad/DoNothingRunner.cs
@@ -4,6 +4,6 @@ public class DoNothingRunner : RunBase
 	{
 		protected override int LoopCount => 100_000_000;
 
-		protected override RoutineBase Routine() => this.Loop(() => 1, (c, f) => { });
+		protected override RoutineBase Routine() => Loop(() => 1, (c, f) => { });
 	}
 }
diff --git a/src/Tests/Tests.ScratchPad/Program.cs b/src/Tests/Tests.ScratchPad/Program.cs
index da659913dde..abdd6c3545d 100644
--- a/src/Tests/Tests.ScratchPad/Program.cs
+++ b/src/Tests/Tests.ScratchPad/Program.cs
@@ -5,37 +5,22 @@ namespace Tests.ScratchPad
 {
 	public class Program
 	{
-		static void Main(string[] args)
-		{
-			//Use Bench<>() to Benchmark using BanchmarkDotNet
-			//Use Run<>() to execture the loop (handy for profilers), this will call create for each itteration
-			//Use RunCreateOnce<>() to do the same but call create once before the loop.
-
-			Run<PropertyNameInferenceRunner>();
-
-
-			//Run(ResolveSomeIds);
-			//RunCreateOnce(ResolveSomePropertyNames);
-			//Run(ResolveSomeFieldsx);
-			//Run(CreateSomeExpressions);
-			//Run(DoNothing);
-		}
+		private static void Main(string[] args) => Run<PropertyNameInferenceRunner>();
 
-		static void Bench<TBenchmark>() where TBenchmark : RunBase => BenchmarkRunner.Run<TBenchmark>();
+		private static void Bench<TBenchmark>() where TBenchmark : RunBase => BenchmarkRunner.Run<TBenchmark>();
 
-		static void Run<TRun>() where TRun : RunBase, new()
+		private static void Run<TRun>() where TRun : RunBase, new()
 		{
 			var runner = new TRun { IsNotBenchmark = true };
 			runner.GlobalSetup();
 			runner.Run();
 		}
-		static void RunCreateOnce<TRun>() where TRun : RunBase, new()
+
+		private static void RunCreateOnce<TRun>() where TRun : RunBase, new()
 		{
 			var runner = new TRun { IsNotBenchmark = true };
 			runner.GlobalSetup();
 			runner.RunCreateOnce();
 		}
-
-
 	}
 }
diff --git a/src/Tests/Tests.ScratchPad/RunBase.cs b/src/Tests/Tests.ScratchPad/RunBase.cs
index c7ce3db97ed..da35c3a7ede 100644
--- a/src/Tests/Tests.ScratchPad/RunBase.cs
+++ b/src/Tests/Tests.ScratchPad/RunBase.cs
@@ -8,42 +8,39 @@
 
 namespace Tests.ScratchPad
 {
-	[SimpleJob(RunStrategy.Throughput, launchCount: 2, warmupCount: 2, targetCount: 5, id: "BenchmarkRun")]
+	[SimpleJob(RunStrategy.Throughput, 2, 2, 5, id: "BenchmarkRun")]
 	[MemoryDiagnoser]
 	public abstract class RunBase
 	{
-		protected virtual int LoopCount => 100_000;
+		private Action<IElasticClient> _run;
+		private Action<IElasticClient> _runOnce;
 		public bool IsNotBenchmark { get; set; }
 
 		protected virtual IElasticClient Client { get; } = TestClient.DefaultInMemoryClient;
-		private Action<IElasticClient> _run;
-		private Action<IElasticClient> _runOnce;
+		protected virtual int LoopCount => 100_000;
 
 		[GlobalSetup]
 		public void GlobalSetup()
 		{
-			var r = this.Routine();
-			_run = r.Bind(cacheCreate: false);
-			_runOnce = r.Bind(cacheCreate: true);
+			var r = Routine();
+			_run = r.Bind(false);
+			_runOnce = r.Bind(true);
 		}
 
 		protected abstract RoutineBase Routine();
 
 		[Benchmark]
-		public void Run() => _run(this.Client);
+		public void Run() => _run(Client);
 
 		[Benchmark]
-		public void RunCreateOnce() => _runOnce(this.Client);
+		public void RunCreateOnce() => _runOnce(Client);
 
-		protected LoopRoutine<T> Loop<T>(Func<T> create, Action<IElasticClient, T> act)
-		{
-			return new LoopRoutine<T>(create, act, this.LoopCount, this.IsNotBenchmark);
-		}
+		protected LoopRoutine<T> Loop<T>(Func<T> create, Action<IElasticClient, T> act) => new LoopRoutine<T>(create, act, LoopCount, IsNotBenchmark);
 
 		protected class LoopRoutine<T> : RunRoutine<T>
 		{
-			private readonly int _loopCount;
 			private readonly bool _isNotBenchmark;
+			private readonly int _loopCount;
 
 			public LoopRoutine(Func<T> create, Action<IElasticClient, T> act, int loopCount, bool isNotBenchmark) : base(create, act)
 			{
@@ -53,24 +50,26 @@ public LoopRoutine(Func<T> create, Action<IElasticClient, T> act, int loopCount,
 
 			public override Action<IElasticClient> Bind(bool cacheCreate)
 			{
-				var instantiator = !cacheCreate ? this.Create : this.CreateCached;
+				var instantiator = !cacheCreate ? Create : CreateCached;
 				var limit = _loopCount * (_isNotBenchmark ? 10 : 1);
-				if (!this._isNotBenchmark) // !!
+				if (!_isNotBenchmark) // !!
+				{
 					return c =>
 					{
-						this.Act(c, instantiator());
-						for (var i = 0; i < limit; i++) this.Act(c, instantiator());
+						Act(c, instantiator());
+						for (var i = 0; i < limit; i++) Act(c, instantiator());
 					};
+				}
 
 				return c =>
 				{
 					var sw = Stopwatch.StartNew();
 
-					this.Act(c, instantiator());
-					for (var i = 0; i < limit; i++) this.Act(c, instantiator());
+					Act(c, instantiator());
+					for (var i = 0; i < limit; i++) Act(c, instantiator());
 
 					var elapsed = sw.Elapsed;
-					var perOp = elapsed.TotalMilliseconds / (double) limit + 1;
+					var perOp = elapsed.TotalMilliseconds / (double)limit + 1;
 					var messagesPerSecond = TimeSpan.FromSeconds(1).TotalMilliseconds / perOp;
 					Console.WriteLine($"Done {limit:N0} iterations in {elapsed}. ({messagesPerSecond:N2}/s)");
 				};
@@ -82,15 +81,15 @@ protected abstract class RunRoutine<T> : RoutineBase
 		{
 			protected RunRoutine(Func<T> create, Action<IElasticClient, T> act)
 			{
-				this.Create = create;
-				this.Act = act;
-				var lazy = new Lazy<T>(this.Create, LazyThreadSafetyMode.ExecutionAndPublication);
-				this.CreateCached = () => lazy.Value;
+				Create = create;
+				Act = act;
+				var lazy = new Lazy<T>(Create, LazyThreadSafetyMode.ExecutionAndPublication);
+				CreateCached = () => lazy.Value;
 			}
-			protected Func<T> Create { get; }
+
 			protected Action<IElasticClient, T> Act { get; }
+			protected Func<T> Create { get; }
 			protected Func<T> CreateCached { get; }
-
 		}
 
 		protected abstract class RoutineBase
diff --git a/src/Tests/Tests.ScratchPad/Runners/ApiCalls/IndexDocumentRunner.cs b/src/Tests/Tests.ScratchPad/Runners/ApiCalls/IndexDocumentRunner.cs
index 8f6f9eae2f8..847ba91ab42 100644
--- a/src/Tests/Tests.ScratchPad/Runners/ApiCalls/IndexDocumentRunner.cs
+++ b/src/Tests/Tests.ScratchPad/Runners/ApiCalls/IndexDocumentRunner.cs
@@ -6,6 +6,6 @@ public class IndexDocumentRunner : RunBase
 	{
 		protected override int LoopCount => 10_000;
 
-		protected override RoutineBase Routine() => this.Loop(() => new Project {Name = "x"}, (c, d) => c.IndexDocument(d));
+		protected override RoutineBase Routine() => Loop(() => new Project { Name = "x" }, (c, d) => c.IndexDocument(d));
 	}
 }
diff --git a/src/Tests/Tests.ScratchPad/Runners/Inferrence/ExpressionCreationRunner.cs b/src/Tests/Tests.ScratchPad/Runners/Inferrence/ExpressionCreationRunner.cs
index 0a45a3f3c9b..8a2f0bc32b2 100644
--- a/src/Tests/Tests.ScratchPad/Runners/Inferrence/ExpressionCreationRunner.cs
+++ b/src/Tests/Tests.ScratchPad/Runners/Inferrence/ExpressionCreationRunner.cs
@@ -8,6 +8,6 @@ public class ExpressionCreationRunner : RunBase
 	{
 		private static Expression<Func<T, object>> Exp<T>(Expression<Func<T, object>> exp) => exp;
 
-		protected override RoutineBase Routine() => this.Loop(() => Exp<Project>(p => p.LeadDeveloper.FirstName), (c, f) => { });
+		protected override RoutineBase Routine() => Loop(() => Exp<Project>(p => p.LeadDeveloper.FirstName), (c, f) => { });
 	}
 }
diff --git a/src/Tests/Tests.ScratchPad/Runners/Inferrence/FieldInferenceRunner.cs b/src/Tests/Tests.ScratchPad/Runners/Inferrence/FieldInferenceRunner.cs
index ffda6dba879..6a1b4dcdf02 100644
--- a/src/Tests/Tests.ScratchPad/Runners/Inferrence/FieldInferenceRunner.cs
+++ b/src/Tests/Tests.ScratchPad/Runners/Inferrence/FieldInferenceRunner.cs
@@ -7,6 +7,6 @@ public class FieldInferenceRunner : RunBase
 	{
 		protected override int LoopCount => 1_000_000;
 
-		protected override RoutineBase Routine() => this.Loop(() => Infer.Field<Project>(p => p.LeadDeveloper.LastName), (c, f) => c.Infer.Field(f));
+		protected override RoutineBase Routine() => Loop(() => Infer.Field<Project>(p => p.LeadDeveloper.LastName), (c, f) => c.Infer.Field(f));
 	}
 }
diff --git a/src/Tests/Tests.ScratchPad/Runners/Inferrence/IdInferenceRunner.cs b/src/Tests/Tests.ScratchPad/Runners/Inferrence/IdInferenceRunner.cs
index 45df4a1809f..86a4da92bac 100644
--- a/src/Tests/Tests.ScratchPad/Runners/Inferrence/IdInferenceRunner.cs
+++ b/src/Tests/Tests.ScratchPad/Runners/Inferrence/IdInferenceRunner.cs
@@ -7,6 +7,6 @@ public class IdInferenceRunner : RunBase
 	{
 		protected override int LoopCount => 1_000_000;
 
-		protected override RoutineBase Routine() => this.Loop(() => Infer.Id(new Project {Name = "x"}), (c, f) => c.Infer.Id(f));
+		protected override RoutineBase Routine() => Loop(() => Infer.Id(new Project { Name = "x" }), (c, f) => c.Infer.Id(f));
 	}
 }
diff --git a/src/Tests/Tests.ScratchPad/Runners/Inferrence/PropertyNameInferenceRunner.cs b/src/Tests/Tests.ScratchPad/Runners/Inferrence/PropertyNameInferenceRunner.cs
index bea2ed6f424..a6134f99b38 100644
--- a/src/Tests/Tests.ScratchPad/Runners/Inferrence/PropertyNameInferenceRunner.cs
+++ b/src/Tests/Tests.ScratchPad/Runners/Inferrence/PropertyNameInferenceRunner.cs
@@ -6,9 +6,9 @@ namespace Tests.ScratchPad.Runners.Inferrence
 	public class PropertyNameInferenceRunner : RunBase
 	{
 		protected override RoutineBase Routine() =>
-			this.Loop(
-				create:() => Infer.Property<Project>(p => p.LeadDeveloper.FirstName),
-				act: (c, f) => c.Infer.PropertyName(f)
+			Loop(
+				() => Infer.Property<Project>(p => p.LeadDeveloper.FirstName),
+				(c, f) => c.Infer.PropertyName(f)
 			);
 	}
 }
diff --git a/src/Tests/Tests/Aggregations/AggregationMetaUsageTests.cs b/src/Tests/Tests/Aggregations/AggregationMetaUsageTests.cs
index bac9c79626c..4650d23294b 100644
--- a/src/Tests/Tests/Aggregations/AggregationMetaUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/AggregationMetaUsageTests.cs
@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations
 {
@@ -52,7 +49,7 @@ public AggregationMetaUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(
 		protected override AggregationDictionary InitializerAggs =>
 			new MinAggregation("min_last_activity", Infer.Field<Project>(p => p.LastActivity))
 			{
-				Meta = new Dictionary<string,object>
+				Meta = new Dictionary<string, object>
 				{
 					{ "meta_1", "value_1" },
 					{ "meta_2", 2 },
diff --git a/src/Tests/Tests/Aggregations/AggregationUsageTestBase.cs b/src/Tests/Tests/Aggregations/AggregationUsageTestBase.cs
index 3953e1806fd..701d058570c 100644
--- a/src/Tests/Tests/Aggregations/AggregationUsageTestBase.cs
+++ b/src/Tests/Tests/Aggregations/AggregationUsageTestBase.cs
@@ -18,35 +18,31 @@ public abstract class AggregationUsageTestBase
 	{
 		protected AggregationUsageTestBase(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		// https://youtrack.jetbrains.com/issue/RIDER-19912
-		[U] protected override Task HitsTheCorrectUrl() => base.HitsTheCorrectUrl();
-
-		[U] protected override Task UsesCorrectHttpMethod() => base.UsesCorrectHttpMethod();
+		protected virtual Nest.Indices AgainstIndex { get; } = Index<Project>();
 
-		[U] protected override void SerializesInitializer() => base.SerializesInitializer();
+		protected abstract object AggregationJson { get; }
 
-		[U] protected override void SerializesFluent() => base.SerializesFluent();
-
-		[I] public override Task ReturnsExpectedStatusCode() => base.ReturnsExpectedResponse();
+		protected override bool ExpectIsValid => true;
 
-		[I] public override Task ReturnsExpectedIsValid() => base.ReturnsExpectedIsValid();
+		protected sealed override object ExpectJson => QueryScopeJson == null
+			? (object)new { size = 0, aggs = AggregationJson }
+			: new { size = 0, aggs = AggregationJson, query = QueryScopeJson };
 
-		[I] public override Task ReturnsExpectedResponse() => base.ReturnsExpectedResponse();
+		protected override int ExpectStatusCode => 200;
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Search<Project>(f),
-			fluentAsync: (client, f) => client.SearchAsync<Project>(f),
-			request: (client, r) => client.Search<Project>(r),
-			requestAsync: (client, r) => client.SearchAsync<Project>(r)
-		);
+		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.Size(0)
+			.Index(AgainstIndex)
+			.Type<Project>()
+			.TypedKeys(TestClient.Configuration.Random.TypedKeys)
+			.Query(q => QueryScope)
+			.Aggregations(FluentAggs);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
+		protected abstract Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs { get; }
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/_search";
 
 		protected override SearchRequest<Project> Initializer =>
-			new SearchRequest<Project>(this.AgainstIndex, Type<Project>())
+			new SearchRequest<Project>(AgainstIndex, Type<Project>())
 			{
 				Query = QueryScope,
 				Size = 0,
@@ -54,38 +50,42 @@ protected override LazyResponses ClientUsage() => Calls(
 				Aggregations = InitializerAggs
 			};
 
+		protected abstract AggregationDictionary InitializerAggs { get; }
+
 		protected virtual QueryContainer QueryScope { get; }
 
 		protected virtual object QueryScopeJson { get; }
+		protected override string UrlPath => $"/project/doc/_search";
 
-		protected virtual Nest.Indices AgainstIndex { get; } = Index<Project>();
+		// https://youtrack.jetbrains.com/issue/RIDER-19912
+		[U] protected override Task HitsTheCorrectUrl() => base.HitsTheCorrectUrl();
 
-		protected abstract AggregationDictionary InitializerAggs { get; }
+		[U] protected override Task UsesCorrectHttpMethod() => base.UsesCorrectHttpMethod();
 
-		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-			.Size(0)
-			.Index(AgainstIndex)
-			.Type<Project>()
-			.TypedKeys(TestClient.Configuration.Random.TypedKeys)
-			.Query(q=> QueryScope)
-			.Aggregations(this.FluentAggs);
+		[U] protected override void SerializesInitializer() => base.SerializesInitializer();
 
-		protected abstract Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs { get; }
+		[U] protected override void SerializesFluent() => base.SerializesFluent();
+
+		[I] public override Task ReturnsExpectedStatusCode() => base.ReturnsExpectedResponse();
+
+		[I] public override Task ReturnsExpectedIsValid() => base.ReturnsExpectedIsValid();
 
-		protected sealed override object ExpectJson => this.QueryScopeJson == null  ?
-			 (object) new { size = 0, aggs = AggregationJson }
-			 : new { size = 0, aggs = AggregationJson, query = QueryScopeJson };
+		[I] public override Task ReturnsExpectedResponse() => base.ReturnsExpectedResponse();
 
-		protected abstract object AggregationJson { get;  }
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Search<Project>(f),
+			(client, f) => client.SearchAsync<Project>(f),
+			(client, r) => client.Search<Project>(r),
+			(client, r) => client.SearchAsync<Project>(r)
+		);
 	}
 
 	public abstract class ProjectsOnlyAggregationUsageTestBase : AggregationUsageTestBase
 	{
-		protected override string UrlPath => $"/{DefaultSeeder.ProjectsAliasFilter}/doc/_search";
-
 		protected ProjectsOnlyAggregationUsageTestBase(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override Nest.Indices AgainstIndex => DefaultSeeder.ProjectsAliasFilter;
+		protected override string UrlPath => $"/{DefaultSeeder.ProjectsAliasFilter}/doc/_search";
 
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] protected override Task HitsTheCorrectUrl() => base.HitsTheCorrectUrl();
diff --git a/src/Tests/Tests/Aggregations/AggregationVisitorTests.cs b/src/Tests/Tests/Aggregations/AggregationVisitorTests.cs
index 00d94bd8463..b20d47548c5 100644
--- a/src/Tests/Tests/Aggregations/AggregationVisitorTests.cs
+++ b/src/Tests/Tests/Aggregations/AggregationVisitorTests.cs
@@ -7,8 +7,8 @@
 
 namespace Tests.Aggregations
 {
-    public class AggregationVisitorTests
-    {
+	public class AggregationVisitorTests
+	{
 		[U] public void VisitMethodForEachTypeOfAggregation()
 		{
 			var aggregationTypes =
diff --git a/src/Tests/Tests/Aggregations/Bucket/AdjacencyMatrix/AdjacencyMatrixUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/AdjacencyMatrix/AdjacencyMatrixUsageTests.cs
index ca6b6c6097d..eb6794a9a8b 100644
--- a/src/Tests/Tests/Aggregations/Bucket/AdjacencyMatrix/AdjacencyMatrixUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/AdjacencyMatrix/AdjacencyMatrixUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Bucket.AdjacencyMatrix
 {
@@ -22,25 +20,14 @@ public AdjacencyMatrixUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 				{
 					filters = new
 					{
-						grpA = new {term = new {state = new {value = "BellyUp"}}},
-						grpB = new {term = new {state = new {value = "Stable"}}},
-						grpC = new {term = new {state = new {value = "VeryActive"}}}
+						grpA = new { term = new { state = new { value = "BellyUp" } } },
+						grpB = new { term = new { state = new { value = "Stable" } } },
+						grpC = new { term = new { state = new { value = "VeryActive" } } }
 					}
 				}
 			}
 		};
 
-		protected override AggregationDictionary InitializerAggs =>
-			new AdjacencyMatrixAggregation("interactions")
-			{
-				Filters = new NamedFiltersContainer
-				{
-					{"grpA", new TermQuery {Field = "state", Value = StateOfBeing.BellyUp}},
-					{"grpB", new TermQuery {Field = "state", Value = StateOfBeing.Stable}},
-					{"grpC", new TermQuery {Field = "state", Value = StateOfBeing.VeryActive}},
-				}
-			};
-
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.AdjacencyMatrix("interactions", am => am
 				.Filters(fs => fs
@@ -50,6 +37,17 @@ public AdjacencyMatrixUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 				)
 			);
 
+		protected override AggregationDictionary InitializerAggs =>
+			new AdjacencyMatrixAggregation("interactions")
+			{
+				Filters = new NamedFiltersContainer
+				{
+					{ "grpA", new TermQuery { Field = "state", Value = StateOfBeing.BellyUp } },
+					{ "grpB", new TermQuery { Field = "state", Value = StateOfBeing.Stable } },
+					{ "grpC", new TermQuery { Field = "state", Value = StateOfBeing.VeryActive } },
+				}
+			};
+
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Aggregations/Bucket/Children/ChildrenAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Children/ChildrenAggregationUsageTests.cs
index 0f66de77452..25312b73d94 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Children/ChildrenAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Children/ChildrenAggregationUsageTests.cs
@@ -3,7 +3,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Bucket.Children
 {
@@ -21,20 +20,20 @@ public ChildrenAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : b
 		{
 			name_of_child_agg = new
 			{
-				children = new {type = "commits"},
+				children = new { type = "commits" },
 				aggs = new
 				{
 					average_per_child = new
 					{
-						avg = new {field = "confidenceFactor"}
+						avg = new { field = "confidenceFactor" }
 					},
 					max_per_child = new
 					{
-						max = new {field = "confidenceFactor"}
+						max = new { field = "confidenceFactor" }
 					},
 					min_per_child = new
 					{
-						min = new {field = "confidenceFactor"}
+						min = new { field = "confidenceFactor" }
 					}
 				}
 			}
diff --git a/src/Tests/Tests/Aggregations/Bucket/Composite/CompositeAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Composite/CompositeAggregationUsageTests.cs
index c84b28894e7..54b6413619b 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Composite/CompositeAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Composite/CompositeAggregationUsageTests.cs
@@ -1,18 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Newtonsoft.Json;
 using Tests.Configuration;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.Composite
@@ -91,7 +87,7 @@ public CompositeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) :
 						{
 							tags = new
 							{
-								terms = new {field = "tags.name"}
+								terms = new { field = "tags.name" }
 							}
 						}
 					}
@@ -131,16 +127,16 @@ public CompositeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) :
 				{
 					new TermsCompositeAggregationSource("branches")
 					{
-						Field = Infer.Field<Project>(f => f.Branches.Suffix("keyword"))
+						Field = Field<Project>(f => f.Branches.Suffix("keyword"))
 					},
 					new DateHistogramCompositeAggregationSource("started")
 					{
-						Field = Infer.Field<Project>(f => f.StartedOn),
+						Field = Field<Project>(f => f.StartedOn),
 						Interval = DateInterval.Month
 					},
 					new HistogramCompositeAggregationSource("branch_count")
 					{
-						Field = Infer.Field<Project>(f => f.RequiredBranches),
+						Field = Field<Project>(f => f.RequiredBranches),
 						Interval = 1
 					}
 				},
@@ -167,10 +163,9 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			composite.Buckets.Should().NotBeNullOrEmpty();
 			composite.AfterKey.Should().NotBeNull();
 			if (TestConfiguration.Instance.InRange(">=6.3.0"))
-			{
-				composite.AfterKey.Should().HaveCount(3)
+				composite.AfterKey.Should()
+					.HaveCount(3)
 					.And.ContainKeys("branches", "started", "branch_count");
-			}
 			foreach (var item in composite.Buckets)
 			{
 				var key = item.Key;
@@ -240,7 +235,7 @@ public CompositeAggregationMissingBucketUsageTests(ReadOnlyCluster i, EndpointUs
 						nested = new { path = "tags" },
 						aggs = new
 						{
-							tags = new { terms = new {field = "tags.name"} }
+							tags = new { terms = new { field = "tags.name" } }
 						}
 					}
 				}
@@ -273,7 +268,7 @@ public CompositeAggregationMissingBucketUsageTests(ReadOnlyCluster i, EndpointUs
 				{
 					new TermsCompositeAggregationSource("branches")
 					{
-						Field = Infer.Field<Project>(f => f.Branches.Suffix("keyword")),
+						Field = Field<Project>(f => f.Branches.Suffix("keyword")),
 						MissingBucket = true,
 						Order = SortOrder.Ascending
 					}
@@ -364,7 +359,7 @@ public DateFormatCompositeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage
 						{
 							tags = new
 							{
-								terms = new {field = "tags.name"}
+								terms = new { field = "tags.name" }
 							}
 						}
 					}
@@ -398,7 +393,7 @@ public DateFormatCompositeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage
 				{
 					new DateHistogramCompositeAggregationSource("started")
 					{
-						Field = Infer.Field<Project>(f => f.StartedOn),
+						Field = Field<Project>(f => f.StartedOn),
 						Interval = DateInterval.Month,
 						Format = "yyyy-MM-dd"
 					},
diff --git a/src/Tests/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs
index 2f647535e3c..6c3eebe1c4f 100644
--- a/src/Tests/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs
@@ -5,10 +5,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
 using static Nest.Infer;
 using static Tests.Domain.Helpers.TestValueHelper;
 
@@ -39,7 +36,7 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage
 					interval = "month",
 					min_doc_count = 2,
 					format = "yyyy-MM-dd'T'HH:mm:ss||date_optional_time", //<1> Note the inclusion of `date_optional_time` to `format`
-					order = new {_count = "asc"},
+					order = new { _count = "asc" },
 					extended_bounds = new
 					{
 						min = FixedDate.AddYears(-1),
@@ -59,7 +56,7 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage
 						{
 							tags = new
 							{
-								terms = new {field = "tags.name"}
+								terms = new { field = "tags.name" }
 							}
 						}
 					}
diff --git a/src/Tests/Tests/Aggregations/Bucket/DateRange/DateRangeAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/DateRange/DateRangeAggregationUsageTests.cs
index 35173c0bf99..cb10b12272f 100644
--- a/src/Tests/Tests/Aggregations/Bucket/DateRange/DateRangeAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/DateRange/DateRangeAggregationUsageTests.cs
@@ -5,9 +5,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 using static Tests.Domain.Helpers.TestValueHelper;
 
@@ -35,15 +33,15 @@ public DateRangeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) :
 					field = "startedOn",
 					ranges = new object[]
 					{
-						new {to = "now", from = "2015-06-06T12:01:02.123||+2d"},
-						new {to = "now+1d-30m/h"},
-						new {from = "2012-05-05||+1d-1m"},
+						new { to = "now", from = "2015-06-06T12:01:02.123||+2d" },
+						new { to = "now+1d-30m/h" },
+						new { from = "2012-05-05||+1d-1m" },
 					},
 					time_zone = "CET"
 				},
 				aggs = new
 				{
-					project_tags = new {terms = new {field = "tags"}}
+					project_tags = new { terms = new { field = "tags" } }
 				}
 			}
 		};
@@ -68,13 +66,13 @@ public DateRangeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) :
 				Field = Field<Project>(p => p.StartedOn),
 				Ranges = new List<DateRangeExpression>
 				{
-					new DateRangeExpression {From = DateMath.Anchored(FixedDate).Add("2d"), To = DateMath.Now},
-					new DateRangeExpression {To = DateMath.Now.Add(TimeSpan.FromDays(1)).Subtract("30m").RoundTo(DateMathTimeUnit.Hour)},
-					new DateRangeExpression {From = DateMath.Anchored("2012-05-05").Add(TimeSpan.FromDays(1)).Subtract("1m")}
+					new DateRangeExpression { From = DateMath.Anchored(FixedDate).Add("2d"), To = DateMath.Now },
+					new DateRangeExpression { To = DateMath.Now.Add(TimeSpan.FromDays(1)).Subtract("30m").RoundTo(DateMathTimeUnit.Hour) },
+					new DateRangeExpression { From = DateMath.Anchored("2012-05-05").Add(TimeSpan.FromDays(1)).Subtract("1m") }
 				},
 				TimeZone = "CET",
 				Aggregations =
-					new TermsAggregation("project_tags") {Field = Field<Project>(p => p.Tags)}
+					new TermsAggregation("project_tags") { Field = Field<Project>(p => p.Tags) }
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
@@ -92,10 +90,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 
 			/** We specified three ranges so we expect to have three of them in the response */
 			dateHistogram.Buckets.Count.Should().Be(3);
-			foreach (var item in dateHistogram.Buckets)
-			{
-				item.DocCount.Should().BeGreaterThan(0);
-			}
+			foreach (var item in dateHistogram.Buckets) item.DocCount.Should().BeGreaterThan(0);
 		}
 	}
 }
diff --git a/src/Tests/Tests/Aggregations/Bucket/Filter/FilterAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Filter/FilterAggregationUsageTests.cs
index 07326058fdc..b24af5a0465 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Filter/FilterAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Filter/FilterAggregationUsageTests.cs
@@ -7,9 +7,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.Filter
@@ -22,10 +20,10 @@ namespace Tests.Aggregations.Bucket.Filter
 	*/
 	public class FilterAggregationUsageTests : AggregationUsageTestBase
 	{
-		public FilterAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		public static string FirstNameToFind = Project.First.LeadDeveloper.FirstName.ToLowerInvariant();
 
+		public FilterAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
 		protected override object AggregationJson => new
 		{
 			bethels_projects = new
@@ -34,12 +32,12 @@ public FilterAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : bas
 				{
 					term = new Dictionary<string, object>
 					{
-						{"leadDeveloper.firstName", new {value = FirstNameToFind}}
+						{ "leadDeveloper.firstName", new { value = FirstNameToFind } }
 					}
 				},
 				aggs = new
 				{
-					project_tags = new {terms = new {field = "curatedTags.name.keyword"}}
+					project_tags = new { terms = new { field = "curatedTags.name.keyword" } }
 				}
 			}
 		};
@@ -55,9 +53,9 @@ public FilterAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : bas
 		protected override AggregationDictionary InitializerAggs =>
 			new FilterAggregation("bethels_projects")
 			{
-				Filter = new TermQuery {Field = Field<Project>(p => p.LeadDeveloper.FirstName), Value = FirstNameToFind},
+				Filter = new TermQuery { Field = Field<Project>(p => p.LeadDeveloper.FirstName), Value = FirstNameToFind },
 				Aggregations =
-					new TermsAggregation("project_tags") {Field = Field<Project>(p => p.CuratedTags.First().Name.Suffix("keyword"))}
+					new TermsAggregation("project_tags") { Field = Field<Project>(p => p.CuratedTags.First().Name.Suffix("keyword")) }
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
@@ -83,14 +81,12 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 	* When the collection of filters is empty or all are conditionless, NEST will serialize them
 	* to an empty object.
 	*/
-	[SkipVersion("6.0.0-alpha1", "https://github.com/elastic/elasticsearch/issues/17518 && 6.0 https://github.com/elastic/elasticsearch/pull/17542#issuecomment-300796197")]
+	[SkipVersion("6.0.0-alpha1",
+		"https://github.com/elastic/elasticsearch/issues/17518 && 6.0 https://github.com/elastic/elasticsearch/pull/17542#issuecomment-300796197")]
 	public class EmptyFilterAggregationUsageTests : AggregationUsageTestBase
 	{
 		public EmptyFilterAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override bool ExpectIsValid => false;
-		protected override int ExpectStatusCode => 400;
-
 		protected override object AggregationJson => new
 		{
 			empty_filter = new
@@ -99,6 +95,9 @@ public EmptyFilterAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 			}
 		};
 
+		protected override bool ExpectIsValid => false;
+		protected override int ExpectStatusCode => 400;
+
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.Filter("empty_filter", date => date
 				.Filter(f => f
@@ -117,18 +116,15 @@ public EmptyFilterAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 				}
 			};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.ShouldNotBeValid();
-		}
+		protected override void ExpectResponse(ISearchResponse<Project> response) => response.ShouldNotBeValid();
 	}
 
 	//reproduce of https://github.com/elastic/elasticsearch-net/issues/1931
 	// hide
 	public class InlineScriptFilterAggregationUsageTests : AggregationUsageTestBase
 	{
-		private string _ctxNumberofCommits = "doc['numberOfCommits'].value > 0";
-		private string _aggName = "script_filter";
+		private readonly string _aggName = "script_filter";
+		private readonly string _ctxNumberofCommits = "doc['numberOfCommits'].value > 0";
 
 		public InlineScriptFilterAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/src/Tests/Tests/Aggregations/Bucket/Filters/FiltersAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Filters/FiltersAggregationUsageTests.cs
index 57296fee28f..08152fddce2 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Filters/FiltersAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Filters/FiltersAggregationUsageTests.cs
@@ -6,10 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.Filters
@@ -39,14 +36,14 @@ public FiltersAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 					other_bucket_key = "other_states_of_being",
 					filters = new
 					{
-						belly_up = new {term = new {state = new {value = "BellyUp"}}},
-						stable = new {term = new {state = new {value = "Stable"}}},
-						very_active = new {term = new {state = new {value = "VeryActive"}}},
+						belly_up = new { term = new { state = new { value = "BellyUp" } } },
+						stable = new { term = new { state = new { value = "Stable" } } },
+						very_active = new { term = new { state = new { value = "VeryActive" } } },
 					}
 				},
 				aggs = new
 				{
-					project_tags = new {terms = new {field = "curatedTags.name.keyword"}}
+					project_tags = new { terms = new { field = "curatedTags.name.keyword" } }
 				}
 			}
 		};
@@ -72,12 +69,12 @@ public FiltersAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 				OtherBucketKey = "other_states_of_being",
 				Filters = new NamedFiltersContainer
 				{
-					{"belly_up", Query<Project>.Term(p => p.State, StateOfBeing.BellyUp)},
-					{"stable", Query<Project>.Term(p => p.State, StateOfBeing.Stable)},
-					{"very_active", Query<Project>.Term(p => p.State, StateOfBeing.VeryActive)}
+					{ "belly_up", Query<Project>.Term(p => p.State, StateOfBeing.BellyUp) },
+					{ "stable", Query<Project>.Term(p => p.State, StateOfBeing.Stable) },
+					{ "very_active", Query<Project>.Term(p => p.State, StateOfBeing.VeryActive) }
 				},
 				Aggregations =
-					new TermsAggregation("project_tags") {Field = Field<Project>(p => p.CuratedTags.First().Name.Suffix("keyword"))}
+					new TermsAggregation("project_tags") { Field = Field<Project>(p => p.CuratedTags.First().Name.Suffix("keyword")) }
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
@@ -126,14 +123,14 @@ public AnonymousFiltersUsage(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 					other_bucket = true,
 					filters = new[]
 					{
-						new {term = new {state = new {value = "BellyUp"}}},
-						new {term = new {state = new {value = "Stable"}}},
-						new {term = new {state = new {value = "VeryActive"}}},
+						new { term = new { state = new { value = "BellyUp" } } },
+						new { term = new { state = new { value = "Stable" } } },
+						new { term = new { state = new { value = "VeryActive" } } },
 					}
 				},
 				aggs = new
 				{
-					project_tags = new {terms = new {field = "curatedTags.name.keyword"}}
+					project_tags = new { terms = new { field = "curatedTags.name.keyword" } }
 				}
 			}
 		};
@@ -162,7 +159,7 @@ public AnonymousFiltersUsage(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 					Query<Project>.Term(p => p.State, StateOfBeing.VeryActive)
 				},
 				Aggregations =
-					new TermsAggregation("project_tags") {Field = Field<Project>(p => p.CuratedTags.First().Name.Suffix("keyword"))}
+					new TermsAggregation("project_tags") { Field = Field<Project>(p => p.CuratedTags.First().Name.Suffix("keyword")) }
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
@@ -179,10 +176,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			var results = filterAgg.AnonymousBuckets();
 			results.Count.Should().Be(4);
 
-			foreach (var singleBucket in results.Take(3))
-			{
-				singleBucket.DocCount.Should().BeGreaterThan(0);
-			}
+			foreach (var singleBucket in results.Take(3)) singleBucket.DocCount.Should().BeGreaterThan(0);
 
 			results.Last().DocCount.Should().Be(0); // <1> The last bucket is the _other bucket_
 		}
diff --git a/src/Tests/Tests/Aggregations/Bucket/GeoDistance/GeoDistanceAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/GeoDistance/GeoDistanceAggregationUsageTests.cs
index ec772df42ba..bcace38e938 100644
--- a/src/Tests/Tests/Aggregations/Bucket/GeoDistance/GeoDistanceAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/GeoDistance/GeoDistanceAggregationUsageTests.cs
@@ -6,9 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.GeoDistance
@@ -31,9 +29,9 @@ public GeoDistanceAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 					},
 					ranges = new object[]
 					{
-						new {to = 100.0},
-						new {from = 100.0, to = 300.0},
-						new {from = 300.0}
+						new { to = 100.0 },
+						new { from = 100.0, to = 300.0 },
+						new { from = 300.0 }
 					}
 				}
 			}
@@ -57,9 +55,9 @@ public GeoDistanceAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 				Origin = "52.376, 4.894",
 				Ranges = new List<AggregationRange>
 				{
-					new AggregationRange {To = 100},
-					new AggregationRange {From = 100, To = 300},
-					new AggregationRange {From = 300}
+					new AggregationRange { To = 100 },
+					new AggregationRange { From = 100, To = 300 },
+					new AggregationRange { From = 300 }
 				}
 			};
 
diff --git a/src/Tests/Tests/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregationUsageTests.cs
index 0a1344c7a6e..89ff94ad90c 100644
--- a/src/Tests/Tests/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/GeoHashGrid/GeoHashGridAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.GeoHashGrid
diff --git a/src/Tests/Tests/Aggregations/Bucket/Global/GlobalAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Global/GlobalAggregationUsageTests.cs
index 0bdeec13206..624b2d5b1b2 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Global/GlobalAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Global/GlobalAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.Global
diff --git a/src/Tests/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs
index cfc95129bd3..65e45c60822 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.Histogram
diff --git a/src/Tests/Tests/Aggregations/Bucket/IpRange/IpRangeAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/IpRange/IpRangeAggregationUsageTests.cs
index 86c9361fa01..d4e8757b553 100644
--- a/src/Tests/Tests/Aggregations/Bucket/IpRange/IpRangeAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/IpRange/IpRangeAggregationUsageTests.cs
@@ -24,8 +24,8 @@ public IpRangeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 					field = "leadDeveloper.ipAddress",
 					ranges = new object[]
 					{
-						new {to = "127.0.0.1"},
-						new {from = "127.0.0.1"}
+						new { to = "127.0.0.1" },
+						new { from = "127.0.0.1" }
 					}
 				}
 			}
@@ -46,8 +46,8 @@ public IpRangeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 				Field = Field((Project p) => p.LeadDeveloper.IpAddress),
 				Ranges = new List<Nest.IpRange>
 				{
-					new Nest.IpRange {To = "127.0.0.1"},
-					new Nest.IpRange {From = "127.0.0.1"}
+					new Nest.IpRange { To = "127.0.0.1" },
+					new Nest.IpRange { From = "127.0.0.1" }
 				}
 			};
 
diff --git a/src/Tests/Tests/Aggregations/Bucket/Missing/MissingAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Missing/MissingAggregationUsageTests.cs
index 3c2e24f27e2..c4b91e9e69d 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Missing/MissingAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Missing/MissingAggregationUsageTests.cs
@@ -1,12 +1,9 @@
 using System;
-using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.Missing
diff --git a/src/Tests/Tests/Aggregations/Bucket/Nested/NestedAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Nested/NestedAggregationUsageTests.cs
index 2415a42628f..271f2e904c9 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Nested/NestedAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Nested/NestedAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Bucket.Nested
 {
@@ -62,7 +60,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			tags.Should().NotBeNull();
 			var tagNames = tags.Terms("tag_names");
 			tagNames.Should().NotBeNull();
-			foreach(var item in tagNames.Buckets)
+			foreach (var item in tagNames.Buckets)
 			{
 				item.Key.Should().NotBeNullOrEmpty();
 				item.DocCount.Should().BeGreaterThan(0);
diff --git a/src/Tests/Tests/Aggregations/Bucket/Range/RangeAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Range/RangeAggregationUsageTests.cs
index 390ebc27e29..fbb3413e347 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Range/RangeAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Range/RangeAggregationUsageTests.cs
@@ -6,9 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.Range
@@ -26,9 +24,9 @@ public RangeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base
 					field = "numberOfCommits",
 					ranges = new object[]
 					{
-						new {to = 100.0},
-						new {from = 100.0, to = 500.0},
-						new {from = 500.0}
+						new { to = 100.0 },
+						new { from = 100.0, to = 500.0 },
+						new { from = 500.0 }
 					}
 				}
 			}
@@ -50,9 +48,9 @@ public RangeAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base
 				Field = Field<Project>(p => p.NumberOfCommits),
 				Ranges = new List<AggregationRange>
 				{
-					{new AggregationRange {To = 100}},
-					{new AggregationRange {From = 100, To = 500}},
-					{new AggregationRange {From = 500}}
+					{ new AggregationRange { To = 100 } },
+					{ new AggregationRange { From = 100, To = 500 } },
+					{ new AggregationRange { From = 500 } }
 				}
 			};
 
diff --git a/src/Tests/Tests/Aggregations/Bucket/ReverseNested/ReverseNestedAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/ReverseNested/ReverseNestedAggregationUsageTests.cs
index a439ca76304..bbb0a6a0c5c 100644
--- a/src/Tests/Tests/Aggregations/Bucket/ReverseNested/ReverseNestedAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/ReverseNested/ReverseNestedAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.ReverseNested
@@ -87,7 +85,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			tags.Should().NotBeNull();
 			var tagNames = tags.Terms("tag_names");
 			tagNames.Should().NotBeNull();
-			foreach(var tagName in tagNames.Buckets)
+			foreach (var tagName in tagNames.Buckets)
 			{
 				tagName.Key.Should().NotBeNullOrEmpty();
 				tagName.DocCount.Should().BeGreaterThan(0);
@@ -95,7 +93,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				tagsToProjects.Should().NotBeNull();
 				var topProjectsPerTag = tagsToProjects.Terms("top_projects_per_tag");
 				topProjectsPerTag.Should().NotBeNull();
-				foreach(var topProject in topProjectsPerTag.Buckets)
+				foreach (var topProject in topProjectsPerTag.Buckets)
 				{
 					topProject.Key.Should().NotBeNullOrEmpty();
 					topProject.DocCount.Should().BeGreaterThan(0);
diff --git a/src/Tests/Tests/Aggregations/Bucket/Sampler/SamplerAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Sampler/SamplerAggregationUsageTests.cs
index c5089cdeb13..2d18774e4df 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Sampler/SamplerAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Sampler/SamplerAggregationUsageTests.cs
@@ -5,10 +5,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Bucket.Sampler
 {
diff --git a/src/Tests/Tests/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregationUsageTests.cs
index 22baad350e4..e3c2b0efd39 100644
--- a/src/Tests/Tests/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/SignificantTerms/SignificantTermsAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.SignificantTerms
@@ -161,7 +159,7 @@ public SignificantTermsExcludeExactValuesAggregationUsageTests(ReadOnlyCluster i
 						background_is_superset = true,
 						include_negatives = true
 					},
-					exclude = new[] {"pierce"}
+					exclude = new[] { "pierce" }
 				}
 			}
 		};
@@ -174,7 +172,7 @@ public SignificantTermsExcludeExactValuesAggregationUsageTests(ReadOnlyCluster i
 					.BackgroundIsSuperSet()
 					.IncludeNegatives()
 				)
-				.Exclude(new[] {"pierce"})
+				.Exclude(new[] { "pierce" })
 			);
 
 		protected override AggregationDictionary InitializerAggs =>
@@ -187,7 +185,7 @@ public SignificantTermsExcludeExactValuesAggregationUsageTests(ReadOnlyCluster i
 					BackgroundIsSuperSet = true,
 					IncludeNegatives = true
 				},
-				Exclude = new SignificantTermsIncludeExclude(new[] {"pierce"})
+				Exclude = new SignificantTermsIncludeExclude(new[] { "pierce" })
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
diff --git a/src/Tests/Tests/Aggregations/Bucket/SignificantText/SignificantTextAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/SignificantText/SignificantTextAggregationUsageTests.cs
index ddeb7216388..49a14917040 100644
--- a/src/Tests/Tests/Aggregations/Bucket/SignificantText/SignificantTextAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/SignificantText/SignificantTextAggregationUsageTests.cs
@@ -5,9 +5,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Bucket.SignificantText
 {
@@ -33,11 +31,11 @@ namespace Tests.Aggregations.Bucket.SignificantText
 	 */
 	public class SignificantTextAggregationUsageTests : AggregationUsageTestBase
 	{
-		public SignificantTextAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly string _firstTenDescriptions =
 			string.Join(" ", Project.First.Description.Split(' ').Distinct().Take(1024));
 
+		public SignificantTextAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
 		protected override object AggregationJson => new
 		{
 			significant_descriptions = new
@@ -50,23 +48,6 @@ public SignificantTextAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usa
 			}
 		};
 
-		protected override object QueryScopeJson => new
-		{
-			match = new
-			{
-				description = new
-				{
-					query = _firstTenDescriptions
-				}
-			}
-		};
-
-		protected override QueryContainer QueryScope => new MatchQuery
-		{
-			Field = Infer.Field<Project>(p => p.Description),
-			Query = _firstTenDescriptions
-		};
-
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.SignificantText("significant_descriptions", st => st
 				.Field(p => p.Description)
@@ -80,6 +61,23 @@ public SignificantTextAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usa
 				FilterDuplicateText = true
 			};
 
+		protected override QueryContainer QueryScope => new MatchQuery
+		{
+			Field = Infer.Field<Project>(p => p.Description),
+			Query = _firstTenDescriptions
+		};
+
+		protected override object QueryScopeJson => new
+		{
+			match = new
+			{
+				description = new
+				{
+					query = _firstTenDescriptions
+				}
+			}
+		};
+
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs
index 2bd38d04c89..0f30c3818f9 100644
--- a/src/Tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs
@@ -6,10 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Bucket.Terms
@@ -45,8 +42,8 @@ public TermsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base
 					},
 					order = new object[]
 					{
-						new {_key = "asc"},
-						new {_count = "desc"}
+						new { _key = "asc" },
+						new { _count = "desc" }
 					}
 				}
 			}
@@ -88,7 +85,7 @@ public TermsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base
 				},
 				Meta = new Dictionary<string, object>
 				{
-					{"foo", "bar"}
+					{ "foo", "bar" }
 				}
 			};
 
@@ -142,8 +139,8 @@ public TermsAggregationIncludePatternUsageTests(ReadOnlyCluster i, EndpointUsage
 					include = "(Stable|VeryActive)",
 					order = new object[]
 					{
-						new {_key = "asc"},
-						new {_count = "desc"}
+						new { _key = "asc" },
+						new { _count = "desc" }
 					}
 				}
 			}
@@ -184,7 +181,7 @@ public TermsAggregationIncludePatternUsageTests(ReadOnlyCluster i, EndpointUsage
 				},
 				Meta = new Dictionary<string, object>
 				{
-					{"foo", "bar"}
+					{ "foo", "bar" }
 				}
 			};
 
@@ -235,11 +232,11 @@ public TermsAggregationIncludeExactValuesUsageTests(ReadOnlyCluster i, EndpointU
 					shard_size = 100,
 					execution_hint = "map",
 					missing = "n/a",
-					include = new[] {"Stable", "VeryActive"},
+					include = new[] { "Stable", "VeryActive" },
 					order = new object[]
 					{
-						new {_key = "asc"},
-						new {_count = "desc"}
+						new { _key = "asc" },
+						new { _count = "desc" }
 					}
 				}
 			}
@@ -253,7 +250,7 @@ public TermsAggregationIncludeExactValuesUsageTests(ReadOnlyCluster i, EndpointU
 				.ShardSize(100)
 				.ExecutionHint(TermsAggregationExecutionHint.Map)
 				.Missing("n/a")
-				.Include(new[] {StateOfBeing.Stable.ToString(), StateOfBeing.VeryActive.ToString()})
+				.Include(new[] { StateOfBeing.Stable.ToString(), StateOfBeing.VeryActive.ToString() })
 				.Order(o => o
 					.KeyAscending()
 					.CountDescending()
@@ -272,7 +269,7 @@ public TermsAggregationIncludeExactValuesUsageTests(ReadOnlyCluster i, EndpointU
 				ShardSize = 100,
 				ExecutionHint = TermsAggregationExecutionHint.Map,
 				Missing = "n/a",
-				Include = new TermsInclude(new[] {StateOfBeing.Stable.ToString(), StateOfBeing.VeryActive.ToString()}),
+				Include = new TermsInclude(new[] { StateOfBeing.Stable.ToString(), StateOfBeing.VeryActive.ToString() }),
 				Order = new List<TermsOrder>
 				{
 					TermsOrder.KeyAscending,
@@ -280,7 +277,7 @@ public TermsAggregationIncludeExactValuesUsageTests(ReadOnlyCluster i, EndpointU
 				},
 				Meta = new Dictionary<string, object>
 				{
-					{"foo", "bar"}
+					{ "foo", "bar" }
 				}
 			};
 
@@ -340,14 +337,14 @@ public PartitionTermsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usag
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.Terms("commits", st => st
 				.Field(p => p.NumberOfCommits)
-				.Include(partition: 0, numberOfPartitions: 10)
+				.Include(0, 10)
 				.Size(5)
 			);
 
 		protected override AggregationDictionary InitializerAggs =>
 			new TermsAggregation("commits")
 			{
-				Field = Infer.Field<Project>(p => p.NumberOfCommits),
+				Field = Field<Project>(p => p.NumberOfCommits),
 				Include = new TermsInclude(0, 10),
 				Size = 5
 			};
@@ -440,8 +437,8 @@ public NestedTermsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 			commits = new
 			{
 				terms = new { field = "numberOfCommits", },
-				 aggs = new
-				 {
+				aggs = new
+				{
 					state = new
 					{
 						meta = new { x = "y" },
@@ -468,7 +465,7 @@ public NestedTermsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 				Field = Field<Project>(p => p.NumberOfCommits),
 				Aggregations = new TermsAggregation("state")
 				{
-					Meta = new Dictionary<string, object> {{"x", "y"}},
+					Meta = new Dictionary<string, object> { { "x", "y" } },
 					Field = Field<Project>(p => p.State),
 				}
 			};
diff --git a/src/Tests/Tests/Aggregations/Matrix/MatrixStats/MatrixStatsAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Matrix/MatrixStats/MatrixStatsAggregationUsageTests.cs
index 16cf9e02a01..63e2676f5c1 100644
--- a/src/Tests/Tests/Aggregations/Matrix/MatrixStats/MatrixStatsAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Matrix/MatrixStats/MatrixStatsAggregationUsageTests.cs
@@ -1,15 +1,13 @@
 using System;
-using FluentAssertions;
-using Nest;
-using Tests.Framework.Integration;
-using static Nest.Infer;
 using System.Collections.Generic;
-using Tests.Framework;
 using System.Linq;
+using FluentAssertions;
+using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.Integration;
+using static Nest.Infer;
 
 namespace Tests.Aggregations.Matrix.MatrixStats
 {
@@ -27,7 +25,7 @@ public MatrixStatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 				},
 				matrix_stats = new
 				{
-					fields = new[] {"numberOfCommits", "numberOfContributors"},
+					fields = new[] { "numberOfCommits", "numberOfContributors" },
 					missing = new
 					{
 						numberOfCommits = 0.0,
@@ -59,12 +57,12 @@ public MatrixStatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 			{
 				Meta = new Dictionary<string, object>
 				{
-					{"foo", "bar"}
+					{ "foo", "bar" }
 				},
 				Missing = new Dictionary<Field, double>
 				{
-					{"numberOfCommits", 0.0},
-					{"numberOfContributors", 1.0},
+					{ "numberOfCommits", 0.0 },
+					{ "numberOfContributors", 1.0 },
 				},
 				Mode = MatrixStatsMode.Median,
 				Fields = Field<Project>(p => p.NumberOfCommits).And("numberOfContributors")
diff --git a/src/Tests/Tests/Aggregations/Metric/Average/AverageAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/Average/AverageAggregationUsageTests.cs
index c5d929489d2..4cf6c23b9c6 100644
--- a/src/Tests/Tests/Aggregations/Metric/Average/AverageAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/Average/AverageAggregationUsageTests.cs
@@ -1,14 +1,12 @@
 using System;
+using System.Collections.Generic;
 using FluentAssertions;
 using Nest;
-using Tests.Framework.Integration;
-using static Nest.Infer;
-using System.Collections.Generic;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.Integration;
+using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.Average
 {
@@ -51,7 +49,7 @@ public AverageAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 			{
 				Meta = new Dictionary<string, object>
 				{
-					{"foo", "bar"}
+					{ "foo", "bar" }
 				},
 				Missing = 10,
 				Script = new InlineScript("_value * 1.2")
diff --git a/src/Tests/Tests/Aggregations/Metric/Cardinality/CardinalityAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/Cardinality/CardinalityAggregationUsageTests.cs
index 4ade2ad1203..827fa6c6ea8 100644
--- a/src/Tests/Tests/Aggregations/Metric/Cardinality/CardinalityAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/Cardinality/CardinalityAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.Cardinality
@@ -45,6 +43,6 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			var projectCount = response.Aggregations.Cardinality("state_count");
 			projectCount.Should().NotBeNull();
 			projectCount.Value.Should().Be(3);
-        }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregationUsageTests.cs
index 6b69d158bf1..a1e996397fd 100644
--- a/src/Tests/Tests/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.ExtendedStats
diff --git a/src/Tests/Tests/Aggregations/Metric/GeoBounds/GeoBoundsAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/GeoBounds/GeoBoundsAggregationUsageTests.cs
index 210d077039e..f465210892f 100644
--- a/src/Tests/Tests/Aggregations/Metric/GeoBounds/GeoBoundsAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/GeoBounds/GeoBoundsAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.GeoBounds
diff --git a/src/Tests/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs
index 4fee5ca5252..e9e4128787a 100644
--- a/src/Tests/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs
@@ -5,10 +5,7 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Core.Xunit;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Aggregations.Metric.GeoCentroid
 {
@@ -135,9 +132,6 @@ public GeoCentroidNoResultsAggregationUsageTests(ReadOnlyCluster i, EndpointUsag
 			}
 		};
 
-		protected override QueryContainer QueryScope => new TermQuery { Field = Infer.Field<Project>(p=>p.Name), Value = "noresult" };
-		protected override object QueryScopeJson { get; } = new {term = new {name = new {value = "noresult"}}};
-
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.GeoCentroid("centroid", gb => gb
 				.Field(p => p.Location)
@@ -146,6 +140,9 @@ public GeoCentroidNoResultsAggregationUsageTests(ReadOnlyCluster i, EndpointUsag
 		protected override AggregationDictionary InitializerAggs =>
 			new GeoCentroidAggregation("centroid", Infer.Field<Project>(p => p.Location));
 
+		protected override QueryContainer QueryScope => new TermQuery { Field = Infer.Field<Project>(p => p.Name), Value = "noresult" };
+		protected override object QueryScopeJson { get; } = new { term = new { name = new { value = "noresult" } } };
+
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Aggregations/Metric/Max/MaxAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/Max/MaxAggregationUsageTests.cs
index ac549b545c6..58e31f234d4 100644
--- a/src/Tests/Tests/Aggregations/Metric/Max/MaxAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/Max/MaxAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.Max
diff --git a/src/Tests/Tests/Aggregations/Metric/Min/MinAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/Min/MinAggregationUsageTests.cs
index da9466f6d60..fc1fabefc63 100644
--- a/src/Tests/Tests/Aggregations/Metric/Min/MinAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/Min/MinAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.Min
diff --git a/src/Tests/Tests/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationUsageTests.cs
index fbf4c3a01a3..c521f96aaac 100644
--- a/src/Tests/Tests/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationUsageTests.cs
@@ -5,9 +5,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.PercentileRanks
@@ -23,7 +21,7 @@ public PercentileRanksAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usa
 				percentile_ranks = new
 				{
 					field = "numberOfCommits",
-					values = new[] {15.0, 30.0},
+					values = new[] { 15.0, 30.0 },
 					tdigest = new
 					{
 						compression = 200.0
@@ -53,7 +51,7 @@ public PercentileRanksAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usa
 		protected override AggregationDictionary InitializerAggs =>
 			new PercentileRanksAggregation("commits_outlier", Field<Project>(p => p.NumberOfCommits))
 			{
-				Values = new List<double> {15, 30},
+				Values = new List<double> { 15, 30 },
 				Method = new TDigestMethod
 				{
 					Compression = 200
diff --git a/src/Tests/Tests/Aggregations/Metric/Percentiles/PercentilesAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/Percentiles/PercentilesAggregationUsageTests.cs
index 9cf2a50cd5d..34067329509 100644
--- a/src/Tests/Tests/Aggregations/Metric/Percentiles/PercentilesAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/Percentiles/PercentilesAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.Percentiles
@@ -22,7 +20,7 @@ public PercentilesAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 				percentiles = new
 				{
 					field = "numberOfCommits",
-					percents = new[] {95.0, 99.0, 99.9},
+					percents = new[] { 95.0, 99.0, 99.9 },
 					hdr = new
 					{
 						number_of_significant_value_digits = 3
@@ -52,7 +50,7 @@ public PercentilesAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 		protected override AggregationDictionary InitializerAggs =>
 			new PercentilesAggregation("commits_outlier", Field<Project>(p => p.NumberOfCommits))
 			{
-				Percents = new[] {95, 99, 99.9},
+				Percents = new[] { 95, 99, 99.9 },
 				Method = new HDRHistogramMethod
 				{
 					NumberOfSignificantValueDigits = 3
diff --git a/src/Tests/Tests/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregationUsageTests.cs
index 81255a3b295..fb70a3417bf 100644
--- a/src/Tests/Tests/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregationUsageTests.cs
@@ -1,30 +1,17 @@
 using System;
+using System.Collections.Generic;
 using FluentAssertions;
 using Nest;
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using System.Collections.Generic;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
+using Tests.Framework.Integration;
 
 namespace Tests.Aggregations.Metric.ScriptedMetric
 {
 	public class ScriptedMetricAggregationUsageTests : ProjectsOnlyAggregationUsageTestBase
 	{
-		class Scripted
-		{
-			public string Language { get; set; }
-			public string Combine { get; set; }
-			public string Reduce { get; set; }
-			public string Map { get; set; }
-			public string Init { get; set; }
-		}
-		public ScriptedMetricAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
-		private Scripted Script = new Scripted
+		private readonly Scripted Script = new Scripted
 		{
 			Language = "painless",
 			Init = "params._agg.commits = []",
@@ -33,16 +20,18 @@ public ScriptedMetricAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usag
 			Reduce = "def sum = 0.0; for (a in params._aggs) { sum += a } return sum",
 		};
 
+		public ScriptedMetricAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
 		protected override object AggregationJson => new
 		{
 			sum_the_hard_way = new
 			{
 				scripted_metric = new
 				{
-					init_script = new {source = Script.Init},
-					map_script = new {source = Script.Map},
-					combine_script = new {source = Script.Combine},
-					reduce_script = new {source = Script.Reduce}
+					init_script = new { source = Script.Init },
+					map_script = new { source = Script.Map },
+					combine_script = new { source = Script.Combine },
+					reduce_script = new { source = Script.Reduce }
 				}
 			}
 		};
@@ -71,6 +60,15 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			sumTheHardWay.Should().NotBeNull();
 			sumTheHardWay.Value<int>().Should().BeGreaterThan(0);
 		}
+
+		private class Scripted
+		{
+			public string Combine { get; set; }
+			public string Init { get; set; }
+			public string Language { get; set; }
+			public string Map { get; set; }
+			public string Reduce { get; set; }
+		}
 	}
 
 	/// <summary>
@@ -78,17 +76,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 	/// </summary>
 	public class ScriptedMetricMultiAggregationTests : ProjectsOnlyAggregationUsageTestBase
 	{
-		// hide
-		class Scripted
-		{
-			public string Language { get; set; }
-			public string Combine { get; set; }
-			public string Reduce { get; set; }
-			public string Map { get; set; }
-			public string Init { get; set; }
-		}
-
-		private Scripted First = new Scripted
+		private readonly Scripted First = new Scripted
 		{
 			Language = "painless",
 			Init = "params._agg.map = [:]",
@@ -113,7 +101,7 @@ class Scripted
 				"return reduce;"
 		};
 
-		private Scripted Second = new Scripted
+		private readonly Scripted Second = new Scripted
 		{
 			Language = "painless",
 			Combine = "def sum = 0.0; for (c in params._agg.commits) { sum += c } return sum",
@@ -189,19 +177,18 @@ public ScriptedMetricMultiAggregationTests(ReadOnlyCluster i, EndpointUsage usag
 			);
 
 		protected override AggregationDictionary InitializerAggs =>
-
 			new ScriptedMetricAggregation("by_state_total")
 			{
-				InitScript = new InlineScript(First.Init) {Lang = First.Language},
-				MapScript = new InlineScript(First.Map) {Lang = First.Language},
-				ReduceScript = new InlineScript(First.Reduce) {Lang = First.Language}
+				InitScript = new InlineScript(First.Init) { Lang = First.Language },
+				MapScript = new InlineScript(First.Map) { Lang = First.Language },
+				ReduceScript = new InlineScript(First.Reduce) { Lang = First.Language }
 			}
 			&& new ScriptedMetricAggregation("total_commits")
 			{
-				InitScript = new InlineScript(Second.Init) {Lang = Second.Language},
-				MapScript = new InlineScript(Second.Map) {Lang = Second.Language},
-				CombineScript = new InlineScript(Second.Combine) {Lang = Second.Language},
-				ReduceScript = new InlineScript(Second.Reduce) {Lang = Second.Language}
+				InitScript = new InlineScript(Second.Init) { Lang = Second.Language },
+				MapScript = new InlineScript(Second.Map) { Lang = Second.Language },
+				CombineScript = new InlineScript(Second.Combine) { Lang = Second.Language },
+				ReduceScript = new InlineScript(Second.Reduce) { Lang = Second.Language }
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
@@ -216,5 +203,15 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			byStateTotal.Value<IDictionary<string, int>>().Should().NotBeNull();
 			totalCommits.Value<int>().Should().BeGreaterThan(0);
 		}
+
+		// hide
+		private class Scripted
+		{
+			public string Combine { get; set; }
+			public string Init { get; set; }
+			public string Language { get; set; }
+			public string Map { get; set; }
+			public string Reduce { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Aggregations/Metric/Stats/StatsAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/Stats/StatsAggregationUsageTests.cs
index 35146538384..b9cf94b00f1 100644
--- a/src/Tests/Tests/Aggregations/Metric/Stats/StatsAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/Stats/StatsAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.Stats
diff --git a/src/Tests/Tests/Aggregations/Metric/Sum/SumAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/Sum/SumAggregationUsageTests.cs
index d245094e972..b95ec4695e0 100644
--- a/src/Tests/Tests/Aggregations/Metric/Sum/SumAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/Sum/SumAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.Sum
diff --git a/src/Tests/Tests/Aggregations/Metric/TopHits/TopHitsAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/TopHits/TopHitsAggregationUsageTests.cs
index 407caa5ab2b..2a741b5a466 100644
--- a/src/Tests/Tests/Aggregations/Metric/TopHits/TopHitsAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/TopHits/TopHitsAggregationUsageTests.cs
@@ -6,9 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.TopHits
@@ -56,13 +54,13 @@ public TopHitsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 							},
 							_source = new
 							{
-								includes = new[] {"name", "lastActivity", "sourceOnly"}
+								includes = new[] { "name", "lastActivity", "sourceOnly" }
 							},
 							size = 1,
 							version = true,
 							track_scores = true,
 							explain = true,
-							stored_fields = new[] {"startedOn"},
+							stored_fields = new[] { "startedOn" },
 							highlight = new
 							{
 								fields = new
@@ -81,109 +79,107 @@ public TopHitsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 									}
 								}
 							},
-							docvalue_fields = new [] { "state" }
+							docvalue_fields = new[] { "state" }
 						}
 					}
 				}
 			}
 		};
 
-		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs =>a => a
-				.Terms("states", t => t
-					.Field(p => p.State)
-					.Aggregations(aa => aa
-						.TopHits("top_state_hits", th => th
-							.Sort(srt => srt
-								.Field(sf => sf
-									.Field(p => p.StartedOn)
+		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
+			.Terms("states", t => t
+				.Field(p => p.State)
+				.Aggregations(aa => aa
+					.TopHits("top_state_hits", th => th
+						.Sort(srt => srt
+							.Field(sf => sf
+								.Field(p => p.StartedOn)
 								.Order(SortOrder.Descending))
-								.Script(ss => ss
-									.Type("number")
-									.Script(sss => sss
-										.Source("Math.sin(34*(double)doc['numberOfCommits'].value)")
-										.Lang("painless")
-									)
-									.Order(SortOrder.Descending)
-								)
-							)
-							.Source(src => src
-								.Includes(fs => fs
-									.Field(p => p.Name)
-									.Field(p => p.LastActivity)
-									.Field(p => p.SourceOnly)
+							.Script(ss => ss
+								.Type("number")
+								.Script(sss => sss
+									.Source("Math.sin(34*(double)doc['numberOfCommits'].value)")
+									.Lang("painless")
 								)
+								.Order(SortOrder.Descending)
 							)
-							.Size(1)
-							.Version()
-							.TrackScores()
-							.Explain()
-							.StoredFields(f => f
-								.Field(p => p.StartedOn)
-							)
-							.Highlight(h => h
-								.Fields(
-									hf => hf.Field(p => p.Tags),
-									hf => hf.Field(p => p.Description)
-								)
+						)
+						.Source(src => src
+							.Includes(fs => fs
+								.Field(p => p.Name)
+								.Field(p => p.LastActivity)
+								.Field(p => p.SourceOnly)
 							)
-							.ScriptFields(sfs => sfs
-								.ScriptField("commit_factor", sf => sf
-									.Source("doc['numberOfCommits'].value * 2")
-
-								)
-
+						)
+						.Size(1)
+						.Version()
+						.TrackScores()
+						.Explain()
+						.StoredFields(f => f
+							.Field(p => p.StartedOn)
+						)
+						.Highlight(h => h
+							.Fields(
+								hf => hf.Field(p => p.Tags),
+								hf => hf.Field(p => p.Description)
 							)
-							.DocValueFields(d => d
-								.Field(p => p.State)
+						)
+						.ScriptFields(sfs => sfs
+							.ScriptField("commit_factor", sf => sf
+								.Source("doc['numberOfCommits'].value * 2")
 							)
 						)
+						.DocValueFields(d => d
+							.Field(p => p.State)
+						)
 					)
-				);
+				)
+			);
 
 		protected override AggregationDictionary InitializerAggs =>
 			new TermsAggregation("states")
 			{
-
-					Field = Field<Project>(p => p.State),
-					Aggregations = new TopHitsAggregation("top_state_hits")
+				Field = Field<Project>(p => p.State),
+				Aggregations = new TopHitsAggregation("top_state_hits")
+				{
+					Sort = new List<ISort>
 					{
-						Sort = new List<ISort>
-						{
-							new SortField { Field = Field<Project>(p => p.StartedOn), Order = SortOrder.Descending },
+						new SortField { Field = Field<Project>(p => p.StartedOn), Order = SortOrder.Descending },
 						new ScriptSort
-							{
-								Type = "number",
-								Script = new InlineScript("Math.sin(34*(double)doc['numberOfCommits'].value)") { Lang = "painless" },
-								Order = SortOrder.Descending
-							},},
-						Source = new SourceFilter
 						{
-							Includes = new [] { "name", "lastActivity", "sourceOnly" }
+							Type = "number",
+							Script = new InlineScript("Math.sin(34*(double)doc['numberOfCommits'].value)") { Lang = "painless" },
+							Order = SortOrder.Descending
 						},
-						Size = 1,
-						Version = true,
-						TrackScores = true,
-						Explain = true,
-						StoredFields = new[] { "startedOn" },
-						Highlight = new Highlight
+					},
+					Source = new SourceFilter
+					{
+						Includes = new[] { "name", "lastActivity", "sourceOnly" }
+					},
+					Size = 1,
+					Version = true,
+					TrackScores = true,
+					Explain = true,
+					StoredFields = new[] { "startedOn" },
+					Highlight = new Highlight
+					{
+						Fields = new Dictionary<Field, IHighlightField>
 						{
-							Fields = new Dictionary<Field, IHighlightField>
-							{
-								{ Field<Project>(p => p.Tags), new HighlightField() },
-								{ Field<Project>(p => p.Description), new HighlightField() }
-							}
-						},
-						ScriptFields = new ScriptFields
+							{ Field<Project>(p => p.Tags), new HighlightField() },
+							{ Field<Project>(p => p.Description), new HighlightField() }
+						}
+					},
+					ScriptFields = new ScriptFields
+					{
 						{
+							"commit_factor", new ScriptField
 							{
-								"commit_factor", new ScriptField
-								{
-									Script = new InlineScript("doc['numberOfCommits'].value * 2")
-								}
-							},
+								Script = new InlineScript("doc['numberOfCommits'].value * 2")
+							}
 						},
-						DocValueFields = Infer.Fields<Project>(f => f.State)
-					}
+					},
+					DocValueFields = Fields<Project>(f => f.State)
+				}
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
@@ -192,7 +188,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			var states = response.Aggregations.Terms("states");
 			states.Should().NotBeNull();
 			states.Buckets.Should().NotBeNullOrEmpty();
-			foreach(var state in states.Buckets)
+			foreach (var state in states.Buckets)
 			{
 				state.Key.Should().NotBeNullOrEmpty();
 				state.DocCount.Should().BeGreaterThan(0);
@@ -207,8 +203,8 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				hits.All(h => h.Fields.ValuesOf<DateTime>("startedOn").Any()).Should().BeTrue();
 				var projects = topStateHits.Documents<Project>();
 				projects.Should().NotBeEmpty();
-				projects.Should().OnlyContain(p=>!string.IsNullOrWhiteSpace(p.Name), "source filter included name");
-				projects.Should().OnlyContain(p=>string.IsNullOrWhiteSpace(p.Description), "source filter does NOT include description");
+				projects.Should().OnlyContain(p => !string.IsNullOrWhiteSpace(p.Name), "source filter included name");
+				projects.Should().OnlyContain(p => string.IsNullOrWhiteSpace(p.Description), "source filter does NOT include description");
 				foreach (var project in projects)
 					project.ShouldAdhereToSourceSerializerWhenSet();
 			}
diff --git a/src/Tests/Tests/Aggregations/Metric/ValueCount/ValueCountAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/ValueCount/ValueCountAggregationUsageTests.cs
index f1d4c9a3cd4..d45699ae5cd 100644
--- a/src/Tests/Tests/Aggregations/Metric/ValueCount/ValueCountAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/ValueCount/ValueCountAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Aggregations.Metric.ValueCount
diff --git a/src/Tests/Tests/Aggregations/Metric/WeightedAverage/WeightedAverageAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Metric/WeightedAverage/WeightedAverageAggregationUsageTests.cs
index 5775f51819e..ad4940e9e5a 100644
--- a/src/Tests/Tests/Aggregations/Metric/WeightedAverage/WeightedAverageAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Metric/WeightedAverage/WeightedAverageAggregationUsageTests.cs
@@ -2,11 +2,11 @@
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Framework.Integration;
-using static Nest.Infer;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
+using Tests.Framework.Integration;
+using static Nest.Infer;
 using ValueType = Nest.ValueType;
 
 namespace Tests.Aggregations.Metric.WeightedAverage
diff --git a/src/Tests/Tests/Aggregations/Pipeline/AverageBucket/AverageBucketAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/AverageBucket/AverageBucketAggregationUsageTests.cs
index 5a6cff01686..020710d75ce 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/AverageBucket/AverageBucketAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/AverageBucket/AverageBucketAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.AverageBucket
 {
diff --git a/src/Tests/Tests/Aggregations/Pipeline/BucketScript/BucketScriptAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/BucketScript/BucketScriptAggregationUsageTests.cs
index e0a7b2a7c82..8f12239bfdd 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/BucketScript/BucketScriptAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/BucketScript/BucketScriptAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.BucketScript
 {
@@ -120,8 +118,8 @@ public BucketScriptAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage
 					}
 					&& new BucketScriptAggregation("stable_percentage", new MultiBucketsPath
 					{
-						{"totalCommits", "commits"},
-						{"stableCommits", "stable_state>commits"}
+						{ "totalCommits", "commits" },
+						{ "stableCommits", "stable_state>commits" }
 					})
 					{
 						Script = new InlineScript("params.stableCommits / params.totalCommits * 100")
@@ -137,7 +135,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			projectsPerMonth.Buckets.Should().NotBeNull();
 			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
 
-			foreach(var item in projectsPerMonth.Buckets)
+			foreach (var item in projectsPerMonth.Buckets)
 			{
 				var stablePercentage = item.BucketScript("stable_percentage");
 				stablePercentage.Should().NotBeNull();
diff --git a/src/Tests/Tests/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregationUsageTests.cs
index 9a00822b1c2..9f0f61d01df 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/BucketSelector/BucketSelectorAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.BucketSelector
 {
@@ -76,7 +74,7 @@ public BucketSelectorAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsag
 					new SumAggregation("commits", "numberOfCommits") &&
 					new BucketSelectorAggregation("commits_bucket_filter", new MultiBucketsPath
 					{
-						{"totalCommits", "commits"},
+						{ "totalCommits", "commits" },
 					})
 					{
 						Script = new InlineScript("params.totalCommits >= 500")
diff --git a/src/Tests/Tests/Aggregations/Pipeline/BucketSort/BucketSortAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/BucketSort/BucketSortAggregationUsageTests.cs
index 7f13cf34377..0cd0851a293 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/BucketSort/BucketSortAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/BucketSort/BucketSortAggregationUsageTests.cs
@@ -6,9 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.BucketSort
 {
@@ -102,7 +100,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			double previousCommits = -1;
 
 			// sum of commits should descend over buckets
-			foreach(var item in projectsPerMonth.Buckets)
+			foreach (var item in projectsPerMonth.Buckets)
 			{
 				var numberOfCommits = item.Sum("commits").Value.Value;
 				if (previousCommits != -1)
diff --git a/src/Tests/Tests/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregationUsageTests.cs
index 7f7a79b4344..3d16fc48f7e 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/CumulativeSum/CumulativeSumAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.CumulativeSum
 {
@@ -43,23 +41,6 @@ public CumulativeSumAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage
 			}
 		};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.ShouldBeValid();
-
-			var projectsPerMonth = response.Aggregations.DateHistogram("projects_started_per_month");
-			projectsPerMonth.Should().NotBeNull();
-			projectsPerMonth.Buckets.Should().NotBeNull();
-			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
-
-			foreach (var item in projectsPerMonth.Buckets)
-			{
-				var commitsDerivative = item.Derivative("cumulative_commits");
-				commitsDerivative.Should().NotBeNull();
-				commitsDerivative.Value.Should().NotBe(null);
-			}
-		}
-
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.DateHistogram("projects_started_per_month", dh => dh
 				.Field(p => p.StartedOn)
@@ -83,5 +64,22 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 					new SumAggregation("commits", "numberOfCommits") &&
 					new CumulativeSumAggregation("cumulative_commits", "commits")
 			};
+
+		protected override void ExpectResponse(ISearchResponse<Project> response)
+		{
+			response.ShouldBeValid();
+
+			var projectsPerMonth = response.Aggregations.DateHistogram("projects_started_per_month");
+			projectsPerMonth.Should().NotBeNull();
+			projectsPerMonth.Buckets.Should().NotBeNull();
+			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
+
+			foreach (var item in projectsPerMonth.Buckets)
+			{
+				var commitsDerivative = item.Derivative("cumulative_commits");
+				commitsDerivative.Should().NotBeNull();
+				commitsDerivative.Value.Should().NotBe(null);
+			}
+		}
 	}
 }
diff --git a/src/Tests/Tests/Aggregations/Pipeline/Derivative/DerivativeAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/Derivative/DerivativeAggregationUsageTests.cs
index 234831420f1..fcd6f7de6b2 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/Derivative/DerivativeAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/Derivative/DerivativeAggregationUsageTests.cs
@@ -5,9 +5,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.Derivative
 {
@@ -44,24 +42,6 @@ public DerivativeAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage us
 			}
 		};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.ShouldBeValid();
-
-			var projectsPerMonth = response.Aggregations.DateHistogram("projects_started_per_month");
-			projectsPerMonth.Should().NotBeNull();
-			projectsPerMonth.Buckets.Should().NotBeNull();
-			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
-
-			// derivative not calculated for the first bucket
-			foreach (var item in projectsPerMonth.Buckets.Skip(1))
-			{
-				var commitsDerivative = item.Derivative("commits_derivative");
-				commitsDerivative.Should().NotBeNull();
-				commitsDerivative.Value.Should().NotBe(null);
-			}
-		}
-
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.DateHistogram("projects_started_per_month", dh => dh
 				.Field(p => p.StartedOn)
@@ -85,5 +65,23 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 					new SumAggregation("commits", "numberOfCommits") &&
 					new DerivativeAggregation("commits_derivative", "commits")
 			};
+
+		protected override void ExpectResponse(ISearchResponse<Project> response)
+		{
+			response.ShouldBeValid();
+
+			var projectsPerMonth = response.Aggregations.DateHistogram("projects_started_per_month");
+			projectsPerMonth.Should().NotBeNull();
+			projectsPerMonth.Buckets.Should().NotBeNull();
+			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
+
+			// derivative not calculated for the first bucket
+			foreach (var item in projectsPerMonth.Buckets.Skip(1))
+			{
+				var commitsDerivative = item.Derivative("commits_derivative");
+				commitsDerivative.Should().NotBeNull();
+				commitsDerivative.Value.Should().NotBe(null);
+			}
+		}
 	}
 }
diff --git a/src/Tests/Tests/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregationUsageTests.cs
index 76dfc572704..c0ee5acc3ab 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.ExtendedStatsBucket
 {
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MaxBucket/MaxBucketAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MaxBucket/MaxBucketAggregationUsageTests.cs
index 5b0bb2020f3..40ca8227c1e 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/MaxBucket/MaxBucketAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/MaxBucket/MaxBucketAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.MaxBucket
 {
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MinBucket/MinBucketAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MinBucket/MinBucketAggregationUsageTests.cs
index 6d5de21cc2b..eb701cc0640 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/MinBucket/MinBucketAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/MinBucket/MinBucketAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.MinBucket
 {
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageEwmaAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageEwmaAggregationUsageTests.cs
index 5d7206cb64a..6f7e8b010a1 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageEwmaAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageEwmaAggregationUsageTests.cs
@@ -6,9 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.MovingAverage
 {
@@ -96,7 +94,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
 
 			// average not calculated for the first bucket
-			foreach(var item in projectsPerMonth.Buckets.Skip(1))
+			foreach (var item in projectsPerMonth.Buckets.Skip(1))
 			{
 				var movingAvg = item.MovingAverage("commits_moving_avg");
 				movingAvg.Should().NotBeNull();
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltLinearAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltLinearAggregationUsageTests.cs
index 2ad3b0a13fa..2ef8c50589e 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltLinearAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltLinearAggregationUsageTests.cs
@@ -6,9 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.MovingAverage
 {
@@ -97,7 +95,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
 
 			// average not calculated for the first bucket
-			foreach(var item in projectsPerMonth.Buckets.Skip(1))
+			foreach (var item in projectsPerMonth.Buckets.Skip(1))
 			{
 				var movingAvg = item.MovingAverage("commits_moving_avg");
 				movingAvg.Should().NotBeNull();
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltWintersAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltWintersAggregationUsageTests.cs
index 875e91ac1b1..7f5a2954b41 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltWintersAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltWintersAggregationUsageTests.cs
@@ -5,9 +5,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.MovingAverage
 {
@@ -112,7 +110,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			projectsPerMonth.Buckets.Should().NotBeNull();
 			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
 
-			int bucketCount = 0;
+			var bucketCount = 0;
 			foreach (var item in projectsPerMonth.Buckets)
 			{
 				bucketCount++;
@@ -126,9 +124,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				// Moving Average specifies a window of 4 so
 				// moving average values should exist from 5th bucketr onwards
 				if (bucketCount <= 4)
-				{
 					movingAverage.Should().BeNull();
-				}
 				else
 				{
 					movingAverage.Should().NotBeNull();
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageLinearAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageLinearAggregationUsageTests.cs
index 08c437811f0..c4ae6c3f7a3 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageLinearAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageLinearAggregationUsageTests.cs
@@ -6,9 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.MovingAverage
 {
@@ -91,7 +89,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
 
 			// average not calculated for the first bucket
-			foreach(var item in projectsPerMonth.Buckets.Skip(1))
+			foreach (var item in projectsPerMonth.Buckets.Skip(1))
 			{
 				var movingAvg = item.MovingAverage("commits_moving_avg");
 				movingAvg.Should().NotBeNull();
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageSimpleAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageSimpleAggregationUsageTests.cs
index 2bef8d8d913..ca788ff2cdd 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageSimpleAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageSimpleAggregationUsageTests.cs
@@ -6,9 +6,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.MovingAverage
 {
@@ -94,7 +92,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
 
 			// average not calculated for the first bucket so movingAvg.Value is expected to be null there
-			foreach(var item in projectsPerMonth.Buckets.Skip(1))
+			foreach (var item in projectsPerMonth.Buckets.Skip(1))
 			{
 				var movingAvg = item.Sum("commits_moving_avg");
 				movingAvg.Should().NotBeNull();
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregationUsageTests.cs
index c563f3b6f40..34e07089fcd 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregationUsageTests.cs
@@ -6,7 +6,6 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
 
 namespace Tests.Aggregations.Pipeline.MovingFunction
@@ -98,7 +97,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			projectsPerMonth.Buckets.Count.Should().BeGreaterThan(0);
 
 			// average not calculated for the first bucket
-			foreach(var item in projectsPerMonth.Buckets.Skip(1))
+			foreach (var item in projectsPerMonth.Buckets.Skip(1))
 			{
 				var movingAvg = item.Sum("commits_moving_avg");
 				movingAvg.Should().NotBeNull();
diff --git a/src/Tests/Tests/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregationUsageTests.cs
index fae8f67c4fc..1f4b1f130d0 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.PercentilesBucket
 {
@@ -39,7 +37,7 @@ public PercentilesBucketAggregationUsageTests(ReadOnlyCluster cluster, EndpointU
 				percentiles_bucket = new
 				{
 					buckets_path = "projects_started_per_month>commits",
-					percents = new[] {95.0, 99.0, 99.9}
+					percents = new[] { 95.0, 99.0, 99.9 }
 				}
 			}
 		};
@@ -68,7 +66,7 @@ public PercentilesBucketAggregationUsageTests(ReadOnlyCluster cluster, EndpointU
 			}
 			&& new PercentilesBucketAggregation("commits_outlier", "projects_started_per_month>commits")
 			{
-				Percents = new[] {95, 99, 99.9}
+				Percents = new[] { 95, 99, 99.9 }
 			};
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
diff --git a/src/Tests/Tests/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregationUsageTests.cs
index 3f39554c1c6..def93ba9233 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.SerialDifferencing
 {
@@ -95,9 +93,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				// serial differencing specified a lag of 2, so
 				// only expect values from the 3rd bucket onwards
 				if (differenceCount <= 2)
-				{
 					secondDifference.Should().BeNull();
-				}
 				else
 				{
 					secondDifference.Should().NotBeNull();
diff --git a/src/Tests/Tests/Aggregations/Pipeline/StatsBucket/StatsBucketAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/StatsBucket/StatsBucketAggregationUsageTests.cs
index 7b2fd296977..a72e082fb64 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/StatsBucket/StatsBucketAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/StatsBucket/StatsBucketAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.StatsBucket
 {
diff --git a/src/Tests/Tests/Aggregations/Pipeline/SumBucket/SumBucketAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/SumBucket/SumBucketAggregationUsageTests.cs
index e4df3a4bec4..d0d75ad91d9 100644
--- a/src/Tests/Tests/Aggregations/Pipeline/SumBucket/SumBucketAggregationUsageTests.cs
+++ b/src/Tests/Tests/Aggregations/Pipeline/SumBucket/SumBucketAggregationUsageTests.cs
@@ -4,9 +4,7 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Aggregations.Pipeline.SumBucket
 {
diff --git a/src/Tests/Tests/Analysis/AnalysisComponentTestBase.cs b/src/Tests/Tests/Analysis/AnalysisComponentTestBase.cs
index 3683e45be95..8dbfb556d93 100644
--- a/src/Tests/Tests/Analysis/AnalysisComponentTestBase.cs
+++ b/src/Tests/Tests/Analysis/AnalysisComponentTestBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Elastic.Xunit;
 using Elastic.Xunit.XunitPlumbing;
@@ -14,14 +13,15 @@ namespace Tests.Analysis
 {
 	public interface IAnalysisAssertion
 	{
-		string Name { get; }
 		object Json { get; }
+		string Name { get; }
 	}
+
 	public interface IAnalysisAssertion<out TComponent, out TContainer, in TDescriptor> : IAnalysisAssertion
 		where TContainer : class
 	{
-		TComponent Initializer { get; }
 		Func<string, TDescriptor, IPromise<TContainer>> Fluent { get; }
+		TComponent Initializer { get; }
 	}
 
 	[IntegrationTestCluster(typeof(WritableCluster))]
@@ -32,51 +32,53 @@ public abstract class AnalysisComponentTestBase<TAssertion, TComponent, TContain
 	{
 		private static readonly SingleEndpointUsage<ICreateIndexResponse> Usage = new SingleEndpointUsage<ICreateIndexResponse>
 		(
-			fluent: (s, c) => c.CreateIndex(s, AssertionSetup.FluentCall),
-			fluentAsync: (s, c) => c.CreateIndexAsync(s, AssertionSetup.FluentCall),
-			request: (s, c) => c.CreateIndex(AssertionSetup.InitializerCall(s)),
-			requestAsync: (s, c) => c.CreateIndexAsync(AssertionSetup.InitializerCall(s)),
-			valuePrefix: $"test-{typeof(TAssertion).Name.ToLowerInvariant()}"
+			(s, c) => c.CreateIndex(s, AssertionSetup.FluentCall),
+			(s, c) => c.CreateIndexAsync(s, AssertionSetup.FluentCall),
+			(s, c) => c.CreateIndex(AssertionSetup.InitializerCall(s)),
+			(s, c) => c.CreateIndexAsync(AssertionSetup.InitializerCall(s)),
+			$"test-{typeof(TAssertion).Name.ToLowerInvariant()}"
 		)
 		{
-			OnAfterCall = c=> c.DeleteIndex(Usage.CallUniqueValues.Value)
+			OnAfterCall = c => c.DeleteIndex(Usage.CallUniqueValues.Value)
 		};
-		protected static TAssertion AssertionSetup { get; } = new TAssertion();
 
 		protected AnalysisComponentTestBase()
 		{
-			this.Client = (ElasticXunitRunner.CurrentCluster as INestTestCluster)?.Client ?? TestClient.DefaultInMemoryClient;
-			Usage.KickOffOnce(this.Client, oneRandomCall: true);
+			Client = (ElasticXunitRunner.CurrentCluster as INestTestCluster)?.Client ?? TestClient.DefaultInMemoryClient;
+			Usage.KickOffOnce(Client, true);
 		}
 
-		private IElasticClient Client { get; }
-
-		public abstract string Name { get; }
-		public abstract TComponent Initializer { get; }
 		public abstract Func<string, TDescriptor, IPromise<TContainer>> Fluent { get; }
+		public abstract TComponent Initializer { get; }
 		public abstract object Json { get; }
 
-		private Func<CreateIndexDescriptor, ICreateIndexRequest> FluentCall => i =>i.Settings(s => s.Analysis(this.FluentAnalysis));
+		public abstract string Name { get; }
+
+		protected abstract object AnalysisJson { get; }
+		protected static TAssertion AssertionSetup { get; } = new TAssertion();
+
+		private IElasticClient Client { get; }
+
+		private Func<CreateIndexDescriptor, ICreateIndexRequest> FluentCall => i => i.Settings(s => s.Analysis(FluentAnalysis));
+
 		protected abstract IAnalysis FluentAnalysis(AnalysisDescriptor an);
 
 		private CreateIndexRequest InitializerCall(string index) => new CreateIndexRequest(index)
 		{
-			Settings = new IndexSettings { Analysis = this.InitializerAnalysis() }
+			Settings = new IndexSettings { Analysis = InitializerAnalysis() }
 		};
+
 		protected abstract Nest.Analysis InitializerAnalysis();
 
 		[U] public virtual async Task TestPutSettingsRequest() => await Usage.AssertOnAllResponses(r =>
 		{
-			var json = new { settings = new { analysis = this.AnalysisJson } };
+			var json = new { settings = new { analysis = AnalysisJson } };
 			SerializationTestHelper.Expect(json).FromRequest(r);
 		});
 
-		protected abstract object AnalysisJson { get; }
-
 		[I] public virtual async Task TestPutSettingsResponse() => await Usage.AssertOnAllResponses(r =>
 		{
 			r.ApiCall.HttpStatusCode.Should().Be(200);
 		});
-
 	}
 }
diff --git a/src/Tests/Tests/Analysis/AnalysisCrudTests.cs b/src/Tests/Tests/Analysis/AnalysisCrudTests.cs
index 4ca45a20628..4ca403e7d20 100644
--- a/src/Tests/Tests/Analysis/AnalysisCrudTests.cs
+++ b/src/Tests/Tests/Analysis/AnalysisCrudTests.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using FluentAssertions;
 using Nest;
-using Tests.Analysis.Tokenizers;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
@@ -10,10 +9,11 @@
 
 namespace Tests.Analysis
 {
-
 	public class AnalysisCrudTests
 		: CrudWithNoDeleteTestBase<ICreateIndexResponse, IGetIndexSettingsResponse, IUpdateIndexSettingsResponse>
 	{
+		public AnalysisCrudTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		/**
 		* == Analysis crud
 		*
@@ -23,18 +23,16 @@ public class AnalysisCrudTests
 		*/
 		protected override bool SupportsDeletes => false;
 
-		public AnalysisCrudTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		/**
 		* We can create the analysis settings as part of the create index call
 		*/
 		protected override LazyResponses Create() => Calls<CreateIndexDescriptor, CreateIndexRequest, ICreateIndexRequest, ICreateIndexResponse>(
 			CreateInitializer,
 			CreateFluent,
-			fluent: (s, c, f) => c.CreateIndex(s, f),
-			fluentAsync: (s, c, f) => c.CreateIndexAsync(s, f),
-			request: (s, c, r) => c.CreateIndex(r),
-			requestAsync: (s, c, r) => c.CreateIndexAsync(r)
+			(s, c, f) => c.CreateIndex(s, f),
+			(s, c, f) => c.CreateIndexAsync(s, f),
+			(s, c, r) => c.CreateIndex(r),
+			(s, c, r) => c.CreateIndexAsync(r)
 		);
 
 		protected virtual CreateIndexRequest CreateInitializer(string indexName) => new CreateIndexRequest(indexName)
@@ -65,16 +63,18 @@ protected virtual ICreateIndexRequest CreateFluent(string indexName, CreateIndex
 		/**
 		* We then read back the analysis settings using `GetIndexSettings()`, you can use this method to get the settings for 1, or many indices in one go
 		*/
-		protected override LazyResponses Read() => Calls<GetIndexSettingsDescriptor, GetIndexSettingsRequest, IGetIndexSettingsRequest, IGetIndexSettingsResponse>(
-			GetInitializer,
-			GetFluent,
-			fluent: (s, c, f) => c.GetIndexSettings(f),
-			fluentAsync: (s, c, f) => c.GetIndexSettingsAsync(f),
-			request: (s, c, r) => c.GetIndexSettings(r),
-			requestAsync: (s, c, r) => c.GetIndexSettingsAsync(r)
-		);
+		protected override LazyResponses Read() =>
+			Calls<GetIndexSettingsDescriptor, GetIndexSettingsRequest, IGetIndexSettingsRequest, IGetIndexSettingsResponse>(
+				GetInitializer,
+				GetFluent,
+				(s, c, f) => c.GetIndexSettings(f),
+				(s, c, f) => c.GetIndexSettingsAsync(f),
+				(s, c, r) => c.GetIndexSettings(r),
+				(s, c, r) => c.GetIndexSettingsAsync(r)
+			);
 
 		protected GetIndexSettingsRequest GetInitializer(string indexName) => new GetIndexSettingsRequest(Nest.Indices.Index(indexName)) { };
+
 		protected IGetIndexSettingsRequest GetFluent(string indexName, GetIndexSettingsDescriptor u) => u.Index(indexName);
 
 		/**
@@ -98,39 +98,40 @@ protected override void ExpectAfterCreate(IGetIndexSettingsResponse response)
 		/**
 		* Elasticsearch has an `UpdateIndexSettings()` call but in order to be able to use it you first need to close the index and reopen it afterwards
 		*/
-		protected override LazyResponses Update() => Calls<UpdateIndexSettingsDescriptor, UpdateIndexSettingsRequest, IUpdateIndexSettingsRequest, IUpdateIndexSettingsResponse>(
-			UpdateInitializer,
-			UpdateFluent,
-			fluent: (s, c, f) =>
-			{
-				c.CloseIndex(s);
-				var response = c.UpdateIndexSettings(s, f);
-				c.OpenIndex(s);
-				return response;
-			}
-			,
-			fluentAsync: async (s, c, f) =>
-			{
-				c.CloseIndex(s);
-				var response = await c.UpdateIndexSettingsAsync(s, f);
-				c.OpenIndex(s);
-				return response;
-			},
-			request: (s, c, r) =>
-			{
-				c.CloseIndex(s);
-				var response = c.UpdateIndexSettings(r);
-				c.OpenIndex(s);
-				return response;
-			},
-			requestAsync: async (s, c, r) =>
-			{
-				c.CloseIndex(s);
-				var response = await c.UpdateIndexSettingsAsync(r);
-				c.OpenIndex(s);
-				return response;
-			}
-		);
+		protected override LazyResponses Update() =>
+			Calls<UpdateIndexSettingsDescriptor, UpdateIndexSettingsRequest, IUpdateIndexSettingsRequest, IUpdateIndexSettingsResponse>(
+				UpdateInitializer,
+				UpdateFluent,
+				(s, c, f) =>
+				{
+					c.CloseIndex(s);
+					var response = c.UpdateIndexSettings(s, f);
+					c.OpenIndex(s);
+					return response;
+				}
+				,
+				async (s, c, f) =>
+				{
+					c.CloseIndex(s);
+					var response = await c.UpdateIndexSettingsAsync(s, f);
+					c.OpenIndex(s);
+					return response;
+				},
+				(s, c, r) =>
+				{
+					c.CloseIndex(s);
+					var response = c.UpdateIndexSettings(r);
+					c.OpenIndex(s);
+					return response;
+				},
+				async (s, c, r) =>
+				{
+					c.CloseIndex(s);
+					var response = await c.UpdateIndexSettingsAsync(r);
+					c.OpenIndex(s);
+					return response;
+				}
+			);
 
 		/**
 		* Here we add a new `HtmlStripCharFilter` called `differentHtml`
@@ -142,7 +143,7 @@ protected override LazyResponses Update() => Calls<UpdateIndexSettingsDescriptor
 			{
 				Analysis = new Nest.Analysis
 				{
-					CharFilters = new Nest.CharFilters {{"differentHtml", new HtmlStripCharFilter {}}}
+					CharFilters = new Nest.CharFilters { { "differentHtml", new HtmlStripCharFilter { } } }
 				}
 			}
 		};
diff --git a/src/Tests/Tests/Analysis/AnalysisUsageTests.cs b/src/Tests/Tests/Analysis/AnalysisUsageTests.cs
index 9205d7e5f77..81d29870dc7 100644
--- a/src/Tests/Tests/Analysis/AnalysisUsageTests.cs
+++ b/src/Tests/Tests/Analysis/AnalysisUsageTests.cs
@@ -32,44 +32,63 @@ [U] public static void CollectionsShouldNotBeEmpty()
 
 	public static class AnalysisUsageTests
 	{
+		public static IndexSettings AnalyzersFluent =>
+			Fluent<AnalyzersDescriptor, IAnalyzerAssertion, IAnalyzers>(i => i.Fluent, (a, v) => a.Analyzers = v.Value);
 
-		public static IndexSettings NormalizersFluent => Fluent<NormalizersDescriptor, INormalizerAssertion, INormalizers>(i => i.Fluent, (a, v) => a.Normalizers = v.Value);
+		public static IndexSettings AnalyzersInitializer =>
+			Init<Nest.Analyzers, IAnalyzerAssertion, IAnalyzer>(i => i.Initializer, (a, v) => a.Analyzers = v);
 
-		public static IndexSettings AnalyzersFluent => Fluent<AnalyzersDescriptor, IAnalyzerAssertion, IAnalyzers>(i => i.Fluent, (a, v) => a.Analyzers = v.Value);
+		public static IndexSettings CharFiltersFluent =>
+			Fluent<CharFiltersDescriptor, ICharFilterAssertion, ICharFilters>(i => i.Fluent, (a, v) => a.CharFilters = v.Value);
 
-		public static IndexSettings TokenizersFluent => Fluent<TokenizersDescriptor, ITokenizerAssertion, ITokenizers>(i => i.Fluent, (a, v) => a.Tokenizers = v.Value);
+		public static IndexSettings CharFiltersInitializer =>
+			Init<Nest.CharFilters, ICharFilterAssertion, ICharFilter>(i => i.Initializer, (a, v) => a.CharFilters = v);
 
-		public static IndexSettings TokenFiltersFluent => Fluent<TokenFiltersDescriptor, ITokenFilterAssertion, ITokenFilters>(i => i.Fluent, (a, v) => a.TokenFilters = v.Value);
+		public static IndexSettings NormalizersFluent =>
+			Fluent<NormalizersDescriptor, INormalizerAssertion, INormalizers>(i => i.Fluent, (a, v) => a.Normalizers = v.Value);
 
-		public static IndexSettings CharFiltersFluent => Fluent<CharFiltersDescriptor, ICharFilterAssertion, ICharFilters>(i => i.Fluent, (a, v) => a.CharFilters = v.Value);
+		public static IndexSettings NormalizersInitializer =>
+			Init<Nest.Normalizers, INormalizerAssertion, INormalizer>(i => i.Initializer, (a, v) => a.Normalizers = v);
 
-		public static IndexSettings NormalizersInitializer => Init<Nest.Normalizers, INormalizerAssertion, INormalizer>(i => i.Initializer, (a, v) => a.Normalizers = v);
+		public static IndexSettings TokenFiltersFluent =>
+			Fluent<TokenFiltersDescriptor, ITokenFilterAssertion, ITokenFilters>(i => i.Fluent, (a, v) => a.TokenFilters = v.Value);
 
-		public static IndexSettings AnalyzersInitializer => Init<Nest.Analyzers, IAnalyzerAssertion, IAnalyzer>(i => i.Initializer, (a, v) => a.Analyzers = v);
+		public static IndexSettings TokenFiltersInitializer =>
+			Init<Nest.TokenFilters, ITokenFilterAssertion, ITokenFilter>(i => i.Initializer, (a, v) => a.TokenFilters = v);
 
-		public static IndexSettings TokenizersInitializer => Init<Nest.Tokenizers, ITokenizerAssertion, ITokenizer>(i => i.Initializer, (a, v) => a.Tokenizers = v);
+		public static IndexSettings TokenizersFluent =>
+			Fluent<TokenizersDescriptor, ITokenizerAssertion, ITokenizers>(i => i.Fluent, (a, v) => a.Tokenizers = v.Value);
 
-		public static IndexSettings TokenFiltersInitializer => Init<Nest.TokenFilters, ITokenFilterAssertion, ITokenFilter>(i => i.Initializer, (a, v) => a.TokenFilters = v);
+		public static IndexSettings TokenizersInitializer =>
+			Init<Nest.Tokenizers, ITokenizerAssertion, ITokenizer>(i => i.Initializer, (a, v) => a.Tokenizers = v);
 
-		public static IndexSettings CharFiltersInitializer => Init<Nest.CharFilters, ICharFilterAssertion, ICharFilter>(i => i.Initializer, (a, v) => a.CharFilters = v);
-
-		private static IndexSettings Fluent<TContainer, TAssertion, TValue>(Func<TAssertion, Func<string, TContainer, IPromise<TValue>>> fluent, Action<Nest.Analysis, IPromise<TValue>> set)
+		private static IndexSettings Fluent<TContainer, TAssertion, TValue>(Func<TAssertion, Func<string, TContainer, IPromise<TValue>>> fluent,
+			Action<Nest.Analysis, IPromise<TValue>> set
+		)
 			where TAssertion : IAnalysisAssertion
 			where TContainer : IPromise<TValue>, new()
 			where TValue : class => Wrap(an => set(an, Apply<TContainer, TAssertion>((t, a) => fluent(a)(a.Name, t))));
 
-		private static IndexSettings Init<TContainer, TAssertion, TInitializer>(Func<TAssertion, TInitializer> value, Action<Nest.Analysis, TContainer> set)
+		private static IndexSettings Init<TContainer, TAssertion, TInitializer>(Func<TAssertion, TInitializer> value,
+			Action<Nest.Analysis, TContainer> set
+		)
 			where TAssertion : IAnalysisAssertion
-			where TContainer : IDictionary<string, TInitializer>, new() => Wrap(an => set(an, Apply<TContainer, TAssertion>((t, a) => t[a.Name] = value(a))));
+			where TContainer : IDictionary<string, TInitializer>, new() =>
+			Wrap(an => set(an, Apply<TContainer, TAssertion>((t, a) => t[a.Name] = value(a))));
 
 		private static TContainer Apply<TContainer, TAssertion>(Action<TContainer, TAssertion> act)
 			where TAssertion : IAnalysisAssertion
-			where TContainer : new() => All<TAssertion>().Aggregate(new TContainer() , (t,a) => { act(t,a); return t; }, t=>t);
+			where TContainer : new() => All<TAssertion>()
+			.Aggregate(new TContainer(), (t, a) =>
+			{
+				act(t, a);
+				return t;
+			}, t => t);
 
 		private static IndexSettings Wrap(Action<Nest.Analysis> set)
 		{
 			var a = new Nest.Analysis();
-			var s =new IndexSettings { Analysis = a };
+			var s = new IndexSettings { Analysis = a };
 			set(a);
 			return s;
 		}
@@ -95,10 +114,8 @@ private static List<TAssertion> All<TAssertion>()
 					a = t.GetCustomAttributes(typeof(SkipVersionAttribute)).FirstOrDefault() as SkipVersionAttribute
 				})
 				.Where(@t1 => @t1.a == null || !@t1.a.Ranges.Any(r => r.IsSatisfied(TestClient.Configuration.ElasticsearchVersion)))
-				.Select(@t1 => (TAssertion) Activator.CreateInstance(@t1.t));
+				.Select(@t1 => (TAssertion)Activator.CreateInstance(@t1.t));
 			return types.ToList();
 		}
-
-
 	}
 }
diff --git a/src/Tests/Tests/Analysis/AnalysisWithNormalizerCrudTests.cs b/src/Tests/Tests/Analysis/AnalysisWithNormalizerCrudTests.cs
index 0832c9d1c2b..6bc59a3d6a9 100644
--- a/src/Tests/Tests/Analysis/AnalysisWithNormalizerCrudTests.cs
+++ b/src/Tests/Tests/Analysis/AnalysisWithNormalizerCrudTests.cs
@@ -1,5 +1,4 @@
 using Nest;
-using Tests.Analysis.Tokenizers;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.Integration;
 using static Tests.Framework.Promisify;
diff --git a/src/Tests/Tests/Analysis/Analyzers/AnalyzerAssertionBase.cs b/src/Tests/Tests/Analysis/Analyzers/AnalyzerAssertionBase.cs
index aeee879a7bb..ae69ecc3325 100644
--- a/src/Tests/Tests/Analysis/Analyzers/AnalyzerAssertionBase.cs
+++ b/src/Tests/Tests/Analysis/Analyzers/AnalyzerAssertionBase.cs
@@ -12,18 +12,20 @@ public abstract class AnalyzerAssertionBase<TAssertion>
 			, IAnalyzerAssertion
 		where TAssertion : AnalyzerAssertionBase<TAssertion>, new()
 	{
+		protected override object AnalysisJson => new
+		{
+			analyzer = new Dictionary<string, object> { { AssertionSetup.Name, AssertionSetup.Json } }
+		};
+
 		protected override IAnalysis FluentAnalysis(AnalysisDescriptor an) =>
 			an.Analyzers(d => AssertionSetup.Fluent(AssertionSetup.Name, d));
 
 		protected override Nest.Analysis InitializerAnalysis() =>
-			new Nest.Analysis {Analyzers = new Nest.Analyzers {{AssertionSetup.Name, AssertionSetup.Initializer}}};
+			new Nest.Analysis { Analyzers = new Nest.Analyzers { { AssertionSetup.Name, AssertionSetup.Initializer } } };
 
-		protected override object AnalysisJson => new
-		{
-			analyzer = new Dictionary<string, object> { {AssertionSetup.Name, AssertionSetup.Json} }
-		};
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] public override Task TestPutSettingsRequest() => base.TestPutSettingsRequest();
+
 		[I] public override Task TestPutSettingsResponse() => base.TestPutSettingsResponse();
 	}
 }
diff --git a/src/Tests/Tests/Analysis/Analyzers/AnalyzerTests.cs b/src/Tests/Tests/Analysis/Analyzers/AnalyzerTests.cs
index b18c38cbe2c..a0e86e7692a 100644
--- a/src/Tests/Tests/Analysis/Analyzers/AnalyzerTests.cs
+++ b/src/Tests/Tests/Analysis/Analyzers/AnalyzerTests.cs
@@ -1,7 +1,6 @@
 using System;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Analysis.TokenFilters;
 
 namespace Tests.Analysis.Analyzers
 {
@@ -11,31 +10,21 @@ public class AnalyzerTests
 	{
 		public class KeywordTests : AnalyzerAssertionBase<KeywordTests>
 		{
-			public override string Name => "myKeyword";
+			public override FuncTokenizer Fluent => (n, an) => an.Keyword("myKeyword");
 
 			public override IAnalyzer Initializer =>
 				new KeywordAnalyzer();
 
-			public override FuncTokenizer Fluent => (n, an) => an.Keyword("myKeyword");
-
 			public override object Json => new
 			{
 				type = "keyword"
 			};
 
+			public override string Name => "myKeyword";
 		}
 
 		public class CustomTests : AnalyzerAssertionBase<CustomTests>
 		{
-			public override string Name => "myCustom";
-
-			public override IAnalyzer Initializer => new CustomAnalyzer
-			{
-				CharFilter = new[] {"html_strip"},
-				Tokenizer = "standard",
-				Filter = new []{"lowercase", "asciifolding" }
-			};
-
 			public override FuncTokenizer Fluent => (n, an) => an
 				.Custom("myCustom", a => a
 					.Filters("lowercase", "asciifolding")
@@ -43,110 +32,120 @@ public class CustomTests : AnalyzerAssertionBase<CustomTests>
 					.Tokenizer("standard")
 				);
 
+			public override IAnalyzer Initializer => new CustomAnalyzer
+			{
+				CharFilter = new[] { "html_strip" },
+				Tokenizer = "standard",
+				Filter = new[] { "lowercase", "asciifolding" }
+			};
+
 			public override object Json => new
 			{
 				type = "custom",
 				tokenizer = "standard",
-				filter = new[] {"lowercase", "asciifolding"},
-				char_filter = new[] {"html_strip"}
+				filter = new[] { "lowercase", "asciifolding" },
+				char_filter = new[] { "html_strip" }
 			};
 
+			public override string Name => "myCustom";
 		}
+
 		public class PatternTests : AnalyzerAssertionBase<PatternTests>
 		{
-			public override string Name => "myPattern ";
-
-			public override IAnalyzer Initializer => new PatternAnalyzer {Pattern = @"\w"};
-
 			public override FuncTokenizer Fluent => (n, an) => an.Pattern(n, a => a.Pattern(@"\w"));
 
-			public override object Json => new { type = "pattern", pattern = "\\w" };
+			public override IAnalyzer Initializer => new PatternAnalyzer { Pattern = @"\w" };
 
+			public override object Json => new { type = "pattern", pattern = "\\w" };
+			public override string Name => "myPattern ";
 		}
+
 		public class SimpleTests : AnalyzerAssertionBase<SimpleTests>
 		{
-			public override string Name => "mySimple";
-
-			public override IAnalyzer Initializer => new SimpleAnalyzer();
-
 			public override FuncTokenizer Fluent => (n, an) => an.Simple("mySimple");
-			public override object Json => new {type = "simple"};
 
+			public override IAnalyzer Initializer => new SimpleAnalyzer();
+			public override object Json => new { type = "simple" };
+			public override string Name => "mySimple";
 		}
+
 		public class LanguageTests : AnalyzerAssertionBase<SimpleTests>
 		{
-			public override string Name => "myLanguage";
-
-			public override IAnalyzer Initializer => new LanguageAnalyzer {Language = Language.Dutch};
-
 			public override FuncTokenizer Fluent => (n, an) => an
 				.Language("myLanguage", a => a.Language(Language.Dutch));
 
-			public override object Json => new {type = "dutch"};
+			public override IAnalyzer Initializer => new LanguageAnalyzer { Language = Language.Dutch };
 
+			public override object Json => new { type = "dutch" };
+			public override string Name => "myLanguage";
 		}
+
 		public class SnowballTests : AnalyzerAssertionBase<SnowballTests>
 		{
-			public override string Name => "mySnow";
-
-			public override IAnalyzer Initializer => new SnowballAnalyzer {Language = SnowballLanguage.Dutch};
-
 			public override FuncTokenizer Fluent => (n, an) => an
 				.Snowball("mySnow", a => a.Language(SnowballLanguage.Dutch));
 
+			public override IAnalyzer Initializer => new SnowballAnalyzer { Language = SnowballLanguage.Dutch };
+
 			public override object Json => new
 			{
 				type = "snowball",
 				language = "Dutch"
 			};
 
+			public override string Name => "mySnow";
 		}
+
 		public class StandardTests : AnalyzerAssertionBase<StandardTests>
 		{
-			public override string Name => "myStandard";
-
-			public override IAnalyzer Initializer => new StandardAnalyzer {MaxTokenLength = 2};
-
 			public override FuncTokenizer Fluent => (n, an) => an
 				.Standard("myStandard", a => a.MaxTokenLength(2));
 
+			public override IAnalyzer Initializer => new StandardAnalyzer { MaxTokenLength = 2 };
+
 			public override object Json => new
 			{
 				type = "standard",
 				max_token_length = 2
 			};
 
+			public override string Name => "myStandard";
 		}
+
 		public class StopTests : AnalyzerAssertionBase<StopTests>
 		{
-			public override string Name => "myStop";
-
-			public override IAnalyzer Initializer => new StopAnalyzer {StopwordsPath = "analysis/stopwords.txt"};
-
 			public override FuncTokenizer Fluent => (n, an) => an
 				.Stop("myStop", a => a.StopwordsPath("analysis/stopwords.txt"));
 
+			public override IAnalyzer Initializer => new StopAnalyzer { StopwordsPath = "analysis/stopwords.txt" };
+
 			public override object Json => new
 			{
 				type = "stop",
 				stopwords_path = "analysis/stopwords.txt"
 			};
 
+			public override string Name => "myStop";
 		}
+
 		public class WhitespaceTests : AnalyzerAssertionBase<WhitespaceTests>
 		{
-			public override string Name => "myWhiteSpace";
-
-			public override IAnalyzer Initializer => new WhitespaceAnalyzer();
-
 			public override FuncTokenizer Fluent => (n, an) => an.Whitespace(n);
-			public override object Json => new {type = "whitespace"};
 
+			public override IAnalyzer Initializer => new WhitespaceAnalyzer();
+			public override object Json => new { type = "whitespace" };
+			public override string Name => "myWhiteSpace";
 		}
 
 		public class FingerprintTests : AnalyzerAssertionBase<FingerprintTests>
 		{
-			public override string Name => "myFingerprint";
+			public override FuncTokenizer Fluent => (n, an) => an
+				.Fingerprint("myFingerprint", a => a
+					.PreserveOriginal()
+					.Separator(",")
+					.MaxOutputSize(100)
+					.StopWords("a", "he", "the")
+				);
 
 			public override IAnalyzer Initializer =>
 				new FingerprintAnalyzer
@@ -154,32 +153,28 @@ public class FingerprintTests : AnalyzerAssertionBase<FingerprintTests>
 					PreserveOriginal = true,
 					Separator = ",",
 					MaxOutputSize = 100,
-					StopWords = new[] {"a", "he", "the"}
+					StopWords = new[] { "a", "he", "the" }
 				};
 
-			public override FuncTokenizer Fluent => (n, an) => an
-				.Fingerprint("myFingerprint", a => a
-					.PreserveOriginal()
-					.Separator(",")
-					.MaxOutputSize(100)
-					.StopWords("a", "he", "the")
-				);
-
 			public override object Json => new
 			{
 				type = "fingerprint",
 				preserve_original = true,
 				separator = ",",
 				max_output_size = 100,
-				stopwords = new[] {"a", "he", "the"}
+				stopwords = new[] { "a", "he", "the" }
 			};
 
+			public override string Name => "myFingerprint";
 		}
 
 
 		public class KuromojuTests : AnalyzerAssertionBase<KuromojuTests>
 		{
-			public override string Name => "kuro";
+			public override FuncTokenizer Fluent => (n, an) => an
+				.Kuromoji("kuro", a => a
+					.Mode(KuromojiTokenizationMode.Search)
+				);
 
 			public override IAnalyzer Initializer =>
 				new KuromojiAnalyzer
@@ -187,40 +182,39 @@ public class KuromojuTests : AnalyzerAssertionBase<KuromojuTests>
 					Mode = KuromojiTokenizationMode.Search
 				};
 
-			public override FuncTokenizer Fluent => (n, an) => an
-				.Kuromoji("kuro", a => a
-					.Mode(KuromojiTokenizationMode.Search)
-				);
-
 			public override object Json => new
 			{
 				type = "kuromoji",
 				mode = "search"
 			};
+
+			public override string Name => "kuro";
 		}
 
 		[SkipVersion("<6.4.0", "analysis-nori plugin introduced in 6.4.0")]
 		public class NoriTests : AnalyzerAssertionBase<NoriTests>
 		{
-			public override string Name => "nori";
-			private readonly string[] _stopTags = {"NR", "SP"};
-			public override IAnalyzer Initializer => new NoriAnalyzer
-			{
-				StopTags = _stopTags,
-				DecompoundMode = NoriDecompoundMode.Mixed
-			};
+			private readonly string[] _stopTags = { "NR", "SP" };
 
 			public override FuncTokenizer Fluent => (n, t) => t.Nori(n, e => e
 				.StopTags(_stopTags)
 				.DecompoundMode(NoriDecompoundMode.Mixed)
 			);
 
+			public override IAnalyzer Initializer => new NoriAnalyzer
+			{
+				StopTags = _stopTags,
+				DecompoundMode = NoriDecompoundMode.Mixed
+			};
+
 			public override object Json => new
 			{
 				type = "nori",
 				decompound_mode = "mixed",
-				stoptags =_stopTags
+				stoptags = _stopTags
 			};
+
+			public override string Name => "nori";
 		}
 	}
 }
diff --git a/src/Tests/Tests/Analysis/CharFilters/CharFilterAssertionBase.cs b/src/Tests/Tests/Analysis/CharFilters/CharFilterAssertionBase.cs
index ba1bafba1f6..6dc069dbe1d 100644
--- a/src/Tests/Tests/Analysis/CharFilters/CharFilterAssertionBase.cs
+++ b/src/Tests/Tests/Analysis/CharFilters/CharFilterAssertionBase.cs
@@ -12,18 +12,20 @@ public abstract class CharFilterAssertionBase<TAssertion>
 			, ICharFilterAssertion
 		where TAssertion : CharFilterAssertionBase<TAssertion>, new()
 	{
+		protected override object AnalysisJson => new
+		{
+			char_filter = new Dictionary<string, object> { { AssertionSetup.Name, AssertionSetup.Json } }
+		};
+
 		protected override IAnalysis FluentAnalysis(AnalysisDescriptor an) =>
 			an.CharFilters(d => AssertionSetup.Fluent(AssertionSetup.Name, d));
 
 		protected override Nest.Analysis InitializerAnalysis() =>
-			new Nest.Analysis {CharFilters = new Nest.CharFilters {{AssertionSetup.Name, AssertionSetup.Initializer}}};
+			new Nest.Analysis { CharFilters = new Nest.CharFilters { { AssertionSetup.Name, AssertionSetup.Initializer } } };
 
-		protected override object AnalysisJson => new
-		{
-			char_filter = new Dictionary<string, object> { {AssertionSetup.Name, AssertionSetup.Json} }
-		};
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] public override Task TestPutSettingsRequest() => base.TestPutSettingsRequest();
+
 		[I] public override Task TestPutSettingsResponse() => base.TestPutSettingsResponse();
 	}
 }
diff --git a/src/Tests/Tests/Analysis/CharFilters/CharFilterTests.cs b/src/Tests/Tests/Analysis/CharFilters/CharFilterTests.cs
index 0cbd28b0c81..8d4023349df 100644
--- a/src/Tests/Tests/Analysis/CharFilters/CharFilterTests.cs
+++ b/src/Tests/Tests/Analysis/CharFilters/CharFilterTests.cs
@@ -9,23 +9,27 @@ public class CharFilterTests
 	{
 		public class MappingTests : CharFilterAssertionBase<MappingTests>
 		{
-			public override string Name => "mapping";
-			public override ICharFilter Initializer => new MappingCharFilter {Mappings = new[] {"a=>b"}};
 			public override FuncTokenizer Fluent => (n, cf) => cf.Mapping(n, c => c.Mappings("a=>b"));
-			public override object Json => new { mappings = new[] {"a=>b"}, type = "mapping" };
+			public override ICharFilter Initializer => new MappingCharFilter { Mappings = new[] { "a=>b" } };
+			public override object Json => new { mappings = new[] { "a=>b" }, type = "mapping" };
+			public override string Name => "mapping";
 		}
 
 		public class PatternReplaceTests : CharFilterAssertionBase<PatternReplaceTests>
 		{
-			public override string Name => "pr";
-			public override ICharFilter Initializer => new PatternReplaceCharFilter {Pattern = "x", Replacement = "y"};
 			public override FuncTokenizer Fluent => (n, cf) => cf.PatternReplace(n, c => c.Pattern("x").Replacement("y"));
-			public override object Json => new {pattern = "x", replacement = "y", type = "pattern_replace"};
+			public override ICharFilter Initializer => new PatternReplaceCharFilter { Pattern = "x", Replacement = "y" };
+			public override object Json => new { pattern = "x", replacement = "y", type = "pattern_replace" };
+			public override string Name => "pr";
 		}
 
 		public class IcuNormalizerTests : CharFilterAssertionBase<IcuNormalizerTests>
 		{
-			public override string Name => "icunorm";
+			public override FuncTokenizer Fluent => (n, cf) => cf
+				.IcuNormalization(n, c => c
+					.Mode(IcuNormalizationMode.Compose)
+					.Name(IcuNormalizationType.CompatibilityCaseFold)
+				);
 
 			public override ICharFilter Initializer =>
 				new IcuNormalizationCharFilter
@@ -34,41 +38,34 @@ public class IcuNormalizerTests : CharFilterAssertionBase<IcuNormalizerTests>
 					Name = IcuNormalizationType.CompatibilityCaseFold
 				};
 
-			public override FuncTokenizer Fluent => (n, cf) => cf
-				.IcuNormalization(n, c => c
-					.Mode(IcuNormalizationMode.Compose)
-					.Name(IcuNormalizationType.CompatibilityCaseFold)
-				);
-
-			public override object Json => new {mode = "compose", name = "nfkc_cf", type = "icu_normalizer"};
-
+			public override object Json => new { mode = "compose", name = "nfkc_cf", type = "icu_normalizer" };
+			public override string Name => "icunorm";
 		}
 
 		public class KuromojiIterationMarkTests : CharFilterAssertionBase<KuromojiIterationMarkTests>
 		{
-			public override string Name => "kmark";
+			public override FuncTokenizer Fluent =>
+				(n, cf) => cf.KuromojiIterationMark("kmark", c => c.NormalizeKana().NormalizeKanji());
 
 			public override ICharFilter Initializer =>
 				new KuromojiIterationMarkCharFilter { NormalizeKana = true, NormalizeKanji = true };
 
-			public override FuncTokenizer Fluent =>
-				(n, cf) => cf.KuromojiIterationMark("kmark", c => c.NormalizeKana().NormalizeKanji());
-
 			public override object Json => new
 			{
 				normalize_kanji = true,
 				normalize_kana = true,
 				type = "kuromoji_iteration_mark"
 			};
+
+			public override string Name => "kmark";
 		}
 
 		public class HtmlStripTests : CharFilterAssertionBase<HtmlStripTests>
 		{
-			public override string Name => "htmls";
-			public override ICharFilter Initializer => new HtmlStripCharFilter { };
 			public override FuncTokenizer Fluent => (n, cf) => cf.HtmlStrip(n);
-			public override object Json => new {type = "html_strip"};
+			public override ICharFilter Initializer => new HtmlStripCharFilter { };
+			public override object Json => new { type = "html_strip" };
+			public override string Name => "htmls";
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/Analysis/Normalizers/NormalizerAssertionBase.cs b/src/Tests/Tests/Analysis/Normalizers/NormalizerAssertionBase.cs
index 86ce05af883..ee5b6ed53ad 100644
--- a/src/Tests/Tests/Analysis/Normalizers/NormalizerAssertionBase.cs
+++ b/src/Tests/Tests/Analysis/Normalizers/NormalizerAssertionBase.cs
@@ -12,19 +12,20 @@ public abstract class NormalizerAssertionBase<TAssertion>
 			, INormalizerAssertion
 		where TAssertion : NormalizerAssertionBase<TAssertion>, new()
 	{
+		protected override object AnalysisJson => new
+		{
+			normalizer = new Dictionary<string, object> { { AssertionSetup.Name, AssertionSetup.Json } }
+		};
+
 		protected override IAnalysis FluentAnalysis(AnalysisDescriptor an) =>
 			an.Normalizers(d => AssertionSetup.Fluent(AssertionSetup.Name, d));
 
 		protected override Nest.Analysis InitializerAnalysis() =>
-			new Nest.Analysis {Normalizers = new Nest.Normalizers {{AssertionSetup.Name, AssertionSetup.Initializer}}};
-
-		protected override object AnalysisJson => new
-		{
-			normalizer = new Dictionary<string, object> { {AssertionSetup.Name, AssertionSetup.Json} }
-		};
+			new Nest.Analysis { Normalizers = new Nest.Normalizers { { AssertionSetup.Name, AssertionSetup.Initializer } } };
 
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] public override Task TestPutSettingsRequest() => base.TestPutSettingsRequest();
+
 		[I] public override Task TestPutSettingsResponse() => base.TestPutSettingsResponse();
 	}
 }
diff --git a/src/Tests/Tests/Analysis/Normalizers/NormalizerTests.cs b/src/Tests/Tests/Analysis/Normalizers/NormalizerTests.cs
index 1265b37b7f6..6575baa1f5c 100644
--- a/src/Tests/Tests/Analysis/Normalizers/NormalizerTests.cs
+++ b/src/Tests/Tests/Analysis/Normalizers/NormalizerTests.cs
@@ -9,24 +9,23 @@ public class NormalizerTests
 	{
 		public class CustomTests : NormalizerAssertionBase<CustomTests>
 		{
-			public override string Name => "myCustom";
-
-			public override INormalizer Initializer => new CustomNormalizer
-			{
-				Filter = new[] {"lowercase", "asciifolding"},
-			};
-
 			public override FuncTokenizer Fluent => (n, an) => an
 				.Custom("myCustom", a => a
 					.Filters("lowercase", "asciifolding")
 				);
 
+			public override INormalizer Initializer => new CustomNormalizer
+			{
+				Filter = new[] { "lowercase", "asciifolding" },
+			};
+
 			public override object Json => new
 			{
 				type = "custom",
-				filter = new[] {"lowercase", "asciifolding"},
+				filter = new[] { "lowercase", "asciifolding" },
 			};
-		}
 
+			public override string Name => "myCustom";
+		}
 	}
 }
diff --git a/src/Tests/Tests/Analysis/TokenFilters/TokenFilterAssertionBase.cs b/src/Tests/Tests/Analysis/TokenFilters/TokenFilterAssertionBase.cs
index 9687ac69b2c..fdb4f82f322 100644
--- a/src/Tests/Tests/Analysis/TokenFilters/TokenFilterAssertionBase.cs
+++ b/src/Tests/Tests/Analysis/TokenFilters/TokenFilterAssertionBase.cs
@@ -12,20 +12,20 @@ public abstract class TokenFilterAssertionBase<TAssertion>
 			, ITokenFilterAssertion
 		where TAssertion : TokenFilterAssertionBase<TAssertion>, new()
 	{
+		protected override object AnalysisJson => new
+		{
+			filter = new Dictionary<string, object> { { AssertionSetup.Name, AssertionSetup.Json } }
+		};
+
 		protected override IAnalysis FluentAnalysis(AnalysisDescriptor an) =>
 			an.TokenFilters(d => AssertionSetup.Fluent(AssertionSetup.Name, d));
 
 		protected override Nest.Analysis InitializerAnalysis() =>
-			new Nest.Analysis {TokenFilters = new Nest.TokenFilters {{AssertionSetup.Name, AssertionSetup.Initializer}}};
-
-		protected override object AnalysisJson => new
-		{
-			filter = new Dictionary<string, object> { {AssertionSetup.Name, AssertionSetup.Json} }
-		};
+			new Nest.Analysis { TokenFilters = new Nest.TokenFilters { { AssertionSetup.Name, AssertionSetup.Initializer } } };
 
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] public override Task TestPutSettingsRequest() => base.TestPutSettingsRequest();
+
 		[I] public override Task TestPutSettingsResponse() => base.TestPutSettingsResponse();
 	}
-
 }
diff --git a/src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs b/src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
index 036e94badb5..5d216042d4c 100644
--- a/src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
+++ b/src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
@@ -1,7 +1,6 @@
 using System;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.Analysis.TokenFilters
 {
@@ -11,47 +10,53 @@ public static class TokenFilterTests
 	{
 		public class AsciiFoldingTests : TokenFilterAssertionBase<AsciiFoldingTests>
 		{
-			public override string Name => "ascii";
-			public override ITokenFilter Initializer => new AsciiFoldingTokenFilter {PreserveOriginal = true};
 			public override FuncTokenFilters Fluent => (n, tf) => tf.AsciiFolding(n, t => t.PreserveOriginal());
-			public override object Json => new {type = "asciifolding", preserve_original = true};
+			public override ITokenFilter Initializer => new AsciiFoldingTokenFilter { PreserveOriginal = true };
+			public override object Json => new { type = "asciifolding", preserve_original = true };
+			public override string Name => "ascii";
 		}
 
 		public class CommonGramsTests : TokenFilterAssertionBase<CommonGramsTests>
 		{
-			public override string Name => "mycomgram";
-
-			public override ITokenFilter Initializer =>
-				new CommonGramsTokenFilter {QueryMode = true, IgnoreCase = true, CommonWords = new[] {"x", "y", "z"}};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.CommonGrams(n, t => t.CommonWords("x", "y", "z").IgnoreCase().QueryMode());
 
+			public override ITokenFilter Initializer =>
+				new CommonGramsTokenFilter { QueryMode = true, IgnoreCase = true, CommonWords = new[] { "x", "y", "z" } };
+
 			public override object Json => new
 			{
 				type = "common_grams",
-				common_words = new[] {"x", "y", "z"},
+				common_words = new[] { "x", "y", "z" },
 				ignore_case = true,
 				query_mode = true
 			};
+
+			public override string Name => "mycomgram";
 		}
 
 		public class DelimitedPayloadFilterTests : TokenFilterAssertionBase<DelimitedPayloadFilterTests>
 		{
-			public override string Name => "mydp";
-
-			public override ITokenFilter Initializer =>
-				new DelimitedPayloadTokenFilter {Delimiter = '-', Encoding = DelimitedPayloadEncoding.Identity};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.DelimitedPayload(n, t => t.Delimiter('-').Encoding(DelimitedPayloadEncoding.Identity));
 
+			public override ITokenFilter Initializer =>
+				new DelimitedPayloadTokenFilter { Delimiter = '-', Encoding = DelimitedPayloadEncoding.Identity };
+
 			public override object Json => new { type = "delimited_payload_filter", delimiter = "-", encoding = "identity" };
+			public override string Name => "mydp";
 		}
 
 		public class DictionaryDecompounderTests : TokenFilterAssertionBase<DictionaryDecompounderTests>
 		{
-			public override string Name => "dcc";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.DictionaryDecompounder(n, t => t
+					.MaxSubwordSize(2)
+					.MinSubwordSize(2)
+					.MinWordSize(2)
+					.OnlyLongestMatch()
+					.WordList("x", "y", "z")
+				);
 
 			public override ITokenFilter Initializer =>
 				new DictionaryDecompounderTokenFilter
@@ -60,57 +65,52 @@ public class DictionaryDecompounderTests : TokenFilterAssertionBase<DictionaryDe
 					MinSubwordSize = 2,
 					MaxSubwordSize = 2,
 					OnlyLongestMatch = true,
-					WordList = new[] {"x", "y", "z"}
+					WordList = new[] { "x", "y", "z" }
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.DictionaryDecompounder(n, t => t
-					.MaxSubwordSize(2)
-					.MinSubwordSize(2)
-					.MinWordSize(2)
-					.OnlyLongestMatch()
-					.WordList("x", "y", "z")
-				);
-
 			public override object Json => new
 			{
 				type = "dictionary_decompounder",
-				word_list = new[] {"x", "y", "z"},
+				word_list = new[] { "x", "y", "z" },
 				min_word_size = 2,
 				min_subword_size = 2,
 				max_subword_size = 2,
 				only_longest_match = true
 			};
 
+			public override string Name => "dcc";
 		}
 
 		public class EdgeNgramTests : TokenFilterAssertionBase<EdgeNgramTests>
 		{
-			public override string Name => "etf";
-
-			public override ITokenFilter Initializer => new EdgeNGramTokenFilter {MaxGram = 2, MinGram = 1};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.EdgeNGram(n, t => t.MaxGram(2).MinGram(1));
 
-			public override object Json => new { type = "edge_ngram", min_gram = 1, max_gram = 2 };
+			public override ITokenFilter Initializer => new EdgeNGramTokenFilter { MaxGram = 2, MinGram = 1 };
 
+			public override object Json => new { type = "edge_ngram", min_gram = 1, max_gram = 2 };
+			public override string Name => "etf";
 		}
 
 		public class ElisionTests : TokenFilterAssertionBase<ElisionTests>
 		{
-			public override string Name => "el";
-
-			public override ITokenFilter Initializer => new ElisionTokenFilter {Articles = new[] {"a", "b", "c"}};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Elision(n, t => t.Articles("a", "b", "c"));
 
-			public override object Json => new { type = "elision", articles = new[] {"a", "b", "c"} };
+			public override ITokenFilter Initializer => new ElisionTokenFilter { Articles = new[] { "a", "b", "c" } };
+
+			public override object Json => new { type = "elision", articles = new[] { "a", "b", "c" } };
+			public override string Name => "el";
 		}
 
 		public class HunspellTests : TokenFilterAssertionBase<HunspellTests>
 		{
-			public override string Name => "huns";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.Hunspell(n, t => t
+					.Dedup()
+					.Dictionary("path_to_dict")
+					.Locale("en_US")
+					.LongestOnly()
+				);
 
 			public override ITokenFilter Initializer =>
 				new HunspellTokenFilter
@@ -121,14 +121,6 @@ public class HunspellTests : TokenFilterAssertionBase<HunspellTests>
 					LongestOnly = true
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.Hunspell(n, t => t
-					.Dedup()
-					.Dictionary("path_to_dict")
-					.Locale("en_US")
-					.LongestOnly()
-				);
-
 			public override object Json => new
 			{
 				type = "hunspell",
@@ -138,11 +130,20 @@ public class HunspellTests : TokenFilterAssertionBase<HunspellTests>
 				longest_only = true
 			};
 
+			public override string Name => "huns";
 		}
 
 		public class HyphenationDecompounderTests : TokenFilterAssertionBase<HyphenationDecompounderTests>
 		{
-			public override string Name => "hyphdecomp";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.HyphenationDecompounder(n, t => t
+					.MaxSubwordSize(2)
+					.MinSubwordSize(2)
+					.MinWordSize(2)
+					.OnlyLongestMatch()
+					.WordList("x", "y", "z")
+					.HyphenationPatternsPath("analysis/fop.xml")
+				);
 
 			public override ITokenFilter Initializer =>
 				new HyphenationDecompounderTokenFilter
@@ -151,24 +152,14 @@ public class HyphenationDecompounderTests : TokenFilterAssertionBase<Hyphenation
 					MinSubwordSize = 2,
 					MinWordSize = 2,
 					OnlyLongestMatch = true,
-					WordList = new[] {"x", "y", "z"},
+					WordList = new[] { "x", "y", "z" },
 					HyphenationPatternsPath = "analysis/fop.xml"
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.HyphenationDecompounder(n, t => t
-					.MaxSubwordSize(2)
-					.MinSubwordSize(2)
-					.MinWordSize(2)
-					.OnlyLongestMatch()
-					.WordList("x", "y", "z")
-					.HyphenationPatternsPath("analysis/fop.xml")
-				);
-
 			public override object Json => new
 			{
 				type = "hyphenation_decompounder",
-				word_list = new[] {"x", "y", "z"},
+				word_list = new[] { "x", "y", "z" },
 				min_word_size = 2,
 				min_subword_size = 2,
 				max_subword_size = 2,
@@ -176,26 +167,30 @@ public class HyphenationDecompounderTests : TokenFilterAssertionBase<Hyphenation
 				hyphenation_patterns_path = "analysis/fop.xml"
 			};
 
+			public override string Name => "hyphdecomp";
 		}
 
 		public class KeepTypesTests : TokenFilterAssertionBase<KeepTypesTests>
 		{
-			public override string Name => "keeptypes";
-
-			private readonly string[] _types = {"<NUM>", "<SOMETHINGELSE>"};
-
-			public override ITokenFilter Initializer => new KeepTypesTokenFilter {Types = _types};
+			private readonly string[] _types = { "<NUM>", "<SOMETHINGELSE>" };
 
 			public override FuncTokenFilters Fluent => (n, tf) => tf.KeepTypes(n, t => t.Types(_types));
 
+			public override ITokenFilter Initializer => new KeepTypesTokenFilter { Types = _types };
+
 			public override object Json => new { type = "keep_types", types = _types };
+			public override string Name => "keeptypes";
 		}
 
 		[SkipVersion("<6.4.0", "The mode option was introduced in https://github.com/elastic/elasticsearch/pull/32012")]
 		public class KeepTypesModeTests : TokenFilterAssertionBase<KeepTypesTests>
 		{
-			public override string Name => "keeptypes_mode";
-			private readonly string[] _types = {"<NUM>", "<SOMETHINGELSE>"};
+			private readonly string[] _types = { "<NUM>", "<SOMETHINGELSE>" };
+
+			public override FuncTokenFilters Fluent => (n, tf) => tf.KeepTypes(n, t => t
+				.Mode(KeepTypesMode.Exclude)
+				.Types(_types)
+			);
 
 			public override ITokenFilter Initializer => new KeepTypesTokenFilter
 			{
@@ -203,17 +198,25 @@ public class KeepTypesModeTests : TokenFilterAssertionBase<KeepTypesTests>
 				Types = _types
 			};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf.KeepTypes(n, t => t
-				.Mode(KeepTypesMode.Exclude)
-				.Types(_types)
-			);
-
 			public override object Json => new { type = "keep_types", types = _types, mode = "exclude" };
+			public override string Name => "keeptypes_mode";
 		}
 
 		public class IcuCollationTests : TokenFilterAssertionBase<IcuCollationTests>
 		{
-			public override string Name => "icuc";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.IcuCollation(n, t => t
+					.Alternate(IcuCollationAlternate.NonIgnorable)
+					.CaseFirst(IcuCollationCaseFirst.Lower)
+					.HiraganaQuaternaryMode()
+					.Decomposition(IcuCollationDecomposition.No)
+					.Numeric()
+					.CaseLevel()
+					.Country("DE")
+					.Language("de")
+					.Strength(IcuCollationStrength.Tertiary)
+					.Variant("@collation=phonebook")
+				);
 
 			public override ITokenFilter Initializer =>
 				new IcuCollationTokenFilter
@@ -230,20 +233,6 @@ public class IcuCollationTests : TokenFilterAssertionBase<IcuCollationTests>
 					Variant = "@collation=phonebook"
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.IcuCollation(n, t => t
-					.Alternate(IcuCollationAlternate.NonIgnorable)
-					.CaseFirst(IcuCollationCaseFirst.Lower)
-					.HiraganaQuaternaryMode()
-					.Decomposition(IcuCollationDecomposition.No)
-					.Numeric()
-					.CaseLevel()
-					.Country("DE")
-					.Language("de")
-					.Strength(IcuCollationStrength.Tertiary)
-					.Variant("@collation=phonebook")
-				);
-
 			public override object Json => new
 			{
 				alternate = "non-ignorable",
@@ -259,44 +248,47 @@ public class IcuCollationTests : TokenFilterAssertionBase<IcuCollationTests>
 				variant = "@collation=phonebook"
 			};
 
+			public override string Name => "icuc";
 		}
 
 		public class IcuFoldingTests : TokenFilterAssertionBase<IcuFoldingTests>
 		{
-			public override string Name => "icuf";
+			public override FuncTokenFilters Fluent => (n, tf) => tf.IcuFolding(n, t => t.UnicodeSetFilter("[^åäöÅÄÖ]"));
 
 			public override ITokenFilter Initializer =>
 				new IcuFoldingTokenFilter { UnicodeSetFilter = "[^åäöÅÄÖ]" };
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf.IcuFolding(n, t => t.UnicodeSetFilter("[^åäöÅÄÖ]"));
-
 			public override object Json => new
 			{
 				type = "icu_folding",
 				unicodeSetFilter = "[^åäöÅÄÖ]"
 			};
 
+			public override string Name => "icuf";
 		}
 
 		public class IcuNormalizerTests : TokenFilterAssertionBase<IcuNormalizerTests>
 		{
-			public override string Name => "icun";
+			public override FuncTokenFilters Fluent => (n, tf) => tf.IcuNormalization(n, t => t.Name(IcuNormalizationType.Canonical));
 
 			public override ITokenFilter Initializer => new IcuNormalizationTokenFilter { Name = IcuNormalizationType.Canonical };
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf .IcuNormalization(n, t => t.Name(IcuNormalizationType.Canonical));
-
 			public override object Json => new
 			{
 				name = "nfc",
 				type = "icu_normalizer"
 			};
 
+			public override string Name => "icun";
 		}
 
 		public class IcuTransformTests : TokenFilterAssertionBase<IcuTransformTests>
 		{
-			public override string Name => "icut";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.IcuTransform(n, t => t
+					.Direction(IcuTransformDirection.Forward)
+					.Id("Any-Latin; NFD; [:Nonspacing Mark:] Remove; NFC")
+				);
 
 			public override ITokenFilter Initializer =>
 				new IcuTransformTokenFilter
@@ -305,12 +297,6 @@ public class IcuTransformTests : TokenFilterAssertionBase<IcuTransformTests>
 					Id = "Any-Latin; NFD; [:Nonspacing Mark:] Remove; NFC"
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.IcuTransform(n, t => t
-					.Direction(IcuTransformDirection.Forward)
-					.Id("Any-Latin; NFD; [:Nonspacing Mark:] Remove; NFC")
-				);
-
 			public override object Json => new
 			{
 				dir = "forward",
@@ -318,78 +304,73 @@ public class IcuTransformTests : TokenFilterAssertionBase<IcuTransformTests>
 				type = "icu_transform"
 			};
 
+			public override string Name => "icut";
 		}
 
 		public class KeepwordsTests : TokenFilterAssertionBase<KeepwordsTests>
 		{
-			public override string Name => "keepwords";
-
-			public override ITokenFilter Initializer =>
-				new KeepWordsTokenFilter {KeepWordsCase = true, KeepWords = new[] {"a", "b", "c"}};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.KeepWords(n, t => t
 					.KeepWords("a", "b", "c")
 					.KeepWordsCase()
 				);
 
+			public override ITokenFilter Initializer =>
+				new KeepWordsTokenFilter { KeepWordsCase = true, KeepWords = new[] { "a", "b", "c" } };
+
 			public override object Json => new
 			{
 				type = "keep",
-				keep_words = new[] {"a", "b", "c"},
+				keep_words = new[] { "a", "b", "c" },
 				keep_words_case = true
 			};
 
+			public override string Name => "keepwords";
 		}
 
 		public class MarkerTests : TokenFilterAssertionBase<MarkerTests>
 		{
-			public override string Name => "marker";
-
-			public override ITokenFilter Initializer => new KeywordMarkerTokenFilter {IgnoreCase = true, Keywords = new[] {"a", "b"}};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.KeywordMarker("marker", t => t
 					.IgnoreCase()
 					.Keywords("a", "b")
 				);
 
+			public override ITokenFilter Initializer => new KeywordMarkerTokenFilter { IgnoreCase = true, Keywords = new[] { "a", "b" } };
+
 			public override object Json => new
 			{
 				type = "keyword_marker",
-				keywords = new[] {"a", "b"},
+				keywords = new[] { "a", "b" },
 				ignore_case = true
 			};
 
-
+			public override string Name => "marker";
 		}
 
 		public class KuromojiReadingFormTests : TokenFilterAssertionBase<KuromojiReadingFormTests>
 		{
-			public override string Name => "kfr";
-
-			public override ITokenFilter Initializer => new KuromojiReadingFormTokenFilter {UseRomaji = true};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.KuromojiReadingForm(n, t => t.UseRomaji());
 
+			public override ITokenFilter Initializer => new KuromojiReadingFormTokenFilter { UseRomaji = true };
+
 			public override object Json => new
 			{
 				type = "kuromoji_readingform",
 				use_romaji = true
 			};
 
+			public override string Name => "kfr";
 		}
 
 		public class KuromojiPartOfSpeechTests : TokenFilterAssertionBase<KuromojiPartOfSpeechTests>
 		{
-			public override string Name => "kpos";
-
-			public override ITokenFilter Initializer =>
-				new KuromojiPartOfSpeechTokenFilter {StopTags = new[] {"#  verb-main:", "動詞-自立"}};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.KuromojiPartOfSpeech(n, t => t.StopTags("#  verb-main:", "動詞-自立"));
 
+			public override ITokenFilter Initializer =>
+				new KuromojiPartOfSpeechTokenFilter { StopTags = new[] { "#  verb-main:", "動詞-自立" } };
+
 			public override object Json => new
 			{
 				stoptags = new[]
@@ -400,50 +381,46 @@ public class KuromojiPartOfSpeechTests : TokenFilterAssertionBase<KuromojiPartOf
 				type = "kuromoji_part_of_speech"
 			};
 
+			public override string Name => "kpos";
 		}
 
 		public class KuromojiStemmerTests : TokenFilterAssertionBase<KuromojiStemmerTests>
 		{
-			public override string Name => "ks";
-
-			public override ITokenFilter Initializer => new KuromojiStemmerTokenFilter {MinimumLength = 4};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.KuromojiStemmer(n, t => t.MinimumLength(4));
 
+			public override ITokenFilter Initializer => new KuromojiStemmerTokenFilter { MinimumLength = 4 };
+
 			public override object Json => new
 			{
 				minimum_length = 4,
 				type = "kuromoji_stemmer"
 			};
 
+			public override string Name => "ks";
 		}
 
 		public class KStemTests : TokenFilterAssertionBase<KStemTests>
 		{
-			public override string Name => "kstem";
-			public override ITokenFilter Initializer => new KStemTokenFilter { };
 			public override FuncTokenFilters Fluent => (n, tf) => tf.KStem(n);
-			public override object Json => new {type = "kstem"};
+			public override ITokenFilter Initializer => new KStemTokenFilter { };
+			public override object Json => new { type = "kstem" };
+			public override string Name => "kstem";
 		}
 
 		public class LengthTests : TokenFilterAssertionBase<LengthTests>
 		{
-			public override string Name => "length";
-			public override ITokenFilter Initializer => new LengthTokenFilter {Min = 10, Max = 200};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Length(n, t => t.Max(200).Min(10));
-			public override object Json => new {type = "length", min = 10, max = 200};
-
+			public override ITokenFilter Initializer => new LengthTokenFilter { Min = 10, Max = 200 };
+			public override object Json => new { type = "length", min = 10, max = 200 };
+			public override string Name => "length";
 		}
 
 		public class LimitTests : TokenFilterAssertionBase<LimitTests>
 		{
-			public override string Name => "limit";
-
-			public override ITokenFilter Initializer => new LimitTokenCountTokenFilter {ConsumeAllTokens = true, MaxTokenCount = 12};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.LimitTokenCount(n, t => t.ConsumeAllToken().MaxTokenCount(12));
 
+			public override ITokenFilter Initializer => new LimitTokenCountTokenFilter { ConsumeAllTokens = true, MaxTokenCount = 12 };
+
 			public override object Json => new
 			{
 				type = "limit",
@@ -451,63 +428,58 @@ public class LimitTests : TokenFilterAssertionBase<LimitTests>
 				consume_all_tokens = true
 			};
 
+			public override string Name => "limit";
 		}
 
 		public class LowercaseTests : TokenFilterAssertionBase<LowercaseTests>
 		{
-			public override string Name => "lc";
-
-			public override ITokenFilter Initializer => new LowercaseTokenFilter();
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Lowercase(n);
 
-			public override object Json => new {type = "lowercase"};
+			public override ITokenFilter Initializer => new LowercaseTokenFilter();
 
+			public override object Json => new { type = "lowercase" };
+			public override string Name => "lc";
 		}
 
 		public class NGramTests : TokenFilterAssertionBase<NGramTests>
 		{
-			public override string Name => "ngram";
-
-			public override ITokenFilter Initializer => new NGramTokenFilter {MinGram = 3, MaxGram = 4};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.NGram(n, t => t.MinGram(3).MaxGram(4));
 
-			public override object Json => new {type = "ngram", min_gram = 3, max_gram = 4};
+			public override ITokenFilter Initializer => new NGramTokenFilter { MinGram = 3, MaxGram = 4 };
 
+			public override object Json => new { type = "ngram", min_gram = 3, max_gram = 4 };
+			public override string Name => "ngram";
 		}
 
 		public class PatternCaptureTests : TokenFilterAssertionBase<PatternCaptureTests>
 		{
-			public override string Name => "pc";
-
-			public override ITokenFilter Initializer =>
-				new PatternCaptureTokenFilter {Patterns = new[] {@"\d", @"\w"}, PreserveOriginal = true};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.PatternCapture(n, t => t.Patterns(@"\d", @"\w").PreserveOriginal());
 
+			public override ITokenFilter Initializer =>
+				new PatternCaptureTokenFilter { Patterns = new[] { @"\d", @"\w" }, PreserveOriginal = true };
+
 			public override object Json => new
 			{
 				type = "pattern_capture",
-				patterns = new[] {"\\d", "\\w"},
+				patterns = new[] { "\\d", "\\w" },
 				preserve_original = true
 			};
+
+			public override string Name => "pc";
 		}
 
 		public class PatternReplaceTests : TokenFilterAssertionBase<PatternReplaceTests>
 		{
-			public override string Name => "pr";
-
-			public override ITokenFilter Initializer =>
-				new PatternReplaceTokenFilter {Pattern = @"(\d|\w)", Replacement = "replacement"};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.PatternReplace(n, t => t
 					.Pattern(@"(\d|\w)")
 					.Replacement("replacement")
 				);
 
+			public override ITokenFilter Initializer =>
+				new PatternReplaceTokenFilter { Pattern = @"(\d|\w)", Replacement = "replacement" };
+
 			public override object Json => new
 			{
 				type = "pattern_replace",
@@ -515,28 +487,36 @@ public class PatternReplaceTests : TokenFilterAssertionBase<PatternReplaceTests>
 				replacement = "replacement"
 			};
 
+			public override string Name => "pr";
 		}
 
 		public class PorterStemTests : TokenFilterAssertionBase<PorterStemTests>
 		{
-			public override string Name => "porter";
-			public override ITokenFilter Initializer => new PorterStemTokenFilter();
 			public override FuncTokenFilters Fluent => (n, tf) => tf.PorterStem(n);
+			public override ITokenFilter Initializer => new PorterStemTokenFilter();
 			public override object Json => new { type = "porter_stem" };
+			public override string Name => "porter";
 		}
 
 		public class ReverseTests : TokenFilterAssertionBase<ReverseTests>
 		{
-			public override string Name => "rev";
-			public override ITokenFilter Initializer => new ReverseTokenFilter();
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Reverse(n);
-			public override object Json => new {type = "reverse"};
-
+			public override ITokenFilter Initializer => new ReverseTokenFilter();
+			public override object Json => new { type = "reverse" };
+			public override string Name => "rev";
 		}
 
 		public class ShingleTests : TokenFilterAssertionBase<ShingleTests>
 		{
-			public override string Name => "shing";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.Shingle(n, t => t
+					.FillerToken("x")
+					.MaxShingleSize(10)
+					.MinShingleSize(8)
+					.OutputUnigrams()
+					.OutputUnigramsIfNoShingles()
+					.TokenSeparator("|")
+				);
 
 			public override ITokenFilter Initializer => new ShingleTokenFilter
 			{
@@ -548,16 +528,6 @@ public class ShingleTests : TokenFilterAssertionBase<ShingleTests>
 				TokenSeparator = "|"
 			};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.Shingle(n, t => t
-					.FillerToken("x")
-					.MaxShingleSize(10)
-					.MinShingleSize(8)
-					.OutputUnigrams()
-					.OutputUnigramsIfNoShingles()
-					.TokenSeparator("|")
-				);
-
 			public override object Json => new
 			{
 				type = "shingle",
@@ -569,75 +539,66 @@ public class ShingleTests : TokenFilterAssertionBase<ShingleTests>
 				filler_token = "x"
 			};
 
+			public override string Name => "shing";
 		}
 
 		public class SnowballTests : TokenFilterAssertionBase<SnowballTests>
 		{
-			public override string Name => "snow";
-
-			public override ITokenFilter Initializer => new SnowballTokenFilter {Language = SnowballLanguage.Dutch};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Snowball(n, t => t.Language(SnowballLanguage.Dutch));
 
+			public override ITokenFilter Initializer => new SnowballTokenFilter { Language = SnowballLanguage.Dutch };
+
 			public override object Json => new
 			{
 				type = "snowball",
 				language = "Dutch"
 			};
 
+			public override string Name => "snow";
 		}
 
 		public class StandardTests : TokenFilterAssertionBase<StandardTests>
 		{
-			public override string Name => "standard";
+			public override FuncTokenFilters Fluent => (n, tf) => tf.Standard(n);
 
 			public override ITokenFilter Initializer => new StandardTokenFilter();
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf.Standard(n);
-
 			public override object Json => new { type = "standard" };
-
+			public override string Name => "standard";
 		}
 
 		public class StemmerTests : TokenFilterAssertionBase<StemmerTests>
 		{
-			public override string Name => "stem";
-
-			public override ITokenFilter Initializer => new StemmerTokenFilter {Language = "arabic"};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Stemmer(n, t => t.Language("arabic"));
 
+			public override ITokenFilter Initializer => new StemmerTokenFilter { Language = "arabic" };
+
 			public override object Json => new
 			{
 				type = "stemmer",
 				language = "arabic"
 			};
 
+			public override string Name => "stem";
 		}
 
 		public class StemmerOverrideTests : TokenFilterAssertionBase<StemmerOverrideTests>
 		{
-			public override string Name => "stemo";
-
-			public override ITokenFilter Initializer => new StemmerOverrideTokenFilter {RulesPath = "analysis/custom_stems.txt"};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf.StemmerOverride(n, t => t.RulesPath("analysis/custom_stems.txt"));
 
+			public override ITokenFilter Initializer => new StemmerOverrideTokenFilter { RulesPath = "analysis/custom_stems.txt" };
+
 			public override object Json => new
 			{
 				type = "stemmer_override",
 				rules_path = "analysis/custom_stems.txt"
 			};
 
+			public override string Name => "stemo";
 		}
 
 		public class StopTests : TokenFilterAssertionBase<StopTests>
 		{
-			public override string Name => "stop";
-
-			public override ITokenFilter Initializer =>
-				new StopTokenFilter {IgnoreCase = true, RemoveTrailing = true, StopWords = new[] {"x", "y", "z"}};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.Stop(n, t => t
 					.IgnoreCase()
@@ -645,19 +606,30 @@ public class StopTests : TokenFilterAssertionBase<StopTests>
 					.StopWords("x", "y", "z")
 				);
 
+			public override ITokenFilter Initializer =>
+				new StopTokenFilter { IgnoreCase = true, RemoveTrailing = true, StopWords = new[] { "x", "y", "z" } };
+
 			public override object Json => new
 			{
 				type = "stop",
-				stopwords = new[] {"x", "y", "z"},
+				stopwords = new[] { "x", "y", "z" },
 				ignore_case = true,
 				remove_trailing = true
 			};
 
+			public override string Name => "stop";
 		}
 
 		public class SynonymTests : TokenFilterAssertionBase<SynonymTests>
 		{
-			public override string Name => "syn";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.Synonym(n, t => t
+					.Expand()
+					.Format(SynonymFormat.WordNet)
+					.SynonymsPath("analysis/stopwords.txt")
+					.Synonyms("x=>y", "z=>s")
+					.Tokenizer("whitespace")
+				);
 
 			public override ITokenFilter Initializer =>
 				new SynonymTokenFilter
@@ -665,35 +637,33 @@ public class SynonymTests : TokenFilterAssertionBase<SynonymTests>
 					Expand = true,
 					Format = SynonymFormat.WordNet,
 					SynonymsPath = "analysis/stopwords.txt",
-					Synonyms = new[] {"x=>y", "z=>s"},
+					Synonyms = new[] { "x=>y", "z=>s" },
 					Tokenizer = "whitespace"
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.Synonym(n, t => t
-					.Expand()
-					.Format(SynonymFormat.WordNet)
-					.SynonymsPath("analysis/stopwords.txt")
-					.Synonyms("x=>y", "z=>s")
-					.Tokenizer("whitespace")
-				);
-
 			public override object Json => new
 			{
 				type = "synonym",
 				synonyms_path = "analysis/stopwords.txt",
 				format = "wordnet",
-				synonyms = new[] {"x=>y", "z=>s"},
+				synonyms = new[] { "x=>y", "z=>s" },
 				expand = true,
 				tokenizer = "whitespace"
 			};
+
+			public override string Name => "syn";
 		}
 
 		[SkipVersion("<6.4.0", "Lenient is an option introduced in 6.4.0")]
 		public class SynonymLenientTests : TokenFilterAssertionBase<SynonymTests>
 		{
-			public override string Name => "syn_lenient";
-			private readonly string[] _synonyms = {"foo", "bar => baz"};
+			private readonly string[] _synonyms = { "foo", "bar => baz" };
+
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.Synonym(n, t => t
+					.Lenient()
+					.Synonyms(_synonyms)
+				);
 
 			public override ITokenFilter Initializer =>
 				new SynonymTokenFilter
@@ -702,23 +672,26 @@ public class SynonymLenientTests : TokenFilterAssertionBase<SynonymTests>
 					Synonyms = _synonyms
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.Synonym(n, t => t
-					.Lenient()
-					.Synonyms(_synonyms)
-				);
-
 			public override object Json => new
 			{
 				type = "synonym",
 				synonyms = _synonyms,
 				lenient = true,
 			};
+
+			public override string Name => "syn_lenient";
 		}
 
 		public class SynonymGraphTests : TokenFilterAssertionBase<SynonymGraphTests>
 		{
-			public override string Name => "syn_graph";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.SynonymGraph(n, t => t
+					.Expand()
+					.Format(SynonymFormat.WordNet)
+					.SynonymsPath("analysis/stopwords.txt")
+					.Synonyms("x=>y", "z=>s")
+					.Tokenizer("whitespace")
+				);
 
 			public override ITokenFilter Initializer =>
 				new SynonymGraphTokenFilter
@@ -726,66 +699,70 @@ public class SynonymGraphTests : TokenFilterAssertionBase<SynonymGraphTests>
 					Expand = true,
 					Format = SynonymFormat.WordNet,
 					SynonymsPath = "analysis/stopwords.txt",
-					Synonyms = new[] {"x=>y", "z=>s"},
+					Synonyms = new[] { "x=>y", "z=>s" },
 					Tokenizer = "whitespace"
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.SynonymGraph(n, t => t
-					.Expand()
-					.Format(SynonymFormat.WordNet)
-					.SynonymsPath("analysis/stopwords.txt")
-					.Synonyms("x=>y", "z=>s")
-					.Tokenizer("whitespace")
-				);
-
 			public override object Json => new
 			{
 				type = "synonym_graph",
 				synonyms_path = "analysis/stopwords.txt",
 				format = "wordnet",
-				synonyms = new[] {"x=>y", "z=>s"},
+				synonyms = new[] { "x=>y", "z=>s" },
 				expand = true,
 				tokenizer = "whitespace"
 			};
 
+			public override string Name => "syn_graph";
 		}
 
 		public class TrimTests : TokenFilterAssertionBase<TrimTests>
 		{
-			public override string Name => "trimmer";
-			public override ITokenFilter Initializer => new TrimTokenFilter();
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Trim(n);
-			public override object Json => new {type = "trim"};
+			public override ITokenFilter Initializer => new TrimTokenFilter();
+			public override object Json => new { type = "trim" };
+			public override string Name => "trimmer";
 		}
 
 		public class TruncateTests : TokenFilterAssertionBase<TruncateTests>
 		{
-			public override string Name => "truncer";
-			public override ITokenFilter Initializer => new TruncateTokenFilter {Length = 100};
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Truncate(n, t => t.Length(100));
-			public override object Json => new {type = "truncate", length = 100};
+			public override ITokenFilter Initializer => new TruncateTokenFilter { Length = 100 };
+			public override object Json => new { type = "truncate", length = 100 };
+			public override string Name => "truncer";
 		}
 
 		public class UniqueTests : TokenFilterAssertionBase<UniqueTests>
 		{
-			public override string Name => "uq";
-			public override ITokenFilter Initializer => new UniqueTokenFilter {OnlyOnSamePosition = true,};
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Unique(n, t => t.OnlyOnSamePosition());
-			public override object Json => new {type = "unique", only_on_same_position = true};
-
+			public override ITokenFilter Initializer => new UniqueTokenFilter { OnlyOnSamePosition = true, };
+			public override object Json => new { type = "unique", only_on_same_position = true };
+			public override string Name => "uq";
 		}
+
 		public class UppercaseTests : TokenFilterAssertionBase<UppercaseTests>
 		{
-			public override string Name => "upper";
-			public override ITokenFilter Initializer => new UppercaseTokenFilter();
 			public override FuncTokenFilters Fluent => (n, tf) => tf.Uppercase(n);
-			public override object Json => new {type = "uppercase"};
-
+			public override ITokenFilter Initializer => new UppercaseTokenFilter();
+			public override object Json => new { type = "uppercase" };
+			public override string Name => "upper";
 		}
+
 		public class WordDelimiterTests : TokenFilterAssertionBase<WordDelimiterTests>
 		{
-			public override string Name => "wd";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.WordDelimiter(n, t => t
+					.CatenateAll()
+					.CatenateNumbers()
+					.CatenateWords()
+					.GenerateNumberParts()
+					.GenerateWordParts()
+					.PreserveOriginal()
+					.ProtectedWords("x", "y", "z")
+					.SplitOnCaseChange()
+					.SplitOnNumerics()
+					.StemEnglishPossessive()
+				);
 
 			public override ITokenFilter Initializer =>
 				new WordDelimiterTokenFilter
@@ -796,26 +773,12 @@ public class WordDelimiterTests : TokenFilterAssertionBase<WordDelimiterTests>
 					GenerateNumberParts = true,
 					GenerateWordParts = true,
 					PreserveOriginal = true,
-					ProtectedWords = new[] {"x", "y", "z"},
+					ProtectedWords = new[] { "x", "y", "z" },
 					SplitOnCaseChange = true,
 					SplitOnNumerics = true,
 					StemEnglishPossessive = true
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.WordDelimiter(n, t => t
-					.CatenateAll()
-					.CatenateNumbers()
-					.CatenateWords()
-					.GenerateNumberParts()
-					.GenerateWordParts()
-					.PreserveOriginal()
-					.ProtectedWords("x", "y", "z")
-					.SplitOnCaseChange()
-					.SplitOnNumerics()
-					.StemEnglishPossessive()
-				);
-
 			public override object Json => new
 			{
 				type = "word_delimiter",
@@ -828,14 +791,27 @@ public class WordDelimiterTests : TokenFilterAssertionBase<WordDelimiterTests>
 				preserve_original = true,
 				split_on_numerics = true,
 				stem_english_possessive = true,
-				protected_words = new[] {"x", "y", "z"}
+				protected_words = new[] { "x", "y", "z" }
 			};
 
+			public override string Name => "wd";
 		}
 
 		public class WordDelimiterGraphTests : TokenFilterAssertionBase<WordDelimiterGraphTests>
 		{
-			public override string Name => "wdg";
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.WordDelimiterGraph(n, t => t
+					.CatenateAll()
+					.CatenateNumbers()
+					.CatenateWords()
+					.GenerateNumberParts()
+					.GenerateWordParts()
+					.PreserveOriginal()
+					.ProtectedWords("x", "y", "z")
+					.SplitOnCaseChange()
+					.SplitOnNumerics()
+					.StemEnglishPossessive()
+				);
 
 			public override ITokenFilter Initializer =>
 				new WordDelimiterGraphTokenFilter
@@ -846,26 +822,12 @@ public class WordDelimiterGraphTests : TokenFilterAssertionBase<WordDelimiterGra
 					GenerateNumberParts = true,
 					GenerateWordParts = true,
 					PreserveOriginal = true,
-					ProtectedWords = new[] {"x", "y", "z"},
+					ProtectedWords = new[] { "x", "y", "z" },
 					SplitOnCaseChange = true,
 					SplitOnNumerics = true,
 					StemEnglishPossessive = true
 				};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.WordDelimiterGraph(n, t => t
-					.CatenateAll()
-					.CatenateNumbers()
-					.CatenateWords()
-					.GenerateNumberParts()
-					.GenerateWordParts()
-					.PreserveOriginal()
-					.ProtectedWords("x", "y", "z")
-					.SplitOnCaseChange()
-					.SplitOnNumerics()
-					.StemEnglishPossessive()
-				);
-
 			public override object Json => new
 			{
 				type = "word_delimiter_graph",
@@ -878,24 +840,14 @@ public class WordDelimiterGraphTests : TokenFilterAssertionBase<WordDelimiterGra
 				preserve_original = true,
 				split_on_numerics = true,
 				stem_english_possessive = true,
-				protected_words = new[] {"x", "y", "z"}
+				protected_words = new[] { "x", "y", "z" }
 			};
 
+			public override string Name => "wdg";
 		}
 
 		public class PhoneticTests : TokenFilterAssertionBase<PhoneticTests>
 		{
-			public override string Name => "phonetic";
-
-			public override ITokenFilter Initializer =>
-				new PhoneticTokenFilter
-				{
-					Encoder = PhoneticEncoder.Beidermorse,
-					RuleType = PhoneticRuleType.Exact,
-					NameType = PhoneticNameType.Sephardic,
-					LanguageSet = new[] {PhoneticLanguage.Cyrillic, PhoneticLanguage.English, PhoneticLanguage.Hebrew}
-				};
-
 			public override FuncTokenFilters Fluent => (n, tf) => tf
 				.Phonetic(n, t => t
 					.Encoder(PhoneticEncoder.Beidermorse)
@@ -908,60 +860,71 @@ public class PhoneticTests : TokenFilterAssertionBase<PhoneticTests>
 					)
 				);
 
+			public override ITokenFilter Initializer =>
+				new PhoneticTokenFilter
+				{
+					Encoder = PhoneticEncoder.Beidermorse,
+					RuleType = PhoneticRuleType.Exact,
+					NameType = PhoneticNameType.Sephardic,
+					LanguageSet = new[] { PhoneticLanguage.Cyrillic, PhoneticLanguage.English, PhoneticLanguage.Hebrew }
+				};
+
 			public override object Json => new
 			{
 				type = "phonetic",
 				encoder = "beider_morse",
 				rule_type = "exact",
 				name_type = "sephardic",
-				languageset = new[] {"cyrillic", "english", "hebrew"}
+				languageset = new[] { "cyrillic", "english", "hebrew" }
 			};
 
+			public override string Name => "phonetic";
 		}
 
 		[SkipVersion("<6.4.0", "analysis-nori plugin introduced in 6.4.0")]
 		public class NoriPartOfSpeechTests : TokenFilterAssertionBase<NoriPartOfSpeechTests>
 		{
-			public override string Name => "nori_pos";
-			private readonly string[] _stopTags = {"NR", "SP"};
-
-			public override ITokenFilter Initializer => new NoriPartOfSpeechTokenFilter {StopTags = _stopTags};
+			private readonly string[] _stopTags = { "NR", "SP" };
 
 			public override FuncTokenFilters Fluent => (n, tf) => tf.NoriPartOfSpeech(n, t => t.StopTags(_stopTags));
 
+			public override ITokenFilter Initializer => new NoriPartOfSpeechTokenFilter { StopTags = _stopTags };
+
 			public override object Json => new { type = "nori_part_of_speech", stoptags = _stopTags };
-    }
+			public override string Name => "nori_pos";
+		}
 
 		[SkipVersion("<6.4.0", "Introduced in 6.4.0")]
 		public class MultiplexerTests : TokenFilterAssertionBase<PhoneticTests>
 		{
-			public override string Name => "multiplexer";
-			public override object Json => new
-			{
-				filters = new[]{"lowercase", "lowercase, porter_stem"},
-				preserve_original = true
-			};
+			public override FuncTokenFilters Fluent => (n, tf) => tf
+				.Multiplexer(n, t => t
+					.Filters("lowercase", "lowercase, porter_stem")
+					.PreserveOriginal()
+				);
 
 			public override ITokenFilter Initializer => new MultiplexerTokenFilter
 			{
-				Filters = new[] {"lowercase", "lowercase, porter_stem"},
+				Filters = new[] { "lowercase", "lowercase, porter_stem" },
 				PreserveOriginal = true
 			};
 
-			public override FuncTokenFilters Fluent => (n, tf) => tf
-				.Multiplexer(n, t => t
-					.Filters("lowercase", "lowercase, porter_stem")
-					.PreserveOriginal()
-				);
+			public override object Json => new
+			{
+				filters = new[] { "lowercase", "lowercase, porter_stem" },
+				preserve_original = true
+			};
+
+			public override string Name => "multiplexer";
 		}
 
 		[SkipVersion("<6.4.0", "Introduced in 6.4.0")]
 		public class RemoveDuplicatesTests : TokenFilterAssertionBase<PhoneticTests>
 		{
-			public override string Name => "dupes";
-			public override object Json => new { };
-			public override ITokenFilter Initializer => new RemoveDuplicatesTokenFilter { };
 			public override FuncTokenFilters Fluent => (n, tf) => tf.RemoveDuplicates(n);
+			public override ITokenFilter Initializer => new RemoveDuplicatesTokenFilter { };
+			public override object Json => new { };
+			public override string Name => "dupes";
 		}
 	}
 }
diff --git a/src/Tests/Tests/Analysis/Tokenizers/TokenizerAssertionBase.cs b/src/Tests/Tests/Analysis/Tokenizers/TokenizerAssertionBase.cs
index 063d4d3c5e9..7b284302328 100644
--- a/src/Tests/Tests/Analysis/Tokenizers/TokenizerAssertionBase.cs
+++ b/src/Tests/Tests/Analysis/Tokenizers/TokenizerAssertionBase.cs
@@ -12,20 +12,20 @@ public abstract class TokenizerAssertionBase<TAssertion>
 			, ITokenizerAssertion
 		where TAssertion : TokenizerAssertionBase<TAssertion>, new()
 	{
+		protected override object AnalysisJson => new
+		{
+			tokenizer = new Dictionary<string, object> { { AssertionSetup.Name, AssertionSetup.Json } }
+		};
+
 		protected override IAnalysis FluentAnalysis(AnalysisDescriptor an) =>
 			an.Tokenizers(d => AssertionSetup.Fluent(AssertionSetup.Name, d));
 
 		protected override Nest.Analysis InitializerAnalysis() =>
-			new Nest.Analysis {Tokenizers = new Nest.Tokenizers {{AssertionSetup.Name, AssertionSetup.Initializer}}};
-
-		protected override object AnalysisJson => new
-		{
-			tokenizer = new Dictionary<string, object> { {AssertionSetup.Name, AssertionSetup.Json} }
-		};
+			new Nest.Analysis { Tokenizers = new Nest.Tokenizers { { AssertionSetup.Name, AssertionSetup.Initializer } } };
 
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] public override Task TestPutSettingsRequest() => base.TestPutSettingsRequest();
+
 		[I] public override Task TestPutSettingsResponse() => base.TestPutSettingsResponse();
 	}
-
 }
diff --git a/src/Tests/Tests/Analysis/Tokenizers/TokenizerTests.cs b/src/Tests/Tests/Analysis/Tokenizers/TokenizerTests.cs
index c13fd9c7a59..bb9a8e9858c 100644
--- a/src/Tests/Tests/Analysis/Tokenizers/TokenizerTests.cs
+++ b/src/Tests/Tests/Analysis/Tokenizers/TokenizerTests.cs
@@ -10,59 +10,65 @@ public static class TokenizerTests
 	{
 		public class EdgeNGramTests : TokenizerAssertionBase<EdgeNGramTests>
 		{
-			public override string Name => "endgen";
+			public override FuncTokenizer Fluent => (n, t) => t.EdgeNGram(n, e => e
+				.MaxGram(2)
+				.MinGram(1)
+				.TokenChars(TokenChar.Digit, TokenChar.Letter)
+			);
 
 			public override ITokenizer Initializer => new EdgeNGramTokenizer
 			{
 				MaxGram = 2,
 				MinGram = 1,
-				TokenChars = new[] {TokenChar.Digit, TokenChar.Letter}
+				TokenChars = new[] { TokenChar.Digit, TokenChar.Letter }
 			};
 
-			public override FuncTokenizer Fluent => (n, t) => t.EdgeNGram(n, e => e
-				.MaxGram(2)
-				.MinGram(1)
-				.TokenChars(TokenChar.Digit, TokenChar.Letter)
-			);
-
 			public override object Json => new
 			{
 				min_gram = 1,
 				max_gram = 2,
-				token_chars = new[] {"digit", "letter"},
+				token_chars = new[] { "digit", "letter" },
 				type = "edge_ngram"
 			};
+
+			public override string Name => "endgen";
 		}
 
 		public class NGramTests : TokenizerAssertionBase<NGramTests>
 		{
-			public override string Name => "ng";
+			public override FuncTokenizer Fluent => (n, t) => t.NGram(n, e => e
+				.MaxGram(2)
+				.MinGram(1)
+				.TokenChars(TokenChar.Digit, TokenChar.Letter)
+			);
 
 			public override ITokenizer Initializer => new NGramTokenizer
 			{
 				MaxGram = 2,
 				MinGram = 1,
-				TokenChars = new[] {TokenChar.Digit, TokenChar.Letter}
+				TokenChars = new[] { TokenChar.Digit, TokenChar.Letter }
 			};
 
-			public override FuncTokenizer Fluent => (n, t) => t.NGram(n, e => e
-				.MaxGram(2)
-				.MinGram(1)
-				.TokenChars(TokenChar.Digit, TokenChar.Letter)
-			);
-
 			public override object Json => new
 			{
 				min_gram = 1,
 				max_gram = 2,
-				token_chars = new[] {"digit", "letter"},
+				token_chars = new[] { "digit", "letter" },
 				type = "ngram"
 			};
+
+			public override string Name => "ng";
 		}
 
 		public class PathHierarchyTests : TokenizerAssertionBase<PathHierarchyTests>
 		{
-			public override string Name => "path";
+			public override FuncTokenizer Fluent => (n, t) => t.PathHierarchy(n, e => e
+				.BufferSize(2048)
+				.Delimiter('|')
+				.Replacement('-')
+				.Reverse()
+				.Skip(1)
+			);
 
 			public override ITokenizer Initializer => new PathHierarchyTokenizer
 			{
@@ -73,14 +79,6 @@ public class PathHierarchyTests : TokenizerAssertionBase<PathHierarchyTests>
 				Skip = 1
 			};
 
-			public override FuncTokenizer Fluent => (n, t) => t.PathHierarchy(n, e => e
-				.BufferSize(2048)
-				.Delimiter('|')
-				.Replacement('-')
-				.Reverse()
-				.Skip(1)
-			);
-
 			public override object Json => new
 			{
 				delimiter = "|",
@@ -90,34 +88,43 @@ public class PathHierarchyTests : TokenizerAssertionBase<PathHierarchyTests>
 				skip = 1,
 				type = "path_hierarchy"
 			};
+
+			public override string Name => "path";
 		}
 
 		public class IcuTests : TokenizerAssertionBase<IcuTests>
 		{
-			public override string Name => "icu";
 			private const string RuleFiles = "Latn:icu-files/KeywordTokenizer.rbbi";
 
+			public override FuncTokenizer Fluent => (n, t) => t.Icu(n, e => e
+				.RuleFiles(RuleFiles)
+			);
+
 			public override ITokenizer Initializer => new IcuTokenizer
 			{
 				RuleFiles = RuleFiles,
 			};
 
-			public override FuncTokenizer Fluent => (n, t) => t.Icu(n, e => e
-				.RuleFiles(RuleFiles)
-			);
-
 			public override object Json => new
 			{
 				rule_files = RuleFiles,
 				type = "icu_tokenizer"
 			};
+
+			public override string Name => "icu";
 		}
 
 		public class KuromojiTests : TokenizerAssertionBase<KuromojiTests>
 		{
-			public override string Name => "kuro";
 			private const string Example = "/箱根山-箱根/成田空港-成田/";
 
+			public override FuncTokenizer Fluent => (n, t) => t.Kuromoji(n, e => e
+				.Mode(KuromojiTokenizationMode.Extended)
+				.DiscardPunctuation()
+				.NBestExamples(Example)
+				.NBestCost(1000)
+			);
+
 			public override ITokenizer Initializer => new KuromojiTokenizer
 			{
 				Mode = KuromojiTokenizationMode.Extended,
@@ -126,13 +133,6 @@ public class KuromojiTests : TokenizerAssertionBase<KuromojiTests>
 				NBestCost = 1000
 			};
 
-			public override FuncTokenizer Fluent => (n, t) => t.Kuromoji(n, e => e
-				.Mode(KuromojiTokenizationMode.Extended)
-				.DiscardPunctuation()
-				.NBestExamples(Example)
-				.NBestCost(1000)
-			);
-
 			public override object Json => new
 			{
 				discard_punctuation = true,
@@ -141,27 +141,34 @@ public class KuromojiTests : TokenizerAssertionBase<KuromojiTests>
 				nbest_examples = Example,
 				type = "kuromoji_tokenizer"
 			};
+
+			public override string Name => "kuro";
 		}
 
 		public class UaxTests : TokenizerAssertionBase<UaxTests>
 		{
-			public override string Name => "uax";
-			public override ITokenizer Initializer => new UaxEmailUrlTokenizer {MaxTokenLength = 12};
-
 			public override FuncTokenizer Fluent => (n, t) => t.UaxEmailUrl(n, e => e
 				.MaxTokenLength(12)
 			);
 
+			public override ITokenizer Initializer => new UaxEmailUrlTokenizer { MaxTokenLength = 12 };
+
 			public override object Json => new
 			{
 				max_token_length = 12,
 				type = "uax_url_email"
 			};
+
+			public override string Name => "uax";
 		}
 
 		public class PatternTests : TokenizerAssertionBase<PatternTests>
 		{
-			public override string Name => "pat";
+			public override FuncTokenizer Fluent => (n, t) => t.Pattern(n, e => e
+				.Flags("CASE_INSENSITIVE")
+				.Group(1)
+				.Pattern(@"\W+")
+			);
 
 			public override ITokenizer Initializer => new PatternTokenizer
 			{
@@ -170,12 +177,6 @@ public class PatternTests : TokenizerAssertionBase<PatternTests>
 				Pattern = @"\W+"
 			};
 
-			public override FuncTokenizer Fluent => (n, t) => t.Pattern(n, e => e
-				.Flags("CASE_INSENSITIVE")
-				.Group(1)
-				.Pattern(@"\W+")
-			);
-
 			public override object Json => new
 			{
 				pattern = @"\W+",
@@ -183,63 +184,65 @@ public class PatternTests : TokenizerAssertionBase<PatternTests>
 				group = 1,
 				type = "pattern"
 			};
+
+			public override string Name => "pat";
 		}
 
 		public class WhitespaceTests : TokenizerAssertionBase<WhitespaceTests>
 		{
-			public override string Name => "ws";
-			public override ITokenizer Initializer => new WhitespaceTokenizer();
-
 			public override FuncTokenizer Fluent => (n, t) => t.Whitespace(n);
+			public override ITokenizer Initializer => new WhitespaceTokenizer();
 
-			public override object Json => new {type = "whitespace"};
+			public override object Json => new { type = "whitespace" };
+			public override string Name => "ws";
 		}
 
 		public class StandardTests : TokenizerAssertionBase<StandardTests>
 		{
-			public override string Name => "stan";
-			public override ITokenizer Initializer => new StandardTokenizer();
-
 			public override FuncTokenizer Fluent => (n, t) => t.Standard(n);
+			public override ITokenizer Initializer => new StandardTokenizer();
 
-			public override object Json => new {type = "standard"};
+			public override object Json => new { type = "standard" };
+			public override string Name => "stan";
 		}
 
 		[SkipVersion("<6.4.0", "analysis-nori plugin introduced in 6.4.0")]
 		public class NoriTests : TokenizerAssertionBase<NoriTests>
 		{
-			public override string Name => "nori";
+			public override FuncTokenizer Fluent => (n, t) => t.Nori(n, e => e
+				.DecompoundMode(NoriDecompoundMode.Mixed)
+			);
+
 			public override ITokenizer Initializer => new NoriTokenizer
 			{
 				DecompoundMode = NoriDecompoundMode.Mixed
 			};
 
-			public override FuncTokenizer Fluent => (n, t) => t.Nori(n, e => e
-				.DecompoundMode(NoriDecompoundMode.Mixed)
-			);
-
-			public override object Json => new {type = "nori_tokenizer", decompound_mode = "mixed"};
+			public override object Json => new { type = "nori_tokenizer", decompound_mode = "mixed" };
+			public override string Name => "nori";
 		}
 
 		[SkipVersion("<6.4.0", "char_group introduced in 6.4.0")]
 		public class CharGroupTests : TokenizerAssertionBase<CharGroupTests>
 		{
-			private readonly string[] _chars = {"whitespace", "-", "\n"};
-			public override string Name => "char_group";
-			public override ITokenizer Initializer => new CharGroupTokenizer
-			{
-				TokenizeOnCharacters = _chars
-			};
+			private readonly string[] _chars = { "whitespace", "-", "\n" };
 
 			public override FuncTokenizer Fluent => (n, t) => t.CharGroup(n, e => e
 				.TokenizeOnCharacters(_chars)
 			);
 
+			public override ITokenizer Initializer => new CharGroupTokenizer
+			{
+				TokenizeOnCharacters = _chars
+			};
+
 			public override object Json => new
 			{
 				tokenize_on_chars = _chars,
 				type = "char_group"
 			};
+
+			public override string Name => "char_group";
 		}
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatAliases/CatAliasesApiTests.cs b/src/Tests/Tests/Cat/CatAliases/CatAliasesApiTests.cs
index a197b8585bc..12d91cd0fce 100644
--- a/src/Tests/Tests/Cat/CatAliases/CatAliasesApiTests.cs
+++ b/src/Tests/Tests/Cat/CatAliases/CatAliasesApiTests.cs
@@ -5,30 +5,27 @@
 using Tests.Core.ManagedElasticsearch.NodeSeeders;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
-using Xunit;
 
 namespace Tests.Cat.CatAliases
 {
-	public class CatAliasesApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatAliasesRecord>, ICatAliasesRequest, CatAliasesDescriptor, CatAliasesRequest>
+	public class CatAliasesApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatAliasesRecord>, ICatAliasesRequest, CatAliasesDescriptor, CatAliasesRequest>
 	{
 		public CatAliasesApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatAliases(),
-			fluentAsync: (client, f) => client.CatAliasesAsync(),
-			request: (client, r) => client.CatAliases(r),
-			requestAsync: (client, r) => client.CatAliasesAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/aliases";
 
-		protected override void ExpectResponse(ICatResponse<CatAliasesRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatAliases(),
+			(client, f) => client.CatAliasesAsync(),
+			(client, r) => client.CatAliases(r),
+			(client, r) => client.CatAliasesAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatAliasesRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => a.Alias == DefaultSeeder.ProjectsAliasName);
-		}
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatAliases/CatAliasesUrlTests.cs b/src/Tests/Tests/Cat/CatAliases/CatAliasesUrlTests.cs
index 96045a6953f..41096ccbcdc 100644
--- a/src/Tests/Tests/Cat/CatAliases/CatAliasesUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatAliases/CatAliasesUrlTests.cs
@@ -11,17 +11,17 @@ public class CatAliasesUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/aliases")
-				.Fluent(c => c.CatAliases())
-				.Request(c => c.CatAliases(new CatAliasesRequest()))
-				.FluentAsync(c => c.CatAliasesAsync())
-				.RequestAsync(c => c.CatAliasesAsync(new CatAliasesRequest()))
+					.Fluent(c => c.CatAliases())
+					.Request(c => c.CatAliases(new CatAliasesRequest()))
+					.FluentAsync(c => c.CatAliasesAsync())
+					.RequestAsync(c => c.CatAliasesAsync(new CatAliasesRequest()))
 				;
 
 			await GET("/_cat/aliases/foo")
-				.Fluent(c => c.CatAliases(a => a.Name("foo")))
-				.Request(c => c.CatAliases(new CatAliasesRequest("foo")))
-				.FluentAsync(c => c.CatAliasesAsync(a => a.Name("foo")))
-				.RequestAsync(c => c.CatAliasesAsync(new CatAliasesRequest("foo")))
+					.Fluent(c => c.CatAliases(a => a.Name("foo")))
+					.Request(c => c.CatAliases(new CatAliasesRequest("foo")))
+					.FluentAsync(c => c.CatAliasesAsync(a => a.Name("foo")))
+					.RequestAsync(c => c.CatAliasesAsync(new CatAliasesRequest("foo")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cat/CatAllocation/CatAllocationApiTests.cs b/src/Tests/Tests/Cat/CatAllocation/CatAllocationApiTests.cs
index 50d33a8add8..64871c29999 100644
--- a/src/Tests/Tests/Cat/CatAllocation/CatAllocationApiTests.cs
+++ b/src/Tests/Tests/Cat/CatAllocation/CatAllocationApiTests.cs
@@ -4,30 +4,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatAllocation
 {
-	public class CatAllocationApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatAllocationRecord>, ICatAllocationRequest, CatAllocationDescriptor, CatAllocationRequest>
+	public class CatAllocationApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatAllocationRecord>, ICatAllocationRequest, CatAllocationDescriptor,
+			CatAllocationRequest>
 	{
 		public CatAllocationApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatAllocation(),
-			fluentAsync: (client, f) => client.CatAllocationAsync(),
-			request: (client, r) => client.CatAllocation(r),
-			requestAsync: (client, r) => client.CatAllocationAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/allocation";
 
-		protected override void ExpectResponse(ICatResponse<CatAllocationRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatAllocation(),
+			(client, f) => client.CatAllocationAsync(),
+			(client, r) => client.CatAllocation(r),
+			(client, r) => client.CatAllocationAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatAllocationRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Node));
-		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cat/CatAllocation/CatAllocationUrlTests.cs b/src/Tests/Tests/Cat/CatAllocation/CatAllocationUrlTests.cs
index b4c004ebf1a..b22e3bdfdbb 100644
--- a/src/Tests/Tests/Cat/CatAllocation/CatAllocationUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatAllocation/CatAllocationUrlTests.cs
@@ -11,17 +11,17 @@ public class CatAllocationUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/allocation")
-				.Fluent(c => c.CatAllocation())
-				.Request(c => c.CatAllocation(new CatAllocationRequest()))
-				.FluentAsync(c => c.CatAllocationAsync())
-				.RequestAsync(c => c.CatAllocationAsync(new CatAllocationRequest()))
+					.Fluent(c => c.CatAllocation())
+					.Request(c => c.CatAllocation(new CatAllocationRequest()))
+					.FluentAsync(c => c.CatAllocationAsync())
+					.RequestAsync(c => c.CatAllocationAsync(new CatAllocationRequest()))
 				;
 
 			await GET("/_cat/allocation/foo")
-				.Fluent(c => c.CatAllocation(a => a.NodeId("foo")))
-				.Request(c => c.CatAllocation(new CatAllocationRequest("foo")))
-				.FluentAsync(c => c.CatAllocationAsync(a => a.NodeId("foo")))
-				.RequestAsync(c => c.CatAllocationAsync(new CatAllocationRequest("foo")))
+					.Fluent(c => c.CatAllocation(a => a.NodeId("foo")))
+					.Request(c => c.CatAllocation(new CatAllocationRequest("foo")))
+					.FluentAsync(c => c.CatAllocationAsync(a => a.NodeId("foo")))
+					.RequestAsync(c => c.CatAllocationAsync(new CatAllocationRequest("foo")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cat/CatCount/CatCountApiTests.cs b/src/Tests/Tests/Cat/CatCount/CatCountApiTests.cs
index 41ec5a14e2c..9ebe728493d 100644
--- a/src/Tests/Tests/Cat/CatCount/CatCountApiTests.cs
+++ b/src/Tests/Tests/Cat/CatCount/CatCountApiTests.cs
@@ -5,50 +5,48 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatCount
 {
-	public class CatCountApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatCountRecord>, ICatCountRequest, CatCountDescriptor, CatCountRequest>
+	public class CatCountApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatCountRecord>, ICatCountRequest, CatCountDescriptor, CatCountRequest>
 	{
 		public CatCountApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatCount(),
-			fluentAsync: (client, f) => client.CatCountAsync(),
-			request: (client, r) => client.CatCount(r),
-			requestAsync: (client, r) => client.CatCountAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/count";
 
-		protected override void ExpectResponse(ICatResponse<CatCountRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatCount(),
+			(client, f) => client.CatCountAsync(),
+			(client, r) => client.CatCount(r),
+			(client, r) => client.CatCountAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatCountRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => a.Count != "0" && !string.IsNullOrEmpty(a.Count));
-		}
 	}
 
-	public class CatCountSingleIndexApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatCountRecord>, ICatCountRequest, CatCountDescriptor, CatCountRequest>
+	public class CatCountSingleIndexApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatCountRecord>, ICatCountRequest, CatCountDescriptor, CatCountRequest>
 	{
 		public CatCountSingleIndexApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatCount(c=>c.Index<Project>()),
-			fluentAsync: (client, f) => client.CatCountAsync(c=>c.Index<Project>()),
-			request: (client, r) => client.CatCount(new CatCountRequest(typeof(Project))),
-			requestAsync: (client, r) => client.CatCountAsync(new CatCountRequest(typeof(Project)))
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/count/project";
 
-		protected override void ExpectResponse(ICatResponse<CatCountRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatCount(c => c.Index<Project>()),
+			(client, f) => client.CatCountAsync(c => c.Index<Project>()),
+			(client, r) => client.CatCount(new CatCountRequest(typeof(Project))),
+			(client, r) => client.CatCountAsync(new CatCountRequest(typeof(Project)))
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatCountRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => a.Count != "0" && !string.IsNullOrEmpty(a.Count));
-		}
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatCount/CatCountUrlTests.cs b/src/Tests/Tests/Cat/CatCount/CatCountUrlTests.cs
index 4193652c7e4..bfd6cb218d4 100644
--- a/src/Tests/Tests/Cat/CatCount/CatCountUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatCount/CatCountUrlTests.cs
@@ -11,17 +11,17 @@ public class CatCountUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/count")
-				.Fluent(c => c.CatCount())
-				.Request(c => c.CatCount(new CatCountRequest()))
-				.FluentAsync(c => c.CatCountAsync())
-				.RequestAsync(c => c.CatCountAsync(new CatCountRequest()))
+					.Fluent(c => c.CatCount())
+					.Request(c => c.CatCount(new CatCountRequest()))
+					.FluentAsync(c => c.CatCountAsync())
+					.RequestAsync(c => c.CatCountAsync(new CatCountRequest()))
 				;
 
 			await GET("/_cat/count/foo")
-				.Fluent(c => c.CatCount(a => a.Index("foo")))
-				.Request(c => c.CatCount(new CatCountRequest("foo")))
-				.FluentAsync(c => c.CatCountAsync(a => a.Index("foo")))
-				.RequestAsync(c => c.CatCountAsync(new CatCountRequest("foo")))
+					.Fluent(c => c.CatCount(a => a.Index("foo")))
+					.Request(c => c.CatCount(new CatCountRequest("foo")))
+					.FluentAsync(c => c.CatCountAsync(a => a.Index("foo")))
+					.RequestAsync(c => c.CatCountAsync(new CatCountRequest("foo")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cat/CatFielddata/CatFielddataApiTests.cs b/src/Tests/Tests/Cat/CatFielddata/CatFielddataApiTests.cs
index 84a9a8ccdf6..441ec71cdd0 100644
--- a/src/Tests/Tests/Cat/CatFielddata/CatFielddataApiTests.cs
+++ b/src/Tests/Tests/Cat/CatFielddata/CatFielddataApiTests.cs
@@ -8,50 +8,51 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatFielddata
 {
-	public class CatFielddataApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatFielddataRecord>, ICatFielddataRequest, CatFielddataDescriptor, CatFielddataRequest>
+	public class CatFielddataApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatFielddataRecord>, ICatFielddataRequest, CatFielddataDescriptor, CatFielddataRequest>
 	{
 		private ISearchResponse<Project> _initialSearchResponse;
+
 		public CatFielddataApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override string UrlPath => "/_cat/fielddata";
+
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatFielddata(),
-			fluentAsync: (client, f) => client.CatFielddataAsync(),
-			request: (client, r) => client.CatFielddata(r),
-			requestAsync: (client, r) => client.CatFielddataAsync(r)
+			(client, f) => client.CatFielddata(),
+			(client, f) => client.CatFielddataAsync(),
+			(client, r) => client.CatFielddata(r),
+			(client, r) => client.CatFielddataAsync(r)
 		);
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			// ensure some fielddata is loaded
-			this._initialSearchResponse = client.Search<Project>(s => s
+			_initialSearchResponse = client.Search<Project>(s => s
 				.Query(q => q
 					.Terms(t => t
 						.Field(p => p.CuratedTags.First().Name)
-						.Terms(Project.Projects.SelectMany(p=>p.CuratedTags).Take(50).ToList())
+						.Terms(Project.Projects.SelectMany(p => p.CuratedTags).Take(50).ToList())
 					)
 				)
 			);
 
-			if (!this._initialSearchResponse.IsValid)
-				throw new Exception($"Failure setting up integration test. {this._initialSearchResponse.DebugInformation}");
+			if (!_initialSearchResponse.IsValid)
+				throw new Exception($"Failure setting up integration test. {_initialSearchResponse.DebugInformation}");
 		}
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_cat/fielddata";
-
 		protected override void ExpectResponse(ICatResponse<CatFielddataRecord> response)
 		{
 			//this tests is very flaky, only do assertions if the query actually returned
 			// TODO investigate flakiness
 			// build seed:64178 integrate 6.3.0 "readonly" "catfielddata"
 			// fails on TeamCity but not locally, assuming the different PC sizes come into play
-			if (SkipOnTeamCityAttribute.RunningOnTeamCity || this._initialSearchResponse == null || this._initialSearchResponse.Total <= 0)
+			if (SkipOnTeamCityAttribute.RunningOnTeamCity || _initialSearchResponse == null || _initialSearchResponse.Total <= 0)
 				return;
 
 			response.Records.Should().NotBeEmpty();
@@ -66,5 +67,4 @@ protected override void ExpectResponse(ICatResponse<CatFielddataRecord> response
 			}
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cat/CatFielddata/CatFielddataUrlTests.cs b/src/Tests/Tests/Cat/CatFielddata/CatFielddataUrlTests.cs
index 14fa1a25b83..746a602d723 100644
--- a/src/Tests/Tests/Cat/CatFielddata/CatFielddataUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatFielddata/CatFielddataUrlTests.cs
@@ -12,19 +12,19 @@ public class CatFielddataUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/fielddata")
-				.Fluent(c => c.CatFielddata())
-				.Request(c => c.CatFielddata(new CatFielddataRequest()))
-				.FluentAsync(c => c.CatFielddataAsync())
-				.RequestAsync(c => c.CatFielddataAsync(new CatFielddataRequest()))
+					.Fluent(c => c.CatFielddata())
+					.Request(c => c.CatFielddata(new CatFielddataRequest()))
+					.FluentAsync(c => c.CatFielddataAsync())
+					.RequestAsync(c => c.CatFielddataAsync(new CatFielddataRequest()))
 				;
 
 			var fields = new[] { "name", "startedOn" };
 
 			await GET("/_cat/fielddata/name%2CstartedOn")
-				.Fluent(c => c.CatFielddata(f => f.Fields<Project>(p => p.Name, p => p.StartedOn)))
-				.Request(c => c.CatFielddata(new CatFielddataRequest(fields)))
-				.FluentAsync(c => c.CatFielddataAsync(f => f.Fields<Project>(p => p.Name, p => p.StartedOn)))
-				.RequestAsync(c => c.CatFielddataAsync(new CatFielddataRequest(fields)))
+					.Fluent(c => c.CatFielddata(f => f.Fields<Project>(p => p.Name, p => p.StartedOn)))
+					.Request(c => c.CatFielddata(new CatFielddataRequest(fields)))
+					.FluentAsync(c => c.CatFielddataAsync(f => f.Fields<Project>(p => p.Name, p => p.StartedOn)))
+					.RequestAsync(c => c.CatFielddataAsync(new CatFielddataRequest(fields)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cat/CatHealth/CatHealthApiTests.cs b/src/Tests/Tests/Cat/CatHealth/CatHealthApiTests.cs
index 13cf688b4bb..fc39aae2800 100644
--- a/src/Tests/Tests/Cat/CatHealth/CatHealthApiTests.cs
+++ b/src/Tests/Tests/Cat/CatHealth/CatHealthApiTests.cs
@@ -5,64 +5,62 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatHealth
 {
-	public class CatHealthApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatHealthRecord>, ICatHealthRequest, CatHealthDescriptor, CatHealthRequest>
+	public class CatHealthApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatHealthRecord>, ICatHealthRequest, CatHealthDescriptor, CatHealthRequest>
 	{
 		public CatHealthApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatHealth(),
-			fluentAsync: (client, f) => client.CatHealthAsync(),
-			request: (client, r) => client.CatHealth(r),
-			requestAsync: (client, r) => client.CatHealthAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/health";
 
-		protected override void ExpectResponse(ICatResponse<CatHealthRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatHealth(),
+			(client, f) => client.CatHealthAsync(),
+			(client, r) => client.CatHealth(r),
+			(client, r) => client.CatHealthAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatHealthRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Status));
-		}
 	}
 
-	public class CatHealthNoTimestampApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatHealthRecord>, ICatHealthRequest, CatHealthDescriptor, CatHealthRequest>
+	public class CatHealthNoTimestampApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatHealthRecord>, ICatHealthRequest, CatHealthDescriptor, CatHealthRequest>
 	{
 		public CatHealthNoTimestampApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatHealth(f),
-			fluentAsync: (client, f) => client.CatHealthAsync(f),
-			request: (client, r) => client.CatHealth(r),
-			requestAsync: (client, r) => client.CatHealthAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_cat/health?ts=false";
 
 		protected override Func<CatHealthDescriptor, ICatHealthRequest> Fluent => s => s
 			.IncludeTimestamp(false);
 
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
 		protected override CatHealthRequest Initializer => new CatHealthRequest
 		{
 			IncludeTimestamp = false
 		};
 
+		protected override string UrlPath => "/_cat/health?ts=false";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatHealth(f),
+			(client, f) => client.CatHealthAsync(f),
+			(client, r) => client.CatHealth(r),
+			(client, r) => client.CatHealthAsync(r)
+		);
+
 		protected override void ExpectResponse(ICatResponse<CatHealthRecord> response)
 		{
 			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Status));
 
-			foreach (var record in response.Records)
-			{
-				record.Timestamp.Should().BeNullOrWhiteSpace();
-			}
+			foreach (var record in response.Records) record.Timestamp.Should().BeNullOrWhiteSpace();
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cat/CatHealth/CatHealthUrlTests.cs b/src/Tests/Tests/Cat/CatHealth/CatHealthUrlTests.cs
index 52c83a37fb5..17f93f525a7 100644
--- a/src/Tests/Tests/Cat/CatHealth/CatHealthUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatHealth/CatHealthUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cat.CatHealth
 {
 	public class CatHealthUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat/health")
-				.Fluent(c => c.CatHealth())
-				.Request(c => c.CatHealth(new CatHealthRequest()))
-				.FluentAsync(c => c.CatHealthAsync())
-				.RequestAsync(c => c.CatHealthAsync(new CatHealthRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cat/health")
+			.Fluent(c => c.CatHealth())
+			.Request(c => c.CatHealth(new CatHealthRequest()))
+			.FluentAsync(c => c.CatHealthAsync())
+			.RequestAsync(c => c.CatHealthAsync(new CatHealthRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatHelp/CatHelpApiTests.cs b/src/Tests/Tests/Cat/CatHelp/CatHelpApiTests.cs
index 772da0b1d0c..7a62ee723de 100644
--- a/src/Tests/Tests/Cat/CatHelp/CatHelpApiTests.cs
+++ b/src/Tests/Tests/Cat/CatHelp/CatHelpApiTests.cs
@@ -4,31 +4,29 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatHelp
 {
-	public class CatHelpApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatHelpRecord>, ICatHelpRequest, CatHelpDescriptor, CatHelpRequest>
+	public class CatHelpApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatHelpRecord>, ICatHelpRequest, CatHelpDescriptor, CatHelpRequest>
 	{
 		public CatHelpApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatHelp(),
-			fluentAsync: (client, f) => client.CatHelpAsync(),
-			request: (client, r) => client.CatHelp(r),
-			requestAsync: (client, r) => client.CatHelpAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat";
 
-		protected override void ExpectResponse(ICatResponse<CatHelpRecord> response)
-		{
-			response.Records.Should().NotBeEmpty()
-				.And.Contain(a => a.Endpoint == "/_cat/shards/{index}")
-				.And.NotContain(a=>a.Endpoint == "=^.^=");
-		}
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatHelp(),
+			(client, f) => client.CatHelpAsync(),
+			(client, r) => client.CatHelp(r),
+			(client, r) => client.CatHelpAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatHelpRecord> response) => response.Records.Should()
+			.NotBeEmpty()
+			.And.Contain(a => a.Endpoint == "/_cat/shards/{index}")
+			.And.NotContain(a => a.Endpoint == "=^.^=");
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatHelp/CatHelpUrlTests.cs b/src/Tests/Tests/Cat/CatHelp/CatHelpUrlTests.cs
index 99001d2590c..e1e79bb5079 100644
--- a/src/Tests/Tests/Cat/CatHelp/CatHelpUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatHelp/CatHelpUrlTests.cs
@@ -8,15 +8,10 @@ namespace Tests.Cat.CatHelp
 {
 	public class CatHelpUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat")
-				.Fluent(c => c.CatHelp())
-				.Request(c => c.CatHelp(new CatHelpRequest()))
-				.FluentAsync(c => c.CatHelpAsync())
-				.RequestAsync(c => c.CatHelpAsync(new CatHelpRequest()))
-				;
-
-		}
+		[U] public override async Task Urls() => await GET("/_cat")
+			.Fluent(c => c.CatHelp())
+			.Request(c => c.CatHelp(new CatHelpRequest()))
+			.FluentAsync(c => c.CatHelpAsync())
+			.RequestAsync(c => c.CatHelpAsync(new CatHelpRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs b/src/Tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs
index 311bf102417..b3e4246e717 100644
--- a/src/Tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs
+++ b/src/Tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs
@@ -6,50 +6,43 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatIndices
 {
-	public class CatIndicesApiTests : ApiIntegrationTestBase<ReadOnlyCluster,ICatResponse<CatIndicesRecord>, ICatIndicesRequest, CatIndicesDescriptor, CatIndicesRequest>
+	public class CatIndicesApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatIndicesRecord>, ICatIndicesRequest, CatIndicesDescriptor, CatIndicesRequest>
 	{
 		public CatIndicesApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatIndices(),
-			fluentAsync: (client, f) => client.CatIndicesAsync(),
-			request: (client, r) => client.CatIndices(r),
-			requestAsync: (client, r) => client.CatIndicesAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/indices";
 
-		protected override void ExpectResponse(ICatResponse<CatIndicesRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatIndices(),
+			(client, f) => client.CatIndicesAsync(),
+			(client, r) => client.CatIndices(r),
+			(client, r) => client.CatIndicesAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatIndicesRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Status));
-		}
 	}
 
-	public class CatIndicesApiNotFoundWithSecurityTests : ApiIntegrationTestBase<XPackCluster,ICatResponse<CatIndicesRecord>, ICatIndicesRequest, CatIndicesDescriptor, CatIndicesRequest>
+	public class CatIndicesApiNotFoundWithSecurityTests
+		: ApiIntegrationTestBase<XPackCluster, ICatResponse<CatIndicesRecord>, ICatIndicesRequest, CatIndicesDescriptor, CatIndicesRequest>
 	{
 		public CatIndicesApiNotFoundWithSecurityTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatIndices(f),
-			fluentAsync: (client, f) => client.CatIndicesAsync(f),
-			request: (client, r) => client.CatIndices(r),
-			requestAsync: (client, r) => client.CatIndicesAsync(r)
-		);
 
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 403;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_cat/indices/doesnot-exist-%2A";
 
 		protected override Func<CatIndicesDescriptor, ICatIndicesRequest> Fluent => f => f
 			.Index("doesnot-exist-*")
-			.RequestConfiguration(r=>r.BasicAuthentication(ClusterAuthentication.User.Username, ClusterAuthentication.User.Password));
+			.RequestConfiguration(r => r.BasicAuthentication(ClusterAuthentication.User.Username, ClusterAuthentication.User.Password));
+
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override CatIndicesRequest Initializer => new CatIndicesRequest("doesnot-exist-*")
 		{
@@ -63,6 +56,15 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override string UrlPath => "/_cat/indices/doesnot-exist-%2A";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatIndices(f),
+			(client, f) => client.CatIndicesAsync(f),
+			(client, r) => client.CatIndices(r),
+			(client, r) => client.CatIndicesAsync(r)
+		);
+
 		protected override void ExpectResponse(ICatResponse<CatIndicesRecord> response)
 		{
 			response.Records.Should().BeEmpty();
diff --git a/src/Tests/Tests/Cat/CatIndices/CatIndicesUrlTests.cs b/src/Tests/Tests/Cat/CatIndices/CatIndicesUrlTests.cs
index 2f6d98890e5..e6793f95041 100644
--- a/src/Tests/Tests/Cat/CatIndices/CatIndicesUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatIndices/CatIndicesUrlTests.cs
@@ -12,17 +12,17 @@ public class CatIndicesUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/indices")
-				.Fluent(c => c.CatIndices())
-				.Request(c => c.CatIndices(new CatIndicesRequest()))
-				.FluentAsync(c => c.CatIndicesAsync())
-				.RequestAsync(c => c.CatIndicesAsync(new CatIndicesRequest()))
+					.Fluent(c => c.CatIndices())
+					.Request(c => c.CatIndices(new CatIndicesRequest()))
+					.FluentAsync(c => c.CatIndicesAsync())
+					.RequestAsync(c => c.CatIndicesAsync(new CatIndicesRequest()))
 				;
 
 			await GET("/_cat/indices/project")
-				.Fluent(c => c.CatIndices(i => i.Index<Project>()))
-				.Request(c => c.CatIndices(new CatIndicesRequest(Nest.Indices.Index<Project>())))
-				.FluentAsync(c => c.CatIndicesAsync(i => i.Index<Project>()))
-				.RequestAsync(c => c.CatIndicesAsync(new CatIndicesRequest(Nest.Indices.Index<Project>())))
+					.Fluent(c => c.CatIndices(i => i.Index<Project>()))
+					.Request(c => c.CatIndices(new CatIndicesRequest(Nest.Indices.Index<Project>())))
+					.FluentAsync(c => c.CatIndicesAsync(i => i.Index<Project>()))
+					.RequestAsync(c => c.CatIndicesAsync(new CatIndicesRequest(Nest.Indices.Index<Project>())))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cat/CatMaster/CatMasterApiTests.cs b/src/Tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
index f21394e609b..a6b1daf5640 100644
--- a/src/Tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
+++ b/src/Tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
@@ -4,29 +4,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatMaster
 {
-	public class CatMasterApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatMasterRecord>, ICatMasterRequest, CatMasterDescriptor, CatMasterRequest>
+	public class CatMasterApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatMasterRecord>, ICatMasterRequest, CatMasterDescriptor, CatMasterRequest>
 	{
 		public CatMasterApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatMaster(),
-			fluentAsync: (client, f) => client.CatMasterAsync(),
-			request: (client, r) => client.CatMaster(r),
-			requestAsync: (client, r) => client.CatMasterAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/master";
 
-		protected override void ExpectResponse(ICatResponse<CatMasterRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatMaster(),
+			(client, f) => client.CatMasterAsync(),
+			(client, r) => client.CatMaster(r),
+			(client, r) => client.CatMasterAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatMasterRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Node));
-		}
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs b/src/Tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
index 2ceda245256..7f6d88439ff 100644
--- a/src/Tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cat.CatMaster
 {
 	public class CatMasterUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat/master")
-				.Fluent(c => c.CatMaster())
-				.Request(c => c.CatMaster(new CatMasterRequest()))
-				.FluentAsync(c => c.CatMasterAsync())
-				.RequestAsync(c => c.CatMasterAsync(new CatMasterRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cat/master")
+			.Fluent(c => c.CatMaster())
+			.Request(c => c.CatMaster(new CatMasterRequest()))
+			.FluentAsync(c => c.CatMasterAsync())
+			.RequestAsync(c => c.CatMasterAsync(new CatMasterRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatNodeAttributes/CatAliasesUrlTests.cs b/src/Tests/Tests/Cat/CatNodeAttributes/CatAliasesUrlTests.cs
index 5141dd17f3b..4eb8049de6d 100644
--- a/src/Tests/Tests/Cat/CatNodeAttributes/CatAliasesUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatNodeAttributes/CatAliasesUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cat.CatNodeAttributes
 {
 	public class CatNodeAttributesUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat/nodeattrs")
-				.Fluent(c => c.CatNodeAttributes())
-				.Request(c => c.CatNodeAttributes(new CatNodeAttributesRequest()))
-				.FluentAsync(c => c.CatNodeAttributesAsync())
-				.RequestAsync(c => c.CatNodeAttributesAsync(new CatNodeAttributesRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cat/nodeattrs")
+			.Fluent(c => c.CatNodeAttributes())
+			.Request(c => c.CatNodeAttributes(new CatNodeAttributesRequest()))
+			.FluentAsync(c => c.CatNodeAttributesAsync())
+			.RequestAsync(c => c.CatNodeAttributesAsync(new CatNodeAttributesRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatNodeAttributes/CatNodeAttributesApiTests.cs b/src/Tests/Tests/Cat/CatNodeAttributes/CatNodeAttributesApiTests.cs
index 83b25d64560..e9b4988b5b8 100644
--- a/src/Tests/Tests/Cat/CatNodeAttributes/CatNodeAttributesApiTests.cs
+++ b/src/Tests/Tests/Cat/CatNodeAttributes/CatNodeAttributesApiTests.cs
@@ -4,29 +4,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatNodeAttributes
 {
-	public class CatNodeAttributesApiTests : ApiIntegrationTestBase<ReadOnlyCluster,ICatResponse<CatNodeAttributesRecord>, ICatNodeAttributesRequest, CatNodeAttributesDescriptor, CatNodeAttributesRequest>
+	public class CatNodeAttributesApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatNodeAttributesRecord>, ICatNodeAttributesRequest, CatNodeAttributesDescriptor,
+			CatNodeAttributesRequest>
 	{
 		public CatNodeAttributesApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatNodeAttributes(),
-			fluentAsync: (client, f) => client.CatNodeAttributesAsync(),
-			request: (client, r) => client.CatNodeAttributes(r),
-			requestAsync: (client, r) => client.CatNodeAttributesAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/nodeattrs";
 
-		protected override void ExpectResponse(ICatResponse<CatNodeAttributesRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatNodeAttributes(),
+			(client, f) => client.CatNodeAttributesAsync(),
+			(client, r) => client.CatNodeAttributes(r),
+			(client, r) => client.CatNodeAttributesAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatNodeAttributesRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => a.Attribute == "testingcluster");
-		}
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatNodes/CatNodesApiTests.cs b/src/Tests/Tests/Cat/CatNodes/CatNodesApiTests.cs
index ecee38ff530..e26786baee7 100644
--- a/src/Tests/Tests/Cat/CatNodes/CatNodesApiTests.cs
+++ b/src/Tests/Tests/Cat/CatNodes/CatNodesApiTests.cs
@@ -4,29 +4,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatNodes
 {
-	public class CatNodesApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatNodesRecord>, ICatNodesRequest, CatNodesDescriptor, CatNodesRequest>
+	public class CatNodesApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatNodesRecord>, ICatNodesRequest, CatNodesDescriptor, CatNodesRequest>
 	{
 		public CatNodesApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatNodes(f),
-			fluentAsync: (client, f) => client.CatNodesAsync(f),
-			request: (client, r) => client.CatNodes(r),
-			requestAsync: (client, r) => client.CatNodesAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/nodes";
 
-		protected override void ExpectResponse(ICatResponse<CatNodesRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatNodes(f),
+			(client, f) => client.CatNodesAsync(f),
+			(client, r) => client.CatNodes(r),
+			(client, r) => client.CatNodesAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatNodesRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Name));
-		}
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatNodes/CatNodesUrlTests.cs b/src/Tests/Tests/Cat/CatNodes/CatNodesUrlTests.cs
index 62bec7c85dc..9250f8f2b54 100644
--- a/src/Tests/Tests/Cat/CatNodes/CatNodesUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatNodes/CatNodesUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cat.CatNodes
 {
 	public class CatNodesUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat/nodes")
-				.Fluent(c => c.CatNodes())
-				.Request(c => c.CatNodes(new CatNodesRequest()))
-				.FluentAsync(c => c.CatNodesAsync())
-				.RequestAsync(c => c.CatNodesAsync(new CatNodesRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cat/nodes")
+			.Fluent(c => c.CatNodes())
+			.Request(c => c.CatNodes(new CatNodesRequest()))
+			.FluentAsync(c => c.CatNodesAsync())
+			.RequestAsync(c => c.CatNodesAsync(new CatNodesRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatPendingTasks/CatPendingTasksApiTests.cs b/src/Tests/Tests/Cat/CatPendingTasks/CatPendingTasksApiTests.cs
index 00d557ee15a..403423cea97 100644
--- a/src/Tests/Tests/Cat/CatPendingTasks/CatPendingTasksApiTests.cs
+++ b/src/Tests/Tests/Cat/CatPendingTasks/CatPendingTasksApiTests.cs
@@ -3,26 +3,25 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatPendingTasks
 {
-	public class CatPendingTasksApiTests : ApiIntegrationTestBase<ReadOnlyCluster,ICatResponse<CatPendingTasksRecord>, ICatPendingTasksRequest, CatPendingTasksDescriptor, CatPendingTasksRequest>
+	public class CatPendingTasksApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatPendingTasksRecord>, ICatPendingTasksRequest, CatPendingTasksDescriptor,
+			CatPendingTasksRequest>
 	{
 		public CatPendingTasksApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatPendingTasks(),
-			fluentAsync: (client, f) => client.CatPendingTasksAsync(),
-			request: (client, r) => client.CatPendingTasks(r),
-			requestAsync: (client, r) => client.CatPendingTasksAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/pending_tasks";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatPendingTasks(),
+			(client, f) => client.CatPendingTasksAsync(),
+			(client, r) => client.CatPendingTasks(r),
+			(client, r) => client.CatPendingTasksAsync(r)
+		);
 	}
-
 }
diff --git a/src/Tests/Tests/Cat/CatPendingTasks/CatPendingTasksUrlTests.cs b/src/Tests/Tests/Cat/CatPendingTasks/CatPendingTasksUrlTests.cs
index 31558a226c4..b2d7fafe716 100644
--- a/src/Tests/Tests/Cat/CatPendingTasks/CatPendingTasksUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatPendingTasks/CatPendingTasksUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cat.CatPendingTasks
 {
 	public class CatPendingTasksUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat/pending_tasks")
-				.Fluent(c => c.CatPendingTasks())
-				.Request(c => c.CatPendingTasks(new CatPendingTasksRequest()))
-				.FluentAsync(c => c.CatPendingTasksAsync())
-				.RequestAsync(c => c.CatPendingTasksAsync(new CatPendingTasksRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cat/pending_tasks")
+			.Fluent(c => c.CatPendingTasks())
+			.Request(c => c.CatPendingTasks(new CatPendingTasksRequest()))
+			.FluentAsync(c => c.CatPendingTasksAsync())
+			.RequestAsync(c => c.CatPendingTasksAsync(new CatPendingTasksRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatPlugins/CatPluginsApiTests.cs b/src/Tests/Tests/Cat/CatPlugins/CatPluginsApiTests.cs
index 7b94943961d..7fd411e03c3 100644
--- a/src/Tests/Tests/Cat/CatPlugins/CatPluginsApiTests.cs
+++ b/src/Tests/Tests/Cat/CatPlugins/CatPluginsApiTests.cs
@@ -4,29 +4,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatPlugins
 {
-	public class CatPluginsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatPluginsRecord>, ICatPluginsRequest, CatPluginsDescriptor, CatPluginsRequest>
+	public class CatPluginsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatPluginsRecord>, ICatPluginsRequest, CatPluginsDescriptor, CatPluginsRequest>
 	{
 		public CatPluginsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatPlugins(),
-			fluentAsync: (client, f) => client.CatPluginsAsync(),
-			request: (client, r) => client.CatPlugins(r),
-			requestAsync: (client, r) => client.CatPluginsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/plugins";
 
-		protected override void ExpectResponse(ICatResponse<CatPluginsRecord> response)
-		{
-			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Name) && a.Component == "mapper-murmur3");
-		}
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatPlugins(),
+			(client, f) => client.CatPluginsAsync(),
+			(client, r) => client.CatPlugins(r),
+			(client, r) => client.CatPluginsAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatPluginsRecord> response) => response.Records.Should()
+			.NotBeEmpty()
+			.And.Contain(a => !string.IsNullOrEmpty(a.Name) && a.Component == "mapper-murmur3");
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatPlugins/CatPluginsUrlTests.cs b/src/Tests/Tests/Cat/CatPlugins/CatPluginsUrlTests.cs
index 504615c1350..75ada0fed79 100644
--- a/src/Tests/Tests/Cat/CatPlugins/CatPluginsUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatPlugins/CatPluginsUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cat.CatPlugins
 {
 	public class CatPluginsUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat/plugins")
-				.Fluent(c => c.CatPlugins())
-				.Request(c => c.CatPlugins(new CatPluginsRequest()))
-				.FluentAsync(c => c.CatPluginsAsync())
-				.RequestAsync(c => c.CatPluginsAsync(new CatPluginsRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cat/plugins")
+			.Fluent(c => c.CatPlugins())
+			.Request(c => c.CatPlugins(new CatPluginsRequest()))
+			.FluentAsync(c => c.CatPluginsAsync())
+			.RequestAsync(c => c.CatPluginsAsync(new CatPluginsRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatRecovery/CatRecoveryApiTests.cs b/src/Tests/Tests/Cat/CatRecovery/CatRecoveryApiTests.cs
index ff6a9dd5ea4..436c389b1b3 100644
--- a/src/Tests/Tests/Cat/CatRecovery/CatRecoveryApiTests.cs
+++ b/src/Tests/Tests/Cat/CatRecovery/CatRecoveryApiTests.cs
@@ -3,26 +3,24 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatRecovery
 {
-	public class CatRecoveryApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatRecoveryRecord>, ICatRecoveryRequest, CatRecoveryDescriptor, CatRecoveryRequest>
+	public class CatRecoveryApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatRecoveryRecord>, ICatRecoveryRequest, CatRecoveryDescriptor, CatRecoveryRequest>
 	{
 		public CatRecoveryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatRecovery(),
-			fluentAsync: (client, f) => client.CatRecoveryAsync(),
-			request: (client, r) => client.CatRecovery(r),
-			requestAsync: (client, r) => client.CatRecoveryAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/recovery";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatRecovery(),
+			(client, f) => client.CatRecoveryAsync(),
+			(client, r) => client.CatRecovery(r),
+			(client, r) => client.CatRecoveryAsync(r)
+		);
 	}
-
 }
diff --git a/src/Tests/Tests/Cat/CatRecovery/CatRecoveryUrlTests.cs b/src/Tests/Tests/Cat/CatRecovery/CatRecoveryUrlTests.cs
index 6805da8af8c..d7503bbc46f 100644
--- a/src/Tests/Tests/Cat/CatRecovery/CatRecoveryUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatRecovery/CatRecoveryUrlTests.cs
@@ -12,10 +12,10 @@ public class CatRecoveryUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/recovery")
-				.Fluent(c => c.CatRecovery())
-				.Request(c => c.CatRecovery(new CatRecoveryRequest()))
-				.FluentAsync(c => c.CatRecoveryAsync())
-				.RequestAsync(c => c.CatRecoveryAsync(new CatRecoveryRequest()))
+					.Fluent(c => c.CatRecovery())
+					.Request(c => c.CatRecovery(new CatRecoveryRequest()))
+					.FluentAsync(c => c.CatRecoveryAsync())
+					.RequestAsync(c => c.CatRecoveryAsync(new CatRecoveryRequest()))
 				;
 
 			await GET("/_cat/recovery/project")
diff --git a/src/Tests/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs b/src/Tests/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs
index 4f46b4d1e44..35a38e027ce 100644
--- a/src/Tests/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs
+++ b/src/Tests/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
@@ -9,24 +8,30 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatRepositories
 {
 	[SkipVersion("<2.1.0", "")]
-	public class CatRepositoriesApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, ICatResponse<CatRepositoriesRecord>, ICatRepositoriesRequest, CatRepositoriesDescriptor, CatRepositoriesRequest>
+	public class CatRepositoriesApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, ICatResponse<CatRepositoriesRecord>, ICatRepositoriesRequest, CatRepositoriesDescriptor,
+			CatRepositoriesRequest>
 	{
 		private static readonly string RepositoryName = RandomString();
 
 		public CatRepositoriesApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override string UrlPath => $"/_cat/repositories";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			if (!TestClient.Configuration.RunIntegrationTests) return;
-			var repositoryLocation = Path.Combine(this.Cluster.FileSystem.RepositoryPath, RandomString());
 
-			var create = this.Client.CreateRepository(RepositoryName, cr => cr
+			var repositoryLocation = Path.Combine(Cluster.FileSystem.RepositoryPath, RandomString());
+
+			var create = Client.CreateRepository(RepositoryName, cr => cr
 				.FileSystem(fs => fs
 					.Settings(repositoryLocation)
 				)
@@ -37,24 +42,17 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatRepositories(f),
-			fluentAsync: (client, f) => client.CatRepositoriesAsync(f),
-			request: (client, r) => client.CatRepositories(r),
-			requestAsync: (client, r) => client.CatRepositoriesAsync(r)
+			(client, f) => client.CatRepositories(f),
+			(client, f) => client.CatRepositoriesAsync(f),
+			(client, r) => client.CatRepositories(r),
+			(client, r) => client.CatRepositoriesAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_cat/repositories";
-
-		protected override void ExpectResponse(ICatResponse<CatRepositoriesRecord> response)
-		{
-			response.Records.Should().NotBeEmpty()
-				.And.OnlyContain(r=>
-					!string.IsNullOrEmpty(r.Id)
-					&& !string.IsNullOrEmpty(r.Type)
-				);
-		}
+		protected override void ExpectResponse(ICatResponse<CatRepositoriesRecord> response) => response.Records.Should()
+			.NotBeEmpty()
+			.And.OnlyContain(r =>
+				!string.IsNullOrEmpty(r.Id)
+				&& !string.IsNullOrEmpty(r.Type)
+			);
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatRepositories/CatRepositoriesUrlTests.cs b/src/Tests/Tests/Cat/CatRepositories/CatRepositoriesUrlTests.cs
index a5e5df7f1ae..3780d4d8e88 100644
--- a/src/Tests/Tests/Cat/CatRepositories/CatRepositoriesUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatRepositories/CatRepositoriesUrlTests.cs
@@ -11,17 +11,17 @@ public class CatRepositoriesUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/repositories")
-				.Fluent(c => c.CatRepositories())
-				.Request(c => c.CatRepositories(new CatRepositoriesRequest()))
-				.FluentAsync(c => c.CatRepositoriesAsync())
-				.RequestAsync(c => c.CatRepositoriesAsync(new CatRepositoriesRequest()))
+					.Fluent(c => c.CatRepositories())
+					.Request(c => c.CatRepositories(new CatRepositoriesRequest()))
+					.FluentAsync(c => c.CatRepositoriesAsync())
+					.RequestAsync(c => c.CatRepositoriesAsync(new CatRepositoriesRequest()))
 				;
 
 			await GET("/_cat/repositories?v=true")
-				.Fluent(c => c.CatRepositories(s=>s.Verbose()))
-				.Request(c => c.CatRepositories(new CatRepositoriesRequest() { Verbose = true }))
-				.FluentAsync(c => c.CatRepositoriesAsync(s=>s.Verbose()))
-				.RequestAsync(c => c.CatRepositoriesAsync(new CatRepositoriesRequest() { Verbose = true }))
+					.Fluent(c => c.CatRepositories(s => s.Verbose()))
+					.Request(c => c.CatRepositories(new CatRepositoriesRequest() { Verbose = true }))
+					.FluentAsync(c => c.CatRepositoriesAsync(s => s.Verbose()))
+					.RequestAsync(c => c.CatRepositoriesAsync(new CatRepositoriesRequest() { Verbose = true }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cat/CatSegments/CatSegmentsApiTests.cs b/src/Tests/Tests/Cat/CatSegments/CatSegmentsApiTests.cs
index da469375bf7..2499df3a56e 100644
--- a/src/Tests/Tests/Cat/CatSegments/CatSegmentsApiTests.cs
+++ b/src/Tests/Tests/Cat/CatSegments/CatSegmentsApiTests.cs
@@ -4,30 +4,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatSegments
 {
-	public class CatSegmentsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatSegmentsRecord>, ICatSegmentsRequest, CatSegmentsDescriptor, CatSegmentsRequest>
+	public class CatSegmentsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatSegmentsRecord>, ICatSegmentsRequest, CatSegmentsDescriptor, CatSegmentsRequest>
 	{
 		public CatSegmentsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatSegments(),
-			fluentAsync: (client, f) => client.CatSegmentsAsync(),
-			request: (client, r) => client.CatSegments(r),
-			requestAsync: (client, r) => client.CatSegmentsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/segments";
 
-		protected override void ExpectResponse(ICatResponse<CatSegmentsRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatSegments(),
+			(client, f) => client.CatSegmentsAsync(),
+			(client, r) => client.CatSegments(r),
+			(client, r) => client.CatSegmentsAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatSegmentsRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Index));
-		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cat/CatSegments/CatSegmentsUrlTests.cs b/src/Tests/Tests/Cat/CatSegments/CatSegmentsUrlTests.cs
index 0ab464588b7..abf21fe3164 100644
--- a/src/Tests/Tests/Cat/CatSegments/CatSegmentsUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatSegments/CatSegmentsUrlTests.cs
@@ -12,10 +12,10 @@ public class CatSegmentsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/segments")
-				.Fluent(c => c.CatSegments())
-				.Request(c => c.CatSegments(new CatSegmentsRequest()))
-				.FluentAsync(c => c.CatSegmentsAsync())
-				.RequestAsync(c => c.CatSegmentsAsync(new CatSegmentsRequest()))
+					.Fluent(c => c.CatSegments())
+					.Request(c => c.CatSegments(new CatSegmentsRequest()))
+					.FluentAsync(c => c.CatSegmentsAsync())
+					.RequestAsync(c => c.CatSegmentsAsync(new CatSegmentsRequest()))
 				;
 
 			await GET("/_cat/segments/project")
diff --git a/src/Tests/Tests/Cat/CatShards/CatShardsApiTests.cs b/src/Tests/Tests/Cat/CatShards/CatShardsApiTests.cs
index 92ae79ca0a6..0bb07c38870 100644
--- a/src/Tests/Tests/Cat/CatShards/CatShardsApiTests.cs
+++ b/src/Tests/Tests/Cat/CatShards/CatShardsApiTests.cs
@@ -4,30 +4,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatShards
 {
-	public class CatShardsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatShardsRecord>, ICatShardsRequest, CatShardsDescriptor, CatShardsRequest>
+	public class CatShardsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatShardsRecord>, ICatShardsRequest, CatShardsDescriptor, CatShardsRequest>
 	{
 		public CatShardsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatShards(),
-			fluentAsync: (client, f) => client.CatShardsAsync(),
-			request: (client, r) => client.CatShards(r),
-			requestAsync: (client, r) => client.CatShardsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/shards";
 
-		protected override void ExpectResponse(ICatResponse<CatShardsRecord> response)
-		{
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatShards(),
+			(client, f) => client.CatShardsAsync(),
+			(client, r) => client.CatShards(r),
+			(client, r) => client.CatShardsAsync(r)
+		);
+
+		protected override void ExpectResponse(ICatResponse<CatShardsRecord> response) =>
 			response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.PrimaryOrReplica));
-		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cat/CatShards/CatShardsUrlTests.cs b/src/Tests/Tests/Cat/CatShards/CatShardsUrlTests.cs
index f59d962e7ec..b289c1d324b 100644
--- a/src/Tests/Tests/Cat/CatShards/CatShardsUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatShards/CatShardsUrlTests.cs
@@ -12,10 +12,10 @@ public class CatShardsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/shards")
-				.Fluent(c => c.CatShards())
-				.Request(c => c.CatShards(new CatShardsRequest()))
-				.FluentAsync(c => c.CatShardsAsync())
-				.RequestAsync(c => c.CatShardsAsync(new CatShardsRequest()))
+					.Fluent(c => c.CatShards())
+					.Request(c => c.CatShards(new CatShardsRequest()))
+					.FluentAsync(c => c.CatShardsAsync())
+					.RequestAsync(c => c.CatShardsAsync(new CatShardsRequest()))
 				;
 
 			await GET("/_cat/shards/project")
diff --git a/src/Tests/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs b/src/Tests/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs
index 2121c708f42..f689b1a7304 100644
--- a/src/Tests/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs
+++ b/src/Tests/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
@@ -9,26 +8,34 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatSnapshots
 {
 	[SkipVersion("<2.1.0", "")]
-	public class CatSnapshotsApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, ICatResponse<CatSnapshotsRecord>, ICatSnapshotsRequest, CatSnapshotsDescriptor, CatSnapshotsRequest>
+	public class CatSnapshotsApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, ICatResponse<CatSnapshotsRecord>, ICatSnapshotsRequest, CatSnapshotsDescriptor,
+			CatSnapshotsRequest>
 	{
-		private static readonly string SnapshotName = RandomString();
-		private static readonly string SnapshotIndexName = RandomString();
 		private static readonly string RepositoryName = RandomString();
+		private static readonly string SnapshotIndexName = RandomString();
+		private static readonly string SnapshotName = RandomString();
 
 		public CatSnapshotsApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
+		protected override CatSnapshotsRequest Initializer => new CatSnapshotsRequest(RepositoryName);
+		protected override string UrlPath => $"/_cat/snapshots/{RepositoryName}";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			if (!TestClient.Configuration.RunIntegrationTests) return;
-			var repositoryLocation = Path.Combine(this.Cluster.FileSystem.RepositoryPath, RandomString());
 
-			var create = this.Client.CreateRepository(RepositoryName, cr => cr
+			var repositoryLocation = Path.Combine(Cluster.FileSystem.RepositoryPath, RandomString());
+
+			var create = Client.CreateRepository(RepositoryName, cr => cr
 				.FileSystem(fs => fs
 					.Settings(repositoryLocation)
 				)
@@ -37,28 +44,19 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			if (!create.IsValid || !create.Acknowledged)
 				throw new Exception("Setup: failed to create snapshot repository");
 
-			var createIndex = this.Client.CreateIndex(SnapshotIndexName);
-			this.Client.ClusterHealth(g => g.WaitForStatus(WaitForStatus.Yellow).Index(SnapshotIndexName));
-			client.Snapshot(RepositoryName, SnapshotName, s=>s.WaitForCompletion().Index(SnapshotIndexName));
+			var createIndex = Client.CreateIndex(SnapshotIndexName);
+			Client.ClusterHealth(g => g.WaitForStatus(WaitForStatus.Yellow).Index(SnapshotIndexName));
+			client.Snapshot(RepositoryName, SnapshotName, s => s.WaitForCompletion().Index(SnapshotIndexName));
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatSnapshots(RepositoryName, f),
-			fluentAsync: (client, f) => client.CatSnapshotsAsync(RepositoryName, f),
-			request: (client, r) => client.CatSnapshots(r),
-			requestAsync: (client, r) => client.CatSnapshotsAsync(r)
+			(client, f) => client.CatSnapshots(RepositoryName, f),
+			(client, f) => client.CatSnapshotsAsync(RepositoryName, f),
+			(client, r) => client.CatSnapshots(r),
+			(client, r) => client.CatSnapshotsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_cat/snapshots/{RepositoryName}";
-
-		protected override CatSnapshotsRequest Initializer => new CatSnapshotsRequest(RepositoryName);
-
-		protected override void ExpectResponse(ICatResponse<CatSnapshotsRecord> response)
-		{
-			response.Records.Should().NotBeEmpty().And.OnlyContain(r=>r.Status == "SUCCESS");
-		}
+		protected override void ExpectResponse(ICatResponse<CatSnapshotsRecord> response) =>
+			response.Records.Should().NotBeEmpty().And.OnlyContain(r => r.Status == "SUCCESS");
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatSnapshots/CatSnapshotsUrlTests.cs b/src/Tests/Tests/Cat/CatSnapshots/CatSnapshotsUrlTests.cs
index c42ea7b78be..079bfc5d2bc 100644
--- a/src/Tests/Tests/Cat/CatSnapshots/CatSnapshotsUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatSnapshots/CatSnapshotsUrlTests.cs
@@ -11,17 +11,17 @@ public class CatSnapshotsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/snapshots/foo")
-				.Fluent(c => c.CatSnapshots("foo"))
-				.Request(c => c.CatSnapshots(new CatSnapshotsRequest("foo")))
-				.FluentAsync(c => c.CatSnapshotsAsync("foo"))
-				.RequestAsync(c => c.CatSnapshotsAsync(new CatSnapshotsRequest("foo")))
+					.Fluent(c => c.CatSnapshots("foo"))
+					.Request(c => c.CatSnapshots(new CatSnapshotsRequest("foo")))
+					.FluentAsync(c => c.CatSnapshotsAsync("foo"))
+					.RequestAsync(c => c.CatSnapshotsAsync(new CatSnapshotsRequest("foo")))
 				;
 
 			await GET("/_cat/snapshots/foo?v=true")
-				.Fluent(c => c.CatSnapshots("foo", s=>s.Verbose()))
-				.Request(c => c.CatSnapshots(new CatSnapshotsRequest("foo") { Verbose = true }))
-				.FluentAsync(c => c.CatSnapshotsAsync("foo", s=>s.Verbose()))
-				.RequestAsync(c => c.CatSnapshotsAsync(new CatSnapshotsRequest("foo") { Verbose = true }))
+					.Fluent(c => c.CatSnapshots("foo", s => s.Verbose()))
+					.Request(c => c.CatSnapshots(new CatSnapshotsRequest("foo") { Verbose = true }))
+					.FluentAsync(c => c.CatSnapshotsAsync("foo", s => s.Verbose()))
+					.RequestAsync(c => c.CatSnapshotsAsync(new CatSnapshotsRequest("foo") { Verbose = true }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cat/CatTasks/CatTasksApiTests.cs b/src/Tests/Tests/Cat/CatTasks/CatTasksApiTests.cs
index b0140a9772d..bb90a06aa76 100644
--- a/src/Tests/Tests/Cat/CatTasks/CatTasksApiTests.cs
+++ b/src/Tests/Tests/Cat/CatTasks/CatTasksApiTests.cs
@@ -3,24 +3,24 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatTasks
 {
-	public class CatTasksApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatTasksRecord>, ICatTasksRequest, CatTasksDescriptor, CatTasksRequest>
+	public class CatTasksApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatTasksRecord>, ICatTasksRequest, CatTasksDescriptor, CatTasksRequest>
 	{
 		public CatTasksApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatTasks(),
-			fluentAsync: (client, f) => client.CatTasksAsync(),
-			request: (client, r) => client.CatTasks(r),
-			requestAsync: (client, r) => client.CatTasksAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/tasks";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatTasks(),
+			(client, f) => client.CatTasksAsync(),
+			(client, r) => client.CatTasks(r),
+			(client, r) => client.CatTasksAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatTasks/CatTasksUrlTests.cs b/src/Tests/Tests/Cat/CatTasks/CatTasksUrlTests.cs
index 40d3e5e6ebd..0f430b399ec 100644
--- a/src/Tests/Tests/Cat/CatTasks/CatTasksUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatTasks/CatTasksUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cat.CatTasks
 {
 	public class CatTasksUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat/tasks")
-				.Fluent(c => c.CatTasks())
-				.Request(c => c.CatTasks(new CatTasksRequest()))
-				.FluentAsync(c => c.CatTasksAsync())
-				.RequestAsync(c => c.CatTasksAsync(new CatTasksRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cat/tasks")
+			.Fluent(c => c.CatTasks())
+			.Request(c => c.CatTasks(new CatTasksRequest()))
+			.FluentAsync(c => c.CatTasksAsync())
+			.RequestAsync(c => c.CatTasksAsync(new CatTasksRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs b/src/Tests/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs
index afbef797375..da706e6e478 100644
--- a/src/Tests/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs
+++ b/src/Tests/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs
@@ -5,27 +5,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatTemplates
 {
 	[SkipVersion("<5.1.0", "CatTemplates is an API introduced in 5.1")]
-	public class CatTemplatesApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatTemplatesRecord>, ICatTemplatesRequest, CatTemplatesDescriptor, CatTemplatesRequest>
+	public class CatTemplatesApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatTemplatesRecord>, ICatTemplatesRequest, CatTemplatesDescriptor, CatTemplatesRequest>
 	{
 		public CatTemplatesApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatTemplates(),
-			fluentAsync: (client, f) => client.CatTemplatesAsync(),
-			request: (client, r) => client.CatTemplates(r),
-			requestAsync: (client, r) => client.CatTemplatesAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/templates";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatTemplates(),
+			(client, f) => client.CatTemplatesAsync(),
+			(client, r) => client.CatTemplates(r),
+			(client, r) => client.CatTemplatesAsync(r)
+		);
+
 		protected override void ExpectResponse(ICatResponse<CatTemplatesRecord> response)
 		{
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -33,5 +33,4 @@ protected override void ExpectResponse(ICatResponse<CatTemplatesRecord> response
 #pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cat/CatTemplates/CatTemplatesUrlTests.cs b/src/Tests/Tests/Cat/CatTemplates/CatTemplatesUrlTests.cs
index 197a7ddb48e..3ed141fb9d0 100644
--- a/src/Tests/Tests/Cat/CatTemplates/CatTemplatesUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatTemplates/CatTemplatesUrlTests.cs
@@ -11,10 +11,10 @@ public class CatTemplatesUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cat/templates")
-				.Fluent(c => c.CatTemplates())
-				.Request(c => c.CatTemplates(new CatTemplatesRequest()))
-				.FluentAsync(c => c.CatTemplatesAsync())
-				.RequestAsync(c => c.CatTemplatesAsync(new CatTemplatesRequest()))
+					.Fluent(c => c.CatTemplates())
+					.Request(c => c.CatTemplates(new CatTemplatesRequest()))
+					.FluentAsync(c => c.CatTemplatesAsync())
+					.RequestAsync(c => c.CatTemplatesAsync(new CatTemplatesRequest()))
 				;
 
 			await GET("/_cat/templates/index-%2A")
diff --git a/src/Tests/Tests/Cat/CatThreadPool/CatThreadPoolUrlTests.cs b/src/Tests/Tests/Cat/CatThreadPool/CatThreadPoolUrlTests.cs
index 96eea848d9c..4d083752e93 100644
--- a/src/Tests/Tests/Cat/CatThreadPool/CatThreadPoolUrlTests.cs
+++ b/src/Tests/Tests/Cat/CatThreadPool/CatThreadPoolUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cat.CatThreadPool
 {
 	public class CatThreadPoolUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cat/thread_pool")
-				.Fluent(c => c.CatThreadPool())
-				.Request(c => c.CatThreadPool(new CatThreadPoolRequest()))
-				.FluentAsync(c => c.CatThreadPoolAsync())
-				.RequestAsync(c => c.CatThreadPoolAsync(new CatThreadPoolRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cat/thread_pool")
+			.Fluent(c => c.CatThreadPool())
+			.Request(c => c.CatThreadPool(new CatThreadPoolRequest()))
+			.FluentAsync(c => c.CatThreadPoolAsync())
+			.RequestAsync(c => c.CatThreadPoolAsync(new CatThreadPoolRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cat/CatThreadPool/CatThreadpoolApiTests.cs b/src/Tests/Tests/Cat/CatThreadPool/CatThreadpoolApiTests.cs
index 56d97e2b529..020cdc8792f 100644
--- a/src/Tests/Tests/Cat/CatThreadPool/CatThreadpoolApiTests.cs
+++ b/src/Tests/Tests/Cat/CatThreadPool/CatThreadpoolApiTests.cs
@@ -5,50 +5,54 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cat.CatThreadPool
 {
-	public class CatThreadPoolApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatThreadPoolRecord>, ICatThreadPoolRequest, CatThreadPoolDescriptor, CatThreadPoolRequest>
+	public class CatThreadPoolApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatThreadPoolRecord>, ICatThreadPoolRequest, CatThreadPoolDescriptor,
+			CatThreadPoolRequest>
 	{
 		public CatThreadPoolApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatThreadPool(),
-			fluentAsync: (client, f) => client.CatThreadPoolAsync(),
-			request: (client, r) => client.CatThreadPool(r),
-			requestAsync: (client, r) => client.CatThreadPoolAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/thread_pool";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatThreadPool(),
+			(client, f) => client.CatThreadPoolAsync(),
+			(client, r) => client.CatThreadPool(r),
+			(client, r) => client.CatThreadPoolAsync(r)
+		);
 	}
 
-	public class CatThreadPoolFullApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatThreadPoolRecord>, ICatThreadPoolRequest, CatThreadPoolDescriptor, CatThreadPoolRequest>
+	public class CatThreadPoolFullApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatThreadPoolRecord>, ICatThreadPoolRequest, CatThreadPoolDescriptor,
+			CatThreadPoolRequest>
 	{
 		public CatThreadPoolFullApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CatThreadPool(f),
-			fluentAsync: (client, f) => client.CatThreadPoolAsync(f),
-			request: (client, r) => client.CatThreadPool(r),
-			requestAsync: (client, r) => client.CatThreadPoolAsync(r)
-		);
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<CatThreadPoolDescriptor, ICatThreadPoolRequest> Fluent => f => f.Headers("*");
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override CatThreadPoolRequest Initializer { get; } = new CatThreadPoolRequest
 		{
 			Headers = new[] { "*" }
 		};
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cat/thread_pool?h=%2A";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CatThreadPool(f),
+			(client, f) => client.CatThreadPoolAsync(f),
+			(client, r) => client.CatThreadPool(r),
+			(client, r) => client.CatThreadPoolAsync(r)
+		);
+
 		protected override void ExpectResponse(ICatResponse<CatThreadPoolRecord> response)
 		{
 			response.Records.Should().NotBeNull();
@@ -71,6 +75,5 @@ protected override void ExpectResponse(ICatResponse<CatThreadPoolRecord> respons
 
 			response.Records.Should().Contain(r => r.KeepAlive != null);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/ClientConcepts/Certificates/SslAndKpiXPackCluster.cs b/src/Tests/Tests/ClientConcepts/Certificates/SslAndKpiXPackCluster.cs
index b57cdd3ce6d..76706dc2a14 100644
--- a/src/Tests/Tests/ClientConcepts/Certificates/SslAndKpiXPackCluster.cs
+++ b/src/Tests/Tests/ClientConcepts/Certificates/SslAndKpiXPackCluster.cs
@@ -1,20 +1,11 @@
-using Elastic.Managed.Ephemeral.Plugins;
-using Nest;
-using Tests.Core.ManagedElasticsearch.Clusters;
+using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Core.Xunit;
-using Tests.Framework;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.ClientConcepts.Certificates
 {
 	public class SslAndKpiClusterConfiguration : XPackClusterConfiguration
 	{
-		public SslAndKpiClusterConfiguration()
-		{
-			// Skipping bootstrap validation because they call out to elasticsearch and would force
-			// The ServerCertificateValidationCallback to return true. Since its cached this would mess with later assertations.
-			this.SkipBuiltInAfterStartTasks = true;
-		}
+		public SslAndKpiClusterConfiguration() => SkipBuiltInAfterStartTasks = true;
 	}
 
 	[IntegrationOnly]
@@ -24,8 +15,6 @@ public SslAndKpiXPackCluster() : this(new SslAndKpiClusterConfiguration()) { }
 
 		public SslAndKpiXPackCluster(SslAndKpiClusterConfiguration configuration) : base(configuration) { }
 
-		protected override void SeedCluster()
-		{
-		}
+		protected override void SeedCluster() { }
 	}
 }
diff --git a/src/Tests/Tests/ClientConcepts/Connection/HttpConnectionTests.cs b/src/Tests/Tests/ClientConcepts/Connection/HttpConnectionTests.cs
index 3c11ad0bde9..551b31cd3e8 100644
--- a/src/Tests/Tests/ClientConcepts/Connection/HttpConnectionTests.cs
+++ b/src/Tests/Tests/ClientConcepts/Connection/HttpConnectionTests.cs
@@ -7,48 +7,20 @@
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using Tests.Framework;
 using HttpMethod = Elasticsearch.Net.HttpMethod;
 
 namespace Tests.ClientConcepts.Connection
 {
-    public class HttpConnectionTests
-    {
-	    public class TestableHttpConnection : HttpConnection
-	    {
-		    public int ClientCount => this.Clients.Count;
-
-		    public int CallCount { get; private set; }
-
-		    public HttpClientHandler LastUsedHttpClientHandler { get; private set; }
-
-		    public override TResponse Request<TResponse>(RequestData requestData)
-		    {
-			    CallCount++;
-			    return base.Request<TResponse>(requestData);
-		    }
-
-		    public override Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
-		    {
-			    CallCount++;
-			    return base.RequestAsync<TResponse>(requestData, cancellationToken);
-		    }
-
-		    protected override HttpClientHandler CreateHttpClientHandler(RequestData requestData)
-		    {
-			    LastUsedHttpClientHandler = base.CreateHttpClientHandler(requestData);
-			    return LastUsedHttpClientHandler;
-		    }
-	    }
-
-	    [I] public async Task SingleInstanceOfHttpClient()
-	    {
+	public class HttpConnectionTests
+	{
+		[I] public async Task SingleInstanceOfHttpClient()
+		{
 			var connection = new TestableHttpConnection();
-		    var requestData = CreateRequestData();
+			var requestData = CreateRequestData();
 			connection.Request<StringResponse>(requestData);
 
 			connection.CallCount.Should().Be(1);
-		    connection.ClientCount.Should().Be(1);
+			connection.ClientCount.Should().Be(1);
 
 			await connection.RequestAsync<StringResponse>(requestData, CancellationToken.None).ConfigureAwait(false);
 
@@ -56,39 +28,40 @@ [I] public async Task SingleInstanceOfHttpClient()
 			connection.ClientCount.Should().Be(1);
 		}
 
-	    [I] public async Task MultipleInstancesOfHttpClientWhenRequestTimeoutChanges() =>
-		    await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(TimeSpan.FromSeconds(30)));
+		[I] public async Task MultipleInstancesOfHttpClientWhenRequestTimeoutChanges() =>
+			await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(TimeSpan.FromSeconds(30)));
 
-	    [I] public async Task MultipleInstancesOfHttpClientWhenProxyChanges() =>
+		[I] public async Task MultipleInstancesOfHttpClientWhenProxyChanges() =>
 			await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(proxyAddress: new Uri("http://localhost:9400")));
 
-	    [I] public async Task MultipleInstancesOfHttpClientWhenAutomaticProxyDetectionChanges() =>
+		[I] public async Task MultipleInstancesOfHttpClientWhenAutomaticProxyDetectionChanges() =>
 			await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(disableAutomaticProxyDetection: true));
 
-	    [I] public async Task MultipleInstancesOfHttpClientWhenHttpCompressionChanges() =>
+		[I] public async Task MultipleInstancesOfHttpClientWhenHttpCompressionChanges() =>
 			await MultipleInstancesOfHttpClientWhen(() => CreateRequestData(httpCompression: true));
 
-	    private static async Task MultipleInstancesOfHttpClientWhen(Func<RequestData> differentRequestData)
-	    {
-		    var connection = new TestableHttpConnection();
-		    var requestData = CreateRequestData();
-		    connection.Request<StringResponse>(requestData);
+		private static async Task MultipleInstancesOfHttpClientWhen(Func<RequestData> differentRequestData)
+		{
+			var connection = new TestableHttpConnection();
+			var requestData = CreateRequestData();
+			connection.Request<StringResponse>(requestData);
 
-		    connection.CallCount.Should().Be(1);
-		    connection.ClientCount.Should().Be(1);
+			connection.CallCount.Should().Be(1);
+			connection.ClientCount.Should().Be(1);
 
-		    requestData = differentRequestData();
-		    await connection.RequestAsync<StringResponse>(requestData, CancellationToken.None).ConfigureAwait(false);
+			requestData = differentRequestData();
+			await connection.RequestAsync<StringResponse>(requestData, CancellationToken.None).ConfigureAwait(false);
 
-		    connection.CallCount.Should().Be(2);
-		    connection.ClientCount.Should().Be(2);
-	    }
+			connection.CallCount.Should().Be(2);
+			connection.ClientCount.Should().Be(2);
+		}
 
-	    private static RequestData CreateRequestData(
+		private static RequestData CreateRequestData(
 			TimeSpan requestTimeout = default(TimeSpan),
 			Uri proxyAddress = null,
 			bool disableAutomaticProxyDetection = false,
-			bool httpCompression = false)
+			bool httpCompression = false
+		)
 		{
 			if (requestTimeout == default(TimeSpan)) requestTimeout = TimeSpan.FromSeconds(10);
 
@@ -101,40 +74,66 @@ private static RequestData CreateRequestData(
 				connectionSettings.Proxy(proxyAddress, null, null);
 
 			var requestData = new RequestData(HttpMethod.GET, "/", null, connectionSettings, new PingRequestParameters(),
-			    new MemoryStreamFactory())
-		    {
-			    Node = new Node(new Uri("http://localhost:9200"))
-		    };
-		    return requestData;
-	    }
-
-	    /// <summary>
-	    /// Setting HttpClientHandler.Proxy = null don't disable HttpClient automatic proxy detection.
-	    /// It is disabled by setting Proxy to non-null value or by setting UseProxy = false.
-	    /// </summary>
-	    [I] public async Task HttpClientUseProxyShouldBeFalseWhenDisabledAutoProxyDetection()
-	    {
-		    var connection = new TestableHttpConnection();
-		    var requestData = CreateRequestData(disableAutomaticProxyDetection: true);
-
-		    connection.Request<StringResponse>(requestData);
-		    connection.LastUsedHttpClientHandler.UseProxy.Should().BeFalse();
-
-		    await connection.RequestAsync<StringResponse>(requestData, CancellationToken.None).ConfigureAwait(false);
-		    connection.LastUsedHttpClientHandler.UseProxy.Should().BeFalse();
-	    }
-
-	    [I] public async Task HttpClientUseProxyShouldBeTrueWhenEnabledAutoProxyDetection()
-	    {
-		    var connection = new TestableHttpConnection();
-		    var requestData = CreateRequestData();
-
-		    connection.Request<StringResponse>(requestData);
-		    connection.LastUsedHttpClientHandler.UseProxy.Should().BeTrue();
-
-		    await connection.RequestAsync<StringResponse>(requestData, CancellationToken.None).ConfigureAwait(false);
-		    connection.LastUsedHttpClientHandler.UseProxy.Should().BeTrue();
-	    }
-    }
+				new MemoryStreamFactory())
+			{
+				Node = new Node(new Uri("http://localhost:9200"))
+			};
+			return requestData;
+		}
+
+		/// <summary>
+		/// Setting HttpClientHandler.Proxy = null don't disable HttpClient automatic proxy detection.
+		/// It is disabled by setting Proxy to non-null value or by setting UseProxy = false.
+		/// </summary>
+		[I] public async Task HttpClientUseProxyShouldBeFalseWhenDisabledAutoProxyDetection()
+		{
+			var connection = new TestableHttpConnection();
+			var requestData = CreateRequestData(disableAutomaticProxyDetection: true);
+
+			connection.Request<StringResponse>(requestData);
+			connection.LastUsedHttpClientHandler.UseProxy.Should().BeFalse();
+
+			await connection.RequestAsync<StringResponse>(requestData, CancellationToken.None).ConfigureAwait(false);
+			connection.LastUsedHttpClientHandler.UseProxy.Should().BeFalse();
+		}
+
+		[I] public async Task HttpClientUseProxyShouldBeTrueWhenEnabledAutoProxyDetection()
+		{
+			var connection = new TestableHttpConnection();
+			var requestData = CreateRequestData();
+
+			connection.Request<StringResponse>(requestData);
+			connection.LastUsedHttpClientHandler.UseProxy.Should().BeTrue();
+
+			await connection.RequestAsync<StringResponse>(requestData, CancellationToken.None).ConfigureAwait(false);
+			connection.LastUsedHttpClientHandler.UseProxy.Should().BeTrue();
+		}
+
+		public class TestableHttpConnection : HttpConnection
+		{
+			public int CallCount { get; private set; }
+			public int ClientCount => Clients.Count;
+
+			public HttpClientHandler LastUsedHttpClientHandler { get; private set; }
+
+			public override TResponse Request<TResponse>(RequestData requestData)
+			{
+				CallCount++;
+				return base.Request<TResponse>(requestData);
+			}
+
+			public override Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
+			{
+				CallCount++;
+				return base.RequestAsync<TResponse>(requestData, cancellationToken);
+			}
+
+			protected override HttpClientHandler CreateHttpClientHandler(RequestData requestData)
+			{
+				LastUsedHttpClientHandler = base.CreateHttpClientHandler(requestData);
+				return LastUsedHttpClientHandler;
+			}
+		}
+	}
 }
 #endif
diff --git a/src/Tests/Tests/ClientConcepts/ConnectionPooling/Dispose/ResponseBuilderDisposeTests.cs b/src/Tests/Tests/ClientConcepts/ConnectionPooling/Dispose/ResponseBuilderDisposeTests.cs
index 5610591b7e6..acfe44e9558 100644
--- a/src/Tests/Tests/ClientConcepts/ConnectionPooling/Dispose/ResponseBuilderDisposeTests.cs
+++ b/src/Tests/Tests/ClientConcepts/ConnectionPooling/Dispose/ResponseBuilderDisposeTests.cs
@@ -9,8 +9,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Client.Settings;
-using Tests.Framework;
-using Tests.Framework.ManagedElasticsearch;
 
 namespace Tests.ClientConcepts.ConnectionPooling.Dispose
 {
@@ -19,49 +17,12 @@ public class ResponseBuilderDisposeTests
 		private readonly IConnectionSettingsValues _settings = new AlwaysInMemoryConnectionSettings().DisableDirectStreaming(false);
 		private readonly IConnectionSettingsValues _settingsDisableDirectStream = new AlwaysInMemoryConnectionSettings().DisableDirectStreaming(true);
 
-		private class TrackDisposeStream : MemoryStream
-		{
-			public TrackDisposeStream()
-			{
-			}
-
-			public TrackDisposeStream(byte[] bytes) : base(bytes)
-			{
-			}
-
-			public bool IsDisposed { get; private set; }
-			protected override void Dispose(bool disposing)
-			{
-				this.IsDisposed = true;
-				base.Dispose(disposing);
-			}
-		}
-
-		private class TrackMemoryStreamFactory : IMemoryStreamFactory
-		{
-			public IList<TrackDisposeStream> Created { get; } = new List<TrackDisposeStream>();
-
-			public MemoryStream Create()
-			{
-				var stream = new TrackDisposeStream();
-				this.Created.Add(stream);
-				return stream;
-			}
-
-			public MemoryStream Create(byte[] bytes)
-			{
-				var stream = new TrackDisposeStream(bytes);
-				this.Created.Add(stream);
-				return stream;
-			}
-		}
-
-		[U] public async Task ResponseWithHttpStatusCode() => await AssertRegularResponse(false, statusCode: 1);
+		[U] public async Task ResponseWithHttpStatusCode() => await AssertRegularResponse(false, 1);
 
 		[U] public async Task ResponseBuilderWithNoHttpStatusCode() => await AssertRegularResponse(false);
 
 		[U] public async Task ResponseWithHttpStatusCodeDisableDirectStreaming() =>
-			await AssertRegularResponse(true, statusCode: 1);
+			await AssertRegularResponse(true, 1);
 
 		[U] public async Task ResponseBuilderWithNoHttpStatusCodeDisableDirectStreaming() =>
 			await AssertRegularResponse(true);
@@ -89,7 +50,8 @@ private async Task AssertRegularResponse(bool disableDirectStreaming, int? statu
 
 			stream = new TrackDisposeStream();
 			var ct = new CancellationToken();
-			response = await ResponseBuilder.ToResponseAsync<RootNodeInfoResponse>(requestData, null, statusCode, null, stream, cancellationToken: ct);
+			response = await ResponseBuilder.ToResponseAsync<RootNodeInfoResponse>(requestData, null, statusCode, null, stream,
+				cancellationToken: ct);
 			memoryStreamFactory.Created.Count().Should().Be(disableDirectStreaming ? 2 : 0);
 			if (disableDirectStreaming)
 			{
@@ -99,12 +61,12 @@ private async Task AssertRegularResponse(bool disableDirectStreaming, int? statu
 			stream.IsDisposed.Should().BeTrue();
 		}
 
-		[U] public async Task StreamResponseWithHttpStatusCode() => await AssertStreamResponse(false, statusCode: 200);
+		[U] public async Task StreamResponseWithHttpStatusCode() => await AssertStreamResponse(false, 200);
 
 		[U] public async Task StreamResponseBuilderWithNoHttpStatusCode() => await AssertStreamResponse(false);
 
 		[U] public async Task StreamResponseWithHttpStatusCodeDisableDirectStreaming() =>
-			await AssertStreamResponse(true, statusCode: 1);
+			await AssertStreamResponse(true, 1);
 
 		[U] public async Task StreamResponseBuilderWithNoHttpStatusCodeDisableDirectStreaming() =>
 			await AssertStreamResponse(true);
@@ -127,12 +89,44 @@ private async Task AssertStreamResponse(bool disableDirectStreaming, int? status
 
 			stream = new TrackDisposeStream();
 			var ct = new CancellationToken();
-			response = await ResponseBuilder.ToResponseAsync<RootNodeInfoResponse>(requestData, null, statusCode, null, stream, cancellationToken: ct);
+			response = await ResponseBuilder.ToResponseAsync<RootNodeInfoResponse>(requestData, null, statusCode, null, stream,
+				cancellationToken: ct);
 			memoryStreamFactory.Created.Count().Should().Be(disableDirectStreaming ? 2 : 0);
 			stream.IsDisposed.Should().Be(true);
 		}
 
-	}
+		private class TrackDisposeStream : MemoryStream
+		{
+			public TrackDisposeStream() { }
+
+			public TrackDisposeStream(byte[] bytes) : base(bytes) { }
+
+			public bool IsDisposed { get; private set; }
+
+			protected override void Dispose(bool disposing)
+			{
+				IsDisposed = true;
+				base.Dispose(disposing);
+			}
+		}
+
+		private class TrackMemoryStreamFactory : IMemoryStreamFactory
+		{
+			public IList<TrackDisposeStream> Created { get; } = new List<TrackDisposeStream>();
 
+			public MemoryStream Create()
+			{
+				var stream = new TrackDisposeStream();
+				Created.Add(stream);
+				return stream;
+			}
 
+			public MemoryStream Create(byte[] bytes)
+			{
+				var stream = new TrackDisposeStream(bytes);
+				Created.Add(stream);
+				return stream;
+			}
+		}
+	}
 }
diff --git a/src/Tests/Tests/ClientConcepts/ConnectionPooling/RoundRobin/VolatileUpdates.cs b/src/Tests/Tests/ClientConcepts/ConnectionPooling/RoundRobin/VolatileUpdates.cs
index dc5b829f310..23054e4261e 100644
--- a/src/Tests/Tests/ClientConcepts/ConnectionPooling/RoundRobin/VolatileUpdates.cs
+++ b/src/Tests/Tests/ClientConcepts/ConnectionPooling/RoundRobin/VolatileUpdates.cs
@@ -5,7 +5,6 @@
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.ConnectionPooling.RoundRobin
 {
@@ -14,23 +13,27 @@ public class VolatileUpdates
 		protected int NumberOfNodes = 10;
 		private readonly Random Random = new Random();
 
-		private List<Node> Update = Enumerable.Range(9200, 10).Select(p => new Uri("http://localhost:" + p)).Select(u => new Node(u)).ToList();
+		private readonly List<Node> Update = Enumerable.Range(9200, 10)
+			.Select(p => new Uri("http://localhost:" + p))
+			.Select(u => new Node(u))
+			.ToList();
 
 		[U] public void SniffingPoolWithstandsConcurrentReadAndWrites()
 		{
 			var uris = Enumerable.Range(9200, NumberOfNodes).Select(p => new Uri("http://localhost:" + p));
-			var sniffingPool = new SniffingConnectionPool(uris, randomize: false);
+			var sniffingPool = new SniffingConnectionPool(uris, false);
 
-			Action callSniffing = () => this.AssertCreateView(sniffingPool);
+			Action callSniffing = () => AssertCreateView(sniffingPool);
 
 			callSniffing.ShouldNotThrow();
 		}
+
 		[U] public void StaticPoolWithstandsConcurrentReadAndWrites()
 		{
 			var uris = Enumerable.Range(9200, NumberOfNodes).Select(p => new Uri("http://localhost:" + p));
-			var staticPool = new StaticConnectionPool(uris, randomize: false);
+			var staticPool = new StaticConnectionPool(uris, false);
 
-			Action callStatic = () => this.AssertCreateView(staticPool);
+			Action callStatic = () => AssertCreateView(staticPool);
 
 			callStatic.ShouldNotThrow();
 		}
@@ -52,11 +55,10 @@ public void AssertCreateView(IConnectionPool pool)
 		public Thread CreateReadAndUpdateThread(IConnectionPool pool) => new Thread(() =>
 		{
 			for (var i = 0; i < 1000; i++)
-			foreach (var v in CallGetNext(pool))
 			{
-				if (this.Random.Next(10) % 2 == 0)
+				foreach (var v in CallGetNext(pool))
 				{
-					pool.Reseed(Update);
+					if (Random.Next(10) % 2 == 0) pool.Reseed(Update);
 				}
 			}
 		});
diff --git a/src/Tests/Tests/ClientConcepts/Exceptions/ExceptionTests.cs b/src/Tests/Tests/ClientConcepts/Exceptions/ExceptionTests.cs
index 9f3676e4f6d..8e2f45a4d5c 100644
--- a/src/Tests/Tests/ClientConcepts/Exceptions/ExceptionTests.cs
+++ b/src/Tests/Tests/ClientConcepts/Exceptions/ExceptionTests.cs
@@ -1,15 +1,12 @@
-using Elasticsearch.Net;
+using System;
+using System.Linq;
+using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using System;
-using System.Linq;
 using Tests.Core.Client.Settings;
 using Tests.Core.ManagedElasticsearch;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using Xunit;
 
 namespace Tests.ClientConcepts.Exceptions
@@ -18,10 +15,7 @@ public class ExceptionTests : ClusterTestClassBase<WritableCluster>
 	{
 		private readonly int _port;
 
-		public ExceptionTests(WritableCluster cluster) : base(cluster)
-		{
-			_port = cluster.Nodes.First().Port ?? 9200;
-		}
+		public ExceptionTests(WritableCluster cluster) : base(cluster) => _port = cluster.Nodes.First().Port ?? 9200;
 
 		//[I]
 		public void ServerTestWhenThrowExceptionsEnabled()
@@ -90,7 +84,7 @@ public void DispatchIndicatesMissingRouteValues()
 			var settings = new ConnectionSettings(new Uri("http://doesntexist:9200"));
 			var client = new ElasticClient(settings);
 
-			System.Action dispatch = () => client.Index(new Project(), p=>p.Index(null));
+			Action dispatch = () => client.Index(new Project(), p => p.Index(null));
 			var ce = dispatch.ShouldThrow<ArgumentException>();
 			ce.Should().NotBeNull();
 			ce.Which.Message.Should().Contain("index=<NULL>");
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Caching/FieldResolverCacheTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Caching/FieldResolverCacheTests.cs
index 477a594b456..5852bf66d25 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Caching/FieldResolverCacheTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Caching/FieldResolverCacheTests.cs
@@ -1,14 +1,12 @@
-using FluentAssertions;
-using Nest;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using Elastic.Xunit.XunitPlumbing;
+using FluentAssertions;
+using Nest;
 using Tests.Domain;
-using Tests.Framework;
 using Xunit.Abstractions;
 using static Nest.Infer;
 
@@ -45,8 +43,8 @@ public class Fields
 			[U]
 			public void ExpressionEquality()
 			{
-				Field first = Field<Project>(p => p.Name);
-				Field second = Field<Project>(p => p.Name);
+				var first = Field<Project>(p => p.Name);
+				var second = Field<Project>(p => p.Name);
 
 				first.Should().Be(second);
 			}
@@ -54,8 +52,8 @@ public void ExpressionEquality()
 			[U]
 			public void ExpressionEqualityWithDifferentParams()
 			{
-				Field first = Field<Project>(p => p.Name);
-				Field second = Field<Project>(project => project.Name);
+				var first = Field<Project>(p => p.Name);
+				var second = Field<Project>(project => project.Name);
 
 				first.Should().Be(second);
 			}
@@ -350,8 +348,8 @@ public class PropertyNames
 			[U]
 			public void ExpressionEquality()
 			{
-				PropertyName first = Property<Project>(p => p.Name);
-				PropertyName second = Property<Project>(p => p.Name);
+				var first = Property<Project>(p => p.Name);
+				var second = Property<Project>(p => p.Name);
 
 				first.Should().Be(second);
 			}
@@ -359,8 +357,8 @@ public void ExpressionEquality()
 			[U]
 			public void ExpressionEqualityWithDifferentParameters()
 			{
-				PropertyName first = Property<Project>(p => p.Name);
-				PropertyName second = Property<Project>(project => project.Name);
+				var first = Property<Project>(p => p.Name);
+				var second = Property<Project>(project => project.Name);
 
 				first.Should().Be(second);
 			}
@@ -382,6 +380,7 @@ public void PropertyInfoInequality()
 
 				first.Should().NotBe(second);
 			}
+
 			[U]
 			public void StringEquality()
 			{
@@ -473,26 +472,12 @@ public void SamePropertyTypesWithDifferentNames()
 
 		public class CachePerformance
 		{
-			private readonly ITestOutputHelper output;
-
-			public CachePerformance(ITestOutputHelper output)
-			{
-				this.output = output;
-			}
-
-			public class HitTiming
-			{
-				public string Name { get; set; }
-				public Func<Field> Field { get; set; }
-				public double FirstHit { get; set; }
-				public double CachedHit { get; set; }
-
-				public override string ToString() => $"First hit for {Name} took {FirstHit}ms, Cached hit took {CachedHit}ms ({FirstHit / CachedHit}x faster).";
-			}
-
 			private readonly List<HitTiming> _timings = new List<HitTiming>();
-			private Stopwatch _stopwatch;
+			private readonly ITestOutputHelper output;
 			private FieldResolver _resolver;
+			private Stopwatch _stopwatch;
+
+			public CachePerformance(ITestOutputHelper output) => this.output = output;
 
 			[U]
 			public void CachedVsNonCached()
@@ -536,6 +521,17 @@ private void AddTiming(Func<Field> field)
 
 				_stopwatch.Stop();
 			}
+
+			public class HitTiming
+			{
+				public double CachedHit { get; set; }
+				public Func<Field> Field { get; set; }
+				public double FirstHit { get; set; }
+				public string Name { get; set; }
+
+				public override string ToString() =>
+					$"First hit for {Name} took {FirstHit}ms, Cached hit took {CachedHit}ms ({FirstHit / CachedHit}x faster).";
+			}
 		}
 	}
 }
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/ActionIdsEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/ActionIdsEqualityTests.cs
index 6fdb8f00fdc..c0a4b7f16af 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/ActionIdsEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/ActionIdsEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -11,7 +10,7 @@ public class NamesEqualityTests
 		[U] public void Eq()
 		{
 			Names types = "foo,bar";
-			Names[] equal = {"foo,bar", "bar,foo", "foo,  bar", "bar,  foo   "};
+			Names[] equal = { "foo,bar", "bar,foo", "foo,  bar", "bar,  foo   " };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -22,13 +21,14 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			Names types = "foo,bar";
-			Names[] notEqual = {"foo,bar,x", "foo" };
+			Names[] notEqual = { "foo,bar,x", "foo" };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
 				t.Should().NotBe(types);
 			}
 		}
+
 		[U] public void Null()
 		{
 			Names types = "foo,bar";
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/CategoryIdEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/CategoryIdEqualityTests.cs
index f172fffdb5c..fccc264230f 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/CategoryIdEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/CategoryIdEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -11,7 +10,7 @@ public class CategoryIdEqualityTests
 		[U] public void Eq()
 		{
 			CategoryId types = 2;
-			CategoryId[] equal = {2L, 2};
+			CategoryId[] equal = { 2L, 2 };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -28,7 +27,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			CategoryId types = 3;
-			CategoryId[] notEqual = {4L, 4};
+			CategoryId[] notEqual = { 4L, 4 };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/DocumentPathEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/DocumentPathEqualityTests.cs
index a3cdc1c24c4..83306e04ad9 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/DocumentPathEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/DocumentPathEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -10,7 +9,7 @@ public class DocumentPathEqualityTests
 	{
 		[U] public void Eq()
 		{
-			var project = new Project {Name = "x"};
+			var project = new Project { Name = "x" };
 			DocumentPath<Project> path = project;
 			DocumentPath<Project> pathOther = project;
 			(pathOther == path).Should().BeTrue();
@@ -24,9 +23,9 @@ [U] public void Eq()
 
 		[U] public void NotEq()
 		{
-			var project = new Project {Name = "x"};
+			var project = new Project { Name = "x" };
 			DocumentPath<Project> path = project;
-			DocumentPath<Project> pathOther = new Project {Name = "x"};
+			DocumentPath<Project> pathOther = new Project { Name = "x" };
 			(pathOther != path).Should().BeTrue();
 			pathOther.Should().NotBe(path);
 
@@ -40,6 +39,7 @@ [U] public void NotEq()
 			(pathOther != path).Should().BeTrue();
 			pathOther.Should().NotBe(path);
 		}
+
 		[U] public void Null()
 		{
 			var value = new DocumentPath<Project>(2);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldEqualityTests.cs
index 8984c85d136..2bd9faefbad 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldEqualityTests.cs
@@ -1,10 +1,8 @@
-using System.Reflection;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -13,7 +11,7 @@ public class FieldEqualityTests
 		[U] public void Eq()
 		{
 			Field name = "foo";
-			Field[] equal = {"foo"};
+			Field[] equal = { "foo" };
 			foreach (var t in equal)
 			{
 				(t == name).ShouldBeTrue(t);
@@ -24,7 +22,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			Field name = "foo";
-			Field[] notEqual = {"bar", "x", "", "   ", " foo ", Infer.Field<Project>(p=>p.Name)};
+			Field[] notEqual = { "bar", "x", "", "   ", " foo ", Infer.Field<Project>(p => p.Name) };
 			foreach (var t in notEqual)
 			{
 				(t != name).ShouldBeTrue(t);
@@ -49,7 +47,7 @@ [U] public void TypedNotEq()
 		[U] public void ReflectedEq()
 		{
 			Field t1 = typeof(Project).GetProperty(nameof(Project.Name)),
-				  t2 = typeof(Project).GetProperty(nameof(Project.Name));
+				t2 = typeof(Project).GetProperty(nameof(Project.Name));
 			(t1 == t2).ShouldBeTrue(t2);
 			t1.Should().Be(t2);
 		}
@@ -57,7 +55,7 @@ [U] public void ReflectedEq()
 		[U] public void ReflectedNotEq()
 		{
 			Field t1 = typeof(CommitActivity).GetProperty(nameof(CommitActivity.Id)),
-				  t2 = typeof(Developer).GetProperty(nameof(Developer.Id));
+				t2 = typeof(Developer).GetProperty(nameof(Developer.Id));
 			(t1 != t2).ShouldBeTrue(t2);
 			t1.Should().NotBe(t2);
 		}
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldsEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldsEqualityTests.cs
index f2d3e5d08df..a5d76a820b8 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldsEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/FieldsEqualityTests.cs
@@ -1,10 +1,8 @@
-using System.Reflection;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -13,7 +11,7 @@ public class FieldsEqualityTests
 		[U] public void Eq()
 		{
 			Fields name = "foo, bar";
-			Fields[] equal = {"foo, bar", "  foo,   bar", "bar, foo", "   bar  ,   foo  "};
+			Fields[] equal = { "foo, bar", "  foo,   bar", "bar, foo", "   bar  ,   foo  " };
 			foreach (var t in equal)
 			{
 				(t == name).ShouldBeTrue(t);
@@ -24,7 +22,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			Fields name = "foo, bar";
-			Fields[] notEqual = {"bar", "foo, bar, x", "", "   ", " foo ", Infer.Field<Project>(p=>p.Name)};
+			Fields[] notEqual = { "bar", "foo, bar, x", "", "   ", " foo ", Infer.Field<Project>(p => p.Name) };
 			foreach (var t in notEqual)
 			{
 				(t != name).ShouldBeTrue(t);
@@ -38,17 +36,20 @@ [U] public void TypedEq()
 			(t1 == t2).ShouldBeTrue(t2);
 			t1.Should().BeEquivalentTo(t2);
 
-			t1 = Infer.Field<Project>(p => p.Name, 1.1); t2 = Infer.Field<Project>(p => p.Name, 1.1);
+			t1 = Infer.Field<Project>(p => p.Name, 1.1);
+			t2 = Infer.Field<Project>(p => p.Name, 1.1);
 			(t1 == t2).ShouldBeTrue(t2);
 			t1.Should().BeEquivalentTo(t2);
 
 			// boost factor is not taken into account when comparing fields
-			t1 = Infer.Field<Project>(p => p.Name, 2.1); t2 = Infer.Field<Project>(p => p.Name, 1.1);
+			t1 = Infer.Field<Project>(p => p.Name, 2.1);
+			t2 = Infer.Field<Project>(p => p.Name, 1.1);
 			(t1 == t2).ShouldBeTrue(t2);
 			t1.Should().BeEquivalentTo(t2);
 
 			// boost factor is not taken into account when comparing fields
-			t1 = Infer.Field<Project>(p => p.Name); t2 = Infer.Field<Project>(p => p.Name, 1.1);
+			t1 = Infer.Field<Project>(p => p.Name);
+			t2 = Infer.Field<Project>(p => p.Name, 1.1);
 			(t1 == t2).ShouldBeTrue(t2);
 			t1.Should().BeEquivalentTo(t2);
 		}
@@ -59,7 +60,8 @@ [U] public void TypedNotEq()
 			(t1 != t2).ShouldBeTrue(t2);
 			t1.Should().NotBeEquivalentTo(t2);
 
-			t1 = Infer.Field<Project>(p => p.Name, 1.0); t2 = Infer.Field<Project>(p => p.Location, 1.0);
+			t1 = Infer.Field<Project>(p => p.Name, 1.0);
+			t2 = Infer.Field<Project>(p => p.Location, 1.0);
 			(t1 != t2).ShouldBeTrue(t2);
 			t1.Should().NotBeEquivalentTo(t2);
 		}
@@ -67,7 +69,7 @@ [U] public void TypedNotEq()
 		[U] public void ReflectedEq()
 		{
 			Fields t1 = typeof(Project).GetProperty(nameof(Project.Name)),
-				  t2 = typeof(Project).GetProperty(nameof(Project.Name));
+				t2 = typeof(Project).GetProperty(nameof(Project.Name));
 			(t1 == t2).ShouldBeTrue(t2);
 			t1.Should().BeEquivalentTo(t2);
 		}
@@ -75,7 +77,7 @@ [U] public void ReflectedEq()
 		[U] public void ReflectedNotEq()
 		{
 			Fields t1 = typeof(CommitActivity).GetProperty(nameof(CommitActivity.Id)),
-				  t2 = typeof(Developer).GetProperty(nameof(Developer.Id));
+				t2 = typeof(Developer).GetProperty(nameof(Developer.Id));
 			(t1 != t2).ShouldBeTrue(t2);
 			t1.Should().NotBeEquivalentTo(t2);
 		}
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IdEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IdEqualityTests.cs
index c7e46646d82..b040d64db57 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IdEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IdEqualityTests.cs
@@ -4,7 +4,6 @@
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -13,7 +12,7 @@ public class IdEqualityTests
 		[U] public void Eq()
 		{
 			Id types = "foo";
-			Id[] equal = {"foo"};
+			Id[] equal = { "foo" };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -29,21 +28,22 @@ [U] public void Eq()
 			l1.Should().Be(2);
 
 			var g = Guid.NewGuid();
-			l1 = g; l2 = g;
+			l1 = g;
+			l2 = g;
 			(l1 == l2).ShouldBeTrue(l2);
 			l1.Should().Be(l2);
 
-			var project = new Project {Name = "x"};
-			l1 = Id.From(project); l2 = Id.From(project);
+			var project = new Project { Name = "x" };
+			l1 = Id.From(project);
+			l2 = Id.From(project);
 			(l1 == l2).ShouldBeTrue(l2);
 			l1.Should().Be(l2);
-
 		}
 
 		[U] public void NotEq()
 		{
 			Id types = "foo";
-			Id[] notEqual = {"bar", "" , "foo  "};
+			Id[] notEqual = { "bar", "", "foo  " };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
@@ -57,12 +57,14 @@ [U] public void NotEq()
 			l1.Should().NotBe(3);
 			l1.Should().NotBe("3");
 
-			l1 = Guid.NewGuid(); l2 = Guid.NewGuid();
+			l1 = Guid.NewGuid();
+			l2 = Guid.NewGuid();
 			(l1 != l2).ShouldBeTrue(l2);
 			l1.Should().NotBe(l2);
 
 			//when comparing objects we can only do referential equality. Project does not have its own Equals implementation.
-			l1 = Id.From(new Project {Name = "x"}); l2 = Id.From(new Project {Name = "x"});
+			l1 = Id.From(new Project { Name = "x" });
+			l2 = Id.From(new Project { Name = "x" });
 			(l1 != l2).ShouldBeTrue(l2);
 			l1.Should().NotBe(l2);
 		}
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndexMetricsEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndexMetricsEqualityTests.cs
index 1714abb168b..89be6c258b4 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndexMetricsEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndexMetricsEqualityTests.cs
@@ -3,7 +3,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -12,7 +11,7 @@ public class IndexMetricsEqualityTests
 		[U] public void Eq()
 		{
 			IndexMetrics metrics = NodesStatsIndexMetric.All;
-			IndexMetrics[] equal = {NodesStatsIndexMetric.All};
+			IndexMetrics[] equal = { NodesStatsIndexMetric.All };
 			foreach (var t in equal)
 			{
 				(t == metrics).ShouldBeTrue(t);
@@ -24,7 +23,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			IndexMetrics metrics = NodesStatsIndexMetric.All;
-			IndexMetrics[] notEqual = {NodesStatsIndexMetric.Flush};
+			IndexMetrics[] notEqual = { NodesStatsIndexMetric.Flush };
 			foreach (var t in notEqual)
 			{
 				(t != metrics).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndexNameEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndexNameEqualityTests.cs
index caaebbd1f6f..10a2230c1b8 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndexNameEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndexNameEqualityTests.cs
@@ -3,7 +3,6 @@
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -12,7 +11,7 @@ public class IndexNameEqualityTests
 		[U] public void Eq()
 		{
 			IndexName types = "foo";
-			IndexName[] equal = {"foo"};
+			IndexName[] equal = { "foo" };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -23,17 +22,18 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			IndexName types = "foo";
-			IndexName[] notEqual = {"bar", "foo  ", "  foo   ", "x", "", "   ", typeof(Project)};
+			IndexName[] notEqual = { "bar", "foo  ", "  foo   ", "x", "", "   ", typeof(Project) };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
 				t.Should().NotBe(types);
 			}
 		}
+
 		[U] public void EqCluster()
 		{
 			IndexName types = "c:foo";
-			IndexName[] equal = {"c:foo"};
+			IndexName[] equal = { "c:foo" };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -44,7 +44,7 @@ [U] public void EqCluster()
 		[U] public void NotEqCluster()
 		{
 			IndexName types = "c:foo";
-			IndexName[] notEqual = {"c1:bar", "c:foo  ", "  c:foo   ", "c:foo1", "x", "", "   ", typeof(Project) };
+			IndexName[] notEqual = { "c1:bar", "c:foo  ", "  c:foo   ", "c:foo1", "x", "", "   ", typeof(Project) };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndicesEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndicesEqualityTests.cs
index 4e9990d1589..44e04a7e6c8 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndicesEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/IndicesEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -11,7 +10,7 @@ public class IndicesEqualityTests
 		[U] public void Eq()
 		{
 			Nest.Indices types = "foo,bar";
-			Nest.Indices[] equal = {"foo,bar", "bar,foo", "foo,  bar", "bar,  foo   "};
+			Nest.Indices[] equal = { "foo,bar", "bar,foo", "foo,  bar", "bar,  foo   " };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -25,7 +24,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			Nest.Indices types = "foo,bar";
-			Nest.Indices[] notEqual = {"foo,bar,x", "foo", typeof(Project)};
+			Nest.Indices[] notEqual = { "foo,bar,x", "foo", typeof(Project) };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
@@ -44,6 +43,7 @@ [U] public void TypedNotEq()
 			Nest.Indices t1 = typeof(Project), t2 = typeof(CommitActivity);
 			(t1 != t2).ShouldBeTrue(t2);
 		}
+
 		[U] public void Null()
 		{
 			Nest.Indices value = typeof(Project);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/MetricsEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/MetricsEqualityTests.cs
index f4f11a444f8..c21caf796fb 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/MetricsEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/MetricsEqualityTests.cs
@@ -3,7 +3,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -12,7 +11,7 @@ public class MetricsEqualityTests
 		[U] public void Eq()
 		{
 			Metrics metrics = IndicesStatsMetric.All;
-			Metrics[] equal = {IndicesStatsMetric.All};
+			Metrics[] equal = { IndicesStatsMetric.All };
 			foreach (var t in equal)
 			{
 				(t == metrics).ShouldBeTrue(t);
@@ -24,7 +23,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			Metrics metrics = IndicesStatsMetric.All;
-			Metrics[] notEqual = {IndicesStatsMetric.Completion, ClusterStateMetric.All};
+			Metrics[] notEqual = { IndicesStatsMetric.Completion, ClusterStateMetric.All };
 			foreach (var t in notEqual)
 			{
 				(t != metrics).ShouldBeTrue(t);
@@ -32,6 +31,7 @@ [U] public void NotEq()
 			}
 			metrics.Should().NotBe(ClusterStateMetric.All);
 		}
+
 		[U] public void Null()
 		{
 			Metrics value = IndicesStatsMetric.All;
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NameEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NameEqualityTests.cs
index 1a1cc44e81e..b557baa5316 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NameEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NameEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -11,7 +10,7 @@ public class NameEqualityTests
 		[U] public void Eq()
 		{
 			Name types = "foo";
-			Name[] equal = {"foo", "  foo", "foo   "};
+			Name[] equal = { "foo", "  foo", "foo   " };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -22,7 +21,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			Name types = "foo";
-			Name[] notEqual = {"bar", "" };
+			Name[] notEqual = { "bar", "" };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NamesEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NamesEqualityTests.cs
index c8783643c0e..1d5b41bcbea 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NamesEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NamesEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -11,7 +10,7 @@ public class ActionIdsEqualityTests
 		[U] public void Eq()
 		{
 			ActionIds types = "foo,bar";
-			ActionIds[] equal = {"foo,bar", "bar,foo", "foo,  bar", "bar,  foo   "};
+			ActionIds[] equal = { "foo,bar", "bar,foo", "foo,  bar", "bar,  foo   " };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -22,7 +21,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			ActionIds types = "foo,bar";
-			ActionIds[] notEqual = {"foo,bar,x", "foo" };
+			ActionIds[] notEqual = { "foo,bar,x", "foo" };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NodeIdsEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NodeIdsEqualityTests.cs
index f0f5c4df136..77eb5b69f82 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NodeIdsEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/NodeIdsEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -11,7 +10,7 @@ public class NodeIdsEqualityTests
 		[U] public void Eq()
 		{
 			NodeIds types = "foo,bar";
-			NodeIds[] equal = {"foo,bar", "bar,foo", "foo,  bar", "bar,  foo   "};
+			NodeIds[] equal = { "foo,bar", "bar,foo", "foo,  bar", "bar,  foo   " };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -22,7 +21,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			NodeIds types = "foo,bar";
-			NodeIds[] notEqual = {"foo,bar,x", "foo"};
+			NodeIds[] notEqual = { "foo,bar,x", "foo" };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/PropertyNameEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/PropertyNameEqualityTests.cs
index 8be93112d64..b6a7afb1e43 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/PropertyNameEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/PropertyNameEqualityTests.cs
@@ -3,7 +3,6 @@
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -12,7 +11,7 @@ public class PropertyNameEqualityTests
 		[U] public void Eq()
 		{
 			PropertyName name = "foo";
-			PropertyName[] equal = {"foo"};
+			PropertyName[] equal = { "foo" };
 			foreach (var t in equal)
 			{
 				(t == name).ShouldBeTrue(t);
@@ -23,7 +22,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			PropertyName name = "foo";
-			PropertyName[] notEqual = {"bar", "foo  ", "  foo   ", "x", "", "   ", Infer.Property<Project>(p=>p.Name)};
+			PropertyName[] notEqual = { "bar", "foo  ", "  foo   ", "x", "", "   ", Infer.Property<Project>(p => p.Name) };
 			foreach (var t in notEqual)
 			{
 				(t != name).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/RelationNameEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/RelationNameEqualityTests.cs
index 3857b159862..b589c3b6a2d 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/RelationNameEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/RelationNameEqualityTests.cs
@@ -3,7 +3,6 @@
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -12,7 +11,7 @@ public class RelationNameEqualityTests
 		[U] public void Eq()
 		{
 			RelationName name = "foo";
-			RelationName[] equal = {"foo"};
+			RelationName[] equal = { "foo" };
 			foreach (var t in equal)
 			{
 				(t == name).ShouldBeTrue(t);
@@ -23,7 +22,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			RelationName name = "foo";
-			RelationName[] notEqual = {"bar", "foo  ", "  foo   ", "x", "", "   ", typeof(Project)};
+			RelationName[] notEqual = { "bar", "foo  ", "  foo   ", "x", "", "   ", typeof(Project) };
 			foreach (var t in notEqual)
 			{
 				(t != name).ShouldBeTrue(t);
@@ -42,6 +41,7 @@ [U] public void TypedNotEq()
 			RelationName t1 = typeof(Project), t2 = typeof(CommitActivity);
 			(t1 != t2).ShouldBeTrue(t2);
 		}
+
 		[U] public void Null()
 		{
 			RelationName value = "foo";
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/RoutingEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/RoutingEqualityTests.cs
index 12fd598f1de..82ab356ec79 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/RoutingEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/RoutingEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -11,7 +10,7 @@ public class RoutingEqualityTests
 		[U] public void Eq()
 		{
 			Routing types = "foo";
-			Routing[] equal = {"foo"};
+			Routing[] equal = { "foo" };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -26,16 +25,16 @@ [U] public void Eq()
 			l1.Should().Be("2");
 			l1.Should().Be(2);
 
-			l1 = "foo, bar"; l2 = "bar,   foo";
+			l1 = "foo, bar";
+			l2 = "bar,   foo";
 			(l1 == l2).ShouldBeTrue(l2);
 			l1.Should().Be(l2);
-
 		}
 
 		[U] public void NotEq()
 		{
 			Routing types = "foo";
-			Routing[] notEqual = {"bar", "" , "foo  "};
+			Routing[] notEqual = { "bar", "", "foo  " };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
@@ -49,11 +48,13 @@ [U] public void NotEq()
 			l1.Should().NotBe(3);
 			l1.Should().NotBe("3");
 
-			l1 = "foo, bar"; l2 = "bar,   foo, x";
+			l1 = "foo, bar";
+			l2 = "bar,   foo, x";
 			(l1 != l2).ShouldBeTrue(l2);
 			l1.Should().NotBe(l2);
 
-			l1 = "foo, bar"; l2 = "bar";
+			l1 = "foo, bar";
+			l2 = "bar";
 			(l1 != l2).ShouldBeTrue(l2);
 			l1.Should().NotBe(l2);
 		}
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TaskIdEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TaskIdEqualityTests.cs
index 6733877f581..71088a7be88 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TaskIdEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TaskIdEqualityTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -11,7 +10,7 @@ public class TaskIdEqualityTests
 		[U] public void Eq()
 		{
 			TaskId types = "node:1337";
-			TaskId[] equal = {"node:1337"};
+			TaskId[] equal = { "node:1337" };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -22,7 +21,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			TaskId types = "node:1337";
-			TaskId[] notEqual = {"node:1338", "  node:1337", "node:1337   ", "node:133", "node2:1337"};
+			TaskId[] notEqual = { "node:1338", "  node:1337", "node:1337   ", "node:133", "node2:1337" };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TypeNameEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TypeNameEqualityTests.cs
index 04e895850e8..ad6558583b8 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TypeNameEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TypeNameEqualityTests.cs
@@ -3,7 +3,6 @@
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -12,7 +11,7 @@ public class TypeNameEqualityTests
 		[U] public void Eq()
 		{
 			TypeName types = "foo";
-			TypeName[] equal = {"foo"};
+			TypeName[] equal = { "foo" };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -23,7 +22,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			TypeName types = "foo";
-			TypeName[] notEqual = {"bar", "foo  ", "  foo   ", "x", "", "   ", typeof(Project)};
+			TypeName[] notEqual = { "bar", "foo  ", "  foo   ", "x", "", "   ", typeof(Project) };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TypesEqualityTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TypesEqualityTests.cs
index 9291bf177b1..d5e7ef8a059 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TypesEqualityTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/Equality/TypesEqualityTests.cs
@@ -3,7 +3,6 @@
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference.Equality
 {
@@ -12,7 +11,7 @@ public class TypesEqualityTests
 		[U] public void Eq()
 		{
 			Types types = "foo,bar";
-			Types[] equal = {"foo,bar", "bar,foo", "foo,  bar", "bar,  foo   "};
+			Types[] equal = { "foo,bar", "bar,foo", "foo,  bar", "bar,  foo   " };
 			foreach (var t in equal)
 			{
 				(t == types).ShouldBeTrue(t);
@@ -24,7 +23,7 @@ [U] public void Eq()
 		[U] public void NotEq()
 		{
 			Types types = "foo,bar";
-			Types[] notEqual = {"foo,bar,x", "foo", "", "   ", typeof(Project)};
+			Types[] notEqual = { "foo,bar,x", "foo", "", "   ", typeof(Project) };
 			foreach (var t in notEqual)
 			{
 				(t != types).ShouldBeTrue(t);
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/ImplicitConversionTests.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/ImplicitConversionTests.cs
index 03e99957546..22c7a96f9c4 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Inference/ImplicitConversionTests.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Inference/ImplicitConversionTests.cs
@@ -5,7 +5,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.HighLevel.Inference
 {
@@ -19,14 +18,11 @@ [U] public void ActionIds()
 			Implicit<ActionIds>("").Should().BeNull();
 			Implicit<ActionIds>("   ").Should().BeNull();
 			Implicit<ActionIds>(",, ,,").Should().BeNull();
-			Implicit<ActionIds>(new string[] {}).Should().BeNull();
-			Implicit<ActionIds>(new string[] {null, null}).Should().BeNull();
+			Implicit<ActionIds>(new string[] { }).Should().BeNull();
+			Implicit<ActionIds>(new string[] { null, null }).Should().BeNull();
 		}
 
-		[U] public void CategoryId()
-		{
-			Implicit<CategoryId>(null).Should().BeNull();
-		}
+		[U] public void CategoryId() => Implicit<CategoryId>(null).Should().BeNull();
 
 		[U] public void DocumentPath()
 		{
@@ -58,13 +54,13 @@ [U] public void Fields()
 			Implicit<Fields>((Field[])null).Should().BeNull();
 			Implicit<Fields>("").Should().BeNull();
 			Implicit<Fields>("   ").Should().BeNull();
-			Implicit<Fields>(new string[] {}).Should().BeNull();
-			Implicit<Fields>(new Expression[] {}).Should().BeNull();
-			Implicit<Fields>(new PropertyInfo[] {}).Should().BeNull();
-			Implicit<Fields>(new Field[] {}).Should().BeNull();
-			Implicit<Fields>(new Expression[] {null, null}).Should().BeNull();
-			Implicit<Fields>(new PropertyInfo[] {null, null}).Should().BeNull();
-			Implicit<Fields>(new Field[] {null, null}).Should().BeNull();
+			Implicit<Fields>(new string[] { }).Should().BeNull();
+			Implicit<Fields>(new Expression[] { }).Should().BeNull();
+			Implicit<Fields>(new PropertyInfo[] { }).Should().BeNull();
+			Implicit<Fields>(new Field[] { }).Should().BeNull();
+			Implicit<Fields>(new Expression[] { null, null }).Should().BeNull();
+			Implicit<Fields>(new PropertyInfo[] { null, null }).Should().BeNull();
+			Implicit<Fields>(new Field[] { null, null }).Should().BeNull();
 		}
 
 		[U] public void Id()
@@ -93,10 +89,10 @@ [U] public void Indices()
 			Implicit<Nest.Indices>("").Should().BeNull();
 			Implicit<Nest.Indices>("    ").Should().BeNull();
 			Implicit<Nest.Indices>(",, ,,    ").Should().BeNull();
-			Implicit<Nest.Indices>(new string[] {}).Should().BeNull();
-			Implicit<Nest.Indices>(new IndexName[] {}).Should().BeNull();
-			Implicit<Nest.Indices>(new string[] {null, null}).Should().BeNull();
-			Implicit<Nest.Indices>(new IndexName[] {null, null}).Should().BeNull();
+			Implicit<Nest.Indices>(new string[] { }).Should().BeNull();
+			Implicit<Nest.Indices>(new IndexName[] { }).Should().BeNull();
+			Implicit<Nest.Indices>(new string[] { null, null }).Should().BeNull();
+			Implicit<Nest.Indices>(new IndexName[] { null, null }).Should().BeNull();
 		}
 
 		[U] public void Names()
@@ -107,8 +103,8 @@ [U] public void Names()
 			Implicit<Names>(",,").Should().BeNull();
 			Implicit<Names>(",   ,").Should().BeNull();
 			Implicit<Names>("   ").Should().BeNull();
-			Implicit<Names>(new string[] {}).Should().BeNull();
-			Implicit<Names>(new string[] {null, null}).Should().BeNull();
+			Implicit<Names>(new string[] { }).Should().BeNull();
+			Implicit<Names>(new string[] { null, null }).Should().BeNull();
 		}
 
 		[U] public void Routing()
@@ -119,19 +115,13 @@ [U] public void Routing()
 			Implicit<Routing>(",,").Should().BeNull();
 			Implicit<Routing>(",   ,").Should().BeNull();
 			Implicit<Routing>("   ").Should().BeNull();
-			Implicit<Routing>(new string[] {}).Should().BeNull();
-			Implicit<Routing>(new string[] {null, null}).Should().BeNull();
+			Implicit<Routing>(new string[] { }).Should().BeNull();
+			Implicit<Routing>(new string[] { null, null }).Should().BeNull();
 		}
 
-		[U] public void Metrics()
-		{
-			Implicit<Metrics>(null).Should().BeNull();
-		}
+		[U] public void Metrics() => Implicit<Metrics>(null).Should().BeNull();
 
-		[U] public void IndexMetrics()
-		{
-			Implicit<IndexMetrics>(null).Should().BeNull();
-		}
+		[U] public void IndexMetrics() => Implicit<IndexMetrics>(null).Should().BeNull();
 
 		[U] public void Name()
 		{
@@ -147,8 +137,8 @@ [U] public void NodeId()
 			Implicit<NodeIds>("").Should().BeNull();
 			Implicit<NodeIds>("  ").Should().BeNull();
 			Implicit<NodeIds>("  ,, , ,,").Should().BeNull();
-			Implicit<NodeIds>(new string[] {}).Should().BeNull();
-			Implicit<NodeIds>(new string[] {null, null}).Should().BeNull();
+			Implicit<NodeIds>(new string[] { }).Should().BeNull();
+			Implicit<NodeIds>(new string[] { null, null }).Should().BeNull();
 		}
 
 		[U] public void PropertyName()
@@ -192,12 +182,10 @@ [U] public void Types()
 			Implicit<Types>("").Should().BeNull();
 			Implicit<Types>(" ,,, ").Should().BeNull();
 			Implicit<Types>("  ").Should().BeNull();
-			Implicit<Types>(new string[] {}).Should().BeNull();
-			Implicit<Types>(new TypeName[] {}).Should().BeNull();
-			Implicit<Types>(new string[] {null, null}).Should().BeNull();
-			Implicit<Types>(new TypeName[] {null, null}).Should().BeNull();
+			Implicit<Types>(new string[] { }).Should().BeNull();
+			Implicit<Types>(new TypeName[] { }).Should().BeNull();
+			Implicit<Types>(new string[] { null, null }).Should().BeNull();
+			Implicit<Types>(new TypeName[] { null, null }).Should().BeNull();
 		}
-
-
 	}
 }
diff --git a/src/Tests/Tests/ClientConcepts/HighLevel/Serialization/SendsUsingSourceSerializer.cs b/src/Tests/Tests/ClientConcepts/HighLevel/Serialization/SendsUsingSourceSerializer.cs
index 31f683b7a4e..3cc875debd0 100644
--- a/src/Tests/Tests/ClientConcepts/HighLevel/Serialization/SendsUsingSourceSerializer.cs
+++ b/src/Tests/Tests/ClientConcepts/HighLevel/Serialization/SendsUsingSourceSerializer.cs
@@ -9,57 +9,36 @@
 using Newtonsoft.Json.Converters;
 using Tests.Core.Client.Serializers;
 using Tests.Domain;
-using Tests.Framework;
 using static Tests.Core.Serialization.SerializationTestHelper;
 
 namespace Tests.ClientConcepts.HighLevel.Serialization
 {
 	public class SendsUsingSourceSerializer
 	{
-
-		public class ADocument
+		public enum SomeEnum
 		{
-			public int Id { get; set; } = 1;
-			public string Name { get; set; }
+			Value,
+
+			[EnumMember(Value = "different")]
+			AnotherValue
 		}
 
-		private readonly object DefaultSerialized = new {id = 1};
+		private readonly object DefaultSerialized = new { id = 1 };
 
 		private readonly Dictionary<string, object> IncludesNullAndType = new Dictionary<string, object>
 		{
-			{"$type", $"{typeof(ADocument).FullName}, Tests"},
-			{"name", null},
-			{"id", 1},
+			{ "$type", $"{typeof(ADocument).FullName}, Tests" },
+			{ "name", null },
+			{ "id", 1 },
 		};
 
-		private class CustomSettingsSerializerBase : TestSourceSerializerBase
-		{
-			public CustomSettingsSerializerBase(IElasticsearchSerializer builtinSerializer, IConnectionSettingsValues connectionSettings)
-				: base(builtinSerializer, connectionSettings) { }
-
-			protected override JsonSerializerSettings CreateJsonSerializerSettings()
-			{
-				return new JsonSerializerSettings
-				{
-					TypeNameHandling = TypeNameHandling.All,
-					NullValueHandling = NullValueHandling.Include
-				};
-			}
-
-			protected override IEnumerable<JsonConverter> CreateJsonConverters()
-			{
-				foreach (var c in base.CreateJsonConverters()) yield return c;
-				yield return new StringEnumConverter();
-			}
-		}
-
 		private static void CanAlterSource<T>(Func<IElasticClient, T> call, object usingDefaults, object withSourceSerializer)
 			where T : IResponse
 		{
 			Expect(usingDefaults).FromRequest(call);
 
 			WithSourceSerializer((s, c) => new CustomSettingsSerializerBase(s, c))
-				.Expect(withSourceSerializer, preserveNullInExpected: true)
+				.Expect(withSourceSerializer, true)
 				.FromRequest(call);
 		}
 
@@ -69,35 +48,24 @@ private static void Serializes<T>(T o, object usingDefaults, object withSourceSe
 			SerializesSourceSerializer(o, withSourceSerializer);
 		}
 
-		private static void SerializesSourceSerializer<T>(T o, object withSourceSerializer)
-		{
+		private static void SerializesSourceSerializer<T>(T o, object withSourceSerializer) =>
 			WithSourceSerializer((s, c) => new CustomSettingsSerializerBase(s, c))
-				.Expect(withSourceSerializer, preserveNullInExpected: true)
+				.Expect(withSourceSerializer, true)
 				.WhenSerializing(o);
-		}
 
-		private static void SerializesDefault<T>(T o, object usingDefaults)
-		{
-			Expect(usingDefaults).WhenSerializing(o);
-		}
+		private static void SerializesDefault<T>(T o, object usingDefaults) => Expect(usingDefaults).WhenSerializing(o);
 
-		[U] public void IndexRequest()
-		{
-			CanAlterSource(
-				r => r.IndexDocument(new ADocument()),
-				usingDefaults: DefaultSerialized,
-				withSourceSerializer: IncludesNullAndType
-			);
-		}
+		[U] public void IndexRequest() => CanAlterSource(
+			r => r.IndexDocument(new ADocument()),
+			DefaultSerialized,
+			IncludesNullAndType
+		);
 
-		[U] public void CreateRequest()
-		{
-			CanAlterSource(
-				r => r.CreateDocument(new ADocument()),
-				usingDefaults: DefaultSerialized,
-				withSourceSerializer: IncludesNullAndType
-			);
-		}
+		[U] public void CreateRequest() => CanAlterSource(
+			r => r.CreateDocument(new ADocument()),
+			DefaultSerialized,
+			IncludesNullAndType
+		);
 
 		[U] public void UpdateRequest()
 		{
@@ -107,12 +75,12 @@ [U] public void UpdateRequest()
 					.Doc(doc)
 					.Upsert(doc)
 				),
-				usingDefaults: new
+				new
 				{
 					doc = DefaultSerialized,
 					upsert = DefaultSerialized,
 				},
-				withSourceSerializer: new
+				new
 				{
 					doc = IncludesNullAndType,
 					upsert = IncludesNullAndType,
@@ -127,20 +95,20 @@ [U] public void TermVectorRequest()
 				r => r.TermVectors<ADocument>(t => t
 					.Document(doc)
 				),
-				usingDefaults: new {doc = DefaultSerialized},
-				withSourceSerializer: new {doc = IncludesNullAndType}
+				new { doc = DefaultSerialized },
+				new { doc = IncludesNullAndType }
 			);
 		}
 
 		private static IEnumerable<object> ExpectBulk(object document)
 		{
-			yield return new {delete = new {_index = "default-index", _type = "adocument", _id = "1"}};
-			yield return new {index = new {_index = "default-index", _type = "adocument", _id = "1"}};
+			yield return new { delete = new { _index = "default-index", _type = "adocument", _id = "1" } };
+			yield return new { index = new { _index = "default-index", _type = "adocument", _id = "1" } };
 			yield return document;
-			yield return new {create = new {_index = "default-index", _type = "adocument", _id = "1"}};
+			yield return new { create = new { _index = "default-index", _type = "adocument", _id = "1" } };
 			yield return document;
-			yield return new {update = new {_index = "default-index", _type = "adocument", _id = "1"}};
-			yield return new {doc = document, upsert = document};
+			yield return new { update = new { _index = "default-index", _type = "adocument", _id = "1" } };
+			yield return new { doc = document, upsert = document };
 		}
 
 		[U] public void BulkRequest()
@@ -153,22 +121,19 @@ [U] public void BulkRequest()
 					.Create<ADocument>(i => i.Document(doc))
 					.Update<ADocument>(i => i.Doc(doc).Upsert(doc))
 				),
-				usingDefaults: ExpectBulk(DefaultSerialized).ToArray(),
-				withSourceSerializer: ExpectBulk(IncludesNullAndType).ToArray()
+				ExpectBulk(DefaultSerialized).ToArray(),
+				ExpectBulk(IncludesNullAndType).ToArray()
 			);
 		}
 
-		public object ExpectMultiTermVectors(object document)
+		public object ExpectMultiTermVectors(object document) => new
 		{
-			return new
+			docs = new object[]
 			{
-				docs = new object[]
-				{
-					new {_index = "default-index", _type = "adocument", doc = document},
-					new {_index = "default-index", _type = "adocument", doc = document}
-				}
-			};
-		}
+				new { _index = "default-index", _type = "adocument", doc = document },
+				new { _index = "default-index", _type = "adocument", doc = document }
+			}
+		};
 
 		[U] public void MultiTermVectorsRequest()
 		{
@@ -178,45 +143,60 @@ [U] public void MultiTermVectorsRequest()
 					.Get<ADocument>(g => g.Document(doc))
 					.Get<ADocument>(g => g.Document(doc))
 				),
-				usingDefaults: ExpectMultiTermVectors(DefaultSerialized),
-				withSourceSerializer: ExpectMultiTermVectors(IncludesNullAndType)
+				ExpectMultiTermVectors(DefaultSerialized),
+				ExpectMultiTermVectors(IncludesNullAndType)
 			);
 		}
 
-		public enum SomeEnum
-		{
-			Value,
-			[EnumMember(Value = "different")]
-			AnotherValue
-		}
-
 		[U] public void TermQuery() =>
-			SerializesEnumValue(new TermQuery { Field = Infer.Field<Project>(p=>p.Name), Value = SomeEnum.AnotherValue});
+			SerializesEnumValue(new TermQuery { Field = Infer.Field<Project>(p => p.Name), Value = SomeEnum.AnotherValue });
 
 		[U] public void TermsQuery() =>
-			Serializes(new TermsQuery { Field = Infer.Field<Project>(p=>p.Name), Terms = new object[] { SomeEnum.AnotherValue }},
-				usingDefaults: new {name =  new [] {1}},
-				withSourceSerializer: new {name = new [] {"different"}}
+			Serializes(new TermsQuery { Field = Infer.Field<Project>(p => p.Name), Terms = new object[] { SomeEnum.AnotherValue } },
+				new { name = new[] { 1 } },
+				new { name = new[] { "different" } }
 			);
 
 		[U] public void WildcardQuery() =>
-			SerializesEnumValue(new WildcardQuery {Field = Infer.Field<Project>(p => p.Name), Value = SomeEnum.AnotherValue});
+			SerializesEnumValue(new WildcardQuery { Field = Infer.Field<Project>(p => p.Name), Value = SomeEnum.AnotherValue });
 
 		[U] public void PrefixQuery() =>
-			SerializesEnumValue(new PrefixQuery { Field = Infer.Field<Project>(p=>p.Name), Value = SomeEnum.AnotherValue});
+			SerializesEnumValue(new PrefixQuery { Field = Infer.Field<Project>(p => p.Name), Value = SomeEnum.AnotherValue });
 
 		[U] public void SpanTermQueryInitializer() =>
-			SerializesEnumValue(new SpanTermQuery { Field = Infer.Field<Project>(p=>p.Name), Value = SomeEnum.AnotherValue});
+			SerializesEnumValue(new SpanTermQuery { Field = Infer.Field<Project>(p => p.Name), Value = SomeEnum.AnotherValue });
 
 		[U] public void SpanTermQueryFluent() =>
-			SerializesEnumValue<ISpanTermQuery>(new SpanTermQueryDescriptor<Project>().Field(p=>p.Name).Value(SomeEnum.AnotherValue));
+			SerializesEnumValue<ISpanTermQuery>(new SpanTermQueryDescriptor<Project>().Field(p => p.Name).Value(SomeEnum.AnotherValue));
 
-		private static void SerializesEnumValue<T>(T query)
+		private static void SerializesEnumValue<T>(T query) => Serializes(query,
+			new { name = new { value = 1 } },
+			new { name = new { value = "different" } }
+		);
+
+		public class ADocument
 		{
-			Serializes(query,
-				usingDefaults: new {name = new {value = 1}},
-				withSourceSerializer: new {name = new {value = "different"}}
-			);
+			public int Id { get; set; } = 1;
+			public string Name { get; set; }
+		}
+
+		private class CustomSettingsSerializerBase : TestSourceSerializerBase
+		{
+			public CustomSettingsSerializerBase(IElasticsearchSerializer builtinSerializer, IConnectionSettingsValues connectionSettings)
+				: base(builtinSerializer, connectionSettings) { }
+
+			protected override JsonSerializerSettings CreateJsonSerializerSettings() => new JsonSerializerSettings
+			{
+				TypeNameHandling = TypeNameHandling.All,
+				NullValueHandling = NullValueHandling.Include
+			};
+
+			protected override IEnumerable<JsonConverter> CreateJsonConverters()
+			{
+				foreach (var c in base.CreateJsonConverters()) yield return c;
+
+				yield return new StringEnumConverter();
+			}
 		}
 	}
 }
diff --git a/src/Tests/Tests/ClientConcepts/LowLevel/DirectStreaming.cs b/src/Tests/Tests/ClientConcepts/LowLevel/DirectStreaming.cs
index 9a900b686c6..53f1cc8684b 100644
--- a/src/Tests/Tests/ClientConcepts/LowLevel/DirectStreaming.cs
+++ b/src/Tests/Tests/ClientConcepts/LowLevel/DirectStreaming.cs
@@ -1,11 +1,9 @@
-using FluentAssertions;
-using Nest;
-using System;
+using System;
 using Elastic.Xunit.XunitPlumbing;
-using Tests.Core;
+using FluentAssertions;
+using Nest;
 using Tests.Core.Client;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.LowLevel
 {
diff --git a/src/Tests/Tests/ClientConcepts/ServerError/ComplexErrorTests.cs b/src/Tests/Tests/ClientConcepts/ServerError/ComplexErrorTests.cs
index 403f1863b20..32f140585b3 100644
--- a/src/Tests/Tests/ClientConcepts/ServerError/ComplexErrorTests.cs
+++ b/src/Tests/Tests/ClientConcepts/ServerError/ComplexErrorTests.cs
@@ -4,15 +4,12 @@
 using Elasticsearch.Net;
 using FluentAssertions;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.ServerError
 {
 	public class ComplexErrorTests : ServerErrorTestsBase
 	{
-		[U] protected override void AssertServerError() => base.AssertServerError();
-
-		protected override string Json  =>@"{
+		protected override string Json => @"{
 	""root_cause"" : [
 	{
 		""type"" : ""parse_exception"",
@@ -73,6 +70,8 @@ public class ComplexErrorTests : ServerErrorTestsBase
 	""lang"" : ""c#""
 }";
 
+		[U] protected override void AssertServerError() => base.AssertServerError();
+
 		protected override void AssertResponseError(string origin, Error error)
 		{
 			AssertCausedBy(origin, error);
diff --git a/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithMultipleRootCausesTests.cs b/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithMultipleRootCausesTests.cs
index 4f244235184..00ad7b2fa03 100644
--- a/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithMultipleRootCausesTests.cs
+++ b/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithMultipleRootCausesTests.cs
@@ -1,15 +1,12 @@
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.ServerError
 {
 	public class ErrorWithMultipleRootCausesTests : ServerErrorTestsBase
 	{
-		[U] protected override void AssertServerError() => base.AssertServerError();
-
-		protected override string Json  => @"{
+		protected override string Json => @"{
 			""root_cause"": [
 			{
 				""type"": ""parse_exception1"",
@@ -31,6 +28,8 @@ public class ErrorWithMultipleRootCausesTests : ServerErrorTestsBase
 			}
 		}";
 
+		[U] protected override void AssertServerError() => base.AssertServerError();
+
 		protected override void AssertResponseError(string origin, Error error)
 		{
 			error.Type.Should().NotBeNullOrWhiteSpace(origin);
@@ -51,4 +50,4 @@ protected override void AssertResponseError(string origin, Error error)
 			causedBy.StackTrace.Should().NotBeNullOrWhiteSpace(origin);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithNullRootCausesTests.cs b/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithNullRootCausesTests.cs
index b0e50a32361..6e3662eee71 100644
--- a/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithNullRootCausesTests.cs
+++ b/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithNullRootCausesTests.cs
@@ -1,15 +1,12 @@
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
-using Tests.Framework;
 using FluentAssertions;
 
 namespace Tests.ClientConcepts.ServerError
 {
 	public class ErrorWithNullRootCausesTests : ServerErrorTestsBase
 	{
-		[U] protected override void AssertServerError() => base.AssertServerError();
-
-		protected override string Json  =>@"{
+		protected override string Json => @"{
 			""root_cause"": null,
 			""type"": ""parse_exception"",
 			""reason"": ""failed to parse source for create index"",
@@ -19,6 +16,8 @@ public class ErrorWithNullRootCausesTests : ServerErrorTestsBase
 			}
 		}";
 
+		[U] protected override void AssertServerError() => base.AssertServerError();
+
 		protected override void AssertResponseError(string origin, Error error)
 		{
 			error.Type.Should().NotBeNullOrWhiteSpace(origin);
diff --git a/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithRootCauseTests.cs b/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithRootCauseTests.cs
index d35239ef402..c65e3bd51e9 100644
--- a/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithRootCauseTests.cs
+++ b/src/Tests/Tests/ClientConcepts/ServerError/ErrorWithRootCauseTests.cs
@@ -2,15 +2,12 @@
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.ServerError
 {
 	public class ErrorWithRootCauseTests : ServerErrorTestsBase
 	{
-		[U] protected override void AssertServerError() => base.AssertServerError();
-
-		protected override string Json  =>@"{
+		protected override string Json => @"{
 			""root_cause"": [
 			{
 				""type"": ""parse_exception"",
@@ -24,6 +21,8 @@ public class ErrorWithRootCauseTests : ServerErrorTestsBase
 			}
 		}";
 
+		[U] protected override void AssertServerError() => base.AssertServerError();
+
 		protected override void AssertResponseError(string origin, Error error)
 		{
 			error.Type.Should().NotBeNullOrWhiteSpace(origin);
@@ -39,4 +38,4 @@ protected override void AssertResponseError(string origin, Error error)
 			causedBy.Reason.Should().NotBeNullOrWhiteSpace(origin);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/ClientConcepts/ServerError/ServerErrorTestsBase.cs b/src/Tests/Tests/ClientConcepts/ServerError/ServerErrorTestsBase.cs
index 223179de6db..eeaeb79f68d 100644
--- a/src/Tests/Tests/ClientConcepts/ServerError/ServerErrorTestsBase.cs
+++ b/src/Tests/Tests/ClientConcepts/ServerError/ServerErrorTestsBase.cs
@@ -1,25 +1,27 @@
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using Tests.Core;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.ServerError
 {
 	public abstract class ServerErrorTestsBase
 	{
-		private IElasticClient HighLevelClient { get; }
-		private IElasticLowLevelClient LowLevelClient { get; }
-
 		protected ServerErrorTestsBase()
 		{
 			var settings = FixedResponseClient.CreateConnectionSettings(ResponseJson, 500);
-			this.LowLevelClient = new ElasticLowLevelClient(settings);
-			this.HighLevelClient = new ElasticClient(settings);
+			LowLevelClient = new ElasticLowLevelClient(settings);
+			HighLevelClient = new ElasticClient(settings);
 		}
+
+		protected abstract string Json { get; }
+		private IElasticClient HighLevelClient { get; }
+		private IElasticLowLevelClient LowLevelClient { get; }
+
+		private string ResponseJson => string.Concat(@"{ ""error"": ", Json, @",  ""status"":500 }");
+
 		protected virtual void AssertServerError()
 		{
 			LowLevelCall();
@@ -28,7 +30,7 @@ protected virtual void AssertServerError()
 
 		protected void HighLevelCall()
 		{
-			var response = this.HighLevelClient.Search<Project>(s => s);
+			var response = HighLevelClient.Search<Project>(s => s);
 			response.Should().NotBeNull();
 			var serverError = response.ServerError;
 			serverError.Should().NotBeNull();
@@ -40,7 +42,7 @@ protected void HighLevelCall()
 
 		protected void LowLevelCall()
 		{
-			var response = this.LowLevelClient.Search<StringResponse>(PostData.Serializable(new { }));
+			var response = LowLevelClient.Search<StringResponse>(PostData.Serializable(new { }));
 			response.Should().NotBeNull();
 			response.Body.Should().NotBeNullOrWhiteSpace();
 			var hasServerError = response.TryGetServerError(out var serverError);
@@ -50,10 +52,6 @@ protected void LowLevelCall()
 			AssertResponseError("low level client", serverError.Error);
 		}
 
-		private string ResponseJson => string.Concat(@"{ ""error"": ", Json, @",  ""status"":500 }");
-
-		protected abstract string Json { get;  }
-
 		protected abstract void AssertResponseError(string origin, Error error);
 	}
 }
diff --git a/src/Tests/Tests/ClientConcepts/ServerError/StringErrrorTests.cs b/src/Tests/Tests/ClientConcepts/ServerError/StringErrrorTests.cs
index 151658d1364..b8ce7b2b65f 100644
--- a/src/Tests/Tests/ClientConcepts/ServerError/StringErrrorTests.cs
+++ b/src/Tests/Tests/ClientConcepts/ServerError/StringErrrorTests.cs
@@ -1,16 +1,15 @@
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Tests.Framework;
 
 namespace Tests.ClientConcepts.ServerError
 {
 	public class StringErrrorTests : ServerErrorTestsBase
 	{
-		[U] protected override void AssertServerError() => base.AssertServerError();
-
 		protected override string Json => @"""alias [x] is missing""";
 
+		[U] protected override void AssertServerError() => base.AssertServerError();
+
 		protected override void AssertResponseError(string origin, Error error)
 		{
 			error.Type.Should().BeNullOrEmpty(origin);
@@ -22,9 +21,10 @@ protected override void AssertResponseError(string origin, Error error)
 
 	public class TempErrrorTests : ServerErrorTestsBase
 	{
-		[U] protected override void AssertServerError() => base.AssertServerError();
+		protected override string Json =>
+			@"{""root_cause"":[{""type"":""index_not_found_exception"",""reason"":""no such index"",""index_uuid"":""_na_"",""index"":""non-existent-index""}],""type"":""index_not_found_exception"",""reason"":""no such index"",""index_uuid"":""_na_"",""index"":""non-existent-index""}";
 
-		protected override string Json => @"{""root_cause"":[{""type"":""index_not_found_exception"",""reason"":""no such index"",""index_uuid"":""_na_"",""index"":""non-existent-index""}],""type"":""index_not_found_exception"",""reason"":""no such index"",""index_uuid"":""_na_"",""index"":""non-existent-index""}";
+		[U] protected override void AssertServerError() => base.AssertServerError();
 
 		protected override void AssertResponseError(string origin, Error error)
 		{
diff --git a/src/Tests/Tests/ClientConcepts/Troubleshooting/DebuggerDisplayTests.cs b/src/Tests/Tests/ClientConcepts/Troubleshooting/DebuggerDisplayTests.cs
index 48ed667e3f7..390c4a91169 100644
--- a/src/Tests/Tests/ClientConcepts/Troubleshooting/DebuggerDisplayTests.cs
+++ b/src/Tests/Tests/ClientConcepts/Troubleshooting/DebuggerDisplayTests.cs
@@ -4,7 +4,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Domain;
-using Tests.Framework;
 
 // ReSharper disable SuggestVarOrType_Elsewhere
 // ReSharper disable SuggestVarOrType_BuiltInTypes
@@ -18,33 +17,34 @@ private string DebugFor<T>(T o)
 		{
 			var property = o.GetType().GetProperty("DebugDisplay", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
 			var getter = property.GetGetMethod(true);
-			var get = (Func<T, string>) getter.CreateDelegate(typeof(Func<T, string>));
+			var get = (Func<T, string>)getter.CreateDelegate(typeof(Func<T, string>));
 			return get(o);
 		}
 
-        [U] public void Field()
+		[U] public void Field()
 		{
 			var fieldFromString = new Field("name^2");
-			var fieldFromExpressionWithBoost = Infer.Field<Project>(p=>p.Name, 14);
+			var fieldFromExpressionWithBoost = Infer.Field<Project>(p => p.Name, 14);
 			var propertyInfoField = Infer.Field(typeof(Project).GetProperty(nameof(Project.Name)));
 
 			DebugFor(fieldFromString).Should().Be("name^2");
 			DebugFor(fieldFromExpressionWithBoost).Should().Be("p => p.Name^14 typeof: Project");
 			DebugFor(propertyInfoField).Should().Be("PropertyInfo: Name typeof: Project");
 		}
-        [U] public void FieldsDebug()
-        {
-	        Nest.Fields fromString = "field1, field2";
-	        Nest.Fields multiple = Infer.Field("somefield").And<Project>(p=>p.Description, 12);
+
+		[U] public void FieldsDebug()
+		{
+			Fields fromString = "field1, field2";
+			Fields multiple = Infer.Field("somefield").And<Project>(p => p.Description, 12);
 
 			DebugFor(fromString).Should().Be($"Count: 2 [(1: field1),(2: field2)]");
 			DebugFor(multiple).Should().Be($"Count: 2 [(1: somefield),(2: p => p.Description^12 typeof: {nameof(Project)})]");
 		}
 
-        [U] public void PropertyName()
+		[U] public void PropertyName()
 		{
 			var fieldFromString = new PropertyName("name");
-			var fieldFromExpressionWithBoost = Infer.Property<Project>(p=>p.Name);
+			var fieldFromExpressionWithBoost = Infer.Property<Project>(p => p.Name);
 			PropertyName propertyInfoField = typeof(Project).GetProperty(nameof(Project.Name));
 
 			DebugFor(fieldFromString).Should().Be("name");
@@ -52,28 +52,28 @@ [U] public void PropertyName()
 			DebugFor(propertyInfoField).Should().Be("PropertyInfo: Name typeof: Project");
 		}
 
-        [U] public void ActionIds()
+		[U] public void ActionIds()
 		{
 			ActionIds fromString = "a,b,  c,d    ";
-			ActionIds fromStringArray = new [] {"a", "b"};
+			ActionIds fromStringArray = new[] { "a", "b" };
 
 			DebugFor(fromString).Should().Be("a,b,c,d");
 			DebugFor(fromStringArray).Should().Be("a,b");
 		}
 
-        [U] public void NodeIds()
+		[U] public void NodeIds()
 		{
 			NodeIds fromString = "a,b,c,d";
 			DebugFor(fromString).Should().Be("a,b,c,d");
 		}
 
-        [U] public void Name()
+		[U] public void Name()
 		{
 			Name fromString = "somename";
 			DebugFor(fromString).Should().Be("somename");
 		}
 
-        [U] public void Names()
+		[U] public void Names()
 		{
 			Name name = "somename";
 			Names fromString = "somename";
@@ -82,13 +82,13 @@ [U] public void Names()
 			DebugFor(fromName).Should().Be("somename");
 		}
 
-        [U] public void Id()
+		[U] public void Id()
 		{
 			Id fromString = "myid";
 			Id fromLong = 1337;
 			var guid = Guid.NewGuid();
 			Id fromGuid = guid;
-			var fromInstance = Infer.Id(new Project { Name = "hello"});
+			var fromInstance = Infer.Id(new Project { Name = "hello" });
 
 			DebugFor(fromString).Should().Be("myid");
 			DebugFor(fromLong).Should().Be("1337");
@@ -96,7 +96,7 @@ [U] public void Id()
 			DebugFor(fromInstance).Should().Be("Id from instance typeof: Project");
 		}
 
-        [U] public void IndexName()
+		[U] public void IndexName()
 		{
 			IndexName fromString = "index-1";
 			var fromType = Infer.Index<Project>();
@@ -105,12 +105,12 @@ [U] public void IndexName()
 			DebugFor(fromType).Should().Be("IndexName for typeof: Project");
 		}
 
-        [U] public void IndicesDebug()
-        {
-	        Nest.Indices all = Nest.Indices.All;
-	        Nest.Indices fromTypeName = Infer.Index<Project>();
-	        Nest.Indices fromType = typeof(CommitActivity);
-	        Nest.Indices multiple = Infer.Index("someindex").And<Project>();
+		[U] public void IndicesDebug()
+		{
+			Nest.Indices all = Nest.Indices.All;
+			Nest.Indices fromTypeName = Infer.Index<Project>();
+			Nest.Indices fromType = typeof(CommitActivity);
+			Nest.Indices multiple = Infer.Index("someindex").And<Project>();
 
 			DebugFor(all).Should().Be("_all");
 			DebugFor(fromTypeName).Should().Be($"Count: 1 [(1: IndexName for typeof: {nameof(Project)})]");
@@ -118,7 +118,7 @@ [U] public void IndicesDebug()
 			DebugFor(multiple).Should().Be($"Count: 2 [(1: someindex),(2: IndexName for typeof: {nameof(Project)})]");
 		}
 
-        [U] public void TypeName()
+		[U] public void TypeName()
 		{
 			TypeName fromString = "index-1";
 			var fromType = Infer.Type<Project>();
@@ -127,12 +127,12 @@ [U] public void TypeName()
 			DebugFor(fromType).Should().Be("TypeName for typeof: Project");
 		}
 
-        [U] public void TypesDebug()
-        {
-	        Types all = Types.All;
-	        Types fromTypeName = Infer.Type<Project>();
-	        Types fromType = typeof(CommitActivity);
-	        Types multiple = Infer.Type("sometype").And<Project>();
+		[U] public void TypesDebug()
+		{
+			Types all = Types.All;
+			Types fromTypeName = Infer.Type<Project>();
+			Types fromType = typeof(CommitActivity);
+			Types multiple = Infer.Type("sometype").And<Project>();
 
 			DebugFor(all).Should().Be("_all");
 			DebugFor(fromTypeName).Should().Be($"Count: 1 [(1: TypeName for typeof: {nameof(Project)})]");
@@ -140,7 +140,7 @@ [U] public void TypesDebug()
 			DebugFor(multiple).Should().Be($"Count: 2 [(1: sometype),(2: TypeName for typeof: {nameof(Project)})]");
 		}
 
-        [U] public void TaskId()
+		[U] public void TaskId()
 		{
 			TaskId fromString = "node-1:12";
 			DebugFor(fromString).Should().Be("node-1:12");
@@ -149,7 +149,7 @@ [U] public void TaskId()
 		[U]
 		public void MappingProperties()
 		{
-			var nested = new NestedProperty() {Name = "hello"};
+			var nested = new NestedProperty() { Name = "hello" };
 			var ip = new IpPropertyDescriptor<Project>().Name("field").Boost(2);
 
 			DebugFor(nested).Should().StartWith("Type: nested");
diff --git a/src/Tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs b/src/Tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs
index 8c8f4c6417a..2871bc419dc 100644
--- a/src/Tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs
@@ -6,25 +6,16 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Cluster.ClusterAllocationExplain
 {
-	public class ClusterAllocationExplainApiTests : ApiIntegrationTestBase<UnbalancedCluster, IClusterAllocationExplainResponse, IClusterAllocationExplainRequest, ClusterAllocationExplainDescriptor, ClusterAllocationExplainRequest>
+	public class ClusterAllocationExplainApiTests
+		: ApiIntegrationTestBase<UnbalancedCluster, IClusterAllocationExplainResponse, IClusterAllocationExplainRequest,
+			ClusterAllocationExplainDescriptor, ClusterAllocationExplainRequest>
 	{
 		public ClusterAllocationExplainApiTests(UnbalancedCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterAllocationExplain(f),
-			fluentAsync: (client, f) => client.ClusterAllocationExplainAsync(f),
-			request: (client, r) => client.ClusterAllocationExplain(r),
-			requestAsync: (client, r) => client.ClusterAllocationExplainAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/_cluster/allocation/explain?include_yes_decisions=true";
 
 		protected override object ExpectJson =>
 			new
@@ -34,12 +25,16 @@ protected override LazyResponses ClientUsage() => Calls(
 				primary = true
 			};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<ClusterAllocationExplainDescriptor, IClusterAllocationExplainRequest> Fluent => s => s
 			.Index<Project>()
 			.Shard(0)
 			.Primary()
 			.IncludeYesDecisions();
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ClusterAllocationExplainRequest Initializer =>
 			new ClusterAllocationExplainRequest
 			{
@@ -49,6 +44,15 @@ protected override LazyResponses ClientUsage() => Calls(
 				IncludeYesDecisions = true
 			};
 
+		protected override string UrlPath => "/_cluster/allocation/explain?include_yes_decisions=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterAllocationExplain(f),
+			(client, f) => client.ClusterAllocationExplainAsync(f),
+			(client, r) => client.ClusterAllocationExplain(r),
+			(client, r) => client.ClusterAllocationExplainAsync(r)
+		);
+
 		protected override void ExpectResponse(IClusterAllocationExplainResponse response)
 		{
 			response.Primary.Should().BeTrue();
@@ -60,7 +64,7 @@ protected override void ExpectResponse(IClusterAllocationExplainResponse respons
 			response.CanRebalanceCluster.Should().NotBeNull();
 			response.CanRebalanceClusterDecisions.Should().NotBeNullOrEmpty();
 
-			foreach( var decision in response.CanRebalanceClusterDecisions)
+			foreach (var decision in response.CanRebalanceClusterDecisions)
 			{
 				decision.Decider.Should().NotBeNullOrEmpty();
 				decision.Explanation.Should().NotBeNullOrEmpty();
diff --git a/src/Tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainUrlTests.cs b/src/Tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainUrlTests.cs
index c17ed08f9ff..b2f6080b8b1 100644
--- a/src/Tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainUrlTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainUrlTests.cs
@@ -8,14 +8,12 @@ namespace Tests.Cluster.ClusterAllocationExplain
 {
 	public class ClusterAllocationExplainUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await UrlTester.POST("/_cluster/allocation/explain?include_yes_decisions=true")
-				.Fluent(c => c.ClusterAllocationExplain(s => s.Index<Project>().Shard(0).Primary(true).IncludeYesDecisions()))
-				.Request(c => c.ClusterAllocationExplain(new ClusterAllocationExplainRequest { Index = typeof(Project), Shard = 0, Primary = true, IncludeYesDecisions = true }))
-				.FluentAsync(c => c.ClusterAllocationExplainAsync(s => s.Index<Project>().Shard(0).Primary(true).IncludeYesDecisions()))
-				.RequestAsync(c => c.ClusterAllocationExplainAsync(new ClusterAllocationExplainRequest { Index = typeof(Project), Shard = 0, Primary = true, IncludeYesDecisions = true }))
-				;
-		}
+		[U] public override async Task Urls() => await UrlTester.POST("/_cluster/allocation/explain?include_yes_decisions=true")
+			.Fluent(c => c.ClusterAllocationExplain(s => s.Index<Project>().Shard(0).Primary(true).IncludeYesDecisions()))
+			.Request(c => c.ClusterAllocationExplain(new ClusterAllocationExplainRequest
+				{ Index = typeof(Project), Shard = 0, Primary = true, IncludeYesDecisions = true }))
+			.FluentAsync(c => c.ClusterAllocationExplainAsync(s => s.Index<Project>().Shard(0).Primary(true).IncludeYesDecisions()))
+			.RequestAsync(c => c.ClusterAllocationExplainAsync(new ClusterAllocationExplainRequest
+				{ Index = typeof(Project), Shard = 0, Primary = true, IncludeYesDecisions = true }));
 	}
 }
diff --git a/src/Tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs b/src/Tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs
index 2adef5c92ed..20c8f1f25c9 100644
--- a/src/Tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs
@@ -7,27 +7,27 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Cluster.ClusterHealth
 {
-	public class ClusterHealthApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IClusterHealthResponse, IClusterHealthRequest, ClusterHealthDescriptor, ClusterHealthRequest>
+	public class ClusterHealthApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IClusterHealthResponse, IClusterHealthRequest, ClusterHealthDescriptor, ClusterHealthRequest>
 	{
 		public ClusterHealthApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterHealth(),
-			fluentAsync: (client, f) => client.ClusterHealthAsync(),
-			request: (client, r) => client.ClusterHealth(r),
-			requestAsync: (client, r) => client.ClusterHealthAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cluster/health";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterHealth(),
+			(client, f) => client.ClusterHealthAsync(),
+			(client, r) => client.ClusterHealth(r),
+			(client, r) => client.ClusterHealthAsync(r)
+		);
+
 		protected override void ExpectResponse(IClusterHealthResponse response)
 		{
 			response.ClusterName.Should().NotBeNullOrWhiteSpace();
@@ -39,23 +39,26 @@ protected override void ExpectResponse(IClusterHealthResponse response)
 			response.ActiveShards.Should().BeGreaterOrEqualTo(1);
 		}
 	}
-	public class ClusterHealthShardsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IClusterHealthResponse, IClusterHealthRequest, ClusterHealthDescriptor, ClusterHealthRequest>
+
+	public class ClusterHealthShardsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IClusterHealthResponse, IClusterHealthRequest, ClusterHealthDescriptor, ClusterHealthRequest>
 	{
 		public ClusterHealthShardsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterHealth(f),
-			fluentAsync: (client, f) => client.ClusterHealthAsync(f),
-			request: (client, r) => client.ClusterHealth(r),
-			requestAsync: (client, r) => client.ClusterHealthAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_cluster/health?level=shards";
 
 		protected override Func<ClusterHealthDescriptor, IClusterHealthRequest> Fluent => c => c.Level(Level.Shards);
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override ClusterHealthRequest Initializer => new ClusterHealthRequest { Level = Level.Shards };
+		protected override string UrlPath => "/_cluster/health?level=shards";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterHealth(f),
+			(client, f) => client.ClusterHealthAsync(f),
+			(client, r) => client.ClusterHealth(r),
+			(client, r) => client.ClusterHealthAsync(r)
+		);
 
 		protected override void ExpectResponse(IClusterHealthResponse response)
 		{
@@ -66,7 +69,8 @@ protected override void ExpectResponse(IClusterHealthResponse response)
 			response.NumberOfDataNodes.Should().BeGreaterOrEqualTo(1);
 			response.ActivePrimaryShards.Should().BeGreaterOrEqualTo(1);
 			response.ActiveShards.Should().BeGreaterOrEqualTo(1);
-			response.Indices.Should().NotBeEmpty()
+			response.Indices.Should()
+				.NotBeEmpty()
 				.And.ContainKey(Index<Developer>());
 
 			var indexHealth = response.Indices[Index<Developer>()];
@@ -75,5 +79,4 @@ protected override void ExpectResponse(IClusterHealthResponse response)
 			indexHealth.Shards["0"].Status.Should().Be(Health.Green);
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cluster/ClusterHealth/ClusterHealthUrlTests.cs b/src/Tests/Tests/Cluster/ClusterHealth/ClusterHealthUrlTests.cs
index 834d458c6b8..86ca2c2b80e 100644
--- a/src/Tests/Tests/Cluster/ClusterHealth/ClusterHealthUrlTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterHealth/ClusterHealthUrlTests.cs
@@ -12,17 +12,17 @@ public class ClusterHealthUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cluster/health")
-				.Fluent(c => c.ClusterHealth())
-				.Request(c => c.ClusterHealth(new ClusterHealthRequest()))
-				.FluentAsync(c => c.ClusterHealthAsync())
-				.RequestAsync(c => c.ClusterHealthAsync(new ClusterHealthRequest()))
+					.Fluent(c => c.ClusterHealth())
+					.Request(c => c.ClusterHealth(new ClusterHealthRequest()))
+					.FluentAsync(c => c.ClusterHealthAsync())
+					.RequestAsync(c => c.ClusterHealthAsync(new ClusterHealthRequest()))
 				;
 
 			await GET("/_cluster/health/project")
-				.Fluent(c => c.ClusterHealth(h => h.Index<Project>()))
-				.Request(c => c.ClusterHealth(new ClusterHealthRequest(typeof(Project))))
-				.FluentAsync(c => c.ClusterHealthAsync(h => h.Index<Project>()))
-				.RequestAsync(c => c.ClusterHealthAsync(new ClusterHealthRequest(typeof(Project))))
+					.Fluent(c => c.ClusterHealth(h => h.Index<Project>()))
+					.Request(c => c.ClusterHealth(new ClusterHealthRequest(typeof(Project))))
+					.FluentAsync(c => c.ClusterHealthAsync(h => h.Index<Project>()))
+					.RequestAsync(c => c.ClusterHealthAsync(new ClusterHealthRequest(typeof(Project))))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksApiTests.cs b/src/Tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksApiTests.cs
index c8102b39e09..f5fc735a736 100644
--- a/src/Tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksApiTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksApiTests.cs
@@ -4,31 +4,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.ClusterPendingTasks
 {
 	public class ClusterPendingTasksApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, IClusterPendingTasksResponse, IClusterPendingTasksRequest, ClusterPendingTasksDescriptor, ClusterPendingTasksRequest>
+		: ApiIntegrationTestBase<ReadOnlyCluster, IClusterPendingTasksResponse, IClusterPendingTasksRequest, ClusterPendingTasksDescriptor,
+			ClusterPendingTasksRequest>
 	{
 		public ClusterPendingTasksApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterPendingTasks(),
-			fluentAsync: (client, f) => client.ClusterPendingTasksAsync(),
-			request: (client, r) => client.ClusterPendingTasks(r),
-			requestAsync: (client, r) => client.ClusterPendingTasksAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cluster/pending_tasks";
 
-		protected override void ExpectResponse(IClusterPendingTasksResponse response)
-		{
-			response.Tasks.Should().NotBeNull();
-		}
-	}
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterPendingTasks(),
+			(client, f) => client.ClusterPendingTasksAsync(),
+			(client, r) => client.ClusterPendingTasks(r),
+			(client, r) => client.ClusterPendingTasksAsync(r)
+		);
 
+		protected override void ExpectResponse(IClusterPendingTasksResponse response) => response.Tasks.Should().NotBeNull();
+	}
 }
diff --git a/src/Tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksUrlTests.cs b/src/Tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksUrlTests.cs
index 09d6dbb2a92..0aa50daa3f5 100644
--- a/src/Tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksUrlTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cluster.ClusterPendingTasks
 {
 	public class ClusterPendingTasksUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cluster/pending_tasks")
-				.Fluent(c => c.ClusterPendingTasks())
-				.Request(c => c.ClusterPendingTasks(new ClusterPendingTasksRequest()))
-				.FluentAsync(c => c.ClusterPendingTasksAsync())
-				.RequestAsync(c => c.ClusterPendingTasksAsync(new ClusterPendingTasksRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cluster/pending_tasks")
+			.Fluent(c => c.ClusterPendingTasks())
+			.Request(c => c.ClusterPendingTasks(new ClusterPendingTasksRequest()))
+			.FluentAsync(c => c.ClusterPendingTasksAsync())
+			.RequestAsync(c => c.ClusterPendingTasksAsync(new ClusterPendingTasksRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs b/src/Tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs
index c3c917848f0..7151d8516dc 100644
--- a/src/Tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs
@@ -8,26 +8,83 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.ClusterReroute
 {
-	public class ClusterRerouteApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IClusterRerouteResponse, IClusterRerouteRequest, ClusterRerouteDescriptor, ClusterRerouteRequest>
+	public class ClusterRerouteApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IClusterRerouteResponse, IClusterRerouteRequest, ClusterRerouteDescriptor,
+			ClusterRerouteRequest>
 	{
-
 		public ClusterRerouteApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterReroute(f),
-			fluentAsync: (client, f) => client.ClusterRerouteAsync(f),
-			request: (client, r) => client.ClusterReroute(r),
-			requestAsync: (client, r) => client.ClusterRerouteAsync(r)
-		);
 
 		protected override bool ExpectIsValid => false;
+
+		protected override object ExpectJson => new
+		{
+			commands = new[]
+			{
+				new Dictionary<string, object>
+				{
+					{
+						"allocate_empty_primary", new
+						{
+							index = "project",
+							node = "x",
+							shard = 0,
+							accept_data_loss = true
+						}
+					}
+				},
+				new Dictionary<string, object>
+				{
+					{
+						"allocate_stale_primary", new
+						{
+							index = "project",
+							node = "x",
+							shard = 0,
+							accept_data_loss = true
+						}
+					}
+				},
+				new Dictionary<string, object>
+				{
+					{
+						"allocate_replica", new
+						{
+							index = "project",
+							node = "x",
+							shard = 0
+						}
+					}
+				},
+				new Dictionary<string, object>
+				{
+					{
+						"move", new
+						{
+							to_node = "y",
+							from_node = "x",
+							index = "project",
+							shard = 0
+						}
+					}
+				},
+				new Dictionary<string, object>
+				{
+					{
+						"cancel", new
+						{
+							index = "project",
+							node = "x",
+							shard = 1
+						}
+					}
+				},
+			}
+		};
+
 		protected override int ExpectStatusCode => 400;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/_cluster/reroute";
 
 		protected override Func<ClusterRerouteDescriptor, IClusterRerouteRequest> Fluent => c => c
 			.AllocateEmptyPrimary(a => a
@@ -42,7 +99,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				.Shard(0)
 				.AcceptDataLoss(true)
 			)
-		    .AllocateReplica(a => a
+			.AllocateReplica(a => a
 				.Index<Project>()
 				.Node("x")
 				.Shard(0)
@@ -59,6 +116,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				.Shard(1)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ClusterRerouteRequest Initializer => new ClusterRerouteRequest
 		{
 			Commands = new List<IClusterRerouteCommand>
@@ -66,50 +125,19 @@ protected override LazyResponses ClientUsage() => Calls(
 				new AllocateEmptyPrimaryRerouteCommand { Index = IndexName.From<Project>(), Node = "x", Shard = 0, AcceptDataLoss = true },
 				new AllocateStalePrimaryRerouteCommand { Index = IndexName.From<Project>(), Node = "x", Shard = 0, AcceptDataLoss = true },
 				new AllocateReplicaClusterRerouteCommand { Index = IndexName.From<Project>(), Node = "x", Shard = 0 },
-				new MoveClusterRerouteCommand { Index = IndexName.From<Project>(), FromNode = "x", ToNode = "y", Shard = 0},
-				new CancelClusterRerouteCommand() { Index = "project", Node = "x", Shard = 1}
+				new MoveClusterRerouteCommand { Index = IndexName.From<Project>(), FromNode = "x", ToNode = "y", Shard = 0 },
+				new CancelClusterRerouteCommand() { Index = "project", Node = "x", Shard = 1 }
 			}
 		};
 
-		protected override object ExpectJson => new
-		{
-			commands = new []
-			{
-				new Dictionary<string, object> { { "allocate_empty_primary", new
-				{
-					index = "project",
-					node = "x",
-					shard = 0,
-					accept_data_loss = true
-				} } },
-				new Dictionary<string, object> { { "allocate_stale_primary", new
-				{
-					index = "project",
-					node = "x",
-					shard = 0,
-					accept_data_loss = true
-				} } },
-				new Dictionary<string, object> { { "allocate_replica", new
-				{
-					index = "project",
-					node = "x",
-					shard = 0
-				} } },
-				new Dictionary<string, object> { { "move", new
-				{
-					to_node = "y",
-					from_node = "x",
-					index = "project",
-					shard = 0
-				} } },
-				new Dictionary<string, object> { { "cancel", new
-				{
-					index = "project",
-					node ="x",
-					shard = 1
-				} } },
-			}
-		};
+		protected override string UrlPath => "/_cluster/reroute";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterReroute(f),
+			(client, f) => client.ClusterRerouteAsync(f),
+			(client, r) => client.ClusterReroute(r),
+			(client, r) => client.ClusterRerouteAsync(r)
+		);
 
 		protected override void ExpectResponse(IClusterRerouteResponse response)
 		{
@@ -119,7 +147,6 @@ protected override void ExpectResponse(IClusterRerouteResponse response)
 			response.ServerError.Error.Should().NotBeNull();
 			response.ServerError.Error.Reason.Should().Contain("failed to resolve");
 			response.ServerError.Error.Type.Should().Contain("illegal_argument_exception");
-
 		}
 	}
 
diff --git a/src/Tests/Tests/Cluster/ClusterReroute/ClusterRerouteUrlTests.cs b/src/Tests/Tests/Cluster/ClusterReroute/ClusterRerouteUrlTests.cs
index 61dbc4be7ef..effb71133c6 100644
--- a/src/Tests/Tests/Cluster/ClusterReroute/ClusterRerouteUrlTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterReroute/ClusterRerouteUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cluster.ClusterReroute
 {
 	public class ClusterRerouteUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_cluster/reroute")
-				.Fluent(c => c.ClusterReroute(r=>r))
-				.Request(c => c.ClusterReroute(new ClusterRerouteRequest()))
-				.FluentAsync(c => c.ClusterRerouteAsync(r=>r))
-				.RequestAsync(c => c.ClusterRerouteAsync(new ClusterRerouteRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_cluster/reroute")
+			.Fluent(c => c.ClusterReroute(r => r))
+			.Request(c => c.ClusterReroute(new ClusterRerouteRequest()))
+			.FluentAsync(c => c.ClusterRerouteAsync(r => r))
+			.RequestAsync(c => c.ClusterRerouteAsync(new ClusterRerouteRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs b/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs
index 4949b704c27..81f17cebd93 100644
--- a/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs
@@ -3,24 +3,23 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.ClusterSettings.ClusterGetSettings
 {
 	public class ClusterGetSettingsApiTests
-		: ApiTestBase<ReadOnlyCluster, IClusterGetSettingsResponse, IClusterGetSettingsRequest, ClusterGetSettingsDescriptor, ClusterGetSettingsRequest>
+		: ApiTestBase<ReadOnlyCluster, IClusterGetSettingsResponse, IClusterGetSettingsRequest, ClusterGetSettingsDescriptor,
+			ClusterGetSettingsRequest>
 	{
 		public ClusterGetSettingsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterGetSettings(),
-			fluentAsync: (client, f) => client.ClusterGetSettingsAsync(),
-			request: (client, r) => client.ClusterGetSettings(r),
-			requestAsync: (client, r) => client.ClusterGetSettingsAsync(r)
-		);
 
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cluster/settings";
-	}
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterGetSettings(),
+			(client, f) => client.ClusterGetSettingsAsync(),
+			(client, r) => client.ClusterGetSettings(r),
+			(client, r) => client.ClusterGetSettingsAsync(r)
+		);
+	}
 }
diff --git a/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsUrlTests.cs b/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsUrlTests.cs
index 657c8b2e4ad..e2d65651fe4 100644
--- a/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsUrlTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cluster.ClusterSettings.ClusterGetSettings
 {
 	public class ClusterGetSettingsUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_cluster/settings")
-				.Fluent(c => c.ClusterGetSettings())
-				.Request(c => c.ClusterGetSettings(new ClusterGetSettingsRequest()))
-				.FluentAsync(c => c.ClusterGetSettingsAsync())
-				.RequestAsync(c => c.ClusterGetSettingsAsync(new ClusterGetSettingsRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_cluster/settings")
+			.Fluent(c => c.ClusterGetSettings())
+			.Request(c => c.ClusterGetSettings(new ClusterGetSettingsRequest()))
+			.FluentAsync(c => c.ClusterGetSettingsAsync())
+			.RequestAsync(c => c.ClusterGetSettingsAsync(new ClusterGetSettingsRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsApiTests.cs b/src/Tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsApiTests.cs
index 26317fb58b3..21fc2cddb74 100644
--- a/src/Tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsApiTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsApiTests.cs
@@ -7,40 +7,43 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.ClusterSettings.ClusterPutSettings
 {
-	public class ClusterPutSettingsApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IClusterPutSettingsResponse, IClusterPutSettingsRequest, ClusterPutSettingsDescriptor, ClusterPutSettingsRequest>
+	public class ClusterPutSettingsApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IClusterPutSettingsResponse, IClusterPutSettingsRequest, ClusterPutSettingsDescriptor,
+			ClusterPutSettingsRequest>
 	{
 		public ClusterPutSettingsApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterPutSettings(f),
-			fluentAsync: (client, f) => client.ClusterPutSettingsAsync(f),
-			request: (client, r) => client.ClusterPutSettings(r),
-			requestAsync: (client, r) => client.ClusterPutSettingsAsync(r)
-		);
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => "/_cluster/settings";
+		protected override bool ExpectIsValid => true;
 
 		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
 
 		protected override Func<ClusterPutSettingsDescriptor, IClusterPutSettingsRequest> Fluent => c => c
 			.Transient(s => s
 				.Add("indices.recovery.max_bytes_per_sec", "41mb")
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override ClusterPutSettingsRequest Initializer => new ClusterPutSettingsRequest
 		{
 			Transient = new Dictionary<string, object>
 			{
-				{"indices.recovery.max_bytes_per_sec" , "41mb"}
+				{ "indices.recovery.max_bytes_per_sec", "41mb" }
 			}
 		};
 
+		protected override string UrlPath => "/_cluster/settings";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterPutSettings(f),
+			(client, f) => client.ClusterPutSettingsAsync(f),
+			(client, r) => client.ClusterPutSettings(r),
+			(client, r) => client.ClusterPutSettingsAsync(r)
+		);
+
 		protected override void ExpectResponse(IClusterPutSettingsResponse response)
 		{
 			response.ShouldBeValid();
@@ -49,25 +52,29 @@ protected override void ExpectResponse(IClusterPutSettingsResponse response)
 		}
 	}
 
-	public class ClusterPutSettingsNoopApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IClusterPutSettingsResponse, IClusterPutSettingsRequest, ClusterPutSettingsDescriptor, ClusterPutSettingsRequest>
+	public class ClusterPutSettingsNoopApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IClusterPutSettingsResponse, IClusterPutSettingsRequest, ClusterPutSettingsDescriptor,
+			ClusterPutSettingsRequest>
 	{
 		public ClusterPutSettingsNoopApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterPutSettings(f),
-			fluentAsync: (client, f) => client.ClusterPutSettingsAsync(f),
-			request: (client, r) => client.ClusterPutSettings(r),
-			requestAsync: (client, r) => client.ClusterPutSettingsAsync(r)
-		);
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => "/_cluster/settings";
+		protected override bool ExpectIsValid => false;
 
 		protected override int ExpectStatusCode => 400;
-		protected override bool ExpectIsValid => false;
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
 		protected override ClusterPutSettingsRequest Initializer => new ClusterPutSettingsRequest
-		{
-		};
+			{ };
+
+		protected override string UrlPath => "/_cluster/settings";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterPutSettings(f),
+			(client, f) => client.ClusterPutSettingsAsync(f),
+			(client, r) => client.ClusterPutSettings(r),
+			(client, r) => client.ClusterPutSettingsAsync(r)
+		);
 
 		protected override void ExpectResponse(IClusterPutSettingsResponse response)
 		{
diff --git a/src/Tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutUrlTests.cs b/src/Tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutUrlTests.cs
index 1c27d080cce..7f7bb1549bf 100644
--- a/src/Tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutUrlTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cluster.ClusterSettings.ClusterPutSettings
 {
 	public class ClusterPutUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_cluster/settings")
-				.Fluent(c => c.ClusterPutSettings(s=>s))
-				.Request(c => c.ClusterPutSettings(new ClusterPutSettingsRequest()))
-				.FluentAsync(c => c.ClusterPutSettingsAsync(s=>s))
-				.RequestAsync(c => c.ClusterPutSettingsAsync(new ClusterPutSettingsRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_cluster/settings")
+			.Fluent(c => c.ClusterPutSettings(s => s))
+			.Request(c => c.ClusterPutSettings(new ClusterPutSettingsRequest()))
+			.FluentAsync(c => c.ClusterPutSettingsAsync(s => s))
+			.RequestAsync(c => c.ClusterPutSettingsAsync(new ClusterPutSettingsRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cluster/ClusterState/ClusterStateApiTests.cs b/src/Tests/Tests/Cluster/ClusterState/ClusterStateApiTests.cs
index 5e9ab66d292..6b202a23674 100644
--- a/src/Tests/Tests/Cluster/ClusterState/ClusterStateApiTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterState/ClusterStateApiTests.cs
@@ -9,28 +9,27 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Cluster.ClusterState
 {
-	public class ClusterStateApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IClusterStateResponse, IClusterStateRequest, ClusterStateDescriptor, ClusterStateRequest>
+	public class ClusterStateApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IClusterStateResponse, IClusterStateRequest, ClusterStateDescriptor, ClusterStateRequest>
 	{
 		public ClusterStateApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterState(),
-			fluentAsync: (client, f) => client.ClusterStateAsync(),
-			request: (client, r) => client.ClusterState(r),
-			requestAsync: (client, r) => client.ClusterStateAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cluster/state";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterState(),
+			(client, f) => client.ClusterStateAsync(),
+			(client, r) => client.ClusterState(r),
+			(client, r) => client.ClusterStateAsync(r)
+		);
+
 		protected override void ExpectResponse(IClusterStateResponse response)
 		{
 			response.ClusterName.Should().NotBeNullOrWhiteSpace();
@@ -61,13 +60,12 @@ private void Assert(MetadataState meta)
 			rawFieldsTemplate.Settings.Should().NotBeNull();
 			rawFieldsTemplate.Settings.NumberOfShards.Should().Be(2);
 
-			var i = this.Client.Infer.IndexName(Index<Project>());
+			var i = Client.Infer.IndexName(Index<Project>());
 
 			meta.Indices.Should().NotBeEmpty().And.ContainKey(i);
 
 			var index = meta.Indices[i];
 			index.Aliases.Should().NotBeEmpty().And.Contain(DefaultSeeder.ProjectsAliasName);
-
 		}
 
 		protected void Assert(RoutingTableState routingTable)
diff --git a/src/Tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs b/src/Tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs
index 470df2497bd..bc11ae11e79 100644
--- a/src/Tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs
@@ -12,27 +12,27 @@ public class ClusterStateUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cluster/state")
-				.Fluent(c => c.ClusterState())
-				.Request(c => c.ClusterState(new ClusterStateRequest()))
-				.FluentAsync(c => c.ClusterStateAsync())
-				.RequestAsync(c => c.ClusterStateAsync(new ClusterStateRequest()))
+					.Fluent(c => c.ClusterState())
+					.Request(c => c.ClusterState(new ClusterStateRequest()))
+					.FluentAsync(c => c.ClusterStateAsync())
+					.RequestAsync(c => c.ClusterStateAsync(new ClusterStateRequest()))
 				;
 
 			var metrics = ClusterStateMetric.MasterNode | ClusterStateMetric.Metadata;
 			await GET("/_cluster/state/metadata%2Cmaster_node")
-				.Fluent(c => c.ClusterState(p=>p.Metric(metrics)))
-				.Request(c => c.ClusterState(new ClusterStateRequest(metrics)))
-				.FluentAsync(c => c.ClusterStateAsync(p=>p.Metric(metrics)))
-				.RequestAsync(c => c.ClusterStateAsync(new ClusterStateRequest(metrics)))
+					.Fluent(c => c.ClusterState(p => p.Metric(metrics)))
+					.Request(c => c.ClusterState(new ClusterStateRequest(metrics)))
+					.FluentAsync(c => c.ClusterStateAsync(p => p.Metric(metrics)))
+					.RequestAsync(c => c.ClusterStateAsync(new ClusterStateRequest(metrics)))
 				;
 
 			metrics |= ClusterStateMetric.All;
 			var index = "indexx";
 			await GET($"/_cluster/state/_all/{index}")
-				.Fluent(c => c.ClusterState(p=>p.Metric(metrics).Index(index)))
-				.Request(c => c.ClusterState(new ClusterStateRequest(metrics, index)))
-				.FluentAsync(c => c.ClusterStateAsync(p=>p.Metric(metrics).Index(index)))
-				.RequestAsync(c => c.ClusterStateAsync(new ClusterStateRequest(metrics, index)))
+					.Fluent(c => c.ClusterState(p => p.Metric(metrics).Index(index)))
+					.Request(c => c.ClusterState(new ClusterStateRequest(metrics, index)))
+					.FluentAsync(c => c.ClusterStateAsync(p => p.Metric(metrics).Index(index)))
+					.RequestAsync(c => c.ClusterStateAsync(new ClusterStateRequest(metrics, index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs b/src/Tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs
index f4dd12aac01..583e5281276 100644
--- a/src/Tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs
@@ -5,25 +5,26 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Cluster.ClusterStats
 {
-	public class ClusterStatsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IClusterStatsResponse, IClusterStatsRequest, ClusterStatsDescriptor, ClusterStatsRequest>
+	public class ClusterStatsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IClusterStatsResponse, IClusterStatsRequest, ClusterStatsDescriptor, ClusterStatsRequest>
 	{
 		public ClusterStatsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClusterStats(),
-			fluentAsync: (client, f) => client.ClusterStatsAsync(),
-			request: (client, r) => client.ClusterStats(r),
-			requestAsync: (client, r) => client.ClusterStatsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cluster/stats";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClusterStats(),
+			(client, f) => client.ClusterStatsAsync(),
+			(client, r) => client.ClusterStats(r),
+			(client, r) => client.ClusterStatsAsync(r)
+		);
+
 		protected override void ExpectResponse(IClusterStatsResponse response)
 		{
 			response.ClusterName.Should().NotBeNullOrWhiteSpace();
diff --git a/src/Tests/Tests/Cluster/ClusterStats/ClusterStatsUrlTests.cs b/src/Tests/Tests/Cluster/ClusterStats/ClusterStatsUrlTests.cs
index 86e55a932ed..808bf588f54 100644
--- a/src/Tests/Tests/Cluster/ClusterStats/ClusterStatsUrlTests.cs
+++ b/src/Tests/Tests/Cluster/ClusterStats/ClusterStatsUrlTests.cs
@@ -11,17 +11,17 @@ public class ClusterStatsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cluster/stats")
-				.Fluent(c => c.ClusterStats())
-				.Request(c => c.ClusterStats(new ClusterStatsRequest()))
-				.FluentAsync(c => c.ClusterStatsAsync())
-				.RequestAsync(c => c.ClusterStatsAsync(new ClusterStatsRequest()))
+					.Fluent(c => c.ClusterStats())
+					.Request(c => c.ClusterStats(new ClusterStatsRequest()))
+					.FluentAsync(c => c.ClusterStatsAsync())
+					.RequestAsync(c => c.ClusterStatsAsync(new ClusterStatsRequest()))
 				;
 
 			await GET("/_cluster/stats/nodes/foo")
-				.Fluent(c => c.ClusterStats(s => s.NodeId("foo")))
-				.Request(c => c.ClusterStats(new ClusterStatsRequest("foo")))
-				.FluentAsync(c => c.ClusterStatsAsync(s => s.NodeId("foo")))
-				.RequestAsync(c => c.ClusterStatsAsync(new ClusterStatsRequest("foo")))
+					.Fluent(c => c.ClusterStats(s => s.NodeId("foo")))
+					.Request(c => c.ClusterStats(new ClusterStatsRequest("foo")))
+					.FluentAsync(c => c.ClusterStatsAsync(s => s.NodeId("foo")))
+					.RequestAsync(c => c.ClusterStatsAsync(new ClusterStatsRequest("foo")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/NodesHotThreads/NodesHotThreadsApiTests.cs b/src/Tests/Tests/Cluster/NodesHotThreads/NodesHotThreadsApiTests.cs
index 5d6bf7e6828..70bca9f2f2f 100644
--- a/src/Tests/Tests/Cluster/NodesHotThreads/NodesHotThreadsApiTests.cs
+++ b/src/Tests/Tests/Cluster/NodesHotThreads/NodesHotThreadsApiTests.cs
@@ -5,26 +5,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.NodesHotThreads
 {
-	public class NodesHotThreadsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, INodesHotThreadsResponse, INodesHotThreadsRequest, NodesHotThreadsDescriptor, NodesHotThreadsRequest>
+	public class NodesHotThreadsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, INodesHotThreadsResponse, INodesHotThreadsRequest, NodesHotThreadsDescriptor, NodesHotThreadsRequest
+		>
 	{
 		public NodesHotThreadsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.NodesHotThreads(),
-			fluentAsync: (client, f) => client.NodesHotThreadsAsync(),
-			request: (client, r) => client.NodesHotThreads(r),
-			requestAsync: (client, r) => client.NodesHotThreadsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cluster/nodes/hotthreads";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.NodesHotThreads(),
+			(client, f) => client.NodesHotThreadsAsync(),
+			(client, r) => client.NodesHotThreads(r),
+			(client, r) => client.NodesHotThreadsAsync(r)
+		);
+
 		protected override void ExpectResponse(INodesHotThreadsResponse response)
 		{
 			response.HotThreads.Should().NotBeEmpty();
@@ -34,5 +35,4 @@ protected override void ExpectResponse(INodesHotThreadsResponse response)
 			t.Hosts.Should().NotBeEmpty();
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cluster/NodesHotThreads/NodesHotThreadsUrlTests.cs b/src/Tests/Tests/Cluster/NodesHotThreads/NodesHotThreadsUrlTests.cs
index 89661aabbc0..adbfb1842de 100644
--- a/src/Tests/Tests/Cluster/NodesHotThreads/NodesHotThreadsUrlTests.cs
+++ b/src/Tests/Tests/Cluster/NodesHotThreads/NodesHotThreadsUrlTests.cs
@@ -11,17 +11,17 @@ public class NodesHotThreadsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_cluster/nodes/hotthreads")
-				.Fluent(c => c.NodesHotThreads())
-				.Request(c => c.NodesHotThreads(new NodesHotThreadsRequest()))
-				.FluentAsync(c => c.NodesHotThreadsAsync())
-				.RequestAsync(c => c.NodesHotThreadsAsync(new NodesHotThreadsRequest()))
+					.Fluent(c => c.NodesHotThreads())
+					.Request(c => c.NodesHotThreads(new NodesHotThreadsRequest()))
+					.FluentAsync(c => c.NodesHotThreadsAsync())
+					.RequestAsync(c => c.NodesHotThreadsAsync(new NodesHotThreadsRequest()))
 				;
 
 			await GET("/_cluster/nodes/foo/hotthreads")
-				.Fluent(c => c.NodesHotThreads(n => n.NodeId("foo")))
-				.Request(c => c.NodesHotThreads(new NodesHotThreadsRequest("foo")))
-				.FluentAsync(c => c.NodesHotThreadsAsync(n => n.NodeId("foo")))
-				.RequestAsync(c => c.NodesHotThreadsAsync(new NodesHotThreadsRequest("foo")))
+					.Fluent(c => c.NodesHotThreads(n => n.NodeId("foo")))
+					.Request(c => c.NodesHotThreads(new NodesHotThreadsRequest("foo")))
+					.FluentAsync(c => c.NodesHotThreadsAsync(n => n.NodeId("foo")))
+					.RequestAsync(c => c.NodesHotThreadsAsync(new NodesHotThreadsRequest("foo")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/NodesInfo/NodesInfoApiTests.cs b/src/Tests/Tests/Cluster/NodesInfo/NodesInfoApiTests.cs
index fc84af1e953..2c95918108a 100644
--- a/src/Tests/Tests/Cluster/NodesInfo/NodesInfoApiTests.cs
+++ b/src/Tests/Tests/Cluster/NodesInfo/NodesInfoApiTests.cs
@@ -8,26 +8,26 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.NodesInfo
 {
-	public class NodesInfoApiTests : ApiIntegrationTestBase<ReadOnlyCluster, INodesInfoResponse, INodesInfoRequest, NodesInfoDescriptor, NodesInfoRequest>
+	public class NodesInfoApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, INodesInfoResponse, INodesInfoRequest, NodesInfoDescriptor, NodesInfoRequest>
 	{
 		public NodesInfoApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.NodesInfo(),
-			fluentAsync: (client, f) => client.NodesInfoAsync(),
-			request: (client, r) => client.NodesInfo(r),
-			requestAsync: (client, r) => client.NodesInfoAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_nodes";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.NodesInfo(),
+			(client, f) => client.NodesInfoAsync(),
+			(client, r) => client.NodesInfo(r),
+			(client, r) => client.NodesInfoAsync(r)
+		);
+
 		protected override void ExpectResponse(INodesInfoResponse response)
 		{
 			response.ClusterName.Should().NotBeNullOrWhiteSpace();
@@ -53,7 +53,7 @@ private static void Assert(NodeStatistics nodesMetada)
 			nodesMetada.Successful.Should().BeGreaterThan(0);
 		}
 
-		protected void Assert(Nest.NodeInfo node)
+		protected void Assert(NodeInfo node)
 		{
 			node.Should().NotBeNull();
 			node.Name.Should().NotBeNullOrWhiteSpace();
@@ -129,7 +129,7 @@ protected void Assert(NodeInfoTransport transport)
 			transport.PublishAddress.Should().NotBeNullOrWhiteSpace();
 		}
 
-		protected void Assert(Nest.NodeInfoHttp http)
+		protected void Assert(NodeInfoHttp http)
 		{
 			http.Should().NotBeNull();
 			http.BoundAddress.Should().NotBeEmpty();
@@ -139,24 +139,24 @@ protected void Assert(Nest.NodeInfoHttp http)
 
 	public class NodesInfoMissingNodeApiTests : NodesInfoApiTests
 	{
-		public NodesInfoMissingNodeApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly NodeIds Nodes = NodeIds.Parse("_local,x");
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.NodesInfo(f),
-			fluentAsync: (client, f) => client.NodesInfoAsync(f),
-			request: (client, r) => client.NodesInfo(r),
-			requestAsync: (client, r) => client.NodesInfoAsync(r)
-		);
+		public NodesInfoMissingNodeApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
+		protected override Func<NodesInfoDescriptor, INodesInfoRequest> Fluent => n => n.NodeId(Nodes);
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_nodes/_local%2Cx";
 
 		protected override NodesInfoRequest Initializer => new NodesInfoRequest(Nodes);
-		protected override Func<NodesInfoDescriptor, INodesInfoRequest> Fluent => n => n.NodeId(Nodes);
+		protected override string UrlPath => "/_nodes/_local%2Cx";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.NodesInfo(f),
+			(client, f) => client.NodesInfoAsync(f),
+			(client, r) => client.NodesInfo(r),
+			(client, r) => client.NodesInfoAsync(r)
+		);
 
 		protected override void ExpectResponse(INodesInfoResponse response)
 		{
diff --git a/src/Tests/Tests/Cluster/NodesInfo/NodesInfoUrlTests.cs b/src/Tests/Tests/Cluster/NodesInfo/NodesInfoUrlTests.cs
index bea882d615f..9fd6aba8b58 100644
--- a/src/Tests/Tests/Cluster/NodesInfo/NodesInfoUrlTests.cs
+++ b/src/Tests/Tests/Cluster/NodesInfo/NodesInfoUrlTests.cs
@@ -12,32 +12,32 @@ public class NodesInfoUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_nodes")
-				.Fluent(c => c.NodesInfo())
-				.Request(c => c.NodesInfo(new NodesInfoRequest()))
-				.FluentAsync(c => c.NodesInfoAsync())
-				.RequestAsync(c => c.NodesInfoAsync(new NodesInfoRequest()))
+					.Fluent(c => c.NodesInfo())
+					.Request(c => c.NodesInfo(new NodesInfoRequest()))
+					.FluentAsync(c => c.NodesInfoAsync())
+					.RequestAsync(c => c.NodesInfoAsync(new NodesInfoRequest()))
 				;
 
 			await GET("/_nodes/foo")
-				.Fluent(c => c.NodesInfo(n => n.NodeId("foo")))
-				.Request(c => c.NodesInfo(new NodesInfoRequest("foo")))
-				.FluentAsync(c => c.NodesInfoAsync(n => n.NodeId("foo")))
-				.RequestAsync(c => c.NodesInfoAsync(new NodesInfoRequest("foo")))
+					.Fluent(c => c.NodesInfo(n => n.NodeId("foo")))
+					.Request(c => c.NodesInfo(new NodesInfoRequest("foo")))
+					.FluentAsync(c => c.NodesInfoAsync(n => n.NodeId("foo")))
+					.RequestAsync(c => c.NodesInfoAsync(new NodesInfoRequest("foo")))
 				;
 
 			var metrics = NodesInfoMetric.Http | NodesInfoMetric.Jvm;
 			await GET("/_nodes/jvm%2Chttp")
-				.Fluent(c => c.NodesInfo(p=>p.Metric(metrics)))
-				.Request(c => c.NodesInfo(new NodesInfoRequest(metrics)))
-				.FluentAsync(c => c.NodesInfoAsync(p=>p.Metric(metrics)))
-				.RequestAsync(c => c.NodesInfoAsync(new NodesInfoRequest(metrics)))
+					.Fluent(c => c.NodesInfo(p => p.Metric(metrics)))
+					.Request(c => c.NodesInfo(new NodesInfoRequest(metrics)))
+					.FluentAsync(c => c.NodesInfoAsync(p => p.Metric(metrics)))
+					.RequestAsync(c => c.NodesInfoAsync(new NodesInfoRequest(metrics)))
 				;
 
 			await GET("/_nodes/foo/jvm%2Chttp")
-				.Fluent(c => c.NodesInfo(n => n.NodeId("foo").Metric(metrics)))
-				.Request(c => c.NodesInfo(new NodesInfoRequest("foo", metrics)))
-				.FluentAsync(c => c.NodesInfoAsync(n => n.NodeId("foo").Metric(metrics)))
-				.RequestAsync(c => c.NodesInfoAsync(new NodesInfoRequest("foo", metrics)))
+					.Fluent(c => c.NodesInfo(n => n.NodeId("foo").Metric(metrics)))
+					.Request(c => c.NodesInfo(new NodesInfoRequest("foo", metrics)))
+					.FluentAsync(c => c.NodesInfoAsync(n => n.NodeId("foo").Metric(metrics)))
+					.RequestAsync(c => c.NodesInfoAsync(new NodesInfoRequest("foo", metrics)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/NodesStats/NodesStatsApiTests.cs b/src/Tests/Tests/Cluster/NodesStats/NodesStatsApiTests.cs
index 07a26f0120a..4c7c59892c4 100644
--- a/src/Tests/Tests/Cluster/NodesStats/NodesStatsApiTests.cs
+++ b/src/Tests/Tests/Cluster/NodesStats/NodesStatsApiTests.cs
@@ -8,27 +8,27 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.NodesStats
 {
 	//TODO: re-evaluate which numerics are safe to assert greater then 0 and add better error messages so we can see which numeric assertion fails on CI.
-	public class NodesStatsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, INodesStatsResponse, INodesStatsRequest, NodesStatsDescriptor, NodesStatsRequest>
+	public class NodesStatsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, INodesStatsResponse, INodesStatsRequest, NodesStatsDescriptor, NodesStatsRequest>
 	{
 		public NodesStatsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.NodesStats(),
-			fluentAsync: (client, f) => client.NodesStatsAsync(),
-			request: (client, r) => client.NodesStats(r),
-			requestAsync: (client, r) => client.NodesStatsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_nodes/stats";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.NodesStats(),
+			(client, f) => client.NodesStatsAsync(),
+			(client, r) => client.NodesStats(r),
+			(client, r) => client.NodesStatsAsync(r)
+		);
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			// performing a bunch of search actions to make sure some stats have been gathered
@@ -75,15 +75,8 @@ protected void Assert(NodeIngestStats nodeIngestStats)
 			nodeIngestStats.Pipelines.Should().NotBeNull();
 		}
 
-		protected void Assert(IReadOnlyDictionary<string, AdaptiveSelectionStats> adaptiveSelectionStats)
-		{
-			adaptiveSelectionStats.Should().NotBeNull(); //.And.NotBeEmpty();
-			// TODO: for the single node case, this is empty. Should it be?
-			//	var nodeSelectionStats = adaptiveSelectionStats.First().Value;
-			//	nodeSelectionStats.Rank.Should().NotBeNullOrWhiteSpace();
-			//	nodeSelectionStats.AverageResponseTimeInNanoseconds.Should().BeGreaterThan(0);
-			//	nodeSelectionStats.AverageServiceTimeInNanoseconds.Should().BeGreaterThan(0);
-		}
+		protected void Assert(IReadOnlyDictionary<string, AdaptiveSelectionStats> adaptiveSelectionStats) =>
+			adaptiveSelectionStats.Should().NotBeNull();
 
 		protected void Assert(NodeStats node)
 		{
@@ -168,25 +161,11 @@ protected void Assert(ProcessStats process)
 			//process.Memory.TotalVirtualInBytes.Should().BeGreaterThan(0);
 		}
 
-		protected void Assert(ScriptStats script)
-		{
-			script.Should().NotBeNull();
-		}
+		protected void Assert(ScriptStats script) => script.Should().NotBeNull();
 
-		protected void Assert(TransportStats transport)
-		{
-			transport.Should().NotBeNull();
-			//transport.RXCount.Should().BeGreaterThan(0);
-			//transport.RXSizeInBytes.Should().BeGreaterThan(0);
-			//transport.TXCount.Should().BeGreaterThan(0);
-			//transport.TXSizeInBytes.Should().BeGreaterThan(0);
-		}
+		protected void Assert(TransportStats transport) => transport.Should().NotBeNull();
 
-		protected void Assert(HttpStats http)
-		{
-			http.Should().NotBeNull();
-			//http.TotalOpened.Should().BeGreaterThan(0);
-		}
+		protected void Assert(HttpStats http) => http.Should().NotBeNull();
 
 		protected void Assert(Dictionary<string, BreakerStats> breakers)
 		{
@@ -242,7 +221,7 @@ protected void Assert(NodeJvmStats jvm)
 
 			jvm.GarbageCollection.Should().NotBeNull();
 			jvm.GarbageCollection.Collectors.Should().NotBeEmpty().And.ContainKey("young");
-			var youngGc=  jvm.GarbageCollection.Collectors["young"];
+			var youngGc = jvm.GarbageCollection.Collectors["young"];
 			youngGc.Should().NotBeNull();
 			//youngGc.CollectionCount.Should().BeGreaterThan(0);
 			//youngGc.CollectionTimeInMilliseconds.Should().BeGreaterThan(0);
diff --git a/src/Tests/Tests/Cluster/NodesStats/NodesStatsUrlTests.cs b/src/Tests/Tests/Cluster/NodesStats/NodesStatsUrlTests.cs
index d3385476ab5..ee1f391b62f 100644
--- a/src/Tests/Tests/Cluster/NodesStats/NodesStatsUrlTests.cs
+++ b/src/Tests/Tests/Cluster/NodesStats/NodesStatsUrlTests.cs
@@ -12,47 +12,47 @@ public class NodesStatsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_nodes/stats")
-				.Fluent(c => c.NodesStats())
-				.Request(c => c.NodesStats(new NodesStatsRequest()))
-				.FluentAsync(c => c.NodesStatsAsync())
-				.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest()))
+					.Fluent(c => c.NodesStats())
+					.Request(c => c.NodesStats(new NodesStatsRequest()))
+					.FluentAsync(c => c.NodesStatsAsync())
+					.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest()))
 				;
 
 			await GET("/_nodes/foo/stats")
-				.Fluent(c => c.NodesStats(n => n.NodeId("foo")))
-				.Request(c => c.NodesStats(new NodesStatsRequest("foo")))
-				.FluentAsync(c => c.NodesStatsAsync(n => n.NodeId("foo")))
-				.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest("foo")))
+					.Fluent(c => c.NodesStats(n => n.NodeId("foo")))
+					.Request(c => c.NodesStats(new NodesStatsRequest("foo")))
+					.FluentAsync(c => c.NodesStatsAsync(n => n.NodeId("foo")))
+					.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest("foo")))
 				;
 
 			var metrics = NodesStatsMetric.Fs | NodesStatsMetric.Jvm;
 			await GET("/_nodes/stats/fs%2Cjvm")
-				.Fluent(c => c.NodesStats(p=>p.Metric(metrics)))
-				.Request(c => c.NodesStats(new NodesStatsRequest(metrics)))
-				.FluentAsync(c => c.NodesStatsAsync(p=>p.Metric(metrics)))
-				.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest(metrics)))
+					.Fluent(c => c.NodesStats(p => p.Metric(metrics)))
+					.Request(c => c.NodesStats(new NodesStatsRequest(metrics)))
+					.FluentAsync(c => c.NodesStatsAsync(p => p.Metric(metrics)))
+					.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest(metrics)))
 				;
 
 			await GET("/_nodes/foo/stats/fs%2Cjvm")
-				.Fluent(c => c.NodesStats(p=>p.NodeId("foo").Metric(metrics)))
-				.Request(c => c.NodesStats(new NodesStatsRequest("foo", metrics)))
-				.FluentAsync(c => c.NodesStatsAsync(p=>p.NodeId("foo").Metric(metrics)))
-				.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest("foo", metrics)))
+					.Fluent(c => c.NodesStats(p => p.NodeId("foo").Metric(metrics)))
+					.Request(c => c.NodesStats(new NodesStatsRequest("foo", metrics)))
+					.FluentAsync(c => c.NodesStatsAsync(p => p.NodeId("foo").Metric(metrics)))
+					.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest("foo", metrics)))
 				;
 
 			var indexMetrics = NodesStatsIndexMetric.Fielddata | NodesStatsIndexMetric.Merge;
 			await GET("/_nodes/stats/fs%2Cjvm/fielddata%2Cmerge")
-				.Fluent(c => c.NodesStats(p=>p.Metric(metrics).IndexMetric(indexMetrics)))
-				.Request(c => c.NodesStats(new NodesStatsRequest(metrics, indexMetrics)))
-				.FluentAsync(c => c.NodesStatsAsync(p=>p.Metric(metrics).IndexMetric(indexMetrics)))
-				.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest(metrics, indexMetrics)))
+					.Fluent(c => c.NodesStats(p => p.Metric(metrics).IndexMetric(indexMetrics)))
+					.Request(c => c.NodesStats(new NodesStatsRequest(metrics, indexMetrics)))
+					.FluentAsync(c => c.NodesStatsAsync(p => p.Metric(metrics).IndexMetric(indexMetrics)))
+					.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest(metrics, indexMetrics)))
 				;
 
 			await GET("/_nodes/foo/stats/fs%2Cjvm/fielddata%2Cmerge")
-				.Fluent(c => c.NodesStats(p=>p.NodeId("foo").Metric(metrics).IndexMetric(indexMetrics)))
-				.Request(c => c.NodesStats(new NodesStatsRequest("foo", metrics, indexMetrics)))
-				.FluentAsync(c => c.NodesStatsAsync(p=>p.NodeId("foo").Metric(metrics).IndexMetric(indexMetrics)))
-				.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest("foo", metrics, indexMetrics)))
+					.Fluent(c => c.NodesStats(p => p.NodeId("foo").Metric(metrics).IndexMetric(indexMetrics)))
+					.Request(c => c.NodesStats(new NodesStatsRequest("foo", metrics, indexMetrics)))
+					.FluentAsync(c => c.NodesStatsAsync(p => p.NodeId("foo").Metric(metrics).IndexMetric(indexMetrics)))
+					.RequestAsync(c => c.NodesStatsAsync(new NodesStatsRequest("foo", metrics, indexMetrics)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/NodesUsage/NodesUsageApiTests.cs b/src/Tests/Tests/Cluster/NodesUsage/NodesUsageApiTests.cs
index 0bed44bd76d..cac2be80aae 100644
--- a/src/Tests/Tests/Cluster/NodesUsage/NodesUsageApiTests.cs
+++ b/src/Tests/Tests/Cluster/NodesUsage/NodesUsageApiTests.cs
@@ -7,25 +7,26 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Cluster.NodesUsage
 {
-	public class NodesUsageApiTests : ApiIntegrationTestBase<ReadOnlyCluster, INodesUsageResponse, INodesUsageRequest, NodesUsageDescriptor, NodesUsageRequest>
+	public class NodesUsageApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, INodesUsageResponse, INodesUsageRequest, NodesUsageDescriptor, NodesUsageRequest>
 	{
 		public NodesUsageApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.NodesUsage(),
-			fluentAsync: (client, f) => client.NodesUsageAsync(),
-			request: (client, r) => client.NodesUsage(r),
-			requestAsync: (client, r) => client.NodesUsageAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_nodes/usage";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.NodesUsage(),
+			(client, f) => client.NodesUsageAsync(),
+			(client, r) => client.NodesUsage(r),
+			(client, r) => client.NodesUsageAsync(r)
+		);
+
 		protected override void ExpectResponse(INodesUsageResponse response)
 		{
 			response.ClusterName.Should().NotBeEmpty();
@@ -43,5 +44,4 @@ protected override void ExpectResponse(INodesUsageResponse response)
 			response.Nodes.First().Value.RestActions.Should().NotBeNull();
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Cluster/NodesUsage/NodesUsageUnitTests.cs b/src/Tests/Tests/Cluster/NodesUsage/NodesUsageUnitTests.cs
index e753f531ca2..3e3e6233add 100644
--- a/src/Tests/Tests/Cluster/NodesUsage/NodesUsageUnitTests.cs
+++ b/src/Tests/Tests/Cluster/NodesUsage/NodesUsageUnitTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
-using Tests.Core;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.XPack.DeprecationInfo
 {
@@ -17,27 +15,32 @@ public void ShouldDeserialize()
 			const string nodeId = "pQHNt5rXTTWNvUgOrdynKg";
 			var fixedResponse = new
 			{
-				_nodes = new {
-				total = 1,
-				successful = 1,
-				failed = 0
-			},
-			cluster_name = "my_cluster",
-			nodes = new Dictionary<string, object>{{
-				nodeId, new {
-					timestamp = 1492553961812,
-					since = 1492553906606,
-					rest_actions = new Dictionary<string, object>
+				_nodes = new
+				{
+					total = 1,
+					successful = 1,
+					failed = 0
+				},
+				cluster_name = "my_cluster",
+				nodes = new Dictionary<string, object>
+				{
 					{
-						{ "org.elasticsearch.rest.action.admin.cluster.RestNodesUsageAction", 1},
-						{ "org.elasticsearch.rest.action.admin.indices.RestCreateIndexAction", 1},
-						{ "org.elasticsearch.rest.action.document.RestGetAction", 1},
-						{ "org.elasticsearch.rest.action.search.RestSearchAction", 19},
-						{ "org.elasticsearch.rest.action.admin.cluster.RestNodesInfoAction", 36}
+						nodeId, new
+						{
+							timestamp = 1492553961812,
+							since = 1492553906606,
+							rest_actions = new Dictionary<string, object>
+							{
+								{ "org.elasticsearch.rest.action.admin.cluster.RestNodesUsageAction", 1 },
+								{ "org.elasticsearch.rest.action.admin.indices.RestCreateIndexAction", 1 },
+								{ "org.elasticsearch.rest.action.document.RestGetAction", 1 },
+								{ "org.elasticsearch.rest.action.search.RestSearchAction", 19 },
+								{ "org.elasticsearch.rest.action.admin.cluster.RestNodesInfoAction", 36 }
+							}
+						}
 					}
 				}
-				}
-			}};
+			};
 
 			var client = FixedResponseClient.Create(fixedResponse);
 
diff --git a/src/Tests/Tests/Cluster/NodesUsage/NodesUsageUrlTests.cs b/src/Tests/Tests/Cluster/NodesUsage/NodesUsageUrlTests.cs
index 29b68b92c94..f26ee2d959d 100644
--- a/src/Tests/Tests/Cluster/NodesUsage/NodesUsageUrlTests.cs
+++ b/src/Tests/Tests/Cluster/NodesUsage/NodesUsageUrlTests.cs
@@ -3,7 +3,6 @@
 using Elasticsearch.Net;
 using Nest;
 using Tests.Framework;
-using static Nest.Infer;
 using static Tests.Framework.UrlTester;
 
 namespace Tests.XPack.NodesUsage
@@ -13,31 +12,31 @@ public class NodesUsageUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_nodes/usage")
-				.Fluent(c => c.NodesUsage(d => d))
-				.Request(c => c.NodesUsage(new NodesUsageRequest()))
-				.FluentAsync(c => c.NodesUsageAsync(d => d))
-				.RequestAsync(c => c.NodesUsageAsync(new NodesUsageRequest()))
+					.Fluent(c => c.NodesUsage(d => d))
+					.Request(c => c.NodesUsage(new NodesUsageRequest()))
+					.FluentAsync(c => c.NodesUsageAsync(d => d))
+					.RequestAsync(c => c.NodesUsageAsync(new NodesUsageRequest()))
 				;
 
 			await GET("/_nodes/nodeId/usage")
-				.Fluent(c => c.NodesUsage(d => d.NodeId("nodeId")))
-				.Request(c => c.NodesUsage(new NodesUsageRequest("nodeId")))
-				.FluentAsync(c => c.NodesUsageAsync(d => d.NodeId("nodeId")))
-				.RequestAsync(c => c.NodesUsageAsync(new NodesUsageRequest("nodeId")))
+					.Fluent(c => c.NodesUsage(d => d.NodeId("nodeId")))
+					.Request(c => c.NodesUsage(new NodesUsageRequest("nodeId")))
+					.FluentAsync(c => c.NodesUsageAsync(d => d.NodeId("nodeId")))
+					.RequestAsync(c => c.NodesUsageAsync(new NodesUsageRequest("nodeId")))
 				;
 
 			await GET("/_nodes/nodeId/usage/rest_actions")
-				.Fluent(c => c.NodesUsage(d => d.NodeId("nodeId").Metric(NodesUsageMetric.RestActions)))
-				.Request(c => c.NodesUsage(new NodesUsageRequest("nodeId", NodesUsageMetric.RestActions)))
-				.FluentAsync(c => c.NodesUsageAsync(d => d.NodeId("nodeId").Metric(NodesUsageMetric.RestActions)))
-				.RequestAsync(c => c.NodesUsageAsync(new NodesUsageRequest("nodeId", NodesUsageMetric.RestActions)))
+					.Fluent(c => c.NodesUsage(d => d.NodeId("nodeId").Metric(NodesUsageMetric.RestActions)))
+					.Request(c => c.NodesUsage(new NodesUsageRequest("nodeId", NodesUsageMetric.RestActions)))
+					.FluentAsync(c => c.NodesUsageAsync(d => d.NodeId("nodeId").Metric(NodesUsageMetric.RestActions)))
+					.RequestAsync(c => c.NodesUsageAsync(new NodesUsageRequest("nodeId", NodesUsageMetric.RestActions)))
 				;
 
 			await GET("/_nodes/nodeId/usage/_all")
-				.Fluent(c => c.NodesUsage(d => d.NodeId("nodeId").Metric(NodesUsageMetric.All)))
-				.Request(c => c.NodesUsage(new NodesUsageRequest("nodeId", NodesUsageMetric.All)))
-				.FluentAsync(c => c.NodesUsageAsync(d => d.NodeId("nodeId").Metric(NodesUsageMetric.All)))
-				.RequestAsync(c => c.NodesUsageAsync(new NodesUsageRequest("nodeId", NodesUsageMetric.All)))
+					.Fluent(c => c.NodesUsage(d => d.NodeId("nodeId").Metric(NodesUsageMetric.All)))
+					.Request(c => c.NodesUsage(new NodesUsageRequest("nodeId", NodesUsageMetric.All)))
+					.FluentAsync(c => c.NodesUsageAsync(d => d.NodeId("nodeId").Metric(NodesUsageMetric.All)))
+					.RequestAsync(c => c.NodesUsageAsync(new NodesUsageRequest("nodeId", NodesUsageMetric.All)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/Ping/PingApiTests.cs b/src/Tests/Tests/Cluster/Ping/PingApiTests.cs
index 74be7b9e0d9..48dcad0e292 100644
--- a/src/Tests/Tests/Cluster/Ping/PingApiTests.cs
+++ b/src/Tests/Tests/Cluster/Ping/PingApiTests.cs
@@ -3,26 +3,23 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.Ping
 {
 	public class PingApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IPingResponse, IPingRequest, PingDescriptor, PingRequest>
 	{
 		public PingApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Ping(),
-			fluentAsync: (client, f) => client.PingAsync(),
-			request: (client, r) => client.Ping(r),
-			requestAsync: (client, r) => client.PingAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
 		protected override string UrlPath => "/";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Ping(),
+			(client, f) => client.PingAsync(),
+			(client, r) => client.Ping(r),
+			(client, r) => client.PingAsync(r)
+		);
 	}
-
 }
diff --git a/src/Tests/Tests/Cluster/Ping/PingUrlTests.cs b/src/Tests/Tests/Cluster/Ping/PingUrlTests.cs
index d5d2c9dfb7f..6e5b90d9cf2 100644
--- a/src/Tests/Tests/Cluster/Ping/PingUrlTests.cs
+++ b/src/Tests/Tests/Cluster/Ping/PingUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cluster.Ping
 {
 	public class PingUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await HEAD("/")
-				.Fluent(c => c.Ping())
-				.Request(c => c.Ping(new PingRequest()))
-				.FluentAsync(c => c.PingAsync())
-				.RequestAsync(c => c.PingAsync(new PingRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await HEAD("/")
+			.Fluent(c => c.Ping())
+			.Request(c => c.Ping(new PingRequest()))
+			.FluentAsync(c => c.PingAsync())
+			.RequestAsync(c => c.PingAsync(new PingRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cluster/RemoteInfo/RemoteInfoApiTests.cs b/src/Tests/Tests/Cluster/RemoteInfo/RemoteInfoApiTests.cs
index b0c50bfd342..b3cbb8a8aec 100644
--- a/src/Tests/Tests/Cluster/RemoteInfo/RemoteInfoApiTests.cs
+++ b/src/Tests/Tests/Cluster/RemoteInfo/RemoteInfoApiTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
@@ -7,30 +6,47 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using M = System.Collections.Generic.Dictionary<string, object>;
 using static Nest.Infer;
 
 namespace Tests.Cluster.RemoteInfo
 {
-	public class RemoteInfoApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IRemoteInfoResponse, IRemoteInfoRequest, RemoteInfoDescriptor, RemoteInfoRequest>
+	public class RemoteInfoApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IRemoteInfoResponse, IRemoteInfoRequest, RemoteInfoDescriptor, RemoteInfoRequest>
 	{
+		public RemoteInfoApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override string UrlPath => "/_remote/info";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			var enableRemoteClusters = client.ClusterPutSettings(new ClusterPutSettingsRequest
 			{
 				Transient = new M
 				{
-					{ "search", new M {
-						{ "remote", new M {
-							{ "cluster_one", new M {
-								{"seeds", new[] {"127.0.0.1:9300", "127.0.0.1:9301"}}
-							}},
-							{ "cluster_two", new M {
-								{"seeds", new[] {"127.0.0.1:9300"}}
-							}}
-						}}
+					{
+						"search", new M
+						{
+							{
+								"remote", new M
+								{
+									{
+										"cluster_one", new M
+										{
+											{ "seeds", new[] { "127.0.0.1:9300", "127.0.0.1:9301" } }
+										}
+									},
+									{
+										"cluster_two", new M
+										{
+											{ "seeds", new[] { "127.0.0.1:9300" } }
+										}
+									}
+								}
+							}
 						}
 					}
 				}
@@ -41,29 +57,22 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			remoteSearch.ShouldBeValid();
 		}
 
-		public RemoteInfoApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.RemoteInfo(),
-			fluentAsync: (client, f) => client.RemoteInfoAsync(),
-			request: (client, r) => client.RemoteInfo(r),
-			requestAsync: (client, r) => client.RemoteInfoAsync(r)
+			(client, f) => client.RemoteInfo(),
+			(client, f) => client.RemoteInfoAsync(),
+			(client, r) => client.RemoteInfo(r),
+			(client, r) => client.RemoteInfoAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_remote/info";
-
 		protected override void ExpectResponse(IRemoteInfoResponse response)
 		{
-			response.Remotes.Should().NotBeEmpty().And.HaveCount(2)
+			response.Remotes.Should()
+				.NotBeEmpty()
+				.And.HaveCount(2)
 				.And.ContainKey("cluster_one")
 				.And.ContainKey("cluster_two");
 
-			foreach(var remote in response.Remotes.Values)
+			foreach (var remote in response.Remotes.Values)
 			{
 				remote.Connected.Should().BeTrue();
 				remote.HttpAddresses.Should().NotBeNullOrEmpty();
diff --git a/src/Tests/Tests/Cluster/RemoteInfo/RemoteInfoUrlTests.cs b/src/Tests/Tests/Cluster/RemoteInfo/RemoteInfoUrlTests.cs
index 9a8d1a04d02..8513a369640 100644
--- a/src/Tests/Tests/Cluster/RemoteInfo/RemoteInfoUrlTests.cs
+++ b/src/Tests/Tests/Cluster/RemoteInfo/RemoteInfoUrlTests.cs
@@ -8,15 +8,10 @@ namespace Tests.Cluster.RemoteInfo
 {
 	public class RemoteInfoUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_remote/info")
-				.Fluent(c => c.RemoteInfo())
-				.Request(c => c.RemoteInfo(new RemoteInfoRequest()))
-				.FluentAsync(c => c.RemoteInfoAsync())
-				.RequestAsync(c => c.RemoteInfoAsync(new RemoteInfoRequest()))
-				;
-
-		}
+		[U] public override async Task Urls() => await GET("/_remote/info")
+			.Fluent(c => c.RemoteInfo())
+			.Request(c => c.RemoteInfo(new RemoteInfoRequest()))
+			.FluentAsync(c => c.RemoteInfoAsync())
+			.RequestAsync(c => c.RemoteInfoAsync(new RemoteInfoRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cluster/RootNodeInfo/RootNodeInfoApiTests.cs b/src/Tests/Tests/Cluster/RootNodeInfo/RootNodeInfoApiTests.cs
index 6104db74c58..931bd38c6dc 100644
--- a/src/Tests/Tests/Cluster/RootNodeInfo/RootNodeInfoApiTests.cs
+++ b/src/Tests/Tests/Cluster/RootNodeInfo/RootNodeInfoApiTests.cs
@@ -4,26 +4,26 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.RootNodeInfo
 {
-	public class RootNodeInfoApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IRootNodeInfoResponse, IRootNodeInfoRequest, RootNodeInfoDescriptor, RootNodeInfoRequest>
+	public class RootNodeInfoApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IRootNodeInfoResponse, IRootNodeInfoRequest, RootNodeInfoDescriptor, RootNodeInfoRequest>
 	{
 		public RootNodeInfoApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.RootNodeInfo(),
-			fluentAsync: (client, f) => client.RootNodeInfoAsync(),
-			request: (client, r) => client.RootNodeInfo(r),
-			requestAsync: (client, r) => client.RootNodeInfoAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.RootNodeInfo(),
+			(client, f) => client.RootNodeInfoAsync(),
+			(client, r) => client.RootNodeInfo(r),
+			(client, r) => client.RootNodeInfoAsync(r)
+		);
+
 		protected override void ExpectResponse(IRootNodeInfoResponse response)
 		{
 			response.Version.Should().NotBeNull();
diff --git a/src/Tests/Tests/Cluster/RootNodeInfo/RootNodeInfoUrlTests.cs b/src/Tests/Tests/Cluster/RootNodeInfo/RootNodeInfoUrlTests.cs
index 787a7bcfa43..6e1731b963f 100644
--- a/src/Tests/Tests/Cluster/RootNodeInfo/RootNodeInfoUrlTests.cs
+++ b/src/Tests/Tests/Cluster/RootNodeInfo/RootNodeInfoUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Cluster.RootNodeInfo
 {
 	public class RootNodeInfoUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/")
-				.Fluent(c => c.RootNodeInfo())
-				.Request(c => c.RootNodeInfo(new RootNodeInfoRequest()))
-				.FluentAsync(c => c.RootNodeInfoAsync())
-				.RequestAsync(c => c.RootNodeInfoAsync(new RootNodeInfoRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/")
+			.Fluent(c => c.RootNodeInfo())
+			.Request(c => c.RootNodeInfo(new RootNodeInfoRequest()))
+			.FluentAsync(c => c.RootNodeInfoAsync())
+			.RequestAsync(c => c.RootNodeInfoAsync(new RootNodeInfoRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs b/src/Tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs
index 3f81b0edc0c..2448391b094 100644
--- a/src/Tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs
+++ b/src/Tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -8,31 +7,30 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.TaskManagement.GetTask
 {
 	public class GetTaskApiTests : ApiIntegrationTestBase<WritableCluster, IGetTaskResponse, IGetTaskRequest, GetTaskDescriptor, GetTaskRequest>
 	{
-		public GetTaskApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetTask(_taskId, f),
-			fluentAsync: (client, f) => client.GetTaskAsync(_taskId, f),
-			request: (client, r) => client.GetTask(r),
-			requestAsync: (client, r) => client.GetTaskAsync(r)
-		);
-
 		private static TaskId _taskId = new TaskId("fakeid:1");
 
+		public GetTaskApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_tasks/fakeid%3A1";
 
 		protected override Func<GetTaskDescriptor, IGetTaskRequest> Fluent => s => s;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override GetTaskRequest Initializer => new GetTaskRequest(_taskId);
+		protected override string UrlPath => $"/_tasks/fakeid%3A1";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetTask(_taskId, f),
+			(client, f) => client.GetTaskAsync(_taskId, f),
+			(client, r) => client.GetTask(r),
+			(client, r) => client.GetTaskAsync(r)
+		);
 
 		protected override void ExpectResponse(IGetTaskResponse response)
 		{
diff --git a/src/Tests/Tests/Cluster/TaskManagement/GetTask/GetTaskUrlTests.cs b/src/Tests/Tests/Cluster/TaskManagement/GetTask/GetTaskUrlTests.cs
index c2722548843..5fe95e398ee 100644
--- a/src/Tests/Tests/Cluster/TaskManagement/GetTask/GetTaskUrlTests.cs
+++ b/src/Tests/Tests/Cluster/TaskManagement/GetTask/GetTaskUrlTests.cs
@@ -12,10 +12,10 @@ [U] public override async Task Urls()
 			var id = new TaskId("fakeid:1");
 
 			await UrlTester.GET($"/_tasks/fakeid%3A1")
-				.Fluent(c => c.GetTask(id))
-				.Request(c => c.GetTask(new GetTaskRequest(id)))
-				.FluentAsync(c => c.GetTaskAsync(id))
-				.RequestAsync(c => c.GetTaskAsync(new GetTaskRequest(id)))
+					.Fluent(c => c.GetTask(id))
+					.Request(c => c.GetTask(new GetTaskRequest(id)))
+					.FluentAsync(c => c.GetTaskAsync(id))
+					.RequestAsync(c => c.GetTaskAsync(new GetTaskRequest(id)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/TaskManagement/TasksCancel/TasksCancelApiTests.cs b/src/Tests/Tests/Cluster/TaskManagement/TasksCancel/TasksCancelApiTests.cs
index 9718673e357..25108589848 100644
--- a/src/Tests/Tests/Cluster/TaskManagement/TasksCancel/TasksCancelApiTests.cs
+++ b/src/Tests/Tests/Cluster/TaskManagement/TasksCancel/TasksCancelApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -8,22 +7,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Cluster.TaskManagement.TasksCancel
 {
-	public class TasksCancelApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, ICancelTasksResponse, ICancelTasksRequest, CancelTasksDescriptor, CancelTasksRequest>
+	public class TasksCancelApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, ICancelTasksResponse, ICancelTasksRequest, CancelTasksDescriptor, CancelTasksRequest>
 	{
-		private TaskId TaskId => this.RanIntegrationSetup ? this.ExtendedValue<TaskId>("taskId") : "foo:1";
+		public TasksCancelApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		private class Test
-		{
-			public long Id { get; set; }
-			public string Flag { get; set; }
-		}
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
 
-		public TasksCancelApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<CancelTasksDescriptor, ICancelTasksRequest> Fluent => d => d
+			.TaskId(TaskId);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected override CancelTasksRequest Initializer => new CancelTasksRequest(TaskId);
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_tasks/{U(TaskId.ToString())}/_cancel";
+		private TaskId TaskId => RanIntegrationSetup ? ExtendedValue<TaskId>("taskId") : "foo:1";
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
@@ -49,31 +53,26 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				values.ExtendedValue("taskId", taskId);
 			}
 		}
+
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CancelTasks(f),
-			fluentAsync: (client, f) => client.CancelTasksAsync(f),
-			request: (client, r) => client.CancelTasks(r),
-			requestAsync: (client, r) => client.CancelTasksAsync(r)
+			(client, f) => client.CancelTasks(f),
+			(client, f) => client.CancelTasksAsync(f),
+			(client, r) => client.CancelTasks(r),
+			(client, r) => client.CancelTasksAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_tasks/{U(this.TaskId.ToString())}/_cancel";
-		protected override bool SupportsDeserialization => false;
-
-
-		protected override Func<CancelTasksDescriptor, ICancelTasksRequest> Fluent => d => d
-			.TaskId(this.TaskId);
-
-		protected override CancelTasksRequest Initializer => new CancelTasksRequest(this.TaskId);
-
 		protected override void ExpectResponse(ICancelTasksResponse response)
 		{
 			response.NodeFailures.Should().BeNullOrEmpty();
 			response.Nodes.Should().NotBeEmpty();
 			var tasks = response.Nodes.First().Value.Tasks;
-			tasks.Should().NotBeEmpty().And.ContainKey(this.TaskId);
+			tasks.Should().NotBeEmpty().And.ContainKey(TaskId);
+		}
+
+		private class Test
+		{
+			public string Flag { get; set; }
+			public long Id { get; set; }
 		}
 	}
 }
diff --git a/src/Tests/Tests/Cluster/TaskManagement/TasksCancel/TasksCancelUrlTests.cs b/src/Tests/Tests/Cluster/TaskManagement/TasksCancel/TasksCancelUrlTests.cs
index 8a72709e7c5..e91619267b7 100644
--- a/src/Tests/Tests/Cluster/TaskManagement/TasksCancel/TasksCancelUrlTests.cs
+++ b/src/Tests/Tests/Cluster/TaskManagement/TasksCancel/TasksCancelUrlTests.cs
@@ -11,27 +11,27 @@ public class TasksCancelUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/_tasks/_cancel")
-				.Fluent(c => c.CancelTasks())
-				.Request(c => c.CancelTasks(new CancelTasksRequest()))
-				.FluentAsync(c => c.CancelTasksAsync())
-				.RequestAsync(c => c.CancelTasksAsync(new CancelTasksRequest()))
+					.Fluent(c => c.CancelTasks())
+					.Request(c => c.CancelTasks(new CancelTasksRequest()))
+					.FluentAsync(c => c.CancelTasksAsync())
+					.RequestAsync(c => c.CancelTasksAsync(new CancelTasksRequest()))
 				;
 
 			var taskId = "node:4";
 			await POST($"/_tasks/node%3A4/_cancel")
-				.Fluent(c => c.CancelTasks(t=>t.TaskId(taskId)))
-				.Request(c => c.CancelTasks(new CancelTasksRequest(taskId)))
-				.FluentAsync(c => c.CancelTasksAsync(t=>t.TaskId(taskId)))
-				.RequestAsync(c => c.CancelTasksAsync(new CancelTasksRequest(taskId)))
+					.Fluent(c => c.CancelTasks(t => t.TaskId(taskId)))
+					.Request(c => c.CancelTasks(new CancelTasksRequest(taskId)))
+					.FluentAsync(c => c.CancelTasksAsync(t => t.TaskId(taskId)))
+					.RequestAsync(c => c.CancelTasksAsync(new CancelTasksRequest(taskId)))
 				;
 
-			var nodes = new []{  "node1", "node2" };
+			var nodes = new[] { "node1", "node2" };
 			var actions = new[] { "*reindex" };
 			await POST($"/_tasks/_cancel?nodes=node1%2Cnode2&actions=%2Areindex")
-				.Fluent(c => c.CancelTasks(t => t.Nodes(nodes).Actions(actions)))
-				.Request(c => c.CancelTasks(new CancelTasksRequest { Nodes = nodes, Actions = actions }))
-				.FluentAsync(c => c.CancelTasksAsync(t => t.Nodes(nodes).Actions(actions)))
-				.RequestAsync(c => c.CancelTasksAsync(new CancelTasksRequest { Nodes = nodes, Actions = actions }))
+					.Fluent(c => c.CancelTasks(t => t.Nodes(nodes).Actions(actions)))
+					.Request(c => c.CancelTasks(new CancelTasksRequest { Nodes = nodes, Actions = actions }))
+					.FluentAsync(c => c.CancelTasksAsync(t => t.Nodes(nodes).Actions(actions)))
+					.RequestAsync(c => c.CancelTasksAsync(new CancelTasksRequest { Nodes = nodes, Actions = actions }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs b/src/Tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs
index 5537717c105..0db80668a8f 100644
--- a/src/Tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs
+++ b/src/Tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs
@@ -10,36 +10,36 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
-using Xunit;
-
 
 namespace Tests.Cluster.TaskManagement.TasksList
 {
-	public class TasksListApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IListTasksResponse, IListTasksRequest, ListTasksDescriptor, ListTasksRequest>
+	public class TasksListApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IListTasksResponse, IListTasksRequest, ListTasksDescriptor, ListTasksRequest>
 	{
 		public TasksListApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ListTasks(f),
-			fluentAsync: (client, f) => client.ListTasksAsync(f),
-			request: (client, r) => client.ListTasks(r),
-			requestAsync: (client, r) => client.ListTasksAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_tasks?actions=%2Alists%2A";
 
 		protected override Func<ListTasksDescriptor, IListTasksRequest> Fluent => s => s
 			.Actions("*lists*");
 
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
 		protected override ListTasksRequest Initializer => new ListTasksRequest
 		{
 			Actions = new[] { "*lists*" }
 		};
 
+		protected override string UrlPath => "/_tasks?actions=%2Alists%2A";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ListTasks(f),
+			(client, f) => client.ListTasksAsync(f),
+			(client, r) => client.ListTasks(r),
+			(client, r) => client.ListTasksAsync(r)
+		);
+
 		protected override void ExpectResponse(IListTasksResponse response)
 		{
 			response.Nodes.Should().NotBeEmpty();
@@ -67,21 +67,38 @@ protected override void ExpectResponse(IListTasksResponse response)
 	}
 
 	[SkipVersion("<2.3.0", "")]
-	public class TasksListDetailedApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IListTasksResponse, IListTasksRequest, ListTasksDescriptor, ListTasksRequest>
+	public class TasksListDetailedApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IListTasksResponse, IListTasksRequest, ListTasksDescriptor, ListTasksRequest>
 	{
 		private static TaskId _taskId = new TaskId("fakeid:1");
 
 		public TasksListDetailedApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<ListTasksDescriptor, IListTasksRequest> Fluent => s => s
+			.Detailed();
+
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
+		protected override ListTasksRequest Initializer => new ListTasksRequest()
+		{
+			Detailed = true
+		};
+
+		protected override string UrlPath => $"/_tasks?detailed=true";
+
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ListTasks(f),
-			fluentAsync: (client, f) => client.ListTasksAsync(f),
-			request: (client, r) => client.ListTasks(r),
-			requestAsync: (client, r) => client.ListTasksAsync(r)
+			(client, f) => client.ListTasks(f),
+			(client, f) => client.ListTasksAsync(f),
+			(client, r) => client.ListTasks(r),
+			(client, r) => client.ListTasksAsync(r)
 		);
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			var seeder = new DefaultSeeder(this.Cluster.Client);
+			var seeder = new DefaultSeeder(Cluster.Client);
 			seeder.SeedNode();
 
 			// get a suitable load of projects in order to get a decent task status out
@@ -106,19 +123,6 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			_taskId = response.Task;
 		}
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_tasks?detailed=true";
-
-		protected override Func<ListTasksDescriptor, IListTasksRequest> Fluent => s => s
-			.Detailed();
-
-		protected override ListTasksRequest Initializer => new ListTasksRequest()
-		{
-			Detailed = true
-		};
-
 		protected override void ExpectResponse(IListTasksResponse response)
 		{
 			response.Nodes.Should().NotBeEmpty();
diff --git a/src/Tests/Tests/Cluster/TaskManagement/TasksList/TasksListUrlTests.cs b/src/Tests/Tests/Cluster/TaskManagement/TasksList/TasksListUrlTests.cs
index 9f9a114c342..c34f5c560d9 100644
--- a/src/Tests/Tests/Cluster/TaskManagement/TasksList/TasksListUrlTests.cs
+++ b/src/Tests/Tests/Cluster/TaskManagement/TasksList/TasksListUrlTests.cs
@@ -7,14 +7,10 @@ namespace Tests.Cluster.TaskManagement.TasksList
 {
 	public class TasksListUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await UrlTester.GET("/_tasks")
-				.Fluent(c => c.ListTasks())
-				.Request(c => c.ListTasks(new ListTasksRequest()))
-				.FluentAsync(c => c.ListTasksAsync())
-				.RequestAsync(c => c.ListTasksAsync(new ListTasksRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await UrlTester.GET("/_tasks")
+			.Fluent(c => c.ListTasks())
+			.Request(c => c.ListTasks(new ListTasksRequest()))
+			.FluentAsync(c => c.ListTasksAsync())
+			.RequestAsync(c => c.ListTasksAsync(new ListTasksRequest()));
 	}
 }
diff --git a/src/Tests/Tests/CodeStandards/Analysis.cs b/src/Tests/Tests/CodeStandards/Analysis.cs
index 8fe89906a07..52d07ca9859 100644
--- a/src/Tests/Tests/CodeStandards/Analysis.cs
+++ b/src/Tests/Tests/CodeStandards/Analysis.cs
@@ -14,6 +14,9 @@ namespace Tests.CodeStandards
 	[ProjectReferenceOnly]
 	public class Analysis
 	{
+		private static readonly string[] IgnoreObjectMethods =
+			{ nameof(GetHashCode), nameof(object.Equals), nameof(ToString), nameof(ReferenceEquals), nameof(GetType) };
+
 		/**
 		* Every analyzer interface should attribute properties with JsonPropertyAttribute
 		*/
@@ -68,10 +71,14 @@ [U] public void CharFiltersShouldBeInSync()
 			var analyzeMethods = PublicMethodsOf<AnalyzeCharFiltersDescriptor>(0, nameof(AnalyzeCharFiltersDescriptor.Name));
 			var indexSettingsMethods = PublicMethodsOf<CharFiltersDescriptor>(1, nameof(CharFiltersDescriptor.UserDefined));
 
-			analyzeMethods.Select(a => a.Item1).Should().BeEquivalentTo(indexSettingsMethods.Select(a => a.Item1),
-				"Char filter methods are not in sync");
-			analyzeMethods.Select(a => a.Item2.ParameterType).Should().BeEquivalentTo(indexSettingsMethods.Select(a => a.Item2.ParameterType),
-				"Char filter selector funcs are not in sync");
+			analyzeMethods.Select(a => a.Item1)
+				.Should()
+				.BeEquivalentTo(indexSettingsMethods.Select(a => a.Item1),
+					"Char filter methods are not in sync");
+			analyzeMethods.Select(a => a.Item2.ParameterType)
+				.Should()
+				.BeEquivalentTo(indexSettingsMethods.Select(a => a.Item2.ParameterType),
+					"Char filter selector funcs are not in sync");
 		}
 
 		[U] public void TokenFiltersShouldBeInSync()
@@ -79,10 +86,14 @@ [U] public void TokenFiltersShouldBeInSync()
 			var analyzeMethods = PublicMethodsOf<AnalyzeTokenFiltersDescriptor>(0, nameof(AnalyzeTokenFiltersDescriptor.Name));
 			var indexSettingsMethods = PublicMethodsOf<TokenFiltersDescriptor>(1, nameof(TokenFiltersDescriptor.UserDefined));
 
-			analyzeMethods.Select(a => a.Item1).Should().BeEquivalentTo(indexSettingsMethods.Select(a => a.Item1),
-				"Token filter methods are not in sync");
-			analyzeMethods.Select(a => a.Item2.ParameterType).Should().BeEquivalentTo(indexSettingsMethods.Select(a => a.Item2.ParameterType),
-				"Token filter selector funcs are not in sync");
+			analyzeMethods.Select(a => a.Item1)
+				.Should()
+				.BeEquivalentTo(indexSettingsMethods.Select(a => a.Item1),
+					"Token filter methods are not in sync");
+			analyzeMethods.Select(a => a.Item2.ParameterType)
+				.Should()
+				.BeEquivalentTo(indexSettingsMethods.Select(a => a.Item2.ParameterType),
+					"Token filter selector funcs are not in sync");
 		}
 
 		[U] public void TokenizersShouldBeInSync()
@@ -90,20 +101,22 @@ [U] public void TokenizersShouldBeInSync()
 			var analyzeMethods = PublicMethodsOf<AnalyzeTokenizersSelector>(0, typeof(ITokenizer), null);
 			var indexSettingsMethods = PublicMethodsOf<TokenizersDescriptor>(1, nameof(TokenizersDescriptor.UserDefined));
 
-			analyzeMethods.Select(a => a.Item1).Should().BeEquivalentTo(indexSettingsMethods.Select(a => a.Item1),
-				"tokenizer methods are not in sync");
-			analyzeMethods.Select(a => a.Item2.ParameterType).Should().BeEquivalentTo(indexSettingsMethods.Select(a => a.Item2.ParameterType),
-				"tokenizer selector funcs are not in sync");
+			analyzeMethods.Select(a => a.Item1)
+				.Should()
+				.BeEquivalentTo(indexSettingsMethods.Select(a => a.Item1),
+					"tokenizer methods are not in sync");
+			analyzeMethods.Select(a => a.Item2.ParameterType)
+				.Should()
+				.BeEquivalentTo(indexSettingsMethods.Select(a => a.Item2.ParameterType),
+					"tokenizer selector funcs are not in sync");
 		}
 
-		private static readonly string[] IgnoreObjectMethods = {nameof(GetHashCode), nameof(object.Equals), nameof(ToString), nameof(ReferenceEquals), nameof(GetType)};
-
 		private static IList<Tuple<string, ParameterInfo>> PublicMethodsOf<T>(int selectorParam, params string[] except) =>
 			PublicMethodsOf<T>(selectorParam, typeof(T), except);
 
 		private static IList<Tuple<string, ParameterInfo>> PublicMethodsOf<T>(int selectorParam, Type returnType, params string[] except)
 		{
-			var ignore = (except ?? new string[] {}).Concat(IgnoreObjectMethods).ToArray();
+			var ignore = (except ?? new string[] { }).Concat(IgnoreObjectMethods).ToArray();
 
 			var methods = (from m in typeof(T).GetMethods(BindingFlags.Public | BindingFlags.Instance)
 				where m.ReturnType == returnType
diff --git a/src/Tests/Tests/CodeStandards/Parity/ParityTests.cs b/src/Tests/Tests/CodeStandards/Parity/ParityTests.cs
index 1d395af91eb..ecdd0f3f379 100644
--- a/src/Tests/Tests/CodeStandards/Parity/ParityTests.cs
+++ b/src/Tests/Tests/CodeStandards/Parity/ParityTests.cs
@@ -2,7 +2,6 @@
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.CodeStandards.Parity
 {
@@ -15,6 +14,5 @@ [U] public void FieldTypeHasAllNumberTypes()
 
 			fieldTypes.Should().Contain(numberTypes);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs b/src/Tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs
index 6597fe7294e..0eb01921ada 100644
--- a/src/Tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs
+++ b/src/Tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs
@@ -1,12 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
-using Tests.Framework;
-using Nest;
 using Xunit;
 
 namespace Tests.CommonOptions.AutoExpandReplicas
@@ -24,14 +18,14 @@ public void ImplicitConversionFromNullString()
 		[U]
 		public void ImplicitConversionFromMinAndMaxString()
 		{
-			string minAndMax = "0-5";
+			var minAndMax = "0-5";
 			Nest.AutoExpandReplicas autoExpandReplicas = minAndMax;
 			autoExpandReplicas.Should().NotBeNull();
 			autoExpandReplicas.Enabled.Should().BeTrue();
 			autoExpandReplicas.MinReplicas.Should().Be(0);
 			autoExpandReplicas.MaxReplicas.Match(
-                i => i.Should().Be(5), 
-                s => Assert.True(false, "expecting a match on integer"));
+				i => i.Should().Be(5),
+				s => Assert.True(false, "expecting a match on integer"));
 
 			autoExpandReplicas.ToString().Should().Be(minAndMax);
 		}
@@ -39,7 +33,7 @@ public void ImplicitConversionFromMinAndMaxString()
 		[U]
 		public void ImplicitConversionFromMinAndAllString()
 		{
-			string minAndMax = "0-all";
+			var minAndMax = "0-all";
 			Nest.AutoExpandReplicas autoExpandReplicas = minAndMax;
 			autoExpandReplicas.Should().NotBeNull();
 			autoExpandReplicas.Enabled.Should().BeTrue();
@@ -59,8 +53,8 @@ public void CreateWithMinAndMax()
 			autoExpandReplicas.Enabled.Should().BeTrue();
 			autoExpandReplicas.MinReplicas.Should().Be(2);
 			autoExpandReplicas.MaxReplicas.Match(
-                i => i.Should().Be(3), 
-                s => Assert.True(false, "expecting a match on integer"));
+				i => i.Should().Be(3),
+				s => Assert.True(false, "expecting a match on integer"));
 
 			autoExpandReplicas.ToString().Should().Be("2-3");
 		}
@@ -92,19 +86,19 @@ public void Disabled()
 		}
 
 		[U]
-		public void MinMustBeEqualOrLessThanMax() => 
-            Assert.Throws<ArgumentException>(() => Nest.AutoExpandReplicas.Create(2,1));
+		public void MinMustBeEqualOrLessThanMax() =>
+			Assert.Throws<ArgumentException>(() => Nest.AutoExpandReplicas.Create(2, 1));
 
 		[U]
-		public void MinMustBeGreaterThanOrEqualToZero() => 
-            Assert.Throws<ArgumentException>(() => Nest.AutoExpandReplicas.Create(-1));
+		public void MinMustBeGreaterThanOrEqualToZero() =>
+			Assert.Throws<ArgumentException>(() => Nest.AutoExpandReplicas.Create(-1));
 
 		[U]
-		public void MinMustBeAnInteger() => 
-            Assert.Throws<FormatException>(() => Nest.AutoExpandReplicas.Create("all-all"));
+		public void MinMustBeAnInteger() =>
+			Assert.Throws<FormatException>(() => Nest.AutoExpandReplicas.Create("all-all"));
 
 		[U]
-		public void MaxMustBeAllOrAnInteger() => 
-            Assert.Throws<FormatException>(() => Nest.AutoExpandReplicas.Create("2-boo"));
+		public void MaxMustBeAllOrAnInteger() =>
+			Assert.Throws<FormatException>(() => Nest.AutoExpandReplicas.Create("2-boo"));
 	}
 }
diff --git a/src/Tests/Tests/CommonOptions/DateMath/DateMathTests.cs b/src/Tests/Tests/CommonOptions/DateMath/DateMathTests.cs
index 22cc2e41d7b..60b31e0e8a9 100644
--- a/src/Tests/Tests/CommonOptions/DateMath/DateMathTests.cs
+++ b/src/Tests/Tests/CommonOptions/DateMath/DateMathTests.cs
@@ -1,7 +1,6 @@
 using System;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
-using Tests.Framework;
 
 namespace Tests.CommonOptions.DateMath
 {
@@ -26,7 +25,7 @@ public void ImplicitConversionFromNullNullableDateTime()
 		[U]
 		public void ImplicitConversionFromDateMathString()
 		{
-			string nullString = "now+3d";
+			var nullString = "now+3d";
 			Nest.DateMath dateMath = nullString;
 			dateMath.Should().NotBeNull();
 		}
@@ -39,4 +38,4 @@ public void ImplicitConversionFromNullableDateTimeWithValue()
 			dateMath.Should().NotBeNull();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Document/Multiple/Bulk/BulkApiTests.cs b/src/Tests/Tests/Document/Multiple/Bulk/BulkApiTests.cs
index 32512604029..6cfc87ce2d1 100644
--- a/src/Tests/Tests/Document/Multiple/Bulk/BulkApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/Bulk/BulkApiTests.cs
@@ -7,78 +7,54 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Multiple.Bulk
 {
 	public class BulkApiTests : ApiIntegrationTestBase<WritableCluster, IBulkResponse, IBulkRequest, BulkDescriptor, BulkRequest>
 	{
 		public BulkApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Bulk(f),
-			fluentAsync: (client, f) => client.BulkAsync(f),
-			request: (client, r) => client.Bulk(r),
-			requestAsync: (client, r) => client.BulkAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk?pipeline=default-pipeline";
-
-		protected override bool SupportsDeserialization => false;
-
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			var pipelineResponse = client.PutPipeline("default-pipeline", p => p
-				.Processors(pr => pr
-					.Set<Project>(t => t.Field(f => f.Description).Value("Default"))
-				)
-			);
-
-			if (!pipelineResponse.IsValid)
-				throw new Exception("Failed to set up pipeline named 'default-pipeline' required for bulk");
-
-			pipelineResponse = client.PutPipeline("pipeline", p => p
-				.Processors(pr => pr
-					.Set<Project>(t => t.Field(f => f.Description).Value("Overridden"))
-				)
-			);
-
-			if (!pipelineResponse.IsValid)
-				throw new Exception($"Failed to set up pipeline named 'pipeline' required for bulk");
-
-			base.IntegrationSetup(client, values);
-		}
 
 		protected override object ExpectJson => new object[]
 		{
-			new Dictionary<string, object>{ { "index", new {  _type = "doc", _id = Project.Instance.Name, pipeline="pipeline", routing = Project.Instance.Name } } },
+			new Dictionary<string, object>
+				{ { "index", new { _type = "doc", _id = Project.Instance.Name, pipeline = "pipeline", routing = Project.Instance.Name } } },
 			Project.InstanceAnonymous,
-			new Dictionary<string, object>{ { "update", new { _type="doc", _id = Project.Instance.Name } } },
-			new { doc = new { leadDeveloper = new { firstName = "martijn" } } } ,
-			new Dictionary<string, object>{ { "create", new { _type="doc", _id = Project.Instance.Name + "1", routing = Project.Instance.Name } } },
+			new Dictionary<string, object> { { "update", new { _type = "doc", _id = Project.Instance.Name } } },
+			new { doc = new { leadDeveloper = new { firstName = "martijn" } } },
+			new Dictionary<string, object>
+				{ { "create", new { _type = "doc", _id = Project.Instance.Name + "1", routing = Project.Instance.Name } } },
 			Project.InstanceAnonymous,
-			new Dictionary<string, object>{ { "delete", new { _type="doc", _id = Project.Instance.Name + "1", routing = Project.Instance.Name  } } },
-			new Dictionary<string, object>{ { "create", new { _type="doc", _id = Project.Instance.Name + "2", routing = Project.Instance.Name } } },
+			new Dictionary<string, object>
+				{ { "delete", new { _type = "doc", _id = Project.Instance.Name + "1", routing = Project.Instance.Name } } },
+			new Dictionary<string, object>
+				{ { "create", new { _type = "doc", _id = Project.Instance.Name + "2", routing = Project.Instance.Name } } },
 			Project.InstanceAnonymous,
-			new Dictionary<string, object>{ { "update", new { _type="doc", _id = Project.Instance.Name + "2", routing = Project.Instance.Name } } },
-			new Dictionary<string, object>{ { "script", new
+			new Dictionary<string, object>
+				{ { "update", new { _type = "doc", _id = Project.Instance.Name + "2", routing = Project.Instance.Name } } },
+			new Dictionary<string, object>
 			{
-				source = "ctx._source.numberOfCommits = params.commits",
-				@params = new { commits = 30 },
-				lang = "painless"
-			} } },
+				{
+					"script", new
+					{
+						source = "ctx._source.numberOfCommits = params.commits",
+						@params = new { commits = 30 },
+						lang = "painless"
+					}
+				}
+			},
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<BulkDescriptor, IBulkRequest> Fluent => d => d
 			.Index(CallIsolatedValue)
 			.Pipeline("default-pipeline")
 			.Index<Project>(b => b.Document(Project.Instance).Pipeline("pipeline"))
 			.Update<Project, object>(b => b.Doc(new { leadDeveloper = new { firstName = "martijn" } }).Id(Project.Instance.Name))
 			.Create<Project>(b => b.Document(Project.Instance).Id(Project.Instance.Name + "1"))
-			.Delete<Project>(b=>b.Id(Project.Instance.Name + "1").Routing(Project.Instance.Name))
+			.Delete<Project>(b => b.Id(Project.Instance.Name + "1").Routing(Project.Instance.Name))
 			.Create<Project>(b => b.Document(Project.Instance).Id(Project.Instance.Name + "2"))
 			.Update<Project>(b => b
 				.Id(Project.Instance.Name + "2")
@@ -90,6 +66,8 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override BulkRequest Initializer =>
 			new BulkRequest(CallIsolatedValue)
 			{
@@ -125,6 +103,39 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				}
 			};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk?pipeline=default-pipeline";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Bulk(f),
+			(client, f) => client.BulkAsync(f),
+			(client, r) => client.Bulk(r),
+			(client, r) => client.BulkAsync(r)
+		);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			var pipelineResponse = client.PutPipeline("default-pipeline", p => p
+				.Processors(pr => pr
+					.Set<Project>(t => t.Field(f => f.Description).Value("Default"))
+				)
+			);
+
+			if (!pipelineResponse.IsValid)
+				throw new Exception("Failed to set up pipeline named 'default-pipeline' required for bulk");
+
+			pipelineResponse = client.PutPipeline("pipeline", p => p
+				.Processors(pr => pr
+					.Set<Project>(t => t.Field(f => f.Description).Value("Overridden"))
+				)
+			);
+
+			if (!pipelineResponse.IsValid)
+				throw new Exception($"Failed to set up pipeline named 'pipeline' required for bulk");
+
+			base.IntegrationSetup(client, values);
+		}
+
 		protected override void ExpectResponse(IBulkResponse response)
 		{
 			response.Took.Should().BeGreaterThan(0);
@@ -147,11 +158,11 @@ protected override void ExpectResponse(IBulkResponse response)
 				item.Result.Should().NotBeNullOrEmpty();
 			}
 
-			var project1 = this.Client.Source<Project>(Project.Instance.Name, p => p.Index(CallIsolatedValue));
+			var project1 = Client.Source<Project>(Project.Instance.Name, p => p.Index(CallIsolatedValue));
 			project1.LeadDeveloper.FirstName.Should().Be("martijn");
 			project1.Description.Should().Be("Overridden");
 
-			var project2 = this.Client.Source<Project>(Project.Instance.Name + "2", p => p
+			var project2 = Client.Source<Project>(Project.Instance.Name + "2", p => p
 				.Index(CallIsolatedValue)
 				.Routing(Project.Instance.Name)
 			);
diff --git a/src/Tests/Tests/Document/Multiple/Bulk/BulkInvalidApiTests.cs b/src/Tests/Tests/Document/Multiple/Bulk/BulkInvalidApiTests.cs
index b1f0cccb47e..daab1d6d67d 100644
--- a/src/Tests/Tests/Document/Multiple/Bulk/BulkInvalidApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/Bulk/BulkInvalidApiTests.cs
@@ -8,35 +8,54 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Multiple.Bulk
 {
 	public class BulkInvalidApiTests : ApiIntegrationTestBase<WritableCluster, IBulkResponse, IBulkRequest, BulkDescriptor, BulkRequest>
 	{
 		public BulkInvalidApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Bulk(f),
-			fluentAsync: (client, f) => client.BulkAsync(f),
-			request: (client, r) => client.Bulk(r),
-			requestAsync: (client, r) => client.BulkAsync(r)
-		);
 
 		protected override bool ExpectIsValid => false;
+
+		protected override object ExpectJson { get; } = new object[]
+		{
+			new Dictionary<string, object> { { "update", new { _type = "doc", _id = Project.Instance.Name } } },
+			new { doc = new { leadDeveloper = new { firstName = "martijn" } } },
+			new Dictionary<string, object> { { "delete", new { _type = "doc", _id = Project.Instance.Name + "1" } } },
+		};
+
 		protected override int ExpectStatusCode => 200;
+
+		protected override Func<BulkDescriptor, IBulkRequest> Fluent => d => d
+			.Index(CallIsolatedValue)
+			.Update<Project, object>(b => b.Doc(new { leadDeveloper = new { firstName = "martijn" } }).Id(Project.Instance.Name))
+			.Delete<Project>(b => b.Id(Project.Instance.Name + "1"));
+
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk";
 
-		protected override bool SupportsDeserialization => false;
 
-		protected override object ExpectJson { get; } = new object[]
+		protected override BulkRequest Initializer => new BulkRequest(CallIsolatedValue)
 		{
-			new Dictionary<string, object>{ { "update", new { _type="doc", _id = Project.Instance.Name } } },
-			new { doc = new { leadDeveloper = new { firstName = "martijn" } } },
-			new Dictionary<string, object>{ { "delete", new { _type="doc", _id = Project.Instance.Name + "1" } } },
+			Operations = new List<IBulkOperation>
+			{
+				new BulkUpdateOperation<Project, object>(Project.Instance.Name)
+				{
+					Doc = new { leadDeveloper = new { firstName = "martijn" } }
+				},
+				new BulkDeleteOperation<Project>(Project.Instance.Name + "1"),
+			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Bulk(f),
+			(client, f) => client.BulkAsync(f),
+			(client, r) => client.Bulk(r),
+			(client, r) => client.BulkAsync(r)
+		);
+
 		protected override void ExpectResponse(IBulkResponse response)
 		{
 			response.Took.Should().BeGreaterThan(0);
@@ -58,23 +77,5 @@ protected override void ExpectResponse(IBulkResponse response)
 			var failedDelete = response.Items.Last() as BulkDeleteResponseItem;
 			failedDelete.IsValid.Should().BeTrue();
 		}
-
-		protected override Func<BulkDescriptor, IBulkRequest> Fluent => d => d
-			.Index(CallIsolatedValue)
-			.Update<Project, object>(b => b.Doc(new { leadDeveloper = new { firstName = "martijn" } }).Id(Project.Instance.Name))
-			.Delete<Project>(b=>b.Id(Project.Instance.Name + "1"));
-
-
-		protected override BulkRequest Initializer => new BulkRequest(CallIsolatedValue)
-		{
-			Operations = new List<IBulkOperation>
-			{
-				new BulkUpdateOperation<Project, object>(Project.Instance.Name)
-				{
-					Doc = new { leadDeveloper = new { firstName = "martijn" } }
-				},
-				new BulkDeleteOperation<Project>(Project.Instance.Name + "1"),
-			}
-		};
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/Bulk/BulkInvalidVersionApiTests.cs b/src/Tests/Tests/Document/Multiple/Bulk/BulkInvalidVersionApiTests.cs
index 9affa668d5b..7bfacd71755 100644
--- a/src/Tests/Tests/Document/Multiple/Bulk/BulkInvalidVersionApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/Bulk/BulkInvalidVersionApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -9,50 +8,33 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Multiple.Bulk
 {
 	public class BulkInvalidVersionApiTests : ApiIntegrationTestBase<WritableCluster, IBulkResponse, IBulkRequest, BulkDescriptor, BulkRequest>
 	{
 		public BulkInvalidVersionApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Bulk(f),
-			fluentAsync: (client, f) => client.BulkAsync(f),
-			request: (client, r) => client.Bulk(r),
-			requestAsync: (client, r) => client.BulkAsync(r)
-		);
 
 		protected override bool ExpectIsValid => false;
-		protected override int ExpectStatusCode => 400;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new object[]
 		{
-			new Dictionary<string, object>{ { "index", new { _type="doc", _id = Project.Instance.Name, routing = Project.Instance.Name } } },
+			new Dictionary<string, object> { { "index", new { _type = "doc", _id = Project.Instance.Name, routing = Project.Instance.Name } } },
 			Project.InstanceAnonymous,
-			new Dictionary<string, object>{ { "index", new { _type="doc", _id = Project.Instance.Name, routing = Project.Instance.Name, version = 0 } } },
+			new Dictionary<string, object>
+				{ { "index", new { _type = "doc", _id = Project.Instance.Name, routing = Project.Instance.Name, version = 0 } } },
 			Project.InstanceAnonymous,
 		};
 
-		protected override void ExpectResponse(IBulkResponse response)
-		{
-			response.ShouldNotBeValid();
-			response.ServerError.Should().NotBeNull();
-			response.ServerError.Status.Should().Be(400);
-			response.ServerError.Error.Type.Should().Be("action_request_validation_exception");
-			response.ServerError.Error.Reason.Should().EndWith("illegal version value [0] for version type [INTERNAL];");
-		}
+		protected override int ExpectStatusCode => 400;
 
 		protected override Func<BulkDescriptor, IBulkRequest> Fluent => d => d
 			.Index(CallIsolatedValue)
 			.Index<Project>(i => i.Document(Project.Instance))
 			.Index<Project>(i => i.Version(0).Document(Project.Instance));
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 
 		protected override BulkRequest Initializer => new BulkRequest(CallIsolatedValue)
 		{
@@ -62,5 +44,24 @@ protected override void ExpectResponse(IBulkResponse response)
 				new BulkIndexOperation<Project>(Project.Instance) { Version = 0 }
 			}
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Bulk(f),
+			(client, f) => client.BulkAsync(f),
+			(client, r) => client.Bulk(r),
+			(client, r) => client.BulkAsync(r)
+		);
+
+		protected override void ExpectResponse(IBulkResponse response)
+		{
+			response.ShouldNotBeValid();
+			response.ServerError.Should().NotBeNull();
+			response.ServerError.Status.Should().Be(400);
+			response.ServerError.Error.Type.Should().Be("action_request_validation_exception");
+			response.ServerError.Error.Reason.Should().EndWith("illegal version value [0] for version type [INTERNAL];");
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/Bulk/BulkResponseParsingTests.cs b/src/Tests/Tests/Document/Multiple/Bulk/BulkResponseParsingTests.cs
index ad0ad093a1f..62cd043098e 100644
--- a/src/Tests/Tests/Document/Multiple/Bulk/BulkResponseParsingTests.cs
+++ b/src/Tests/Tests/Document/Multiple/Bulk/BulkResponseParsingTests.cs
@@ -1,13 +1,11 @@
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Client;
 using Tests.Framework;
-using static Tests.Framework.UrlTester;
 
 namespace Tests.Document.Multiple.Bulk
 {
@@ -19,9 +17,9 @@ [U] public void CanDeserialize()
 			var count = 100000;
 			var bytes = client.RequestResponseSerializer.SerializeToBytes(ReturnBulkResponse(count));
 			var x = Deserialize(bytes, client);
-			x.Items.Should().HaveCount(count).And.NotContain(i=>i == null);
-
+			x.Items.Should().HaveCount(count).And.NotContain(i => i == null);
 		}
+
 		private BulkResponse Deserialize(byte[] response, IElasticClient client)
 		{
 			using (var ms = new MemoryStream(response))
@@ -48,17 +46,13 @@ private BulkResponse Deserialize(byte[] response, IElasticClient client)
 		};
 
 
-		private static object ReturnBulkResponse(int numberOfItems)
+		private static object ReturnBulkResponse(int numberOfItems) => new
 		{
-			return new
-			{
-				took = 276,
-				errors = false,
-				items = Enumerable.Range(0, numberOfItems)
-					.Select(i => BulkItemResponse())
-					.ToArray()
-			};
-		}
-
+			took = 276,
+			errors = false,
+			items = Enumerable.Range(0, numberOfItems)
+				.Select(i => BulkItemResponse())
+				.ToArray()
+		};
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/Bulk/BulkUpdateManyTests.cs b/src/Tests/Tests/Document/Multiple/Bulk/BulkUpdateManyTests.cs
index 458ff9be9ec..954e16ab37f 100644
--- a/src/Tests/Tests/Document/Multiple/Bulk/BulkUpdateManyTests.cs
+++ b/src/Tests/Tests/Document/Multiple/Bulk/BulkUpdateManyTests.cs
@@ -2,52 +2,50 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
-using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Multiple.Bulk
 {
 	public class BulkUpdateManyTests : ApiTestBase<ReadOnlyCluster, IBulkResponse, IBulkRequest, BulkDescriptor, BulkRequest>
 	{
-		private List<Project> Updates = Project.Projects.Take(10).ToList();
+		private readonly List<Project> Updates = Project.Projects.Take(10).ToList();
 
 		public BulkUpdateManyTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Bulk(f),
-			fluentAsync: (client, f) => client.BulkAsync(f),
-			request: (client, r) => client.Bulk(r),
-			requestAsync: (client, r) => client.BulkAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => Updates.SelectMany<Project, object>(ProjectToBulkJson);
 
-		private IEnumerable<object> ProjectToBulkJson(Project p)
-		{
-			yield return new Dictionary<string, object> { { "update", new { _type = "doc", _id = p.Name, routing = p.Name } } };
-			yield return new { script = new { source = "_source.counter++" } };
-		}
-
 		protected override Func<BulkDescriptor, IBulkRequest> Fluent => d => d
 			.Index(CallIsolatedValue)
 			.UpdateMany(Updates, (b, u) => b.Script(s => s.Source("_source.counter++")));
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 
 		protected override BulkRequest Initializer => new BulkRequest(CallIsolatedValue)
 		{
 			Operations = Updates
-				.Select(u=> new BulkUpdateOperation<Project, Project>(u) { Script = new InlineScript("_source.counter++") })
+				.Select(u => new BulkUpdateOperation<Project, Project>(u) { Script = new InlineScript("_source.counter++") })
 				.ToList<IBulkOperation>()
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Bulk(f),
+			(client, f) => client.BulkAsync(f),
+			(client, r) => client.Bulk(r),
+			(client, r) => client.BulkAsync(r)
+		);
+
+		private IEnumerable<object> ProjectToBulkJson(Project p)
+		{
+			yield return new Dictionary<string, object> { { "update", new { _type = "doc", _id = p.Name, routing = p.Name } } };
+			yield return new { script = new { source = "_source.counter++" } };
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/Bulk/BulkUrlTests.cs b/src/Tests/Tests/Document/Multiple/Bulk/BulkUrlTests.cs
index 76c02e06f27..0beacdd699c 100644
--- a/src/Tests/Tests/Document/Multiple/Bulk/BulkUrlTests.cs
+++ b/src/Tests/Tests/Document/Multiple/Bulk/BulkUrlTests.cs
@@ -12,24 +12,24 @@ public class BulkUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/_bulk")
-				.Fluent(c => c.Bulk(s => s))
-				.Request(c => c.Bulk(new BulkRequest()))
-				.FluentAsync(c => c.BulkAsync(s => s))
-				.RequestAsync(c => c.BulkAsync(new BulkRequest()))
+					.Fluent(c => c.Bulk(s => s))
+					.Request(c => c.Bulk(new BulkRequest()))
+					.FluentAsync(c => c.BulkAsync(s => s))
+					.RequestAsync(c => c.BulkAsync(new BulkRequest()))
 				;
 
 			await POST("/project/_bulk")
-				.Fluent(c => c.Bulk(b => b.Index<Project>()))
-				.Request(c => c.Bulk(new BulkRequest(typeof(Project))))
-				.FluentAsync(c => c.BulkAsync(b => b.Index<Project>()))
-				.RequestAsync(c => c.BulkAsync(new BulkRequest(typeof(Project))))
+					.Fluent(c => c.Bulk(b => b.Index<Project>()))
+					.Request(c => c.Bulk(new BulkRequest(typeof(Project))))
+					.FluentAsync(c => c.BulkAsync(b => b.Index<Project>()))
+					.RequestAsync(c => c.BulkAsync(new BulkRequest(typeof(Project))))
 				;
 
 			await POST("/project/doc/_bulk")
-				.Fluent(c => c.Bulk(b => b.Index(typeof(Project)).Type(typeof(Project))))
-				.Request(c => c.Bulk(new BulkRequest(typeof(Project), typeof(Project))))
-				.FluentAsync(c => c.BulkAsync(b => b.Index(typeof(Project)).Type(typeof(Project))))
-				.RequestAsync(c => c.BulkAsync(new BulkRequest(typeof(Project), typeof(Project))))
+					.Fluent(c => c.Bulk(b => b.Index(typeof(Project)).Type(typeof(Project))))
+					.Request(c => c.Bulk(new BulkRequest(typeof(Project), typeof(Project))))
+					.FluentAsync(c => c.BulkAsync(b => b.Index(typeof(Project)).Type(typeof(Project))))
+					.RequestAsync(c => c.BulkAsync(new BulkRequest(typeof(Project), typeof(Project))))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllApiTestsBase.cs b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllApiTestsBase.cs
index 220e379ee4a..13c03c40372 100644
--- a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllApiTestsBase.cs
+++ b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllApiTestsBase.cs
@@ -14,13 +14,7 @@ namespace Tests.Document.Multiple.BulkAll
 {
 	public abstract class BulkAllApiTestsBase : IClusterFixture<IntrusiveOperationCluster>, IClassFixture<EndpointUsage>
 	{
-		protected BulkAllApiTestsBase(IntrusiveOperationCluster cluster, EndpointUsage usage) => this.Client = cluster.Client;
-
-		protected class SmallObject
-		{
-			public int Id { get; set; }
-			public string Number { get; set; }
-		}
+		protected BulkAllApiTestsBase(IntrusiveOperationCluster cluster, EndpointUsage usage) => Client = cluster.Client;
 
 		protected IElasticClient Client { get; }
 
@@ -34,7 +28,7 @@ protected IEnumerable<SmallObject> CreateLazyStreamOfDocuments(int count)
 
 		protected async Task CreateIndexAsync(string indexName, int numberOfShards, Func<MappingsDescriptor, IPromise<IMappings>> mappings = null)
 		{
-			var result = await this.Client.CreateIndexAsync(indexName, s => s
+			var result = await Client.CreateIndexAsync(indexName, s => s
 				.Settings(settings => settings
 					.NumberOfShards(numberOfShards)
 					.NumberOfReplicas(0)
@@ -44,11 +38,18 @@ protected async Task CreateIndexAsync(string indexName, int numberOfShards, Func
 			result.Should().NotBeNull();
 			result.ShouldBeValid();
 		}
+
 		protected static void OnError(ref Exception ex, Exception e, EventWaitHandle handle)
 		{
 			ex = e;
 			handle.Set();
 			throw e;
 		}
+
+		protected class SmallObject
+		{
+			public int Id { get; set; }
+			public string Number { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs
index 4ec2c43ba1a..f1ede51ef14 100644
--- a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs
@@ -14,7 +14,7 @@ public class BulkAllCancellationTokenApiTests : BulkAllApiTestsBase
 	{
 		public BulkAllCancellationTokenApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		[I, SkipOnTeamCity]
+		[I] [SkipOnTeamCity]
 		public void CancelBulkAll()
 		{
 			var index = CreateIndexName();
@@ -24,18 +24,18 @@ public void CancelBulkAll()
 			var pages = 1000;
 			var seenPages = 0;
 			var numberOfDocuments = size * pages;
-			var documents = this.CreateLazyStreamOfDocuments(numberOfDocuments);
+			var documents = CreateLazyStreamOfDocuments(numberOfDocuments);
 
 			//first we setup our cold observable
 			var tokenSource = new CancellationTokenSource();
-			var observableBulk = this.Client.BulkAll(documents, f => f
-				.MaxDegreeOfParallelism(8)
-				.BackOffTime(TimeSpan.FromSeconds(10))
-				.BackOffRetries(2)
-				.Size(size)
-				.RefreshOnCompleted()
-				.Index(index)
-			, tokenSource.Token);
+			var observableBulk = Client.BulkAll(documents, f => f
+					.MaxDegreeOfParallelism(8)
+					.BackOffTime(TimeSpan.FromSeconds(10))
+					.BackOffRetries(2)
+					.Size(size)
+					.RefreshOnCompleted()
+					.Index(index)
+				, tokenSource.Token);
 
 			//we set up an observer
 			Exception ex = null;
@@ -54,7 +54,7 @@ public void CancelBulkAll()
 			if (ex != null && !(ex is TaskCanceledException) && !(ex is OperationCanceledException)) throw ex;
 
 			seenPages.Should().BeLessThan(pages).And.BeGreaterThan(0);
-			var count = this.Client.Count<SmallObject>(f => f.Index(index));
+			var count = Client.Count<SmallObject>(f => f.Index(index));
 			count.Count.Should().BeLessThan(numberOfDocuments).And.BeGreaterThan(0);
 			bulkObserver.TotalNumberOfFailedBuffers.Should().Be(0);
 			bulkObserver.TotalNumberOfRetries.Should().Be(0);
diff --git a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs
index 49512acf854..86bfb52de81 100644
--- a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs
@@ -17,22 +17,23 @@ [I] public void ForEachAsyncReleasesProcessedItemsInMemory()
 			WeakReference<SmallObject> deallocReference = null;
 			SmallObject obj = null;
 
-			var lazyCollection = this.GetLazyCollection(
+			var lazyCollection = GetLazyCollection(
 				weakRef => deallocReference = weakRef,
-				delegate { },//...
-				delegate { },//Making sure that all of the objects have gone through pipeline
-				delegate { },//so that the first one can be deallocated
-				delegate { },//Various GC roots prevent several of previous (2 or 3)
-				delegate { },//items in the lazy Enumerable from deallocation during forced GC
-				delegate { },//...
-				delegate {
+				delegate { }, //...
+				delegate { }, //Making sure that all of the objects have gone through pipeline
+				delegate { }, //so that the first one can be deallocated
+				delegate { }, //Various GC roots prevent several of previous (2 or 3)
+				delegate { }, //items in the lazy Enumerable from deallocation during forced GC
+				delegate { }, //...
+				delegate
+				{
 					GC.Collect(2, GCCollectionMode.Forced, true);
 					deallocReference.TryGetTarget(out obj);
 				}
 			);
 
 			var index = CreateIndexName();
-			var observableBulk = this.Client.BulkAll(lazyCollection, f => f
+			var observableBulk = Client.BulkAll(lazyCollection, f => f
 				.MaxDegreeOfParallelism(1)
 				.Size(1)
 				.Index(index)
@@ -55,4 +56,4 @@ private IEnumerable<SmallObject> GetLazyCollection(params Action<WeakReference<S
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs
index 431b376bb5f..316a2b2f442 100644
--- a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs
@@ -14,7 +14,7 @@ public class BulkAllDisposeApiTests : BulkAllApiTestsBase
 	{
 		public BulkAllDisposeApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		[I, SkipOnTeamCity]
+		[I] [SkipOnTeamCity]
 		public void DisposingObservableCancelsBulkAll()
 		{
 			var index = CreateIndexName();
@@ -24,10 +24,10 @@ public void DisposingObservableCancelsBulkAll()
 			var pages = 1000;
 			var seenPages = 0;
 			var numberOfDocuments = size * pages;
-			var documents = this.CreateLazyStreamOfDocuments(numberOfDocuments);
+			var documents = CreateLazyStreamOfDocuments(numberOfDocuments);
 
 			//first we setup our cold observable
-			var observableBulk = this.Client.BulkAll(documents, f => f
+			var observableBulk = Client.BulkAll(documents, f => f
 				.MaxDegreeOfParallelism(8)
 				.BackOffTime(TimeSpan.FromSeconds(10))
 				.BackOffRetries(2)
@@ -54,9 +54,9 @@ public void DisposingObservableCancelsBulkAll()
 			if (ex != null && !(ex is TaskCanceledException) && !(ex is OperationCanceledException)) throw ex;
 
 			seenPages.Should().BeLessThan(pages).And.BeGreaterThan(0);
-			var count = this.Client.Count<SmallObject>(f => f.Index(index));
+			var count = Client.Count<SmallObject>(f => f.Index(index));
 			count.Count.Should().BeLessThan(numberOfDocuments).And.BeGreaterThan(0);
 			bulkObserver.TotalNumberOfFailedBuffers.Should().Be(0);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllExceptionApiTests.cs b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllExceptionApiTests.cs
index c2f36aaf75e..01295cba1f2 100644
--- a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllExceptionApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllExceptionApiTests.cs
@@ -20,10 +20,10 @@ [I] public void WaitBulkAllThrowsAndIsCaught()
 			var pages = 10;
 			var seenPages = 0;
 			var numberOfDocuments = size * pages;
-			var documents = this.CreateLazyStreamOfDocuments(numberOfDocuments);
+			var documents = CreateLazyStreamOfDocuments(numberOfDocuments);
 
 			var tokenSource = new CancellationTokenSource();
-			var observableBulk = this.Client.BulkAll(documents, f => f
+			var observableBulk = Client.BulkAll(documents, f => f
 					.MaxDegreeOfParallelism(4)
 					.BackOffTime(TimeSpan.FromSeconds(10))
 					.BackOffRetries(2)
@@ -38,8 +38,8 @@ [I] public void WaitBulkAllThrowsAndIsCaught()
 				observableBulk.Wait(TimeSpan.FromSeconds(30), b =>
 				{
 					if (seenPages == 8) throw new Exception("boom");
-					Interlocked.Increment(ref seenPages);
 
+					Interlocked.Increment(ref seenPages);
 				});
 			}
 			catch (Exception e)
@@ -49,4 +49,4 @@ [I] public void WaitBulkAllThrowsAndIsCaught()
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllForEachAsyncApiTests.cs b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllForEachAsyncApiTests.cs
index e80f89e674e..0c690e5994c 100644
--- a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllForEachAsyncApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAllForEachAsyncApiTests.cs
@@ -21,10 +21,10 @@ [I] public async Task AwaitBulkAll()
 			var pages = 10;
 			var seenPages = 0;
 			var numberOfDocuments = size * pages;
-			var documents = this.CreateLazyStreamOfDocuments(numberOfDocuments);
+			var documents = CreateLazyStreamOfDocuments(numberOfDocuments);
 
 			var tokenSource = new CancellationTokenSource();
-			var observableBulk = this.Client.BulkAll(documents, f => f
+			var observableBulk = Client.BulkAll(documents, f => f
 					.MaxDegreeOfParallelism(8)
 					.BackOffTime(TimeSpan.FromSeconds(10))
 					.BackOffRetries(2)
@@ -39,8 +39,8 @@ await observableBulk
 				.ForEachAsync(x => Interlocked.Increment(ref seenPages), tokenSource.Token);
 
 			seenPages.Should().Be(pages);
-			var count = this.Client.Count<SmallObject>(f => f.Index(index));
+			var count = Client.Count<SmallObject>(f => f.Index(index));
 			count.Count.Should().Be(numberOfDocuments);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAndScrollApiTests.cs b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAndScrollApiTests.cs
index de3da3ebbd6..7fbe603dda7 100644
--- a/src/Tests/Tests/Document/Multiple/BulkAll/BulkAndScrollApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/BulkAll/BulkAndScrollApiTests.cs
@@ -21,31 +21,32 @@ [I] public async Task BulkAllAndScrollAll()
 			var index = CreateIndexName();
 
 			const int size = 1000, pages = 100, numberOfDocuments = size * pages, numberOfShards = 10;
-			var documents = this.CreateLazyStreamOfDocuments(numberOfDocuments);
+			var documents = CreateLazyStreamOfDocuments(numberOfDocuments);
 
-			await this.CreateIndexAsync(index, numberOfShards);
+			await CreateIndexAsync(index, numberOfShards);
 
-			this.BulkAll(index, documents, size, pages, numberOfDocuments);
-			this.ScrollAll(index, size, numberOfShards, numberOfDocuments);
+			BulkAll(index, documents, size, pages, numberOfDocuments);
+			ScrollAll(index, size, numberOfShards, numberOfDocuments);
 		}
 
 		private void ScrollAll(string index, int size, int numberOfShards, int numberOfDocuments)
 		{
 			var seenDocuments = 0;
 			var seenSlices = new ConcurrentBag<int>();
-			var scrollObserver = this.Client.ScrollAll<SmallObject>("1m", numberOfShards, s => s
-				.MaxDegreeOfParallelism(numberOfShards / 2)
-				.Search(search => search
-					.Size(size / 2)
-					.Index(index)
-					.AllTypes()
-					.MatchAll()
+			var scrollObserver = Client.ScrollAll<SmallObject>("1m", numberOfShards, s => s
+					.MaxDegreeOfParallelism(numberOfShards / 2)
+					.Search(search => search
+						.Size(size / 2)
+						.Index(index)
+						.AllTypes()
+						.MatchAll()
+					)
 				)
-			).Wait(TimeSpan.FromMinutes(5), r =>
-			{
-				seenSlices.Add(r.Slice);
-				Interlocked.Add(ref seenDocuments, r.SearchResponse.Hits.Count);
-			});
+				.Wait(TimeSpan.FromMinutes(5), r =>
+				{
+					seenSlices.Add(r.Slice);
+					Interlocked.Add(ref seenDocuments, r.SearchResponse.Hits.Count);
+				});
 
 			seenDocuments.Should().Be(numberOfDocuments);
 			var groups = seenSlices.GroupBy(s => s).ToList();
@@ -53,13 +54,13 @@ private void ScrollAll(string index, int size, int numberOfShards, int numberOfD
 			groups.Should().OnlyContain(g => g.Count() > 1);
 		}
 
-		private void BulkAll(string index, IEnumerable<SmallObject> documents, int size,  int pages, int numberOfDocuments)
+		private void BulkAll(string index, IEnumerable<SmallObject> documents, int size, int pages, int numberOfDocuments)
 		{
 			var seenPages = 0;
 
 			var droppedDocuments = new ConcurrentBag<Tuple<IBulkResponseItem, SmallObject>>();
 			//first we setup our cold observable
-			var observableBulk = this.Client.BulkAll(documents, f => f
+			var observableBulk = Client.BulkAll(documents, f => f
 				.MaxDegreeOfParallelism(8)
 				.BackOffTime(TimeSpan.FromSeconds(10))
 				.BackOffRetries(2)
@@ -74,7 +75,7 @@ private void BulkAll(string index, IEnumerable<SmallObject> documents, int size,
 			droppedDocuments.Take(10).Should().BeEmpty();
 			bulkObserver.TotalNumberOfFailedBuffers.Should().Be(0, "All buffers are expected to be indexed");
 			seenPages.Should().Be(pages, "BulkAll() did not run to completion");
-			var count = this.Client.Count<SmallObject>(f => f.Index(index));
+			var count = Client.Count<SmallObject>(f => f.Index(index));
 			count.Count.Should().Be(numberOfDocuments, "Target index should have the same document count as source index");
 		}
 	}
diff --git a/src/Tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs b/src/Tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs
index 30a58314240..679685d51d7 100644
--- a/src/Tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -15,21 +14,25 @@ namespace Tests.Document.Multiple.BulkAll
 {
 	public class BulkOnErrorApiTests : BulkAllApiTestsBase
 	{
-		private const int Size = 100, Pages = 3, NumberOfShards = 1, FailAfterPage = 2,
+		private const int Size = 100,
+			Pages = 3,
+			NumberOfShards = 1,
+			FailAfterPage = 2,
 			// last page will have some errors we don't need a 100 exceptions printed on console out though :)
-			NumberOfDocuments = (Size * (Pages - 1)) + 2;
+			NumberOfDocuments = Size * (Pages - 1) + 2;
 
 		public BulkOnErrorApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		[I] public async Task WaitThrowsExceptionAndHalts()
 		{
 			var index = CreateIndexName();
-			var documents = await this.CreateIndexAndReturnDocuments(index);
+			var documents = await CreateIndexAndReturnDocuments(index);
 			var seenPages = 0;
-			var observableBulk = this.KickOff(index, documents);
+			var observableBulk = KickOff(index, documents);
 			Action bulkObserver = () => observableBulk.Wait(TimeSpan.FromMinutes(5), b => Interlocked.Increment(ref seenPages));
 			bulkObserver.ShouldThrow<ElasticsearchClientException>()
-				.And.Message.Should().StartWith("BulkAll halted after receiving failures that can not");
+				.And.Message.Should()
+				.StartWith("BulkAll halted after receiving failures that can not");
 
 			seenPages.Should().Be(2);
 		}
@@ -37,9 +40,9 @@ [I] public async Task WaitThrowsExceptionAndHalts()
 		[I] public async Task SubscribeHitsOnError()
 		{
 			var index = CreateIndexName();
-			var documents = await this.CreateIndexAndReturnDocuments(index);
+			var documents = await CreateIndexAndReturnDocuments(index);
 			var seenPages = 0;
-			var observableBulk = this.KickOff(index, documents);
+			var observableBulk = KickOff(index, documents);
 			Exception ex = null;
 			var handle = new ManualResetEvent(false);
 			using (observableBulk.Subscribe(
@@ -66,11 +69,11 @@ [I] public async Task SubscribeHitsOnError()
 		[I] public async Task ContinueAfterDroppedCallsCallback()
 		{
 			var index = CreateIndexName();
-			var documents = await this.CreateIndexAndReturnDocuments(index);
+			var documents = await CreateIndexAndReturnDocuments(index);
 			var seenPages = 0;
-			var expectedBadDocuments = NumberOfDocuments - (Size * FailAfterPage);
+			var expectedBadDocuments = NumberOfDocuments - Size * FailAfterPage;
 			var badDocumentIds = new List<int>(expectedBadDocuments);
-			var observableBulk = this.KickOff(index, documents, r => r
+			var observableBulk = KickOff(index, documents, r => r
 				.ContinueAfterDroppedDocuments(true)
 				.DroppedDocumentCallback((i, d) =>
 				{
@@ -78,12 +81,12 @@ [I] public async Task ContinueAfterDroppedCallsCallback()
 					badDocumentIds.Add(d.Id);
 					i.IsValid.Should().BeFalse();
 				})
-
 			);
 			observableBulk.Wait(TimeSpan.FromMinutes(5), b => Interlocked.Increment(ref seenPages));
 
 			seenPages.Should().Be(3);
-			badDocumentIds.Should().NotBeEmpty()
+			badDocumentIds.Should()
+				.NotBeEmpty()
 				.And.HaveCount(expectedBadDocuments)
 				.And.OnlyContain(id => id >= Size * FailAfterPage);
 		}
@@ -91,9 +94,9 @@ [I] public async Task ContinueAfterDroppedCallsCallback()
 		[I] public async Task BadBulkRequestFeedsToOnError()
 		{
 			var index = CreateIndexName();
-			var documents = await this.CreateIndexAndReturnDocuments(index);
+			var documents = await CreateIndexAndReturnDocuments(index);
 			var seenPages = 0;
-			var badUris = new[] {new Uri("http://test.example:9201"), new Uri("http://test.example:9202")};
+			var badUris = new[] { new Uri("http://test.example:9201"), new Uri("http://test.example:9202") };
 			var pool = new StaticConnectionPool(badUris);
 			var badClient = new ElasticClient(new ConnectionSettings(pool));
 			var observableBulk = badClient.BulkAll(documents, f => f
@@ -126,10 +129,11 @@ [I] public async Task BadBulkRequestFeedsToOnError()
 		private BulkAllObservable<SmallObject> KickOff(
 			string index,
 			IEnumerable<SmallObject> documents,
-			Func<BulkAllDescriptor<SmallObject>, BulkAllDescriptor<SmallObject>> selector = null)
+			Func<BulkAllDescriptor<SmallObject>, BulkAllDescriptor<SmallObject>> selector = null
+		)
 		{
 			selector = selector ?? (s => s);
-			var observableBulk = this.Client.BulkAll(documents, f => selector(f
+			var observableBulk = Client.BulkAll(documents, f => selector(f
 				.MaxDegreeOfParallelism(8)
 				.BackOffTime(TimeSpan.FromSeconds(10))
 				.BackOffRetries(2)
@@ -142,19 +146,19 @@ private BulkAllObservable<SmallObject> KickOff(
 
 		private async Task<IEnumerable<SmallObject>> CreateIndexAndReturnDocuments(string index)
 		{
-			await this.CreateIndexAsync(index, NumberOfShards, m => m
+			await CreateIndexAsync(index, NumberOfShards, m => m
 				.Map<SmallObject>(mm => mm.Properties(p => p.Number(n => n.Name(pp => pp.Number).Coerce(false).IgnoreMalformed(false)))
 				));
 
-			var documents = this.CreateLazyStreamOfDocuments(NumberOfDocuments)
+			var documents = CreateLazyStreamOfDocuments(NumberOfDocuments)
 				.Select(s =>
 				{
 					if (s.Id < FailAfterPage * Size) return s;
+
 					s.Number = "Not excepted";
 					return s;
 				});
 			return documents;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs b/src/Tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs
index 3c97b3337dd..5fa6fdd950f 100644
--- a/src/Tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs
@@ -10,59 +10,17 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Document.Multiple.DeleteByQuery
 {
-	public class DeleteByQueryApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IDeleteByQueryResponse, IDeleteByQueryRequest, DeleteByQueryDescriptor<Project>, DeleteByQueryRequest>
+	public class DeleteByQueryApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IDeleteByQueryResponse, IDeleteByQueryRequest, DeleteByQueryDescriptor<Project>,
+			DeleteByQueryRequest>
 	{
 		public DeleteByQueryApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var index in values.Values)
-			{
-				this.Client.CreateIndex(index, c => c
-					.Settings(s => s
-						.NumberOfShards(2)
-						.NumberOfReplicas(0)
-						.Analysis(DefaultSeeder.ProjectAnalysisSettings)
-					)
-					.Mappings(m => m
-						.Map<Project>(p => p
-							.AutoMap()
-							.Properties(DefaultSeeder.ProjectProperties)
-						)
-					)
-				);
-
-				this.Client.IndexMany(Project.Projects, index);
-				var cloneIndex = index + "-clone";
-				this.Client.CreateIndex(cloneIndex);
-				this.Client.Refresh(Index(index).And(cloneIndex));
-			}
-		}
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteByQuery(f),
-			fluentAsync: (client, f) => client.DeleteByQueryAsync(f),
-			request: (client, r) => client.DeleteByQuery(r),
-			requestAsync: (client, r) => client.DeleteByQueryAsync(r)
-		);
-		protected override void OnAfterCall(IElasticClient client) => client.Refresh(CallIsolatedValue);
-
-		private string SecondIndex => $"{CallIsolatedValue}-clone";
-		private Nest.Indices Indices => Index(CallIsolatedValue).And(SecondIndex);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/{CallIsolatedValue}%2C{SecondIndex}/doc/_delete_by_query?ignore_unavailable=true";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -71,24 +29,26 @@ protected override LazyResponses ClientUsage() => Calls(
 				ids = new
 				{
 					type = new[] { "doc" },
-					values = new [] { Project.First.Name, "x" }
+					values = new[] { Project.First.Name, "x" }
 				}
 			}
 		};
 
-		protected override DeleteByQueryDescriptor<Project> NewDescriptor() => new DeleteByQueryDescriptor<Project>(this.Indices);
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<DeleteByQueryDescriptor<Project>, IDeleteByQueryRequest> Fluent => d => d
-			.Index(this.Indices)
+			.Index(Indices)
 			.IgnoreUnavailable()
-			.Query(q=>q
-				.Ids(ids=>ids
+			.Query(q => q
+				.Ids(ids => ids
 					.Types(typeof(Project))
 					.Values(Project.First.Name, "x")
 				)
 			);
 
-		protected override DeleteByQueryRequest Initializer => new DeleteByQueryRequest(this.Indices, Type<Project>())
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected override DeleteByQueryRequest Initializer => new DeleteByQueryRequest(Indices, Type<Project>())
 		{
 			IgnoreUnavailable = true,
 			Query = new IdsQuery
@@ -98,6 +58,49 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/{CallIsolatedValue}%2C{SecondIndex}/doc/_delete_by_query?ignore_unavailable=true";
+		private Nest.Indices Indices => Index(CallIsolatedValue).And(SecondIndex);
+
+		private string SecondIndex => $"{CallIsolatedValue}-clone";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var index in values.Values)
+			{
+				Client.CreateIndex(index, c => c
+					.Settings(s => s
+						.NumberOfShards(2)
+						.NumberOfReplicas(0)
+						.Analysis(DefaultSeeder.ProjectAnalysisSettings)
+					)
+					.Mappings(m => m
+						.Map<Project>(p => p
+							.AutoMap()
+							.Properties(DefaultSeeder.ProjectProperties)
+						)
+					)
+				);
+
+				Client.IndexMany(Project.Projects, index);
+				var cloneIndex = index + "-clone";
+				Client.CreateIndex(cloneIndex);
+				Client.Refresh(Index(index).And(cloneIndex));
+			}
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteByQuery(f),
+			(client, f) => client.DeleteByQueryAsync(f),
+			(client, r) => client.DeleteByQuery(r),
+			(client, r) => client.DeleteByQueryAsync(r)
+		);
+
+		protected override void OnAfterCall(IElasticClient client) => client.Refresh(CallIsolatedValue);
+
+		protected override DeleteByQueryDescriptor<Project> NewDescriptor() => new DeleteByQueryDescriptor<Project>(Indices);
+
 		protected override void ExpectResponse(IDeleteByQueryResponse response)
 		{
 			response.Took.Should().BeGreaterThan(0);
@@ -119,25 +122,25 @@ public class DeleteByQueryWaitForCompletionApiTests : DeleteByQueryApiTests
 	{
 		public DeleteByQueryWaitForCompletionApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_delete_by_query?wait_for_completion=false&conflicts=proceed";
-
-		protected override DeleteByQueryDescriptor<Project> NewDescriptor() => new DeleteByQueryDescriptor<Project>(this.CallIsolatedValue);
-
 		protected override object ExpectJson => new { query = new { match_all = new { } } };
 
 		protected override Func<DeleteByQueryDescriptor<Project>, IDeleteByQueryRequest> Fluent => d => d
-			.Index(this.CallIsolatedValue)
-			.Query(q=>q.MatchAll())
+			.Index(CallIsolatedValue)
+			.Query(q => q.MatchAll())
 			.WaitForCompletion(false)
 			.Conflicts(Conflicts.Proceed);
 
-		protected override DeleteByQueryRequest Initializer => new DeleteByQueryRequest(this.CallIsolatedValue, Type<Project>())
+		protected override DeleteByQueryRequest Initializer => new DeleteByQueryRequest(CallIsolatedValue, Type<Project>())
 		{
 			Query = new MatchAllQuery(),
 			WaitForCompletion = false,
 			Conflicts = Conflicts.Proceed
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_delete_by_query?wait_for_completion=false&conflicts=proceed";
+
+		protected override DeleteByQueryDescriptor<Project> NewDescriptor() => new DeleteByQueryDescriptor<Project>(CallIsolatedValue);
+
 		protected override void ExpectResponse(IDeleteByQueryResponse response)
 		{
 			response.Task.Should().NotBeNull();
@@ -151,45 +154,26 @@ public class DeleteByQueryWithFailuresApiTests : DeleteByQueryApiTests
 	{
 		public DeleteByQueryWithFailuresApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var index in values.Values)
-			{
-				this.Client.CreateIndex(index, c => c
-					.Settings(s => s
-						.RefreshInterval(-1)
-					)
-				);
-				this.Client.Index(new Project { Name = "project1", Description = "description" },
-					i => i.Index(index).Id(1).Refresh(Refresh.True).Routing(Project.Routing));
-				this.Client.Index(new Project { Name = "project2", Description = "description" },
-					i => i.Index(index).Id(1).Routing(Project.Routing));
-			}
-		}
-
 		protected override bool ExpectIsValid => false;
-		protected override int ExpectStatusCode => 409;
 
-		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_delete_by_query";
 		protected override object ExpectJson =>
 			new
 			{
 				query = new { match = new { description = new { query = "description" } } }
 			};
 
-		protected override DeleteByQueryDescriptor<Project> NewDescriptor() => new DeleteByQueryDescriptor<Project>(this.CallIsolatedValue);
+		protected override int ExpectStatusCode => 409;
 
 		protected override Func<DeleteByQueryDescriptor<Project>, IDeleteByQueryRequest> Fluent => d => d
-			.Index(this.CallIsolatedValue)
+			.Index(CallIsolatedValue)
 			.Query(q => q
 				.Match(m => m
 					.Field(p => p.Description)
 					.Query("description")
 				)
-			)
-			;
+			);
 
-		protected override DeleteByQueryRequest Initializer => new DeleteByQueryRequest(this.CallIsolatedValue, Type<Project>())
+		protected override DeleteByQueryRequest Initializer => new DeleteByQueryRequest(CallIsolatedValue, Type<Project>())
 		{
 			Query = new MatchQuery
 			{
@@ -198,6 +182,26 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			},
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_delete_by_query";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var index in values.Values)
+			{
+				Client.CreateIndex(index, c => c
+					.Settings(s => s
+						.RefreshInterval(-1)
+					)
+				);
+				Client.Index(new Project { Name = "project1", Description = "description" },
+					i => i.Index(index).Id(1).Refresh(Refresh.True).Routing(Project.Routing));
+				Client.Index(new Project { Name = "project2", Description = "description" },
+					i => i.Index(index).Id(1).Routing(Project.Routing));
+			}
+		}
+
+		protected override DeleteByQueryDescriptor<Project> NewDescriptor() => new DeleteByQueryDescriptor<Project>(CallIsolatedValue);
+
 		protected override void ExpectResponse(IDeleteByQueryResponse response)
 		{
 			response.VersionConflicts.Should().Be(1);
@@ -220,14 +224,9 @@ protected override void ExpectResponse(IDeleteByQueryResponse response)
 
 	public class DeleteByQueryWithSlicesApiTests : DeleteByQueryApiTests
 	{
-		private static List<string> FirstTenProjectNames => Project.Projects.Take(10).Select(p => p.Name).ToList();
-
 		public DeleteByQueryWithSlicesApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-
-		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_delete_by_query";
 
 		protected override object ExpectJson =>
 			new
@@ -236,10 +235,10 @@ public DeleteByQueryWithSlicesApiTests(IntrusiveOperationCluster cluster, Endpoi
 				query = new { terms = new { name = FirstTenProjectNames } }
 			};
 
-		protected override DeleteByQueryDescriptor<Project> NewDescriptor() => new DeleteByQueryDescriptor<Project>(this.CallIsolatedValue);
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<DeleteByQueryDescriptor<Project>, IDeleteByQueryRequest> Fluent => d => d
-			.Index(this.CallIsolatedValue)
+			.Index(CallIsolatedValue)
 			.Slice(s => s
 				.Id(0)
 				.Max(2)
@@ -249,10 +248,9 @@ public DeleteByQueryWithSlicesApiTests(IntrusiveOperationCluster cluster, Endpoi
 					.Field(p => p.Name)
 					.Terms(FirstTenProjectNames)
 				)
-			)
-			;
+			);
 
-		protected override DeleteByQueryRequest Initializer => new DeleteByQueryRequest(this.CallIsolatedValue, Type<Project>())
+		protected override DeleteByQueryRequest Initializer => new DeleteByQueryRequest(CallIsolatedValue, Type<Project>())
 		{
 			Slice = new SlicedScroll
 			{
@@ -266,6 +264,11 @@ public DeleteByQueryWithSlicesApiTests(IntrusiveOperationCluster cluster, Endpoi
 			},
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_delete_by_query";
+		private static List<string> FirstTenProjectNames => Project.Projects.Take(10).Select(p => p.Name).ToList();
+
+		protected override DeleteByQueryDescriptor<Project> NewDescriptor() => new DeleteByQueryDescriptor<Project>(CallIsolatedValue);
+
 		protected override void ExpectResponse(IDeleteByQueryResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryUrlTests.cs b/src/Tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryUrlTests.cs
index 0fa1fac0702..c38f8ccdb68 100644
--- a/src/Tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryUrlTests.cs
+++ b/src/Tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryUrlTests.cs
@@ -4,7 +4,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
-using static Nest.Infer;
 
 namespace Tests.Document.Multiple.DeleteByQuery
 {
@@ -13,17 +12,17 @@ public class DeleteByQueryUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/project/_delete_by_query")
-				.Fluent(c => c.DeleteByQuery<Project>(d => d.AllTypes()))
-				.Request(c => c.DeleteByQuery(new DeleteByQueryRequest<Project>("project")))
-				.FluentAsync(c => c.DeleteByQueryAsync<Project>(d => d.AllTypes()))
-				.RequestAsync(c => c.DeleteByQueryAsync(new DeleteByQueryRequest<Project>("project")))
+					.Fluent(c => c.DeleteByQuery<Project>(d => d.AllTypes()))
+					.Request(c => c.DeleteByQuery(new DeleteByQueryRequest<Project>("project")))
+					.FluentAsync(c => c.DeleteByQueryAsync<Project>(d => d.AllTypes()))
+					.RequestAsync(c => c.DeleteByQueryAsync(new DeleteByQueryRequest<Project>("project")))
 				;
 
 			await POST("/project/doc/_delete_by_query")
-				.Fluent(c => c.DeleteByQuery<Project>(d => d))
-				.Request(c => c.DeleteByQuery(new DeleteByQueryRequest<Project>("project", "doc")))
-				.FluentAsync(c => c.DeleteByQueryAsync<Project>(d => d))
-				.RequestAsync(c => c.DeleteByQueryAsync(new DeleteByQueryRequest<Project>("project", "doc")))
+					.Fluent(c => c.DeleteByQuery<Project>(d => d))
+					.Request(c => c.DeleteByQuery(new DeleteByQueryRequest<Project>("project", "doc")))
+					.FluentAsync(c => c.DeleteByQueryAsync<Project>(d => d))
+					.RequestAsync(c => c.DeleteByQueryAsync(new DeleteByQueryRequest<Project>("project", "doc")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Document/Multiple/MultiGet/GetManyApiTests.cs b/src/Tests/Tests/Document/Multiple/MultiGet/GetManyApiTests.cs
index 2a3eb6fec4c..1e4279e4383 100644
--- a/src/Tests/Tests/Document/Multiple/MultiGet/GetManyApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/MultiGet/GetManyApiTests.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -11,19 +9,14 @@
 using Tests.Core.Client.Settings;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Multiple.MultiGet
 {
 	public class GetManyApiTests : IClusterFixture<ReadOnlyCluster>
 	{
+		private readonly IElasticClient _client;
 		private readonly ReadOnlyCluster _cluster;
 		private readonly IEnumerable<long> _ids = Developer.Developers.Select(d => (long)d.Id).Take(10);
-		private readonly IElasticClient _client;
 
 		public GetManyApiTests(ReadOnlyCluster cluster)
 		{
@@ -59,7 +52,7 @@ [I] public async Task UsesDefaultIndexAndInferredTypeAsync()
 
 		[I] public async Task CanHandleNotFoundResponses()
 		{
-			var response = await _client.GetManyAsync<Developer>(_ids.Select(i=>i*100));
+			var response = await _client.GetManyAsync<Developer>(_ids.Select(i => i * 100));
 			response.Count().Should().Be(10);
 			foreach (var hit in response)
 			{
@@ -69,12 +62,13 @@ [I] public async Task CanHandleNotFoundResponses()
 				hit.Found.Should().BeFalse();
 			}
 		}
+
 		[I] public void ThrowsExceptionOnConnectionError()
 		{
 			if (TestConnectionSettings.RunningFiddler) return; //fiddler meddles here
 
 			var client = new ElasticClient(new TestConnectionSettings(port: 9500));
-			Action response = () => client.GetMany<Developer>(_ids.Select(i=>i*100));
+			Action response = () => client.GetMany<Developer>(_ids.Select(i => i * 100));
 			response.ShouldThrow<ElasticsearchClientException>();
 		}
 	}
diff --git a/src/Tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs b/src/Tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs
index 97eca9eb828..b394db1af24 100644
--- a/src/Tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs
@@ -9,36 +9,50 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Document.Multiple.MultiGet
 {
-	public class MultiGetSimplifiedApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IMultiGetResponse, IMultiGetRequest, MultiGetDescriptor, MultiGetRequest>
+	public class MultiGetSimplifiedApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiGetResponse, IMultiGetRequest, MultiGetDescriptor, MultiGetRequest>
 	{
-		public MultiGetSimplifiedApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.MultiGet(f),
-			fluentAsync: (client, f) => client.MultiGetAsync(f),
-			request: (client, r) => client.MultiGet(r),
-			requestAsync: (client, r) => client.MultiGetAsync(r)
-		);
+		private readonly IEnumerable<long> _ids = Developer.Developers.Select(d => (long)d.Id).Take(10);
 
-		private IEnumerable<long> _ids = Developer.Developers.Select(d => (long)d.Id).Take(10);
+		public MultiGetSimplifiedApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => new
+		{
+			ids = _ids
+		};
+
 		protected override int ExpectStatusCode => 200;
+
+		protected override Func<MultiGetDescriptor, IMultiGetRequest> Fluent => d => d
+			.Index<Developer>()
+			.Type<Developer>()
+			.GetMany<Developer>(_ids);
+
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/devs/developer/_mget";
 
-		protected override bool SupportsDeserialization => false;
 
-		protected override object ExpectJson => new
+		protected override MultiGetRequest Initializer => new MultiGetRequest(Index<Developer>(), Type<Developer>())
 		{
-			ids = this._ids
+			Documents = _ids
+				.Select(n => new MultiGetOperation<Developer>(n))
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/devs/developer/_mget";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.MultiGet(f),
+			(client, f) => client.MultiGetAsync(f),
+			(client, r) => client.MultiGet(r),
+			(client, r) => client.MultiGetAsync(r)
+		);
+
 		protected override void ExpectResponse(IMultiGetResponse response)
 		{
 			response.Hits.Should().NotBeEmpty().And.HaveCount(10);
@@ -50,54 +64,45 @@ protected override void ExpectResponse(IMultiGetResponse response)
 				document.Found.Should().BeTrue();
 			}
 		}
-
-		protected override Func<MultiGetDescriptor, IMultiGetRequest> Fluent => d => d
-			.Index<Developer>()
-			.Type<Developer>()
-			.GetMany<Developer>(this._ids);
-
-
-		protected override MultiGetRequest Initializer => new MultiGetRequest(Index<Developer>(), Type<Developer>())
-		{
-			Documents = this._ids
-				.Select(n=>new MultiGetOperation<Developer>(n))
-		};
 	}
 
 	public class MultiGetApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IMultiGetResponse, IMultiGetRequest, MultiGetDescriptor, MultiGetRequest>
 	{
-		public MultiGetApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.MultiGet(f),
-			fluentAsync: (client, f) => client.MultiGetAsync(f),
-			request: (client, r) => client.MultiGet(r),
-			requestAsync: (client, r) => client.MultiGetAsync(r)
-		);
+		private readonly IEnumerable<long> _ids = Developer.Developers.Select(d => (long)d.Id).Take(10);
 
-		private IEnumerable<long> _ids = Developer.Developers.Select(d => (long)d.Id).Take(10);
+		public MultiGetApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/devs/_mget";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new
 		{
 			docs = Developer.Developers.Select(p => new { _type = "developer", _id = p.Id, routing = p.Id.ToString(), _source = false }).Take(10)
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<MultiGetDescriptor, IMultiGetRequest> Fluent => d => d
 			.Index<Developer>()
-			.GetMany<Developer>(this._ids, (g, i) => g.Routing(i.ToString()).Source(false));
+			.GetMany<Developer>(_ids, (g, i) => g.Routing(i.ToString()).Source(false));
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override MultiGetRequest Initializer => new MultiGetRequest(Index<Developer>())
 		{
-			Documents = this._ids
-				.Select(n=>new MultiGetOperation<Developer>(n) { Routing = n.ToString(), Source = false })
+			Documents = _ids
+				.Select(n => new MultiGetOperation<Developer>(n) { Routing = n.ToString(), Source = false })
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/devs/_mget";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.MultiGet(f),
+			(client, f) => client.MultiGetAsync(f),
+			(client, r) => client.MultiGet(r),
+			(client, r) => client.MultiGetAsync(r)
+		);
+
 		protected override void ExpectResponse(IMultiGetResponse response)
 		{
 			response.Hits.Should().NotBeEmpty().And.HaveCount(10);
@@ -108,51 +113,52 @@ protected override void ExpectResponse(IMultiGetResponse response)
 				hit.Id.Should().NotBeNullOrWhiteSpace();
 				hit.Found.Should().BeTrue();
 			}
-			foreach (var document in response.SourceMany<Project>(this._ids))
-			{
-				document.ShouldAdhereToSourceSerializerWhenSet();
-			}
+			foreach (var document in response.SourceMany<Project>(_ids)) document.ShouldAdhereToSourceSerializerWhenSet();
 		}
 	}
 
 
-	public class MultiGetMetadataApiTests : ApiIntegrationTestBase<ReadOnlyCluster,IMultiGetResponse, IMultiGetRequest, MultiGetDescriptor, MultiGetRequest>
+	public class MultiGetMetadataApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiGetResponse, IMultiGetRequest, MultiGetDescriptor, MultiGetRequest>
 	{
-		public MultiGetMetadataApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.MultiGet(f),
-			fluentAsync: (client, f) => client.MultiGetAsync(f),
-			request: (client, r) => client.MultiGet(r),
-			requestAsync: (client, r) => client.MultiGetAsync(r)
-		);
+		private readonly IEnumerable<string> _ids = Project.Projects.Select(d => d.Name).Take(10);
 
-		private IEnumerable<string> _ids = Project.Projects.Select(d => d.Name).Take(10);
+		public MultiGetMetadataApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/_mget";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
-			docs = this._ids.Select(i=> new
+			docs = _ids.Select(i => new
 			{
 				_id = i, routing = i
 			})
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<MultiGetDescriptor, IMultiGetRequest> Fluent => d => d
 			.Index<Project>()
 			.Type<Project>()
-			.GetMany<Project>(this._ids, (op, id) =>op.Routing(id));
+			.GetMany<Project>(_ids, (op, id) => op.Routing(id));
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override MultiGetRequest Initializer => new MultiGetRequest(Index<Project>(), Type<Project>())
 		{
-			Documents = this._ids.Select(n => new MultiGetOperation<Project>(n) { Routing = n })
+			Documents = _ids.Select(n => new MultiGetOperation<Project>(n) { Routing = n })
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/_mget";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.MultiGet(f),
+			(client, f) => client.MultiGetAsync(f),
+			(client, r) => client.MultiGet(r),
+			(client, r) => client.MultiGetAsync(r)
+		);
+
 		protected override void ExpectResponse(IMultiGetResponse response)
 		{
 			response.Hits.Should().NotBeEmpty().And.HaveCount(10);
@@ -169,40 +175,44 @@ protected override void ExpectResponse(IMultiGetResponse response)
 		}
 	}
 
-	public class MultiGetParentApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IMultiGetResponse, IMultiGetRequest, MultiGetDescriptor, MultiGetRequest>
+	public class MultiGetParentApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiGetResponse, IMultiGetRequest, MultiGetDescriptor, MultiGetRequest>
 	{
-		public MultiGetParentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.MultiGet(f),
-			fluentAsync: (client, f) => client.MultiGetAsync(f),
-			request: (client, r) => client.MultiGet(r),
-			requestAsync: (client, r) => client.MultiGetAsync(r)
-		);
+		private readonly IEnumerable<CommitActivity> _activities = CommitActivity.CommitActivities.Take(10);
 
-		private IEnumerable<CommitActivity> _activities = CommitActivity.CommitActivities.Take(10);
+		public MultiGetParentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/_mget";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
 			docs = _activities.Select(p => new { _id = p.Id, routing = p.ProjectName })
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<MultiGetDescriptor, IMultiGetRequest> Fluent => d => d
 			.Index<Project>()
 			.Type<CommitActivity>()
-			.GetMany<CommitActivity>(this._activities.Select(c => c.Id), (m, id) => m.Routing(_activities.Single(a => a.Id == id).ProjectName));
+			.GetMany<CommitActivity>(_activities.Select(c => c.Id), (m, id) => m.Routing(_activities.Single(a => a.Id == id).ProjectName));
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override MultiGetRequest Initializer => new MultiGetRequest(Index<Project>(), Type<CommitActivity>())
 		{
-			Documents = this._activities.Select(n => new MultiGetOperation<CommitActivity>(n.Id) { Routing = n.ProjectName })
+			Documents = _activities.Select(n => new MultiGetOperation<CommitActivity>(n.Id) { Routing = n.ProjectName })
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/_mget";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.MultiGet(f),
+			(client, f) => client.MultiGetAsync(f),
+			(client, r) => client.MultiGet(r),
+			(client, r) => client.MultiGetAsync(r)
+		);
+
 		protected override void ExpectResponse(IMultiGetResponse response)
 		{
 			response.Hits.Should().NotBeEmpty().And.HaveCount(10);
diff --git a/src/Tests/Tests/Document/Multiple/MultiGet/MultiGetUrlTests.cs b/src/Tests/Tests/Document/Multiple/MultiGet/MultiGetUrlTests.cs
index a90506d2bc7..a783d9927ac 100644
--- a/src/Tests/Tests/Document/Multiple/MultiGet/MultiGetUrlTests.cs
+++ b/src/Tests/Tests/Document/Multiple/MultiGet/MultiGetUrlTests.cs
@@ -12,26 +12,25 @@ public class MultiGetUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/_mget")
-				.Fluent(c => c.MultiGet())
-				.Request(c => c.MultiGet(new MultiGetRequest()))
-				.FluentAsync(c => c.MultiGetAsync())
-				.RequestAsync(c => c.MultiGetAsync(new MultiGetRequest()))
+					.Fluent(c => c.MultiGet())
+					.Request(c => c.MultiGet(new MultiGetRequest()))
+					.FluentAsync(c => c.MultiGetAsync())
+					.RequestAsync(c => c.MultiGetAsync(new MultiGetRequest()))
 				;
 
 			await POST("/project/_mget")
-				.Fluent(c => c.MultiGet(m => m.Index<Project>()))
-				.Request(c => c.MultiGet(new MultiGetRequest(typeof(Project))))
-				.FluentAsync(c => c.MultiGetAsync(m => m.Index<Project>()))
-				.RequestAsync(c => c.MultiGetAsync(new MultiGetRequest(typeof(Project))))
+					.Fluent(c => c.MultiGet(m => m.Index<Project>()))
+					.Request(c => c.MultiGet(new MultiGetRequest(typeof(Project))))
+					.FluentAsync(c => c.MultiGetAsync(m => m.Index<Project>()))
+					.RequestAsync(c => c.MultiGetAsync(new MultiGetRequest(typeof(Project))))
 				;
 
 			await POST("/project/doc/_mget")
-				.Fluent(c => c.MultiGet(m => m.Index<Project>().Type<Project>()))
-				.Request(c => c.MultiGet(new MultiGetRequest(typeof(Project), typeof(Project))))
-				.FluentAsync(c => c.MultiGetAsync(m => m.Index<Project>().Type<Project>()))
-				.RequestAsync(c => c.MultiGetAsync(new MultiGetRequest(typeof(Project), typeof(Project))))
+					.Fluent(c => c.MultiGet(m => m.Index<Project>().Type<Project>()))
+					.Request(c => c.MultiGet(new MultiGetRequest(typeof(Project), typeof(Project))))
+					.FluentAsync(c => c.MultiGetAsync(m => m.Index<Project>().Type<Project>()))
+					.RequestAsync(c => c.MultiGetAsync(new MultiGetRequest(typeof(Project), typeof(Project))))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsApiTests.cs b/src/Tests/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsApiTests.cs
index ba44033e257..2e5fe42bb27 100644
--- a/src/Tests/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsApiTests.cs
@@ -8,85 +8,41 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Document.Multiple.MultiTermVectors
 {
-	public class MultiTermVectorsDocsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IMultiTermVectorsResponse, IMultiTermVectorsRequest, MultiTermVectorsDescriptor, MultiTermVectorsRequest>
+	public class MultiTermVectorsDocsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiTermVectorsResponse, IMultiTermVectorsRequest, MultiTermVectorsDescriptor,
+			MultiTermVectorsRequest>
 	{
 		public MultiTermVectorsDocsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.MultiTermVectors(f),
-			fluentAsync: (client, f) => client.MultiTermVectorsAsync(f),
-			request: (client, r) => client.MultiTermVectors(r),
-			requestAsync: (client, r) => client.MultiTermVectorsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/devs/_mtermvectors";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new
 		{
 			docs = Developer.Developers.Select(p => new
-			{
-				_index = "devs",
-				_type = "developer",
-				_id = p.Id,
-				payloads = true,
-				field_statistics = true,
-				term_statistics = true,
-				positions = true,
-				offsets = true,
-				filter = new
 				{
-					max_num_terms = 3,
-					min_term_freq = 1,
-					min_doc_freq = 1
-				}
-			}).Take(2)
+					_index = "devs",
+					_type = "developer",
+					_id = p.Id,
+					payloads = true,
+					field_statistics = true,
+					term_statistics = true,
+					positions = true,
+					offsets = true,
+					filter = new
+					{
+						max_num_terms = 3,
+						min_term_freq = 1,
+						min_doc_freq = 1
+					}
+				})
+				.Take(2)
 		};
 
-		protected override void ExpectResponse(IMultiTermVectorsResponse response)
-		{
-			response.ShouldBeValid();
-			response.Documents.Should().NotBeEmpty().And.HaveCount(2).And.OnlyContain(d => d.Found);
-			var termvectorDoc = response.Documents.FirstOrDefault(d => d.TermVectors.Count > 0);
-
-			termvectorDoc.Should().NotBeNull();
-			termvectorDoc.Index.Should().NotBeNull();
-			termvectorDoc.Type.Should().NotBeNull();
-			termvectorDoc.Id.Should().NotBeNull();
-
-			termvectorDoc.TermVectors.Should().NotBeEmpty().And.ContainKey("firstName");
-			var vectors = termvectorDoc.TermVectors["firstName"];
-			AssertTermVectors(vectors);
-
-			vectors = termvectorDoc.TermVectors[Field<Developer>(p=>p.FirstName)];
-			AssertTermVectors(vectors);
-		}
-
-		private static void AssertTermVectors(TermVector vectors)
-		{
-			vectors.Terms.Should().NotBeEmpty();
-			foreach (var vectorTerm in vectors.Terms)
-			{
-				vectorTerm.Key.Should().NotBeNullOrWhiteSpace();
-				vectorTerm.Value.Should().NotBeNull();
-				vectorTerm.Value.TermFrequency.Should().BeGreaterThan(0);
-				vectorTerm.Value.DocumentFrequency.Should().BeGreaterThan(0);
-				vectorTerm.Value.TotalTermFrequency.Should().BeGreaterThan(0);
-				vectorTerm.Value.Tokens.Should().NotBeEmpty();
-
-				var token = vectorTerm.Value.Tokens.First();
-				token.EndOffset.Should().BeGreaterThan(0);
-			}
-		}
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<MultiTermVectorsDescriptor, IMultiTermVectorsRequest> Fluent => d => d
 			.Index<Developer>()
@@ -101,12 +57,14 @@ private static void AssertTermVectors(TermVector vectors)
 					.MinimumTermFrequency(1)
 					.MinimumDocumentFrequency(1)
 				)
-			)
-		;
+			);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override MultiTermVectorsRequest Initializer => new MultiTermVectorsRequest(Index<Developer>())
 		{
-			Documents = Developer.Developers.Select(p => p.Id).Take(2)
+			Documents = Developer.Developers.Select(p => p.Id)
+				.Take(2)
 				.Select(n => new MultiTermVectorOperation<Developer>(n)
 				{
 					FieldStatistics = true,
@@ -122,30 +80,16 @@ private static void AssertTermVectors(TermVector vectors)
 					}
 				})
 		};
-	}
-
-	public class MultiTermVectorsIdsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IMultiTermVectorsResponse, IMultiTermVectorsRequest, MultiTermVectorsDescriptor, MultiTermVectorsRequest>
-	{
-		public MultiTermVectorsIdsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.MultiTermVectors(f),
-			fluentAsync: (client, f) => client.MultiTermVectorsAsync(f),
-			request: (client, r) => client.MultiTermVectors(r),
-			requestAsync: (client, r) => client.MultiTermVectorsAsync(r)
-		);
-
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath =>
-			$"/devs/developer/_mtermvectors?field_statistics=true&payloads=true&term_statistics=true&positions=true&offsets=true";
 
 		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/devs/_mtermvectors";
 
-		protected override object ExpectJson { get; } = new
-		{
-			ids = Developer.Developers.Select(p => p.Id).Take(2)
-		};
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.MultiTermVectors(f),
+			(client, f) => client.MultiTermVectorsAsync(f),
+			(client, r) => client.MultiTermVectors(r),
+			(client, r) => client.MultiTermVectorsAsync(r)
+		);
 
 		protected override void ExpectResponse(IMultiTermVectorsResponse response)
 		{
@@ -162,7 +106,7 @@ protected override void ExpectResponse(IMultiTermVectorsResponse response)
 			var vectors = termvectorDoc.TermVectors["firstName"];
 			AssertTermVectors(vectors);
 
-			vectors = termvectorDoc.TermVectors[Field<Developer>(p=>p.FirstName)];
+			vectors = termvectorDoc.TermVectors[Field<Developer>(p => p.FirstName)];
 			AssertTermVectors(vectors);
 		}
 
@@ -174,6 +118,7 @@ private static void AssertTermVectors(TermVector vectors)
 				vectorTerm.Key.Should().NotBeNullOrWhiteSpace();
 				vectorTerm.Value.Should().NotBeNull();
 				vectorTerm.Value.TermFrequency.Should().BeGreaterThan(0);
+				vectorTerm.Value.DocumentFrequency.Should().BeGreaterThan(0);
 				vectorTerm.Value.TotalTermFrequency.Should().BeGreaterThan(0);
 				vectorTerm.Value.Tokens.Should().NotBeEmpty();
 
@@ -181,6 +126,22 @@ private static void AssertTermVectors(TermVector vectors)
 				token.EndOffset.Should().BeGreaterThan(0);
 			}
 		}
+	}
+
+	public class MultiTermVectorsIdsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiTermVectorsResponse, IMultiTermVectorsRequest, MultiTermVectorsDescriptor,
+			MultiTermVectorsRequest>
+	{
+		public MultiTermVectorsIdsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson { get; } = new
+		{
+			ids = Developer.Developers.Select(p => p.Id).Take(2)
+		};
+
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<MultiTermVectorsDescriptor, IMultiTermVectorsRequest> Fluent => d => d
 			.Index<Developer>()
@@ -190,8 +151,9 @@ private static void AssertTermVectors(TermVector vectors)
 			.Payloads()
 			.TermStatistics()
 			.Positions()
-			.Offsets()
-		;
+			.Offsets();
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override MultiTermVectorsRequest Initializer => new MultiTermVectorsRequest(Index<Developer>(), Type<Developer>())
 		{
@@ -202,5 +164,52 @@ private static void AssertTermVectors(TermVector vectors)
 			Positions = true,
 			Offsets = true
 		};
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath =>
+			$"/devs/developer/_mtermvectors?field_statistics=true&payloads=true&term_statistics=true&positions=true&offsets=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.MultiTermVectors(f),
+			(client, f) => client.MultiTermVectorsAsync(f),
+			(client, r) => client.MultiTermVectors(r),
+			(client, r) => client.MultiTermVectorsAsync(r)
+		);
+
+		protected override void ExpectResponse(IMultiTermVectorsResponse response)
+		{
+			response.ShouldBeValid();
+			response.Documents.Should().NotBeEmpty().And.HaveCount(2).And.OnlyContain(d => d.Found);
+			var termvectorDoc = response.Documents.FirstOrDefault(d => d.TermVectors.Count > 0);
+
+			termvectorDoc.Should().NotBeNull();
+			termvectorDoc.Index.Should().NotBeNull();
+			termvectorDoc.Type.Should().NotBeNull();
+			termvectorDoc.Id.Should().NotBeNull();
+
+			termvectorDoc.TermVectors.Should().NotBeEmpty().And.ContainKey("firstName");
+			var vectors = termvectorDoc.TermVectors["firstName"];
+			AssertTermVectors(vectors);
+
+			vectors = termvectorDoc.TermVectors[Field<Developer>(p => p.FirstName)];
+			AssertTermVectors(vectors);
+		}
+
+		private static void AssertTermVectors(TermVector vectors)
+		{
+			vectors.Terms.Should().NotBeEmpty();
+			foreach (var vectorTerm in vectors.Terms)
+			{
+				vectorTerm.Key.Should().NotBeNullOrWhiteSpace();
+				vectorTerm.Value.Should().NotBeNull();
+				vectorTerm.Value.TermFrequency.Should().BeGreaterThan(0);
+				vectorTerm.Value.TotalTermFrequency.Should().BeGreaterThan(0);
+				vectorTerm.Value.Tokens.Should().NotBeEmpty();
+
+				var token = vectorTerm.Value.Tokens.First();
+				token.EndOffset.Should().BeGreaterThan(0);
+			}
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsUrlTests.cs b/src/Tests/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsUrlTests.cs
index 3ae4e5c3e5f..f6bdc9a3199 100644
--- a/src/Tests/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsUrlTests.cs
+++ b/src/Tests/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsUrlTests.cs
@@ -12,24 +12,24 @@ public class MultiTermVectorsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/_mtermvectors")
-				.Fluent(c => c.MultiTermVectors())
-				.Request(c => c.MultiTermVectors(new MultiTermVectorsRequest()))
-				.FluentAsync(c => c.MultiTermVectorsAsync())
-				.RequestAsync(c => c.MultiTermVectorsAsync(new MultiTermVectorsRequest()))
+					.Fluent(c => c.MultiTermVectors())
+					.Request(c => c.MultiTermVectors(new MultiTermVectorsRequest()))
+					.FluentAsync(c => c.MultiTermVectorsAsync())
+					.RequestAsync(c => c.MultiTermVectorsAsync(new MultiTermVectorsRequest()))
 				;
 
 			await POST("/project/_mtermvectors")
-				.Fluent(c => c.MultiTermVectors(m => m.Index<Project>()))
-				.Request(c => c.MultiTermVectors(new MultiTermVectorsRequest(typeof(Project))))
-				.FluentAsync(c => c.MultiTermVectorsAsync(m => m.Index<Project>()))
-				.RequestAsync(c => c.MultiTermVectorsAsync(new MultiTermVectorsRequest(typeof(Project))))
+					.Fluent(c => c.MultiTermVectors(m => m.Index<Project>()))
+					.Request(c => c.MultiTermVectors(new MultiTermVectorsRequest(typeof(Project))))
+					.FluentAsync(c => c.MultiTermVectorsAsync(m => m.Index<Project>()))
+					.RequestAsync(c => c.MultiTermVectorsAsync(new MultiTermVectorsRequest(typeof(Project))))
 				;
 
 			await POST("/project/doc/_mtermvectors")
-				.Fluent(c => c.MultiTermVectors(m => m.Index<Project>().Type<Project>()))
-				.Request(c => c.MultiTermVectors(new MultiTermVectorsRequest(typeof(Project), typeof(Project))))
-				.FluentAsync(c => c.MultiTermVectorsAsync(m => m.Index<Project>().Type<Project>()))
-				.RequestAsync(c => c.MultiTermVectorsAsync(new MultiTermVectorsRequest(typeof(Project), typeof(Project))))
+					.Fluent(c => c.MultiTermVectors(m => m.Index<Project>().Type<Project>()))
+					.Request(c => c.MultiTermVectors(new MultiTermVectorsRequest(typeof(Project), typeof(Project))))
+					.FluentAsync(c => c.MultiTermVectorsAsync(m => m.Index<Project>().Type<Project>()))
+					.RequestAsync(c => c.MultiTermVectorsAsync(new MultiTermVectorsRequest(typeof(Project), typeof(Project))))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Document/Multiple/Reindex/ReindexApiTests.cs b/src/Tests/Tests/Document/Multiple/Reindex/ReindexApiTests.cs
index 7f4518478ea..808b5dfb273 100644
--- a/src/Tests/Tests/Document/Multiple/Reindex/ReindexApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/Reindex/ReindexApiTests.cs
@@ -14,37 +14,29 @@ namespace Tests.Document.Multiple.Reindex
 {
 	public class ReindexCluster : ClientTestClusterBase
 	{
-		protected override void SeedCluster() => new DefaultSeeder(this.Client).SeedNodeNoData();
+		protected override void SeedCluster() => new DefaultSeeder(Client).SeedNodeNoData();
 	}
 
 	public class ManualReindexCluster : ClientTestClusterBase
 	{
-		protected override void SeedCluster() => new DefaultSeeder(this.Client).SeedNodeNoData();
+		protected override void SeedCluster() => new DefaultSeeder(Client).SeedNodeNoData();
 	}
 
 	public class ReindexApiTests : IClusterFixture<ManualReindexCluster>
 	{
+		private readonly IElasticClient _client;
 		private readonly IObservable<IBulkAllResponse> _reindexManyTypesResult;
-		private readonly IObservable<IBulkAllResponse> _reindexSingleTypeResult;
 		private readonly IObservable<IBulkAllResponse> _reindexProjectionResult;
-		private readonly IElasticClient _client;
-
-		private static string NewManyTypesIndexName { get; } = $"project-many-{Guid.NewGuid().ToString("N").Substring(8)}";
-
-		private static string NewSingleTypeIndexName { get; } = $"project-single-{Guid.NewGuid().ToString("N").Substring(8)}";
-
-		private static string NewProjectionIndex { get; } = $"project-projection-{Guid.NewGuid().ToString("N").Substring(8)}";
-
-		private static string IndexName { get; } = "project";
+		private readonly IObservable<IBulkAllResponse> _reindexSingleTypeResult;
 
 		public ReindexApiTests(ManualReindexCluster cluster)
 		{
-			this._client = cluster.Client;
+			_client = cluster.Client;
 
 			// create a couple of projects
 			var projects = Project.Generator.Generate(2);
-			var indexProjectsResponse = this._client.IndexMany(projects, IndexName);
-			this._client.Refresh(IndexName);
+			var indexProjectsResponse = _client.IndexMany(projects, IndexName);
+			_client.Refresh(IndexName);
 
 			// create a thousand commits and associate with the projects
 			var commits = CommitActivity.Generator.Generate(5000);
@@ -63,18 +55,19 @@ public ReindexApiTests(ManualReindexCluster cluster)
 					.Routing(project)
 				);
 			}
-            CommitActivity UpdateJoin(CommitActivity a, string p)
-            {
-                a.ProjectName = p;
-	            return a;
-            }
 
-			var bulkResult = this._client.Bulk(b => bb);
+			CommitActivity UpdateJoin(CommitActivity a, string p)
+			{
+				a.ProjectName = p;
+				return a;
+			}
+
+			var bulkResult = _client.Bulk(b => bb);
 			bulkResult.ShouldBeValid();
 
-			this._client.Refresh(IndexName);
+			_client.Refresh(IndexName);
 
-			this._reindexManyTypesResult = this._client.Reindex<ILazyDocument>(r => r
+			_reindexManyTypesResult = _client.Reindex<ILazyDocument>(r => r
 				.BackPressureFactor(10)
 				.ScrollAll("1m", 2, s => s
 					.Search(ss => ss
@@ -90,27 +83,18 @@ CommitActivity UpdateJoin(CommitActivity a, string p)
 					.RefreshOnCompleted()
 				)
 			);
-			this._reindexSingleTypeResult = this._client.Reindex<Project>(IndexName, NewSingleTypeIndexName);
-			this._reindexProjectionResult = this._client.Reindex<CommitActivity, CommitActivityVersion2>(
-				IndexName, NewProjectionIndex, p =>  new CommitActivityVersion2(p));
+			_reindexSingleTypeResult = _client.Reindex<Project>(IndexName, NewSingleTypeIndexName);
+			_reindexProjectionResult = _client.Reindex<CommitActivity, CommitActivityVersion2>(
+				IndexName, NewProjectionIndex, p => new CommitActivityVersion2(p));
 		}
 
-		public class CommitActivityVersion2
-		{
-			public string Id { get; }
-			public string ProjectName { get; }
-			public Developer Committer { get; }
-			public JoinField Join { get; set; }
+		private static string IndexName { get; } = "project";
 
-			public CommitActivityVersion2(CommitActivity commit)
-			{
-				this.Join = commit.Join;
-				this.ProjectName = commit.ProjectName + "-projected";
-				this.Id = commit.Id + "-projected";
-				this.Committer = commit.Committer;
-			}
+		private static string NewManyTypesIndexName { get; } = $"project-many-{Guid.NewGuid().ToString("N").Substring(8)}";
 
-		}
+		private static string NewProjectionIndex { get; } = $"project-projection-{Guid.NewGuid().ToString("N").Substring(8)}";
+
+		private static string NewSingleTypeIndexName { get; } = $"project-single-{Guid.NewGuid().ToString("N").Substring(8)}";
 
 		[I] public void ReturnsExpectedResponse()
 		{
@@ -128,8 +112,16 @@ [I] public void ReturnsExpectedResponse()
 			observableWait.Wait(TimeSpan.FromMinutes(3));
 			if (ex != null) throw ex;
 
-			void Signal(Exception e) { ex = e; observableWait.Signal(); }
-			CountdownEvent GetSignal() => observableWait;
+			void Signal(Exception e)
+			{
+				ex = e;
+				observableWait.Signal();
+			}
+
+			CountdownEvent GetSignal()
+			{
+				return observableWait;
+			}
 		}
 
 		public void ReindexMany(Func<CountdownEvent> getCountDown, Action<Exception> signal)
@@ -139,18 +131,18 @@ public void ReindexMany(Func<CountdownEvent> getCountDown, Action<Exception> sig
 				onCompleted: () => ReindexManyTypesCompleted(getCountDown())
 			);
 
-			this._reindexManyTypesResult.Subscribe(manyTypesObserver);
+			_reindexManyTypesResult.Subscribe(manyTypesObserver);
 		}
 
 		private void ReindexManyTypesCompleted(CountdownEvent handle)
 		{
-			var refresh = this._client.Refresh(NewManyTypesIndexName);
+			var refresh = _client.Refresh(NewManyTypesIndexName);
 
-			var originalIndexCount = this._client.Count<CommitActivity>(c => c
+			var originalIndexCount = _client.Count<CommitActivity>(c => c
 				.Index(IndexName)
 				.Query(q => q.HasRelationName<CommitActivity>(p => p.Join))
 			);
-			var newIndexCount = this._client.Count<CommitActivity>(c => c
+			var newIndexCount = _client.Count<CommitActivity>(c => c
 				.Index(NewManyTypesIndexName)
 				.Query(q => q.HasRelationName<CommitActivity>(p => p.Join))
 			);
@@ -158,22 +150,19 @@ private void ReindexManyTypesCompleted(CountdownEvent handle)
 			originalIndexCount.Count.Should().BeGreaterThan(0).And.Be(newIndexCount.Count);
 
 			var scroll = "20s";
-			var searchResult = this._client.Search<CommitActivity>(s => s
+			var searchResult = _client.Search<CommitActivity>(s => s
 				.Index(NewManyTypesIndexName)
 				.From(0)
 				.Size(100)
-				.Query(q => q.HasRelationName<CommitActivity>(p=>p.Join))
+				.Query(q => q.HasRelationName<CommitActivity>(p => p.Join))
 				.Scroll(scroll)
 			);
 
 			do
 			{
 				var result = searchResult;
-				searchResult = this._client.Scroll<CommitActivity>(scroll, result.ScrollId);
-				foreach (var hit in searchResult.Hits)
-				{
-					hit.Routing.Should().NotBeNullOrEmpty();
-				}
+				searchResult = _client.Scroll<CommitActivity>(scroll, result.ScrollId);
+				foreach (var hit in searchResult.Hits) hit.Routing.Should().NotBeNullOrEmpty();
 			} while (searchResult.IsValid && searchResult.Documents.Any());
 			handle.Signal();
 		}
@@ -184,20 +173,20 @@ public void ReindexProjection(Func<CountdownEvent> getCountDown, Action<Exceptio
 				onError: signal,
 				onCompleted: () => ProjectionCompleted(getCountDown())
 			);
-			this._reindexProjectionResult.Subscribe(projectionObserver);
+			_reindexProjectionResult.Subscribe(projectionObserver);
 		}
 
 		private void ProjectionCompleted(CountdownEvent handle)
 		{
-			var refresh = this._client.Refresh(NewProjectionIndex);
-			var originalIndexCount = this._client.Count<CommitActivity>(c => c
+			var refresh = _client.Refresh(NewProjectionIndex);
+			var originalIndexCount = _client.Count<CommitActivity>(c => c
 				.Index(IndexName)
-				.Query(q=>q.HasRelationName<CommitActivity>(p => p.Join))
+				.Query(q => q.HasRelationName<CommitActivity>(p => p.Join))
 			);
 
-			var newIndexSearch = this._client.Search<CommitActivity>(c => c
+			var newIndexSearch = _client.Search<CommitActivity>(c => c
 				.Index(NewProjectionIndex)
-				.Query(q=>q.HasRelationName<CommitActivity>(p => p.Join))
+				.Query(q => q.HasRelationName<CommitActivity>(p => p.Join))
 			);
 
 			originalIndexCount.Count.Should().BeGreaterThan(0).And.Be(newIndexSearch.Total);
@@ -213,21 +202,36 @@ public void ReindexSingleType(Func<CountdownEvent> getCountDown, Action<Exceptio
 				onError: signal,
 				onCompleted: () => ReindexSingleTypeCompleted(getCountDown())
 			);
-			this._reindexSingleTypeResult.Subscribe(singleTypeObserver);
+			_reindexSingleTypeResult.Subscribe(singleTypeObserver);
 		}
 
 		private void ReindexSingleTypeCompleted(CountdownEvent handle)
 		{
-			var refresh = this._client.Refresh(NewSingleTypeIndexName);
-			var originalIndexCount = this._client.Count<Project>(c => c.Index(IndexName));
+			var refresh = _client.Refresh(NewSingleTypeIndexName);
+			var originalIndexCount = _client.Count<Project>(c => c.Index(IndexName));
 
 			// new index should only contain project document types
-			var newIndexCount = this._client.Count<Project>(c => c.Index(NewSingleTypeIndexName).AllTypes());
+			var newIndexCount = _client.Count<Project>(c => c.Index(NewSingleTypeIndexName).AllTypes());
 
 			originalIndexCount.Count.Should().BeGreaterThan(0).And.Be(newIndexCount.Count);
 
 			handle.Signal();
 		}
 
+		public class CommitActivityVersion2
+		{
+			public CommitActivityVersion2(CommitActivity commit)
+			{
+				Join = commit.Join;
+				ProjectName = commit.ProjectName + "-projected";
+				Id = commit.Id + "-projected";
+				Committer = commit.Committer;
+			}
+
+			public Developer Committer { get; }
+			public string Id { get; }
+			public JoinField Join { get; set; }
+			public string ProjectName { get; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs
index a578971ad50..c6851c99ccb 100644
--- a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -8,48 +7,46 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Document.Multiple.ReindexOnServer
 {
 	[SkipVersion("<2.3.0", "")]
-	public class ReindexOnServerApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IReindexOnServerResponse, IReindexOnServerRequest, ReindexOnServerDescriptor, ReindexOnServerRequest>
+	public class ReindexOnServerApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IReindexOnServerResponse, IReindexOnServerRequest, ReindexOnServerDescriptor,
+			ReindexOnServerRequest>
 	{
-		public class Test
-		{
-			public long Id { get; set; }
-			public string Flag { get; set; }
-		}
-
 		public ReindexOnServerApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var index in values.Values)
-			{
-				this.Client.Index(new Test { Id = 1, Flag = "bar" }, i => i.Index(index).Refresh(Refresh.True));
-				this.Client.Index(new Test { Id = 2, Flag = "bar" }, i => i.Index(index).Refresh(Refresh.True));
-			}
-		}
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ReindexOnServer(f),
-			fluentAsync: (client, f) => client.ReindexOnServerAsync(f),
-			request: (client, r) => client.ReindexOnServer(r),
-			requestAsync: (client, r) => client.ReindexOnServerAsync(r)
-		);
-		protected override void OnAfterCall(IElasticClient client) => client.Refresh(CallIsolatedValue);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/_reindex?refresh=true";
 
-		protected override bool SupportsDeserialization => false;
+		protected override object ExpectJson =>
+			new
+			{
+				dest = new
+				{
+					index = $"{CallIsolatedValue}-clone",
+					op_type = "create",
+					routing = "discard",
+					type = "test",
+					version_type = "internal"
+				},
+				script = new
+				{
+					source = PainlessScript,
+				},
+				source = new
+				{
+					index = CallIsolatedValue,
+					query = new { match = new { flag = new { query = "bar" } } },
+					sort = new[] { new { id = new { order = "asc" } } },
+					type = new[] { "test" },
+					size = 100
+				},
+				conflicts = "proceed"
+			};
 
-		protected virtual string PainlessScript { get; } = "if (ctx._source.flag == 'bar') {ctx._source.remove('flag')}";
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<ReindexOnServerDescriptor, IReindexOnServerRequest> Fluent => d => d
 			.Source(s => s
@@ -77,6 +74,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			.Conflicts(Conflicts.Proceed)
 			.Refresh();
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ReindexOnServerRequest Initializer => new ReindexOnServerRequest()
 		{
 			Source = new ReindexSource
@@ -86,7 +85,6 @@ protected override LazyResponses ClientUsage() => Calls(
 				Query = new MatchQuery { Field = Field<Test>(p => p.Flag), Query = "bar" },
 				Sort = new List<ISort> { new SortField { Field = "id", Order = SortOrder.Ascending } },
 				Size = 100
-
 			},
 			Destination = new ReindexDestination
 			{
@@ -101,6 +99,30 @@ protected override LazyResponses ClientUsage() => Calls(
 			Refresh = true,
 		};
 
+		protected virtual string PainlessScript { get; } = "if (ctx._source.flag == 'bar') {ctx._source.remove('flag')}";
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_reindex?refresh=true";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var index in values.Values)
+			{
+				Client.Index(new Test { Id = 1, Flag = "bar" }, i => i.Index(index).Refresh(Refresh.True));
+				Client.Index(new Test { Id = 2, Flag = "bar" }, i => i.Index(index).Refresh(Refresh.True));
+			}
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ReindexOnServer(f),
+			(client, f) => client.ReindexOnServerAsync(f),
+			(client, r) => client.ReindexOnServer(r),
+			(client, r) => client.ReindexOnServerAsync(r)
+		);
+
+		protected override void OnAfterCall(IElasticClient client) => client.Refresh(CallIsolatedValue);
+
 		protected override void ExpectResponse(IReindexOnServerResponse response)
 		{
 			response.Task.Should().BeNull();
@@ -110,37 +132,17 @@ protected override void ExpectResponse(IReindexOnServerResponse response)
 			response.Created.Should().Be(2);
 			response.Batches.Should().Be(1);
 
-			var search = this.Client.Search<Test>(s => s
+			var search = Client.Search<Test>(s => s
 				.Index(CallIsolatedValue + "-clone")
 			);
 			search.Total.Should().BeGreaterThan(0);
 			search.Documents.Should().OnlyContain(t => string.IsNullOrWhiteSpace(t.Flag));
 		}
 
-		protected override object ExpectJson =>
-			new
-			{
-				dest = new
-				{
-					index = $"{CallIsolatedValue}-clone",
-					op_type = "create",
-					routing = "discard",
-					type = "test",
-					version_type = "internal"
-				},
-				script = new
-				{
-					source = this.PainlessScript,
-				},
-				source = new
-				{
-					index = CallIsolatedValue,
-					query = new { match = new { flag = new { query = "bar" } } },
-					sort = new[] { new { id = new { order = "asc" } } },
-					type = new[] { "test" },
-					size = 100
-				},
-				conflicts = "proceed"
-			};
+		public class Test
+		{
+			public string Flag { get; set; }
+			public long Id { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerInvalidApiTests.cs b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerInvalidApiTests.cs
index 33efa621ab2..2091ea2afe9 100644
--- a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerInvalidApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerInvalidApiTests.cs
@@ -1,16 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
-using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using static Nest.Infer;
 
 namespace Tests.Document.Multiple.ReindexOnServer
 {
@@ -34,6 +27,5 @@ protected override void ExpectResponse(IReindexOnServerResponse response)
 			response.ServerError.Error.RootCause.First().Reason.Should().Contain("compil");
 			response.ServerError.Error.RootCause.First().Type.Should().Be("script_exception");
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerRemoteApiTests.cs b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerRemoteApiTests.cs
index 3930a04174d..fe2544cd293 100644
--- a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerRemoteApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerRemoteApiTests.cs
@@ -9,24 +9,38 @@
 namespace Tests.Document.Multiple.ReindexOnServer
 {
 	[SkipVersion("<2.3.0", "")]
-	public class ReindexOnServerRemoteApiTests : ApiTestBase<IntrusiveOperationCluster, IReindexOnServerResponse, IReindexOnServerRequest, ReindexOnServerDescriptor, ReindexOnServerRequest>
+	public class ReindexOnServerRemoteApiTests
+		: ApiTestBase<IntrusiveOperationCluster, IReindexOnServerResponse, IReindexOnServerRequest, ReindexOnServerDescriptor, ReindexOnServerRequest>
 	{
 		private readonly Uri _host = new Uri("http://myremoteserver.example:9200");
+
 		public ReindexOnServerRemoteApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ReindexOnServer(f),
-			fluentAsync: (client, f) => client.ReindexOnServerAsync(f),
-			request: (client, r) => client.ReindexOnServer(r),
-			requestAsync: (client, r) => client.ReindexOnServerAsync(r)
-		);
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_reindex";
-		protected override bool SupportsDeserialization => false;
+		protected override object ExpectJson =>
+			new
+			{
+				dest = new
+				{
+					index = $"{CallIsolatedValue}-clone",
+					type = "test"
+				},
+				source = new
+				{
+					remote = new
+					{
+						host = "http://myremoteserver.example:9200",
+						username = "user",
+						password = "changeme"
+					},
+					index = CallIsolatedValue,
+					type = new[] { "test" },
+					size = 100
+				}
+			};
 
 		protected override Func<ReindexOnServerDescriptor, IReindexOnServerRequest> Fluent => d => d
 			.Source(s => s
-				.Remote(r=>r.Host(_host).Username("user").Password("changeme"))
+				.Remote(r => r.Host(_host).Username("user").Password("changeme"))
 				.Index(CallIsolatedValue)
 				.Type("test")
 				.Size(100)
@@ -36,6 +50,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				.Type("test")
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ReindexOnServerRequest Initializer => new ReindexOnServerRequest()
 		{
 			Source = new ReindexSource
@@ -49,7 +65,6 @@ protected override LazyResponses ClientUsage() => Calls(
 				Index = CallIsolatedValue,
 				Type = "test",
 				Size = 100
-
 			},
 			Destination = new ReindexDestination
 			{
@@ -58,26 +73,14 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override object ExpectJson =>
-			new
-			{
-				dest = new
-				{
-					index = $"{CallIsolatedValue}-clone",
-					type = "test"
-				},
-				source = new
-				{
-					remote = new
-					{
-						host = "http://myremoteserver.example:9200",
-						username = "user",
-						password = "changeme"
-					},
-					index = CallIsolatedValue,
-					type = new[] { "test" },
-					size = 100
-				}
-			};
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_reindex";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ReindexOnServer(f),
+			(client, f) => client.ReindexOnServerAsync(f),
+			(client, r) => client.ReindexOnServer(r),
+			(client, r) => client.ReindexOnServerAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs
index 607f6f6a09b..34334f1584f 100644
--- a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs
@@ -1,57 +1,52 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Document.Multiple.ReindexOnServer
 {
-	public class ReindexOnServerSliceApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IReindexOnServerResponse, IReindexOnServerRequest, ReindexOnServerDescriptor, ReindexOnServerRequest>
+	public class ReindexOnServerSliceApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IReindexOnServerResponse, IReindexOnServerRequest, ReindexOnServerDescriptor,
+			ReindexOnServerRequest>
 	{
-		public class Test
-		{
-			public long Id { get; set; }
-			public string Flag { get; set; }
-		}
-
 		public ReindexOnServerSliceApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var index in values.Values)
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson =>
+			new
 			{
-				this.Client.Bulk(b => b
-					.Index(index)
-					.IndexMany(new []
+				dest = new
+				{
+					index = $"{CallIsolatedValue}-clone",
+					op_type = "create",
+					routing = "discard",
+					type = "test",
+					version_type = "internal"
+				},
+				source = new
+				{
+					index = CallIsolatedValue,
+					query = new { match_all = new { } },
+					sort = new[] { new { id = new { order = "asc" } } },
+					type = new[] { "test" },
+					size = 100,
+					slice = new
 					{
-						new Test { Id = 1, Flag = "bar" },
-						new Test { Id = 2, Flag = "bar" }
-					})
-					.Refresh(Refresh.WaitFor)
-				);
-			}
-		}
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ReindexOnServer(f),
-			fluentAsync: (client, f) => client.ReindexOnServerAsync(f),
-			request: (client, r) => client.ReindexOnServer(r),
-			requestAsync: (client, r) => client.ReindexOnServerAsync(r)
-		);
+						field = "id",
+						id = 0,
+						max = 2
+					}
+				},
+				conflicts = "proceed"
+			};
 
-		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/_reindex?refresh=true";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override Func<ReindexOnServerDescriptor, IReindexOnServerRequest> Fluent => d => d
 			.Source(s => s
@@ -80,6 +75,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			.Conflicts(Conflicts.Proceed)
 			.Refresh();
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ReindexOnServerRequest Initializer => new ReindexOnServerRequest
 		{
 			Source = new ReindexSource
@@ -103,37 +100,37 @@ protected override LazyResponses ClientUsage() => Calls(
 			Refresh = true,
 		};
 
-		protected override void ExpectResponse(IReindexOnServerResponse response)
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_reindex?refresh=true";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			response.SliceId.Should().Be(0);
+			foreach (var index in values.Values)
+				Client.Bulk(b => b
+					.Index(index)
+					.IndexMany(new[]
+					{
+						new Test { Id = 1, Flag = "bar" },
+						new Test { Id = 2, Flag = "bar" }
+					})
+					.Refresh(Refresh.WaitFor)
+				);
 		}
 
-		protected override object ExpectJson =>
-			new
-			{
-				dest = new
-				{
-					index = $"{CallIsolatedValue}-clone",
-					op_type = "create",
-					routing = "discard",
-					type = "test",
-					version_type = "internal"
-				},
-				source = new
-				{
-					index = CallIsolatedValue,
-					query = new { match_all = new { } },
-					sort = new[] { new { id = new { order = "asc" } } },
-					type = new[] { "test" },
-					size = 100,
-					slice = new
-					{
-						field = "id",
-						id = 0,
-						max = 2
-					}
-				},
-				conflicts = "proceed"
-			};
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ReindexOnServer(f),
+			(client, f) => client.ReindexOnServerAsync(f),
+			(client, r) => client.ReindexOnServer(r),
+			(client, r) => client.ReindexOnServerAsync(r)
+		);
+
+		protected override void ExpectResponse(IReindexOnServerResponse response) => response.SliceId.Should().Be(0);
+
+		public class Test
+		{
+			public string Flag { get; set; }
+			public long Id { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSourceApiTests.cs b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSourceApiTests.cs
index bfa3477b2af..abfa8683666 100644
--- a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSourceApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSourceApiTests.cs
@@ -5,50 +5,36 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Document.Multiple.ReindexOnServer
 {
-	public class ReindexOnServerSourceApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IReindexOnServerResponse, IReindexOnServerRequest, ReindexOnServerDescriptor, ReindexOnServerRequest>
+	public class ReindexOnServerSourceApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IReindexOnServerResponse, IReindexOnServerRequest, ReindexOnServerDescriptor,
+			ReindexOnServerRequest>
 	{
-		public class Test
-		{
-			public long Id { get; set; }
-			public string Flag { get; set; }
-		}
-
 		public ReindexOnServerSourceApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var index in values.Values)
-			{
-				this.Client.Bulk(b => b
-					.Index(index)
-					.IndexMany(new []
-					{
-						new Test { Id = 1, Flag = "bar" },
-						new Test { Id = 2, Flag = "bar" }
-					})
-					.Refresh(Refresh.WaitFor)
-				);
-			}
-		}
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ReindexOnServer(f),
-			fluentAsync: (client, f) => client.ReindexOnServerAsync(f),
-			request: (client, r) => client.ReindexOnServer(r),
-			requestAsync: (client, r) => client.ReindexOnServerAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
-		protected override string UrlPath => $"/_reindex?refresh=true";
+		protected override object ExpectJson =>
+			new
+			{
+				dest = new
+				{
+					index = $"{CallIsolatedValue}-clone",
+					type = "test",
+				},
+				source = new
+				{
+					index = CallIsolatedValue,
+					_source = new[] { "id", "flag" },
+					type = new[] { "test" },
+				},
+				conflicts = "proceed"
+			};
 
-		protected override bool SupportsDeserialization => false;
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<ReindexOnServerDescriptor, IReindexOnServerRequest> Fluent => d => d
 			.Source(s => s
@@ -66,13 +52,15 @@ protected override LazyResponses ClientUsage() => Calls(
 			.Conflicts(Conflicts.Proceed)
 			.Refresh();
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ReindexOnServerRequest Initializer => new ReindexOnServerRequest
 		{
 			Source = new ReindexSource
 			{
 				Index = CallIsolatedValue,
 				Type = "test",
-				Source = Infer.Fields<Test>(
+				Source = Fields<Test>(
 					ff => ff.Id,
 					ff => ff.Flag
 				)
@@ -86,26 +74,37 @@ protected override LazyResponses ClientUsage() => Calls(
 			Refresh = true,
 		};
 
-		protected override void ExpectResponse(IReindexOnServerResponse response)
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_reindex?refresh=true";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			response.ShouldBeValid();
+			foreach (var index in values.Values)
+				Client.Bulk(b => b
+					.Index(index)
+					.IndexMany(new[]
+					{
+						new Test { Id = 1, Flag = "bar" },
+						new Test { Id = 2, Flag = "bar" }
+					})
+					.Refresh(Refresh.WaitFor)
+				);
 		}
 
-		protected override object ExpectJson =>
-			new
-			{
-				dest = new
-				{
-					index = $"{CallIsolatedValue}-clone",
-					type = "test",
-				},
-				source = new
-				{
-					index = CallIsolatedValue,
-					_source = new [] { "id", "flag" },
-					type = new[] { "test" },
-				},
-				conflicts = "proceed"
-			};
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ReindexOnServer(f),
+			(client, f) => client.ReindexOnServerAsync(f),
+			(client, r) => client.ReindexOnServer(r),
+			(client, r) => client.ReindexOnServerAsync(r)
+		);
+
+		protected override void ExpectResponse(IReindexOnServerResponse response) => response.ShouldBeValid();
+
+		public class Test
+		{
+			public string Flag { get; set; }
+			public long Id { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerUrlTests.cs b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerUrlTests.cs
index 1f4aae00769..4a30821f2a2 100644
--- a/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerUrlTests.cs
+++ b/src/Tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerUrlTests.cs
@@ -8,15 +8,10 @@ namespace Tests.Document.Multiple.ReindexOnServer
 {
 	public class ReindexOnServerUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_reindex")
-				.Fluent(c => c.ReindexOnServer(f=>f))
-				.Request(c => c.ReindexOnServer(new ReindexOnServerRequest()))
-				.FluentAsync(c => c.ReindexOnServerAsync(f=>f))
-				.RequestAsync(c => c.ReindexOnServerAsync(new ReindexOnServerRequest()))
-				;
-
-		}
+		[U] public override async Task Urls() => await POST("/_reindex")
+			.Fluent(c => c.ReindexOnServer(f => f))
+			.Request(c => c.ReindexOnServer(new ReindexOnServerRequest()))
+			.FluentAsync(c => c.ReindexOnServerAsync(f => f))
+			.RequestAsync(c => c.ReindexOnServerAsync(new ReindexOnServerRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleApiTests.cs b/src/Tests/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleApiTests.cs
index 9c8058940ae..1ace7f5d9a1 100644
--- a/src/Tests/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleApiTests.cs
@@ -1,16 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Document.Multiple.Reindex;
-using Tests.Document.Multiple.ReindexOnServer;
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Document.Multiple.ReindexRethrottle
@@ -35,7 +32,7 @@ protected override void OnBeforeCall(IElasticClient client)
 			);
 
 			reindex.ShouldBeValid();
-			this.ExtendedValue(TaskIdKey, reindex.Task);
+			ExtendedValue(TaskIdKey, reindex.Task);
 		}
 	}
 
@@ -55,49 +52,52 @@ protected override void OnBeforeCall(IElasticClient client)
 			);
 
 			reindex.ShouldBeValid();
-			this.ExtendedValue(TaskIdKey, reindex.Task);
+			ExtendedValue(TaskIdKey, reindex.Task);
 		}
 	}
 
 	public abstract class ReindexRethrottleApiTests
-		: ApiIntegrationTestBase<ReindexCluster, IReindexRethrottleResponse, IReindexRethrottleRequest, ReindexRethrottleDescriptor, ReindexRethrottleRequest>
+		: ApiIntegrationTestBase<ReindexCluster, IReindexRethrottleResponse, IReindexRethrottleRequest, ReindexRethrottleDescriptor,
+			ReindexRethrottleRequest>
 	{
-		protected TaskId TaskId => this.RanIntegrationSetup ? this.ExtendedValue<TaskId>(TaskIdKey) : "foo:1";
-
 		protected const string TaskIdKey = "taskId";
 
 		protected ReindexRethrottleApiTests(ReindexCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			client.IndexMany(Project.Projects);
-			client.Refresh(Index<Project>());
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Rethrottle(TaskId, f),
-			fluentAsync: (client, f) => client.RethrottleAsync(TaskId, f),
-			request: (client, r) => client.Rethrottle(r),
-			requestAsync: (client, r) => client.RethrottleAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/_reindex/{TaskId.NodeId}%3A{TaskId.TaskNumber}/_rethrottle?requests_per_second=-1";
 
-		protected override bool SupportsDeserialization => false;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> Fluent => d => d
 			.TaskId(TaskId)
 			.RequestsPerSecond(-1);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ReindexRethrottleRequest Initializer => new ReindexRethrottleRequest(TaskId)
 		{
 			RequestsPerSecond = -1,
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected TaskId TaskId => RanIntegrationSetup ? ExtendedValue<TaskId>(TaskIdKey) : "foo:1";
+
+		protected override string UrlPath => $"/_reindex/{TaskId.NodeId}%3A{TaskId.TaskNumber}/_rethrottle?requests_per_second=-1";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			client.IndexMany(Project.Projects);
+			client.Refresh(Index<Project>());
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Rethrottle(TaskId, f),
+			(client, f) => client.RethrottleAsync(TaskId, f),
+			(client, r) => client.Rethrottle(r),
+			(client, r) => client.RethrottleAsync(r)
+		);
+
 		protected override void ExpectResponse(IReindexRethrottleResponse response)
 		{
 			response.ShouldBeValid();
@@ -129,7 +129,5 @@ protected override void ExpectResponse(IReindexRethrottleResponse response)
 			task.RunningTimeInNanoseconds.Should().BeGreaterThan(0);
 			task.Cancellable.Should().BeTrue();
 		}
-
-		protected override object ExpectJson => null;
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleUrlTests.cs b/src/Tests/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleUrlTests.cs
index 40fbd58f6f3..eb6d7cb5e94 100644
--- a/src/Tests/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleUrlTests.cs
+++ b/src/Tests/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleUrlTests.cs
@@ -14,17 +14,16 @@ [U] public override async Task Urls()
 		{
 			await POST($"/_reindex/{EscapeUriString(_taskId.ToString())}/_rethrottle")
 #pragma warning disable 618 // changing method signature would be binary breaking
-				.Fluent(c => c.Rethrottle(f=>f.TaskId(_taskId)))
+					.Fluent(c => c.Rethrottle(f => f.TaskId(_taskId)))
 #pragma warning restore 618
-				.Fluent(c => c.Rethrottle(_taskId))
-				.Request(c => c.Rethrottle(new ReindexRethrottleRequest(_taskId)))
+					.Fluent(c => c.Rethrottle(_taskId))
+					.Request(c => c.Rethrottle(new ReindexRethrottleRequest(_taskId)))
 #pragma warning disable 618 // changing method signature would be binary breaking
-				.FluentAsync(c => c.RethrottleAsync(f=>f.TaskId(_taskId)))
+					.FluentAsync(c => c.RethrottleAsync(f => f.TaskId(_taskId)))
 #pragma warning restore 618
-				.FluentAsync(c => c.RethrottleAsync(_taskId))
-				.RequestAsync(c => c.RethrottleAsync(new ReindexRethrottleRequest(_taskId)))
+					.FluentAsync(c => c.RethrottleAsync(_taskId))
+					.RequestAsync(c => c.RethrottleAsync(new ReindexRethrottleRequest(_taskId)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Multiple/UpdateByQuery/UpdateByQueryApiTests.cs b/src/Tests/Tests/Document/Multiple/UpdateByQuery/UpdateByQueryApiTests.cs
index b715a8be2b5..ec336e73788 100644
--- a/src/Tests/Tests/Document/Multiple/UpdateByQuery/UpdateByQueryApiTests.cs
+++ b/src/Tests/Tests/Document/Multiple/UpdateByQuery/UpdateByQueryApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
@@ -8,28 +7,46 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Document.Multiple.UpdateByQuery
 {
 	[SkipVersion("<2.3.0", "")]
-	public class UpdateByQueryApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IUpdateByQueryResponse, IUpdateByQueryRequest, UpdateByQueryDescriptor<UpdateByQueryApiTests.Test>, UpdateByQueryRequest>
+	public class UpdateByQueryApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IUpdateByQueryResponse, IUpdateByQueryRequest,
+			UpdateByQueryDescriptor<UpdateByQueryApiTests.Test>, UpdateByQueryRequest>
 	{
-		public class Test
+		public UpdateByQueryApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson { get; } = new { query = new { match_all = new { } } };
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<UpdateByQueryDescriptor<Test>, IUpdateByQueryRequest> Fluent => d => d
+			.Index(CallIsolatedValue)
+			.Query(q => q.MatchAll())
+			.Refresh()
+			.Conflicts(Conflicts.Proceed);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected override UpdateByQueryRequest Initializer => new UpdateByQueryRequest(CallIsolatedValue, Type<Test>())
 		{
-			public string Text { get; set; }
-			public string Flag { get; set; }
-		}
+			Query = new MatchAllQuery(),
+			Refresh = true,
+			Conflicts = Conflicts.Proceed
+		};
 
-		public UpdateByQueryApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/{CallIsolatedValue}/test/_update_by_query?refresh=true&conflicts=proceed";
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var index in values.Values)
 			{
-				this.Client.CreateIndex(index, c => c
+				Client.CreateIndex(index, c => c
 					.Mappings(m => m
 						.Map<Test>(map => map
 							.Dynamic(false)
@@ -39,9 +56,9 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 						)
 					)
 				);
-				this.Client.Index(new Test { Text = "words words", Flag = "bar" }, i => i.Index(index).Refresh(Refresh.True));
-				this.Client.Index(new Test { Text = "words words", Flag = "foo" }, i => i.Index(index).Refresh(Refresh.True));
-				this.Client.Map<Test>(m => m
+				Client.Index(new Test { Text = "words words", Flag = "bar" }, i => i.Index(index).Refresh(Refresh.True));
+				Client.Index(new Test { Text = "words words", Flag = "foo" }, i => i.Index(index).Refresh(Refresh.True));
+				Client.Map<Test>(m => m
 					.Index(index)
 					.Properties(props => props
 						.Text(s => s.Name(p => p.Text))
@@ -49,45 +66,24 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 					)
 				);
 
-				var searchResults = this.SearchFlags(index);
+				var searchResults = SearchFlags(index);
 				searchResults.Total.Should().Be(0);
 			}
 		}
+
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.UpdateByQuery(f),
-			fluentAsync: (client, f) => client.UpdateByQueryAsync(f),
-			request: (client, r) => client.UpdateByQuery(r),
-			requestAsync: (client, r) => client.UpdateByQueryAsync(r)
+			(client, f) => client.UpdateByQuery(f),
+			(client, f) => client.UpdateByQueryAsync(f),
+			(client, r) => client.UpdateByQuery(r),
+			(client, r) => client.UpdateByQueryAsync(r)
 		);
-		protected override void OnAfterCall(IElasticClient client) => client.Refresh(CallIsolatedValue);
-
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/{CallIsolatedValue}/test/_update_by_query?refresh=true&conflicts=proceed";
-
-		protected override bool SupportsDeserialization => false;
 
-		protected override object ExpectJson { get; } = new { query = new { match_all = new { } } };
+		protected override void OnAfterCall(IElasticClient client) => client.Refresh(CallIsolatedValue);
 
 		protected override UpdateByQueryDescriptor<Test> NewDescriptor() => new UpdateByQueryDescriptor<Test>(CallIsolatedValue).Type<Test>();
 
-		protected override Func<UpdateByQueryDescriptor<Test>, IUpdateByQueryRequest> Fluent => d => d
-			.Index(CallIsolatedValue)
-			.Query(q=>q.MatchAll())
-			.Refresh()
-			.Conflicts(Conflicts.Proceed);
-
-		protected override UpdateByQueryRequest Initializer => new UpdateByQueryRequest(CallIsolatedValue, Type<Test>())
-		{
-			Query = new MatchAllQuery(),
-			Refresh = true,
-			Conflicts = Conflicts.Proceed
-		};
-
 		private ISearchResponse<Test> SearchFlags(string index) =>
-			this.Client.Search<Test>(s => s
+			Client.Search<Test>(s => s
 				.Index(index)
 				.Query(q => q.Match(m => m.Field(p => p.Flag).Query("foo")))
 			);
@@ -100,9 +96,15 @@ protected override void ExpectResponse(IUpdateByQueryResponse response)
 			response.Updated.Should().Be(2);
 			response.Batches.Should().Be(1);
 
-			var searchResponse = this.SearchFlags(CallIsolatedValue);
+			var searchResponse = SearchFlags(CallIsolatedValue);
 			searchResponse.Total.Should().Be(1);
 		}
+
+		public class Test
+		{
+			public string Flag { get; set; }
+			public string Text { get; set; }
+		}
 	}
 
 	[SkipVersion("<2.3.0", "")]
@@ -110,10 +112,8 @@ public class UpdateByQueryWaitForCompletionApiTests : UpdateByQueryApiTests
 	{
 		public UpdateByQueryWaitForCompletionApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override string UrlPath => $"/{CallIsolatedValue}/test/_update_by_query?wait_for_completion=false&conflicts=proceed";
-
 		protected override Func<UpdateByQueryDescriptor<Test>, IUpdateByQueryRequest> Fluent => d => d
-			.Query(q=>q.MatchAll())
+			.Query(q => q.MatchAll())
 			.Index(CallIsolatedValue)
 			.WaitForCompletion(false)
 			.Conflicts(Conflicts.Proceed);
@@ -125,6 +125,8 @@ public UpdateByQueryWaitForCompletionApiTests(IntrusiveOperationCluster cluster,
 			Conflicts = Conflicts.Proceed
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}/test/_update_by_query?wait_for_completion=false&conflicts=proceed";
+
 		protected override void ExpectResponse(IUpdateByQueryResponse response)
 		{
 			response.Task.Should().NotBeNull();
@@ -137,27 +139,12 @@ protected override void ExpectResponse(IUpdateByQueryResponse response)
 	[SkipVersion("<2.3.0", "")]
 	public class UpdateByQueryWithFailuresApiTests : UpdateByQueryApiTests
 	{
-		public UpdateByQueryWithFailuresApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		private static readonly string _script = "ctx._source.text = 'x'";
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var index in values.Values)
-			{
-				this.Client.CreateIndex(index, c => c
-					.Settings(s => s
-						.RefreshInterval(-1)
-					)
-				);
-				this.Client.Index(new Test { Text = "test1", Flag = "bar" }, i => i.Index(index).Id(1).Refresh(Refresh.True));
-				this.Client.Index(new Test { Text = "test2", Flag = "bar" }, i => i.Index(index).Id(1));
-			}
-		}
-		private static string _script = "ctx._source.text = 'x'";
+		public UpdateByQueryWithFailuresApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => false;
-		protected override int ExpectStatusCode => 409;
 
-		protected override string UrlPath => $"/{CallIsolatedValue}/test/_update_by_query";
 		protected override object ExpectJson { get; } =
 			new
 			{
@@ -165,11 +152,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				script = new { source = "ctx._source.text = 'x'" }
 			};
 
+		protected override int ExpectStatusCode => 409;
+
 		protected override Func<UpdateByQueryDescriptor<Test>, IUpdateByQueryRequest> Fluent => d => d
 			.Index(CallIsolatedValue)
 			.Query(q => q.Match(m => m.Field(p => p.Flag).Query("bar")))
-			.Script(ss => ss.Source(_script))
-			;
+			.Script(ss => ss.Source(_script));
 
 		protected override UpdateByQueryRequest Initializer => new UpdateByQueryRequest(CallIsolatedValue, Type<Test>())
 		{
@@ -181,6 +169,22 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			Script = new InlineScript(_script),
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}/test/_update_by_query";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var index in values.Values)
+			{
+				Client.CreateIndex(index, c => c
+					.Settings(s => s
+						.RefreshInterval(-1)
+					)
+				);
+				Client.Index(new Test { Text = "test1", Flag = "bar" }, i => i.Index(index).Id(1).Refresh(Refresh.True));
+				Client.Index(new Test { Text = "test2", Flag = "bar" }, i => i.Index(index).Id(1));
+			}
+		}
+
 		protected override void ExpectResponse(IUpdateByQueryResponse response)
 		{
 			response.VersionConflicts.Should().Be(1);
diff --git a/src/Tests/Tests/Document/Multiple/UpdateByQuery/UpdateByQueryUrlTests.cs b/src/Tests/Tests/Document/Multiple/UpdateByQuery/UpdateByQueryUrlTests.cs
index fbd6610b9f7..9f20c60656e 100644
--- a/src/Tests/Tests/Document/Multiple/UpdateByQuery/UpdateByQueryUrlTests.cs
+++ b/src/Tests/Tests/Document/Multiple/UpdateByQuery/UpdateByQueryUrlTests.cs
@@ -4,7 +4,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
-using static Nest.Infer;
 
 namespace Tests.Document.Multiple.UpdateByQuery
 {
@@ -13,17 +12,17 @@ public class UpdateByQueryUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/project/_update_by_query")
-				.Fluent(c => c.UpdateByQuery<Project>(d => d.AllTypes()))
-				.Request(c => c.UpdateByQuery(new UpdateByQueryRequest<Project>("project")))
-				.FluentAsync(c => c.UpdateByQueryAsync<Project>(d => d.AllTypes()))
-				.RequestAsync(c => c.UpdateByQueryAsync(new UpdateByQueryRequest<Project>("project")))
+					.Fluent(c => c.UpdateByQuery<Project>(d => d.AllTypes()))
+					.Request(c => c.UpdateByQuery(new UpdateByQueryRequest<Project>("project")))
+					.FluentAsync(c => c.UpdateByQueryAsync<Project>(d => d.AllTypes()))
+					.RequestAsync(c => c.UpdateByQueryAsync(new UpdateByQueryRequest<Project>("project")))
 				;
 
 			await POST("/project/doc/_update_by_query")
-				.Fluent(c => c.UpdateByQuery<Project>(d => d))
-				.Request(c => c.UpdateByQuery(new UpdateByQueryRequest<Project>("project", "doc")))
-				.FluentAsync(c => c.UpdateByQueryAsync<Project>(d => d))
-				.RequestAsync(c => c.UpdateByQueryAsync(new UpdateByQueryRequest<Project>("project", "doc")))
+					.Fluent(c => c.UpdateByQuery<Project>(d => d))
+					.Request(c => c.UpdateByQuery(new UpdateByQueryRequest<Project>("project", "doc")))
+					.FluentAsync(c => c.UpdateByQueryAsync<Project>(d => d))
+					.RequestAsync(c => c.UpdateByQueryAsync(new UpdateByQueryRequest<Project>("project", "doc")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Document/Single/Create/CreateApiTests.cs b/src/Tests/Tests/Document/Single/Create/CreateApiTests.cs
index 4bf09247237..2b67aac83c0 100644
--- a/src/Tests/Tests/Document/Single/Create/CreateApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Create/CreateApiTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -14,42 +13,16 @@
 using Tests.Domain.Extensions;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Tests.Domain.Helpers.TestValueHelper;
 
 namespace Tests.Document.Single.Create
 {
-	public class CreateApiTests :
-		ApiIntegrationTestBase<WritableCluster, ICreateResponse, ICreateRequest<Project>, CreateDescriptor<Project>, CreateRequest<Project>>
+	public class CreateApiTests
+		: ApiIntegrationTestBase<WritableCluster, ICreateResponse, ICreateRequest<Project>, CreateDescriptor<Project>, CreateRequest<Project>>
 	{
-		protected override bool IncludeNullInExpected => false;
-
-		private Project Document => new Project
-		{
-			State = StateOfBeing.Stable,
-			Name = CallIsolatedValue,
-			StartedOn = FixedDate,
-			LastActivity = FixedDate,
-			CuratedTags = new List<Tag> {new Tag {Name = "x", Added = FixedDate}},
-			SourceOnly = TestClient.Configuration.Random.SourceSerializer ? new SourceOnlyObject() : null
-		};
-
 		public CreateApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Create(this.Document, f),
-			fluentAsync: (client, f) => client.CreateAsync(this.Document, f),
-			request: (client, r) => client.Create(r),
-			requestAsync: (client, r) => client.CreateAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 201;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath
-			=> $"/project/doc/{CallIsolatedValue}/_create?wait_for_active_shards=1&refresh=true&routing=route";
 
 		protected override object ExpectJson =>
 			new
@@ -63,23 +36,48 @@ protected override string UrlPath
 				lastActivity = FixedDate,
 				numberOfContributors = 0,
 				sourceOnly = Dependant(null, new { notWrittenByDefaultSerializer = "written" }),
-				curatedTags = new[] {new {name = "x", added = FixedDate}},
+				curatedTags = new[] { new { name = "x", added = FixedDate } },
 			};
 
-		protected override CreateDescriptor<Project> NewDescriptor() => new CreateDescriptor<Project>(this.Document);
+		protected override int ExpectStatusCode => 201;
 
 		protected override Func<CreateDescriptor<Project>, ICreateRequest<Project>> Fluent => s => s
 			.WaitForActiveShards("1")
 			.Refresh(Refresh.True)
 			.Routing("route");
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+		protected override bool IncludeNullInExpected => false;
+
 		protected override CreateRequest<Project> Initializer =>
-			new CreateRequest<Project>(this.Document)
+			new CreateRequest<Project>(Document)
 			{
 				Refresh = Refresh.True,
 				WaitForActiveShards = "1",
 				Routing = "route"
 			};
+
+		protected override string UrlPath
+			=> $"/project/doc/{CallIsolatedValue}/_create?wait_for_active_shards=1&refresh=true&routing=route";
+
+		private Project Document => new Project
+		{
+			State = StateOfBeing.Stable,
+			Name = CallIsolatedValue,
+			StartedOn = FixedDate,
+			LastActivity = FixedDate,
+			CuratedTags = new List<Tag> { new Tag { Name = "x", Added = FixedDate } },
+			SourceOnly = TestClient.Configuration.Random.SourceSerializer ? new SourceOnlyObject() : null
+		};
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Create(Document, f),
+			(client, f) => client.CreateAsync(Document, f),
+			(client, r) => client.Create(r),
+			(client, r) => client.CreateAsync(r)
+		);
+
+		protected override CreateDescriptor<Project> NewDescriptor() => new CreateDescriptor<Project>(Document);
 	}
 
 	public class CreateInvalidApiTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
@@ -91,14 +89,14 @@ public void CreateWithSameIndexTypeAndId()
 		{
 			var index = RandomString();
 			var project = Project.Generator.Generate(1).First();
-			var createResponse = this.Client.Create(project, f => f
+			var createResponse = Client.Create(project, f => f
 				.Index(index)
 			);
 			createResponse.ShouldBeValid();
 			createResponse.ApiCall.HttpStatusCode.Should().Be(201);
 			createResponse.Result.Should().Be(Result.Created);
 			createResponse.Index.Should().Be(index);
-			createResponse.Type.Should().Be(this.Client.Infer.TypeName<Project>());
+			createResponse.Type.Should().Be(Client.Infer.TypeName<Project>());
 			createResponse.Id.Should().Be(project.Name);
 
 			createResponse.Shards.Should().NotBeNull();
@@ -107,7 +105,7 @@ public void CreateWithSameIndexTypeAndId()
 			createResponse.PrimaryTerm.Should().BeGreaterThan(0);
 			createResponse.SequenceNumber.Should().BeGreaterOrEqualTo(0);
 
-			createResponse = this.Client.Create(project, f => f
+			createResponse = Client.Create(project, f => f
 				.Index(index)
 			);
 
@@ -128,22 +126,22 @@ public void Create()
 				.Select(i =>
 					new JObject
 					{
-						{"id", i},
-						{"name", $"name {i}"},
-						{"value", Math.Pow(i, 2)},
-						{"date", new DateTime(2016, 1, 1)},
+						{ "id", i },
+						{ "name", $"name {i}" },
+						{ "value", Math.Pow(i, 2) },
+						{ "date", new DateTime(2016, 1, 1) },
 						{
 							"child", new JObject
 							{
-								{"child_name", $"child_name {i}{i}"},
-								{"child_value", 3}
+								{ "child_name", $"child_name {i}{i}" },
+								{ "child_value", 3 }
 							}
 						}
 					});
 
 			var jObject = jObjects.First();
 
-			var createResponse = this.Client.Create(jObject, f => f
+			var createResponse = Client.Create(jObject, f => f
 				.Index(index)
 				.Id(jObject["id"].Value<int>())
 			);
@@ -154,7 +152,7 @@ public void Create()
 			createResponse.Index.Should().Be(index);
 			createResponse.Type.Should().Be("jobject");
 
-			var bulkResponse = this.Client.Bulk(b => b
+			var bulkResponse = Client.Bulk(b => b
 				.Index(index)
 				.CreateMany(jObjects.Skip(1), (bi, d) => bi
 					.Document(d)
@@ -190,7 +188,7 @@ public void Create()
 				}
 			};
 
-			var createResponse = this.Client.Create(anonymousType, f => f
+			var createResponse = Client.Create(anonymousType, f => f
 				.Index(index)
 				.Id(anonymousType.name)
 			);
diff --git a/src/Tests/Tests/Document/Single/Create/CreateUrlTests.cs b/src/Tests/Tests/Document/Single/Create/CreateUrlTests.cs
index f6aa8caafb4..88ccbe33936 100644
--- a/src/Tests/Tests/Document/Single/Create/CreateUrlTests.cs
+++ b/src/Tests/Tests/Document/Single/Create/CreateUrlTests.cs
@@ -16,9 +16,9 @@ [U] public async Task Urls()
 			await PUT("/project/doc/1/_create")
 				.Fluent(c => c.Create<object>(new { }, i => i.Index(typeof(Project)).Type(typeof(Project)).Id(1)))
 				.Request(c => c.Create(new CreateRequest<object>("project", "doc", 1) { Document = new { } }))
-				.FluentAsync(c => c.CreateAsync<object>(new {}, i => i.Index(typeof(Project)).Type(typeof(Project)).Id(1)))
+				.FluentAsync(c => c.CreateAsync<object>(new { }, i => i.Index(typeof(Project)).Type(typeof(Project)).Id(1)))
 				.RequestAsync(c => c.CreateAsync(new CreateRequest<object>(IndexName.From<Project>(), TypeName.From<Project>(), 1)
-                {
+				{
 					Document = new { }
 				}));
 
@@ -29,16 +29,17 @@ await PUT("/project/doc/NEST/_create?routing=NEST")
 				.RequestAsync(c => c.CreateAsync(new CreateRequest<Project>(project)));
 
 			await PUT("/project/project/NEST/_create?routing=NEST")
-				.Fluent(c => c.Create(project, cc=>cc.Index("project").Type("project")))
-				.Request(c => c.Create(new CreateRequest<Project>(project, "project", "project", "NEST") {Document = project}))
-				.RequestAsync(c => c.CreateAsync(new CreateRequest<Project>(project, "project", "project", "NEST") {Document = project}))
-				.FluentAsync(c => c.CreateAsync(project, cc=>cc.Index("project").Type("project")));
+				.Fluent(c => c.Create(project, cc => cc.Index("project").Type("project")))
+				.Request(c => c.Create(new CreateRequest<Project>(project, "project", "project", "NEST") { Document = project }))
+				.RequestAsync(c => c.CreateAsync(new CreateRequest<Project>(project, "project", "project", "NEST") { Document = project }))
+				.FluentAsync(c => c.CreateAsync(project, cc => cc.Index("project").Type("project")));
 
 			await PUT("/different-projects/project/elasticsearch/_create?routing=NEST")
-				.Request(c => c.Create(new CreateRequest<Project>("different-projects", "project", "elasticsearch") { Document = project }))
-				.Request(c => c.Create(new CreateRequest<Project>(project, "different-projects", "project", "elasticsearch")))
-				.RequestAsync(c => c.CreateAsync(new CreateRequest<Project>(project, "different-projects", "project", "elasticsearch")))
-				.RequestAsync(c => c.CreateAsync(new CreateRequest<Project>("different-projects", "project", "elasticsearch") { Document = project }))
+					.Request(c => c.Create(new CreateRequest<Project>("different-projects", "project", "elasticsearch") { Document = project }))
+					.Request(c => c.Create(new CreateRequest<Project>(project, "different-projects", "project", "elasticsearch")))
+					.RequestAsync(c => c.CreateAsync(new CreateRequest<Project>(project, "different-projects", "project", "elasticsearch")))
+					.RequestAsync(c => c.CreateAsync(new CreateRequest<Project>("different-projects", "project", "elasticsearch")
+						{ Document = project }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Document/Single/Delete/DeleteApiTests.cs b/src/Tests/Tests/Document/Single/Delete/DeleteApiTests.cs
index 218ea5e3b3c..64890a2f413 100644
--- a/src/Tests/Tests/Document/Single/Delete/DeleteApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Delete/DeleteApiTests.cs
@@ -1,48 +1,47 @@
 using System;
-using System.Collections.Generic;
 using Elasticsearch.Net;
-using Nest;
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Xunit;
 using FluentAssertions;
+using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework;
+using Tests.Framework.Integration;
 
 namespace Tests.Document.Single.Delete
 {
-	public class DeleteApiTests : ApiIntegrationTestBase<WritableCluster, IDeleteResponse, IDeleteRequest, DeleteDescriptor<Project>, DeleteRequest<Project>>
+	public class DeleteApiTests
+		: ApiIntegrationTestBase<WritableCluster, IDeleteResponse, IDeleteRequest, DeleteDescriptor<Project>, DeleteRequest<Project>>
 	{
 		public DeleteApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<DeleteDescriptor<Project>, IDeleteRequest> Fluent => d => d.Routing(Project.Instance.Name);
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+
+		protected override DeleteRequest<Project> Initializer => new DeleteRequest<Project>(CallIsolatedValue)
+		{
+			Routing = Project.Instance.Name
+		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}?routing={U(Project.Routing)}";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var id in values.Values)
-				this.Client.Index(Project.Instance, i=>i.Id(id));
+				Client.Index(Project.Instance, i => i.Id(id));
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Delete<Project>(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.DeleteAsync<Project>(CallIsolatedValue, f),
-			request: (client, r) => client.Delete(r),
-			requestAsync: (client, r) => client.DeleteAsync(r)
+			(client, f) => client.Delete<Project>(CallIsolatedValue, f),
+			(client, f) => client.DeleteAsync<Project>(CallIsolatedValue, f),
+			(client, r) => client.Delete(r),
+			(client, r) => client.DeleteAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}?routing={U(Project.Routing)}";
-
-		protected override bool SupportsDeserialization => false;
-
 		protected override DeleteDescriptor<Project> NewDescriptor() => new DeleteDescriptor<Project>(CallIsolatedValue);
-		protected override Func<DeleteDescriptor<Project>, IDeleteRequest> Fluent => d => d.Routing(Project.Instance.Name);
-		protected override DeleteRequest<Project> Initializer => new DeleteRequest<Project>(CallIsolatedValue)
-		{
-			Routing = Project.Instance.Name
-		};
 
 		protected override void ExpectResponse(IDeleteResponse response)
 		{
@@ -56,41 +55,41 @@ protected override void ExpectResponse(IDeleteResponse response)
 		}
 	}
 
-	public class DeleteNonExistentDocumentApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IDeleteResponse, IDeleteRequest,
-		DeleteDescriptor<Project>, DeleteRequest<Project>>
+	public class DeleteNonExistentDocumentApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IDeleteResponse, IDeleteRequest,
+			DeleteDescriptor<Project>, DeleteRequest<Project>>
 	{
-		public DeleteNonExistentDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Delete<Project>(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.DeleteAsync<Project>(CallIsolatedValue, f),
-			request: (client, r) => client.Delete(r),
-			requestAsync: (client, r) => client.DeleteAsync(r)
-		);
+		public DeleteNonExistentDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 404;
+		protected override Func<DeleteDescriptor<Project>, IDeleteRequest> Fluent => d => d.Routing(CallIsolatedValue);
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}?routing={CallIsolatedValue}";
 
-		protected override bool SupportsDeserialization => false;
-
-		protected override DeleteDescriptor<Project> NewDescriptor() => new DeleteDescriptor<Project>(CallIsolatedValue);
-		protected override Func<DeleteDescriptor<Project>, IDeleteRequest> Fluent => d => d.Routing(CallIsolatedValue);
 		protected override DeleteRequest<Project> Initializer => new DeleteRequest<Project>(CallIsolatedValue)
 		{
 			Routing = CallIsolatedValue
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}?routing={CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Delete<Project>(CallIsolatedValue, f),
+			(client, f) => client.DeleteAsync<Project>(CallIsolatedValue, f),
+			(client, r) => client.Delete(r),
+			(client, r) => client.DeleteAsync(r)
+		);
+
+		protected override DeleteDescriptor<Project> NewDescriptor() => new DeleteDescriptor<Project>(CallIsolatedValue);
+
 		protected override void ExpectResponse(IDeleteResponse response)
 		{
 			response.ShouldNotBeValid();
 			response.Result.Should().Be(Result.NotFound);
 			response.Index.Should().Be("project");
 			response.Type.Should().Be("doc");
-			response.Id.Should().Be(this.CallIsolatedValue);
+			response.Id.Should().Be(CallIsolatedValue);
 			response.Shards.Total.Should().BeGreaterOrEqualTo(1);
 			response.Shards.Successful.Should().BeGreaterOrEqualTo(1);
 			response.PrimaryTerm.Should().BeGreaterThan(0);
@@ -98,32 +97,33 @@ protected override void ExpectResponse(IDeleteResponse response)
 		}
 	}
 
-	public class DeleteNonExistentIndexDocumentApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IDeleteResponse, IDeleteRequest, DeleteDescriptor<Project>, DeleteRequest<Project>>
+	public class DeleteNonExistentIndexDocumentApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IDeleteResponse, IDeleteRequest, DeleteDescriptor<Project>, DeleteRequest<Project>>
 	{
 		public DeleteNonExistentIndexDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		private string BadIndex => CallIsolatedValue + "-bad-index";
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Delete<Project>(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.DeleteAsync<Project>(CallIsolatedValue, f),
-			request: (client, r) => client.Delete(r),
-			requestAsync: (client, r) => client.DeleteAsync(r)
-		);
-
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 404;
+
+		protected override Func<DeleteDescriptor<Project>, IDeleteRequest> Fluent => f => f.Index(BadIndex);
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/{BadIndex}/doc/{CallIsolatedValue}";
+		protected override DeleteRequest<Project> Initializer => new DeleteRequest<Project>(CallIsolatedValue, BadIndex);
 
 		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{BadIndex}/doc/{CallIsolatedValue}";
+
+		private string BadIndex => CallIsolatedValue + "-bad-index";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Delete<Project>(CallIsolatedValue, f),
+			(client, f) => client.DeleteAsync<Project>(CallIsolatedValue, f),
+			(client, r) => client.Delete(r),
+			(client, r) => client.DeleteAsync(r)
+		);
 
 		protected override DeleteDescriptor<Project> NewDescriptor() =>
 			new DeleteDescriptor<Project>(DocumentPath<Project>.Id(CallIsolatedValue).Index(CallIsolatedValue));
 
-		protected override Func<DeleteDescriptor<Project>, IDeleteRequest> Fluent => f => f.Index(BadIndex);
-		protected override DeleteRequest<Project> Initializer => new DeleteRequest<Project>(CallIsolatedValue, index: BadIndex);
-
 		protected override void ExpectResponse(IDeleteResponse response)
 		{
 			response.ShouldNotBeValid();
diff --git a/src/Tests/Tests/Document/Single/Delete/DeleteUrlTests.cs b/src/Tests/Tests/Document/Single/Delete/DeleteUrlTests.cs
index d42fc254e9c..3ab01b52339 100644
--- a/src/Tests/Tests/Document/Single/Delete/DeleteUrlTests.cs
+++ b/src/Tests/Tests/Document/Single/Delete/DeleteUrlTests.cs
@@ -9,14 +9,10 @@ namespace Tests.Document.Single.Delete
 {
 	public class DeleteUrlTests
 	{
-		[U] public async Task Urls()
-		{
-			await DELETE("/project/doc/1")
-				.Fluent(c => c.Delete<Project>(1))
-				.Request(c => c.Delete(new DeleteRequest<Project>(1)))
-				.FluentAsync(c => c.DeleteAsync<Project>(1))
-				.RequestAsync(c => c.DeleteAsync(new DeleteRequest<Project>(1)))
-				;
-		}
+		[U] public async Task Urls() => await DELETE("/project/doc/1")
+			.Fluent(c => c.Delete<Project>(1))
+			.Request(c => c.Delete(new DeleteRequest<Project>(1)))
+			.FluentAsync(c => c.DeleteAsync<Project>(1))
+			.RequestAsync(c => c.DeleteAsync(new DeleteRequest<Project>(1)));
 	}
 }
diff --git a/src/Tests/Tests/Document/Single/DocumentCrudTests.cs b/src/Tests/Tests/Document/Single/DocumentCrudTests.cs
index 97ae1bef2a5..b9f49d5c67b 100644
--- a/src/Tests/Tests/Document/Single/DocumentCrudTests.cs
+++ b/src/Tests/Tests/Document/Single/DocumentCrudTests.cs
@@ -7,8 +7,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Single
 {
@@ -19,31 +17,32 @@ public DocumentCrudTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 
 		protected override bool SupportsDeletes => true;
 
-		protected override LazyResponses Exists() => Calls<DocumentExistsDescriptor<Project>, DocumentExistsRequest<Project>, IDocumentExistsRequest, IExistsResponse>(
-			id => new DocumentExistsRequest<Project>(Project.Instance, id: id),
-			(id, d) => d.Routing(Project.Instance.Name),
-			fluent: (s, c, f) => c.DocumentExists<Project>(s, f),
-			fluentAsync: (s, c, f) => c.DocumentExistsAsync<Project>(s, f),
-			request: (s, c, r) => c.DocumentExists(r),
-			requestAsync: (s, c, r) => c.DocumentExistsAsync(r)
-		);
+		protected override LazyResponses Exists() =>
+			Calls<DocumentExistsDescriptor<Project>, DocumentExistsRequest<Project>, IDocumentExistsRequest, IExistsResponse>(
+				id => new DocumentExistsRequest<Project>(Project.Instance, id: id),
+				(id, d) => d.Routing(Project.Instance.Name),
+				(s, c, f) => c.DocumentExists<Project>(s, f),
+				(s, c, f) => c.DocumentExistsAsync<Project>(s, f),
+				(s, c, r) => c.DocumentExists(r),
+				(s, c, r) => c.DocumentExistsAsync(r)
+			);
 
 		protected override LazyResponses Create() => Calls<IndexDescriptor<Project>, IndexRequest<Project>, IIndexRequest<Project>, IIndexResponse>(
 			id => new IndexRequest<Project>(Project.Instance, id: id),
 			(id, d) => d.Id(id),
-			fluent: (s, c, f) => c.Index(Project.Instance, f),
-			fluentAsync: (s, c, f) => c.IndexAsync(Project.Instance, f),
-			request: (s, c, r) => c.Index(r),
-			requestAsync: (s, c, r) => c.IndexAsync(r)
+			(s, c, f) => c.Index(Project.Instance, f),
+			(s, c, f) => c.IndexAsync(Project.Instance, f),
+			(s, c, r) => c.Index(r),
+			(s, c, r) => c.IndexAsync(r)
 		);
 
 		protected override LazyResponses Read() => Calls<GetDescriptor<Project>, GetRequest<Project>, IGetRequest, IGetResponse<Project>>(
 			id => new GetRequest<Project>(id) { Routing = Project.Instance.Name },
 			(id, d) => d.Routing(Project.Instance.Name),
-			fluent: (s, c, f) => c.Get<Project>(s, f),
-			fluentAsync: (s, c, f) => c.GetAsync<Project>(s, f),
-			request: (s, c, r) => c.Get<Project>(r),
-			requestAsync: (s, c, r) => c.GetAsync<Project>(r)
+			(s, c, f) => c.Get<Project>(s, f),
+			(s, c, f) => c.GetAsync<Project>(s, f),
+			(s, c, r) => c.Get<Project>(r),
+			(s, c, r) => c.GetAsync<Project>(r)
 		);
 
 		protected override LazyResponses Update() => Calls<
@@ -51,43 +50,43 @@ protected override LazyResponses Update() => Calls<
 			UpdateRequest<Project, Project>,
 			IUpdateRequest<Project, Project>,
 			IUpdateResponse<Project>
-			>(
-				id => new UpdateRequest<Project, Project>(id)
-				{
-					Routing = Project.Instance.Name,
-					Doc = new Project { Description = id + " updated" }
-				},
-				(id, d) => d
-					.Routing(Project.Instance.Name)
-					.Doc(new Project { Description = id + " updated"} ),
-				fluent: (s, c, f) => c.Update<Project, Project>(s, f),
-				fluentAsync: (s, c, f) => c.UpdateAsync<Project, Project>(s, f),
-				request: (s, c, r) => c.Update<Project, Project>(r),
-				requestAsync: (s, c, r) => c.UpdateAsync<Project, Project>(r)
-			);
+		>(
+			id => new UpdateRequest<Project, Project>(id)
+			{
+				Routing = Project.Instance.Name,
+				Doc = new Project { Description = id + " updated" }
+			},
+			(id, d) => d
+				.Routing(Project.Instance.Name)
+				.Doc(new Project { Description = id + " updated" }),
+			(s, c, f) => c.Update<Project, Project>(s, f),
+			(s, c, f) => c.UpdateAsync<Project, Project>(s, f),
+			(s, c, r) => c.Update<Project, Project>(r),
+			(s, c, r) => c.UpdateAsync<Project, Project>(r)
+		);
 
 		protected override LazyResponses Delete() => Calls<DeleteDescriptor<Project>, DeleteRequest<Project>, IDeleteRequest, IDeleteResponse>(
 			id => new DeleteRequest<Project>(id) { Routing = Project.Instance.Name },
 			(id, d) => d.Routing(Project.Instance.Name),
-			fluent: (s, c, f) => c.Delete<Project>(s, f),
-			fluentAsync: (s, c, f) => c.DeleteAsync<Project>(s, f),
-			request: (s, c, r) => c.Delete(r),
-			requestAsync: (s, c, r) => c.DeleteAsync(r)
+			(s, c, f) => c.Delete<Project>(s, f),
+			(s, c, f) => c.DeleteAsync<Project>(s, f),
+			(s, c, r) => c.Delete(r),
+			(s, c, r) => c.DeleteAsync(r)
 		);
 
-		[I] protected async Task DocumentIsUpdated() => await this.AssertOnGetAfterUpdate(r =>
+		[I] protected async Task DocumentIsUpdated() => await AssertOnGetAfterUpdate(r =>
 		{
 			r.Source.Should().NotBeNull();
 			r.Version.Should().BeGreaterThan(1);
 			r.Source.Description.Should().EndWith("updated");
 		});
 
-		[I] protected async Task DocumentIsDeleted() => await this.AssertOnGetAfterDelete(r =>
+		[I] protected async Task DocumentIsDeleted() => await AssertOnGetAfterDelete(r =>
 			r.Found.Should().BeFalse()
 		);
 
 		[I]
-		protected override async Task GetAfterDeleteIsValid() => await this.AssertOnGetAfterDelete(r =>
+		protected override async Task GetAfterDeleteIsValid() => await AssertOnGetAfterDelete(r =>
 		{
 			r.ShouldNotBeValid();
 			r.Index.Should().NotBeNullOrEmpty();
@@ -103,7 +102,6 @@ protected override void ExpectDeleteNotFoundResponse(IDeleteResponse response)
 			response.Version.Should().BeGreaterThan(0);
 			response.SequenceNumber.Should().BeGreaterThan(0);
 			response.Result.Should().Be(Result.NotFound);
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Single/Exists/DocumentExistsApiTests.cs b/src/Tests/Tests/Document/Single/Exists/DocumentExistsApiTests.cs
index b57e3104877..7d2a490de3e 100644
--- a/src/Tests/Tests/Document/Single/Exists/DocumentExistsApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Exists/DocumentExistsApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -7,41 +6,42 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Single.Exists
 {
-	public class DocumentExistsApiTests : ApiIntegrationTestBase<WritableCluster, IExistsResponse, IDocumentExistsRequest, DocumentExistsDescriptor<Project>, DocumentExistsRequest<Project>>
+	public class DocumentExistsApiTests
+		: ApiIntegrationTestBase<WritableCluster, IExistsResponse, IDocumentExistsRequest, DocumentExistsDescriptor<Project>,
+			DocumentExistsRequest<Project>>
 	{
 		public DocumentExistsApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<DocumentExistsDescriptor<Project>, IDocumentExistsRequest> Fluent => d => d.Routing(Project.Routing);
+		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
+
+		protected override DocumentExistsRequest<Project> Initializer => new DocumentExistsRequest<Project>(CallIsolatedValue)
+		{
+			Routing = Project.Routing
+		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}?routing={U(Project.Routing)}";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var id in values.Values)
-				this.Client.Index(Project.Instance, i=>i.Id(id));
+				Client.Index(Project.Instance, i => i.Id(id));
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DocumentExists<Project>(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.DocumentExistsAsync<Project>(CallIsolatedValue, f),
-			request: (client, r) => client.DocumentExists(r),
-			requestAsync: (client, r) => client.DocumentExistsAsync(r)
+			(client, f) => client.DocumentExists<Project>(CallIsolatedValue, f),
+			(client, f) => client.DocumentExistsAsync<Project>(CallIsolatedValue, f),
+			(client, r) => client.DocumentExists(r),
+			(client, r) => client.DocumentExistsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}?routing={U(Project.Routing)}";
-
-		protected override bool SupportsDeserialization => false;
-
 		protected override DocumentExistsDescriptor<Project> NewDescriptor() => new DocumentExistsDescriptor<Project>(CallIsolatedValue);
-		protected override Func<DocumentExistsDescriptor<Project>, IDocumentExistsRequest> Fluent => d => d.Routing(Project.Routing);
-		protected override DocumentExistsRequest<Project> Initializer => new DocumentExistsRequest<Project>(CallIsolatedValue)
-		{
-			Routing = Project.Routing
-		};
 
 		protected override void ExpectResponse(IExistsResponse response)
 		{
diff --git a/src/Tests/Tests/Document/Single/Exists/DocumentExistsUrlTests.cs b/src/Tests/Tests/Document/Single/Exists/DocumentExistsUrlTests.cs
index 083feb3db9c..8fa4c958e8b 100644
--- a/src/Tests/Tests/Document/Single/Exists/DocumentExistsUrlTests.cs
+++ b/src/Tests/Tests/Document/Single/Exists/DocumentExistsUrlTests.cs
@@ -9,14 +9,10 @@ namespace Tests.Document.Single.Exists
 {
 	public class DocumentExistsUrlTests
 	{
-		[U] public async Task Urls()
-		{
-			await HEAD("/project/doc/1")
-				.Fluent(c => c.DocumentExists<Project>(1))
-				.Request(c => c.DocumentExists(new DocumentExistsRequest<Project>(1)))
-				.FluentAsync(c => c.DocumentExistsAsync<Project>(1))
-				.RequestAsync(c => c.DocumentExistsAsync(new DocumentExistsRequest<Project>(1)))
-				;
-		}
+		[U] public async Task Urls() => await HEAD("/project/doc/1")
+			.Fluent(c => c.DocumentExists<Project>(1))
+			.Request(c => c.DocumentExists(new DocumentExistsRequest<Project>(1)))
+			.FluentAsync(c => c.DocumentExistsAsync<Project>(1))
+			.RequestAsync(c => c.DocumentExistsAsync(new DocumentExistsRequest<Project>(1)));
 	}
 }
diff --git a/src/Tests/Tests/Document/Single/Get/GetApiTests.cs b/src/Tests/Tests/Document/Single/Get/GetApiTests.cs
index 3c140d0d69c..f7f79aec331 100644
--- a/src/Tests/Tests/Document/Single/Get/GetApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Get/GetApiTests.cs
@@ -1,44 +1,44 @@
-using System;
+using System;
 using System.Linq;
 using Elasticsearch.Net;
+using FluentAssertions;
 using Nest;
+using Tests.Core.Extensions;
+using Tests.Core.ManagedElasticsearch.Clusters;
+using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
- using Xunit;
-using FluentAssertions;
- using Tests.Core.Extensions;
- using Tests.Core.ManagedElasticsearch.Clusters;
- using Tests.Domain;
- using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Document.Single.Get
 {
-	public class GetApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<Project>, IGetRequest, GetDescriptor<Project>, GetRequest<Project>>
+	public class GetApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<Project>, IGetRequest, GetDescriptor<Project>, GetRequest<Project>>
 	{
-		protected string ProjectId => Project.First.Name;
-
-	    public GetApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Get<Project>(this.ProjectId, f),
-			fluentAsync: (client, f) => client.GetAsync<Project>(this.ProjectId, f),
-			request: (client, r) => client.Get<Project>(r),
-			requestAsync: (client, r) => client.GetAsync<Project>(r)
-		);
+		public GetApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
+		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => g => g.Routing(ProjectId);
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/project/doc/{U(this.ProjectId)}?routing={U(this.ProjectId)}";
+
+		protected override GetRequest<Project> Initializer => new GetRequest<Project>(ProjectId)
+		{
+			Routing = ProjectId
+		};
+
+		protected string ProjectId => Project.First.Name;
 
 		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{U(ProjectId)}?routing={U(ProjectId)}";
 
-		protected override GetDescriptor<Project> NewDescriptor() => new GetDescriptor<Project>(this.ProjectId);
-		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => g=>g.Routing(this.ProjectId);
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Get<Project>(ProjectId, f),
+			(client, f) => client.GetAsync<Project>(ProjectId, f),
+			(client, r) => client.Get<Project>(r),
+			(client, r) => client.GetAsync<Project>(r)
+		);
 
-		protected override GetRequest<Project> Initializer => new GetRequest<Project>(this.ProjectId)
-		{
-			Routing = this.ProjectId
-		};
+		protected override GetDescriptor<Project> NewDescriptor() => new GetDescriptor<Project>(ProjectId);
 
 		protected override void ExpectResponse(IGetResponse<Project> response)
 		{
@@ -48,67 +48,72 @@ protected override void ExpectResponse(IGetResponse<Project> response)
 		}
 	}
 
-	public class GetNonExistentDocumentApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<Project>, IGetRequest, GetDescriptor<Project>, GetRequest<Project>>
+	public class GetNonExistentDocumentApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<Project>, IGetRequest, GetDescriptor<Project>, GetRequest<Project>>
 	{
-		protected string ProjectId => this.CallIsolatedValue;
-
-	    public GetNonExistentDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Get<Project>(this.ProjectId, f),
-			fluentAsync: (client, f) => client.GetAsync<Project>(this.ProjectId, f),
-			request: (client, r) => client.Get<Project>(r),
-			requestAsync: (client, r) => client.GetAsync<Project>(r)
-		);
+		public GetNonExistentDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 404;
+		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => g => g.Routing(ProjectId);
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/project/doc/{U(this.ProjectId)}?routing={U(this.ProjectId)}";
 
-		protected override bool SupportsDeserialization => false;
-
-		protected override GetDescriptor<Project> NewDescriptor() => new GetDescriptor<Project>(this.ProjectId);
-		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => g => g.Routing(this.ProjectId);
-		protected override GetRequest<Project> Initializer => new GetRequest<Project>(this.ProjectId)
+		protected override GetRequest<Project> Initializer => new GetRequest<Project>(ProjectId)
 		{
-			Routing = this.ProjectId
+			Routing = ProjectId
 		};
 
+		protected string ProjectId => CallIsolatedValue;
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{U(ProjectId)}?routing={U(ProjectId)}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Get<Project>(ProjectId, f),
+			(client, f) => client.GetAsync<Project>(ProjectId, f),
+			(client, r) => client.Get<Project>(r),
+			(client, r) => client.GetAsync<Project>(r)
+		);
+
+		protected override GetDescriptor<Project> NewDescriptor() => new GetDescriptor<Project>(ProjectId);
+
 		protected override void ExpectResponse(IGetResponse<Project> response)
 		{
 			response.Found.Should().BeFalse();
 			response.Index.Should().Be("project");
 			response.Type.Should().Be("doc");
-			response.Id.Should().Be(this.CallIsolatedValue);
+			response.Id.Should().Be(CallIsolatedValue);
 		}
 	}
 
-	public class GetNonExistentIndexDocumentApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<Project>, IGetRequest, GetDescriptor<Project>, GetRequest<Project>>
+	public class GetNonExistentIndexDocumentApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<Project>, IGetRequest, GetDescriptor<Project>, GetRequest<Project>>
 	{
-		protected string ProjectId => this.CallIsolatedValue;
-		protected string BadIndex => this.CallIsolatedValue + "-index";
+		public GetNonExistentIndexDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-	    public GetNonExistentIndexDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Get<Project>(this.ProjectId, f),
-			fluentAsync: (client, f) => client.GetAsync<Project>(this.ProjectId, f),
-			request: (client, r) => client.Get<Project>(r),
-			requestAsync: (client, r) => client.GetAsync<Project>(r)
-		);
+		protected string BadIndex => CallIsolatedValue + "-index";
 
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 404;
+
+		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => (g) => g.Index(BadIndex);
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/{BadIndex}/doc/{U(this.ProjectId)}";
 
-		protected override bool SupportsDeserialization => false;
+		protected override GetRequest<Project> Initializer => new GetRequest<Project>(ProjectId, BadIndex);
+		protected string ProjectId => CallIsolatedValue;
 
-		protected override GetDescriptor<Project> NewDescriptor() =>
-			new GetDescriptor<Project>(DocumentPath<Project>.Id(this.ProjectId).Index(BadIndex));
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{BadIndex}/doc/{U(ProjectId)}";
 
-		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => (g) => g.Index(BadIndex);
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Get<Project>(ProjectId, f),
+			(client, f) => client.GetAsync<Project>(ProjectId, f),
+			(client, r) => client.Get<Project>(r),
+			(client, r) => client.GetAsync<Project>(r)
+		);
 
-		protected override GetRequest<Project> Initializer => new GetRequest<Project>(this.ProjectId, index: BadIndex);
+		protected override GetDescriptor<Project> NewDescriptor() =>
+			new GetDescriptor<Project>(DocumentPath<Project>.Id(ProjectId).Index(BadIndex));
 
 		protected override void ExpectResponse(IGetResponse<Project> response)
 		{
@@ -118,38 +123,41 @@ protected override void ExpectResponse(IGetResponse<Project> response)
 		}
 	}
 
-	public class GetApiParentTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<CommitActivity>, IGetRequest, GetDescriptor<CommitActivity>, GetRequest<CommitActivity>>
+	public class GetApiParentTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<CommitActivity>, IGetRequest, GetDescriptor<CommitActivity>, GetRequest<CommitActivity>
+		>
 	{
+		public GetApiParentTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected CommitActivity CommitActivity => CommitActivity.CommitActivities.First();
 
 		protected string CommitActivityId => CommitActivity.Id;
 
-	    public GetApiParentTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Get<CommitActivity>(this.CommitActivityId, f),
-			fluentAsync: (client, f) => client.GetAsync<CommitActivity>(this.CommitActivityId, f),
-			request: (client, r) => client.Get<CommitActivity>(r),
-			requestAsync: (client, r) => client.GetAsync<CommitActivity>(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/project/doc/{U(this.CommitActivityId)}?routing={U(this.CommitActivity.ProjectName)}";
-
-		protected override bool SupportsDeserialization => false;
-
-		protected override GetDescriptor<CommitActivity> NewDescriptor() => new GetDescriptor<CommitActivity>(CommitActivity);
 
 		protected override Func<GetDescriptor<CommitActivity>, IGetRequest> Fluent => g => g
-			.Routing(this.CommitActivity.ProjectName)
-			;
+			.Routing(CommitActivity.ProjectName);
+
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
-		protected override GetRequest<CommitActivity> Initializer => new GetRequest<CommitActivity>(this.CommitActivityId)
+		protected override GetRequest<CommitActivity> Initializer => new GetRequest<CommitActivity>(CommitActivityId)
 		{
-			Routing = this.CommitActivity.ProjectName
+			Routing = CommitActivity.ProjectName
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{U(CommitActivityId)}?routing={U(CommitActivity.ProjectName)}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Get<CommitActivity>(CommitActivityId, f),
+			(client, f) => client.GetAsync<CommitActivity>(CommitActivityId, f),
+			(client, r) => client.Get<CommitActivity>(r),
+			(client, r) => client.GetAsync<CommitActivity>(r)
+		);
+
+		protected override GetDescriptor<CommitActivity> NewDescriptor() => new GetDescriptor<CommitActivity>(CommitActivity);
+
 		protected override void ExpectResponse(IGetResponse<CommitActivity> response)
 		{
 			response.Source.Should().NotBeNull();
@@ -158,7 +166,6 @@ protected override void ExpectResponse(IGetResponse<CommitActivity> response)
 #pragma warning disable 618
 			response.Parent.Should().BeNullOrEmpty();
 #pragma warning restore 618
-
 		}
 	}
 
@@ -166,10 +173,8 @@ public class GetApiFieldsTests : GetApiTests
 	{
 		public GetApiFieldsTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override string UrlPath => $"/project/doc/{U(this.ProjectId)}?stored_fields=name%2CnumberOfCommits&routing={U(this.ProjectId)}";
-
 		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => g => g
-			.Routing(this.ProjectId)
+			.Routing(ProjectId)
 			.StoredFields(
 				p => p.Name,
 				p => p.NumberOfCommits
@@ -181,6 +186,8 @@ public GetApiFieldsTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 			StoredFields = Infer.Fields<Project>(p => p.Name, p => p.NumberOfCommits)
 		};
 
+		protected override string UrlPath => $"/project/doc/{U(ProjectId)}?stored_fields=name%2CnumberOfCommits&routing={U(ProjectId)}";
+
 		protected override void ExpectResponse(IGetResponse<Project> response)
 		{
 			response.Fields.Should().NotBeNull();
diff --git a/src/Tests/Tests/Document/Single/Get/GetUrlTests.cs b/src/Tests/Tests/Document/Single/Get/GetUrlTests.cs
index cd1180ffa6b..7a7d2fdda9a 100644
--- a/src/Tests/Tests/Document/Single/Get/GetUrlTests.cs
+++ b/src/Tests/Tests/Document/Single/Get/GetUrlTests.cs
@@ -1,12 +1,10 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Domain;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
-using static Nest.Infer;
 
 namespace Tests.Document.Single.Get
 {
@@ -16,51 +14,52 @@ public class GetUrlTests
 		public async Task Urls()
 		{
 			await GET("/project/doc/1")
-				.Fluent(c => c.Get<Project>(1))
-				.Request(c => c.Get<Project>(new GetRequest<Project>(1)))
-				.FluentAsync(c => c.GetAsync<Project>(1))
-				.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(1)))
+					.Fluent(c => c.Get<Project>(1))
+					.Request(c => c.Get<Project>(new GetRequest<Project>(1)))
+					.FluentAsync(c => c.GetAsync<Project>(1))
+					.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(1)))
 				;
 
 			//new GetRequest<Project>(null, null, 1) is still an error
 			await GET("/project/doc/1")
-				.Fluent(c => c.Get<Project>(1, g => g.Index(null).Type(null)))
-				.Request(c => c.Get<Project>(new GetRequest<Project>(new DocumentPath<Project>(1).Index(null).Type(null))))
-				.FluentAsync(c => c.GetAsync<Project>(1, g => g.Index(null).Type(null)))
-				.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(new DocumentPath<Project>(1).Index(null).Type(null))))
+					.Fluent(c => c.Get<Project>(1, g => g.Index(null).Type(null)))
+					.Request(c => c.Get<Project>(new GetRequest<Project>(new DocumentPath<Project>(1).Index(null).Type(null))))
+					.FluentAsync(c => c.GetAsync<Project>(1, g => g.Index(null).Type(null)))
+					.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(new DocumentPath<Project>(1).Index(null).Type(null))))
 				;
 
 			await GET("/testindex/typeindex/1")
-				.Fluent(c => c.Get<Project>(1, g => g.Index("testindex").Type("typeindex")))
-				.Request(c => c.Get<Project>(new GetRequest<Project>(new DocumentPath<Project>(1).Index("testindex").Type("typeindex"))))
-				.Request(c => c.Get<Project>(new GetRequest<Project>("testindex", "typeindex", 1)))
-				.FluentAsync(c => c.GetAsync<Project>(1, g => g.Index("testindex").Type("typeindex")))
-				.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(new DocumentPath<Project>(1).Index("testindex").Type("typeindex"))))
-				.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>("testindex", "typeindex", 1)))
+					.Fluent(c => c.Get<Project>(1, g => g.Index("testindex").Type("typeindex")))
+					.Request(c => c.Get<Project>(new GetRequest<Project>(new DocumentPath<Project>(1).Index("testindex").Type("typeindex"))))
+					.Request(c => c.Get<Project>(new GetRequest<Project>("testindex", "typeindex", 1)))
+					.FluentAsync(c => c.GetAsync<Project>(1, g => g.Index("testindex").Type("typeindex")))
+					.RequestAsync(
+						c => c.GetAsync<Project>(new GetRequest<Project>(new DocumentPath<Project>(1).Index("testindex").Type("typeindex"))))
+					.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>("testindex", "typeindex", 1)))
 				;
 
 			var urlId = "http://id.mynamespace/metainformation?x=y,2";
 			var escaped = "http%3A%2F%2Fid.mynamespace%2Fmetainformation%3Fx%3Dy%2C2";
 			await GET($"/project/doc/{escaped}")
-				.Fluent(c => c.Get<Project>(urlId))
-				.Request(c => c.Get<Project>(new GetRequest<Project>(urlId)))
-				.FluentAsync(c => c.GetAsync<Project>(urlId))
-				.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(urlId)))
+					.Fluent(c => c.Get<Project>(urlId))
+					.Request(c => c.Get<Project>(new GetRequest<Project>(urlId)))
+					.FluentAsync(c => c.GetAsync<Project>(urlId))
+					.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(urlId)))
 				;
 
 			await GET($"/project/doc/{escaped}?routing={escaped}")
-				.Fluent(c => c.Get<Project>(urlId, s=>s.Routing(urlId)))
-				.Request(c => c.Get<Project>(new GetRequest<Project>(urlId) { Routing = urlId }))
-				.FluentAsync(c => c.GetAsync<Project>(urlId, s=>s.Routing(urlId)))
-				.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(urlId) { Routing = urlId }))
+					.Fluent(c => c.Get<Project>(urlId, s => s.Routing(urlId)))
+					.Request(c => c.Get<Project>(new GetRequest<Project>(urlId) { Routing = urlId }))
+					.FluentAsync(c => c.GetAsync<Project>(urlId, s => s.Routing(urlId)))
+					.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(urlId) { Routing = urlId }))
 				;
 
 			GET($"/project/doc/{escaped}?routing={escaped}")
 				.LowLevel(c => c.Get<DynamicResponse>("project", "doc", urlId, new GetRequestParameters
-				{
-					Routing = urlId
-				})
-			);
+					{
+						Routing = urlId
+					})
+				);
 		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Single/Index/IndexApiTests.cs b/src/Tests/Tests/Document/Single/Index/IndexApiTests.cs
index 1fa45d74c20..1696311973e 100644
--- a/src/Tests/Tests/Document/Single/Index/IndexApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Index/IndexApiTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -14,42 +13,16 @@
 using Tests.Domain.Extensions;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Tests.Domain.Helpers.TestValueHelper;
 
 namespace Tests.Document.Single.Index
 {
-	public class IndexApiTests :
-		ApiIntegrationTestBase<WritableCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
+	public class IndexApiTests
+		: ApiIntegrationTestBase<WritableCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
 	{
-		protected override bool IncludeNullInExpected => false;
-
-		private Project Document => new Project
-		{
-			State = StateOfBeing.Stable,
-			Name = CallIsolatedValue,
-			StartedOn = FixedDate,
-			LastActivity = FixedDate,
-			CuratedTags = new List<Tag> {new Tag {Name = "x", Added = FixedDate}},
-			SourceOnly = TestClient.Configuration.Random.SourceSerializer ? new SourceOnlyObject() : null
-		};
-
 		public IndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Index<Project>(this.Document, f),
-			fluentAsync: (client, f) => client.IndexAsync<Project>(this.Document, f),
-			request: (client, r) => client.Index(r),
-			requestAsync: (client, r) => client.IndexAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 201;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath
-			=> $"/project/doc/{CallIsolatedValue}?wait_for_active_shards=1&op_type=index&refresh=true&routing=route";
 
 		protected override object ExpectJson =>
 			new
@@ -63,10 +36,10 @@ protected override string UrlPath
 				lastActivity = FixedDate,
 				numberOfContributors = 0,
 				sourceOnly = Dependant(null, new { notWrittenByDefaultSerializer = "written" }),
-				curatedTags = new[] {new {name = "x", added = FixedDate}},
+				curatedTags = new[] { new { name = "x", added = FixedDate } },
 			};
 
-		protected override IndexDescriptor<Project> NewDescriptor() => new IndexDescriptor<Project>(this.Document);
+		protected override int ExpectStatusCode => 201;
 
 		protected override Func<IndexDescriptor<Project>, IIndexRequest<Project>> Fluent => s => s
 			.WaitForActiveShards("1")
@@ -74,14 +47,39 @@ protected override string UrlPath
 			.Refresh(Refresh.True)
 			.Routing("route");
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+		protected override bool IncludeNullInExpected => false;
+
 		protected override IndexRequest<Project> Initializer =>
-			new IndexRequest<Project>(this.Document)
+			new IndexRequest<Project>(Document)
 			{
 				Refresh = Refresh.True,
 				OpType = OpType.Index,
 				WaitForActiveShards = "1",
 				Routing = "route"
 			};
+
+		protected override string UrlPath
+			=> $"/project/doc/{CallIsolatedValue}?wait_for_active_shards=1&op_type=index&refresh=true&routing=route";
+
+		private Project Document => new Project
+		{
+			State = StateOfBeing.Stable,
+			Name = CallIsolatedValue,
+			StartedOn = FixedDate,
+			LastActivity = FixedDate,
+			CuratedTags = new List<Tag> { new Tag { Name = "x", Added = FixedDate } },
+			SourceOnly = TestClient.Configuration.Random.SourceSerializer ? new SourceOnlyObject() : null
+		};
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Index<Project>(Document, f),
+			(client, f) => client.IndexAsync<Project>(Document, f),
+			(client, r) => client.Index(r),
+			(client, r) => client.IndexAsync(r)
+		);
+
+		protected override IndexDescriptor<Project> NewDescriptor() => new IndexDescriptor<Project>(Document);
 	}
 
 	public class IndexIntegrationTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
@@ -92,7 +90,7 @@ [I] public void OpTypeCreate()
 		{
 			var indexName = RandomString();
 			var project = Project.Generator.Generate(1).First();
-			var indexResult = this.Client.Index(project, f => f
+			var indexResult = Client.Index(project, f => f
 				.Index(indexName)
 				.OpType(OpType.Create)
 			);
@@ -100,10 +98,10 @@ [I] public void OpTypeCreate()
 			indexResult.ApiCall.HttpStatusCode.Should().Be(201);
 			indexResult.Result.Should().Be(Result.Created);
 			indexResult.Index.Should().Be(indexName);
-			indexResult.Type.Should().Be(this.Client.Infer.TypeName<Project>());
+			indexResult.Type.Should().Be(Client.Infer.TypeName<Project>());
 			indexResult.Id.Should().Be(project.Name);
 
-			indexResult = this.Client.Index(project, f => f
+			indexResult = Client.Index(project, f => f
 				.Index(indexName)
 				.OpType(OpType.Create)
 			);
@@ -120,12 +118,12 @@ public void Index()
 		{
 			var indexName = RandomString();
 			var commitActivity = CommitActivity.CommitActivities.First();
-			var indexResult = this.Client.Index(commitActivity, f => f.Index(indexName));
+			var indexResult = Client.Index(commitActivity, f => f.Index(indexName));
 			indexResult.ShouldBeValid();
 			indexResult.ApiCall.HttpStatusCode.Should().Be(201);
 			indexResult.Result.Should().Be(Result.Created);
 			indexResult.Index.Should().Be(indexName);
-			indexResult.Type.Should().Be(this.Client.Infer.TypeName<CommitActivity>());
+			indexResult.Type.Should().Be(Client.Infer.TypeName<CommitActivity>());
 			indexResult.Id.Should().Be(commitActivity.Id);
 			indexResult.Version.Should().Be(1);
 			indexResult.Shards.Should().NotBeNull();
@@ -134,7 +132,7 @@ public void Index()
 			indexResult.SequenceNumber.Should().BeGreaterOrEqualTo(0);
 			indexResult.PrimaryTerm.Should().BeGreaterThan(0);
 
-			indexResult = this.Client.Index(commitActivity, f => f.Index(indexName));
+			indexResult = Client.Index(commitActivity, f => f.Index(indexName));
 
 			indexResult.ShouldBeValid();
 			indexResult.ApiCall.HttpStatusCode.Should().Be(200);
@@ -145,9 +143,7 @@ public void Index()
 
 	public class IndexJObjectIntegrationTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
 	{
-		public IndexJObjectIntegrationTests(WritableCluster cluster) : base(cluster)
-		{
-		}
+		public IndexJObjectIntegrationTests(WritableCluster cluster) : base(cluster) { }
 
 		[I]
 		public void Index()
@@ -157,22 +153,22 @@ public void Index()
 				.Select(i =>
 					new JObject
 					{
-						{"id", i},
-						{"name", $"name {i}"},
-						{"value", Math.Pow(i, 2)},
-						{"date", new DateTime(2016, 1, 1)},
+						{ "id", i },
+						{ "name", $"name {i}" },
+						{ "value", Math.Pow(i, 2) },
+						{ "date", new DateTime(2016, 1, 1) },
 						{
 							"child", new JObject
 							{
-								{"child_name", $"child_name {i}{i}"},
-								{"child_value", 3}
+								{ "child_name", $"child_name {i}{i}" },
+								{ "child_value", 3 }
 							}
 						}
 					});
 
 			var jObject = jObjects.First();
 
-			var indexResult = this.Client.Index(jObject, f => f
+			var indexResult = Client.Index(jObject, f => f
 				.Index(index)
 				.Id(jObject["id"].Value<int>())
 			);
@@ -188,7 +184,7 @@ public void Index()
 			indexResult.SequenceNumber.Should().BeGreaterOrEqualTo(0);
 			indexResult.PrimaryTerm.Should().BeGreaterThan(0);
 
-			var bulkResponse = this.Client.Bulk(b => b
+			var bulkResponse = Client.Bulk(b => b
 				.Index(index)
 				.IndexMany(jObjects.Skip(1), (bi, d) => bi
 					.Document(d)
@@ -211,9 +207,7 @@ public void Index()
 
 	public class IndexAnonymousTypesIntegrationTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
 	{
-		public IndexAnonymousTypesIntegrationTests(WritableCluster cluster) : base(cluster)
-		{
-		}
+		public IndexAnonymousTypesIntegrationTests(WritableCluster cluster) : base(cluster) { }
 
 		[I]
 		public void Index()
@@ -231,7 +225,7 @@ public void Index()
 				}
 			};
 
-			var indexResult = this.Client.Index(anonymousType, f => f
+			var indexResult = Client.Index(anonymousType, f => f
 				.Index(index)
 				.Id(anonymousType.name)
 			);
diff --git a/src/Tests/Tests/Document/Single/Index/IndexIngestApiTests.cs b/src/Tests/Tests/Document/Single/Index/IndexIngestApiTests.cs
index 00b34fac9d1..06fc375e6b1 100644
--- a/src/Tests/Tests/Document/Single/Index/IndexIngestApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Index/IndexIngestApiTests.cs
@@ -8,63 +8,16 @@
 using Tests.Domain.Extensions;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Tests.Domain.Helpers.TestValueHelper;
 
 namespace Tests.Document.Single.Index
 {
-	public class IndexIngestApiTests :
-		ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
+	public class IndexIngestApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
 	{
-		protected override bool IncludeNullInExpected => false;
-
-		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
-
-		public IndexIngestApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			client.PutPipeline(new PutPipelineRequest(PipelineId)
-			{
-				Description = "Index pipeline test",
-				Processors = new List<IProcessor>
-				{
-					new RenameProcessor
-					{
-						TargetField = "lastSeen",
-						Field = "lastActivity"
-					}
-				}
-			});
-		}
-
-		private Project Document => new Project
-		{
-			State = StateOfBeing.Stable,
-			Name = CallIsolatedValue,
-			StartedOn = FixedDate,
-			LastActivity = FixedDate,
-			CuratedTags = new List<Tag> {new Tag {Name = "x", Added = FixedDate}},
-			SourceOnly = TestClient.Configuration.Random.SourceSerializer ? new SourceOnlyObject() : null
-		};
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Index<Project>(this.Document, f),
-			fluentAsync: (client, f) => client.IndexAsync<Project>(this.Document, f),
-			request: (client, r) => client.Index(r),
-			requestAsync: (client, r) => client.IndexAsync(r)
-			);
+		public IndexIngestApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 201;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath
-			=> $"/project/doc/{CallIsolatedValue}?wait_for_active_shards=1&op_type=index&refresh=true&routing=route&pipeline={PipelineId}";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson =>
 			new
@@ -78,10 +31,10 @@ protected override string UrlPath
 				lastActivity = FixedDate,
 				numberOfContributors = 0,
 				sourceOnly = Dependant(null, new { notWrittenByDefaultSerializer = "written" }),
-				curatedTags = new[] {new {name = "x", added = FixedDate}},
+				curatedTags = new[] { new { name = "x", added = FixedDate } },
 			};
 
-		protected override IndexDescriptor<Project> NewDescriptor() => new IndexDescriptor<Project>(this.Document);
+		protected override int ExpectStatusCode => 201;
 
 		protected override Func<IndexDescriptor<Project>, IIndexRequest<Project>> Fluent => s => s
 			.WaitForActiveShards("1")
@@ -90,8 +43,11 @@ protected override string UrlPath
 			.Pipeline(PipelineId)
 			.Routing("route");
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+		protected override bool IncludeNullInExpected => false;
+
 		protected override IndexRequest<Project> Initializer =>
-			new IndexRequest<Project>(this.Document)
+			new IndexRequest<Project>(Document)
 			{
 				Refresh = Refresh.True,
 				OpType = OpType.Index,
@@ -100,5 +56,44 @@ protected override string UrlPath
 				Pipeline = PipelineId
 			};
 
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath
+			=> $"/project/doc/{CallIsolatedValue}?wait_for_active_shards=1&op_type=index&refresh=true&routing=route&pipeline={PipelineId}";
+
+		private Project Document => new Project
+		{
+			State = StateOfBeing.Stable,
+			Name = CallIsolatedValue,
+			StartedOn = FixedDate,
+			LastActivity = FixedDate,
+			CuratedTags = new List<Tag> { new Tag { Name = "x", Added = FixedDate } },
+			SourceOnly = TestClient.Configuration.Random.SourceSerializer ? new SourceOnlyObject() : null
+		};
+
+		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values) => client.PutPipeline(
+			new PutPipelineRequest(PipelineId)
+			{
+				Description = "Index pipeline test",
+				Processors = new List<IProcessor>
+				{
+					new RenameProcessor
+					{
+						TargetField = "lastSeen",
+						Field = "lastActivity"
+					}
+				}
+			});
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Index<Project>(Document, f),
+			(client, f) => client.IndexAsync<Project>(Document, f),
+			(client, r) => client.Index(r),
+			(client, r) => client.IndexAsync(r)
+		);
+
+		protected override IndexDescriptor<Project> NewDescriptor() => new IndexDescriptor<Project>(Document);
 	}
 }
diff --git a/src/Tests/Tests/Document/Single/Index/IndexIngestAttachmentApiTests.cs b/src/Tests/Tests/Document/Single/Index/IndexIngestAttachmentApiTests.cs
index 56fb6006223..3279cad177f 100644
--- a/src/Tests/Tests/Document/Single/Index/IndexIngestAttachmentApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Index/IndexIngestAttachmentApiTests.cs
@@ -8,8 +8,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Single.Index
 {
@@ -30,24 +28,48 @@ static TestDocument()
 		// Base 64 encoded version of Attachment_Test_Document.pdf
 		public static string TestPdfDocument { get; }
 	}
-	public class IndexIngestAttachmentApiTests :
-		ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse,
+
+	public class IndexIngestAttachmentApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse,
 			IIndexRequest<IndexIngestAttachmentApiTests.IngestedAttachment>,
 			IndexDescriptor<IndexIngestAttachmentApiTests.IngestedAttachment>,
 			IndexRequest<IndexIngestAttachmentApiTests.IngestedAttachment>>
 	{
-		public class IngestedAttachment
-		{
-			public int Id { get; set; }
-			public string Content { get; set; }
-			public Attachment Attachment { get; set; }
-		}
+		public IndexIngestAttachmentApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => new { id = 1, content = Content };
+		protected override int ExpectStatusCode => 201;
+
+		protected override Func<IndexDescriptor<IngestedAttachment>, IIndexRequest<IngestedAttachment>> Fluent => s => s
+			.Index(CallIsolatedValue)
+			.Refresh(Refresh.True)
+			.Pipeline(PipelineId);
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+		protected override IndexRequest<IngestedAttachment> Initializer =>
+			new IndexRequest<IngestedAttachment>(Document, CallIsolatedValue)
+			{
+				Refresh = Refresh.True,
+				Pipeline = PipelineId
+			};
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath
+			=> $"/{CallIsolatedValue}/ingestedattachment/1?refresh=true&pipeline={PipelineId}";
 
 		private static string Content => TestDocument.TestPdfDocument;
 
-		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
+		private IngestedAttachment Document => new IngestedAttachment
+		{
+			Id = 1,
+			Content = Content
+		};
 
-		public IndexIngestAttachmentApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
@@ -85,49 +107,20 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			});
 		}
 
-		private IngestedAttachment Document => new IngestedAttachment
-		{
-			Id = 1,
-			Content = Content
-		};
-
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Index<IngestedAttachment>(this.Document, f),
-			fluentAsync: (client, f) => client.IndexAsync<IngestedAttachment>(this.Document, f),
-			request: (client, r) => client.Index(r),
-			requestAsync: (client, r) => client.IndexAsync(r)
+			(client, f) => client.Index<IngestedAttachment>(Document, f),
+			(client, f) => client.IndexAsync<IngestedAttachment>(Document, f),
+			(client, r) => client.Index(r),
+			(client, r) => client.IndexAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 201;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath
-			=> $"/{CallIsolatedValue}/ingestedattachment/1?refresh=true&pipeline={PipelineId}";
-
-		protected override bool SupportsDeserialization => false;
-
-		protected override object ExpectJson => new {id = 1, content = Content};
-
-		protected override IndexDescriptor<IngestedAttachment> NewDescriptor() => new IndexDescriptor<IngestedAttachment>(this.Document);
-
-		protected override Func<IndexDescriptor<IngestedAttachment>, IIndexRequest<IngestedAttachment>> Fluent => s => s
-			.Index(CallIsolatedValue)
-			.Refresh(Refresh.True)
-			.Pipeline(PipelineId);
-
-		protected override IndexRequest<IngestedAttachment> Initializer =>
-			new IndexRequest<IngestedAttachment>(this.Document, CallIsolatedValue)
-			{
-				Refresh = Refresh.True,
-				Pipeline = PipelineId
-			};
+		protected override IndexDescriptor<IngestedAttachment> NewDescriptor() => new IndexDescriptor<IngestedAttachment>(Document);
 
 		protected override void ExpectResponse(IIndexResponse response)
 		{
 			response.ShouldBeValid();
 
-			var getResponse = this.Client.Get<IngestedAttachment>(response.Id, g => g.Index(CallIsolatedValue));
+			var getResponse = Client.Get<IngestedAttachment>(response.Id, g => g.Index(CallIsolatedValue));
 
 			getResponse.ShouldBeValid();
 			getResponse.Source.Should().NotBeNull();
@@ -145,5 +138,12 @@ protected override void ExpectResponse(IIndexResponse response)
 			attachment.ContentLength.Should().Be(96);
 			attachment.Content.Should().Contain("mapper-attachment support");
 		}
+
+		public class IngestedAttachment
+		{
+			public Attachment Attachment { get; set; }
+			public string Content { get; set; }
+			public int Id { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Document/Single/Index/IndexIngestGeoIpApiTests.cs b/src/Tests/Tests/Document/Single/Index/IndexIngestGeoIpApiTests.cs
index 49ff5a34056..d015e460a9c 100644
--- a/src/Tests/Tests/Document/Single/Index/IndexIngestGeoIpApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Index/IndexIngestGeoIpApiTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using Newtonsoft.Json.Linq;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
@@ -12,26 +10,69 @@
 using Tests.Domain.Extensions;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Tests.Domain.Helpers.TestValueHelper;
 
 namespace Tests.Document.Single.Index
 {
-	public class IndexIngestGeoIpApiTests :
-		ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
+	public class IndexIngestGeoIpApiTests
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
 	{
+		public IndexIngestGeoIpApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson =>
+			new
+			{
+				name = CallIsolatedValue,
+				type = Project.TypeName,
+				join = Document.Join.ToAnonymousObject(),
+				leadDeveloper = new { ipAddress = "193.4.250.122", gender = "Male", id = 1 },
+				state = "Stable",
+				visibility = "Public",
+				startedOn = FixedDate,
+				lastActivity = FixedDate,
+				numberOfContributors = 0,
+				curatedTags = new[] { new { name = "x", added = FixedDate } },
+				sourceOnly = Dependant(null, new { notWrittenByDefaultSerializer = "written" }),
+			};
+
+		protected override int ExpectStatusCode => 201;
+
+		protected override Func<IndexDescriptor<Project>, IIndexRequest<Project>> Fluent => s => s
+			.Refresh(Refresh.True)
+			.Pipeline(PipelineId);
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool IncludeNullInExpected => false;
 
-		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
+		protected override IndexRequest<Project> Initializer =>
+			new IndexRequest<Project>(Document)
+			{
+				Refresh = Refresh.True,
+				Pipeline = PipelineId
+			};
 
-		public IndexIngestGeoIpApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
+		protected override bool SupportsDeserialization => false;
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		protected override string UrlPath
+			=> $"/project/doc/{CallIsolatedValue}?refresh=true&pipeline={PipelineId}&routing={CallIsolatedValue}";
+
+		private Project Document => new Project
 		{
-			client.PutPipeline(new PutPipelineRequest(PipelineId)
+			State = StateOfBeing.Stable,
+			Name = CallIsolatedValue,
+			LeadDeveloper = new Developer { Gender = Gender.Male, Id = 1, IpAddress = "193.4.250.122" },
+			StartedOn = FixedDate,
+			LastActivity = FixedDate,
+			CuratedTags = new List<Tag> { new Tag { Name = "x", Added = FixedDate } },
+			SourceOnly = TestClient.Configuration.Random.SourceSerializer ? new SourceOnlyObject() : null
+		};
+
+		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values) => client.PutPipeline(
+			new PutPipelineRequest(PipelineId)
 			{
 				Description = "Index pipeline test",
 				Processors = new List<IProcessor>
@@ -68,69 +109,21 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 					}
 				}
 			});
-		}
-
-		private Project Document => new Project
-		{
-			State = StateOfBeing.Stable,
-			Name = CallIsolatedValue,
-			LeadDeveloper = new Developer { Gender = Gender.Male, Id  = 1, IpAddress = "193.4.250.122" },
-			StartedOn = FixedDate,
-			LastActivity = FixedDate,
-			CuratedTags = new List<Tag> {new Tag {Name = "x", Added = FixedDate}},
-			SourceOnly = TestClient.Configuration.Random.SourceSerializer ? new SourceOnlyObject() : null
-		};
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Index<Project>(this.Document, f),
-			fluentAsync: (client, f) => client.IndexAsync<Project>(this.Document, f),
-			request: (client, r) => client.Index(r),
-			requestAsync: (client, r) => client.IndexAsync(r)
-			);
+			(client, f) => client.Index<Project>(Document, f),
+			(client, f) => client.IndexAsync<Project>(Document, f),
+			(client, r) => client.Index(r),
+			(client, r) => client.IndexAsync(r)
+		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 201;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath
-			=> $"/project/doc/{CallIsolatedValue}?refresh=true&pipeline={PipelineId}&routing={CallIsolatedValue}";
-
-		protected override bool SupportsDeserialization => false;
-
-		protected override object ExpectJson =>
-			new
-			{
-				name = CallIsolatedValue,
-				type = Project.TypeName,
-				join = Document.Join.ToAnonymousObject(),
-				leadDeveloper = new { ipAddress = "193.4.250.122", gender = "Male", id = 1 },
-				state = "Stable",
-				visibility = "Public",
-				startedOn = FixedDate,
-				lastActivity = FixedDate,
-				numberOfContributors = 0,
-				curatedTags = new[] {new {name = "x", added = FixedDate}},
-				sourceOnly = Dependant(null, new { notWrittenByDefaultSerializer = "written" }),
-			};
-
-		protected override IndexDescriptor<Project> NewDescriptor() => new IndexDescriptor<Project>(this.Document);
-
-		protected override Func<IndexDescriptor<Project>, IIndexRequest<Project>> Fluent => s => s
-			.Refresh(Refresh.True)
-			.Pipeline(PipelineId);
-
-		protected override IndexRequest<Project> Initializer =>
-			new IndexRequest<Project>(this.Document)
-			{
-				Refresh = Refresh.True,
-				Pipeline = PipelineId
-			};
+		protected override IndexDescriptor<Project> NewDescriptor() => new IndexDescriptor<Project>(Document);
 
 		protected override void ExpectResponse(IIndexResponse response)
 		{
 			response.ShouldBeValid();
 
-			var getResponse = this.Client.Get<Project>(response.Id, g=>g.Routing(CallIsolatedValue));
+			var getResponse = Client.Get<Project>(response.Id, g => g.Routing(CallIsolatedValue));
 
 			getResponse.ShouldBeValid();
 			getResponse.Source.Should().NotBeNull();
diff --git a/src/Tests/Tests/Document/Single/Index/IndexUrlTests.cs b/src/Tests/Tests/Document/Single/Index/IndexUrlTests.cs
index 19ea94e9c21..ef4fadff29a 100644
--- a/src/Tests/Tests/Document/Single/Index/IndexUrlTests.cs
+++ b/src/Tests/Tests/Document/Single/Index/IndexUrlTests.cs
@@ -13,11 +13,11 @@ public class IndexUrlTests
 	{
 		[U] public async Task Urls()
 		{
-			var project = new Project {Name = "NEST"};
+			var project = new Project { Name = "NEST" };
 
 			await POST("/project/doc?routing=NEST")
 				.Fluent(c => c.Index(project, i => i.Id(null)))
-				.Request(c => c.Index(new IndexRequest<Project>("project", "doc") {Document = project}))
+				.Request(c => c.Index(new IndexRequest<Project>("project", "doc") { Document = project }))
 				.FluentAsync(c => c.IndexAsync(project, i => i.Id(null)))
 				.RequestAsync(c => c.IndexAsync(new IndexRequest<Project>(typeof(Project), TypeName.From<Project>())
 				{
@@ -27,7 +27,7 @@ await POST("/project/doc?routing=NEST")
 			//no explicit ID is provided and none can be inferred on the anonymous object so this falls back to a POST to /index/type
 			await POST("/project/doc")
 				.Fluent(c => c.Index(new { }, i => i.Index(typeof(Project)).Type(typeof(Project))))
-				.Request(c => c.Index(new IndexRequest<object>("project", "doc") {Document = new { }}))
+				.Request(c => c.Index(new IndexRequest<object>("project", "doc") { Document = new { } }))
 				.FluentAsync(c => c.IndexAsync(new { }, i => i.Index(typeof(Project)).Type(typeof(Project))))
 				.RequestAsync(c => c.IndexAsync(new IndexRequest<object>(typeof(Project), TypeName.From<Project>())
 				{
@@ -36,10 +36,10 @@ await POST("/project/doc")
 
 			await PUT("/project/doc/NEST?routing=NEST")
 				.Fluent(c => c.IndexDocument(project))
-				.Request(c => c.Index(new IndexRequest<Project>("project", "doc", "NEST") {Document = project}))
+				.Request(c => c.Index(new IndexRequest<Project>("project", "doc", "NEST") { Document = project }))
 				.Request(c => c.Index(new IndexRequest<Project>(project)))
 				.FluentAsync(c => c.IndexDocumentAsync(project))
-				.RequestAsync(c => c.IndexAsync(new IndexRequest<Project>(project))) ;
+				.RequestAsync(c => c.IndexAsync(new IndexRequest<Project>(project)));
 		}
 
 		[U] public async Task CanIndexUrlIds()
@@ -47,21 +47,21 @@ [U] public async Task CanIndexUrlIds()
 			var id = "http://my.local/id?qwe=2";
 			var escaped = Uri.EscapeDataString(id);
 			escaped.Should().NotContain("/").And.NotContain("?");
-			var project = new Project {Name = "name"};
+			var project = new Project { Name = "name" };
 
 			await PUT($"/project/doc/{escaped}?routing=name")
 				.Fluent(c => c.Index(project, i => i.Id(id)))
-				.Request(c => c.Index(new IndexRequest<Project>("project", "doc", id) {Document = project}))
+				.Request(c => c.Index(new IndexRequest<Project>("project", "doc", id) { Document = project }))
 				.FluentAsync(c => c.IndexAsync(project, i => i.Id(id)))
 				.RequestAsync(c => c.IndexAsync(new IndexRequest<Project>(typeof(Project), TypeName.From<Project>(), id)
 				{
 					Document = project
 				}));
 
-			project = new Project {Name = id};
+			project = new Project { Name = id };
 			await PUT($"/project/doc/{escaped}?routing={escaped}")
 				.Fluent(c => c.Index(project, i => i.Id(id)))
-				.Request(c => c.Index(new IndexRequest<Project>("project", "doc", id) {Document = project}))
+				.Request(c => c.Index(new IndexRequest<Project>("project", "doc", id) { Document = project }))
 				.FluentAsync(c => c.IndexAsync(project, i => i.Id(id)))
 				.RequestAsync(c => c.IndexAsync(new IndexRequest<Project>(typeof(Project), TypeName.From<Project>(), id)
 				{
diff --git a/src/Tests/Tests/Document/Single/Source/SourceApiTests.cs b/src/Tests/Tests/Document/Single/Source/SourceApiTests.cs
index 3af819296c1..6d097f79c00 100644
--- a/src/Tests/Tests/Document/Single/Source/SourceApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Source/SourceApiTests.cs
@@ -1,13 +1,9 @@
 using System.Linq;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework;
-using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Document.Single.Source
 {
@@ -17,8 +13,8 @@ public SourceIntegrationTests(ReadOnlyCluster cluster) : base(cluster) { }
 
 		[I] public void SourceReturnsDocument()
 		{
-			var project = this.Client.Source<Project>(Project.Instance.Name, s=>s.Routing(Project.Routing));
-			var p = Project.Projects.FirstOrDefault(i=>i.Name == Project.Instance.Name);
+			var project = Client.Source<Project>(Project.Instance.Name, s => s.Routing(Project.Routing));
+			var p = Project.Projects.FirstOrDefault(i => i.Name == Project.Instance.Name);
 			p.Should().NotBeNull("Test setup failure, project instance not found in projects indexed into readonly cluster");
 
 			project.Name.Should().Be(p.Name);
diff --git a/src/Tests/Tests/Document/Single/SourceExists/SourceExistsApiTests.cs b/src/Tests/Tests/Document/Single/SourceExists/SourceExistsApiTests.cs
index ea79f178c99..eb3dca135bb 100644
--- a/src/Tests/Tests/Document/Single/SourceExists/SourceExistsApiTests.cs
+++ b/src/Tests/Tests/Document/Single/SourceExists/SourceExistsApiTests.cs
@@ -7,112 +7,119 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Document.Single.SourceExists
 {
 	[SkipVersion("<5.4.0", "API was documented from 5.4.0 and over")]
-	public class SourceExistsApiTests : ApiIntegrationTestBase<WritableCluster, IExistsResponse, ISourceExistsRequest, SourceExistsDescriptor<Project>, SourceExistsRequest<Project>>
+	public class SourceExistsApiTests
+		: ApiIntegrationTestBase<WritableCluster, IExistsResponse, ISourceExistsRequest, SourceExistsDescriptor<Project>, SourceExistsRequest<Project>
+		>
 	{
 		public SourceExistsApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<SourceExistsDescriptor<Project>, ISourceExistsRequest> Fluent => d => d.Routing(Project.Routing);
+		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
+
+		protected override SourceExistsRequest<Project> Initializer => new SourceExistsRequest<Project>(CallIsolatedValue)
+		{
+			Routing = Project.Routing
+		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}/_source?routing={U(Project.Routing)}";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var id in values.Values)
-				this.Client.Index(Project.Instance, i=>i.Id(id));
+				Client.Index(Project.Instance, i => i.Id(id));
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.SourceExists<Project>(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.SourceExistsAsync<Project>(CallIsolatedValue, f),
-			request: (client, r) => client.SourceExists(r),
-			requestAsync: (client, r) => client.SourceExistsAsync(r)
+			(client, f) => client.SourceExists<Project>(CallIsolatedValue, f),
+			(client, f) => client.SourceExistsAsync<Project>(CallIsolatedValue, f),
+			(client, r) => client.SourceExists(r),
+			(client, r) => client.SourceExistsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}/_source?routing={U(Project.Routing)}";
+		protected override SourceExistsDescriptor<Project> NewDescriptor() => new SourceExistsDescriptor<Project>(CallIsolatedValue);
+	}
 
-		protected override bool SupportsDeserialization => false;
+	public class SourceExistsNotFoundApiTests
+		: ApiIntegrationTestBase<WritableCluster, IExistsResponse, ISourceExistsRequest, SourceExistsDescriptor<Project>, SourceExistsRequest<Project>
+		>
+	{
+		public SourceExistsNotFoundApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override SourceExistsDescriptor<Project> NewDescriptor() => new SourceExistsDescriptor<Project>(CallIsolatedValue);
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 404;
 		protected override Func<SourceExistsDescriptor<Project>, ISourceExistsRequest> Fluent => d => d.Routing(Project.Routing);
-		protected override SourceExistsRequest<Project> Initializer => new SourceExistsRequest<Project>(CallIsolatedValue)
+		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
+
+		protected override SourceExistsRequest<Project> Initializer => new SourceExistsRequest<Project>(Doc(CallIsolatedValue))
 		{
 			Routing = Project.Routing
 		};
 
-	}
-
-	public class SourceExistsNotFoundApiTests : ApiIntegrationTestBase<WritableCluster, IExistsResponse, ISourceExistsRequest, SourceExistsDescriptor<Project>, SourceExistsRequest<Project>>
-	{
-		public SourceExistsNotFoundApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{IndexWithNoSource.Name}/doc/{CallIsolatedValue}/_source?routing={U(Project.Routing)}";
 
 		private static IndexName IndexWithNoSource { get; } = "project-with-no-source";
+
 		private static DocumentPath<Project> Doc(string id) => new DocumentPath<Project>(id).Index(IndexWithNoSource);
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			var index = client.CreateIndex(IndexWithNoSource, i=>i
-				.Mappings(m=>m
-					.Map<Project>(mm=>mm
-						.SourceField(sf=>sf.Enabled(false))
+			var index = client.CreateIndex(IndexWithNoSource, i => i
+				.Mappings(m => m
+					.Map<Project>(mm => mm
+						.SourceField(sf => sf.Enabled(false))
 					)
 				)
 			);
 			index.ShouldBeValid();
 
 			foreach (var id in values.Values)
-				this.Client.Index(Project.Instance, i=>i.Id(id).Index(IndexWithNoSource));
+				Client.Index(Project.Instance, i => i.Id(id).Index(IndexWithNoSource));
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.SourceExists<Project>(Doc(CallIsolatedValue), f),
-			fluentAsync: (client, f) => client.SourceExistsAsync<Project>(Doc(CallIsolatedValue), f),
-			request: (client, r) => client.SourceExists(r),
-			requestAsync: (client, r) => client.SourceExistsAsync(r)
+			(client, f) => client.SourceExists<Project>(Doc(CallIsolatedValue), f),
+			(client, f) => client.SourceExistsAsync<Project>(Doc(CallIsolatedValue), f),
+			(client, r) => client.SourceExists(r),
+			(client, r) => client.SourceExistsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 404;
-		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/{IndexWithNoSource.Name}/doc/{CallIsolatedValue}/_source?routing={U(Project.Routing)}";
-
-		protected override bool SupportsDeserialization => false;
-
 		protected override SourceExistsDescriptor<Project> NewDescriptor() => new SourceExistsDescriptor<Project>(Doc(CallIsolatedValue));
-		protected override Func<SourceExistsDescriptor<Project>, ISourceExistsRequest> Fluent => d => d.Routing(Project.Routing);
-		protected override SourceExistsRequest<Project> Initializer => new SourceExistsRequest<Project>(Doc(CallIsolatedValue))
-		{
-			Routing = Project.Routing
-		};
 	}
 
 
-	public class SourceExistsIndexNotFoundApiTests : ApiIntegrationTestBase<WritableCluster, IExistsResponse, ISourceExistsRequest, SourceExistsDescriptor<Project>, SourceExistsRequest<Project>>
+	public class SourceExistsIndexNotFoundApiTests
+		: ApiIntegrationTestBase<WritableCluster, IExistsResponse, ISourceExistsRequest, SourceExistsDescriptor<Project>, SourceExistsRequest<Project>
+		>
 	{
 		public SourceExistsIndexNotFoundApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 404;
+		protected override Func<SourceExistsDescriptor<Project>, ISourceExistsRequest> Fluent => f => null;
+		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
+		protected override SourceExistsRequest<Project> Initializer => new SourceExistsRequest<Project>(Doc(CallIsolatedValue));
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{IndexWithNoSource.Name}/doc/{CallIsolatedValue}/_source";
+
 		private static IndexName IndexWithNoSource { get; } = "source-no-index";
 
 		protected override SourceExistsDescriptor<Project> NewDescriptor() => new SourceExistsDescriptor<Project>(Doc(CallIsolatedValue));
-		protected override Func<SourceExistsDescriptor<Project>, ISourceExistsRequest> Fluent => f=> null;
-		protected override SourceExistsRequest<Project> Initializer => new SourceExistsRequest<Project>(Doc(CallIsolatedValue));
+
 		private static DocumentPath<Project> Doc(string id) => new DocumentPath<Project>(id).Index(IndexWithNoSource);
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.SourceExists<Project>(Doc(CallIsolatedValue), f),
-			fluentAsync: (client, f) => client.SourceExistsAsync<Project>(Doc(CallIsolatedValue), f),
-			request: (client, r) => client.SourceExists(r),
-			requestAsync: (client, r) => client.SourceExistsAsync(r)
+			(client, f) => client.SourceExists<Project>(Doc(CallIsolatedValue), f),
+			(client, f) => client.SourceExistsAsync<Project>(Doc(CallIsolatedValue), f),
+			(client, r) => client.SourceExists(r),
+			(client, r) => client.SourceExistsAsync(r)
 		);
-
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 404;
-		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/{IndexWithNoSource.Name}/doc/{CallIsolatedValue}/_source";
-		protected override bool SupportsDeserialization => false;
-
 	}
 }
diff --git a/src/Tests/Tests/Document/Single/TermVectors/TermVectorsApiTests.cs b/src/Tests/Tests/Document/Single/TermVectors/TermVectorsApiTests.cs
index 5fe82391939..633a27d0ec9 100644
--- a/src/Tests/Tests/Document/Single/TermVectors/TermVectorsApiTests.cs
+++ b/src/Tests/Tests/Document/Single/TermVectors/TermVectorsApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -8,28 +7,17 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Document.Single.TermVectors
 {
-	public class TermVectorsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ITermVectorsResponse, ITermVectorsRequest<Project>, TermVectorsDescriptor<Project>, TermVectorsRequest<Project>>
+	public class TermVectorsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ITermVectorsResponse, ITermVectorsRequest<Project>, TermVectorsDescriptor<Project>,
+			TermVectorsRequest<Project>>
 	{
 		public TermVectorsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.TermVectors(f),
-			fluentAsync: (client, f) => client.TermVectorsAsync(f),
-			request: (client, r) => client.TermVectors(r),
-			requestAsync: (client, r) => client.TermVectorsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/{U(Project.Instance.Name)}/_termvectors?offsets=true&routing={U(Project.Routing)}";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
@@ -45,9 +33,9 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override TermVectorsDescriptor<Project> NewDescriptor() => new TermVectorsDescriptor<Project>(typeof (Project), typeof (Project));
+		protected override int ExpectStatusCode => 200;
 
-		protected override Func<TermVectorsDescriptor<Project>, ITermVectorsRequest<Project>> Fluent => d=>d
+		protected override Func<TermVectorsDescriptor<Project>, ITermVectorsRequest<Project>> Fluent => d => d
 			.Id(Id(Project.Instance))
 			.Routing(Project.Routing)
 			.Offsets()
@@ -59,8 +47,9 @@ protected override LazyResponses ClientUsage() => Calls(
 				.MaximumDocumentFrequency(int.MaxValue)
 				.MinimumWordLength(0)
 				.MaximumWordLength(200)
-			)
-		;
+			);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override TermVectorsRequest<Project> Initializer => new TermVectorsRequest<Project>(Project.Instance.Name)
 		{
@@ -78,6 +67,18 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{U(Project.Instance.Name)}/_termvectors?offsets=true&routing={U(Project.Routing)}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.TermVectors(f),
+			(client, f) => client.TermVectorsAsync(f),
+			(client, r) => client.TermVectors(r),
+			(client, r) => client.TermVectorsAsync(r)
+		);
+
+		protected override TermVectorsDescriptor<Project> NewDescriptor() => new TermVectorsDescriptor<Project>(typeof(Project), typeof(Project));
+
 		protected override void ExpectResponse(ITermVectorsResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Document/Single/TermVectors/TermVectorsUrlTests.cs b/src/Tests/Tests/Document/Single/TermVectors/TermVectorsUrlTests.cs
index 3dcd5ed3afe..682556952d1 100644
--- a/src/Tests/Tests/Document/Single/TermVectors/TermVectorsUrlTests.cs
+++ b/src/Tests/Tests/Document/Single/TermVectors/TermVectorsUrlTests.cs
@@ -9,7 +9,6 @@ namespace Tests.Document.Single.TermVectors
 {
 	public class TermVectorsUrlTests
 	{
-
 		[U]
 		public async Task Urls()
 		{
@@ -17,40 +16,40 @@ public async Task Urls()
 			var index = "myindex";
 
 			await GET($"/{index}/doc/{id}/_termvectors")
-				.Fluent(c=>c.TermVectors<Project>(t => t.Index(index).Id(id)))
-				.Request(c=>c.TermVectors(new TermVectorsRequest<Project>(index, typeof(Project), id)))
-				.FluentAsync(c=>c.TermVectorsAsync<Project>(t => t.Index(index).Id(id)))
-				.RequestAsync(c=>c.TermVectorsAsync(new TermVectorsRequest<Project>(index, typeof(Project), id)))
+					.Fluent(c => c.TermVectors<Project>(t => t.Index(index).Id(id)))
+					.Request(c => c.TermVectors(new TermVectorsRequest<Project>(index, typeof(Project), id)))
+					.FluentAsync(c => c.TermVectorsAsync<Project>(t => t.Index(index).Id(id)))
+					.RequestAsync(c => c.TermVectorsAsync(new TermVectorsRequest<Project>(index, typeof(Project), id)))
 				;
 
 			await GET($"/project/doc/{id}/_termvectors")
-				.Fluent(c=>c.TermVectors<Project>(t => t.Id(id)))
-				.Request(c=>c.TermVectors(new TermVectorsRequest<Project>(id)))
-				.FluentAsync(c=>c.TermVectorsAsync<Project>(t => t.Id(id)))
-				.RequestAsync(c=>c.TermVectorsAsync(new TermVectorsRequest<Project>(id)))
+					.Fluent(c => c.TermVectors<Project>(t => t.Id(id)))
+					.Request(c => c.TermVectors(new TermVectorsRequest<Project>(id)))
+					.FluentAsync(c => c.TermVectorsAsync<Project>(t => t.Id(id)))
+					.RequestAsync(c => c.TermVectorsAsync(new TermVectorsRequest<Project>(id)))
 				;
 
 			await GET($"/{index}/doc/{id}/_termvectors")
-				.Fluent(c=>c.TermVectors<Project>(t => t.Index(index).Id(id)))
-				.Request(c=>c.TermVectors(new TermVectorsRequest<Project>(index, typeof(Project), id)))
-				.FluentAsync(c=>c.TermVectorsAsync<Project>(t => t.Index(index).Id(id)))
-				.RequestAsync(c=>c.TermVectorsAsync(new TermVectorsRequest<Project>(index, typeof(Project), id)))
+					.Fluent(c => c.TermVectors<Project>(t => t.Index(index).Id(id)))
+					.Request(c => c.TermVectors(new TermVectorsRequest<Project>(index, typeof(Project), id)))
+					.FluentAsync(c => c.TermVectorsAsync<Project>(t => t.Index(index).Id(id)))
+					.RequestAsync(c => c.TermVectorsAsync(new TermVectorsRequest<Project>(index, typeof(Project), id)))
 				;
 
 			var document = new Project { Name = "foo" };
 
 			await POST($"/{index}/doc/_termvectors?routing=foo")
-				.Fluent(c => c.TermVectors<Project>(t => t.Index(index).Document(document)))
-				.Request(c => c.TermVectors(new TermVectorsRequest<Project>(new DocumentPath<Project>(document).Index(index))))
-				.FluentAsync(c => c.TermVectorsAsync<Project>(t => t.Index(index).Document(document)))
-				.RequestAsync(c => c.TermVectorsAsync(new TermVectorsRequest<Project>(new DocumentPath<Project>(document).Index(index))))
+					.Fluent(c => c.TermVectors<Project>(t => t.Index(index).Document(document)))
+					.Request(c => c.TermVectors(new TermVectorsRequest<Project>(new DocumentPath<Project>(document).Index(index))))
+					.FluentAsync(c => c.TermVectorsAsync<Project>(t => t.Index(index).Document(document)))
+					.RequestAsync(c => c.TermVectorsAsync(new TermVectorsRequest<Project>(new DocumentPath<Project>(document).Index(index))))
 				;
 
 			await POST($"/project/doc/_termvectors?routing=foo")
-				.Fluent(c=>c.TermVectors<Project>(t => t.Document(document)))
-				.Request(c=>c.TermVectors(new TermVectorsRequest<Project>(document)))
-				.FluentAsync(c=>c.TermVectorsAsync<Project>(t => t.Document(document)))
-				.RequestAsync(c=>c.TermVectorsAsync(new TermVectorsRequest<Project>(document)))
+					.Fluent(c => c.TermVectors<Project>(t => t.Document(document)))
+					.Request(c => c.TermVectors(new TermVectorsRequest<Project>(document)))
+					.FluentAsync(c => c.TermVectorsAsync<Project>(t => t.Document(document)))
+					.RequestAsync(c => c.TermVectorsAsync(new TermVectorsRequest<Project>(document)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Document/Single/Update/UpdateApiTests.cs b/src/Tests/Tests/Document/Single/Update/UpdateApiTests.cs
index edecd07e5ff..f6572ca9c3c 100644
--- a/src/Tests/Tests/Document/Single/Update/UpdateApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Update/UpdateApiTests.cs
@@ -1,41 +1,22 @@
 using System;
-using System.Collections.Generic;
 using Elasticsearch.Net;
-using Nest;
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Xunit;
 using FluentAssertions;
+using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework;
+using Tests.Framework.Integration;
 
 namespace Tests.Document.Single.Update
 {
-	public class UpdateApiTests : ApiIntegrationTestBase<WritableCluster, IUpdateResponse<Project>, IUpdateRequest<Project, Project>, UpdateDescriptor<Project, Project>, UpdateRequest<Project, Project>>
+	public class UpdateApiTests
+		: ApiIntegrationTestBase<WritableCluster, IUpdateResponse<Project>, IUpdateRequest<Project, Project>, UpdateDescriptor<Project, Project>,
+			UpdateRequest<Project, Project>>
 	{
 		public UpdateApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var id in values.Values)
-				this.Client.Index(Project.Instance, i=>i.Id(id));
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Update<Project>(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.UpdateAsync<Project>(CallIsolatedValue, f),
-			request: (client, r) => client.Update<Project>(r),
-			requestAsync: (client, r) => client.UpdateAsync<Project>(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}/_update?routing={U(Project.Routing)}";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -44,13 +25,15 @@ protected override LazyResponses ClientUsage() => Calls(
 			detect_noop = true
 		};
 
-		protected override UpdateDescriptor<Project, Project> NewDescriptor() => new UpdateDescriptor<Project, Project>(DocumentPath<Project>.Id(CallIsolatedValue));
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<UpdateDescriptor<Project, Project>, IUpdateRequest<Project, Project>> Fluent => u => u
 			.Doc(Project.Instance)
 			.DocAsUpsert()
 			.DetectNoop();
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override UpdateRequest<Project, Project> Initializer => new UpdateRequest<Project, Project>(CallIsolatedValue)
 		{
 			Doc = Project.Instance,
@@ -58,6 +41,25 @@ protected override LazyResponses ClientUsage() => Calls(
 			DetectNoop = true
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}/_update?routing={U(Project.Routing)}";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var id in values.Values)
+				Client.Index(Project.Instance, i => i.Id(id));
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Update<Project>(CallIsolatedValue, f),
+			(client, f) => client.UpdateAsync<Project>(CallIsolatedValue, f),
+			(client, r) => client.Update<Project>(r),
+			(client, r) => client.UpdateAsync<Project>(r)
+		);
+
+		protected override UpdateDescriptor<Project, Project> NewDescriptor() =>
+			new UpdateDescriptor<Project, Project>(DocumentPath<Project>.Id(CallIsolatedValue));
+
 		protected override void ExpectResponse(IUpdateResponse<Project> response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Document/Single/Update/UpdateUrlTests.cs b/src/Tests/Tests/Document/Single/Update/UpdateUrlTests.cs
index 4c06dc784b2..84becaaa72d 100644
--- a/src/Tests/Tests/Document/Single/Update/UpdateUrlTests.cs
+++ b/src/Tests/Tests/Document/Single/Update/UpdateUrlTests.cs
@@ -9,43 +9,42 @@ namespace Tests.Document.Single.Update
 {
 	public class UpdateUrlTests
 	{
-
 		[U] public async Task Urls()
 		{
 			var document = new Project { Name = "foo" };
 
 			await POST($"/project/doc/foo/_update?routing=foo")
-				.Fluent(c => c.Update<Project>(document, u => u))
-				.Request(c => c.Update(new UpdateRequest<Project, object>(document)))
-				.FluentAsync(c => c.UpdateAsync<Project>(document, u => u))
-				.RequestAsync(c => c.UpdateAsync(new UpdateRequest<Project, object>(document)))
+					.Fluent(c => c.Update<Project>(document, u => u))
+					.Request(c => c.Update(new UpdateRequest<Project, object>(document)))
+					.FluentAsync(c => c.UpdateAsync<Project>(document, u => u))
+					.RequestAsync(c => c.UpdateAsync(new UpdateRequest<Project, object>(document)))
 				;
 
 			var otherId = "other-id";
 
 			await POST($"/project/doc/{otherId}/_update")
-				.Fluent(c => c.Update<Project>(otherId, u => u))
-				.Request(c => c.Update(new UpdateRequest<Project, object>(typeof(Project), typeof(Project), otherId)))
-				.FluentAsync(c => c.UpdateAsync<Project>(otherId, u => u))
-				.RequestAsync(c => c.UpdateAsync(new UpdateRequest<Project, object>(typeof(Project), typeof(Project), otherId)))
+					.Fluent(c => c.Update<Project>(otherId, u => u))
+					.Request(c => c.Update(new UpdateRequest<Project, object>(typeof(Project), typeof(Project), otherId)))
+					.FluentAsync(c => c.UpdateAsync<Project>(otherId, u => u))
+					.RequestAsync(c => c.UpdateAsync(new UpdateRequest<Project, object>(typeof(Project), typeof(Project), otherId)))
 				;
 
 			var otherIndex = "other-index";
 
 			await POST($"/{otherIndex}/doc/{otherId}/_update")
-				.Fluent(c => c.Update<Project>(otherId, u => u.Index(otherIndex)))
-				.Request(c => c.Update(new UpdateRequest<Project, object>(otherIndex, typeof(Project), otherId)))
-				.FluentAsync(c => c.UpdateAsync<Project>(otherId, u => u.Index(otherIndex)))
-				.RequestAsync(c => c.UpdateAsync(new UpdateRequest<Project, object>(otherIndex, typeof(Project), otherId)))
+					.Fluent(c => c.Update<Project>(otherId, u => u.Index(otherIndex)))
+					.Request(c => c.Update(new UpdateRequest<Project, object>(otherIndex, typeof(Project), otherId)))
+					.FluentAsync(c => c.UpdateAsync<Project>(otherId, u => u.Index(otherIndex)))
+					.RequestAsync(c => c.UpdateAsync(new UpdateRequest<Project, object>(otherIndex, typeof(Project), otherId)))
 				;
 
 			var otherType = "other-type";
 
 			await POST($"/{otherIndex}/{otherType}/{otherId}/_update")
-				.Fluent(c => c.Update<Project>(otherId, u => u.Index(otherIndex).Type(otherType)))
-				.Request(c => c.Update(new UpdateRequest<Project, object>(otherIndex, otherType, otherId)))
-				.FluentAsync(c => c.UpdateAsync<Project>(otherId, u => u.Index(otherIndex).Type(otherType)))
-				.RequestAsync(c => c.UpdateAsync(new UpdateRequest<Project, object>(otherIndex, otherType, otherId)))
+					.Fluent(c => c.Update<Project>(otherId, u => u.Index(otherIndex).Type(otherType)))
+					.Request(c => c.Update(new UpdateRequest<Project, object>(otherIndex, otherType, otherId)))
+					.FluentAsync(c => c.UpdateAsync<Project>(otherId, u => u.Index(otherIndex).Type(otherType)))
+					.RequestAsync(c => c.UpdateAsync(new UpdateRequest<Project, object>(otherIndex, otherType, otherId)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Document/Single/Update/UpdateWithScriptApiTests.cs b/src/Tests/Tests/Document/Single/Update/UpdateWithScriptApiTests.cs
index 53a59e72ddb..65cb78f1c49 100644
--- a/src/Tests/Tests/Document/Single/Update/UpdateWithScriptApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Update/UpdateWithScriptApiTests.cs
@@ -6,33 +6,16 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Document.Single.Update
 {
-	public class UpdateWithScriptApiTests : ApiIntegrationTestBase<WritableCluster, IUpdateResponse<Project>, IUpdateRequest<Project, Project>, UpdateDescriptor<Project, Project>, UpdateRequest<Project, Project>>
+	public class UpdateWithScriptApiTests
+		: ApiIntegrationTestBase<WritableCluster, IUpdateResponse<Project>, IUpdateRequest<Project, Project>, UpdateDescriptor<Project, Project>,
+			UpdateRequest<Project, Project>>
 	{
 		public UpdateWithScriptApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var id in values.Values)
-				this.Client.Index(Project.Instance, i=>i.Id(id));
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Update<Project>(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.UpdateAsync<Project>(CallIsolatedValue, f),
-			request: (client, r) => client.Update<Project>(r),
-			requestAsync: (client, r) => client.UpdateAsync<Project>(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}/_update?routing={U(Project.Routing)}";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -41,15 +24,15 @@ protected override LazyResponses ClientUsage() => Calls(
 			{
 				source = "ctx._source.name = \"params.name\"",
 				lang = "painless",
-				@params = new {
+				@params = new
+				{
 					name = "foo",
 					other = (object)null
 				}
 			}
 		};
 
-		protected override UpdateDescriptor<Project, Project> NewDescriptor() =>
-			new UpdateDescriptor<Project, Project>(DocumentPath<Project>.Id(CallIsolatedValue));
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<UpdateDescriptor<Project, Project>, IUpdateRequest<Project, Project>> Fluent => d => d
 			.Routing(Project.Routing)
@@ -61,7 +44,9 @@ protected override UpdateDescriptor<Project, Project> NewDescriptor() =>
 					.Add("name", "foo")
 					.Add("other", null)
 				)
-			 );
+			);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override UpdateRequest<Project, Project> Initializer => new UpdateRequest<Project, Project>(CallIsolatedValue)
 		{
@@ -76,9 +61,25 @@ protected override UpdateDescriptor<Project, Project> NewDescriptor() =>
 					{ "other", null }
 				}
 			}
-
 		};
-	}
-}
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}/_update?routing={U(Project.Routing)}";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var id in values.Values)
+				Client.Index(Project.Instance, i => i.Id(id));
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Update<Project>(CallIsolatedValue, f),
+			(client, f) => client.UpdateAsync<Project>(CallIsolatedValue, f),
+			(client, r) => client.Update<Project>(r),
+			(client, r) => client.UpdateAsync<Project>(r)
+		);
 
+		protected override UpdateDescriptor<Project, Project> NewDescriptor() =>
+			new UpdateDescriptor<Project, Project>(DocumentPath<Project>.Id(CallIsolatedValue));
+	}
+}
diff --git a/src/Tests/Tests/Document/Single/Update/UpdateWithSourceApiTests.cs b/src/Tests/Tests/Document/Single/Update/UpdateWithSourceApiTests.cs
index 3421348c06f..74af3450673 100644
--- a/src/Tests/Tests/Document/Single/Update/UpdateWithSourceApiTests.cs
+++ b/src/Tests/Tests/Document/Single/Update/UpdateWithSourceApiTests.cs
@@ -1,63 +1,46 @@
 using System;
-using System.Collections.Generic;
-using Elasticsearch.Net;
-using Nest;
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Xunit;
-using static Nest.Infer;
 using System.Threading.Tasks;
-using FluentAssertions;
-using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
+using Elasticsearch.Net;
+using FluentAssertions;
+using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework;
+using Tests.Framework.Integration;
+using static Nest.Infer;
 
 namespace Tests.Document.Single.Update
 {
-	public class UpdateWithSourceApiTests : ApiIntegrationTestBase<WritableCluster, IUpdateResponse<Project>, IUpdateRequest<Project, Project>, UpdateDescriptor<Project, Project>, UpdateRequest<Project, Project>>
+	public class UpdateWithSourceApiTests
+		: ApiIntegrationTestBase<WritableCluster, IUpdateResponse<Project>, IUpdateRequest<Project, Project>, UpdateDescriptor<Project, Project>,
+			UpdateRequest<Project, Project>>
 	{
 		public UpdateWithSourceApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var id in values.Values)
-				this.Client.Index(Project.Instance, i=>i.Id(id));
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Update<Project>(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.UpdateAsync<Project>(CallIsolatedValue, f),
-			request: (client, r) => client.Update<Project>(r),
-			requestAsync: (client, r) => client.UpdateAsync<Project>(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}/_update?routing={U(Project.Routing)}";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new
 		{
 			doc = Project.InstanceAnonymous,
 			doc_as_upsert = true,
-			_source = new {
-				includes = new [] {"name", "sourceOnly"}
+			_source = new
+			{
+				includes = new[] { "name", "sourceOnly" }
 			}
 		};
 
-		protected override UpdateDescriptor<Project, Project> NewDescriptor() => new UpdateDescriptor<Project, Project>(DocumentPath<Project>.Id(CallIsolatedValue));
+		protected override int ExpectStatusCode => 200;
 
-		protected override Func<UpdateDescriptor<Project,Project>, IUpdateRequest<Project, Project>> Fluent => d=>d
+		protected override Func<UpdateDescriptor<Project, Project>, IUpdateRequest<Project, Project>> Fluent => d => d
 			.Routing(Project.Routing)
 			.Doc(Project.Instance)
-			.Source(s=>s.Includes(f=>f.Field(p=>p.Name).Field("sourceOnly")))
+			.Source(s => s.Includes(f => f.Field(p => p.Name).Field("sourceOnly")))
 			.DocAsUpsert();
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override UpdateRequest<Project, Project> Initializer => new UpdateRequest<Project, Project>(CallIsolatedValue)
 		{
 			Routing = Project.Routing,
@@ -65,11 +48,30 @@ protected override LazyResponses ClientUsage() => Calls(
 			DocAsUpsert = true,
 			Source = new SourceFilter
 			{
-				Includes = Field<Project>(p=>p.Name).And("sourceOnly")
+				Includes = Field<Project>(p => p.Name).And("sourceOnly")
 			}
 		};
 
-		[I] public Task ReturnsSourceAndFields() => this.AssertOnAllResponses(r =>
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/project/doc/{CallIsolatedValue}/_update?routing={U(Project.Routing)}";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var id in values.Values)
+				Client.Index(Project.Instance, i => i.Id(id));
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Update<Project>(CallIsolatedValue, f),
+			(client, f) => client.UpdateAsync<Project>(CallIsolatedValue, f),
+			(client, r) => client.Update<Project>(r),
+			(client, r) => client.UpdateAsync<Project>(r)
+		);
+
+		protected override UpdateDescriptor<Project, Project> NewDescriptor() =>
+			new UpdateDescriptor<Project, Project>(DocumentPath<Project>.Id(CallIsolatedValue));
+
+		[I] public Task ReturnsSourceAndFields() => AssertOnAllResponses(r =>
 		{
 			r.Get.Should().NotBeNull();
 			r.Get.Found.Should().BeTrue();
diff --git a/src/Tests/Tests/Framework/DocumentationTests/IntegrationDocumentationTestBase.cs b/src/Tests/Tests/Framework/DocumentationTests/IntegrationDocumentationTestBase.cs
index e2225534610..c1d3e3da7ad 100644
--- a/src/Tests/Tests/Framework/DocumentationTests/IntegrationDocumentationTestBase.cs
+++ b/src/Tests/Tests/Framework/DocumentationTests/IntegrationDocumentationTestBase.cs
@@ -2,30 +2,24 @@
 using Nest;
 using Tests.Core.Client;
 using Tests.Core.ManagedElasticsearch.Clusters;
-using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Framework
 {
 	public abstract class DocumentationTestBase
 	{
-		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
-
 		protected IElasticClient Client => TestClient.DefaultInMemoryClient;
 
+		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
 	}
 
 	public abstract class IntegrationDocumentationTestBase
 	{
-		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
+		private readonly ClientTestClusterBase _cluster;
+
+		protected IntegrationDocumentationTestBase(ClientTestClusterBase cluster) => _cluster = cluster;
 
-		readonly ClientTestClusterBase _cluster;
-		protected IElasticClient Client => this._cluster.Client;
+		protected IElasticClient Client => _cluster.Client;
 
-		protected IntegrationDocumentationTestBase(ClientTestClusterBase cluster)
-		{
-			this._cluster = cluster;
-		}
+		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
 	}
 }
diff --git a/src/Tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs b/src/Tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs
index 3238e740aab..b99ad491f5c 100644
--- a/src/Tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs
@@ -7,7 +7,6 @@
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Framework
 {
@@ -23,7 +22,7 @@ protected ApiIntegrationAgainstNewIndexTestBase(TCluster cluster, EndpointUsage
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var index in values.Values) client.CreateIndex(index, this.CreateIndexSettings).ShouldBeValid();
+			foreach (var index in values.Values) client.CreateIndex(index, CreateIndexSettings).ShouldBeValid();
 			var indices = Infer.Indices(values.Values.Select(i => (IndexName)i));
 			client.ClusterHealth(f => f.WaitForStatus(WaitForStatus.Yellow).Index(indices))
 				.ShouldBeValid();
diff --git a/src/Tests/Tests/Framework/EndpointTests/ApiIntegrationTestBase.cs b/src/Tests/Tests/Framework/EndpointTests/ApiIntegrationTestBase.cs
index a1fb93fbc07..2116742abab 100644
--- a/src/Tests/Tests/Framework/EndpointTests/ApiIntegrationTestBase.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/ApiIntegrationTestBase.cs
@@ -6,33 +6,31 @@
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
-using FluentAssertions.Execution;
 using Nest;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Framework
 {
 	public abstract class ApiIntegrationTestBase<TCluster, TResponse, TInterface, TDescriptor, TInitializer>
 		: ApiTestBase<TCluster, TResponse, TInterface, TDescriptor, TInitializer>
-		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster , new()
+		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
 		where TResponse : class, IResponse
 		where TDescriptor : class, TInterface
 		where TInitializer : class, TInterface
 		where TInterface : class
 	{
-		protected abstract int ExpectStatusCode { get; }
-		protected abstract bool ExpectIsValid { get; }
-		protected virtual void ExpectResponse(TResponse response) { }
-
 		protected ApiIntegrationTestBase(TCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		public override IElasticClient Client => this.Cluster.Client;
+		public override IElasticClient Client => Cluster.Client;
+		protected abstract bool ExpectIsValid { get; }
+		protected abstract int ExpectStatusCode { get; }
 		protected override TInitializer Initializer => Activator.CreateInstance<TInitializer>();
 
+		protected virtual void ExpectResponse(TResponse response) { }
+
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] protected override Task HitsTheCorrectUrl() => base.HitsTheCorrectUrl();
 
@@ -43,21 +41,21 @@ protected ApiIntegrationTestBase(TCluster cluster, EndpointUsage usage) : base(c
 		[U] protected override void SerializesFluent() => base.SerializesFluent();
 
 		[I] public virtual async Task ReturnsExpectedStatusCode() =>
-			await this.AssertOnAllResponses(r => r.ApiCall.HttpStatusCode.Should().Be(this.ExpectStatusCode));
+			await AssertOnAllResponses(r => r.ApiCall.HttpStatusCode.Should().Be(ExpectStatusCode));
 
 		[I] public virtual async Task ReturnsExpectedIsValid() =>
-			await this.AssertOnAllResponses(r => r.ShouldHaveExpectedIsValid(this.ExpectIsValid));
+			await AssertOnAllResponses(r => r.ShouldHaveExpectedIsValid(ExpectIsValid));
 
-		[I] public virtual async Task ReturnsExpectedResponse() => await this.AssertOnAllResponses(ExpectResponse);
+		[I] public virtual async Task ReturnsExpectedResponse() => await AssertOnAllResponses(ExpectResponse);
 
 		protected override Task AssertOnAllResponses(Action<TResponse> assert)
 		{
-			if (!this.ExpectIsValid) return base.AssertOnAllResponses(assert);
+			if (!ExpectIsValid) return base.AssertOnAllResponses(assert);
 
 			return base.AssertOnAllResponses((r) =>
 			{
 				if (TestClient.Configuration.RunIntegrationTests && !r.IsValid && r.ApiCall.OriginalException != null
-				    && !(r.ApiCall.OriginalException is ElasticsearchClientException))
+					&& !(r.ApiCall.OriginalException is ElasticsearchClientException))
 				{
 					var e = ExceptionDispatchInfo.Capture(r.ApiCall.OriginalException.Demystify());
 					throw new ResponseAssertionException(e.SourceException, r);
diff --git a/src/Tests/Tests/Framework/EndpointTests/ApiTestBase.cs b/src/Tests/Tests/Framework/EndpointTests/ApiTestBase.cs
index e1e38d694bf..7f7852ca8cf 100644
--- a/src/Tests/Tests/Framework/EndpointTests/ApiTestBase.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/ApiTestBase.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Elastic.Managed;
 using Elastic.Managed.Ephemeral;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
@@ -8,34 +7,32 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Framework
 {
 	public abstract class ApiTestBase<TCluster, TResponse, TInterface, TDescriptor, TInitializer>
 		: RequestResponseApiTestBase<TCluster, TResponse, TInterface, TDescriptor, TInitializer>
-		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster , new()
+		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
 		where TResponse : class, IResponse
 		where TDescriptor : class, TInterface
 		where TInitializer : class, TInterface
 		where TInterface : class
 	{
+		protected ApiTestBase(TCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected override object ExpectJson { get; } = null;
-		protected abstract string UrlPath { get; }
 		protected abstract HttpMethod HttpMethod { get; }
+		protected abstract string UrlPath { get; }
 
-		protected ApiTestBase(TCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		[U] protected virtual async Task HitsTheCorrectUrl() => await this.AssertOnAllResponses(r => this.AssertUrl(r.ApiCall.Uri));
+		[U] protected virtual async Task HitsTheCorrectUrl() => await AssertOnAllResponses(r => AssertUrl(r.ApiCall.Uri));
 
 		[U] protected virtual async Task UsesCorrectHttpMethod() =>
-			await this.AssertOnAllResponses(r => r.ApiCall.HttpMethod.Should().Be(this.HttpMethod, this.UniqueValues.CurrentView.GetStringValue()));
+			await AssertOnAllResponses(r => r.ApiCall.HttpMethod.Should().Be(HttpMethod, UniqueValues.CurrentView.GetStringValue()));
 
-		[U] protected virtual void SerializesInitializer() => this.RoundTripsOrSerializes<TInterface>(this.Initializer);
+		[U] protected virtual void SerializesInitializer() => RoundTripsOrSerializes<TInterface>(Initializer);
 
-		[U] protected virtual void SerializesFluent() => this.RoundTripsOrSerializes(this.Fluent?.Invoke(NewDescriptor()));
+		[U] protected virtual void SerializesFluent() => RoundTripsOrSerializes(Fluent?.Invoke(NewDescriptor()));
 
-		private void AssertUrl(Uri u) => u.PathEquals(this.UrlPath, this.UniqueValues.CurrentView.GetStringValue());
+		private void AssertUrl(Uri u) => u.PathEquals(UrlPath, UniqueValues.CurrentView.GetStringValue());
 	}
-
 }
diff --git a/src/Tests/Tests/Framework/EndpointTests/CanConnectTestBase.cs b/src/Tests/Tests/Framework/EndpointTests/CanConnectTestBase.cs
index f4f2a578160..55863d84dfa 100644
--- a/src/Tests/Tests/Framework/EndpointTests/CanConnectTestBase.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/CanConnectTestBase.cs
@@ -6,27 +6,27 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Framework
 {
-	public abstract class CanConnectTestBase<TCluster> :
-		ApiIntegrationTestBase<TCluster, IRootNodeInfoResponse, IRootNodeInfoRequest, RootNodeInfoDescriptor, RootNodeInfoRequest>
+	public abstract class CanConnectTestBase<TCluster>
+		: ApiIntegrationTestBase<TCluster, IRootNodeInfoResponse, IRootNodeInfoRequest, RootNodeInfoDescriptor, RootNodeInfoRequest>
 		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
 	{
 		protected CanConnectTestBase(TCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.RootNodeInfo(),
-			fluentAsync: (client, f) => client.RootNodeInfoAsync(),
-			request: (client, r) => client.RootNodeInfo(r),
-			requestAsync: (client, r) => client.RootNodeInfoAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.RootNodeInfo(),
+			(client, f) => client.RootNodeInfoAsync(),
+			(client, r) => client.RootNodeInfo(r),
+			(client, r) => client.RootNodeInfoAsync(r)
+		);
+
 		protected override void ExpectResponse(IRootNodeInfoResponse response)
 		{
 			response.Version.Should().NotBeNull();
diff --git a/src/Tests/Tests/Framework/EndpointTests/ConnectionErrorTestBase.cs b/src/Tests/Tests/Framework/EndpointTests/ConnectionErrorTestBase.cs
index 81fb959ab6b..cb14008a070 100644
--- a/src/Tests/Tests/Framework/EndpointTests/ConnectionErrorTestBase.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/ConnectionErrorTestBase.cs
@@ -3,39 +3,37 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Framework
 {
 	public abstract class ConnectionErrorTestBase<TCluster>
 		: RequestResponseApiTestBase<TCluster, IRootNodeInfoResponse, IRootNodeInfoRequest, RootNodeInfoDescriptor, RootNodeInfoRequest>
-		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster , new()
+		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
 	{
 		protected ConnectionErrorTestBase(TCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.RootNodeInfo(f),
-			fluentAsync: (client, f) => client.RootNodeInfoAsync(f),
-			request: (client, r) => client.RootNodeInfo(r),
-			requestAsync: (client, r) => client.RootNodeInfoAsync(r)
-		);
+		public override IElasticClient Client => Cluster.Client;
 
 		protected override object ExpectJson { get; } = null;
-
-		public override IElasticClient Client => this.Cluster.Client;
 		protected override RootNodeInfoRequest Initializer => new RootNodeInfoRequest();
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.RootNodeInfo(f),
+			(client, f) => client.RootNodeInfoAsync(f),
+			(client, r) => client.RootNodeInfo(r),
+			(client, r) => client.RootNodeInfoAsync(r)
+		);
+
 		//[I]
-		public async Task IsValidIsFalse() => await this.AssertOnAllResponses(r => r.ShouldHaveExpectedIsValid(false));
+		public async Task IsValidIsFalse() => await AssertOnAllResponses(r => r.ShouldHaveExpectedIsValid(false));
 
 		//[I]
-		public async Task AssertException() => await this.AssertOnAllResponses(r =>
+		public async Task AssertException() => await AssertOnAllResponses(r =>
 		{
 			var e = r.OriginalException;
 			e.Should().NotBeNull();
@@ -46,8 +44,8 @@ private void FindWebExceptionOrHttpRequestException(Exception mainException, Exc
 		{
 			mainException.Should().NotBeNull();
 			currentException.Should().NotBeNull();
-			if (currentException is WebException exception) this.AssertWebException(exception);
-			else if (currentException is HttpRequestException requestException) this.AssertHttpRequestException(requestException);
+			if (currentException is WebException exception) AssertWebException(exception);
+			else if (currentException is HttpRequestException requestException) AssertHttpRequestException(requestException);
 			else if (currentException.InnerException != null)
 				FindWebExceptionOrHttpRequestException(mainException, currentException.InnerException);
 			else
@@ -55,7 +53,7 @@ private void FindWebExceptionOrHttpRequestException(Exception mainException, Exc
 		}
 
 		protected abstract void AssertWebException(WebException e);
-		protected abstract void AssertHttpRequestException(System.Net.Http.HttpRequestException e);
 
+		protected abstract void AssertHttpRequestException(HttpRequestException e);
 	}
 }
diff --git a/src/Tests/Tests/Framework/EndpointTests/CrudTestBase.cs b/src/Tests/Tests/Framework/EndpointTests/CrudTestBase.cs
index e446af571fa..09db2dc2755 100644
--- a/src/Tests/Tests/Framework/EndpointTests/CrudTestBase.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/CrudTestBase.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Threading.Tasks;
 using Elastic.Managed.Ephemeral;
 using Elastic.Xunit.XunitPlumbing;
@@ -17,131 +16,170 @@ namespace Tests.Framework
 {
 	public abstract class CrudWithNoDeleteTestBase<TCreateResponse, TReadResponse, TUpdateResponse>
 		: CrudTestBase<TCreateResponse, TReadResponse, TUpdateResponse, AcknowledgedResponseBase>
-			where TCreateResponse : class, IResponse
-			where TReadResponse : class, IResponse
-			where TUpdateResponse : class, IResponse
+		where TCreateResponse : class, IResponse
+		where TReadResponse : class, IResponse
+		where TUpdateResponse : class, IResponse
 	{
-	    protected CrudWithNoDeleteTestBase(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected CrudWithNoDeleteTestBase(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected override bool SupportsDeletes => false;
 		protected override bool SupportsExists => false;
 
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[I] protected override Task CreateCallIsValid() => base.CreateCallIsValid();
+
 		[I] protected override Task GetAfterCreateIsValid() => base.GetAfterCreateIsValid();
+
 		[I] protected override Task ExistsAfterCreateIsValid() => base.ExistsAfterCreateIsValid();
+
 		[I] protected override Task UpdateCallIsValid() => base.UpdateCallIsValid();
+
 		[I] protected override Task GetAfterUpdateIsValid() => base.GetAfterUpdateIsValid();
+
 		[I] protected override Task DeleteCallIsValid() => base.DeleteCallIsValid();
+
 		[I] protected override Task GetAfterDeleteIsValid() => base.GetAfterDeleteIsValid();
+
 		[I] protected override Task ExistsAfterDeleteIsValid() => base.ExistsAfterDeleteIsValid();
+
 		[I] protected override Task DeleteNotFoundIsNotValid() => base.DeleteNotFoundIsNotValid();
 	}
 
 	public abstract class CrudTestBase<TCreateResponse, TReadResponse, TUpdateResponse, TDeleteResponse>
 		: CrudTestBase<WritableCluster, TCreateResponse, TReadResponse, TUpdateResponse, TDeleteResponse, ExistsResponse>
-			where TCreateResponse : class, IResponse
-			where TReadResponse : class, IResponse
-			where TUpdateResponse : class, IResponse
-			where TDeleteResponse : class, IResponse
+		where TCreateResponse : class, IResponse
+		where TReadResponse : class, IResponse
+		where TUpdateResponse : class, IResponse
+		where TDeleteResponse : class, IResponse
 	{
 		protected CrudTestBase(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected override bool SupportsExists => false;
-    
+
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[I] protected override Task CreateCallIsValid() => base.CreateCallIsValid();
+
 		[I] protected override Task GetAfterCreateIsValid() => base.GetAfterCreateIsValid();
+
 		[I] protected override Task ExistsAfterCreateIsValid() => base.ExistsAfterCreateIsValid();
+
 		[I] protected override Task UpdateCallIsValid() => base.UpdateCallIsValid();
+
 		[I] protected override Task GetAfterUpdateIsValid() => base.GetAfterUpdateIsValid();
+
 		[I] protected override Task DeleteCallIsValid() => base.DeleteCallIsValid();
+
 		[I] protected override Task GetAfterDeleteIsValid() => base.GetAfterDeleteIsValid();
+
 		[I] protected override Task ExistsAfterDeleteIsValid() => base.ExistsAfterDeleteIsValid();
+
 		[I] protected override Task DeleteNotFoundIsNotValid() => base.DeleteNotFoundIsNotValid();
 	}
-  
+
 	public abstract class CrudTestBase<TCluster, TCreateResponse, TReadResponse, TUpdateResponse, TDeleteResponse>
 		: CrudTestBase<TCluster, TCreateResponse, TReadResponse, TUpdateResponse, TDeleteResponse, ExistsResponse>
-			where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
-			where TCreateResponse : class, IResponse
-			where TReadResponse : class, IResponse
-			where TUpdateResponse : class, IResponse
-			where TDeleteResponse : class, IResponse
+		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
+		where TCreateResponse : class, IResponse
+		where TReadResponse : class, IResponse
+		where TUpdateResponse : class, IResponse
+		where TDeleteResponse : class, IResponse
 	{
 		protected CrudTestBase(TCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected override bool SupportsExists => false;
 
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[I] protected override Task CreateCallIsValid() => base.CreateCallIsValid();
+
 		[I] protected override Task GetAfterCreateIsValid() => base.GetAfterCreateIsValid();
+
 		[I] protected override Task ExistsAfterCreateIsValid() => base.ExistsAfterCreateIsValid();
+
 		[I] protected override Task UpdateCallIsValid() => base.UpdateCallIsValid();
+
 		[I] protected override Task GetAfterUpdateIsValid() => base.GetAfterUpdateIsValid();
+
 		[I] protected override Task DeleteCallIsValid() => base.DeleteCallIsValid();
+
 		[I] protected override Task GetAfterDeleteIsValid() => base.GetAfterDeleteIsValid();
+
 		[I] protected override Task ExistsAfterDeleteIsValid() => base.ExistsAfterDeleteIsValid();
+
 		[I] protected override Task DeleteNotFoundIsNotValid() => base.DeleteNotFoundIsNotValid();
 	}
 
 	public abstract class CrudTestBase<TCluster, TCreateResponse, TReadResponse, TUpdateResponse, TDeleteResponse, TExistsResponse>
 		: IClusterFixture<TCluster>, IClassFixture<EndpointUsage>
-			where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster , new()
-			where TCreateResponse : class, IResponse
-			where TReadResponse : class, IResponse
-			where TUpdateResponse : class, IResponse
-			where TDeleteResponse : class, IResponse
-			where TExistsResponse : class, IResponse, IExistsResponse
+		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
+		where TCreateResponse : class, IResponse
+		where TReadResponse : class, IResponse
+		where TUpdateResponse : class, IResponse
+		where TDeleteResponse : class, IResponse
+		where TExistsResponse : class, IResponse, IExistsResponse
 	{
-		private readonly EndpointUsage _usage;
-		private readonly LazyResponses _createResponse;
-		private readonly LazyResponses _createGetResponse;
 		private readonly Dictionary<string, LazyResponses> _afterCreateResponses = new Dictionary<string, LazyResponses>();
 		private readonly LazyResponses _createExistsResponse;
-		private readonly LazyResponses _updateResponse;
-		private readonly LazyResponses _updateGetResponse;
-		private readonly LazyResponses _deleteResponse;
-		private readonly LazyResponses _deleteGetResponse;
+		private readonly LazyResponses _createGetResponse;
+		private readonly LazyResponses _createResponse;
 		private readonly LazyResponses _deleteExistsResponse;
+		private readonly LazyResponses _deleteGetResponse;
 		private readonly LazyResponses _deleteNotFoundResponse;
+		private readonly LazyResponses _deleteResponse;
+		private readonly LazyResponses _updateGetResponse;
+		private readonly LazyResponses _updateResponse;
+		private readonly EndpointUsage _usage;
 
 
-		[SuppressMessage("Potential Code Quality Issues", "RECS0021:Warns about calls to virtual member functions occuring in the constructor", Justification = "Expected behaviour")]
+		[SuppressMessage("Potential Code Quality Issues", "RECS0021:Warns about calls to virtual member functions occuring in the constructor",
+			Justification = "Expected behaviour")]
 		protected CrudTestBase(TCluster cluster, EndpointUsage usage)
 		{
 			_usage = usage;
-			this.Cluster = cluster;
-			_createResponse = usage.CallOnce(this.Create, 1);
-			_createGetResponse = usage.CallOnce(this.Read, 2);
-			_createExistsResponse = usage.CallOnce(this.Exists, 3);
+			Cluster = cluster;
+			_createResponse = usage.CallOnce(Create, 1);
+			_createGetResponse = usage.CallOnce(Read, 2);
+			_createExistsResponse = usage.CallOnce(Exists, 3);
 			var i = 1;
 			// ReSharper disable once VirtualMemberCallInConstructor
-			foreach (var kv in this.AfterCreateCalls())
-				_afterCreateResponses[kv.Key] = usage.CallOnce(kv.Value, (3 * 10) + i++);
-
-			_updateResponse = usage.CallOnce(this.Update, 4);
-			_updateGetResponse = usage.CallOnce(this.Read, 5);
-			_deleteResponse = usage.CallOnce(this.Delete, 6);
-			_deleteGetResponse = usage.CallOnce(this.Read, 7);
-			_deleteExistsResponse = usage.CallOnce(this.Exists, 8);
-			_deleteNotFoundResponse = usage.CallOnce(this.Delete, 9);
+			foreach (var kv in AfterCreateCalls())
+				_afterCreateResponses[kv.Key] = usage.CallOnce(kv.Value, 3 * 10 + i++);
+
+			_updateResponse = usage.CallOnce(Update, 4);
+			_updateGetResponse = usage.CallOnce(Read, 5);
+			_deleteResponse = usage.CallOnce(Delete, 6);
+			_deleteGetResponse = usage.CallOnce(Read, 7);
+			_deleteExistsResponse = usage.CallOnce(Exists, 8);
+			_deleteNotFoundResponse = usage.CallOnce(Delete, 9);
 		}
-		protected abstract LazyResponses Create();
-		protected abstract LazyResponses Read();
-		protected abstract LazyResponses Update();
-		protected virtual LazyResponses Exists() => LazyResponses.Empty;
-		protected virtual LazyResponses Delete() => LazyResponses.Empty;
-		protected virtual IDictionary<string, Func<LazyResponses>> AfterCreateCalls() => new Dictionary<string, Func<LazyResponses>>();
 
-		private static string RandomFluent { get; } = $"fluent-{RandomString()}";
-		private static string RandomFluentAsync { get; } = $"fluentasync-{RandomString()}";
-		private static string RandomInitializer { get; } = $"ois-{RandomString()}";
-		private static string RandomInitializerAsync { get; } = $"oisasync-{RandomString()}";
+		protected virtual IElasticClient Client => Cluster.Client;
+
+		protected TCluster Cluster { get; }
 
 		protected virtual bool SupportsDeletes => true;
 		protected virtual bool SupportsExists => true;
 		protected virtual bool SupportsUpdates => true;
+
 		/// <summary>Helpful if you want to capture a reproduce trace with e.g fiddler</summary>
 		protected virtual bool TestOnlyOneMethod => false;
 
+		private static string RandomFluent { get; } = $"fluent-{RandomString()}";
+		private static string RandomFluentAsync { get; } = $"fluentasync-{RandomString()}";
+		private static string RandomInitializer { get; } = $"ois-{RandomString()}";
+		private static string RandomInitializerAsync { get; } = $"oisasync-{RandomString()}";
+
+		protected abstract LazyResponses Create();
+
+		protected abstract LazyResponses Read();
+
+		protected abstract LazyResponses Update();
+
+		protected virtual LazyResponses Exists() => LazyResponses.Empty;
+
+		protected virtual LazyResponses Delete() => LazyResponses.Empty;
+
+		protected virtual IDictionary<string, Func<LazyResponses>> AfterCreateCalls() => new Dictionary<string, Func<LazyResponses>>();
+
 		protected virtual void IntegrationSetup(IElasticClient client) { }
 
 		protected LazyResponses Calls<TDescriptor, TInitializer, TInterface, TResponse>(
@@ -157,82 +195,84 @@ Func<string, IElasticClient, TInitializer, Task<TResponse>> requestAsync
 			where TInitializer : class, TInterface
 			where TInterface : class
 		{
-			var client = this.Client;
+			var client = Client;
 			return new LazyResponses(async () =>
 			{
 				var dict = new Dictionary<ClientMethod, IResponse>();
 
 				if (TestClient.Configuration.RunIntegrationTests)
 				{
-					this.IntegrationSetup(client);
+					IntegrationSetup(client);
 					_usage.CalledSetup = true;
 				}
 
-				var sf = this.Sanitize(RandomFluent);
+				var sf = Sanitize(RandomFluent);
 				dict.Add(ClientMethod.Fluent, fluent(sf, client, f => fluentBody(sf, f)));
-				if (this.TestOnlyOneMethod) return dict;
+				if (TestOnlyOneMethod) return dict;
 
-				var sfa = this.Sanitize(RandomFluentAsync);
+				var sfa = Sanitize(RandomFluentAsync);
 				dict.Add(ClientMethod.FluentAsync, await fluentAsync(sfa, client, f => fluentBody(sfa, f)));
 
-				var si = this.Sanitize(RandomInitializer);
+				var si = Sanitize(RandomInitializer);
 				dict.Add(ClientMethod.Initializer, request(si, client, initializerBody(si)));
 
-				var sia = this.Sanitize(RandomInitializerAsync);
+				var sia = Sanitize(RandomInitializerAsync);
 				dict.Add(ClientMethod.InitializerAsync, await requestAsync(sia, client, initializerBody(sia)));
 				return dict;
 			});
 		}
+
 		protected LazyResponses Call<TResponse>(
 			Func<List<string>, IElasticClient, Task<TResponse>> requestAsync
 		)
 			where TResponse : class, IResponse
 		{
-			var client = this.Client;
+			var client = Client;
 			return new LazyResponses(async () =>
 			{
 				var dict = new Dictionary<ClientMethod, IResponse>();
 
-				var values = new List<string>() {
-					this.Sanitize(RandomFluent)};
-				if (!this.TestOnlyOneMethod)
+				var values = new List<string>()
+				{
+					Sanitize(RandomFluent)
+				};
+				if (!TestOnlyOneMethod)
 				{
-					values.Add(this.Sanitize(RandomFluentAsync));
-					values.Add(this.Sanitize(RandomInitializer));
-					values.Add(this.Sanitize(RandomInitializerAsync));
+					values.Add(Sanitize(RandomFluentAsync));
+					values.Add(Sanitize(RandomInitializer));
+					values.Add(Sanitize(RandomInitializerAsync));
 				}
 				dict.Add(ClientMethod.InitializerAsync, await requestAsync(values, client));
 				return dict;
 			});
 		}
-		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
 
-		protected virtual string Sanitize(string randomString) => randomString + "-" + this.GetType().Name.Replace("CrudTests", "").ToLowerInvariant();
+		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
 
-		protected TCluster Cluster { get; }
-		protected virtual IElasticClient Client => this.Cluster.Client;
+		protected virtual string Sanitize(string randomString) => randomString + "-" + GetType().Name.Replace("CrudTests", "").ToLowerInvariant();
 
 		protected async Task AssertOnAfterCreateResponse<TResponse>(string name, Action<TResponse> assert)
 			where TResponse : class, IResponse
 		{
-			await this.ExecuteOnceInOrder();
+			await ExecuteOnceInOrder();
 			if (_afterCreateResponses.ContainsKey(name))
-				await this.AssertOnAllResponses(_afterCreateResponses[name], assert);
+				await AssertOnAllResponses(_afterCreateResponses[name], assert);
 			else throw new Exception($"{name} is not a keyed after create response");
 		}
 
 		protected async Task AssertOnAllResponses<TResponse>(LazyResponses responses, Action<TResponse> assert)
 			where TResponse : class, IResponse
 		{
-			await this.ExecuteOnceInOrder();
+			await ExecuteOnceInOrder();
 
 			foreach (var kv in await responses)
 			{
 				if (!(kv.Value is TResponse response))
 					throw new Exception($"{kv.Value.GetType()} is not expected response type {typeof(TResponse)}");
+
 				//try
 				//{
-					assert(response);
+				assert(response);
 				//}
 #pragma warning disable 7095
 				//catch (Exception ex) when (false)
@@ -248,108 +288,127 @@ private async Task ExecuteOnceInOrder()
 			//hack to make sure these are resolved in the right order, calling twice yields cached results so  should be fast
 			await _createResponse;
 			await _createGetResponse;
-			if (this.SupportsExists)
+			if (SupportsExists)
 				await _createExistsResponse;
 
 			foreach (var kv in _afterCreateResponses) await kv.Value;
-			if (this.SupportsUpdates)
+			if (SupportsUpdates)
 			{
 				await _updateResponse;
 				await _updateGetResponse;
 			}
 
-			if (this.SupportsDeletes)
+			if (SupportsDeletes)
 			{
 				await _deleteResponse;
 				await _deleteGetResponse;
-				if (this.SupportsExists)
+				if (SupportsExists)
 					await _deleteExistsResponse;
 				await _deleteNotFoundResponse;
 			}
 		}
 
-		protected async Task AssertOnCreate(Action<TCreateResponse> assert) => await this.AssertOnAllResponses(_createResponse, assert);
+		protected async Task AssertOnCreate(Action<TCreateResponse> assert) => await AssertOnAllResponses(_createResponse, assert);
+
 		protected async Task AssertOnUpdate(Action<TUpdateResponse> assert)
 		{
-			if (!this.SupportsUpdates) return;
-			await this.AssertOnAllResponses(_updateResponse, assert);
+			if (!SupportsUpdates) return;
+
+			await AssertOnAllResponses(_updateResponse, assert);
 		}
 
 		protected async Task AssertOnDelete(Action<TDeleteResponse> assert)
 		{
-			if (!this.SupportsDeletes) return;
-			await this.AssertOnAllResponses(_deleteResponse, assert);
-		}
+			if (!SupportsDeletes) return;
 
-		protected async Task AssertOnGetAfterCreate(Action<TReadResponse> assert)
-		{
-			await this.AssertOnAllResponses(_createGetResponse, assert);
+			await AssertOnAllResponses(_deleteResponse, assert);
 		}
 
+		protected async Task AssertOnGetAfterCreate(Action<TReadResponse> assert) => await AssertOnAllResponses(_createGetResponse, assert);
+
 		protected async Task AssertOnGetAfterUpdate(Action<TReadResponse> assert)
 		{
-			if (!this.SupportsUpdates) return;
-			await this.AssertOnAllResponses(_updateGetResponse, assert);
+			if (!SupportsUpdates) return;
+
+			await AssertOnAllResponses(_updateGetResponse, assert);
 		}
 
 		protected async Task AssertOnGetAfterDelete(Action<TReadResponse> assert)
 		{
-			if (!this.SupportsDeletes) return;
-			await this.AssertOnAllResponses(_deleteGetResponse, assert);
+			if (!SupportsDeletes) return;
+
+			await AssertOnAllResponses(_deleteGetResponse, assert);
 		}
 
 		protected async Task AssertOnExistsAfterCreate(Action<TExistsResponse> assert)
 		{
-			if (!this.SupportsExists) return;
-			await this.AssertOnAllResponses(_createExistsResponse, assert);
+			if (!SupportsExists) return;
+
+			await AssertOnAllResponses(_createExistsResponse, assert);
 		}
+
 		protected async Task AssertOnExistsAfterDelete(Action<TExistsResponse> assert)
 		{
-			if (!this.SupportsExists) return;
-			await this.AssertOnAllResponses(_deleteExistsResponse, assert);
+			if (!SupportsExists) return;
+
+			await AssertOnAllResponses(_deleteExistsResponse, assert);
 		}
 
 		protected async Task AssertOnDeleteNotFoundAfterDelete(Action<TDeleteResponse> assert)
 		{
-			if (!this.SupportsDeletes) return;
-			await this.AssertOnAllResponses(_deleteNotFoundResponse, assert);
+			if (!SupportsDeletes) return;
+
+			await AssertOnAllResponses(_deleteNotFoundResponse, assert);
 		}
 
 		protected virtual void ExpectAfterCreate(TReadResponse response) { }
+
 		protected virtual void ExpectExistsAfterCreate(TExistsResponse response) { }
+
 		protected virtual void ExpectAfterUpdate(TReadResponse response) { }
+
 		protected virtual void ExpectDeleteNotFoundResponse(TDeleteResponse response) { }
+
 		protected virtual void ExpectExistsAfterDelete(TExistsResponse response) { }
 
-		[I] protected virtual async Task CreateCallIsValid() => await this.AssertOnCreate(r => r.ShouldBeValid());
-		[I] protected virtual async Task GetAfterCreateIsValid() => await this.AssertOnGetAfterCreate(r => {
+		[I] protected virtual async Task CreateCallIsValid() => await AssertOnCreate(r => r.ShouldBeValid());
+
+		[I] protected virtual async Task GetAfterCreateIsValid() => await AssertOnGetAfterCreate(r =>
+		{
 			r.ShouldBeValid();
-			this.ExpectAfterCreate(r);
+			ExpectAfterCreate(r);
 		});
-		[I] protected virtual async Task ExistsAfterCreateIsValid() => await this.AssertOnExistsAfterCreate(r => {
+
+		[I] protected virtual async Task ExistsAfterCreateIsValid() => await AssertOnExistsAfterCreate(r =>
+		{
 			r.ShouldBeValid();
 			r.Exists.Should().BeTrue();
-			this.ExpectExistsAfterCreate(r);
+			ExpectExistsAfterCreate(r);
 		});
 
-		[I] protected virtual async Task UpdateCallIsValid() => await this.AssertOnUpdate(r => r.ShouldBeValid());
+		[I] protected virtual async Task UpdateCallIsValid() => await AssertOnUpdate(r => r.ShouldBeValid());
 
-		[I] protected virtual async Task GetAfterUpdateIsValid() => await this.AssertOnGetAfterUpdate(r => {
+		[I] protected virtual async Task GetAfterUpdateIsValid() => await AssertOnGetAfterUpdate(r =>
+		{
 			r.ShouldBeValid();
-			this.ExpectAfterUpdate(r);
+			ExpectAfterUpdate(r);
 		});
 
-		[I] protected virtual async Task DeleteCallIsValid() => await this.AssertOnDelete(r => r.ShouldBeValid());
-		[I] protected virtual async Task GetAfterDeleteIsValid() => await this.AssertOnGetAfterDelete(r => r.ShouldNotBeValid());
-		[I] protected virtual async Task ExistsAfterDeleteIsValid() => await this.AssertOnExistsAfterDelete(r => {
+		[I] protected virtual async Task DeleteCallIsValid() => await AssertOnDelete(r => r.ShouldBeValid());
+
+		[I] protected virtual async Task GetAfterDeleteIsValid() => await AssertOnGetAfterDelete(r => r.ShouldNotBeValid());
+
+		[I] protected virtual async Task ExistsAfterDeleteIsValid() => await AssertOnExistsAfterDelete(r =>
+		{
 			r.ShouldBeValid();
 			r.Exists.Should().BeFalse();
-			this.ExpectExistsAfterDelete(r);
+			ExpectExistsAfterDelete(r);
 		});
-		[I] protected virtual async Task DeleteNotFoundIsNotValid() => await this.AssertOnDeleteNotFoundAfterDelete(r =>
+
+		[I] protected virtual async Task DeleteNotFoundIsNotValid() => await AssertOnDeleteNotFoundAfterDelete(r =>
 		{
 			r.ShouldNotBeValid();
-			this.ExpectDeleteNotFoundResponse(r);
+			ExpectDeleteNotFoundResponse(r);
 		});
 	}
 }
diff --git a/src/Tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs b/src/Tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs
index 0f0cc0ae84b..b07586e408f 100644
--- a/src/Tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs
@@ -1,23 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Elastic.Managed;
 using Elastic.Managed.Ephemeral;
-using Nest;
-using Tests.Framework.Integration;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
+using Nest;
 using Tests.Core.Client;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Core.Serialization;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.Integration;
 using Xunit;
 
 namespace Tests.Framework
 {
 	public abstract class RequestResponseApiTestBase<TCluster, TResponse, TInterface, TDescriptor, TInitializer>
 		: ExpectJsonTestBase, IClusterFixture<TCluster>, IClassFixture<EndpointUsage>
-		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster , new()
+		where TCluster : IEphemeralCluster<EphemeralClusterConfiguration>, INestTestCluster, new()
 		where TResponse : class, IResponse
 		where TInterface : class
 		where TDescriptor : class, TInterface
@@ -25,104 +22,111 @@ public abstract class RequestResponseApiTestBase<TCluster, TResponse, TInterface
 	{
 		private readonly EndpointUsage _usage;
 
-		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
-		protected bool RanIntegrationSetup => this._usage?.CalledSetup ?? false;
-	    protected string U(string s) => Uri.EscapeDataString(s);
+		protected RequestResponseApiTestBase(TCluster cluster, EndpointUsage usage) : base(cluster.Client)
+		{
+			_usage = usage ?? throw new ArgumentNullException(nameof(usage));
 
-		protected string CallIsolatedValue => UniqueValues.Value;
-		protected T ExtendedValue<T>(string key) where T : class => this.UniqueValues.ExtendedValue<T>(key);
-		protected void ExtendedValue<T>(string key, T value) where T : class => this.UniqueValues.ExtendedValue(key, value);
+			if (cluster == null) throw new ArgumentNullException(nameof(cluster));
 
-		protected virtual TDescriptor NewDescriptor() => Activator.CreateInstance<TDescriptor>();
+			Cluster = cluster;
+			Responses = usage.CallOnce(ClientUsage, 0);
+			UniqueValues = usage.CallUniqueValues;
+		}
+
+		public virtual IElasticClient Client => TestClient.DefaultInMemoryClient;
+
+		public TCluster Cluster { get; }
+
+		protected string CallIsolatedValue => UniqueValues.Value;
 		protected virtual Func<TDescriptor, TInterface> Fluent { get; } = null;
 		protected virtual TInitializer Initializer { get; } = null;
-
-		protected virtual void IntegrationSetup(IElasticClient client, CallUniqueValues values) { }
-		protected virtual void IntegrationTeardown(IElasticClient client, CallUniqueValues values) { }
-		protected virtual void OnBeforeCall(IElasticClient client) { }
-		protected virtual void OnAfterCall(IElasticClient client) { }
+		protected bool RanIntegrationSetup => _usage?.CalledSetup ?? false;
+		protected LazyResponses Responses { get; }
 
 		protected CallUniqueValues UniqueValues { get; }
-		protected LazyResponses Responses { get; }
 
-		public virtual IElasticClient Client => TestClient.DefaultInMemoryClient;
+		protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8);
 
-		protected abstract LazyResponses ClientUsage();
+		protected string U(string s) => Uri.EscapeDataString(s);
 
-        public TCluster Cluster { get; }
+		protected T ExtendedValue<T>(string key) where T : class => UniqueValues.ExtendedValue<T>(key);
 
-		protected RequestResponseApiTestBase(TCluster cluster, EndpointUsage usage) : base(cluster.Client)
-		{
-			this._usage = usage ?? throw new ArgumentNullException(nameof(usage));
+		protected void ExtendedValue<T>(string key, T value) where T : class => UniqueValues.ExtendedValue(key, value);
 
-			if (cluster == null) throw new ArgumentNullException(nameof(cluster));
-			this.Cluster = cluster;
-			this.Responses = usage.CallOnce(this.ClientUsage, 0);
-			this.UniqueValues = usage.CallUniqueValues;
-		}
+		protected virtual TDescriptor NewDescriptor() => Activator.CreateInstance<TDescriptor>();
+
+		protected virtual void IntegrationSetup(IElasticClient client, CallUniqueValues values) { }
+
+		protected virtual void IntegrationTeardown(IElasticClient client, CallUniqueValues values) { }
+
+		protected virtual void OnBeforeCall(IElasticClient client) { }
+
+		protected virtual void OnAfterCall(IElasticClient client) { }
+
+		protected abstract LazyResponses ClientUsage();
 
 		protected LazyResponses Calls(
 			Func<IElasticClient, Func<TDescriptor, TInterface>, TResponse> fluent,
 			Func<IElasticClient, Func<TDescriptor, TInterface>, Task<TResponse>> fluentAsync,
 			Func<IElasticClient, TInitializer, TResponse> request,
 			Func<IElasticClient, TInitializer, Task<TResponse>> requestAsync
-		)
+		) => new LazyResponses(async () =>
 		{
-			return new LazyResponses(async () =>
+			var client = Client;
+
+			void IntegrateOnly(Action<IElasticClient> act)
 			{
-				var client = this.Client;
-				void IntegrateOnly(Action<IElasticClient> act)
-				{
-					if (!TestClient.Configuration.RunIntegrationTests) return;
-					act(client);
-				}
-				if (TestClient.Configuration.RunIntegrationTests)
-				{
-					this.IntegrationSetup(client, UniqueValues);
-					this._usage.CalledSetup = true;
-				}
+				if (!TestClient.Configuration.RunIntegrationTests) return;
+
+				act(client);
+			}
+
+			if (TestClient.Configuration.RunIntegrationTests)
+			{
+				IntegrationSetup(client, UniqueValues);
+				_usage.CalledSetup = true;
+			}
 
-				var dict = new Dictionary<ClientMethod, IResponse>();
-				UniqueValues.CurrentView = ClientMethod.Fluent;
+			var dict = new Dictionary<ClientMethod, IResponse>();
+			UniqueValues.CurrentView = ClientMethod.Fluent;
 
-				IntegrateOnly(this.OnBeforeCall);
-				dict.Add(ClientMethod.Fluent, fluent(client, this.Fluent));
-				IntegrateOnly(this.OnAfterCall);
+			IntegrateOnly(OnBeforeCall);
+			dict.Add(ClientMethod.Fluent, fluent(client, Fluent));
+			IntegrateOnly(OnAfterCall);
 
-				UniqueValues.CurrentView = ClientMethod.FluentAsync;
-				IntegrateOnly(this.OnBeforeCall);
-				dict.Add(ClientMethod.FluentAsync, await fluentAsync(client, this.Fluent));
-				IntegrateOnly(this.OnAfterCall);
+			UniqueValues.CurrentView = ClientMethod.FluentAsync;
+			IntegrateOnly(OnBeforeCall);
+			dict.Add(ClientMethod.FluentAsync, await fluentAsync(client, Fluent));
+			IntegrateOnly(OnAfterCall);
 
-				UniqueValues.CurrentView = ClientMethod.Initializer;
-				IntegrateOnly(this.OnBeforeCall);
-				dict.Add(ClientMethod.Initializer, request(client, this.Initializer));
-				IntegrateOnly(this.OnAfterCall);
+			UniqueValues.CurrentView = ClientMethod.Initializer;
+			IntegrateOnly(OnBeforeCall);
+			dict.Add(ClientMethod.Initializer, request(client, Initializer));
+			IntegrateOnly(OnAfterCall);
 
-				UniqueValues.CurrentView = ClientMethod.InitializerAsync;
-				IntegrateOnly(this.OnBeforeCall);
-				dict.Add(ClientMethod.InitializerAsync, await requestAsync(client, this.Initializer));
-				IntegrateOnly(this.OnAfterCall);
+			UniqueValues.CurrentView = ClientMethod.InitializerAsync;
+			IntegrateOnly(OnBeforeCall);
+			dict.Add(ClientMethod.InitializerAsync, await requestAsync(client, Initializer));
+			IntegrateOnly(OnAfterCall);
 
-				if (TestClient.Configuration.RunIntegrationTests)
-				{
-					this.IntegrationTeardown(client, UniqueValues);
-					this._usage.CalledTeardown = true;
-				}
+			if (TestClient.Configuration.RunIntegrationTests)
+			{
+				IntegrationTeardown(client, UniqueValues);
+				_usage.CalledTeardown = true;
+			}
 
-				return dict;
-			});
-		}
+			return dict;
+		});
 
 		protected virtual async Task AssertOnAllResponses(Action<TResponse> assert)
 		{
-			var responses = await this.Responses;
+			var responses = await Responses;
 			foreach (var kv in responses)
 			{
 				var response = kv.Value as TResponse;
 				try
 				{
-					this.UniqueValues.CurrentView = kv.Key;
+					UniqueValues.CurrentView = kv.Key;
 					assert(response);
 				}
 #pragma warning disable 7095 //enable this if you expect a single overload to act up
diff --git a/src/Tests/Tests/Framework/EndpointTests/TestState/AsyncLazy.cs b/src/Tests/Tests/Framework/EndpointTests/TestState/AsyncLazy.cs
index 011b4971fda..02cb75e5250 100644
--- a/src/Tests/Tests/Framework/EndpointTests/TestState/AsyncLazy.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/TestState/AsyncLazy.cs
@@ -16,19 +16,19 @@ public class AsyncLazy<T>
 		private readonly Lazy<Task<T>> instance;
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="AsyncLazy&lt;T&gt;"/> class.
+		/// Initializes a new instance of the <see cref="AsyncLazy&lt;T&gt;" /> class.
 		/// </summary>
 		/// <param name="factory">The delegate that is invoked on a background thread to produce the value when it is needed.</param>
 		public AsyncLazy(Func<T> factory) => instance = new Lazy<Task<T>>(() => Task.Run(factory));
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="AsyncLazy&lt;T&gt;"/> class.
+		/// Initializes a new instance of the <see cref="AsyncLazy&lt;T&gt;" /> class.
 		/// </summary>
 		/// <param name="factory">The asynchronous delegate that is invoked on a background thread to produce the value when it is needed.</param>
 		public AsyncLazy(Func<Task<T>> factory) => instance = new Lazy<Task<T>>(() => Task.Run(factory));
 
 		/// <summary>
-		/// Asynchronous infrastructure support. This method permits instances of <see cref="AsyncLazy&lt;T&gt;"/> to be await'ed.
+		/// Asynchronous infrastructure support. This method permits instances of <see cref="AsyncLazy&lt;T&gt;" /> to be await'ed.
 		/// </summary>
 		public TaskAwaiter<T> GetAwaiter() => instance.Value.GetAwaiter();
 
diff --git a/src/Tests/Tests/Framework/EndpointTests/TestState/CallUniqueValues.cs b/src/Tests/Tests/Framework/EndpointTests/TestState/CallUniqueValues.cs
index 3156d0f8455..99135fbaa1e 100644
--- a/src/Tests/Tests/Framework/EndpointTests/TestState/CallUniqueValues.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/TestState/CallUniqueValues.cs
@@ -8,44 +8,48 @@ namespace Tests.Framework.Integration
 {
 	/// <summary>
 	/// Holds unique values for the the two DSL's and the exposed sync and async methods we expose
-	/// <see cref="ClientMethod"/>
+	/// <see cref="ClientMethod" />
 	/// </summary>
 	public class CallUniqueValues : Dictionary<ClientMethod, string>
 	{
 		private readonly string _prefix;
-		private string UniqueValue => $"{this._prefix}-{ViewName}-{Guid.NewGuid().ToString("N").Substring(0, 8)}";
-    public string FixedForAllCallsValue { get; }
 
-		private IDictionary<ClientMethod, ConcurrentDictionary<string, object>> ExtendedValues { get; }
-			= new Dictionary<ClientMethod, ConcurrentDictionary<string, object>>();
+		public CallUniqueValues(string prefix = "nest")
+		{
+			_prefix = prefix;
+			FixedForAllCallsValue = UniqueValue;
+			SetupClientMethod(Fluent);
+			SetupClientMethod(FluentAsync);
+			SetupClientMethod(Initializer);
+			SetupClientMethod(InitializerAsync);
+			CurrentView = Fluent;
+		}
 
 		public ClientMethod CurrentView { get; set; } = Fluent;
-		public string ViewName => this.CurrentView.GetStringValue().ToLowerInvariant();
+		public string FixedForAllCallsValue { get; }
+
+		public string Value => this[CurrentView];
+		public string ViewName => CurrentView.GetStringValue().ToLowerInvariant();
 
 		public ClientMethod[] Views { get; } = { Fluent, FluentAsync, Initializer, InitializerAsync };
 
-		public string Value => this[CurrentView];
-		public T ExtendedValue<T>(string key) where T : class => this.ExtendedValues[CurrentView][key] as T;
-		public void ExtendedValue<T>(string key, T value) where T : class => this.ExtendedValues[CurrentView][key] = value;
-		public T ExtendedValue<T>(string key, Func<T> value) where T : class =>
-			this.ExtendedValues[CurrentView].GetOrAdd(key, value) as T;
+		private IDictionary<ClientMethod, ConcurrentDictionary<string, object>> ExtendedValues { get; }
+			= new Dictionary<ClientMethod, ConcurrentDictionary<string, object>>();
 
-		public CallUniqueValues(string prefix = "nest")
-		{
-			this._prefix = prefix;
-      this.FixedForAllCallsValue = this.UniqueValue;
-			this.SetupClientMethod(Fluent);
-			this.SetupClientMethod(FluentAsync);
-			this.SetupClientMethod(Initializer);
-			this.SetupClientMethod(InitializerAsync);
-			this.CurrentView = Fluent;
-		}
+		private string UniqueValue => $"{_prefix}-{ViewName}-{Guid.NewGuid().ToString("N").Substring(0, 8)}";
+
+		public T ExtendedValue<T>(string key) where T : class => ExtendedValues[CurrentView][key] as T;
+
+		public void ExtendedValue<T>(string key, T value) where T : class => ExtendedValues[CurrentView][key] = value;
+
+		public T ExtendedValue<T>(string key, Func<T> value) where T : class =>
+			ExtendedValues[CurrentView].GetOrAdd(key, value) as T;
 
 		private void SetupClientMethod(ClientMethod method)
 		{
-			this.CurrentView = method;
-			this.Add(method, this.UniqueValue);
-			this.ExtendedValues.Add(method, new ConcurrentDictionary<string, object>());
+			CurrentView = method;
+			Add(method, UniqueValue);
+			ExtendedValues.Add(method, new ConcurrentDictionary<string, object>());
 		}
 	}
 }
diff --git a/src/Tests/Tests/Framework/EndpointTests/TestState/EndpointUsage.cs b/src/Tests/Tests/Framework/EndpointTests/TestState/EndpointUsage.cs
index 226772332a2..be322360727 100644
--- a/src/Tests/Tests/Framework/EndpointTests/TestState/EndpointUsage.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/TestState/EndpointUsage.cs
@@ -18,21 +18,23 @@ public class EndpointUsage
 		private readonly object _lock = new object();
 		private readonly ConcurrentDictionary<int, LazyResponses> _usages = new ConcurrentDictionary<int, LazyResponses>();
 
-		public CallUniqueValues CallUniqueValues { get; }
+		public EndpointUsage() : this("nest") { }
+
+		protected EndpointUsage(string prefix) => CallUniqueValues = new CallUniqueValues(prefix);
 
 		public bool CalledSetup { get; internal set; }
 		public bool CalledTeardown { get; internal set; }
 
-		public EndpointUsage() : this("nest") { }
-
-		protected EndpointUsage(string prefix) => this.CallUniqueValues = new CallUniqueValues(prefix);
+		public CallUniqueValues CallUniqueValues { get; }
 
 		public LazyResponses CallOnce(Func<LazyResponses> clientUsage, int k = 0)
 		{
 			if (_usages.TryGetValue(k, out var lazyResponses)) return lazyResponses;
+
 			lock (_lock)
 			{
 				if (_usages.TryGetValue(k, out lazyResponses)) return lazyResponses;
+
 				var response = clientUsage();
 				_usages.TryAdd(k, response);
 				return response;
@@ -43,13 +45,18 @@ public LazyResponses CallOnce(Func<LazyResponses> clientUsage, int k = 0)
 	public class SingleEndpointUsage<TResponse> : EndpointUsage
 		where TResponse : class, IResponse
 	{
+		private readonly Func<string, IElasticClient, TResponse> _fluent;
+		private readonly Func<string, IElasticClient, Task<TResponse>> _fluentAsync;
+		private readonly Func<string, IElasticClient, TResponse> _request;
+		private readonly Func<string, IElasticClient, Task<TResponse>> _requestAsync;
+
 		public SingleEndpointUsage(
 			Func<string, IElasticClient, TResponse> fluent,
 			Func<string, IElasticClient, Task<TResponse>> fluentAsync,
 			Func<string, IElasticClient, TResponse> request,
 			Func<string, IElasticClient, Task<TResponse>> requestAsync,
 			string valuePrefix = null
-			) : base(valuePrefix)
+		) : base(valuePrefix)
 		{
 			_fluent = fluent;
 			_fluentAsync = fluentAsync;
@@ -57,27 +64,22 @@ public SingleEndpointUsage(
 			_requestAsync = requestAsync;
 		}
 
-		private readonly Func<string, IElasticClient, TResponse> _fluent;
-		private readonly Func<string, IElasticClient, Task<TResponse>> _fluentAsync;
-		private readonly Func<string, IElasticClient, TResponse> _request;
-		private readonly Func<string, IElasticClient, Task<TResponse>> _requestAsync;
-
 		public Action<IElasticClient, CallUniqueValues> IntegrationSetup { get; set; }
 		public Action<IElasticClient, CallUniqueValues> IntegrationTeardown { get; set; }
-		public Action<IElasticClient> OnBeforeCall { get; set; }
 		public Action<IElasticClient> OnAfterCall { get; set; }
-
-		private LazyResponses Responses { get; set; }
+		public Action<IElasticClient> OnBeforeCall { get; set; }
 
 		public static Randomizer Random { get; } = new Randomizer(TestConfiguration.Instance.Seed);
 
+		private LazyResponses Responses { get; set; }
+
 		public void KickOffOnce(IElasticClient client, bool oneRandomCall = false) =>
-			this.Responses = this.CallOnce(()=> new LazyResponses(async () =>
+			Responses = CallOnce(() => new LazyResponses(async () =>
 			{
 				if (TestClient.Configuration.RunIntegrationTests)
 				{
-					this.IntegrationSetup?.Invoke(client, this.CallUniqueValues);
-					this.CalledSetup = true;
+					IntegrationSetup?.Invoke(client, CallUniqueValues);
+					CalledSetup = true;
 				}
 
 				var randomCall = Random.Number(0, 3);
@@ -85,22 +87,22 @@ public void KickOffOnce(IElasticClient client, bool oneRandomCall = false) =>
 				var dict = new Dictionary<ClientMethod, IResponse>();
 
 				if (!oneRandomCall || randomCall == 0)
-					this.Call(client, dict, ClientMethod.Fluent, v => _fluent(v, client));
+					Call(client, dict, ClientMethod.Fluent, v => _fluent(v, client));
 
 				if (!oneRandomCall || randomCall == 1)
-					await this.CallAsync(client, dict, ClientMethod.FluentAsync, v => _fluentAsync(v, client));
+					await CallAsync(client, dict, ClientMethod.FluentAsync, v => _fluentAsync(v, client));
 
 				if (!oneRandomCall || randomCall == 2)
-					this.Call(client, dict, ClientMethod.Initializer, v => _request(v, client));
+					Call(client, dict, ClientMethod.Initializer, v => _request(v, client));
 
 				if (!oneRandomCall || randomCall == 3)
-					await this.CallAsync(client, dict, ClientMethod.InitializerAsync, v => _requestAsync(v, client));
+					await CallAsync(client, dict, ClientMethod.InitializerAsync, v => _requestAsync(v, client));
 
 				if (TestClient.Configuration.RunIntegrationTests)
 				{
-					foreach (var v in this.CallUniqueValues.Values.SelectMany(d => d))
-						this.IntegrationTeardown?.Invoke(client, this.CallUniqueValues);
-					this.CalledTeardown = true;
+					foreach (var v in CallUniqueValues.Values.SelectMany(d => d))
+						IntegrationTeardown?.Invoke(client, CallUniqueValues);
+					CalledTeardown = true;
 				}
 
 				return dict;
@@ -108,29 +110,32 @@ public void KickOffOnce(IElasticClient client, bool oneRandomCall = false) =>
 
 		private void Call(IElasticClient client, IDictionary<ClientMethod, IResponse> dict, ClientMethod method, Func<string, TResponse> call)
 		{
-			this.CallUniqueValues.CurrentView = method;
-			this.OnBeforeCall?.Invoke(client);
-			dict.Add(method, call(this.CallUniqueValues.Value));
-			this.OnAfterCall?.Invoke(client);
+			CallUniqueValues.CurrentView = method;
+			OnBeforeCall?.Invoke(client);
+			dict.Add(method, call(CallUniqueValues.Value));
+			OnAfterCall?.Invoke(client);
 		}
-		private async Task CallAsync(IElasticClient client, IDictionary<ClientMethod, IResponse> dict, ClientMethod method, Func<string,Task<TResponse>> call)
+
+		private async Task CallAsync(IElasticClient client, IDictionary<ClientMethod, IResponse> dict, ClientMethod method,
+			Func<string, Task<TResponse>> call
+		)
 		{
-			this.CallUniqueValues.CurrentView = method;
-			this.OnBeforeCall?.Invoke(client);
-			dict.Add(method, await call(this.CallUniqueValues.Value));
-			this.OnAfterCall?.Invoke(client);
+			CallUniqueValues.CurrentView = method;
+			OnBeforeCall?.Invoke(client);
+			dict.Add(method, await call(CallUniqueValues.Value));
+			OnAfterCall?.Invoke(client);
 		}
 
 		public async Task AssertOnAllResponses(Action<TResponse> assert)
 		{
-			var responses = await this.Responses;
+			var responses = await Responses;
 			foreach (var kv in responses)
 			{
 				var r = kv.Value as TResponse;
 
 				//this is to make sure any unexpected exceptions on the response are rethrown and shown during testing
 				if (TestClient.Configuration.RunIntegrationTests && !r.IsValid && r.ApiCall.OriginalException != null
-				    && !(r.ApiCall.OriginalException is ElasticsearchClientException))
+					&& !(r.ApiCall.OriginalException is ElasticsearchClientException))
 				{
 					var e = ExceptionDispatchInfo.Capture(r.ApiCall.OriginalException.Demystify());
 					throw new ResponseAssertionException(e.SourceException, r);
@@ -147,5 +152,4 @@ public async Task AssertOnAllResponses(Action<TResponse> assert)
 			}
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Framework/EndpointTests/TestState/LazyResponses.cs b/src/Tests/Tests/Framework/EndpointTests/TestState/LazyResponses.cs
index 24de1fb63f1..81e8342d8ce 100644
--- a/src/Tests/Tests/Framework/EndpointTests/TestState/LazyResponses.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/TestState/LazyResponses.cs
@@ -8,10 +8,10 @@ namespace Tests.Framework
 {
 	public class LazyResponses : AsyncLazy<Dictionary<ClientMethod, IResponse>>
 	{
-		public static LazyResponses Empty { get; } = new LazyResponses(() => new Dictionary<ClientMethod, IResponse>());
-
 		public LazyResponses(Func<Dictionary<ClientMethod, IResponse>> factory) : base(factory) { }
 
 		public LazyResponses(Func<Task<Dictionary<ClientMethod, IResponse>>> factory) : base(factory) { }
+
+		public static LazyResponses Empty { get; } = new LazyResponses(() => new Dictionary<ClientMethod, IResponse>());
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Framework/EndpointTests/UrlTests.cs b/src/Tests/Tests/Framework/EndpointTests/UrlTests.cs
index a2f0e4e3ac5..85af21d713e 100644
--- a/src/Tests/Tests/Framework/EndpointTests/UrlTests.cs
+++ b/src/Tests/Tests/Framework/EndpointTests/UrlTests.cs
@@ -6,7 +6,6 @@
 using Nest;
 using Tests.Core.Client;
 using Tests.Core.Client.Settings;
-using Tests.Framework.ManagedElasticsearch;
 
 namespace Tests.Framework
 {
@@ -26,33 +25,43 @@ public static async Task<UrlTester> FluentAsync<TResponse>(this Task<UrlTester>
 
 	public class UrlTester
 	{
-		protected string ExpectedUrl { get; set; }
-		protected HttpMethod ExpectedHttpMethod { get; set; }
-		private IElasticClient Client { get; }
-
 		internal UrlTester(HttpMethod method, string expectedUrl, Func<ConnectionSettings, ConnectionSettings> settings = null)
 		{
-			this.ExpectedHttpMethod = method;
-			this.ExpectedUrl = expectedUrl;
-			this.Client = settings == null
+			ExpectedHttpMethod = method;
+			ExpectedUrl = expectedUrl;
+			Client = settings == null
 				? TestClient.DefaultInMemoryClient
 				: new ElasticClient(settings(new AlwaysInMemoryConnectionSettings()));
 		}
 
+		protected HttpMethod ExpectedHttpMethod { get; set; }
+		protected string ExpectedUrl { get; set; }
+		private IElasticClient Client { get; }
+
 		public static UrlTester ExpectUrl(HttpMethod method, string url, Func<ConnectionSettings, ConnectionSettings> settings = null) =>
 			new UrlTester(method, url, settings);
-		public static UrlTester POST(string url) =>  new UrlTester(HttpMethod.POST, url);
-		public static UrlTester PUT(string url) =>  new UrlTester(HttpMethod.PUT, url);
-		public static UrlTester GET(string url) =>  new UrlTester(HttpMethod.GET, url);
-		public static UrlTester HEAD(string url) =>  new UrlTester(HttpMethod.HEAD, url);
-		public static UrlTester DELETE(string url) =>  new UrlTester(HttpMethod.DELETE, url);
+
+		public static UrlTester POST(string url) => new UrlTester(HttpMethod.POST, url);
+
+		public static UrlTester PUT(string url) => new UrlTester(HttpMethod.PUT, url);
+
+		public static UrlTester GET(string url) => new UrlTester(HttpMethod.GET, url);
+
+		public static UrlTester HEAD(string url) => new UrlTester(HttpMethod.HEAD, url);
+
+		public static UrlTester DELETE(string url) => new UrlTester(HttpMethod.DELETE, url);
+
 		public static string EscapeUriString(string s) => Uri.EscapeDataString(s);
 
 		public UrlTester Fluent<TResponse>(Func<IElasticClient, TResponse> call) where TResponse : IResponse => WhenCalling(call, "fluent");
+
 		public UrlTester Request<TResponse>(Func<IElasticClient, TResponse> call) where TResponse : IResponse => WhenCalling(call, "request");
 
-		public Task<UrlTester> FluentAsync<TResponse>(Func<IElasticClient, Task<TResponse>> call) where TResponse : IResponse => WhenCallingAsync(call, "fluent async");
-		public Task<UrlTester> RequestAsync<TResponse>(Func<IElasticClient, Task<TResponse>> call) where TResponse : IResponse => WhenCallingAsync(call, "request async");
+		public Task<UrlTester> FluentAsync<TResponse>(Func<IElasticClient, Task<TResponse>> call) where TResponse : IResponse =>
+			WhenCallingAsync(call, "fluent async");
+
+		public Task<UrlTester> RequestAsync<TResponse>(Func<IElasticClient, Task<TResponse>> call) where TResponse : IResponse =>
+			WhenCallingAsync(call, "request async");
 
 		public UrlTester LowLevel(Func<IElasticLowLevelClient, IApiCallDetails> call)
 		{
@@ -77,8 +86,8 @@ internal async Task<UrlTester> WhenCallingAsync<TResponse>(Func<IElasticClient,
 		private UrlTester Assert(string typeOfCall, IApiCallDetails callDetails)
 		{
 			var url = callDetails.Uri.PathAndQuery;
-			callDetails.Uri.PathEquals(this.ExpectedUrl, typeOfCall);
-			callDetails.HttpMethod.Should().Be(this.ExpectedHttpMethod, $"{typeOfCall} to {url}");
+			callDetails.Uri.PathEquals(ExpectedUrl, typeOfCall);
+			callDetails.HttpMethod.Should().Be(ExpectedHttpMethod, $"{typeOfCall} to {url}");
 			return this;
 		}
 	}
diff --git a/src/Tests/Tests/Framework/Extensions/Numeric.cs b/src/Tests/Tests/Framework/Extensions/Numeric.cs
index 6437b94b0cf..41824e057fd 100644
--- a/src/Tests/Tests/Framework/Extensions/Numeric.cs
+++ b/src/Tests/Tests/Framework/Extensions/Numeric.cs
@@ -1,6 +1,4 @@
-using Nest;
-
-namespace Tests.Framework
+namespace Tests.Framework
 {
 	internal static class NumericExtensions
 	{
@@ -27,8 +25,6 @@ public static string ToOrdinal(this int num)
 				default:
 					return num + "th";
 			}
-
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Framework/Extensions/Promisify.cs b/src/Tests/Tests/Framework/Extensions/Promisify.cs
index b0283575209..eb5a321ef61 100644
--- a/src/Tests/Tests/Framework/Extensions/Promisify.cs
+++ b/src/Tests/Tests/Framework/Extensions/Promisify.cs
@@ -10,12 +10,9 @@ public class PromiseValue<T> : IPromise<T> where T : class
 		{
 			private readonly T _o;
 
-			public PromiseValue(T o)
-			{
-				_o = o;
-			}
+			public PromiseValue(T o) => _o = o;
 
 			T IPromise<T>.Value => _o;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Framework/Extensions/TypeExtensions.cs b/src/Tests/Tests/Framework/Extensions/TypeExtensions.cs
index 6151bdea0b9..b8bd25e0e0b 100644
--- a/src/Tests/Tests/Framework/Extensions/TypeExtensions.cs
+++ b/src/Tests/Tests/Framework/Extensions/TypeExtensions.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Threading;
-using System.Reflection;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace Tests.Framework
 {
@@ -118,17 +117,18 @@ internal static IEnumerable<TAttribute> GetAttributes<TAttribute>(this Type t)
 #if !DOTNETCORE
 			var attributes = Attribute.GetCustomAttributes(t, typeof(TAttribute), true);
 #else
-			var attributes =  t.GetTypeInfo().GetCustomAttributes(typeof(TAttribute), true);
+			var attributes = t.GetTypeInfo().GetCustomAttributes(typeof(TAttribute), true);
 #endif
 			return attributes.Cast<TAttribute>();
 		}
+
 		internal static IEnumerable<TAttribute> GetAttributes<TAttribute>(this MethodInfo m)
 			where TAttribute : Attribute
 		{
 #if !DOTNETCORE
 			var attributes = Attribute.GetCustomAttributes(m, typeof(TAttribute), true);
 #else
-			var attributes =  m.GetCustomAttributes(typeof(TAttribute), true);
+			var attributes = m.GetCustomAttributes(typeof(TAttribute), true);
 #endif
 			return attributes.Cast<TAttribute>();
 		}
diff --git a/src/Tests/Tests/Framework/Extensions/UriExtensions.cs b/src/Tests/Tests/Framework/Extensions/UriExtensions.cs
index c5ef7f62ddf..a89f73faa4e 100644
--- a/src/Tests/Tests/Framework/Extensions/UriExtensions.cs
+++ b/src/Tests/Tests/Framework/Extensions/UriExtensions.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Tests.Core.Extensions;
 
@@ -30,7 +28,7 @@ public static void PathEquals(this Uri actualUri, string pathAndQueryString, str
 		private static Uri CreateUri(Uri baseUri, Dictionary<string, string> newQueryString)
 		{
 			var query = FlattenQueryString(newQueryString);
-			var uriBuilder = new UriBuilder(baseUri) {Query = query };
+			var uriBuilder = new UriBuilder(baseUri) { Query = query };
 			return uriBuilder.Uri;
 		}
 
@@ -47,6 +45,7 @@ private static void AssertQueryString(Uri actualUri, Uri expectedUri, string ori
 
 			//actualParameters.Count.Should().Be(expectedParameters.Count, "All query string parameters need to be asserted.\r\n{0}", because);
 			if (actualParameters.Count == 0) return;
+
 			actualParameters.Should().ContainKeys(expectedParameters.Keys.ToArray(), because);
 			actualParameters.Should().Equal(expectedParameters, because);
 		}
@@ -56,20 +55,22 @@ private static void AssertSpecialQueryStringValues(
 			Dictionary<string, string> expectedParameters,
 			Uri actualUri,
 			Dictionary<string, string> actualParameters,
-			string origin)
+			string origin
+		)
 		{
 			var because = $"\r\nExpected query string from {origin}: {expectedUri.Query} on {expectedUri.PathAndQuery}";
 			because += $"\r\nActual query string from {origin}: {actualUri.Query} on {actualUri.PathAndQuery}\r\n";
 
 			//only assert these if they appear in expectedUri
-			var specialQueryStringParameters = new[] {"pretty", "typed_keys", "error_trace"};
+			var specialQueryStringParameters = new[] { "pretty", "typed_keys", "error_trace" };
 			foreach (var key in specialQueryStringParameters)
 			{
 				if (!expectedParameters.ContainsKey(key)) continue;
+
 				var expected = expectedParameters[key];
 				actualParameters.Should().ContainKey(key, "query value for '{0}' expected to exist\r\n{1}", key, because);
 				var actual = actualParameters[key];
-				new[] {key, actual}.Should().BeEquivalentTo(new[] {key, expected}, "query value for '{0}' should be equal\r\n{1}", key, because);
+				new[] { key, actual }.Should().BeEquivalentTo(new[] { key, expected }, "query value for '{0}' should be equal\r\n{1}", key, because);
 			}
 
 			foreach (var key in specialQueryStringParameters)
@@ -88,7 +89,7 @@ private static void ComparePaths(Uri actualUri, Uri expectedUri, string origin)
 
 		private static Uri CreateExpectedUri(Uri u, string pathAndQueryString)
 		{
-			var paths = (pathAndQueryString ?? "").Split(new[] {'?'}, 2);
+			var paths = (pathAndQueryString ?? "").Split(new[] { '?' }, 2);
 
 			string path = paths.First(), query = string.Empty;
 			if (paths.Length > 1) query = paths.Last();
@@ -96,9 +97,11 @@ private static Uri CreateExpectedUri(Uri u, string pathAndQueryString)
 			var expectedUri = new UriBuilder("http", "localhost", u.Port, path, "?" + query).Uri;
 			return expectedUri;
 		}
+
 		private static string FlattenQueryString(Dictionary<string, string> queryString)
 		{
 			if (queryString == null || queryString.Count == 0) return string.Empty;
+
 			return string.Join("&", queryString.Select(kv => $"{kv.Key}={kv.Value}"));
 		}
 
@@ -106,7 +109,9 @@ private static Dictionary<string, string> ExplodeQueryString(Uri u)
 		{
 			var query = u.Query;
 			if (string.IsNullOrEmpty(query) || query.Length <= 1) return new Dictionary<string, string>();
-			return query.Substring(1).Split('&')
+
+			return query.Substring(1)
+				.Split('&')
 				.Select(v => v.Split('='))
 				.Where(k => !string.IsNullOrWhiteSpace(k[0]))
 				.ToDictionary(k => k[0], v => v.Last());
diff --git a/src/Tests/Tests/Framework/Extensions/WaitHandleExtensions.cs b/src/Tests/Tests/Framework/Extensions/WaitHandleExtensions.cs
index aa67b8c8dd5..7b71e0faccb 100644
--- a/src/Tests/Tests/Framework/Extensions/WaitHandleExtensions.cs
+++ b/src/Tests/Tests/Framework/Extensions/WaitHandleExtensions.cs
@@ -1,21 +1,15 @@
 #if DOTNETCORE
 using System;
-using System.Threading;
 using System.Diagnostics;
+using System.Threading;
 
 namespace Tests.Framework
 {
 	public static class CoreFxExtensions
 	{
-		internal static bool WaitOne(this WaitHandle waitHandle, TimeSpan timeSpan, bool exitContext)
-		{
-			return waitHandle.WaitOne(timeSpan);
-		}
+		internal static bool WaitOne(this WaitHandle waitHandle, TimeSpan timeSpan, bool exitContext) => waitHandle.WaitOne(timeSpan);
 
-		internal static void Close(this Process process)
-		{
-			process.Dispose();
-		}
+		internal static void Close(this Process process) => process.Dispose();
 	}
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Tests/Tests/Framework/Extensions/WebClient-CoreFx.cs b/src/Tests/Tests/Framework/Extensions/WebClient-CoreFx.cs
index 657325f6481..5eb7c931687 100644
--- a/src/Tests/Tests/Framework/Extensions/WebClient-CoreFx.cs
+++ b/src/Tests/Tests/Framework/Extensions/WebClient-CoreFx.cs
@@ -1,5 +1,4 @@
 #if DOTNETCORE
-using System;
 using System.IO;
 using System.Net.Http;
 
@@ -10,13 +9,11 @@ public class WebClient
 		public void DownloadFile(string url, string file)
 		{
 			using (var client = new HttpClient())
-			{
-				using (var request = new HttpRequestMessage(HttpMethod.Get, url))
-				using (var contentStream = client.SendAsync(request).Result.Content.ReadAsStreamAsync().Result)
-				using (var stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true))
-					contentStream.CopyTo(stream);
-			}
+			using (var request = new HttpRequestMessage(HttpMethod.Get, url))
+			using (var contentStream = client.SendAsync(request).Result.Content.ReadAsStreamAsync().Result)
+			using (var stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true))
+				contentStream.CopyTo(stream);
 		}
 	}
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Tests/Tests/Framework/SerializationTests/DictionarySerializationTests.cs b/src/Tests/Tests/Framework/SerializationTests/DictionarySerializationTests.cs
index cd37d82ec38..89b85173687 100644
--- a/src/Tests/Tests/Framework/SerializationTests/DictionarySerializationTests.cs
+++ b/src/Tests/Tests/Framework/SerializationTests/DictionarySerializationTests.cs
@@ -24,7 +24,7 @@ public void CanSerializeIsADictionary()
 				{ "Key2", "value2" },
 			});
 
-			Object(isADictionary).RoundTrips(this.ExpectJson);
+			Object(isADictionary).RoundTrips(ExpectJson);
 		}
 
 		private class MyIsADictionary : IsADictionaryBase<object, object>
@@ -35,7 +35,7 @@ public MyIsADictionary(IDictionary<object, object> backingDictionary) : base(bac
 
 	public class DictionarySerializationTests
 	{
-		protected object ExpectJson => new { Key1 = "value1", Key2 ="value2", };
+		protected object ExpectJson => new { Key1 = "value1", Key2 = "value2", };
 
 		[U]
 		public void CanSerializeCustomGenericDictionary()
@@ -46,19 +46,19 @@ public void CanSerializeCustomGenericDictionary()
 				{ "Key2", "value2" },
 			};
 
-			Object(dictionary).RoundTrips(this.ExpectJson);
+			Object(dictionary).RoundTrips(ExpectJson);
 		}
 
 		[U]
 		public void CanSerializeGenericDictionary()
 		{
-			var dictionary = new Dictionary<string,string>
+			var dictionary = new Dictionary<string, string>
 			{
 				{ "Key1", "value1" },
 				{ "Key2", "value2" },
 			};
 
-			Object(dictionary).RoundTrips(this.ExpectJson);
+			Object(dictionary).RoundTrips(ExpectJson);
 		}
 
 		[U]
@@ -71,7 +71,7 @@ public void CanSerializeGenericReadOnlyDictionary()
 					{ "Key2", "value2" },
 				});
 
-			Object(dictionary).RoundTrips(this.ExpectJson);
+			Object(dictionary).RoundTrips(ExpectJson);
 		}
 
 		[U]
@@ -83,7 +83,7 @@ public void CanSerializeCustomGenericIDictionary()
 				{ "Key2", "value2" },
 			};
 
-			Object(dictionary).RoundTrips(this.ExpectJson);
+			Object(dictionary).RoundTrips(ExpectJson);
 		}
 
 		[U]
@@ -95,7 +95,7 @@ public void CanSerializeCustomGenericIReadOnlyDictionary()
 				{ "Key2", "value2" },
 			});
 
-			Object(dictionary).RoundTrips(this.ExpectJson);
+			Object(dictionary).RoundTrips(ExpectJson);
 		}
 
 		[U]
@@ -107,7 +107,7 @@ public void CanSerializeCustomDictionary()
 				{ "Key2", "value2" },
 			};
 
-			Object(hashTable).RoundTrips(this.ExpectJson);
+			Object(hashTable).RoundTrips(ExpectJson);
 		}
 
 		[U]
@@ -119,83 +119,91 @@ public void CanSerializeDictionary()
 				{ "Key2", "value2" },
 			};
 
-			Object(hashTable).RoundTrips(this.ExpectJson);
+			Object(hashTable).RoundTrips(ExpectJson);
 		}
 
 		private class MyDictionary : IDictionary
 		{
 			private readonly IDictionary _dictionary = new Hashtable();
 
-			public bool Contains(object key) => _dictionary.Contains(key);
-
-			public void Add(object key, object value) => _dictionary.Add(key, value);
+			public int Count => _dictionary.Count;
 
-			public void Clear() => _dictionary.Clear();
+			public bool IsFixedSize => _dictionary.IsFixedSize;
 
-			public IDictionaryEnumerator GetEnumerator() => _dictionary.GetEnumerator();
+			public bool IsReadOnly => _dictionary.IsReadOnly;
 
-			public void Remove(object key) => _dictionary.Remove(key);
+			public bool IsSynchronized => _dictionary.IsSynchronized;
 
 			public object this[object key]
 			{
-				get { return _dictionary[key]; }
-				set { _dictionary[key] = value; }
+				get => _dictionary[key];
+				set => _dictionary[key] = value;
 			}
 
 			public ICollection Keys => _dictionary.Keys;
 
+			public object SyncRoot => _dictionary.SyncRoot;
+
 			public ICollection Values => _dictionary.Values;
 
-			public bool IsReadOnly => _dictionary.IsReadOnly;
+			public void CopyTo(Array array, int index) => _dictionary.CopyTo(array, index);
 
-			public bool IsFixedSize => _dictionary.IsFixedSize;
+			public void Add(object key, object value) => _dictionary.Add(key, value);
 
-			IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_dictionary).GetEnumerator();
+			public void Clear() => _dictionary.Clear();
 
-			public void CopyTo(Array array, int index) => _dictionary.CopyTo(array, index);
+			public bool Contains(object key) => _dictionary.Contains(key);
 
-			public int Count => _dictionary.Count;
+			public IDictionaryEnumerator GetEnumerator() => _dictionary.GetEnumerator();
 
-			public object SyncRoot => _dictionary.SyncRoot;
+			public void Remove(object key) => _dictionary.Remove(key);
 
-			public bool IsSynchronized => _dictionary.IsSynchronized;
+			IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_dictionary).GetEnumerator();
 		}
 
-		private class MyGenericDictionary : Dictionary<string, string> {}
+		private class MyGenericDictionary : Dictionary<string, string> { }
 
 		private class MyGenericIReadOnlyDictionary : IReadOnlyDictionary<object, object>
 		{
 			private readonly IDictionary<object, object> _backingDictionary;
 
-			public MyGenericIReadOnlyDictionary(IDictionary<object, object> dictionary)
-			{
+			public MyGenericIReadOnlyDictionary(IDictionary<object, object> dictionary) =>
 				_backingDictionary = dictionary ?? new Dictionary<object, object>();
-			}
-
-			public IEnumerator<KeyValuePair<object, object>> GetEnumerator() => _backingDictionary.GetEnumerator();
-
-			IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_backingDictionary).GetEnumerator();
 
 			public int Count => _backingDictionary.Count;
 
-			public bool ContainsKey(object key) => _backingDictionary.ContainsKey(key);
-
-			public bool TryGetValue(object key, out object value) => _backingDictionary.TryGetValue(key, out value);
-
 			public object this[object key] => _backingDictionary[key];
 
 			public IEnumerable<object> Keys => _backingDictionary.Keys;
 
 			public IEnumerable<object> Values => _backingDictionary.Values;
+
+			IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_backingDictionary).GetEnumerator();
+
+			public IEnumerator<KeyValuePair<object, object>> GetEnumerator() => _backingDictionary.GetEnumerator();
+
+			public bool ContainsKey(object key) => _backingDictionary.ContainsKey(key);
+
+			public bool TryGetValue(object key, out object value) => _backingDictionary.TryGetValue(key, out value);
 		}
 
 		private class MyGenericIDictionary : IDictionary<object, object>
 		{
 			private readonly IDictionary<object, object> _backingDictionary = new Dictionary<object, object>();
 
-			public IEnumerator<KeyValuePair<object, object>> GetEnumerator() => _backingDictionary.GetEnumerator();
+			public int Count => _backingDictionary.Count;
 
-			IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_backingDictionary).GetEnumerator();
+			public bool IsReadOnly => _backingDictionary.IsReadOnly;
+
+			public object this[object key]
+			{
+				get => _backingDictionary[key];
+				set => _backingDictionary[key] = value;
+			}
+
+			public ICollection<object> Keys => _backingDictionary.Keys;
+
+			public ICollection<object> Values => _backingDictionary.Values;
 
 			public void Add(KeyValuePair<object, object> item) => _backingDictionary.Add(item);
 
@@ -207,27 +215,17 @@ private class MyGenericIDictionary : IDictionary<object, object>
 
 			public bool Remove(KeyValuePair<object, object> item) => _backingDictionary.Remove(item);
 
-			public int Count => _backingDictionary.Count;
-
-			public bool IsReadOnly => _backingDictionary.IsReadOnly;
+			public void Add(object key, object value) => _backingDictionary.Add(key, value);
 
 			public bool ContainsKey(object key) => _backingDictionary.ContainsKey(key);
 
-			public void Add(object key, object value) => _backingDictionary.Add(key, value);
-
 			public bool Remove(object key) => _backingDictionary.Remove(key);
 
 			public bool TryGetValue(object key, out object value) => _backingDictionary.TryGetValue(key, out value);
 
-			public object this[object key]
-			{
-				get { return _backingDictionary[key]; }
-				set { _backingDictionary[key] = value; }
-			}
-
-			public ICollection<object> Keys => _backingDictionary.Keys;
+			IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_backingDictionary).GetEnumerator();
 
-			public ICollection<object> Values => _backingDictionary.Values;
+			public IEnumerator<KeyValuePair<object, object>> GetEnumerator() => _backingDictionary.GetEnumerator();
 		}
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Audit/Auditor.cs b/src/Tests/Tests/Framework/VirtualClustering/Audit/Auditor.cs
index 03aef510ad9..10438e8fe3b 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Audit/Auditor.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Audit/Auditor.cs
@@ -5,8 +5,6 @@
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using FluentAssertions;
-using FluentAssertions.Collections;
-using FluentAssertions.Execution;
 using Nest;
 using Tests.Core.Extensions;
 
@@ -14,69 +12,68 @@ namespace Tests.Framework
 {
 	public class Auditor
 	{
-		public Func<VirtualizedCluster> Cluster { get; set; }
-		public Action<IConnectionPool> AssertPoolBeforeStartup { get; set; }
-		public Action<IConnectionPool> AssertPoolAfterStartup { get; set; }
-
-		public Action<IConnectionPool> AssertPoolBeforeCall { get; set; }
-		public Action<IConnectionPool> AssertPoolAfterCall { get; set; }
-
 		private VirtualizedCluster _cluster;
 		private VirtualizedCluster _clusterAsync;
 
-		private bool StartedUp { get; }
+		public Auditor(Func<VirtualizedCluster> setup) => Cluster = setup;
 
-		public Auditor(Func<VirtualizedCluster> setup) {
-			this.Cluster = setup;
-		}
 		private Auditor(VirtualizedCluster cluster, VirtualizedCluster clusterAsync)
 		{
 			_cluster = cluster;
 			_clusterAsync = clusterAsync;
-			this.StartedUp = true;
+			StartedUp = true;
 		}
 
-		public IResponse Response { get; internal set; }
-		public IResponse ResponseAsync { get; internal set; }
+		public Action<IConnectionPool> AssertPoolAfterCall { get; set; }
+		public Action<IConnectionPool> AssertPoolAfterStartup { get; set; }
+
+		public Action<IConnectionPool> AssertPoolBeforeCall { get; set; }
+		public Action<IConnectionPool> AssertPoolBeforeStartup { get; set; }
 
 		public List<Audit> AsyncAuditTrail { get; set; }
 		public List<Audit> AuditTrail { get; set; }
+		public Func<VirtualizedCluster> Cluster { get; set; }
+
+		public IResponse Response { get; internal set; }
+		public IResponse ResponseAsync { get; internal set; }
+
+		private bool StartedUp { get; }
 
 
 		public void ChangeTime(Func<DateTime, DateTime> selector)
 		{
-			this._cluster  = _cluster ?? this.Cluster();
-			this._clusterAsync = _clusterAsync ?? this.Cluster();
+			_cluster = _cluster ?? Cluster();
+			_clusterAsync = _clusterAsync ?? Cluster();
 
-			this._cluster.ChangeTime(selector);
-			this._clusterAsync.ChangeTime(selector);
+			_cluster.ChangeTime(selector);
+			_clusterAsync.ChangeTime(selector);
 		}
 
 		public async Task<Auditor> TraceStartup(ClientCall callTrace = null)
 		{
 			//synchronous code path
-			this._cluster  = _cluster ?? this.Cluster();
-			if (!this.StartedUp) this.AssertPoolBeforeStartup?.Invoke(this._cluster.ConnectionPool);
-			this.AssertPoolBeforeCall?.Invoke(this._cluster.ConnectionPool);
-			this.Response = this._cluster.ClientCall(callTrace?.RequestOverrides);
-			this.AuditTrail = this.Response.ApiCall.AuditTrail;
-			if (!this.StartedUp) this.AssertPoolAfterStartup?.Invoke(this._cluster.ConnectionPool);
-			this.AssertPoolAfterCall?.Invoke(this._cluster.ConnectionPool);
+			_cluster = _cluster ?? Cluster();
+			if (!StartedUp) AssertPoolBeforeStartup?.Invoke(_cluster.ConnectionPool);
+			AssertPoolBeforeCall?.Invoke(_cluster.ConnectionPool);
+			Response = _cluster.ClientCall(callTrace?.RequestOverrides);
+			AuditTrail = Response.ApiCall.AuditTrail;
+			if (!StartedUp) AssertPoolAfterStartup?.Invoke(_cluster.ConnectionPool);
+			AssertPoolAfterCall?.Invoke(_cluster.ConnectionPool);
 
 			//async code path
-			this._clusterAsync = _clusterAsync ?? this.Cluster();
-			if (!this.StartedUp) this.AssertPoolBeforeStartup?.Invoke(this._clusterAsync.ConnectionPool);
-			this.AssertPoolBeforeCall?.Invoke(this._clusterAsync.ConnectionPool);
-			this.ResponseAsync = await this._clusterAsync.ClientCallAsync(callTrace?.RequestOverrides);
-			this.AsyncAuditTrail = this.ResponseAsync.ApiCall.AuditTrail;
-			if (!this.StartedUp) this.AssertPoolAfterStartup?.Invoke(this._clusterAsync.ConnectionPool);
-			this.AssertPoolAfterCall?.Invoke(this._clusterAsync.ConnectionPool);
+			_clusterAsync = _clusterAsync ?? Cluster();
+			if (!StartedUp) AssertPoolBeforeStartup?.Invoke(_clusterAsync.ConnectionPool);
+			AssertPoolBeforeCall?.Invoke(_clusterAsync.ConnectionPool);
+			ResponseAsync = await _clusterAsync.ClientCallAsync(callTrace?.RequestOverrides);
+			AsyncAuditTrail = ResponseAsync.ApiCall.AuditTrail;
+			if (!StartedUp) AssertPoolAfterStartup?.Invoke(_clusterAsync.ConnectionPool);
+			AssertPoolAfterCall?.Invoke(_clusterAsync.ConnectionPool);
 			return new Auditor(_cluster, _clusterAsync);
 		}
 
 		public async Task<Auditor> TraceCall(ClientCall callTrace, int nthCall = 0)
 		{
-			await this.TraceStartup(callTrace);
+			await TraceStartup(callTrace);
 			return AssertAuditTrails(callTrace, nthCall);
 		}
 
@@ -85,38 +82,39 @@ private async Task TraceException<TException>(ClientCall callTrace, Action<TExce
 #pragma warning restore 1998 // Async method lacks 'await' operators and will run synchronously
 			where TException : ElasticsearchClientException
 		{
-			this._cluster  = _cluster ?? this.Cluster();
-			this._cluster.ClientThrows(true);
-			this.AssertPoolBeforeCall?.Invoke(this._cluster.ConnectionPool);
+			_cluster = _cluster ?? Cluster();
+			_cluster.ClientThrows(true);
+			AssertPoolBeforeCall?.Invoke(_cluster.ConnectionPool);
 
-			Action call = () => this._cluster.ClientCall(callTrace?.RequestOverrides);
+			Action call = () => _cluster.ClientCall(callTrace?.RequestOverrides);
 			var exception = call.ShouldThrowExactly<TException>()
 				.Subject.First();
 			assert(exception);
 
-			this.AuditTrail = exception.AuditTrail;
-			this.AssertPoolAfterCall?.Invoke(this._cluster.ConnectionPool);
+			AuditTrail = exception.AuditTrail;
+			AssertPoolAfterCall?.Invoke(_cluster.ConnectionPool);
 
-			this._clusterAsync = _clusterAsync ?? this.Cluster();
-			this._clusterAsync.ClientThrows(true);
-			Func<Task> callAsync = async () => await this._clusterAsync.ClientCallAsync(callTrace?.RequestOverrides);
+			_clusterAsync = _clusterAsync ?? Cluster();
+			_clusterAsync.ClientThrows(true);
+			Func<Task> callAsync = async () => await _clusterAsync.ClientCallAsync(callTrace?.RequestOverrides);
 			exception = callAsync.ShouldThrowExactly<TException>()
 				.Subject.First();
 			assert(exception);
 
-			this.AsyncAuditTrail = exception.AuditTrail;
-			this.AssertPoolAfterCall?.Invoke(this._clusterAsync.ConnectionPool);
+			AsyncAuditTrail = exception.AuditTrail;
+			AssertPoolAfterCall?.Invoke(_clusterAsync.ConnectionPool);
 		}
+
 		public async Task<Auditor> TraceElasticsearchException(ClientCall callTrace, Action<ElasticsearchClientException> assert)
 		{
-			await this.TraceException(callTrace, assert);
-			var audit  = new Auditor(_cluster, _clusterAsync);
+			await TraceException(callTrace, assert);
+			var audit = new Auditor(_cluster, _clusterAsync);
 			return await audit.TraceElasticsearchExceptionOnResponse(callTrace, assert);
 		}
 
 		public async Task<Auditor> TraceUnexpectedElasticsearchException(ClientCall callTrace, Action<UnexpectedElasticsearchClientException> assert)
 		{
-			await this.TraceException(callTrace, assert);
+			await TraceException(callTrace, assert);
 			return new Auditor(_cluster, _clusterAsync);
 		}
 
@@ -124,33 +122,33 @@ public async Task<Auditor> TraceUnexpectedElasticsearchException(ClientCall call
 		public async Task<Auditor> TraceElasticsearchExceptionOnResponse(ClientCall callTrace, Action<ElasticsearchClientException> assert)
 #pragma warning restore 1998
 		{
-			this._cluster  = _cluster ?? this.Cluster();
-			this._cluster.ClientThrows(false);
-			this.AssertPoolBeforeCall?.Invoke(this._cluster.ConnectionPool);
+			_cluster = _cluster ?? Cluster();
+			_cluster.ClientThrows(false);
+			AssertPoolBeforeCall?.Invoke(_cluster.ConnectionPool);
 
-			Action call = () => { this.Response = this._cluster.ClientCall(callTrace?.RequestOverrides); };
+			Action call = () => { Response = _cluster.ClientCall(callTrace?.RequestOverrides); };
 			call.ShouldNotThrow();
 
-			this.Response.ShouldNotBeValid();
-			var exception = this.Response.ApiCall.OriginalException as ElasticsearchClientException;
+			Response.ShouldNotBeValid();
+			var exception = Response.ApiCall.OriginalException as ElasticsearchClientException;
 			exception.Should().NotBeNull("OriginalException on response is not expected ElasticsearchClientException");
 			assert(exception);
 
-			this.AuditTrail = exception.AuditTrail;
-			this.AssertPoolAfterCall?.Invoke(this._cluster.ConnectionPool);
+			AuditTrail = exception.AuditTrail;
+			AssertPoolAfterCall?.Invoke(_cluster.ConnectionPool);
 
-			this._clusterAsync = _clusterAsync ?? this.Cluster();
-			this._clusterAsync.ClientThrows(false);
-			Func<Task> callAsync = async () => { this.ResponseAsync = await this._clusterAsync.ClientCallAsync(callTrace?.RequestOverrides); };
+			_clusterAsync = _clusterAsync ?? Cluster();
+			_clusterAsync.ClientThrows(false);
+			Func<Task> callAsync = async () => { ResponseAsync = await _clusterAsync.ClientCallAsync(callTrace?.RequestOverrides); };
 			callAsync.ShouldNotThrow();
-			this.ResponseAsync.ShouldNotBeValid();
-			exception = this.ResponseAsync.ApiCall.OriginalException as ElasticsearchClientException;
+			ResponseAsync.ShouldNotBeValid();
+			exception = ResponseAsync.ApiCall.OriginalException as ElasticsearchClientException;
 			exception.Should().NotBeNull("OriginalException on response is not expected ElasticsearchClientException");
 			assert(exception);
 
-			this.AsyncAuditTrail = exception.AuditTrail;
-			this.AssertPoolAfterCall?.Invoke(this._clusterAsync.ConnectionPool);
-			var audit  = new Auditor(_cluster, _clusterAsync);
+			AsyncAuditTrail = exception.AuditTrail;
+			AssertPoolAfterCall?.Invoke(_clusterAsync.ConnectionPool);
+			var audit = new Auditor(_cluster, _clusterAsync);
 
 			return audit;
 		}
@@ -159,52 +157,52 @@ public async Task<Auditor> TraceElasticsearchExceptionOnResponse(ClientCall call
 		public async Task<Auditor> TraceUnexpectedException(ClientCall callTrace, Action<UnexpectedElasticsearchClientException> assert)
 #pragma warning restore 1998
 		{
-			this._cluster  = _cluster ?? this.Cluster();
-			this.AssertPoolBeforeCall?.Invoke(this._cluster.ConnectionPool);
+			_cluster = _cluster ?? Cluster();
+			AssertPoolBeforeCall?.Invoke(_cluster.ConnectionPool);
 
-			Action call = () => this._cluster.ClientCall(callTrace?.RequestOverrides);
+			Action call = () => _cluster.ClientCall(callTrace?.RequestOverrides);
 			var exception = call.ShouldThrowExactly<UnexpectedElasticsearchClientException>()
 				.Subject.First();
 			assert(exception);
 
-			this.AuditTrail = exception.AuditTrail;
-			this.AssertPoolAfterCall?.Invoke(this._cluster.ConnectionPool);
+			AuditTrail = exception.AuditTrail;
+			AssertPoolAfterCall?.Invoke(_cluster.ConnectionPool);
 
-			this._clusterAsync = _clusterAsync ?? this.Cluster();
-			Func<Task> callAsync = async () => await this._clusterAsync.ClientCallAsync(callTrace?.RequestOverrides);
+			_clusterAsync = _clusterAsync ?? Cluster();
+			Func<Task> callAsync = async () => await _clusterAsync.ClientCallAsync(callTrace?.RequestOverrides);
 			exception = callAsync.ShouldThrowExactly<UnexpectedElasticsearchClientException>()
 				.Subject.First();
 			assert(exception);
 
-			this.AsyncAuditTrail = exception.AuditTrail;
-			this.AssertPoolAfterCall?.Invoke(this._clusterAsync.ConnectionPool);
+			AsyncAuditTrail = exception.AuditTrail;
+			AssertPoolAfterCall?.Invoke(_clusterAsync.ConnectionPool);
 			return new Auditor(_cluster, _clusterAsync);
 		}
 
 		private Auditor AssertAuditTrails(ClientCall callTrace, int nthCall)
 		{
-			this.AuditTrail.Count.Should()
-				.Be(this.AsyncAuditTrail.Count,
-					$"{nthCall} has a mismatch between sync and async. \r\nasync:{this.AuditTrail}\r\nsync:{this.AsyncAuditTrail}");
+			AuditTrail.Count.Should()
+				.Be(AsyncAuditTrail.Count,
+					$"{nthCall} has a mismatch between sync and async. \r\nasync:{AuditTrail}\r\nsync:{AsyncAuditTrail}");
 
-			AssertTrailOnResponse(callTrace, this.AuditTrail, true, nthCall);
-			AssertTrailOnResponse(callTrace, this.AuditTrail, false, nthCall);
+			AssertTrailOnResponse(callTrace, AuditTrail, true, nthCall);
+			AssertTrailOnResponse(callTrace, AuditTrail, false, nthCall);
 
-			callTrace?.AssertPoolAfterCall?.Invoke(this._cluster.ConnectionPool);
-			callTrace?.AssertPoolAfterCall?.Invoke(this._clusterAsync.ConnectionPool);
+			callTrace?.AssertPoolAfterCall?.Invoke(_cluster.ConnectionPool);
+			callTrace?.AssertPoolAfterCall?.Invoke(_clusterAsync.ConnectionPool);
 			return new Auditor(_cluster, _clusterAsync);
 		}
 
 
 		public void VisualizeCalls(int numberOfCalls)
 		{
-			var cluster  = _cluster ?? this.Cluster();
+			var cluster = _cluster ?? Cluster();
 			var messages = new List<string>(numberOfCalls * 2);
 			for (var i = 0; i < numberOfCalls; i++)
 			{
 				var call = cluster.ClientCall();
 				var d = call.ApiCall;
-                var actualAuditTrail = AuditTrailToString(d.AuditTrail);
+				var actualAuditTrail = AuditTrailToString(d.AuditTrail);
 				messages.Add($"{d.HttpMethod.GetStringValue()} ({d.Uri.Port})");
 				messages.Add(actualAuditTrail);
 			}
@@ -223,10 +221,7 @@ private static string AuditTrailToString(List<Audit> auditTrail)
 		public async Task<Auditor> TraceCalls(params ClientCall[] audits)
 		{
 			var auditor = this;
-			foreach (var a in audits.Select((a, i)=> new { a, i }))
-			{
-				auditor = await auditor.TraceCall(a.a, a.i);
-			}
+			foreach (var a in audits.Select((a, i) => new { a, i })) auditor = await auditor.TraceCall(a.a, a.i);
 			return auditor;
 		}
 
@@ -236,11 +231,12 @@ private static void AssertTrailOnResponse(ClientCall callTrace, List<Audit> audi
 			var nthClientCall = (nthCall + 1).ToOrdinal();
 
 			var actualAuditTrail = auditTrail.Aggregate(new StringBuilder(Environment.NewLine),
-				(sb, a)=> sb.AppendLine($"-> {a}"),
+				(sb, a) => sb.AppendLine($"-> {a}"),
 				sb => sb.ToString());
 
-			callTrace.Select(c=>c.Event)
-				.Should().ContainInOrder(auditTrail.Select(a=>a.Event),
+			callTrace.Select(c => c.Event)
+				.Should()
+				.ContainInOrder(auditTrail.Select(a => a.Event),
 					$"the {nthClientCall} client call's {typeOfTrail} should assert ALL audit trail items{actualAuditTrail}");
 
 			foreach (var t in auditTrail.Select((a, i) => new { a, i }))
@@ -258,7 +254,5 @@ private static void AssertTrailOnResponse(ClientCall callTrace, List<Audit> audi
 
 			callTrace.Count.Should().Be(auditTrail.Count, $"actual auditTrail {actualAuditTrail}");
 		}
-
 	}
-
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Audit/Audits.cs b/src/Tests/Tests/Framework/VirtualClustering/Audit/Audits.cs
index 3dd505b5255..b3c55ffb01a 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Audit/Audits.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Audit/Audits.cs
@@ -1,42 +1,37 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elasticsearch.Net;
-using Tests.Framework;
 
 namespace Tests.Framework
 {
 	public class CallTraceState
 	{
-		public CallTraceState(AuditEvent e) { this.Event = e;  }
+		public CallTraceState(AuditEvent e) => Event = e;
+
+		public Action<string, Audit> AssertWithBecause { get; set; }
 
 		public AuditEvent Event { get; private set; }
 
 		public int? Port { get; set; }
 
 		public Action<Audit> SimpleAssert { get; set; }
-
-		public Action<string, Audit> AssertWithBecause { get; set; }
 	}
 
 	public class ClientCall : List<CallTraceState>
 	{
-		public Func<RequestConfigurationDescriptor, IRequestConfiguration> RequestOverrides { get; }
 		public ClientCall() { }
 
-		public ClientCall(Func<RequestConfigurationDescriptor, IRequestConfiguration> requestOverrides)
-		{
-			RequestOverrides = requestOverrides;
-		}
+		public ClientCall(Func<RequestConfigurationDescriptor, IRequestConfiguration> requestOverrides) => RequestOverrides = requestOverrides;
 
 		public Action<IConnectionPool> AssertPoolAfterCall { get; set; }
+		public Func<RequestConfigurationDescriptor, IRequestConfiguration> RequestOverrides { get; }
 
-		public void Add(AuditEvent key, Action<Audit> value) => this.Add(new CallTraceState(key) { SimpleAssert = value });
+		public void Add(AuditEvent key, Action<Audit> value) => Add(new CallTraceState(key) { SimpleAssert = value });
 
-		public void Add(AuditEvent key, int port) => this.Add(new CallTraceState(key) { Port = port });
+		public void Add(AuditEvent key, int port) => Add(new CallTraceState(key) { Port = port });
 
-		public void Add(AuditEvent key) => this.Add(new CallTraceState(key));
+		public void Add(AuditEvent key) => Add(new CallTraceState(key));
 
-		public void Add(Action<IConnectionPool> pool) => this.AssertPoolAfterCall = pool;
+		public void Add(Action<IConnectionPool> pool) => AssertPoolAfterCall = pool;
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Cluster.cs b/src/Tests/Tests/Framework/VirtualClustering/Cluster.cs
index 1406ea81a55..6a80375eeaa 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Cluster.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Cluster.cs
@@ -15,7 +15,7 @@ public static VirtualCluster Nodes(int numberOfNodes, int startFrom = 9200) =>
 		public static VirtualCluster MasterOnlyNodes(int numberOfNodes, int startFrom = 9200) =>
 			new VirtualCluster(
 				Enumerable.Range(startFrom, numberOfNodes)
-					.Select(n=>new Node(new Uri($"http://localhost:{n}")) { HoldsData = false, MasterEligible = true})
+					.Select(n => new Node(new Uri($"http://localhost:{n}")) { HoldsData = false, MasterEligible = true })
 			);
 
 
diff --git a/src/Tests/Tests/Framework/VirtualClustering/FixedPipelineFactory.cs b/src/Tests/Tests/Framework/VirtualClustering/FixedPipelineFactory.cs
index 8074a2de516..79196b77474 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/FixedPipelineFactory.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/FixedPipelineFactory.cs
@@ -5,27 +5,29 @@ namespace Tests.Framework
 {
 	public class FixedPipelineFactory : IRequestPipelineFactory
 	{
-		private IConnectionSettingsValues Settings { get; }
-		private Transport<IConnectionSettingsValues> Transport =>
-			new Transport<IConnectionSettingsValues>(this.Settings, this, this.DateTimeProvider, this.MemoryStreamFactory);
+		public FixedPipelineFactory(IConnectionSettingsValues connectionSettings, IDateTimeProvider dateTimeProvider)
+		{
+			DateTimeProvider = dateTimeProvider;
+			MemoryStreamFactory = new MemoryStreamFactory();
 
-		private IDateTimeProvider DateTimeProvider { get; }
-		private MemoryStreamFactory MemoryStreamFactory { get; }
+			Settings = connectionSettings;
+			Pipeline = Create(Settings, DateTimeProvider, MemoryStreamFactory, new SearchRequestParameters());
+		}
 
-		public IRequestPipeline Pipeline { get; }
+		public ElasticClient Client => new ElasticClient(Transport);
 
-		public ElasticClient Client => new ElasticClient(this.Transport);
+		public IRequestPipeline Pipeline { get; }
 
-		public FixedPipelineFactory(IConnectionSettingsValues connectionSettings, IDateTimeProvider dateTimeProvider)
-		{
-			this.DateTimeProvider = dateTimeProvider;
-			this.MemoryStreamFactory = new MemoryStreamFactory();
+		private IDateTimeProvider DateTimeProvider { get; }
+		private MemoryStreamFactory MemoryStreamFactory { get; }
+		private IConnectionSettingsValues Settings { get; }
 
-			this.Settings = connectionSettings;
-			this.Pipeline = this.Create(this.Settings, this.DateTimeProvider, this.MemoryStreamFactory, new SearchRequestParameters());
-		}
+		private Transport<IConnectionSettingsValues> Transport =>
+			new Transport<IConnectionSettingsValues>(Settings, this, DateTimeProvider, MemoryStreamFactory);
 
-		public IRequestPipeline Create(IConnectionConfigurationValues configurationValues, IDateTimeProvider dateTimeProvider, IMemoryStreamFactory memorystreamFactory, IRequestParameters requestParameters) =>
-			new RequestPipeline(this.Settings, this.DateTimeProvider, this.MemoryStreamFactory, requestParameters ?? new SearchRequestParameters());
+		public IRequestPipeline Create(IConnectionConfigurationValues configurationValues, IDateTimeProvider dateTimeProvider,
+			IMemoryStreamFactory memorystreamFactory, IRequestParameters requestParameters
+		) =>
+			new RequestPipeline(Settings, DateTimeProvider, MemoryStreamFactory, requestParameters ?? new SearchRequestParameters());
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/MockResponses/SniffResponseBytes.cs b/src/Tests/Tests/Framework/VirtualClustering/MockResponses/SniffResponseBytes.cs
index 21ad05601fd..291da32d0f1 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/MockResponses/SniffResponseBytes.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/MockResponses/SniffResponseBytes.cs
@@ -24,11 +24,12 @@ public static byte[] Create(IEnumerable<Node> nodes, string publishAddressOverri
 				return ms.ToArray();
 			}
 		}
+
 		private static IDictionary<string, object> SniffResponseNodes(IEnumerable<Node> nodes, string publishAddressOverride, bool randomFqdn) =>
 			(from node in nodes
-			let id = string.IsNullOrEmpty(node.Id) ? Guid.NewGuid().ToString("N").Substring(0, 8) : node.Id
-			let name = string.IsNullOrEmpty(node.Name) ? Guid.NewGuid().ToString("N").Substring(0, 8) : node.Name
-			select new { id, name, node })
+				let id = string.IsNullOrEmpty(node.Id) ? Guid.NewGuid().ToString("N").Substring(0, 8) : node.Id
+				let name = string.IsNullOrEmpty(node.Name) ? Guid.NewGuid().ToString("N").Substring(0, 8) : node.Name
+				select new { id, name, node })
 			.ToDictionary(kv => kv.id, kv => CreateNodeResponse(kv.node, kv.name, publishAddressOverride, randomFqdn));
 
 		private static object CreateNodeResponse(Node node, string name, string publishAddressOverride, bool randomFqdn)
@@ -39,8 +40,8 @@ private static object CreateNodeResponse(Node node, string name, string publishA
 
 			var settings = new Dictionary<string, object>
 			{
-				{"cluster.name", ClusterName},
-				{"node.name", name}
+				{ "cluster.name", ClusterName },
+				{ "node.name", name }
 			};
 			foreach (var kv in node.Settings) settings[kv.Key] = kv.Value;
 
@@ -53,15 +54,17 @@ private static object CreateNodeResponse(Node node, string name, string publishA
 				version = TestConfiguration.Instance.ElasticsearchVersion,
 				build_hash = Guid.NewGuid().ToString("N").Substring(0, 8),
 				roles = new List<string>(),
-				http = node.HttpEnabled ? new
-				{
-					bound_address = new []
+				http = node.HttpEnabled
+					? new
 					{
-						$"{fqdn}127.0.0.1:{port}"
-					},
-					//publish_address = $"{fqdn}${publishAddress}"
-					publish_address = $"{fqdn}{host}:{port}"
-				} : null,
+						bound_address = new[]
+						{
+							$"{fqdn}127.0.0.1:{port}"
+						},
+						//publish_address = $"{fqdn}${publishAddress}"
+						publish_address = $"{fqdn}{host}:{port}"
+					}
+					: null,
 				settings = settings
 			};
 			if (node.MasterEligible) nodeResponse.roles.Add("master");
@@ -71,6 +74,5 @@ private static object CreateNodeResponse(Node node, string name, string publishA
 				nodeResponse.settings.Add("http.enabled", false);
 			return nodeResponse;
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Providers/TestableDateTimeProvider.cs b/src/Tests/Tests/Framework/VirtualClustering/Providers/TestableDateTimeProvider.cs
index 1a17f241abf..6d909b966bd 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Providers/TestableDateTimeProvider.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Providers/TestableDateTimeProvider.cs
@@ -9,6 +9,6 @@ public class TestableDateTimeProvider : DateTimeProvider
 
 		public override DateTime Now() => MutableNow;
 
-		public void ChangeTime(Func<DateTime, DateTime> change) => this.MutableNow = change(this.MutableNow);
+		public void ChangeTime(Func<DateTime, DateTime> change) => MutableNow = change(MutableNow);
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Rules/ClientCallRule.cs b/src/Tests/Tests/Framework/VirtualClustering/Rules/ClientCallRule.cs
index fb6713fc099..677a5cd4c1f 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Rules/ClientCallRule.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Rules/ClientCallRule.cs
@@ -1,12 +1,10 @@
 using System;
+using System.Net.Http;
 using Nest;
-using System.Net;
 
 namespace Tests.Framework
 {
-	public interface IClientCallRule : IRule
-	{
-	}
+	public interface IClientCallRule : IRule { }
 
 	public class ClientCallRule : RuleBase<ClientCallRule>, IClientCallRule
 	{
@@ -18,7 +16,7 @@ public ClientCallRule Fails(Union<TimesHelper.AllTimes, int> times, Union<Except
 			Self.Succeeds = false;
 			Self.Return = errorState ??
 #if DOTNETCORE
-			new System.Net.Http.HttpRequestException();
+				new HttpRequestException();
 #else
 			new WebException();
 #endif
@@ -32,23 +30,26 @@ public ClientCallRule Succeeds(Union<TimesHelper.AllTimes, int> times, int? vali
 			Self.Return = validResponseCode;
 			return this;
 		}
+
 		public ClientCallRule AfterSucceeds(Union<Exception, int> errorState = null)
 		{
 			Self.AfterSucceeds = errorState;
 			return this;
 		}
+
 		public ClientCallRule ThrowsAfterSucceeds()
 		{
 			Self.AfterSucceeds =
-                #if DOTNETCORE
-                    new System.Net.Http.HttpRequestException();
-                #else
+#if DOTNETCORE
+				new HttpRequestException();
+#else
                     new WebException();
                 #endif
 			return this;
 		}
 
-		public ClientCallRule SucceedAlways(int? validResponseCode = 200) => this.Succeeds(TimesHelper.Always, validResponseCode);
-		public ClientCallRule FailAlways(Union<Exception, int> errorState = null) => this.Fails(TimesHelper.Always, errorState);
+		public ClientCallRule SucceedAlways(int? validResponseCode = 200) => Succeeds(TimesHelper.Always, validResponseCode);
+
+		public ClientCallRule FailAlways(Union<Exception, int> errorState = null) => Fails(TimesHelper.Always, errorState);
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Rules/PingRule.cs b/src/Tests/Tests/Framework/VirtualClustering/Rules/PingRule.cs
index ca4e226ea60..a85c0d47ac6 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Rules/PingRule.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Rules/PingRule.cs
@@ -7,23 +7,24 @@ public class PingRule : RuleBase<PingRule>, IRule
 	{
 		private IRule Self => this;
 
-		public PingRule Fails(Union<TimesHelper.AllTimes, int> times, Union<Exception, int> errorState = null)
-		{
-			Self.Times = times;
-			Self.Succeeds = false;
-			Self.Return = errorState;
-			return this;
-		}
-
-		public PingRule Succeeds(Union<TimesHelper.AllTimes, int> times, int? validResponseCode = 200)
-		{
-			Self.Times = times;
-			Self.Succeeds = true;
-			Self.Return = validResponseCode;
-			return this;
-		}
-
-		public PingRule SucceedAlways(int? validResponseCode = 200) => this.Succeeds(TimesHelper.Always, validResponseCode);
-		public PingRule FailAlways(Union<Exception, int> errorState = null) => this.Fails(TimesHelper.Always, errorState);
+		public PingRule Fails(Union<TimesHelper.AllTimes, int> times, Union<Exception, int> errorState = null)
+		{
+			Self.Times = times;
+			Self.Succeeds = false;
+			Self.Return = errorState;
+			return this;
+		}
+
+		public PingRule Succeeds(Union<TimesHelper.AllTimes, int> times, int? validResponseCode = 200)
+		{
+			Self.Times = times;
+			Self.Succeeds = true;
+			Self.Return = validResponseCode;
+			return this;
+		}
+
+		public PingRule SucceedAlways(int? validResponseCode = 200) => Succeeds(TimesHelper.Always, validResponseCode);
+
+		public PingRule FailAlways(Union<Exception, int> errorState = null) => Fails(TimesHelper.Always, errorState);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Rules/RuleBase.cs b/src/Tests/Tests/Framework/VirtualClustering/Rules/RuleBase.cs
index 644432e3287..5d47c8b0353 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Rules/RuleBase.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Rules/RuleBase.cs
@@ -7,34 +7,34 @@ namespace Tests.Framework
 {
 	public interface IRule
 	{
-		Union<TimesHelper.AllTimes, int> Times { get; set; }
+		Union<Exception, int> AfterSucceeds { get; set; }
 		int? OnPort { get; set; }
-		bool Succeeds { get; set; }
-		TimeSpan? Takes { get; set; }
 
 		/// <summary>
 		/// Either a hard exception or soft HTTP error code
 		/// </summary>
 		Union<Exception, int> Return { get; set; }
 
-		Union<Exception, int> AfterSucceeds { get; set; }
+		string ReturnContentType { get; set; }
 
 		byte[] ReturnResponse { get; set; }
-		string ReturnContentType { get; set; }
+		bool Succeeds { get; set; }
+		TimeSpan? Takes { get; set; }
+		Union<TimesHelper.AllTimes, int> Times { get; set; }
 	}
 
 	public abstract class RuleBase<TRule> : IRule
 		where TRule : RuleBase<TRule>, IRule
 	{
-		private IRule Self => this;
+		Union<Exception, int> IRule.AfterSucceeds { get; set; }
 		int? IRule.OnPort { get; set; }
+		Union<Exception, int> IRule.Return { get; set; }
+		string IRule.ReturnContentType { get; set; }
+		byte[] IRule.ReturnResponse { get; set; }
+		private IRule Self => this;
 		bool IRule.Succeeds { get; set; }
 		TimeSpan? IRule.Takes { get; set; }
 		Union<TimesHelper.AllTimes, int> IRule.Times { get; set; }
-		Union<Exception, int> IRule.Return { get; set; }
-		Union<Exception, int> IRule.AfterSucceeds { get; set; }
-		byte[] IRule.ReturnResponse { get; set; }
-		string IRule.ReturnContentType { get; set; }
 
 		public TRule OnPort(int port)
 		{
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Rules/SniffRule.cs b/src/Tests/Tests/Framework/VirtualClustering/Rules/SniffRule.cs
index a1c8cbbf2c4..93cf3c2910e 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Rules/SniffRule.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Rules/SniffRule.cs
@@ -10,8 +10,8 @@ public interface ISniffRule : IRule
 
 	public class SniffRule : RuleBase<SniffRule>, ISniffRule
 	{
-		private ISniffRule Self => this;
 		VirtualCluster ISniffRule.NewClusterState { get; set; }
+		private ISniffRule Self => this;
 
 		public SniffRule Fails(Union<TimesHelper.AllTimes, int> times, Union<Exception, int> errorState = null)
 		{
@@ -29,7 +29,9 @@ public SniffRule Succeeds(Union<TimesHelper.AllTimes, int> times, VirtualCluster
 			Self.Return = 200;
 			return this;
 		}
-		public SniffRule SucceedAlways(VirtualCluster cluster = null) => this.Succeeds(TimesHelper.Always, cluster);
-		public SniffRule FailAlways(Union<Exception, int> errorState = null) => this.Fails(TimesHelper.Always, errorState);
+
+		public SniffRule SucceedAlways(VirtualCluster cluster = null) => Succeeds(TimesHelper.Always, cluster);
+
+		public SniffRule FailAlways(Union<Exception, int> errorState = null) => Fails(TimesHelper.Always, errorState);
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/Rules/TimesHelper.cs b/src/Tests/Tests/Framework/VirtualClustering/Rules/TimesHelper.cs
index 7a9a76fc118..019371e9020 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/Rules/TimesHelper.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/Rules/TimesHelper.cs
@@ -4,11 +4,15 @@ namespace Tests.Framework
 {
 	public static class TimesHelper
 	{
-		public class AllTimes { internal AllTimes() { } }
-
 		public static AllTimes Always = new AllTimes();
 		public static readonly int Once = 0;
 		public static readonly int Twice = 1;
+
 		public static int Times(int n) => Math.Max(0, n - 1);
+
+		public class AllTimes
+		{
+			internal AllTimes() { }
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/Framework/VirtualClustering/SealedVirtualCluster.cs b/src/Tests/Tests/Framework/VirtualClustering/SealedVirtualCluster.cs
index 7f47ef765d8..fe5c1a03dbe 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/SealedVirtualCluster.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/SealedVirtualCluster.cs
@@ -6,24 +6,24 @@ namespace Tests.Framework
 {
 	public class SealedVirtualCluster
 	{
-		private readonly IConnectionPool _connectionPool;
 		private readonly IConnection _connection;
+		private readonly IConnectionPool _connectionPool;
 		private readonly TestableDateTimeProvider _dateTimeProvider;
 
 		public SealedVirtualCluster(VirtualCluster cluster, IConnectionPool pool, TestableDateTimeProvider dateTimeProvider)
 		{
-			this._connectionPool = pool;
-			this._connection = new VirtualClusterConnection(cluster, dateTimeProvider);
-			this._dateTimeProvider = dateTimeProvider;
+			_connectionPool = pool;
+			_connection = new VirtualClusterConnection(cluster, dateTimeProvider);
+			_dateTimeProvider = dateTimeProvider;
 		}
 
 		private ConnectionSettings CreateSettings() =>
-			new ConnectionSettings(this._connectionPool, this._connection).DefaultIndex("default-index");
+			new ConnectionSettings(_connectionPool, _connection).DefaultIndex("default-index");
 
 		public VirtualizedCluster AllDefaults() =>
-			new VirtualizedCluster(this._dateTimeProvider, CreateSettings());
+			new VirtualizedCluster(_dateTimeProvider, CreateSettings());
 
 		public VirtualizedCluster Settings(Func<ConnectionSettings, ConnectionSettings> selector) =>
-			new VirtualizedCluster(this._dateTimeProvider, selector(CreateSettings()));
+			new VirtualizedCluster(_dateTimeProvider, selector(CreateSettings()));
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/VirtualCluster.cs b/src/Tests/Tests/Framework/VirtualClustering/VirtualCluster.cs
index 4a1072c6a60..1841ae0bea4 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/VirtualCluster.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/VirtualCluster.cs
@@ -10,107 +10,107 @@ public class VirtualCluster
 	{
 		private readonly List<Node> _nodes;
 
-		public List<ISniffRule> SniffingRules { get; } = new List<ISniffRule>();
-		public List<IRule> PingingRules { get; } = new List<IRule>();
+		public VirtualCluster(IEnumerable<Node> nodes) => _nodes = nodes.ToList();
+
 		public List<IClientCallRule> ClientCallRules { get; } = new List<IClientCallRule>();
 		public TestableDateTimeProvider DateTimeProvider { get; } = new TestableDateTimeProvider();
 
-		private bool _sniffReturnsFqdn = false;
-		internal bool SniffShouldReturnFqnd => _sniffReturnsFqdn;
-
-		private string _publishAddress;
-		internal string PublishAddressOverride => _publishAddress;
-
 		public IReadOnlyList<Node> Nodes => _nodes;
+		public List<IRule> PingingRules { get; } = new List<IRule>();
 
-		public VirtualCluster(IEnumerable<Node> nodes)
-		{
-			this._nodes = nodes.ToList();
-		}
+		public List<ISniffRule> SniffingRules { get; } = new List<ISniffRule>();
+		internal string PublishAddressOverride { get; private set; }
+
+		internal bool SniffShouldReturnFqnd { get; private set; } = false;
 
 		public VirtualCluster SniffShouldReturnFqdn()
 		{
-			_sniffReturnsFqdn = true;
+			SniffShouldReturnFqnd = true;
 			return this;
 		}
 
 		public VirtualCluster PublishAddress(string publishHost)
 		{
-			_publishAddress = publishHost;
+			PublishAddressOverride = publishHost;
 			return this;
 		}
 
 		public VirtualCluster MasterEligible(params int[] ports)
 		{
-			foreach (var node in this._nodes.Where(n => !ports.Contains(n.Uri.Port)))
+			foreach (var node in _nodes.Where(n => !ports.Contains(n.Uri.Port)))
 				node.MasterEligible = false;
 			return this;
 		}
 
 		public VirtualCluster StoresNoData(params int[] ports)
 		{
-			foreach (var node in this._nodes.Where(n => ports.Contains(n.Uri.Port)))
+			foreach (var node in _nodes.Where(n => ports.Contains(n.Uri.Port)))
 				node.HoldsData = false;
 			return this;
 		}
+
 		public VirtualCluster HasSetting(string key, string value, params int[] ports)
 		{
-			foreach (var node in this._nodes.Where(n => ports.Contains(n.Uri.Port)))
-				node.Settings = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>{{key, value}});
+			foreach (var node in _nodes.Where(n => ports.Contains(n.Uri.Port)))
+				node.Settings = new ReadOnlyDictionary<string, object>(new Dictionary<string, object> { { key, value } });
 			return this;
 		}
+
 		public VirtualCluster HttpDisabled(params int[] ports)
 		{
-			foreach (var node in this._nodes.Where(n => ports.Contains(n.Uri.Port)))
+			foreach (var node in _nodes.Where(n => ports.Contains(n.Uri.Port)))
 				node.HttpEnabled = false;
 			return this;
 		}
 
 		public VirtualCluster Ping(Func<PingRule, IRule> selector)
 		{
-			this.PingingRules.Add(selector(new PingRule()));
+			PingingRules.Add(selector(new PingRule()));
 			return this;
 		}
 
 		public VirtualCluster Sniff(Func<SniffRule, ISniffRule> selector)
 		{
-			this.SniffingRules.Add(selector(new SniffRule()));
+			SniffingRules.Add(selector(new SniffRule()));
 			return this;
 		}
+
 		public VirtualCluster ClientCalls(Func<ClientCallRule, IClientCallRule> selector)
 		{
-			this.ClientCallRules.Add(selector(new ClientCallRule()));
+			ClientCallRules.Add(selector(new ClientCallRule()));
 			return this;
 		}
 
 		public SealedVirtualCluster SingleNodeConnection(Func<IList<Node>, IEnumerable<Node>> seedNodesSelector = null)
 		{
-			var nodes = seedNodesSelector?.Invoke(this._nodes) ?? this._nodes;
-			return new SealedVirtualCluster(this, new SingleNodeConnectionPool(nodes.First().Uri), this.DateTimeProvider);
+			var nodes = seedNodesSelector?.Invoke(_nodes) ?? _nodes;
+			return new SealedVirtualCluster(this, new SingleNodeConnectionPool(nodes.First().Uri), DateTimeProvider);
 		}
+
 		public SealedVirtualCluster StaticConnectionPool(Func<IList<Node>, IEnumerable<Node>> seedNodesSelector = null)
 		{
-			var nodes = seedNodesSelector?.Invoke(this._nodes) ?? this._nodes;
-			return new SealedVirtualCluster(this, new StaticConnectionPool(nodes, randomize: false, dateTimeProvider: this.DateTimeProvider), this.DateTimeProvider);
+			var nodes = seedNodesSelector?.Invoke(_nodes) ?? _nodes;
+			return new SealedVirtualCluster(this, new StaticConnectionPool(nodes, false, DateTimeProvider), DateTimeProvider);
 		}
 
 		public SealedVirtualCluster SniffingConnectionPool(Func<IList<Node>, IEnumerable<Node>> seedNodesSelector = null)
 		{
-			var nodes = seedNodesSelector?.Invoke(this._nodes) ?? this._nodes;
-			return new SealedVirtualCluster(this, new SniffingConnectionPool(nodes, randomize: false, dateTimeProvider: this.DateTimeProvider), this.DateTimeProvider);
+			var nodes = seedNodesSelector?.Invoke(_nodes) ?? _nodes;
+			return new SealedVirtualCluster(this, new SniffingConnectionPool(nodes, false, DateTimeProvider), DateTimeProvider);
 		}
 
 		public SealedVirtualCluster StickyConnectionPool(Func<IList<Node>, IEnumerable<Node>> seedNodesSelector = null)
 		{
-			var nodes = seedNodesSelector?.Invoke(this._nodes) ?? this._nodes;
-			return new SealedVirtualCluster(this, new StickyConnectionPool(nodes, dateTimeProvider: this.DateTimeProvider), this.DateTimeProvider);
+			var nodes = seedNodesSelector?.Invoke(_nodes) ?? _nodes;
+			return new SealedVirtualCluster(this, new StickyConnectionPool(nodes, DateTimeProvider), DateTimeProvider);
 		}
 
-		public SealedVirtualCluster StickySniffingConnectionPool(Func<Node, float> sorter = null, Func<IList<Node>,  IEnumerable<Node>> seedNodesSelector = null)
+		public SealedVirtualCluster StickySniffingConnectionPool(Func<Node, float> sorter = null,
+			Func<IList<Node>, IEnumerable<Node>> seedNodesSelector = null
+		)
 		{
-			var nodes = seedNodesSelector?.Invoke(this._nodes) ?? this._nodes;
-			return new SealedVirtualCluster(this, new StickySniffingConnectionPool(nodes, sorter ,dateTimeProvider: this.DateTimeProvider), this.DateTimeProvider);
+			var nodes = seedNodesSelector?.Invoke(_nodes) ?? _nodes;
+			return new SealedVirtualCluster(this, new StickySniffingConnectionPool(nodes, sorter, DateTimeProvider), DateTimeProvider);
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/VirtualClusterConnection.cs b/src/Tests/Tests/Framework/VirtualClustering/VirtualClusterConnection.cs
index 33af37c6f42..fa92963b5ca 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/VirtualClusterConnection.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/VirtualClusterConnection.cs
@@ -2,59 +2,86 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Framework.MockResponses;
+using HttpMethod = Elasticsearch.Net.HttpMethod;
 
 namespace Tests.Framework
 {
 	public class VirtualClusterConnection : InMemoryConnection
 	{
 		private static readonly object _lock = new object();
-		private class State { public int Pinged = 0; public int Sniffed = 0; public int Called = 0; public int Successes = 0; public int Failures = 0; }
-		private IDictionary<int, State> Calls = new Dictionary<int, State> { };
+
+		private static byte[] DefaultResponseBytes;
 
 		private VirtualCluster _cluster;
-		private TestableDateTimeProvider _dateTimeProvider;
+		private readonly TestableDateTimeProvider _dateTimeProvider;
+		private IDictionary<int, State> Calls = new Dictionary<int, State> { };
 
 		public VirtualClusterConnection(VirtualCluster cluster, TestableDateTimeProvider dateTimeProvider)
 		{
-			this.UpdateCluster(cluster);
-			this._dateTimeProvider = dateTimeProvider;
+			UpdateCluster(cluster);
+			_dateTimeProvider = dateTimeProvider;
+		}
+
+		private static object DefaultResponse
+		{
+			get
+			{
+				var response = new
+				{
+					name = "Razor Fist",
+					cluster_name = "elasticsearch-test-cluster",
+					version = new
+					{
+						number = "2.0.0",
+						build_hash = "af1dc6d8099487755c3143c931665b709de3c764",
+						build_timestamp = "2015-07-07T11:28:47Z",
+						build_snapshot = true,
+						lucene_version = "5.2.1"
+					},
+					tagline = "You Know, for Search"
+				};
+				return response;
+			}
 		}
 
 		public void UpdateCluster(VirtualCluster cluster)
 		{
 			if (cluster == null) return;
+
 			lock (_lock)
 			{
-				this._cluster = cluster;
-				this.Calls = cluster.Nodes.ToDictionary(n => n.Uri.Port, v => new State());
+				_cluster = cluster;
+				Calls = cluster.Nodes.ToDictionary(n => n.Uri.Port, v => new State());
 			}
 		}
 
-		public bool IsSniffRequest(RequestData requestData) => requestData.PathAndQuery.StartsWith(RequestPipeline.SniffPath, StringComparison.Ordinal);
+		public bool IsSniffRequest(RequestData requestData) =>
+			requestData.PathAndQuery.StartsWith(RequestPipeline.SniffPath, StringComparison.Ordinal);
+
 		public bool IsPingRequest(RequestData requestData) => requestData.PathAndQuery == "/" && requestData.Method == HttpMethod.HEAD;
 
 		public override TResponse Request<TResponse>(RequestData requestData)
 		{
-			this.Calls.Should().ContainKey(requestData.Uri.Port);
+			Calls.Should().ContainKey(requestData.Uri.Port);
 			try
 			{
-				var state = this.Calls[requestData.Uri.Port];
+				var state = Calls[requestData.Uri.Port];
 				if (IsSniffRequest(requestData))
 				{
 					var sniffed = Interlocked.Increment(ref state.Sniffed);
 					return HandleRules<TResponse, ISniffRule>(
 						requestData,
-						this._cluster.SniffingRules,
+						_cluster.SniffingRules,
 						requestData.RequestTimeout,
-						(r) => this.UpdateCluster(r.NewClusterState),
-						(r) => SniffResponseBytes.Create(this._cluster.Nodes, this._cluster.PublishAddressOverride, this._cluster.SniffShouldReturnFqnd)
+						(r) => UpdateCluster(r.NewClusterState),
+						(r) => SniffResponseBytes.Create(_cluster.Nodes, _cluster.PublishAddressOverride, _cluster.SniffShouldReturnFqnd)
 					);
 				}
 				if (IsPingRequest(requestData))
@@ -62,7 +89,7 @@ public override TResponse Request<TResponse>(RequestData requestData)
 					var pinged = Interlocked.Increment(ref state.Pinged);
 					return HandleRules<TResponse, IRule>(
 						requestData,
-						this._cluster.PingingRules,
+						_cluster.PingingRules,
 						requestData.PingTimeout,
 						(r) => { },
 						(r) => null //HEAD request
@@ -71,14 +98,14 @@ public override TResponse Request<TResponse>(RequestData requestData)
 				var called = Interlocked.Increment(ref state.Called);
 				return HandleRules<TResponse, IClientCallRule>(
 					requestData,
-					this._cluster.ClientCallRules,
+					_cluster.ClientCallRules,
 					requestData.RequestTimeout,
 					(r) => { },
 					CallResponse
 				);
 			}
 #if DOTNETCORE
-			catch (System.Net.Http.HttpRequestException e)
+			catch (HttpRequestException e)
 #else
 			catch (WebException e)
 #endif
@@ -93,13 +120,13 @@ private TResponse HandleRules<TResponse, TRule>(
 			TimeSpan timeout,
 			Action<TRule> beforeReturn,
 			Func<TRule, byte[]> successResponse
-			)
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 			where TRule : IRule
 		{
 			requestData.MadeItToResponse = true;
 
-			var state = this.Calls[requestData.Uri.Port];
+			var state = Calls[requestData.Uri.Port];
 			foreach (var rule in rules.Where(s => s.OnPort.HasValue))
 			{
 				var always = rule.Times.Match(t => true, t => false);
@@ -121,20 +148,23 @@ Func<TRule, byte[]> successResponse
 
 				return Sometimes<TResponse, TRule>(requestData, timeout, beforeReturn, successResponse, state, rule, times);
 			}
-			return this.ReturnConnectionStatus<TResponse>(requestData, successResponse(default(TRule)));
+			return ReturnConnectionStatus<TResponse>(requestData, successResponse(default(TRule)));
 		}
 
-		private TResponse Always<TResponse, TRule>(RequestData requestData, TimeSpan timeout, Action<TRule> beforeReturn, Func<TRule, byte[]> successResponse, TRule rule)
+		private TResponse Always<TResponse, TRule>(RequestData requestData, TimeSpan timeout, Action<TRule> beforeReturn,
+			Func<TRule, byte[]> successResponse, TRule rule
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 			where TRule : IRule
 		{
 			if (rule.Takes.HasValue)
 			{
-				var time = timeout < rule.Takes.Value ? timeout: rule.Takes.Value;
-				this._dateTimeProvider.ChangeTime(d=> d.Add(time));
+				var time = timeout < rule.Takes.Value ? timeout : rule.Takes.Value;
+				_dateTimeProvider.ChangeTime(d => d.Add(time));
 				if (rule.Takes.Value > requestData.RequestTimeout)
 #if DOTNETCORE
-					throw new System.Net.Http.HttpRequestException($"Request timed out after {time} : call configured to take {rule.Takes.Value} while requestTimeout was: {timeout}");
+					throw new HttpRequestException(
+						$"Request timed out after {time} : call configured to take {rule.Takes.Value} while requestTimeout was: {timeout}");
 #else
 					throw new WebException($"Request timed out after {time} : call configured to take {rule.Takes.Value} while requestTimeout was: {timeout}");
 #endif
@@ -146,17 +176,20 @@ private TResponse Always<TResponse, TRule>(RequestData requestData, TimeSpan tim
 		}
 
 		private TResponse Sometimes<TResponse, TRule>(
-			RequestData requestData, TimeSpan timeout, Action<TRule> beforeReturn, Func<TRule, byte[]> successResponse, State state, TRule rule, int times)
+			RequestData requestData, TimeSpan timeout, Action<TRule> beforeReturn, Func<TRule, byte[]> successResponse, State state, TRule rule,
+			int times
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 			where TRule : IRule
 		{
 			if (rule.Takes.HasValue)
 			{
 				var time = timeout < rule.Takes.Value ? timeout : rule.Takes.Value;
-				this._dateTimeProvider.ChangeTime(d=> d.Add(time));
+				_dateTimeProvider.ChangeTime(d => d.Add(time));
 				if (rule.Takes.Value > requestData.RequestTimeout)
 #if DOTNETCORE
-					throw new System.Net.Http.HttpRequestException($"Request timed out after {time} : call configured to take {rule.Takes.Value} while requestTimeout was: {timeout}");
+					throw new HttpRequestException(
+						$"Request timed out after {time} : call configured to take {rule.Takes.Value} while requestTimeout was: {timeout}");
 #else
 					throw new WebException($"Request timed out after {time} : call configured to take {rule.Takes.Value} while requestTimeout was: {timeout}");
 #endif
@@ -164,13 +197,11 @@ private TResponse Sometimes<TResponse, TRule>(
 
 			if (rule.Succeeds && times >= state.Successes)
 				return Success<TResponse, TRule>(requestData, beforeReturn, successResponse, rule);
-			else if (rule.Succeeds)
-			{
-				return Fail<TResponse, TRule>(requestData, rule);
-			}
+			else if (rule.Succeeds) return Fail<TResponse, TRule>(requestData, rule);
 
 			if (!rule.Succeeds && times >= state.Failures)
 				return Fail<TResponse, TRule>(requestData, rule);
+
 			return Success<TResponse, TRule>(requestData, beforeReturn, successResponse, rule);
 		}
 
@@ -178,32 +209,34 @@ private TResponse Fail<TResponse, TRule>(RequestData requestData, TRule rule, Un
 			where TResponse : class, IElasticsearchResponse, new()
 			where TRule : IRule
 		{
-			var state = this.Calls[requestData.Uri.Port];
+			var state = Calls[requestData.Uri.Port];
 			var failed = Interlocked.Increment(ref state.Failures);
 			var ret = returnOverride ?? rule.Return;
 
 			if (ret == null)
 #if DOTNETCORE
-				throw new System.Net.Http.HttpRequestException();
+				throw new HttpRequestException();
 #else
 				throw new WebException();
 #endif
 			return ret.Match(
 				(e) => throw e,
-				(statusCode) => this.ReturnConnectionStatus<TResponse>(requestData, CallResponse(rule),
+				(statusCode) => ReturnConnectionStatus<TResponse>(requestData, CallResponse(rule),
 					//make sure we never return a valid status code in Fail responses because of a bad rule.
 					statusCode >= 200 && statusCode < 300 ? 502 : statusCode, rule.ReturnContentType)
 			);
 		}
 
-		private TResponse Success<TResponse, TRule>(RequestData requestData, Action<TRule> beforeReturn, Func<TRule, byte[]> successResponse, TRule rule)
+		private TResponse Success<TResponse, TRule>(RequestData requestData, Action<TRule> beforeReturn, Func<TRule, byte[]> successResponse,
+			TRule rule
+		)
 			where TResponse : class, IElasticsearchResponse, new()
 			where TRule : IRule
 		{
-			var state = this.Calls[requestData.Uri.Port];
+			var state = Calls[requestData.Uri.Port];
 			var succeeded = Interlocked.Increment(ref state.Successes);
 			beforeReturn?.Invoke(rule);
-			return this.ReturnConnectionStatus<TResponse>(requestData, successResponse(rule), contentType: rule.ReturnContentType);
+			return ReturnConnectionStatus<TResponse>(requestData, successResponse(rule), contentType: rule.ReturnContentType);
 		}
 
 		private static byte[] CallResponse<TRule>(TRule rule)
@@ -213,6 +246,7 @@ private static byte[] CallResponse<TRule>(TRule rule)
 				return rule.ReturnResponse;
 
 			if (DefaultResponseBytes != null) return DefaultResponseBytes;
+
 			var response = DefaultResponse;
 			using (var ms = new MemoryStream())
 			{
@@ -222,32 +256,16 @@ private static byte[] CallResponse<TRule>(TRule rule)
 			return DefaultResponseBytes;
 		}
 
-		private static byte[] DefaultResponseBytes;
-		private static object DefaultResponse
-		{
-			get
-			{
-				var response = new
-				{
-					name = "Razor Fist",
-					cluster_name = "elasticsearch-test-cluster",
-					version = new
-					{
-						number = "2.0.0",
-						build_hash = "af1dc6d8099487755c3143c931665b709de3c764",
-						build_timestamp = "2015-07-07T11:28:47Z",
-						build_snapshot = true,
-						lucene_version = "5.2.1"
-					},
-					tagline = "You Know, for Search"
-				};
-				return response;
-			}
-		}
+		public override Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken) =>
+			Task.FromResult(Request<TResponse>(requestData));
 
-		public override Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
+		private class State
 		{
-			return Task.FromResult(this.Request<TResponse>(requestData));
+			public int Called = 0;
+			public int Failures = 0;
+			public int Pinged = 0;
+			public int Sniffed = 0;
+			public int Successes = 0;
 		}
 	}
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/VirtualizedCluster.cs b/src/Tests/Tests/Framework/VirtualClustering/VirtualizedCluster.cs
index ba81cfb0656..99a9ea1a5d6 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/VirtualizedCluster.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/VirtualizedCluster.cs
@@ -8,48 +8,47 @@ namespace Tests.Framework
 {
 	public class VirtualizedCluster
 	{
-		private ElasticClient Client => this._fixedRequestPipeline?.Client;
+		public FixedPipelineFactory _fixedRequestPipeline;
 		private readonly TestableDateTimeProvider _dateTimeProvider;
 		private readonly ConnectionSettings _settings;
-		public FixedPipelineFactory _fixedRequestPipeline;
-		private Func<IElasticClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, IResponse> _syncCall;
 		private Func<IElasticClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, Task<IResponse>> _asyncCall;
-
-		public IConnectionPool ConnectionPool => this.Client.ConnectionSettings.ConnectionPool;
+		private Func<IElasticClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, IResponse> _syncCall;
 
 		public VirtualizedCluster(TestableDateTimeProvider dateTimeProvider, ConnectionSettings settings)
 		{
-			this._dateTimeProvider = dateTimeProvider;
-			this._settings = settings;
-			this._fixedRequestPipeline = new FixedPipelineFactory(settings, this._dateTimeProvider);
+			_dateTimeProvider = dateTimeProvider;
+			_settings = settings;
+			_fixedRequestPipeline = new FixedPipelineFactory(settings, _dateTimeProvider);
 
-			this._syncCall = (c, r) => c.Search<Project>(s => s.RequestConfiguration(r));
-			this._asyncCall = async (c, r) =>
+			_syncCall = (c, r) => c.Search<Project>(s => s.RequestConfiguration(r));
+			_asyncCall = async (c, r) =>
 			{
 				var res = await c.SearchAsync<Project>(s => s.RequestConfiguration(r));
 				return (IResponse)res;
 			};
 		}
 
+		public IConnectionPool ConnectionPool => Client.ConnectionSettings.ConnectionPool;
+		private ElasticClient Client => _fixedRequestPipeline?.Client;
+
 		public VirtualizedCluster ClientProxiesTo(
 			Func<IElasticClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, IResponse> sync,
 			Func<IElasticClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, Task<IResponse>> async
-			)
+		)
 		{
-			this._syncCall = sync;
-			this._asyncCall = async;
+			_syncCall = sync;
+			_asyncCall = async;
 			return this;
 		}
 
 		public IResponse ClientCall(Func<RequestConfigurationDescriptor, IRequestConfiguration> requestOverrides = null) =>
-			this._syncCall(this.Client, requestOverrides);
+			_syncCall(Client, requestOverrides);
 
 		public async Task<IResponse> ClientCallAsync(Func<RequestConfigurationDescriptor, IRequestConfiguration> requestOverrides = null) =>
-			await this._asyncCall(this.Client, requestOverrides);
+			await _asyncCall(Client, requestOverrides);
 
 		public void ChangeTime(Func<DateTime, DateTime> change) => _dateTimeProvider.ChangeTime(change);
 
 		public void ClientThrows(bool throws) => _settings.ThrowExceptions(throws);
 	}
-
 }
diff --git a/src/Tests/Tests/Framework/VirtualClustering/WaitingInMemoryConnection.cs b/src/Tests/Tests/Framework/VirtualClustering/WaitingInMemoryConnection.cs
index 28733232c62..d3085229c4d 100644
--- a/src/Tests/Tests/Framework/VirtualClustering/WaitingInMemoryConnection.cs
+++ b/src/Tests/Tests/Framework/VirtualClustering/WaitingInMemoryConnection.cs
@@ -5,26 +5,23 @@
 
 namespace Tests.Framework
 {
-    public class WaitingInMemoryConnection : InMemoryConnection
-    {
-        private readonly TimeSpan _waitTime;
+	public class WaitingInMemoryConnection : InMemoryConnection
+	{
+		private readonly TimeSpan _waitTime;
 
-        public WaitingInMemoryConnection(TimeSpan waitTime, byte[] responseBody, int statusCode = 200, Exception exception = null)
-            : base (responseBody, statusCode, exception)
-        {
-            this._waitTime = waitTime;
-        }
+		public WaitingInMemoryConnection(TimeSpan waitTime, byte[] responseBody, int statusCode = 200, Exception exception = null)
+			: base(responseBody, statusCode, exception) => _waitTime = waitTime;
 
-        public override TResponse Request<TResponse>(RequestData requestData)
-        {
-            Thread.Sleep(_waitTime);
-            return base.Request<TResponse>(requestData);
-        }
+		public override TResponse Request<TResponse>(RequestData requestData)
+		{
+			Thread.Sleep(_waitTime);
+			return base.Request<TResponse>(requestData);
+		}
 
-        public override async Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
-        {
-            await Task.Delay(_waitTime, cancellationToken);
-            return await base.RequestAsync<TResponse>(requestData, cancellationToken);
-        }
-    }
+		public override async Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
+		{
+			await Task.Delay(_waitTime, cancellationToken);
+			return await base.RequestAsync<TResponse>(requestData, cancellationToken);
+		}
+	}
 }
diff --git a/src/Tests/Tests/GlobalSuppressions.cs b/src/Tests/Tests/GlobalSuppressions.cs
index 3d984987476..31a1b420b9b 100644
--- a/src/Tests/Tests/GlobalSuppressions.cs
+++ b/src/Tests/Tests/GlobalSuppressions.cs
@@ -1,9 +1,9 @@
-
-// This file is used by Code Analysis to maintain SuppressMessage 
+// This file is used by Code Analysis to maintain SuppressMessage 
 // attributes that are applied to this project.
 // Project-level suppressions either have no target or are given 
 // a specific target and scoped to a namespace, type, member, etc.
 
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("AsyncUsage", "AsyncFixer001:Unnecessary async/await usage", Justification = "<Pending>")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("AsyncUsage", "AsyncFixer002:Long running / blocking operations under an async method", Justification = "<Pending>")]
+using System.Diagnostics.CodeAnalysis;
 
+[assembly: SuppressMessage("AsyncUsage", "AsyncFixer001:Unnecessary async/await usage", Justification = "<Pending>")]
+[assembly: SuppressMessage("AsyncUsage", "AsyncFixer002:Long running / blocking operations under an async method", Justification = "<Pending>")]
diff --git a/src/Tests/Tests/IndexModules/IndexSettings/Merge/MergeSettings.cs b/src/Tests/Tests/IndexModules/IndexSettings/Merge/MergeSettings.cs
index abadbbde8ae..a0f9c7aa6bb 100644
--- a/src/Tests/Tests/IndexModules/IndexSettings/Merge/MergeSettings.cs
+++ b/src/Tests/Tests/IndexModules/IndexSettings/Merge/MergeSettings.cs
@@ -14,16 +14,17 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
-				{"index.merge.policy.expunge_deletes_allowed", 10},
-				{"index.merge.policy.floor_segment", "2mb"},
-				{"index.merge.policy.max_merge_at_once", 10},
-				{"index.merge.policy.max_merge_at_once_explicit", 30},
-				{"index.merge.policy.max_merged_segment", "5gb"},
-				{"index.merge.policy.segments_per_tier", 10},
-				{"index.merge.policy.reclaim_deletes_weight", 2.0},
-				{"index.merge.scheduler.max_thread_count", 1},
-				{"index.merge.scheduler.auto_throttle", true},
+				{ "index.merge.policy.expunge_deletes_allowed", 10 },
+				{ "index.merge.policy.floor_segment", "2mb" },
+				{ "index.merge.policy.max_merge_at_once", 10 },
+				{ "index.merge.policy.max_merge_at_once_explicit", 30 },
+				{ "index.merge.policy.max_merged_segment", "5gb" },
+				{ "index.merge.policy.segments_per_tier", 10 },
+				{ "index.merge.policy.reclaim_deletes_weight", 2.0 },
+				{ "index.merge.scheduler.max_thread_count", 1 },
+				{ "index.merge.scheduler.auto_throttle", true },
 			};
+
 			/**
 			 * 
 			 */
diff --git a/src/Tests/Tests/IndexModules/IndexSettings/Settings/RoutingPartitionSizeIndexSettings.cs b/src/Tests/Tests/IndexModules/IndexSettings/Settings/RoutingPartitionSizeIndexSettings.cs
index 27636f3d883..f89cf21d57f 100644
--- a/src/Tests/Tests/IndexModules/IndexSettings/Settings/RoutingPartitionSizeIndexSettings.cs
+++ b/src/Tests/Tests/IndexModules/IndexSettings/Settings/RoutingPartitionSizeIndexSettings.cs
@@ -11,7 +11,7 @@ public class RoutingPartitionSizeIndexSettingsUsage : PromiseUsageTestBase<IInde
 	{
 		protected override object ExpectJson => new Dictionary<string, object>
 		{
-			{FixedIndexSettings.RoutingPartitionSize, 6},
+			{ FixedIndexSettings.RoutingPartitionSize, 6 },
 		};
 
 		/**
diff --git a/src/Tests/Tests/IndexModules/IndexSettings/Settings/TypedIndexSettings.cs b/src/Tests/Tests/IndexModules/IndexSettings/Settings/TypedIndexSettings.cs
index 7655bbcd966..76bb2ca33a8 100644
--- a/src/Tests/Tests/IndexModules/IndexSettings/Settings/TypedIndexSettings.cs
+++ b/src/Tests/Tests/IndexModules/IndexSettings/Settings/TypedIndexSettings.cs
@@ -14,25 +14,25 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
-				{"any.setting", "can be set"},
-				{"doubles", 1.1},
-				{"bools", false},
-				{"enums", "analyzed"},
-				{"index.number_of_replicas", 2},
-				{"index.auto_expand_replicas", "1-3" },
-				{"index.refresh_interval", -1 },
-				{"index.blocks.read_only", true},
-				{"index.blocks.read", true},
-				{"index.blocks.write", true},
-				{"index.blocks.metadata", true},
-				{"index.priority", 11},
-				{"index.recovery.initial_shards", "full-1"},
-				{"index.requests.cache.enable", true},
-				{"index.routing.allocation.total_shards_per_node", 10 },
-				{"index.unassigned.node_left.delayed_timeout", "1m" },
-				{"index.number_of_shards", 1},
-				{"index.store.type", "mmapfs"},
-				{"index.queries.cache.enabled", true},
+				{ "any.setting", "can be set" },
+				{ "doubles", 1.1 },
+				{ "bools", false },
+				{ "enums", "analyzed" },
+				{ "index.number_of_replicas", 2 },
+				{ "index.auto_expand_replicas", "1-3" },
+				{ "index.refresh_interval", -1 },
+				{ "index.blocks.read_only", true },
+				{ "index.blocks.read", true },
+				{ "index.blocks.write", true },
+				{ "index.blocks.metadata", true },
+				{ "index.priority", 11 },
+				{ "index.recovery.initial_shards", "full-1" },
+				{ "index.requests.cache.enable", true },
+				{ "index.routing.allocation.total_shards_per_node", 10 },
+				{ "index.unassigned.node_left.delayed_timeout", "1m" },
+				{ "index.number_of_shards", 1 },
+				{ "index.store.type", "mmapfs" },
+				{ "index.queries.cache.enabled", true },
 			};
 
 			/**
diff --git a/src/Tests/Tests/IndexModules/IndexSettings/SlowLog/SlowLogSettings.cs b/src/Tests/Tests/IndexModules/IndexSettings/SlowLog/SlowLogSettings.cs
index 006f41c911a..5a54c23b244 100644
--- a/src/Tests/Tests/IndexModules/IndexSettings/SlowLog/SlowLogSettings.cs
+++ b/src/Tests/Tests/IndexModules/IndexSettings/SlowLog/SlowLogSettings.cs
@@ -14,22 +14,23 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
-				{"index.search.slowlog.threshold.query.warn", "10s"},
-				{"index.search.slowlog.threshold.query.info", "5s"},
-				{"index.search.slowlog.threshold.query.debug", "2s"},
-				{"index.search.slowlog.threshold.query.trace", "500ms"},
-				{"index.search.slowlog.threshold.fetch.warn", "1s"},
-				{"index.search.slowlog.threshold.fetch.info", "800ms"},
-				{"index.search.slowlog.threshold.fetch.debug", "500ms"},
-				{"index.search.slowlog.threshold.fetch.trace", "200ms"},
-				{"index.search.slowlog.level", "info"},
-				{"index.indexing.slowlog.threshold.index.warn", "10s"},
-				{"index.indexing.slowlog.threshold.index.info", "5s"},
-				{"index.indexing.slowlog.threshold.index.debug", "2s"},
-				{"index.indexing.slowlog.threshold.index.trace", "500ms"},
-				{"index.indexing.slowlog.level", "debug"},
-				{"index.indexing.slowlog.source", 100},
+				{ "index.search.slowlog.threshold.query.warn", "10s" },
+				{ "index.search.slowlog.threshold.query.info", "5s" },
+				{ "index.search.slowlog.threshold.query.debug", "2s" },
+				{ "index.search.slowlog.threshold.query.trace", "500ms" },
+				{ "index.search.slowlog.threshold.fetch.warn", "1s" },
+				{ "index.search.slowlog.threshold.fetch.info", "800ms" },
+				{ "index.search.slowlog.threshold.fetch.debug", "500ms" },
+				{ "index.search.slowlog.threshold.fetch.trace", "200ms" },
+				{ "index.search.slowlog.level", "info" },
+				{ "index.indexing.slowlog.threshold.index.warn", "10s" },
+				{ "index.indexing.slowlog.threshold.index.info", "5s" },
+				{ "index.indexing.slowlog.threshold.index.debug", "2s" },
+				{ "index.indexing.slowlog.threshold.index.trace", "500ms" },
+				{ "index.indexing.slowlog.level", "debug" },
+				{ "index.indexing.slowlog.source", 100 },
 			};
+
 			/**
 			 *
 			 */
@@ -81,7 +82,6 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 							LogLevel = LogLevel.Info,
 							Fetch = new SlowLogSearchFetch
 							{
-
 								ThresholdInfo = TimeSpan.FromMilliseconds(800),
 								ThresholdDebug = "500ms",
 								ThresholdTrace = "200ms",
@@ -94,7 +94,6 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 								ThresholdTrace = "500ms",
 								ThresholdWarn = TimeSpan.FromSeconds(10)
 							}
-
 						}
 					},
 				};
diff --git a/src/Tests/Tests/IndexModules/IndexSettings/Sorting/SortingSettingsSingleItem.cs b/src/Tests/Tests/IndexModules/IndexSettings/Sorting/SortingSettingsSingleItem.cs
index bad5602a9ac..902e0617ad6 100644
--- a/src/Tests/Tests/IndexModules/IndexSettings/Sorting/SortingSettingsSingleItem.cs
+++ b/src/Tests/Tests/IndexModules/IndexSettings/Sorting/SortingSettingsSingleItem.cs
@@ -16,10 +16,10 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
-				{"index.sort.field", "field1" },
-				{"index.sort.order", "asc" },
-				{"index.sort.mode", "min" },
-				{"index.sort.missing", "_first" },
+				{ "index.sort.field", "field1" },
+				{ "index.sort.order", "asc" },
+				{ "index.sort.mode", "min" },
+				{ "index.sort.missing", "_first" },
 			};
 
 			protected override Func<IndexSettingsDescriptor, IPromise<IIndexSettings>> Fluent => s => s
@@ -33,12 +33,12 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 			protected override Nest.IndexSettings Initializer =>
 				new Nest.IndexSettings
 				{
-					Sorting = new Nest.SortingSettings
+					Sorting = new SortingSettings
 					{
 						Fields = new[] { "field1" },
-						Order = new [] { IndexSortOrder.Ascending },
-						Mode = new [] { IndexSortMode.Minimum },
-						Missing = new [] { IndexSortMissing.First }
+						Order = new[] { IndexSortOrder.Ascending },
+						Mode = new[] { IndexSortMode.Minimum },
+						Missing = new[] { IndexSortMissing.First }
 					}
 				};
 		}
@@ -56,10 +56,10 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
-				{"index.sort.field", new[] { "field1", "field2" } },
-				{"index.sort.order", new[] { "asc", "desc" } },
-				{"index.sort.mode", new[] { "min", "max" } },
-				{"index.sort.missing", new[] { "_first", "_last" } },
+				{ "index.sort.field", new[] { "field1", "field2" } },
+				{ "index.sort.order", new[] { "asc", "desc" } },
+				{ "index.sort.mode", new[] { "min", "max" } },
+				{ "index.sort.missing", new[] { "_first", "_last" } },
 			};
 
 			protected override Func<IndexSettingsDescriptor, IPromise<IIndexSettings>> Fluent => s => s
@@ -67,18 +67,18 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 					.Fields(f => f.Field(p => p.field1).Field("field2"))
 					.Order(IndexSortOrder.Ascending, IndexSortOrder.Descending)
 					.Mode(IndexSortMode.Minimum, IndexSortMode.Maximum)
-					.Missing(IndexSortMissing.First,IndexSortMissing.Last)
+					.Missing(IndexSortMissing.First, IndexSortMissing.Last)
 				);
 
 			protected override Nest.IndexSettings Initializer =>
 				new Nest.IndexSettings
 				{
-					Sorting = new Nest.SortingSettings
+					Sorting = new SortingSettings
 					{
 						Fields = new[] { "field1", "field2" },
-						Order = new [] { IndexSortOrder.Ascending, IndexSortOrder.Descending },
-						Mode = new [] { IndexSortMode.Minimum, IndexSortMode.Maximum },
-						Missing = new [] { IndexSortMissing.First, IndexSortMissing.Last }
+						Order = new[] { IndexSortOrder.Ascending, IndexSortOrder.Descending },
+						Mode = new[] { IndexSortMode.Minimum, IndexSortMode.Maximum },
+						Missing = new[] { IndexSortMissing.First, IndexSortMissing.Last }
 					}
 				};
 		}
diff --git a/src/Tests/Tests/IndexModules/IndexSettings/Translog/TranslogSettings.cs b/src/Tests/Tests/IndexModules/IndexSettings/Translog/TranslogSettings.cs
index 9083fcd9529..e2530fa32ad 100644
--- a/src/Tests/Tests/IndexModules/IndexSettings/Translog/TranslogSettings.cs
+++ b/src/Tests/Tests/IndexModules/IndexSettings/Translog/TranslogSettings.cs
@@ -14,10 +14,10 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
-				{"index.translog.sync_interval", "5s" },
-				{"index.translog.durability", "request" },
-				{"index.translog.flush_threshold_size", "10mb" },
-				{"index.translog.flush_threshold_period", "30m" }
+				{ "index.translog.sync_interval", "5s" },
+				{ "index.translog.durability", "request" },
+				{ "index.translog.flush_threshold_size", "10mb" },
+				{ "index.translog.flush_threshold_period", "30m" }
 			};
 
 			/**
diff --git a/src/Tests/Tests/IndexModules/Similarity/SimilaritySettings.cs b/src/Tests/Tests/IndexModules/Similarity/SimilaritySettings.cs
index a7deab99e17..42ce8a81012 100644
--- a/src/Tests/Tests/IndexModules/Similarity/SimilaritySettings.cs
+++ b/src/Tests/Tests/IndexModules/Similarity/SimilaritySettings.cs
@@ -31,14 +31,16 @@ public class Usage : PromiseUsageTestBase<ISimilarities, SimilaritiesDescriptor,
 					independence_measure = "chisquared",
 					type = "DFI"
 				},
-				dfr = new Dictionary<string, object>{
+				dfr = new Dictionary<string, object>
+				{
 					{ "basic_model", "d" },
 					{ "after_effect", "b" },
 					{ "normalization", "h1" },
 					{ "normalization.h1.c", 1.1 },
 					{ "type", "DFR" }
 				},
-				ib = new Dictionary<string, object> {
+				ib = new Dictionary<string, object>
+				{
 					{ "distribution", "ll" },
 					{ "lambda", "df" },
 					{ "normalization", "h1" },
@@ -65,7 +67,8 @@ public class Usage : PromiseUsageTestBase<ISimilarities, SimilaritiesDescriptor,
 					type = "scripted",
 					script = new
 					{
-						source = "double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;"
+						source =
+							"double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;"
 					}
 				}
 			};
@@ -100,32 +103,38 @@ public class Usage : PromiseUsageTestBase<ISimilarities, SimilaritiesDescriptor,
 				)
 				.Scripted("scripted_tfidf", sc => sc
 					.Script(ssc => ssc
-						.Source("double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;")
+						.Source(
+							"double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;")
 					)
 				);
+
 			/**
 			 */
 			protected override Similarities Initializer =>
 				new Similarities
 				{
-					{ "bm25", new BM25Similarity
+					{
+						"bm25", new BM25Similarity
 						{
 							B = 1.0,
 							K1 = 1.1,
 							DiscountOverlaps = true
 						}
 					},
-					{ "def", new ClassicSimilarity
+					{
+						"def", new ClassicSimilarity
 						{
 							DiscountOverlaps = true
 						}
 					},
-					{ "dfi", new DFISimilarity
+					{
+						"dfi", new DFISimilarity
 						{
 							IndependenceMeasure = DFIIndependenceMeasure.ChiSquared
 						}
 					},
-					{ "dfr", new DFRSimilarity
+					{
+						"dfr", new DFRSimilarity
 						{
 							AfterEffect = DFRAfterEffect.B,
 							BasicModel = DFRBasicModel.D,
@@ -133,7 +142,8 @@ public class Usage : PromiseUsageTestBase<ISimilarities, SimilaritiesDescriptor,
 							NormalizationH1C = 1.1
 						}
 					},
-					{ "ib", new IBSimilarity
+					{
+						"ib", new IBSimilarity
 						{
 							Distribution = IBDistribution.LogLogistic,
 							Lambda = IBLambda.DocumentFrequency,
@@ -141,24 +151,29 @@ public class Usage : PromiseUsageTestBase<ISimilarities, SimilaritiesDescriptor,
 							NormalizationH1C = 1.2
 						}
 					},
-					{ "lmd", new LMDirichletSimilarity
+					{
+						"lmd", new LMDirichletSimilarity
 						{
 							Mu = 2
 						}
 					},
-					{ "lmj", new LMJelinekMercerSimilarity
+					{
+						"lmj", new LMJelinekMercerSimilarity
 						{
 							Lambda = 2.0
 						}
 					},
-					{ "my_name", new CustomSimilarity("plugin_sim")
+					{
+						"my_name", new CustomSimilarity("plugin_sim")
 						{
 							{ "some_property", "some value" }
 						}
 					},
-					{ "scripted_tfidf", new ScriptedSimilarity
+					{
+						"scripted_tfidf", new ScriptedSimilarity
 						{
-							Script = new InlineScript("double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;")
+							Script = new InlineScript(
+								"double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;")
 						}
 					}
 				};
diff --git a/src/Tests/Tests/IndexModules/UsageTestBase.cs b/src/Tests/Tests/IndexModules/UsageTestBase.cs
index b2651b392c2..4579cc30339 100644
--- a/src/Tests/Tests/IndexModules/UsageTestBase.cs
+++ b/src/Tests/Tests/IndexModules/UsageTestBase.cs
@@ -11,21 +11,21 @@ public abstract class UsageTestBase<TInterface, TDescriptor, TInitializer> : Exp
 		where TInitializer : class, TInterface
 		where TInterface : class
 	{
-		private TInterface FluentInstance { get; }
-		protected abstract TInitializer Initializer { get; }
+		protected UsageTestBase() : base(TestClient.DefaultInMemoryClient) =>
+			FluentInstance = Fluent(new TDescriptor());
+
 		protected abstract Func<TDescriptor, TInterface> Fluent { get; }
+		protected abstract TInitializer Initializer { get; }
 
 		protected virtual bool TestObjectInitializer => true;
-
-		protected UsageTestBase() : base(TestClient.DefaultInMemoryClient) =>
-			this.FluentInstance = this.Fluent(new TDescriptor());
+		private TInterface FluentInstance { get; }
 
 		[U] protected void SerializesInitializer()
 		{
-			if (this.TestObjectInitializer) this.RoundTripsOrSerializes<TInterface>(this.Initializer);
+			if (TestObjectInitializer) RoundTripsOrSerializes<TInterface>(Initializer);
 		}
 
-		[U] protected void SerializesFluent() => this.RoundTripsOrSerializes(this.FluentInstance);
+		[U] protected void SerializesFluent() => RoundTripsOrSerializes(FluentInstance);
 	}
 
 	public abstract class PromiseUsageTestBase<TInterface, TDescriptor, TInitializer> : ExpectJsonTestBase
@@ -33,15 +33,15 @@ public abstract class PromiseUsageTestBase<TInterface, TDescriptor, TInitializer
 		where TInitializer : class, TInterface
 		where TInterface : class
 	{
-		private TInterface FluentInstance { get; }
-		protected abstract TInitializer Initializer { get; }
-		protected abstract Func<TDescriptor, IPromise<TInterface>> Fluent { get; }
-
 		protected PromiseUsageTestBase() : base(TestClient.DefaultInMemoryClient) =>
-			this.FluentInstance = this.Fluent(new TDescriptor())?.Value;
+			FluentInstance = Fluent(new TDescriptor())?.Value;
+
+		protected abstract Func<TDescriptor, IPromise<TInterface>> Fluent { get; }
+		protected abstract TInitializer Initializer { get; }
+		private TInterface FluentInstance { get; }
 
-		[U] protected void SerializesInitializer() => this.Tester.RoundTrips<TInterface>(this.Initializer, this.ExpectJson);
+		[U] protected void SerializesInitializer() => Tester.RoundTrips<TInterface>(Initializer, ExpectJson);
 
-		[U] protected void SerializesFluent() => this.Tester.RoundTrips(this.FluentInstance, this.ExpectJson);
+		[U] protected void SerializesFluent() => Tester.RoundTrips(FluentInstance, ExpectJson);
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/Alias/AliasApiRemoveIndexTests.cs b/src/Tests/Tests/Indices/AliasManagement/Alias/AliasApiRemoveIndexTests.cs
index 21eba25c897..4eb5cd2214b 100644
--- a/src/Tests/Tests/Indices/AliasManagement/Alias/AliasApiRemoveIndexTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/Alias/AliasApiRemoveIndexTests.cs
@@ -5,63 +5,64 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Indices.AliasManagement.Alias
 {
-	public class AliasApiRemoveIndexTests : ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IBulkAliasResponse, IBulkAliasRequest, BulkAliasDescriptor, BulkAliasRequest>
+	public class AliasApiRemoveIndexTests
+		: ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IBulkAliasResponse, IBulkAliasRequest, BulkAliasDescriptor, BulkAliasRequest>
 	{
 		public AliasApiRemoveIndexTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var value in values.Values)
-			{
-				var createIndexResponse = client.CreateIndex(value + "-1", c => c);
-				if (!createIndexResponse.IsValid)
-					throw new Exception(createIndexResponse.DebugInformation);
-
-				createIndexResponse = client.CreateIndex(value + "-2", c => c);
-				if (!createIndexResponse.IsValid)
-					throw new Exception(createIndexResponse.DebugInformation);
-			}
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Alias(f),
-			fluentAsync: (client, f) => client.AliasAsync(f),
-			request: (client, r) => client.Alias(r),
-			requestAsync: (client, r) => client.AliasAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_aliases";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
 			actions = new object[]
 			{
-				new Dictionary<string, object> { { "remove_index", new { index = CallIsolatedValue + "-1"} } },
+				new Dictionary<string, object> { { "remove_index", new { index = CallIsolatedValue + "-1" } } },
 				new Dictionary<string, object> { { "add", new { alias = CallIsolatedValue + "-1", index = CallIsolatedValue + "-2" } } },
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<BulkAliasDescriptor, IBulkAliasRequest> Fluent => d => d
 			.RemoveIndex(a => a.Index(CallIsolatedValue + "-1"))
-			.Add(a=>a.Alias(CallIsolatedValue + "-1").Index(CallIsolatedValue + "-2"))
-		;
+			.Add(a => a.Alias(CallIsolatedValue + "-1").Index(CallIsolatedValue + "-2"));
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override BulkAliasRequest Initializer => new BulkAliasRequest
 		{
 			Actions = new List<IAliasAction>
 			{
 				new AliasRemoveIndexAction { RemoveIndex = new AliasRemoveIndexOperation { Index = Infer.Index(CallIsolatedValue + "-1") } },
-				new AliasAddAction { Add = new AliasAddOperation {Alias = CallIsolatedValue + "-1", Index = CallIsolatedValue + "-2"} },
+				new AliasAddAction { Add = new AliasAddOperation { Alias = CallIsolatedValue + "-1", Index = CallIsolatedValue + "-2" } },
 			}
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_aliases";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var value in values.Values)
+			{
+				var createIndexResponse = client.CreateIndex(value + "-1", c => c);
+				if (!createIndexResponse.IsValid)
+					throw new Exception(createIndexResponse.DebugInformation);
+
+				createIndexResponse = client.CreateIndex(value + "-2", c => c);
+				if (!createIndexResponse.IsValid)
+					throw new Exception(createIndexResponse.DebugInformation);
+			}
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Alias(f),
+			(client, f) => client.AliasAsync(f),
+			(client, r) => client.Alias(r),
+			(client, r) => client.AliasAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs b/src/Tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs
index 0d9ff78d926..409517f2463 100644
--- a/src/Tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs
@@ -8,114 +8,136 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.AliasManagement.Alias
 {
-	public class AliasApiTests : ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IBulkAliasResponse, IBulkAliasRequest, BulkAliasDescriptor, BulkAliasRequest>
+	public class AliasApiTests
+		: ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IBulkAliasResponse, IBulkAliasRequest, BulkAliasDescriptor, BulkAliasRequest>
 	{
 		public AliasApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Alias(f),
-			fluentAsync: (client, f) => client.AliasAsync(f),
-			request: (client, r) => client.Alias(r),
-			requestAsync: (client, r) => client.AliasAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_aliases";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
 			actions = new object[]
 			{
-				new Dictionary<string, object> { { "add", new { alias = "alias", index = CallIsolatedValue, index_routing="x", search_routing="y"} } },
-				new Dictionary<string, object> { { "remove", new { alias = "alias", index = CallIsolatedValue} } },
+				new Dictionary<string, object>
+					{ { "add", new { alias = "alias", index = CallIsolatedValue, index_routing = "x", search_routing = "y" } } },
+				new Dictionary<string, object> { { "remove", new { alias = "alias", index = CallIsolatedValue } } },
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<BulkAliasDescriptor, IBulkAliasRequest> Fluent => d => d
-			.Add(a=>a.Alias("alias").Index(CallIsolatedValue).IndexRouting("x").SearchRouting("y"))
-			.Remove(a=>a.Alias("alias").Index(CallIsolatedValue))
-		;
+			.Add(a => a.Alias("alias").Index(CallIsolatedValue).IndexRouting("x").SearchRouting("y"))
+			.Remove(a => a.Alias("alias").Index(CallIsolatedValue));
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override BulkAliasRequest Initializer => new BulkAliasRequest
 		{
 			Actions = new List<IAliasAction>
 			{
-				new AliasAddAction { Add = new AliasAddOperation {Alias = "alias", Index = CallIsolatedValue, IndexRouting = "x", SearchRouting = "y"} },
-				new AliasRemoveAction {Remove = new AliasRemoveOperation {Alias = "alias", Index = CallIsolatedValue }},
+				new AliasAddAction
+					{ Add = new AliasAddOperation { Alias = "alias", Index = CallIsolatedValue, IndexRouting = "x", SearchRouting = "y" } },
+				new AliasRemoveAction { Remove = new AliasRemoveOperation { Alias = "alias", Index = CallIsolatedValue } },
 			}
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_aliases";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Alias(f),
+			(client, f) => client.AliasAsync(f),
+			(client, r) => client.Alias(r),
+			(client, r) => client.AliasAsync(r)
+		);
 	}
 
 	[SkipVersion("<6.4.0", "is_write_index is a new feature")]
-	public class AliasIsWriteIndexApiTests : ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IBulkAliasResponse, IBulkAliasRequest, BulkAliasDescriptor, BulkAliasRequest>
+	public class AliasIsWriteIndexApiTests
+		: ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IBulkAliasResponse, IBulkAliasRequest, BulkAliasDescriptor, BulkAliasRequest>
 	{
 		public AliasIsWriteIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Alias(f),
-			fluentAsync: (client, f) => client.AliasAsync(f),
-			request: (client, r) => client.Alias(r),
-			requestAsync: (client, r) => client.AliasAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_aliases";
-		private string Index => this.CallIsolatedValue;
-		private string Alias(int i) => $"alias-{this.CallIsolatedValue}-{i}";
-
-		protected override void OnAfterCall(IElasticClient client)
-		{
-			var secondAlias = this.Alias(2);
-			var aliasResponse = this.Client.GetAlias(a => a.Name(secondAlias));
-			aliasResponse.ShouldBeValid();
-			aliasResponse.Indices.Should().NotBeEmpty().And.ContainKey(this.Index);
-			var indexAliases = aliasResponse.Indices[this.Index].Aliases;
-
-			indexAliases.Should().NotBeEmpty().And.ContainKey(secondAlias);
-			var alias = indexAliases[secondAlias];
-			alias.IsWriteIndex.Should().HaveValue().And
-				.BeTrue($"{secondAlias} was stored is is_write_index, so we need to be able to read it too");
-
-		}
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
 			actions = new object[]
 			{
-				new Dictionary<string, object> { { "add",
-					new { alias = this.Alias(1), index = this.Index, index_routing="x", search_routing="y", is_write_index = false} } },
-				new Dictionary<string, object> { { "add",
-					new { alias = this.Alias(2), index = this.Index, index_routing="x", search_routing="y", is_write_index = true} } },
+				new Dictionary<string, object>
+				{
+					{
+						"add",
+						new { alias = Alias(1), index = Index, index_routing = "x", search_routing = "y", is_write_index = false }
+					}
+				},
+				new Dictionary<string, object>
+				{
+					{
+						"add",
+						new { alias = Alias(2), index = Index, index_routing = "x", search_routing = "y", is_write_index = true }
+					}
+				},
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<BulkAliasDescriptor, IBulkAliasRequest> Fluent => d => d
-			.Add(a=>a.Alias(this.Alias(1)).Index(this.Index).IndexRouting("x").SearchRouting("y").IsWriteIndex(false))
-			.Add(a=>a.Alias(this.Alias(2)).Index(this.Index).IndexRouting("x").SearchRouting("y").IsWriteIndex())
-		;
+			.Add(a => a.Alias(Alias(1)).Index(Index).IndexRouting("x").SearchRouting("y").IsWriteIndex(false))
+			.Add(a => a.Alias(Alias(2)).Index(Index).IndexRouting("x").SearchRouting("y").IsWriteIndex());
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override BulkAliasRequest Initializer => new BulkAliasRequest
 		{
 			Actions = new List<IAliasAction>
 			{
-				new AliasAddAction { Add =
-					new AliasAddOperation {Alias = this.Alias(1), Index = this.Index, IndexRouting = "x", SearchRouting = "y", IsWriteIndex = false} },
-				new AliasAddAction { Add =
-					new AliasAddOperation {Alias = this.Alias(2), Index = this.Index, IndexRouting = "x", SearchRouting = "y", IsWriteIndex = true} },
+				new AliasAddAction
+				{
+					Add =
+						new AliasAddOperation { Alias = Alias(1), Index = Index, IndexRouting = "x", SearchRouting = "y", IsWriteIndex = false }
+				},
+				new AliasAddAction
+				{
+					Add =
+						new AliasAddOperation { Alias = Alias(2), Index = Index, IndexRouting = "x", SearchRouting = "y", IsWriteIndex = true }
+				},
 			}
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_aliases";
+		private string Index => CallIsolatedValue;
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Alias(f),
+			(client, f) => client.AliasAsync(f),
+			(client, r) => client.Alias(r),
+			(client, r) => client.AliasAsync(r)
+		);
+
+		private string Alias(int i) => $"alias-{CallIsolatedValue}-{i}";
+
+		protected override void OnAfterCall(IElasticClient client)
+		{
+			var secondAlias = Alias(2);
+			var aliasResponse = Client.GetAlias(a => a.Name(secondAlias));
+			aliasResponse.ShouldBeValid();
+			aliasResponse.Indices.Should().NotBeEmpty().And.ContainKey(Index);
+			var indexAliases = aliasResponse.Indices[Index].Aliases;
+
+			indexAliases.Should().NotBeEmpty().And.ContainKey(secondAlias);
+			var alias = indexAliases[secondAlias];
+			alias.IsWriteIndex.Should()
+				.HaveValue()
+				.And
+				.BeTrue($"{secondAlias} was stored is is_write_index, so we need to be able to read it too");
+		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/Alias/AliasUrlTests.cs b/src/Tests/Tests/Indices/AliasManagement/Alias/AliasUrlTests.cs
index fec62eb0a24..51afb6076f4 100644
--- a/src/Tests/Tests/Indices/AliasManagement/Alias/AliasUrlTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/Alias/AliasUrlTests.cs
@@ -8,15 +8,10 @@ namespace Tests.Indices.AliasManagement.Alias
 {
 	public class AliasUrlTests
 	{
-		[U] public async Task Urls()
-		{
-			await POST($"/_aliases")
-				.Fluent(c=>c.Alias(b=>b))
-				.Request(c=>c.Alias(new BulkAliasRequest()))
-				.FluentAsync(c=>c.AliasAsync(b=>b))
-				.RequestAsync(c=>c.AliasAsync(new BulkAliasRequest()))
-				;
-
-		}
+		[U] public async Task Urls() => await POST($"/_aliases")
+			.Fluent(c => c.Alias(b => b))
+			.Request(c => c.Alias(new BulkAliasRequest()))
+			.FluentAsync(c => c.AliasAsync(b => b))
+			.RequestAsync(c => c.AliasAsync(new BulkAliasRequest()));
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsApiTests.cs b/src/Tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsApiTests.cs
index 43ed1c8fcaa..e3447c79d33 100644
--- a/src/Tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsApiTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsApiTests.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.AliasManagement.AliasExists
@@ -17,6 +14,17 @@ public class AliasExistsApiTests
 	{
 		public AliasExistsApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<AliasExistsDescriptor, IAliasExistsRequest> Fluent => d => d;
+		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
+
+		protected override AliasExistsRequest Initializer => new AliasExistsRequest(Names(CallIsolatedValue + "-alias"));
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_alias/{CallIsolatedValue}-alias";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var index in values.Values)
@@ -26,29 +34,15 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.AliasExists(CallIsolatedValue + "-alias", f),
-			fluentAsync: (client, f) => client.AliasExistsAsync(CallIsolatedValue + "-alias", f),
-			request: (client, r) => client.AliasExists(r),
-			requestAsync: (client, r) => client.AliasExistsAsync(r)
+			(client, f) => client.AliasExists(CallIsolatedValue + "-alias", f),
+			(client, f) => client.AliasExistsAsync(CallIsolatedValue + "-alias", f),
+			(client, r) => client.AliasExists(r),
+			(client, r) => client.AliasExistsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/_alias/{CallIsolatedValue}-alias";
-
-		protected override bool SupportsDeserialization => false;
-
 		protected override AliasExistsDescriptor NewDescriptor() => new AliasExistsDescriptor(Names(CallIsolatedValue + "-alias"));
 
-		protected override Func<AliasExistsDescriptor, IAliasExistsRequest> Fluent => d => d;
-
-		protected override AliasExistsRequest Initializer => new AliasExistsRequest(Names(CallIsolatedValue + "-alias"));
-
-		protected override void ExpectResponse(IExistsResponse response)
-		{
-			response.Exists.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IExistsResponse response) => response.Exists.Should().BeTrue();
 	}
 
 	public class AliasExistsNotFoundApiTests
@@ -57,25 +51,25 @@ public class AliasExistsNotFoundApiTests
 	{
 		public AliasExistsNotFoundApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.AliasExists("unknown-alias", f),
-			fluentAsync: (client, f) => client.AliasExistsAsync("unknown-alias", f),
-			request: (client, r) => client.AliasExists(r),
-			requestAsync: (client, r) => client.AliasExistsAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 404;
+
+		protected override Func<AliasExistsDescriptor, IAliasExistsRequest> Fluent => d => d;
 		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/_alias/unknown-alias";
 
-		protected override bool SupportsDeserialization => false;
+		protected override AliasExistsRequest Initializer => new AliasExistsRequest(Names("unknown-alias"));
 
-		protected override AliasExistsDescriptor NewDescriptor() => new AliasExistsDescriptor(Names("unknown-alias"));
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_alias/unknown-alias";
 
-		protected override Func<AliasExistsDescriptor, IAliasExistsRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.AliasExists("unknown-alias", f),
+			(client, f) => client.AliasExistsAsync("unknown-alias", f),
+			(client, r) => client.AliasExists(r),
+			(client, r) => client.AliasExistsAsync(r)
+		);
 
-		protected override AliasExistsRequest Initializer => new AliasExistsRequest(Names("unknown-alias"));
+		protected override AliasExistsDescriptor NewDescriptor() => new AliasExistsDescriptor(Names("unknown-alias"));
 
 		protected override void ExpectResponse(IExistsResponse response)
 		{
diff --git a/src/Tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsUrlTests.cs b/src/Tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsUrlTests.cs
index 22d1deb29ff..ead8745e657 100644
--- a/src/Tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsUrlTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsUrlTests.cs
@@ -13,31 +13,30 @@ [U] public async Task Urls()
 			Name name = "hardcoded";
 			IndexName index = "index";
 			await HEAD($"/_alias/hardcoded")
-				.Fluent(c=>c.AliasExists(name))
+					.Fluent(c => c.AliasExists(name))
 #pragma warning disable 618 // changing method signature would be binary breaking
-				.Fluent(c=>c.AliasExists(b => b.Name(name)))
+					.Fluent(c => c.AliasExists(b => b.Name(name)))
 #pragma warning restore 618
-				.Request(c=>c.AliasExists(new AliasExistsRequest(name)))
-				.FluentAsync(c=>c.AliasExistsAsync(name))
+					.Request(c => c.AliasExists(new AliasExistsRequest(name)))
+					.FluentAsync(c => c.AliasExistsAsync(name))
 #pragma warning disable 618 // changing method signature would be binary breaking
-				.FluentAsync(c=>c.AliasExistsAsync(b => b.Name(name)))
+					.FluentAsync(c => c.AliasExistsAsync(b => b.Name(name)))
 #pragma warning restore 618
-				.RequestAsync(c=>c.AliasExistsAsync(new AliasExistsRequest(name)))
+					.RequestAsync(c => c.AliasExistsAsync(new AliasExistsRequest(name)))
 				;
 
 			await HEAD($"/index/_alias/hardcoded")
-				.Fluent(c=>c.AliasExists(name, b=>b.Index(index)))
+					.Fluent(c => c.AliasExists(name, b => b.Index(index)))
 #pragma warning disable 618 // changing method signature would be binary breaking
-				.Fluent(c=>c.AliasExists(b=>b.Index(index).Name(name)))
+					.Fluent(c => c.AliasExists(b => b.Index(index).Name(name)))
 #pragma warning restore 618
-				.Request(c=>c.AliasExists(new AliasExistsRequest(index, name)))
-				.FluentAsync(c=>c.AliasExistsAsync(name, b=>b.Index(index)))
+					.Request(c => c.AliasExists(new AliasExistsRequest(index, name)))
+					.FluentAsync(c => c.AliasExistsAsync(name, b => b.Index(index)))
 #pragma warning disable 618 // changing method signature would be binary breaking
-				.FluentAsync(c=>c.AliasExistsAsync(b=>b.Index(index).Name(name)))
+					.FluentAsync(c => c.AliasExistsAsync(b => b.Index(index).Name(name)))
 #pragma warning restore 618
-				.RequestAsync(c=>c.AliasExistsAsync(new AliasExistsRequest(index, name)))
+					.RequestAsync(c => c.AliasExistsAsync(new AliasExistsRequest(index, name)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/DeleteAlias/AliasDeleteApiTests.cs b/src/Tests/Tests/Indices/AliasManagement/DeleteAlias/AliasDeleteApiTests.cs
index 1ba93a43d14..4e0cec08a6b 100644
--- a/src/Tests/Tests/Indices/AliasManagement/DeleteAlias/AliasDeleteApiTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/DeleteAlias/AliasDeleteApiTests.cs
@@ -1,42 +1,40 @@
 using System;
-using System.Collections.Generic;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.AliasManagement.DeleteAlias
 {
-	public class DeleteAliasApiTests : ApiIntegrationTestBase<WritableCluster, IDeleteAliasResponse, IDeleteAliasRequest, DeleteAliasDescriptor, DeleteAliasRequest>
+	public class DeleteAliasApiTests
+		: ApiIntegrationTestBase<WritableCluster, IDeleteAliasResponse, IDeleteAliasRequest, DeleteAliasDescriptor, DeleteAliasRequest>
 	{
+		public DeleteAliasApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<DeleteAliasDescriptor, IDeleteAliasRequest> Fluent => null;
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+		protected override DeleteAliasRequest Initializer => new DeleteAliasRequest(Infer.AllIndices, Names);
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_all/_alias/{CallIsolatedValue + "-alias"}";
 		private Names Names => Infer.Names(CallIsolatedValue + "-alias");
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var index in values.Values)
-				client.CreateIndex(index, c=>c
-					.Aliases(aa=>aa.Alias(index + "-alias"))
+				client.CreateIndex(index, c => c
+					.Aliases(aa => aa.Alias(index + "-alias"))
 				);
 		}
 
-		public DeleteAliasApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteAlias(Infer.AllIndices, Names),
-			fluentAsync: (client, f) => client.DeleteAliasAsync(Infer.AllIndices, Names),
-			request: (client, r) => client.DeleteAlias(r),
-			requestAsync: (client, r) => client.DeleteAliasAsync(r)
+			(client, f) => client.DeleteAlias(Infer.AllIndices, Names),
+			(client, f) => client.DeleteAliasAsync(Infer.AllIndices, Names),
+			(client, r) => client.DeleteAlias(r),
+			(client, r) => client.DeleteAliasAsync(r)
 		);
-
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/_all/_alias/{CallIsolatedValue + "-alias"}";
-		protected override bool SupportsDeserialization => false;
-
-		protected override Func<DeleteAliasDescriptor, IDeleteAliasRequest> Fluent => null;
-		protected override DeleteAliasRequest Initializer => new DeleteAliasRequest(Infer.AllIndices, Names);
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/DeleteAlias/DeleteAliasUrlTests.cs b/src/Tests/Tests/Indices/AliasManagement/DeleteAlias/DeleteAliasUrlTests.cs
index 58f94023844..3c1bd3f6cc4 100644
--- a/src/Tests/Tests/Indices/AliasManagement/DeleteAlias/DeleteAliasUrlTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/DeleteAlias/DeleteAliasUrlTests.cs
@@ -13,12 +13,11 @@ [U] public async Task Urls()
 			var hardcoded = "hardcoded";
 			var index = "index";
 			await DELETE($"/{index}/_alias/{hardcoded}")
-				.Fluent(c=>c.DeleteAlias(index, hardcoded))
-				.Request(c=>c.DeleteAlias(new DeleteAliasRequest(index, hardcoded)))
-				.FluentAsync(c=>c.DeleteAliasAsync(index, hardcoded))
-				.RequestAsync(c=>c.DeleteAliasAsync(new DeleteAliasRequest(index, hardcoded)))
+					.Fluent(c => c.DeleteAlias(index, hardcoded))
+					.Request(c => c.DeleteAlias(new DeleteAliasRequest(index, hardcoded)))
+					.FluentAsync(c => c.DeleteAliasAsync(index, hardcoded))
+					.RequestAsync(c => c.DeleteAliasAsync(new DeleteAliasRequest(index, hardcoded)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs b/src/Tests/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs
index 625687645d0..f6a85e18fcd 100644
--- a/src/Tests/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -11,10 +9,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.AliasManagement.GetAlias
@@ -25,18 +19,25 @@ public class GetAliasApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetAlia
 
 		public GetAliasApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetAlias(f),
-			fluentAsync: (client, f) => client.GetAliasAsync(f),
-			request: (client, r) => client.GetAlias(r),
-			requestAsync: (client, r) => client.GetAliasAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
+
+		protected override Func<GetAliasDescriptor, IGetAliasRequest> Fluent => d => d
+			.AllIndices()
+			.Name(Names);
+
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override GetAliasRequest Initializer => new GetAliasRequest(Nest.Indices.All, Names);
+		protected override bool SupportsDeserialization => false;
 		protected override string UrlPath => $"_all/_alias/{DefaultSeeder.ProjectsAliasName}";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetAlias(f),
+			(client, f) => client.GetAliasAsync(f),
+			(client, r) => client.GetAlias(r),
+			(client, r) => client.GetAliasAsync(r)
+		);
+
 		protected override void ExpectResponse(IGetAliasResponse response)
 		{
 			response.Indices.Should().NotBeEmpty($"expect to find indices pointing to {DefaultSeeder.ProjectsAliasName}");
@@ -46,69 +47,65 @@ protected override void ExpectResponse(IGetAliasResponse response)
 			var alias = indexAliases.Aliases[DefaultSeeder.ProjectsAliasName];
 			alias.Should().NotBeNull();
 		}
-		protected override bool SupportsDeserialization => false;
-
-		protected override Func<GetAliasDescriptor, IGetAliasRequest> Fluent => d=>d
-			.AllIndices()
-			.Name(Names)
-		;
-		protected override GetAliasRequest Initializer => new GetAliasRequest(Nest.Indices.All, Names);
 	}
 
-	public class GetAliasPartialMatchApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetAliasResponse, IGetAliasRequest, GetAliasDescriptor, GetAliasRequest>
+	public class GetAliasPartialMatchApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetAliasResponse, IGetAliasRequest, GetAliasDescriptor, GetAliasRequest>
 	{
-		private static readonly Names Names = Names(DefaultSeeder.ProjectsAliasName,"x", "y");
+		private static readonly Names Names = Names(DefaultSeeder.ProjectsAliasName, "x", "y");
 
 		public GetAliasPartialMatchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetAlias(f),
-			fluentAsync: (client, f) => client.GetAliasAsync(f),
-			request: (client, r) => client.GetAlias(r),
-			requestAsync: (client, r) => client.GetAliasAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => TestConfiguration.Instance.InRange("<5.5.0") ? 200 : 404;
+
+		protected override Func<GetAliasDescriptor, IGetAliasRequest> Fluent => d => d
+			.AllIndices()
+			.Name(Names);
+
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override GetAliasRequest Initializer => new GetAliasRequest(Nest.Indices.All, Names);
+		protected override bool SupportsDeserialization => false;
 		protected override string UrlPath => $"_all/_alias/{DefaultSeeder.ProjectsAliasName}%2Cx%2Cy";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetAlias(f),
+			(client, f) => client.GetAliasAsync(f),
+			(client, r) => client.GetAlias(r),
+			(client, r) => client.GetAliasAsync(r)
+		);
+
 		protected override void ExpectResponse(IGetAliasResponse response)
 		{
 			response.Indices.Should().NotBeNull();
 			response.Indices.Count.Should().BeGreaterThan(0);
 		}
-		protected override bool SupportsDeserialization => false;
-
-		protected override Func<GetAliasDescriptor, IGetAliasRequest> Fluent => d=>d
-			.AllIndices()
-			.Name(Names)
-		;
-		protected override GetAliasRequest Initializer => new GetAliasRequest(Nest.Indices.All, Names);
 	}
 
-	public class GetAliasNotFoundApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetAliasResponse, IGetAliasRequest, GetAliasDescriptor, GetAliasRequest>
+	public class GetAliasNotFoundApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetAliasResponse, IGetAliasRequest, GetAliasDescriptor, GetAliasRequest>
 	{
 		private static readonly Names Names = Names("bad-alias");
 
 		public GetAliasNotFoundApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetAlias(f),
-			fluentAsync: (client, f) => client.GetAliasAsync(f),
-			request: (client, r) => client.GetAlias(r),
-			requestAsync: (client, r) => client.GetAliasAsync(r)
-		);
-
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 404;
+
+		protected override Func<GetAliasDescriptor, IGetAliasRequest> Fluent => d => d
+			.Name(Names);
+
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_alias/bad-alias";
+		protected override GetAliasRequest Initializer => new GetAliasRequest(Names);
 		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_alias/bad-alias";
 
-		protected override Func<GetAliasDescriptor, IGetAliasRequest> Fluent => d=>d
-			.Name(Names)
-		;
-		protected override GetAliasRequest Initializer => new GetAliasRequest(Names);
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetAlias(f),
+			(client, f) => client.GetAliasAsync(f),
+			(client, r) => client.GetAlias(r),
+			(client, r) => client.GetAliasAsync(r)
+		);
 
 		protected override void ExpectResponse(IGetAliasResponse response)
 		{
@@ -116,6 +113,5 @@ protected override void ExpectResponse(IGetAliasResponse response)
 			response.ServerError.Error.Reason.Should().Contain("missing");
 			response.Indices.Should().NotBeNull();
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/GetAlias/GetAliasUrlTests.cs b/src/Tests/Tests/Indices/AliasManagement/GetAlias/GetAliasUrlTests.cs
index 07d45380073..d8e963486e4 100644
--- a/src/Tests/Tests/Indices/AliasManagement/GetAlias/GetAliasUrlTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/GetAlias/GetAliasUrlTests.cs
@@ -13,31 +13,30 @@ [U] public async Task Urls()
 			Name name = "hardcoded";
 			IndexName index = "index";
 			await GET($"/_alias")
-				.Fluent(c=>c.GetAlias())
-				.Request(c=>c.GetAlias(new GetAliasRequest()))
-				.FluentAsync(c=>c.GetAliasAsync())
-				.RequestAsync(c=>c.GetAliasAsync(new GetAliasRequest()))
+					.Fluent(c => c.GetAlias())
+					.Request(c => c.GetAlias(new GetAliasRequest()))
+					.FluentAsync(c => c.GetAliasAsync())
+					.RequestAsync(c => c.GetAliasAsync(new GetAliasRequest()))
 				;
 			await GET($"/_alias/hardcoded")
-				.Fluent(c=>c.GetAlias(b=>b.Name(name)))
-				.Request(c=>c.GetAlias(new GetAliasRequest(name)))
-				.FluentAsync(c=>c.GetAliasAsync(b=>b.Name(name)))
-				.RequestAsync(c=>c.GetAliasAsync(new GetAliasRequest(name)))
+					.Fluent(c => c.GetAlias(b => b.Name(name)))
+					.Request(c => c.GetAlias(new GetAliasRequest(name)))
+					.FluentAsync(c => c.GetAliasAsync(b => b.Name(name)))
+					.RequestAsync(c => c.GetAliasAsync(new GetAliasRequest(name)))
 				;
 			await GET($"/index/_alias")
-				.Fluent(c=>c.GetAlias(b=>b.Index(index)))
-				.Request(c=>c.GetAlias(new GetAliasRequest(index)))
-				.FluentAsync(c=>c.GetAliasAsync(b=>b.Index(index)))
-				.RequestAsync(c=>c.GetAliasAsync(new GetAliasRequest(index)))
+					.Fluent(c => c.GetAlias(b => b.Index(index)))
+					.Request(c => c.GetAlias(new GetAliasRequest(index)))
+					.FluentAsync(c => c.GetAliasAsync(b => b.Index(index)))
+					.RequestAsync(c => c.GetAliasAsync(new GetAliasRequest(index)))
 				;
 
 			await GET($"/index/_alias/hardcoded")
-				.Fluent(c=>c.GetAlias(b=>b.Index(index).Name(name)))
-				.Request(c=>c.GetAlias(new GetAliasRequest(index, name)))
-				.FluentAsync(c=>c.GetAliasAsync(b=>b.Index(index).Name(name)))
-				.RequestAsync(c=>c.GetAliasAsync(new GetAliasRequest(index, name)))
+					.Fluent(c => c.GetAlias(b => b.Index(index).Name(name)))
+					.Request(c => c.GetAlias(new GetAliasRequest(index, name)))
+					.FluentAsync(c => c.GetAliasAsync(b => b.Index(index).Name(name)))
+					.RequestAsync(c => c.GetAliasAsync(new GetAliasRequest(index, name)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/GetAliasesPointingToIndex/GetAliasesPointingToIndexTests.cs b/src/Tests/Tests/Indices/AliasManagement/GetAliasesPointingToIndex/GetAliasesPointingToIndexTests.cs
index 36bbf4522cf..d0f630a5e9b 100644
--- a/src/Tests/Tests/Indices/AliasManagement/GetAliasesPointingToIndex/GetAliasesPointingToIndexTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/GetAliasesPointingToIndex/GetAliasesPointingToIndexTests.cs
@@ -1,28 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
-using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.AliasManagement.GetAliasesPointingToIndex
 {
 	public class GetAliasesPointingToIndexTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
 	{
-		private readonly WritableCluster _cluster;
-		private readonly IElasticClient _client;
-		private static string Unique = RandomString();
+		private static readonly string Unique = RandomString();
 		private static readonly string Index = "aliases-index-" + Unique;
-		private static string Alias(int alias) => "aliases-index-" + Unique + "-alias-" + alias;
+
+		private readonly IElasticClient _client;
+		private readonly WritableCluster _cluster;
 
 		public GetAliasesPointingToIndexTests(WritableCluster cluster) : base(cluster)
 		{
@@ -30,9 +23,11 @@ public GetAliasesPointingToIndexTests(WritableCluster cluster) : base(cluster)
 			_client = _cluster.Client;
 
 			if (_client.IndexExists(Index).Exists) return;
-			lock(Unique)
+
+			lock (Unique)
 			{
 				if (_client.IndexExists(Index).Exists) return;
+
 				var createResponse = _client.CreateIndex(Index, c => c
 					.Settings(s => s
 						.NumberOfShards(1)
@@ -49,6 +44,8 @@ public GetAliasesPointingToIndexTests(WritableCluster cluster) : base(cluster)
 			}
 		}
 
+		private static string Alias(int alias) => "aliases-index-" + Unique + "-alias-" + alias;
+
 		[I] public void ShouldGetAliasesPointingToIndex()
 		{
 			var aliasesPointingToIndex = _client.GetAliasesPointingToIndex(Index);
@@ -66,6 +63,7 @@ [I] public async Task ShouldGetAliasesPointingToIndexAsync()
 			var aliasesPointingToIndex = await _client.GetAliasesPointingToIndexAsync(Index);
 			AssertGetAliasesPointingToIndexResponse(aliasesPointingToIndex);
 		}
+
 		[I] public async Task ShouldGetIndicesPointingToAliasAsync()
 		{
 			var indices = await _client.GetIndicesPointingToAliasAsync(Alias(3));
@@ -74,7 +72,9 @@ [I] public async Task ShouldGetIndicesPointingToAliasAsync()
 
 		private static void AssertGetAliasesPointingToIndexResponse(IReadOnlyDictionary<string, AliasDefinition> aliasesPointingToIndex)
 		{
-			aliasesPointingToIndex.Should().NotBeEmpty().And.HaveCount(3)
+			aliasesPointingToIndex.Should()
+				.NotBeEmpty()
+				.And.HaveCount(3)
 				.And.ContainKey(Alias(1))
 				.And.ContainKey(Alias(2))
 				.And.ContainKey(Alias(3));
@@ -82,8 +82,6 @@ private static void AssertGetAliasesPointingToIndexResponse(IReadOnlyDictionary<
 			aliasesPointingToIndex[Alias(1)].Should().NotBeNull();
 			aliasesPointingToIndex[Alias(2)].Should().NotBeNull();
 			aliasesPointingToIndex[Alias(3)].Should().NotBeNull();
-
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/GetIndicesPointingToAlias/GetIndicesPointingToAliasTests.cs b/src/Tests/Tests/Indices/AliasManagement/GetIndicesPointingToAlias/GetIndicesPointingToAliasTests.cs
index 4c7c6812b1d..5aa14cf32c4 100644
--- a/src/Tests/Tests/Indices/AliasManagement/GetIndicesPointingToAlias/GetIndicesPointingToAliasTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/GetIndicesPointingToAlias/GetIndicesPointingToAliasTests.cs
@@ -1,33 +1,28 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Elastic.Xunit.Sdk;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
-using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.AliasManagement.GetIndicesPointingToAlias
 {
 	public class GetIndicesPointingToAliasTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
 	{
-		private readonly WritableCluster _cluster;
-		private readonly IElasticClient _client;
-		private static string Unique = RandomString();
-
+		private static readonly string Unique = RandomString();
 		private static readonly string Alias = "alias-" + Unique;
 
-		private static readonly string[] Indices = {
+		private static readonly string[] Indices =
+		{
 			$"alias-index-{Unique}-1",
 			$"alias-index-{Unique}-2",
 			$"alias-index-{Unique}-3"
 		};
 
+		private readonly IElasticClient _client;
+		private readonly WritableCluster _cluster;
+
 		public GetIndicesPointingToAliasTests(WritableCluster cluster) : base(cluster)
 		{
 			_cluster = cluster;
diff --git a/src/Tests/Tests/Indices/AliasManagement/PutAlias/PutAliasApiTests.cs b/src/Tests/Tests/Indices/AliasManagement/PutAlias/PutAliasApiTests.cs
index 5ef06c7edae..3baaa352e96 100644
--- a/src/Tests/Tests/Indices/AliasManagement/PutAlias/PutAliasApiTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/PutAlias/PutAliasApiTests.cs
@@ -1,64 +1,65 @@
 using System;
-using System.Collections.Generic;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.AliasManagement.PutAlias
 {
-	public class PutAliasApiTests : ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IPutAliasResponse, IPutAliasRequest, PutAliasDescriptor, PutAliasRequest>
+	public class PutAliasApiTests
+		: ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IPutAliasResponse, IPutAliasRequest, PutAliasDescriptor, PutAliasRequest>
 	{
 		public PutAliasApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutAlias(CallIsolatedValue, CallIsolatedValue + "-alias"),
-			fluentAsync: (client, f) => client.PutAliasAsync(CallIsolatedValue, CallIsolatedValue + "-alias"),
-			request: (client, r) => client.PutAlias(r),
-			requestAsync: (client, r) => client.PutAliasAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
+
+		protected override Func<PutAliasDescriptor, IPutAliasRequest> Fluent => null;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_alias/{CallIsolatedValue + "-alias"}";
+		protected override PutAliasRequest Initializer => new PutAliasRequest(CallIsolatedValue, CallIsolatedValue + "-alias");
 
 		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{CallIsolatedValue}/_alias/{CallIsolatedValue + "-alias"}";
 
-		protected override Func<PutAliasDescriptor, IPutAliasRequest> Fluent => null;
-		protected override PutAliasRequest Initializer => new PutAliasRequest(CallIsolatedValue, CallIsolatedValue + "-alias");
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutAlias(CallIsolatedValue, CallIsolatedValue + "-alias"),
+			(client, f) => client.PutAliasAsync(CallIsolatedValue, CallIsolatedValue + "-alias"),
+			(client, r) => client.PutAlias(r),
+			(client, r) => client.PutAliasAsync(r)
+		);
 	}
 
 	[SkipVersion("<6.4.0", "is_write_index is a new feature")]
-	public class PutAliasIsWriteIndexApiTests : ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IPutAliasResponse, IPutAliasRequest, PutAliasDescriptor, PutAliasRequest>
+	public class PutAliasIsWriteIndexApiTests
+		: ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IPutAliasResponse, IPutAliasRequest, PutAliasDescriptor, PutAliasRequest>
 	{
 		public PutAliasIsWriteIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutAlias(CallIsolatedValue, CallIsolatedValue + "-alias"),
-			fluentAsync: (client, f) => client.PutAliasAsync(CallIsolatedValue, CallIsolatedValue + "-alias"),
-			request: (client, r) => client.PutAlias(r),
-			requestAsync: (client, r) => client.PutAliasAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_alias/{CallIsolatedValue + "-alias"}";
-
-		protected override bool SupportsDeserialization => false;
-
-		protected override object ExpectJson => new {is_write_index = true};
 
-		protected override PutAliasDescriptor NewDescriptor() => new PutAliasDescriptor(CallIsolatedValue, CallIsolatedValue + "-alias");
+		protected override object ExpectJson => new { is_write_index = true };
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<PutAliasDescriptor, IPutAliasRequest> Fluent => f => f.IsWriteIndex();
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
 		protected override PutAliasRequest Initializer => new PutAliasRequest(CallIsolatedValue, CallIsolatedValue + "-alias")
 		{
 			IsWriteIndex = true
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/{CallIsolatedValue}/_alias/{CallIsolatedValue + "-alias"}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutAlias(CallIsolatedValue, CallIsolatedValue + "-alias"),
+			(client, f) => client.PutAliasAsync(CallIsolatedValue, CallIsolatedValue + "-alias"),
+			(client, r) => client.PutAlias(r),
+			(client, r) => client.PutAliasAsync(r)
+		);
+
+		protected override PutAliasDescriptor NewDescriptor() => new PutAliasDescriptor(CallIsolatedValue, CallIsolatedValue + "-alias");
 	}
 }
diff --git a/src/Tests/Tests/Indices/AliasManagement/PutAlias/PutAliasUrlTests.cs b/src/Tests/Tests/Indices/AliasManagement/PutAlias/PutAliasUrlTests.cs
index 2dc9d9ab44c..4982af0afe2 100644
--- a/src/Tests/Tests/Indices/AliasManagement/PutAlias/PutAliasUrlTests.cs
+++ b/src/Tests/Tests/Indices/AliasManagement/PutAlias/PutAliasUrlTests.cs
@@ -13,12 +13,11 @@ [U] public async Task Urls()
 			var hardcoded = "hardcoded";
 			var index = "index";
 			await PUT($"/{index}/_alias/{hardcoded}")
-				.Fluent(c=>c.PutAlias(index, hardcoded))
-				.Request(c=>c.PutAlias(new PutAliasRequest(index, hardcoded)))
-				.FluentAsync(c=>c.PutAliasAsync(index, hardcoded))
-				.RequestAsync(c=>c.PutAliasAsync(new PutAliasRequest(index, hardcoded)))
+					.Fluent(c => c.PutAlias(index, hardcoded))
+					.Request(c => c.PutAlias(new PutAliasRequest(index, hardcoded)))
+					.FluentAsync(c => c.PutAliasAsync(index, hardcoded))
+					.RequestAsync(c => c.PutAliasAsync(new PutAliasRequest(index, hardcoded)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/Analyze/AnalyzeApiTests.cs b/src/Tests/Tests/Indices/Analyze/AnalyzeApiTests.cs
index f781184b659..45cdbb4c4fa 100644
--- a/src/Tests/Tests/Indices/Analyze/AnalyzeApiTests.cs
+++ b/src/Tests/Tests/Indices/Analyze/AnalyzeApiTests.cs
@@ -6,25 +6,14 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.Analyze
 {
 	public class AnalyzeApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IAnalyzeResponse, IAnalyzeRequest, AnalyzeDescriptor, AnalyzeRequest>
 	{
 		public AnalyzeApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Analyze(f),
-			fluentAsync: (client, f) => client.AnalyzeAsync(f),
-			request: (client, r) => client.Analyze(r),
-			requestAsync: (client, r) => client.AnalyzeAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_analyze";
 
 		protected override object ExpectJson => new
 		{
@@ -34,12 +23,16 @@ protected override LazyResponses ClientUsage() => Calls(
 			filter = new[] { "lowercase", "stop" }
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<AnalyzeDescriptor, IAnalyzeRequest> Fluent => d => d
 			.Text("hello world", "domination")
 			.CharFilter("html_strip")
 			.Tokenizer("keyword")
 			.Filter("lowercase", "stop");
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override AnalyzeRequest Initializer => new AnalyzeRequest
 		{
 			Text = new[] { "hello world", "domination" },
@@ -47,25 +40,25 @@ protected override LazyResponses ClientUsage() => Calls(
 			Tokenizer = "keyword",
 			Filter = new[] { "lowercase", "stop" }
 		};
+
+		protected override string UrlPath => $"/_analyze";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Analyze(f),
+			(client, f) => client.AnalyzeAsync(f),
+			(client, r) => client.Analyze(r),
+			(client, r) => client.AnalyzeAsync(r)
+		);
 	}
 
-	public class AnalyzeInlineAnalyzerApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IAnalyzeResponse, IAnalyzeRequest, AnalyzeDescriptor, AnalyzeRequest>
+	public class AnalyzeInlineAnalyzerApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IAnalyzeResponse, IAnalyzeRequest, AnalyzeDescriptor, AnalyzeRequest>
 	{
 		protected const string TextToAnalyze = "F# is <b>THE SUPERIOR</b> language :) :gandalf: ";
 
 		public AnalyzeInlineAnalyzerApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Analyze(f),
-			fluentAsync: (client, f) => client.AnalyzeAsync(f),
-			request: (client, r) => client.Analyze(r),
-			requestAsync: (client, r) => client.AnalyzeAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_analyze";
 
 		protected override object ExpectJson => new
 		{
@@ -83,6 +76,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<AnalyzeDescriptor, IAnalyzeRequest> Fluent => d => d
 			.Text(TextToAnalyze)
 			.CharFilter(c => c
@@ -95,6 +90,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			)
 			.Tokenizer(t => t.Standard(s => s.MaxTokenLength(7)));
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override AnalyzeRequest Initializer => new AnalyzeRequest
 		{
 			Text = new[] { TextToAnalyze },
@@ -102,15 +99,24 @@ protected override LazyResponses ClientUsage() => Calls(
 			CharFilter = new AnalyzeCharFilters
 			{
 				"html_strip",
-				new MappingCharFilter { Mappings = new[] { "F# => fsharp"}}
+				new MappingCharFilter { Mappings = new[] { "F# => fsharp" } }
 			},
 			Filter = new AnalyzeTokenFilters
 			{
 				"lowercase",
-				new StopTokenFilter { StopWords = new [] {"_english_", "the" }}
+				new StopTokenFilter { StopWords = new[] { "_english_", "the" } }
 			}
 		};
 
+		protected override string UrlPath => $"/_analyze";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Analyze(f),
+			(client, f) => client.AnalyzeAsync(f),
+			(client, r) => client.Analyze(r),
+			(client, r) => client.AnalyzeAsync(r)
+		);
+
 		protected override void ExpectResponse(IAnalyzeResponse response)
 		{
 			//TIL standard chops up words greater than `MaxTokenLength` classic tokenizer drops them
@@ -120,23 +126,14 @@ protected override void ExpectResponse(IAnalyzeResponse response)
 		}
 	}
 
-	public class AnalyzeInlineNormalizerApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IAnalyzeResponse, IAnalyzeRequest, AnalyzeDescriptor, AnalyzeRequest>
+	public class AnalyzeInlineNormalizerApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IAnalyzeResponse, IAnalyzeRequest, AnalyzeDescriptor, AnalyzeRequest>
 	{
 		private const string TextToAnalyze = "F# is <b>THE SUPERIOR</b> language :) :gandalf: ";
 
 		public AnalyzeInlineNormalizerApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Analyze(f),
-			fluentAsync: (client, f) => client.AnalyzeAsync(f),
-			request: (client, r) => client.Analyze(r),
-			requestAsync: (client, r) => client.AnalyzeAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_analyze";
 
 		protected override object ExpectJson => new
 		{
@@ -151,6 +148,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<AnalyzeDescriptor, IAnalyzeRequest> Fluent => d => d
 			.Text(TextToAnalyze)
 			.CharFilter(c => c
@@ -160,12 +159,14 @@ protected override LazyResponses ClientUsage() => Calls(
 				.Name("lowercase")
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override AnalyzeRequest Initializer => new AnalyzeRequest
 		{
 			Text = new[] { TextToAnalyze },
 			CharFilter = new AnalyzeCharFilters
 			{
-				new MappingCharFilter { Mappings = new[] { "F# => fsharp"}}
+				new MappingCharFilter { Mappings = new[] { "F# => fsharp" } }
 			},
 			Filter = new AnalyzeTokenFilters
 			{
@@ -173,6 +174,15 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override string UrlPath => $"/_analyze";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Analyze(f),
+			(client, f) => client.AnalyzeAsync(f),
+			(client, r) => client.Analyze(r),
+			(client, r) => client.AnalyzeAsync(r)
+		);
+
 		protected override void ExpectResponse(IAnalyzeResponse response)
 		{
 			response.Tokens.Should().HaveCount(1);
@@ -236,10 +246,7 @@ protected override void ExpectResponse(IAnalyzeResponse response)
 		private static void AssertTokenDetail(TokenDetail c)
 		{
 			c.Name.Should().NotBeNullOrWhiteSpace();
-			foreach (var t in c.Tokens)
-			{
-				t.Token.Should().NotBeNullOrWhiteSpace();
-			}
+			foreach (var t in c.Tokens) t.Token.Should().NotBeNullOrWhiteSpace();
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/Analyze/AnalyzeUrlTests.cs b/src/Tests/Tests/Indices/Analyze/AnalyzeUrlTests.cs
index 64cee668548..9f105aaf693 100644
--- a/src/Tests/Tests/Indices/Analyze/AnalyzeUrlTests.cs
+++ b/src/Tests/Tests/Indices/Analyze/AnalyzeUrlTests.cs
@@ -13,19 +13,18 @@ [U] public async Task Urls()
 			var hardcoded = "hardcoded";
 			var index = "index";
 			await POST($"/{index}/_analyze")
-				.Fluent(c=>c.Analyze(a=>a.Text(hardcoded).Index(index)))
-				.Request(c=>c.Analyze(new AnalyzeRequest(index, hardcoded)))
-				.FluentAsync(c=>c.AnalyzeAsync(a=>a.Text(hardcoded).Index(index)))
-				.RequestAsync(c=>c.AnalyzeAsync(new AnalyzeRequest(index, hardcoded)))
+					.Fluent(c => c.Analyze(a => a.Text(hardcoded).Index(index)))
+					.Request(c => c.Analyze(new AnalyzeRequest(index, hardcoded)))
+					.FluentAsync(c => c.AnalyzeAsync(a => a.Text(hardcoded).Index(index)))
+					.RequestAsync(c => c.AnalyzeAsync(new AnalyzeRequest(index, hardcoded)))
 				;
 
 			await POST($"/_analyze")
-				.Fluent(c=>c.Analyze(a=>a.Text(hardcoded)))
-				.Request(c=>c.Analyze(new AnalyzeRequest() { Text = new[] { hardcoded } }))
-				.FluentAsync(c=>c.AnalyzeAsync(a=>a.Text(hardcoded)))
-				.RequestAsync(c=>c.AnalyzeAsync(new AnalyzeRequest() { Text = new[] { hardcoded } }))
+					.Fluent(c => c.Analyze(a => a.Text(hardcoded)))
+					.Request(c => c.Analyze(new AnalyzeRequest() { Text = new[] { hardcoded } }))
+					.FluentAsync(c => c.AnalyzeAsync(a => a.Text(hardcoded)))
+					.RequestAsync(c => c.AnalyzeAsync(new AnalyzeRequest() { Text = new[] { hardcoded } }))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexApiTests.cs
index ea8b2588522..8598bd2d3ea 100644
--- a/src/Tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexApiTests.cs
@@ -8,24 +8,15 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Indices.IndexManagement.CreateIndex
 {
-	public class CreateIndexApiTests : ApiIntegrationTestBase<WritableCluster, ICreateIndexResponse, ICreateIndexRequest, CreateIndexDescriptor, CreateIndexRequest>
+	public class CreateIndexApiTests
+		: ApiIntegrationTestBase<WritableCluster, ICreateIndexResponse, ICreateIndexRequest, CreateIndexDescriptor, CreateIndexRequest>
 	{
 		public CreateIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CreateIndex(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.CreateIndexAsync(CallIsolatedValue, f),
-			request: (client, r) => client.CreateIndex(r),
-			requestAsync: (client, r) => client.CreateIndexAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/{CallIsolatedValue}";
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -34,7 +25,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				{ "index.number_of_replicas", 1 },
 				{ "index.number_of_shards", 1 },
 				{ "index.queries.cache.enabled", true },
-				{ "similarity", new
+				{
+					"similarity", new
 					{
 						bm25 = new
 						{
@@ -53,14 +45,16 @@ protected override LazyResponses ClientUsage() => Calls(
 							independence_measure = "chisquared",
 							type = "DFI"
 						},
-						dfr = new Dictionary<string, object>{
+						dfr = new Dictionary<string, object>
+						{
 							{ "basic_model", "d" },
 							{ "after_effect", "b" },
 							{ "normalization", "h1" },
 							{ "normalization.h1.c", 1.1 },
 							{ "type", "DFR" }
 						},
-						ib = new Dictionary<string, object> {
+						ib = new Dictionary<string, object>
+						{
 							{ "distribution", "ll" },
 							{ "lambda", "df" },
 							{ "normalization", "h1" },
@@ -82,7 +76,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override CreateIndexDescriptor NewDescriptor() => new CreateIndexDescriptor(CallIsolatedValue);
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<CreateIndexDescriptor, ICreateIndexRequest> Fluent => d => d
 			.Settings(s => s
@@ -124,6 +118,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override CreateIndexRequest Initializer => new CreateIndexRequest(CallIsolatedValue)
 		{
 			Settings = new Nest.IndexSettings
@@ -139,24 +135,28 @@ protected override LazyResponses ClientUsage() => Calls(
 				},
 				Similarity = new Similarities
 				{
-					{ "bm25", new BM25Similarity
+					{
+						"bm25", new BM25Similarity
 						{
 							B = 1.0,
 							K1 = 1.1,
 							DiscountOverlaps = true
 						}
 					},
-					{ "tfidf", new ClassicSimilarity
+					{
+						"tfidf", new ClassicSimilarity
 						{
 							DiscountOverlaps = true
 						}
 					},
-					{ "dfi", new DFISimilarity
+					{
+						"dfi", new DFISimilarity
 						{
 							IndependenceMeasure = DFIIndependenceMeasure.ChiSquared
 						}
 					},
-					{ "dfr", new DFRSimilarity
+					{
+						"dfr", new DFRSimilarity
 						{
 							AfterEffect = DFRAfterEffect.B,
 							BasicModel = DFRBasicModel.D,
@@ -164,7 +164,8 @@ protected override LazyResponses ClientUsage() => Calls(
 							NormalizationH1C = 1.1
 						}
 					},
-					{ "ib", new IBSimilarity
+					{
+						"ib", new IBSimilarity
 						{
 							Distribution = IBDistribution.LogLogistic,
 							Lambda = IBLambda.DocumentFrequency,
@@ -172,12 +173,14 @@ protected override LazyResponses ClientUsage() => Calls(
 							NormalizationH1C = 1.2
 						}
 					},
-					{ "lmd", new LMDirichletSimilarity
+					{
+						"lmd", new LMDirichletSimilarity
 						{
 							Mu = 2
 						}
 					},
-					{ "lmj", new LMJelinekMercerSimilarity
+					{
+						"lmj", new LMJelinekMercerSimilarity
 						{
 							Lambda = 2.0
 						}
@@ -186,13 +189,24 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CreateIndex(CallIsolatedValue, f),
+			(client, f) => client.CreateIndexAsync(CallIsolatedValue, f),
+			(client, r) => client.CreateIndex(r),
+			(client, r) => client.CreateIndexAsync(r)
+		);
+
+		protected override CreateIndexDescriptor NewDescriptor() => new CreateIndexDescriptor(CallIsolatedValue);
+
 		protected override void ExpectResponse(ICreateIndexResponse response)
 		{
 			response.ShouldBeValid();
 			response.Acknowledged.Should().BeTrue();
 			response.ShardsAcknowledged.Should().BeTrue();
 
-			var indexSettings = this.Client.GetIndexSettings(g => g.Index(CallIsolatedValue));
+			var indexSettings = Client.GetIndexSettings(g => g.Index(CallIsolatedValue));
 
 			indexSettings.ShouldBeValid();
 			indexSettings.Indices.Should().NotBeEmpty().And.ContainKey(CallIsolatedValue);
@@ -217,20 +231,12 @@ protected override void ExpectResponse(ICreateIndexResponse response)
 	}
 
 	[SkipVersion("<6.1.0", "Scripted Similarity introduced in 6.1.0")]
-	public class CreateIndexWithScriptedSimilarityApiTests : ApiIntegrationTestBase<WritableCluster, ICreateIndexResponse, ICreateIndexRequest, CreateIndexDescriptor, CreateIndexRequest>
+	public class CreateIndexWithScriptedSimilarityApiTests
+		: ApiIntegrationTestBase<WritableCluster, ICreateIndexResponse, ICreateIndexRequest, CreateIndexDescriptor, CreateIndexRequest>
 	{
 		public CreateIndexWithScriptedSimilarityApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CreateIndex(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.CreateIndexAsync(CallIsolatedValue, f),
-			request: (client, r) => client.CreateIndex(r),
-			requestAsync: (client, r) => client.CreateIndexAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/{CallIsolatedValue}";
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -238,14 +244,16 @@ protected override LazyResponses ClientUsage() => Calls(
 			{
 				{ "index.number_of_replicas", 0 },
 				{ "index.number_of_shards", 1 },
-				{ "similarity", new
+				{
+					"similarity", new
 					{
 						scripted_tfidf = new
 						{
 							type = "scripted",
 							script = new
 							{
-								source = "double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;"
+								source =
+									"double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;"
 							}
 						}
 					}
@@ -253,7 +261,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override CreateIndexDescriptor NewDescriptor() => new CreateIndexDescriptor(CallIsolatedValue);
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<CreateIndexDescriptor, ICreateIndexRequest> Fluent => d => d
 			.Settings(s => s
@@ -262,12 +270,15 @@ protected override LazyResponses ClientUsage() => Calls(
 				.Similarity(si => si
 					.Scripted("scripted_tfidf", sc => sc
 						.Script(ssc => ssc
-							.Source("double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;")
+							.Source(
+								"double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;")
 						)
 					)
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override CreateIndexRequest Initializer => new CreateIndexRequest(CallIsolatedValue)
 		{
 			Settings = new Nest.IndexSettings
@@ -276,22 +287,35 @@ protected override LazyResponses ClientUsage() => Calls(
 				NumberOfShards = 1,
 				Similarity = new Similarities
 				{
-					{ "scripted_tfidf", new ScriptedSimilarity
+					{
+						"scripted_tfidf", new ScriptedSimilarity
 						{
-							Script = new InlineScript("double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;")
+							Script = new InlineScript(
+								"double tf = Math.sqrt(doc.freq); double idf = Math.log((field.docCount+1.0)/(term.docFreq+1.0)) + 1.0; double norm = 1/Math.sqrt(doc.length); return query.boost * tf * idf * norm;")
 						}
 					}
 				}
 			}
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CreateIndex(CallIsolatedValue, f),
+			(client, f) => client.CreateIndexAsync(CallIsolatedValue, f),
+			(client, r) => client.CreateIndex(r),
+			(client, r) => client.CreateIndexAsync(r)
+		);
+
+		protected override CreateIndexDescriptor NewDescriptor() => new CreateIndexDescriptor(CallIsolatedValue);
+
 		protected override void ExpectResponse(ICreateIndexResponse response)
 		{
 			response.ShouldBeValid();
 			response.Acknowledged.Should().BeTrue();
 			response.ShardsAcknowledged.Should().BeTrue();
 
-			var indexSettings = this.Client.GetIndexSettings(g => g.Index(CallIsolatedValue));
+			var indexSettings = Client.GetIndexSettings(g => g.Index(CallIsolatedValue));
 
 			indexSettings.ShouldBeValid();
 			indexSettings.Indices.Should().NotBeEmpty().And.ContainKey(CallIsolatedValue);
@@ -302,9 +326,9 @@ protected override void ExpectResponse(ICreateIndexResponse response)
 			similarities.Should().NotBeNull();
 			similarities.Should().ContainKey("scripted_tfidf").WhichValue.Should().BeOfType<ScriptedSimilarity>();
 
-			var scriptedSimilarity = (ScriptedSimilarity) similarities["scripted_tfidf"];
+			var scriptedSimilarity = (ScriptedSimilarity)similarities["scripted_tfidf"];
 			scriptedSimilarity.Script.Should().NotBeNull();
-			((InlineScript) scriptedSimilarity.Script).Source.Should().NotBeNullOrEmpty();
+			((InlineScript)scriptedSimilarity.Script).Source.Should().NotBeNullOrEmpty();
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexUrlTests.cs
index 3286cbc0796..41b7f0bfcb6 100644
--- a/src/Tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexUrlTests.cs
@@ -12,12 +12,11 @@ [U] public async Task Urls()
 		{
 			var index = "index1";
 			await PUT($"/{index}")
-				.Fluent(c => c.CreateIndex(index, s=>s))
-				.Request(c => c.CreateIndex(new CreateIndexRequest(index)))
-				.FluentAsync(c => c.CreateIndexAsync(index))
-				.RequestAsync(c => c.CreateIndexAsync(new CreateIndexRequest(index)))
+					.Fluent(c => c.CreateIndex(index, s => s))
+					.Request(c => c.CreateIndex(new CreateIndexRequest(index)))
+					.FluentAsync(c => c.CreateIndexAsync(index))
+					.RequestAsync(c => c.CreateIndexAsync(new CreateIndexRequest(index)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexApiTests.cs
index 6a3a3313b44..2a0a97349c0 100644
--- a/src/Tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexApiTests.cs
@@ -1,61 +1,55 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.IndexManagement.DeleteIndex
 {
-	public class DeleteIndexApiTests : ApiIntegrationAgainstNewIndexTestBase
-		<WritableCluster, IDeleteIndexResponse, IDeleteIndexRequest, DeleteIndexDescriptor, DeleteIndexRequest>
+	public class DeleteIndexApiTests
+		: ApiIntegrationAgainstNewIndexTestBase
+			<WritableCluster, IDeleteIndexResponse, IDeleteIndexRequest, DeleteIndexDescriptor, DeleteIndexRequest>
 	{
 		public DeleteIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteIndex(CallIsolatedValue),
-			fluentAsync: (client, f) => client.DeleteIndexAsync(CallIsolatedValue),
-			request: (client, r) => client.DeleteIndex(r),
-			requestAsync: (client, r) => client.DeleteIndexAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/{CallIsolatedValue}";
 
 		protected override DeleteIndexRequest Initializer => new DeleteIndexRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/{CallIsolatedValue}";
 
-		protected override void ExpectResponse(IDeleteIndexResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteIndex(CallIsolatedValue),
+			(client, f) => client.DeleteIndexAsync(CallIsolatedValue),
+			(client, r) => client.DeleteIndex(r),
+			(client, r) => client.DeleteIndexAsync(r)
+		);
+
+		protected override void ExpectResponse(IDeleteIndexResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 
-	public class DeleteNonExistentIndexApiTests : ApiIntegrationTestBase
-		<WritableCluster, IDeleteIndexResponse, IDeleteIndexRequest, DeleteIndexDescriptor, DeleteIndexRequest>
+	public class DeleteNonExistentIndexApiTests
+		: ApiIntegrationTestBase
+			<WritableCluster, IDeleteIndexResponse, IDeleteIndexRequest, DeleteIndexDescriptor, DeleteIndexRequest>
 	{
 		public DeleteNonExistentIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteIndex(CallIsolatedValue),
-			fluentAsync: (client, f) => client.DeleteIndexAsync(CallIsolatedValue),
-			request: (client, r) => client.DeleteIndex(r),
-			requestAsync: (client, r) => client.DeleteIndexAsync(r)
-		);
-
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 404;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/{CallIsolatedValue}";
 
 		protected override DeleteIndexRequest Initializer => new DeleteIndexRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteIndex(CallIsolatedValue),
+			(client, f) => client.DeleteIndexAsync(CallIsolatedValue),
+			(client, r) => client.DeleteIndex(r),
+			(client, r) => client.DeleteIndexAsync(r)
+		);
 
 		protected override void ExpectResponse(IDeleteIndexResponse response)
 		{
@@ -71,16 +65,16 @@ public class DeleteAllIndicesApiTests
 	{
 		public DeleteAllIndicesApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteIndex(AllIndices),
-			fluentAsync: (client, f) => client.DeleteIndexAsync(AllIndices),
-			request: (client, r) => client.DeleteIndex(r),
-			requestAsync: (client, r) => client.DeleteIndexAsync(r)
-		);
-
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/_all";
 
 		protected override DeleteIndexRequest Initializer => new DeleteIndexRequest(AllIndices);
+		protected override string UrlPath => $"/_all";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteIndex(AllIndices),
+			(client, f) => client.DeleteIndexAsync(AllIndices),
+			(client, r) => client.DeleteIndex(r),
+			(client, r) => client.DeleteIndexAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexUrlTests.cs
index fefba8d003d..395c7579ba0 100644
--- a/src/Tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexUrlTests.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
- using Elastic.Xunit.XunitPlumbing;
- using Nest;
- using Tests.Domain;
- using Tests.Framework;
- using static Nest.Indices;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
+using Nest;
+using Tests.Domain;
+using Tests.Framework;
+using static Nest.Indices;
 using static Tests.Framework.UrlTester;
 
 namespace Tests.Indices.IndexManagement.DeleteIndex
@@ -15,12 +15,11 @@ [U] public async Task Urls()
 			var indices = Index<Project>().And<Developer>();
 			var index = "project%2Cdevs";
 			await DELETE($"/{index}")
-				.Fluent(c => c.DeleteIndex(indices, s=>s))
-				.Request(c => c.DeleteIndex(new DeleteIndexRequest(indices)))
-				.FluentAsync(c => c.DeleteIndexAsync(indices))
-				.RequestAsync(c => c.DeleteIndexAsync(new DeleteIndexRequest(indices)))
+					.Fluent(c => c.DeleteIndex(indices, s => s))
+					.Request(c => c.DeleteIndex(new DeleteIndexRequest(indices)))
+					.FluentAsync(c => c.DeleteIndexAsync(indices))
+					.RequestAsync(c => c.DeleteIndexAsync(new DeleteIndexRequest(indices)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/GetIndex/GetIndexApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/GetIndex/GetIndexApiTests.cs
index afbbe31256a..72ec56d1467 100644
--- a/src/Tests/Tests/Indices/IndexManagement/GetIndex/GetIndexApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/GetIndex/GetIndexApiTests.cs
@@ -6,8 +6,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.IndexManagement.GetIndex
@@ -18,44 +16,46 @@ public class GetIndexApiTests
 		private static readonly IndexName ProjectIndex = Index<Project>();
 
 		public GetIndexApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetIndex(typeof(Project)),
-			fluentAsync: (client, f) => client.GetIndexAsync(typeof(Project)),
-			request: (client, r) => client.GetIndex(r),
-			requestAsync: (client, r) => client.GetIndexAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/project";
 
 		protected override GetIndexRequest Initializer => new GetIndexRequest(ProjectIndex);
+		protected override string UrlPath => $"/project";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetIndex(typeof(Project)),
+			(client, f) => client.GetIndexAsync(typeof(Project)),
+			(client, r) => client.GetIndex(r),
+			(client, r) => client.GetIndexAsync(r)
+		);
 
-	    protected override void ExpectResponse(IGetIndexResponse response)
-	    {
-	        response.Indices.Should().NotBeNull();
-	        response.Indices.Count.Should().BeGreaterThan(0);
-	        var projectIndex = response.Indices[ProjectIndex];
-	        projectIndex.Should().NotBeNull();
-	    }
+		protected override void ExpectResponse(IGetIndexResponse response)
+		{
+			response.Indices.Should().NotBeNull();
+			response.Indices.Count.Should().BeGreaterThan(0);
+			var projectIndex = response.Indices[ProjectIndex];
+			projectIndex.Should().NotBeNull();
+		}
 	}
 
 
 	public class GetAllIndicesApiTests
-		: ApiTestBase<ReadOnlyCluster,IGetIndexResponse, IGetIndexRequest, GetIndexDescriptor, GetIndexRequest>
+		: ApiTestBase<ReadOnlyCluster, IGetIndexResponse, IGetIndexRequest, GetIndexDescriptor, GetIndexRequest>
 	{
 		public GetAllIndicesApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetIndex(AllIndices),
-			fluentAsync: (client, f) => client.GetIndexAsync(AllIndices),
-			request: (client, r) => client.GetIndex(r),
-			requestAsync: (client, r) => client.GetIndexAsync(r)
-		);
 
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_all";
 
 		protected override GetIndexRequest Initializer => new GetIndexRequest(AllIndices);
+		protected override string UrlPath => $"/_all";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetIndex(AllIndices),
+			(client, f) => client.GetIndexAsync(AllIndices),
+			(client, r) => client.GetIndex(r),
+			(client, r) => client.GetIndexAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/GetIndex/GetIndexUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/GetIndex/GetIndexUrlTests.cs
index 04e5c16bad6..2a26b0e9469 100644
--- a/src/Tests/Tests/Indices/IndexManagement/GetIndex/GetIndexUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/GetIndex/GetIndexUrlTests.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
@@ -13,10 +12,10 @@ [U] public async Task Urls()
 		{
 			var index = "index1";
 			await GET($"/{index}")
-				.Fluent(c => c.GetIndex(index, s=>s))
-				.Request(c => c.GetIndex(new GetIndexRequest(index)))
-				.FluentAsync(c => c.GetIndexAsync(index))
-				.RequestAsync(c => c.GetIndexAsync(new GetIndexRequest(index)))
+					.Fluent(c => c.GetIndex(index, s => s))
+					.Request(c => c.GetIndex(new GetIndexRequest(index)))
+					.FluentAsync(c => c.GetIndexAsync(index))
+					.RequestAsync(c => c.GetIndexAsync(new GetIndexRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsApiTests.cs
index 6e16e3370a7..fd57dbbcedb 100644
--- a/src/Tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsApiTests.cs
@@ -5,32 +5,29 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.IndexManagement.IndicesExists
 {
-	public class IndexExistsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IExistsResponse, IIndexExistsRequest, IndexExistsDescriptor, IndexExistsRequest>
+	public class IndexExistsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IExistsResponse, IIndexExistsRequest, IndexExistsDescriptor, IndexExistsRequest>
 	{
 		public IndexExistsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.IndexExists(Index<Project>()),
-			fluentAsync: (client, f) => client.IndexExistsAsync(Index<Project>()),
-			request: (client, r) => client.IndexExists(r),
-			requestAsync: (client, r) => client.IndexExistsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/project";
 
 		protected override IndexExistsRequest Initializer => new IndexExistsRequest(Index<Project>());
+		protected override string UrlPath => $"/project";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.IndexExists(Index<Project>()),
+			(client, f) => client.IndexExistsAsync(Index<Project>()),
+			(client, r) => client.IndexExists(r),
+			(client, r) => client.IndexExistsAsync(r)
+		);
 
-		protected override void ExpectResponse(IExistsResponse response)
-		{
-			response.Exists.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IExistsResponse response) => response.Exists.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsUrlTests.cs
index 52fe7af77e6..baf5ee42f72 100644
--- a/src/Tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsUrlTests.cs
@@ -15,12 +15,11 @@ [U] public async Task Urls()
 			var indices = Index<Project>().And<CommitActivity>();
 			var index = "project";
 			await HEAD($"/{index}")
-				.Fluent(c => c.IndexExists(index, s=>s))
-				.Request(c => c.IndexExists(new IndexExistsRequest(index)))
-				.FluentAsync(c => c.IndexExistsAsync(index))
-				.RequestAsync(c => c.IndexExistsAsync(new IndexExistsRequest(index)))
+					.Fluent(c => c.IndexExists(index, s => s))
+					.Request(c => c.IndexExists(new IndexExistsRequest(index)))
+					.FluentAsync(c => c.IndexExistsAsync(index))
+					.RequestAsync(c => c.IndexExistsAsync(new IndexExistsRequest(index)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexApiTests.cs
index 11a7d34981c..163c31f105f 100644
--- a/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexApiTests.cs
@@ -1,32 +1,28 @@
-using System.Collections.Generic;
-using System.Linq;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using static Nest.Infer;
 
 namespace Tests.Indices.IndexManagement.OpenCloseIndex.CloseIndex
 {
-	public class CloseIndexApiTests : ApiIntegrationAgainstNewIndexTestBase<WritableCluster, ICloseIndexResponse, ICloseIndexRequest, CloseIndexDescriptor, CloseIndexRequest>
+	public class CloseIndexApiTests
+		: ApiIntegrationAgainstNewIndexTestBase<WritableCluster, ICloseIndexResponse, ICloseIndexRequest, CloseIndexDescriptor, CloseIndexRequest>
 	{
 		public CloseIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CloseIndex(CallIsolatedValue),
-			fluentAsync: (client, f) => client.CloseIndexAsync(CallIsolatedValue),
-			request: (client, r) => client.CloseIndex(r),
-			requestAsync: (client, r) => client.CloseIndexAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_close";
 
 		protected override CloseIndexRequest Initializer => new CloseIndexRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/{CallIsolatedValue}/_close";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CloseIndex(CallIsolatedValue),
+			(client, f) => client.CloseIndexAsync(CallIsolatedValue),
+			(client, r) => client.CloseIndex(r),
+			(client, r) => client.CloseIndexAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexUrlTests.cs
index bc55e09aa3c..f1d948f7185 100644
--- a/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexUrlTests.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
- using Elastic.Xunit.XunitPlumbing;
- using Nest;
- using Tests.Domain;
- using Tests.Framework;
- using static Nest.Indices;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
+using Nest;
+using Tests.Domain;
+using Tests.Framework;
+using static Nest.Indices;
 using static Tests.Framework.UrlTester;
 
 namespace Tests.Indices.IndexManagement.OpenCloseIndex.CloseIndex
@@ -15,12 +15,11 @@ [U] public async Task Urls()
 			var indices = Index<Project>().And<Developer>();
 			var index = "project%2Cdevs";
 			await POST($"/{index}/_close")
-				.Fluent(c => c.CloseIndex(indices, s=>s))
-				.Request(c => c.CloseIndex(new CloseIndexRequest(indices)))
-				.FluentAsync(c => c.CloseIndexAsync(indices))
-				.RequestAsync(c => c.CloseIndexAsync(new CloseIndexRequest(indices)))
+					.Fluent(c => c.CloseIndex(indices, s => s))
+					.Request(c => c.CloseIndex(new CloseIndexRequest(indices)))
+					.FluentAsync(c => c.CloseIndexAsync(indices))
+					.RequestAsync(c => c.CloseIndexAsync(new CloseIndexRequest(indices)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexApiTests.cs
index ca16af3794d..499eb3970eb 100644
--- a/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexApiTests.cs
@@ -1,12 +1,9 @@
 using System;
-using System.Collections.Generic;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.IndexManagement.OpenCloseIndex.OpenIndex
 {
@@ -15,6 +12,21 @@ public class OpenIndexApiTests
 	{
 		public OpenIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<OpenIndexDescriptor, IOpenIndexRequest> Fluent => d => d
+			.IgnoreUnavailable();
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected override OpenIndexRequest Initializer => new OpenIndexRequest(CallIsolatedValue)
+		{
+			IgnoreUnavailable = true
+		};
+
+		protected override string UrlPath => $"/{CallIsolatedValue}/_open?ignore_unavailable=true";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var index in values.Values)
@@ -26,25 +38,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.OpenIndex(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.OpenIndexAsync(CallIsolatedValue, f),
-			request: (client, r) => client.OpenIndex(r),
-			requestAsync: (client, r) => client.OpenIndexAsync(r)
-			);
-
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_open?ignore_unavailable=true";
+			(client, f) => client.OpenIndex(CallIsolatedValue, f),
+			(client, f) => client.OpenIndexAsync(CallIsolatedValue, f),
+			(client, r) => client.OpenIndex(r),
+			(client, r) => client.OpenIndexAsync(r)
+		);
 
 		protected override OpenIndexDescriptor NewDescriptor() => new OpenIndexDescriptor(CallIsolatedValue);
-
-		protected override Func<OpenIndexDescriptor, IOpenIndexRequest> Fluent => d => d
-			.IgnoreUnavailable();
-
-		protected override OpenIndexRequest Initializer => new OpenIndexRequest(CallIsolatedValue)
-		{
-			IgnoreUnavailable = true
-		};
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexUrlTests.cs
index 3cc9b17039c..e058ab63627 100644
--- a/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexUrlTests.cs
@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
- using Elastic.Xunit.XunitPlumbing;
- using Nest;
- using Tests.Domain;
- using Tests.Framework;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
+using Nest;
+using Tests.Domain;
+using Tests.Framework;
 
 namespace Tests.Indices.IndexManagement.OpenCloseIndex.OpenIndex
 {
@@ -13,12 +13,11 @@ [U] public async Task Urls()
 			var indices = Nest.Indices.Index<Project>().And<Developer>();
 			var index = "project%2Cdevs";
 			await UrlTester.POST($"/{index}/_open")
-				.Fluent(c => c.OpenIndex(indices, s=>s))
-				.Request(c => c.OpenIndex(new OpenIndexRequest(indices)))
-				.FluentAsync(c => c.OpenIndexAsync(indices))
-				.RequestAsync(c => c.OpenIndexAsync(new OpenIndexRequest(indices)))
+					.Fluent(c => c.OpenIndex(indices, s => s))
+					.Request(c => c.OpenIndex(new OpenIndexRequest(indices)))
+					.FluentAsync(c => c.OpenIndexAsync(indices))
+					.RequestAsync(c => c.OpenIndexAsync(new OpenIndexRequest(indices)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexApiTests.cs
index 469267c7a22..43466977d55 100644
--- a/src/Tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexApiTests.cs
@@ -1,17 +1,13 @@
-using Elasticsearch.Net;
+using System;
+using System.Collections.Generic;
+using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Indices.IndexManagement.RolloverIndex
 {
@@ -21,35 +17,8 @@ public class RolloverIndexApiTests
 		public RolloverIndexApiTests(WritableCluster cluster, EndpointUsage usage)
 			: base(cluster, usage) { }
 
-		protected override bool SupportsDeserialization => false;
-
-		protected override void OnBeforeCall(IElasticClient client)
-		{
-			var create = client.CreateIndex(CallIsolatedValue, c => c
-				.Aliases(a => a
-					.Alias(CallIsolatedValue + "-alias")
-				)
-			);
-			create.ShouldBeValid();
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.RolloverIndex(CallIsolatedValue + "-alias", f),
-			fluentAsync: (client, f) => client.RolloverIndexAsync(CallIsolatedValue + "-alias", f),
-			request: (client, r) => client.RolloverIndex(r),
-			requestAsync: (client, r) => client.RolloverIndexAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 
-		protected override int ExpectStatusCode => 200;
-
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/{CallIsolatedValue}-alias/_rollover/{CallIsolatedValue}-new";
-
-		protected override RolloverIndexDescriptor NewDescriptor() => new RolloverIndexDescriptor(CallIsolatedValue + "-alias");
-
 		protected override object ExpectJson => new
 		{
 			conditions = new
@@ -85,10 +54,43 @@ protected override LazyResponses ClientUsage() => Calls(
 			},
 			aliases = new
 			{
-				new_projects = new {}
+				new_projects = new { }
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<RolloverIndexDescriptor, IRolloverIndexRequest> Fluent => f => f
+			.NewIndex(CallIsolatedValue + "-new")
+			.Conditions(c => c
+				.MaxAge("7d")
+				.MaxDocs(1000)
+			)
+			.Settings(s => s
+				.NumberOfShards(1)
+				.NumberOfReplicas(1)
+			)
+			.Mappings(m => m
+				.Map<Project>(p => p
+					.Properties(pp => pp
+						.Text(t => t
+							.Name(n => n.Branches)
+							.Fields(pf => pf
+								.Keyword(k => k
+									.Name("keyword")
+									.IgnoreAbove(256)
+								)
+							)
+						)
+					)
+				)
+			)
+			.Aliases(a => a
+				.Alias("new_projects")
+			);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override RolloverIndexRequest Initializer => new RolloverIndexRequest(CallIsolatedValue + "-alias", CallIsolatedValue + "-new")
 		{
 			Conditions = new RolloverConditions
@@ -103,7 +105,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			},
 			Mappings = new Mappings
 			{
-				{ typeof(Project), new TypeMapping
+				{
+					typeof(Project), new TypeMapping
 					{
 						Properties = new Properties<Project>
 						{
@@ -131,34 +134,28 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override Func<RolloverIndexDescriptor, IRolloverIndexRequest> Fluent => f => f
-			.NewIndex(CallIsolatedValue + "-new")
-			.Conditions(c => c
-				.MaxAge("7d")
-				.MaxDocs(1000)
-			)
-			.Settings(s => s
-				.NumberOfShards(1)
-				.NumberOfReplicas(1)
-			)
-			.Mappings(m => m
-				.Map<Project>(p => p
-					.Properties(pp => pp
-						.Text(t => t
-							.Name(n => n.Branches)
-							.Fields(pf => pf
-								.Keyword(k => k
-									.Name("keyword")
-									.IgnoreAbove(256)
-								)
-							)
-						)
-					)
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/{CallIsolatedValue}-alias/_rollover/{CallIsolatedValue}-new";
+
+		protected override void OnBeforeCall(IElasticClient client)
+		{
+			var create = client.CreateIndex(CallIsolatedValue, c => c
+				.Aliases(a => a
+					.Alias(CallIsolatedValue + "-alias")
 				)
-			)
-			.Aliases(a => a
-				.Alias("new_projects")
 			);
+			create.ShouldBeValid();
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.RolloverIndex(CallIsolatedValue + "-alias", f),
+			(client, f) => client.RolloverIndexAsync(CallIsolatedValue + "-alias", f),
+			(client, r) => client.RolloverIndex(r),
+			(client, r) => client.RolloverIndexAsync(r)
+		);
+
+		protected override RolloverIndexDescriptor NewDescriptor() => new RolloverIndexDescriptor(CallIsolatedValue + "-alias");
 
 		protected override void ExpectResponse(IRolloverIndexResponse response)
 		{
diff --git a/src/Tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexUrlTests.cs
index 149a870a721..ff94f17a47d 100644
--- a/src/Tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexUrlTests.cs
@@ -1,10 +1,6 @@
-using Nest;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
+using Nest;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
diff --git a/src/Tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexApiTests.cs
index 6e332b23b1c..915c1dd9c22 100644
--- a/src/Tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexApiTests.cs
@@ -7,43 +7,15 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.IndexManagement.ShrinkIndex
 {
-	public class ShrinkIndexApiTests : ApiIntegrationTestBase<WritableCluster, IShrinkIndexResponse, IShrinkIndexRequest, ShrinkIndexDescriptor, ShrinkIndexRequest>
+	public class ShrinkIndexApiTests
+		: ApiIntegrationTestBase<WritableCluster, IShrinkIndexResponse, IShrinkIndexRequest, ShrinkIndexDescriptor, ShrinkIndexRequest>
 	{
 		public ShrinkIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ShrinkIndex(CallIsolatedValue, CallIsolatedValue + "-target", f),
-			fluentAsync: (client, f) => client.ShrinkIndexAsync(CallIsolatedValue, CallIsolatedValue + "-target", f),
-			request: (client, r) => client.ShrinkIndex(r),
-			requestAsync: (client, r) => client.ShrinkIndexAsync(r)
-		);
-
-		protected override void OnBeforeCall(IElasticClient client)
-		{
-			var create = client.CreateIndex(CallIsolatedValue, c => c
-				.Settings(s => s
-					.NumberOfShards(8)
-					.NumberOfReplicas(0)
-				)
-			);
-			create.ShouldBeValid();
-			var update = client.UpdateIndexSettings(CallIsolatedValue, u => u
-				.IndexSettings(s => s
-					.BlocksWrite()
-				)
-			);
-			update.ShouldBeValid();
-		}
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_shrink/{CallIsolatedValue}-target";
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -53,13 +25,15 @@ protected override void OnBeforeCall(IElasticClient client)
 			}
 		};
 
-		protected override ShrinkIndexDescriptor NewDescriptor() => new ShrinkIndexDescriptor(CallIsolatedValue, CallIsolatedValue + "-target");
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<ShrinkIndexDescriptor, IShrinkIndexRequest> Fluent => d => d
 			.Settings(s => s
 				.NumberOfShards(4)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override ShrinkIndexRequest Initializer => new ShrinkIndexRequest(CallIsolatedValue, CallIsolatedValue + "-target")
 		{
 			Settings = new Nest.IndexSettings
@@ -68,6 +42,34 @@ protected override void OnBeforeCall(IElasticClient client)
 			}
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}/_shrink/{CallIsolatedValue}-target";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ShrinkIndex(CallIsolatedValue, CallIsolatedValue + "-target", f),
+			(client, f) => client.ShrinkIndexAsync(CallIsolatedValue, CallIsolatedValue + "-target", f),
+			(client, r) => client.ShrinkIndex(r),
+			(client, r) => client.ShrinkIndexAsync(r)
+		);
+
+		protected override void OnBeforeCall(IElasticClient client)
+		{
+			var create = client.CreateIndex(CallIsolatedValue, c => c
+				.Settings(s => s
+					.NumberOfShards(8)
+					.NumberOfReplicas(0)
+				)
+			);
+			create.ShouldBeValid();
+			var update = client.UpdateIndexSettings(CallIsolatedValue, u => u
+				.IndexSettings(s => s
+					.BlocksWrite()
+				)
+			);
+			update.ShouldBeValid();
+		}
+
+		protected override ShrinkIndexDescriptor NewDescriptor() => new ShrinkIndexDescriptor(CallIsolatedValue, CallIsolatedValue + "-target");
+
 		protected override void ExpectResponse(IShrinkIndexResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexUrlTests.cs
index f51ec2d01a2..0bb362f3988 100644
--- a/src/Tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var source = "source";
 			var target = "target";
 			await PUT($"/{source}/_shrink/{target}")
-				.Fluent(c => c.ShrinkIndex(source, target))
-				.Request(c => c.ShrinkIndex(new ShrinkIndexRequest(source, target)))
-				.FluentAsync(c => c.ShrinkIndexAsync(source, target))
-				.RequestAsync(c => c.ShrinkIndexAsync(new ShrinkIndexRequest(source, target)))
+					.Fluent(c => c.ShrinkIndex(source, target))
+					.Request(c => c.ShrinkIndex(new ShrinkIndexRequest(source, target)))
+					.FluentAsync(c => c.ShrinkIndexAsync(source, target))
+					.RequestAsync(c => c.ShrinkIndexAsync(new ShrinkIndexRequest(source, target)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexApiTests.cs
index 271f5dc984a..13b2a8ac03f 100644
--- a/src/Tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexApiTests.cs
@@ -8,45 +8,16 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.IndexManagement.SplitIndex
 {
 	[SkipVersion("<6.1.0", "split index api was added in 6.1.0")]
-	public class SplitIndexApiTests : ApiIntegrationTestBase<WritableCluster, ISplitIndexResponse, ISplitIndexRequest, SplitIndexDescriptor, SplitIndexRequest>
+	public class SplitIndexApiTests
+		: ApiIntegrationTestBase<WritableCluster, ISplitIndexResponse, ISplitIndexRequest, SplitIndexDescriptor, SplitIndexRequest>
 	{
 		public SplitIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.SplitIndex(CallIsolatedValue, CallIsolatedValue + "-target", f),
-			fluentAsync: (client, f) => client.SplitIndexAsync(CallIsolatedValue, CallIsolatedValue + "-target", f),
-			request: (client, r) => client.SplitIndex(r),
-			requestAsync: (client, r) => client.SplitIndexAsync(r)
-		);
-
-		protected override void OnBeforeCall(IElasticClient client)
-		{
-			var create = client.CreateIndex(CallIsolatedValue, c => c
-				.Settings(s => s
-					.NumberOfShards(4)
-					.NumberOfRoutingShards(8)
-					.NumberOfReplicas(0)
-				)
-			);
-			create.ShouldBeValid();
-			var update = client.UpdateIndexSettings(CallIsolatedValue, u => u
-				.IndexSettings(s => s
-					.BlocksWrite()
-				)
-			);
-			update.ShouldBeValid();
-		}
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_split/{CallIsolatedValue}-target";
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -56,13 +27,15 @@ protected override void OnBeforeCall(IElasticClient client)
 			}
 		};
 
-		protected override SplitIndexDescriptor NewDescriptor() => new SplitIndexDescriptor(CallIsolatedValue, CallIsolatedValue + "-target");
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<SplitIndexDescriptor, ISplitIndexRequest> Fluent => d => d
 			.Settings(s => s
 				.NumberOfShards(8)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override SplitIndexRequest Initializer => new SplitIndexRequest(CallIsolatedValue, CallIsolatedValue + "-target")
 		{
 			Settings = new Nest.IndexSettings
@@ -71,6 +44,35 @@ protected override void OnBeforeCall(IElasticClient client)
 			}
 		};
 
+		protected override string UrlPath => $"/{CallIsolatedValue}/_split/{CallIsolatedValue}-target";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.SplitIndex(CallIsolatedValue, CallIsolatedValue + "-target", f),
+			(client, f) => client.SplitIndexAsync(CallIsolatedValue, CallIsolatedValue + "-target", f),
+			(client, r) => client.SplitIndex(r),
+			(client, r) => client.SplitIndexAsync(r)
+		);
+
+		protected override void OnBeforeCall(IElasticClient client)
+		{
+			var create = client.CreateIndex(CallIsolatedValue, c => c
+				.Settings(s => s
+					.NumberOfShards(4)
+					.NumberOfRoutingShards(8)
+					.NumberOfReplicas(0)
+				)
+			);
+			create.ShouldBeValid();
+			var update = client.UpdateIndexSettings(CallIsolatedValue, u => u
+				.IndexSettings(s => s
+					.BlocksWrite()
+				)
+			);
+			update.ShouldBeValid();
+		}
+
+		protected override SplitIndexDescriptor NewDescriptor() => new SplitIndexDescriptor(CallIsolatedValue, CallIsolatedValue + "-target");
+
 		protected override void ExpectResponse(ISplitIndexResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexUrlTests.cs
index 7eb24c98e2d..f8e16ba28d7 100644
--- a/src/Tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var source = "source";
 			var target = "target";
 			await PUT($"/{source}/_split/{target}")
-				.Fluent(c => c.SplitIndex(source, target))
-				.Request(c => c.SplitIndex(new SplitIndexRequest(source, target)))
-				.FluentAsync(c => c.SplitIndexAsync(source, target))
-				.RequestAsync(c => c.SplitIndexAsync(new SplitIndexRequest(source, target)))
+					.Fluent(c => c.SplitIndex(source, target))
+					.Request(c => c.SplitIndex(new SplitIndexRequest(source, target)))
+					.FluentAsync(c => c.SplitIndexAsync(source, target))
+					.RequestAsync(c => c.SplitIndexAsync(new SplitIndexRequest(source, target)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsApiTests.cs b/src/Tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsApiTests.cs
index ad8da73e058..93cb75f9fe8 100644
--- a/src/Tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsApiTests.cs
@@ -5,8 +5,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.IndexManagement.TypesExists
@@ -15,26 +13,29 @@ public class TypeExistsApiTests
 		: ApiIntegrationTestBase<ReadOnlyCluster, IExistsResponse, ITypeExistsRequest, TypeExistsDescriptor, TypeExistsRequest>
 	{
 		public TypeExistsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.TypeExists(Index<Project>(), Type<Project>(), f),
-			fluentAsync: (client, f) => client.TypeExistsAsync(Index<Project>(), Type<Project>(), f),
-			request: (client, r) => client.TypeExists(r),
-			requestAsync: (client, r) => client.TypeExistsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/project/_mapping/doc?ignore_unavailable=true";
-
-		protected override TypeExistsDescriptor NewDescriptor() => new TypeExistsDescriptor(Index<Project>(), Type<Project>());
 
 		protected override Func<TypeExistsDescriptor, ITypeExistsRequest> Fluent => d => d
 			.IgnoreUnavailable();
 
+		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
+
 		protected override TypeExistsRequest Initializer => new TypeExistsRequest(Index<Project>(), Type<Project>())
 		{
 			IgnoreUnavailable = true
 		};
+
+		protected override string UrlPath => $"/project/_mapping/doc?ignore_unavailable=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.TypeExists(Index<Project>(), Type<Project>(), f),
+			(client, f) => client.TypeExistsAsync(Index<Project>(), Type<Project>(), f),
+			(client, r) => client.TypeExists(r),
+			(client, r) => client.TypeExistsAsync(r)
+		);
+
+		protected override TypeExistsDescriptor NewDescriptor() => new TypeExistsDescriptor(Index<Project>(), Type<Project>());
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsUrlTests.cs b/src/Tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsUrlTests.cs
index b13a5e2c08c..bdeb627d2ea 100644
--- a/src/Tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsUrlTests.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
- using Elastic.Xunit.XunitPlumbing;
- using Nest;
- using Tests.Domain;
- using Tests.Framework;
- using static Nest.Indices;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
+using Nest;
+using Tests.Domain;
+using Tests.Framework;
+using static Nest.Indices;
 using static Nest.Types;
 using static Tests.Framework.UrlTester;
 
@@ -18,12 +18,11 @@ [U] public async Task Urls()
 			var types = Type<Project>().And<Developer>();
 			var type = "doc%2Cdeveloper";
 			await HEAD($"/{index}/_mapping/{type}")
-				.Fluent(c => c.TypeExists(indices, types))
-				.Request(c => c.TypeExists(new TypeExistsRequest(indices, types)))
-				.FluentAsync(c => c.TypeExistsAsync(indices, types))
-				.RequestAsync(c => c.TypeExistsAsync(new TypeExistsRequest(indices, types)))
+					.Fluent(c => c.TypeExists(indices, types))
+					.Request(c => c.TypeExists(new TypeExistsRequest(indices, types)))
+					.FluentAsync(c => c.TypeExistsAsync(indices, types))
+					.RequestAsync(c => c.TypeExistsAsync(new TypeExistsRequest(indices, types)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs b/src/Tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs
index 2080aa24390..8e6210d8184 100644
--- a/src/Tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Linq;
-using System.Threading.Tasks;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -9,39 +7,43 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.IndexSettings.GetIndexSettings
 {
-	public class GetIndexSettingsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetIndexSettingsResponse, IGetIndexSettingsRequest, GetIndexSettingsDescriptor, GetIndexSettingsRequest>
+	public class GetIndexSettingsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetIndexSettingsResponse, IGetIndexSettingsRequest, GetIndexSettingsDescriptor,
+			GetIndexSettingsRequest>
 	{
 		private static readonly IndexName PercolationIndex = Index<ProjectPercolation>();
 
 		public GetIndexSettingsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetIndexSettings(f),
-			fluentAsync: (client, f) => client.GetIndexSettingsAsync(f),
-			request: (client, r) => client.GetIndexSettings(r),
-			requestAsync: (client, r) => client.GetIndexSettingsAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/queries/_settings/index.%2A?local=true";
 
 		protected override Func<GetIndexSettingsDescriptor, IGetIndexSettingsRequest> Fluent => d => d
 			.Index<ProjectPercolation>()
 			.Name("index.*")
 			.Local();
 
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
 		protected override GetIndexSettingsRequest Initializer => new GetIndexSettingsRequest(PercolationIndex, "index.*")
 		{
 			Local = true
 		};
 
+		protected override string UrlPath => $"/queries/_settings/index.%2A?local=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetIndexSettings(f),
+			(client, f) => client.GetIndexSettingsAsync(f),
+			(client, r) => client.GetIndexSettings(r),
+			(client, r) => client.GetIndexSettingsAsync(r)
+		);
+
 		protected override void ExpectResponse(IGetIndexSettingsResponse response)
 		{
 			response.Indices.Should().NotBeEmpty();
diff --git a/src/Tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsUrlTests.cs b/src/Tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsUrlTests.cs
index b01012aeb16..bf4b61d1f3f 100644
--- a/src/Tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsUrlTests.cs
@@ -16,30 +16,30 @@ [U] public async Task Urls()
 			var name = "name";
 			Name n = name;
 			await GET($"/index1%2Cindex2/_settings/{name}")
-				.Fluent(c => c.GetIndexSettings(m=>m.Index(index).Name(name)))
-				.Request(c => c.GetIndexSettings(new GetIndexSettingsRequest(index, name)))
-				.FluentAsync(c => c.GetIndexSettingsAsync(m=>m.Index(index).Name(name)))
-				.RequestAsync(c => c.GetIndexSettingsAsync(new GetIndexSettingsRequest(index, name)))
+					.Fluent(c => c.GetIndexSettings(m => m.Index(index).Name(name)))
+					.Request(c => c.GetIndexSettings(new GetIndexSettingsRequest(index, name)))
+					.FluentAsync(c => c.GetIndexSettingsAsync(m => m.Index(index).Name(name)))
+					.RequestAsync(c => c.GetIndexSettingsAsync(new GetIndexSettingsRequest(index, name)))
 				;
-			
+
 			await GET($"/index1%2Cindex2/_settings")
-				.Fluent(c => c.GetIndexSettings(m=>m.Index(index)))
-				.Request(c => c.GetIndexSettings(new GetIndexSettingsRequest(indices)))
-				.FluentAsync(c => c.GetIndexSettingsAsync(m=>m.Index(index)))
-				.RequestAsync(c => c.GetIndexSettingsAsync(new GetIndexSettingsRequest(indices)))
+					.Fluent(c => c.GetIndexSettings(m => m.Index(index)))
+					.Request(c => c.GetIndexSettings(new GetIndexSettingsRequest(indices)))
+					.FluentAsync(c => c.GetIndexSettingsAsync(m => m.Index(index)))
+					.RequestAsync(c => c.GetIndexSettingsAsync(new GetIndexSettingsRequest(indices)))
 				;
 
 			await GET($"/_settings/{name}")
-				.Fluent(c => c.GetIndexSettings(m=>m.Name(name)))
-				.Request(c => c.GetIndexSettings(new GetIndexSettingsRequest(n)))
-				.FluentAsync(c => c.GetIndexSettingsAsync(m=>m.Name(name)))
-				.RequestAsync(c => c.GetIndexSettingsAsync(new GetIndexSettingsRequest(n)))
+					.Fluent(c => c.GetIndexSettings(m => m.Name(name)))
+					.Request(c => c.GetIndexSettings(new GetIndexSettingsRequest(n)))
+					.FluentAsync(c => c.GetIndexSettingsAsync(m => m.Name(name)))
+					.RequestAsync(c => c.GetIndexSettingsAsync(new GetIndexSettingsRequest(n)))
 				;
 			await GET($"/_settings")
-				.Fluent(c => c.GetIndexSettings(m=>m.Index(AllIndices)))
-				.Request(c => c.GetIndexSettings(new GetIndexSettingsRequest(AllIndices)))
-				.FluentAsync(c => c.GetIndexSettingsAsync(m=>m.Index(AllIndices)))
-				.RequestAsync(c => c.GetIndexSettingsAsync(new GetIndexSettingsRequest(AllIndices)))
+					.Fluent(c => c.GetIndexSettings(m => m.Index(AllIndices)))
+					.Request(c => c.GetIndexSettings(new GetIndexSettingsRequest(AllIndices)))
+					.FluentAsync(c => c.GetIndexSettingsAsync(m => m.Index(AllIndices)))
+					.RequestAsync(c => c.GetIndexSettingsAsync(new GetIndexSettingsRequest(AllIndices)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateApiTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateApiTests.cs
index d1d4c0d8f4c..cbf689f2a47 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateApiTests.cs
@@ -3,25 +3,25 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.IndexSettings.IndexTemplates.DeleteIndexTemplate
 {
 	public class DeleteIndexTemplateApiTests
-		: ApiTestBase<WritableCluster, IDeleteIndexTemplateResponse, IDeleteIndexTemplateRequest, DeleteIndexTemplateDescriptor, DeleteIndexTemplateRequest>
+		: ApiTestBase<WritableCluster, IDeleteIndexTemplateResponse, IDeleteIndexTemplateRequest, DeleteIndexTemplateDescriptor,
+			DeleteIndexTemplateRequest>
 	{
 		public DeleteIndexTemplateApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteIndexTemplate(CallIsolatedValue),
-			fluentAsync: (client, f) => client.DeleteIndexTemplateAsync(CallIsolatedValue),
-			request: (client, r) => client.DeleteIndexTemplate(r),
-			requestAsync: (client, r) => client.DeleteIndexTemplateAsync(r)
-		);
 
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/_template/{CallIsolatedValue}";
 
 		protected override DeleteIndexTemplateRequest Initializer => new DeleteIndexTemplateRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_template/{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteIndexTemplate(CallIsolatedValue),
+			(client, f) => client.DeleteIndexTemplateAsync(CallIsolatedValue),
+			(client, r) => client.DeleteIndexTemplate(r),
+			(client, r) => client.DeleteIndexTemplateAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateUrlTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateUrlTests.cs
index fe08330f852..c254c819a64 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateUrlTests.cs
@@ -12,10 +12,10 @@ [U] public async Task Urls()
 		{
 			var name = "temp";
 			await DELETE($"/_template/{name}")
-				.Fluent(c => c.DeleteIndexTemplate(name))
-				.Request(c => c.DeleteIndexTemplate(new DeleteIndexTemplateRequest(name)))
-				.FluentAsync(c => c.DeleteIndexTemplateAsync(name))
-				.RequestAsync(c => c.DeleteIndexTemplateAsync(new DeleteIndexTemplateRequest(name)))
+					.Fluent(c => c.DeleteIndexTemplate(name))
+					.Request(c => c.DeleteIndexTemplate(new DeleteIndexTemplateRequest(name)))
+					.FluentAsync(c => c.DeleteIndexTemplateAsync(name))
+					.RequestAsync(c => c.DeleteIndexTemplateAsync(new DeleteIndexTemplateRequest(name)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateApiTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateApiTests.cs
index 5879b388d28..f4542b48803 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateApiTests.cs
@@ -7,35 +7,35 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.IndexSettings.IndexTemplates.GetIndexTemplate
 {
 	public class GetIndexTemplateApiTests
-		: ApiIntegrationTestBase<WritableCluster, IGetIndexTemplateResponse, IGetIndexTemplateRequest, GetIndexTemplateDescriptor, GetIndexTemplateRequest>
+		: ApiIntegrationTestBase<WritableCluster, IGetIndexTemplateResponse, IGetIndexTemplateRequest, GetIndexTemplateDescriptor,
+			GetIndexTemplateRequest>
 	{
 		public GetIndexTemplateApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetIndexTemplate(f),
-			fluentAsync: (client, f) => client.GetIndexTemplateAsync(f),
-			request: (client, r) => client.GetIndexTemplate(r),
-			requestAsync: (client, r) => client.GetIndexTemplateAsync(r)
-		);
 
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_template/{CallIsolatedValue}";
+		protected override bool ExpectIsValid => true;
 
-		protected override Func<GetIndexTemplateDescriptor, IGetIndexTemplateRequest> Fluent => d => d
-			.Name(CallIsolatedValue);
+		protected override object ExpectJson => null;
 
 		protected override int ExpectStatusCode => 200;
 
-		protected override bool ExpectIsValid => true;
+		protected override Func<GetIndexTemplateDescriptor, IGetIndexTemplateRequest> Fluent => d => d
+			.Name(CallIsolatedValue);
+
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override GetIndexTemplateRequest Initializer => new GetIndexTemplateRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_template/{CallIsolatedValue}";
 
-		protected override object ExpectJson => null;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetIndexTemplate(f),
+			(client, f) => client.GetIndexTemplateAsync(f),
+			(client, r) => client.GetIndexTemplate(r),
+			(client, r) => client.GetIndexTemplateAsync(r)
+		);
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
@@ -43,9 +43,9 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			{
 				var putTemplateResponse = client.PutIndexTemplate(callUniqueValue.Value, d =>
 					d.IndexPatterns("startingwiththis-*")
-				     .Settings(s => s.NumberOfShards(2))
-					 .Version(1)
-					);
+						.Settings(s => s.NumberOfShards(2))
+						.Version(1)
+				);
 
 				if (!putTemplateResponse.IsValid)
 					throw new Exception($"Problem putting index template for integration test: {putTemplateResponse.DebugInformation}");
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateUrlTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateUrlTests.cs
index 5129950452f..08e163181bd 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateUrlTests.cs
@@ -12,17 +12,17 @@ [U] public async Task Urls()
 		{
 			var name = "temp";
 			await GET($"/_template/{name}")
-				.Fluent(c => c.GetIndexTemplate(p=>p.Name(name)))
-				.Request(c => c.GetIndexTemplate(new GetIndexTemplateRequest(name)))
-				.FluentAsync(c => c.GetIndexTemplateAsync(p=>p.Name(name)))
-				.RequestAsync(c => c.GetIndexTemplateAsync(new GetIndexTemplateRequest(name)))
+					.Fluent(c => c.GetIndexTemplate(p => p.Name(name)))
+					.Request(c => c.GetIndexTemplate(new GetIndexTemplateRequest(name)))
+					.FluentAsync(c => c.GetIndexTemplateAsync(p => p.Name(name)))
+					.RequestAsync(c => c.GetIndexTemplateAsync(new GetIndexTemplateRequest(name)))
 				;
 
 			await GET($"/_template")
-				.Fluent(c => c.GetIndexTemplate())
-				.Request(c => c.GetIndexTemplate(new GetIndexTemplateRequest()))
-				.FluentAsync(c => c.GetIndexTemplateAsync())
-				.RequestAsync(c => c.GetIndexTemplateAsync(new GetIndexTemplateRequest()))
+					.Fluent(c => c.GetIndexTemplate())
+					.Request(c => c.GetIndexTemplate(new GetIndexTemplateRequest()))
+					.FluentAsync(c => c.GetIndexTemplateAsync())
+					.RequestAsync(c => c.GetIndexTemplateAsync(new GetIndexTemplateRequest()))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateCrudTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateCrudTests.cs
index 569102b50a6..cd60ef84d38 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateCrudTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateCrudTests.cs
@@ -6,33 +6,34 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.IndexSettings.IndexTemplates
 {
 	public class IndexTemplateCrudTests
-		: CrudTestBase<WritableCluster, IPutIndexTemplateResponse, IGetIndexTemplateResponse, IPutIndexTemplateResponse, IDeleteIndexTemplateResponse, IExistsResponse>
+		: CrudTestBase<WritableCluster, IPutIndexTemplateResponse, IGetIndexTemplateResponse, IPutIndexTemplateResponse, IDeleteIndexTemplateResponse,
+			IExistsResponse>
 	{
 		public IndexTemplateCrudTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses Exists() => Calls<IndexTemplateExistsDescriptor, IndexTemplateExistsRequest, IIndexTemplateExistsRequest, IExistsResponse>(
-			id => new IndexTemplateExistsRequest(id),
-			(id, d) => d,
-			fluent: (s, c, f) => c.IndexTemplateExists(s, f),
-			fluentAsync: (s, c, f) => c.IndexTemplateExistsAsync(s, f),
-			request: (s, c, r) => c.IndexTemplateExists(r),
-			requestAsync: (s, c, r) => c.IndexTemplateExistsAsync(r)
-		);
+		protected override LazyResponses Exists() =>
+			Calls<IndexTemplateExistsDescriptor, IndexTemplateExistsRequest, IIndexTemplateExistsRequest, IExistsResponse>(
+				id => new IndexTemplateExistsRequest(id),
+				(id, d) => d,
+				(s, c, f) => c.IndexTemplateExists(s, f),
+				(s, c, f) => c.IndexTemplateExistsAsync(s, f),
+				(s, c, r) => c.IndexTemplateExists(r),
+				(s, c, r) => c.IndexTemplateExistsAsync(r)
+			);
 
-		protected override LazyResponses Create() => Calls<PutIndexTemplateDescriptor, PutIndexTemplateRequest, IPutIndexTemplateRequest, IPutIndexTemplateResponse>(
-			CreateInitializer,
-			CreateFluent,
-			fluent: (s, c, f) => c.PutIndexTemplate(s, f),
-			fluentAsync: (s, c, f) => c.PutIndexTemplateAsync(s, f),
-			request: (s, c, r) => c.PutIndexTemplate(r),
-			requestAsync: (s, c, r) => c.PutIndexTemplateAsync(r)
-		);
+		protected override LazyResponses Create() =>
+			Calls<PutIndexTemplateDescriptor, PutIndexTemplateRequest, IPutIndexTemplateRequest, IPutIndexTemplateResponse>(
+				CreateInitializer,
+				CreateFluent,
+				(s, c, f) => c.PutIndexTemplate(s, f),
+				(s, c, f) => c.PutIndexTemplateAsync(s, f),
+				(s, c, r) => c.PutIndexTemplate(r),
+				(s, c, r) => c.PutIndexTemplateAsync(r)
+			);
 
 		private PutIndexTemplateRequest CreateInitializer(string name) => new PutIndexTemplateRequest(name)
 		{
@@ -49,14 +50,15 @@ private IPutIndexTemplateRequest CreateFluent(string name, PutIndexTemplateDescr
 				.NumberOfShards(2)
 			);
 
-		protected override LazyResponses Read() => Calls<GetIndexTemplateDescriptor, GetIndexTemplateRequest, IGetIndexTemplateRequest, IGetIndexTemplateResponse>(
-			name => new GetIndexTemplateRequest(name),
-			(name, d) => d.Name(name),
-			fluent: (s, c, f) => c.GetIndexTemplate(f),
-			fluentAsync: (s, c, f) => c.GetIndexTemplateAsync(f),
-			request: (s, c, r) => c.GetIndexTemplate(r),
-			requestAsync: (s, c, r) => c.GetIndexTemplateAsync(r)
-		);
+		protected override LazyResponses Read() =>
+			Calls<GetIndexTemplateDescriptor, GetIndexTemplateRequest, IGetIndexTemplateRequest, IGetIndexTemplateResponse>(
+				name => new GetIndexTemplateRequest(name),
+				(name, d) => d.Name(name),
+				(s, c, f) => c.GetIndexTemplate(f),
+				(s, c, f) => c.GetIndexTemplateAsync(f),
+				(s, c, r) => c.GetIndexTemplate(r),
+				(s, c, r) => c.GetIndexTemplateAsync(r)
+			);
 
 		protected override void ExpectAfterCreate(IGetIndexTemplateResponse response)
 		{
@@ -67,14 +69,15 @@ protected override void ExpectAfterCreate(IGetIndexTemplateResponse response)
 			templateMapping.Settings.NumberOfShards.Should().Be(2);
 		}
 
-		protected override LazyResponses Update() => Calls<PutIndexTemplateDescriptor, PutIndexTemplateRequest, IPutIndexTemplateRequest, IPutIndexTemplateResponse>(
-			PutInitializer,
-			PutFluent,
-			fluent: (s, c, f) => c.PutIndexTemplate(s, f),
-			fluentAsync: (s, c, f) => c.PutIndexTemplateAsync(s, f),
-			request: (s, c, r) => c.PutIndexTemplate(r),
-			requestAsync: (s, c, r) => c.PutIndexTemplateAsync(r)
-		);
+		protected override LazyResponses Update() =>
+			Calls<PutIndexTemplateDescriptor, PutIndexTemplateRequest, IPutIndexTemplateRequest, IPutIndexTemplateResponse>(
+				PutInitializer,
+				PutFluent,
+				(s, c, f) => c.PutIndexTemplate(s, f),
+				(s, c, f) => c.PutIndexTemplateAsync(s, f),
+				(s, c, r) => c.PutIndexTemplate(r),
+				(s, c, r) => c.PutIndexTemplateAsync(r)
+			);
 
 		private PutIndexTemplateRequest PutInitializer(string name) => new PutIndexTemplateRequest(name)
 		{
@@ -87,7 +90,7 @@ protected override LazyResponses Update() => Calls<PutIndexTemplateDescriptor, P
 
 		private IPutIndexTemplateRequest PutFluent(string name, PutIndexTemplateDescriptor d) => d
 			.IndexPatterns("startingwiththis-*")
-			.Settings(s=>s
+			.Settings(s => s
 				.NumberOfShards(1)
 			);
 
@@ -100,16 +103,17 @@ protected override void ExpectAfterUpdate(IGetIndexTemplateResponse response)
 			templateMapping.Settings.NumberOfShards.Should().Be(1);
 		}
 
-		protected override LazyResponses Delete() => Calls<DeleteIndexTemplateDescriptor, DeleteIndexTemplateRequest, IDeleteIndexTemplateRequest, IDeleteIndexTemplateResponse>(
-			name => new DeleteIndexTemplateRequest(name),
-			(name, d) => d,
-			fluent: (s, c, f) => c.DeleteIndexTemplate(s, f),
-			fluentAsync: (s, c, f) => c.DeleteIndexTemplateAsync(s, f),
-			request: (s, c, r) => c.DeleteIndexTemplate(r),
-			requestAsync: (s, c, r) => c.DeleteIndexTemplateAsync(r)
-		);
+		protected override LazyResponses Delete() =>
+			Calls<DeleteIndexTemplateDescriptor, DeleteIndexTemplateRequest, IDeleteIndexTemplateRequest, IDeleteIndexTemplateResponse>(
+				name => new DeleteIndexTemplateRequest(name),
+				(name, d) => d,
+				(s, c, f) => c.DeleteIndexTemplate(s, f),
+				(s, c, f) => c.DeleteIndexTemplateAsync(s, f),
+				(s, c, r) => c.DeleteIndexTemplate(r),
+				(s, c, r) => c.DeleteIndexTemplateAsync(r)
+			);
 
-		protected override async Task GetAfterDeleteIsValid() => await this.AssertOnGetAfterDelete(r => r.ShouldNotBeValid());
+		protected override async Task GetAfterDeleteIsValid() => await AssertOnGetAfterDelete(r => r.ShouldNotBeValid());
 
 		protected override void ExpectDeleteNotFoundResponse(IDeleteIndexTemplateResponse response)
 		{
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsApiTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsApiTests.cs
index 2866caf8f5f..1418b9b4e7d 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsApiTests.cs
@@ -4,8 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.IndexSettings.IndexTemplates.IndexTemplateExists
 {
@@ -13,20 +11,21 @@ public class IndexTemplateExistsApiTests
 		: ApiTestBase<WritableCluster, IExistsResponse, IIndexTemplateExistsRequest, IndexTemplateExistsDescriptor, IndexTemplateExistsRequest>
 	{
 		public IndexTemplateExistsApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.IndexTemplateExists(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.IndexTemplateExistsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.IndexTemplateExists(r),
-			requestAsync: (client, r) => client.IndexTemplateExistsAsync(r)
-		);
+
+		protected override Func<IndexTemplateExistsDescriptor, IIndexTemplateExistsRequest> Fluent => d => d;
 
 		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
-		protected override string UrlPath => $"/_template/{CallIsolatedValue}";
 
-		protected override IndexTemplateExistsDescriptor NewDescriptor()=> new IndexTemplateExistsDescriptor(CallIsolatedValue);
+		protected override IndexTemplateExistsRequest Initializer => new IndexTemplateExistsRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_template/{CallIsolatedValue}";
 
-		protected override Func<IndexTemplateExistsDescriptor, IIndexTemplateExistsRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.IndexTemplateExists(CallIsolatedValue, f),
+			(client, f) => client.IndexTemplateExistsAsync(CallIsolatedValue, f),
+			(client, r) => client.IndexTemplateExists(r),
+			(client, r) => client.IndexTemplateExistsAsync(r)
+		);
 
-		protected override IndexTemplateExistsRequest Initializer => new IndexTemplateExistsRequest(CallIsolatedValue);
+		protected override IndexTemplateExistsDescriptor NewDescriptor() => new IndexTemplateExistsDescriptor(CallIsolatedValue);
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsUrlTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsUrlTests.cs
index 74b5d70d62a..fcafaa931ee 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsUrlTests.cs
@@ -12,10 +12,10 @@ [U] public async Task Urls()
 		{
 			var name = "temp";
 			await HEAD($"/_template/{name}")
-				.Fluent(c => c.IndexTemplateExists(name))
-				.Request(c => c.IndexTemplateExists(new IndexTemplateExistsRequest(name)))
-				.FluentAsync(c => c.IndexTemplateExistsAsync(name))
-				.RequestAsync(c => c.IndexTemplateExistsAsync(new IndexTemplateExistsRequest(name)))
+					.Fluent(c => c.IndexTemplateExists(name))
+					.Request(c => c.IndexTemplateExists(new IndexTemplateExistsRequest(name)))
+					.FluentAsync(c => c.IndexTemplateExistsAsync(name))
+					.RequestAsync(c => c.IndexTemplateExistsAsync(new IndexTemplateExistsRequest(name)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateApiTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateApiTests.cs
index 5e7e9d5e177..561046adca6 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateApiTests.cs
@@ -7,35 +7,22 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Indices.IndexSettings.IndexTemplates.PutIndexTemplate
 {
 	public class PutIndexTemplateApiTests
-		: ApiIntegrationTestBase<WritableCluster, IPutIndexTemplateResponse, IPutIndexTemplateRequest, PutIndexTemplateDescriptor, PutIndexTemplateRequest>
+		: ApiIntegrationTestBase<WritableCluster, IPutIndexTemplateResponse, IPutIndexTemplateRequest, PutIndexTemplateDescriptor,
+			PutIndexTemplateRequest>
 	{
-		public PutIndexTemplateApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutIndexTemplate(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.PutIndexTemplateAsync(CallIsolatedValue, f),
-			request: (client, r) => client.PutIndexTemplate(r),
-			requestAsync: (client, r) => client.PutIndexTemplateAsync(r)
-			);
+		public PutIndexTemplateApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_template/{CallIsolatedValue}?create=false";
-		protected override bool SupportsDeserialization => false;
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
 
 		protected override object ExpectJson { get; } = new
 		{
 			order = 1,
 			version = 2,
-			index_patterns = new [] {"nestx-*" },
+			index_patterns = new[] { "nestx-*" },
 			settings = new Dictionary<string, object> { { "index.number_of_shards", 1 } },
 			mappings = new
 			{
@@ -60,14 +47,14 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override PutIndexTemplateDescriptor NewDescriptor() => new PutIndexTemplateDescriptor(CallIsolatedValue);
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<PutIndexTemplateDescriptor, IPutIndexTemplateRequest> Fluent => d => d
 			.Order(1)
 			.Version(2)
 			.IndexPatterns("nestx-*")
 			.Create(false)
-			.Settings(p=>p.NumberOfShards(1))
+			.Settings(p => p.NumberOfShards(1))
 			.Mappings(m => m
 				.Map("doc", tm => tm
 					.DynamicTemplates(t => t
@@ -84,6 +71,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
 
 		protected override PutIndexTemplateRequest Initializer => new PutIndexTemplateRequest(CallIsolatedValue)
@@ -98,11 +86,13 @@ protected override LazyResponses ClientUsage() => Calls(
 			},
 			Mappings = new Mappings
 			{
-				{ "doc", new TypeMapping
+				{
+					"doc", new TypeMapping
 					{
 						DynamicTemplates = new DynamicTemplateContainer
 						{
-							{ "base", new DynamicTemplate
+							{
+								"base", new DynamicTemplate
 								{
 									Match = "*",
 									MatchMappingType = "*",
@@ -118,6 +108,18 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_template/{CallIsolatedValue}?create=false";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutIndexTemplate(CallIsolatedValue, f),
+			(client, f) => client.PutIndexTemplateAsync(CallIsolatedValue, f),
+			(client, r) => client.PutIndexTemplate(r),
+			(client, r) => client.PutIndexTemplateAsync(r)
+		);
+
+		protected override PutIndexTemplateDescriptor NewDescriptor() => new PutIndexTemplateDescriptor(CallIsolatedValue);
+
 		protected override void ExpectResponse(IPutIndexTemplateResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateUrlTests.cs b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateUrlTests.cs
index 70b7d512957..b7f0531751d 100644
--- a/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateUrlTests.cs
@@ -12,10 +12,10 @@ [U] public async Task Urls()
 		{
 			var name = "temp";
 			await PUT($"/_template/{name}")
-				.Fluent(c => c.PutIndexTemplate(name, p=>p))
-				.Request(c => c.PutIndexTemplate(new PutIndexTemplateRequest(name)))
-				.FluentAsync(c => c.PutIndexTemplateAsync(name, p=>p))
-				.RequestAsync(c => c.PutIndexTemplateAsync(new PutIndexTemplateRequest(name)))
+					.Fluent(c => c.PutIndexTemplate(name, p => p))
+					.Request(c => c.PutIndexTemplate(new PutIndexTemplateRequest(name)))
+					.FluentAsync(c => c.PutIndexTemplateAsync(name, p => p))
+					.RequestAsync(c => c.PutIndexTemplateAsync(new PutIndexTemplateRequest(name)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsApiTests.cs b/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsApiTests.cs
index aba62050491..11de491de6a 100644
--- a/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsApiTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsApiTests.cs
@@ -5,37 +5,16 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Indices.IndexSettings.UpdateIndicesSettings
 {
-	public class UpdateIndexSettingsApiTests : ApiIntegrationTestBase<WritableCluster, IUpdateIndexSettingsResponse, IUpdateIndexSettingsRequest, UpdateIndexSettingsDescriptor, UpdateIndexSettingsRequest>
+	public class UpdateIndexSettingsApiTests
+		: ApiIntegrationTestBase<WritableCluster, IUpdateIndexSettingsResponse, IUpdateIndexSettingsRequest, UpdateIndexSettingsDescriptor,
+			UpdateIndexSettingsRequest>
 	{
 		public UpdateIndexSettingsApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var value in values)
-			{
-				var index = value.Value;
-				var createIndexResponse = client.CreateIndex(index);
-
-				if (!createIndexResponse.IsValid)
-					throw new Exception($"Invalid response when setting up index for integration test {this.GetType().Name}");
-			}
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.UpdateIndexSettings(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.UpdateIndexSettingsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.UpdateIndexSettings(r),
-			requestAsync: (client, r) => client.UpdateIndexSettingsAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"{CallIsolatedValue}/_settings";
 
 		protected override object ExpectJson { get; } = new Dictionary<string, object>
 		{
@@ -44,6 +23,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			{ "index.priority", 2 }
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> Fluent => d => d
 			.Index(CallIsolatedValue)
 			.IndexSettings(i => i
@@ -52,6 +33,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				.Priority(2)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override UpdateIndexSettingsRequest Initializer => new UpdateIndexSettingsRequest(CallIsolatedValue)
 		{
 			IndexSettings = new Nest.IndexSettings(new Dictionary<string, object>
@@ -64,11 +47,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				NumberOfReplicas = 2, //this should win from the value provided in the base dictionary
 			}
 		};
-	}
 
-	public class UpdateIndexSettingsRefreshIntervalNullApiTests : ApiIntegrationTestBase<WritableCluster, IUpdateIndexSettingsResponse, IUpdateIndexSettingsRequest, UpdateIndexSettingsDescriptor, UpdateIndexSettingsRequest>
-	{
-		public UpdateIndexSettingsRefreshIntervalNullApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected override string UrlPath => $"{CallIsolatedValue}/_settings";
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
@@ -78,33 +58,41 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				var createIndexResponse = client.CreateIndex(index);
 
 				if (!createIndexResponse.IsValid)
-					throw new Exception($"Invalid response when setting up index for integration test {this.GetType().Name}");
+					throw new Exception($"Invalid response when setting up index for integration test {GetType().Name}");
 			}
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.UpdateIndexSettings(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.UpdateIndexSettingsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.UpdateIndexSettings(r),
-			requestAsync: (client, r) => client.UpdateIndexSettingsAsync(r)
+			(client, f) => client.UpdateIndexSettings(CallIsolatedValue, f),
+			(client, f) => client.UpdateIndexSettingsAsync(CallIsolatedValue, f),
+			(client, r) => client.UpdateIndexSettings(r),
+			(client, r) => client.UpdateIndexSettingsAsync(r)
 		);
+	}
+
+	public class UpdateIndexSettingsRefreshIntervalNullApiTests
+		: ApiIntegrationTestBase<WritableCluster, IUpdateIndexSettingsResponse, IUpdateIndexSettingsRequest, UpdateIndexSettingsDescriptor,
+			UpdateIndexSettingsRequest>
+	{
+		public UpdateIndexSettingsRefreshIntervalNullApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"{CallIsolatedValue}/_settings";
 
 		protected override object ExpectJson { get; } = new Dictionary<string, object>
 		{
 			{ "index.refresh_interval", null },
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<UpdateIndexSettingsDescriptor, IUpdateIndexSettingsRequest> Fluent => d => d
 			.Index(CallIsolatedValue)
 			.IndexSettings(i => i
 				.RefreshInterval(null)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override UpdateIndexSettingsRequest Initializer => new UpdateIndexSettingsRequest(CallIsolatedValue)
 		{
 			IndexSettings = new Nest.IndexSettings
@@ -112,5 +100,26 @@ protected override LazyResponses ClientUsage() => Calls(
 				RefreshInterval = null
 			}
 		};
+
+		protected override string UrlPath => $"{CallIsolatedValue}/_settings";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var value in values)
+			{
+				var index = value.Value;
+				var createIndexResponse = client.CreateIndex(index);
+
+				if (!createIndexResponse.IsValid)
+					throw new Exception($"Invalid response when setting up index for integration test {GetType().Name}");
+			}
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.UpdateIndexSettings(CallIsolatedValue, f),
+			(client, f) => client.UpdateIndexSettingsAsync(CallIsolatedValue, f),
+			(client, r) => client.UpdateIndexSettings(r),
+			(client, r) => client.UpdateIndexSettingsAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs b/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs
index fbc7596b101..a5def308aea 100644
--- a/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs
+++ b/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs
@@ -14,16 +14,16 @@ [U] public async Task Urls()
 			var index = "index1,index2";
 			Nest.Indices indices = index;
 			await PUT($"/index1%2Cindex2/_settings")
-				.Fluent(c => c.UpdateIndexSettings(indices, s=>s))
-				.Request(c => c.UpdateIndexSettings(new UpdateIndexSettingsRequest(index)))
-				.FluentAsync(c => c.UpdateIndexSettingsAsync(indices, s=>s))
-				.RequestAsync(c => c.UpdateIndexSettingsAsync(new UpdateIndexSettingsRequest(index)))
+					.Fluent(c => c.UpdateIndexSettings(indices, s => s))
+					.Request(c => c.UpdateIndexSettings(new UpdateIndexSettingsRequest(index)))
+					.FluentAsync(c => c.UpdateIndexSettingsAsync(indices, s => s))
+					.RequestAsync(c => c.UpdateIndexSettingsAsync(new UpdateIndexSettingsRequest(index)))
 				;
 			await PUT($"/_settings")
-				.Fluent(c => c.UpdateIndexSettings(AllIndices, s=>s))
-				.Request(c => c.UpdateIndexSettings(new UpdateIndexSettingsRequest()))
-				.FluentAsync(c => c.UpdateIndexSettingsAsync(AllIndices, s=>s))
-				.RequestAsync(c => c.UpdateIndexSettingsAsync(new UpdateIndexSettingsRequest()))
+					.Fluent(c => c.UpdateIndexSettings(AllIndices, s => s))
+					.Request(c => c.UpdateIndexSettings(new UpdateIndexSettingsRequest()))
+					.FluentAsync(c => c.UpdateIndexSettingsAsync(AllIndices, s => s))
+					.RequestAsync(c => c.UpdateIndexSettingsAsync(new UpdateIndexSettingsRequest()))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingApiTests.cs b/src/Tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingApiTests.cs
index 8e5d5690f69..7bdd23d8103 100644
--- a/src/Tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingApiTests.cs
+++ b/src/Tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingApiTests.cs
@@ -6,33 +6,34 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Indices.MappingManagement.GetFieldMapping
 {
 	public class GetFieldMappingApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, IGetFieldMappingResponse, IGetFieldMappingRequest, GetFieldMappingDescriptor<Project>, GetFieldMappingRequest>
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetFieldMappingResponse, IGetFieldMappingRequest, GetFieldMappingDescriptor<Project>,
+			GetFieldMappingRequest>
 	{
 		private static readonly Fields Fields = Fields<Project>(p => p.Name, p => p.LeadDeveloper.IpAddress);
 		private static readonly Field NameField = Field<Project>(p => p.Name);
 
 		public GetFieldMappingApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetFieldMapping<Project>(Fields),
-			fluentAsync: (client, f) => client.GetFieldMappingAsync<Project>(Fields),
-			request: (client, r) => client.GetFieldMapping(r),
-			requestAsync: (client, r) => client.GetFieldMappingAsync(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
+		protected override GetFieldMappingRequest Initializer => new GetFieldMappingRequest(Fields);
 		protected override string UrlPath => $"/_mapping/field/name%2CleadDeveloper.ipAddress";
 
-		protected override GetFieldMappingDescriptor<Project> NewDescriptor() => new GetFieldMappingDescriptor<Project>(Fields);
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetFieldMapping<Project>(Fields),
+			(client, f) => client.GetFieldMappingAsync<Project>(Fields),
+			(client, r) => client.GetFieldMapping(r),
+			(client, r) => client.GetFieldMappingAsync(r)
+		);
 
-		protected override GetFieldMappingRequest Initializer => new GetFieldMappingRequest(Fields);
+		protected override GetFieldMappingDescriptor<Project> NewDescriptor() => new GetFieldMappingDescriptor<Project>(Fields);
 
 		protected override void ExpectResponse(IGetFieldMappingResponse response)
 		{
@@ -69,14 +70,14 @@ protected override void ExpectResponse(IGetFieldMappingResponse response)
 			fieldMapping = response.MappingFor<Project>(NameField);
 			AssertNameFieldMapping(fieldMapping);
 
-			fieldMapping = response.MappingFor<Project>(p=>p.Name);
+			fieldMapping = response.MappingFor<Project>(p => p.Name);
 			AssertNameFieldMapping(fieldMapping);
 		}
 
 		private static void AssertNameFieldMapping(IFieldMapping fieldMapping)
 		{
 			fieldMapping.Should().NotBeNull("expected to find name on field type mapping for project");
-			var nameKeyword = (fieldMapping as KeywordProperty);
+			var nameKeyword = fieldMapping as KeywordProperty;
 			nameKeyword.Should().NotBeNull("the field type is a keyword mapping");
 			nameKeyword.Store.Should().BeTrue("name is keyword field that has store enabled");
 			nameKeyword.Fields.Should().NotBeEmpty().And.HaveCount(2);
diff --git a/src/Tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingUrlTests.cs b/src/Tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingUrlTests.cs
index b556795791b..bb713b2132b 100644
--- a/src/Tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingUrlTests.cs
+++ b/src/Tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingUrlTests.cs
@@ -17,32 +17,32 @@ public async Task Urls()
 			Nest.Indices indices = index;
 			var fields = Field<Project>(p => p.Name).And("field");
 			await GET($"/_mapping/field/name%2Cfield")
-				.Fluent(c => c.GetFieldMapping<Project>(fields))
-				.Request(c => c.GetFieldMapping(new GetFieldMappingRequest(fields)))
-				.FluentAsync(c => c.GetFieldMappingAsync<Project>(fields))
-				.RequestAsync(c => c.GetFieldMappingAsync(new GetFieldMappingRequest(fields)))
+					.Fluent(c => c.GetFieldMapping<Project>(fields))
+					.Request(c => c.GetFieldMapping(new GetFieldMappingRequest(fields)))
+					.FluentAsync(c => c.GetFieldMappingAsync<Project>(fields))
+					.RequestAsync(c => c.GetFieldMappingAsync(new GetFieldMappingRequest(fields)))
 				;
 
 			await GET($"/index1%2Cindex2/_mapping/field/name%2Cfield")
-				.Fluent(c => c.GetFieldMapping<Project>(fields, g => g.Index(index)))
-				.Request(c => c.GetFieldMapping(new GetFieldMappingRequest(indices, fields)))
-				.FluentAsync(c => c.GetFieldMappingAsync<Project>(fields, g => g.Index(index)))
-				.RequestAsync(c => c.GetFieldMappingAsync(new GetFieldMappingRequest(indices, fields)))
+					.Fluent(c => c.GetFieldMapping<Project>(fields, g => g.Index(index)))
+					.Request(c => c.GetFieldMapping(new GetFieldMappingRequest(indices, fields)))
+					.FluentAsync(c => c.GetFieldMappingAsync<Project>(fields, g => g.Index(index)))
+					.RequestAsync(c => c.GetFieldMappingAsync(new GetFieldMappingRequest(indices, fields)))
 				;
 
 			var types = Type<Project>().And<Developer>();
 			await GET($"/_mapping/doc%2Cdeveloper/field/name%2Cfield")
-				.Fluent(c => c.GetFieldMapping<Project>(fields, g => g.Type(types)))
-				.Request(c => c.GetFieldMapping(new GetFieldMappingRequest(types, fields)))
-				.FluentAsync(c => c.GetFieldMappingAsync<Project>(fields, g => g.Type(types)))
-				.RequestAsync(c => c.GetFieldMappingAsync(new GetFieldMappingRequest(types, fields)))
+					.Fluent(c => c.GetFieldMapping<Project>(fields, g => g.Type(types)))
+					.Request(c => c.GetFieldMapping(new GetFieldMappingRequest(types, fields)))
+					.FluentAsync(c => c.GetFieldMappingAsync<Project>(fields, g => g.Type(types)))
+					.RequestAsync(c => c.GetFieldMappingAsync(new GetFieldMappingRequest(types, fields)))
 				;
 
 			await GET($"/index1%2Cindex2/_mapping/doc%2Cdeveloper/field/name%2Cfield")
-				.Fluent(c => c.GetFieldMapping<Project>(fields, g => g.Index(indices).Type(types)))
-				.Request(c => c.GetFieldMapping(new GetFieldMappingRequest(indices, types, fields)))
-				.FluentAsync(c => c.GetFieldMappingAsync<Project>(fields, g => g.Index(indices).Type(types)))
-				.RequestAsync(c => c.GetFieldMappingAsync(new GetFieldMappingRequest(indices, types, fields)))
+					.Fluent(c => c.GetFieldMapping<Project>(fields, g => g.Index(indices).Type(types)))
+					.Request(c => c.GetFieldMapping(new GetFieldMappingRequest(indices, types, fields)))
+					.FluentAsync(c => c.GetFieldMappingAsync<Project>(fields, g => g.Index(indices).Type(types)))
+					.RequestAsync(c => c.GetFieldMappingAsync(new GetFieldMappingRequest(indices, types, fields)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs b/src/Tests/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
index 21981a8b70f..9125b989d0d 100644
--- a/src/Tests/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
+++ b/src/Tests/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
@@ -11,37 +11,38 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.MappingManagement.GetMapping
 {
-	public class GetMappingApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetMappingResponse, IGetMappingRequest, GetMappingDescriptor<Project>,
-		GetMappingRequest>
+	public class GetMappingApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetMappingResponse, IGetMappingRequest, GetMappingDescriptor<Project>,
+			GetMappingRequest>
 	{
 		public GetMappingApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => this.Calls(
-			fluent: (client, f) => client.GetMapping<Project>(f),
-			fluentAsync: (client, f) => client.GetMappingAsync<Project>(f),
-			request: (client, r) => client.GetMapping(r),
-			requestAsync: (client, r) => client.GetMappingAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/project/_mapping/doc?ignore_unavailable=true";
 
 		protected override Func<GetMappingDescriptor<Project>, IGetMappingRequest> Fluent => d => d
 			.IgnoreUnavailable();
 
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
 		protected override GetMappingRequest Initializer => new GetMappingRequest(Index<Project>(), Type<Project>())
 		{
 			IgnoreUnavailable = true
 		};
 
+		protected override string UrlPath => "/project/_mapping/doc?ignore_unavailable=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetMapping<Project>(f),
+			(client, f) => client.GetMappingAsync<Project>(f),
+			(client, r) => client.GetMapping(r),
+			(client, r) => client.GetMappingAsync(r)
+		);
+
 		protected override void ExpectResponse(IGetMappingResponse response)
 		{
 			response.ShouldBeValid();
@@ -77,10 +78,8 @@ private static void AssertExtensionMethods(IGetMappingResponse response)
 			response.GetMappingFor("dev", "dev").Should().BeNull();
 			response.GetMappingFor(typeof(Project), "x").Should().BeNull();
 			response.GetMappingFor("dev").Should().BeNull();
-
-
-
 		}
+
 		//hide
 		private static void AssertVisitedProperies(IGetMappingResponse response)
 		{
@@ -107,30 +106,32 @@ private static void AssertVisitedProperies(IGetMappingResponse response)
 		}
 	}
 
-	public class GetMappingNonExistentIndexApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetMappingResponse, IGetMappingRequest,
-		GetMappingDescriptor<Project>, GetMappingRequest>
+	public class GetMappingNonExistentIndexApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGetMappingResponse, IGetMappingRequest,
+			GetMappingDescriptor<Project>, GetMappingRequest>
 	{
-		private string _nonExistentIndex = "non-existent-index";
+		private readonly string _nonExistentIndex = "non-existent-index";
 
 		public GetMappingNonExistentIndexApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => this.Calls(
-			fluent: (client, f) => client.GetMapping<Project>(f),
-			fluentAsync: (client, f) => client.GetMappingAsync<Project>(f),
-			request: (client, r) => client.GetMapping(r),
-			requestAsync: (client, r) => client.GetMappingAsync(r)
-		);
-
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 404;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/{_nonExistentIndex}/_mapping";
 
 		protected override Func<GetMappingDescriptor<Project>, IGetMappingRequest> Fluent => d => d
 			.Index(_nonExistentIndex)
 			.AllTypes();
 
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
 		protected override GetMappingRequest Initializer => new GetMappingRequest(_nonExistentIndex, AllTypes);
+		protected override string UrlPath => $"/{_nonExistentIndex}/_mapping";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetMapping<Project>(f),
+			(client, f) => client.GetMappingAsync<Project>(f),
+			(client, r) => client.GetMapping(r),
+			(client, r) => client.GetMappingAsync(r)
+		);
 
 		protected override void ExpectResponse(IGetMappingResponse response)
 		{
@@ -141,75 +142,72 @@ protected override void ExpectResponse(IGetMappingResponse response)
 
 	internal class TestVisitor : IMappingVisitor
 	{
-		public TestVisitor() => this.Counts = new Dictionary<string, int>();
-
-		public int Depth { get; set; }
+		public TestVisitor() => Counts = new Dictionary<string, int>();
 
 		public Dictionary<string, int> Counts { get; }
 
-		private void Increment(string key)
-		{
-			if (!this.Counts.ContainsKey(key))
-			{
-				this.Counts.Add(key, 0);
-			}
+		public int Depth { get; set; }
 
-			this.Counts[key] += 1;
-		}
+		public void Visit(IDateProperty mapping) => Increment("date");
 
-		public void CountsShouldContainKeyAndCountBe(string key, int count)
-		{
-			this.Counts.ContainsKey(key).Should().BeTrue($"did not see {key}");
-			var sb = new StringBuilder()
-				.AppendLine($"because there should be {count} {key} properties");
-			var because = this.Counts.Aggregate(sb, (s, kv) => s.AppendLine($"{kv.Key} = {kv.Value}"), s=>s.ToString());
-			this.Counts[key].Should().Be(count, because);
-		}
+		public void Visit(IBinaryProperty mapping) => Increment("binary");
 
-		public void Visit(IDateProperty mapping) => this.Increment("date");
+		public void Visit(INestedProperty mapping) => Increment("nested");
 
-		public void Visit(IBinaryProperty mapping) => this.Increment("binary");
+		public void Visit(IGeoPointProperty mapping) => Increment("geo_point");
 
-		public void Visit(INestedProperty mapping) => this.Increment("nested");
+		public void Visit(ICompletionProperty mapping) => Increment("completion");
 
-		public void Visit(IGeoPointProperty mapping) => this.Increment("geo_point");
+		public void Visit(ITokenCountProperty mapping) => Increment("token_count");
 
-		public void Visit(ICompletionProperty mapping) => this.Increment("completion");
+		public void Visit(IPercolatorProperty property) => Increment("percolator");
 
-		public void Visit(ITokenCountProperty mapping) => this.Increment("token_count");
+		public void Visit(IIntegerRangeProperty property) => Increment("integer_range");
 
-		public void Visit(IPercolatorProperty property) => this.Increment("percolator");
+		public void Visit(IFloatRangeProperty property) => Increment("float_range");
 
-		public void Visit(IIntegerRangeProperty property) => this.Increment("integer_range");
+		public void Visit(ILongRangeProperty property) => Increment("long_range");
 
-		public void Visit(IFloatRangeProperty property) => this.Increment("float_range");
+		public void Visit(IDoubleRangeProperty property) => Increment("double_range");
 
-		public void Visit(ILongRangeProperty property) => this.Increment("long_range");
+		public void Visit(IDateRangeProperty property) => Increment("date_range");
 
-		public void Visit(IDoubleRangeProperty property) => this.Increment("double_range");
+		public void Visit(IIpRangeProperty property) => Increment("ip_range");
 
-		public void Visit(IDateRangeProperty property) => this.Increment("date_range");
+		public void Visit(IJoinProperty property) => Increment("join");
 
-		public void Visit(IIpRangeProperty property) => this.Increment("ip_range");
+		public void Visit(IMurmur3HashProperty mapping) => Increment("murmur3");
 
-		public void Visit(IJoinProperty property) => this.Increment("join");
+		public void Visit(INumberProperty mapping) => Increment("number");
 
-		public void Visit(IMurmur3HashProperty mapping) => this.Increment("murmur3");
+		public void Visit(IGeoShapeProperty mapping) => Increment("geo_shape");
 
-		public void Visit(INumberProperty mapping) => this.Increment("number");
+		public void Visit(IIpProperty mapping) => Increment("ip");
 
-		public void Visit(IGeoShapeProperty mapping) => this.Increment("geo_shape");
+		public void Visit(IObjectProperty mapping) => Increment("object");
 
-		public void Visit(IIpProperty mapping) => this.Increment("ip");
+		public void Visit(IBooleanProperty mapping) => Increment("boolean");
 
-		public void Visit(IObjectProperty mapping) => this.Increment("object");
+		public void Visit(ITextProperty mapping) => Increment("text");
 
-		public void Visit(IBooleanProperty mapping) => this.Increment("boolean");
+		public void Visit(IKeywordProperty mapping) => Increment("keyword");
 
-		public void Visit(ITextProperty mapping) => this.Increment("text");
+		public void Visit(ITypeMapping mapping) => Increment("type");
 
-		public void Visit(IKeywordProperty mapping) => this.Increment("keyword");
+		private void Increment(string key)
+		{
+			if (!Counts.ContainsKey(key)) Counts.Add(key, 0);
+
+			Counts[key] += 1;
+		}
 
-		public void Visit(ITypeMapping mapping) => this.Increment("type");
+		public void CountsShouldContainKeyAndCountBe(string key, int count)
+		{
+			Counts.ContainsKey(key).Should().BeTrue($"did not see {key}");
+			var sb = new StringBuilder()
+				.AppendLine($"because there should be {count} {key} properties");
+			var because = Counts.Aggregate(sb, (s, kv) => s.AppendLine($"{kv.Key} = {kv.Value}"), s => s.ToString());
+			Counts[key].Should().Be(count, because);
+		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/MappingManagement/GetMapping/GetMappingUrlTests.cs b/src/Tests/Tests/Indices/MappingManagement/GetMapping/GetMappingUrlTests.cs
index 0920ca9e125..b1903a0fc87 100644
--- a/src/Tests/Tests/Indices/MappingManagement/GetMapping/GetMappingUrlTests.cs
+++ b/src/Tests/Tests/Indices/MappingManagement/GetMapping/GetMappingUrlTests.cs
@@ -15,12 +15,11 @@ [U] public async Task Urls()
 			var index = "index1,index2";
 			var types = Type<Project>().And<Developer>();
 			await GET($"/index1%2Cindex2/_mapping/doc%2Cdeveloper")
-				.Fluent(c => c.GetMapping<Project>(m=>m.Index(index).Type(types)))
-				.Request(c => c.GetMapping(new GetMappingRequest(index, types)))
-				.FluentAsync(c => c.GetMappingAsync<Project>(m=>m.Index(index).Type(types)))
-				.RequestAsync(c => c.GetMappingAsync(new GetMappingRequest(index, types)))
+					.Fluent(c => c.GetMapping<Project>(m => m.Index(index).Type(types)))
+					.Request(c => c.GetMapping(new GetMappingRequest(index, types)))
+					.FluentAsync(c => c.GetMappingAsync<Project>(m => m.Index(index).Type(types)))
+					.RequestAsync(c => c.GetMappingAsync(new GetMappingRequest(index, types)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs b/src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs
index 436ad523abf..59cd01568a2 100644
--- a/src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs
+++ b/src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs
@@ -2,13 +2,10 @@
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using Nest;
-using Tests.ClientConcepts.HighLevel.Inference;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.MappingManagement.PutMapping
@@ -18,21 +15,9 @@ public class PutMappingApiTests
 		: ApiIntegrationAgainstNewIndexTestBase
 			<WritableCluster, IPutMappingResponse, IPutMappingRequest, PutMappingDescriptor<Project>, PutMappingRequest<Project>>
 	{
-		public PutMappingApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Map(f),
-			fluentAsync: (client, f) => client.MapAsync(f),
-			request: (client, r) => client.Map(r),
-			requestAsync: (client, r) => client.MapAsync(r)
-		);
+		public PutMappingApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_mapping";
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -101,8 +86,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				},
 				numberOfCommits = new { type = "integer" },
 				numberOfContributors = new { type = "integer" },
-				sourceOnly = new {properties = new { }, type = "object"},
-				startedOn = new {type = "date"},
+				sourceOnly = new { properties = new { }, type = "object" },
+				startedOn = new { type = "date" },
 				state = new { type = "keyword" },
 				visibility = new { type = "keyword" },
 				suggest = new { type = "completion" },
@@ -135,6 +120,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 
 		protected override Func<PutMappingDescriptor<Project>, IPutMappingRequest> Fluent => d => d
 			.Index(CallIsolatedValue)
@@ -188,6 +175,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override PutMappingRequest<Project> Initializer => new PutMappingRequest<Project>(CallIsolatedValue, Type<Project>())
 		{
 			Properties = new Properties<Project>
@@ -197,7 +186,7 @@ protected override LazyResponses ClientUsage() => Calls(
 					{
 						Relations = new Relations
 						{
-							{typeof(Project), typeof(CommitActivity)}
+							{ typeof(Project), typeof(CommitActivity) }
 						}
 					}
 				},
@@ -220,29 +209,29 @@ protected override LazyResponses ClientUsage() => Calls(
 					{
 						Properties = new Properties<Tag>
 						{
-							{p => p.Added, new DateProperty()},
-							{p => p.Name, new TextProperty()},
+							{ p => p.Added, new DateProperty() },
+							{ p => p.Name, new TextProperty() },
 						}
 					}
 				},
-				{p => p.Description, new TextProperty()},
-				{p => p.DateString, new TextProperty { }},
-				{p => p.Type, new TextProperty { }},
-				{p => p.LastActivity, new DateProperty()},
+				{ p => p.Description, new TextProperty() },
+				{ p => p.DateString, new TextProperty { } },
+				{ p => p.Type, new TextProperty { } },
+				{ p => p.LastActivity, new DateProperty() },
 				{
 					p => p.LeadDeveloper, new ObjectProperty
 					{
 						Properties = new Properties<Developer>
 						{
-							{p => p.FirstName, new TextProperty()},
-							{p => p.Gender, new KeywordProperty()},
-							{p => p.Id, new NumberProperty(NumberType.Long)},
-							{p => p.IpAddress, new TextProperty()},
-							{p => p.JobTitle, new TextProperty()},
-							{p => p.LastName, new TextProperty()},
-							{p => p.Location, new GeoPointProperty()},
-							{p => p.OnlineHandle, new TextProperty()},
-							{p => p.GeoIp, new ObjectProperty()},
+							{ p => p.FirstName, new TextProperty() },
+							{ p => p.Gender, new KeywordProperty() },
+							{ p => p.Id, new NumberProperty(NumberType.Long) },
+							{ p => p.IpAddress, new TextProperty() },
+							{ p => p.JobTitle, new TextProperty() },
+							{ p => p.LastName, new TextProperty() },
+							{ p => p.Location, new GeoPointProperty() },
+							{ p => p.OnlineHandle, new TextProperty() },
+							{ p => p.GeoIp, new ObjectProperty() },
 						}
 					}
 				},
@@ -251,51 +240,60 @@ protected override LazyResponses ClientUsage() => Calls(
 					{
 						Properties = new Properties<SimpleGeoPoint>
 						{
-							{p => p.Lat, new NumberProperty(NumberType.Double)},
-							{p => p.Lon, new NumberProperty(NumberType.Double)},
+							{ p => p.Lat, new NumberProperty(NumberType.Double) },
+							{ p => p.Lon, new NumberProperty(NumberType.Double) },
 						}
 					}
 				},
-				{p => p.Metadata, new ObjectProperty()},
-				{p => p.Name, new TextProperty {Index = false}},
-				{p => p.NumberOfCommits, new NumberProperty(NumberType.Integer)},
-				{p => p.NumberOfContributors, new NumberProperty(NumberType.Integer)},
+				{ p => p.Metadata, new ObjectProperty() },
+				{ p => p.Name, new TextProperty { Index = false } },
+				{ p => p.NumberOfCommits, new NumberProperty(NumberType.Integer) },
+				{ p => p.NumberOfContributors, new NumberProperty(NumberType.Integer) },
 				{
 					p => p.SourceOnly, new ObjectProperty()
 					{
 						Properties = new Properties()
 					}
 				},
-				{p => p.StartedOn, new DateProperty()},
-				{p => p.State, new KeywordProperty()},
-				{p => p.Visibility, new KeywordProperty()},
-				{p => p.Suggest, new CompletionProperty()},
+				{ p => p.StartedOn, new DateProperty() },
+				{ p => p.State, new KeywordProperty() },
+				{ p => p.Visibility, new KeywordProperty() },
+				{ p => p.Suggest, new CompletionProperty() },
 				{
 					p => p.Ranges, new ObjectProperty
 					{
 						Properties = new Properties<Ranges>
 						{
-							{p => p.Dates, new DateRangeProperty()},
-							{p => p.Doubles, new DoubleRangeProperty()},
-							{p => p.Floats, new FloatRangeProperty()},
-							{p => p.Integers, new IntegerRangeProperty()},
-							{p => p.Longs, new LongRangeProperty()},
-							{p => p.Ips, new IpRangeProperty()},
+							{ p => p.Dates, new DateRangeProperty() },
+							{ p => p.Doubles, new DoubleRangeProperty() },
+							{ p => p.Floats, new FloatRangeProperty() },
+							{ p => p.Integers, new IntegerRangeProperty() },
+							{ p => p.Longs, new LongRangeProperty() },
+							{ p => p.Ips, new IpRangeProperty() },
 						}
 					}
 				},
-				{p => p.RequiredBranches, new NumberProperty(NumberType.Integer)},
+				{ p => p.RequiredBranches, new NumberProperty(NumberType.Integer) },
 				{
 					p => p.Tags, new ObjectProperty
 					{
 						Properties = new Properties<Tag>
 						{
-							{p => p.Added, new DateProperty()},
-							{p => p.Name, new TextProperty()},
+							{ p => p.Added, new DateProperty() },
+							{ p => p.Name, new TextProperty() },
 						}
 					}
 				},
 			}
 		};
+
+		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_mapping";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Map(f),
+			(client, f) => client.MapAsync(f),
+			(client, r) => client.Map(r),
+			(client, r) => client.MapAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingUrlTests.cs b/src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingUrlTests.cs
index 92f1e12eb54..fdf42181d14 100644
--- a/src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingUrlTests.cs
+++ b/src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingUrlTests.cs
@@ -19,10 +19,9 @@ await PUT($"/project/doc/_mapping")
 				.RequestAsync(c => c.MapAsync(new PutMappingRequest<Project>()));
 
 			await PUT($"/project/project/_mapping")
-				.Request(c => c.Map(new PutMappingRequest("project", "project")))
-				.RequestAsync(c => c.MapAsync(new PutMappingRequest("project", "project")))
+					.Request(c => c.Map(new PutMappingRequest("project", "project")))
+					.RequestAsync(c => c.MapAsync(new PutMappingRequest("project", "project")))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusApiTests.cs
index 8161fe0abdf..2c330151fbf 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusApiTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusApiTests.cs
@@ -4,29 +4,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.Monitoring.IndicesRecovery
 {
-	public class RecoveryStatusApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IRecoveryStatusResponse, IRecoveryStatusRequest, RecoveryStatusDescriptor, RecoveryStatusRequest>
+	public class RecoveryStatusApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IRecoveryStatusResponse, IRecoveryStatusRequest, RecoveryStatusDescriptor, RecoveryStatusRequest>
 	{
 		public RecoveryStatusApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.RecoveryStatus(Infer.AllIndices, f),
-			fluentAsync: (client, f) => client.RecoveryStatusAsync(Infer.AllIndices, f),
-			request: (client, r) => client.RecoveryStatus(r),
-			requestAsync: (client, r) => client.RecoveryStatusAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_recovery";
 
 		protected override Func<RecoveryStatusDescriptor, IRecoveryStatusRequest> Fluent => d => d;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override RecoveryStatusRequest Initializer => new RecoveryStatusRequest(Infer.AllIndices);
+		protected override string UrlPath => "/_recovery";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.RecoveryStatus(Infer.AllIndices, f),
+			(client, f) => client.RecoveryStatusAsync(Infer.AllIndices, f),
+			(client, r) => client.RecoveryStatus(r),
+			(client, r) => client.RecoveryStatusAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusUrlTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusUrlTests.cs
index e3e8329e61a..144a4a2a7d4 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusUrlTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusUrlTests.cs
@@ -10,18 +10,18 @@ public class RecoveryStatusUrlTests
 		[U] public async Task Urls()
 		{
 			await UrlTester.GET($"/_recovery")
-				.Fluent(c => c.RecoveryStatus(Nest.Indices.All))
-				.Request(c => c.RecoveryStatus(new RecoveryStatusRequest()))
-				.FluentAsync(c => c.RecoveryStatusAsync(Nest.Indices.All))
-				.RequestAsync(c => c.RecoveryStatusAsync(new RecoveryStatusRequest()))
+					.Fluent(c => c.RecoveryStatus(Nest.Indices.All))
+					.Request(c => c.RecoveryStatus(new RecoveryStatusRequest()))
+					.FluentAsync(c => c.RecoveryStatusAsync(Nest.Indices.All))
+					.RequestAsync(c => c.RecoveryStatusAsync(new RecoveryStatusRequest()))
 				;
 
 			var index = "index1,index2";
 			await UrlTester.GET($"/index1%2Cindex2/_recovery")
-				.Fluent(c => c.RecoveryStatus(index))
-				.Request(c => c.RecoveryStatus(new RecoveryStatusRequest(index)))
-				.FluentAsync(c => c.RecoveryStatusAsync(index))
-				.RequestAsync(c => c.RecoveryStatusAsync(new RecoveryStatusRequest(index)))
+					.Fluent(c => c.RecoveryStatus(index))
+					.Request(c => c.RecoveryStatus(new RecoveryStatusRequest(index)))
+					.FluentAsync(c => c.RecoveryStatusAsync(index))
+					.RequestAsync(c => c.RecoveryStatusAsync(new RecoveryStatusRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsApiTests.cs
index bedd7003f22..f4cf419ff28 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsApiTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsApiTests.cs
@@ -8,8 +8,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Indices.Monitoring.IndicesSegments
 {
@@ -17,21 +15,21 @@ public class SegmentsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ISegment
 	{
 		public SegmentsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Segments(Infer.AllIndices, f),
-			fluentAsync: (client, f) => client.SegmentsAsync(Infer.AllIndices, f),
-			request: (client, r) => client.Segments(r),
-			requestAsync: (client, r) => client.SegmentsAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_segments";
 
 		protected override Func<SegmentsDescriptor, ISegmentsRequest> Fluent => d => d;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override SegmentsRequest Initializer => new SegmentsRequest(Infer.AllIndices);
+		protected override string UrlPath => "/_segments";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Segments(Infer.AllIndices, f),
+			(client, f) => client.SegmentsAsync(Infer.AllIndices, f),
+			(client, r) => client.Segments(r),
+			(client, r) => client.SegmentsAsync(r)
+		);
 
 		protected override void ExpectResponse(ISegmentsResponse response)
 		{
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsUrlTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsUrlTests.cs
index 022e601a9f9..064c447ee7c 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsUrlTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsUrlTests.cs
@@ -10,18 +10,18 @@ public class SegmentsUrlTests
 		[U] public async Task Urls()
 		{
 			await UrlTester.GET($"/_segments")
-				.Fluent(c => c.Segments(Nest.Indices.All))
-				.Request(c => c.Segments(new SegmentsRequest()))
-				.FluentAsync(c => c.SegmentsAsync(Nest.Indices.All))
-				.RequestAsync(c => c.SegmentsAsync(new SegmentsRequest()))
+					.Fluent(c => c.Segments(Nest.Indices.All))
+					.Request(c => c.Segments(new SegmentsRequest()))
+					.FluentAsync(c => c.SegmentsAsync(Nest.Indices.All))
+					.RequestAsync(c => c.SegmentsAsync(new SegmentsRequest()))
 				;
 
 			var index = "index1,index2";
 			await UrlTester.GET($"/index1%2Cindex2/_segments")
-				.Fluent(c => c.Segments(index))
-				.Request(c => c.Segments(new SegmentsRequest(index)))
-				.FluentAsync(c => c.SegmentsAsync(index))
-				.RequestAsync(c => c.SegmentsAsync(new SegmentsRequest(index)))
+					.Fluent(c => c.Segments(index))
+					.Request(c => c.Segments(new SegmentsRequest(index)))
+					.FluentAsync(c => c.SegmentsAsync(index))
+					.RequestAsync(c => c.SegmentsAsync(new SegmentsRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresApiTests.cs
index ff327917172..a9109d3e746 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresApiTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
@@ -10,16 +9,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.Monitoring.IndicesShardStores
 {
-	public class IndicesShardStoresApiTests : ApiIntegrationTestBase<WritableCluster, IIndicesShardStoresResponse, IIndicesShardStoresRequest, IndicesShardStoresDescriptor, IndicesShardStoresRequest>
+	public class IndicesShardStoresApiTests
+		: ApiIntegrationTestBase<WritableCluster, IIndicesShardStoresResponse, IIndicesShardStoresRequest, IndicesShardStoresDescriptor,
+			IndicesShardStoresRequest>
 	{
+		private static readonly string IndexWithUnassignedShards = "nest-" + RandomString();
+
 		public IndicesShardStoresApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		private static string IndexWithUnassignedShards = "nest-" + RandomString();
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<IndicesShardStoresDescriptor, IIndicesShardStoresRequest> Fluent => s =>
+			s.Index(IndexWithUnassignedShards)
+				.Status("all");
+
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
+		protected override IndicesShardStoresRequest Initializer =>
+			new IndicesShardStoresRequest(IndexWithUnassignedShards)
+			{
+				Status = new[] { "all" }
+			};
+
+		protected override string UrlPath => $"/{IndexWithUnassignedShards}/_shard_stores?status=all";
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
@@ -37,24 +53,11 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.IndicesShardStores(f),
-			fluentAsync: (client, f) => client.IndicesShardStoresAsync(f),
-			request: (client, r) => client.IndicesShardStores(r),
-			requestAsync: (client, r) => client.IndicesShardStoresAsync(r)
+			(client, f) => client.IndicesShardStores(f),
+			(client, f) => client.IndicesShardStoresAsync(f),
+			(client, r) => client.IndicesShardStores(r),
+			(client, r) => client.IndicesShardStoresAsync(r)
 		);
-		protected override IndicesShardStoresRequest Initializer =>
-			new IndicesShardStoresRequest(IndexWithUnassignedShards)
-			{
-				Status = new[] { "all" }
-			};
-		protected override Func<IndicesShardStoresDescriptor, IIndicesShardStoresRequest> Fluent => s =>
-			s.Index(IndexWithUnassignedShards)
-			.Status("all");
-
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/{IndexWithUnassignedShards}/_shard_stores?status=all";
 
 		[I] public Task AssertResponse() => AssertOnAllResponses(r =>
 		{
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresUrlTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresUrlTests.cs
index d447598a3b3..091fdf58f95 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresUrlTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresUrlTests.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
@@ -12,20 +11,19 @@ public class IndicesShardStoresUrlTests
 		[U] public async Task Urls()
 		{
 			await GET("/_shard_stores")
-				.Fluent(c => c.IndicesShardStores())
-				.Request(c => c.IndicesShardStores(new IndicesShardStoresRequest()))
-				.FluentAsync(c => c.IndicesShardStoresAsync())
-				.RequestAsync(c => c.IndicesShardStoresAsync(new IndicesShardStoresRequest()))
+					.Fluent(c => c.IndicesShardStores())
+					.Request(c => c.IndicesShardStores(new IndicesShardStoresRequest()))
+					.FluentAsync(c => c.IndicesShardStoresAsync())
+					.RequestAsync(c => c.IndicesShardStoresAsync(new IndicesShardStoresRequest()))
 				;
 
 			var index = "index1,index2";
 			await GET("/index1%2Cindex2/_shard_stores")
-				.Fluent(c => c.IndicesShardStores(s=>s.Index(index)))
-				.Request(c => c.IndicesShardStores(new IndicesShardStoresRequest(index)))
-				.FluentAsync(c => c.IndicesShardStoresAsync(s=>s.Index(index)))
-				.RequestAsync(c => c.IndicesShardStoresAsync(new IndicesShardStoresRequest(index)))
+					.Fluent(c => c.IndicesShardStores(s => s.Index(index)))
+					.Request(c => c.IndicesShardStores(new IndicesShardStoresRequest(index)))
+					.FluentAsync(c => c.IndicesShardStoresAsync(s => s.Index(index)))
+					.RequestAsync(c => c.IndicesShardStoresAsync(new IndicesShardStoresRequest(index)))
 				;
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsApiTests.cs
index ecbf39c036c..667c4221526 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsApiTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsApiTests.cs
@@ -4,29 +4,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Indices.Monitoring.IndicesStats
 {
-	public class IndicesStatsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IIndicesStatsResponse, IIndicesStatsRequest, IndicesStatsDescriptor, IndicesStatsRequest>
+	public class IndicesStatsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IIndicesStatsResponse, IIndicesStatsRequest, IndicesStatsDescriptor, IndicesStatsRequest>
 	{
 		public IndicesStatsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.IndicesStats(Infer.AllIndices, f),
-			fluentAsync: (client, f) => client.IndicesStatsAsync(Infer.AllIndices, f),
-			request: (client, r) => client.IndicesStats(r),
-			requestAsync: (client, r) => client.IndicesStatsAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_stats";
 
 		protected override Func<IndicesStatsDescriptor, IIndicesStatsRequest> Fluent => d => d;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override IndicesStatsRequest Initializer => new IndicesStatsRequest(Infer.AllIndices);
+		protected override string UrlPath => "/_stats";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.IndicesStats(Infer.AllIndices, f),
+			(client, f) => client.IndicesStatsAsync(Infer.AllIndices, f),
+			(client, r) => client.IndicesStats(r),
+			(client, r) => client.IndicesStatsAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsUrlTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsUrlTests.cs
index 9f1b5d79fac..b94a8af6229 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsUrlTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsUrlTests.cs
@@ -13,26 +13,26 @@ public class IndicesStatsUrlTests
 		[U] public async Task Urls()
 		{
 			await GET($"/_stats")
-				.Fluent(c => c.IndicesStats(Nest.Indices.All))
-				.Request(c => c.IndicesStats(new IndicesStatsRequest()))
-				.FluentAsync(c => c.IndicesStatsAsync(Nest.Indices.All))
-				.RequestAsync(c => c.IndicesStatsAsync(new IndicesStatsRequest()))
+					.Fluent(c => c.IndicesStats(Nest.Indices.All))
+					.Request(c => c.IndicesStats(new IndicesStatsRequest()))
+					.FluentAsync(c => c.IndicesStatsAsync(Nest.Indices.All))
+					.RequestAsync(c => c.IndicesStatsAsync(new IndicesStatsRequest()))
 				;
 
 			var index = "index1,index2";
 			await GET($"/index1%2Cindex2/_stats")
-				.Fluent(c => c.IndicesStats(index))
-				.Request(c => c.IndicesStats(new IndicesStatsRequest(index)))
-				.FluentAsync(c => c.IndicesStatsAsync(index))
-				.RequestAsync(c => c.IndicesStatsAsync(new IndicesStatsRequest(index)))
+					.Fluent(c => c.IndicesStats(index))
+					.Request(c => c.IndicesStats(new IndicesStatsRequest(index)))
+					.FluentAsync(c => c.IndicesStatsAsync(index))
+					.RequestAsync(c => c.IndicesStatsAsync(new IndicesStatsRequest(index)))
 				;
 
 			var metrics = IndicesStatsMetric.Completion | IndicesStatsMetric.Flush;
 			await GET($"/index1%2Cindex2/_stats/completion%2Cflush")
-				.Fluent(c => c.IndicesStats(index, i=>i.Metric(metrics)))
-				.Request(c => c.IndicesStats(new IndicesStatsRequest(index, metrics)))
-				.FluentAsync(c => c.IndicesStatsAsync(index, i => i.Metric(metrics)))
-				.RequestAsync(c => c.IndicesStatsAsync(new IndicesStatsRequest(index, metrics)))
+					.Fluent(c => c.IndicesStats(index, i => i.Metric(metrics)))
+					.Request(c => c.IndicesStats(new IndicesStatsRequest(index, metrics)))
+					.FluentAsync(c => c.IndicesStatsAsync(index, i => i.Metric(metrics)))
+					.RequestAsync(c => c.IndicesStatsAsync(new IndicesStatsRequest(index, metrics)))
 				;
 
 			metrics = IndicesStatsMetric.Completion | IndicesStatsMetric.Flush | IndicesStatsMetric.All;
@@ -41,10 +41,10 @@ await GET($"/index1%2Cindex2/_stats/completion%2Cflush")
 				Types = new TypeName[] { typeof(Project) }
 			};
 			await GET($"/index1%2Cindex2/_stats/_all?types=doc")
-				.Fluent(c => c.IndicesStats(index, i=>i.Metric(metrics).Types(typeof(Project))))
-				.Request(c => c.IndicesStats(request))
-				.FluentAsync(c => c.IndicesStatsAsync(index, i => i.Metric(metrics).Types(typeof(Project))))
-				.RequestAsync(c => c.IndicesStatsAsync(request))
+					.Fluent(c => c.IndicesStats(index, i => i.Metric(metrics).Types(typeof(Project))))
+					.Request(c => c.IndicesStats(request))
+					.FluentAsync(c => c.IndicesStatsAsync(index, i => i.Metric(metrics).Types(typeof(Project))))
+					.RequestAsync(c => c.IndicesStatsAsync(request))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsWithShardsInformationApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsWithShardsInformationApiTests.cs
index f953411a112..abcabe2916e 100644
--- a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsWithShardsInformationApiTests.cs
+++ b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsWithShardsInformationApiTests.cs
@@ -7,20 +7,31 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Indices.Monitoring.IndicesStats
 {
-	public class IndicesStatsWithShardsInformationApiTests : ApiIntegrationTestBase<WritableCluster, IIndicesStatsResponse,
-		IIndicesStatsRequest, IndicesStatsDescriptor, IndicesStatsRequest>
+	public class IndicesStatsWithShardsInformationApiTests
+		: ApiIntegrationTestBase<WritableCluster, IIndicesStatsResponse,
+			IIndicesStatsRequest, IndicesStatsDescriptor, IndicesStatsRequest>
 	{
-		public IndicesStatsWithShardsInformationApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage)
+		public IndicesStatsWithShardsInformationApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<IndicesStatsDescriptor, IIndicesStatsRequest> Fluent => d => d.Level(Level.Shards);
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
+		protected override IndicesStatsRequest Initializer => new IndicesStatsRequest(Infer.AllIndices)
 		{
-		}
+			Level = Level.Shards
+		};
+
+		protected override string UrlPath => "/_stats?level=shards";
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			var createShardedIndex = this.Client.CreateIndex(RandomString(), c => c
+			var createShardedIndex = Client.CreateIndex(RandomString(), c => c
 				.Settings(settings => settings
 					.NumberOfShards(3)
 				)
@@ -29,24 +40,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.IndicesStats(Infer.AllIndices, f),
-			fluentAsync: (client, f) => client.IndicesStatsAsync(Infer.AllIndices, f),
-			request: (client, r) => client.IndicesStats(r),
-			requestAsync: (client, r) => client.IndicesStatsAsync(r)
+			(client, f) => client.IndicesStats(Infer.AllIndices, f),
+			(client, f) => client.IndicesStatsAsync(Infer.AllIndices, f),
+			(client, r) => client.IndicesStats(r),
+			(client, r) => client.IndicesStatsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/_stats?level=shards";
-
-		protected override Func<IndicesStatsDescriptor, IIndicesStatsRequest> Fluent => d => d.Level(Level.Shards);
-
-		protected override IndicesStatsRequest Initializer => new IndicesStatsRequest(Infer.AllIndices)
-		{
-			Level = Level.Shards
-		};
-
 		protected override void ExpectResponse(IIndicesStatsResponse response)
 		{
 			var firstIndex = response.Indices.First().Value;
diff --git a/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs b/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs
index c944e5362ed..82054b5f79e 100644
--- a/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs
@@ -4,30 +4,29 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Indices.StatusManagement.ClearCache
 {
-	public class ClearCacheApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IClearCacheResponse, IClearCacheRequest, ClearCacheDescriptor, ClearCacheRequest>
+	public class ClearCacheApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IClearCacheResponse, IClearCacheRequest, ClearCacheDescriptor, ClearCacheRequest>
 	{
 		public ClearCacheApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClearCache(AllIndices, f),
-			fluentAsync: (client, f) => client.ClearCacheAsync(AllIndices, f),
-			request: (client, r) => client.ClearCache(r),
-			requestAsync: (client, r) => client.ClearCacheAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/_cache/clear?request=true";
 
 		protected override Func<ClearCacheDescriptor, IClearCacheRequest> Fluent => d => d.Request();
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override ClearCacheRequest Initializer => new ClearCacheRequest(AllIndices) { Request = true };
+		protected override string UrlPath => "/_cache/clear?request=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClearCache(AllIndices, f),
+			(client, f) => client.ClearCacheAsync(AllIndices, f),
+			(client, r) => client.ClearCache(r),
+			(client, r) => client.ClearCacheAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs
index 307b19626b5..171c8c104d5 100644
--- a/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs
@@ -11,18 +11,18 @@ public class ClearCacheUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_cache/clear")
-				.Fluent(c => c.ClearCache(Nest.Indices.All))
-				.Request(c => c.ClearCache(new ClearCacheRequest()))
-				.FluentAsync(c => c.ClearCacheAsync(Nest.Indices.All))
-				.RequestAsync(c => c.ClearCacheAsync(new ClearCacheRequest()))
+					.Fluent(c => c.ClearCache(Nest.Indices.All))
+					.Request(c => c.ClearCache(new ClearCacheRequest()))
+					.FluentAsync(c => c.ClearCacheAsync(Nest.Indices.All))
+					.RequestAsync(c => c.ClearCacheAsync(new ClearCacheRequest()))
 				;
 
 			var index = "index1,index2";
 			await POST($"/index1%2Cindex2/_cache/clear")
-				.Fluent(c => c.ClearCache(index))
-				.Request(c => c.ClearCache(new ClearCacheRequest(index)))
-				.FluentAsync(c => c.ClearCacheAsync(index))
-				.RequestAsync(c => c.ClearCacheAsync(new ClearCacheRequest(index)))
+					.Fluent(c => c.ClearCache(index))
+					.Request(c => c.ClearCache(new ClearCacheRequest(index)))
+					.FluentAsync(c => c.ClearCacheAsync(index))
+					.RequestAsync(c => c.ClearCacheAsync(new ClearCacheRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/StatusManagement/Flush/FlushApiTests.cs b/src/Tests/Tests/Indices/StatusManagement/Flush/FlushApiTests.cs
index 82e594d92d0..56eb31593df 100644
--- a/src/Tests/Tests/Indices/StatusManagement/Flush/FlushApiTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/Flush/FlushApiTests.cs
@@ -4,32 +4,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using static Nest.Infer;
 
 namespace Tests.Indices.StatusManagement.Flush
 {
 	public class FlushApiTests
 		: ApiIntegrationAgainstNewIndexTestBase<IntrusiveOperationCluster, IFlushResponse, IFlushRequest, FlushDescriptor, FlushRequest>
 	{
-
 		public FlushApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Flush(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.FlushAsync(CallIsolatedValue, f),
-			request: (client, r) => client.Flush(r),
-			requestAsync: (client, r) => client.FlushAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_flush?allow_no_indices=true";
 
 		protected override Func<FlushDescriptor, IFlushRequest> Fluent => d => d.AllowNoIndices();
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override FlushRequest Initializer => new FlushRequest(CallIsolatedValue) { AllowNoIndices = true };
+		protected override string UrlPath => $"/{CallIsolatedValue}/_flush?allow_no_indices=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Flush(CallIsolatedValue, f),
+			(client, f) => client.FlushAsync(CallIsolatedValue, f),
+			(client, r) => client.Flush(r),
+			(client, r) => client.FlushAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs
index b9e2d675220..97070a6e3fa 100644
--- a/src/Tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs
@@ -12,18 +12,18 @@ public class FlushUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_flush")
-				.Fluent(c => c.Flush(All))
-				.Request(c => c.Flush(new FlushRequest()))
-				.FluentAsync(c => c.FlushAsync(All))
-				.RequestAsync(c => c.FlushAsync(new FlushRequest()))
+					.Fluent(c => c.Flush(All))
+					.Request(c => c.Flush(new FlushRequest()))
+					.FluentAsync(c => c.FlushAsync(All))
+					.RequestAsync(c => c.FlushAsync(new FlushRequest()))
 				;
 
 			var index = "index1,index2";
 			await POST($"/index1%2Cindex2/_flush")
-				.Fluent(c => c.Flush(index))
-				.Request(c => c.Flush(new FlushRequest(index)))
-				.FluentAsync(c => c.FlushAsync(index))
-				.RequestAsync(c => c.FlushAsync(new FlushRequest(index)))
+					.Fluent(c => c.Flush(index))
+					.Request(c => c.Flush(new FlushRequest(index)))
+					.FluentAsync(c => c.FlushAsync(index))
+					.RequestAsync(c => c.FlushAsync(new FlushRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeApiTests.cs b/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeApiTests.cs
index 7ea685d4f91..9f18ca3e37e 100644
--- a/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeApiTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
@@ -8,32 +7,31 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using static Nest.Infer;
 
 namespace Tests.Indices.StatusManagement.ForceMerge
 {
 	[SkipVersion("<2.1.0", "")]
-	public class ForceMergeApiTests : ApiIntegrationAgainstNewIndexTestBase<IntrusiveOperationCluster, IForceMergeResponse, IForceMergeRequest, ForceMergeDescriptor, ForceMergeRequest>
+	public class ForceMergeApiTests
+		: ApiIntegrationAgainstNewIndexTestBase<IntrusiveOperationCluster, IForceMergeResponse, IForceMergeRequest, ForceMergeDescriptor,
+			ForceMergeRequest>
 	{
 		public ForceMergeApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ForceMerge(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.ForceMergeAsync(CallIsolatedValue, f),
-			request: (client, r) => client.ForceMerge(r),
-			requestAsync: (client, r) => client.ForceMergeAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_forcemerge?allow_no_indices=true";
 
 		protected override Func<ForceMergeDescriptor, IForceMergeRequest> Fluent => d => d.AllowNoIndices();
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override ForceMergeRequest Initializer => new ForceMergeRequest(CallIsolatedValue) { AllowNoIndices = true };
+		protected override string UrlPath => $"/{CallIsolatedValue}/_forcemerge?allow_no_indices=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ForceMerge(CallIsolatedValue, f),
+			(client, f) => client.ForceMergeAsync(CallIsolatedValue, f),
+			(client, r) => client.ForceMerge(r),
+			(client, r) => client.ForceMergeAsync(r)
+		);
 
 		[I] public Task AssertResponse() => AssertOnAllResponses(r =>
 		{
diff --git a/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs
index 35d16e3fc1b..54dbe18f8f2 100644
--- a/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs
@@ -12,18 +12,18 @@ public class ForceMergeUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_forcemerge")
-				.Fluent(c => c.ForceMerge(All))
-				.Request(c => c.ForceMerge(new ForceMergeRequest()))
-				.FluentAsync(c => c.ForceMergeAsync(All))
-				.RequestAsync(c => c.ForceMergeAsync(new ForceMergeRequest()))
+					.Fluent(c => c.ForceMerge(All))
+					.Request(c => c.ForceMerge(new ForceMergeRequest()))
+					.FluentAsync(c => c.ForceMergeAsync(All))
+					.RequestAsync(c => c.ForceMergeAsync(new ForceMergeRequest()))
 				;
 
 			var index = "index1,index2";
 			await POST($"/index1%2Cindex2/_forcemerge")
-				.Fluent(c => c.ForceMerge(index))
-				.Request(c => c.ForceMerge(new ForceMergeRequest(index)))
-				.FluentAsync(c => c.ForceMergeAsync(index))
-				.RequestAsync(c => c.ForceMergeAsync(new ForceMergeRequest(index)))
+					.Fluent(c => c.ForceMerge(index))
+					.Request(c => c.ForceMerge(new ForceMergeRequest(index)))
+					.FluentAsync(c => c.ForceMergeAsync(index))
+					.RequestAsync(c => c.ForceMergeAsync(new ForceMergeRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshApiTests.cs b/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshApiTests.cs
index daedd4bb0eb..1807ca0da46 100644
--- a/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshApiTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshApiTests.cs
@@ -4,9 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using static Nest.Infer;
 
 namespace Tests.Indices.StatusManagement.Refresh
 {
@@ -16,20 +13,20 @@ public class RefreshApiTests
 	{
 		public RefreshApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Refresh(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.RefreshAsync(CallIsolatedValue, f),
-			request: (client, r) => client.Refresh(r),
-			requestAsync: (client, r) => client.RefreshAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_refresh?allow_no_indices=true";
 
 		protected override Func<RefreshDescriptor, IRefreshRequest> Fluent => d => d.AllowNoIndices();
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override RefreshRequest Initializer => new RefreshRequest(CallIsolatedValue) { AllowNoIndices = true };
+		protected override string UrlPath => $"/{CallIsolatedValue}/_refresh?allow_no_indices=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Refresh(CallIsolatedValue, f),
+			(client, f) => client.RefreshAsync(CallIsolatedValue, f),
+			(client, r) => client.Refresh(r),
+			(client, r) => client.RefreshAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs
index 9094ce43859..92515e64d18 100644
--- a/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs
@@ -12,18 +12,18 @@ public class RefreshUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_refresh")
-				.Fluent(c => c.Refresh(All))
-				.Request(c => c.Refresh(new RefreshRequest()))
-				.FluentAsync(c => c.RefreshAsync(All))
-				.RequestAsync(c => c.RefreshAsync(new RefreshRequest()))
+					.Fluent(c => c.Refresh(All))
+					.Request(c => c.Refresh(new RefreshRequest()))
+					.FluentAsync(c => c.RefreshAsync(All))
+					.RequestAsync(c => c.RefreshAsync(new RefreshRequest()))
 				;
 
 			var index = "index1,index2";
 			await POST($"/index1%2Cindex2/_refresh")
-				.Fluent(c => c.Refresh(index))
-				.Request(c => c.Refresh(new RefreshRequest(index)))
-				.FluentAsync(c => c.RefreshAsync(index))
-				.RequestAsync(c => c.RefreshAsync(new RefreshRequest(index)))
+					.Fluent(c => c.Refresh(index))
+					.Request(c => c.Refresh(new RefreshRequest(index)))
+					.FluentAsync(c => c.RefreshAsync(index))
+					.RequestAsync(c => c.RefreshAsync(new RefreshRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFlushUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFlushUrlTests.cs
index 79586ac1e0f..3a4cb4db7dd 100644
--- a/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFlushUrlTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFlushUrlTests.cs
@@ -12,18 +12,18 @@ public class SyncedFlushUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_flush/synced")
-				.Fluent(c => c.SyncedFlush(All))
-				.Request(c => c.SyncedFlush(new SyncedFlushRequest()))
-				.FluentAsync(c => c.SyncedFlushAsync(All))
-				.RequestAsync(c => c.SyncedFlushAsync(new SyncedFlushRequest()))
+					.Fluent(c => c.SyncedFlush(All))
+					.Request(c => c.SyncedFlush(new SyncedFlushRequest()))
+					.FluentAsync(c => c.SyncedFlushAsync(All))
+					.RequestAsync(c => c.SyncedFlushAsync(new SyncedFlushRequest()))
 				;
 
 			var index = "index1,index2";
 			await POST($"/index1%2Cindex2/_flush/synced")
-				.Fluent(c => c.SyncedFlush(index))
-				.Request(c => c.SyncedFlush(new SyncedFlushRequest(index)))
-				.FluentAsync(c => c.SyncedFlushAsync(index))
-				.RequestAsync(c => c.SyncedFlushAsync(new SyncedFlushRequest(index)))
+					.Fluent(c => c.SyncedFlush(index))
+					.Request(c => c.SyncedFlush(new SyncedFlushRequest(index)))
+					.FluentAsync(c => c.SyncedFlushAsync(index))
+					.RequestAsync(c => c.SyncedFlushAsync(new SyncedFlushRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFushApiTests.cs b/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFushApiTests.cs
index 3531d48dc68..7c247791343 100644
--- a/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFushApiTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFushApiTests.cs
@@ -4,9 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using static Nest.Infer;
 
 namespace Tests.Indices.StatusManagement.SyncedFlush
 {
@@ -16,20 +13,20 @@ public class SyncedFlushApiTests
 	{
 		public SyncedFlushApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.SyncedFlush(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.SyncedFlushAsync(CallIsolatedValue, f),
-			request: (client, r) => client.SyncedFlush(r),
-			requestAsync: (client, r) => client.SyncedFlushAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_flush/synced?allow_no_indices=true";
 
 		protected override Func<SyncedFlushDescriptor, ISyncedFlushRequest> Fluent => d => d.AllowNoIndices();
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override SyncedFlushRequest Initializer => new SyncedFlushRequest(CallIsolatedValue) { AllowNoIndices = true };
+		protected override string UrlPath => $"/{CallIsolatedValue}/_flush/synced?allow_no_indices=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.SyncedFlush(CallIsolatedValue, f),
+			(client, f) => client.SyncedFlushAsync(CallIsolatedValue, f),
+			(client, r) => client.SyncedFlush(r),
+			(client, r) => client.SyncedFlushAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeApiTests.cs b/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeApiTests.cs
index 50fd979eea2..4a2ab77d0ea 100644
--- a/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeApiTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeApiTests.cs
@@ -5,9 +5,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using static Nest.Infer;
 
 namespace Tests.Indices.StatusManagement.Upgrade
 {
@@ -18,20 +15,20 @@ public class UpgradeApiTests
 	{
 		public UpgradeApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Upgrade(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.UpgradeAsync(CallIsolatedValue, f),
-			request: (client, r) => client.Upgrade(r),
-			requestAsync: (client, r) => client.UpgradeAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/{CallIsolatedValue}/_upgrade?allow_no_indices=true";
 
 		protected override Func<UpgradeDescriptor, IUpgradeRequest> Fluent => d => d.AllowNoIndices();
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override UpgradeRequest Initializer => new UpgradeRequest(CallIsolatedValue) { AllowNoIndices = true };
+		protected override string UrlPath => $"/{CallIsolatedValue}/_upgrade?allow_no_indices=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Upgrade(CallIsolatedValue, f),
+			(client, f) => client.UpgradeAsync(CallIsolatedValue, f),
+			(client, r) => client.Upgrade(r),
+			(client, r) => client.UpgradeAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeUrlTests.cs
index d11d88e731b..a59a2d6925c 100644
--- a/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeUrlTests.cs
+++ b/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeUrlTests.cs
@@ -12,18 +12,18 @@ public class UpgradeUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_upgrade")
-				.Fluent(c => c.Upgrade(All))
-				.Request(c => c.Upgrade(new UpgradeRequest()))
-				.FluentAsync(c => c.UpgradeAsync(All))
-				.RequestAsync(c => c.UpgradeAsync(new UpgradeRequest()))
+					.Fluent(c => c.Upgrade(All))
+					.Request(c => c.Upgrade(new UpgradeRequest()))
+					.FluentAsync(c => c.UpgradeAsync(All))
+					.RequestAsync(c => c.UpgradeAsync(new UpgradeRequest()))
 				;
 
 			var index = "index1,index2";
 			await POST($"/index1%2Cindex2/_upgrade")
-				.Fluent(c => c.Upgrade(index))
-				.Request(c => c.Upgrade(new UpgradeRequest(index)))
-				.FluentAsync(c => c.UpgradeAsync(index))
-				.RequestAsync(c => c.UpgradeAsync(new UpgradeRequest(index)))
+					.Fluent(c => c.Upgrade(index))
+					.Request(c => c.Upgrade(new UpgradeRequest(index)))
+					.FluentAsync(c => c.UpgradeAsync(index))
+					.RequestAsync(c => c.UpgradeAsync(new UpgradeRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Ingest/DeletePipeline/DeletePipelineApiTests.cs b/src/Tests/Tests/Ingest/DeletePipeline/DeletePipelineApiTests.cs
index 45fb17d903a..994c94e7560 100644
--- a/src/Tests/Tests/Ingest/DeletePipeline/DeletePipelineApiTests.cs
+++ b/src/Tests/Tests/Ingest/DeletePipeline/DeletePipelineApiTests.cs
@@ -8,26 +8,27 @@
 namespace Tests.Ingest.DeletePipeline
 {
 	//integration test is part of PipelineCrudTests
-	public class DeletePipelineApiTests : ApiTestBase<ReadOnlyCluster, IDeletePipelineResponse, IDeletePipelineRequest, DeletePipelineDescriptor, DeletePipelineRequest>
+	public class DeletePipelineApiTests
+		: ApiTestBase<ReadOnlyCluster, IDeletePipelineResponse, IDeletePipelineRequest, DeletePipelineDescriptor, DeletePipelineRequest>
 	{
-		public DeletePipelineApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _id = "pipeline-1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeletePipeline(_id, f),
-			fluentAsync: (client, f) => client.DeletePipelineAsync(_id, f),
-			request: (client, r) => client.DeletePipeline(r),
-			requestAsync: (client, r) => client.DeletePipelineAsync(r)
-		);
+		public DeletePipelineApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<DeletePipelineDescriptor, IDeletePipelineRequest> Fluent => d => d;
 
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/_ingest/pipeline/{_id}";
 
-		protected override DeletePipelineDescriptor NewDescriptor() => new DeletePipelineDescriptor(_id);
+		protected override DeletePipelineRequest Initializer => new DeletePipelineRequest(_id);
+		protected override string UrlPath => $"/_ingest/pipeline/{_id}";
 
-		protected override Func<DeletePipelineDescriptor, IDeletePipelineRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeletePipeline(_id, f),
+			(client, f) => client.DeletePipelineAsync(_id, f),
+			(client, r) => client.DeletePipeline(r),
+			(client, r) => client.DeletePipelineAsync(r)
+		);
 
-		protected override DeletePipelineRequest Initializer => new DeletePipelineRequest(_id);
+		protected override DeletePipelineDescriptor NewDescriptor() => new DeletePipelineDescriptor(_id);
 	}
 }
diff --git a/src/Tests/Tests/Ingest/DeletePipeline/DeletePipelineUrlTests.cs b/src/Tests/Tests/Ingest/DeletePipeline/DeletePipelineUrlTests.cs
index 777a224f773..95e5712924a 100644
--- a/src/Tests/Tests/Ingest/DeletePipeline/DeletePipelineUrlTests.cs
+++ b/src/Tests/Tests/Ingest/DeletePipeline/DeletePipelineUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var id = "pipeline-1";
 
 			await DELETE($"/_ingest/pipeline/{id}")
-				.Fluent(c => c.DeletePipeline(id))
-				.Request(c => c.DeletePipeline(new DeletePipelineRequest(id)))
-				.FluentAsync(c => c.DeletePipelineAsync(id))
-				.RequestAsync(c => c.DeletePipelineAsync(new DeletePipelineRequest(id)))
+					.Fluent(c => c.DeletePipeline(id))
+					.Request(c => c.DeletePipeline(new DeletePipelineRequest(id)))
+					.FluentAsync(c => c.DeletePipelineAsync(id))
+					.RequestAsync(c => c.DeletePipelineAsync(new DeletePipelineRequest(id)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Ingest/GetPipeline/GetPipelineApiTests.cs b/src/Tests/Tests/Ingest/GetPipeline/GetPipelineApiTests.cs
index 5661952b237..5930b6d5345 100644
--- a/src/Tests/Tests/Ingest/GetPipeline/GetPipelineApiTests.cs
+++ b/src/Tests/Tests/Ingest/GetPipeline/GetPipelineApiTests.cs
@@ -4,32 +4,31 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Ingest.GetPipeline
 {
 	//integration test is part of PipelineCrudTests
-	public class GetPipelineApiTests : ApiTestBase<ReadOnlyCluster, IGetPipelineResponse, IGetPipelineRequest, GetPipelineDescriptor, GetPipelineRequest>
+	public class GetPipelineApiTests
+		: ApiTestBase<ReadOnlyCluster, IGetPipelineResponse, IGetPipelineRequest, GetPipelineDescriptor, GetPipelineRequest>
 	{
-		public GetPipelineApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private const string PipelineId = "pipeline-1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetPipeline(f),
-			fluentAsync: (client, f) => client.GetPipelineAsync(f),
-			request: (client, r) => client.GetPipeline(r),
-			requestAsync: (client, r) => client.GetPipelineAsync(r)
-		);
+		public GetPipelineApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<GetPipelineDescriptor, IGetPipelineRequest> Fluent => d => d.Id(PipelineId);
 
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_ingest/pipeline/{PipelineId}";
 
-		protected override GetPipelineDescriptor NewDescriptor() => new GetPipelineDescriptor().Id(PipelineId);
+		protected override GetPipelineRequest Initializer => new GetPipelineRequest(PipelineId);
+		protected override string UrlPath => $"/_ingest/pipeline/{PipelineId}";
 
-		protected override Func<GetPipelineDescriptor, IGetPipelineRequest> Fluent => d => d.Id(PipelineId);
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetPipeline(f),
+			(client, f) => client.GetPipelineAsync(f),
+			(client, r) => client.GetPipeline(r),
+			(client, r) => client.GetPipelineAsync(r)
+		);
 
-		protected override GetPipelineRequest Initializer => new GetPipelineRequest(PipelineId);
+		protected override GetPipelineDescriptor NewDescriptor() => new GetPipelineDescriptor().Id(PipelineId);
 	}
 }
diff --git a/src/Tests/Tests/Ingest/GetPipeline/GetPipelineUrlTests.cs b/src/Tests/Tests/Ingest/GetPipeline/GetPipelineUrlTests.cs
index cd5f684aa18..b98c7bc736f 100644
--- a/src/Tests/Tests/Ingest/GetPipeline/GetPipelineUrlTests.cs
+++ b/src/Tests/Tests/Ingest/GetPipeline/GetPipelineUrlTests.cs
@@ -11,19 +11,19 @@ public class GetPipelineUrlTests
 		[U] public async Task Urls()
 		{
 			await GET($"/_ingest/pipeline")
-				.Fluent(c => c.GetPipeline())
-				.Request(c => c.GetPipeline(new GetPipelineRequest()))
-				.FluentAsync(c => c.GetPipelineAsync())
-				.RequestAsync(c => c.GetPipelineAsync())
+					.Fluent(c => c.GetPipeline())
+					.Request(c => c.GetPipeline(new GetPipelineRequest()))
+					.FluentAsync(c => c.GetPipelineAsync())
+					.RequestAsync(c => c.GetPipelineAsync())
 				;
 
 			var id = "id";
 
 			await GET($"/_ingest/pipeline/{id}")
-				.Fluent(c => c.GetPipeline(g => g.Id(id)))
-				.Request(c => c.GetPipeline(new GetPipelineRequest(id)))
-				.FluentAsync(c => c.GetPipelineAsync(g => g.Id(id)))
-				.RequestAsync(c => c.GetPipelineAsync(new GetPipelineRequest(id)))
+					.Fluent(c => c.GetPipeline(g => g.Id(id)))
+					.Request(c => c.GetPipeline(new GetPipelineRequest(id)))
+					.FluentAsync(c => c.GetPipelineAsync(g => g.Id(id)))
+					.RequestAsync(c => c.GetPipelineAsync(new GetPipelineRequest(id)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsApiTests.cs b/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsApiTests.cs
index 35193c1bb0b..77bc7713931 100644
--- a/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsApiTests.cs
+++ b/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsApiTests.cs
@@ -4,28 +4,30 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Ingest.Processor
 {
-	public class GrokProcessorPatternsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGrokProcessorPatternsResponse, IGrokProcessorPatternsRequest, GrokProcessorPatternsDescriptor, GrokProcessorPatternsRequest>
+	public class GrokProcessorPatternsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IGrokProcessorPatternsResponse, IGrokProcessorPatternsRequest, GrokProcessorPatternsDescriptor,
+			GrokProcessorPatternsRequest>
 	{
 		public GrokProcessorPatternsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GrokProcessorPatterns(f),
-			fluentAsync: (client, f) => client.GrokProcessorPatternsAsync(f),
-			request: (client, r) => client.GrokProcessorPatterns(r),
-			requestAsync: (client, r) => client.GrokProcessorPatternsAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_ingest/processor/grok";
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<GrokProcessorPatternsDescriptor, IGrokProcessorPatternsRequest> Fluent => d => d;
 
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
 		protected override GrokProcessorPatternsRequest Initializer => new GrokProcessorPatternsRequest();
+		protected override string UrlPath => $"/_ingest/processor/grok";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GrokProcessorPatterns(f),
+			(client, f) => client.GrokProcessorPatternsAsync(f),
+			(client, r) => client.GrokProcessorPatterns(r),
+			(client, r) => client.GrokProcessorPatternsAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsTests.cs b/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsTests.cs
index 0850f9da854..f56c34b4873 100644
--- a/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsTests.cs
+++ b/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsTests.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
-using Nest;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
@@ -8,14 +7,10 @@ namespace Tests.Ingest.Processor
 {
 	public class GrokProcessorPatternsUrlTests
 	{
-		[U] public async Task Urls()
-		{
-			await GET($"/_ingest/processor/grok")
-				.Fluent(c => c.GrokProcessorPatterns())
-				.Request(c => c.GrokProcessorPatterns())
-				.FluentAsync(c => c.GrokProcessorPatternsAsync())
-				.RequestAsync(c => c.GrokProcessorPatternsAsync())
-				;
-		}
+		[U] public async Task Urls() => await GET($"/_ingest/processor/grok")
+			.Fluent(c => c.GrokProcessorPatterns())
+			.Request(c => c.GrokProcessorPatterns())
+			.FluentAsync(c => c.GrokProcessorPatternsAsync())
+			.RequestAsync(c => c.GrokProcessorPatternsAsync());
 	}
 }
diff --git a/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsUnitTests.cs b/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsUnitTests.cs
index 2a2a89ee287..2f93f3c8c0e 100644
--- a/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsUnitTests.cs
+++ b/src/Tests/Tests/Ingest/GrokProcessorPatterns/GrokProcessorPatternsUnitTests.cs
@@ -1,10 +1,7 @@
 using System.Collections.Generic;
 using Elastic.Xunit.XunitPlumbing;
-using FluentAssertions;
-using Tests.Core;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.Ingest.Processor
 {
@@ -17,8 +14,8 @@ public void ShouldDeserialize()
 			{
 				patterns = new Dictionary<string, object>
 				{
-					{ "BACULA_CAPACITY" ,"%{INT}{1,3}(,%{INT}{3})*"},
-					{ "PATH", "(?:%{UNIXPATH}|%{WINPATH})"}
+					{ "BACULA_CAPACITY", "%{INT}{1,3}(,%{INT}{3})*" },
+					{ "PATH", "(?:%{UNIXPATH}|%{WINPATH})" }
 				}
 			};
 
diff --git a/src/Tests/Tests/Ingest/PipelineCrudTests.cs b/src/Tests/Tests/Ingest/PipelineCrudTests.cs
index be1be5a3d4d..be948a6a4d2 100644
--- a/src/Tests/Tests/Ingest/PipelineCrudTests.cs
+++ b/src/Tests/Tests/Ingest/PipelineCrudTests.cs
@@ -1,17 +1,11 @@
-using FluentAssertions;
+using System.Linq;
+using FluentAssertions;
 using Nest;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Ingest
 {
@@ -24,10 +18,10 @@ public PipelineCrudTests(IntrusiveOperationCluster cluster, EndpointUsage usage)
 		protected override LazyResponses Create() => Calls<PutPipelineDescriptor, PutPipelineRequest, IPutPipelineRequest, IPutPipelineResponse>(
 			CreateInitializer,
 			CreateFluent,
-			fluent: (s, c, f) => c.PutPipeline(s, f),
-			fluentAsync: (s, c, f) => c.PutPipelineAsync(s, f),
-			request: (s, c, r) => c.PutPipeline(r),
-			requestAsync: (s, c, r) => c.PutPipelineAsync(r)
+			(s, c, f) => c.PutPipeline(s, f),
+			(s, c, f) => c.PutPipelineAsync(s, f),
+			(s, c, r) => c.PutPipeline(r),
+			(s, c, r) => c.PutPipelineAsync(r)
 		);
 
 		protected override void ExpectAfterCreate(IGetPipelineResponse response)
@@ -86,19 +80,19 @@ private IPutPipelineRequest CreateFluent(string pipelineId, PutPipelineDescripto
 		protected override LazyResponses Read() => Calls<GetPipelineDescriptor, GetPipelineRequest, IGetPipelineRequest, IGetPipelineResponse>(
 			id => new GetPipelineRequest(id),
 			(id, d) => d.Id(id),
-			fluent: (s, c, f) => c.GetPipeline(f),
-			fluentAsync: (s, c, f) => c.GetPipelineAsync(f),
-			request: (s, c, r) => c.GetPipeline(r),
-			requestAsync: (s, c, r) => c.GetPipelineAsync(r)
+			(s, c, f) => c.GetPipeline(f),
+			(s, c, f) => c.GetPipelineAsync(f),
+			(s, c, r) => c.GetPipeline(r),
+			(s, c, r) => c.GetPipelineAsync(r)
 		);
 
 		protected override LazyResponses Update() => Calls<PutPipelineDescriptor, PutPipelineRequest, IPutPipelineRequest, IPutPipelineResponse>(
 			UpdateInitializer,
 			UpdateFluent,
-			fluent: (s, c, f) => c.PutPipeline(s, f),
-			fluentAsync: (s, c, f) => c.PutPipelineAsync(s, f),
-			request: (s, c, r) => c.PutPipeline(r),
-			requestAsync: (s, c, r) => c.PutPipelineAsync(r)
+			(s, c, f) => c.PutPipeline(s, f),
+			(s, c, f) => c.PutPipelineAsync(s, f),
+			(s, c, r) => c.PutPipeline(r),
+			(s, c, r) => c.PutPipelineAsync(r)
 		);
 
 		private PutPipelineRequest UpdateInitializer(string pipelineId) => new PutPipelineRequest(pipelineId)
@@ -168,14 +162,14 @@ protected override void ExpectAfterUpdate(IGetPipelineResponse response)
 			rename.TargetField.Should().NotBeNull();
 		}
 
-		protected override LazyResponses Delete() => Calls<DeletePipelineDescriptor, DeletePipelineRequest, IDeletePipelineRequest, IDeletePipelineResponse>(
-			id => new DeletePipelineRequest(id),
-			(id, d) => d,
-			fluent: (s, c, f) => c.DeletePipeline(s, f),
-			fluentAsync: (s, c, f) => c.DeletePipelineAsync(s, f),
-			request: (s, c, r) => c.DeletePipeline(r),
-			requestAsync: (s, c, r) => c.DeletePipelineAsync(r)
-		);
-
+		protected override LazyResponses Delete() =>
+			Calls<DeletePipelineDescriptor, DeletePipelineRequest, IDeletePipelineRequest, IDeletePipelineResponse>(
+				id => new DeletePipelineRequest(id),
+				(id, d) => d,
+				(s, c, f) => c.DeletePipeline(s, f),
+				(s, c, f) => c.DeletePipelineAsync(s, f),
+				(s, c, r) => c.DeletePipeline(r),
+				(s, c, r) => c.DeletePipelineAsync(r)
+			);
 	}
 }
diff --git a/src/Tests/Tests/Ingest/ProcessorAssertions.cs b/src/Tests/Tests/Ingest/ProcessorAssertions.cs
index 70f35b889f9..41277eda569 100644
--- a/src/Tests/Tests/Ingest/ProcessorAssertions.cs
+++ b/src/Tests/Tests/Ingest/ProcessorAssertions.cs
@@ -10,19 +10,21 @@
 namespace Tests.Ingest
 {
 	using ProcFunc = Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>>;
+
 	public interface IProcessorAssertion
 	{
+		ProcFunc Fluent { get; }
+		IProcessor Initializer { get; }
 		object Json { get; }
 		string Key { get; }
-		IProcessor Initializer { get; }
-		ProcFunc Fluent { get; }
 	}
+
 	public abstract class ProcessorAssertion : IProcessorAssertion
 	{
-		public abstract string Key { get; }
-		public abstract IProcessor Initializer { get; }
 		public abstract ProcFunc Fluent { get; }
+		public abstract IProcessor Initializer { get; }
 		public abstract object Json { get; }
+		public abstract string Key { get; }
 	}
 
 
@@ -33,13 +35,16 @@ from t in typeof(ProcessorAssertions).GetNestedTypes()
 			where typeof(IProcessorAssertion).IsAssignableFrom(t) && t.IsClass
 			let a = t.GetCustomAttributes(typeof(SkipVersionAttribute)).FirstOrDefault() as SkipVersionAttribute
 			where a == null || !a.Ranges.Any(r => r.IsSatisfied(TestClient.Configuration.ElasticsearchVersion))
-			select (IProcessorAssertion) (Activator.CreateInstance(t));
+			select (IProcessorAssertion)Activator.CreateInstance(t);
+
+		public static IProcessor[] Initializer => All.Select(a => a.Initializer).ToArray();
 
 		public static Dictionary<string, object>[] Json =>
 			All.Select(a => new Dictionary<string, object>
-			{
-				{a.Key, a.Json}
-			}).ToArray();
+				{
+					{ a.Key, a.Json }
+				})
+				.ToArray();
 
 		public static IPromise<IList<IProcessor>> Fluent(ProcessorsDescriptor d)
 		{
@@ -47,68 +52,52 @@ public static IPromise<IList<IProcessor>> Fluent(ProcessorsDescriptor d)
 			return d;
 		}
 
-		public static IProcessor[] Initializer => All.Select(a => a.Initializer).ToArray();
-
 		public class Append : ProcessorAssertion
 		{
-			public override string Key => "append";
-			public override object Json => new {field = "state", value = new[] {"Stable", "VeryActive"}};
-
-			public override IProcessor Initializer => new AppendProcessor
-			{
-				Field = "state",
-				Value = new object[] {StateOfBeing.Stable, StateOfBeing.VeryActive}
-			};
 			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
 				.Append<Project>(a => a
 					.Field(p => p.State)
 					.Value(StateOfBeing.Stable, StateOfBeing.VeryActive)
 				);
 
+			public override IProcessor Initializer => new AppendProcessor
+			{
+				Field = "state",
+				Value = new object[] { StateOfBeing.Stable, StateOfBeing.VeryActive }
+			};
+
+			public override object Json => new { field = "state", value = new[] { "Stable", "VeryActive" } };
+			public override string Key => "append";
 		}
 
 		public class Convert : ProcessorAssertion
 		{
-			public override string Key => "convert";
-			public override object Json => new
-			{
-				field = "numberOfCommits",
-				target_field = "targetField",
-				type = "string"
-			};
-
-			public override IProcessor Initializer => new ConvertProcessor
-			{
-				Field = "numberOfCommits",
-				TargetField = "targetField",
-				Type = ConvertProcessorType.String
-			};
 			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
 				.Convert<Project>(c => c
 					.Field(p => p.NumberOfCommits)
 					.TargetField("targetField")
 					.Type(ConvertProcessorType.String)
 				);
-		}
 
-		public class Date : ProcessorAssertion
-		{
-			public override string Key => "date";
-			public override object Json => new
+			public override IProcessor Initializer => new ConvertProcessor
 			{
-				field = "startedOn",
-				target_field = "timestamp",
-				formats = new[] {"dd/MM/yyyy hh:mm:ss"},
-				timezone = "Europe/Amsterdam"
+				Field = "numberOfCommits",
+				TargetField = "targetField",
+				Type = ConvertProcessorType.String
 			};
 
-			public override IProcessor Initializer => new DateProcessor
+			public override object Json => new
 			{
-				Field = "startedOn",
-				TargetField = "timestamp",
-				Formats = new string[] {"dd/MM/yyyy hh:mm:ss"},
-				Timezone = "Europe/Amsterdam"
+				field = "numberOfCommits",
+				target_field = "targetField",
+				type = "string"
 			};
+
+			public override string Key => "convert";
+		}
+
+		public class Date : ProcessorAssertion
+		{
 			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
 				.Date<Project>(dt => dt
 					.Field(p => p.StartedOn)
@@ -116,42 +105,38 @@ public class Date : ProcessorAssertion
 					.Formats("dd/MM/yyyy hh:mm:ss")
 					.Timezone("Europe/Amsterdam")
 				);
+
+			public override IProcessor Initializer => new DateProcessor
+			{
+				Field = "startedOn",
+				TargetField = "timestamp",
+				Formats = new string[] { "dd/MM/yyyy hh:mm:ss" },
+				Timezone = "Europe/Amsterdam"
+			};
+
+			public override object Json => new
+			{
+				field = "startedOn",
+				target_field = "timestamp",
+				formats = new[] { "dd/MM/yyyy hh:mm:ss" },
+				timezone = "Europe/Amsterdam"
+			};
+
+			public override string Key => "date";
 		}
 
 		public class Fail : ProcessorAssertion
 		{
-			public override string Key => "fail";
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Fail(f => f.Message("an error message"));
 
-			public override object Json => new { message = "an error message" };
+			public override IProcessor Initializer => new FailProcessor { Message = "an error message" };
 
-			public override IProcessor Initializer => new FailProcessor {Message = "an error message"};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Fail(f => f.Message("an error message"));
+			public override object Json => new { message = "an error message" };
+			public override string Key => "fail";
 		}
 
 		public class Foreach : ProcessorAssertion
 		{
-			public override string Key => "foreach";
-
-			public override object Json => new
-			{
-				field = "tags",
-				processor = new
-				{
-					uppercase = new
-					{
-						field = "_value.name"
-					}
-				}
-			};
-
-			public override IProcessor Initializer => new ForeachProcessor
-			{
-				Field = Infer.Field<Project>(p => p.Tags),
-				Processor = new UppercaseProcessor
-				{
-					Field = "_value.name"
-				}
-			};
 			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
 				.Foreach<Project>(fe => fe
 					.Field(p => p.Tags)
@@ -161,33 +146,33 @@ public class Foreach : ProcessorAssertion
 						)
 					)
 				);
-		}
-
-		public class Grok : ProcessorAssertion
-		{
-			public override string Key => "grok";
 
-			public override object Json => new
+			public override IProcessor Initializer => new ForeachProcessor
 			{
-				field = "description",
-				patterns = new[] {"my %{FAVORITE_DOG:dog} is colored %{RGB:color}"},
-				pattern_definitions = new Dictionary<string, string>
+				Field = Infer.Field<Project>(p => p.Tags),
+				Processor = new UppercaseProcessor
 				{
-					{"FAVORITE_DOG", "border collie"},
-					{"RGB", "RED|BLUE|GREEN"},
+					Field = "_value.name"
 				}
 			};
 
-			public override IProcessor Initializer => new GrokProcessor
+			public override object Json => new
 			{
-				Field = "description",
-				Patterns = new[] {"my %{FAVORITE_DOG:dog} is colored %{RGB:color}"},
-				PatternDefinitions = new Dictionary<string, string>
+				field = "tags",
+				processor = new
 				{
-					{"FAVORITE_DOG", "border collie"},
-					{"RGB", "RED|BLUE|GREEN"},
+					uppercase = new
+					{
+						field = "_value.name"
+					}
 				}
 			};
+
+			public override string Key => "foreach";
+		}
+
+		public class Grok : ProcessorAssertion
+		{
 			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
 				.Grok<Project>(gk => gk
 					.Field(p => p.Description)
@@ -197,13 +182,40 @@ public class Grok : ProcessorAssertion
 						.Add("RGB", "RED|BLUE|GREEN")
 					)
 				);
+
+			public override IProcessor Initializer => new GrokProcessor
+			{
+				Field = "description",
+				Patterns = new[] { "my %{FAVORITE_DOG:dog} is colored %{RGB:color}" },
+				PatternDefinitions = new Dictionary<string, string>
+				{
+					{ "FAVORITE_DOG", "border collie" },
+					{ "RGB", "RED|BLUE|GREEN" },
+				}
+			};
+
+			public override object Json => new
+			{
+				field = "description",
+				patterns = new[] { "my %{FAVORITE_DOG:dog} is colored %{RGB:color}" },
+				pattern_definitions = new Dictionary<string, string>
+				{
+					{ "FAVORITE_DOG", "border collie" },
+					{ "RGB", "RED|BLUE|GREEN" },
+				}
+			};
+
+			public override string Key => "grok";
 		}
 
 		public class Gsub : ProcessorAssertion
 		{
-			public override string Key => "gsub";
-
-			public override object Json => new { field = "name", pattern = "-", replacement = "_" };
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
+				.Gsub<Project>(gs => gs
+					.Field(p => p.Name)
+					.Pattern("-")
+					.Replacement("_")
+				);
 
 			public override IProcessor Initializer => new GsubProcessor
 			{
@@ -211,186 +223,201 @@ public class Gsub : ProcessorAssertion
 				Pattern = "-",
 				Replacement = "_"
 			};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
-				.Gsub<Project>(gs => gs
-					.Field(p => p.Name)
-					.Pattern("-")
-					.Replacement("_")
-				);
+
+			public override object Json => new { field = "name", pattern = "-", replacement = "_" };
+			public override string Key => "gsub";
 		}
 
 		public class Join : ProcessorAssertion
 		{
-			public override string Key => "join";
-
-			public override object Json => new { field = "branches", separator = "," };
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent =>
+				d => d.Join<Project>(j => j.Field(p => p.Branches).Separator(","));
 
 			public override IProcessor Initializer => new JoinProcessor
 			{
 				Field = "branches",
 				Separator = ","
 			};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Join<Project>(j => j.Field(p => p.Branches).Separator(","));
+
+			public override object Json => new { field = "branches", separator = "," };
+			public override string Key => "join";
 		}
 
 		public class Lowercase : ProcessorAssertion
 		{
-			public override string Key => "lowercase";
-
-			public override object Json => new { field = "name" };
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Lowercase<Project>(l => l.Field(p => p.Name));
 
 			public override IProcessor Initializer => new LowercaseProcessor { Field = "name" };
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Lowercase<Project>(l => l.Field(p => p.Name));
+
+			public override object Json => new { field = "name" };
+			public override string Key => "lowercase";
 		}
 
 		public class Remove : ProcessorAssertion
 		{
-			public override string Key => "remove";
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Remove<Project>(r => r.Field(p => p.Suggest));
 
-			public override object Json => new { field = "suggest" };
+			public override IProcessor Initializer => new RemoveProcessor { Field = "suggest" };
 
-			public override IProcessor Initializer => new RemoveProcessor {Field = "suggest"};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Remove<Project>(r => r.Field(p => p.Suggest));
+			public override object Json => new { field = "suggest" };
+			public override string Key => "remove";
 		}
 
 		public class Rename : ProcessorAssertion
 		{
-			public override string Key => "rename";
-
-			public override object Json => new { field = "leadDeveloper", target_field = "projectLead" };
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent =>
+				d => d.Rename<Project>(rn => rn.Field(p => p.LeadDeveloper).TargetField("projectLead"));
 
 			public override IProcessor Initializer => new RenameProcessor
 			{
 				Field = "leadDeveloper",
 				TargetField = "projectLead"
 			};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Rename<Project>(rn => rn.Field(p => p.LeadDeveloper).TargetField("projectLead"));
+
+			public override object Json => new { field = "leadDeveloper", target_field = "projectLead" };
+			public override string Key => "rename";
 		}
 
 		public class Set : ProcessorAssertion
 		{
-			public override string Key => "set";
-
-			public override object Json => new { field = "name", value = "foo" };
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent =>
+				d => d.Set<Project>(s => s.Field(p => p.Name).Value("foo"));
 
 			public override IProcessor Initializer => new SetProcessor { Field = Infer.Field<Project>(p => p.Name), Value = "foo" };
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Set<Project>(s => s.Field(p => p.Name).Value("foo"));
+
+			public override object Json => new { field = "name", value = "foo" };
+			public override string Key => "set";
 		}
 
 		public class Split : ProcessorAssertion
 		{
-			public override string Key => "split";
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent =>
+				d => d.Split<Project>(sp => sp.Field(p => p.Description).Separator("."));
 
-			public override object Json => new { field = "description", separator = "." };
+			public override IProcessor Initializer => new SplitProcessor { Field = "description", Separator = "." };
 
-			public override IProcessor Initializer => new SplitProcessor {Field = "description", Separator = "."};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Split<Project>(sp => sp.Field(p => p.Description).Separator("."));
+			public override object Json => new { field = "description", separator = "." };
+			public override string Key => "split";
 		}
 
 		public class Trim : ProcessorAssertion
 		{
-			public override string Key => "trim";
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Trim<Project>(t => t.Field(p => p.Name));
 
-			public override object Json => new { field = "name" };
+			public override IProcessor Initializer => new TrimProcessor { Field = "name" };
 
-			public override IProcessor Initializer => new TrimProcessor {Field = "name"};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Trim<Project>(t => t.Field(p => p.Name));
+			public override object Json => new { field = "name" };
+			public override string Key => "trim";
 		}
 
 		public class Uppercase : ProcessorAssertion
 		{
-			public override string Key => "uppercase";
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Uppercase<Project>(u => u.Field(p => p.Name));
 
-			public override object Json => new { field = "name" };
+			public override IProcessor Initializer => new UppercaseProcessor { Field = "name" };
 
-			public override IProcessor Initializer => new UppercaseProcessor {Field = "name"};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Uppercase<Project>(u => u.Field(p => p.Name));
+			public override object Json => new { field = "name" };
+			public override string Key => "uppercase";
 		}
 
 		public class DotExpander : ProcessorAssertion
 		{
-			public override string Key => "dot_expander";
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent =>
+				d => d.DotExpander<Project>(de => de.Field("field.withDots"));
 
-			public override object Json => new { field = "field.withDots" };
+			public override IProcessor Initializer => new DotExpanderProcessor { Field = "field.withDots" };
 
-			public override IProcessor Initializer => new DotExpanderProcessor {Field = "field.withDots"};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.DotExpander<Project>(de => de.Field("field.withDots"));
+			public override object Json => new { field = "field.withDots" };
+			public override string Key => "dot_expander";
 		}
 
 		public class Script : ProcessorAssertion
 		{
-			public override string Key => "script";
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Script(s => s.Source("ctx.numberOfCommits++"));
 
-			public override object Json => new { source = "ctx.numberOfCommits++" };
+			public override IProcessor Initializer => new ScriptProcessor { Source = "ctx.numberOfCommits++" };
 
-			public override IProcessor Initializer => new ScriptProcessor {Source = "ctx.numberOfCommits++"};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d.Script(s => s.Source("ctx.numberOfCommits++"));
+			public override object Json => new { source = "ctx.numberOfCommits++" };
+			public override string Key => "script";
 		}
 
 		[SkipVersion("<6.1.0", "uses url decode which was introduced in 6.1.0")]
 		public class UrlDecode : ProcessorAssertion
 		{
-			public override string Key => "urldecode";
-
-			public override object Json => new { field = "description", ignore_missing = true };
-
-			public override IProcessor Initializer => new UrlDecodeProcessor { Field = "description", IgnoreMissing = true };
 			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
 				.UrlDecode<Project>(ud => ud
 					.Field(p => p.Description)
 					.IgnoreMissing()
 				);
+
+			public override IProcessor Initializer => new UrlDecodeProcessor { Field = "description", IgnoreMissing = true };
+
+			public override object Json => new { field = "description", ignore_missing = true };
+			public override string Key => "urldecode";
 		}
 
 		[SkipVersion("<6.4.0", "")]
 		public class Attachment : ProcessorAssertion
 		{
-			public override string Key => "attachment";
-
-			public override object Json => new
-			{
-				field = "description",
-				ignore_missing = true,
-				properties = new [] {"title", "author"},
-				indexed_chars = 100_000,
-			};
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
+				.Attachment<Project>(ud => ud
+					.Field(p => p.Description)
+					.IndexedCharacters(100_000)
+					.Properties("title", "author")
+					.IgnoreMissing()
+				);
 
 			public override IProcessor Initializer => new AttachmentProcessor
 			{
 				Field = "description",
-				Properties = new [] {"title", "author"},
+				Properties = new[] { "title", "author" },
 				IndexedCharacters = 100_000,
 				IgnoreMissing = true
+			};
 
+			public override object Json => new
+			{
+				field = "description",
+				ignore_missing = true,
+				properties = new[] { "title", "author" },
+				indexed_chars = 100_000,
 			};
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
-				.Attachment<Project>(ud => ud
-					.Field(p => p.Description)
-					.IndexedCharacters(100_000)
-					.Properties("title", "author")
-					.IgnoreMissing()
-				);
+
+			public override string Key => "attachment";
 		}
 
 
 		[SkipVersion("<6.4.0", "")]
 		public class Bytes : ProcessorAssertion
 		{
-			public override string Key => "bytes";
-
-			public override object Json => new { field = "description", ignore_missing = true };
-
-			public override IProcessor Initializer => new BytesProcessor { Field = "description", IgnoreMissing = true };
-
 			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
 				.Bytes<Project>(ud => ud
 					.Field(p => p.Description)
 				);
+
+			public override IProcessor Initializer => new BytesProcessor { Field = "description", IgnoreMissing = true };
+
+			public override object Json => new { field = "description", ignore_missing = true };
+			public override string Key => "bytes";
 		}
 
 		public class KeyValue : ProcessorAssertion
 		{
-			public override string Key => "kv";
+			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
+				.Kv<Project>(ud => ud
+					.Field(p => p.Description)
+					.FieldSplit("_")
+					.ValueSplit(" ")
+					.IgnoreMissing()
+				);
+
+			public override IProcessor Initializer => new KeyValueProcessor
+			{
+				Field = "description",
+				FieldSplit = "_",
+				ValueSplit = " ",
+				IgnoreMissing = true
+			};
 
 			public override object Json => new
 			{
@@ -400,38 +427,22 @@ public class KeyValue : ProcessorAssertion
 				value_split = " "
 			};
 
-			public override IProcessor Initializer => new KeyValueProcessor
-			{
-				Field = "description",
-				FieldSplit = "_",
-				ValueSplit = " ",
-				IgnoreMissing = true
-			};
+			public override string Key => "kv";
+		}
 
+		[SkipVersion("<6.4.0", "trimming options were introduced later")]
+		public class KeyValueTrimming : ProcessorAssertion
+		{
 			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
 				.Kv<Project>(ud => ud
 					.Field(p => p.Description)
 					.FieldSplit("_")
 					.ValueSplit(" ")
+					.TrimKey("xyz")
+					.TrimValue("abc")
+					.StripBrackets()
 					.IgnoreMissing()
 				);
-		}
-		
-		[SkipVersion("<6.4.0", "trimming options were introduced later")]
-		public class KeyValueTrimming : ProcessorAssertion
-		{
-			public override string Key => "kv";
-
-			public override object Json => new
-			{
-				field = "description",
-				ignore_missing = true,
-				field_split = "_",
-				value_split = " ",
-				trim_key = "xyz",
-				trim_value = "abc",
-				strip_brackets = true
-			};
 
 			public override IProcessor Initializer => new KeyValueProcessor
 			{
@@ -444,16 +455,18 @@ public class KeyValueTrimming : ProcessorAssertion
 				IgnoreMissing = true
 			};
 
-			public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
-				.Kv<Project>(ud => ud
-					.Field(p => p.Description)
-					.FieldSplit("_")
-					.ValueSplit(" ")
-					.TrimKey("xyz")
-					.TrimValue("abc")
-					.StripBrackets()
-					.IgnoreMissing()
-				);
+			public override object Json => new
+			{
+				field = "description",
+				ignore_missing = true,
+				field_split = "_",
+				value_split = " ",
+				trim_key = "xyz",
+				trim_value = "abc",
+				strip_brackets = true
+			};
+
+			public override string Key => "kv";
 		}
 	}
 }
diff --git a/src/Tests/Tests/Ingest/ProcessorSerializationTests.cs b/src/Tests/Tests/Ingest/ProcessorSerializationTests.cs
index 198311bbfd5..2da451bfca2 100644
--- a/src/Tests/Tests/Ingest/ProcessorSerializationTests.cs
+++ b/src/Tests/Tests/Ingest/ProcessorSerializationTests.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Framework;
-using System.Reflection;
-using Elastic.Xunit.XunitPlumbing;
 using static Tests.Core.Serialization.SerializationTestHelper;
 
 namespace Tests.Ingest
diff --git a/src/Tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs b/src/Tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs
index adb3b55c1fe..70c6db6e0dd 100644
--- a/src/Tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs
+++ b/src/Tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs
@@ -2,31 +2,19 @@
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using Tests.Core.Extensions;
+using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Core.ManagedElasticsearch.Clusters;
 
 namespace Tests.Ingest.PutPipeline
 {
 	public class PutPipelineApiTests
 		: ApiIntegrationTestBase<WritableCluster, IPutPipelineResponse, IPutPipelineRequest, PutPipelineDescriptor, PutPipelineRequest>
 	{
-		public PutPipelineApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _id = "pipeline-1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutPipeline(_id, f),
-			fluentAsync: (client, f) => client.PutPipelineAsync(_id, f),
-			request: (client, r) => client.PutPipeline(r),
-			requestAsync: (client, r) => client.PutPipelineAsync(r)
-		);
+		public PutPipelineApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_ingest/pipeline/{_id}";
-		protected override bool SupportsDeserialization => false;
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
 
 		protected override object ExpectJson { get; } = new
@@ -35,18 +23,32 @@ protected override LazyResponses ClientUsage() => Calls(
 			processors = ProcessorAssertions.Json
 		};
 
-		protected override PutPipelineDescriptor NewDescriptor() => new PutPipelineDescriptor(_id);
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<PutPipelineDescriptor, IPutPipelineRequest> Fluent => d => d
 			.Description("My test pipeline")
 			.Processors(ProcessorAssertions.Fluent);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override PutPipelineRequest Initializer => new PutPipelineRequest(_id)
 		{
 			Description = "My test pipeline",
 			Processors = ProcessorAssertions.Initializer
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_ingest/pipeline/{_id}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutPipeline(_id, f),
+			(client, f) => client.PutPipelineAsync(_id, f),
+			(client, r) => client.PutPipeline(r),
+			(client, r) => client.PutPipelineAsync(r)
+		);
+
+		protected override PutPipelineDescriptor NewDescriptor() => new PutPipelineDescriptor(_id);
+
 		protected override void ExpectResponse(IPutPipelineResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/Ingest/PutPipeline/PutPipelineUrlTests.cs b/src/Tests/Tests/Ingest/PutPipeline/PutPipelineUrlTests.cs
index 4c22b30b002..550b099ce99 100644
--- a/src/Tests/Tests/Ingest/PutPipeline/PutPipelineUrlTests.cs
+++ b/src/Tests/Tests/Ingest/PutPipeline/PutPipelineUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var id = "id";
 
 			await PUT($"/_ingest/pipeline/{id}")
-				.Fluent(c => c.PutPipeline(id, s=>s))
-				.Request(c => c.PutPipeline(new PutPipelineRequest(id)))
-				.FluentAsync(c => c.PutPipelineAsync(id, s=>s))
-				.RequestAsync(c => c.PutPipelineAsync(new PutPipelineRequest(id)))
+					.Fluent(c => c.PutPipeline(id, s => s))
+					.Request(c => c.PutPipeline(new PutPipelineRequest(id)))
+					.FluentAsync(c => c.PutPipelineAsync(id, s => s))
+					.RequestAsync(c => c.PutPipelineAsync(new PutPipelineRequest(id)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Ingest/SimulatePipeline/SimulatePipelineApiTests.cs b/src/Tests/Tests/Ingest/SimulatePipeline/SimulatePipelineApiTests.cs
index 097829adf65..67394d94004 100644
--- a/src/Tests/Tests/Ingest/SimulatePipeline/SimulatePipelineApiTests.cs
+++ b/src/Tests/Tests/Ingest/SimulatePipeline/SimulatePipelineApiTests.cs
@@ -1,42 +1,30 @@
 using System;
+using System.Linq;
 using Elasticsearch.Net;
-using Nest;
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Xunit;
 using FluentAssertions;
-using System.Linq;
+using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework;
+using Tests.Framework.Integration;
 
 namespace Tests.Ingest.SimulatePipeline
 {
 	public class SimulatePipelineApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, ISimulatePipelineResponse, ISimulatePipelineRequest, SimulatePipelineDescriptor, SimulatePipelineRequest>
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISimulatePipelineResponse, ISimulatePipelineRequest, SimulatePipelineDescriptor,
+			SimulatePipelineRequest>
 	{
 		public SimulatePipelineApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.SimulatePipeline(f),
-			fluentAsync: (client, f) => client.SimulatePipelineAsync(f),
-			request: (client, r) => client.SimulatePipeline(r),
-			requestAsync: (client, r) => client.SimulatePipelineAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_ingest/pipeline/_simulate";
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new
 		{
 			pipeline = new
 			{
 				description = "pipeline simulation",
-				processors = new object []
+				processors = new object[]
 				{
 					new
 					{
@@ -51,7 +39,7 @@ protected override LazyResponses ClientUsage() => Calls(
 						append = new
 						{
 							field = "colors",
-							value = new [] { "blue", "black" }
+							value = new[] { "blue", "black" }
 						}
 					},
 					new
@@ -63,7 +51,7 @@ protected override LazyResponses ClientUsage() => Calls(
 					}
 				}
 			},
-			docs = new object []
+			docs = new object[]
 			{
 				new
 				{
@@ -84,45 +72,12 @@ protected override LazyResponses ClientUsage() => Calls(
 					_index = "otherindex",
 					_type = "anotherType",
 					_id = "2",
-					_source = new { id = "2", colors = new [] { "red" } }
+					_source = new { id = "2", colors = new[] { "red" } }
 				}
 			}
 		};
 
-		protected override void ExpectResponse(ISimulatePipelineResponse response)
-		{
-			response.ShouldBeValid();
-			response.Documents.Should().NotBeNull().And.HaveCount(3);
-
-			var simulation = response.Documents.FirstOrDefault(d => d.Document.Id == Project.Instance.Name);
-			simulation.Should().NotBeNull();
-			simulation.Document.Ingest.Should().NotBeNull();
-			simulation.Document.Ingest.Timestamp.Should().NotBe(default(DateTime));
-			var project = simulation.Document.Source.As<Project>();
-			project.Should().NotBeNull();
-			project.Name.Should().Be("BUZZ");
-			project.ShouldAdhereToSourceSerializerWhenSet();
-
-			simulation = response.Documents.FirstOrDefault(d => d.Document.Id == "otherid");
-			simulation.Should().NotBeNull();
-			simulation.Document.Ingest.Should().NotBeNull();
-			simulation.Document.Ingest.Timestamp.Should().NotBe(default(DateTime));
-			project = simulation.Document.Source.As<Project>();
-			project.Name.Should().Be("BUZZ");
-
-			simulation = response.Documents.FirstOrDefault(d => d.Document.Id == "2");
-			simulation.Document.Ingest.Should().NotBeNull();
-			simulation.Document.Ingest.Timestamp.Should().NotBe(default(DateTime));
-			var anotherType = simulation.Document.Source.As<AnotherType>();
-			anotherType.Should().NotBeNull();
-			anotherType.Colors.Should().BeEquivalentTo(new string[] { "red", "blue", "black" });
-		}
-
-		public class AnotherType
-		{
-			public string Id { get; set; }
-			public string[] Colors { get; set; }
-		}
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> Fluent => d => d
 			.Pipeline(pl => pl
@@ -158,6 +113,8 @@ public class AnotherType
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override SimulatePipelineRequest Initializer => new SimulatePipelineRequest
 		{
 			Pipeline = new Pipeline
@@ -173,7 +130,7 @@ public class AnotherType
 					new AppendProcessor
 					{
 						Field = "colors",
-						Value = new [] { "blue", "black"}
+						Value = new[] { "blue", "black" }
 					},
 					new UppercaseProcessor
 					{
@@ -198,16 +155,73 @@ public class AnotherType
 				{
 					Index = "otherindex",
 					Type = "anotherType",
-					Source = new AnotherType { Id = "2", Colors = new [] { "red" } }
+					Source = new AnotherType { Id = "2", Colors = new[] { "red" } }
 				}
 			}
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_ingest/pipeline/_simulate";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.SimulatePipeline(f),
+			(client, f) => client.SimulatePipelineAsync(f),
+			(client, r) => client.SimulatePipeline(r),
+			(client, r) => client.SimulatePipelineAsync(r)
+		);
+
+		protected override void ExpectResponse(ISimulatePipelineResponse response)
+		{
+			response.ShouldBeValid();
+			response.Documents.Should().NotBeNull().And.HaveCount(3);
+
+			var simulation = response.Documents.FirstOrDefault(d => d.Document.Id == Project.Instance.Name);
+			simulation.Should().NotBeNull();
+			simulation.Document.Ingest.Should().NotBeNull();
+			simulation.Document.Ingest.Timestamp.Should().NotBe(default(DateTime));
+			var project = simulation.Document.Source.As<Project>();
+			project.Should().NotBeNull();
+			project.Name.Should().Be("BUZZ");
+			project.ShouldAdhereToSourceSerializerWhenSet();
+
+			simulation = response.Documents.FirstOrDefault(d => d.Document.Id == "otherid");
+			simulation.Should().NotBeNull();
+			simulation.Document.Ingest.Should().NotBeNull();
+			simulation.Document.Ingest.Timestamp.Should().NotBe(default(DateTime));
+			project = simulation.Document.Source.As<Project>();
+			project.Name.Should().Be("BUZZ");
+
+			simulation = response.Documents.FirstOrDefault(d => d.Document.Id == "2");
+			simulation.Document.Ingest.Should().NotBeNull();
+			simulation.Document.Ingest.Timestamp.Should().NotBe(default(DateTime));
+			var anotherType = simulation.Document.Source.As<AnotherType>();
+			anotherType.Should().NotBeNull();
+			anotherType.Colors.Should().BeEquivalentTo(new string[] { "red", "blue", "black" });
+		}
+
+		public class AnotherType
+		{
+			public string[] Colors { get; set; }
+			public string Id { get; set; }
+		}
 	}
 
 	public class SimulatePipelineVerboseApiTests : SimulatePipelineApiTests
 	{
 		public SimulatePipelineVerboseApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> Fluent => f => base.Fluent(f.Verbose());
+
+		protected override SimulatePipelineRequest Initializer
+		{
+			get
+			{
+				var initializer = base.Initializer;
+				initializer.Verbose = true;
+				return initializer;
+			}
+		}
+
 		protected override string UrlPath => $"/_ingest/pipeline/_simulate?verbose=true";
 
 		protected override void ExpectResponse(ISimulatePipelineResponse response)
@@ -224,17 +238,5 @@ protected override void ExpectResponse(ISimulatePipelineResponse response)
 				}
 			}
 		}
-
-		protected override Func<SimulatePipelineDescriptor, ISimulatePipelineRequest> Fluent => f => base.Fluent(f.Verbose());
-
-		protected override SimulatePipelineRequest Initializer
-		{
-			get
-			{
-				var initializer = base.Initializer;
-				initializer.Verbose = true;
-				return initializer;
-			}
-		}
 	}
 }
diff --git a/src/Tests/Tests/Ingest/SimulatePipeline/SimulatePipelineUrlTests.cs b/src/Tests/Tests/Ingest/SimulatePipeline/SimulatePipelineUrlTests.cs
index acc37490618..1c9a1344cde 100644
--- a/src/Tests/Tests/Ingest/SimulatePipeline/SimulatePipelineUrlTests.cs
+++ b/src/Tests/Tests/Ingest/SimulatePipeline/SimulatePipelineUrlTests.cs
@@ -11,18 +11,18 @@ public class SimulatePipelineUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_ingest/pipeline/_simulate")
-				.Fluent(c => c.SimulatePipeline(s=>s))
-				.Request(c => c.SimulatePipeline(new SimulatePipelineRequest()))
-				.FluentAsync(c => c.SimulatePipelineAsync(s=>s))
-				.RequestAsync(c => c.SimulatePipelineAsync(new SimulatePipelineRequest()))
+					.Fluent(c => c.SimulatePipeline(s => s))
+					.Request(c => c.SimulatePipeline(new SimulatePipelineRequest()))
+					.FluentAsync(c => c.SimulatePipelineAsync(s => s))
+					.RequestAsync(c => c.SimulatePipelineAsync(new SimulatePipelineRequest()))
 				;
 
 			var id = "id";
 			await POST($"/_ingest/pipeline/{id}/_simulate")
-				.Fluent(c => c.SimulatePipeline(s=>s.Id(id)))
-				.Request(c => c.SimulatePipeline(new SimulatePipelineRequest(id)))
-				.FluentAsync(c => c.SimulatePipelineAsync(s=>s.Id(id)))
-				.RequestAsync(c => c.SimulatePipelineAsync(new SimulatePipelineRequest(id)))
+					.Fluent(c => c.SimulatePipeline(s => s.Id(id)))
+					.Request(c => c.SimulatePipeline(new SimulatePipelineRequest(id)))
+					.FluentAsync(c => c.SimulatePipelineAsync(s => s.Id(id)))
+					.RequestAsync(c => c.SimulatePipelineAsync(new SimulatePipelineRequest(id)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Mapping/LocalMetadata/LocalMetadataUsageTests.cs b/src/Tests/Tests/Mapping/LocalMetadata/LocalMetadataUsageTests.cs
index 016f78ea4e6..7f538dfdaae 100644
--- a/src/Tests/Tests/Mapping/LocalMetadata/LocalMetadataUsageTests.cs
+++ b/src/Tests/Tests/Mapping/LocalMetadata/LocalMetadataUsageTests.cs
@@ -1,6 +1,6 @@
-using Nest;
-using System;
+using System;
 using System.Collections.Generic;
+using Nest;
 using Tests.Domain;
 using Tests.Framework;
 
diff --git a/src/Tests/Tests/Mapping/LocalMetadata/LocalMetadataVisitorTests.cs b/src/Tests/Tests/Mapping/LocalMetadata/LocalMetadataVisitorTests.cs
index bbd6193d74e..be80c81d5ff 100644
--- a/src/Tests/Tests/Mapping/LocalMetadata/LocalMetadataVisitorTests.cs
+++ b/src/Tests/Tests/Mapping/LocalMetadata/LocalMetadataVisitorTests.cs
@@ -1,12 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Mapping.Types.Core.Text;
-using Xunit;
-using Tests.Framework;
 using Tests.Mapping.LocalMetadata.Extensions;
+using Tests.Mapping.Types.Core.Text;
 
 namespace Tests.Mapping.LocalMetadata
 {
@@ -34,12 +31,12 @@ public void CanAssignAndAccessLocalMetadataFluent()
 		{
 			var descriptor = new TypeMappingDescriptor<TextTest>().Properties(p => p
 				.Text(t => t
-				.Name(o => o.Full)
-				.Norms()
-				.LocalMetadata(m => m
-					.Add("Test", "TestValue")
-				)
-			)) as ITypeMapping;
+					.Name(o => o.Full)
+					.Norms()
+					.LocalMetadata(m => m
+						.Add("Test", "TestValue")
+					)
+				)) as ITypeMapping;
 
 			var visitor = new LocalMatadataVisitor();
 			var walker = new MappingWalker(visitor);
@@ -55,7 +52,7 @@ namespace Tests.Mapping.LocalMetadata.Extensions
 	public static class TestLocalMetadataMappingExtensions
 	{
 		public static TDescriptor AddTestLocalMetadata<TDescriptor>(this TDescriptor descriptor)
-				where TDescriptor : IDescriptor
+			where TDescriptor : IDescriptor
 		{
 			var propertyDescriptor = descriptor as IProperty;
 
diff --git a/src/Tests/Tests/Mapping/Metafields/MetafieldsMappingApiTestsBase.cs b/src/Tests/Tests/Mapping/Metafields/MetafieldsMappingApiTestsBase.cs
index 110afee4322..d7d6bfabf33 100644
--- a/src/Tests/Tests/Mapping/Metafields/MetafieldsMappingApiTestsBase.cs
+++ b/src/Tests/Tests/Mapping/Metafields/MetafieldsMappingApiTestsBase.cs
@@ -1,10 +1,9 @@
-using Nest;
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework;
+using Tests.Framework.Integration;
 
 namespace Tests.Mapping.Metafields
 {
@@ -13,15 +12,14 @@ public abstract class MetafieldsMappingApiTestsBase
 	{
 		protected MetafieldsMappingApiTestsBase(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Map(f),
-			fluentAsync: (client, f) => client.MapAsync(f),
-			request: (client, r) => client.Map(r),
-			requestAsync: (client, r) => client.MapAsync(r)
-		);
-
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override string UrlPath => $"/{CallIsolatedValue}/project/_mapping";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Map(f),
+			(client, f) => client.MapAsync(f),
+			(client, r) => client.Map(r),
+			(client, r) => client.MapAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Mapping/Scalar/ScalarUsageTests.cs b/src/Tests/Tests/Mapping/Scalar/ScalarUsageTests.cs
index 7287de2ca6a..c90b6cdd088 100644
--- a/src/Tests/Tests/Mapping/Scalar/ScalarUsageTests.cs
+++ b/src/Tests/Tests/Mapping/Scalar/ScalarUsageTests.cs
@@ -1,112 +1,15 @@
-using Nest;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Nest;
 using Tests.Framework;
 
 namespace Tests.Mapping.Scalar
 {
 	public class ScalarUsageTests : UsageTestBase<ITypeMapping, TypeMappingDescriptor<ScalarUsageTests.ScalarPoco>, TypeMapping>
 	{
-		protected override bool SupportsDeserialization => false;
-		protected override bool TestObjectInitializer => false;
-
-		public enum ScalarEnum { X }
-
-		public class ScalarPoco
+		public enum ScalarEnum
 		{
-			public int Int { get; set; }
-			public IEnumerable<int> Ints { get; set; }
-			public int? IntNullable { get; set; }
-			public IEnumerable<int?> IntNullables { get; set; }
-
-			public float Float { get; set; }
-			public IEnumerable<float> Floats { get; set; }
-			public float? FloatNullable { get; set; }
-			public IEnumerable<float?> FloatNullables { get; set; }
-
-			public double Double { get; set; }
-			public IEnumerable<double> Doubles { get; set; }
-			public double? DoubleNullable { get; set; }
-			public IEnumerable<double?> DoubleNullables { get; set; }
-
-			public sbyte SByte { get; set; }
-			public IEnumerable<sbyte> SBytes { get; set; }
-			public sbyte? SByteNullable { get; set; }
-			public IEnumerable<sbyte?> SByteNullables { get; set; }
-
-			public short Short { get; set; }
-			public IEnumerable<short> Shorts { get; set; }
-			public short? ShortNullable { get; set; }
-			public IEnumerable<short?> ShortNullables { get; set; }
-
-			public byte Byte { get; set; }
-			public IEnumerable<byte> Bytes { get; set; }
-			public byte? ByteNullable { get; set; }
-			public IEnumerable<byte?> ByteNullables { get; set; }
-
-			public long Long { get; set; }
-			public IEnumerable<long> Longs { get; set; }
-			public long? LongNullable { get; set; }
-			public IEnumerable<long?> LongNullables { get; set; }
-
-			public uint Uint { get; set; }
-			public IEnumerable<uint> Uints { get; set; }
-			public uint? UintNullable { get; set; }
-			public IEnumerable<uint?> UintNullables { get; set; }
-
-			public TimeSpan TimeSpan { get; set; }
-			public IEnumerable<TimeSpan> TimeSpans { get; set; }
-			public TimeSpan? TimeSpanNullable { get; set; }
-			public IEnumerable<TimeSpan?> TimeSpanNullables { get; set; }
-
-			public decimal Decimal { get; set; }
-			public IEnumerable<decimal> Decimals {get;set; }
-			public decimal? DecimalNullable { get; set; }
-			public IEnumerable<decimal?> DecimalNullables { get; set; }
-
-			public ulong Ulong { get; set; }
-			public IEnumerable<ulong> Ulongs { get; set; }
-			public ulong? UlongNullable { get; set; }
-			public IEnumerable<ulong?> UlongNullables { get; set; }
-
-			public DateTime DateTime { get; set; }
-			public IEnumerable<DateTime> DateTimes { get; set; }
-			public DateTime? DateTimeNullable { get; set; }
-			public IEnumerable<DateTime?> DateTimeNullables { get; set; }
-
-			public DateTimeOffset DateTimeOffset { get; set; }
-			public IEnumerable<DateTimeOffset> DateTimeOffsets { get; set; }
-			public DateTimeOffset? DateTimeOffsetNullable { get; set; }
-			public IEnumerable<DateTimeOffset?> DateTimeOffsetNullables { get; set; }
-
-			public bool Bool { get; set; }
-			public IEnumerable<bool> Bools { get; set; }
-			public bool? BoolNullable { get; set; }
-			public IEnumerable<bool?> BoolNullables { get; set; }
-
-			public char Char { get; set; }
-			public IEnumerable<char> Chars { get; set; }
-			public char? CharNullable { get; set; }
-			public IEnumerable<char?> CharNullables { get; set; }
-
-			public Guid Guid { get; set; }
-			public IEnumerable<Guid> Guids { get; set; }
-			public Guid? GuidNullable { get; set; }
-			public IEnumerable<Guid?> GuidNullables { get; set; }
-
-			public string String { get; set; }
-			public IEnumerable<string> Strings { get; set; }
-
-			public ScalarEnum Enum { get; set; }
-
-			public DateRange DateRange { get; set; }
-			public DoubleRange DoubleRange { get; set; }
-			public IntegerRange IntegerRange { get; set; }
-			public FloatRange FloatRange { get; set; }
-			public LongRange LongRange { get; set; }
+			X
 		}
 
 		protected override object ExpectJson => new
@@ -265,5 +168,100 @@ public class ScalarPoco
 			);
 
 		protected override TypeMapping Initializer => null;
+		protected override bool SupportsDeserialization => false;
+		protected override bool TestObjectInitializer => false;
+
+		public class ScalarPoco
+		{
+			public bool Bool { get; set; }
+			public bool? BoolNullable { get; set; }
+			public IEnumerable<bool?> BoolNullables { get; set; }
+			public IEnumerable<bool> Bools { get; set; }
+
+			public byte Byte { get; set; }
+			public byte? ByteNullable { get; set; }
+			public IEnumerable<byte?> ByteNullables { get; set; }
+			public IEnumerable<byte> Bytes { get; set; }
+
+			public char Char { get; set; }
+			public char? CharNullable { get; set; }
+			public IEnumerable<char?> CharNullables { get; set; }
+			public IEnumerable<char> Chars { get; set; }
+
+			public DateRange DateRange { get; set; }
+
+			public DateTime DateTime { get; set; }
+			public DateTime? DateTimeNullable { get; set; }
+			public IEnumerable<DateTime?> DateTimeNullables { get; set; }
+
+			public DateTimeOffset DateTimeOffset { get; set; }
+			public DateTimeOffset? DateTimeOffsetNullable { get; set; }
+			public IEnumerable<DateTimeOffset?> DateTimeOffsetNullables { get; set; }
+			public IEnumerable<DateTimeOffset> DateTimeOffsets { get; set; }
+			public IEnumerable<DateTime> DateTimes { get; set; }
+
+			public decimal Decimal { get; set; }
+			public decimal? DecimalNullable { get; set; }
+			public IEnumerable<decimal?> DecimalNullables { get; set; }
+			public IEnumerable<decimal> Decimals { get; set; }
+
+			public double Double { get; set; }
+			public double? DoubleNullable { get; set; }
+			public IEnumerable<double?> DoubleNullables { get; set; }
+			public DoubleRange DoubleRange { get; set; }
+			public IEnumerable<double> Doubles { get; set; }
+
+			public ScalarEnum Enum { get; set; }
+
+			public float Float { get; set; }
+			public float? FloatNullable { get; set; }
+			public IEnumerable<float?> FloatNullables { get; set; }
+			public FloatRange FloatRange { get; set; }
+			public IEnumerable<float> Floats { get; set; }
+
+			public Guid Guid { get; set; }
+			public Guid? GuidNullable { get; set; }
+			public IEnumerable<Guid?> GuidNullables { get; set; }
+			public IEnumerable<Guid> Guids { get; set; }
+			public int Int { get; set; }
+			public IntegerRange IntegerRange { get; set; }
+			public int? IntNullable { get; set; }
+			public IEnumerable<int?> IntNullables { get; set; }
+			public IEnumerable<int> Ints { get; set; }
+
+			public long Long { get; set; }
+			public long? LongNullable { get; set; }
+			public IEnumerable<long?> LongNullables { get; set; }
+			public LongRange LongRange { get; set; }
+			public IEnumerable<long> Longs { get; set; }
+
+			public sbyte SByte { get; set; }
+			public sbyte? SByteNullable { get; set; }
+			public IEnumerable<sbyte?> SByteNullables { get; set; }
+			public IEnumerable<sbyte> SBytes { get; set; }
+
+			public short Short { get; set; }
+			public short? ShortNullable { get; set; }
+			public IEnumerable<short?> ShortNullables { get; set; }
+			public IEnumerable<short> Shorts { get; set; }
+
+			public string String { get; set; }
+			public IEnumerable<string> Strings { get; set; }
+
+			public TimeSpan TimeSpan { get; set; }
+			public TimeSpan? TimeSpanNullable { get; set; }
+			public IEnumerable<TimeSpan?> TimeSpanNullables { get; set; }
+			public IEnumerable<TimeSpan> TimeSpans { get; set; }
+
+			public uint Uint { get; set; }
+			public uint? UintNullable { get; set; }
+			public IEnumerable<uint?> UintNullables { get; set; }
+			public IEnumerable<uint> Uints { get; set; }
+
+			public ulong Ulong { get; set; }
+			public ulong? UlongNullable { get; set; }
+			public IEnumerable<ulong?> UlongNullables { get; set; }
+			public IEnumerable<ulong> Ulongs { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Mapping/Types/AttributeTestsBase.cs b/src/Tests/Tests/Mapping/Types/AttributeTestsBase.cs
index 858dd10ddca..f73aec20761 100644
--- a/src/Tests/Tests/Mapping/Types/AttributeTestsBase.cs
+++ b/src/Tests/Tests/Mapping/Types/AttributeTestsBase.cs
@@ -1,15 +1,11 @@
-using System;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Framework;
 using static Tests.Core.Serialization.SerializationTestHelper;
-using Tests.Framework.Integration;
 
 namespace Tests.Mapping.Types
 {
-
 	public abstract class AttributeTestsBase<T>
-			where T : class
+		where T : class
 	{
 		protected abstract object ExpectJson { get; }
 
diff --git a/src/Tests/Tests/Mapping/Types/Complex/Nested/NestedAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Complex/Nested/NestedAttributeTests.cs
index f5edd0c3a67..5fdf1cd10f9 100644
--- a/src/Tests/Tests/Mapping/Types/Complex/Nested/NestedAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Complex/Nested/NestedAttributeTests.cs
@@ -1,15 +1,9 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Complex.Nested
 {
 	public class NestedTest
 	{
-		public class InnerObject
-		{
-			public string Name { get; set; }
-		}
-
 		[Nested(
 			IncludeInParent = true,
 			IncludeInRoot = false,
@@ -18,6 +12,11 @@ public class InnerObject
 
 		[Nested]
 		public InnerObject Minimal { get; set; }
+
+		public class InnerObject
+		{
+			public string Name { get; set; }
+		}
 	}
 
 	public class NestedAttributeTests : AttributeTestsBase<NestedTest>
diff --git a/src/Tests/Tests/Mapping/Types/Complex/Nested/NestedPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Complex/Nested/NestedPropertyTests.cs
index f5c891cdd67..d339cd4874d 100644
--- a/src/Tests/Tests/Mapping/Types/Complex/Nested/NestedPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Complex/Nested/NestedPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Nested
 {
@@ -36,22 +33,23 @@ public NestedPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 		};
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.Nested<Developer>(n => n
-					.Name(p => p.LeadDeveloper)
-					.IncludeInParent()
-					.IncludeInRoot(false)
-					.Dynamic(DynamicMapping.Strict)
-					.Enabled()
-					.Properties(pps => pps
-						.Ip(i => i
-							.Name(p => p.IpAddress)
-						)
+			.Nested<Developer>(n => n
+				.Name(p => p.LeadDeveloper)
+				.IncludeInParent()
+				.IncludeInRoot(false)
+				.Dynamic(DynamicMapping.Strict)
+				.Enabled()
+				.Properties(pps => pps
+					.Ip(i => i
+						.Name(p => p.IpAddress)
 					)
-				);
+				)
+			);
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "leadDeveloper", new NestedProperty
+			{
+				"leadDeveloper", new NestedProperty
 				{
 					IncludeInParent = true,
 					IncludeInRoot = false,
@@ -59,7 +57,7 @@ public NestedPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 					Enabled = true,
 					Properties = new Properties
 					{
-						{ "ipAddress", new IpProperty () }
+						{ "ipAddress", new IpProperty() }
 					}
 				}
 			}
diff --git a/src/Tests/Tests/Mapping/Types/Complex/Object/ObjectAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Complex/Object/ObjectAttributeTests.cs
index 491d9cf7f91..0029ccfbfad 100644
--- a/src/Tests/Tests/Mapping/Types/Complex/Object/ObjectAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Complex/Object/ObjectAttributeTests.cs
@@ -1,21 +1,20 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Complex.Object
 {
 	public class ObjectTest
 	{
-		public class InnerObject
-		{
-			public string Name { get; set; }
-		}
-
 		[Object(
 			Enabled = true)]
 		public InnerObject Full { get; set; }
 
 		[Object]
 		public InnerObject Minimal { get; set; }
+
+		public class InnerObject
+		{
+			public string Name { get; set; }
+		}
 	}
 
 	public class ObjectAttributeTests : AttributeTestsBase<ObjectTest>
diff --git a/src/Tests/Tests/Mapping/Types/Complex/Object/ObjectPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Complex/Object/ObjectPropertyTests.cs
index 412693f8510..2460361a220 100644
--- a/src/Tests/Tests/Mapping/Types/Complex/Object/ObjectPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Complex/Object/ObjectPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Object
 {
@@ -46,17 +43,18 @@ public ObjectPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 			);
 
 		protected override IProperties InitializerProperties => new Properties
+		{
 			{
-				{ "leadDeveloper", new ObjectProperty
+				"leadDeveloper", new ObjectProperty
+				{
+					Dynamic = true,
+					Enabled = true,
+					Properties = new Properties
 					{
-						Dynamic = true,
-						Enabled = true,
-						Properties = new Properties
-						{
-							{ "ipAddress", new IpProperty () }
-						}
+						{ "ipAddress", new IpProperty() }
 					}
 				}
-			};
+			}
+		};
 	}
 }
diff --git a/src/Tests/Tests/Mapping/Types/Core/Binary/BinaryAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Binary/BinaryAttributeTests.cs
index 606e8b0edb0..62f4231a51b 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Binary/BinaryAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Binary/BinaryAttributeTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Core.Binary
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Binary/BinaryPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Binary/BinaryPropertyTests.cs
index b750145dad5..3e0cf3e5def 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Binary/BinaryPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Binary/BinaryPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Binary
 {
@@ -37,7 +34,8 @@ public BinaryPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "name", new BinaryProperty
+			{
+				"name", new BinaryProperty
 				{
 					DocValues = true,
 					Similarity = SimilarityOption.Classic,
@@ -47,4 +45,3 @@ public BinaryPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 		};
 	}
 }
-
diff --git a/src/Tests/Tests/Mapping/Types/Core/Boolean/BooleanAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Boolean/BooleanAttributeTests.cs
index 51c13d51efb..6224d300f07 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Boolean/BooleanAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Boolean/BooleanAttributeTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Core.Boolean
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Boolean/BooleanPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Boolean/BooleanPropertyTests.cs
index 627a9c49df8..5a4d5e11d8e 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Boolean/BooleanPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Boolean/BooleanPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Boolean
 {
@@ -43,7 +40,8 @@ public BooleanPropertyTests(WritableCluster cluster, EndpointUsage usage) : base
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "name", new BooleanProperty
+			{
+				"name", new BooleanProperty
 				{
 					DocValues = false,
 					Boost = 1.3,
diff --git a/src/Tests/Tests/Mapping/Types/Core/Date/DateAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Date/DateAttributeTests.cs
index 7091970ce58..c2ab493178e 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Date/DateAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Date/DateAttributeTests.cs
@@ -15,12 +15,12 @@ public class DateTest
 			Format = "MM/dd/yyyy")]
 		public DateTime Full { get; set; }
 
-		[Date]
-		public DateTime Minimal { get; set; }
-
 		public DateTime Inferred { get; set; }
 
 		public DateTimeOffset InferredOffset { get; set; }
+
+		[Date]
+		public DateTime Minimal { get; set; }
 	}
 
 	public class DateAttributeTests : AttributeTestsBase<DateTest>
diff --git a/src/Tests/Tests/Mapping/Types/Core/Date/DatePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Date/DatePropertyTests.cs
index 1a1b2ef4963..494b76d50a1 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Date/DatePropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Date/DatePropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Date
 {
@@ -47,7 +44,8 @@ public DatePropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "lastActivity", new DateProperty
+			{
+				"lastActivity", new DateProperty
 				{
 					DocValues = false,
 					Similarity = SimilarityOption.Classic,
diff --git a/src/Tests/Tests/Mapping/Types/Core/Join/JoinAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Join/JoinAttributeTests.cs
index 4618bf0cd40..627736824c4 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Join/JoinAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Join/JoinAttributeTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Nest;
+using Nest;
 using Tests.Domain;
 
 namespace Tests.Mapping.Types.Core.Join
@@ -23,7 +18,8 @@ public class JoinAttributeTests : AttributeTestsBase<JoinTest>
 				joinField = new
 				{
 					type = "join",
-					relations = new {
+					relations = new
+					{
 						project = "commits"
 					}
 				}
diff --git a/src/Tests/Tests/Mapping/Types/Core/Join/JoinPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Join/JoinPropertyTests.cs
index d1675ef7aa3..fcefc1b08a2 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Join/JoinPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Join/JoinPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Mapping.Types.Core.Join
@@ -21,7 +18,8 @@ public JoinPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 				name = new
 				{
 					type = "join",
-					relations = new {
+					relations = new
+					{
 						project = "commits"
 					}
 				}
@@ -37,16 +35,18 @@ public JoinPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-
-			{"name", new JoinProperty
 			{
-				Relations = new Relations
+				"name", new JoinProperty
 				{
-					{Relation<Project>(), Relation<CommitActivity>()}
+					Relations = new Relations
+					{
+						{ Relation<Project>(), Relation<CommitActivity>() }
+					}
 				}
-			}}
+			}
 		};
 	}
+
 	public class JoinPropertyComplexTests : PropertyTestsBase
 	{
 		public JoinPropertyComplexTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
@@ -58,9 +58,10 @@ public JoinPropertyComplexTests(WritableCluster cluster, EndpointUsage usage) :
 				name = new
 				{
 					type = "join",
-					relations = new {
+					relations = new
+					{
 						project = "commits",
-						parent2 = new [] { "child2", "child3" }
+						parent2 = new[] { "child2", "child3" }
 					}
 				}
 			}
@@ -78,14 +79,16 @@ public JoinPropertyComplexTests(WritableCluster cluster, EndpointUsage usage) :
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "name", new JoinProperty
 			{
-				Relations = new Relations
+				"name", new JoinProperty
 				{
-					{ Relation<Project>(), typeof(CommitActivity) },
-					{ "parent2", "child2", "child3" }
+					Relations = new Relations
+					{
+						{ Relation<Project>(), typeof(CommitActivity) },
+						{ "parent2", "child2", "child3" }
+					}
 				}
-			} }
+			}
 		};
 	}
 }
diff --git a/src/Tests/Tests/Mapping/Types/Core/Keyword/KeywordAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Keyword/KeywordAttributeTests.cs
index 6b00983e2b0..3d49317bd8b 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Keyword/KeywordAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Keyword/KeywordAttributeTests.cs
@@ -5,6 +5,8 @@ namespace Tests.Mapping.Types.Core.Keyword
 {
 	public class KeywordTest
 	{
+		public char Char { get; set; }
+
 		[Keyword(
 			Boost = 1.2,
 			EagerGlobalOrdinals = true,
@@ -16,12 +18,10 @@ public class KeywordTest
 		)]
 		public string Full { get; set; }
 
+		public Guid Guid { get; set; }
+
 		[Keyword]
 		public string Minimal { get; set; }
-
-        public char Char { get; set; }
-
-        public Guid Guid { get; set; }
 	}
 
 	public class KeywordAttributeTests : AttributeTestsBase<KeywordTest>
diff --git a/src/Tests/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs
index 81f9d9c770f..a9ddda471a1 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs
@@ -2,7 +2,6 @@
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Analysis;
-using Tests.Analysis.Tokenizers;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
@@ -12,18 +11,7 @@ namespace Tests.Mapping.Types.Core.Keyword
 {
 	public class KeywordPropertyTests : PropertyTestsBase
 	{
-		public KeywordPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		protected override ICreateIndexRequest CreateIndexSettings(CreateIndexDescriptor create) => create
-			.Settings(s => s
-				.Analysis(a => a
-					.CharFilters(t => Promise(AnalysisUsageTests.CharFiltersFluent.Analysis.CharFilters))
-					.TokenFilters(t => Promise(AnalysisUsageTests.TokenFiltersFluent.Analysis.TokenFilters))
-					.Normalizers(t => Promise(AnalysisUsageTests.NormalizersInitializer.Analysis.Normalizers))
-				)
-			);
+		public KeywordPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson => new
 		{
@@ -96,12 +84,21 @@ protected override ICreateIndexRequest CreateIndexSettings(CreateIndexDescriptor
 					Store = true,
 					Fields = new Properties
 					{
-						{"foo", new KeywordProperty {IgnoreAbove = 10}}
+						{ "foo", new KeywordProperty { IgnoreAbove = 10 } }
 					}
 				}
 			}
 		};
 
+		protected override ICreateIndexRequest CreateIndexSettings(CreateIndexDescriptor create) => create
+			.Settings(s => s
+				.Analysis(a => a
+					.CharFilters(t => Promise(AnalysisUsageTests.CharFiltersFluent.Analysis.CharFilters))
+					.TokenFilters(t => Promise(AnalysisUsageTests.TokenFiltersFluent.Analysis.TokenFilters))
+					.Normalizers(t => Promise(AnalysisUsageTests.NormalizersInitializer.Analysis.Normalizers))
+				)
+			);
+
 		[SkipVersion("<6.4.0", "split_queries_on_whitespace is a new option https://github.com/elastic/elasticsearch/pull/30691")]
 		public class KeywordPropertySplitQueriesOnWhitespaceTests : PropertyTestsBase
 		{
diff --git a/src/Tests/Tests/Mapping/Types/Core/Number/NumberAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Number/NumberAttributeTests.cs
index f07d127df00..f9efd3ed74f 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Number/NumberAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Number/NumberAttributeTests.cs
@@ -5,6 +5,14 @@ namespace Tests.Mapping.Types.Core.Number
 {
 	public class NumberTest
 	{
+		public byte Byte { get; set; }
+
+		public decimal Decimal { get; set; }
+
+		public double Double { get; set; }
+
+		public float Float { get; set; }
+
 		[Number(
 			DocValues = true,
 			Similarity = "classic",
@@ -17,32 +25,24 @@ public class NumberTest
 			ScalingFactor = 10)]
 		public double Full { get; set; }
 
+		public int Integer { get; set; }
+
+		public long Long { get; set; }
+
 		[Number]
 		public double Minimal { get; set; }
 
-		public byte Byte { get; set; }
-
 		public short Short { get; set; }
 
-		public int Integer { get; set; }
-
-		public long Long { get; set; }
-
 		public sbyte SignedByte { get; set; }
 
-		public ushort UnsignedShort { get; set; }
+		public TimeSpan TimeSpan { get; set; }
 
 		public uint UnsignedInteger { get; set; }
 
 		public ulong UnsignedLong { get; set; }
 
-		public float Float { get; set; }
-
-		public double Double { get; set; }
-
-		public decimal Decimal { get; set; }
-
-		public TimeSpan TimeSpan { get; set; }
+		public ushort UnsignedShort { get; set; }
 	}
 
 	public class NumberAttributeTests
diff --git a/src/Tests/Tests/Mapping/Types/Core/Number/NumberPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Number/NumberPropertyTests.cs
index d086d5d336d..0828541eced 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Number/NumberPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Number/NumberPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Number
 {
@@ -49,7 +46,8 @@ public NumberPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "numberOfCommits", new NumberProperty(NumberType.Integer)
+			{
+				"numberOfCommits", new NumberProperty(NumberType.Integer)
 				{
 					DocValues = true,
 					Similarity = SimilarityOption.Classic,
@@ -106,7 +104,8 @@ public ScaledFloatNumberPropertyTests(WritableCluster cluster, EndpointUsage usa
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "numberOfCommits", new NumberProperty(NumberType.ScaledFloat)
+			{
+				"numberOfCommits", new NumberProperty(NumberType.ScaledFloat)
 				{
 					ScalingFactor = 10,
 					DocValues = true,
diff --git a/src/Tests/Tests/Mapping/Types/Core/Percolator/PercolatorAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Percolator/PercolatorAttributeTests.cs
index 587f3fa4ecd..905f4fa0d8f 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Percolator/PercolatorAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Percolator/PercolatorAttributeTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Core.Percolator
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Percolator/PercolatorPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Percolator/PercolatorPropertyTests.cs
index 88bbaab72a1..4049a2227dd 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Percolator/PercolatorPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Percolator/PercolatorPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Percolator
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangeAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangeAttributeTests.cs
index 568eab30172..8755dec2ccf 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangeAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangeAttributeTests.cs
@@ -1,13 +1,11 @@
-using System.Reflection;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.DateRange
 {
 	public class DateRangeTest
 	{
-		[DateRange(Boost=1.2, Coerce = false, Format = "yyyy-MM")]
+		[DateRange(Boost = 1.2, Coerce = false, Format = "yyyy-MM")]
 		public Nest.DateRange Range { get; set; }
 	}
 
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangePropertyTests.cs
index 8726ca1e612..c8147899051 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangePropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangePropertyTests.cs
@@ -3,9 +3,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Range.DateRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttributeTests.cs
index 41785adc512..6fe0b843b50 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttributeTests.cs
@@ -1,6 +1,5 @@
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.DoubleRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangePropertyTests.cs
index 1a203129307..22eb0f4fc50 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangePropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangePropertyTests.cs
@@ -3,9 +3,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Range.DoubleRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangeAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangeAttributeTests.cs
index 68a4abfcb4a..477449f5a16 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangeAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangeAttributeTests.cs
@@ -1,6 +1,5 @@
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.FloatRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangePropertyTests.cs
index 0c1a24f99ef..f48595cbb61 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangePropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangePropertyTests.cs
@@ -3,9 +3,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Range.FloatRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttributeTests.cs
index d7d1df2a1b8..3390ec0e6d0 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttributeTests.cs
@@ -1,6 +1,5 @@
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.IntegerRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangePropertyTests.cs
index 7e73f8cf543..3445ad21c4d 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangePropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangePropertyTests.cs
@@ -3,9 +3,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Range.IntegerRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangeAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangeAttributeTests.cs
index ba9205a4db9..b28f3159cd1 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangeAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangeAttributeTests.cs
@@ -6,7 +6,7 @@ namespace Tests.Mapping.Types.Core.Range.IpRange
 	public class IpRangeTest
 	{
 		[IpRange]
-		public Nest.IpAddressRange Range { get; set; }
+		public IpAddressRange Range { get; set; }
 	}
 
 	[SkipVersion("<5.5.0", "ip range type is a new 5.5.0 feature")]
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangePropertyTests.cs
index db5633f2b1e..9600544d9e8 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangePropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangePropertyTests.cs
@@ -4,7 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Range.IpRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangeAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangeAttributeTests.cs
index ab577cfde78..744df35d8e3 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangeAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangeAttributeTests.cs
@@ -1,6 +1,5 @@
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.LongRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangePropertyTests.cs
index 42aedfb0760..f2725c71e53 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangePropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangePropertyTests.cs
@@ -3,9 +3,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Range.LongRange
 {
diff --git a/src/Tests/Tests/Mapping/Types/Core/Text/TextAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Core/Text/TextAttributeTests.cs
index 7f050d0864a..359eb517ac3 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Text/TextAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Text/TextAttributeTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Core.Text
 {
@@ -21,10 +20,10 @@ public class TextTest
 			TermVector = TermVectorOption.WithPositionsOffsets)]
 		public string Full { get; set; }
 
+		public string Inferred { get; set; }
+
 		[Text]
 		public string Minimal { get; set; }
-
-		public string Inferred { get; set; }
 	}
 
 	public class TextAttributeTests : AttributeTestsBase<TextTest>
diff --git a/src/Tests/Tests/Mapping/Types/Core/Text/TextPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Core/Text/TextPropertyTests.cs
index 30abf9deb2f..32b674b9871 100644
--- a/src/Tests/Tests/Mapping/Types/Core/Text/TextPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Core/Text/TextPropertyTests.cs
@@ -7,7 +7,6 @@
 
 namespace Tests.Mapping.Types.Core.Text
 {
-
 	[SkipVersion("<6.4.0", "index_phrases is a new feature")]
 	public class TextPropertyIndexPhrasesTests : PropertyTestsBase
 	{
@@ -27,10 +26,10 @@ public TextPropertyIndexPhrasesTests(WritableCluster cluster, EndpointUsage usag
 
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.Text(s => s
-					.Name(p => p.Name)
-					.IndexPhrases()
-				);
+			.Text(s => s
+				.Name(p => p.Name)
+				.IndexPhrases()
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
@@ -62,18 +61,19 @@ public TextPropertyIndexPrefixesTests(WritableCluster cluster, EndpointUsage usa
 
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.Text(s => s
-					.Name(p => p.Name)
-					.IndexPrefixes(i => i
-						.MinCharacters(1)
-						.MaxCharacters(10)
-					)
-				);
+			.Text(s => s
+				.Name(p => p.Name)
+				.IndexPrefixes(i => i
+					.MinCharacters(1)
+					.MaxCharacters(10)
+				)
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "name", new TextProperty
+			{
+				"name", new TextProperty
 				{
 					IndexPrefixes = new TextIndexPrefixes
 					{
@@ -98,7 +98,7 @@ public TextPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 					type = "text",
 					analyzer = "standard",
 					boost = 1.2,
-					copy_to = new [] { "other_field" },
+					copy_to = new[] { "other_field" },
 					eager_global_ordinals = true,
 					fielddata = true,
 					fielddata_frequency_filter = new
@@ -130,41 +130,42 @@ public TextPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.Text(s => s
-					.Name(p => p.Name)
-					.Analyzer("standard")
-					.Boost(1.2)
-					.CopyTo(c => c
-						.Field("other_field")
-					)
-					.EagerGlobalOrdinals()
-					.Fielddata()
-					.FielddataFrequencyFilter(ff => ff
-						.Min(1)
-						.Max(100)
-						.MinSegmentSize(2)
+			.Text(s => s
+				.Name(p => p.Name)
+				.Analyzer("standard")
+				.Boost(1.2)
+				.CopyTo(c => c
+					.Field("other_field")
+				)
+				.EagerGlobalOrdinals()
+				.Fielddata()
+				.FielddataFrequencyFilter(ff => ff
+					.Min(1)
+					.Max(100)
+					.MinSegmentSize(2)
+				)
+				.Fields(fd => fd
+					.Keyword(k => k
+						.Name("raw")
+						.IgnoreAbove(100)
 					)
-					.Fields(fd => fd
-						.Keyword(k => k
-							.Name("raw")
-							.IgnoreAbove(100)
-						)
-					)
-					.Index(true)
-					.IndexOptions(IndexOptions.Offsets)
-					.PositionIncrementGap(5)
-					.SearchAnalyzer("standard")
-					.SearchQuoteAnalyzer("standard")
-					.Similarity(SimilarityOption.Classic)
-					.Store()
-					.Norms(false)
-					.TermVector(TermVectorOption.WithPositionsOffsets)
-				);
+				)
+				.Index(true)
+				.IndexOptions(IndexOptions.Offsets)
+				.PositionIncrementGap(5)
+				.SearchAnalyzer("standard")
+				.SearchQuoteAnalyzer("standard")
+				.Similarity(SimilarityOption.Classic)
+				.Store()
+				.Norms(false)
+				.TermVector(TermVectorOption.WithPositionsOffsets)
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "name", new TextProperty
+			{
+				"name", new TextProperty
 				{
 					Analyzer = "standard",
 					Boost = 1.2,
@@ -179,7 +180,8 @@ public TextPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 					},
 					Fields = new Properties
 					{
-						{ "raw", new KeywordProperty
+						{
+							"raw", new KeywordProperty
 							{
 								IgnoreAbove = 100
 							}
diff --git a/src/Tests/Tests/Mapping/Types/Geo/GeoPoint/GeoPointAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Geo/GeoPoint/GeoPointAttributeTests.cs
index 9c60d7790a9..e35dc5bef04 100644
--- a/src/Tests/Tests/Mapping/Types/Geo/GeoPoint/GeoPointAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Geo/GeoPoint/GeoPointAttributeTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Geo.GeoPoint
 {
@@ -8,10 +7,10 @@ public class GeoPointTest
 		[GeoPoint(IgnoreMalformed = true, IgnoreZValue = true)]
 		public string Full { get; set; }
 
+		public GeoLocation Inferred { get; set; }
+
 		[GeoPoint]
 		public string Minimal { get; set; }
-
-		public GeoLocation Inferred { get; set; }
 	}
 
 	public class GeoPointAttributeTests : AttributeTestsBase<GeoPointTest>
diff --git a/src/Tests/Tests/Mapping/Types/Geo/GeoPoint/GeoPointPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Geo/GeoPoint/GeoPointPropertyTests.cs
index 0d0e29ae463..a38006dc255 100644
--- a/src/Tests/Tests/Mapping/Types/Geo/GeoPoint/GeoPointPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Geo/GeoPoint/GeoPointPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.GeoPoint
 {
@@ -27,15 +24,16 @@ public GeoPointPropertyTests(WritableCluster cluster, EndpointUsage usage) : bas
 
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.GeoPoint(s => s
-					.Name(p => p.Location)
-					.IgnoreMalformed()
-				);
+			.GeoPoint(s => s
+				.Name(p => p.Location)
+				.IgnoreMalformed()
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "location", new GeoPointProperty
+			{
+				"location", new GeoPointProperty
 				{
 					IgnoreMalformed = true
 				}
diff --git a/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeAttributeTests.cs
index 73ec4bc4729..e60c4ecc96b 100644
--- a/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeAttributeTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Geo.GeoShape
 {
diff --git a/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapePropertyTests.cs
index 722ba9e494e..ab7c903a85d 100644
--- a/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapePropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapePropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.GeoShape
 {
@@ -31,20 +28,21 @@ public GeoShapePropertyTests(WritableCluster cluster, EndpointUsage usage) : bas
 		};
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.GeoShape(s => s
-					.Name(p => p.Location)
-					.Tree(GeoTree.Quadtree)
-					.Orientation(GeoOrientation.ClockWise)
-					.Strategy(GeoStrategy.Recursive)
-					.TreeLevels(3)
-					.PointsOnly()
-					.DistanceErrorPercentage(1.0)
-				);
+			.GeoShape(s => s
+				.Name(p => p.Location)
+				.Tree(GeoTree.Quadtree)
+				.Orientation(GeoOrientation.ClockWise)
+				.Strategy(GeoStrategy.Recursive)
+				.TreeLevels(3)
+				.PointsOnly()
+				.DistanceErrorPercentage(1.0)
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "location", new GeoShapeProperty
+			{
+				"location", new GeoShapeProperty
 				{
 					Tree = GeoTree.Quadtree,
 					Orientation = GeoOrientation.ClockWise,
diff --git a/src/Tests/Tests/Mapping/Types/PropertyTestsBase.cs b/src/Tests/Tests/Mapping/Types/PropertyTestsBase.cs
index d40acf21fb8..de51a027e7e 100644
--- a/src/Tests/Tests/Mapping/Types/PropertyTestsBase.cs
+++ b/src/Tests/Tests/Mapping/Types/PropertyTestsBase.cs
@@ -1,47 +1,47 @@
 using System;
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
-using Nest;
 using Elasticsearch.Net;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types
 {
 	public abstract class PropertyTestsBase
-		: ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IPutMappingResponse, IPutMappingRequest, PutMappingDescriptor<Project>, PutMappingRequest<Project>>
+		: ApiIntegrationAgainstNewIndexTestBase<WritableCluster, IPutMappingResponse, IPutMappingRequest, PutMappingDescriptor<Project>,
+			PutMappingRequest<Project>>
 	{
 		protected PropertyTestsBase(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Map(f),
-			fluentAsync: (client, f) => client.MapAsync(f),
-			request: (client, r) => client.Map(r),
-			requestAsync: (client, r) => client.MapAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_mapping";
-
-		protected abstract Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties { get; }
-
-		protected abstract IProperties InitializerProperties { get; }
 
 		protected override Func<PutMappingDescriptor<Project>, IPutMappingRequest> Fluent => f => f
 			.Index(CallIsolatedValue)
-			.Properties(this.FluentProperties);
+			.Properties(FluentProperties);
+
+		protected abstract Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties { get; }
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
 
 		protected override PutMappingRequest<Project> Initializer => new PutMappingRequest<Project>(CallIsolatedValue, typeof(Project))
 		{
-			Properties = this.InitializerProperties
+			Properties = InitializerProperties
 		};
 
+		protected abstract IProperties InitializerProperties { get; }
+		protected override string UrlPath => $"/{CallIsolatedValue}/doc/_mapping";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Map(f),
+			(client, f) => client.MapAsync(f),
+			(client, r) => client.Map(r),
+			(client, r) => client.MapAsync(r)
+		);
+
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] protected override Task HitsTheCorrectUrl() => base.HitsTheCorrectUrl();
 
diff --git a/src/Tests/Tests/Mapping/Types/SingleMappingPropertyTestsBase.cs b/src/Tests/Tests/Mapping/Types/SingleMappingPropertyTestsBase.cs
index afad5c1056e..733ebf0b14f 100644
--- a/src/Tests/Tests/Mapping/Types/SingleMappingPropertyTestsBase.cs
+++ b/src/Tests/Tests/Mapping/Types/SingleMappingPropertyTestsBase.cs
@@ -5,32 +5,21 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types
 {
 	public abstract class SingleMappingPropertyTestsBase
-		: ApiIntegrationTestBase<ReadOnlyCluster, IPutIndexTemplateResponse, IPutIndexTemplateRequest, PutIndexTemplateDescriptor, PutIndexTemplateRequest>
+		: ApiIntegrationTestBase<ReadOnlyCluster, IPutIndexTemplateResponse, IPutIndexTemplateRequest, PutIndexTemplateDescriptor,
+			PutIndexTemplateRequest>
 	{
 		protected SingleMappingPropertyTestsBase(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutIndexTemplate(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.PutIndexTemplateAsync(CallIsolatedValue, f),
-			request: (client, r) => client.PutIndexTemplate(r),
-			requestAsync: (client, r) => client.PutIndexTemplateAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_template/{CallIsolatedValue}?create=false";
-		protected override bool SupportsDeserialization => false;
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
 
 		protected override object ExpectJson => new
 		{
 			order = 1,
-			index_patterns = new [] {"nestx-*" },
+			index_patterns = new[] { "nestx-*" },
 			settings = new Dictionary<string, object> { { "index.number_of_shards", 1 } },
 			mappings = new
 			{
@@ -45,7 +34,7 @@ protected override LazyResponses ClientUsage() => Calls(
 								match = "*",
 								match_pattern = "simple",
 								match_mapping_type = "*",
-								mapping = this.SingleMappingJson
+								mapping = SingleMappingJson
 							}
 						}
 					}
@@ -53,14 +42,13 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected abstract object SingleMappingJson { get;  }
+		protected override int ExpectStatusCode => 200;
 
-		protected override PutIndexTemplateDescriptor NewDescriptor() => new PutIndexTemplateDescriptor(CallIsolatedValue);
 		protected override Func<PutIndexTemplateDescriptor, IPutIndexTemplateRequest> Fluent => d => d
 			.Order(1)
 			.IndexPatterns("nestx-*")
 			.Create(false)
-			.Settings(p=>p.NumberOfShards(1))
+			.Settings(p => p.NumberOfShards(1))
 			.Mappings(m => m
 				.Map("doc", tm => tm
 					.DynamicTemplates(t => t
@@ -75,24 +63,27 @@ protected override LazyResponses ClientUsage() => Calls(
 			);
 
 		protected abstract Func<SingleMappingSelector<object>, IProperty> FluentSingleMapping { get; }
-		protected abstract IProperty InitializerSingleMapping { get; }
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
 		protected override PutIndexTemplateRequest Initializer => new PutIndexTemplateRequest(CallIsolatedValue)
 		{
 			Order = 1,
 			IndexPatterns = new[] { "nestx-*" },
 			Create = false,
-			Settings = new Nest.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfShards = 1
 			},
 			Mappings = new Mappings
 			{
-				{ "doc", new TypeMapping
+				{
+					"doc", new TypeMapping
 					{
 						DynamicTemplates = new DynamicTemplateContainer
 						{
-							{ "base", new DynamicTemplate
+							{
+								"base", new DynamicTemplate
 								{
 									Match = "*",
 									MatchPattern = MatchType.Simple,
@@ -105,5 +96,20 @@ protected override LazyResponses ClientUsage() => Calls(
 				}
 			}
 		};
+
+		protected abstract IProperty InitializerSingleMapping { get; }
+
+		protected abstract object SingleMappingJson { get; }
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_template/{CallIsolatedValue}?create=false";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutIndexTemplate(CallIsolatedValue, f),
+			(client, f) => client.PutIndexTemplateAsync(CallIsolatedValue, f),
+			(client, r) => client.PutIndexTemplate(r),
+			(client, r) => client.PutIndexTemplateAsync(r)
+		);
+
+		protected override PutIndexTemplateDescriptor NewDescriptor() => new PutIndexTemplateDescriptor(CallIsolatedValue);
 	}
 }
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/Completion/CompletionAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/Completion/CompletionAttributeTests.cs
index f354b6df426..945a9b84cc1 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/Completion/CompletionAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/Completion/CompletionAttributeTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Specialized.Completion
 {
@@ -13,10 +12,10 @@ public class CompletionTest
 			MaxInputLength = 20)]
 		public CompletionField Full { get; set; }
 
+		public CompletionField Inferred { get; set; }
+
 		[Completion]
 		public CompletionField Minimal { get; set; }
-
-        public CompletionField Inferred { get; set; }
 	}
 
 	public class CompletionAttributeTests : AttributeTestsBase<CompletionTest>
@@ -38,11 +37,11 @@ public class CompletionAttributeTests : AttributeTestsBase<CompletionTest>
 				{
 					type = "completion"
 				},
-                inferred = new
-                {
-                    type = "completion"
-                }
-            }
+				inferred = new
+				{
+					type = "completion"
+				}
+			}
 		};
 	}
 }
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/Completion/CompletionPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/Completion/CompletionPropertyTests.cs
index abe4789749e..522edae3260 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/Completion/CompletionPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/Completion/CompletionPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Completion
 {
@@ -26,23 +23,24 @@ public CompletionPropertyTests(WritableCluster cluster, EndpointUsage usage) : b
 					preserve_position_increments = true,
 					max_input_length = 20
 				}
-            }
+			}
 		};
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.Completion(s => s
-					.Name(p => p.Suggest)
-					.SearchAnalyzer("standard")
-					.Analyzer("standard")
-					.PreserveSeparators()
-					.PreservePositionIncrements()
-					.MaxInputLength(20)
-				);
+			.Completion(s => s
+				.Name(p => p.Suggest)
+				.SearchAnalyzer("standard")
+				.Analyzer("standard")
+				.PreserveSeparators()
+				.PreservePositionIncrements()
+				.MaxInputLength(20)
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "suggest", new CompletionProperty
+			{
+				"suggest", new CompletionProperty
 				{
 					SearchAnalyzer = "standard",
 					Analyzer = "standard",
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/FieldAlias/FieldAliasPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/FieldAlias/FieldAliasPropertyTests.cs
index 28a6c10696b..3e8df824604 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/FieldAlias/FieldAliasPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/FieldAlias/FieldAliasPropertyTests.cs
@@ -2,7 +2,6 @@
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
-using Tests.Core.ManagedElasticsearch.NodeSeeders;
 using Tests.Domain;
 using Tests.Framework.Integration;
 
@@ -13,13 +12,6 @@ public class FieldAliasPropertyTests : PropertyTestsBase
 	{
 		public FieldAliasPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override ICreateIndexRequest CreateIndexSettings(CreateIndexDescriptor create) => create
-			.Mappings(m => m
-				.Map<Project>(mm => mm
-					.AutoMap()
-				)
-			);
-
 		protected override object ExpectJson => new
 		{
 			properties = new
@@ -33,18 +25,26 @@ protected override ICreateIndexRequest CreateIndexSettings(CreateIndexDescriptor
 		};
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.FieldAlias(s => s
-					.Name("leadDevFirstName")
-					.Path(p=>p.LeadDeveloper.FirstName)
-				);
+			.FieldAlias(s => s
+				.Name("leadDevFirstName")
+				.Path(p => p.LeadDeveloper.FirstName)
+			);
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "leadDevFirstName", new FieldAliasProperty
+			{
+				"leadDevFirstName", new FieldAliasProperty
 				{
-					Path = Infer.Field<Project>(p=>p.LeadDeveloper.FirstName)
+					Path = Infer.Field<Project>(p => p.LeadDeveloper.FirstName)
 				}
 			}
 		};
+
+		protected override ICreateIndexRequest CreateIndexSettings(CreateIndexDescriptor create) => create
+			.Mappings(m => m
+				.Map<Project>(mm => mm
+					.AutoMap()
+				)
+			);
 	}
 }
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/Generic/GenericPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/Generic/GenericPropertyTests.cs
index cfd2376126d..df478008f0e 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/Generic/GenericPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/Generic/GenericPropertyTests.cs
@@ -2,16 +2,14 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Specialized.Generic
 {
 	public class GenericPropertyTests : SingleMappingPropertyTestsBase
 	{
 		private const string GenericType = "{dynamic_type}";
-		public GenericPropertyTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object SingleMappingJson { get; } = new {index = false, type= GenericType};
+		public GenericPropertyTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override Func<SingleMappingSelector<object>, IProperty> FluentSingleMapping => m => m
 			.Generic(g => g
@@ -24,5 +22,7 @@ public GenericPropertyTests(ReadOnlyCluster cluster, EndpointUsage usage) : base
 			Type = GenericType,
 			Indexed = false
 		};
+
+		protected override object SingleMappingJson { get; } = new { index = false, type = GenericType };
 	}
 }
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/Ip/IpAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/Ip/IpAttributeTests.cs
index fe6f93f70b2..bd7ef8832e5 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/Ip/IpAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/Ip/IpAttributeTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Specialized.Ip
 {
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/Ip/IpPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/Ip/IpPropertyTests.cs
index ee100a5ed2d..b6e6ea16861 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/Ip/IpPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/Ip/IpPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Ip
 {
@@ -30,19 +27,20 @@ public IpPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(clus
 		};
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.Ip(s => s
-					.Name(p => p.Name)
-					.Index(false)
-					.Boost(1.3)
-					.NullValue("127.0.0.1")
-					.DocValues()
-					.Store()
-				);
+			.Ip(s => s
+				.Name(p => p.Name)
+				.Index(false)
+				.Boost(1.3)
+				.NullValue("127.0.0.1")
+				.DocValues()
+				.Store()
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "name", new IpProperty
+			{
+				"name", new IpProperty
 				{
 					Index = false,
 					Boost = 1.3,
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashAttributeTests.cs
index eee62820ccb..9bf43691cf2 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashAttributeTests.cs
@@ -1,7 +1,4 @@
-using System;
-using Nest;
-using Tests.Framework;
-using Tests.Framework.Integration;
+using Nest;
 
 namespace Tests.Mapping.Types.Specialized.Murmur3Hash
 {
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashPropertyTests.cs
index ee7ba71fa97..5728dd8bc34 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/Murmur3Hash/Murmur3HashPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.Murmur3Hash
 {
@@ -25,9 +22,9 @@ public Murmur3HashPropertyTests(WritableCluster cluster, EndpointUsage usage) :
 		};
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.Murmur3Hash(s => s
-					.Name(p => p.Name)
-				);
+			.Murmur3Hash(s => s
+				.Name(p => p.Name)
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountAttributeTests.cs
index c2b956c2739..80f83518635 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountAttributeTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountAttributeTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Nest;
+using Nest;
 
 namespace Tests.Mapping.Types.Specialized.TokenCount
 {
diff --git a/src/Tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountPropertyTests.cs b/src/Tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountPropertyTests.cs
index ce26838e012..74af229b3b0 100644
--- a/src/Tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountPropertyTests.cs
+++ b/src/Tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountPropertyTests.cs
@@ -1,11 +1,8 @@
 using System;
-using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Mapping.Types.Core.TokenCount
 {
@@ -29,18 +26,19 @@ public TokenCountPropertyTests(WritableCluster cluster, EndpointUsage usage) : b
 		};
 
 		protected override Func<PropertiesDescriptor<Project>, IPromise<IProperties>> FluentProperties => f => f
-				.TokenCount(s => s
-					.Name(p => p.Name)
-					.Analyzer("standard")
-					.Index(false)
-					.Boost(1.2)
-					.NullValue(0.0)
-				);
+			.TokenCount(s => s
+				.Name(p => p.Name)
+				.Analyzer("standard")
+				.Index(false)
+				.Boost(1.2)
+				.NullValue(0.0)
+			);
 
 
 		protected override IProperties InitializerProperties => new Properties
 		{
-			{ "name", new TokenCountProperty
+			{
+				"name", new TokenCountProperty
 				{
 					Index = false,
 					Analyzer = "standard",
diff --git a/src/Tests/Tests/Modules/Scripting/DeleteScript/DeleteScriptApiTests.cs b/src/Tests/Tests/Modules/Scripting/DeleteScript/DeleteScriptApiTests.cs
index d84796cfda1..a501e49d972 100644
--- a/src/Tests/Tests/Modules/Scripting/DeleteScript/DeleteScriptApiTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/DeleteScript/DeleteScriptApiTests.cs
@@ -4,32 +4,30 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.Scripting.DeleteScript
 {
 	public class DeleteScriptApiTests
 		: ApiTestBase<ReadOnlyCluster, IDeleteScriptResponse, IDeleteScriptRequest, DeleteScriptDescriptor, DeleteScriptRequest>
 	{
-		public DeleteScriptApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _name = "scrpt1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteScript(_name, f),
-			fluentAsync: (client, f) => client.DeleteScriptAsync(_name, f),
-			request: (client, r) => client.DeleteScript(r),
-			requestAsync: (client, r) => client.DeleteScriptAsync(r)
-		);
+		public DeleteScriptApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<DeleteScriptDescriptor, IDeleteScriptRequest> Fluent => d => d;
 
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/_scripts/{_name}";
 
-		protected override DeleteScriptDescriptor NewDescriptor() => new DeleteScriptDescriptor(_name);
+		protected override DeleteScriptRequest Initializer => new DeleteScriptRequest(_name);
+		protected override string UrlPath => $"/_scripts/{_name}";
 
-		protected override Func<DeleteScriptDescriptor, IDeleteScriptRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteScript(_name, f),
+			(client, f) => client.DeleteScriptAsync(_name, f),
+			(client, r) => client.DeleteScript(r),
+			(client, r) => client.DeleteScriptAsync(r)
+		);
 
-		protected override DeleteScriptRequest Initializer => new DeleteScriptRequest(_name);
+		protected override DeleteScriptDescriptor NewDescriptor() => new DeleteScriptDescriptor(_name);
 	}
 }
diff --git a/src/Tests/Tests/Modules/Scripting/DeleteScript/DeleteScriptUrlTests.cs b/src/Tests/Tests/Modules/Scripting/DeleteScript/DeleteScriptUrlTests.cs
index 9dcb671d797..adba7618375 100644
--- a/src/Tests/Tests/Modules/Scripting/DeleteScript/DeleteScriptUrlTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/DeleteScript/DeleteScriptUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var id = "id";
 
 			await DELETE($"/_scripts/{id}")
-				.Fluent(c => c.DeleteScript(id))
-				.Request(c => c.DeleteScript(new DeleteScriptRequest(id)))
-				.FluentAsync(c => c.DeleteScriptAsync(id))
-				.RequestAsync(c => c.DeleteScriptAsync(new DeleteScriptRequest(id)))
+					.Fluent(c => c.DeleteScript(id))
+					.Request(c => c.DeleteScript(new DeleteScriptRequest(id)))
+					.FluentAsync(c => c.DeleteScriptAsync(id))
+					.RequestAsync(c => c.DeleteScriptAsync(new DeleteScriptRequest(id)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs b/src/Tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs
index 9084437e1a7..6be47c973a9 100644
--- a/src/Tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs
@@ -13,26 +13,15 @@ namespace Tests.Modules.Scripting.ExecutePainlessScript
 {
 	[SkipVersion("<6.3.0", "this API was introduced in 6.3.0")]
 	public class ExecutePainlessScriptApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, IExecutePainlessScriptResponse<string>, IExecutePainlessScriptRequest, ExecutePainlessScriptDescriptor, ExecutePainlessScriptRequest>
+		: ApiIntegrationTestBase<ReadOnlyCluster, IExecutePainlessScriptResponse<string>, IExecutePainlessScriptRequest,
+			ExecutePainlessScriptDescriptor, ExecutePainlessScriptRequest>
 	{
-		public ExecutePainlessScriptApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _painlessScript = "params.count / params.total";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ExecutePainlessScript<string>(f),
-			fluentAsync: (client, f) => client.ExecutePainlessScriptAsync<string>(f),
-			request: (client, r) => client.ExecutePainlessScript<string>(r),
-			requestAsync: (client, r) => client.ExecutePainlessScriptAsync<string>(r)
-		);
+		public ExecutePainlessScriptApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/_scripts/painless/_execute";
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
 
-		protected override bool SupportsDeserialization => false;
-
 		protected override object ExpectJson => new
 		{
 			script = new
@@ -42,12 +31,16 @@ protected override LazyResponses ClientUsage() => Calls(
 			},
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> Fluent => d => d
-			.Script(s=>s
+			.Script(s => s
 				.Source(_painlessScript)
 				.Params(p => p.Add("count", 100.0).Add("total", 1000.0))
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ExecutePainlessScriptRequest Initializer => new ExecutePainlessScriptRequest
 		{
 			Script = new InlineScript(_painlessScript)
@@ -60,6 +53,16 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => "/_scripts/painless/_execute";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ExecutePainlessScript<string>(f),
+			(client, f) => client.ExecutePainlessScriptAsync<string>(f),
+			(client, r) => client.ExecutePainlessScript<string>(r),
+			(client, r) => client.ExecutePainlessScriptAsync<string>(r)
+		);
+
 		protected override void ExpectResponse(IExecutePainlessScriptResponse<string> response)
 		{
 			response.ShouldBeValid();
@@ -69,36 +72,14 @@ protected override void ExpectResponse(IExecutePainlessScriptResponse<string> re
 
 	[SkipVersion("<6.4.0", "Context only tested on 6.4.0 when they were introduced")]
 	public class ExecutePainlessScriptContextApiTests
-		: ApiIntegrationTestBase<WritableCluster, IExecutePainlessScriptResponse<string>, IExecutePainlessScriptRequest, ExecutePainlessScriptDescriptor, ExecutePainlessScriptRequest>
+		: ApiIntegrationTestBase<WritableCluster, IExecutePainlessScriptResponse<string>, IExecutePainlessScriptRequest,
+			ExecutePainlessScriptDescriptor, ExecutePainlessScriptRequest>
 	{
-		public ExecutePainlessScriptContextApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _painlessScript = "doc['rank'].value / params.max_rank";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ExecutePainlessScript<string>(f),
-			fluentAsync: (client, f) => client.ExecutePainlessScriptAsync<string>(f),
-			request: (client, r) => client.ExecutePainlessScript<string>(r),
-			requestAsync: (client, r) => client.ExecutePainlessScriptAsync<string>(r)
-		);
+		public ExecutePainlessScriptContextApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/_scripts/painless/_execute";
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
-		protected override bool SupportsDeserialization => false;
-
-		private class ScriptDocument
-		{
-			public string Field { get; set; }
-			public long Rank  { get; set; }
-		}
-
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			var create =client.CreateIndex(values.FixedForAllCallsValue, c => c.Mappings(map => map.Map<ScriptDocument>(m => m.AutoMap())));
-			create.ShouldBeValid();
-		}
 
 		protected override object ExpectJson => new
 		{
@@ -106,8 +87,8 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			context_setup = new
 			{
 				document = new { rank = 4 },
-				index = this.UniqueValues.FixedForAllCallsValue,
-				query = new { match_all = new {} }
+				index = UniqueValues.FixedForAllCallsValue,
+				query = new { match_all = new { } }
 			},
 			script = new
 			{
@@ -116,24 +97,28 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			},
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<ExecutePainlessScriptDescriptor, IExecutePainlessScriptRequest> Fluent => d => d
-			.ContextSetup(cs=>cs
-				.Index(this.UniqueValues.FixedForAllCallsValue)
+			.ContextSetup(cs => cs
+				.Index(UniqueValues.FixedForAllCallsValue)
 				.Document(new ScriptDocument { Rank = 4 })
-				.Query<ScriptDocument>(q=>q.MatchAll())
+				.Query<ScriptDocument>(q => q.MatchAll())
 			)
 			.Context("score")
-			.Script(s=>s
+			.Script(s => s
 				.Source(_painlessScript)
 				.Params(p => p.Add("max_rank", 5.0))
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ExecutePainlessScriptRequest Initializer => new ExecutePainlessScriptRequest
 		{
 			ContextSetup = new PainlessContextSetup
 			{
-				Index = this.UniqueValues.FixedForAllCallsValue,
-				Document =  new ScriptDocument { Rank = 4 },
+				Index = UniqueValues.FixedForAllCallsValue,
+				Document = new ScriptDocument { Rank = 4 },
 				Query = new MatchAllQuery()
 			},
 			Context = "score",
@@ -146,10 +131,32 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => "/_scripts/painless/_execute";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ExecutePainlessScript<string>(f),
+			(client, f) => client.ExecutePainlessScriptAsync<string>(f),
+			(client, r) => client.ExecutePainlessScript<string>(r),
+			(client, r) => client.ExecutePainlessScriptAsync<string>(r)
+		);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			var create = client.CreateIndex(values.FixedForAllCallsValue, c => c.Mappings(map => map.Map<ScriptDocument>(m => m.AutoMap())));
+			create.ShouldBeValid();
+		}
+
 		protected override void ExpectResponse(IExecutePainlessScriptResponse<string> response)
 		{
 			response.ShouldBeValid();
 			response.Result.Should().NotBeNullOrWhiteSpace();
 		}
+
+		private class ScriptDocument
+		{
+			public string Field { get; set; }
+			public long Rank { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptUrlTests.cs b/src/Tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptUrlTests.cs
index 18b364b1356..87fae3ef729 100644
--- a/src/Tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptUrlTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptUrlTests.cs
@@ -17,10 +17,10 @@ [U] public async Task Urls()
 			};
 
 			await POST("/_scripts/painless/_execute")
-				.Fluent(c => c.ExecutePainlessScript<string>(f => f.Script(s => s.Source(painless))))
-				.Request(c => c.ExecutePainlessScript<string>(request))
-				.FluentAsync(c => c.ExecutePainlessScriptAsync<string>(f => f.Script(s => s.Source(painless))))
-				.RequestAsync(c => c.ExecutePainlessScriptAsync<string>(request))
+					.Fluent(c => c.ExecutePainlessScript<string>(f => f.Script(s => s.Source(painless))))
+					.Request(c => c.ExecutePainlessScript<string>(request))
+					.FluentAsync(c => c.ExecutePainlessScriptAsync<string>(f => f.Script(s => s.Source(painless))))
+					.RequestAsync(c => c.ExecutePainlessScriptAsync<string>(request))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/Scripting/GetScript/GetScriptApiTests.cs b/src/Tests/Tests/Modules/Scripting/GetScript/GetScriptApiTests.cs
index a00ad7bebe0..e0ed3a0c3ff 100644
--- a/src/Tests/Tests/Modules/Scripting/GetScript/GetScriptApiTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/GetScript/GetScriptApiTests.cs
@@ -4,32 +4,30 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.Scripting.GetScript
 {
 	public class GetScriptApiTests
 		: ApiTestBase<ReadOnlyCluster, IGetScriptResponse, IGetScriptRequest, GetScriptDescriptor, GetScriptRequest>
 	{
-		public GetScriptApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _name = "scrpt1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetScript(_name, f),
-			fluentAsync: (client, f) => client.GetScriptAsync(_name, f),
-			request: (client, r) => client.GetScript(r),
-			requestAsync: (client, r) => client.GetScriptAsync(r)
-		);
+		public GetScriptApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<GetScriptDescriptor, IGetScriptRequest> Fluent => d => d;
 
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_scripts/{_name}";
 
-		protected override GetScriptDescriptor NewDescriptor() => new GetScriptDescriptor(_name);
+		protected override GetScriptRequest Initializer => new GetScriptRequest(_name);
+		protected override string UrlPath => $"/_scripts/{_name}";
 
-		protected override Func<GetScriptDescriptor, IGetScriptRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetScript(_name, f),
+			(client, f) => client.GetScriptAsync(_name, f),
+			(client, r) => client.GetScript(r),
+			(client, r) => client.GetScriptAsync(r)
+		);
 
-		protected override GetScriptRequest Initializer => new GetScriptRequest(_name);
+		protected override GetScriptDescriptor NewDescriptor() => new GetScriptDescriptor(_name);
 	}
 }
diff --git a/src/Tests/Tests/Modules/Scripting/GetScript/GetScriptUrlTests.cs b/src/Tests/Tests/Modules/Scripting/GetScript/GetScriptUrlTests.cs
index eeafc58c1a5..8e4a0b0e262 100644
--- a/src/Tests/Tests/Modules/Scripting/GetScript/GetScriptUrlTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/GetScript/GetScriptUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var id = "id";
 
 			await GET($"/_scripts/{id}")
-				.Fluent(c => c.GetScript(id))
-				.Request(c => c.GetScript(new GetScriptRequest(id)))
-				.FluentAsync(c => c.GetScriptAsync(id))
-				.RequestAsync(c => c.GetScriptAsync(new GetScriptRequest(id)))
+					.Fluent(c => c.GetScript(id))
+					.Request(c => c.GetScript(new GetScriptRequest(id)))
+					.FluentAsync(c => c.GetScriptAsync(id))
+					.RequestAsync(c => c.GetScriptAsync(new GetScriptRequest(id)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/Scripting/PutScript/PutScriptApiTests.cs b/src/Tests/Tests/Modules/Scripting/PutScript/PutScriptApiTests.cs
index 436c7cdb94f..ea67b784a94 100644
--- a/src/Tests/Tests/Modules/Scripting/PutScript/PutScriptApiTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/PutScript/PutScriptApiTests.cs
@@ -6,32 +6,18 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.Scripting.PutScript
 {
 	public class PutScriptApiTests
 		: ApiIntegrationTestBase<ReadOnlyCluster, IPutScriptResponse, IPutScriptRequest, PutScriptDescriptor, PutScriptRequest>
 	{
-		public PutScriptApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _name = "scrpt1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutScript(_name, f),
-			fluentAsync: (client, f) => client.PutScriptAsync(_name, f),
-			request: (client, r) => client.PutScript(r),
-			requestAsync: (client, r) => client.PutScriptAsync(r)
-		);
+		public PutScriptApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_scripts/{_name}";
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
 
-		protected override bool SupportsDeserialization => false;
-
 		protected override object ExpectJson => new
 		{
 			script = new
@@ -41,16 +27,30 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override PutScriptDescriptor NewDescriptor() => new PutScriptDescriptor(_name);
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<PutScriptDescriptor, IPutScriptRequest> Fluent => d => d
 			.Painless("1+1");
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override PutScriptRequest Initializer => new PutScriptRequest(_name)
 		{
 			Script = new PainlessScript("1+1")
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_scripts/{_name}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutScript(_name, f),
+			(client, f) => client.PutScriptAsync(_name, f),
+			(client, r) => client.PutScript(r),
+			(client, r) => client.PutScriptAsync(r)
+		);
+
+		protected override PutScriptDescriptor NewDescriptor() => new PutScriptDescriptor(_name);
+
 		protected override void ExpectResponse(IPutScriptResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/Modules/Scripting/PutScript/PutScriptUrlTests.cs b/src/Tests/Tests/Modules/Scripting/PutScript/PutScriptUrlTests.cs
index 905c1c5c4d3..0d9b302c176 100644
--- a/src/Tests/Tests/Modules/Scripting/PutScript/PutScriptUrlTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/PutScript/PutScriptUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var id = "id";
 
 			await PUT($"/_scripts/{id}")
-				.Fluent(c => c.PutScript(id, s=>s.Painless("")))
-				.Request(c => c.PutScript(new PutScriptRequest(id)))
-				.FluentAsync(c => c.PutScriptAsync(id, s=>s.Painless("")))
-				.RequestAsync(c => c.PutScriptAsync(new PutScriptRequest(id)))
+					.Fluent(c => c.PutScript(id, s => s.Painless("")))
+					.Request(c => c.PutScript(new PutScriptRequest(id)))
+					.FluentAsync(c => c.PutScriptAsync(id, s => s.Painless("")))
+					.RequestAsync(c => c.PutScriptAsync(new PutScriptRequest(id)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/Scripting/ScriptingCrudTests.cs b/src/Tests/Tests/Modules/Scripting/ScriptingCrudTests.cs
index a600e0880dd..da46a326216 100644
--- a/src/Tests/Tests/Modules/Scripting/ScriptingCrudTests.cs
+++ b/src/Tests/Tests/Modules/Scripting/ScriptingCrudTests.cs
@@ -3,58 +3,58 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.Scripting
 {
 	public class ScriptingCrudTests
 		: CrudTestBase<IntrusiveOperationCluster, IPutScriptResponse, IGetScriptResponse, IPutScriptResponse, IDeleteScriptResponse>
 	{
+		private readonly string _updatedScript = "2+2";
+
 		public ScriptingCrudTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override LazyResponses Create() => Calls<PutScriptDescriptor, PutScriptRequest, IPutScriptRequest, IPutScriptResponse>(
 			CreateInitializer,
 			CreateFluent,
-			fluent: (s, c, f) => c.PutScript(s, f),
-			fluentAsync: (s, c, f) => c.PutScriptAsync(s, f),
-			request: (s, c, r) => c.PutScript(r),
-			requestAsync: (s, c, r) => c.PutScriptAsync(r)
+			(s, c, f) => c.PutScript(s, f),
+			(s, c, f) => c.PutScriptAsync(s, f),
+			(s, c, r) => c.PutScript(r),
+			(s, c, r) => c.PutScriptAsync(r)
 		);
 
 		private PutScriptRequest CreateInitializer(string id) => new PutScriptRequest(id) { Script = new PainlessScript("1+1") };
+
 		private IPutScriptRequest CreateFluent(string id, PutScriptDescriptor d) => d.Painless("1+1");
 
 		protected override LazyResponses Read() => Calls<GetScriptDescriptor, GetScriptRequest, IGetScriptRequest, IGetScriptResponse>(
 			id => new GetScriptRequest(id),
 			(id, d) => d,
-			fluent: (s, c, f) => c.GetScript(s, f),
-			fluentAsync: (s, c, f) => c.GetScriptAsync(s, f),
-			request: (s, c, r) => c.GetScript(r),
-			requestAsync: (s, c, r) => c.GetScriptAsync(r)
+			(s, c, f) => c.GetScript(s, f),
+			(s, c, f) => c.GetScriptAsync(s, f),
+			(s, c, r) => c.GetScript(r),
+			(s, c, r) => c.GetScriptAsync(r)
 		);
 
 		protected override LazyResponses Update() => Calls<PutScriptDescriptor, PutScriptRequest, IPutScriptRequest, IPutScriptResponse>(
 			UpdateInitializer,
 			UpdateFluent,
-			fluent: (s, c, f) => c.PutScript(s, f),
-			fluentAsync: (s, c, f) => c.PutScriptAsync(s, f),
-			request: (s, c, r) => c.PutScript(r),
-			requestAsync: (s, c, r) => c.PutScriptAsync(r)
+			(s, c, f) => c.PutScript(s, f),
+			(s, c, f) => c.PutScriptAsync(s, f),
+			(s, c, r) => c.PutScript(r),
+			(s, c, r) => c.PutScriptAsync(r)
 		);
 
-		private string _updatedScript = "2+2";
-
 		private PutScriptRequest UpdateInitializer(string id) => new PutScriptRequest(id) { Script = new PainlessScript(_updatedScript) };
+
 		private IPutScriptRequest UpdateFluent(string id, PutScriptDescriptor d) => d.Painless(_updatedScript);
 
 		protected override LazyResponses Delete() => Calls<DeleteScriptDescriptor, DeleteScriptRequest, IDeleteScriptRequest, IDeleteScriptResponse>(
 			id => new DeleteScriptRequest(id),
 			(id, d) => d,
-			fluent: (s, c, f) => c.DeleteScript(s, f),
-			fluentAsync: (s, c, f) => c.DeleteScriptAsync(s, f),
-			request: (s, c, r) => c.DeleteScript(r),
-			requestAsync: (s, c, r) => c.DeleteScriptAsync(r)
+			(s, c, f) => c.DeleteScript(s, f),
+			(s, c, f) => c.DeleteScriptAsync(s, f),
+			(s, c, r) => c.DeleteScript(r),
+			(s, c, r) => c.DeleteScriptAsync(r)
 		);
 
 		protected override void ExpectAfterUpdate(IGetScriptResponse response) => response.Script.Source.Should().Be(_updatedScript);
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryApiTests.cs
index 61ed323a3a9..d67ce150b7f 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryApiTests.cs
@@ -4,28 +4,15 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Repositories.CreateRepository
 {
-	public class CreateAzureRepositoryApiTests : ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
+	public class CreateAzureRepositoryApiTests
+		: ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
 	{
-		public CreateAzureRepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _name = "repository1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CreateRepository(_name, f),
-			fluentAsync: (client, f) => client.CreateRepositoryAsync(_name, f),
-			request: (client, r) => client.CreateRepository(r),
-			requestAsync: (client, r) => client.CreateRepositoryAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_snapshot/{_name}";
-
-		protected override bool SupportsDeserialization => false;
+		public CreateAzureRepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -39,8 +26,6 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
-
 		protected override Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> Fluent => d => d
 			.Azure(a => a
 				.Settings(s => s
@@ -51,6 +36,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override CreateRepositoryRequest Initializer => new CreateRepositoryRequest(_name)
 		{
 			Repository = new AzureRepository()
@@ -64,31 +51,32 @@ protected override LazyResponses ClientUsage() => Calls(
 				}
 			}
 		};
-	}
-
-	public class CreateHdfsRepositoryApiTests : ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
-	{
-		public CreateHdfsRepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		private static readonly string _name = "repository1";
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_name}";
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CreateRepository(_name, f),
-			fluentAsync: (client, f) => client.CreateRepositoryAsync(_name, f),
-			request: (client, r) => client.CreateRepository(r),
-			requestAsync: (client, r) => client.CreateRepositoryAsync(r)
+			(client, f) => client.CreateRepository(_name, f),
+			(client, f) => client.CreateRepositoryAsync(_name, f),
+			(client, r) => client.CreateRepository(r),
+			(client, r) => client.CreateRepositoryAsync(r)
 		);
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_snapshot/{_name}";
+		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
+	}
 
-		protected override bool SupportsDeserialization => false;
+	public class CreateHdfsRepositoryApiTests
+		: ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
+	{
+		private static readonly string _name = "repository1";
+
+		public CreateHdfsRepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson { get; } = new
 		{
 			type = "hdfs",
-			settings = new {
+			settings = new
+			{
 				uri = "foouri",
 				path = "some/path",
 				load_defaults = true,
@@ -99,8 +87,6 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
-
 		protected override Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> Fluent => d => d
 			.Hdfs(h => h
 				.Settings("some/path", s => s
@@ -113,6 +99,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override CreateRepositoryRequest Initializer => new CreateRepositoryRequest(_name)
 		{
 			Repository = new HdfsRepository(new HdfsRepositorySettings("some/path")
@@ -125,31 +113,33 @@ protected override LazyResponses ClientUsage() => Calls(
 				ChunkSize = "64mb"
 			})
 		};
-	}
 
-	public class CreateFileSystemRepositoryApiTests
-		: ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
-	{
-		public CreateFileSystemRepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_name}";
 
-		private static readonly string _name = "repository1";
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CreateRepository(_name, f),
-			fluentAsync: (client, f) => client.CreateRepositoryAsync(_name, f),
-			request: (client, r) => client.CreateRepository(r),
-			requestAsync: (client, r) => client.CreateRepositoryAsync(r)
+			(client, f) => client.CreateRepository(_name, f),
+			(client, f) => client.CreateRepositoryAsync(_name, f),
+			(client, r) => client.CreateRepository(r),
+			(client, r) => client.CreateRepositoryAsync(r)
 		);
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_snapshot/{_name}";
+		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
+	}
 
-		protected override bool SupportsDeserialization => false;
+	public class CreateFileSystemRepositoryApiTests
+		: ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
+	{
+		private static readonly string _name = "repository1";
+
+		public CreateFileSystemRepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson { get; } = new
 		{
 			type = "fs",
-			settings = new {
+			settings = new
+			{
 				location = "some/location",
 				compress = true,
 				concurrent_streams = 5,
@@ -159,8 +149,6 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
-
 		protected override Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> Fluent => d => d
 			.FileSystem(fs => fs
 				.Settings("some/location", s => s
@@ -172,6 +160,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override CreateRepositoryRequest Initializer => new CreateRepositoryRequest(_name)
 		{
 			Repository = new FileSystemRepository(new FileSystemRepositorySettings("some/location")
@@ -183,37 +173,37 @@ protected override LazyResponses ClientUsage() => Calls(
 				SnapshotBytesPerSecondMaximum = "200mb"
 			})
 		};
-	}
 
-	public class CreateReadOnlyUrlRepositoryApiTests : ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
-	{
-		public CreateReadOnlyUrlRepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		private static readonly string _name = "repository1";
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_name}";
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CreateRepository(_name, f),
-			fluentAsync: (client, f) => client.CreateRepositoryAsync(_name, f),
-			request: (client, r) => client.CreateRepository(r),
-			requestAsync: (client, r) => client.CreateRepositoryAsync(r)
+			(client, f) => client.CreateRepository(_name, f),
+			(client, f) => client.CreateRepositoryAsync(_name, f),
+			(client, r) => client.CreateRepository(r),
+			(client, r) => client.CreateRepositoryAsync(r)
 		);
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_snapshot/{_name}";
+		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
+	}
 
-		protected override bool SupportsDeserialization => false;
+	public class CreateReadOnlyUrlRepositoryApiTests
+		: ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
+	{
+		private static readonly string _name = "repository1";
+
+		public CreateReadOnlyUrlRepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson { get; } = new
 		{
 			type = "url",
-			settings = new {
+			settings = new
+			{
 				location = "http://some/location",
 				concurrent_streams = 5
 			}
 		};
 
-		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
-
 		protected override Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> Fluent => d => d
 			.ReadOnlyUrl(u => u
 				.Settings("http://some/location", s => s
@@ -221,6 +211,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override CreateRepositoryRequest Initializer => new CreateRepositoryRequest(_name)
 		{
 			Repository = new ReadOnlyUrlRepository(new ReadOnlyUrlRepositorySettings("http://some/location")
@@ -228,30 +220,32 @@ protected override LazyResponses ClientUsage() => Calls(
 				ConcurrentStreams = 5,
 			})
 		};
-	}
 
-	public class CreateS3RepositoryApiTests : ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
-	{
-		public CreateS3RepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		private static readonly string _name = "repository1";
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_name}";
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CreateRepository(_name, f),
-			fluentAsync: (client, f) => client.CreateRepositoryAsync(_name, f),
-			request: (client, r) => client.CreateRepository(r),
-			requestAsync: (client, r) => client.CreateRepositoryAsync(r)
+			(client, f) => client.CreateRepository(_name, f),
+			(client, f) => client.CreateRepositoryAsync(_name, f),
+			(client, r) => client.CreateRepository(r),
+			(client, r) => client.CreateRepositoryAsync(r)
 		);
 
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_snapshot/{_name}";
+		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
+	}
 
-		protected override bool SupportsDeserialization => false;
+	public class CreateS3RepositoryApiTests
+		: ApiTestBase<WritableCluster, ICreateRepositoryResponse, ICreateRepositoryRequest, CreateRepositoryDescriptor, CreateRepositoryRequest>
+	{
+		private static readonly string _name = "repository1";
+
+		public CreateS3RepositoryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson { get; } = new
 		{
 			type = "s3",
-			settings = new {
+			settings = new
+			{
 				bucket = "foobucket",
 				client = "default",
 				base_path = "some/path",
@@ -264,8 +258,6 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
-
 		protected override Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> Fluent => d => d
 			.S3(fs => fs
 				.Settings("foobucket", s => s
@@ -280,6 +272,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override CreateRepositoryRequest Initializer => new CreateRepositoryRequest(_name)
 		{
 			Repository = new S3Repository(new S3RepositorySettings("foobucket")
@@ -294,5 +288,17 @@ protected override LazyResponses ClientUsage() => Calls(
 				StorageClass = "standard"
 			})
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_name}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.CreateRepository(_name, f),
+			(client, f) => client.CreateRepositoryAsync(_name, f),
+			(client, r) => client.CreateRepository(r),
+			(client, r) => client.CreateRepositoryAsync(r)
+		);
+
+		protected override CreateRepositoryDescriptor NewDescriptor() => new CreateRepositoryDescriptor(_name);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryUrlTests.cs
index 8cbe9cac002..ab96da64585 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var repository = "repos";
 
 			await PUT($"/_snapshot/{repository}")
-				.Fluent(c => c.CreateRepository(repository, s=>s))
-				.Request(c => c.CreateRepository(new CreateRepositoryRequest(repository)))
-				.FluentAsync(c => c.CreateRepositoryAsync(repository, s=>s))
-				.RequestAsync(c => c.CreateRepositoryAsync(new CreateRepositoryRequest(repository)))
+					.Fluent(c => c.CreateRepository(repository, s => s))
+					.Request(c => c.CreateRepository(new CreateRepositoryRequest(repository)))
+					.FluentAsync(c => c.CreateRepositoryAsync(repository, s => s))
+					.RequestAsync(c => c.CreateRepositoryAsync(new CreateRepositoryRequest(repository)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryApiTests.cs
index 444e06621bc..437efef9030 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryApiTests.cs
@@ -4,33 +4,32 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Repositories.DeleteRepository
 {
-	public class DeleteRepositoryApiTests : ApiTestBase<ReadOnlyCluster, IDeleteRepositoryResponse, IDeleteRepositoryRequest, DeleteRepositoryDescriptor, DeleteRepositoryRequest>
+	public class DeleteRepositoryApiTests
+		: ApiTestBase<ReadOnlyCluster, IDeleteRepositoryResponse, IDeleteRepositoryRequest, DeleteRepositoryDescriptor, DeleteRepositoryRequest>
 	{
-		public DeleteRepositoryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _name = "repository1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteRepository(_name, f),
-			fluentAsync: (client, f) => client.DeleteRepositoryAsync(_name, f),
-			request: (client, r) => client.DeleteRepository(r),
-			requestAsync: (client, r) => client.DeleteRepositoryAsync(r)
-		);
+		public DeleteRepositoryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> Fluent => d => d;
 
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/_snapshot/{_name}";
 
-		protected override bool SupportsDeserialization => false;
+		protected override DeleteRepositoryRequest Initializer => new DeleteRepositoryRequest(_name);
 
-		protected override DeleteRepositoryDescriptor NewDescriptor() => new DeleteRepositoryDescriptor(_name);
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_name}";
 
-		protected override Func<DeleteRepositoryDescriptor, IDeleteRepositoryRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteRepository(_name, f),
+			(client, f) => client.DeleteRepositoryAsync(_name, f),
+			(client, r) => client.DeleteRepository(r),
+			(client, r) => client.DeleteRepositoryAsync(r)
+		);
 
-		protected override DeleteRepositoryRequest Initializer => new DeleteRepositoryRequest(_name);
+		protected override DeleteRepositoryDescriptor NewDescriptor() => new DeleteRepositoryDescriptor(_name);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryUrlTests.cs
index 17e5fc0bd90..df831ab1db9 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/DeleteRepository/DeleteRepositoryUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var repository = "repos";
 
 			await DELETE($"/_snapshot/{repository}")
-				.Fluent(c => c.DeleteRepository(repository))
-				.Request(c => c.DeleteRepository(new DeleteRepositoryRequest(repository)))
-				.FluentAsync(c => c.DeleteRepositoryAsync(repository))
-				.RequestAsync(c => c.DeleteRepositoryAsync(new DeleteRepositoryRequest(repository)))
+					.Fluent(c => c.DeleteRepository(repository))
+					.Request(c => c.DeleteRepository(new DeleteRepositoryRequest(repository)))
+					.FluentAsync(c => c.DeleteRepositoryAsync(repository))
+					.RequestAsync(c => c.DeleteRepositoryAsync(new DeleteRepositoryRequest(repository)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryApiTests.cs
index 6ccfce917c6..69a0849d146 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryApiTests.cs
@@ -4,31 +4,30 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Repositories.GetRepository
 {
-	public class GetRepositoryApiTests : ApiTestBase<ReadOnlyCluster, IGetRepositoryResponse, IGetRepositoryRequest, GetRepositoryDescriptor, GetRepositoryRequest>
+	public class GetRepositoryApiTests
+		: ApiTestBase<ReadOnlyCluster, IGetRepositoryResponse, IGetRepositoryRequest, GetRepositoryDescriptor, GetRepositoryRequest>
 	{
-		public GetRepositoryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _name = "repository1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetRepository(f),
-			fluentAsync: (client, f) => client.GetRepositoryAsync(f),
-			request: (client, r) => client.GetRepository(r),
-			requestAsync: (client, r) => client.GetRepositoryAsync(r)
-		);
+		public GetRepositoryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<GetRepositoryDescriptor, IGetRepositoryRequest> Fluent => d => d.RepositoryName(_name);
 
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_snapshot/{_name}";
 
-		protected override bool SupportsDeserialization => false;
+		protected override GetRepositoryRequest Initializer => new GetRepositoryRequest(_name);
 
-		protected override Func<GetRepositoryDescriptor, IGetRepositoryRequest> Fluent => d => d.RepositoryName(_name);
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_name}";
 
-		protected override GetRepositoryRequest Initializer => new GetRepositoryRequest(_name);
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetRepository(f),
+			(client, f) => client.GetRepositoryAsync(f),
+			(client, r) => client.GetRepository(r),
+			(client, r) => client.GetRepositoryAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryUrlTests.cs
index 065510c4ac3..ac9686b9b5a 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryUrlTests.cs
@@ -13,16 +13,16 @@ [U] public async Task Urls()
 			var repositories = "repos1,repos2";
 
 			await GET($"/_snapshot/repos1%2Crepos2")
-				.Fluent(c => c.GetRepository(s=>s.RepositoryName(repositories)))
-				.Request(c => c.GetRepository(new GetRepositoryRequest(repositories)))
-				.FluentAsync(c => c.GetRepositoryAsync(s=>s.RepositoryName(repositories)))
-				.RequestAsync(c => c.GetRepositoryAsync(new GetRepositoryRequest(repositories)))
+					.Fluent(c => c.GetRepository(s => s.RepositoryName(repositories)))
+					.Request(c => c.GetRepository(new GetRepositoryRequest(repositories)))
+					.FluentAsync(c => c.GetRepositoryAsync(s => s.RepositoryName(repositories)))
+					.RequestAsync(c => c.GetRepositoryAsync(new GetRepositoryRequest(repositories)))
 				;
 			await GET($"/_snapshot")
-				.Fluent(c => c.GetRepository())
-				.Request(c => c.GetRepository(new GetRepositoryRequest()))
-				.FluentAsync(c => c.GetRepositoryAsync())
-				.RequestAsync(c => c.GetRepositoryAsync(new GetRepositoryRequest()))
+					.Fluent(c => c.GetRepository())
+					.Request(c => c.GetRepository(new GetRepositoryRequest()))
+					.FluentAsync(c => c.GetRepositoryAsync())
+					.RequestAsync(c => c.GetRepositoryAsync(new GetRepositoryRequest()))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/RepositoryCrudTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/RepositoryCrudTests.cs
index 35ddaa61975..1203e1a8ae6 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/RepositoryCrudTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/RepositoryCrudTests.cs
@@ -6,29 +6,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Repositories
 {
 	public class RepositoryCrudTests
-		: CrudTestBase<IntrusiveOperationCluster, ICreateRepositoryResponse, IGetRepositoryResponse, ICreateRepositoryResponse, IDeleteRepositoryResponse>
+		: CrudTestBase<IntrusiveOperationCluster, ICreateRepositoryResponse, IGetRepositoryResponse, ICreateRepositoryResponse,
+			IDeleteRepositoryResponse>
 	{
-		public RepositoryCrudTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
+		private readonly string _rootRepositoryPath;
+
+		public RepositoryCrudTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) =>
 			_rootRepositoryPath = cluster.FileSystem.RepositoryPath;
-		}
 
-		protected override LazyResponses Create() => Calls<CreateRepositoryDescriptor, CreateRepositoryRequest, ICreateRepositoryRequest, ICreateRepositoryResponse>(
-			CreateInitializer,
-			CreateFluent,
-			fluent: (s, c, f) => c.CreateRepository(s, f),
-			fluentAsync: (s, c, f) => c.CreateRepositoryAsync(s, f),
-			request: (s, c, r) => c.CreateRepository(r),
-			requestAsync: (s, c, r) => c.CreateRepositoryAsync(r)
-		);
+		protected override LazyResponses Create() =>
+			Calls<CreateRepositoryDescriptor, CreateRepositoryRequest, ICreateRepositoryRequest, ICreateRepositoryResponse>(
+				CreateInitializer,
+				CreateFluent,
+				(s, c, f) => c.CreateRepository(s, f),
+				(s, c, f) => c.CreateRepositoryAsync(s, f),
+				(s, c, r) => c.CreateRepository(r),
+				(s, c, r) => c.CreateRepositoryAsync(r)
+			);
 
-		private string _rootRepositoryPath;
 		private string GetRepositoryPath(string name) => Path.Combine(_rootRepositoryPath, name);
 
 		protected CreateRepositoryRequest CreateInitializer(string name) =>
@@ -40,7 +39,7 @@ protected CreateRepositoryRequest CreateInitializer(string name) =>
 						ChunkSize = "64mb",
 						Compress = true
 					}
-					)
+				)
 			};
 
 		protected ICreateRepositoryRequest CreateFluent(string name, CreateRepositoryDescriptor d) => d
@@ -51,37 +50,39 @@ protected ICreateRepositoryRequest CreateFluent(string name, CreateRepositoryDes
 				)
 			);
 
-		protected override LazyResponses Read() => Calls<GetRepositoryDescriptor, GetRepositoryRequest, IGetRepositoryRequest, IGetRepositoryResponse>(
-			ReadInitializer,
-			ReadFluent,
-			fluent: (s, c, f) => c.GetRepository(f),
-			fluentAsync: (s, c, f) => c.GetRepositoryAsync(f),
-			request: (s, c, r) => c.GetRepository(r),
-			requestAsync: (s, c, r) => c.GetRepositoryAsync(r)
-		);
+		protected override LazyResponses Read() =>
+			Calls<GetRepositoryDescriptor, GetRepositoryRequest, IGetRepositoryRequest, IGetRepositoryResponse>(
+				ReadInitializer,
+				ReadFluent,
+				(s, c, f) => c.GetRepository(f),
+				(s, c, f) => c.GetRepositoryAsync(f),
+				(s, c, r) => c.GetRepository(r),
+				(s, c, r) => c.GetRepositoryAsync(r)
+			);
 
 		protected GetRepositoryRequest ReadInitializer(string name) => new GetRepositoryRequest(name);
 
 		protected IGetRepositoryRequest ReadFluent(string name, GetRepositoryDescriptor d) => d
 			.RepositoryName(name);
 
-		protected override LazyResponses Update() => Calls<CreateRepositoryDescriptor, CreateRepositoryRequest, ICreateRepositoryRequest, ICreateRepositoryResponse>(
-			UpdateInitializer,
-			UpdateFluent,
-			fluent: (s, c, f) => c.CreateRepository(s, f),
-			fluentAsync: (s, c, f) => c.CreateRepositoryAsync(s, f),
-			request: (s, c, r) => c.CreateRepository(r),
-			requestAsync: (s, c, r) => c.CreateRepositoryAsync(r)
-		);
+		protected override LazyResponses Update() =>
+			Calls<CreateRepositoryDescriptor, CreateRepositoryRequest, ICreateRepositoryRequest, ICreateRepositoryResponse>(
+				UpdateInitializer,
+				UpdateFluent,
+				(s, c, f) => c.CreateRepository(s, f),
+				(s, c, f) => c.CreateRepositoryAsync(s, f),
+				(s, c, r) => c.CreateRepository(r),
+				(s, c, r) => c.CreateRepositoryAsync(r)
+			);
 
 		protected CreateRepositoryRequest UpdateInitializer(string name) => new CreateRepositoryRequest(name)
 		{
 			Repository = new FileSystemRepository(new FileSystemRepositorySettings(GetRepositoryPath(name))
-			{
-				ChunkSize = "64mb",
-				Compress = true,
-				ConcurrentStreams = 5
-			}
+				{
+					ChunkSize = "64mb",
+					Compress = true,
+					ConcurrentStreams = 5
+				}
 			)
 		};
 
@@ -94,14 +95,15 @@ protected ICreateRepositoryRequest UpdateFluent(string name, CreateRepositoryDes
 				)
 			);
 
-		protected override LazyResponses Delete() => Calls<DeleteRepositoryDescriptor, DeleteRepositoryRequest, IDeleteRepositoryRequest, IDeleteRepositoryResponse>(
-			DeleteInitializer,
-			DeleteFluent,
-			fluent: (s, c, f) => c.DeleteRepository(s),
-			fluentAsync: (s, c, f) => c.DeleteRepositoryAsync(s),
-			request: (s, c, r) => c.DeleteRepository(r),
-			requestAsync: (s, c, r) => c.DeleteRepositoryAsync(r)
-		);
+		protected override LazyResponses Delete() =>
+			Calls<DeleteRepositoryDescriptor, DeleteRepositoryRequest, IDeleteRepositoryRequest, IDeleteRepositoryResponse>(
+				DeleteInitializer,
+				DeleteFluent,
+				(s, c, f) => c.DeleteRepository(s),
+				(s, c, f) => c.DeleteRepositoryAsync(s),
+				(s, c, r) => c.DeleteRepository(r),
+				(s, c, r) => c.DeleteRepositoryAsync(r)
+			);
 
 		protected DeleteRepositoryRequest DeleteInitializer(string name) => new DeleteRepositoryRequest(name);
 
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryApiTests.cs
index 1d8ca623ad7..923adefc178 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryApiTests.cs
@@ -4,36 +4,35 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Repositories.VerifyRepository
 {
-	public class VerifyRepositoryApiTests : ApiTestBase<ReadOnlyCluster, IVerifyRepositoryResponse, IVerifyRepositoryRequest, VerifyRepositoryDescriptor, VerifyRepositoryRequest>
+	public class VerifyRepositoryApiTests
+		: ApiTestBase<ReadOnlyCluster, IVerifyRepositoryResponse, IVerifyRepositoryRequest, VerifyRepositoryDescriptor, VerifyRepositoryRequest>
 	{
-		public VerifyRepositoryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _name = "repository1";
 
+		public VerifyRepositoryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.VerifyRepository(_name, f),
-			fluentAsync: (client, f) => client.VerifyRepositoryAsync(_name, f),
-			request: (client, r) => client.VerifyRepository(r),
-			requestAsync: (client, r) => client.VerifyRepositoryAsync(r)
-		);
+		protected override object ExpectJson { get; } = new { };
+
+		protected override Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> Fluent => d => d;
 
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_snapshot/{_name}/_verify";
 
-		protected override bool SupportsDeserialization => false;
+		protected override VerifyRepositoryRequest Initializer => new VerifyRepositoryRequest(_name);
 
-		protected override object ExpectJson { get; } = new { };
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_name}/_verify";
 
-		protected override VerifyRepositoryDescriptor NewDescriptor() => new VerifyRepositoryDescriptor(_name);
 
-		protected override Func<VerifyRepositoryDescriptor, IVerifyRepositoryRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.VerifyRepository(_name, f),
+			(client, f) => client.VerifyRepositoryAsync(_name, f),
+			(client, r) => client.VerifyRepository(r),
+			(client, r) => client.VerifyRepositoryAsync(r)
+		);
 
-		protected override VerifyRepositoryRequest Initializer => new VerifyRepositoryRequest(_name);
+		protected override VerifyRepositoryDescriptor NewDescriptor() => new VerifyRepositoryDescriptor(_name);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryUrlTests.cs
index bb6b21038ea..f72fd44759b 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryUrlTests.cs
@@ -13,10 +13,10 @@ [U] public async Task Urls()
 			var repos = "repos1";
 
 			await POST($"/_snapshot/repos1/_verify")
-				.Fluent(c => c.VerifyRepository(repos))
-				.Request(c => c.VerifyRepository(new VerifyRepositoryRequest(repos)))
-				.FluentAsync(c => c.VerifyRepositoryAsync(repos))
-				.RequestAsync(c => c.VerifyRepositoryAsync(new VerifyRepositoryRequest(repos)))
+					.Fluent(c => c.VerifyRepository(repos))
+					.Request(c => c.VerifyRepository(new VerifyRepositoryRequest(repos)))
+					.FluentAsync(c => c.VerifyRepositoryAsync(repos))
+					.RequestAsync(c => c.VerifyRepositoryAsync(new VerifyRepositoryRequest(repos)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Restore/RestoreApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Restore/RestoreApiTests.cs
index 2d5f4401d50..34fff7e0846 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Restore/RestoreApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Restore/RestoreApiTests.cs
@@ -7,8 +7,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Restore
 {
@@ -18,7 +16,7 @@ public RestoreApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) :
 		{
 			if (!TestClient.Configuration.RunIntegrationTests) return;
 
-			var createRepository = this.Client.CreateRepository(RepositoryName, r => r
+			var createRepository = Client.CreateRepository(RepositoryName, r => r
 				.FileSystem(fs => fs
 					.Settings(Path.Combine(cluster.FileSystem.RepositoryPath, RepositoryName))
 				)
@@ -26,12 +24,12 @@ public RestoreApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) :
 			if (!createRepository.IsValid)
 				throw new Exception("Setup: failed to create snapshot repository");
 
-			var getSnapshotResponse = this.Client.GetSnapshot(RepositoryName, SnapshotName);
+			var getSnapshotResponse = Client.GetSnapshot(RepositoryName, SnapshotName);
 
-			if ((!getSnapshotResponse.IsValid && getSnapshotResponse.ApiCall.HttpStatusCode == 404) ||
+			if (!getSnapshotResponse.IsValid && getSnapshotResponse.ApiCall.HttpStatusCode == 404 ||
 				!getSnapshotResponse.Snapshots.Any())
 			{
-				var snapshot = this.Client.Snapshot(RepositoryName, SnapshotName, s => s
+				var snapshot = Client.Snapshot(RepositoryName, SnapshotName, s => s
 					.WaitForCompletion()
 				);
 
@@ -40,37 +38,37 @@ public RestoreApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) :
 			}
 		}
 
-		private static string RepositoryName { get; } = RandomString();
-		private static string SnapshotName { get; } = RandomString();
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Restore(RepositoryName, SnapshotName, f),
-			fluentAsync: (client, f) => client.RestoreAsync(RepositoryName, SnapshotName, f),
-			request: (client, r) => client.Restore(r),
-			requestAsync: (client, r) => client.RestoreAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_snapshot/{RepositoryName}/{SnapshotName}/_restore";
-
 		protected override object ExpectJson { get; } = new
 		{
 			rename_pattern = "nest-(.+)",
 			rename_replacement = "nest-restored-$1",
 		};
 
-		protected override bool SupportsDeserialization => false;
-
-		protected override RestoreDescriptor NewDescriptor() => new RestoreDescriptor(RepositoryName, SnapshotName);
-
 		protected override Func<RestoreDescriptor, IRestoreRequest> Fluent => d => d
 			.RenamePattern("nest-(.+)")
 			.RenameReplacement("nest-restored-$1");
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override RestoreRequest Initializer => new RestoreRequest(RepositoryName, SnapshotName)
 		{
 			RenamePattern = "nest-(.+)",
 			RenameReplacement = "nest-restored-$1"
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{RepositoryName}/{SnapshotName}/_restore";
+
+		private static string RepositoryName { get; } = RandomString();
+		private static string SnapshotName { get; } = RandomString();
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Restore(RepositoryName, SnapshotName, f),
+			(client, f) => client.RestoreAsync(RepositoryName, SnapshotName, f),
+			(client, r) => client.Restore(r),
+			(client, r) => client.RestoreAsync(r)
+		);
+
+		protected override RestoreDescriptor NewDescriptor() => new RestoreDescriptor(RepositoryName, SnapshotName);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Restore/RestoreUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Restore/RestoreUrlTests.cs
index 73991c75fd0..f8c29dfccc9 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Restore/RestoreUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Restore/RestoreUrlTests.cs
@@ -14,10 +14,10 @@ [U] public async Task Urls()
 			var snapshot = "snap";
 
 			await POST($"/_snapshot/{repository}/{snapshot}/_restore")
-				.Fluent(c => c.Restore(repository, snapshot))
-				.Request(c => c.Restore(new RestoreRequest(repository, snapshot)))
-				.FluentAsync(c => c.RestoreAsync(repository, snapshot))
-				.RequestAsync(c => c.RestoreAsync(new RestoreRequest(repository, snapshot)))
+					.Fluent(c => c.Restore(repository, snapshot))
+					.Request(c => c.Restore(new RestoreRequest(repository, snapshot)))
+					.FluentAsync(c => c.RestoreAsync(repository, snapshot))
+					.RequestAsync(c => c.RestoreAsync(new RestoreRequest(repository, snapshot)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotApiTests.cs
index a68973fecec..4972c8b4af0 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotApiTests.cs
@@ -4,34 +4,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Snapshot.DeleteSnapshot
 {
-	public class DeleteSnapshotApiTests : ApiTestBase<WritableCluster, IDeleteSnapshotResponse, IDeleteSnapshotRequest, DeleteSnapshotDescriptor, DeleteSnapshotRequest>
+	public class DeleteSnapshotApiTests
+		: ApiTestBase<WritableCluster, IDeleteSnapshotResponse, IDeleteSnapshotRequest, DeleteSnapshotDescriptor, DeleteSnapshotRequest>
 	{
-		public DeleteSnapshotApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _repos = "repository1";
 		private static readonly string _snapshot = "snapshot1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteSnapshot(_repos, _snapshot, f),
-			fluentAsync: (client, f) => client.DeleteSnapshotAsync(_repos, _snapshot, f),
-			request: (client, r) => client.DeleteSnapshot(r),
-			requestAsync: (client, r) => client.DeleteSnapshotAsync(r)
-		);
+		public DeleteSnapshotApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> Fluent => d => d;
 
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/_snapshot/{_repos}/{_snapshot}";
 
-		protected override bool SupportsDeserialization => false;
+		protected override DeleteSnapshotRequest Initializer => new DeleteSnapshotRequest(_repos, _snapshot);
 
-		protected override DeleteSnapshotDescriptor NewDescriptor() => new DeleteSnapshotDescriptor(_repos, _snapshot);
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_repos}/{_snapshot}";
 
-		protected override Func<DeleteSnapshotDescriptor, IDeleteSnapshotRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteSnapshot(_repos, _snapshot, f),
+			(client, f) => client.DeleteSnapshotAsync(_repos, _snapshot, f),
+			(client, r) => client.DeleteSnapshot(r),
+			(client, r) => client.DeleteSnapshotAsync(r)
+		);
 
-		protected override DeleteSnapshotRequest Initializer => new DeleteSnapshotRequest(_repos, _snapshot);
+		protected override DeleteSnapshotDescriptor NewDescriptor() => new DeleteSnapshotDescriptor(_repos, _snapshot);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotUrlTests.cs
index db295b9a198..3025c7dae94 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/DeleteSnapshot/DeleteSnapshotUrlTests.cs
@@ -14,10 +14,10 @@ [U] public async Task Urls()
 			var snapshot = "snap";
 
 			await DELETE($"/_snapshot/{repository}/{snapshot}")
-				.Fluent(c => c.DeleteSnapshot(repository, snapshot))
-				.Request(c => c.DeleteSnapshot(new DeleteSnapshotRequest(repository, snapshot)))
-				.FluentAsync(c => c.DeleteSnapshotAsync(repository, snapshot))
-				.RequestAsync(c => c.DeleteSnapshotAsync(new DeleteSnapshotRequest(repository, snapshot)))
+					.Fluent(c => c.DeleteSnapshot(repository, snapshot))
+					.Request(c => c.DeleteSnapshot(new DeleteSnapshotRequest(repository, snapshot)))
+					.FluentAsync(c => c.DeleteSnapshotAsync(repository, snapshot))
+					.RequestAsync(c => c.DeleteSnapshotAsync(new DeleteSnapshotRequest(repository, snapshot)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/GetSnapshot/GetSnapshotApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/GetSnapshot/GetSnapshotApiTests.cs
index ded038ef413..7bb1ee23d62 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/GetSnapshot/GetSnapshotApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/GetSnapshot/GetSnapshotApiTests.cs
@@ -4,34 +4,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Snapshot.GetSnapshot
 {
-	public class GetSnapshotApiTests : ApiTestBase<ReadOnlyCluster, IGetSnapshotResponse, IGetSnapshotRequest, GetSnapshotDescriptor, GetSnapshotRequest>
+	public class GetSnapshotApiTests
+		: ApiTestBase<ReadOnlyCluster, IGetSnapshotResponse, IGetSnapshotRequest, GetSnapshotDescriptor, GetSnapshotRequest>
 	{
-		public GetSnapshotApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _repos = "repository1";
 		private static readonly string _snapshot = "snapshot1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetSnapshot(_repos, _snapshot, f),
-			fluentAsync: (client, f) => client.GetSnapshotAsync(_repos, _snapshot, f),
-			request: (client, r) => client.GetSnapshot(r),
-			requestAsync: (client, r) => client.GetSnapshotAsync(r)
-		);
+		public GetSnapshotApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<GetSnapshotDescriptor, IGetSnapshotRequest> Fluent => d => d;
 
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_snapshot/{_repos}/{_snapshot}";
 
-		protected override bool SupportsDeserialization => false;
+		protected override GetSnapshotRequest Initializer => new GetSnapshotRequest(_repos, _snapshot);
 
-		protected override GetSnapshotDescriptor NewDescriptor() => new GetSnapshotDescriptor(_repos, _snapshot);
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_repos}/{_snapshot}";
 
-		protected override Func<GetSnapshotDescriptor, IGetSnapshotRequest> Fluent => d => d;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetSnapshot(_repos, _snapshot, f),
+			(client, f) => client.GetSnapshotAsync(_repos, _snapshot, f),
+			(client, r) => client.GetSnapshot(r),
+			(client, r) => client.GetSnapshotAsync(r)
+		);
 
-		protected override GetSnapshotRequest Initializer => new GetSnapshotRequest(_repos, _snapshot);
+		protected override GetSnapshotDescriptor NewDescriptor() => new GetSnapshotDescriptor(_repos, _snapshot);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/GetSnapshot/GetSnapshotUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/GetSnapshot/GetSnapshotUrlTests.cs
index fe2c559151b..a2bfda738e5 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/GetSnapshot/GetSnapshotUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/GetSnapshot/GetSnapshotUrlTests.cs
@@ -14,10 +14,10 @@ [U] public async Task Urls()
 			var snapshot = "snap";
 
 			await GET($"/_snapshot/{repository}/{snapshot}")
-				.Fluent(c => c.GetSnapshot(repository, snapshot))
-				.Request(c => c.GetSnapshot(new GetSnapshotRequest(repository, snapshot)))
-				.FluentAsync(c => c.GetSnapshotAsync(repository, snapshot))
-				.RequestAsync(c => c.GetSnapshotAsync(new GetSnapshotRequest(repository, snapshot)))
+					.Fluent(c => c.GetSnapshot(repository, snapshot))
+					.Request(c => c.GetSnapshot(new GetSnapshotRequest(repository, snapshot)))
+					.FluentAsync(c => c.GetSnapshotAsync(repository, snapshot))
+					.RequestAsync(c => c.GetSnapshotAsync(new GetSnapshotRequest(repository, snapshot)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotApiTests.cs
index 764fb736556..7cbc358eebf 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotApiTests.cs
@@ -5,30 +5,16 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Modules.SnapshotAndRestore.Snapshot.Snapshot
 {
 	public class SnapshotApiTests : ApiTestBase<ReadOnlyCluster, ISnapshotResponse, ISnapshotRequest, SnapshotDescriptor, SnapshotRequest>
 	{
-		public SnapshotApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _repos = "repository1";
 		private static readonly string _snapshot = "snapshot1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Snapshot(_repos, _snapshot, f),
-			fluentAsync: (client, f) => client.SnapshotAsync(_repos, _snapshot, f),
-			request: (client, r) => client.Snapshot(r),
-			requestAsync: (client, r) => client.SnapshotAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_snapshot/{_repos}/{_snapshot}?wait_for_completion=true";
-
-		protected override bool SupportsDeserialization => false;
+		public SnapshotApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -36,13 +22,12 @@ protected override LazyResponses ClientUsage() => Calls(
 			include_global_state = true
 		};
 
-		protected override SnapshotDescriptor NewDescriptor() => new SnapshotDescriptor(_repos, _snapshot);
-
 		protected override Func<SnapshotDescriptor, ISnapshotRequest> Fluent => d => d
 			.Index<Project>()
 			.IncludeGlobalState()
-			.WaitForCompletion()
-		;
+			.WaitForCompletion();
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
 		protected override SnapshotRequest Initializer => new SnapshotRequest(_repos, _snapshot)
 		{
@@ -50,5 +35,17 @@ protected override LazyResponses ClientUsage() => Calls(
 			IncludeGlobalState = true,
 			WaitForCompletion = true
 		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_repos}/{_snapshot}?wait_for_completion=true";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Snapshot(_repos, _snapshot, f),
+			(client, f) => client.SnapshotAsync(_repos, _snapshot, f),
+			(client, r) => client.Snapshot(r),
+			(client, r) => client.SnapshotAsync(r)
+		);
+
+		protected override SnapshotDescriptor NewDescriptor() => new SnapshotDescriptor(_repos, _snapshot);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotUrlTests.cs
index 570fbad8d2b..96cfe09c62b 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/Snapshot/SnapshotUrlTests.cs
@@ -15,20 +15,20 @@ [U] public async Task Urls()
 			var snapshot = "snap";
 
 			await PUT($"/_snapshot/{repository}/{snapshot}")
-				.Fluent(c => c.Snapshot(repository, snapshot))
-				.Request(c => c.Snapshot(new SnapshotRequest(repository, snapshot)))
-				.FluentAsync(c => c.SnapshotAsync(repository, snapshot))
-				.RequestAsync(c => c.SnapshotAsync(new SnapshotRequest(repository, snapshot)))
+					.Fluent(c => c.Snapshot(repository, snapshot))
+					.Request(c => c.Snapshot(new SnapshotRequest(repository, snapshot)))
+					.FluentAsync(c => c.SnapshotAsync(repository, snapshot))
+					.RequestAsync(c => c.SnapshotAsync(new SnapshotRequest(repository, snapshot)))
 				;
 
 
-			await ExpectUrl(HttpMethod.PUT, $"/_snapshot/{repository}/{snapshot}?pretty=true", s=>s.PrettyJson())
+			await ExpectUrl(HttpMethod.PUT, $"/_snapshot/{repository}/{snapshot}?pretty=true", s => s.PrettyJson())
 				.Fluent(c => c.Snapshot(repository, snapshot))
 				.Request(c => c.Snapshot(new SnapshotRequest(repository, snapshot)))
 				.FluentAsync(c => c.SnapshotAsync(repository, snapshot))
 				.RequestAsync(c => c.SnapshotAsync(new SnapshotRequest(repository, snapshot)));
 
-			await ExpectUrl(HttpMethod.PUT, $"/_snapshot/{repository}/{snapshot}?pretty=true", s=>s.PrettyJson())
+			await ExpectUrl(HttpMethod.PUT, $"/_snapshot/{repository}/{snapshot}?pretty=true", s => s.PrettyJson())
 				.Fluent(c => c.Snapshot(repository, snapshot, s => s.Pretty()))
 				.Request(c => c.Snapshot(new SnapshotRequest(repository, snapshot) { Pretty = true }))
 				.FluentAsync(c => c.SnapshotAsync(repository, snapshot, s => s.Pretty()))
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs
index 82c485edf8a..a79724c8f0e 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs
@@ -7,8 +7,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Snapshot
 {
@@ -17,14 +15,15 @@ public class SnapshotCrudTests
 	{
 		private static readonly string SnapshotIndexName = Guid.NewGuid().ToString("N").Substring(8);
 
-		public SnapshotCrudTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
+		private readonly string _repositoryLocation;
+		private readonly string _repositoryName = RandomString();
+
+		public SnapshotCrudTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) =>
 			_repositoryLocation = Path.Combine(cluster.FileSystem.RepositoryPath, RandomString());
-		}
 
 		protected override void IntegrationSetup(IElasticClient client)
 		{
-			var create = this.Client.CreateRepository(_repositoryName, cr => cr
+			var create = Client.CreateRepository(_repositoryName, cr => cr
 				.FileSystem(fs => fs
 					.Settings(_repositoryLocation)
 				)
@@ -33,23 +32,20 @@ protected override void IntegrationSetup(IElasticClient client)
 			if (!create.IsValid || !create.Acknowledged)
 				throw new Exception("Setup: failed to create snapshot repository");
 
-			var createIndex = this.Client.CreateIndex(SnapshotIndexName);
-			var waitForIndex = this.Client.ClusterHealth(c=>c
+			var createIndex = Client.CreateIndex(SnapshotIndexName);
+			var waitForIndex = Client.ClusterHealth(c => c
 				.WaitForStatus(WaitForStatus.Yellow)
 				.Index(SnapshotIndexName)
 			);
 		}
 
-		private string _repositoryLocation;
-		private string _repositoryName = RandomString();
-
 		protected override LazyResponses Create() => Calls<SnapshotDescriptor, SnapshotRequest, ISnapshotRequest, ISnapshotResponse>(
 			CreateInitializer,
 			CreateFluent,
-			fluent: (s, c, f) => c.Snapshot(_repositoryName, s, f),
-			fluentAsync: (s, c, f) => c.SnapshotAsync(_repositoryName, s, f),
-			request: (s, c, r) => c.Snapshot(r),
-			requestAsync: (s, c, r) => c.SnapshotAsync(r)
+			(s, c, f) => c.Snapshot(_repositoryName, s, f),
+			(s, c, f) => c.SnapshotAsync(_repositoryName, s, f),
+			(s, c, r) => c.Snapshot(r),
+			(s, c, r) => c.SnapshotAsync(r)
 		);
 
 		protected SnapshotRequest CreateInitializer(string snapshotName) => new SnapshotRequest(_repositoryName, snapshotName)
@@ -65,25 +61,28 @@ protected ISnapshotRequest CreateFluent(string snapshotName, SnapshotDescriptor
 		protected override LazyResponses Read() => Calls<GetSnapshotDescriptor, GetSnapshotRequest, IGetSnapshotRequest, IGetSnapshotResponse>(
 			ReadInitializer,
 			ReadFluent,
-			fluent: (s, c, f) => c.GetSnapshot(_repositoryName, s, f),
-			fluentAsync: (s, c, f) => c.GetSnapshotAsync(_repositoryName, s, f),
-			request: (s, c, r) => c.GetSnapshot(r),
-			requestAsync: (s, c, r) => c.GetSnapshotAsync(r)
+			(s, c, f) => c.GetSnapshot(_repositoryName, s, f),
+			(s, c, f) => c.GetSnapshotAsync(_repositoryName, s, f),
+			(s, c, r) => c.GetSnapshot(r),
+			(s, c, r) => c.GetSnapshotAsync(r)
 		);
 
 		protected GetSnapshotRequest ReadInitializer(string snapshotName) => new GetSnapshotRequest(_repositoryName, snapshotName);
+
 		protected IGetSnapshotRequest ReadFluent(string snapshotName, GetSnapshotDescriptor d) => null;
 
-		protected override LazyResponses Delete() => Calls<DeleteSnapshotDescriptor, DeleteSnapshotRequest, IDeleteSnapshotRequest, IDeleteSnapshotResponse>(
-			DeleteInitializer,
-			DeleteFluent,
-			fluent: (s, c, f) => c.DeleteSnapshot(_repositoryName, s, f),
-			fluentAsync: (s, c, f) => c.DeleteSnapshotAsync(_repositoryName, s, f),
-			request: (s, c, r) => c.DeleteSnapshot(r),
-			requestAsync: (s, c, r) => c.DeleteSnapshotAsync(r)
-		);
+		protected override LazyResponses Delete() =>
+			Calls<DeleteSnapshotDescriptor, DeleteSnapshotRequest, IDeleteSnapshotRequest, IDeleteSnapshotResponse>(
+				DeleteInitializer,
+				DeleteFluent,
+				(s, c, f) => c.DeleteSnapshot(_repositoryName, s, f),
+				(s, c, f) => c.DeleteSnapshotAsync(_repositoryName, s, f),
+				(s, c, r) => c.DeleteSnapshot(r),
+				(s, c, r) => c.DeleteSnapshotAsync(r)
+			);
 
 		protected DeleteSnapshotRequest DeleteInitializer(string snapshotName) => new DeleteSnapshotRequest(_repositoryName, snapshotName);
+
 		protected IDeleteSnapshotRequest DeleteFluent(string snapshotName, DeleteSnapshotDescriptor d) => null;
 
 		protected override LazyResponses Update() => LazyResponses.Empty;
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusApiTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusApiTests.cs
index 22ac1e45c51..4e6d8e6c6f6 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusApiTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusApiTests.cs
@@ -4,35 +4,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Modules.SnapshotAndRestore.Snapshot.SnapshotStatus
 {
-	public class SnapshotStatusApiTests : ApiTestBase<ReadOnlyCluster, ISnapshotStatusResponse, ISnapshotStatusRequest, SnapshotStatusDescriptor, SnapshotStatusRequest>
+	public class SnapshotStatusApiTests
+		: ApiTestBase<ReadOnlyCluster, ISnapshotStatusResponse, ISnapshotStatusRequest, SnapshotStatusDescriptor, SnapshotStatusRequest>
 	{
-		public SnapshotStatusApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private static readonly string _repos = "repository1";
 		private static readonly string _snapshot = "snapshot1";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.SnapshotStatus(f),
-			fluentAsync: (client, f) => client.SnapshotStatusAsync(f),
-			request: (client, r) => client.SnapshotStatus(r),
-			requestAsync: (client, r) => client.SnapshotStatusAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_snapshot/{_repos}/{_snapshot}/_status";
-
-		protected override bool SupportsDeserialization => false;
+		public SnapshotStatusApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override Func<SnapshotStatusDescriptor, ISnapshotStatusRequest> Fluent => d => d
 			.RepositoryName(_repos)
-			.Snapshot(_snapshot)
-		;
+			.Snapshot(_snapshot);
+
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override SnapshotStatusRequest Initializer => new SnapshotStatusRequest(_repos, _snapshot);
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_snapshot/{_repos}/{_snapshot}/_status";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.SnapshotStatus(f),
+			(client, f) => client.SnapshotStatusAsync(f),
+			(client, r) => client.SnapshotStatus(r),
+			(client, r) => client.SnapshotStatusAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusUrlTests.cs b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusUrlTests.cs
index 800ef397437..dfc3ca82a59 100644
--- a/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusUrlTests.cs
+++ b/src/Tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotStatus/SnapshotStatusUrlTests.cs
@@ -11,25 +11,25 @@ public class SnapshotStatusUrlTests
 		[U] public async Task Urls()
 		{
 			await GET("/_snapshot/_status")
-				.Fluent(c => c.SnapshotStatus())
-				.Request(c => c.SnapshotStatus(new SnapshotStatusRequest()))
-				.FluentAsync(c => c.SnapshotStatusAsync())
-				.RequestAsync(c => c.SnapshotStatusAsync(new SnapshotStatusRequest()))
+					.Fluent(c => c.SnapshotStatus())
+					.Request(c => c.SnapshotStatus(new SnapshotStatusRequest()))
+					.FluentAsync(c => c.SnapshotStatusAsync())
+					.RequestAsync(c => c.SnapshotStatusAsync(new SnapshotStatusRequest()))
 				;
 
 			var repository = "repos";
 			await GET($"/_snapshot/{repository}/_status")
-				.Fluent(c => c.SnapshotStatus(s=>s.RepositoryName(repository)))
-				.Request(c => c.SnapshotStatus(new SnapshotStatusRequest(repository)))
-				.FluentAsync(c => c.SnapshotStatusAsync(s=>s.RepositoryName(repository)))
-				.RequestAsync(c => c.SnapshotStatusAsync(new SnapshotStatusRequest(repository)))
+					.Fluent(c => c.SnapshotStatus(s => s.RepositoryName(repository)))
+					.Request(c => c.SnapshotStatus(new SnapshotStatusRequest(repository)))
+					.FluentAsync(c => c.SnapshotStatusAsync(s => s.RepositoryName(repository)))
+					.RequestAsync(c => c.SnapshotStatusAsync(new SnapshotStatusRequest(repository)))
 				;
 			var snapshot = "snap";
 			await GET($"/_snapshot/{repository}/{snapshot}/_status")
-				.Fluent(c => c.SnapshotStatus(s=>s.RepositoryName(repository).Snapshot(snapshot)))
-				.Request(c => c.SnapshotStatus(new SnapshotStatusRequest(repository, snapshot)))
-				.FluentAsync(c => c.SnapshotStatusAsync(s=>s.RepositoryName(repository).Snapshot(snapshot)))
-				.RequestAsync(c => c.SnapshotStatusAsync(new SnapshotStatusRequest(repository, snapshot)))
+					.Fluent(c => c.SnapshotStatus(s => s.RepositoryName(repository).Snapshot(snapshot)))
+					.Request(c => c.SnapshotStatus(new SnapshotStatusRequest(repository, snapshot)))
+					.FluentAsync(c => c.SnapshotStatusAsync(s => s.RepositoryName(repository).Snapshot(snapshot)))
+					.RequestAsync(c => c.SnapshotStatusAsync(new SnapshotStatusRequest(repository, snapshot)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/BoolApiTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/BoolApiTests.cs
index 9ea2fe9d88a..f957f2845cb 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/BoolApiTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/BoolApiTests.cs
@@ -1,24 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
-using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using A = Tests.QueryDsl.BoolDsl.BoolCluster.A;
-using E = Tests.QueryDsl.BoolDsl.BoolCluster.E;
 using static Nest.Infer;
 
 
@@ -26,27 +16,23 @@ namespace Tests.QueryDsl.BoolDsl
 {
 	internal static class BoolDslTestExtensions
 	{
-		public static QueryContainer Id(this QueryContainerDescriptor<A> q, int id) => q.Term(p => p.Id, id);
-		public static QueryContainer O(this QueryContainerDescriptor<A> q, E option) => q.Term(p => p.Option, option);
+		public static QueryContainer Id(this QueryContainerDescriptor<BoolCluster.A> q, int id) => q.Term(p => p.Id, id);
+
+		public static QueryContainer O(this QueryContainerDescriptor<BoolCluster.A> q, BoolCluster.E option) => q.Term(p => p.Option, option);
 	}
 
 	public class BoolCluster : ClientTestClusterBase
 	{
 		[JsonConverter(typeof(StringEnumConverter))]
-		public enum E { Option1, Option2 }
-
-		public class A
+		public enum E
 		{
-			public int Id { get; set; }
-			public E Option { get; set; }
-
-			private static E[] Options = new[] { E.Option1, E.Option2 };
-			public static IList<A> Documents => Enumerable.Range(0, 20).Select(i => new A { Id = i + 1, Option = Options[i % 2] }).ToList();
+			Option1,
+			Option2
 		}
 
 		protected override void SeedCluster()
 		{
-			var client = this.Client;
+			var client = Client;
 			var index = client.CreateIndex(Index<A>(), i => i
 				.Mappings(map => map
 					.Map<A>(m => m
@@ -59,36 +45,42 @@ protected override void SeedCluster()
 			);
 			var bulkResponse = client.Bulk(b => b.IndexMany(A.Documents));
 			if (!bulkResponse.IsValid) throw new Exception("Could not bootstrap bool cluster, bulk was invalid");
+
 			client.Refresh(Indices<A>());
 		}
+
+		public class A
+		{
+			private static readonly E[] Options = new[] { E.Option1, E.Option2 };
+			public static IList<A> Documents => Enumerable.Range(0, 20).Select(i => new A { Id = i + 1, Option = Options[i % 2] }).ToList();
+			public int Id { get; set; }
+			public E Option { get; set; }
+		}
 	}
 
 	public class BoolsInPractice : IClusterFixture<BoolCluster>
 	{
 		private readonly BoolCluster _cluster;
 
-		public BoolsInPractice(BoolCluster cluster)
-		{
-			this._cluster = cluster;
-		}
+		public BoolsInPractice(BoolCluster cluster) => _cluster = cluster;
 
 		private async Task Bool(
-			Func<A, bool> programmatic,
-			Func<QueryContainerDescriptor<A>, QueryContainer> fluentQuery,
+			Func<BoolCluster.A, bool> programmatic,
+			Func<QueryContainerDescriptor<BoolCluster.A>, QueryContainer> fluentQuery,
 			QueryContainer initializerQuery,
 			int expectedCount
-			)
+		)
 		{
-			var documents = A.Documents.Where(programmatic).ToList();
+			var documents = BoolCluster.A.Documents.Where(programmatic).ToList();
 			documents.Count().Should().Be(expectedCount, " filtering the documents in memory did not yield the expected count");
 
-			var client = this._cluster.Client;
+			var client = _cluster.Client;
 
-			var fluent = client.Search<A>(s => s.Query(fluentQuery));
-			var fluentAsync = await client.SearchAsync<A>(s => s.Query(fluentQuery));
+			var fluent = client.Search<BoolCluster.A>(s => s.Query(fluentQuery));
+			var fluentAsync = await client.SearchAsync<BoolCluster.A>(s => s.Query(fluentQuery));
 
-			var initializer = client.Search<A>(new SearchRequest<A> { Query = initializerQuery });
-			var initializerAsync = await client.SearchAsync<A>(new SearchRequest<A> { Query = initializerQuery });
+			var initializer = client.Search<BoolCluster.A>(new SearchRequest<BoolCluster.A> { Query = initializerQuery });
+			var initializerAsync = await client.SearchAsync<BoolCluster.A>(new SearchRequest<BoolCluster.A> { Query = initializerQuery });
 
 			var responses = new[] { fluent, fluentAsync, initializer, initializerAsync };
 			foreach (var response in responses)
@@ -99,46 +91,46 @@ int expectedCount
 		}
 
 		private TermQuery Id(int id) => new TermQuery { Field = "id", Value = id };
-		private TermQuery O(E option) => new TermQuery { Field = "option", Value = option };
+
+		private TermQuery O(BoolCluster.E option) => new TermQuery { Field = "option", Value = option };
 
 		[I]
 		public async Task CompareBoolQueryTranslationsToRealBooleanLogic()
 		{
 			await Bool(
-				a => a.Id == 1 && a.Option == E.Option1,
-				a => a.Id(1) && a.O(E.Option1),
-				Id(1) && O(E.Option1),
-				expectedCount: 1
+				a => a.Id == 1 && a.Option == BoolCluster.E.Option1,
+				a => a.Id(1) && a.O(BoolCluster.E.Option1),
+				Id(1) && O(BoolCluster.E.Option1),
+				1
 			);
 
 			await Bool(
 				a => a.Id == 1 || a.Id == 2 || a.Id == 3 || a.Id == 4,
 				a => +a.Id(1) || +a.Id(2) || +a.Id(3) || +a.Id(4),
 				+Id(1) || +Id(2) || +Id(3) || +Id(4),
-				expectedCount: 4
+				4
 			);
 
 			await Bool(
-				a => a.Id == 1 || a.Id == 2 || a.Id == 3 || a.Id == 4 && (a.Option != E.Option1 || a.Option == E.Option2),
-				a => +a.Id(1) || +a.Id(2) || +a.Id(3) || +a.Id(4) && (!a.O(E.Option1) || a.O(E.Option2)),
-				+Id(1) || +Id(2) || +Id(3) || +Id(4) && (!O(E.Option1) || O(E.Option2)),
-				expectedCount: 4
+				a => a.Id == 1 || a.Id == 2 || a.Id == 3 || a.Id == 4 && (a.Option != BoolCluster.E.Option1 || a.Option == BoolCluster.E.Option2),
+				a => +a.Id(1) || +a.Id(2) || +a.Id(3) || +a.Id(4) && (!a.O(BoolCluster.E.Option1) || a.O(BoolCluster.E.Option2)),
+				+Id(1) || +Id(2) || +Id(3) || +Id(4) && (!O(BoolCluster.E.Option1) || O(BoolCluster.E.Option2)),
+				4
 			);
 
 			await Bool(
-				a => a.Id == 1 || a.Id == 2 || a.Id == 3 || a.Id == 4 && a.Option != E.Option1 || a.Option == E.Option2,
-				a => +a.Id(1) || +a.Id(2) || +a.Id(3) || +a.Id(4) && !a.O(E.Option1) || a.O(E.Option2),
-				+Id(1) || +Id(2) || +Id(3) || +Id(4) && !O(E.Option1) || O(E.Option2),
-				expectedCount: 12
+				a => a.Id == 1 || a.Id == 2 || a.Id == 3 || a.Id == 4 && a.Option != BoolCluster.E.Option1 || a.Option == BoolCluster.E.Option2,
+				a => +a.Id(1) || +a.Id(2) || +a.Id(3) || +a.Id(4) && !a.O(BoolCluster.E.Option1) || a.O(BoolCluster.E.Option2),
+				+Id(1) || +Id(2) || +Id(3) || +Id(4) && !O(BoolCluster.E.Option1) || O(BoolCluster.E.Option2),
+				12
 			);
 
 			await Bool(
-				a => a.Option != E.Option1 && a.Id != 2 && a.Id != 3,
-				a => !a.O(E.Option1) && !a.Id(2) && !+a.Id(3),
-				!O(E.Option1) && !Id(2) && !+Id(3),
-				expectedCount: 9
+				a => a.Option != BoolCluster.E.Option1 && a.Id != 2 && a.Id != 3,
+				a => !a.O(BoolCluster.E.Option1) && !a.Id(2) && !+a.Id(3),
+				!O(BoolCluster.E.Option1) && !Id(2) && !+Id(3),
+				9
 			);
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndAssignManyManualBoolsTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndAssignManyManualBoolsTests.cs
index cbb509fbd6b..3de0abcc71b 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndAssignManyManualBoolsTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndAssignManyManualBoolsTests.cs
@@ -4,16 +4,15 @@
 using FluentAssertions;
 using Nest;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
 	//hide
 	public class AndAssignManyManualBoolsTests : OperatorUsageBase
 	{
-		private static QueryContainer ATermQuery(QueryContainerDescriptor<Project> must) => must.Term(p => p.Name, "foo");
+		private static readonly int Iterations = 10000;
 
-		private static int Iterations = 10000;
+		private static QueryContainer ATermQuery(QueryContainerDescriptor<Project> must) => must.Term(p => p.Name, "foo");
 
 		private void AssertBoolQuery(QueryContainer q, Action<IBoolQuery> assert) =>
 			assert(((IQueryContainer)q).Bool);
@@ -50,9 +49,11 @@ [U] public void AndAssigningBoolShouldQueriesWithMustClauses()
 			var q = Query<Project>.Bool(b => b.Should(ATermQuery).Must(ATermQuery));
 			var container = AndAssignManyBoolQueries(q);
 			DefaultMustAssert(container);
-			container.Bool.Must.Cast<IQueryContainer>().Should()
+			container.Bool.Must.Cast<IQueryContainer>()
+				.Should()
 				.OnlyContain(s => s.Bool != null && s.Bool.Should != null && s.Bool.Must != null);
-			AssertBoolQuery(q, b => {
+			AssertBoolQuery(q, b =>
+			{
 				b.Should.Should().NotBeNullOrEmpty();
 				b.Must.Should().NotBeNullOrEmpty();
 			});
@@ -63,9 +64,11 @@ [U] public void AndAssigningBoolShouldQueriesWithMustNotClauses()
 			var q = Query<Project>.Bool(b => b.Should(ATermQuery).MustNot(ATermQuery));
 			var container = AndAssignManyBoolQueries(q);
 			DefaultMustAssert(container);
-			container.Bool.Must.Cast<IQueryContainer>().Should()
+			container.Bool.Must.Cast<IQueryContainer>()
+				.Should()
 				.OnlyContain(s => s.Bool != null && s.Bool.Should != null && s.Bool.MustNot != null);
-			AssertBoolQuery(q, b => {
+			AssertBoolQuery(q, b =>
+			{
 				b.Should.Should().NotBeNullOrEmpty();
 				b.MustNot.Should().NotBeNullOrEmpty();
 			});
@@ -78,7 +81,8 @@ [U] public void AndAssigningBoolMustQueriesWithMustNotClauses()
 			DefaultMustAssert(container);
 			container.Bool.MustNot.Should().NotBeEmpty().And.HaveCount(Iterations);
 			container.Bool.Must.Cast<IQueryContainer>().Should().OnlyContain(s => s.Term != null);
-			AssertBoolQuery(q, b => {
+			AssertBoolQuery(q, b =>
+			{
 				b.Must.Should().NotBeNullOrEmpty();
 				b.MustNot.Should().NotBeNullOrEmpty();
 			});
@@ -89,9 +93,11 @@ [U] public void AndAssigningNamedBoolMustQueries()
 			var q = Query<Project>.Bool(b => b.Must(ATermQuery).Name("name"));
 			var container = AndAssignManyBoolQueries(q);
 			DefaultMustAssert(container);
-			container.Bool.Must.Cast<IQueryContainer>().Should()
+			container.Bool.Must.Cast<IQueryContainer>()
+				.Should()
 				.OnlyContain(s => s.Bool != null && s.Bool.Must != null && s.Bool.Name == "name");
-			AssertBoolQuery(q, b => {
+			AssertBoolQuery(q, b =>
+			{
 				b.Must.Should().NotBeNullOrEmpty();
 				b.Name.Should().NotBeNullOrEmpty();
 			});
@@ -100,19 +106,19 @@ [U] public void AndAssigningNamedBoolMustQueries()
 		private IQueryContainer AndAssignManyBoolQueries(QueryContainer q)
 		{
 			var container = new QueryContainer();
-			System.Action act = () =>
+			Action act = () =>
 			{
-				for (int i = 0; i < Iterations; i++) container &= q;
+				for (var i = 0; i < Iterations; i++) container &= q;
 			};
 			act.ShouldNotThrow();
 			return container;
 		}
+
 		private void DefaultMustAssert(IQueryContainer lotsOfAnds)
 		{
 			lotsOfAnds.Should().NotBeNull();
 			lotsOfAnds.Bool.Should().NotBeNull();
 			lotsOfAnds.Bool.Must.Should().NotBeEmpty().And.HaveCount(Iterations);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndOperatorOnManualBoolsTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndOperatorOnManualBoolsTests.cs
index 47b3ae26d3e..39475d6438a 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndOperatorOnManualBoolsTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndOperatorOnManualBoolsTests.cs
@@ -4,7 +4,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
@@ -17,27 +16,26 @@ [U] public void CombindingTwoBools()
 			var queries = new QueryContainer[] { Query };
 			ReturnsBool(
 				new BoolQuery { Must = queries, Should = queries }
-					&& new BoolQuery { MustNot = queries, Should = queries }
-				, q => q.Bool(b=>b.Must(c=>c.Query()).Should(c=>c.Query()))
-					&& q.Bool(b=>b.MustNot(c=>c.Query()).Should(c=>c.Query()))
+				&& new BoolQuery { MustNot = queries, Should = queries }
+				, q => q.Bool(b => b.Must(c => c.Query()).Should(c => c.Query()))
+					&& q.Bool(b => b.MustNot(c => c.Query()).Should(c => c.Query()))
 				, b =>
-			{
-
-				b.Must.Should().NotBeEmpty().And.HaveCount(2);
-				var first = (IQueryContainer)b.Must.First();
-				var last = (IQueryContainer)b.Must.Last();
-				first.Bool.Should().NotBeNull();
-				last.Bool.Should().NotBeNull();
+				{
+					b.Must.Should().NotBeEmpty().And.HaveCount(2);
+					var first = (IQueryContainer)b.Must.First();
+					var last = (IQueryContainer)b.Must.Last();
+					first.Bool.Should().NotBeNull();
+					last.Bool.Should().NotBeNull();
 
-				var firstBool = first.Bool;
-				var lastBool = last.Bool;
+					var firstBool = first.Bool;
+					var lastBool = last.Bool;
 
-				firstBool.Should.Should().NotBeEmpty().And.HaveCount(1);
-				firstBool.Must.Should().NotBeEmpty().And.HaveCount(1);
+					firstBool.Should.Should().NotBeEmpty().And.HaveCount(1);
+					firstBool.Must.Should().NotBeEmpty().And.HaveCount(1);
 
-				lastBool.Should.Should().NotBeEmpty().And.HaveCount(1);
-				lastBool.MustNot.Should().NotBeEmpty().And.HaveCount(1);
-			});
+					lastBool.Should.Should().NotBeEmpty().And.HaveCount(1);
+					lastBool.MustNot.Should().NotBeEmpty().And.HaveCount(1);
+				});
 		}
 
 		protected void CombineBothWays(
@@ -48,7 +46,7 @@ protected void CombineBothWays(
 			Action<IQueryContainer> assertLeft,
 			Action<IQueryContainer> assertRight,
 			Action<IBoolQuery> assertContainer = null
-			)
+		)
 		{
 			var oisLeft = ois1 && ois2;
 			Func<QueryContainerDescriptor<Project>, QueryContainer> lambdaLeft = (s) => lambda1(s) && lambda2(s);
@@ -80,7 +78,7 @@ [U] public void AndIntoBoolWithMustAndShould()
 			var queries = new QueryContainer[] { Query };
 			CombineBothWays(
 				new BoolQuery { Must = queries, Should = queries }, Query
-				, q => q.Bool(b => b.Must(c => c.Query()).Should(c => c.Query())), q=> q.Query()
+				, q => q.Bool(b => b.Must(c => c.Query()).Should(c => c.Query())), q => q.Query()
 				, l => l.Bool.Should().NotBeNull()
 				, r => r.Term.Should().NotBeNull()
 				, b => b.Must.Should().NotBeEmpty().And.HaveCount(2)
@@ -95,7 +93,8 @@ [U] public void AndIntoBoolWithMustAndMustNot()
 				, q => q.Bool(b => b.Must(c => c.Query()).MustNot(c => c.Query())), q => q.Query()
 				, l => l.Term.Should().NotBeNull()
 				, r => r.Term.Should().NotBeNull()
-				, b => {
+				, b =>
+				{
 					b.Must.Should().NotBeEmpty().And.HaveCount(2);
 					b.MustNot.Should().NotBeEmpty().And.HaveCount(1);
 				}
@@ -110,9 +109,7 @@ [U] public void AndIntoBoolWithMust()
 				, q => q.Bool(b => b.Must(c => c.Query())), q => q.Query()
 				, l => l.Term.Should().NotBeNull()
 				, r => r.Term.Should().NotBeNull()
-				, b => {
-					b.Must.Should().NotBeEmpty().And.HaveCount(2);
-				}
+				, b => { b.Must.Should().NotBeEmpty().And.HaveCount(2); }
 			);
 		}
 
@@ -121,8 +118,9 @@ [U] public void AndIntoBoolWithShould()
 			var queries = new QueryContainer[] { Query };
 			CombineBothWays(
 				new BoolQuery { Should = queries }, Query
-				, q => q.Bool(b => b.Should(c => c.Query())), q=> q.Query()
-				, l => {
+				, q => q.Bool(b => b.Should(c => c.Query())), q => q.Query()
+				, l =>
+				{
 					l.Bool.Should().NotBeNull();
 					l.Bool.Should.Should().NotBeNullOrEmpty();
 				}
@@ -136,8 +134,9 @@ [U] public void AndIntoNamedBool()
 			var queries = new QueryContainer[] { Query };
 			CombineBothWays(
 				new BoolQuery { Should = queries, Name = "name" }, Query
-				, q => q.Bool(b => b.Should(c => c.Query()).Name("name")), q=> q.Query()
-				, l => {
+				, q => q.Bool(b => b.Should(c => c.Query()).Name("name")), q => q.Query()
+				, l =>
+				{
 					l.Bool.Should().NotBeNull();
 					l.Bool.Should.Should().NotBeNullOrEmpty();
 					l.Bool.Name.Should().Be("name");
@@ -146,6 +145,5 @@ [U] public void AndIntoNamedBool()
 				, b => b.Must.Should().NotBeEmpty().And.HaveCount(2)
 			);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndOperatorUsageTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndOperatorUsageTests.cs
index 814b1a79284..384c3587c17 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndOperatorUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/AndOperatorUsageTests.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Linq;
+using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
@@ -36,7 +34,7 @@ [U] public void And()
 			ReturnsSingleQuery(Query && NullQuery, q => q.Query() && q.NullQuery(),
 				c => c.Term.Value.Should().NotBeNull());
 
-			ReturnsSingleQuery(NullQuery && Query, q=> q.NullQuery() && q.Query(),
+			ReturnsSingleQuery(NullQuery && Query, q => q.NullQuery() && q.Query(),
 				c => c.Term.Value.Should().NotBeNull());
 
 			ReturnsSingleQuery(ConditionlessQuery && ConditionlessQuery && ConditionlessQuery && Query,
@@ -45,20 +43,19 @@ [U] public void And()
 
 			ReturnsSingleQuery(
 				NullQuery && NullQuery && ConditionlessQuery && Query,
-				q=>q.NullQuery() && q.NullQuery() && q.ConditionlessQuery() && q.Query(),
+				q => q.NullQuery() && q.NullQuery() && q.ConditionlessQuery() && q.Query(),
 				c => c.Term.Value.Should().NotBeNull());
 
-			ReturnsNull(NullQuery && ConditionlessQuery, q=> q.NullQuery() && q.ConditionlessQuery());
-			ReturnsNull(ConditionlessQuery && NullQuery, q=>q.ConditionlessQuery() && q.NullQuery());
-			ReturnsNull(ConditionlessQuery && ConditionlessQuery, q=>q.ConditionlessQuery() && q.ConditionlessQuery());
+			ReturnsNull(NullQuery && ConditionlessQuery, q => q.NullQuery() && q.ConditionlessQuery());
+			ReturnsNull(ConditionlessQuery && NullQuery, q => q.ConditionlessQuery() && q.NullQuery());
+			ReturnsNull(ConditionlessQuery && ConditionlessQuery, q => q.ConditionlessQuery() && q.ConditionlessQuery());
 			ReturnsNull(
 				ConditionlessQuery && ConditionlessQuery && ConditionlessQuery && ConditionlessQuery,
-				q=>q.ConditionlessQuery() && q.ConditionlessQuery() && q.ConditionlessQuery() && q.ConditionlessQuery()
-
+				q => q.ConditionlessQuery() && q.ConditionlessQuery() && q.ConditionlessQuery() && q.ConditionlessQuery()
 			);
 			ReturnsNull(
 				NullQuery && ConditionlessQuery && ConditionlessQuery && ConditionlessQuery,
-				q=>q.NullQuery() && q.ConditionlessQuery() && q.ConditionlessQuery() && q.ConditionlessQuery()
+				q => q.NullQuery() && q.ConditionlessQuery() && q.ConditionlessQuery() && q.ConditionlessQuery()
 			);
 		}
 
@@ -71,7 +68,7 @@ [U] public void CombiningManyUsingAggregate()
 		[U] public void CombiningManyUsingForeachInitializingWithNull()
 		{
 			QueryContainer container = null;
-			foreach(var i in Enumerable.Range(0, 100))
+			foreach (var i in Enumerable.Range(0, 100))
 				container &= Query;
 			LotsOfAnds(container);
 		}
@@ -79,7 +76,7 @@ [U] public void CombiningManyUsingForeachInitializingWithNull()
 		[U] public void CombiningManyUsingForeachInitializingWithDefault()
 		{
 			var container = new QueryContainer();
-			foreach(var i in Enumerable.Range(0, 100))
+			foreach (var i in Enumerable.Range(0, 100))
 				container &= Query;
 			LotsOfAnds(container);
 		}
@@ -90,6 +87,5 @@ private void LotsOfAnds(IQueryContainer lotsOfAnds, int iterations = 100)
 			lotsOfAnds.Bool.Should().NotBeNull();
 			lotsOfAnds.Bool.Must.Should().NotBeEmpty().And.HaveCount(iterations);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/CombinatorialUsageTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/CombinatorialUsageTests.cs
index 741d7dcf29a..68e4626db32 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/CombinatorialUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/CombinatorialUsageTests.cs
@@ -1,14 +1,12 @@
-using System.Linq;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
-using Nest;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
 	public class CombinationUsageTests : OperatorUsageBase
 	{
-		[U] void DoesNotJoinTwoShouldsUsingAnd() => ReturnsBool(
+		[U]
+		private void DoesNotJoinTwoShouldsUsingAnd() => ReturnsBool(
 			(Query || Query) && (Query || Query),
 			q => (q.Query() || q.Query()) && (q.Query() || q.Query()),
 			b =>
@@ -17,12 +15,12 @@ [U] void DoesNotJoinTwoShouldsUsingAnd() => ReturnsBool(
 				b.Should.Should().BeNull();
 				b.MustNot.Should().BeNull();
 				b.Filter.Should().BeNull();
-
 			});
 
-		[U] void DoesJoinTwoShouldsUsingOr() => ReturnsBool(
-			(Query || Query) || (Query || Query),
-			q => (q.Query() || q.Query()) || (q.Query() || q.Query()),
+		[U]
+		private void DoesJoinTwoShouldsUsingOr() => ReturnsBool(
+			Query || Query || (Query || Query),
+			q => q.Query() || q.Query() || (q.Query() || q.Query()),
 			b =>
 			{
 				b.Should.Should().NotBeEmpty().And.HaveCount(4);
@@ -31,9 +29,10 @@ [U] void DoesJoinTwoShouldsUsingOr() => ReturnsBool(
 				b.Filter.Should().BeNull();
 			});
 
-		[U] void DoesNotJoinTwoMustsUsingOr() => ReturnsBool(
-			(Query && Query) || (Query && Query),
-			q => (q.Query() && q.Query()) || (q.Query() && q.Query()),
+		[U]
+		private void DoesNotJoinTwoMustsUsingOr() => ReturnsBool(
+			Query && Query || Query && Query,
+			q => q.Query() && q.Query() || q.Query() && q.Query(),
 			b =>
 			{
 				b.Should.Should().NotBeEmpty().And.HaveCount(2);
@@ -42,9 +41,10 @@ [U] void DoesNotJoinTwoMustsUsingOr() => ReturnsBool(
 				b.Filter.Should().BeNull();
 			});
 
-		[U] void DoesJoinTwoMustsUsingAnd() => ReturnsBool(
-			(Query && Query) && (Query && Query),
-			q => (q.Query() && q.Query()) && (q.Query() && q.Query()),
+		[U]
+		private void DoesJoinTwoMustsUsingAnd() => ReturnsBool(
+			Query && Query && (Query && Query),
+			q => q.Query() && q.Query() && (q.Query() && q.Query()),
 			b =>
 			{
 				b.Must.Should().NotBeEmpty().And.HaveCount(4);
@@ -53,7 +53,8 @@ [U] void DoesJoinTwoMustsUsingAnd() => ReturnsBool(
 				b.Filter.Should().BeNull();
 			});
 
-		[U] void AndJoinsMustNot() => ReturnsBool(
+		[U]
+		private void AndJoinsMustNot() => ReturnsBool(
 			Query && !Query,
 			q => q.Query() && !q.Query(),
 			b =>
@@ -62,15 +63,14 @@ [U] void AndJoinsMustNot() => ReturnsBool(
 				b.MustNot.Should().NotBeEmpty().And.HaveCount(1);
 			});
 
-		[U] void OrDoesNotJoinMustNot() => ReturnsBool(
+		[U]
+		private void OrDoesNotJoinMustNot() => ReturnsBool(
 			Query || !Query,
 			q => q.Query() || !q.Query(),
-			b =>
-			{
-				b.Should.Should().NotBeEmpty().And.HaveCount(2);
-			});
+			b => { b.Should.Should().NotBeEmpty().And.HaveCount(2); });
 
-		[U] void OrDoesNotJoinFilter() => ReturnsBool(
+		[U]
+		private void OrDoesNotJoinFilter() => ReturnsBool(
 			Query || !Query,
 			q => q.Query() || +q.Query(),
 			b =>
@@ -79,7 +79,8 @@ [U] void OrDoesNotJoinFilter() => ReturnsBool(
 				b.Filter.Should().BeNull();
 			});
 
-		[U] void AndJoinsFilter() => ReturnsBool(
+		[U]
+		private void AndJoinsFilter() => ReturnsBool(
 			Query && +Query,
 			q => q.Query() && +q.Query(),
 			b =>
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/NotOperatorUsageTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/NotOperatorUsageTests.cs
index 74c9abf0183..0f381a36b10 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/NotOperatorUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/NotOperatorUsageTests.cs
@@ -2,7 +2,6 @@
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
@@ -58,14 +57,13 @@ [U] public void Not()
 			ReturnsNull(
 				!ConditionlessQuery || !ConditionlessQuery || !ConditionlessQuery || !ConditionlessQuery,
 				q => !q.ConditionlessQuery() || !q.ConditionlessQuery() || !q.ConditionlessQuery() || !q.ConditionlessQuery()
-
 			);
 			ReturnsNull(
 				!NullQuery || !ConditionlessQuery || !ConditionlessQuery || !ConditionlessQuery,
 				q => !q.NullQuery() || !q.ConditionlessQuery() || !q.ConditionlessQuery() || !q.ConditionlessQuery()
 			);
-
 		}
+
 		[U]
 		public void CombiningManyUsingAggregate()
 		{
@@ -97,6 +95,5 @@ private void LotsOfNots(IQueryContainer lotsOfNots)
 			lotsOfNots.Bool.Should().NotBeNull();
 			lotsOfNots.Bool.Should.Should().NotBeEmpty().And.HaveCount(100);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OperatorUsageBase.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OperatorUsageBase.cs
index cfb3bb65689..3f8850fc565 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OperatorUsageBase.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OperatorUsageBase.cs
@@ -7,16 +7,19 @@ namespace Tests.QueryDsl.BoolDsl.Operators
 {
 	public abstract class OperatorUsageBase
 	{
-		protected static readonly TermQuery Query = new TermQuery { Field = "x", Value = "y" };
 		protected static readonly TermQuery ConditionlessQuery = new TermQuery { };
 		protected static readonly TermQuery NullQuery = null;
+		protected static readonly TermQuery Query = new TermQuery { Field = "x", Value = "y" };
 
 		protected void ReturnsNull(QueryContainer combined, Func<QueryContainerDescriptor<Project>, QueryContainer> selector)
 		{
-			combined.Should().BeNull(); selector.Invoke(new QueryContainerDescriptor<Project>()).Should().BeNull();
+			combined.Should().BeNull();
+			selector.Invoke(new QueryContainerDescriptor<Project>()).Should().BeNull();
 		}
 
-		protected void ReturnsBool(QueryContainer combined, Func<QueryContainerDescriptor<Project>, QueryContainer> selector, Action<IBoolQuery> boolQueryAssert)
+		protected void ReturnsBool(QueryContainer combined, Func<QueryContainerDescriptor<Project>, QueryContainer> selector,
+			Action<IBoolQuery> boolQueryAssert
+		)
 		{
 			ReturnsBool(combined, boolQueryAssert);
 			ReturnsBool(selector.Invoke(new QueryContainerDescriptor<Project>()), boolQueryAssert);
@@ -30,7 +33,9 @@ private void ReturnsBool(QueryContainer combined, Action<IBoolQuery> boolQueryAs
 			boolQueryAssert(c.Bool);
 		}
 
-		protected void ReturnsSingleQuery(QueryContainer combined, Func<QueryContainerDescriptor<Project>, QueryContainer> selector, Action<IQueryContainer> containerAssert)
+		protected void ReturnsSingleQuery(QueryContainer combined, Func<QueryContainerDescriptor<Project>, QueryContainer> selector,
+			Action<IQueryContainer> containerAssert
+		)
 		{
 			ReturnsSingleQuery(combined, containerAssert);
 			ReturnsSingleQuery(selector.Invoke(new QueryContainerDescriptor<Project>()), containerAssert);
@@ -42,9 +47,5 @@ private void ReturnsSingleQuery(QueryContainer combined, Action<IQueryContainer>
 			IQueryContainer c = combined;
 			containerAssert(c);
 		}
-
-
-
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrAssignManyManualBoolsTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrAssignManyManualBoolsTests.cs
index 8de32b9696d..d8e69c00331 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrAssignManyManualBoolsTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrAssignManyManualBoolsTests.cs
@@ -4,12 +4,12 @@
 using FluentAssertions;
 using Nest;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
 	public class OrAssignManyManualBoolsTests : OperatorUsageBase
 	{
+		private static readonly int Iterations = 10000;
 		/** Or assigning many bool queries that are not locked should result in a single bool query with many
 		 * should clauses. Consider our combining logic where we try to merge should clauses or wrap in a new container:
 		 *
@@ -31,7 +31,6 @@ public class OrAssignManyManualBoolsTests : OperatorUsageBase
 		 */
 
 		private static QueryContainer ATermQuery(QueryContainerDescriptor<Project> must) => must.Term(p => p.Name, "foo");
-		private static int Iterations = 10000;
 
 		[U] public void OrAssigningManyBoolMustQueries()
 		{
@@ -46,6 +45,7 @@ [U] public void OrAssigningManyBoolMustNotQueries()
 			var container = OrAssignManyBoolQueries(q);
 			container.Bool.Should.Cast<IQueryContainer>().Should().OnlyContain(s => s.Bool != null && s.Bool.MustNot != null);
 		}
+
 		/**
 		 * |= assigning many bool queries with only should clauses flattens even further to a single bool with only term
 		 * queries in the should
@@ -56,43 +56,51 @@ [U] public void OrAssigningBoolShouldQueries()
 			var container = OrAssignManyBoolQueries(q);
 			container.Bool.Should.Cast<IQueryContainer>().Should().OnlyContain(s => s.Term != null);
 		}
+
 		[U] public void OrAssigningBoolShouldQueriesWithMustClauses()
 		{
 			var q = Query<Project>.Bool(b => b.Should(ATermQuery).Must(ATermQuery));
 			var container = OrAssignManyBoolQueries(q);
-			container.Bool.Should.Cast<IQueryContainer>().Should()
+			container.Bool.Should.Cast<IQueryContainer>()
+				.Should()
 				.OnlyContain(s => s.Bool != null && s.Bool.Should != null && s.Bool.Must != null);
 		}
+
 		/** But not if that query has other clauses */
 		[U] public void OrAssigningBoolShouldQueriesWithMustNotClauses()
 		{
 			var q = Query<Project>.Bool(b => b.Should(ATermQuery).MustNot(ATermQuery));
 			var container = OrAssignManyBoolQueries(q);
-			container.Bool.Should.Cast<IQueryContainer>().Should()
+			container.Bool.Should.Cast<IQueryContainer>()
+				.Should()
 				.OnlyContain(s => s.Bool != null && s.Bool.Should != null && s.Bool.MustNot != null);
 		}
+
 		[U] public void OrAssigningBoolMustQueriesWithMustNotClauses()
 		{
 			var q = Query<Project>.Bool(b => b.Must(ATermQuery).MustNot(ATermQuery));
 			var container = OrAssignManyBoolQueries(q);
-			container.Bool.Should.Cast<IQueryContainer>().Should()
+			container.Bool.Should.Cast<IQueryContainer>()
+				.Should()
 				.OnlyContain(s => s.Bool != null && s.Bool.Must != null && s.Bool.MustNot != null);
 		}
+
 		/** Or is locked */
 		[U] public void OrAssigningNamedBoolShouldQueries()
 		{
 			var q = Query<Project>.Bool(b => b.Should(ATermQuery).Name("name"));
 			var container = OrAssignManyBoolQueries(q);
-			container.Bool.Should.Cast<IQueryContainer>().Should()
+			container.Bool.Should.Cast<IQueryContainer>()
+				.Should()
 				.OnlyContain(s => s.Bool != null && s.Bool.Should != null && s.Bool.Name == "name");
 		}
 
 		private IQueryContainer OrAssignManyBoolQueries(QueryContainer q)
 		{
 			var container = new QueryContainer();
-			System.Action act = () =>
+			Action act = () =>
 			{
-				for (int i = 0; i < Iterations; i++) container |= q;
+				for (var i = 0; i < Iterations; i++) container |= q;
 			};
 			act.ShouldNotThrow();
 			LotsOfOrs(container);
@@ -105,6 +113,5 @@ private void LotsOfOrs(IQueryContainer lotsOfOrs)
 			lotsOfOrs.Bool.Should().NotBeNull();
 			lotsOfOrs.Bool.Should.Should().NotBeEmpty().And.HaveCount(Iterations);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrOperatorOnManualBoolsTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrOperatorOnManualBoolsTests.cs
index 23b7cd962e9..032ec918c18 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrOperatorOnManualBoolsTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrOperatorOnManualBoolsTests.cs
@@ -4,7 +4,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Domain;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
@@ -17,27 +16,26 @@ [U] public void CombindingTwoBools()
 			var queries = new QueryContainer[] { Query };
 			ReturnsBool(
 				new BoolQuery { Must = queries, Should = queries }
-					|| new BoolQuery { MustNot = queries, Should = queries }
-				, q => q.Bool(b=>b.Must(c=>c.Query()).Should(c=>c.Query()))
-					|| q.Bool(b=>b.MustNot(c=>c.Query()).Should(c=>c.Query()))
+				|| new BoolQuery { MustNot = queries, Should = queries }
+				, q => q.Bool(b => b.Must(c => c.Query()).Should(c => c.Query()))
+					|| q.Bool(b => b.MustNot(c => c.Query()).Should(c => c.Query()))
 				, b =>
-			{
-
-				b.Should.Should().NotBeEmpty().And.HaveCount(2);
-				var first = (IQueryContainer)b.Should.First();
-				var last = (IQueryContainer)b.Should.Last();
-				first.Bool.Should().NotBeNull();
-				last.Bool.Should().NotBeNull();
+				{
+					b.Should.Should().NotBeEmpty().And.HaveCount(2);
+					var first = (IQueryContainer)b.Should.First();
+					var last = (IQueryContainer)b.Should.Last();
+					first.Bool.Should().NotBeNull();
+					last.Bool.Should().NotBeNull();
 
-				var firstBool = first.Bool;
-				var lastBool = last.Bool;
+					var firstBool = first.Bool;
+					var lastBool = last.Bool;
 
-				firstBool.Should.Should().NotBeEmpty().And.HaveCount(1);
-				firstBool.Must.Should().NotBeEmpty().And.HaveCount(1);
+					firstBool.Should.Should().NotBeEmpty().And.HaveCount(1);
+					firstBool.Must.Should().NotBeEmpty().And.HaveCount(1);
 
-				lastBool.Should.Should().NotBeEmpty().And.HaveCount(1);
-				lastBool.MustNot.Should().NotBeEmpty().And.HaveCount(1);
-			});
+					lastBool.Should.Should().NotBeEmpty().And.HaveCount(1);
+					lastBool.MustNot.Should().NotBeEmpty().And.HaveCount(1);
+				});
 		}
 
 		protected void CombineBothWays(
@@ -48,7 +46,7 @@ protected void CombineBothWays(
 			Action<IQueryContainer> assertLeft,
 			Action<IQueryContainer> assertRight,
 			Action<IBoolQuery> assertContainer = null
-			)
+		)
 		{
 			var oisLeft = ois1 || ois2;
 			Func<QueryContainerDescriptor<Project>, QueryContainer> lambdaLeft = (s) => lambda1(s) || lambda2(s);
@@ -80,7 +78,7 @@ [U] public void OrIntoBoolWithMustAndShould()
 			var queries = new QueryContainer[] { Query };
 			CombineBothWays(
 				new BoolQuery { Must = queries, Should = queries }, Query
-				, q => q.Bool(b => b.Must(c => c.Query()).Should(c => c.Query())), q=> q.Query()
+				, q => q.Bool(b => b.Must(c => c.Query()).Should(c => c.Query())), q => q.Query()
 				, l => l.Bool.Should().NotBeNull()
 				, r => r.Term.Should().NotBeNull()
 				, b => b.Should.Should().NotBeEmpty().And.HaveCount(2)
@@ -95,9 +93,7 @@ [U] public void OrIntoBoolWithMustAndMustNot()
 				, q => q.Bool(b => b.Must(c => c.Query()).MustNot(c => c.Query())), q => q.Query()
 				, l => l.Bool.Should().NotBeNull()
 				, r => r.Term.Should().NotBeNull()
-				, b => {
-					b.Should.Should().NotBeEmpty().And.HaveCount(2);
-				}
+				, b => { b.Should.Should().NotBeEmpty().And.HaveCount(2); }
 			);
 		}
 
@@ -109,9 +105,7 @@ [U] public void OrIntoBoolWithMust()
 				, q => q.Bool(b => b.Must(c => c.Query())), q => q.Query()
 				, l => l.Bool.Should().NotBeNull()
 				, r => r.Term.Should().NotBeNull()
-				, b => {
-					b.Should.Should().NotBeEmpty().And.HaveCount(2);
-				}
+				, b => { b.Should.Should().NotBeEmpty().And.HaveCount(2); }
 			);
 		}
 
@@ -120,7 +114,7 @@ [U] public void OrIntoBoolWithShould()
 			var queries = new QueryContainer[] { Query };
 			CombineBothWays(
 				new BoolQuery { Should = queries }, Query
-				, q => q.Bool(b => b.Should(c => c.Query())), q=> q.Query()
+				, q => q.Bool(b => b.Should(c => c.Query())), q => q.Query()
 				, l => l.Term.Should().NotBeNull()
 				, r => r.Term.Should().NotBeNull()
 				, b => b.Should.Should().NotBeEmpty().And.HaveCount(2)
@@ -132,8 +126,9 @@ [U] public void OrIntoNamedBool()
 			var queries = new QueryContainer[] { Query };
 			CombineBothWays(
 				new BoolQuery { Should = queries, Name = "name" }, Query
-				, q => q.Bool(b => b.Should(c => c.Query()).Name("name")), q=> q.Query()
-				, l => {
+				, q => q.Bool(b => b.Should(c => c.Query()).Name("name")), q => q.Query()
+				, l =>
+				{
 					l.Bool.Should().NotBeNull();
 					l.Bool.Should.Should().NotBeNullOrEmpty();
 					l.Bool.Name.Should().Be("name");
@@ -142,6 +137,5 @@ [U] public void OrIntoNamedBool()
 				, b => b.Should.Should().NotBeEmpty().And.HaveCount(2)
 			);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrOperatorUsageTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrOperatorUsageTests.cs
index 6609fab7b54..3acd7798040 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrOperatorUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/OrOperatorUsageTests.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Linq;
+using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
 	public class OrOperatorUsageTests : OperatorUsageBase
 	{
+		private static readonly int Iterations = 10000;
+
 		[U] public void Or()
 		{
 			ReturnsBool(Query || Query, q => q.Query() || q.Query(), b =>
@@ -44,7 +44,7 @@ [U] public void Or()
 			ReturnsSingleQuery(Query || NullQuery, q => q.Query() || q.NullQuery(),
 				c => c.Term.Value.Should().NotBeNull());
 
-			ReturnsSingleQuery(NullQuery || Query, q=> q.NullQuery() || q.Query(),
+			ReturnsSingleQuery(NullQuery || Query, q => q.NullQuery() || q.Query(),
 				c => c.Term.Value.Should().NotBeNull());
 
 			ReturnsSingleQuery(ConditionlessQuery || ConditionlessQuery || ConditionlessQuery || Query,
@@ -53,25 +53,22 @@ [U] public void Or()
 
 			ReturnsSingleQuery(
 				NullQuery || NullQuery || ConditionlessQuery || Query,
-				q=>q.NullQuery() || q.NullQuery() || q.ConditionlessQuery() || q.Query(),
+				q => q.NullQuery() || q.NullQuery() || q.ConditionlessQuery() || q.Query(),
 				c => c.Term.Value.Should().NotBeNull());
 
-			ReturnsNull(NullQuery || ConditionlessQuery, q=> q.NullQuery() || q.ConditionlessQuery());
-			ReturnsNull(ConditionlessQuery || NullQuery, q=>q.ConditionlessQuery() || q.NullQuery());
-			ReturnsNull(ConditionlessQuery || ConditionlessQuery, q=>q.ConditionlessQuery() || q.ConditionlessQuery());
+			ReturnsNull(NullQuery || ConditionlessQuery, q => q.NullQuery() || q.ConditionlessQuery());
+			ReturnsNull(ConditionlessQuery || NullQuery, q => q.ConditionlessQuery() || q.NullQuery());
+			ReturnsNull(ConditionlessQuery || ConditionlessQuery, q => q.ConditionlessQuery() || q.ConditionlessQuery());
 			ReturnsNull(
 				ConditionlessQuery || ConditionlessQuery || ConditionlessQuery || ConditionlessQuery,
-				q=>q.ConditionlessQuery() || q.ConditionlessQuery() || q.ConditionlessQuery() || q.ConditionlessQuery()
-
+				q => q.ConditionlessQuery() || q.ConditionlessQuery() || q.ConditionlessQuery() || q.ConditionlessQuery()
 			);
 			ReturnsNull(
 				NullQuery || ConditionlessQuery || ConditionlessQuery || ConditionlessQuery,
-				q=>q.NullQuery() || q.ConditionlessQuery() || q.ConditionlessQuery() || q.ConditionlessQuery()
+				q => q.NullQuery() || q.ConditionlessQuery() || q.ConditionlessQuery() || q.ConditionlessQuery()
 			);
 		}
 
-		private static int Iterations = 10000;
-
 		[U] public void CombiningManyUsingAggregate()
 		{
 			var lotsOfOrs = Enumerable.Range(0, Iterations).Aggregate(new QueryContainer(), (q, c) => q || Query, q => q);
@@ -81,7 +78,7 @@ [U] public void CombiningManyUsingAggregate()
 		[U] public void CombiningManyUsingForeachInitializingWithNull()
 		{
 			QueryContainer container = null;
-			foreach(var i in Enumerable.Range(0, Iterations))
+			foreach (var i in Enumerable.Range(0, Iterations))
 				container |= Query;
 			LotsOfOrs(container);
 		}
@@ -89,7 +86,7 @@ [U] public void CombiningManyUsingForeachInitializingWithNull()
 		[U] public void CombiningManyUsingForeachInitializingWithDefault()
 		{
 			var container = new QueryContainer();
-			foreach(var i in Enumerable.Range(0, Iterations))
+			foreach (var i in Enumerable.Range(0, Iterations))
 				container |= Query;
 			LotsOfOrs(container);
 		}
@@ -100,6 +97,5 @@ private void LotsOfOrs(IQueryContainer lotsOfOrs)
 			lotsOfOrs.Bool.Should().NotBeNull();
 			lotsOfOrs.Bool.Should.Should().NotBeEmpty().And.HaveCount(Iterations);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/UnaryAddOperatorUsageTests.cs b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/UnaryAddOperatorUsageTests.cs
index 674793abd48..5f97b61a55d 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/Operators/UnaryAddOperatorUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/Operators/UnaryAddOperatorUsageTests.cs
@@ -2,13 +2,11 @@
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.BoolDsl.Operators
 {
 	public class UnaryAddOperatorUsageTests : OperatorUsageBase
 	{
-
 		[U] public void UnaryAdd()
 		{
 			ReturnsBool(+Query && +Query, q => +q.Query() && +q.Query(), b =>
@@ -59,14 +57,13 @@ [U] public void UnaryAdd()
 			ReturnsNull(
 				+ConditionlessQuery || +ConditionlessQuery || +ConditionlessQuery || +ConditionlessQuery,
 				q => +q.ConditionlessQuery() || +q.ConditionlessQuery() || +q.ConditionlessQuery() || +q.ConditionlessQuery()
-
 			);
 			ReturnsNull(
 				+NullQuery || +ConditionlessQuery || +ConditionlessQuery || +ConditionlessQuery,
 				q => +q.NullQuery() || +q.ConditionlessQuery() || +q.ConditionlessQuery() || +q.ConditionlessQuery()
 			);
-
 		}
+
 		[U]
 		public void CombiningManyUsingAggregate()
 		{
@@ -106,9 +103,8 @@ public void CombindingManyBoolFiltersUsingOrsShouldFlatten()
 			foreach (var i in Enumerable.Range(0, 100))
 				container |= +Query;
 			var c = container as IQueryContainer;
-		
+
 			c.Bool.Should.Should().NotBeEmpty().And.HaveCount(100);
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/BoolDsl/QueryContainerDescriptorExtensions.cs b/src/Tests/Tests/QueryDsl/BoolDsl/QueryContainerDescriptorExtensions.cs
index fd3989cf112..3979431ce36 100644
--- a/src/Tests/Tests/QueryDsl/BoolDsl/QueryContainerDescriptorExtensions.cs
+++ b/src/Tests/Tests/QueryDsl/BoolDsl/QueryContainerDescriptorExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using Nest;
 using Tests.Domain;
 
@@ -7,7 +6,9 @@ namespace Tests.QueryDsl.BoolDsl
 	public static class QueryContainerDescriptorExtensions
 	{
 		public static QueryContainer Query(this QueryContainerDescriptor<Project> q) => q.Term("x", "y");
+
 		public static QueryContainer ConditionlessQuery(this QueryContainerDescriptor<Project> q) => q.Term("x", "");
+
 		public static QueryContainer NullQuery(this QueryContainerDescriptor<Project> q) => q.Term("x", "");
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Compound/Bool/BoolDslComplexQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Compound/Bool/BoolDslComplexQueryUsageTests.cs
index 9b8384d617c..efd08dfc733 100644
--- a/src/Tests/Tests/QueryDsl/Compound/Bool/BoolDslComplexQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Compound/Bool/BoolDslComplexQueryUsageTests.cs
@@ -4,54 +4,81 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using Tests.QueryDsl.BoolDsl;
 
 namespace Tests.QueryDsl.Compound.Bool
 {
 	public class BoolDslComplexQueryUsageTests : BoolQueryUsageTests
 	{
-		protected static readonly TermQuery Query = new TermQuery { Field = "x", Value = "y" };
 		protected static readonly TermQuery NullQuery = null;
+		protected static readonly TermQuery Query = new TermQuery { Field = "x", Value = "y" };
 
 		public BoolDslComplexQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override QueryContainer QueryInitializer =>
+			//first bool
+			Query && Query
+			//second bool
+			|| (+Query || +Query || !Query && (!Query && !ConditionlessQuery))
+			// simple nested or
+			&& (Query || Query || Query)
+			//all conditionless bool
+			&& (NullQuery || +ConditionlessQuery || !ConditionlessQuery)
+			// actual bool query
+			&& base.QueryInitializer;
+
 		protected override object QueryJson => new
 		{
 			@bool = new
 			{
-				should = new object[] {
+				should = new object[]
+				{
 					//first bool
-					new {
-						@bool = new {
-							must = new object[] {
+					new
+					{
+						@bool = new
+						{
+							must = new object[]
+							{
 								new { term = new { x = new { value = "y" } } },
 								new { term = new { x = new { value = "y" } } }
 							}
 						}
 					},
-					new {
-						@bool = new {
-							must = new object[] {
-								new {
-									@bool = new {
+					new
+					{
+						@bool = new
+						{
+							must = new object[]
+							{
+								new
+								{
+									@bool = new
+									{
 										//complex nested bool
-										should = new object[] {
-											new {
-												@bool = new {
+										should = new object[]
+										{
+											new
+											{
+												@bool = new
+												{
 													filter = new object[] { new { term = new { x = new { value = "y" } } } }
 												}
 											},
-											new {
-												@bool = new {
+											new
+											{
+												@bool = new
+												{
 													filter = new object[] { new { term = new { x = new { value = "y" } } } }
 												}
 											},
-											new {
-												@bool = new {
-													must_not = new object[] {
+											new
+											{
+												@bool = new
+												{
+													must_not = new object[]
+													{
 														new { term = new { x = new { value = "y" } } },
 														new { term = new { x = new { value = "y" } } }
 													}
@@ -61,9 +88,12 @@ public BoolDslComplexQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usag
 									}
 								},
 								//simple nested or
-								new {
-									@bool = new {
-										should = new object[] {
+								new
+								{
+									@bool = new
+									{
+										should = new object[]
+										{
 											new { term = new { x = new { value = "y" } } },
 											new { term = new { x = new { value = "y" } } },
 											new { term = new { x = new { value = "y" } } }
@@ -79,41 +109,21 @@ public BoolDslComplexQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usag
 			}
 		};
 
-		protected override QueryContainer QueryInitializer =>
-			//first bool
-			Query && Query
-			//second bool
-			|| (
-				//complex nested bool
-				(+Query || +Query || !Query && (!Query && !ConditionlessQuery))
-				// simple nested or
-				&& (Query || Query || Query)
-				//all conditionless bool
-				&& (NullQuery || +ConditionlessQuery || !ConditionlessQuery)
-				// actual bool query
-				&& (base.QueryInitializer));
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) =>
 			//first bool
 			q.Query() && q.Query()
 			//second bool
-			|| (
-				//complex nested bool
-				(+q.Query() || +q.Query() || !q.Query() && (!q.Query() && !q.ConditionlessQuery()))
-				// simple nested or
-				&& (q.Query() || q.Query() || q.Query())
-				//all conditionless bool
-				&& (q.NullQuery() || +q.ConditionlessQuery() || !q.ConditionlessQuery())
-				// actual bool query
-				&& (base.QueryFluent(q)));
+			|| (+q.Query() || +q.Query() || !q.Query() && (!q.Query() && !q.ConditionlessQuery()))
+			// simple nested or
+			&& (q.Query() || q.Query() || q.Query())
+			//all conditionless bool
+			&& (q.NullQuery() || +q.ConditionlessQuery() || !q.ConditionlessQuery())
+			// actual bool query
+			&& base.QueryFluent(q);
 
 		//hide
 		[U]
-		protected void AsssertShape()
-		{
-			this.AssertShape(this.QueryInitializer);
-			//this.AssertShape(this.QueryFluent(new QueryContainerDescriptor<Project>()));
-		}
+		protected void AsssertShape() => AssertShape(QueryInitializer);
 
 		//hide
 		private void AssertShape(IQueryContainer container)
@@ -147,10 +157,9 @@ private void AssertShape(IQueryContainer container)
 			complexNestedBool.Should.Should().HaveCount(3);
 
 			//inner must nots
-			var mustNotsBool = (complexNestedBool.Should.Cast<IQueryContainer>().FirstOrDefault(q => q.Bool != null && q.Bool.MustNot != null))?.Bool;
+			var mustNotsBool = complexNestedBool.Should.Cast<IQueryContainer>().FirstOrDefault(q => q.Bool != null && q.Bool.MustNot != null)?.Bool;
 			mustNotsBool.Should().NotBeNull();
 			mustNotsBool.MustNot.Should().HaveCount(2); //one of the three must nots was conditionless
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Compound/Bool/BoolQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Compound/Bool/BoolQueryUsageTests.cs
index bd0540ec7d2..5d3210a7d2e 100644
--- a/src/Tests/Tests/QueryDsl/Compound/Bool/BoolQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Compound/Bool/BoolQueryUsageTests.cs
@@ -1,13 +1,11 @@
-using System.Linq;
-using Nest;
-using Tests.Framework.Integration;
-using System;
+using System;
+using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
-using Tests.Framework;
 using FluentAssertions;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.Integration;
 
 namespace Tests.QueryDsl.Compound.Bool
 {
@@ -38,116 +36,123 @@ public class BoolQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public BoolQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
-		{
-			@bool = new
-			{
-				must = new[]
-				{
-					new { match_all = new { } }
-				},
-				must_not = new[]
-				{
-					new { match_all = new { } }
-				},
-				should = new[]
-				{
-					new { match_all = new { } }
-				},
-				filter = new[]
-				{
-					new { match_all = new { } }
-				},
-				minimum_should_match = 1,
-				boost = 2.0,
-			}
-		};
-
-		protected override QueryContainer QueryInitializer =>
-			new BoolQuery
-			{
-				MustNot = new QueryContainer[] { new MatchAllQuery() },
-				Should = new QueryContainer[] { new MatchAllQuery() },
-				Must = new QueryContainer[] { new MatchAllQuery() },
-				Filter = new QueryContainer[] { new MatchAllQuery() },
-				MinimumShouldMatch = 1,
-				Boost = 2
-			};
-
-		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
-			.Bool(b => b
-				.MustNot(m => m.MatchAll())
-				.Should(m => m.MatchAll())
-				.Must(m => m.MatchAll())
-				.Filter(f => f.MatchAll())
-				.MinimumShouldMatch(1)
-				.Boost(2));
-
 		// hide
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IBoolQuery>(a => a.Bool)
 		{
-			q=> {
+			q =>
+			{
 				q.MustNot = null;
 				q.Should = null;
 				q.Must = null;
 				q.Filter = null;
 			},
-			q => {
+			q =>
+			{
 				q.MustNot = Enumerable.Empty<QueryContainer>();
 				q.Should = Enumerable.Empty<QueryContainer>();
 				q.Must = Enumerable.Empty<QueryContainer>();
 				q.Filter = Enumerable.Empty<QueryContainer>();
 			},
-			q => {
-				q.MustNot = new [] { ConditionlessQuery };
-				q.Should = new [] { ConditionlessQuery };
-				q.Must = new [] { ConditionlessQuery };
-				q.Filter = new [] { ConditionlessQuery };
+			q =>
+			{
+				q.MustNot = new[] { ConditionlessQuery };
+				q.Should = new[] { ConditionlessQuery };
+				q.Must = new[] { ConditionlessQuery };
+				q.Filter = new[] { ConditionlessQuery };
 			},
 		};
 
 		// hide
 		protected override NotConditionlessWhen NotConditionlessWhen => new NotConditionlessWhen<IBoolQuery>(a => a.Bool)
 		{
-			q => {
-				q.MustNot = new [] { VerbatimQuery };
+			q =>
+			{
+				q.MustNot = new[] { VerbatimQuery };
 				q.Should = null;
 				q.Must = null;
 				q.Filter = null;
 			},
-			q => {
+			q =>
+			{
 				q.MustNot = null;
-				q.Should = new [] { VerbatimQuery };
+				q.Should = new[] { VerbatimQuery };
 				q.Must = null;
 				q.Filter = null;
 			},
-			q => {
+			q =>
+			{
 				q.MustNot = null;
 				q.Should = null;
-				q.Must = new [] { VerbatimQuery };
+				q.Must = new[] { VerbatimQuery };
 				q.Filter = null;
 			},
-			q => {
+			q =>
+			{
 				q.MustNot = null;
 				q.Should = null;
 				q.Must = null;
-				q.Filter = new [] { VerbatimQuery };
+				q.Filter = new[] { VerbatimQuery };
 			},
 		};
 
+		protected override QueryContainer QueryInitializer =>
+			new BoolQuery
+			{
+				MustNot = new QueryContainer[] { new MatchAllQuery() },
+				Should = new QueryContainer[] { new MatchAllQuery() },
+				Must = new QueryContainer[] { new MatchAllQuery() },
+				Filter = new QueryContainer[] { new MatchAllQuery() },
+				MinimumShouldMatch = 1,
+				Boost = 2
+			};
+
+		protected override object QueryJson => new
+		{
+			@bool = new
+			{
+				must = new[]
+				{
+					new { match_all = new { } }
+				},
+				must_not = new[]
+				{
+					new { match_all = new { } }
+				},
+				should = new[]
+				{
+					new { match_all = new { } }
+				},
+				filter = new[]
+				{
+					new { match_all = new { } }
+				},
+				minimum_should_match = 1,
+				boost = 2.0,
+			}
+		};
+
+		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
+			.Bool(b => b
+				.MustNot(m => m.MatchAll())
+				.Should(m => m.MatchAll())
+				.Must(m => m.MatchAll())
+				.Filter(f => f.MatchAll())
+				.MinimumShouldMatch(1)
+				.Boost(2));
+
 		// hide
 		[U]
 		public void NullQueryDoesNotCauseANullReferenceException()
 		{
-			Action query = () => this.Client.Search<Project>(s => s
-					.Query(q => q
-						.Bool(b => b
-							.Filter(f => f
-								.Term(t => t.Name, null)
-							)
+			Action query = () => Client.Search<Project>(s => s
+				.Query(q => q
+					.Bool(b => b
+						.Filter(f => f
+							.Term(t => t.Name, null)
 						)
 					)
-				);
+				)
+			);
 
 			query.ShouldNotThrow();
 		}
diff --git a/src/Tests/Tests/QueryDsl/Compound/Boosting/BoostingQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Compound/Boosting/BoostingQueryUsageTests.cs
index 00e067a4be5..f4a39640eb4 100644
--- a/src/Tests/Tests/QueryDsl/Compound/Boosting/BoostingQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Compound/Boosting/BoostingQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 #pragma warning disable 618 //Testing an obsolete method
 
@@ -12,6 +11,48 @@ public class BoostingQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public BoostingQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IBoostingQuery>(a => a.Boosting)
+		{
+			q =>
+			{
+				q.NegativeQuery = null;
+				q.PositiveQuery = null;
+			},
+			q =>
+			{
+				q.NegativeQuery = ConditionlessQuery;
+				q.PositiveQuery = ConditionlessQuery;
+			},
+		};
+
+		protected override NotConditionlessWhen NotConditionlessWhen => new NotConditionlessWhen<IBoostingQuery>(a => a.Boosting)
+		{
+			q =>
+			{
+				q.NegativeQuery = VerbatimQuery;
+				q.PositiveQuery = VerbatimQuery;
+			},
+			q =>
+			{
+				q.NegativeQuery = null;
+				q.PositiveQuery = VerbatimQuery;
+			},
+			q =>
+			{
+				q.NegativeQuery = VerbatimQuery;
+				q.PositiveQuery = null;
+			}
+		};
+
+		protected override QueryContainer QueryInitializer => new BoostingQuery()
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			PositiveQuery = new MatchAllQuery { Name = "filter" },
+			NegativeQuery = new MatchAllQuery() { Name = "query" },
+			NegativeBoost = 1.12
+		};
+
 		protected override object QueryJson => new
 		{
 			boosting = new
@@ -30,15 +71,6 @@ public BoostingQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i,
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new BoostingQuery()
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			PositiveQuery = new MatchAllQuery { Name ="filter" },
-			NegativeQuery= new MatchAllQuery() { Name = "query" },
-			NegativeBoost = 1.12
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Boosting(c => c
 				.Name("named_query")
@@ -47,34 +79,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Negative(qq => qq.MatchAll(m => m.Name("query")))
 				.NegativeBoost(1.12)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IBoostingQuery>(a => a.Boosting)
-		{
-			q=> {
-				q.NegativeQuery = null;
-				q.PositiveQuery = null;
-			},
-			q => {
-				q.NegativeQuery =  ConditionlessQuery;
-				q.PositiveQuery =  ConditionlessQuery;
-			},
-		};
-
-		protected override NotConditionlessWhen NotConditionlessWhen => new NotConditionlessWhen<IBoostingQuery>(a => a.Boosting)
-		{
-			q=> {
-				q.NegativeQuery = VerbatimQuery;
-				q.PositiveQuery = VerbatimQuery;
-			},
-			q => {
-				q.NegativeQuery =  null;
-				q.PositiveQuery =  VerbatimQuery;
-			},
-			q => {
-				q.NegativeQuery =  VerbatimQuery;
-				q.PositiveQuery =  null;
-			}
-		};
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Compound/ConstantScore/ConstantScoreQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Compound/ConstantScore/ConstantScoreQueryUsageTests.cs
index 14760cd6ba1..80338e94ceb 100644
--- a/src/Tests/Tests/QueryDsl/Compound/ConstantScore/ConstantScoreQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Compound/ConstantScore/ConstantScoreQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 #pragma warning disable 618 //Testing an obsolete method
 
@@ -12,6 +11,24 @@ public class ConstantScoreQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public ConstantScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IConstantScoreQuery>(a => a.ConstantScore)
+		{
+			q => q.Filter = null,
+			q => q.Filter = ConditionlessQuery,
+		};
+
+		protected override NotConditionlessWhen NotConditionlessWhen => new NotConditionlessWhen<IConstantScoreQuery>(a => a.ConstantScore)
+		{
+			q => q.Filter = VerbatimQuery
+		};
+
+		protected override QueryContainer QueryInitializer => new ConstantScoreQuery()
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Filter = new MatchAllQuery { Name = "filter" },
+		};
+
 		protected override object QueryJson => new
 		{
 			constant_score = new
@@ -28,28 +45,11 @@ public ConstantScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new ConstantScoreQuery()
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Filter = new MatchAllQuery { Name = "filter" },
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.ConstantScore(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Filter(qq => qq.MatchAll(m => m.Name("filter")))
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IConstantScoreQuery>(a => a.ConstantScore)
-		{
-			q => q.Filter = null ,
-			q => q.Filter =  ConditionlessQuery,
-		};
-		protected override NotConditionlessWhen NotConditionlessWhen => new NotConditionlessWhen<IConstantScoreQuery>(a => a.ConstantScore)
-		{
-			q => q.Filter = VerbatimQuery
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Compound/Dismax/DismaxQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Compound/Dismax/DismaxQueryUsageTests.cs
index e46bf40c20b..5b65941d72b 100644
--- a/src/Tests/Tests/QueryDsl/Compound/Dismax/DismaxQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Compound/Dismax/DismaxQueryUsageTests.cs
@@ -1,13 +1,11 @@
-using System.Linq;
-using Nest;
-using Tests.Framework.Integration;
-using Tests.Framework;
-using System;
+using System;
+using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.Integration;
 
 #pragma warning disable 618 //Testing an obsolete method
 
@@ -17,18 +15,17 @@ public class DismaxQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public DismaxQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IDisMaxQuery>(a => a.DisMax)
 		{
-			dis_max = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				queries = new[] {
-					new { match_all = new { _name = "query1" } },
-					new { match_all = new { _name = "query2" } }
-				},
-				tie_breaker = 1.11
-			}
+			q => q.Queries = null,
+			q => q.Queries = Enumerable.Empty<QueryContainer>(),
+			q => q.Queries = new[] { ConditionlessQuery },
+		};
+
+		protected override NotConditionlessWhen NotConditionlessWhen => new NotConditionlessWhen<IDisMaxQuery>(a => a.DisMax)
+		{
+			q => q.Queries = new[] { VerbatimQuery },
+			q => q.Queries = new[] { VerbatimQuery, ConditionlessQuery },
 		};
 
 		protected override QueryContainer QueryInitializer => new DisMaxQuery()
@@ -36,12 +33,28 @@ public DismaxQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 			Name = "named_query",
 			Boost = 1.1,
 			TieBreaker = 1.11,
-			Queries = new QueryContainer[] {
+			Queries = new QueryContainer[]
+			{
 				new MatchAllQuery() { Name = "query1" },
 				new MatchAllQuery() { Name = "query2" },
 			}
 		};
 
+		protected override object QueryJson => new
+		{
+			dis_max = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				queries = new[]
+				{
+					new { match_all = new { _name = "query1" } },
+					new { match_all = new { _name = "query2" } }
+				},
+				tie_breaker = 1.11
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.DisMax(c => c
 				.Name("named_query")
@@ -53,23 +66,10 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				)
 			);
 
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IDisMaxQuery>(a => a.DisMax)
-		{
-			q => q.Queries = null,
-			q => q.Queries = Enumerable.Empty<QueryContainer>(),
-			q => q.Queries = new [] { ConditionlessQuery },
-		};
-
-		protected override NotConditionlessWhen NotConditionlessWhen => new NotConditionlessWhen<IDisMaxQuery>(a => a.DisMax)
-		{
-			q => q.Queries = new [] { VerbatimQuery },
-			q => q.Queries = new [] { VerbatimQuery, ConditionlessQuery },
-		};
-
 		[U]
 		public void NullQueryDoesNotCauseANullReferenceException()
 		{
-			Action query = () => this.Client.Search<Project>(s => s
+			Action query = () => Client.Search<Project>(s => s
 				.Query(q => q
 					.DisMax(dm => dm
 						.Queries(
diff --git a/src/Tests/Tests/QueryDsl/Compound/FunctionScore/FunctionScoreQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Compound/FunctionScore/FunctionScoreQueryUsageTests.cs
index 9aee4239e3c..50d7413d019 100644
--- a/src/Tests/Tests/QueryDsl/Compound/FunctionScore/FunctionScoreQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Compound/FunctionScore/FunctionScoreQueryUsageTests.cs
@@ -5,7 +5,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.Compound.FunctionScore
@@ -21,6 +20,42 @@ public class FunctionScoreQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public FunctionScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IFunctionScoreQuery>(a => a.FunctionScore)
+		{
+			q => q.Functions = null,
+			q => q.Functions = Enumerable.Empty<IScoreFunction>(),
+		};
+
+		protected override QueryContainer QueryInitializer => new FunctionScoreQuery()
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Query = new MatchAllQuery { },
+			BoostMode = FunctionBoostMode.Multiply,
+			ScoreMode = FunctionScoreMode.Sum,
+			MaxBoost = 20.0,
+			MinScore = 1.0,
+			Functions = new List<IScoreFunction>
+			{
+				new ExponentialDecayFunction { Origin = 1.0, Decay = 0.5, Field = Field<Project>(p => p.NumberOfCommits), Scale = 0.1, Weight = 2.1 },
+				new GaussDateDecayFunction
+					{ Origin = DateMath.Now, Field = Field<Project>(p => p.LastActivity), Decay = 0.5, Scale = TimeSpan.FromDays(1) },
+				new LinearGeoDecayFunction
+				{
+					Origin = new GeoLocation(70, -70), Field = Field<Project>(p => p.Location), Scale = Distance.Miles(1),
+					MultiValueMode = MultiValueMode.Average
+				},
+				new FieldValueFactorFunction
+				{
+					Field = "x", Factor = 1.1, Missing = 0.1, Modifier = FieldValueFactorModifier.Ln
+				},
+				new RandomScoreFunction { Seed = 1337, Field = "_seq_no" },
+				new RandomScoreFunction { Seed = "randomstring", Field = "_seq_no" },
+				new WeightFunction { Weight = 1.0 },
+				new ScriptScoreFunction { Script = new ScriptQuery { Id = "x" } }
+			}
+		};
+
 		protected override object QueryJson => new
 		{
 			function_score = new
@@ -28,10 +63,14 @@ public FunctionScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 				_name = "named_query",
 				boost = 1.1,
 				boost_mode = "multiply",
-				functions = new object[] {
-					new {
-						exp = new {
-							numberOfCommits = new {
+				functions = new object[]
+				{
+					new
+					{
+						exp = new
+						{
+							numberOfCommits = new
+							{
 								origin = 1.0,
 								scale = 0.1,
 								decay = 0.5
@@ -39,29 +78,38 @@ public FunctionScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 						},
 						weight = 2.1
 					},
-					new {
-						gauss = new {
-							lastActivity = new {
+					new
+					{
+						gauss = new
+						{
+							lastActivity = new
+							{
 								origin = "now",
 								scale = "1d",
 								decay = 0.5
 							}
 						}
 					},
-					new {
-						linear = new {
-							location = new {
-								origin = new {
-								lat = 70.0,
-								lon = -70.0
+					new
+					{
+						linear = new
+						{
+							location = new
+							{
+								origin = new
+								{
+									lat = 70.0,
+									lon = -70.0
 								},
 								scale = "1.0mi"
 							},
-						multi_value_mode = "avg"
+							multi_value_mode = "avg"
 						}
 					},
-					new {
-						field_value_factor = new {
+					new
+					{
+						field_value_factor = new
+						{
 							field = "x",
 							factor = 1.1,
 							missing = 0.1,
@@ -71,9 +119,12 @@ public FunctionScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 					new { random_score = new { seed = 1337, field = "_seq_no" } },
 					new { random_score = new { seed = "randomstring", field = "_seq_no" } },
 					new { weight = 1.0 },
-					new {
-						script_score = new {
-							script = new {
+					new
+					{
+						script_score = new
+						{
+							script = new
+							{
 								id = "x"
 							}
 						}
@@ -89,31 +140,6 @@ public FunctionScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new FunctionScoreQuery()
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Query = new MatchAllQuery { },
-			BoostMode = FunctionBoostMode.Multiply,
-			ScoreMode = FunctionScoreMode.Sum,
-			MaxBoost = 20.0,
-			MinScore = 1.0,
-			Functions = new List<IScoreFunction>
-			{
-				new ExponentialDecayFunction { Origin = 1.0, Decay =	0.5, Field = Field<Project>(p=>p.NumberOfCommits), Scale = 0.1, Weight = 2.1 },
-				new GaussDateDecayFunction { Origin = DateMath.Now, Field = Field<Project>(p=>p.LastActivity), Decay = 0.5, Scale = TimeSpan.FromDays(1) },
-				new LinearGeoDecayFunction { Origin = new GeoLocation(70, -70), Field = Field<Project>(p=>p.Location), Scale = Distance.Miles(1), MultiValueMode = MultiValueMode.Average },
-				new FieldValueFactorFunction
-				{
-					Field = "x", Factor = 1.1,	Missing = 0.1, Modifier = FieldValueFactorModifier.Ln
-				},
-				new RandomScoreFunction { Seed = 1337, Field = "_seq_no" },
-				new RandomScoreFunction { Seed = "randomstring", Field = "_seq_no" },
-				new WeightFunction { Weight = 1.0},
-				new ScriptScoreFunction { Script = new ScriptQuery { Id = "x" } }
-			}
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.FunctionScore(c => c
 				.Name("named_query")
@@ -126,19 +152,14 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Functions(f => f
 					.Exponential(b => b.Field(p => p.NumberOfCommits).Decay(0.5).Origin(1.0).Scale(0.1).Weight(2.1))
 					.GaussDate(b => b.Field(p => p.LastActivity).Origin(DateMath.Now).Decay(0.5).Scale("1d"))
-					.LinearGeoLocation(b => b.Field(p => p.Location).Origin(new GeoLocation(70, -70)).Scale(Distance.Miles(1)).MultiValueMode(MultiValueMode.Average))
+					.LinearGeoLocation(b =>
+						b.Field(p => p.Location).Origin(new GeoLocation(70, -70)).Scale(Distance.Miles(1)).MultiValueMode(MultiValueMode.Average))
 					.FieldValueFactor(b => b.Field("x").Factor(1.1).Missing(0.1).Modifier(FieldValueFactorModifier.Ln))
-					.RandomScore(r=>r.Seed(1337).Field("_seq_no"))
-					.RandomScore(r=>r.Seed("randomstring").Field("_seq_no"))
+					.RandomScore(r => r.Seed(1337).Field("_seq_no"))
+					.RandomScore(r => r.Seed("randomstring").Field("_seq_no"))
 					.Weight(1.0)
 					.ScriptScore(ss => ss.Script(s => s.Id("x")))
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IFunctionScoreQuery>(a => a.FunctionScore)
-		{
-			q=> q.Functions = null,
-			q=> q.Functions = Enumerable.Empty<IScoreFunction>(),
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/ConditionlessWhen.cs b/src/Tests/Tests/QueryDsl/ConditionlessWhen.cs
index 0ede35d7822..6b8c2acc5c0 100644
--- a/src/Tests/Tests/QueryDsl/ConditionlessWhen.cs
+++ b/src/Tests/Tests/QueryDsl/ConditionlessWhen.cs
@@ -6,20 +6,18 @@
 namespace Tests.QueryDsl
 {
 	public abstract class ConditionlessWhen : List<Action<QueryContainer>> { }
+
 	public class ConditionlessWhen<TQuery> : ConditionlessWhen where TQuery : IQuery
 	{
 		private readonly Func<IQueryContainer, TQuery> _dispatch;
 
-		public ConditionlessWhen(Func<IQueryContainer, TQuery> dispatch)
-		{
-			_dispatch = dispatch;
-		}
+		public ConditionlessWhen(Func<IQueryContainer, TQuery> dispatch) => _dispatch = dispatch;
 
-		public void Add(Action<TQuery> when) => this.Add(q => Assert(q, when));
+		public void Add(Action<TQuery> when) => Add(q => Assert(q, when));
 
 		private void Assert(IQueryContainer c, Action<TQuery> when)
 		{
-			TQuery q = this._dispatch(c);
+			var q = _dispatch(c);
 			q.Conditionless.Should().BeFalse();
 			c.IsConditionless.Should().BeFalse();
 			when(q);
diff --git a/src/Tests/Tests/QueryDsl/FullText/CommonTerms/CommonTermsUsageTests.cs b/src/Tests/Tests/QueryDsl/FullText/CommonTerms/CommonTermsUsageTests.cs
index c09baca223e..442196bf130 100644
--- a/src/Tests/Tests/QueryDsl/FullText/CommonTerms/CommonTermsUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/FullText/CommonTerms/CommonTermsUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.FullText.CommonTerms
@@ -11,6 +10,26 @@ public class CommonTermsUsageTests : QueryDslUsageTestsBase
 	{
 		public CommonTermsUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ICommonTermsQuery>(a => a.CommonTerms)
+		{
+			q => q.Query = null,
+			q => q.Query = string.Empty,
+			q => q.Field = null
+		};
+
+		protected override QueryContainer QueryInitializer => new CommonTermsQuery()
+		{
+			Field = Field<Project>(p => p.Description),
+			Analyzer = "standard",
+			Boost = 1.1,
+			CutoffFrequency = 0.001,
+			HighFrequencyOperator = Operator.And,
+			LowFrequencyOperator = Operator.Or,
+			MinimumShouldMatch = 1,
+			Name = "named_query",
+			Query = "nelly the elephant not as a"
+		};
+
 		protected override object QueryJson => new
 		{
 			common = new
@@ -29,19 +48,6 @@ public CommonTermsUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new CommonTermsQuery()
-		{
-			Field = Field<Project>(p => p.Description),
-			Analyzer = "standard",
-			Boost = 1.1,
-			CutoffFrequency = 0.001,
-			HighFrequencyOperator = Operator.And,
-			LowFrequencyOperator = Operator.Or,
-			MinimumShouldMatch = 1,
-			Name = "named_query",
-			Query = "nelly the elephant not as a"
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.CommonTerms(c => c
 				.Field(p => p.Description)
@@ -54,12 +60,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Name("named_query")
 				.Query("nelly the elephant not as a")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ICommonTermsQuery>(a => a.CommonTerms)
-		{
-			q => q.Query = null,
-			q => q.Query = string.Empty,
-			q => q.Field = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/FullText/Match/MatchUsageTests.cs b/src/Tests/Tests/QueryDsl/FullText/Match/MatchUsageTests.cs
index 4aa05fb39cd..244142ab35c 100644
--- a/src/Tests/Tests/QueryDsl/FullText/Match/MatchUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/FullText/Match/MatchUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.FullText.Match
@@ -11,6 +10,29 @@ public class MatchUsageTests : QueryDslUsageTestsBase
 	{
 		public MatchUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMatchQuery>(a => a.Match)
+		{
+			q => q.Query = null,
+			q => q.Query = string.Empty,
+			q => q.Field = null
+		};
+
+		protected override QueryContainer QueryInitializer => new MatchQuery
+		{
+			Field = Field<Project>(p => p.Description),
+			Analyzer = "standard",
+			Boost = 1.1,
+			Name = "named_query",
+			CutoffFrequency = 0.001,
+			Query = "hello world",
+			Fuzziness = Fuzziness.Auto,
+			FuzzyTranspositions = true,
+			MinimumShouldMatch = 2,
+			FuzzyRewrite = MultiTermQueryRewrite.TopTermsBlendedFreqs(10),
+			Lenient = true,
+			Operator = Operator.Or
+		};
+
 		protected override object QueryJson => new
 		{
 			match = new
@@ -27,26 +49,9 @@ public MatchUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage)
 					cutoff_frequency = 0.001,
 					lenient = true,
 					minimum_should_match = 2,
-			        @operator = "or"
+					@operator = "or"
 				}
 			}
-
-		};
-
-		protected override QueryContainer QueryInitializer => new MatchQuery
-		{
-			Field = Field<Project>(p=>p.Description),
-			Analyzer = "standard",
-			Boost = 1.1,
-			Name = "named_query",
-			CutoffFrequency = 0.001,
-			Query = "hello world",
-			Fuzziness = Fuzziness.Auto,
-			FuzzyTranspositions = true,
-			MinimumShouldMatch = 2,
-			FuzzyRewrite = MultiTermQueryRewrite.TopTermsBlendedFreqs(10),
-			Lenient = true,
-			Operator = Operator.Or
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -64,12 +69,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.FuzzyRewrite(MultiTermQueryRewrite.TopTermsBlendedFreqs(10))
 				.Name("named_query")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMatchQuery>(a => a.Match)
-		{
-			q => q.Query = null,
-			q => q.Query = string.Empty,
-			q => q.Field = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/FullText/MatchPhrase/MatchPhraseUsageTests.cs b/src/Tests/Tests/QueryDsl/FullText/MatchPhrase/MatchPhraseUsageTests.cs
index 832f819f7c0..db8f4faaf41 100644
--- a/src/Tests/Tests/QueryDsl/FullText/MatchPhrase/MatchPhraseUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/FullText/MatchPhrase/MatchPhraseUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.FullText.MatchPhrase
@@ -11,6 +10,23 @@ public class MatchPhraseUsageTests : QueryDslUsageTestsBase
 	{
 		public MatchPhraseUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMatchPhraseQuery>(a => a.MatchPhrase)
+		{
+			q => q.Query = null,
+			q => q.Query = string.Empty,
+			q => q.Field = null
+		};
+
+		protected override QueryContainer QueryInitializer => new MatchPhraseQuery
+		{
+			Field = Field<Project>(p => p.Description),
+			Analyzer = "standard",
+			Boost = 1.1,
+			Name = "named_query",
+			Query = "hello world",
+			Slop = 2,
+		};
+
 		protected override object QueryJson => new
 		{
 			match_phrase = new
@@ -24,17 +40,6 @@ public MatchPhraseUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 					slop = 2,
 				}
 			}
-
-		};
-
-		protected override QueryContainer QueryInitializer => new MatchPhraseQuery
-		{
-			Field = Field<Project>(p=>p.Description),
-			Analyzer = "standard",
-			Boost = 1.1,
-			Name = "named_query",
-			Query = "hello world",
-			Slop = 2,
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -46,12 +51,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Slop(2)
 				.Name("named_query")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMatchPhraseQuery>(a => a.MatchPhrase)
-		{
-			q => q.Query = null,
-			q => q.Query = string.Empty,
-			q => q.Field = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixUsageTests.cs b/src/Tests/Tests/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixUsageTests.cs
index a2fee83b6b9..70ac13b45ed 100644
--- a/src/Tests/Tests/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.FullText.MatchPhrasePrefix
@@ -11,6 +10,24 @@ public class MatchPhrasePrefixUsageTests : QueryDslUsageTestsBase
 	{
 		public MatchPhrasePrefixUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMatchPhrasePrefixQuery>(a => a.MatchPhrasePrefix)
+		{
+			q => q.Query = null,
+			q => q.Query = string.Empty,
+			q => q.Field = null
+		};
+
+		protected override QueryContainer QueryInitializer => new MatchPhrasePrefixQuery
+		{
+			Field = Field<Project>(p => p.Description),
+			Analyzer = "standard",
+			Boost = 1.1,
+			Name = "named_query",
+			Query = "hello worl",
+			MaxExpansions = 2,
+			Slop = 2
+		};
+
 		protected override object QueryJson => new
 		{
 			match_phrase_prefix = new
@@ -27,17 +44,6 @@ public MatchPhrasePrefixUsageTests(ReadOnlyCluster i, EndpointUsage usage) : bas
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new MatchPhrasePrefixQuery
-		{
-			Field = Field<Project>(p => p.Description),
-			Analyzer = "standard",
-			Boost = 1.1,
-			Name = "named_query",
-			Query = "hello worl",
-			MaxExpansions = 2,
-			Slop = 2
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MatchPhrasePrefix(c => c
 				.Field(p => p.Description)
@@ -48,12 +54,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Slop(2)
 				.Name("named_query")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMatchPhrasePrefixQuery>(a => a.MatchPhrasePrefix)
-		{
-			q => q.Query = null,
-			q => q.Query = string.Empty,
-			q => q.Field = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/FullText/MultiMatch/MultiMatchUsageTests.cs b/src/Tests/Tests/QueryDsl/FullText/MultiMatch/MultiMatchUsageTests.cs
index 7a97d099549..eac8492ed8d 100644
--- a/src/Tests/Tests/QueryDsl/FullText/MultiMatch/MultiMatchUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/FullText/MultiMatch/MultiMatchUsageTests.cs
@@ -3,7 +3,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.FullText.MultiMatch
@@ -12,6 +11,32 @@ public class MultiMatchUsageTests : QueryDslUsageTestsBase
 	{
 		public MultiMatchUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMultiMatchQuery>(a => a.MultiMatch)
+		{
+			q => q.Query = null,
+			q => q.Query = string.Empty
+		};
+
+		protected override QueryContainer QueryInitializer => new MultiMatchQuery
+		{
+			Fields = Field<Project>(p => p.Description).And("myOtherField"),
+			Query = "hello world",
+			Analyzer = "standard",
+			Boost = 1.1,
+			Slop = 2,
+			Fuzziness = Fuzziness.Auto,
+			PrefixLength = 2,
+			MaxExpansions = 2,
+			Operator = Operator.Or,
+			MinimumShouldMatch = 2,
+			FuzzyRewrite = MultiTermQueryRewrite.ConstantScoreBoolean,
+			TieBreaker = 1.1,
+			CutoffFrequency = 0.001,
+			Lenient = true,
+			ZeroTermsQuery = ZeroTermsQuery.All,
+			Name = "named_query"
+		};
+
 		protected override object QueryJson => new
 		{
 			multi_match = new
@@ -30,7 +55,8 @@ public MultiMatchUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, us
 				tie_breaker = 1.1,
 				minimum_should_match = 2,
 				@operator = "or",
-				fields = new[] {
+				fields = new[]
+				{
 					"description",
 					"myOtherField"
 				},
@@ -38,29 +64,9 @@ public MultiMatchUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, us
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new MultiMatchQuery
-		{
-			Fields = Field<Project>(p=>p.Description).And("myOtherField"),
-			Query = "hello world",
-			Analyzer = "standard",
-			Boost = 1.1,
-			Slop = 2,
-			Fuzziness = Fuzziness.Auto,
-			PrefixLength = 2,
-			MaxExpansions = 2,
-			Operator = Operator.Or,
-			MinimumShouldMatch = 2,
-			FuzzyRewrite = MultiTermQueryRewrite.ConstantScoreBoolean,
-			TieBreaker = 1.1,
-			CutoffFrequency = 0.001,
-			Lenient = true,
-			ZeroTermsQuery = ZeroTermsQuery.All,
-			Name = "named_query"
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MultiMatch(c => c
-				.Fields(f => f.Field(p=>p.Description).Field("myOtherField"))
+				.Fields(f => f.Field(p => p.Description).Field("myOtherField"))
 				.Query("hello world")
 				.Analyzer("standard")
 				.Boost(1.1)
@@ -77,42 +83,37 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.ZeroTermsQuery(ZeroTermsQuery.All)
 				.Name("named_query")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMultiMatchQuery>(a => a.MultiMatch)
-		{
-			q => q.Query = null,
-			q => q.Query = string.Empty
-		};
 	}
 
-    /**[float]
-     * === Multi match with boost usage
-     */
+	/**[float]
+	 * === Multi match with boost usage
+	 */
 	public class MultiMatchWithBoostUsageTests : QueryDslUsageTestsBase
 	{
 		public MultiMatchWithBoostUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override QueryContainer QueryInitializer => new MultiMatchQuery
+		{
+			Fields = Field<Project>(p => p.Description, 2.2).And("myOtherField^0.3"),
+			Query = "hello world",
+		};
+
 		protected override object QueryJson => new
 		{
 			multi_match = new
 			{
 				query = "hello world",
-				fields = new[] {
+				fields = new[]
+				{
 					"description^2.2",
 					"myOtherField^0.3"
 				}
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new MultiMatchQuery
-		{
-			Fields = Field<Project>(p=>p.Description, 2.2).And("myOtherField^0.3"),
-			Query = "hello world",
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MultiMatch(c => c
-				.Fields(Field<Project>(p=>p.Description, 2.2).And("myOtherField^0.3"))
+				.Fields(Field<Project>(p => p.Description, 2.2).And("myOtherField^0.3"))
 				.Query("hello world")
 			);
 	}
@@ -129,6 +130,11 @@ public class MultiMatchWithNoFieldsSpecifiedUsageTests : QueryDslUsageTestsBase
 	{
 		public MultiMatchWithNoFieldsSpecifiedUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override QueryContainer QueryInitializer => new MultiMatchQuery
+		{
+			Query = "hello world",
+		};
+
 		protected override object QueryJson => new
 		{
 			multi_match = new
@@ -137,11 +143,6 @@ public MultiMatchWithNoFieldsSpecifiedUsageTests(ReadOnlyCluster i, EndpointUsag
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new MultiMatchQuery
-		{
-			Query = "hello world",
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MultiMatch(c => c
 				.Query("hello world")
diff --git a/src/Tests/Tests/QueryDsl/FullText/QueryString/QueryStringUsageTests.cs b/src/Tests/Tests/QueryDsl/FullText/QueryString/QueryStringUsageTests.cs
index bd0042b6140..a912dec096c 100644
--- a/src/Tests/Tests/QueryDsl/FullText/QueryString/QueryStringUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/FullText/QueryString/QueryStringUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.FullText.QueryString
@@ -11,6 +10,37 @@ public class QueryStringUsageTests : QueryDslUsageTestsBase
 	{
 		public QueryStringUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IQueryStringQuery>(a => a.QueryString)
+		{
+			q => q.Query = null,
+			q => q.Query = string.Empty,
+		};
+
+		protected override QueryContainer QueryInitializer => new QueryStringQuery
+		{
+			Fields = Field<Project>(p => p.Description).And("myOtherField"),
+			Boost = 1.1,
+			Name = "named_query",
+			Query = "hello world",
+			DefaultField = Field<Project>(p => p.Description),
+			DefaultOperator = Operator.Or,
+			Analyzer = "standard",
+			QuoteAnalyzer = "quote-an",
+			AllowLeadingWildcard = true,
+			MaximumDeterminizedStates = 2,
+			Escape = true,
+			FuzzyPrefixLength = 2,
+			FuzzyMaxExpansions = 3,
+			FuzzyRewrite = MultiTermQueryRewrite.ConstantScore,
+			Rewrite = MultiTermQueryRewrite.ConstantScore,
+			Fuzziness = Fuzziness.Auto,
+			TieBreaker = 1.2,
+			AnalyzeWildcard = true,
+			MinimumShouldMatch = 2,
+			QuoteFieldSuffix = "'",
+			Lenient = true
+		};
+
 		protected override object QueryJson => new
 		{
 			query_string = new
@@ -39,38 +69,13 @@ public QueryStringUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new QueryStringQuery
-		{
-			Fields = Field<Project>(p=>p.Description).And("myOtherField"),
-			Boost = 1.1,
-			Name = "named_query",
-			Query = "hello world",
-			DefaultField = Field<Project>(p=>p.Description),
-			DefaultOperator = Operator.Or,
-			Analyzer = "standard",
-			QuoteAnalyzer = "quote-an",
-			AllowLeadingWildcard = true,
-			MaximumDeterminizedStates = 2,
-			Escape = true,
-			FuzzyPrefixLength = 2,
-			FuzzyMaxExpansions = 3,
-			FuzzyRewrite = MultiTermQueryRewrite.ConstantScore,
-			Rewrite = MultiTermQueryRewrite.ConstantScore,
-			Fuzziness = Fuzziness.Auto,
-			TieBreaker = 1.2,
-			AnalyzeWildcard = true,
-			MinimumShouldMatch = 2,
-			QuoteFieldSuffix = "'",
-			Lenient = true
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.QueryString(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Fields(f => f.Field(p=>p.Description).Field("myOtherField"))
+				.Fields(f => f.Field(p => p.Description).Field("myOtherField"))
 				.Query("hello world")
-				.DefaultField(p=>p.Description)
+				.DefaultField(p => p.Description)
 				.DefaultOperator(Operator.Or)
 				.Analyzer("standard")
 				.QuoteAnalyzer("quote-an")
@@ -88,11 +93,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.QuoteFieldSuffix("'")
 				.Lenient()
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IQueryStringQuery>(a => a.QueryString)
-		{
-			q => q.Query = null,
-			q => q.Query = string.Empty,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringUsageTests.cs b/src/Tests/Tests/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringUsageTests.cs
index f8092b09a81..ef699b4f717 100644
--- a/src/Tests/Tests/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 
@@ -12,6 +11,26 @@ public class SimpleQueryStringUsageTests : QueryDslUsageTestsBase
 	{
 		public SimpleQueryStringUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISimpleQueryStringQuery>(a => a.SimpleQueryString)
+		{
+			q => q.Query = null,
+			q => q.Query = string.Empty,
+		};
+
+		protected override QueryContainer QueryInitializer => new SimpleQueryStringQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Fields = Field<Project>(p => p.Description).And("myOtherField"),
+			Query = "hello world",
+			Analyzer = "standard",
+			DefaultOperator = Operator.Or,
+			Flags = SimpleQueryStringFlags.And | SimpleQueryStringFlags.Near,
+			Lenient = true,
+			AnalyzeWildcard = true,
+			MinimumShouldMatch = "30%"
+		};
+
 		protected override object QueryJson => new
 		{
 			simple_query_string = new
@@ -29,38 +48,18 @@ public SimpleQueryStringUsageTests(ReadOnlyCluster i, EndpointUsage usage) : bas
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new SimpleQueryStringQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Fields = Field<Project>(p=>p.Description).And("myOtherField"),
-			Query = "hello world",
-			Analyzer = "standard",
-			DefaultOperator = Operator.Or,
-			Flags = SimpleQueryStringFlags.And|SimpleQueryStringFlags.Near,
-			Lenient = true,
-			AnalyzeWildcard = true,
-			MinimumShouldMatch = "30%"
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SimpleQueryString(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Fields(f => f.Field(p=>p.Description).Field("myOtherField"))
+				.Fields(f => f.Field(p => p.Description).Field("myOtherField"))
 				.Query("hello world")
 				.Analyzer("standard")
 				.DefaultOperator(Operator.Or)
-				.Flags(SimpleQueryStringFlags.And|SimpleQueryStringFlags.Near)
+				.Flags(SimpleQueryStringFlags.And | SimpleQueryStringFlags.Near)
 				.Lenient()
 				.AnalyzeWildcard()
 				.MinimumShouldMatch("30%")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISimpleQueryStringQuery>(a => a.SimpleQueryString)
-		{
-			q => q.Query = null,
-			q => q.Query = string.Empty,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQueryUsageTests.cs
index 43f17991f90..d2d4be98c4d 100644
--- a/src/Tests/Tests/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/BoundingBox/GeoBoundingBoxQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Geo.BoundingBox
 {
@@ -10,6 +9,27 @@ public class GeoBoundingBoxQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public GeoBoundingBoxQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoBoundingBoxQuery>(a => a.GeoBoundingBox)
+		{
+			q => q.BoundingBox = null,
+			q => q.BoundingBox = new Nest.BoundingBox { },
+			q => q.Field = null
+		};
+
+		protected override QueryContainer QueryInitializer => new GeoBoundingBoxQuery
+		{
+			Boost = 1.1,
+			Name = "named_query",
+			Field = Infer.Field<Project>(p => p.Location),
+			BoundingBox = new Nest.BoundingBox
+			{
+				TopLeft = new GeoLocation(34, -34),
+				BottomRight = new GeoLocation(-34, 34),
+			},
+			Type = GeoExecution.Indexed,
+			ValidationMethod = GeoValidationMethod.Strict
+		};
+
 		protected override object QueryJson => new
 		{
 			geo_bounding_box = new
@@ -34,58 +54,29 @@ public GeoBoundingBoxQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : b
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new GeoBoundingBoxQuery
-		{
-			Boost = 1.1,
-			Name = "named_query",
-			Field = Infer.Field<Project>(p => p.Location),
-			BoundingBox = new Nest.BoundingBox
-			{
-				TopLeft = new GeoLocation(34,-34),
-				BottomRight = new GeoLocation(-34,34),
-			},
-			Type = GeoExecution.Indexed,
-			ValidationMethod = GeoValidationMethod.Strict
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
-			.GeoBoundingBox(g=>g
+			.GeoBoundingBox(g => g
 				.Boost(1.1)
 				.Name("named_query")
-				.Field(p=>p.Location)
-				.BoundingBox(b=>b
+				.Field(p => p.Location)
+				.BoundingBox(b => b
 					.TopLeft(34, -34)
 					.BottomRight(-34, 34)
 				)
 				.ValidationMethod(GeoValidationMethod.Strict)
 				.Type(GeoExecution.Indexed)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoBoundingBoxQuery>(a => a.GeoBoundingBox)
-		{
-			q => q.BoundingBox = null,
-			q => q.BoundingBox = new Nest.BoundingBox { } ,
-			q =>  q.Field = null
-		};
 	}
 
 	public class GeoBoundingBoxWKTQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public GeoBoundingBoxWKTQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoBoundingBoxQuery>(a => a.GeoBoundingBox)
 		{
-			geo_bounding_box = new
-			{
-				type = "indexed",
-				validation_method = "strict",
-				_name = "named_query",
-				boost = 1.1,
-				location = new
-				{
-					wkt = "BBOX (34, -34, -34, 34)"
-				}
-			}
+			q => q.BoundingBox = null,
+			q => q.BoundingBox = new Nest.BoundingBox { },
+			q => q.Field = null
 		};
 
 		protected override QueryContainer QueryInitializer => new GeoBoundingBoxQuery
@@ -101,23 +92,31 @@ public GeoBoundingBoxWKTQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage)
 			ValidationMethod = GeoValidationMethod.Strict
 		};
 
+		protected override object QueryJson => new
+		{
+			geo_bounding_box = new
+			{
+				type = "indexed",
+				validation_method = "strict",
+				_name = "named_query",
+				boost = 1.1,
+				location = new
+				{
+					wkt = "BBOX (34, -34, -34, 34)"
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
-			.GeoBoundingBox(g=>g
+			.GeoBoundingBox(g => g
 				.Boost(1.1)
 				.Name("named_query")
-				.Field(p=>p.Location)
-				.BoundingBox(b=>b
+				.Field(p => p.Location)
+				.BoundingBox(b => b
 					.WellKnownText("BBOX (34, -34, -34, 34)")
 				)
 				.ValidationMethod(GeoValidationMethod.Strict)
 				.Type(GeoExecution.Indexed)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoBoundingBoxQuery>(a => a.GeoBoundingBox)
-		{
-			q => q.BoundingBox = null,
-			q => q.BoundingBox = new Nest.BoundingBox { } ,
-			q => q.Field = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Distance/GeoDistanceQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Distance/GeoDistanceQueryUsageTests.cs
index 75973c457c0..32e75bfc8f1 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Distance/GeoDistanceQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Distance/GeoDistanceQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Geo.Distance
 {
@@ -10,6 +9,24 @@ public class GeoDistanceQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public GeoDistanceQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoDistanceQuery>(a => a.GeoDistance)
+		{
+			q => q.Distance = null,
+			q => q.Field = null,
+			q => q.Location = null
+		};
+
+		protected override QueryContainer QueryInitializer => new GeoDistanceQuery
+		{
+			Boost = 1.1,
+			Name = "named_query",
+			Field = Infer.Field<Project>(p => p.Location),
+			DistanceType = GeoDistanceType.Arc,
+			Location = new GeoLocation(34, -34),
+			Distance = "200.0m",
+			ValidationMethod = GeoValidationMethod.IgnoreMalformed
+		};
+
 		protected override object QueryJson => new
 		{
 			geo_distance = new
@@ -27,33 +44,15 @@ public GeoDistanceQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new GeoDistanceQuery
-		{
-			Boost = 1.1,
-			Name = "named_query",
-			Field = Infer.Field<Project>(p => p.Location),
-			DistanceType = GeoDistanceType.Arc,
-			Location = new GeoLocation(34,-34),
-			Distance = "200.0m",
-			ValidationMethod = GeoValidationMethod.IgnoreMalformed
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
-			.GeoDistance(g=>g
+			.GeoDistance(g => g
 				.Boost(1.1)
 				.Name("named_query")
-				.Field(p=>p.Location)
+				.Field(p => p.Location)
 				.DistanceType(GeoDistanceType.Arc)
 				.Location(34, -34)
 				.Distance("200.0m")
 				.ValidationMethod(GeoValidationMethod.IgnoreMalformed)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoDistanceQuery>(a => a.GeoDistance)
-		{
-			q => q.Distance = null,
-			q =>  q.Field = null,
-			q =>  q.Location = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/GeoShapeSerializationTests.cs b/src/Tests/Tests/QueryDsl/Geo/GeoShapeSerializationTests.cs
index 700516cbdb3..1f1d49f228f 100644
--- a/src/Tests/Tests/QueryDsl/Geo/GeoShapeSerializationTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/GeoShapeSerializationTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -9,36 +8,26 @@
 using FluentAssertions;
 using Nest;
 using Newtonsoft.Json.Linq;
-using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Domain;
 
 namespace Tests.QueryDsl.Geo
 {
-	public abstract class GeoShapeSerializationTestsBase :
-		ApiIntegrationTestBase<IntrusiveOperationCluster,
+	public abstract class GeoShapeSerializationTestsBase
+		: ApiIntegrationTestBase<IntrusiveOperationCluster,
 			ISearchResponse<Domain.Shape>,
 			ISearchRequest,
 			SearchDescriptor<Domain.Shape>,
 			SearchRequest<Domain.Shape>>
 	{
+		private readonly IEnumerable<GeoCoordinate> _coordinates =
+			Domain.Shape.Shapes.First().Envelope.Coordinates;
+
 		protected GeoShapeSerializationTestsBase(IntrusiveOperationCluster cluster, EndpointUsage usage)
 			: base(cluster, usage) { }
 
-		protected abstract string Index { get; }
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Search<Domain.Shape>(f),
-			fluentAsync: (client, f) => client.SearchAsync<Domain.Shape>(f),
-			request: (client, r) => client.Search<Domain.Shape>(r),
-			requestAsync: (client, r) => client.SearchAsync<Domain.Shape>(r)
-		);
-
-		private readonly IEnumerable<GeoCoordinate> _coordinates =
-			Domain.Shape.Shapes.First().Envelope.Coordinates;
+		protected override bool ExpectIsValid => true;
 
 		protected override object ExpectJson => new
 		{
@@ -46,7 +35,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			{
 				geo_shape = new
 				{
-					_name="named_query",
+					_name = "named_query",
 					boost = 1.1,
 					ignore_unmapped = true,
 					envelope = new
@@ -55,7 +44,7 @@ protected override LazyResponses ClientUsage() => Calls(
 						shape = new
 						{
 							type = "envelope",
-							coordinates = this._coordinates
+							coordinates = _coordinates
 						}
 					}
 				}
@@ -63,10 +52,24 @@ protected override LazyResponses ClientUsage() => Calls(
 		};
 
 		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
-		protected override string UrlPath => $"/{Index}/doc/_search";
+
+		protected override Func<SearchDescriptor<Domain.Shape>, ISearchRequest> Fluent => s => s
+			.Index(Index)
+			.Query(q => q
+				.GeoShapeEnvelope(c => c
+					.Name("named_query")
+					.Boost(1.1)
+					.Field(p => p.Envelope)
+					.Coordinates(_coordinates)
+					.Relation(GeoShapeRelation.Intersects)
+					.IgnoreUnmapped()
+				)
+			);
+
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
+		protected abstract string Index { get; }
+
 		protected override SearchRequest<Domain.Shape> Initializer => new SearchRequest<Domain.Shape>(Index)
 		{
 			Query = new GeoShapeEnvelopeQuery
@@ -74,24 +77,20 @@ protected override LazyResponses ClientUsage() => Calls(
 				Name = "named_query",
 				Boost = 1.1,
 				Field = Infer.Field<Domain.Shape>(p => p.Envelope),
-				Shape = new EnvelopeGeoShape(this._coordinates),
+				Shape = new EnvelopeGeoShape(_coordinates),
 				Relation = GeoShapeRelation.Intersects,
 				IgnoreUnmapped = true
 			}
 		};
 
-		protected override Func<SearchDescriptor<Domain.Shape>, ISearchRequest> Fluent => s => s
-			.Index(Index)
-			.Query(q => q
-				.GeoShapeEnvelope(c => c
-					.Name("named_query")
-					.Boost(1.1)
-					.Field(p => p.Envelope)
-					.Coordinates(this._coordinates)
-					.Relation(GeoShapeRelation.Intersects)
-					.IgnoreUnmapped()
-				)
-			);
+		protected override string UrlPath => $"/{Index}/doc/_search";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Search<Domain.Shape>(f),
+			(client, f) => client.SearchAsync<Domain.Shape>(f),
+			(client, r) => client.Search<Domain.Shape>(r),
+			(client, r) => client.SearchAsync<Domain.Shape>(r)
+		);
 
 		protected override void ExpectResponse(ISearchResponse<Domain.Shape> response)
 		{
@@ -105,6 +104,8 @@ public class GeoShapeSerializationTests : GeoShapeSerializationTestsBase
 		public GeoShapeSerializationTests(IntrusiveOperationCluster cluster, EndpointUsage usage)
 			: base(cluster, usage) { }
 
+		protected override string Index => "geoshapes";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			if (client.IndexExists(Index).Exists)
@@ -136,7 +137,7 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			if (!createIndexResponse.IsValid)
 				throw new Exception($"Error creating index for integration test: {createIndexResponse.DebugInformation}");
 
-			var bulkResponse = this.Client.Bulk(b => b
+			var bulkResponse = Client.Bulk(b => b
 				.Index(Index)
 				.IndexMany(Domain.Shape.Shapes)
 				.Refresh(Refresh.WaitFor)
@@ -145,8 +146,6 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			if (!bulkResponse.IsValid)
 				throw new Exception($"Error indexing shapes for integration test: {bulkResponse.DebugInformation}");
 		}
-
-		protected override string Index => "geoshapes";
 	}
 
 	[SkipVersion("<6.2.0", "Support for WKT in Elasticsearch 6.2.0+")]
@@ -155,6 +154,8 @@ public class GeoShapeWKTSerializationTests : GeoShapeSerializationTestsBase
 		public GeoShapeWKTSerializationTests(IntrusiveOperationCluster cluster, EndpointUsage usage)
 			: base(cluster, usage) { }
 
+		protected override string Index => "wkt-geoshapes";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			if (client.IndexExists(Index).Exists)
@@ -189,7 +190,7 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			var bulk = new List<object>();
 
 			// use the low level client to force WKT
-			var typeName = this.Client.Infer.TypeName<Domain.Shape>();
+			var typeName = Client.Infer.TypeName<Domain.Shape>();
 			foreach (var shape in Domain.Shape.Shapes)
 			{
 				bulk.Add(new { index = new { _index = Index, _type = typeName, _id = shape.Id } });
@@ -202,23 +203,21 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				});
 			}
 
-			var bulkResponse = this.Client.LowLevel.Bulk<BulkResponse>(
+			var bulkResponse = Client.LowLevel.Bulk<BulkResponse>(
 				PostData.MultiJson(bulk),
-				new BulkRequestParameters{ Refresh = Refresh.WaitFor }
+				new BulkRequestParameters { Refresh = Refresh.WaitFor }
 			);
 
 			if (!bulkResponse.IsValid)
 				throw new Exception($"Error indexing shapes for integration test: {bulkResponse.DebugInformation}");
 		}
 
-		protected override string Index => "wkt-geoshapes";
-
 		protected override void ExpectResponse(ISearchResponse<Domain.Shape> response)
 		{
 			base.ExpectResponse(response);
 
 			// index shapes again
-			var bulkResponse = this.Client.Bulk(b => b
+			var bulkResponse = Client.Bulk(b => b
 				.Index(Index)
 				.IndexMany(response.Documents)
 				.Refresh(Refresh.WaitFor)
diff --git a/src/Tests/Tests/QueryDsl/Geo/GeoWKTTests.cs b/src/Tests/Tests/QueryDsl/Geo/GeoWKTTests.cs
index 6ac22a27493..33c64823d7c 100644
--- a/src/Tests/Tests/QueryDsl/Geo/GeoWKTTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/GeoWKTTests.cs
@@ -3,7 +3,6 @@
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Framework;
 
 namespace Tests.QueryDsl.Geo
 {
@@ -88,23 +87,23 @@ public void ReadMultiLineString()
 		[U]
 		public void WriteMultiLineString()
 		{
-			var multLineString = new MultiLineStringGeoShape(new []
+			var multLineString = new MultiLineStringGeoShape(new[]
+			{
+				new[]
 				{
-					new []
-					{
-						new GeoCoordinate(2, 102),
-						new GeoCoordinate(2, 103),
-						new GeoCoordinate(3, 103),
-						new GeoCoordinate(3, 102),
-					},
-					new []
-					{
-						new GeoCoordinate(0, 100),
-						new GeoCoordinate(0, 101),
-						new GeoCoordinate(1, 101),
-						new GeoCoordinate(1, 100),
-					}
-				});
+					new GeoCoordinate(2, 102),
+					new GeoCoordinate(2, 103),
+					new GeoCoordinate(3, 103),
+					new GeoCoordinate(3, 102),
+				},
+				new[]
+				{
+					new GeoCoordinate(0, 100),
+					new GeoCoordinate(0, 101),
+					new GeoCoordinate(1, 101),
+					new GeoCoordinate(1, 100),
+				}
+			});
 
 			var wkt = GeoWKTWriter.Write(multLineString);
 			wkt.Should().Be("MULTILINESTRING ((102 2, 103 2, 103 3, 102 3), (100 0, 101 0, 101 1, 100 1))");
@@ -133,16 +132,16 @@ public void ReadPolygon()
 		[U]
 		public void WritePolygon()
 		{
-			var polygon = new PolygonGeoShape(new []
+			var polygon = new PolygonGeoShape(new[]
 			{
-				new []
+				new[]
 				{
 					new GeoCoordinate(2, 102),
 					new GeoCoordinate(2, 103),
 					new GeoCoordinate(3, 103),
 					new GeoCoordinate(3, 102),
 				},
-				new []
+				new[]
 				{
 					new GeoCoordinate(0, 100),
 					new GeoCoordinate(0, 101),
@@ -185,11 +184,11 @@ public void ReadMultiPolygon()
 		[U]
 		public void WriteMultiPolygon()
 		{
-			var multiPolygon = new MultiPolygonGeoShape(new []
+			var multiPolygon = new MultiPolygonGeoShape(new[]
 			{
-				new []
+				new[]
 				{
-					new []
+					new[]
 					{
 						new GeoCoordinate(2, 102),
 						new GeoCoordinate(2, 103),
@@ -198,9 +197,9 @@ public void WriteMultiPolygon()
 						new GeoCoordinate(2, 102),
 					}
 				},
-				new []
+				new[]
 				{
-					new []
+					new[]
 					{
 						new GeoCoordinate(0, 100),
 						new GeoCoordinate(0, 101),
@@ -208,7 +207,7 @@ public void WriteMultiPolygon()
 						new GeoCoordinate(1, 100),
 						new GeoCoordinate(0, 100),
 					},
-					new []
+					new[]
 					{
 						new GeoCoordinate(0.2, 100.2),
 						new GeoCoordinate(0.2, 100.8),
@@ -219,7 +218,10 @@ public void WriteMultiPolygon()
 				}
 			});
 
-			GeoWKTWriter.Write(multiPolygon).Should().Be("MULTIPOLYGON (((102 2, 103 2, 103 3, 102 3, 102 2)), ((100 0, 101 0, 101 1, 100 1, 100 0), (100.2 0.2, 100.8 0.2, 100.8 0.8, 100.2 0.8, 100.2 0.2)))");
+			GeoWKTWriter.Write(multiPolygon)
+				.Should()
+				.Be(
+					"MULTIPOLYGON (((102 2, 103 2, 103 3, 102 3, 102 2)), ((100 0, 101 0, 101 1, 100 1, 100 0), (100.2 0.2, 100.8 0.2, 100.8 0.8, 100.2 0.8, 100.2 0.2)))");
 		}
 
 		[U]
@@ -241,7 +243,7 @@ public void ReadAndWriteEnvelope()
 		[U]
 		public void WriteEnvelopeIgnoresZValues()
 		{
-			var envelope = new EnvelopeGeoShape(new []
+			var envelope = new EnvelopeGeoShape(new[]
 			{
 				new GeoCoordinate(40.73, -74.1, 3),
 				new GeoCoordinate(40.01, -71.12, 2)
@@ -288,6 +290,5 @@ public void GeoWKTExceptionReturnsCorrectLineNumberAndPosition()
 			Action action = () => GeoWKTReader.Read(wkt);
 			action.ShouldThrow<GeoWKTException>().Which.Message.Should().Be("Expected number but found: , at line 2, position 5");
 		}
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Polygon/GeoPolygonQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Polygon/GeoPolygonQueryUsageTests.cs
index 22afdd43b9b..3cd8b5bd005 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Polygon/GeoPolygonQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Polygon/GeoPolygonQueryUsageTests.cs
@@ -3,7 +3,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Geo.Polygon
 {
@@ -11,6 +10,22 @@ public class GeoPolygonQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public GeoPolygonQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoPolygonQuery>(a => a.GeoPolygon)
+		{
+			q => q.Field = null,
+			q => q.Points = null,
+			q => q.Points = Enumerable.Empty<GeoLocation>()
+		};
+
+		protected override QueryContainer QueryInitializer => new GeoPolygonQuery
+		{
+			Boost = 1.1,
+			Name = "named_query",
+			ValidationMethod = GeoValidationMethod.Strict,
+			Points = new[] { new GeoLocation(45, -45), new GeoLocation(-34, 34), },
+			Field = Infer.Field<Project>(p => p.Location)
+		};
+
 		protected override object QueryJson => new
 		{
 			geo_polygon = new
@@ -20,39 +35,22 @@ public GeoPolygonQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(
 				validation_method = "strict",
 				location = new
 				{
-					points = new[] {
+					points = new[]
+					{
 						new { lat = 45.0, lon = -45.0 },
 						new { lat = -34.0, lon = 34.0 }
 					}
 				}
 			}
-
-		};
-
-		protected override QueryContainer QueryInitializer => new GeoPolygonQuery
-		{
-			Boost = 1.1,
-			Name = "named_query",
-			ValidationMethod =	GeoValidationMethod.Strict,
-			Points = new [] { new GeoLocation(45,-45), new GeoLocation(-34,34),  },
-			Field = Infer.Field<Project>(p=>p.Location)
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoPolygon(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
+				.Field(p => p.Location)
 				.ValidationMethod(GeoValidationMethod.Strict)
-				.Points( new GeoLocation(45,-45), new GeoLocation(-34,34))
+				.Points(new GeoLocation(45, -45), new GeoLocation(-34, 34))
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoPolygonQuery>(a => a.GeoPolygon)
-		{
-			q =>  q.Field = null,
-			q =>  q.Points = null,
-			q =>  q.Points = Enumerable.Empty<GeoLocation>()
-		};
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQueryUsageTests.cs
index 778276f4a92..a2bcb9c5a35 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQueryUsageTests.cs
@@ -1,48 +1,48 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
-using Tests.Framework.Integration;
 using Tests.Domain;
+using Tests.Framework.Integration;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.Geo.Shape.Circle
 {
 	public class GeoShapeCircleQueryUsageTests : GeoShapeQueryUsageTestsBase
 	{
-		public GeoShapeCircleQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly GeoCoordinate _coordinates = new GeoCoordinate(-45.0, 45.0);
 
-		protected override object ShapeJson => new
+		public GeoShapeCircleQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeCircleQuery>(a => a.GeoShape as IGeoShapeCircleQuery)
 		{
-			type ="circle",
-			radius = "100m",
-			coordinates = this._coordinates
+			q => q.Field = null,
+			q => q.Shape = null,
+			q => q.Shape.Coordinates = null,
 		};
 
 		protected override QueryContainer QueryInitializer => new GeoShapeCircleQuery
 		{
 			Name = "named_query",
 			Boost = 1.1,
-			Field = Field<Project>(p=>p.Location),
-			Shape = new CircleGeoShape(this._coordinates) { Radius = "100m" },
+			Field = Field<Project>(p => p.Location),
+			Shape = new CircleGeoShape(_coordinates) { Radius = "100m" },
 			Relation = GeoShapeRelation.Intersects,
 		};
 
+		protected override object ShapeJson => new
+		{
+			type = "circle",
+			radius = "100m",
+			coordinates = _coordinates
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapeCircle(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
-				.Coordinates(this._coordinates)
+				.Field(p => p.Location)
+				.Coordinates(_coordinates)
 				.Radius("100m")
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeCircleQuery>(a => a.GeoShape as IGeoShapeCircleQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Coordinates = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQueryUsageTests.cs
index 2d2c4ff8a6f..64e52481342 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQueryUsageTests.cs
@@ -9,43 +9,44 @@ namespace Tests.QueryDsl.Geo.Shape.Envelope
 {
 	public class GeoShapeEnvelopeQueryUsageTests : GeoShapeQueryUsageTestsBase
 	{
-		public GeoShapeEnvelopeQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly IEnumerable<GeoCoordinate> _coordinates = new GeoCoordinate[]
 		{
-			new [] { -45.0, 45.0 },
-			new [] { 45.0, -45.0 }
+			new[] { -45.0, 45.0 },
+			new[] { 45.0, -45.0 }
 		};
 
-		protected override object ShapeJson => new
-		{
-			type ="envelope",
-			coordinates = this._coordinates
-		};
+		public GeoShapeEnvelopeQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen =>
+			new ConditionlessWhen<IGeoShapeEnvelopeQuery>(a => a.GeoShape as IGeoShapeEnvelopeQuery)
+			{
+				q => q.Field = null,
+				q => q.Shape = null,
+				q => q.Shape.Coordinates = null,
+			};
 
 		protected override QueryContainer QueryInitializer => new GeoShapeEnvelopeQuery
 		{
 			Name = "named_query",
 			Boost = 1.1,
-			Field = Field<Project>(p=>p.Location),
-			Shape = new EnvelopeGeoShape(this._coordinates),
+			Field = Field<Project>(p => p.Location),
+			Shape = new EnvelopeGeoShape(_coordinates),
 			Relation = GeoShapeRelation.Intersects,
 		};
 
+		protected override object ShapeJson => new
+		{
+			type = "envelope",
+			coordinates = _coordinates
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapeEnvelope(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
-				.Coordinates(this._coordinates)
+				.Field(p => p.Location)
+				.Coordinates(_coordinates)
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeEnvelopeQuery>(a => a.GeoShape as IGeoShapeEnvelopeQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Coordinates = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/GeoShapeQueryUsageTestsBase.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/GeoShapeQueryUsageTestsBase.cs
index 91386c02a0b..7aa482e065a 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/GeoShapeQueryUsageTestsBase.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/GeoShapeQueryUsageTestsBase.cs
@@ -11,12 +11,12 @@ protected GeoShapeQueryUsageTestsBase(ReadOnlyCluster i, EndpointUsage usage) :
 		{
 			geo_shape = new
 			{
-				_name="named_query",
+				_name = "named_query",
 				boost = 1.1,
 				location = new
 				{
 					relation = "intersects",
-					shape = this.ShapeJson
+					shape = ShapeJson
 				}
 			}
 		};
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/GeometryCollection/GeoShapeGeometryCollectionQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/GeometryCollection/GeoShapeGeometryCollectionQueryUsageTests.cs
index 2975cd7cdd5..ae561be2085 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/GeometryCollection/GeoShapeGeometryCollectionQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/GeometryCollection/GeoShapeGeometryCollectionQueryUsageTests.cs
@@ -8,25 +8,47 @@ namespace Tests.QueryDsl.Geo.Shape.GeometryCollection
 {
 	public class GeoShapeGeometryCollectionQueryUsageTests : GeoShapeQueryUsageTestsBase
 	{
-		public GeoShapeGeometryCollectionQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly IEnumerable<GeoCoordinate> _lineStringCoordinates = new GeoCoordinate[]
 		{
-			new [] {-77.03653, 38.897676},
-			new [] {-77.009051, 38.889939 }
+			new[] { -77.03653, 38.897676 },
+			new[] { -77.009051, 38.889939 }
 		};
 
 		private readonly IEnumerable<IEnumerable<GeoCoordinate>> _multiLineStringCoordinates = new[]
 		{
-			new GeoCoordinate[] { new [] { 12.0, 2.0 }, new [] { 13.0, 2.0},new [] { 13.0, 3.0 }, new []{ 12.0, 3.0 } },
-			new GeoCoordinate[] { new [] { 10.0, 0.0 }, new [] { 11.0, 0.0},new [] { 11.0, 1.0 }, new []{ 10.0, 1.0 } },
-			new GeoCoordinate[] { new [] { 10.2, 0.2 }, new [] { 10.8, 0.2},new [] { 10.8, 0.8 }, new []{ 12.0, 0.8 } },
+			new GeoCoordinate[] { new[] { 12.0, 2.0 }, new[] { 13.0, 2.0 }, new[] { 13.0, 3.0 }, new[] { 12.0, 3.0 } },
+			new GeoCoordinate[] { new[] { 10.0, 0.0 }, new[] { 11.0, 0.0 }, new[] { 11.0, 1.0 }, new[] { 10.0, 1.0 } },
+			new GeoCoordinate[] { new[] { 10.2, 0.2 }, new[] { 10.8, 0.2 }, new[] { 10.8, 0.8 }, new[] { 12.0, 0.8 } },
 		};
 
 		private readonly IEnumerable<GeoCoordinate> _multiPointCoordinates = new GeoCoordinate[]
 		{
-			new [] {-77.03653, 38.897676},
-			new [] {-77.009051, 38.889939 }
+			new[] { -77.03653, 38.897676 },
+			new[] { -77.009051, 38.889939 }
+		};
+
+		private readonly IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> _multiPolygonCoordinates = new[]
+		{
+			new[]
+			{
+				new GeoCoordinate[]
+				{
+					new[] { -17.0, 10.0 }, new[] { 16.0, 15.0 }, new[] { 12.0, 0.0 }, new[] { 16.0, -15.0 }, new[] { -17.0, -10.0 },
+					new[] { -17.0, 10.0 }
+				},
+				new GeoCoordinate[]
+				{
+					new[] { 18.2, 8.2 }, new[] { -18.8, 8.2 }, new[] { -10.8, -8.8 }, new[] { 18.2, 8.8 }
+				}
+			},
+			new[]
+			{
+				new GeoCoordinate[]
+				{
+					new[] { -15.0, 8.0 }, new[] { 16.0, 15.0 }, new[] { 12.0, 0.0 }, new[] { 16.0, -15.0 }, new[] { -17.0, -10.0 },
+					new[] { -15.0, 8.0 }
+				}
+			}
 		};
 
 		private readonly GeoCoordinate _pointCoordinates = new[] { -77.03653, 38.897676 };
@@ -35,115 +57,96 @@ public GeoShapeGeometryCollectionQueryUsageTests(ReadOnlyCluster i, EndpointUsag
 		{
 			new GeoCoordinate[]
 			{
-				new [] {-17.0, 10.0}, new [] {16.0, 15.0}, new [] {12.0, 0.0}, new [] {16.0, -15.0}, new [] {-17.0, -10.0}, new [] {-17.0, 10.0}
+				new[] { -17.0, 10.0 }, new[] { 16.0, 15.0 }, new[] { 12.0, 0.0 }, new[] { 16.0, -15.0 }, new[] { -17.0, -10.0 }, new[] { -17.0, 10.0 }
 			},
 			new GeoCoordinate[]
 			{
-				new [] {18.2, 8.2}, new [] {-18.8, 8.2}, new [] {-10.8, -8.8}, new [] {18.2, 8.8}
+				new[] { 18.2, 8.2 }, new[] { -18.8, 8.2 }, new[] { -10.8, -8.8 }, new[] { 18.2, 8.8 }
 			}
 		};
 
-		private readonly IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> _multiPolygonCoordinates = new[]
+		public GeoShapeGeometryCollectionQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen =>
+			new ConditionlessWhen<IGeoShapeGeometryCollectionQuery>(a => a.GeoShape as IGeoShapeGeometryCollectionQuery)
+			{
+				q => q.Field = null,
+				q => q.Shape = null,
+				q => q.Shape.Geometries = null,
+			};
+
+		protected override QueryContainer QueryInitializer => new GeoShapeGeometryCollectionQuery
 		{
-			new []
+			Name = "named_query",
+			Boost = 1.1,
+			Field = Infer.Field<Project>(p => p.Location),
+			Shape = new Nest.GeometryCollection
 			{
-				new GeoCoordinate[]
-				{
-					new [] {-17.0, 10.0}, new [] {16.0, 15.0}, new [] {12.0, 0.0}, new [] {16.0, -15.0}, new [] {-17.0, -10.0}, new [] {-17.0, 10.0}
-				},
-				new GeoCoordinate[]
+				Geometries = new IGeoShape[]
 				{
-					new [] {18.2, 8.2}, new [] {-18.8, 8.2}, new [] {-10.8, -8.8}, new [] {18.2, 8.8}
+					new PointGeoShape(_pointCoordinates),
+					new MultiPointGeoShape(_multiPointCoordinates),
+					new LineStringGeoShape(_lineStringCoordinates),
+					new MultiLineStringGeoShape(_multiLineStringCoordinates),
+					new PolygonGeoShape(_polygonCoordinates),
+					new MultiPolygonGeoShape(_multiPolygonCoordinates),
 				}
 			},
-			new []
-			{
-				new GeoCoordinate[]
-				{
-					new [] {-15.0, 8.0}, new [] {16.0, 15.0}, new [] {12.0, 0.0}, new [] {16.0, -15.0}, new [] {-17.0, -10.0}, new [] {-15.0, 8.0}
-				}
-			}
+			Relation = GeoShapeRelation.Intersects,
 		};
 
 		protected override object ShapeJson => new
 		{
-			type ="geometrycollection",
+			type = "geometrycollection",
 			geometries = new object[]
 			{
 				new
 				{
 					type = "point",
-					coordinates = this._pointCoordinates
+					coordinates = _pointCoordinates
 				},
 				new
 				{
 					type = "multipoint",
-					coordinates = this._multiPointCoordinates
+					coordinates = _multiPointCoordinates
 				},
 				new
 				{
-					type ="linestring",
-					coordinates = this._lineStringCoordinates
+					type = "linestring",
+					coordinates = _lineStringCoordinates
 				},
 				new
 				{
-					type ="multilinestring",
-					coordinates = this._multiLineStringCoordinates
+					type = "multilinestring",
+					coordinates = _multiLineStringCoordinates
 				},
 				new
 				{
-					type ="polygon",
-					coordinates = this._polygonCoordinates
+					type = "polygon",
+					coordinates = _polygonCoordinates
 				},
 				new
 				{
-					type ="multipolygon",
-					coordinates = this._multiPolygonCoordinates
+					type = "multipolygon",
+					coordinates = _multiPolygonCoordinates
 				}
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new GeoShapeGeometryCollectionQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = Infer.Field<Project>(p=>p.Location),
-			Shape = new Nest.GeometryCollection
-			{
-				Geometries = new IGeoShape[]
-				{
-					new PointGeoShape(this._pointCoordinates),
-					new MultiPointGeoShape(this._multiPointCoordinates),
-					new LineStringGeoShape(this._lineStringCoordinates),
-					new MultiLineStringGeoShape(_multiLineStringCoordinates),
-					new PolygonGeoShape(this._polygonCoordinates),
-					new MultiPolygonGeoShape(this._multiPolygonCoordinates),
-				}
-			},
-			Relation = GeoShapeRelation.Intersects,
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapeGeometryCollection(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
+				.Field(p => p.Location)
 				.Geometries(
-					new PointGeoShape(this._pointCoordinates),
-					new MultiPointGeoShape(this._multiPointCoordinates),
-					new LineStringGeoShape(this._lineStringCoordinates),
-					new MultiLineStringGeoShape(this._multiLineStringCoordinates),
-					new PolygonGeoShape(this._polygonCoordinates),
-					new MultiPolygonGeoShape(this._multiPolygonCoordinates)
+					new PointGeoShape(_pointCoordinates),
+					new MultiPointGeoShape(_multiPointCoordinates),
+					new LineStringGeoShape(_lineStringCoordinates),
+					new MultiLineStringGeoShape(_multiLineStringCoordinates),
+					new PolygonGeoShape(_polygonCoordinates),
+					new MultiPolygonGeoShape(_multiPolygonCoordinates)
 				)
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeGeometryCollectionQuery>(a => a.GeoShape as IGeoShapeGeometryCollectionQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Geometries = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/IndexedShape/GeoShapeIndexedShapeQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/IndexedShape/GeoShapeIndexedShapeQueryUsageTests.cs
index 7d83b749e07..b1aa5e2031f 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/IndexedShape/GeoShapeIndexedShapeQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/IndexedShape/GeoShapeIndexedShapeQueryUsageTests.cs
@@ -17,11 +17,37 @@ public class GeoShapeIndexedShapeQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public GeoShapeIndexedShapeQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen =>
+			new ConditionlessWhen<IGeoIndexedShapeQuery>(a => a.GeoShape as IGeoIndexedShapeQuery)
+			{
+				q => q.Field = null,
+				q => q.IndexedShape = null,
+				q => q.IndexedShape.Id = null,
+				q => q.IndexedShape.Index = null,
+				q => q.IndexedShape.Type = null,
+				q => q.IndexedShape.Path = null,
+			};
+
+		protected override QueryContainer QueryInitializer => new GeoIndexedShapeQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = Field<Project>(p => p.Location),
+			IndexedShape = new FieldLookup
+			{
+				Id = 2,
+				Index = Index<Project>(),
+				Type = Type<Project>(),
+				Path = Field<Project>(p => p.Location),
+			},
+			Relation = GeoShapeRelation.Intersects
+		};
+
 		protected override object QueryJson => new
 		{
 			geo_shape = new
 			{
-				_name="named_query",
+				_name = "named_query",
 				boost = 1.1,
 				location = new
 				{
@@ -37,41 +63,16 @@ public GeoShapeIndexedShapeQueryUsageTests(ReadOnlyCluster i, EndpointUsage usag
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new GeoIndexedShapeQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = Field<Project>(p=>p.Location),
-			IndexedShape = new FieldLookup
-			{
-				Id = 2,
-				Index = Index<Project>(),
-				Type = Type<Project>(),
-				Path = Field<Project>(p=>p.Location),
-			},
-			Relation = GeoShapeRelation.Intersects
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoIndexedShape(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
-				.IndexedShape(p=>p
+				.Field(p => p.Location)
+				.IndexedShape(p => p
 					.Id(2)
-					.Path(pp=>pp.Location)
+					.Path(pp => pp.Location)
 				)
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoIndexedShapeQuery>(a => a.GeoShape as IGeoIndexedShapeQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.IndexedShape = null,
-			q =>  q.IndexedShape.Id = null,
-			q =>  q.IndexedShape.Index = null,
-			q =>  q.IndexedShape.Type = null,
-			q =>  q.IndexedShape.Path = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQueryUsageTests.cs
index ba02a0bce6e..59908a79f03 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQueryUsageTests.cs
@@ -9,43 +9,44 @@ namespace Tests.QueryDsl.Geo.Shape.LineString
 {
 	public class GeoShapeLineStringQueryUsageTests : GeoShapeQueryUsageTestsBase
 	{
-		public GeoShapeLineStringQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly IEnumerable<GeoCoordinate> _coordinates = new GeoCoordinate[]
 		{
-			new [] {-77.03653, 38.897676},
-			new [] {-77.009051, 38.889939 }
+			new[] { -77.03653, 38.897676 },
+			new[] { -77.009051, 38.889939 }
 		};
 
-		protected override object ShapeJson => new
-		{
-			type ="linestring",
-			coordinates = this._coordinates
-		};
+		public GeoShapeLineStringQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen =>
+			new ConditionlessWhen<IGeoShapeLineStringQuery>(a => a.GeoShape as IGeoShapeLineStringQuery)
+			{
+				q => q.Field = null,
+				q => q.Shape = null,
+				q => q.Shape.Coordinates = null,
+			};
 
 		protected override QueryContainer QueryInitializer => new GeoShapeLineStringQuery
 		{
 			Name = "named_query",
 			Boost = 1.1,
-			Field = Field<Project>(p=>p.Location),
-			Shape = new LineStringGeoShape(this._coordinates),
+			Field = Field<Project>(p => p.Location),
+			Shape = new LineStringGeoShape(_coordinates),
 			Relation = GeoShapeRelation.Intersects,
 		};
 
+		protected override object ShapeJson => new
+		{
+			type = "linestring",
+			coordinates = _coordinates
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapeLineString(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
-				.Coordinates(this._coordinates)
+				.Field(p => p.Location)
+				.Coordinates(_coordinates)
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeLineStringQuery>(a => a.GeoShape as IGeoShapeLineStringQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Coordinates = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQueryUsageTests.cs
index 2d8e7c3f80c..f9c4f199d2c 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQueryUsageTests.cs
@@ -9,44 +9,45 @@ namespace Tests.QueryDsl.Geo.Shape.MultiLineString
 {
 	public class GeoShapeMultiLineStringQueryUsageTests : GeoShapeQueryUsageTestsBase
 	{
-		public GeoShapeMultiLineStringQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly IEnumerable<IEnumerable<GeoCoordinate>> _coordinates = new[]
 		{
-			new GeoCoordinate[] { new [] { 12.0, 2.0 }, new [] { 13.0, 2.0},new [] { 13.0, 3.0 }, new []{ 12.0, 3.0 } },
-			new GeoCoordinate[] { new [] { 10.0, 0.0 }, new [] { 11.0, 0.0},new [] { 11.0, 1.0 }, new []{ 10.0, 1.0 } },
-			new GeoCoordinate[] { new [] { 10.2, 0.2 }, new [] { 10.8, 0.2},new [] { 10.8, 0.8 }, new []{ 12.0, 0.8 } },
+			new GeoCoordinate[] { new[] { 12.0, 2.0 }, new[] { 13.0, 2.0 }, new[] { 13.0, 3.0 }, new[] { 12.0, 3.0 } },
+			new GeoCoordinate[] { new[] { 10.0, 0.0 }, new[] { 11.0, 0.0 }, new[] { 11.0, 1.0 }, new[] { 10.0, 1.0 } },
+			new GeoCoordinate[] { new[] { 10.2, 0.2 }, new[] { 10.8, 0.2 }, new[] { 10.8, 0.8 }, new[] { 12.0, 0.8 } },
 		};
 
-		protected override object ShapeJson => new
-		{
-			type ="multilinestring",
-			coordinates = this._coordinates
-		};
+		public GeoShapeMultiLineStringQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen =>
+			new ConditionlessWhen<IGeoShapeMultiLineStringQuery>(a => a.GeoShape as IGeoShapeMultiLineStringQuery)
+			{
+				q => q.Field = null,
+				q => q.Shape = null,
+				q => q.Shape.Coordinates = null,
+			};
 
 		protected override QueryContainer QueryInitializer => new GeoShapeMultiLineStringQuery
 		{
 			Name = "named_query",
 			Boost = 1.1,
-			Field = Field<Project>(p=>p.Location),
-			Shape = new MultiLineStringGeoShape(this._coordinates),
+			Field = Field<Project>(p => p.Location),
+			Shape = new MultiLineStringGeoShape(_coordinates),
 			Relation = GeoShapeRelation.Intersects,
 		};
 
+		protected override object ShapeJson => new
+		{
+			type = "multilinestring",
+			coordinates = _coordinates
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapeMultiLineString(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
-				.Coordinates(this._coordinates)
+				.Field(p => p.Location)
+				.Coordinates(_coordinates)
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeMultiLineStringQuery>(a => a.GeoShape as IGeoShapeMultiLineStringQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Coordinates = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQueryUsageTests.cs
index cab167212b8..bd7e26c801d 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQueryUsageTests.cs
@@ -9,43 +9,44 @@ namespace Tests.QueryDsl.Geo.Shape.MultiPoint
 {
 	public class GeoShapeMultiPointQueryUsageTests : GeoShapeQueryUsageTestsBase
 	{
-		public GeoShapeMultiPointQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly IEnumerable<GeoCoordinate> _coordinates = new GeoCoordinate[]
 		{
-			new [] {-77.03653, 38.897676},
-			new [] {-77.009051, 38.889939 }
+			new[] { -77.03653, 38.897676 },
+			new[] { -77.009051, 38.889939 }
 		};
 
-		protected override object ShapeJson => new
-		{
-			type ="multipoint",
-			coordinates = this._coordinates
-		};
+		public GeoShapeMultiPointQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen =>
+			new ConditionlessWhen<IGeoShapeMultiPointQuery>(a => a.GeoShape as IGeoShapeMultiPointQuery)
+			{
+				q => q.Field = null,
+				q => q.Shape = null,
+				q => q.Shape.Coordinates = null,
+			};
 
 		protected override QueryContainer QueryInitializer => new GeoShapeMultiPointQuery
 		{
 			Name = "named_query",
 			Boost = 1.1,
-			Field = Field<Project>(p=>p.Location),
-			Shape = new MultiPointGeoShape(this._coordinates),
+			Field = Field<Project>(p => p.Location),
+			Shape = new MultiPointGeoShape(_coordinates),
 			Relation = GeoShapeRelation.Intersects,
 		};
 
+		protected override object ShapeJson => new
+		{
+			type = "multipoint",
+			coordinates = _coordinates
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapeMultiPoint(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
-				.Coordinates(this._coordinates)
+				.Field(p => p.Location)
+				.Coordinates(_coordinates)
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeMultiPointQuery>(a => a.GeoShape as IGeoShapeMultiPointQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Coordinates = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQueryUsageTests.cs
index a39478bb20d..db312af5793 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQueryUsageTests.cs
@@ -9,59 +9,62 @@ namespace Tests.QueryDsl.Geo.Shape.MultiPolygon
 {
 	public class GeoShapeMultiPolygonQueryUsageTests : GeoShapeQueryUsageTestsBase
 	{
-		public GeoShapeMultiPolygonQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> _coordinates = new[]
 		{
-			new []
+			new[]
 			{
 				new GeoCoordinate[]
 				{
-					new [] {-17.0, 10.0}, new [] {16.0, 15.0}, new [] {12.0, 0.0}, new [] {16.0, -15.0}, new [] {-17.0, -10.0}, new [] {-17.0, 10.0}
+					new[] { -17.0, 10.0 }, new[] { 16.0, 15.0 }, new[] { 12.0, 0.0 }, new[] { 16.0, -15.0 }, new[] { -17.0, -10.0 },
+					new[] { -17.0, 10.0 }
 				},
 				new GeoCoordinate[]
 				{
-					new [] {18.2, 8.2}, new [] {-18.8, 8.2}, new [] {-10.8, -8.8}, new [] {18.2, 8.8}
+					new[] { 18.2, 8.2 }, new[] { -18.8, 8.2 }, new[] { -10.8, -8.8 }, new[] { 18.2, 8.8 }
 				}
 			},
-			new []
+			new[]
 			{
 				new GeoCoordinate[]
 				{
-					new [] {-15.0, 8.0}, new [] {16.0, 15.0}, new [] {12.0, 0.0}, new [] {16.0, -15.0}, new [] {-17.0, -10.0}, new [] {-15.0, 8.0}
+					new[] { -15.0, 8.0 }, new[] { 16.0, 15.0 }, new[] { 12.0, 0.0 }, new[] { 16.0, -15.0 }, new[] { -17.0, -10.0 },
+					new[] { -15.0, 8.0 }
 				}
 			}
 		};
 
-		protected override object ShapeJson => new
-		{
-			type = "multipolygon",
-			coordinates = this._coordinates
-		};
+		public GeoShapeMultiPolygonQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen =>
+			new ConditionlessWhen<IGeoShapeMultiPolygonQuery>(a => a.GeoShape as IGeoShapeMultiPolygonQuery)
+			{
+				q => q.Field = null,
+				q => q.Shape = null,
+				q => q.Shape.Coordinates = null
+			};
 
 		protected override QueryContainer QueryInitializer => new GeoShapeMultiPolygonQuery
 		{
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Field<Project>(p => p.Location),
-			Shape = new MultiPolygonGeoShape(this._coordinates),
+			Shape = new MultiPolygonGeoShape(_coordinates),
 			Relation = GeoShapeRelation.Intersects,
 		};
 
+		protected override object ShapeJson => new
+		{
+			type = "multipolygon",
+			coordinates = _coordinates
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapeMultiPolygon(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Field(p => p.Location)
-				.Coordinates(this._coordinates)
+				.Coordinates(_coordinates)
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeMultiPolygonQuery>(a => a.GeoShape as IGeoShapeMultiPolygonQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Coordinates = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/Point/GeoShapePointQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/Point/GeoShapePointQueryUsageTests.cs
index 0ea7bfbb8c7..117383e5fc2 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/Point/GeoShapePointQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/Point/GeoShapePointQueryUsageTests.cs
@@ -8,39 +8,39 @@ namespace Tests.QueryDsl.Geo.Shape.Point
 {
 	public class GeoShapePointQueryUsageTests : GeoShapeQueryUsageTestsBase
 	{
-		public GeoShapePointQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly GeoCoordinate _coordinates = new[] { -77.03653, 38.897676 };
 
-		protected override object ShapeJson => new
+		public GeoShapePointQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapePointQuery>(a => a.GeoShape as IGeoShapePointQuery)
 		{
-			type ="point",
-			coordinates = this._coordinates
+			q => q.Field = null,
+			q => q.Shape = null,
+			q => q.Shape.Coordinates = null,
 		};
 
 		protected override QueryContainer QueryInitializer => new GeoShapePointQuery
 		{
 			Name = "named_query",
 			Boost = 1.1,
-			Field = Field<Project>(p=>p.Location),
-			Shape = new PointGeoShape(this._coordinates),
+			Field = Field<Project>(p => p.Location),
+			Shape = new PointGeoShape(_coordinates),
 			Relation = GeoShapeRelation.Intersects,
 		};
 
+		protected override object ShapeJson => new
+		{
+			type = "point",
+			coordinates = _coordinates
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapePoint(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Field(p=>p.Location)
-				.Coordinates(this._coordinates)
+				.Field(p => p.Location)
+				.Coordinates(_coordinates)
 				.Relation(GeoShapeRelation.Intersects)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapePointQuery>(a => a.GeoShape as IGeoShapePointQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Coordinates = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQueryUsageTests.cs
index 9226688444e..4153ac83566 100644
--- a/src/Tests/Tests/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQueryUsageTests.cs
@@ -9,25 +9,43 @@ namespace Tests.QueryDsl.Geo.Shape.Polygon
 {
 	public class GeoShapePolygonQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public GeoShapePolygonQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private readonly IEnumerable<IEnumerable<GeoCoordinate>> _polygonCoordinates = new[]
 		{
 			new GeoCoordinate[]
 			{
-				new [] {-17.0, 10.0}, new [] {16.0, 15.0}, new [] {12.0, 0.0}, new [] {16.0, -15.0}, new [] {-17.0, -10.0}, new [] {-17.0, 10.0}
+				new[] { -17.0, 10.0 }, new[] { 16.0, 15.0 }, new[] { 12.0, 0.0 }, new[] { 16.0, -15.0 }, new[] { -17.0, -10.0 }, new[] { -17.0, 10.0 }
 			},
 			new GeoCoordinate[]
 			{
-				new [] {18.2, 8.2}, new [] {-18.8, 8.2}, new [] {-10.8, -8.8}, new [] {18.2, 8.8}
+				new[] { 18.2, 8.2 }, new[] { -18.8, 8.2 }, new[] { -10.8, -8.8 }, new[] { 18.2, 8.8 }
 			}
 		};
 
+		public GeoShapePolygonQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen =>
+			new ConditionlessWhen<IGeoShapePolygonQuery>(a => a.GeoShape as IGeoShapePolygonQuery)
+			{
+				q => q.Field = null,
+				q => q.Shape = null,
+				q => q.Shape.Coordinates = null
+			};
+
+		protected override QueryContainer QueryInitializer => new GeoShapePolygonQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = Field<Project>(p => p.Location),
+			Shape = new PolygonGeoShape(_polygonCoordinates),
+			Relation = GeoShapeRelation.Intersects,
+			IgnoreUnmapped = true
+		};
+
 		protected override object QueryJson => new
 		{
 			geo_shape = new
 			{
-				_name="named_query",
+				_name = "named_query",
 				boost = 1.1,
 				ignore_unmapped = true,
 				location = new
@@ -36,37 +54,20 @@ public GeoShapePolygonQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) :
 					shape = new
 					{
 						type = "polygon",
-						coordinates = this._polygonCoordinates
+						coordinates = _polygonCoordinates
 					}
 				}
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new GeoShapePolygonQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = Field<Project>(p => p.Location),
-			Shape = new PolygonGeoShape(this._polygonCoordinates),
-			Relation = GeoShapeRelation.Intersects,
-			IgnoreUnmapped = true
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.GeoShapePolygon(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Field(p => p.Location)
-				.Coordinates(this._polygonCoordinates)
+				.Coordinates(_polygonCoordinates)
 				.Relation(GeoShapeRelation.Intersects)
 				.IgnoreUnmapped(true)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapePolygonQuery>(a => a.GeoShape as IGeoShapePolygonQuery)
-		{
-			q =>  q.Field = null,
-			q =>  q.Shape = null,
-			q =>  q.Shape.Coordinates = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Joining/HasChild/HasChildQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Joining/HasChild/HasChildQueryUsageTests.cs
index 418085a3eeb..339f6a3fb06 100644
--- a/src/Tests/Tests/QueryDsl/Joining/HasChild/HasChildQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Joining/HasChild/HasChildQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.HasChild
 {
@@ -10,19 +9,11 @@ public class HasChildUsageTests : QueryDslUsageTestsBase
 	{
 		public HasChildUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IHasChildQuery>(a => a.HasChild)
 		{
-			has_child = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				type = "developer",
-				score_mode = "avg",
-				min_children = 1,
-				max_children = 5,
-				query = new { match_all = new { } },
-				inner_hits = new { explain = true }
-			}
+			q => q.Query = null,
+			q => q.Query = ConditionlessQuery,
+			q => q.Type = null,
 		};
 
 		protected override QueryContainer QueryInitializer => new HasChildQuery
@@ -37,22 +28,30 @@ public HasChildUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usag
 			ScoreMode = ChildScoreMode.Average
 		};
 
+		protected override object QueryJson => new
+		{
+			has_child = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				type = "developer",
+				score_mode = "avg",
+				min_children = 1,
+				max_children = 5,
+				query = new { match_all = new { } },
+				inner_hits = new { explain = true }
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.HasChild<Developer>(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.InnerHits(i=>i.Explain())
+				.InnerHits(i => i.Explain())
 				.MaxChildren(5)
 				.MinChildren(1)
 				.ScoreMode(ChildScoreMode.Average)
-				.Query(qq=>qq.MatchAll())
+				.Query(qq => qq.MatchAll())
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IHasChildQuery>(a => a.HasChild)
-		{
-			q =>  q.Query = null,
-			q =>  q.Query = ConditionlessQuery,
-			q =>  q.Type = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Joining/HasParent/HasParentQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Joining/HasParent/HasParentQueryUsageTests.cs
index 23b30b6ceba..3b4129590a2 100644
--- a/src/Tests/Tests/QueryDsl/Joining/HasParent/HasParentQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Joining/HasParent/HasParentQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.HasParent
 {
@@ -10,6 +9,24 @@ public class HasParentUsageTests : QueryDslUsageTestsBase
 	{
 		public HasParentUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IHasParentQuery>(a => a.HasParent)
+		{
+			q => q.Query = null,
+			q => q.Query = ConditionlessQuery,
+			q => q.ParentType = null,
+		};
+
+		protected override QueryContainer QueryInitializer => new HasParentQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			ParentType = Infer.Type<Developer>(),
+			InnerHits = new InnerHits { Explain = true },
+			Query = new MatchAllQuery(),
+			Score = true,
+			IgnoreUnmapped = true
+		};
+
 		protected override object QueryJson => new
 		{
 			has_parent = new
@@ -30,32 +47,14 @@ public HasParentUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usa
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new HasParentQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			ParentType = Infer.Type<Developer>(),
-			InnerHits = new InnerHits { Explain = true },
-			Query = new MatchAllQuery(),
-			Score = true,
-			IgnoreUnmapped = true
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.HasParent<Developer>(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.InnerHits(i=>i.Explain())
+				.InnerHits(i => i.Explain())
 				.Score(true)
-				.Query(qq=>qq.MatchAll())
+				.Query(qq => qq.MatchAll())
 				.IgnoreUnmapped(true)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IHasParentQuery>(a => a.HasParent)
-		{
-			q =>  q.Query = null,
-			q =>  q.Query = ConditionlessQuery,
-			q =>  q.ParentType = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Joining/Nested/NestedQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Joining/Nested/NestedQueryUsageTests.cs
index b693e9adbd5..aeb8e2fef62 100644
--- a/src/Tests/Tests/QueryDsl/Joining/Nested/NestedQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Joining/Nested/NestedQueryUsageTests.cs
@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Nest;
-using Newtonsoft.Json.Linq;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.Joining.Nested
@@ -21,6 +19,27 @@ public class NestedUsageTests : QueryDslUsageTestsBase
 	{
 		public NestedUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<INestedQuery>(a => a.Nested)
+		{
+			q => q.Query = null,
+			q => q.Query = ConditionlessQuery,
+			q => q.Path = null,
+		};
+
+		protected override QueryContainer QueryInitializer => new NestedQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			InnerHits = new InnerHits { Explain = true },
+			Path = Field<Project>(p => p.CuratedTags),
+			Query = new TermsQuery
+			{
+				Field = Field<Project>(p => p.CuratedTags.First().Name),
+				Terms = new[] { "lorem", "ipsum" }
+			},
+			IgnoreUnmapped = true
+		};
+
 		protected override object QueryJson => new
 		{
 			nested = new
@@ -31,7 +50,7 @@ public NestedUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage)
 				{
 					terms = new Dictionary<string, object>
 					{
-						{ "curatedTags.name", new [] {"lorem", "ipsum"} }
+						{ "curatedTags.name", new[] { "lorem", "ipsum" } }
 					}
 				},
 				ignore_unmapped = true,
@@ -43,26 +62,12 @@ public NestedUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage)
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new NestedQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			InnerHits = new InnerHits { Explain = true },
-			Path = Field<Project>(p => p.CuratedTags),
-			Query = new TermsQuery
-			{
-				Field = Field<Project>(p => p.CuratedTags.First().Name),
-				Terms = new[] { "lorem", "ipsum" }
-			},
-			IgnoreUnmapped = true
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Nested(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.InnerHits(i=>i.Explain())
-				.Path(p=>p.CuratedTags)
+				.InnerHits(i => i.Explain())
+				.Path(p => p.CuratedTags)
 				.Query(nq => nq
 					.Terms(t => t
 						.Field(f => f.CuratedTags.First().Name)
@@ -71,12 +76,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				)
 				.IgnoreUnmapped()
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<INestedQuery>(a => a.Nested)
-		{
-			q =>  q.Query = null,
-			q =>  q.Query = ConditionlessQuery,
-			q =>  q.Path = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Joining/ParentId/ParentIdQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Joining/ParentId/ParentIdQueryUsageTests.cs
index 98c6a7a3ba2..93de3743b41 100644
--- a/src/Tests/Tests/QueryDsl/Joining/ParentId/ParentIdQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Joining/ParentId/ParentIdQueryUsageTests.cs
@@ -1,9 +1,7 @@
-using System.Linq;
-using Nest;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.ParentId
 {
@@ -16,14 +14,10 @@ public class ParentIdQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public ParentIdQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IParentIdQuery>(a => a.ParentId)
 		{
-			parent_id = new
-			{
-				_name = "named_query",
-				type = "commits",
-				id = Project.Instance.Name
-			}
+			q => q.Id = null,
+			q => q.Type = null,
 		};
 
 		protected override QueryContainer QueryInitializer => new ParentIdQuery
@@ -33,17 +27,21 @@ public ParentIdQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i,
 			Id = Project.Instance.Name
 		};
 
+		protected override object QueryJson => new
+		{
+			parent_id = new
+			{
+				_name = "named_query",
+				type = "commits",
+				id = Project.Instance.Name
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.ParentId(p => p
 				.Name("named_query")
 				.Type<CommitActivity>()
 				.Id(Project.Instance.Name)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IParentIdQuery>(a => a.ParentId)
-		{
-			q =>  q.Id = null,
-			q =>  q.Type = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/MatchNoneQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/MatchNoneQueryUsageTests.cs
index b81207c7530..7941f99a337 100644
--- a/src/Tests/Tests/QueryDsl/MatchNoneQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/MatchNoneQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl
 {
@@ -10,6 +9,12 @@ public class MatchNoneQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public MatchNoneQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override QueryContainer QueryInitializer => new MatchNoneQuery
+		{
+			Name = "named_query",
+			Boost = 1.1
+		};
+
 		protected override object QueryJson => new
 		{
 			match_none = new
@@ -19,12 +24,6 @@ public MatchNoneQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new MatchNoneQuery
-		{
-			Name = "named_query",
-			Boost = 1.1
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MatchNone(c => c
 				.Name("named_query")
diff --git a/src/Tests/Tests/QueryDsl/NestSpecific/Raw/RawCombineUsageTests.cs b/src/Tests/Tests/QueryDsl/NestSpecific/Raw/RawCombineUsageTests.cs
index d80c86c9574..fabc42c3558 100644
--- a/src/Tests/Tests/QueryDsl/NestSpecific/Raw/RawCombineUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/NestSpecific/Raw/RawCombineUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.NestSpecific.Raw
 {
@@ -12,15 +11,18 @@ namespace Tests.QueryDsl.NestSpecific.Raw
 	 */
 	public class RawCombineUsageTests : QueryDslUsageTestsBase
 	{
-		public RawCombineUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private static readonly string RawTermQuery = @"{""term"": { ""fieldname"":""value"" } }";
 
-		protected override bool SupportsDeserialization => false;
+		public RawCombineUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override QueryContainer QueryInitializer =>
+			new RawQuery(RawTermQuery)
+			&& new TermQuery { Field = "x", Value = "y" };
 
 		protected override object QueryJson => new
 		{
-			@bool = new {
+			@bool = new
+			{
 				must = new object[]
 				{
 					new { term = new { fieldname = "value" } },
@@ -29,12 +31,9 @@ public RawCombineUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, us
 			}
 		};
 
-		protected override QueryContainer QueryInitializer =>
-			new RawQuery(RawTermQuery)
-			&& new TermQuery { Field = "x", Value = "y" };
+		protected override bool SupportsDeserialization => false;
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) =>
 			q.Raw(RawTermQuery) && q.Term("x", "y");
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/NestSpecific/Raw/RawQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/NestSpecific/Raw/RawQueryUsageTests.cs
index cccb6e05356..aee491f5457 100644
--- a/src/Tests/Tests/QueryDsl/NestSpecific/Raw/RawQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/NestSpecific/Raw/RawQueryUsageTests.cs
@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using Nest;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.NestSpecific.Raw
 {
@@ -14,21 +11,20 @@ namespace Tests.QueryDsl.NestSpecific.Raw
 	 */
 	public class RawUsageTests : QueryDslUsageTestsBase
 	{
-		public RawUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private static readonly string RawTermQuery = @"{""term"": { ""fieldname"":""value"" } }";
 
-		protected override bool SupportsDeserialization => false;
+		public RawUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override QueryContainer QueryInitializer => new RawQuery(RawTermQuery);
 
 		protected override object QueryJson => new
 		{
 			term = new { fieldname = "value" }
 		};
 
-		protected override QueryContainer QueryInitializer => new RawQuery(RawTermQuery);
+		protected override bool SupportsDeserialization => false;
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Raw(RawTermQuery);
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/NotConditionlessWhen.cs b/src/Tests/Tests/QueryDsl/NotConditionlessWhen.cs
index 94a6d005fb2..d6090918eae 100644
--- a/src/Tests/Tests/QueryDsl/NotConditionlessWhen.cs
+++ b/src/Tests/Tests/QueryDsl/NotConditionlessWhen.cs
@@ -1,33 +1,23 @@
-using FluentAssertions;
-using Nest;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using FluentAssertions;
+using Nest;
 
 namespace Tests.QueryDsl
 {
-	public abstract class NotConditionlessWhen : List<Action<QueryContainer>>
-	{
-	}
+	public abstract class NotConditionlessWhen : List<Action<QueryContainer>> { }
+
 	public class NotConditionlessWhen<TQuery> : NotConditionlessWhen where TQuery : IQuery
 	{
 		private readonly Func<IQueryContainer, TQuery> _dispatch;
 
-		public NotConditionlessWhen(Func<IQueryContainer, TQuery> dispatch)
-		{
-			_dispatch = dispatch;
-		}
+		public NotConditionlessWhen(Func<IQueryContainer, TQuery> dispatch) => _dispatch = dispatch;
 
-		public void Add(Action<TQuery> when)
-		{
-			this.Add(q => Assert(q, when));
-		}
+		public void Add(Action<TQuery> when) => Add(q => Assert(q, when));
 
 		private void Assert(IQueryContainer c, Action<TQuery> when)
 		{
-			TQuery q = this._dispatch(c);
+			var q = _dispatch(c);
 			when(q);
 			q.Conditionless.Should().BeFalse();
 			c.IsConditionless.Should().BeFalse();
diff --git a/src/Tests/Tests/QueryDsl/QueryDslIntegrationTestsBase.cs b/src/Tests/Tests/QueryDsl/QueryDslIntegrationTestsBase.cs
index 5c87c99beb3..b43a0ebd9eb 100644
--- a/src/Tests/Tests/QueryDsl/QueryDslIntegrationTestsBase.cs
+++ b/src/Tests/Tests/QueryDsl/QueryDslIntegrationTestsBase.cs
@@ -5,39 +5,42 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl
 {
-	public abstract class QueryDslIntegrationTestsBase : ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest, SearchDescriptor<Project>, SearchRequest<Project>>
+	public abstract class QueryDslIntegrationTestsBase
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest, SearchDescriptor<Project>, SearchRequest<Project>>
 	{
 		protected QueryDslIntegrationTestsBase(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Search<Project>(f),
-			fluentAsync: (client, f) => client.SearchAsync<Project>(f),
-			request: (client, r) => client.Search<Project>(r),
-			requestAsync: (client, r) => client.SearchAsync<Project>(r)
-		);
 
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/project/doc/_search";
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
 
-		protected abstract object QueryJson { get; }
-
-		protected abstract QueryContainer QueryInitializer { get; }
-		protected abstract QueryContainer QueryFluent(QueryContainerDescriptor<Project> q);
-
-		protected override object ExpectJson => new { query = this.QueryJson };
+		protected override object ExpectJson => new { query = QueryJson };
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-			.Query(this.QueryFluent);
+			.Query(QueryFluent);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override SearchRequest<Project> Initializer =>
 			new SearchRequest<Project>
 			{
-				Query = this.QueryInitializer
+				Query = QueryInitializer
 			};
+
+		protected abstract QueryContainer QueryInitializer { get; }
+
+		protected abstract object QueryJson { get; }
+		protected override string UrlPath => "/project/doc/_search";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Search<Project>(f),
+			(client, f) => client.SearchAsync<Project>(f),
+			(client, r) => client.Search<Project>(r),
+			(client, r) => client.SearchAsync<Project>(r)
+		);
+
+		protected abstract QueryContainer QueryFluent(QueryContainerDescriptor<Project> q);
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/QueryDslUsageTestsBase.cs b/src/Tests/Tests/QueryDsl/QueryDslUsageTestsBase.cs
index 9cebad9ece9..761c8ec60d6 100644
--- a/src/Tests/Tests/QueryDsl/QueryDslUsageTestsBase.cs
+++ b/src/Tests/Tests/QueryDsl/QueryDslUsageTestsBase.cs
@@ -9,37 +9,55 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.QueryDsl
 {
-	public abstract class QueryDslUsageTestsBase : ApiTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest, SearchDescriptor<Project>, SearchRequest<Project>>
+	public abstract class QueryDslUsageTestsBase
+		: ApiTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest, SearchDescriptor<Project>, SearchRequest<Project>>
 	{
+		protected readonly QueryContainer ConditionlessQuery = new QueryContainer(new TermQuery { });
+
+		protected readonly QueryContainer VerbatimQuery = new QueryContainer(new TermQuery { IsVerbatim = true });
+
 		protected QueryDslUsageTestsBase(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Search<Project>(f),
-			fluentAsync: (client, f) => client.SearchAsync<Project>(f),
-			request: (client, r) => client.Search<Project>(r),
-			requestAsync: (client, r) => client.SearchAsync<Project>(r)
-		);
+		protected virtual ConditionlessWhen ConditionlessWhen => null;
+
+		protected override object ExpectJson => new { query = QueryJson };
+
+		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.Query(q => QueryFluent(q));
 
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/project/doc/_search";
 
-		protected abstract object QueryJson { get; }
+		protected override SearchRequest<Project> Initializer =>
+			new SearchRequest<Project>
+			{
+				Query = QueryInitializer
+			};
+
+		protected virtual bool KnownParseException => false;
+
+		protected virtual NotConditionlessWhen NotConditionlessWhen => null;
 
 		protected abstract QueryContainer QueryInitializer { get; }
-		protected abstract QueryContainer QueryFluent(QueryContainerDescriptor<Project> q);
 
-		protected override object ExpectJson => new { query = this.QueryJson };
+		protected abstract object QueryJson { get; }
+		protected override string UrlPath => "/project/doc/_search";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Search<Project>(f),
+			(client, f) => client.SearchAsync<Project>(f),
+			(client, r) => client.Search<Project>(r),
+			(client, r) => client.SearchAsync<Project>(r)
+		);
+
+		protected abstract QueryContainer QueryFluent(QueryContainerDescriptor<Project> q);
 
 		[U] public void FluentIsNotConditionless() =>
-			AssertIsNotConditionless(this.QueryFluent(new QueryContainerDescriptor<Project>()));
+			AssertIsNotConditionless(QueryFluent(new QueryContainerDescriptor<Project>()));
 
-		[U] public void InitializerIsNotConditionless() => AssertIsNotConditionless(this.QueryInitializer);
+		[U] public void InitializerIsNotConditionless() => AssertIsNotConditionless(QueryInitializer);
 
 		private void AssertIsNotConditionless(IQueryContainer c)
 		{
@@ -47,26 +65,10 @@ private void AssertIsNotConditionless(IQueryContainer c)
 				c.IsConditionless.Should().BeFalse();
 		}
 
-		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-			.Query(q => this.QueryFluent(q));
-
-		protected override SearchRequest<Project> Initializer =>
-			new SearchRequest<Project>
-			{
-				Query = this.QueryInitializer
-			};
-
-		protected virtual NotConditionlessWhen NotConditionlessWhen => null;
-		protected virtual ConditionlessWhen ConditionlessWhen => null;
-
-		protected readonly QueryContainer ConditionlessQuery = new QueryContainer(new TermQuery { });
-
-		protected readonly QueryContainer VerbatimQuery = new QueryContainer(new TermQuery { IsVerbatim = true });
-
 		[U] public void SeenByVisitor()
 		{
 			var visitor = new DslPrettyPrintVisitor(TestClient.DefaultInMemoryClient.ConnectionSettings);
-			var query = this.QueryFluent(new QueryContainerDescriptor<Project>());
+			var query = QueryFluent(new QueryContainerDescriptor<Project>());
 			query.Accept(visitor);
 			var pretty = visitor.PrettyPrint;
 			pretty.Should().NotBeNullOrWhiteSpace();
@@ -75,41 +77,38 @@ [U] public void SeenByVisitor()
 		[U] public void ConditionlessWhenExpectedToBe()
 		{
 			if (ConditionlessWhen == null) return;
+
 			foreach (var when in ConditionlessWhen)
 			{
-				when(this.QueryFluent(new QueryContainerDescriptor<Project>()));
+				when(QueryFluent(new QueryContainerDescriptor<Project>()));
 				//this.JsonEquals(query, new { });
-				when(this.QueryInitializer);
+				when(QueryInitializer);
 				//this.JsonEquals(query, new { });
 			}
 
-			((IQueryContainer)this.QueryInitializer).IsConditionless.Should().BeFalse();
+			((IQueryContainer)QueryInitializer).IsConditionless.Should().BeFalse();
 		}
 
 		[U] public void NotConditionlessWhenExpectedToBe()
 		{
 			if (NotConditionlessWhen == null) return;
+
 			foreach (var when in NotConditionlessWhen)
 			{
-				var query = this.QueryFluent(new QueryContainerDescriptor<Project>());
+				var query = QueryFluent(new QueryContainerDescriptor<Project>());
 				when(query);
 
-				query = this.QueryInitializer;
+				query = QueryInitializer;
 				when(query);
 			}
 		}
 
-		protected virtual bool KnownParseException => false;
-
-		[I] protected async Task AssertQueryResponse() => await this.AssertOnAllResponses(r =>
+		[I] protected async Task AssertQueryResponse() => await AssertOnAllResponses(r =>
 		{
 			var validOrNotParseExceptionOrKnownParseException = r.IsValid || r.ServerError?.Error.Type != "parsing_exception" || KnownParseException;
 			validOrNotParseExceptionOrKnownParseException.Should().BeTrue("query should be valid or when not valid not a parsing_exception.");
 
 			//TODO only assert IsValid == true and remove corner cases we don't have time to fix now.
 		});
-
-
-
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/Container/SpanContainingQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/Container/SpanContainingQueryUsageTests.cs
index 0a832012532..33c8ac2bdd9 100644
--- a/src/Tests/Tests/QueryDsl/Span/Container/SpanContainingQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/Container/SpanContainingQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Span.Container
 {
@@ -10,6 +9,28 @@ public class SpanContainingUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanContainingUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanContainingQuery>(a => a.SpanContaining)
+		{
+			q =>
+			{
+				q.Big = null;
+				q.Little = null;
+			},
+			q =>
+			{
+				q.Big = new SpanQuery { };
+				q.Little = new SpanQuery { };
+			},
+		};
+
+		protected override QueryContainer QueryInitializer => new SpanContainingQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Little = new SpanQuery { SpanTerm = new SpanTermQuery { Field = "field1", Value = "hoya" } },
+			Big = new SpanQuery { SpanTerm = new SpanTermQuery { Field = "field1", Value = "hoya2" } },
+		};
+
 		protected override object QueryJson => new
 		{
 			span_containing = new
@@ -39,36 +60,16 @@ public SpanContainingUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new SpanContainingQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Little = new SpanQuery { SpanTerm = new SpanTermQuery { Field = "field1", Value = "hoya"} },
-			Big = new SpanQuery { SpanTerm = new SpanTermQuery { Field = "field1", Value = "hoya2"} },
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanContaining(sn => sn
 				.Name("named_query")
 				.Boost(1.1)
-				.Little(i=>i
-					.SpanTerm(st=>st.Field("field1").Value("hoya"))
+				.Little(i => i
+					.SpanTerm(st => st.Field("field1").Value("hoya"))
 				)
-				.Big(e=>e
-					.SpanTerm(st=>st.Field("field1").Value("hoya2"))
+				.Big(e => e
+					.SpanTerm(st => st.Field("field1").Value("hoya2"))
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanContainingQuery>(a => a.SpanContaining)
-		{
-			q => {
-				q.Big = null;
-				q.Little = null;
-			},
-			q => {
-				q.Big = new SpanQuery { };
-				q.Little = new SpanQuery { };
-			},
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/FieldMasking/SpanFieldMaskingUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/FieldMasking/SpanFieldMaskingUsageTests.cs
index 49c6d7294cf..ec4583b7199 100644
--- a/src/Tests/Tests/QueryDsl/Span/FieldMasking/SpanFieldMaskingUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/FieldMasking/SpanFieldMaskingUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Span.FieldMasking
 {
@@ -10,18 +9,10 @@ public class SpanFieldMaskingUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanFieldMaskingUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanFieldMaskingQuery>(a => a.SpanFieldMasking)
 		{
-			field_masking_span = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				field = "name",
-				query = new
-				{
-					span_term = new { description = new { value = "dolorem" } }
-				}
-			}
+			q => q.Query = null,
+			q => q.Field = null,
 		};
 
 		protected override QueryContainer QueryInitializer => new SpanFieldMaskingQuery
@@ -39,20 +30,28 @@ public SpanFieldMaskingUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base
 			}
 		};
 
+		protected override object QueryJson => new
+		{
+			field_masking_span = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				field = "name",
+				query = new
+				{
+					span_term = new { description = new { value = "dolorem" } }
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanFieldMasking(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Field(p => p.Name)
-				.Query(sq=>sq
-					.SpanTerm(st=>st.Field(p=>p.Description).Value("dolorem"))
+				.Query(sq => sq
+					.SpanTerm(st => st.Field(p => p.Description).Value("dolorem"))
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanFieldMaskingQuery>(a => a.SpanFieldMasking)
-		{
-			q => q.Query = null,
-			q => q.Field = null ,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/First/SpanFirstQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/First/SpanFirstQueryUsageTests.cs
index 6e4265ea156..b5b58ba98ed 100644
--- a/src/Tests/Tests/QueryDsl/Span/First/SpanFirstQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/First/SpanFirstQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.SpanFirst
 {
@@ -10,18 +9,10 @@ public class SpanFirstUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanFirstUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanFirstQuery>(a => a.SpanFirst)
 		{
-			span_first = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				match = new
-				{
-					span_term = new { name = new { value = "value" } }
-				},
-				end = 3
-			}
+			q => q.Match = null,
+			q => q.Match = new SpanQuery { SpanTerm = new SpanTermQuery() },
 		};
 
 		protected override QueryContainer QueryInitializer => new SpanFirstQuery
@@ -35,20 +26,28 @@ public SpanFirstUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usa
 			}
 		};
 
+		protected override object QueryJson => new
+		{
+			span_first = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				match = new
+				{
+					span_term = new { name = new { value = "value" } }
+				},
+				end = 3
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanFirst(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Match(sq=>sq
-					.SpanTerm(st=>st.Field(p=>p.Name).Value("value"))
+				.Match(sq => sq
+					.SpanTerm(st => st.Field(p => p.Name).Value("value"))
 				)
 				.End(3)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanFirstQuery>(a => a.SpanFirst)
-		{
-			q => q.Match = null,
-			q => q.Match = new SpanQuery { SpanTerm = new SpanTermQuery() } ,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/MultiTerm/SpanMultiTermQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/MultiTerm/SpanMultiTermQueryUsageTests.cs
index 392683a34f3..1fb4d057816 100644
--- a/src/Tests/Tests/QueryDsl/Span/MultiTerm/SpanMultiTermQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/MultiTerm/SpanMultiTermQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.SpanMultiTerm
 {
@@ -10,6 +9,19 @@ public class SpanMultiTermUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanMultiTermUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanMultiTermQuery>(a => a.SpanMultiTerm)
+		{
+			q => q.Match = null,
+			q => q.Match = ConditionlessQuery,
+		};
+
+		protected override QueryContainer QueryInitializer => new SpanMultiTermQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Match = new PrefixQuery { Field = "name", Value = "pre-*" }
+		};
+
 		protected override object QueryJson => new
 		{
 			span_multi = new
@@ -23,26 +35,13 @@ public SpanMultiTermUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i,
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new SpanMultiTermQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Match = new PrefixQuery { Field = "name", Value = "pre-*" }
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanMultiTerm(c => c
 				.Name("named_query")
 				.Boost(1.1)
-				.Match(sq=>sq
-					.Prefix(pr=>pr.Field(p=>p.Name).Value("pre-*"))
+				.Match(sq => sq
+					.Prefix(pr => pr.Field(p => p.Name).Value("pre-*"))
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanMultiTermQuery>(a => a.SpanMultiTerm)
-		{
-			q => q.Match = null,
-			q => q.Match = ConditionlessQuery,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/Near/SpanNearQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/Near/SpanNearQueryUsageTests.cs
index 73e9a32ccac..db7f8fc6da7 100644
--- a/src/Tests/Tests/QueryDsl/Span/Near/SpanNearQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/Near/SpanNearQueryUsageTests.cs
@@ -4,7 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 #pragma warning disable 618 // Uses CollectPayloads
 
@@ -14,22 +13,11 @@ public class SpanNearUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanNearUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanNearQuery>(a => a.SpanNear)
 		{
-			span_near = new
-			{
-				clauses = new object[] {
-					new { span_term = new { field = new { value = "value1" } } },
-					new { span_term = new { field = new { value = "value2" } } },
-					new { span_term = new { field = new { value = "value3" } } },
-					new { span_gap = new { field = 2 } }
-				},
-				slop = 12,
-				in_order = false,
-				_name = "named_query",
-				boost = 1.1
-			}
-
+			q => q.Clauses = null,
+			q => q.Clauses = Enumerable.Empty<ISpanQuery>(),
+			q => q.Clauses = new[] { new SpanQuery() },
 		};
 
 		protected override QueryContainer QueryInitializer => new SpanNearQuery
@@ -47,6 +35,24 @@ public SpanNearUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usag
 			InOrder = false,
 		};
 
+		protected override object QueryJson => new
+		{
+			span_near = new
+			{
+				clauses = new object[]
+				{
+					new { span_term = new { field = new { value = "value1" } } },
+					new { span_term = new { field = new { value = "value2" } } },
+					new { span_term = new { field = new { value = "value3" } } },
+					new { span_gap = new { field = 2 } }
+				},
+				slop = 12,
+				in_order = false,
+				_name = "named_query",
+				boost = 1.1
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanNear(sn => sn
 				.Name("named_query")
@@ -60,12 +66,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Slop(12)
 				.InOrder(false)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanNearQuery>(a => a.SpanNear)
-		{
-			q => q.Clauses = null,
-			q => q.Clauses = Enumerable.Empty<ISpanQuery>(),
-			q => q.Clauses = new [] { new SpanQuery() },
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/Not/SpanNotQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/Not/SpanNotQueryUsageTests.cs
index 7178dd9de68..1f3d8b8c9d3 100644
--- a/src/Tests/Tests/QueryDsl/Span/Not/SpanNotQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/Not/SpanNotQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.SpanNot
 {
@@ -10,28 +9,22 @@ public class SpanNotUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanNotUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override bool KnownParseException => true; //using both pre/post AND dist needs to be split up in to two.
-
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanNotQuery>(a => a.SpanNot)
 		{
-			span_not = new
+			q =>
 			{
-				_name = "named_query",
-				boost = 1.1,
-				include = new
-				{
-					span_term = new { field1 = new { value = "hoya" } }
-				},
-				exclude = new
-				{
-					span_term = new { field1 = new { value = "hoya2" } }
-				},
-				pre = 14,
-				post = 13,
-				dist = 12
-			}
+				q.Include = null;
+				q.Exclude = null;
+			},
+			q =>
+			{
+				q.Include = new SpanQuery();
+				q.Exclude = new SpanQuery();
+			},
 		};
 
+		protected override bool KnownParseException => true; //using both pre/post AND dist needs to be split up in to two.
+
 		protected override QueryContainer QueryInitializer => new SpanNotQuery
 		{
 			Name = "named_query",
@@ -55,6 +48,26 @@ public SpanNotUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage
 			},
 		};
 
+		protected override object QueryJson => new
+		{
+			span_not = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				include = new
+				{
+					span_term = new { field1 = new { value = "hoya" } }
+				},
+				exclude = new
+				{
+					span_term = new { field1 = new { value = "hoya2" } }
+				},
+				pre = 14,
+				post = 13,
+				dist = 12
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanNot(sn => sn
 				.Name("named_query")
@@ -69,17 +82,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 					.SpanTerm(st => st.Field("field1").Value("hoya2"))
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanNotQuery>(a => a.SpanNot)
-		{
-			q => {
-				q.Include = null;
-				q.Exclude = null;
-			},
-			q => {
-				q.Include = new SpanQuery();
-				q.Exclude = new SpanQuery();
-			},
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/Or/SpanOrQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/Or/SpanOrQueryUsageTests.cs
index 331a7cd0967..157e182d440 100644
--- a/src/Tests/Tests/QueryDsl/Span/Or/SpanOrQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/Or/SpanOrQueryUsageTests.cs
@@ -4,7 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.SpanOr
 {
@@ -12,18 +11,11 @@ public class SpanOrUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanOrUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanOrQuery>(a => a.SpanOr)
 		{
-			span_or = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				clauses = new[] {
-					new { span_term = new { field = new { value = "value1" } } },
-					new { span_term = new { field = new { value = "value2" } } },
-					new { span_term = new { field = new { value = "value3" } } }
-				}
-			}
+			q => q.Clauses = null,
+			q => q.Clauses = Enumerable.Empty<ISpanQuery>(),
+			q => q.Clauses = new[] { new SpanQuery() },
 		};
 
 		protected override QueryContainer QueryInitializer => new SpanOrQuery
@@ -38,6 +30,21 @@ public SpanOrUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage)
 			},
 		};
 
+		protected override object QueryJson => new
+		{
+			span_or = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				clauses = new[]
+				{
+					new { span_term = new { field = new { value = "value1" } } },
+					new { span_term = new { field = new { value = "value2" } } },
+					new { span_term = new { field = new { value = "value3" } } }
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanOr(sn => sn
 				.Name("named_query")
@@ -48,12 +55,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 					c => c.SpanTerm(st => st.Field("field").Value("value3"))
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanOrQuery>(a => a.SpanOr)
-		{
-			q => q.Clauses = null,
-			q => q.Clauses = Enumerable.Empty<ISpanQuery>(),
-			q => q.Clauses = new [] { new SpanQuery() },
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/Term/SpanTermQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/Term/SpanTermQueryUsageTests.cs
index 53587959418..c99da96d6d6 100644
--- a/src/Tests/Tests/QueryDsl/Span/Term/SpanTermQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/Term/SpanTermQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.SpanTerm
 {
@@ -10,6 +9,21 @@ public class SpanTermUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanTermUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanTermQuery>(a => a.SpanTerm)
+		{
+			q => q.Value = null,
+			q => q.Value = string.Empty,
+			q => q.Field = null,
+		};
+
+		protected override QueryContainer QueryInitializer => new SpanTermQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Value = "kimchy",
+			Field = "user"
+		};
+
 		protected override object QueryJson => new
 		{
 			span_term = new
@@ -23,14 +37,6 @@ public SpanTermUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usag
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new SpanTermQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Value = "kimchy",
-			Field = "user"
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanTerm(c => c
 				.Name("named_query")
@@ -38,12 +44,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Field("user")
 				.Value("kimchy")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanTermQuery>(a => a.SpanTerm)
-		{
-			q => q.Value = null,
-			q => q.Value = string.Empty,
-			q => q.Field = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Span/Within/SpanWithinQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Span/Within/SpanWithinQueryUsageTests.cs
index 72d79b3fab3..b0b38bb93f7 100644
--- a/src/Tests/Tests/QueryDsl/Span/Within/SpanWithinQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Span/Within/SpanWithinQueryUsageTests.cs
@@ -2,7 +2,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.Joining.SpanWithin
 {
@@ -10,6 +9,28 @@ public class SpanWithinUsageTests : QueryDslUsageTestsBase
 	{
 		public SpanWithinUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanWithinQuery>(a => a.SpanWithin)
+		{
+			q =>
+			{
+				q.Big = null;
+				q.Little = null;
+			},
+			q =>
+			{
+				q.Big = new SpanQuery { };
+				q.Little = new SpanQuery { };
+			},
+		};
+
+		protected override QueryContainer QueryInitializer => new SpanWithinQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Little = new SpanQuery { SpanTerm = new SpanTermQuery { Field = "field1", Value = "hoya" } },
+			Big = new SpanQuery { SpanTerm = new SpanTermQuery { Field = "field1", Value = "hoya2" } },
+		};
+
 		protected override object QueryJson => new
 		{
 			span_within = new
@@ -27,36 +48,16 @@ public SpanWithinUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, us
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new SpanWithinQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Little = new SpanQuery { SpanTerm = new SpanTermQuery { Field = "field1", Value = "hoya"} },
-			Big = new SpanQuery { SpanTerm = new SpanTermQuery { Field = "field1", Value = "hoya2"} },
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.SpanWithin(sn => sn
 				.Name("named_query")
 				.Boost(1.1)
-				.Little(i=>i
-					.SpanTerm(st=>st.Field("field1").Value("hoya"))
+				.Little(i => i
+					.SpanTerm(st => st.Field("field1").Value("hoya"))
 				)
-				.Big(e=>e
-					.SpanTerm(st=>st.Field("field1").Value("hoya2"))
+				.Big(e => e
+					.SpanTerm(st => st.Field("field1").Value("hoya2"))
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ISpanWithinQuery>(a => a.SpanWithin)
-		{
-			q => {
-				q.Big = null;
-				q.Little = null;
-			},
-			q => {
-				q.Big = new SpanQuery { };
-				q.Little = new SpanQuery { };
-			},
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisFullDocumentQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisFullDocumentQueryUsageTests.cs
index 589ea69cde4..296a77f2304 100644
--- a/src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisFullDocumentQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisFullDocumentQueryUsageTests.cs
@@ -4,7 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.Specialized.MoreLikeThis
@@ -13,13 +12,32 @@ public class MoreLikeThisFullDocumentQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public MoreLikeThisFullDocumentQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMoreLikeThisQuery>(a => a.MoreLikeThis)
+		{
+			q => q.Like = null,
+			q => q.Like = Enumerable.Empty<Like>(),
+			q => q.Fields = null,
+		};
+
+		protected override QueryContainer QueryInitializer => new MoreLikeThisQuery
+		{
+			Fields = Fields<Project>(p => p.Name),
+			Like = new List<Like>
+			{
+				new LikeDocument<Project>(Project.Instance),
+				"some long text"
+			}
+		};
+
 		protected override object QueryJson => new
 		{
 			more_like_this = new
 			{
 				fields = new[] { "name" },
-				like = new object[] {
-					new {
+				like = new object[]
+				{
+					new
+					{
 						_index = "project",
 						_type = "doc",
 						_id = Project.Instance.Name,
@@ -31,30 +49,13 @@ public MoreLikeThisFullDocumentQueryUsageTests(ReadOnlyCluster i, EndpointUsage
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new MoreLikeThisQuery
-		{
-			Fields = Fields<Project>(p=>p.Name),
-			Like = new List<Like>
-			{
-				new LikeDocument<Project>(Project.Instance),
-				"some long text"
-			}
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MoreLikeThis(sn => sn
-				.Fields(f=>f.Field(p=>p.Name))
-				.Like(l=>l
-					.Document(d=>d.Document(Project.Instance))
+				.Fields(f => f.Field(p => p.Name))
+				.Like(l => l
+					.Document(d => d.Document(Project.Instance))
 					.Text("some long text")
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMoreLikeThisQuery>(a => a.MoreLikeThis)
-		{
-			q => q.Like = null,
-			q => q.Like = Enumerable.Empty<Like>(),
-			q => q.Fields = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQueryUsageTests.cs
index f88872eee88..782e0fa418d 100644
--- a/src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQueryUsageTests.cs
@@ -4,7 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.Specialized.MoreLikeThis
@@ -13,41 +12,18 @@ public class MoreLikeThisQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public MoreLikeThisQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMoreLikeThisQuery>(a => a.MoreLikeThis)
 		{
-			more_like_this = new
-			{
-				fields = new[] { "name" },
-				minimum_should_match = 1,
-				stop_words = new[] { "and", "the" },
-				min_term_freq = 1,
-				max_query_terms = 12,
-				min_doc_freq = 1,
-				max_doc_freq = 12,
-				min_word_length = 10,
-				max_word_length = 300,
-				boost_terms = 1.1,
-				analyzer = "some_analyzer",
-				include = true,
-				like = new object[] {
-					new {
-						_index = "project",
-						_type = "doc",
-						_id = Project.Instance.Name
-					},
-					"some long text"
-				},
-				unlike = new[] { "not like this text" },
-				_name = "named_query",
-				boost = 1.1
-			}
+			q => q.Like = null,
+			q => q.Like = Enumerable.Empty<Like>(),
+			q => q.Fields = null,
 		};
 
 		protected override QueryContainer QueryInitializer => new MoreLikeThisQuery
 		{
 			Name = "named_query",
 			Boost = 1.1,
-			Fields = Fields<Project>(p=>p.Name),
+			Fields = Fields<Project>(p => p.Name),
 			Like = new List<Like>
 			{
 				new LikeDocument<Project>(Project.Instance.Name),
@@ -63,19 +39,51 @@ public MoreLikeThisQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : bas
 			MinTermFrequency = 1,
 			MinWordLength = 10,
 			MinimumShouldMatch = 1,
-			StopWords = new [] { "and", "the"},
+			StopWords = new[] { "and", "the" },
 			Unlike = new List<Like>
 			{
 				"not like this text"
 			}
 		};
 
+		protected override object QueryJson => new
+		{
+			more_like_this = new
+			{
+				fields = new[] { "name" },
+				minimum_should_match = 1,
+				stop_words = new[] { "and", "the" },
+				min_term_freq = 1,
+				max_query_terms = 12,
+				min_doc_freq = 1,
+				max_doc_freq = 12,
+				min_word_length = 10,
+				max_word_length = 300,
+				boost_terms = 1.1,
+				analyzer = "some_analyzer",
+				include = true,
+				like = new object[]
+				{
+					new
+					{
+						_index = "project",
+						_type = "doc",
+						_id = Project.Instance.Name
+					},
+					"some long text"
+				},
+				unlike = new[] { "not like this text" },
+				_name = "named_query",
+				boost = 1.1
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MoreLikeThis(sn => sn
 				.Name("named_query")
 				.Boost(1.1)
-				.Like(l=>l
-					.Document(d=>d .Id(Project.Instance.Name))
+				.Like(l => l
+					.Document(d => d.Id(Project.Instance.Name))
 					.Text("some long text")
 				)
 				.Analyzer("some_analyzer")
@@ -89,17 +97,10 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.MinWordLength(10)
 				.StopWords("and", "the")
 				.MinimumShouldMatch(1)
-				.Fields(f=>f.Field(p=>p.Name))
-				.Unlike(l=>l
+				.Fields(f => f.Field(p => p.Name))
+				.Unlike(l => l
 					.Text("not like this text")
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IMoreLikeThisQuery>(a => a.MoreLikeThis)
-		{
-			q => q.Like = null,
-			q => q.Like = Enumerable.Empty<Like>(),
-			q => q.Fields = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Specialized/Percolate/PercolateQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Specialized/Percolate/PercolateQueryUsageTests.cs
index 296920cac7b..609f1c89927 100644
--- a/src/Tests/Tests/QueryDsl/Specialized/Percolate/PercolateQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Specialized/Percolate/PercolateQueryUsageTests.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -12,16 +9,12 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Tests.Framework.ManagedElasticsearch.NodeSeeders;
-using Xunit;
 
 namespace Tests.QueryDsl.Specialized.Percolate
 {
-
 	//hide
-	public abstract class PercolateQueryUsageTestsBase :
-		ApiIntegrationTestBase<
+	public abstract class PercolateQueryUsageTestsBase
+		: ApiIntegrationTestBase<
 			WritableCluster,
 			ISearchResponse<ProjectPercolation>,
 			ISearchRequest,
@@ -29,32 +22,34 @@ public abstract class PercolateQueryUsageTestsBase :
 			SearchRequest<ProjectPercolation>
 		>
 	{
-		protected PercolateQueryUsageTestsBase(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		protected static readonly string PercolatorId = RandomString();
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Search<ProjectPercolation>(f),
-			fluentAsync: (client, f) => client.SearchAsync<ProjectPercolation>(f),
-			request: (client, r) => client.Search<ProjectPercolation>(r),
-			requestAsync: (client, r) => client.SearchAsync<ProjectPercolation>(r)
-		);
+		protected PercolateQueryUsageTestsBase(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override string UrlPath => $"{this.PercolationIndex}/_search";
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected string PercolationIndex => CallIsolatedValue + "-queries";
+
+		protected override string UrlPath => $"{PercolationIndex}/_search";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Search<ProjectPercolation>(f),
+			(client, f) => client.SearchAsync<ProjectPercolation>(f),
+			(client, r) => client.Search<ProjectPercolation>(r),
+			(client, r) => client.SearchAsync<ProjectPercolation>(r)
+		);
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var index in values.Values)
 			{
-				this.Client.CreateIndex(index, c => c
-                    .Settings(settings=>settings
+				Client.CreateIndex(index, c => c
+					.Settings(settings => settings
 						.NumberOfShards(1)
 						.NumberOfReplicas(0)
-                        .Analysis(DefaultSeeder.ProjectAnalysisSettings)
-                    )
+						.Analysis(DefaultSeeder.ProjectAnalysisSettings)
+					)
 					.Mappings(m => m
 						.Map<Project>(mm => mm.AutoMap()
 							.Properties(DefaultSeeder.ProjectProperties)
@@ -62,12 +57,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 					)
 				);
 				var percolationIndex = index + "-queries";
-				this.Client.CreateIndex(percolationIndex, c => c
-                    .Settings(settings=>settings
+				Client.CreateIndex(percolationIndex, c => c
+					.Settings(settings => settings
 						.NumberOfShards(1)
 						.NumberOfReplicas(0)
 						.Analysis(DefaultSeeder.ProjectAnalysisSettings)
-                    )
+					)
 					.Mappings(m => m
 						.Map<ProjectPercolation>(mm => mm.AutoMap()
 							.Properties(DefaultSeeder.PercolatedQueryProperties)
@@ -75,7 +70,7 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 					)
 				);
 
-				this.Client.Index(new ProjectPercolation
+				Client.Index(new ProjectPercolation
 				{
 					Id = PercolatorId,
 					Query = new MatchQuery
@@ -84,11 +79,10 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 						Query = "Martijn"
 					}
 				}, d => d.Index(percolationIndex));
-				this.Client.IndexDocument(Project.Instance);
-				this.Client.Refresh(Nest.Indices.Index(percolationIndex).And<Project>());
+				Client.IndexDocument(Project.Instance);
+				Client.Refresh(Nest.Indices.Index(percolationIndex).And<Project>());
 			}
 		}
-		protected string PercolationIndex => CallIsolatedValue + "-queries";
 	}
 
 	/**
@@ -108,24 +102,20 @@ public class PercolateQueryUsageTests : PercolateQueryUsageTestsBase
 	{
 		public PercolateQueryUsageTests(WritableCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected object QueryJson => new
+		protected ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IPercolateQuery>(a => a.Percolate)
 		{
-			percolate = new
-			{
-				document = Project.InstanceAnonymous,
-				field = "query"
-			}
+			q => { q.Document = null; }
 		};
 
-        //hide
+		//hide
 		protected override Func<SearchDescriptor<ProjectPercolation>, ISearchRequest> Fluent => f =>
 			f.Query(QueryFluent).Index(PercolationIndex).AllTypes();
 
-        //hide
+		//hide
 		protected override SearchRequest<ProjectPercolation> Initializer =>
 			new SearchRequest<ProjectPercolation>(PercolationIndex, Types.All)
 			{
-				Query = this.QueryInitializer
+				Query = QueryInitializer
 			};
 
 		protected QueryContainer QueryInitializer => new PercolateQuery
@@ -134,6 +124,15 @@ public PercolateQueryUsageTests(WritableCluster i, EndpointUsage usage) : base(i
 			Field = Infer.Field<ProjectPercolation>(f => f.Query)
 		};
 
+		protected object QueryJson => new
+		{
+			percolate = new
+			{
+				document = Project.InstanceAnonymous,
+				field = "query"
+			}
+		};
+
 		protected QueryContainer QueryFluent(QueryContainerDescriptor<ProjectPercolation> q) => q
 			.Percolate(p => p
 				.Document(Project.Instance)
@@ -149,13 +148,6 @@ protected override void ExpectResponse(ISearchResponse<ProjectPercolation> respo
 			match.Id.Should().Be(PercolatorId);
 			((IQueryContainer)match.Query).Match.Should().NotBeNull();
 		}
-
-		protected ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IPercolateQuery>(a => a.Percolate)
-		{
-			q => {
-				q.Document = null;
-			}
-		};
 	}
 
 	/**[float]
@@ -177,18 +169,6 @@ public class PercolateQueryExistingDocumentUsageTests : PercolateQueryUsageTests
 	{
 		public PercolateQueryExistingDocumentUsageTests(WritableCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected object QueryJson => new
-		{
-			percolate = new
-			{
-				type = "doc",
-				index = "project",
-				id = Project.Instance.Name,
-				routing = Project.Instance.Name,
-				field = "query"
-			}
-		};
-
 		//hide
 		protected override Func<SearchDescriptor<ProjectPercolation>, ISearchRequest> Fluent => f =>
 			f.Query(QueryFluent).Index(PercolationIndex).AllTypes();
@@ -197,7 +177,7 @@ public PercolateQueryExistingDocumentUsageTests(WritableCluster i, EndpointUsage
 		protected override SearchRequest<ProjectPercolation> Initializer =>
 			new SearchRequest<ProjectPercolation>(PercolationIndex, Types.All)
 			{
-				Query = this.QueryInitializer
+				Query = QueryInitializer
 			};
 
 		protected QueryContainer QueryInitializer => new PercolateQuery
@@ -209,6 +189,18 @@ public PercolateQueryExistingDocumentUsageTests(WritableCluster i, EndpointUsage
 			Field = Infer.Field<ProjectPercolation>(f => f.Query)
 		};
 
+		protected object QueryJson => new
+		{
+			percolate = new
+			{
+				type = "doc",
+				index = "project",
+				id = Project.Instance.Name,
+				routing = Project.Instance.Name,
+				field = "query"
+			}
+		};
+
 		protected QueryContainer QueryFluent(QueryContainerDescriptor<ProjectPercolation> q) => q
 			.Percolate(p => p
 				.Type<Project>()
@@ -242,18 +234,9 @@ public class PercolateMultipleDocumentsQueryUsageTests : PercolateQueryUsageTest
 	{
 		public PercolateMultipleDocumentsQueryUsageTests(WritableCluster i, EndpointUsage usage) : base(i, usage) { }
 
-		protected object QueryJson => new
+		protected ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IPercolateQuery>(a => a.Percolate)
 		{
-			percolate = new
-			{
-				documents = new []
-				{
-					Project.InstanceAnonymous,
-					Project.InstanceAnonymous,
-					Project.InstanceAnonymous
-				},
-				field = "query"
-			}
+			q => q.Documents = null
 		};
 
 		//hide
@@ -264,15 +247,29 @@ public PercolateMultipleDocumentsQueryUsageTests(WritableCluster i, EndpointUsag
 		protected override SearchRequest<ProjectPercolation> Initializer =>
 			new SearchRequest<ProjectPercolation>(PercolationIndex, Types.All)
 			{
-				Query = this.QueryInitializer
+				Query = QueryInitializer
 			};
 
 		protected QueryContainer QueryInitializer => new PercolateQuery
 		{
-			Documents = new [] { Project.Instance, Project.Instance, Project.Instance },
+			Documents = new[] { Project.Instance, Project.Instance, Project.Instance },
 			Field = Infer.Field<ProjectPercolation>(f => f.Query)
 		};
 
+		protected object QueryJson => new
+		{
+			percolate = new
+			{
+				documents = new[]
+				{
+					Project.InstanceAnonymous,
+					Project.InstanceAnonymous,
+					Project.InstanceAnonymous
+				},
+				field = "query"
+			}
+		};
+
 		protected QueryContainer QueryFluent(QueryContainerDescriptor<ProjectPercolation> q) => q
 			.Percolate(p => p
 				.Documents(Project.Instance, Project.Instance, Project.Instance)
@@ -288,16 +285,11 @@ protected override void ExpectResponse(ISearchResponse<ProjectPercolation> respo
 
 			var field = response.Fields.ElementAt(0);
 			var values = field.ValuesOf<int>("_percolator_document_slot");
-			values.Should().Contain(new[] {0, 1, 2});
+			values.Should().Contain(new[] { 0, 1, 2 });
 
 			var match = response.Documents.First();
 			match.Id.Should().Be(PercolatorId);
 			((IQueryContainer)match.Query).Match.Should().NotBeNull();
 		}
-
-		protected ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IPercolateQuery>(a => a.Percolate)
-		{
-			q => q.Documents = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Specialized/Script/ScriptQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Specialized/Script/ScriptQueryUsageTests.cs
index 4007e6b45a0..bbf54387a9c 100644
--- a/src/Tests/Tests/QueryDsl/Specialized/Script/ScriptQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Specialized/Script/ScriptQueryUsageTests.cs
@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using FluentAssertions;
+using System.Collections.Generic;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.QueryDsl.Specialized.Script
 {
@@ -20,21 +13,21 @@ namespace Tests.QueryDsl.Specialized.Script
 	*/
 	public class ScriptQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public ScriptQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
 		private static readonly string _templateString = "doc['numberOfCommits'].value > param1";
 
-		protected override object QueryJson => new
+		public ScriptQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IScriptQuery>(a => a.Script)
 		{
-			script = new
+			q =>
 			{
-				_name = "named_query",
-				boost = 1.1,
-				script = new
-				{
-					source = "doc['numberOfCommits'].value > param1",
-					@params = new { param1 = 50 }
-				}
+				q.Source = "";
+				q.Id = null;
+			},
+			q =>
+			{
+				q.Source = null;
+				q.Id = null;
 			}
 		};
 
@@ -49,24 +42,26 @@ public ScriptQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 			}
 		};
 
+		protected override object QueryJson => new
+		{
+			script = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				script = new
+				{
+					source = "doc['numberOfCommits'].value > param1",
+					@params = new { param1 = 50 }
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Script(sn => sn
 				.Name("named_query")
 				.Boost(1.1)
 				.Source(_templateString)
-				.Params(p=>p.Add("param1", 50))
+				.Params(p => p.Add("param1", 50))
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IScriptQuery>(a => a.Script)
-		{
-			q => {
-				q.Source = "";
-				q.Id = null;
-			},
-			q => {
-				q.Source = null;
-				q.Id = null;
-			}
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Exists/ExistsQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Exists/ExistsQueryUsageTests.cs
index a0ef5f612eb..b98bd8d3831 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Exists/ExistsQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Exists/ExistsQueryUsageTests.cs
@@ -2,22 +2,16 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Exists
 {
 	public class ExistsQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public ExistsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public ExistsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IExistsQuery>(a => a.Exists)
 		{
-			exists = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				field = "description"
-			}
+			q => q.Field = null
 		};
 
 		protected override QueryContainer QueryInitializer => new ExistsQuery
@@ -27,16 +21,21 @@ public ExistsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : bas
 			Field = "description",
 		};
 
+		protected override object QueryJson => new
+		{
+			exists = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				field = "description"
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Exists(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Field(p => p.Description)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IExistsQuery>(a => a.Exists)
-		{
-			q => q.Field = null
-		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyDateQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyDateQueryUsageTests.cs
index 33d48ff8161..73dd424c8bd 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyDateQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyDateQueryUsageTests.cs
@@ -3,13 +3,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Fuzzy
 {
 	public class FuzzyDateQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public FuzzyDateQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public FuzzyDateQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IFuzzyQuery<DateTime?, Time>>(
+			a => a.Fuzzy as IFuzzyQuery<DateTime?, Time>
+		)
+		{
+			q => q.Field = null,
+			q => q.Value = null
+		};
+
+		protected override QueryContainer QueryInitializer => new FuzzyDateQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Fuzziness = TimeSpan.FromDays(2),
+			Value = Project.Instance.StartedOn,
+			MaxExpansions = 100,
+			PrefixLength = 3,
+			Rewrite = MultiTermQueryRewrite.ConstantScore,
+			Transpositions = true
+		};
 
 		protected override object QueryJson => new
 		{
@@ -27,20 +47,6 @@ public FuzzyDateQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 					value = "2015-01-01T00:00:00"
 				}
 			}
-
-		};
-
-		protected override QueryContainer QueryInitializer => new FuzzyDateQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Fuzziness = TimeSpan.FromDays(2),
-			Value = Project.Instance.StartedOn,
-			MaxExpansions = 100,
-			PrefixLength = 3,
-			Rewrite = MultiTermQueryRewrite.ConstantScore,
-			Transpositions = true
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -55,13 +61,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Rewrite(MultiTermQueryRewrite.ConstantScore)
 				.Transpositions()
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IFuzzyQuery<DateTime?, Time>>(
-			a => a.Fuzzy as IFuzzyQuery<DateTime?, Time>
-		)
-		{
-			q => q.Field = null,
-			q => q.Value = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyNumericQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyNumericQueryUsageTests.cs
index 0a2f4a2c161..58305b71245 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyNumericQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyNumericQueryUsageTests.cs
@@ -2,13 +2,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Fuzzy
 {
 	public class FuzzyNumericQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public FuzzyNumericQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public FuzzyNumericQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IFuzzyQuery<double?, double?>>(
+			a => a.Fuzzy as IFuzzyQuery<double?, double?>
+		)
+		{
+			q => q.Field = null,
+			q => q.Value = null
+		};
+
+		protected override QueryContainer QueryInitializer => new FuzzyNumericQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Fuzziness = 2,
+			Value = 12,
+			MaxExpansions = 100,
+			PrefixLength = 3,
+			Rewrite = MultiTermQueryRewrite.ConstantScore,
+			Transpositions = true
+		};
 
 		protected override object QueryJson => new
 		{
@@ -26,20 +46,6 @@ public FuzzyNumericQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage)
 					value = 12.0
 				}
 			}
-
-		};
-
-		protected override QueryContainer QueryInitializer => new FuzzyNumericQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Fuzziness = 2,
-			Value = 12,
-			MaxExpansions = 100,
-			PrefixLength = 3,
-			Rewrite = MultiTermQueryRewrite.ConstantScore,
-			Transpositions = true
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -54,13 +60,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Rewrite(MultiTermQueryRewrite.ConstantScore)
 				.Transpositions()
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IFuzzyQuery<double?, double?>>(
-			a => a.Fuzzy as IFuzzyQuery<double?, double?>
-		)
-		{
-			q => q.Field = null,
-			q => q.Value = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyQueryUsageTests.cs
index 9da022a0747..14c4327c28e 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyQueryUsageTests.cs
@@ -2,13 +2,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Fuzzy
 {
 	public class FuzzyQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public FuzzyQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public FuzzyQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IFuzzyQuery<string, Fuzziness>>(
+			a => a.Fuzzy as IFuzzyQuery<string, Fuzziness>
+		)
+		{
+			q => q.Field = null,
+			q => q.Value = null
+		};
+
+		protected override QueryContainer QueryInitializer => new FuzzyQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Fuzziness = Fuzziness.Auto,
+			Value = "ki",
+			MaxExpansions = 100,
+			PrefixLength = 3,
+			Rewrite = MultiTermQueryRewrite.ConstantScore,
+			Transpositions = true
+		};
 
 		protected override object QueryJson => new
 		{
@@ -28,19 +48,6 @@ public FuzzyQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new FuzzyQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Fuzziness = Fuzziness.Auto,
-			Value = "ki",
-			MaxExpansions = 100,
-			PrefixLength = 3,
-			Rewrite = MultiTermQueryRewrite.ConstantScore,
-			Transpositions = true
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Fuzzy(c => c
 				.Name("named_query")
@@ -53,13 +60,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Rewrite(MultiTermQueryRewrite.ConstantScore)
 				.Transpositions()
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IFuzzyQuery<string, Fuzziness>>(
-			a => a.Fuzzy as IFuzzyQuery<string, Fuzziness>
-		)
-		{
-			q => q.Field = null,
-			q => q.Value = null
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Ids/IdsQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Ids/IdsQueryUsageTests.cs
index 7eaf5ff69e4..cbb932fca79 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Ids/IdsQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Ids/IdsQueryUsageTests.cs
@@ -4,14 +4,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.TermLevel.Ids
 {
 	public class IdsQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public IdsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public IdsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IIdsQuery>(a => a.Ids)
+		{
+			q => q.Values = null,
+			q => q.Values = Enumerable.Empty<Id>()
+		};
+
+		protected override QueryContainer QueryInitializer => new IdsQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Values = new List<Id> { 1, 2, 3, 4 },
+			Types = Type<Project>().And<Developer>()
+		};
 
 		protected override object QueryJson => new
 		{
@@ -22,15 +35,6 @@ public IdsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(c
 				type = new[] { "doc", "developer" },
 				values = new[] { 1, 2, 3, 4 }
 			}
-
-		};
-
-		protected override QueryContainer QueryInitializer => new IdsQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Values = new List<Id> { 1, 2,3,4 },
-			Types = Type<Project>().And<Developer>()
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -40,11 +44,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Values(1, 2, 3, 4)
 				.Types(typeof(Project), typeof(Developer))
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IIdsQuery>(a => a.Ids)
-		{
-			q => q.Values = null,
-			q => q.Values = Enumerable.Empty<Id>()
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Prefix/PrefixQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Prefix/PrefixQueryUsageTests.cs
index eabba77f28d..5a114b65d82 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Prefix/PrefixQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Prefix/PrefixQueryUsageTests.cs
@@ -2,13 +2,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.PrefixLevel.Prefix
 {
 	public class PrefixQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public PrefixQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public PrefixQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IPrefixQuery>(a => a.Prefix)
+		{
+			q => q.Field = null,
+			q => q.Value = null,
+			q => q.Value = string.Empty
+		};
+
+		protected override QueryContainer QueryInitializer => new PrefixQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Value = "proj",
+			Rewrite = MultiTermQueryRewrite.TopTerms(10)
+		};
 
 		protected override object QueryJson => new
 		{
@@ -24,15 +39,6 @@ public PrefixQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : bas
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new PrefixQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Value = "proj",
-			Rewrite = MultiTermQueryRewrite.TopTerms(10)
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Prefix(c => c
 				.Name("named_query")
@@ -41,12 +47,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Value("proj")
 				.Rewrite(MultiTermQueryRewrite.TopTerms(10))
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IPrefixQuery>(a => a.Prefix)
-		{
-			q => q.Field = null,
-			q => q.Value = null,
-			q => q.Value = string.Empty
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Range/DateRangeQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Range/DateRangeQueryUsageTests.cs
index 9f680aeda60..b02ddb9d328 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Range/DateRangeQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Range/DateRangeQueryUsageTests.cs
@@ -2,30 +2,23 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Tests.Domain.Helpers.TestValueHelper;
 
 namespace Tests.QueryDsl.TermLevel.Range
 {
 	public class DateRangeQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public DateRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public DateRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IDateRangeQuery>(q => q.Range as IDateRangeQuery)
 		{
-			range = new
+			q => q.Field = null,
+			q =>
 			{
-				description = new
-				{
-					_name = "named_query",
-					boost = 1.1,
-					format = "dd/MM/yyyy||yyyy",
-					gt = "2015-06-06T12:01:02.123",
-					gte = "2015-06-06T12:01:02.123||/M",
-					lt = "01/01/2012",
-					lte = "now",
-					time_zone = "+01:00"
-				}
+				q.GreaterThan = null;
+				q.GreaterThanOrEqualTo = null;
+				q.LessThan = null;
+				q.LessThanOrEqualTo = null;
 			}
 		};
 
@@ -42,6 +35,24 @@ public DateRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 			Format = "dd/MM/yyyy||yyyy"
 		};
 
+		protected override object QueryJson => new
+		{
+			range = new
+			{
+				description = new
+				{
+					_name = "named_query",
+					boost = 1.1,
+					format = "dd/MM/yyyy||yyyy",
+					gt = "2015-06-06T12:01:02.123",
+					gte = "2015-06-06T12:01:02.123||/M",
+					lt = "01/01/2012",
+					lte = "now",
+					time_zone = "+01:00"
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.DateRange(c => c
 				.Name("named_query")
@@ -54,17 +65,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Format("dd/MM/yyyy||yyyy")
 				.TimeZone("+01:00")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IDateRangeQuery>(q => q.Range as IDateRangeQuery)
-		{
-			q=> q.Field = null,
-			q=>
-			{
-				q.GreaterThan = null;
-				q.GreaterThanOrEqualTo = null;
-				q.LessThan = null;
-				q.LessThanOrEqualTo = null;
-			}
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Range/LongRangeQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Range/LongRangeQueryUsageTests.cs
index 62a5c87e258..169a20a9e08 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Range/LongRangeQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Range/LongRangeQueryUsageTests.cs
@@ -7,22 +7,17 @@ namespace Tests.QueryDsl.TermLevel.Range
 {
 	public class LongRangeQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public LongRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public LongRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ILongRangeQuery>(q => q.Range as ILongRangeQuery)
 		{
-			range = new
+			q => q.Field = null,
+			q =>
 			{
-				description = new
-				{
-					_name = "named_query",
-					boost = 1.1,
-					gt = 636634079999999999,
-					gte = 636634080000000000,
-					lt = 636634080000000000,
-					lte = 636634079999999999,
-					relation = "within"
-				}
+				q.GreaterThan = null;
+				q.GreaterThanOrEqualTo = null;
+				q.LessThan = null;
+				q.LessThanOrEqualTo = null;
 			}
 		};
 
@@ -38,6 +33,23 @@ public LongRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 			Relation = RangeRelation.Within
 		};
 
+		protected override object QueryJson => new
+		{
+			range = new
+			{
+				description = new
+				{
+					_name = "named_query",
+					boost = 1.1,
+					gt = 636634079999999999,
+					gte = 636634080000000000,
+					lt = 636634080000000000,
+					lte = 636634079999999999,
+					relation = "within"
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.LongRange(c => c
 				.Name("named_query")
@@ -49,17 +61,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.LessThanOrEquals(636634079999999999)
 				.Relation(RangeRelation.Within)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ILongRangeQuery>(q => q.Range as ILongRangeQuery)
-		{
-			q=> q.Field = null,
-			q=>
-			{
-				q.GreaterThan = null;
-				q.GreaterThanOrEqualTo = null;
-				q.LessThan = null;
-				q.LessThanOrEqualTo = null;
-			}
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Range/NumericRangeQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Range/NumericRangeQueryUsageTests.cs
index c49e5eee60d..6e7bbfca24d 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Range/NumericRangeQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Range/NumericRangeQueryUsageTests.cs
@@ -2,28 +2,22 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Range
 {
 	public class RangeQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public RangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public RangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<INumericRangeQuery>(q => q.Range as INumericRangeQuery)
 		{
-			range = new
+			q => q.Field = null,
+			q =>
 			{
-				description = new
-				{
-					_name = "named_query",
-					boost = 1.1,
-					gt = 1.0,
-					gte = 1.1,
-					lt = 2.1,
-					lte = 2.0,
-					relation = "within"
-				}
+				q.GreaterThan = null;
+				q.GreaterThanOrEqualTo = null;
+				q.LessThan = null;
+				q.LessThanOrEqualTo = null;
 			}
 		};
 
@@ -39,6 +33,23 @@ public RangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base
 			Relation = RangeRelation.Within
 		};
 
+		protected override object QueryJson => new
+		{
+			range = new
+			{
+				description = new
+				{
+					_name = "named_query",
+					boost = 1.1,
+					gt = 1.0,
+					gte = 1.1,
+					lt = 2.1,
+					lte = 2.0,
+					relation = "within"
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Range(c => c
 				.Name("named_query")
@@ -50,17 +61,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.LessThanOrEquals(2.0)
 				.Relation(RangeRelation.Within)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<INumericRangeQuery>(q => q.Range as INumericRangeQuery)
-		{
-			q=> q.Field = null,
-			q=>
-			{
-				q.GreaterThan = null;
-				q.GreaterThanOrEqualTo = null;
-				q.LessThan = null;
-				q.LessThanOrEqualTo = null;
-			}
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Range/TermRangeQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Range/TermRangeQueryUsageTests.cs
index d01fcbd771b..731c1cb873d 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Range/TermRangeQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Range/TermRangeQueryUsageTests.cs
@@ -2,13 +2,42 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Range
 {
 	public class TermRangeQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public TermRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public TermRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermRangeQuery>(q => q.Range as ITermRangeQuery)
+		{
+			q => q.Field = null,
+			q =>
+			{
+				q.GreaterThan = null;
+				q.GreaterThanOrEqualTo = null;
+				q.LessThan = null;
+				q.LessThanOrEqualTo = null;
+			},
+			q =>
+			{
+				q.GreaterThan = string.Empty;
+				q.GreaterThanOrEqualTo = string.Empty;
+				q.LessThan = string.Empty;
+				q.LessThanOrEqualTo = string.Empty;
+			},
+		};
+
+		protected override QueryContainer QueryInitializer => new TermRangeQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			GreaterThan = "foo",
+			GreaterThanOrEqualTo = "foof",
+			LessThan = "bar",
+			LessThanOrEqualTo = "barb"
+		};
 
 		protected override object QueryJson => new
 		{
@@ -26,17 +55,6 @@ public TermRangeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new TermRangeQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			GreaterThan = "foo",
-			GreaterThanOrEqualTo = "foof",
-			LessThan = "bar",
-			LessThanOrEqualTo = "barb"
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.TermRange(c => c
 				.Name("named_query")
@@ -47,24 +65,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.LessThan("bar")
 				.LessThanOrEquals("barb")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermRangeQuery>(q => q.Range as ITermRangeQuery)
-		{
-			q=> q.Field = null,
-			q=>
-			{
-				q.GreaterThan = null;
-				q.GreaterThanOrEqualTo = null;
-				q.LessThan = null;
-				q.LessThanOrEqualTo = null;
-			},
-            q =>
-			{
-				q.GreaterThan = string.Empty;
-				q.GreaterThanOrEqualTo = string.Empty;
-				q.LessThan = string.Empty;
-				q.LessThanOrEqualTo = string.Empty;
-			},
-		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Regexp/RegexpQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Regexp/RegexpQueryUsageTests.cs
index 2e6ee57c702..9421a25934c 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Regexp/RegexpQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Regexp/RegexpQueryUsageTests.cs
@@ -2,13 +2,29 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Regexp
 {
 	public class RegexpQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public RegexpQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public RegexpQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IRegexpQuery>(a => a.Regexp)
+		{
+			q => q.Field = null,
+			q => q.Value = null,
+			q => q.Value = string.Empty
+		};
+
+		protected override QueryContainer QueryInitializer => new RegexpQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Value = "s.*y",
+			Flags = "INTERSECTION|COMPLEMENT|EMPTY",
+			MaximumDeterminizedStates = 20000
+		};
 
 		protected override object QueryJson => new
 		{
@@ -25,16 +41,6 @@ public RegexpQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : bas
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new RegexpQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Value = "s.*y",
-			Flags = "INTERSECTION|COMPLEMENT|EMPTY",
-			MaximumDeterminizedStates = 20000
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Regexp(c => c
 				.Name("named_query")
@@ -44,12 +50,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Flags("INTERSECTION|COMPLEMENT|EMPTY")
 				.MaximumDeterminizedStates(20000)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IRegexpQuery>(a => a.Regexp)
-		{
-			q => q.Field = null,
-			q => q.Value = null,
-			q => q.Value = string.Empty
-		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Term/TermQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Term/TermQueryUsageTests.cs
index c926e97029c..3594b0a7403 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Term/TermQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Term/TermQueryUsageTests.cs
@@ -2,13 +2,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Term
 {
 	public class TermQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public TermQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public TermQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermQuery>(q => q.Term)
+		{
+			q => q.Field = null,
+			q => q.Value = "  ",
+			q => q.Value = null
+		};
+
+		protected override QueryContainer QueryInitializer => new TermQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Value = "project description"
+		};
 
 		protected override object QueryJson => new
 		{
@@ -23,14 +37,6 @@ public TermQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new TermQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Value = "project description"
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Term(c => c
 				.Name("named_query")
@@ -38,13 +44,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Field(p => p.Description)
 				.Value("project description")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermQuery>(q => q.Term)
-		{
-			q=> q.Field = null,
-			q=> q.Value = "  ",
-			q=> q.Value = null
-		};
 	}
 
 	/**[float]
@@ -59,8 +58,13 @@ public class VerbatimTermQueryUsageTests : TermQueryUsageTests
 		public VerbatimTermQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override ConditionlessWhen ConditionlessWhen => null;
-		//when reading back the json the notion of is conditionless is lost
-		protected override bool SupportsDeserialization => false;
+
+		protected override QueryContainer QueryInitializer => new TermQuery
+		{
+			IsVerbatim = true,
+			Field = "description",
+			Value = "",
+		};
 
 		protected override object QueryJson => new
 		{
@@ -73,12 +77,8 @@ public VerbatimTermQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage)
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new TermQuery
-		{
-			IsVerbatim = true,
-			Field = "description",
-			Value = "",
-		};
+		//when reading back the json the notion of is conditionless is lost
+		protected override bool SupportsDeserialization => false;
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Term(c => c
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsListQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsListQueryUsageTests.cs
index 6180416ad97..8e7924ce3c6 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsListQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsListQueryUsageTests.cs
@@ -1,20 +1,25 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Terms
 {
 	public class TermsListQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public TermsListQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public TermsListQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override QueryContainer QueryInitializer => new TermsQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Terms = new List<string> { "term1", "term2" }
+		};
 
 		protected override object QueryJson => new
 		{
@@ -26,14 +31,6 @@ public TermsListQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new TermsQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Terms = new List<string> { "term1", "term2" }
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
@@ -45,12 +42,21 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 
 	public class TermsListOfListIntegrationTests : QueryDslIntegrationTestsBase
 	{
+		private readonly List<List<string>> _terms = new List<List<string>> { new List<string> { "term1", "term2" } };
+
 		public TermsListOfListIntegrationTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		private List<List<string>> _terms = new List<List<string>> { new List<string> { "term1", "term2" } };
+		protected override bool ExpectIsValid => false;
 
 		protected override int ExpectStatusCode => 400;
-		protected override bool ExpectIsValid => false;
+
+		protected override QueryContainer QueryInitializer => new TermsQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Terms = _terms
+		};
 
 		protected override object QueryJson => new
 		{
@@ -58,18 +64,10 @@ public TermsListOfListIntegrationTests(ReadOnlyCluster cluster, EndpointUsage us
 			{
 				_name = "named_query",
 				boost = 1.1,
-				description = new[] { new [] { "term1", "term2" } },
+				description = new[] { new[] { "term1", "term2" } },
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new TermsQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Terms = _terms
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
@@ -94,13 +92,22 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 
 	public class TermsListOfListStringAgainstNumericFieldIntegrationTests : QueryDslIntegrationTestsBase
 	{
+		private readonly List<List<string>> _terms = new List<List<string>> { new List<string> { "term1", "term2" } };
+
 		public TermsListOfListStringAgainstNumericFieldIntegrationTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		private List<List<string>> _terms = new List<List<string>> { new List<string> { "term1", "term2" } };
+		protected override bool ExpectIsValid => false;
 
 
 		protected override int ExpectStatusCode => 400;
-		protected override bool ExpectIsValid => false;
+
+		protected override QueryContainer QueryInitializer => new TermsQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "numberOfCommits",
+			Terms = _terms,
+		};
 
 		protected override object QueryJson => new
 		{
@@ -108,18 +115,10 @@ public TermsListOfListStringAgainstNumericFieldIntegrationTests(ReadOnlyCluster
 			{
 				_name = "named_query",
 				boost = 1.1,
-				numberOfCommits = new[] { new [] { "term1", "term2" } }
+				numberOfCommits = new[] { new[] { "term1", "term2" } }
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new TermsQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "numberOfCommits",
-			Terms = _terms,
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
@@ -138,7 +137,5 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			var rootCause = rootCauses.First();
 			rootCause.Type.Should().Be("parsing_exception");
 		}
-
 	}
-
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsLookupQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsLookupQueryUsageTests.cs
index 241d4c6c2ec..f599ac7c273 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsLookupQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsLookupQueryUsageTests.cs
@@ -2,30 +2,22 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.TermLevel.Terms
 {
 	public class TermsLookupQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public TermsLookupQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public TermsLookupQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermsQuery>(a => a.Terms)
 		{
-			terms = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				description = new
-				{
-					id = 12,
-					index = "devs",
-					path = "lastName",
-					type = "developer",
-					routing = "myroutingvalue"
-				}
-			}
+			q => q.Field = null,
+			q => q.TermsLookup = null,
+			q => q.TermsLookup.Id = null,
+			q => q.TermsLookup.Type = null,
+			q => q.TermsLookup.Index = null,
+			q => q.TermsLookup.Path = null,
 		};
 
 		protected override QueryContainer QueryInitializer => new TermsQuery
@@ -38,11 +30,28 @@ public TermsLookupQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage)
 				Id = 12,
 				Index = Index<Developer>(),
 				Type = Type<Developer>(),
-				Path = Field<Developer>(p=>p.LastName),
+				Path = Field<Developer>(p => p.LastName),
 				Routing = "myroutingvalue"
 			}
 		};
 
+		protected override object QueryJson => new
+		{
+			terms = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				description = new
+				{
+					id = 12,
+					index = "devs",
+					path = "lastName",
+					type = "developer",
+					routing = "myroutingvalue"
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
@@ -54,15 +63,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 					.Routing("myroutingvalue")
 				)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermsQuery>(a => a.Terms)
-		{
-			q => q.Field = null,
-			q => q.TermsLookup = null,
-			q => q.TermsLookup.Id = null,
-			q => q.TermsLookup.Type = null,
-			q => q.TermsLookup.Index = null,
-			q => q.TermsLookup.Path = null,
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsQueryUsageTests.cs
index 7ad3d914748..399921b2c30 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Terms/TermsQueryUsageTests.cs
@@ -1,10 +1,8 @@
-using System.Collections.Generic;
 using System.Linq;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Terms
 {
@@ -15,20 +13,18 @@ namespace Tests.QueryDsl.TermLevel.Terms
 	*/
 	public class TermsQueryUsageTests : QueryDslUsageTestsBase
 	{
-		protected virtual string[] ExpectedTerms => new [] { "term1", "term2" };
+		public TermsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		public TermsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
-
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermsQuery>(a => a.Terms)
 		{
-			terms = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				description = ExpectedTerms
-			}
+			q => q.Field = null,
+			q => q.Terms = null,
+			q => q.Terms = Enumerable.Empty<object>(),
+			q => q.Terms = new[] { "" }
 		};
 
+		protected virtual string[] ExpectedTerms => new[] { "term1", "term2" };
+
 		protected override QueryContainer QueryInitializer => new TermsQuery
 		{
 			Name = "named_query",
@@ -37,6 +33,16 @@ public TermsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base
 			Terms = ExpectedTerms,
 		};
 
+		protected override object QueryJson => new
+		{
+			terms = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				description = ExpectedTerms
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
@@ -44,14 +50,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Field(p => p.Description)
 				.Terms("term1", "term2")
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermsQuery>(a => a.Terms)
-		{
-			q => q.Field = null,
-			q => q.Terms = null,
-			q => q.Terms = Enumerable.Empty<object>(),
-			q => q.Terms = new [] { "" }
-		};
 	}
 
 	/**[float]
@@ -59,10 +57,10 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 	*/
 	public class SingleTermTermsQueryUsageTests : TermsQueryUsageTests
 	{
-		protected override string[] ExpectedTerms => new [] { "term1"  };
-
 		public SingleTermTermsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override string[] ExpectedTerms => new[] { "term1" };
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
@@ -84,31 +82,30 @@ public class VerbatimTermsQueryUsageTests : TermsQueryUsageTests
 		public VerbatimTermsQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override ConditionlessWhen ConditionlessWhen => null;
-		//when reading back the json the notion of is conditionless is lost
-		protected override bool SupportsDeserialization => false;
+
+		protected override QueryContainer QueryInitializer => new TermsQuery
+		{
+			IsVerbatim = true,
+			Field = "description",
+			Terms = new string[] { },
+		};
 
 		protected override object QueryJson => new
 		{
 			terms = new
 			{
-				description = new string[] {}
+				description = new string[] { }
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new TermsQuery
-		{
-			IsVerbatim = true,
-			Field = "description",
-			Terms = new string[] {},
-		};
+		//when reading back the json the notion of is conditionless is lost
+		protected override bool SupportsDeserialization => false;
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Verbatim()
 				.Field(p => p.Description)
-				.Terms(new string[] {})
+				.Terms(new string[] { })
 			);
 	}
-
-
 }
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/TermsSet/TermsSetQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/TermsSet/TermsSetQueryUsageTests.cs
index dbafe30a26a..839f89d60fe 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/TermsSet/TermsSetQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/TermsSet/TermsSetQueryUsageTests.cs
@@ -1,11 +1,9 @@
-using System.Collections.Generic;
 using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.TermsSet
 {
@@ -24,19 +22,18 @@ namespace Tests.QueryDsl.TermLevel.TermsSet
 	[SkipVersion("<6.1.0", "terms set query was added in 6.1.0")]
 	public class TermsSetQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public TermsSetQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public TermsSetQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermsSetQuery>(a => a.TermsSet)
 		{
-			terms_set = new
+			q => q.Field = null,
+			q => q.Terms = null,
+			q => q.Terms = Enumerable.Empty<object>(),
+			q => q.Terms = new[] { "" },
+			q =>
 			{
-				branches = new
-				{
-					_name = "named_query",
-					boost = 1.1,
-					terms = new [] { "master", "dev" },
-					minimum_should_match_field = "requiredBranches"
-				}
+				q.MinimumShouldMatchField = null;
+				q.MinimumShouldMatchScript = null;
 			}
 		};
 
@@ -45,10 +42,24 @@ public TermsSetQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : b
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Infer.Field<Project>(p => p.Branches),
-			Terms = new [] { "master", "dev" },
+			Terms = new[] { "master", "dev" },
 			MinimumShouldMatchField = Infer.Field<Project>(p => p.RequiredBranches)
 		};
 
+		protected override object QueryJson => new
+		{
+			terms_set = new
+			{
+				branches = new
+				{
+					_name = "named_query",
+					boost = 1.1,
+					terms = new[] { "master", "dev" },
+					minimum_should_match_field = "requiredBranches"
+				}
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.TermsSet(c => c
 				.Name("named_query")
@@ -57,19 +68,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Terms("master", "dev")
 				.MinimumShouldMatchField(p => p.RequiredBranches)
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermsSetQuery>(a => a.TermsSet)
-		{
-			q => q.Field = null,
-			q => q.Terms = null,
-			q => q.Terms = Enumerable.Empty<object>(),
-			q => q.Terms = new [] { "" },
-			q =>
-			{
-				q.MinimumShouldMatchField = null;
-				q.MinimumShouldMatchScript = null;
-			}
-		};
 	}
 
 	/**[float]
@@ -83,7 +81,16 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 	[SkipVersion("<6.1.0", "terms set query was added in 6.1.0")]
 	public class TermsSetScriptQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public TermsSetScriptQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public TermsSetScriptQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override QueryContainer QueryInitializer => new TermsSetQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = Infer.Field<Project>(p => p.Branches),
+			Terms = new[] { "master", "dev" },
+			MinimumShouldMatchScript = new InlineScript("Math.min(params.num_terms, doc['requiredBranches'].value)")
+		};
 
 		protected override object QueryJson => new
 		{
@@ -93,7 +100,7 @@ public TermsSetScriptQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usag
 				{
 					_name = "named_query",
 					boost = 1.1,
-					terms = new [] { "master", "dev" },
+					terms = new[] { "master", "dev" },
 					minimum_should_match_script = new
 					{
 						source = "Math.min(params.num_terms, doc['requiredBranches'].value)"
@@ -102,15 +109,6 @@ public TermsSetScriptQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usag
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new TermsSetQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = Infer.Field<Project>(p => p.Branches),
-			Terms = new [] { "master", "dev" },
-			MinimumShouldMatchScript = new InlineScript("Math.min(params.num_terms, doc['requiredBranches'].value)")
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.TermsSet(c => c
 				.Name("named_query")
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Type/TypeQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Type/TypeQueryUsageTests.cs
index 7c5c5851943..45e01d88f77 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Type/TypeQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Type/TypeQueryUsageTests.cs
@@ -2,23 +2,17 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.QueryDsl.TypeLevel.Type
 {
 	public class TypeQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public TypeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public TypeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITypeQuery>(a => a.Type)
 		{
-			type = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				value = "developer"
-			}
+			q => q.Value = null,
 		};
 
 		protected override QueryContainer QueryInitializer => new TypeQuery
@@ -28,16 +22,21 @@ public TypeQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(
 			Value = Type<Developer>()
 		};
 
+		protected override object QueryJson => new
+		{
+			type = new
+			{
+				_name = "named_query",
+				boost = 1.1,
+				value = "developer"
+			}
+		};
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Type(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Value<Developer>()
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITypeQuery>(a => a.Type)
-		{
-			q => q.Value = null,
-		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Tests/Tests/QueryDsl/TermLevel/Wildcard/WildcardQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/TermLevel/Wildcard/WildcardQueryUsageTests.cs
index 6ddd8b41bbf..4ec96a9b09a 100644
--- a/src/Tests/Tests/QueryDsl/TermLevel/Wildcard/WildcardQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/TermLevel/Wildcard/WildcardQueryUsageTests.cs
@@ -2,13 +2,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.QueryDsl.TermLevel.Wildcard
 {
 	public class WildcardQueryUsageTests : QueryDslUsageTestsBase
 	{
-		public WildcardQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
+		public WildcardQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IWildcardQuery>(a => a.Wildcard)
+		{
+			q => q.Field = null,
+			q => q.Value = null,
+			q => q.Value = string.Empty
+		};
+
+		protected override QueryContainer QueryInitializer => new WildcardQuery
+		{
+			Name = "named_query",
+			Boost = 1.1,
+			Field = "description",
+			Value = "p*oj",
+			Rewrite = MultiTermQueryRewrite.TopTermsBoost(10)
+		};
 
 		protected override object QueryJson => new
 		{
@@ -24,15 +39,6 @@ public WildcardQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : b
 			}
 		};
 
-		protected override QueryContainer QueryInitializer => new WildcardQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = "description",
-			Value = "p*oj",
-			Rewrite = MultiTermQueryRewrite.TopTermsBoost(10)
-		};
-
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Wildcard(c => c
 				.Name("named_query")
@@ -41,12 +47,5 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Value("p*oj")
 				.Rewrite(MultiTermQueryRewrite.TopTermsBoost(10))
 			);
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IWildcardQuery>(a => a.Wildcard)
-		{
-			q => q.Field = null,
-			q => q.Value = null,
-			q => q.Value = string.Empty
-		};
 	}
 }
diff --git a/src/Tests/Tests/QueryDsl/Verbatim/VerbatimAndStrictQueryUsageTests.cs b/src/Tests/Tests/QueryDsl/Verbatim/VerbatimAndStrictQueryUsageTests.cs
index b0d17b53d6c..4f532c772c9 100644
--- a/src/Tests/Tests/QueryDsl/Verbatim/VerbatimAndStrictQueryUsageTests.cs
+++ b/src/Tests/Tests/QueryDsl/Verbatim/VerbatimAndStrictQueryUsageTests.cs
@@ -1,16 +1,10 @@
-using FluentAssertions;
-using Nest;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 using Elastic.Xunit.XunitPlumbing;
+using FluentAssertions;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using Xunit;
 
 namespace Tests.QueryDsl.Verbatim
@@ -26,10 +20,21 @@ namespace Tests.QueryDsl.Verbatim
 	 */
 	public class CompoundVerbatimQueryUsageTests : QueryDslUsageTestsBase
 	{
-		protected override bool SupportsDeserialization => false;
-
 		public CompoundVerbatimQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override QueryContainer QueryInitializer =>
+			new TermQuery
+			{
+				IsVerbatim = true,
+				Field = "description",
+				Value = ""
+			}
+			&& new TermQuery
+			{
+				Field = "name",
+				Value = "foo"
+			};
+
 		protected override object QueryJson => new
 		{
 			@bool = new
@@ -60,31 +65,20 @@ public CompoundVerbatimQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage us
 			}
 		};
 
-		protected override QueryContainer QueryInitializer =>
-			new TermQuery
-			{
-				IsVerbatim = true,
-				Field = "description",
-				Value = ""
-			}
-			&& new TermQuery
-			{
-				Field = "name",
-				Value = "foo"
-			};
+		protected override bool SupportsDeserialization => false;
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Bool(b => b
 				.Must(qt => qt
-					.Term(t => t
-						.Verbatim()
-						.Field(p => p.Description)
-						.Value("")
-					), qt => qt
-					.Term(t => t
-						.Field(p => p.Name)
-						.Value("foo")
-					)
+						.Term(t => t
+							.Verbatim()
+							.Field(p => p.Description)
+							.Value("")
+						), qt => qt
+						.Term(t => t
+							.Field(p => p.Name)
+							.Value("foo")
+						)
 				)
 			);
 	}
@@ -92,34 +86,38 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 	/** A compound query can also be marked as verbatim, demonstrated here with a `bool` query. */
 	public class QueryContainerVerbatimSupportedUsageTests : QueryDslUsageTestsBase
 	{
-		protected override bool SupportsDeserialization => false;
-
 		public QueryContainerVerbatimSupportedUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override object QueryJson => new
+		protected override QueryContainer QueryInitializer => new BoolQuery
 		{
-			@bool = new
-			{
-			}
+			IsVerbatim = true,
 		};
 
-		protected override QueryContainer QueryInitializer => new BoolQuery
+		protected override object QueryJson => new
 		{
-			IsVerbatim = true,
+			@bool = new
+				{ }
 		};
 
+		protected override bool SupportsDeserialization => false;
+
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Bool(b => b
 				.Verbatim()
 			);
 	}
 
-    /** A single verbatim query will be serialized as-is */
-    public class SingleVerbatimQueryUsageTests : QueryDslUsageTestsBase
+	/** A single verbatim query will be serialized as-is */
+	public class SingleVerbatimQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public SingleVerbatimQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override bool SupportsDeserialization => false;
+		protected override QueryContainer QueryInitializer => new TermQuery
+		{
+			IsVerbatim = true,
+			Field = "description",
+			Value = ""
+		};
 
 		protected override object QueryJson => new
 		{
@@ -130,15 +128,9 @@ public SingleVerbatimQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usag
 					value = ""
 				}
 			}
-
 		};
 
-		protected override QueryContainer QueryInitializer => new TermQuery
-		{
-			IsVerbatim = true,
-			Field = "description",
-			Value = ""
-		};
+		protected override bool SupportsDeserialization => false;
 
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -149,26 +141,42 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 			);
 	}
 
-    /**
-     * Leaf queries within a compound query marked as verbatim will also be serialized as-is
-     */
+	/**
+	 * Leaf queries within a compound query marked as verbatim will also be serialized as-is
+	 */
 	public class CompoundVerbatimInnerQueryUsageTests : QueryDslUsageTestsBase
 	{
 		public CompoundVerbatimInnerQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override bool SupportsDeserialization => false;
+
+		protected override QueryContainer QueryInitializer => new BoolQuery
+		{
+			Filter = new QueryContainer[]
+			{
+				!new TermQuery
+				{
+					IsVerbatim = true,
+					Field = "name",
+					Value = ""
+				} &&
+				new ExistsQuery
+				{
+					Field = "numberOfCommits"
+				}
+			}
+		};
 
 		protected override object QueryJson => new
 		{
 			@bool = new
 			{
-				filter = new []
+				filter = new[]
 				{
 					new
 					{
 						@bool = new
 						{
-							must = new []
+							must = new[]
 							{
 								new
 								{
@@ -178,7 +186,7 @@ public CompoundVerbatimInnerQueryUsageTests(ReadOnlyCluster cluster, EndpointUsa
 									}
 								}
 							},
-							must_not = new []
+							must_not = new[]
 							{
 								new
 								{
@@ -197,36 +205,20 @@ public CompoundVerbatimInnerQueryUsageTests(ReadOnlyCluster cluster, EndpointUsa
 			}
 		};
 
-
-
-		protected override QueryContainer QueryInitializer => new BoolQuery
-		{
-			Filter = new QueryContainer[] {
-				!new TermQuery
-				{
-					IsVerbatim = true,
-					Field = "name",
-					Value = ""
-				} &&
-				new ExistsQuery
-				{
-					Field = "numberOfCommits"
-				}
-			}
-		};
+		protected override bool SupportsDeserialization => false;
 
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Bool(b => b
 				.Filter(f => !f
-					.Term(t => t
-						.Verbatim()
-						.Field(p => p.Name)
-						.Value("")
-					) && f
-					.Exists(e => e
-						.Field(p => p.NumberOfCommits)
-					)
+						.Term(t => t
+							.Verbatim()
+							.Field(p => p.Name)
+							.Value("")
+						) && f
+						.Exists(e => e
+							.Field(p => p.NumberOfCommits)
+						)
 				)
 			);
 	}
diff --git a/src/Tests/Tests/Search/Count/CountApiTests.cs b/src/Tests/Tests/Search/Count/CountApiTests.cs
index d5d9381b88d..de105e5d838 100644
--- a/src/Tests/Tests/Search/Count/CountApiTests.cs
+++ b/src/Tests/Tests/Search/Count/CountApiTests.cs
@@ -5,8 +5,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.Count
 {
@@ -15,17 +13,7 @@ public class CountApiTests
 	{
 		public CountApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.Count(f),
-			fluentAsync: (c, f) => c.CountAsync(f),
-			request: (c, r) => c.Count<Project>(r),
-			requestAsync: (c, r) => c.CountAsync<Project>(r)
-		);
-
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/project/doc/_count";
 
 		protected override object ExpectJson => new
 		{
@@ -41,6 +29,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<CountDescriptor<Project>, ICountRequest> Fluent => c => c
 			.Query(q => q
 				.Match(m => m
@@ -49,6 +39,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override CountRequest<Project> Initializer => new CountRequest<Project>()
 		{
 			Query = new QueryContainer(new MatchQuery
@@ -57,5 +49,14 @@ protected override LazyResponses ClientUsage() => Calls(
 				Query = "NEST"
 			})
 		};
+
+		protected override string UrlPath => "/project/doc/_count";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.Count(f),
+			(c, f) => c.CountAsync(f),
+			(c, r) => c.Count<Project>(r),
+			(c, r) => c.CountAsync<Project>(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/Search/Count/CountUrlTests.cs b/src/Tests/Tests/Search/Count/CountUrlTests.cs
index b4818d6b504..e5b04d72174 100644
--- a/src/Tests/Tests/Search/Count/CountUrlTests.cs
+++ b/src/Tests/Tests/Search/Count/CountUrlTests.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
- using Elastic.Xunit.XunitPlumbing;
- using Nest;
- using Tests.Domain;
- using Tests.Framework;
- using static Tests.Framework.UrlTester;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
+using Nest;
+using Tests.Domain;
+using Tests.Framework;
+using static Tests.Framework.UrlTester;
 
 namespace Tests.Search.Count
 {
@@ -13,61 +13,61 @@ [U] public async Task Urls()
 		{
 			var hardcoded = "hardcoded";
 			await GET("/devs/developer/_count")
-				.Fluent(c=>c.Count<Developer>())
-				.Request(c=>c.Count<Project>(new CountRequest<Developer>()))
-				.FluentAsync(c=>c.CountAsync<Developer>())
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest<Developer>()))
+					.Fluent(c => c.Count<Developer>())
+					.Request(c => c.Count<Project>(new CountRequest<Developer>()))
+					.FluentAsync(c => c.CountAsync<Developer>())
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Developer>()))
 				;
 
 			await GET("/devs/developer/_count?q=querystring")
-				.Fluent(c=>c.Count<Developer>(s=>s.QueryOnQueryString("querystring")))
-				.Request(c=>c.Count<Project>(new CountRequest<Developer>() { QueryOnQueryString = "querystring" }))
-				.FluentAsync(c=>c.CountAsync<Developer>(s=>s.QueryOnQueryString("querystring")))
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest<Developer>() { QueryOnQueryString = "querystring" }))
+					.Fluent(c => c.Count<Developer>(s => s.QueryOnQueryString("querystring")))
+					.Request(c => c.Count<Project>(new CountRequest<Developer>() { QueryOnQueryString = "querystring" }))
+					.FluentAsync(c => c.CountAsync<Developer>(s => s.QueryOnQueryString("querystring")))
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Developer>() { QueryOnQueryString = "querystring" }))
 				;
 			await GET($"/devs/{hardcoded}/_count")
-				.Fluent(c=>c.Count<Developer>(s=>s.Type(hardcoded)))
-				.Request(c=>c.Count<Project>(new CountRequest<Developer>(typeof(Developer), hardcoded)))
-				.FluentAsync(c=>c.CountAsync<Developer>(s=>s.Type(hardcoded)))
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest<Developer>(typeof(Developer), hardcoded)))
+					.Fluent(c => c.Count<Developer>(s => s.Type(hardcoded)))
+					.Request(c => c.Count<Project>(new CountRequest<Developer>(typeof(Developer), hardcoded)))
+					.FluentAsync(c => c.CountAsync<Developer>(s => s.Type(hardcoded)))
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Developer>(typeof(Developer), hardcoded)))
 				;
 
 			await GET("/project/_count")
-				.Fluent(c=>c.Count<Project>(s=>s.Type(Types.All)))
-				.Fluent(c=>c.Count<Project>(s=>s.AllTypes()))
-				.Request(c=>c.Count<Project>(new CountRequest("project")))
-				.Request(c=>c.Count<Project>(new CountRequest<Project>("project", Types.All)))
-				.FluentAsync(c=>c.CountAsync<Project>(s=>s.Type(Types.All)))
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest<Project>(typeof(Project), Types.All)))
-				.FluentAsync(c=>c.CountAsync<Project>(s=>s.AllTypes()))
+					.Fluent(c => c.Count<Project>(s => s.Type(Types.All)))
+					.Fluent(c => c.Count<Project>(s => s.AllTypes()))
+					.Request(c => c.Count<Project>(new CountRequest("project")))
+					.Request(c => c.Count<Project>(new CountRequest<Project>("project", Types.All)))
+					.FluentAsync(c => c.CountAsync<Project>(s => s.Type(Types.All)))
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Project>(typeof(Project), Types.All)))
+					.FluentAsync(c => c.CountAsync<Project>(s => s.AllTypes()))
 				;
 
 			await GET($"/{hardcoded}/_count")
-				.Fluent(c=>c.Count<Project>(s=>s.Index(hardcoded).Type(Types.All)))
-				.Fluent(c=>c.Count<Project>(s=>s.Index(hardcoded).AllTypes()))
-				.Request(c=>c.Count<Project>(new CountRequest(hardcoded)))
-				.Request(c=>c.Count<Project>(new CountRequest<Project>(hardcoded, Types.All)))
-				.FluentAsync(c=>c.CountAsync<Project>(s=>s.Index(hardcoded).Type(Types.All)))
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest<Project>(hardcoded, Types.All)))
-				.FluentAsync(c=>c.CountAsync<Project>(s=>s.Index(hardcoded).AllTypes()))
+					.Fluent(c => c.Count<Project>(s => s.Index(hardcoded).Type(Types.All)))
+					.Fluent(c => c.Count<Project>(s => s.Index(hardcoded).AllTypes()))
+					.Request(c => c.Count<Project>(new CountRequest(hardcoded)))
+					.Request(c => c.Count<Project>(new CountRequest<Project>(hardcoded, Types.All)))
+					.FluentAsync(c => c.CountAsync<Project>(s => s.Index(hardcoded).Type(Types.All)))
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Project>(hardcoded, Types.All)))
+					.FluentAsync(c => c.CountAsync<Project>(s => s.Index(hardcoded).AllTypes()))
 				;
 
 			await GET("/_count")
-				.Fluent(c=>c.Count<Project>(s=>s.AllTypes().AllIndices()))
-				.Request(c=>c.Count<Project>(new CountRequest()))
-				.Request(c=>c.Count<Project>(new CountRequest<Project>(Nest.Indices.All, Types.All)))
-				.FluentAsync(c=>c.CountAsync<Project>(s=>s.AllIndices().Type(Types.All)))
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest<Project>(Nest.Indices.All, Types.All)))
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest()))
+					.Fluent(c => c.Count<Project>(s => s.AllTypes().AllIndices()))
+					.Request(c => c.Count<Project>(new CountRequest()))
+					.Request(c => c.Count<Project>(new CountRequest<Project>(Nest.Indices.All, Types.All)))
+					.FluentAsync(c => c.CountAsync<Project>(s => s.AllIndices().Type(Types.All)))
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Project>(Nest.Indices.All, Types.All)))
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest()))
 				;
 
 			await POST("/_count")
-				.Fluent(c=>c.Count<Project>(s=>s.AllTypes().AllIndices().Query(q=>q.MatchAll())))
-				.Request(c=>c.Count<Project>(new CountRequest() { Query = new MatchAllQuery() }))
-				.Request(c=>c.Count<Project>(new CountRequest<Project>(Nest.Indices.All, Types.All) { Query = new MatchAllQuery() }))
-				.FluentAsync(c=>c.CountAsync<Project>(s=>s.AllIndices().Type(Types.All).Query(q=>q.MatchAll())))
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest<Project>(Nest.Indices.All, Types.All) { Query = new MatchAllQuery() }))
-				.RequestAsync(c=>c.CountAsync<Project>(new CountRequest() { Query = new MatchAllQuery() }))
+					.Fluent(c => c.Count<Project>(s => s.AllTypes().AllIndices().Query(q => q.MatchAll())))
+					.Request(c => c.Count<Project>(new CountRequest() { Query = new MatchAllQuery() }))
+					.Request(c => c.Count<Project>(new CountRequest<Project>(Nest.Indices.All, Types.All) { Query = new MatchAllQuery() }))
+					.FluentAsync(c => c.CountAsync<Project>(s => s.AllIndices().Type(Types.All).Query(q => q.MatchAll())))
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Project>(Nest.Indices.All, Types.All) { Query = new MatchAllQuery() }))
+					.RequestAsync(c => c.CountAsync<Project>(new CountRequest() { Query = new MatchAllQuery() }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/Explain/ExplainApiTests.cs b/src/Tests/Tests/Search/Explain/ExplainApiTests.cs
index 8b468492d5f..f7ee5fd335f 100644
--- a/src/Tests/Tests/Search/Explain/ExplainApiTests.cs
+++ b/src/Tests/Tests/Search/Explain/ExplainApiTests.cs
@@ -7,34 +7,18 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.Explain
 {
 	public class ExplainApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, IExplainResponse<Project>, IExplainRequest<Project>, ExplainDescriptor<Project>, ExplainRequest<Project>>
+		: ApiIntegrationTestBase<ReadOnlyCluster, IExplainResponse<Project>, IExplainRequest<Project>, ExplainDescriptor<Project>,
+			ExplainRequest<Project>>
 	{
-		public ExplainApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		private readonly Project _project = new Project { Name = Project.Instance.Name };
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.Explain(_project, f),
-			fluentAsync: (c, f) => c.ExplainAsync(_project, f),
-			request: (c, r) => c.Explain(r),
-			requestAsync: (c, r) => c.ExplainAsync(r)
-		);
+		public ExplainApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath =>
-			$"/project/doc/{U(Project.Instance.Name)}/_explain?_source=true&routing={U(Project.Instance.Name)}";
-
-		protected override bool SupportsDeserialization => false;
-
-		protected override ExplainDescriptor<Project> NewDescriptor() => new ExplainDescriptor<Project>(_project);
-
-		private readonly Project _project = new Project { Name = Project.Instance.Name };
 
 		protected override object ExpectJson => new
 		{
@@ -50,6 +34,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<ExplainDescriptor<Project>, IExplainRequest<Project>> Fluent => e => e
 			.SourceEnabled()
 			.Query(q => q
@@ -59,6 +45,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ExplainRequest<Project> Initializer => new ExplainRequest<Project>(_project)
 		{
 			SourceEnabled = true,
@@ -69,6 +57,20 @@ protected override LazyResponses ClientUsage() => Calls(
 			})
 		};
 
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath =>
+			$"/project/doc/{U(Project.Instance.Name)}/_explain?_source=true&routing={U(Project.Instance.Name)}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.Explain(_project, f),
+			(c, f) => c.ExplainAsync(_project, f),
+			(c, r) => c.Explain(r),
+			(c, r) => c.ExplainAsync(r)
+		);
+
+		protected override ExplainDescriptor<Project> NewDescriptor() => new ExplainDescriptor<Project>(_project);
+
 		protected override void ExpectResponse(IExplainResponse<Project> response)
 		{
 			response.IsValid.Should().BeTrue();
diff --git a/src/Tests/Tests/Search/Explain/ExplainUrlTests.cs b/src/Tests/Tests/Search/Explain/ExplainUrlTests.cs
index 68b5c58c632..399a8ef36b3 100644
--- a/src/Tests/Tests/Search/Explain/ExplainUrlTests.cs
+++ b/src/Tests/Tests/Search/Explain/ExplainUrlTests.cs
@@ -14,17 +14,17 @@ [U] public async Task Urls()
 			var project = new Project { Name = "NEST" };
 
 			await POST("/project/doc/NEST/_explain?routing=NEST")
-				.Fluent(c => c.Explain<Project>(project, e => e.Query(q=>q.MatchAll())))
-				.Request(c => c.Explain(new ExplainRequest<Project>(project) {}))
-				.FluentAsync(c => c.ExplainAsync<Project>(project, e=>e.Query(q=>q.MatchAll())))
-				.RequestAsync(c => c.ExplainAsync(new ExplainRequest<Project>(project)))
+					.Fluent(c => c.Explain<Project>(project, e => e.Query(q => q.MatchAll())))
+					.Request(c => c.Explain(new ExplainRequest<Project>(project) { }))
+					.FluentAsync(c => c.ExplainAsync<Project>(project, e => e.Query(q => q.MatchAll())))
+					.RequestAsync(c => c.ExplainAsync(new ExplainRequest<Project>(project)))
 				;
 
 			await POST("/project/doc/NEST/_explain")
-				.Fluent(c => c.Explain<Project>("NEST", e => e.Query(q=>q.MatchAll())))
-				.Request(c => c.Explain(new ExplainRequest<Project>("project", "doc", "NEST") {}))
-				.FluentAsync(c => c.ExplainAsync<Project>("NEST", e=>e.Query(q=>q.MatchAll())))
-				.RequestAsync(c => c.ExplainAsync(new ExplainRequest<Project>("NEST")))
+					.Fluent(c => c.Explain<Project>("NEST", e => e.Query(q => q.MatchAll())))
+					.Request(c => c.Explain(new ExplainRequest<Project>("project", "doc", "NEST") { }))
+					.FluentAsync(c => c.ExplainAsync<Project>("NEST", e => e.Query(q => q.MatchAll())))
+					.RequestAsync(c => c.ExplainAsync(new ExplainRequest<Project>("NEST")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/FieldCapabilities/FieldCapabilitiesApiTests.cs b/src/Tests/Tests/Search/FieldCapabilities/FieldCapabilitiesApiTests.cs
index e3b90ebda2b..aaedf039f86 100644
--- a/src/Tests/Tests/Search/FieldCapabilities/FieldCapabilitiesApiTests.cs
+++ b/src/Tests/Tests/Search/FieldCapabilities/FieldCapabilitiesApiTests.cs
@@ -8,36 +8,39 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Search.FieldCapabilities
 {
 	public class FieldCapabilitiesApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, IFieldCapabilitiesResponse, IFieldCapabilitiesRequest, FieldCapabilitiesDescriptor, FieldCapabilitiesRequest>
+		: ApiIntegrationTestBase<ReadOnlyCluster, IFieldCapabilitiesResponse, IFieldCapabilitiesRequest, FieldCapabilitiesDescriptor,
+			FieldCapabilitiesRequest>
 	{
 		public FieldCapabilitiesApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.FieldCapabilities(Index<Project>().And<Developer>(), f),
-			fluentAsync: (c, f) => c.FieldCapabilitiesAsync(Index<Project>().And<Developer>(), f),
-			request: (c, r) => c.FieldCapabilities(r),
-			requestAsync: (c, r) => c.FieldCapabilitiesAsync(r)
-		);
+		protected override bool ExpectIsValid => true;
 
 		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => "/project%2Cdevs/_field_caps?fields=name%2C%2A";
 
 		protected override Func<FieldCapabilitiesDescriptor, IFieldCapabilitiesRequest> Fluent => d => d
-			.Fields(Fields<Project>(p=>p.Name).And("*"));
+			.Fields(Fields<Project>(p => p.Name).And("*"));
+
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override FieldCapabilitiesRequest Initializer => new FieldCapabilitiesRequest(Index<Project>().And<Developer>())
 		{
-			Fields = Fields<Project>(p=>p.Name).And("*"),
+			Fields = Fields<Project>(p => p.Name).And("*"),
 		};
 
+		protected override string UrlPath => "/project%2Cdevs/_field_caps?fields=name%2C%2A";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.FieldCapabilities(Index<Project>().And<Developer>(), f),
+			(c, f) => c.FieldCapabilitiesAsync(Index<Project>().And<Developer>(), f),
+			(c, r) => c.FieldCapabilities(r),
+			(c, r) => c.FieldCapabilitiesAsync(r)
+		);
+
 		protected override void ExpectResponse(IFieldCapabilitiesResponse response)
 		{
 			response.Fields.Should().ContainKey("_uid");
@@ -57,7 +60,7 @@ protected override void ExpectResponse(IFieldCapabilitiesResponse response)
 			stateCapabilities.Aggregatable.Should().BeTrue();
 			stateCapabilities.Searchable.Should().BeTrue();
 
-			stateCapabilities = response.Fields[Field<Project>(p=>p.State)].Keyword;
+			stateCapabilities = response.Fields[Field<Project>(p => p.State)].Keyword;
 			stateCapabilities.Aggregatable.Should().BeTrue();
 			stateCapabilities.Searchable.Should().BeTrue();
 		}
diff --git a/src/Tests/Tests/Search/FieldCapabilities/FieldCapabilitiesUrlTests.cs b/src/Tests/Tests/Search/FieldCapabilities/FieldCapabilitiesUrlTests.cs
index 2b876f33c3e..faaed15e9fc 100644
--- a/src/Tests/Tests/Search/FieldCapabilities/FieldCapabilitiesUrlTests.cs
+++ b/src/Tests/Tests/Search/FieldCapabilities/FieldCapabilitiesUrlTests.cs
@@ -9,14 +9,10 @@ namespace Tests.Search.FieldCapabilities
 {
 	public class FieldCapabilitiesUrlTests
 	{
-		[U] public async Task Urls()
-		{
-			await GET("/project/_field_caps")
-				.Fluent(c => c.FieldCapabilities(Nest.Indices.Index<Project>()))
-				.Request(c => c.FieldCapabilities(new FieldCapabilitiesRequest("project") {}))
-				.FluentAsync(c => c.FieldCapabilitiesAsync(typeof(Project)))
-				.RequestAsync(c => c.FieldCapabilitiesAsync(new FieldCapabilitiesRequest("project")))
-				;
-		}
+		[U] public async Task Urls() => await GET("/project/_field_caps")
+			.Fluent(c => c.FieldCapabilities(Nest.Indices.Index<Project>()))
+			.Request(c => c.FieldCapabilities(new FieldCapabilitiesRequest("project") { }))
+			.FluentAsync(c => c.FieldCapabilitiesAsync(typeof(Project)))
+			.RequestAsync(c => c.FieldCapabilitiesAsync(new FieldCapabilitiesRequest("project")));
 	}
 }
diff --git a/src/Tests/Tests/Search/Hits/HitsSerializationTests.cs b/src/Tests/Tests/Search/Hits/HitsSerializationTests.cs
index 60fc5641fff..cf110ca997e 100644
--- a/src/Tests/Tests/Search/Hits/HitsSerializationTests.cs
+++ b/src/Tests/Tests/Search/Hits/HitsSerializationTests.cs
@@ -10,17 +10,6 @@ namespace Tests.Search.Hits
 {
 	public class HitsSerializationTests
 	{
-		public class Person
-		{
-			public string Name { get; set; }
-
-			public byte Age { get; set; }
-
-			public Name.Gender Gender { get; set; }
-
-			public List<Person> Children { get; set; }
-		}
-
 		[U]
 		public void CanDeserializeNestedNestedTopHits()
 		{
@@ -309,5 +298,15 @@ public void CanDeserializeNestedNestedTopHits()
 				nestedNestedIdentity.Offset.Should().BeGreaterOrEqualTo(0);
 			}
 		}
+
+		public class Person
+		{
+			public byte Age { get; set; }
+
+			public List<Person> Children { get; set; }
+
+			public Name.Gender Gender { get; set; }
+			public string Name { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Search/MultiSearch/MultiSearchApiTests.cs b/src/Tests/Tests/Search/MultiSearch/MultiSearchApiTests.cs
index b4cceedbdb3..1413774424b 100644
--- a/src/Tests/Tests/Search/MultiSearch/MultiSearchApiTests.cs
+++ b/src/Tests/Tests/Search/MultiSearch/MultiSearchApiTests.cs
@@ -11,51 +11,47 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Tests.Domain.Helpers.TestValueHelper;
 
 namespace Tests.Search.MultiSearch
 {
 	[SkipVersion(">5.0.0-alpha1", "format of percolate query changed.")]
-	public class MultiSearchApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IMultiSearchResponse, IMultiSearchRequest, MultiSearchDescriptor, MultiSearchRequest>
+	public class MultiSearchApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiSearchResponse, IMultiSearchRequest, MultiSearchDescriptor, MultiSearchRequest>
 	{
 		public MultiSearchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.MultiSearch(f),
-			fluentAsync: (c, f) => c.MultiSearchAsync(f),
-			request: (c, r) => c.MultiSearch(r),
-			requestAsync: (c, r) => c.MultiSearchAsync(r)
-		);
-
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/project/doc/_msearch";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new object[]
 		{
-			new {},
-			new { from = 0, size = 10, query = new { match_all = new {} } },
+			new { },
+			new { from = 0, size = 10, query = new { match_all = new { } } },
 			new { search_type = "dfs_query_then_fetch" },
-			new {},
+			new { },
 			new { index = "devs", type = "developer" },
-			new { from = 0, size = 5, query = new { match_all = new {} } },
+			new { from = 0, size = 5, query = new { match_all = new { } } },
 			new { index = "devs", type = "developer" },
-			new { from = 0, size = 5, query = new { match_all = new {} } },
+			new { from = 0, size = 5, query = new { match_all = new { } } },
 			new { index = "queries", type = PercolatorType },
-			new { query = new { percolate = new { document = Project.InstanceAnonymous, field = "query" , routing = Project.First.Name } } },
+			new { query = new { percolate = new { document = Project.InstanceAnonymous, field = "query", routing = Project.First.Name } } },
 			new { index = "queries", type = PercolatorType },
-			new { query = new { percolate = new { index = "project", type = "doc", id = Project.First.Name, version = 1, field = "query", routing = Project.First.Name } } },
+			new
+			{
+				query = new
+				{
+					percolate = new
+						{ index = "project", type = "doc", id = Project.First.Name, version = 1, field = "query", routing = Project.First.Name }
+				}
+			},
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<MultiSearchDescriptor, IMultiSearchRequest> Fluent => ms => ms
 			.Index(typeof(Project))
 			.Type(typeof(Project))
-			.Search<Project>("10projects",s => s.Query(q => q.MatchAll()).From(0).Size(10))
+			.Search<Project>("10projects", s => s.Query(q => q.MatchAll()).From(0).Size(10))
 			.Search<Project>("dfs_projects", s => s.SearchType(SearchType.DfsQueryThenFetch))
 			.Search<Developer>("5developers", s => s.Query(q => q.MatchAll()).From(0).Size(5))
 			.Search<Developer>("infer_type_name", s => s.Index("devs").From(0).Size(5).MatchAll())
@@ -82,15 +78,18 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override MultiSearchRequest Initializer => new MultiSearchRequest(typeof(Project), typeof(Project))
 		{
 			Operations = new Dictionary<string, ISearchRequest>
 			{
 				{ "10projects", new SearchRequest<Project> { From = 0, Size = 10, Query = new QueryContainer(new MatchAllQuery()) } },
-				{ "dfs_projects", new SearchRequest<Project> { SearchType = SearchType.DfsQueryThenFetch} },
+				{ "dfs_projects", new SearchRequest<Project> { SearchType = SearchType.DfsQueryThenFetch } },
 				{ "5developers", new SearchRequest<Developer> { From = 0, Size = 5, Query = new QueryContainer(new MatchAllQuery()) } },
 				{ "infer_type_name", new SearchRequest<Developer>("devs") { From = 0, Size = 5, Query = new QueryContainer(new MatchAllQuery()) } },
-				{ "percolate_document", new SearchRequest<ProjectPercolation>()
+				{
+					"percolate_document", new SearchRequest<ProjectPercolation>()
 					{
 						Query = new QueryContainer(new PercolateQuery
 						{
@@ -99,7 +98,8 @@ protected override LazyResponses ClientUsage() => Calls(
 						})
 					}
 				},
-				{ "percolate_existing_document", new SearchRequest<ProjectPercolation>()
+				{
+					"percolate_existing_document", new SearchRequest<ProjectPercolation>()
 					{
 						Query = new QueryContainer(new PercolateQuery
 						{
@@ -115,6 +115,16 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => "/project/doc/_msearch";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.MultiSearch(f),
+			(c, f) => c.MultiSearchAsync(f),
+			(c, r) => c.MultiSearch(r),
+			(c, r) => c.MultiSearchAsync(r)
+		);
+
 		[I] public Task AssertResponse() => AssertOnAllResponses(r =>
 		{
 			r.TotalResponses.Should().Be(6);
@@ -125,7 +135,7 @@ [I] public Task AssertResponse() => AssertOnAllResponses(r =>
 			var allResponses = r.AllResponses.ToList();
 			allResponses.Should().NotBeEmpty().And.HaveCount(6).And.OnlyContain(rr => rr.IsValid);
 
-			var projects= r.GetResponse<Project>("10projects");
+			var projects = r.GetResponse<Project>("10projects");
 			projects.ShouldBeValid();
 			projects.Documents.Should().HaveCount(10);
 
diff --git a/src/Tests/Tests/Search/MultiSearch/MultiSearchInvalidApiTests.cs b/src/Tests/Tests/Search/MultiSearch/MultiSearchInvalidApiTests.cs
index 325cbe259ab..3cfdce5fecf 100644
--- a/src/Tests/Tests/Search/MultiSearch/MultiSearchInvalidApiTests.cs
+++ b/src/Tests/Tests/Search/MultiSearch/MultiSearchInvalidApiTests.cs
@@ -11,28 +11,15 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.MultiSearch
 {
-	public class MultiSearchInvalidApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IMultiSearchResponse, IMultiSearchRequest, MultiSearchDescriptor, MultiSearchRequest>
+	public class MultiSearchInvalidApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiSearchResponse, IMultiSearchRequest, MultiSearchDescriptor, MultiSearchRequest>
 	{
 		public MultiSearchInvalidApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.MultiSearch(f),
-			fluentAsync: (c, f) => c.MultiSearchAsync(f),
-			request: (c, r) => c.MultiSearch(r),
-			requestAsync: (c, r) => c.MultiSearchAsync(r)
-		);
-
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => false; //2 out of the three searches are not valid
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/project/doc/_msearch";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new object[]
 		{
@@ -44,23 +31,45 @@ protected override LazyResponses ClientUsage() => Calls(
 			new { query = new { match_all = new { } } }
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<MultiSearchDescriptor, IMultiSearchRequest> Fluent => ms => ms
 			.Index(typeof(Project))
 			.Type(typeof(Project))
 			.Search<Project>(s => s.Query(q => q.MatchAll()).From(0).Size(10))
 			.Search<Project>(s => s.Index("otherindex").Query(q => q.Match(m => m.Field(p => p.Name).Query("nest"))))
-			.Search<Project>(s => s.Index("otherindex").Type("othertype").SearchType(SearchType.DfsQueryThenFetch).Query(q=>q.MatchAll()));
+			.Search<Project>(s => s.Index("otherindex").Type("othertype").SearchType(SearchType.DfsQueryThenFetch).Query(q => q.MatchAll()));
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override MultiSearchRequest Initializer => new MultiSearchRequest(typeof(Project), typeof(Project))
 		{
 			Operations = new Dictionary<string, ISearchRequest>
 			{
 				{ "s1", new SearchRequest<Project> { From = 0, Size = 10, Query = new QueryContainer(new MatchAllQuery()) } },
-				{ "s2", new SearchRequest<Project>("otherindex", typeof(Project)) { Query = new QueryContainer(new MatchQuery { Field = "name", Query = "nest" }) } },
-				{ "s3", new SearchRequest<Project>("otherindex", "othertype") { SearchType = SearchType.DfsQueryThenFetch, Query = new QueryContainer(new MatchAllQuery()) } },
+				{
+					"s2",
+					new SearchRequest<Project>("otherindex", typeof(Project))
+						{ Query = new QueryContainer(new MatchQuery { Field = "name", Query = "nest" }) }
+				},
+				{
+					"s3",
+					new SearchRequest<Project>("otherindex", "othertype")
+						{ SearchType = SearchType.DfsQueryThenFetch, Query = new QueryContainer(new MatchAllQuery()) }
+				},
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => "/project/doc/_msearch";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.MultiSearch(f),
+			(c, f) => c.MultiSearchAsync(f),
+			(c, r) => c.MultiSearch(r),
+			(c, r) => c.MultiSearchAsync(r)
+		);
+
 		[I] public Task AssertResponse() => AssertOnAllResponses(r =>
 		{
 			r.TotalResponses.Should().Be(3);
@@ -68,14 +77,14 @@ [I] public Task AssertResponse() => AssertOnAllResponses(r =>
 			/** GetResponses also returns invalid requests **/
 			var responses = r.GetResponses<Project>().ToList();
 			responses.First().ShouldBeValid();
-			this.AssertInvalidResponse(responses[1]);
-			this.AssertInvalidResponse(responses[2]);
+			AssertInvalidResponse(responses[1]);
+			AssertInvalidResponse(responses[2]);
 
 			/** GetInvalidResponses returns all the invalid responses as IResponse **/
 			var invalidResponses = r.GetInvalidResponses();
 			invalidResponses.Should().NotBeNull().And.HaveCount(2);
-			foreach(var response in invalidResponses)
-				this.AssertInvalidResponse(response);
+			foreach (var response in invalidResponses)
+				AssertInvalidResponse(response);
 		});
 
 		private void AssertInvalidResponse(IResponse searchResponse)
diff --git a/src/Tests/Tests/Search/MultiSearch/MultiSearchLowLevelPostDataTests.cs b/src/Tests/Tests/Search/MultiSearch/MultiSearchLowLevelPostDataTests.cs
index bfb2f958657..c22a1326370 100644
--- a/src/Tests/Tests/Search/MultiSearch/MultiSearchLowLevelPostDataTests.cs
+++ b/src/Tests/Tests/Search/MultiSearch/MultiSearchLowLevelPostDataTests.cs
@@ -1,14 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Elastic.Xunit.Sdk;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using Xunit;
 
 namespace Tests.Search.MultiSearch
@@ -17,61 +15,58 @@ public class MultiSearchLowLevelPostDataTests : IClusterFixture<ReadOnlyCluster>
 	{
 		private readonly IElasticClient _client;
 
-		public MultiSearchLowLevelPostDataTests(ReadOnlyCluster cluster, EndpointUsage usage)
-		{
-			_client = cluster.Client;
-		}
+		public MultiSearchLowLevelPostDataTests(ReadOnlyCluster cluster, EndpointUsage usage) => _client = cluster.Client;
 
 		protected static List<object> Search => new object[]
 		{
-			new {},
-			new { from = 0, size = 10, query = new { match_all = new {} } },
+			new { },
+			new { from = 0, size = 10, query = new { match_all = new { } } },
 			new { search_type = "query_then_fetch" },
-			new {},
+			new { },
 			new { index = "devs", type = "developer" },
-			new { from = 0, size = 5, query = new { match_all = new {} } },
+			new { from = 0, size = 5, query = new { match_all = new { } } },
 			new { index = "devs", type = "developer" },
-			new { from = 0, size = 5, query = new { match_all = new {} } }
+			new { from = 0, size = 5, query = new { match_all = new { } } }
 		}.ToList();
 
 
 		[I] public void PostEnumerableOfObjects()
 		{
-			var response = this._client.LowLevel.Msearch<DynamicResponse>("project", "project", PostData.MultiJson(Search));
+			var response = _client.LowLevel.Msearch<DynamicResponse>("project", "project", PostData.MultiJson(Search));
 			AssertResponse(response);
 		}
 
 		[I] public void PostEnumerableOfStrings()
 		{
 			var listOfStrings = Search
-				.Select(s => this._client.RequestResponseSerializer.SerializeToString(s, SerializationFormatting.None))
+				.Select(s => _client.RequestResponseSerializer.SerializeToString(s, SerializationFormatting.None))
 				.ToList();
 
-			var response = this._client.LowLevel.Msearch<DynamicResponse>("project", "project", PostData.MultiJson(listOfStrings));
+			var response = _client.LowLevel.Msearch<DynamicResponse>("project", "project", PostData.MultiJson(listOfStrings));
 			AssertResponse(response);
 		}
 
 		[I] public void PostString()
 		{
 			var str = Search
-				.Select(s => this._client.RequestResponseSerializer.SerializeToString(s, SerializationFormatting.None))
+				.Select(s => _client.RequestResponseSerializer.SerializeToString(s, SerializationFormatting.None))
 				.ToList()
 				.Aggregate(new StringBuilder(), (sb, s) => sb.Append(s + "\n"), sb => sb.ToString());
 
-			var response = this._client.LowLevel.Msearch<DynamicResponse>("project", "project", str);
+			var response = _client.LowLevel.Msearch<DynamicResponse>("project", "project", str);
 			AssertResponse(response);
 		}
 
 		[I] public void PostByteArray()
 		{
 			var str = Search
-				.Select(s => this._client.RequestResponseSerializer.SerializeToString(s, SerializationFormatting.None))
+				.Select(s => _client.RequestResponseSerializer.SerializeToString(s, SerializationFormatting.None))
 				.ToList()
 				.Aggregate(new StringBuilder(), (sb, s) => sb.Append(s + "\n"), sb => sb.ToString());
 
 			var bytes = Encoding.UTF8.GetBytes(str);
 
-			var response = this._client.LowLevel.Msearch<DynamicResponse>("project", "project", bytes);
+			var response = _client.LowLevel.Msearch<DynamicResponse>("project", "project", bytes);
 			AssertResponse(response);
 		}
 
@@ -96,7 +91,6 @@ private static void AssertResponse(DynamicResponse response)
 //			JArray responses = r.responses;
 //
 //			responses.Count().Should().Be(4);
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Search/MultiSearch/MultiSearchTemplate/MultiSearchTemplateApiTests.cs b/src/Tests/Tests/Search/MultiSearch/MultiSearchTemplate/MultiSearchTemplateApiTests.cs
index 1c493880dba..605845422df 100644
--- a/src/Tests/Tests/Search/MultiSearch/MultiSearchTemplate/MultiSearchTemplateApiTests.cs
+++ b/src/Tests/Tests/Search/MultiSearch/MultiSearchTemplate/MultiSearchTemplateApiTests.cs
@@ -9,38 +9,28 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.MultiSearch.MultiSearchTemplate
 {
 	public class MultiSearchTemplateApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiSearchResponse, IMultiSearchTemplateRequest, MultiSearchTemplateDescriptor, MultiSearchTemplateRequest>
+		: ApiIntegrationTestBase<ReadOnlyCluster, IMultiSearchResponse, IMultiSearchTemplateRequest, MultiSearchTemplateDescriptor,
+			MultiSearchTemplateRequest>
 	{
 		public MultiSearchTemplateApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.MultiSearchTemplate(f),
-			fluentAsync: (c, f) => c.MultiSearchTemplateAsync(f),
-			request: (c, r) => c.MultiSearchTemplate(r),
-			requestAsync: (c, r) => c.MultiSearchTemplateAsync(r)
-		);
-
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => false;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => "/project/doc/_msearch/template";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new object[]
 		{
-			new {},
+			new { },
 			new { @params = new { state = "Stable" }, source = "{\"query\": {\"match\":  {\"state\" : \"{{state}}\" }}}" },
 			new { index = "devs" },
-			new { id = "template-id"},
-			new { index = "devs"},
+			new { id = "template-id" },
+			new { index = "devs" },
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<MultiSearchTemplateDescriptor, IMultiSearchTemplateRequest> Fluent => ms => ms
 			.Index(typeof(Project))
 			.Type(typeof(Project))
@@ -52,11 +42,14 @@ protected override LazyResponses ClientUsage() => Calls(
 			)
 			.Template<Project>("id", s => s.Index("devs").Id("template-id"));
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override MultiSearchTemplateRequest Initializer => new MultiSearchTemplateRequest(typeof(Project), typeof(Project))
 		{
 			Operations = new Dictionary<string, ISearchTemplateRequest>
 			{
-				{ "inline", new SearchTemplateRequest<Project>(typeof(Project))
+				{
+					"inline", new SearchTemplateRequest<Project>(typeof(Project))
 					{
 						Source = "{\"query\": {\"match\":  {\"state\" : \"{{state}}\" }}}",
 						Params = new Dictionary<string, object>
@@ -69,6 +62,16 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => "/project/doc/_msearch/template";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.MultiSearchTemplate(f),
+			(c, f) => c.MultiSearchTemplateAsync(f),
+			(c, r) => c.MultiSearchTemplate(r),
+			(c, r) => c.MultiSearchTemplateAsync(r)
+		);
+
 		protected override void ExpectResponse(IMultiSearchResponse response)
 		{
 			var inline = response.GetResponse<Project>("inline");
diff --git a/src/Tests/Tests/Search/MultiSearch/MultiSearchTemplate/MultiSearchTemplateUrlTests.cs b/src/Tests/Tests/Search/MultiSearch/MultiSearchTemplate/MultiSearchTemplateUrlTests.cs
index 97ad1996e0e..7b2f7a0b70b 100644
--- a/src/Tests/Tests/Search/MultiSearch/MultiSearchTemplate/MultiSearchTemplateUrlTests.cs
+++ b/src/Tests/Tests/Search/MultiSearch/MultiSearchTemplate/MultiSearchTemplateUrlTests.cs
@@ -14,24 +14,24 @@ [U] public async Task Urls()
 			var index = "indexx";
 
 			await POST($"/_msearch/template")
-				.Fluent(c=>c.MultiSearchTemplate(s=>s))
-				.Request(c=>c.MultiSearchTemplate(new MultiSearchTemplateRequest()))
-				.FluentAsync(c=>c.MultiSearchTemplateAsync(s=> s))
-				.RequestAsync(c=>c.MultiSearchTemplateAsync(new MultiSearchTemplateRequest()))
+					.Fluent(c => c.MultiSearchTemplate(s => s))
+					.Request(c => c.MultiSearchTemplate(new MultiSearchTemplateRequest()))
+					.FluentAsync(c => c.MultiSearchTemplateAsync(s => s))
+					.RequestAsync(c => c.MultiSearchTemplateAsync(new MultiSearchTemplateRequest()))
 				;
 
 			await POST($"/{index}/_msearch/template")
-				.Fluent(c=>c.MultiSearchTemplate(s=>s.Index(index)))
-				.Request(c=>c.MultiSearchTemplate(new MultiSearchTemplateRequest(index)))
-				.FluentAsync(c=>c.MultiSearchTemplateAsync(s=> s.Index(index)))
-				.RequestAsync(c=>c.MultiSearchTemplateAsync(new MultiSearchTemplateRequest(index)))
+					.Fluent(c => c.MultiSearchTemplate(s => s.Index(index)))
+					.Request(c => c.MultiSearchTemplate(new MultiSearchTemplateRequest(index)))
+					.FluentAsync(c => c.MultiSearchTemplateAsync(s => s.Index(index)))
+					.RequestAsync(c => c.MultiSearchTemplateAsync(new MultiSearchTemplateRequest(index)))
 				;
 
 			await POST($"/{index}/doc/_msearch/template")
-				.Fluent(c=>c.MultiSearchTemplate(s=>s.Index(index).Type<CommitActivity>()))
-				.Request(c=>c.MultiSearchTemplate(new MultiSearchTemplateRequest(index, TypeName.From<CommitActivity>())))
-				.FluentAsync(c=>c.MultiSearchTemplateAsync(s=> s.Index(index).Type(typeof(CommitActivity))))
-				.RequestAsync(c=>c.MultiSearchTemplateAsync(new MultiSearchTemplateRequest(index, typeof(CommitActivity))))
+					.Fluent(c => c.MultiSearchTemplate(s => s.Index(index).Type<CommitActivity>()))
+					.Request(c => c.MultiSearchTemplate(new MultiSearchTemplateRequest(index, TypeName.From<CommitActivity>())))
+					.FluentAsync(c => c.MultiSearchTemplateAsync(s => s.Index(index).Type(typeof(CommitActivity))))
+					.RequestAsync(c => c.MultiSearchTemplateAsync(new MultiSearchTemplateRequest(index, typeof(CommitActivity))))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/MultiSearch/MultiSearchUrlTests.cs b/src/Tests/Tests/Search/MultiSearch/MultiSearchUrlTests.cs
index b460a1f4222..b9b88cc7e08 100644
--- a/src/Tests/Tests/Search/MultiSearch/MultiSearchUrlTests.cs
+++ b/src/Tests/Tests/Search/MultiSearch/MultiSearchUrlTests.cs
@@ -13,24 +13,24 @@ [U] public async Task Urls()
 		{
 			var index = "indexx";
 			await POST($"/_msearch")
-				.Fluent(c=>c.MultiSearch(s=>s))
-				.Request(c=>c.MultiSearch(new MultiSearchRequest()))
-				.FluentAsync(c=>c.MultiSearchAsync(s=> s))
-				.RequestAsync(c=>c.MultiSearchAsync(new MultiSearchRequest()))
+					.Fluent(c => c.MultiSearch(s => s))
+					.Request(c => c.MultiSearch(new MultiSearchRequest()))
+					.FluentAsync(c => c.MultiSearchAsync(s => s))
+					.RequestAsync(c => c.MultiSearchAsync(new MultiSearchRequest()))
 				;
 
 			await POST($"/{index}/_msearch")
-				.Fluent(c=>c.MultiSearch(s=>s.Index(index)))
-				.Request(c=>c.MultiSearch(new MultiSearchRequest(index)))
-				.FluentAsync(c=>c.MultiSearchAsync(s=> s.Index(index)))
-				.RequestAsync(c=>c.MultiSearchAsync(new MultiSearchRequest(index)))
+					.Fluent(c => c.MultiSearch(s => s.Index(index)))
+					.Request(c => c.MultiSearch(new MultiSearchRequest(index)))
+					.FluentAsync(c => c.MultiSearchAsync(s => s.Index(index)))
+					.RequestAsync(c => c.MultiSearchAsync(new MultiSearchRequest(index)))
 				;
 
 			await POST($"/{index}/doc/_msearch")
-				.Fluent(c=>c.MultiSearch(s=>s.Index(index).Type<CommitActivity>()))
-				.Request(c=>c.MultiSearch(new MultiSearchRequest(index, TypeName.From<CommitActivity>())))
-				.FluentAsync(c=>c.MultiSearchAsync(s=> s.Index(index).Type(typeof(CommitActivity))))
-				.RequestAsync(c=>c.MultiSearchAsync(new MultiSearchRequest(index, typeof(CommitActivity))))
+					.Fluent(c => c.MultiSearch(s => s.Index(index).Type<CommitActivity>()))
+					.Request(c => c.MultiSearch(new MultiSearchRequest(index, TypeName.From<CommitActivity>())))
+					.FluentAsync(c => c.MultiSearchAsync(s => s.Index(index).Type(typeof(CommitActivity))))
+					.RequestAsync(c => c.MultiSearchAsync(new MultiSearchRequest(index, typeof(CommitActivity))))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/Request/ExplainUsageTests.cs b/src/Tests/Tests/Search/Request/ExplainUsageTests.cs
index 1c5a3d0b705..043cd96256d 100644
--- a/src/Tests/Tests/Search/Request/ExplainUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/ExplainUsageTests.cs
@@ -6,9 +6,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
@@ -31,7 +29,7 @@ public ExplainUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage
 			new SearchRequest<Project> { Explain = true };
 
 		[I]
-		protected async Task ExplanationIsSetOnHits() => await this.AssertOnAllResponses(r =>
+		protected async Task ExplanationIsSetOnHits() => await AssertOnAllResponses(r =>
 		{
 			r.Hits.Should().NotBeEmpty();
 			r.Hits.Should().NotContain(hit => hit.Explanation == null);
diff --git a/src/Tests/Tests/Search/Request/FieldsUsageTests.cs b/src/Tests/Tests/Search/Request/FieldsUsageTests.cs
index 0c5bfcd8098..90e61b2c1e3 100644
--- a/src/Tests/Tests/Search/Request/FieldsUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/FieldsUsageTests.cs
@@ -6,9 +6,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Search.Request
@@ -53,7 +51,7 @@ public FieldsUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clu
 					p => p.DateString)
 			};
 
-		[I] protected Task FieldsAreReturned() => this.AssertOnAllResponses(r =>
+		[I] protected Task FieldsAreReturned() => AssertOnAllResponses(r =>
 		{
 			r.Fields.Should().NotBeNull();
 			r.Fields.Count().Should().BeGreaterThan(0);
@@ -78,7 +76,8 @@ [I] protected Task FieldsAreReturned() => this.AssertOnAllResponses(r =>
 
 				//Date strings should come out verbatim
 				var dateTimeAsString = fieldValues.ValueOf<Project, string>(p => p.DateString);
-				dateTimeAsString.Should().NotContain("/")
+				dateTimeAsString.Should()
+					.NotContain("/")
 					.And.MatchRegex(@"^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.*$");
 			}
 		});
diff --git a/src/Tests/Tests/Search/Request/FromAndSizeUsageTests.cs b/src/Tests/Tests/Search/Request/FromAndSizeUsageTests.cs
index 96b4610a49f..115ccb032ce 100644
--- a/src/Tests/Tests/Search/Request/FromAndSizeUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/FromAndSizeUsageTests.cs
@@ -3,7 +3,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
@@ -21,15 +20,15 @@ public FromAndSizeUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : bas
 		protected override object ExpectJson =>
 			new { from = 10, size = 12 };
 
+		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.From(10)
+			.Size(12);
+
 		protected override SearchRequest<Project> Initializer =>
 			new SearchRequest<Project>()
 			{
 				From = 10,
 				Size = 12
 			};
-
-		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-				.From(10)
-				.Size(12);
 	}
 }
diff --git a/src/Tests/Tests/Search/Request/HighlightingUsageTests.cs b/src/Tests/Tests/Search/Request/HighlightingUsageTests.cs
index 52ff4e9ca76..b936e7b65f6 100644
--- a/src/Tests/Tests/Search/Request/HighlightingUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/HighlightingUsageTests.cs
@@ -1,17 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Bogus;
-using Nest;
-using Tests.Framework.Integration;
 using FluentAssertions;
-using Newtonsoft.Json.Linq;
+using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
+using Tests.Framework.Integration;
 using Xunit;
-using Tests.Framework;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
@@ -33,7 +29,8 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 			{
 				match = new Dictionary<string, object>
 				{
-					{ "name.standard", new Dictionary<string, object>
+					{
+						"name.standard", new Dictionary<string, object>
 						{
 							{ "query", "Upton Sons Shield Rice Rowe Roberts" }
 						}
@@ -47,28 +44,33 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 				encoder = "html",
 				fields = new Dictionary<string, object>
 				{
-					{ "name.standard", new Dictionary<string, object>
+					{
+						"name.standard", new Dictionary<string, object>
 						{
 							{ "type", "plain" },
-							{ "force_source", true},
+							{ "force_source", true },
 							{ "fragment_size", 150 },
 							{ "fragmenter", "span" },
-							{ "number_of_fragments", 3},
+							{ "number_of_fragments", 3 },
 							{ "no_match_size", 150 }
 						}
 					},
-					{ "leadDeveloper.firstName", new Dictionary<string, object>
+					{
+						"leadDeveloper.firstName", new Dictionary<string, object>
 						{
 							{ "type", "fvh" },
 							{ "phrase_limit", 10 },
 							{ "boundary_max_scan", 50 },
-							{ "pre_tags", new [] { "<name>" } },
-							{ "post_tags", new [] { "</name>" } },
-							{ "highlight_query", new Dictionary<string, object>
+							{ "pre_tags", new[] { "<name>" } },
+							{ "post_tags", new[] { "</name>" } },
+							{
+								"highlight_query", new Dictionary<string, object>
 								{
-									{ "match", new Dictionary<string, object>
+									{
+										"match", new Dictionary<string, object>
 										{
-											{ "leadDeveloper.firstName", new Dictionary<string, object>
+											{
+												"leadDeveloper.firstName", new Dictionary<string, object>
 												{
 													{ "query", "Kurt Edgardo Naomi Dariana Justice Felton" }
 												}
@@ -79,16 +81,20 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 							}
 						}
 					},
-					{ "leadDeveloper.lastName", new Dictionary<string, object>
+					{
+						"leadDeveloper.lastName", new Dictionary<string, object>
 						{
 							{ "type", "unified" },
-							{ "pre_tags", new [] { "<name>" } },
-							{ "post_tags", new [] { "</name>" } },
-							{ "highlight_query", new Dictionary<string, object>
+							{ "pre_tags", new[] { "<name>" } },
+							{ "post_tags", new[] { "</name>" } },
+							{
+								"highlight_query", new Dictionary<string, object>
 								{
-									{ "match", new Dictionary<string, object>
+									{
+										"match", new Dictionary<string, object>
 										{
-											{ "leadDeveloper.lastName", new Dictionary<string, object>
+											{
+												"leadDeveloper.lastName", new Dictionary<string, object>
 												{
 													{ "query", LastNameSearch }
 												}
@@ -165,7 +171,8 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 					Encoder = HighlighterEncoder.Html,
 					Fields = new Dictionary<Field, IHighlightField>
 					{
-						{ "name.standard", new HighlightField
+						{
+							"name.standard", new HighlightField
 							{
 								Type = HighlighterType.Plain,
 								ForceSource = true,
@@ -175,13 +182,14 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 								NoMatchSize = 150
 							}
 						},
-						{ "leadDeveloper.firstName", new HighlightField
+						{
+							"leadDeveloper.firstName", new HighlightField
 							{
 								Type = "fvh",
 								PhraseLimit = 10,
 								BoundaryMaxScan = 50,
-								PreTags = new[] { "<name>"},
-								PostTags = new[] { "</name>"},
+								PreTags = new[] { "<name>" },
+								PostTags = new[] { "</name>" },
 								HighlightQuery = new MatchQuery
 								{
 									Field = "leadDeveloper.firstName",
@@ -189,11 +197,12 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 								}
 							}
 						},
-						{ "leadDeveloper.lastName", new HighlightField
+						{
+							"leadDeveloper.lastName", new HighlightField
 							{
 								Type = HighlighterType.Unified,
-								PreTags = new[] { "<name>"},
-								PostTags = new[] { "</name>"},
+								PreTags = new[] { "<name>" },
+								PostTags = new[] { "</name>" },
 								HighlightQuery = new MatchQuery
 								{
 									Field = "leadDeveloper.lastName",
@@ -209,7 +218,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			response.ShouldBeValid();
 
-			foreach (var highlightsInEachHit in response.Hits.Select(d=>d.Highlights))
+			foreach (var highlightsInEachHit in response.Hits.Select(d => d.Highlights))
 			{
 				foreach (var highlightField in highlightsInEachHit)
 				{
@@ -238,9 +247,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 						}
 					}
 					else
-					{
 						Assert.True(false, $"highlights contains unexpected key {highlightField.Key}");
-					}
 				}
 			}
 		}
diff --git a/src/Tests/Tests/Search/Request/IndicesBoostSerializationTests.cs b/src/Tests/Tests/Search/Request/IndicesBoostSerializationTests.cs
index d91103c1437..05b37644586 100644
--- a/src/Tests/Tests/Search/Request/IndicesBoostSerializationTests.cs
+++ b/src/Tests/Tests/Search/Request/IndicesBoostSerializationTests.cs
@@ -4,7 +4,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Client;
-using Tests.Framework;
 
 namespace Tests.Search.Request
 {
@@ -19,7 +18,7 @@ [U] public void CanDeserializeArrayFormat()
 				var searchRequest = TestClient.Default.RequestResponseSerializer.Deserialize<SearchRequest>(stream);
 
 				searchRequest.Should().NotBeNull();
-				searchRequest.IndicesBoost.Should().NotBeNull().And.ContainKeys((IndexName) "project", (IndexName) "devs");
+				searchRequest.IndicesBoost.Should().NotBeNull().And.ContainKeys((IndexName)"project", (IndexName)"devs");
 			}
 		}
 
@@ -32,7 +31,7 @@ [U] public void CanDeserializeObjectFormat()
 				var searchRequest = TestClient.Default.RequestResponseSerializer.Deserialize<SearchRequest>(stream);
 
 				searchRequest.Should().NotBeNull();
-				searchRequest.IndicesBoost.Should().NotBeNull().And.ContainKeys((IndexName) "project", (IndexName) "devs");
+				searchRequest.IndicesBoost.Should().NotBeNull().And.ContainKeys((IndexName)"project", (IndexName)"devs");
 			}
 		}
 	}
diff --git a/src/Tests/Tests/Search/Request/IndicesBoostUsageTests.cs b/src/Tests/Tests/Search/Request/IndicesBoostUsageTests.cs
index 69bbaa39a52..8ee45fbe160 100644
--- a/src/Tests/Tests/Search/Request/IndicesBoostUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/IndicesBoostUsageTests.cs
@@ -4,7 +4,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
@@ -14,13 +13,14 @@ public IndicesBoostUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 
 		protected override object ExpectJson => new
 		{
-			indices_boost = new object[] {
+			indices_boost = new object[]
+			{
 				new { project = 1.4 },
 				new { devs = 1.3 }
 			},
 			query = new
 			{
-				match_all = new {}
+				match_all = new { }
 			}
 		};
 
diff --git a/src/Tests/Tests/Search/Request/InnerHitsUsageTests.cs b/src/Tests/Tests/Search/Request/InnerHitsUsageTests.cs
index 965de3e57df..4bd8968940b 100644
--- a/src/Tests/Tests/Search/Request/InnerHitsUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/InnerHitsUsageTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using Bogus;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -11,7 +10,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Search.Request
@@ -19,8 +17,8 @@ namespace Tests.Search.Request
 	//hide
 	public interface IRoyal
 	{
-		string Name { get; set; }
 		JoinField Join { get; set; }
+		string Name { get; set; }
 	}
 
 	[ElasticsearchType(IdProperty = nameof(Name))]
@@ -29,6 +27,14 @@ public abstract class RoyalBase<TRoyal> : IRoyal
 	{
 		protected static int IdState = 0;
 
+		public static Faker<TRoyal> Generator { get; } =
+			new Faker<TRoyal>()
+				.UseSeed(GenerationSeed())
+				.RuleFor(p => p.Name, f => f.Person.Company.Name + IdState++);
+
+		public virtual JoinField Join { get; set; }
+		public string Name { get; set; }
+
 		protected static int GenerationSeed()
 		{
 			unchecked
@@ -49,58 +55,50 @@ protected static int GenerationSeed()
 				return seed;
 			}
 		}
-
-		public virtual JoinField Join { get; set; }
-		public string Name { get; set; }
-
-		public static Faker<TRoyal> Generator { get; } =
-			new Faker<TRoyal>()
-				.UseSeed(GenerationSeed())
-				.RuleFor(p => p.Name, f => f.Person.Company.Name + IdState++);
 	}
 
 	public abstract class RoyalBase<TRoyal, TSubject> : RoyalBase<TRoyal>
 		where TRoyal : class, IRoyal
-		where TSubject : class, IRoyal
-	{
-	}
+		where TSubject : class, IRoyal { }
 
 	public class King : RoyalBase<King>
 	{
-		public override JoinField Join { get; set; } = JoinField.Root<King>();
 		public List<King> Foes { get; set; }
+		public override JoinField Join { get; set; } = JoinField.Root<King>();
 	}
 
 	public class Prince : RoyalBase<Prince>
 	{
 		public string FullTextField { get; set; } = "default full text field text";
 	}
+
 	public class Duke : RoyalBase<Duke> { }
+
 	public class Earl : RoyalBase<Earl> { }
+
 	public class Baron : RoyalBase<Baron> { }
 
 	//hide
 	public class RoyalSeeder
 	{
+		public static readonly string RoyalType = "royal";
 		private readonly IElasticClient _client;
 		private readonly IndexName _index;
 
 		public RoyalSeeder(IElasticClient client, IndexName index)
 		{
-			this._client = client;
-			this._index = index;
+			_client = client;
+			_index = index;
 		}
 
-		public static readonly string RoyalType = "royal";
-
-		private string AliasFor<TRoyal>() where TRoyal : IRoyal => $"{this._index}-{typeof(TRoyal).Name.ToLowerInvariant()}";
+		private string AliasFor<TRoyal>() where TRoyal : IRoyal => $"{_index}-{typeof(TRoyal).Name.ToLowerInvariant()}";
 
 		private IAlias AliasFilterFor<TRoyal>(AliasDescriptor a) where TRoyal : class, IRoyal =>
-			a.Filter<TRoyal>(f => f.Term(p => p.Join, Infer.Relation<TRoyal>()));
+			a.Filter<TRoyal>(f => f.Term(p => p.Join, Relation<TRoyal>()));
 
 		public void Seed()
 		{
-			var create = this._client.CreateIndex(_index, c => c
+			var create = _client.CreateIndex(_index, c => c
 				.Settings(s => s
 					.NumberOfReplicas(0)
 					.NumberOfShards(1)
@@ -134,17 +132,19 @@ public void Seed()
 			var kings = King.Generator.Generate(2)
 				.Select(k =>
 				{
-					var foes = King.Generator.Generate(2).Select(f =>
-					{
-						f.Join = null;
-						return f;
-					}).ToList();
+					var foes = King.Generator.Generate(2)
+						.Select(f =>
+						{
+							f.Join = null;
+							return f;
+						})
+						.ToList();
 					k.Foes = foes;
 					return k;
 				});
 
 			var bulk = new BulkDescriptor();
-			IndexAll(bulk, () => kings, indexChildren: king =>
+			IndexAll(bulk, () => kings, king =>
 				IndexAll(bulk, () => Prince.Generator.Generate(2), king, prince =>
 					IndexAll(bulk, () => Duke.Generator.Generate(3), prince, duke =>
 						IndexAll(bulk, () => Earl.Generator.Generate(5), duke, earl =>
@@ -153,8 +153,8 @@ public void Seed()
 					)
 				)
 			);
-			this._client.Bulk(bulk);
-			this._client.Refresh(this._index);
+			_client.Bulk(bulk);
+			_client.Refresh(_index);
 		}
 
 
@@ -166,7 +166,8 @@ private void IndexAll<TRoyal>(BulkDescriptor bulk, Func<IEnumerable<TRoyal>> cre
 			IndexAll<TRoyal, TRoyal>(bulk, create, null, indexChildren);
 
 		private void IndexAll<TRoyal, TParent>(BulkDescriptor bulk, Func<IEnumerable<TRoyal>> create, TParent parent = null,
-			Action<TRoyal> indexChildren = null)
+			Action<TRoyal> indexChildren = null
+		)
 			where TRoyal : class, IRoyal
 			where TParent : class, IRoyal
 		{
@@ -181,6 +182,7 @@ private void IndexAll<TRoyal, TParent>(BulkDescriptor bulk, Func<IEnumerable<TRo
 				bulk.Index<TRoyal>(i => i.Document(royal1).Index(_index).Type(RoyalType).Routing(parent == null ? royal.Name : parent.Name));
 			}
 			if (indexChildren == null) return;
+
 			foreach (var royal in royals)
 				indexChildren(royal);
 		}
@@ -205,29 +207,29 @@ private void IndexAll<TRoyal, TParent>(BulkDescriptor bulk, Func<IEnumerable<TRo
 	*
 	* See the Elasticsearch documentation on {ref_current}/search-request-inner-hits.html[Inner hits] for more detail.
 	*/
-	public abstract class InnerHitsApiTestsBase<TRoyal> : ApiIntegrationTestBase<IntrusiveOperationCluster, ISearchResponse<TRoyal>,
-		ISearchRequest, SearchDescriptor<TRoyal>, SearchRequest<TRoyal>>
+	public abstract class InnerHitsApiTestsBase<TRoyal>
+		: ApiIntegrationTestBase<IntrusiveOperationCluster, ISearchResponse<TRoyal>,
+			ISearchRequest, SearchDescriptor<TRoyal>, SearchRequest<TRoyal>>
 		where TRoyal : class, IRoyal
 	{
-		protected InnerHitsApiTestsBase(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		protected abstract IndexName Index { get; }
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values) => new RoyalSeeder(this.Client, Index).Seed();
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Search<TRoyal>(f),
-			fluentAsync: (client, f) => client.SearchAsync<TRoyal>(f),
-			request: (client, r) => client.Search<TRoyal>(r),
-			requestAsync: (client, r) => client.SearchAsync<TRoyal>(r)
-		);
+		protected InnerHitsApiTestsBase(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected abstract IndexName Index { get; }
 		protected override string UrlPath => $"/{Index}/{RoyalSeeder.RoyalType}/_search";
 
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values) => new RoyalSeeder(Client, Index).Seed();
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Search<TRoyal>(f),
+			(client, f) => client.SearchAsync<TRoyal>(f),
+			(client, r) => client.Search<TRoyal>(r),
+			(client, r) => client.SearchAsync<TRoyal>(r)
+		);
+
 		protected override SearchDescriptor<TRoyal> NewDescriptor() => new SearchDescriptor<TRoyal>().Index(Index);
 	}
 
@@ -236,12 +238,7 @@ protected override LazyResponses ClientUsage() => Calls(
 	*/
 	public class QueryInnerHitsApiTests : InnerHitsApiTestsBase<King>
 	{
-		public QueryInnerHitsApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		private static IndexName IndexName { get; } = RandomString();
-		protected override IndexName Index => QueryInnerHitsApiTests.IndexName;
+		public QueryInnerHitsApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -263,7 +260,7 @@ public QueryInnerHitsApiTests(IntrusiveOperationCluster cluster, EndpointUsage u
 								inner_hits = new
 								{
 									name = "princes",
-									docvalue_fields = new []{"name"},
+									docvalue_fields = new[] { "name" },
 									highlight = new
 									{
 										fields = new { fullTextField = new { } }
@@ -295,13 +292,12 @@ public QueryInnerHitsApiTests(IntrusiveOperationCluster cluster, EndpointUsage u
 				q.HasChild<Prince>(hc => hc
 					.Query(hcq => hcq.Match(m => m.Field(p => p.FullTextField).Query("default")))
 					.InnerHits(ih => ih
-						.DocValueFields(f=>f.Field(p=>p.Name))
+						.DocValueFields(f => f.Field(p => p.Name))
 						.Name("princes")
-						.Highlight(h=>h.Fields(f=>f.Field(p=>p.FullTextField)))
+						.Highlight(h => h.Fields(f => f.Field(p => p.FullTextField)))
 						.IgnoreUnmapped(false)
 						.Version()
 					)
-
 				) || q.Nested(n => n
 					.Path(p => p.Foes)
 					.Query(nq => nq.MatchAll())
@@ -310,17 +306,19 @@ public QueryInnerHitsApiTests(IntrusiveOperationCluster cluster, EndpointUsage u
 			)
 			.Version();
 
+		protected override IndexName Index => IndexName;
+
 		protected override SearchRequest<King> Initializer => new SearchRequest<King>(Index, RoyalSeeder.RoyalType)
 		{
 			Query = new HasChildQuery
 			{
 				Type = typeof(Prince),
-				Query = new MatchQuery { Field = Field<Prince>(p=>p.FullTextField), Query = "default" },
+				Query = new MatchQuery { Field = Field<Prince>(p => p.FullTextField), Query = "default" },
 				InnerHits = new InnerHits
 				{
 					Name = "princes",
-					DocValueFields = Field<Prince>(p=>p.Name),
-					Highlight = Highlight.Field(Field<Prince>(p=>p.FullTextField)),
+					DocValueFields = Field<Prince>(p => p.Name),
+					Highlight = Highlight.Field(Field<Prince>(p => p.FullTextField)),
 					IgnoreUnmapped = false,
 					Version = true
 				}
@@ -336,6 +334,8 @@ public QueryInnerHitsApiTests(IntrusiveOperationCluster cluster, EndpointUsage u
 			Version = true
 		};
 
+		private static IndexName IndexName { get; } = RandomString();
+
 		protected override void ExpectResponse(ISearchResponse<King> response)
 		{
 			response.Hits.Should().NotBeEmpty();
@@ -353,11 +353,12 @@ protected override void ExpectResponse(ISearchResponse<King> response)
 					highlights.Should().NotBeNull("princes should have highlights");
 					highlights.Should().ContainKey("fullTextField", "we are highlighting this field");
 					var hl = highlights["fullTextField"];
-					hl.Highlights.Should().NotBeEmpty("all docs have the same text so should all highlight")
+					hl.Highlights.Should()
+						.NotBeEmpty("all docs have the same text so should all highlight")
 						.And.Contain(s => s.Contains("<em>default</em>"), "default to be highlighted as its part of the query");
 
 					princeHit.Fields.Should().NotBeNull("all princes have a keyword name so fields should be returned");
-					var docValueName = princeHit.Fields.ValueOf<Prince, string>(p=>p.Name);
+					var docValueName = princeHit.Fields.ValueOf<Prince, string>(p => p.Name);
 					docValueName.Should().NotBeNullOrWhiteSpace("value of name on Fields");
 
 					princeHit.Version?.Should().Be(1);
diff --git a/src/Tests/Tests/Search/Request/MinScoreUsageTests.cs b/src/Tests/Tests/Search/Request/MinScoreUsageTests.cs
index 0229a40ec1e..05276c1e4c9 100644
--- a/src/Tests/Tests/Search/Request/MinScoreUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/MinScoreUsageTests.cs
@@ -3,7 +3,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
diff --git a/src/Tests/Tests/Search/Request/PostFilterUsageTests.cs b/src/Tests/Tests/Search/Request/PostFilterUsageTests.cs
index 5dadfd261ad..4b7ace9deb6 100644
--- a/src/Tests/Tests/Search/Request/PostFilterUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/PostFilterUsageTests.cs
@@ -5,9 +5,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
@@ -18,6 +16,9 @@ public PostFilterUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base
 		protected override object ExpectJson =>
 			new { post_filter = new { match_all = new { } } };
 
+		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.PostFilter(f => f.MatchAll());
+
 
 		protected override SearchRequest<Project> Initializer =>
 			new SearchRequest<Project>()
@@ -25,13 +26,7 @@ public PostFilterUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base
 				PostFilter = new QueryContainer(new MatchAllQuery())
 			};
 
-		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-			.PostFilter(f => f.MatchAll());
-
 		[I]
-		public async Task ShouldHaveHits() => await AssertOnAllResponses((r) =>
-		{
-			r.Hits.Should().NotBeNull();
-		});
+		public async Task ShouldHaveHits() => await AssertOnAllResponses((r) => { r.Hits.Should().NotBeNull(); });
 	}
 }
diff --git a/src/Tests/Tests/Search/Request/ProfileUsageTests.cs b/src/Tests/Tests/Search/Request/ProfileUsageTests.cs
index a454243a38e..19a636e83aa 100644
--- a/src/Tests/Tests/Search/Request/ProfileUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/ProfileUsageTests.cs
@@ -6,9 +6,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
diff --git a/src/Tests/Tests/Search/Request/QueryUsageTests.cs b/src/Tests/Tests/Search/Request/QueryUsageTests.cs
index 25e570ff6ce..befeb8c14a3 100644
--- a/src/Tests/Tests/Search/Request/QueryUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/QueryUsageTests.cs
@@ -3,7 +3,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
@@ -31,6 +30,5 @@ public QueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clus
 					Value = "elasticsearch"
 				}
 			};
-
 	}
 }
diff --git a/src/Tests/Tests/Search/Request/ScriptFieldsUsageTests.cs b/src/Tests/Tests/Search/Request/ScriptFieldsUsageTests.cs
index dd6305cf982..ebc3263bcc8 100644
--- a/src/Tests/Tests/Search/Request/ScriptFieldsUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/ScriptFieldsUsageTests.cs
@@ -3,25 +3,24 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {
-    /**
-     * Allows to return a script evaluation (based on different fields) for each hit.
-     *
-     * Script fields can work on fields that are not stored, and allow to return custom values to
-     * be returned (the evaluated value of the script).
-     *
-     * Script fields can also access the actual `_source` document and extract specific elements to
-     * be returned from it by using `params['_source']`.
-     *
-     * Script fields can be accessed on the response using <<returned-fields,`.Fields`>>, similarly to stored fields.
-     *
-     * See the Elasticsearch documentation on {ref_current}/search-request-script-fields.html[script fields]
-     * for more detail.
-     */
-    public class ScriptFieldsUsageTests : SearchUsageTestBase
+	/**
+	 * Allows to return a script evaluation (based on different fields) for each hit.
+	 *
+	 * Script fields can work on fields that are not stored, and allow to return custom values to
+	 * be returned (the evaluated value of the script).
+	 *
+	 * Script fields can also access the actual `_source` document and extract specific elements to
+	 * be returned from it by using `params['_source']`.
+	 *
+	 * Script fields can be accessed on the response using <<returned-fields,`.Fields`>>, similarly to stored fields.
+	 *
+	 * See the Elasticsearch documentation on {ref_current}/search-request-script-fields.html[script fields]
+	 * for more detail.
+	 */
+	public class ScriptFieldsUsageTests : SearchUsageTestBase
 	{
 		public ScriptFieldsUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
@@ -69,7 +68,8 @@ public ScriptFieldsUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 				ScriptFields = new ScriptFields
 				{
 					{ "test1", new ScriptField { Script = new InlineScript("doc['my_field_name'].value * 2") } },
-					{ "test2", new InlineScript("doc['my_field_name'].value * params.factor")
+					{
+						"test2", new InlineScript("doc['my_field_name'].value * params.factor")
 						{
 							Params = new FluentDictionary<string, object>
 							{
diff --git a/src/Tests/Tests/Search/Request/SearchAfterUsageTests.cs b/src/Tests/Tests/Search/Request/SearchAfterUsageTests.cs
index 725ee84567a..ce186ba7d28 100644
--- a/src/Tests/Tests/Search/Request/SearchAfterUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/SearchAfterUsageTests.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Linq;
-using Nest;
-using Tests.Framework.Integration;
-using static Nest.Infer;
 using System.Collections.Generic;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.Integration;
+using static Nest.Infer;
 
 namespace Tests.Search.Request
 {
@@ -22,7 +20,7 @@ public SearchAfterUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : bas
 					new { numberOfCommits = new { order = "desc" } },
 					new { name = new { order = "desc" } }
 				},
-				search_after = new object []
+				search_after = new object[]
 				{
 					Project.First.NumberOfCommits,
 					Project.First.Name
diff --git a/src/Tests/Tests/Search/Request/SlicedScrollSearchUsageTests.cs b/src/Tests/Tests/Search/Request/SlicedScrollSearchUsageTests.cs
index 3a83be68a98..4ac5b83989d 100644
--- a/src/Tests/Tests/Search/Request/SlicedScrollSearchUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/SlicedScrollSearchUsageTests.cs
@@ -3,30 +3,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using static Nest.Infer;
 
 namespace Tests.Search.Request
 {
 	public class SlicedScrollSearchUsageTests : SearchUsageTestBase
 	{
-
 		public SlicedScrollSearchUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override string UrlPath => "/project/doc/_search?scroll=1m";
-
 		protected override object ExpectJson =>
 			new { slice = new { id = 0, max = 5 } };
 
+		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.Scroll("1m")
+			.Slice(ss => ss.Id(0).Max(5));
+
 		protected override SearchRequest<Project> Initializer =>
 			new SearchRequest<Project>()
 			{
 				Scroll = "1m",
-				Slice = new SlicedScroll {  Id = 0, Max = 5 }
+				Slice = new SlicedScroll { Id = 0, Max = 5 }
 			};
 
-		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-			.Scroll("1m")
-			.Slice(ss=>ss.Id(0).Max(5));
+		protected override string UrlPath => "/project/doc/_search?scroll=1m";
 	}
 }
diff --git a/src/Tests/Tests/Search/Request/SortUsageTests.cs b/src/Tests/Tests/Search/Request/SortUsageTests.cs
index 86c1bcac1c4..0a0d84d89e2 100644
--- a/src/Tests/Tests/Search/Request/SortUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/SortUsageTests.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.Search.Request
@@ -19,14 +16,13 @@ namespace Tests.Search.Request
 	 */
 	public class SortUsageTests : SearchUsageTestBase
 	{
-		public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
+		public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson =>
 			new
 			{
-				sort = new object[] {
+				sort = new object[]
+				{
 					new { startedOn = new { order = "asc" } },
 					new { name = new { order = "desc" } },
 					new { _score = new { order = "desc" } },
@@ -97,7 +93,6 @@ public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clust
 					}
 				}
 			};
-
 #pragma warning disable 618 // uses NestedPath and NestedFilter
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
 			.Sort(ss => ss
@@ -105,7 +100,6 @@ public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clust
 				.Descending(p => p.Name)
 				.Descending(SortSpecialField.Score)
 				.Ascending(SortSpecialField.DocumentIndexOrder)
-
 				.Field(f => f
 					.Field(p => p.Tags.First().Added)
 					.Order(SortOrder.Descending)
@@ -150,13 +144,13 @@ public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clust
 					new SortField { Field = "_doc", Order = SortOrder.Ascending },
 					new SortField
 					{
-						Field = Field<Project>(p=>p.Tags.First().Added),
+						Field = Field<Project>(p => p.Tags.First().Added),
 						Order = SortOrder.Descending,
 						Missing = "_last",
 						UnmappedType = FieldType.Date,
 						Mode = SortMode.Average,
 #pragma warning disable 618
-						NestedPath = Field<Project>(p=>p.Tags),
+						NestedPath = Field<Project>(p => p.Tags),
 						NestedFilter = new MatchAllQuery(),
 #pragma warning restore 618
 					},
@@ -173,7 +167,7 @@ public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clust
 						DistanceType = GeoDistanceType.Arc,
 						GeoUnit = DistanceUnit.Centimeters,
 						Mode = SortMode.Min,
-						Points = new[] {new GeoLocation(70, -70), new GeoLocation(-12, 12)}
+						Points = new[] { new GeoLocation(70, -70), new GeoLocation(-12, 12) }
 					},
 					new ScriptSort
 					{
@@ -183,7 +177,7 @@ public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clust
 						{
 							Params = new Dictionary<string, object>
 							{
-								{"factor", 1.1}
+								{ "factor", 1.1 }
 							}
 						}
 					}
@@ -201,9 +195,7 @@ public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clust
 	[SkipVersion("<6.1.0", "Only available in Elasticsearch 6.1.0+")]
 	public class NestedSortUsageTests : SearchUsageTestBase
 	{
-		public NestedSortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
+		public NestedSortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson =>
 			new
@@ -328,7 +320,7 @@ public GeoDistanceIgnoreUnmappedUsageTests(ReadOnlyCluster cluster, EndpointUsag
 						DistanceType = GeoDistanceType.Arc,
 						GeoUnit = DistanceUnit.Centimeters,
 						Mode = SortMode.Min,
-						Points = new[] {new GeoLocation(70, -70), new GeoLocation(-12, 12)}
+						Points = new[] { new GeoLocation(70, -70), new GeoLocation(-12, 12) }
 					},
 				}
 			};
diff --git a/src/Tests/Tests/Search/Request/SourceFilteringUsageTests.cs b/src/Tests/Tests/Search/Request/SourceFilteringUsageTests.cs
index 9e4117b0e91..b5b39a70894 100644
--- a/src/Tests/Tests/Search/Request/SourceFilteringUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/SourceFilteringUsageTests.cs
@@ -1,17 +1,14 @@
 using System;
 using Elastic.Xunit.XunitPlumbing;
-using Tests.Framework.Integration;
-using Nest;
 using FluentAssertions;
-using Tests.Framework;
+using Nest;
 using Newtonsoft.Json;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using static Nest.Infer;
+using Tests.Framework.Integration;
 using Xunit;
-using Xunit.Sdk;
+using static Nest.Infer;
 using static Tests.Core.Serialization.SerializationTestHelper;
 
 namespace Tests.Search.Request
@@ -100,12 +97,6 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 	//hide
 	public class SourceFilteringSerializationTests
 	{
-		internal class WithSourceFilterProperty
-		{
-			[PropertyName("_source"), JsonProperty("_source")]
-			public Union<bool, ISourceFilter> SourceFilter { get; set; }
-		}
-
 		[U]
 		public void CanDeserializeBoolean()
 		{
@@ -113,7 +104,7 @@ public void CanDeserializeBoolean()
 			falseCase.Should().NotBeNull();
 			falseCase.SourceFilter.Should().NotBeNull();
 			falseCase.SourceFilter.Match
-				(b => b.Should().BeFalse(),
+			(b => b.Should().BeFalse(),
 				f => Assert.True(false, "Expected bool but found ISourceFilter")
 			);
 
@@ -121,7 +112,7 @@ public void CanDeserializeBoolean()
 			trueCase.Should().NotBeNull();
 			trueCase.SourceFilter.Should().NotBeNull();
 			trueCase.SourceFilter.Match
-				(b => b.Should().BeTrue(),
+			(b => b.Should().BeTrue(),
 				f => Assert.True(false, "Expected bool but found ISourceFilter")
 			);
 		}
@@ -139,7 +130,6 @@ public void CanDeserializeArray()
 					f.Includes.Should().Contain("obj.*");
 				}
 			);
-
 		}
 
 		[U]
@@ -172,5 +162,11 @@ public void CanDeserializeObject()
 				}
 			);
 		}
+
+		internal class WithSourceFilterProperty
+		{
+			[PropertyName("_source")] [JsonProperty("_source")]
+			public Union<bool, ISourceFilter> SourceFilter { get; set; }
+		}
 	}
 }
diff --git a/src/Tests/Tests/Search/Request/SuggestUsageTests.cs b/src/Tests/Tests/Search/Request/SuggestUsageTests.cs
index 206aba664da..bb20717919a 100644
--- a/src/Tests/Tests/Search/Request/SuggestUsageTests.cs
+++ b/src/Tests/Tests/Search/Request/SuggestUsageTests.cs
@@ -1,16 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Elasticsearch.Net;
-using Nest;
-using Tests.Framework.Integration;
-using static Nest.Infer;
 using FluentAssertions;
-using System.Linq;
+using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.Integration;
+using static Nest.Infer;
 
 namespace Tests.Search.Request
 {
@@ -27,68 +25,87 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 			new
 			{
 				query = ProjectFilterExpectedJson,
-				suggest = new Dictionary<string, object>{
-					{  "my-completion-suggest", new {
-					  completion = new {
-						analyzer = "simple",
-						contexts = new {
-						  color = new object[] {
-							  new { context = Project.First.Suggest.Contexts.Values.SelectMany(v => v).First() }
-						  }
-						},
-						field = "suggest",
-						fuzzy = new {
-						  fuzziness = "AUTO",
-						  min_length = 1,
-						  prefix_length = 2,
-						  transpositions = true,
-						  unicode_aware = false
-						},
-						size = 8
-					  },
-					  prefix = Project.Instance.Name
-					} },
-					{  "my-phrase-suggest", new {
-					  phrase = new {
-						collate = new {
-						  query = new {
-							source = "{ \"match\": { \"{{field_name}}\": \"{{suggestion}}\" }}",
-						  },
-						  @params = new {
-					        field_name = "title"
-						  },
-						  prune = true,
-						},
-						confidence = 10.1,
-						direct_generator = new [] {
-						  new { field = "description" }
-						},
-						field = "name",
-						gram_size = 1,
-						real_word_error_likelihood = 0.5,
-						token_limit = 5,
-						force_unigrams = false
-					  },
-					  text = "hello world"
-					} },
-					{  "my-term-suggest", new {
-					  term = new {
-						analyzer = "standard",
-						field = "name",
-						max_edits = 1,
-						max_inspections = 2,
-						max_term_freq = 3.0,
-						min_doc_freq = 4.0,
-						min_word_length = 5,
-						prefix_length = 6,
-						shard_size = 7,
-						size = 8,
-						suggest_mode = "always"
-					  },
-					  text = "hello world"
-					  }
+				suggest = new Dictionary<string, object>
+				{
+					{
+						"my-completion-suggest", new
+						{
+							completion = new
+							{
+								analyzer = "simple",
+								contexts = new
+								{
+									color = new object[]
+									{
+										new { context = Project.First.Suggest.Contexts.Values.SelectMany(v => v).First() }
+									}
+								},
+								field = "suggest",
+								fuzzy = new
+								{
+									fuzziness = "AUTO",
+									min_length = 1,
+									prefix_length = 2,
+									transpositions = true,
+									unicode_aware = false
+								},
+								size = 8
+							},
+							prefix = Project.Instance.Name
+						}
+					},
+					{
+						"my-phrase-suggest", new
+						{
+							phrase = new
+							{
+								collate = new
+								{
+									query = new
+									{
+										source = "{ \"match\": { \"{{field_name}}\": \"{{suggestion}}\" }}",
+									},
+									@params = new
+									{
+										field_name = "title"
+									},
+									prune = true,
+								},
+								confidence = 10.1,
+								direct_generator = new[]
+								{
+									new { field = "description" }
+								},
+								field = "name",
+								gram_size = 1,
+								real_word_error_likelihood = 0.5,
+								token_limit = 5,
+								force_unigrams = false
+							},
+							text = "hello world"
+						}
+					},
+					{
+						"my-term-suggest", new
+						{
+							term = new
+							{
+								analyzer = "standard",
+								field = "name",
+								max_edits = 1,
+								max_inspections = 2,
+								max_term_freq = 3.0,
+								min_doc_freq = 4.0,
+								min_word_length = 5,
+								prefix_length = 6,
+								shard_size = 7,
+								size = 8,
+								suggest_mode = "always"
+							},
+							text = "hello world"
+						}
 					}
-				  }
+				}
 			};
 
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
@@ -153,75 +170,85 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 				Query = ProjectFilter,
 				Suggest = new SuggestContainer
 				{
-					{ "my-term-suggest", new SuggestBucket
 					{
-						Text = "hello world",
-						Term = new TermSuggester
+						"my-term-suggest", new SuggestBucket
 						{
-							MaxEdits = 1,
-							MaxInspections = 2,
-							MaxTermFrequency = 3,
-							MinDocFrequency = 4,
-							MinWordLength = 5,
-							PrefixLength = 6,
-							SuggestMode = SuggestMode.Always,
-							Analyzer = "standard",
-							Field = Field<Project>(p=>p.Name),
-							ShardSize = 7,
-							Size = 8
+							Text = "hello world",
+							Term = new TermSuggester
+							{
+								MaxEdits = 1,
+								MaxInspections = 2,
+								MaxTermFrequency = 3,
+								MinDocFrequency = 4,
+								MinWordLength = 5,
+								PrefixLength = 6,
+								SuggestMode = SuggestMode.Always,
+								Analyzer = "standard",
+								Field = Field<Project>(p => p.Name),
+								ShardSize = 7,
+								Size = 8
+							}
 						}
-					} },
-					{ "my-completion-suggest", new SuggestBucket
+					},
 					{
-						Prefix = Project.Instance.Name,
-						Completion = new CompletionSuggester
+						"my-completion-suggest", new SuggestBucket
 						{
-							Contexts = new Dictionary<string, IList<ISuggestContextQuery>>
-							{
-								{ "color", new List<ISuggestContextQuery> { new SuggestContextQuery { Context = Project.First.Suggest.Contexts.Values.SelectMany(v => v).First() } } }
-							},
-							Fuzzy = new FuzzySuggester
+							Prefix = Project.Instance.Name,
+							Completion = new CompletionSuggester
 							{
-								Fuzziness = Fuzziness.Auto,
-								MinLength = 1,
-								PrefixLength = 2,
-								Transpositions = true,
-								UnicodeAware = false
-							},
-							Analyzer = "simple",
-							Field = Field<Project>(p=>p.Suggest),
-							Size = 8
+								Contexts = new Dictionary<string, IList<ISuggestContextQuery>>
+								{
+									{
+										"color",
+										new List<ISuggestContextQuery>
+											{ new SuggestContextQuery { Context = Project.First.Suggest.Contexts.Values.SelectMany(v => v).First() } }
+									}
+								},
+								Fuzzy = new FuzzySuggester
+								{
+									Fuzziness = Fuzziness.Auto,
+									MinLength = 1,
+									PrefixLength = 2,
+									Transpositions = true,
+									UnicodeAware = false
+								},
+								Analyzer = "simple",
+								Field = Field<Project>(p => p.Suggest),
+								Size = 8
+							}
 						}
-					} },
-					{ "my-phrase-suggest", new SuggestBucket
+					},
 					{
-						Text = "hello world",
-						Phrase = new PhraseSuggester
+						"my-phrase-suggest", new SuggestBucket
 						{
-							Collate = new PhraseSuggestCollate
+							Text = "hello world",
+							Phrase = new PhraseSuggester
 							{
-								Query = new PhraseSuggestCollateQuery
+								Collate = new PhraseSuggestCollate
 								{
-									Source = "{ \"match\": { \"{{field_name}}\": \"{{suggestion}}\" }}",
+									Query = new PhraseSuggestCollateQuery
+									{
+										Source = "{ \"match\": { \"{{field_name}}\": \"{{suggestion}}\" }}",
+									},
+									Params = new Dictionary<string, object>
+									{
+										{ "field_name", "title" }
+									},
+									Prune = true
 								},
-								Params = new Dictionary<string, object>
+								Confidence = 10.1,
+								DirectGenerator = new List<DirectGenerator>
 								{
-									{ "field_name", "title" }
+									new DirectGenerator { Field = "description" }
 								},
-								Prune = true
-							},
-							Confidence = 10.1,
-							DirectGenerator = new List<DirectGenerator>
-							{
-								new DirectGenerator { Field = "description" }
-							},
-							GramSize = 1,
-							Field = "name",
-							RealWordErrorLikelihood = 0.5,
-							TokenLimit = 5,
-							ForceUnigrams = false
+								GramSize = 1,
+								Field = "name",
+								RealWordErrorLikelihood = 0.5,
+								TokenLimit = 5,
+								ForceUnigrams = false
+							}
 						}
-					} },
+					},
 				}
 			};
 
@@ -246,7 +273,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			option.Contexts.Should().ContainKey("color");
 			var colorContexts = option.Contexts["color"];
 			colorContexts.Should().NotBeNull().And.HaveCount(1);
-			colorContexts.First().Category.Should().Be((Project.First.Suggest.Contexts.Values.SelectMany(v => v).First()));
+			colorContexts.First().Category.Should().Be(Project.First.Suggest.Contexts.Values.SelectMany(v => v).First());
 		}
 	}
 }
diff --git a/src/Tests/Tests/Search/Scroll/ClearScroll/ClearScrollApiTests.cs b/src/Tests/Tests/Search/Scroll/ClearScroll/ClearScrollApiTests.cs
index eff1718a024..b4f4f67cda9 100644
--- a/src/Tests/Tests/Search/Scroll/ClearScroll/ClearScrollApiTests.cs
+++ b/src/Tests/Tests/Search/Scroll/ClearScroll/ClearScrollApiTests.cs
@@ -5,51 +5,52 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.Scroll.ClearScroll
 {
 	// ReadOnlyCluster because eventhough its technically a write action it does not hinder
 	// on going reads
-	public class ClearScrollApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IClearScrollResponse, IClearScrollRequest, ClearScrollDescriptor, ClearScrollRequest>
+	public class ClearScrollApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IClearScrollResponse, IClearScrollRequest, ClearScrollDescriptor, ClearScrollRequest>
 	{
-		public ClearScrollApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private string _scrollId = "default-for-unit-tests";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.ClearScroll(f),
-			fluentAsync: (c, f) => c.ClearScrollAsync(f),
-			request: (c, r) => c.ClearScroll(r),
-			requestAsync: (c, r) => c.ClearScrollAsync(r)
-		);
+		public ClearScrollApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
 
 		protected override object ExpectJson => new
 		{
-			scroll_id = new []
+			scroll_id = new[]
 			{
 				_scrollId
 			}
 		};
 
 		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"/_search/scroll";
-		protected override bool SupportsDeserialization => false;
-
-		protected override ClearScrollDescriptor NewDescriptor() => new ClearScrollDescriptor();
 
 		protected override Func<ClearScrollDescriptor, IClearScrollRequest> Fluent => cs => cs.ScrollId(_scrollId);
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 
 		protected override ClearScrollRequest Initializer => new ClearScrollRequest(_scrollId);
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_search/scroll";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.ClearScroll(f),
+			(c, f) => c.ClearScrollAsync(f),
+			(c, r) => c.ClearScroll(r),
+			(c, r) => c.ClearScrollAsync(r)
+		);
+
+		protected override ClearScrollDescriptor NewDescriptor() => new ClearScrollDescriptor();
 
 		protected override void OnBeforeCall(IElasticClient client)
 		{
-			var scroll = this.Client.Search<Project>(s => s.MatchAll().Scroll(TimeSpan.FromMinutes((1))));
+			var scroll = Client.Search<Project>(s => s.MatchAll().Scroll(TimeSpan.FromMinutes(1)));
 			if (!scroll.IsValid)
 				throw new Exception("Setup: Initial scroll failed.");
+
 			_scrollId = scroll.ScrollId ?? _scrollId;
 		}
 	}
diff --git a/src/Tests/Tests/Search/Scroll/ClearScroll/ClearScrollUrlTests.cs b/src/Tests/Tests/Search/Scroll/ClearScroll/ClearScrollUrlTests.cs
index 1c6d54a403d..8da47a77e64 100644
--- a/src/Tests/Tests/Search/Scroll/ClearScroll/ClearScrollUrlTests.cs
+++ b/src/Tests/Tests/Search/Scroll/ClearScroll/ClearScrollUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.Search.Scroll.ClearScroll
 {
 	public class ClearScrollUrlTests
 	{
-		[U] public async Task Urls()
-		{
-			await DELETE("/_search/scroll")
-				.Fluent(c=>c.ClearScroll(cs => cs.ScrollId("scrollid1, scrollid2")))
-				.Request(c=>c.ClearScroll(new ClearScrollRequest(new[] { "scrollid1, scrollid2" })))
-				.FluentAsync(c=>c.ClearScrollAsync(cs => cs.ScrollId("scrollid1, scrollid2")))
-				.RequestAsync(c=>c.ClearScrollAsync(new ClearScrollRequest(new[] { "scrollid1, scrollid2" })))
-				;
-		}
+		[U] public async Task Urls() => await DELETE("/_search/scroll")
+			.Fluent(c => c.ClearScroll(cs => cs.ScrollId("scrollid1, scrollid2")))
+			.Request(c => c.ClearScroll(new ClearScrollRequest(new[] { "scrollid1, scrollid2" })))
+			.FluentAsync(c => c.ClearScrollAsync(cs => cs.ScrollId("scrollid1, scrollid2")))
+			.RequestAsync(c => c.ClearScrollAsync(new ClearScrollRequest(new[] { "scrollid1, scrollid2" })));
 	}
 }
diff --git a/src/Tests/Tests/Search/Scroll/Scroll/ScrollApiTests.cs b/src/Tests/Tests/Search/Scroll/Scroll/ScrollApiTests.cs
index 596b110aeaf..484bef9602a 100644
--- a/src/Tests/Tests/Search/Scroll/Scroll/ScrollApiTests.cs
+++ b/src/Tests/Tests/Search/Scroll/Scroll/ScrollApiTests.cs
@@ -5,23 +5,17 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.Scroll.Scroll
 {
-	public class ScrollApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, IScrollRequest, ScrollDescriptor<Project>, ScrollRequest>
+	public class ScrollApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, IScrollRequest, ScrollDescriptor<Project>, ScrollRequest>
 	{
-		public ScrollApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private string _scrollId = "default-for-unit-tests";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.Scroll("1m", _scrollId, f),
-			fluentAsync: (c, f) => c.ScrollAsync("1m", _scrollId, f),
-			request: (c, r) => c.Scroll<Project>(r),
-			requestAsync: (c, r) => c.ScrollAsync<Project>(r)
-		);
+		public ScrollApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
 
 		protected override object ExpectJson => new
 		{
@@ -30,26 +24,30 @@ protected override LazyResponses ClientUsage() => Calls(
 		};
 
 		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_search/scroll";
-		protected override bool SupportsDeserialization => false;
 
 		protected override Func<ScrollDescriptor<Project>, IScrollRequest> Fluent => s => s.Scroll("1m").ScrollId(_scrollId);
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override ScrollRequest Initializer => new ScrollRequest(_scrollId, "1m");
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_search/scroll";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.Scroll("1m", _scrollId, f),
+			(c, f) => c.ScrollAsync("1m", _scrollId, f),
+			(c, r) => c.Scroll<Project>(r),
+			(c, r) => c.ScrollAsync<Project>(r)
+		);
 
 		protected override void OnBeforeCall(IElasticClient client)
 		{
-			var response = client.Search<Project>(s => s.MatchAll().Scroll(TimeSpan.FromMinutes((1))));
+			var response = client.Search<Project>(s => s.MatchAll().Scroll(TimeSpan.FromMinutes(1)));
 			if (!response.IsValid)
 				throw new Exception("Scroll setup failed");
+
 			_scrollId = response.ScrollId ?? _scrollId;
 		}
 
-		protected override void OnAfterCall(IElasticClient client)
-		{
-			client.ClearScroll(cs => cs.ScrollId(_scrollId));
-		}
+		protected override void OnAfterCall(IElasticClient client) => client.ClearScroll(cs => cs.ScrollId(_scrollId));
 	}
 }
diff --git a/src/Tests/Tests/Search/Scroll/Scroll/ScrollUrlTests.cs b/src/Tests/Tests/Search/Scroll/Scroll/ScrollUrlTests.cs
index 35e845273a9..b04e0324589 100644
--- a/src/Tests/Tests/Search/Scroll/Scroll/ScrollUrlTests.cs
+++ b/src/Tests/Tests/Search/Scroll/Scroll/ScrollUrlTests.cs
@@ -10,14 +10,10 @@ namespace Tests.Search.Scroll.Scroll
 {
 	public class ScrollUrlTests
 	{
-		[U] public async Task Urls()
-		{
-			await POST("/_search/scroll")
-				.Fluent(c=>c.Scroll<CommitActivity>("1m", "scroll_id"))
-				.Request(c=>c.Scroll<CommitActivity>(new ScrollRequest("scroll_id", TimeSpan.FromMinutes(1))))
-				.FluentAsync(c=>c.ScrollAsync<CommitActivity>("1m", "scroll_id"))
-				.RequestAsync(c=>c.ScrollAsync<CommitActivity>(new ScrollRequest("scroll_id", "1m")))
-				;
-		}
+		[U] public async Task Urls() => await POST("/_search/scroll")
+			.Fluent(c => c.Scroll<CommitActivity>("1m", "scroll_id"))
+			.Request(c => c.Scroll<CommitActivity>(new ScrollRequest("scroll_id", TimeSpan.FromMinutes(1))))
+			.FluentAsync(c => c.ScrollAsync<CommitActivity>("1m", "scroll_id"))
+			.RequestAsync(c => c.ScrollAsync<CommitActivity>(new ScrollRequest("scroll_id", "1m")));
 	}
 }
diff --git a/src/Tests/Tests/Search/Scroll/Scroll/SlicedScrollSearchApiTests.cs b/src/Tests/Tests/Search/Scroll/Scroll/SlicedScrollSearchApiTests.cs
index bbae542a032..cbef43af110 100644
--- a/src/Tests/Tests/Search/Scroll/Scroll/SlicedScrollSearchApiTests.cs
+++ b/src/Tests/Tests/Search/Scroll/Scroll/SlicedScrollSearchApiTests.cs
@@ -6,23 +6,19 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.Scroll.Scroll
 {
-	public class SlicedScrollSearchApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, IScrollRequest, ScrollDescriptor<Project>, ScrollRequest>
+	public class SlicedScrollSearchApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, IScrollRequest, ScrollDescriptor<Project>, ScrollRequest>
 	{
-		public SlicedScrollSearchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected int _slice = 0;
 
 		private string _scrollId = "default-for-unit-tests";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.Scroll("1m", _scrollId, f),
-			fluentAsync: (c, f) => c.ScrollAsync("1m", _scrollId, f),
-			request: (c, r) => c.Scroll<Project>(r),
-			requestAsync: (c, r) => c.ScrollAsync<Project>(r)
-		);
+		public SlicedScrollSearchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
 
 		protected override object ExpectJson => new
 		{
@@ -31,34 +27,37 @@ protected override LazyResponses ClientUsage() => Calls(
 		};
 
 		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_search/scroll";
-		protected override bool SupportsDeserialization => false;
 
 		protected override Func<ScrollDescriptor<Project>, IScrollRequest> Fluent => s => s.Scroll("1m").ScrollId(_scrollId);
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override ScrollRequest Initializer => new ScrollRequest(_scrollId, "1m");
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_search/scroll";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.Scroll("1m", _scrollId, f),
+			(c, f) => c.ScrollAsync("1m", _scrollId, f),
+			(c, r) => c.Scroll<Project>(r),
+			(c, r) => c.ScrollAsync<Project>(r)
+		);
 
-		protected int _slice = 0;
 		protected override void OnBeforeCall(IElasticClient client)
 		{
 			var maxSlices = 2; // number of shards we use by default for test indices
-			var currentSlice = Interlocked.Increment(ref this._slice) % maxSlices;
+			var currentSlice = Interlocked.Increment(ref _slice) % maxSlices;
 			var scrollTimeout = TimeSpan.FromMinutes(1);
 			var response = client.Search<Project>(s => s
 				.Scroll(scrollTimeout)
-				.Slice(ss=>ss.Max(maxSlices).Id(currentSlice))
-				.Sort(ss=>ss.Field("_doc", SortOrder.Ascending))
+				.Slice(ss => ss.Max(maxSlices).Id(currentSlice))
+				.Sort(ss => ss.Field("_doc", SortOrder.Ascending))
 			);
 			if (!response.IsValid)
 				throw new Exception("Scroll setup failed");
+
 			_scrollId = response.ScrollId ?? _scrollId;
 		}
 
-		protected override void OnAfterCall(IElasticClient client)
-		{
-			client.ClearScroll(cs => cs.ScrollId(_scrollId));
-		}
+		protected override void OnAfterCall(IElasticClient client) => client.ClearScroll(cs => cs.ScrollId(_scrollId));
 	}
 }
diff --git a/src/Tests/Tests/Search/Search/Collapsing/FieldCollapseUsageTests.cs b/src/Tests/Tests/Search/Search/Collapsing/FieldCollapseUsageTests.cs
index 76e48bf1818..fbdd4f2ef7a 100644
--- a/src/Tests/Tests/Search/Search/Collapsing/FieldCollapseUsageTests.cs
+++ b/src/Tests/Tests/Search/Search/Collapsing/FieldCollapseUsageTests.cs
@@ -13,8 +13,6 @@ namespace Tests.Search.Search.Collapsing
 {
 	public class FieldCollapseUsageTests : SearchUsageTestBase
 	{
-		protected override string UrlPath => $"/{DefaultSeeder.ProjectsAliasFilter}/doc/_search";
-
 		public FieldCollapseUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson => new
@@ -29,7 +27,6 @@ public FieldCollapseUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : b
 					name = "stateofbeing",
 					size = 5
 				}
-
 			}
 		};
 
@@ -60,6 +57,8 @@ public FieldCollapseUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : b
 			}
 		};
 
+		protected override string UrlPath => $"/{DefaultSeeder.ProjectsAliasFilter}/doc/_search";
+
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			var numberOfStates = Enum.GetValues(typeof(StateOfBeing)).Length;
@@ -78,20 +77,22 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 	[SkipVersion("<6.4.0", "2nd level collapsing is a new feature in 6.4.0")]
 	public class FieldCollapseSecondLevelUsageTests : SearchUsageTestBase
 	{
-		protected override string UrlPath => $"/{DefaultSeeder.ProjectsAliasFilter}/doc/_search";
-
 		public FieldCollapseSecondLevelUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object ExpectJson => new
 		{
-			_source = new { excludes = new [] { "*" } },
-			collapse = new {
+			_source = new { excludes = new[] { "*" } },
+			collapse = new
+			{
 				field = "state",
-				inner_hits = new {
-					_source = new {
-						excludes = new [] { "*" }
+				inner_hits = new
+				{
+					_source = new
+					{
+						excludes = new[] { "*" }
 					},
-					collapse = new {
+					collapse = new
+					{
 						field = "name"
 					},
 					from = 1,
@@ -103,18 +104,18 @@ public FieldCollapseSecondLevelUsageTests(ReadOnlyCluster cluster, EndpointUsage
 		};
 
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-			.Source(source=>source.ExcludeAll())
+			.Source(source => source.ExcludeAll())
 			.Index(DefaultSeeder.ProjectsAliasFilter)
 			.Collapse(c => c
 				.Field(f => f.State)
 				.MaxConcurrentGroupSearches(1000)
 				.InnerHits(i => i
-					.Source(source=>source.ExcludeAll())
+					.Source(source => source.ExcludeAll())
 					.Name(nameof(StateOfBeing).ToLowerInvariant())
 					.Size(5)
 					.From(1)
 					.Collapse(c2 => c2
-						.Field(p=>p.Name)
+						.Field(p => p.Name)
 					)
 				)
 			);
@@ -134,12 +135,14 @@ public FieldCollapseSecondLevelUsageTests(ReadOnlyCluster cluster, EndpointUsage
 					From = 1,
 					Collapse = new FieldCollapse
 					{
-						Field = Field<Project>(p=>p.Name)
+						Field = Field<Project>(p => p.Name)
 					}
 				}
 			}
 		};
 
+		protected override string UrlPath => $"/{DefaultSeeder.ProjectsAliasFilter}/doc/_search";
+
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			var numberOfStates = Enum.GetValues(typeof(StateOfBeing)).Length;
@@ -155,7 +158,8 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				foreach (var innerHit in innerHits.Hits.Hits)
 				{
 					i++;
-					innerHit.Fields.Should().NotBeEmpty()
+					innerHit.Fields.Should()
+						.NotBeEmpty()
 						.And.ContainKey("name");
 				}
 
diff --git a/src/Tests/Tests/Search/Search/InvalidSearchApiTests.cs b/src/Tests/Tests/Search/Search/InvalidSearchApiTests.cs
index 282d08aad81..1528906e784 100644
--- a/src/Tests/Tests/Search/Search/InvalidSearchApiTests.cs
+++ b/src/Tests/Tests/Search/Search/InvalidSearchApiTests.cs
@@ -1,16 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.Search
 {
@@ -20,8 +16,6 @@ public InvalidSearchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : bas
 
 		protected override bool ExpectIsValid => false;
 
-		protected override int ExpectStatusCode => 400;
-
 		protected override object ExpectJson => new
 		{
 			from = 10,
@@ -41,6 +35,8 @@ public InvalidSearchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : bas
 			}
 		};
 
+		protected override int ExpectStatusCode => 400;
+
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
 			.From(10)
 			.Size(20)
@@ -71,7 +67,6 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			serverError.Status.Should().Be(400);
 			serverError.Error.Reason.Should().Be("all shards failed");
 			serverError.Error.RootCause.First().Reason.Should().Contain("[-1m]");
-
 		}
 	}
 }
diff --git a/src/Tests/Tests/Search/Search/Rescoring/RescoreUsageTests.cs b/src/Tests/Tests/Search/Search/Rescoring/RescoreUsageTests.cs
index 69110b4aa33..a757522e7d6 100644
--- a/src/Tests/Tests/Search/Search/Rescoring/RescoreUsageTests.cs
+++ b/src/Tests/Tests/Search/Search/Rescoring/RescoreUsageTests.cs
@@ -1,15 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elasticsearch.Net;
-using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.Search.Search.Rescoring
@@ -49,7 +44,7 @@ public RescoreUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 								{
 									terms = new
 									{
-										tags = new [] { "eos", "sit", "sed" }
+										tags = new[] { "eos", "sit", "sed" }
 									}
 								}
 							}
@@ -112,7 +107,7 @@ public RescoreUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 						.Query(q => q
 							.FunctionScore(fs => fs
 								.Functions(f => f
-									.RandomScore(rs=>rs.Seed(1337).Field("_seq_no"))
+									.RandomScore(rs => rs.Seed(1337).Field("_seq_no"))
 								)
 							)
 						)
@@ -137,7 +132,7 @@ public RescoreUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 						{
 							Filter = new TermsQuery
 							{
-								Field = Infer.Field<Project>(p => p.Tags.First()),
+								Field = Field<Project>(p => p.Tags.First()),
 								Terms = new[] { "eos", "sit", "sed" }
 							}
 						}
diff --git a/src/Tests/Tests/Search/Search/SearchApiTests.cs b/src/Tests/Tests/Search/Search/SearchApiTests.cs
index 22fea612672..a93e700e22b 100644
--- a/src/Tests/Tests/Search/Search/SearchApiTests.cs
+++ b/src/Tests/Tests/Search/Search/SearchApiTests.cs
@@ -10,26 +10,15 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.Search
 {
-	public class SearchApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest, SearchDescriptor<Project>, SearchRequest<Project>>
+	public class SearchApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest, SearchDescriptor<Project>, SearchRequest<Project>>
 	{
 		public SearchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.Search(f),
-			fluentAsync: (c, f) => c.SearchAsync(f),
-			request: (c, r) => c.Search<Project>(r),
-			requestAsync: (c, r) => c.SearchAsync<Project>(r)
-		);
-
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/_search";
 
 		protected override object ExpectJson => new
 		{
@@ -57,26 +46,11 @@ protected override LazyResponses ClientUsage() => Calls(
 					{
 						value = "Stable"
 					}
-
 				}
 			}
 		};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.Hits.Count().Should().BeGreaterThan(0);
-			response.Hits.First().Should().NotBeNull();
-			response.Hits.First().Source.Should().NotBeNull();
-			response.Aggregations.Count.Should().BeGreaterThan(0);
-			response.Took.Should().BeGreaterThan(0);
-			var startDates = response.Aggregations.Terms("startDates");
-			startDates.Should().NotBeNull();
-
-			foreach (var document in response.Documents)
-			{
-				document.ShouldAdhereToSourceSerializerWhenSet();
-			}
-		}
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
 			.From(10)
@@ -93,6 +67,8 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				.Term(p => p.State, StateOfBeing.Stable)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override SearchRequest<Project> Initializer => new SearchRequest<Project>()
 		{
 			From = 10,
@@ -108,6 +84,28 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				Value = "Stable"
 			})
 		};
+
+		protected override string UrlPath => $"/project/doc/_search";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.Search(f),
+			(c, f) => c.SearchAsync(f),
+			(c, r) => c.Search<Project>(r),
+			(c, r) => c.SearchAsync<Project>(r)
+		);
+
+		protected override void ExpectResponse(ISearchResponse<Project> response)
+		{
+			response.Hits.Count().Should().BeGreaterThan(0);
+			response.Hits.First().Should().NotBeNull();
+			response.Hits.First().Source.Should().NotBeNull();
+			response.Aggregations.Count.Should().BeGreaterThan(0);
+			response.Took.Should().BeGreaterThan(0);
+			var startDates = response.Aggregations.Terms("startDates");
+			startDates.Should().NotBeNull();
+
+			foreach (var document in response.Documents) document.ShouldAdhereToSourceSerializerWhenSet();
+		}
 	}
 
 	public class SearchApiFieldsTests : SearchApiTests
@@ -140,30 +138,29 @@ public SearchApiFieldsTests(ReadOnlyCluster cluster, EndpointUsage usage) : base
 					{
 						value = "Stable"
 					}
-
 				}
 			},
 			stored_fields = new[] { "name", "numberOfCommits" }
 		};
 
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-		.From(10)
-		.Size(20)
-		.Query(q => q
-			.MatchAll()
-		)
-		.Aggregations(a => a
-			.Terms("startDates", t => t
-				.Field(p => p.StartedOn)
+			.From(10)
+			.Size(20)
+			.Query(q => q
+				.MatchAll()
 			)
-		)
-		.PostFilter(f => f
-			.Term(p => p.State, StateOfBeing.Stable)
-		)
-		.StoredFields(fs => fs
-			.Field(p => p.Name)
-			.Field(p => p.NumberOfCommits)
-		);
+			.Aggregations(a => a
+				.Terms("startDates", t => t
+					.Field(p => p.StartedOn)
+				)
+			)
+			.PostFilter(f => f
+				.Term(p => p.State, StateOfBeing.Stable)
+			)
+			.StoredFields(fs => fs
+				.Field(p => p.Name)
+				.Field(p => p.NumberOfCommits)
+			);
 
 		protected override SearchRequest<Project> Initializer => new SearchRequest<Project>()
 		{
@@ -244,35 +241,32 @@ public SearchApiContainingConditionlessQueryContainerTests(ReadOnlyCluster clust
 			{
 				Must = new List<QueryContainer>
 				{
-					new QueryStringQuery{ Query = "query" },
-					new QueryStringQuery{ Query = string.Empty },
-					new QueryStringQuery{ Query =  null },
+					new QueryStringQuery { Query = "query" },
+					new QueryStringQuery { Query = string.Empty },
+					new QueryStringQuery { Query = null },
 					new QueryContainer(),
 					null
 				},
 				Should = new List<QueryContainer>
 				{
-					new QueryStringQuery{ Query = "query" },
-					new QueryStringQuery{ Query = string.Empty },
-					new QueryStringQuery{ Query =  null },
+					new QueryStringQuery { Query = "query" },
+					new QueryStringQuery { Query = string.Empty },
+					new QueryStringQuery { Query = null },
 					new QueryContainer(),
 					null
 				},
 				MustNot = new List<QueryContainer>
 				{
-					new QueryStringQuery{ Query = "query" },
-					new QueryStringQuery{ Query = string.Empty },
-					new QueryStringQuery{ Query =  null },
+					new QueryStringQuery { Query = "query" },
+					new QueryStringQuery { Query = string.Empty },
+					new QueryStringQuery { Query = null },
 					new QueryContainer(),
 					null
 				}
 			}
 		};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.ShouldBeValid();
-		}
+		protected override void ExpectResponse(ISearchResponse<Project> response) => response.ShouldBeValid();
 	}
 
 	public class SearchApiNullQueryContainerTests : SearchApiTests
@@ -300,21 +294,13 @@ public SearchApiNullQueryContainerTests(ReadOnlyCluster cluster, EndpointUsage u
 			}
 		};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.ShouldBeValid();
-		}
+		protected override void ExpectResponse(ISearchResponse<Project> response) => response.ShouldBeValid();
 	}
 
 	public class SearchApiNullQueriesInQueryContainerTests : SearchApiTests
 	{
 		public SearchApiNullQueriesInQueryContainerTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		// when we serialize we write and empty bool, when we read the fact it was verbatim is lost so while
-		// we technically DO support deserialization here (and empty bool will get set) when we write it a second
-		// time it will NOT write that bool because the is verbatim did not carry over.
-		protected override bool SupportsDeserialization => false;
-
 		protected override object ExpectJson => new
 		{
 			query = new
@@ -349,46 +335,52 @@ public SearchApiNullQueriesInQueryContainerTests(ReadOnlyCluster cluster, Endpoi
 			}
 		};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.ShouldBeValid();
-		}
+		// when we serialize we write and empty bool, when we read the fact it was verbatim is lost so while
+		// we technically DO support deserialization here (and empty bool will get set) when we write it a second
+		// time it will NOT write that bool because the is verbatim did not carry over.
+		protected override bool SupportsDeserialization => false;
+
+		protected override void ExpectResponse(ISearchResponse<Project> response) => response.ShouldBeValid();
 	}
 
 
 	[SkipVersion("<6.2.0", "OpaqueId introduced in 6.2.0")]
-	public class OpaqueIdApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IListTasksResponse, IListTasksRequest, ListTasksDescriptor, ListTasksRequest>
+	public class OpaqueIdApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IListTasksResponse, IListTasksRequest, ListTasksDescriptor, ListTasksRequest>
 	{
 		public OpaqueIdApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
 		protected override object ExpectJson => null;
-		protected override bool SupportsDeserialization => false;
 		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_tasks?pretty=true&error_trace=true";
 
 		protected override Func<ListTasksDescriptor, IListTasksRequest> Fluent => s => s
 			.RequestConfiguration(r => r.OpaqueId(CallIsolatedValue));
 
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
 		protected override ListTasksRequest Initializer => new ListTasksRequest()
 		{
 			RequestConfiguration = new RequestConfiguration { OpaqueId = CallIsolatedValue },
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_tasks?pretty=true&error_trace=true";
+
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.ListTasks(f),
-			fluentAsync: (c, f) => c.ListTasksAsync(f),
-			request: (c, r) => c.ListTasks(r),
-			requestAsync: (c, r) => c.ListTasksAsync(r)
+			(c, f) => c.ListTasks(f),
+			(c, f) => c.ListTasksAsync(f),
+			(c, r) => c.ListTasks(r),
+			(c, r) => c.ListTasksAsync(r)
 		);
 
 		protected override void OnBeforeCall(IElasticClient client)
 		{
 			var searchResponse = client.Search<Project>(s => s
-				.RequestConfiguration(r => r.OpaqueId(CallIsolatedValue))
-				.Scroll("10m") // Create a scroll in order to keep the task around.
-            );
+					.RequestConfiguration(r => r.OpaqueId(CallIsolatedValue))
+					.Scroll("10m") // Create a scroll in order to keep the task around.
+			);
 
 			searchResponse.ShouldBeValid();
 		}
@@ -401,10 +393,9 @@ protected override void ExpectResponse(IListTasksResponse response)
 			{
 				task.Value.Headers.Should().NotBeNull();
 				if (task.Value.Headers.TryGetValue(RequestData.OpaqueIdHeader, out var opaqueIdValue))
-				{
-					opaqueIdValue.Should().Be(this.CallIsolatedValue,
-						$"OpaqueId header {opaqueIdValue} did not match {this.CallIsolatedValue}");
-				}
+					opaqueIdValue.Should()
+						.Be(CallIsolatedValue,
+							$"OpaqueId header {opaqueIdValue} did not match {CallIsolatedValue}");
 				// TODO: Determine if this is a valid assertion i.e. should all tasks returned have an OpaqueId header?
 //				else
 //				{
diff --git a/src/Tests/Tests/Search/Search/SearchProfileApiTests.cs b/src/Tests/Tests/Search/Search/SearchProfileApiTests.cs
index 53680dcd2e1..8f06ab3bf80 100644
--- a/src/Tests/Tests/Search/Search/SearchProfileApiTests.cs
+++ b/src/Tests/Tests/Search/Search/SearchProfileApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -8,28 +7,16 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Search
 {
-	public class SearchProfileApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest,
-		SearchDescriptor<Project>, SearchRequest<Project>>
+	public class SearchProfileApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest,
+			SearchDescriptor<Project>, SearchRequest<Project>>
 	{
-		public SearchProfileApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.Search(f),
-			fluentAsync: (c, f) => c.SearchAsync(f),
-			request: (c, r) => c.Search<Project>(r),
-			requestAsync: (c, r) => c.SearchAsync<Project>(r)
-		);
+		public SearchProfileApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/doc/_search";
 
 		protected override object ExpectJson => new
 		{
@@ -50,6 +37,40 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.Profile()
+			.Query(q => q
+				.MatchAll()
+			)
+			.Aggregations(aggs => aggs
+				.Terms("startDates", t => t
+					.Field(p => p.StartedOn)
+				)
+			);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected override SearchRequest<Project> Initializer => new SearchRequest<Project>()
+		{
+			Profile = true,
+			Query = new QueryContainer(new MatchAllQuery()),
+			Aggregations = new TermsAggregation("startDates")
+			{
+				Field = "startedOn"
+			}
+		};
+
+		protected override string UrlPath => $"/project/doc/_search";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.Search(f),
+			(c, f) => c.SearchAsync(f),
+			(c, r) => c.Search<Project>(r),
+			(c, r) => c.SearchAsync<Project>(r)
+		);
+
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			response.Hits.Count().Should().BeGreaterThan(0);
@@ -112,26 +133,5 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				}
 			}
 		}
-
-		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
-			.Profile()
-			.Query(q => q
-				.MatchAll()
-			)
-			.Aggregations(aggs => aggs
-				.Terms("startDates", t => t
-					.Field(p => p.StartedOn)
-				)
-			);
-
-		protected override SearchRequest<Project> Initializer => new SearchRequest<Project>()
-		{
-			Profile = true,
-			Query = new QueryContainer(new MatchAllQuery()),
-			Aggregations = new TermsAggregation("startDates")
-			{
-				Field = "startedOn"
-			}
-		};
 	}
 }
diff --git a/src/Tests/Tests/Search/Search/SearchUrlTests.cs b/src/Tests/Tests/Search/Search/SearchUrlTests.cs
index 35cd71e4dc6..4552baffa69 100644
--- a/src/Tests/Tests/Search/Search/SearchUrlTests.cs
+++ b/src/Tests/Tests/Search/Search/SearchUrlTests.cs
@@ -1,10 +1,10 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
 using Nest;
+using Tests.Domain;
 using Tests.Framework;
- using static Tests.Framework.UrlTester;
-using System;
- using Elastic.Xunit.XunitPlumbing;
- using Tests.Domain;
+using static Tests.Framework.UrlTester;
 
 namespace Tests.Search.Search
 {
@@ -14,53 +14,53 @@ [U] public async Task Urls()
 		{
 			var hardcoded = "hardcoded";
 			await POST("/devs/developer/_search")
-				.Fluent(c=>c.Search<Developer>())
-				.Request(c=>c.Search<Project>(new SearchRequest<Developer>()))
-				.FluentAsync(c=>c.SearchAsync<Developer>())
-				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest<Developer>()))
+					.Fluent(c => c.Search<Developer>())
+					.Request(c => c.Search<Project>(new SearchRequest<Developer>()))
+					.FluentAsync(c => c.SearchAsync<Developer>())
+					.RequestAsync(c => c.SearchAsync<Project>(new SearchRequest<Developer>()))
 				;
 
 			await POST("/devs/hardcoded/_search")
-				.Fluent(c=>c.Search<Developer>(s=>s.Type(hardcoded)))
-				.Request(c=>c.Search<Project>(new SearchRequest<Developer>(typeof(Developer), hardcoded)))
-				.FluentAsync(c=>c.SearchAsync<Developer>(s=>s.Type(hardcoded)))
-				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest<Developer>(typeof(Developer), hardcoded)))
+					.Fluent(c => c.Search<Developer>(s => s.Type(hardcoded)))
+					.Request(c => c.Search<Project>(new SearchRequest<Developer>(typeof(Developer), hardcoded)))
+					.FluentAsync(c => c.SearchAsync<Developer>(s => s.Type(hardcoded)))
+					.RequestAsync(c => c.SearchAsync<Project>(new SearchRequest<Developer>(typeof(Developer), hardcoded)))
 				;
 
 			await POST("/project/_search")
-				.Fluent(c=>c.Search<Project>(s=>s.Type(Types.All)))
-				.Fluent(c=>c.Search<Project>(s=>s.AllTypes()))
-				.Request(c=>c.Search<Project>(new SearchRequest("project")))
-				.Request(c=>c.Search<Project>(new SearchRequest<Project>("project", Types.All)))
-				.FluentAsync(c=>c.SearchAsync<Project>(s=>s.Type(Types.All)))
-				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest<Project>(typeof(Project), Types.All)))
-				.FluentAsync(c=>c.SearchAsync<Project>(s=>s.AllTypes()))
+					.Fluent(c => c.Search<Project>(s => s.Type(Types.All)))
+					.Fluent(c => c.Search<Project>(s => s.AllTypes()))
+					.Request(c => c.Search<Project>(new SearchRequest("project")))
+					.Request(c => c.Search<Project>(new SearchRequest<Project>("project", Types.All)))
+					.FluentAsync(c => c.SearchAsync<Project>(s => s.Type(Types.All)))
+					.RequestAsync(c => c.SearchAsync<Project>(new SearchRequest<Project>(typeof(Project), Types.All)))
+					.FluentAsync(c => c.SearchAsync<Project>(s => s.AllTypes()))
 				;
 
 			await POST("/hardcoded/_search")
-				.Fluent(c=>c.Search<Project>(s=>s.Index(hardcoded).Type(Types.All)))
-				.Fluent(c=>c.Search<Project>(s=>s.Index(hardcoded).AllTypes()))
-				.Request(c=>c.Search<Project>(new SearchRequest(hardcoded)))
-				.Request(c=>c.Search<Project>(new SearchRequest<Project>(hardcoded, Types.All)))
-				.FluentAsync(c=>c.SearchAsync<Project>(s=>s.Index(hardcoded).Type(Types.All)))
-				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest<Project>(hardcoded, Types.All)))
-				.FluentAsync(c=>c.SearchAsync<Project>(s=>s.Index(hardcoded).AllTypes()))
+					.Fluent(c => c.Search<Project>(s => s.Index(hardcoded).Type(Types.All)))
+					.Fluent(c => c.Search<Project>(s => s.Index(hardcoded).AllTypes()))
+					.Request(c => c.Search<Project>(new SearchRequest(hardcoded)))
+					.Request(c => c.Search<Project>(new SearchRequest<Project>(hardcoded, Types.All)))
+					.FluentAsync(c => c.SearchAsync<Project>(s => s.Index(hardcoded).Type(Types.All)))
+					.RequestAsync(c => c.SearchAsync<Project>(new SearchRequest<Project>(hardcoded, Types.All)))
+					.FluentAsync(c => c.SearchAsync<Project>(s => s.Index(hardcoded).AllTypes()))
 				;
 
 			await POST("/_search")
-				.Fluent(c=>c.Search<Project>(s=>s.AllTypes().AllIndices()))
-				.Request(c=>c.Search<Project>(new SearchRequest()))
-				.Request(c=>c.Search<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All)))
-				.FluentAsync(c=>c.SearchAsync<Project>(s=>s.AllIndices().Type(Types.All)))
-				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All)))
-				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest()))
+					.Fluent(c => c.Search<Project>(s => s.AllTypes().AllIndices()))
+					.Request(c => c.Search<Project>(new SearchRequest()))
+					.Request(c => c.Search<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All)))
+					.FluentAsync(c => c.SearchAsync<Project>(s => s.AllIndices().Type(Types.All)))
+					.RequestAsync(c => c.SearchAsync<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All)))
+					.RequestAsync(c => c.SearchAsync<Project>(new SearchRequest()))
 				;
 
 			await POST("/_search?scroll=1m")
-				.Fluent(c=>c.Search<Project>(s=>s.AllTypes().AllIndices().Scroll(60000)))
-				.Request(c=>c.Search<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All) { Scroll = TimeSpan.FromMinutes(1) }))
-				.FluentAsync(c=>c.SearchAsync<Project>(s=>s.AllIndices().Type(Types.All).Scroll("1m")))
-				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All) { Scroll = 60000 } ))
+					.Fluent(c => c.Search<Project>(s => s.AllTypes().AllIndices().Scroll(60000)))
+					.Request(c => c.Search<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All) { Scroll = TimeSpan.FromMinutes(1) }))
+					.FluentAsync(c => c.SearchAsync<Project>(s => s.AllIndices().Type(Types.All).Scroll("1m")))
+					.RequestAsync(c => c.SearchAsync<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All) { Scroll = 60000 }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/SearchShards/SearchShardsApiTests.cs b/src/Tests/Tests/Search/SearchShards/SearchShardsApiTests.cs
index 3599dbf8321..a5ca5ff1804 100644
--- a/src/Tests/Tests/Search/SearchShards/SearchShardsApiTests.cs
+++ b/src/Tests/Tests/Search/SearchShards/SearchShardsApiTests.cs
@@ -5,32 +5,33 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.SearchShards
 {
-	public class SearchShardsApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ISearchShardsResponse, ISearchShardsRequest, SearchShardsDescriptor<Project>, SearchShardsRequest<Project>>
+	public class SearchShardsApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchShardsResponse, ISearchShardsRequest, SearchShardsDescriptor<Project>,
+			SearchShardsRequest<Project>>
 	{
 		public SearchShardsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.SearchShards(f),
-			fluentAsync: (c, f) => c.SearchShardsAsync(f),
-			request: (c, r) => c.SearchShards(r),
-			requestAsync: (c, r) => c.SearchShardsAsync(r)
-		);
+		protected override bool ExpectIsValid => true;
 
 
 		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"project/_search_shards";
-
-		protected override SearchShardsDescriptor<Project> NewDescriptor() => new SearchShardsDescriptor<Project>();
 
 		protected override Func<SearchShardsDescriptor<Project>, ISearchShardsRequest> Fluent => s => s;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override SearchShardsRequest<Project> Initializer => new SearchShardsRequest<Project>();
+		protected override string UrlPath => $"project/_search_shards";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.SearchShards(f),
+			(c, f) => c.SearchShardsAsync(f),
+			(c, r) => c.SearchShards(r),
+			(c, r) => c.SearchShardsAsync(r)
+		);
+
+		protected override SearchShardsDescriptor<Project> NewDescriptor() => new SearchShardsDescriptor<Project>();
 	}
 }
diff --git a/src/Tests/Tests/Search/SearchShards/SearchShardsUrlTests.cs b/src/Tests/Tests/Search/SearchShards/SearchShardsUrlTests.cs
index 4cf79ee3a1e..035e30b1175 100644
--- a/src/Tests/Tests/Search/SearchShards/SearchShardsUrlTests.cs
+++ b/src/Tests/Tests/Search/SearchShards/SearchShardsUrlTests.cs
@@ -13,27 +13,27 @@ [U] public async Task Urls()
 		{
 			var hardcoded = "hardcoded";
 			await POST("/project/_search_shards")
-				.Request(c=>c.SearchShards(new SearchShardsRequest("project")))
-				.Request(c=>c.SearchShards(new SearchShardsRequest<Project>(typeof(Project))))
-				.RequestAsync(c=>c.SearchShardsAsync(new SearchShardsRequest<Project>(typeof(Project))))
-				.FluentAsync(c=>c.SearchShardsAsync<Project>(s=>s.Index<Project>()))
+					.Request(c => c.SearchShards(new SearchShardsRequest("project")))
+					.Request(c => c.SearchShards(new SearchShardsRequest<Project>(typeof(Project))))
+					.RequestAsync(c => c.SearchShardsAsync(new SearchShardsRequest<Project>(typeof(Project))))
+					.FluentAsync(c => c.SearchShardsAsync<Project>(s => s.Index<Project>()))
 				;
 
 			await POST("/hardcoded/_search_shards")
-				.Request(c=>c.SearchShards(new SearchShardsRequest(hardcoded)))
-				.Request(c=>c.SearchShards(new SearchShardsRequest<Project>(hardcoded)))
-				.FluentAsync(c=>c.SearchShardsAsync<Project>(s=>s.Index(hardcoded)))
-				.RequestAsync(c=>c.SearchShardsAsync(new SearchShardsRequest<Project>(hardcoded)))
-				.FluentAsync(c=>c.SearchShardsAsync<Project>(s=>s.Index(hardcoded)))
+					.Request(c => c.SearchShards(new SearchShardsRequest(hardcoded)))
+					.Request(c => c.SearchShards(new SearchShardsRequest<Project>(hardcoded)))
+					.FluentAsync(c => c.SearchShardsAsync<Project>(s => s.Index(hardcoded)))
+					.RequestAsync(c => c.SearchShardsAsync(new SearchShardsRequest<Project>(hardcoded)))
+					.FluentAsync(c => c.SearchShardsAsync<Project>(s => s.Index(hardcoded)))
 				;
 
 			await POST("/_search_shards")
-				.Fluent(c=>c.SearchShards<Project>(s=>s.AllIndices()))
-				.Request(c=>c.SearchShards(new SearchShardsRequest()))
-				.Request(c=>c.SearchShards(new SearchShardsRequest<Project>(Nest.Indices.All)))
-				.FluentAsync(c=>c.SearchShardsAsync<Project>(s=>s.AllIndices()))
-				.RequestAsync(c=>c.SearchShardsAsync(new SearchShardsRequest<Project>(Nest.Indices.All)))
-				.RequestAsync(c=>c.SearchShardsAsync(new SearchShardsRequest()))
+					.Fluent(c => c.SearchShards<Project>(s => s.AllIndices()))
+					.Request(c => c.SearchShards(new SearchShardsRequest()))
+					.Request(c => c.SearchShards(new SearchShardsRequest<Project>(Nest.Indices.All)))
+					.FluentAsync(c => c.SearchShardsAsync<Project>(s => s.AllIndices()))
+					.RequestAsync(c => c.SearchShardsAsync(new SearchShardsRequest<Project>(Nest.Indices.All)))
+					.RequestAsync(c => c.SearchShardsAsync(new SearchShardsRequest()))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateApiTests.cs b/src/Tests/Tests/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateApiTests.cs
index 1abccbcc04a..0d71dee4bd6 100644
--- a/src/Tests/Tests/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateApiTests.cs
+++ b/src/Tests/Tests/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateApiTests.cs
@@ -8,28 +8,14 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search.SearchTemplate.RenderSearchTemplate
 {
-	public class RenderSearchTemplateApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IRenderSearchTemplateResponse, IRenderSearchTemplateRequest, RenderSearchTemplateDescriptor, RenderSearchTemplateRequest>
+	public class RenderSearchTemplateApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IRenderSearchTemplateResponse, IRenderSearchTemplateRequest, RenderSearchTemplateDescriptor,
+			RenderSearchTemplateRequest>
 	{
-		public RenderSearchTemplateApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.RenderSearchTemplate(f),
-			fluentAsync: (c, f) => c.RenderSearchTemplateAsync(f),
-			request: (c, r) => c.RenderSearchTemplate(r),
-			requestAsync: (c, r) => c.RenderSearchTemplateAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_render/template";
-		protected override int ExpectStatusCode => 200;
-		protected override bool ExpectIsValid => true;
-
-		private static string inlineSearchTemplate = @"
+		private static readonly string inlineSearchTemplate = @"
 {
 	""query"": {
 	  ""terms"": {
@@ -41,14 +27,22 @@ protected override LazyResponses ClientUsage() => Calls(
 	  }
 	}
   }";
-		private string[] statusValues = new[] { "pending", "published" };
 
-		protected override Func<RenderSearchTemplateDescriptor, IRenderSearchTemplateRequest> Fluent => s=>s
+		private readonly string[] statusValues = new[] { "pending", "published" };
+
+		public RenderSearchTemplateApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<RenderSearchTemplateDescriptor, IRenderSearchTemplateRequest> Fluent => s => s
 			.Source(inlineSearchTemplate)
-			.Params(p=>p
+			.Params(p => p
 				.Add("status", statusValues)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 
 		protected override RenderSearchTemplateRequest Initializer => new RenderSearchTemplateRequest
 		{
@@ -59,7 +53,16 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		[I] public Task AssertResponse() => this.AssertOnAllResponses(r =>
+		protected override string UrlPath => $"/_render/template";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.RenderSearchTemplate(f),
+			(c, f) => c.RenderSearchTemplateAsync(f),
+			(c, r) => c.RenderSearchTemplate(r),
+			(c, r) => c.RenderSearchTemplateAsync(r)
+		);
+
+		[I] public Task AssertResponse() => AssertOnAllResponses(r =>
 		{
 			r.TemplateOutput.Should().NotBeNull();
 			var searchRequest = r.TemplateOutput.As<ISearchRequest>();
diff --git a/src/Tests/Tests/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateUrlTests.cs b/src/Tests/Tests/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateUrlTests.cs
index 5d503f6b2f3..0bed5740041 100644
--- a/src/Tests/Tests/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateUrlTests.cs
+++ b/src/Tests/Tests/Search/SearchTemplate/RenderSearchTemplate/RenderSearchTemplateUrlTests.cs
@@ -12,17 +12,17 @@ [U] public async Task Urls()
 		{
 			var id = "the-id";
 			await POST("/_render/template/the-id")
-				.Fluent(c => c.RenderSearchTemplate(s=>s.Id(id)))
-				.Request(c=>c.RenderSearchTemplate(new RenderSearchTemplateRequest(id)))
-				.FluentAsync(c => c.RenderSearchTemplateAsync(s=>s.Id(id)))
-				.RequestAsync(c=>c.RenderSearchTemplateAsync(new RenderSearchTemplateRequest(id)))
+					.Fluent(c => c.RenderSearchTemplate(s => s.Id(id)))
+					.Request(c => c.RenderSearchTemplate(new RenderSearchTemplateRequest(id)))
+					.FluentAsync(c => c.RenderSearchTemplateAsync(s => s.Id(id)))
+					.RequestAsync(c => c.RenderSearchTemplateAsync(new RenderSearchTemplateRequest(id)))
 				;
 
 			await POST("/_render/template")
-				.Fluent(c => c.RenderSearchTemplate(s=>s.Source("")))
-				.Request(c=>c.RenderSearchTemplate(new RenderSearchTemplateRequest { Source = "" }))
-				.FluentAsync(c => c.RenderSearchTemplateAsync(s=>s.Source("")))
-				.RequestAsync(c=>c.RenderSearchTemplateAsync(new RenderSearchTemplateRequest { Source = "" }))
+					.Fluent(c => c.RenderSearchTemplate(s => s.Source("")))
+					.Request(c => c.RenderSearchTemplate(new RenderSearchTemplateRequest { Source = "" }))
+					.FluentAsync(c => c.RenderSearchTemplateAsync(s => s.Source("")))
+					.RequestAsync(c => c.RenderSearchTemplateAsync(new RenderSearchTemplateRequest { Source = "" }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/SearchTemplate/SearchTemplateApiTests.cs b/src/Tests/Tests/Search/SearchTemplate/SearchTemplateApiTests.cs
index b173b2849e7..2e2e8ab6a76 100644
--- a/src/Tests/Tests/Search/SearchTemplate/SearchTemplateApiTests.cs
+++ b/src/Tests/Tests/Search/SearchTemplate/SearchTemplateApiTests.cs
@@ -8,26 +8,16 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.SearchTemplate
 {
-	public class SearchTemplateApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchTemplateRequest,
-		SearchTemplateDescriptor<Project>, SearchTemplateRequest<Project>>
+	public class SearchTemplateApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchTemplateRequest,
+			SearchTemplateDescriptor<Project>, SearchTemplateRequest<Project>>
 	{
 		public SearchTemplateApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.SearchTemplate(f),
-			fluentAsync: (c, f) => c.SearchTemplateAsync(f),
-			request: (c, r) => c.SearchTemplate<Project>(r),
-			requestAsync: (c, r) => c.SearchTemplateAsync<Project>(r)
-		);
-
-		protected override int ExpectStatusCode => 200;
 		protected override bool ExpectIsValid => true;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/_search/template";
 
 		protected override object ExpectJson => new
 		{
@@ -35,10 +25,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			source = "{\"query\": {\"match\":  {\"state\" : \"{{state}}\" }}}"
 		};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.Hits.Count().Should().BeGreaterThan(0);
-		}
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<SearchTemplateDescriptor<Project>, ISearchTemplateRequest> Fluent => s => s
 			.AllTypes()
@@ -47,32 +34,38 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				.Add("state", "Stable")
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override SearchTemplateRequest<Project> Initializer => new SearchTemplateRequest<Project>()
 		{
 			Source = "{\"query\": {\"match\":  {\"state\" : \"{{state}}\" }}}",
 			Params = new Dictionary<string, object>
 			{
-				{"state", "Stable"}
+				{ "state", "Stable" }
 			}
 		};
-	}
-	public class SearchTemplateInvalidApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchTemplateRequest,
-		SearchTemplateDescriptor<Project>, SearchTemplateRequest<Project>>
-	{
-		private string _templateString = "{\"query\": {\"atch\":  {\"state\" : \"{{state}}\" }}}";
-		public SearchTemplateInvalidApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override string UrlPath => $"/project/_search/template";
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.SearchTemplate(f),
-			fluentAsync: (c, f) => c.SearchTemplateAsync(f),
-			request: (c, r) => c.SearchTemplate<Project>(r),
-			requestAsync: (c, r) => c.SearchTemplateAsync<Project>(r)
+			(c, f) => c.SearchTemplate(f),
+			(c, f) => c.SearchTemplateAsync(f),
+			(c, r) => c.SearchTemplate<Project>(r),
+			(c, r) => c.SearchTemplateAsync<Project>(r)
 		);
 
-		protected override int ExpectStatusCode => 400;
+		protected override void ExpectResponse(ISearchResponse<Project> response) => response.Hits.Count().Should().BeGreaterThan(0);
+	}
+
+	public class SearchTemplateInvalidApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchTemplateRequest,
+			SearchTemplateDescriptor<Project>, SearchTemplateRequest<Project>>
+	{
+		private readonly string _templateString = "{\"query\": {\"atch\":  {\"state\" : \"{{state}}\" }}}";
+
+		public SearchTemplateInvalidApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected override bool ExpectIsValid => false;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/project/_search/template";
 
 		protected override object ExpectJson => new
 		{
@@ -80,11 +73,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			source = _templateString
 		};
 
-		protected override void ExpectResponse(ISearchResponse<Project> response)
-		{
-			response.ServerError.Should().NotBeNull();
-			response.ServerError.Error.Reason.Should().Contain("no [query]");
-		}
+		protected override int ExpectStatusCode => 400;
 
 		protected override Func<SearchTemplateDescriptor<Project>, ISearchTemplateRequest> Fluent => s => s
 			.AllTypes()
@@ -93,13 +82,30 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				.Add("state", "Stable")
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override SearchTemplateRequest<Project> Initializer => new SearchTemplateRequest<Project>()
 		{
 			Source = _templateString,
 			Params = new Dictionary<string, object>
 			{
-				{"state", "Stable"}
+				{ "state", "Stable" }
 			}
 		};
+
+		protected override string UrlPath => $"/project/_search/template";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.SearchTemplate(f),
+			(c, f) => c.SearchTemplateAsync(f),
+			(c, r) => c.SearchTemplate<Project>(r),
+			(c, r) => c.SearchTemplateAsync<Project>(r)
+		);
+
+		protected override void ExpectResponse(ISearchResponse<Project> response)
+		{
+			response.ServerError.Should().NotBeNull();
+			response.ServerError.Error.Reason.Should().Contain("no [query]");
+		}
 	}
 }
diff --git a/src/Tests/Tests/Search/SearchTemplate/SearchTemplateUrlTests.cs b/src/Tests/Tests/Search/SearchTemplate/SearchTemplateUrlTests.cs
index ffa2d93cc4c..32b47504855 100644
--- a/src/Tests/Tests/Search/SearchTemplate/SearchTemplateUrlTests.cs
+++ b/src/Tests/Tests/Search/SearchTemplate/SearchTemplateUrlTests.cs
@@ -14,27 +14,27 @@ [U] public async Task Urls()
 			var hardcoded = "hardcoded";
 
 			await UrlTester.POST("/hardcoded/doc/_search/template")
-				.Request(c=>c.SearchTemplate<Project>(new SearchTemplateRequest(hardcoded, "doc")))
-				.Request(c=>c.SearchTemplate<Project>(new SearchTemplateRequest<Project>(hardcoded, Type<Project>())))
-				.FluentAsync(c=>c.SearchTemplateAsync<Project>(s=>s.Index(hardcoded).Type<Project>()))
-				.RequestAsync(c=>c.SearchTemplateAsync<Project>(new SearchTemplateRequest<Project>(hardcoded, Type<Project>())))
-				.FluentAsync(c=>c.SearchTemplateAsync<Project>(s=>s.Index(hardcoded).Type<Project>()))
+					.Request(c => c.SearchTemplate<Project>(new SearchTemplateRequest(hardcoded, "doc")))
+					.Request(c => c.SearchTemplate<Project>(new SearchTemplateRequest<Project>(hardcoded, Type<Project>())))
+					.FluentAsync(c => c.SearchTemplateAsync<Project>(s => s.Index(hardcoded).Type<Project>()))
+					.RequestAsync(c => c.SearchTemplateAsync<Project>(new SearchTemplateRequest<Project>(hardcoded, Type<Project>())))
+					.FluentAsync(c => c.SearchTemplateAsync<Project>(s => s.Index(hardcoded).Type<Project>()))
 				;
 
 			await UrlTester.POST("/project/_search/template")
-				.Request(c=>c.SearchTemplate<Project>(new SearchTemplateRequest("project")))
-				.Fluent(c=>c.SearchTemplate<Project>(s=>s.Index("project").AllTypes()))
-				.Request(c=>c.SearchTemplate<Project>(new SearchTemplateRequest<Project>(typeof(Project))))
-				.FluentAsync(c=>c.SearchTemplateAsync<Project>(s=>s.Index("project").AllTypes()))
-				.RequestAsync(c=>c.SearchTemplateAsync<Project>(new SearchTemplateRequest<Project>(typeof(Project))));
+				.Request(c => c.SearchTemplate<Project>(new SearchTemplateRequest("project")))
+				.Fluent(c => c.SearchTemplate<Project>(s => s.Index("project").AllTypes()))
+				.Request(c => c.SearchTemplate<Project>(new SearchTemplateRequest<Project>(typeof(Project))))
+				.FluentAsync(c => c.SearchTemplateAsync<Project>(s => s.Index("project").AllTypes()))
+				.RequestAsync(c => c.SearchTemplateAsync<Project>(new SearchTemplateRequest<Project>(typeof(Project))));
 
 			await UrlTester.POST("/_search/template")
-				.Fluent(c=>c.SearchTemplate<Project>(s=>s.AllIndices().AllTypes()))
-				.Request(c=>c.SearchTemplate<Project>(new SearchTemplateRequest()))
-				.Request(c=>c.SearchTemplate<Project>(new SearchTemplateRequest<Project>(Nest.Indices.All, Types.All)))
-				.FluentAsync(c=>c.SearchTemplateAsync<Project>(s=>s.AllIndices().AllTypes()))
-				.RequestAsync(c=>c.SearchTemplateAsync<Project>(new SearchTemplateRequest<Project>(Nest.Indices.All, Types.All)))
-				.RequestAsync(c=>c.SearchTemplateAsync<Project>(new SearchTemplateRequest()))
+					.Fluent(c => c.SearchTemplate<Project>(s => s.AllIndices().AllTypes()))
+					.Request(c => c.SearchTemplate<Project>(new SearchTemplateRequest()))
+					.Request(c => c.SearchTemplate<Project>(new SearchTemplateRequest<Project>(Nest.Indices.All, Types.All)))
+					.FluentAsync(c => c.SearchTemplateAsync<Project>(s => s.AllIndices().AllTypes()))
+					.RequestAsync(c => c.SearchTemplateAsync<Project>(new SearchTemplateRequest<Project>(Nest.Indices.All, Types.All)))
+					.RequestAsync(c => c.SearchTemplateAsync<Project>(new SearchTemplateRequest()))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/SearchUsageTestBase.cs b/src/Tests/Tests/Search/SearchUsageTestBase.cs
index 30a7c358497..b660a529246 100644
--- a/src/Tests/Tests/Search/SearchUsageTestBase.cs
+++ b/src/Tests/Tests/Search/SearchUsageTestBase.cs
@@ -6,33 +6,33 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.Search
 {
-	public abstract class SearchUsageTestBase : ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest, SearchDescriptor<Project>, SearchRequest<Project>>
+	public abstract class SearchUsageTestBase
+		: ApiIntegrationTestBase<ReadOnlyCluster, ISearchResponse<Project>, ISearchRequest, SearchDescriptor<Project>, SearchRequest<Project>>
 	{
+		protected TermQuery ProjectFilter = new TermQuery
+		{
+			Field = Infer.Field<Project>(p => p.Type),
+			Value = Project.TypeName
+		};
+
+		protected object ProjectFilterExpectedJson = new { term = new { type = new { value = Project.TypeName } } };
+
 		protected SearchUsageTestBase(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Search<Project>(f),
-			fluentAsync: (client, f) => client.SearchAsync<Project>(f),
-			request: (client, r) => client.Search<Project>(r),
-			requestAsync: (client, r) => client.SearchAsync<Project>(r)
-		);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override string UrlPath => "/project/doc/_search";
 
-		protected TermQuery ProjectFilter = new TermQuery
-		{
-			Field = Infer.Field<Project>(p => p.Type),
-			Value = Project.TypeName
-		};
-
-		protected object ProjectFilterExpectedJson = new {term = new {type = new {value = Project.TypeName}}};
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Search<Project>(f),
+			(client, f) => client.SearchAsync<Project>(f),
+			(client, r) => client.Search<Project>(r),
+			(client, r) => client.SearchAsync<Project>(r)
+		);
 
 		// https://youtrack.jetbrains.com/issue/RIDER-19912
 		[U] protected override Task HitsTheCorrectUrl() => base.HitsTheCorrectUrl();
@@ -48,7 +48,5 @@ protected override LazyResponses ClientUsage() => Calls(
 		[I] public override Task ReturnsExpectedIsValid() => base.ReturnsExpectedIsValid();
 
 		[I] public override Task ReturnsExpectedResponse() => base.ReturnsExpectedResponse();
-
-
 	}
 }
diff --git a/src/Tests/Tests/Search/Validate/ValidateQueryApiTests.cs b/src/Tests/Tests/Search/Validate/ValidateQueryApiTests.cs
index 5b0a6b67981..3865eeedb6e 100644
--- a/src/Tests/Tests/Search/Validate/ValidateQueryApiTests.cs
+++ b/src/Tests/Tests/Search/Validate/ValidateQueryApiTests.cs
@@ -1,46 +1,37 @@
-using Tests.Framework;
-using Tests.Framework.Integration;
-using Xunit;
-using Nest;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
 using FluentAssertions;
+using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework;
+using Tests.Framework.Integration;
 
 namespace Tests.Search.Validate
 {
 	public class ValidateQueryApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, IValidateQueryResponse, IValidateQueryRequest, ValidateQueryDescriptor<Project>, ValidateQueryRequest<Project>>
+		: ApiIntegrationTestBase<ReadOnlyCluster, IValidateQueryResponse, IValidateQueryRequest, ValidateQueryDescriptor<Project>,
+			ValidateQueryRequest<Project>>
 	{
 		public ValidateQueryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.ValidateQuery<Project>(v => v.Query(q => q.MatchAll())),
-			fluentAsync: (c, f) => c.ValidateQueryAsync<Project>(v => v.Query(q => q.MatchAll())),
-			request: (c, r) => c.ValidateQuery(new ValidateQueryRequest<Project> { Query = new QueryContainer(new MatchAllQuery()) }),
-			requestAsync: (c, r) => c.ValidateQueryAsync(new ValidateQueryRequest<Project> { Query = new QueryContainer(new MatchAllQuery()) })
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override string UrlPath => "/project/doc/_validate/query";
-	}
-
-	public class ValidateInvalidQueryApiTests
-		: ApiIntegrationTestBase<ReadOnlyCluster, IValidateQueryResponse, IValidateQueryRequest, ValidateQueryDescriptor<Project>, ValidateQueryRequest<Project>>
-	{
-		public ValidateInvalidQueryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.ValidateQuery<Project>(v => _descriptor),
-			fluentAsync: (c, f) => c.ValidateQueryAsync<Project>(v => _descriptor),
-			request: (c, r) => c.ValidateQuery(_request),
-			requestAsync: (c, r) => c.ValidateQueryAsync(_request)
+			(c, f) => c.ValidateQuery<Project>(v => v.Query(q => q.MatchAll())),
+			(c, f) => c.ValidateQueryAsync<Project>(v => v.Query(q => q.MatchAll())),
+			(c, r) => c.ValidateQuery(new ValidateQueryRequest<Project> { Query = new QueryContainer(new MatchAllQuery()) }),
+			(c, r) => c.ValidateQueryAsync(new ValidateQueryRequest<Project> { Query = new QueryContainer(new MatchAllQuery()) })
 		);
+	}
 
-		private ValidateQueryDescriptor<Project> _descriptor = new ValidateQueryDescriptor<Project>()
+	public class ValidateInvalidQueryApiTests
+		: ApiIntegrationTestBase<ReadOnlyCluster, IValidateQueryResponse, IValidateQueryRequest, ValidateQueryDescriptor<Project>,
+			ValidateQueryRequest<Project>>
+	{
+		private readonly ValidateQueryDescriptor<Project> _descriptor = new ValidateQueryDescriptor<Project>()
 			.Query(q => q
 				.Match(m => m
 					.Field(p => p.StartedOn)
@@ -48,7 +39,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
-		private ValidateQueryRequest<Project> _request = new ValidateQueryRequest<Project>
+		private readonly ValidateQueryRequest<Project> _request = new ValidateQueryRequest<Project>
 		{
 			Query = new QueryContainer(
 				new MatchQuery
@@ -59,14 +50,20 @@ protected override LazyResponses ClientUsage() => Calls(
 			)
 		};
 
+		public ValidateInvalidQueryApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override string UrlPath => "/project/doc/_validate/query";
 
-		protected override void ExpectResponse(IValidateQueryResponse response)
-		{
-			response.Valid.Should().BeFalse();
-		}
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.ValidateQuery<Project>(v => _descriptor),
+			(c, f) => c.ValidateQueryAsync<Project>(v => _descriptor),
+			(c, r) => c.ValidateQuery(_request),
+			(c, r) => c.ValidateQueryAsync(_request)
+		);
+
+		protected override void ExpectResponse(IValidateQueryResponse response) => response.Valid.Should().BeFalse();
 	}
 }
diff --git a/src/Tests/Tests/Search/Validate/ValidateQueryUrlTests.cs b/src/Tests/Tests/Search/Validate/ValidateQueryUrlTests.cs
index a9bde253043..7f9111e6458 100644
--- a/src/Tests/Tests/Search/Validate/ValidateQueryUrlTests.cs
+++ b/src/Tests/Tests/Search/Validate/ValidateQueryUrlTests.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
- using Elastic.Xunit.XunitPlumbing;
- using Nest;
- using Tests.Domain;
- using Tests.Framework;
- using static Tests.Framework.UrlTester;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
+using Nest;
+using Tests.Domain;
+using Tests.Framework;
+using static Tests.Framework.UrlTester;
 
 namespace Tests.Search.Validate
 {
@@ -13,48 +13,48 @@ [U] public async Task Urls()
 		{
 			var hardcoded = "hardcoded";
 			await POST("/devs/developer/_validate/query")
-				.Fluent(c=>c.ValidateQuery<Developer>(s=>s))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest<Developer>()))
-				.FluentAsync(c=>c.ValidateQueryAsync<Developer>(s=>s))
-				.RequestAsync(c=>c.ValidateQueryAsync(new ValidateQueryRequest<Developer>()))
+					.Fluent(c => c.ValidateQuery<Developer>(s => s))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest<Developer>()))
+					.FluentAsync(c => c.ValidateQueryAsync<Developer>(s => s))
+					.RequestAsync(c => c.ValidateQueryAsync(new ValidateQueryRequest<Developer>()))
 				;
 
 			await POST("/devs/hardcoded/_validate/query")
-				.Fluent(c=>c.ValidateQuery<Developer>(s=>s.Type(hardcoded)))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest<Project>(typeof(Developer), hardcoded)))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest(typeof(Developer), hardcoded)))
-				.FluentAsync(c=>c.ValidateQueryAsync<Developer>(s=>s.Type(hardcoded)))
-				.RequestAsync(c=>c.ValidateQueryAsync(new ValidateQueryRequest<Project>(typeof(Developer), hardcoded)))
-				.RequestAsync(c=>c.ValidateQueryAsync(new ValidateQueryRequest(typeof(Developer), hardcoded)))
+					.Fluent(c => c.ValidateQuery<Developer>(s => s.Type(hardcoded)))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest<Project>(typeof(Developer), hardcoded)))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest(typeof(Developer), hardcoded)))
+					.FluentAsync(c => c.ValidateQueryAsync<Developer>(s => s.Type(hardcoded)))
+					.RequestAsync(c => c.ValidateQueryAsync(new ValidateQueryRequest<Project>(typeof(Developer), hardcoded)))
+					.RequestAsync(c => c.ValidateQueryAsync(new ValidateQueryRequest(typeof(Developer), hardcoded)))
 				;
 
 			await POST("/project/_validate/query")
-				.Fluent(c=>c.ValidateQuery<Project>(s=>s.Type(Types.All)))
-				.Fluent(c=>c.ValidateQuery<Project>(s=>s.AllTypes()))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest("project")))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest<Project>("project", Types.All)))
-				.FluentAsync(c=>c.ValidateQueryAsync<Project>(s=>s.Type(Types.All)))
-				.RequestAsync(c=>c.ValidateQueryAsync(new ValidateQueryRequest<Project>(typeof(Project), Types.All)))
-				.FluentAsync(c=>c.ValidateQueryAsync<Project>(s=>s.AllTypes()))
+					.Fluent(c => c.ValidateQuery<Project>(s => s.Type(Types.All)))
+					.Fluent(c => c.ValidateQuery<Project>(s => s.AllTypes()))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest("project")))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest<Project>("project", Types.All)))
+					.FluentAsync(c => c.ValidateQueryAsync<Project>(s => s.Type(Types.All)))
+					.RequestAsync(c => c.ValidateQueryAsync(new ValidateQueryRequest<Project>(typeof(Project), Types.All)))
+					.FluentAsync(c => c.ValidateQueryAsync<Project>(s => s.AllTypes()))
 				;
 
 			await POST("/hardcoded/_validate/query")
-				.Fluent(c=>c.ValidateQuery<Project>(s=>s.Index(hardcoded).Type(Types.All)))
-				.Fluent(c=>c.ValidateQuery<Project>(s=>s.Index(hardcoded).AllTypes()))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest(hardcoded)))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest<Project>(hardcoded, Types.All)))
-				.FluentAsync(c=>c.ValidateQueryAsync<Project>(s=>s.Index(hardcoded).Type(Types.All)))
-				.RequestAsync(c=>c.ValidateQueryAsync(new ValidateQueryRequest<Project>(hardcoded, Types.All)))
-				.FluentAsync(c=>c.ValidateQueryAsync<Project>(s=>s.Index(hardcoded).AllTypes()))
+					.Fluent(c => c.ValidateQuery<Project>(s => s.Index(hardcoded).Type(Types.All)))
+					.Fluent(c => c.ValidateQuery<Project>(s => s.Index(hardcoded).AllTypes()))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest(hardcoded)))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest<Project>(hardcoded, Types.All)))
+					.FluentAsync(c => c.ValidateQueryAsync<Project>(s => s.Index(hardcoded).Type(Types.All)))
+					.RequestAsync(c => c.ValidateQueryAsync(new ValidateQueryRequest<Project>(hardcoded, Types.All)))
+					.FluentAsync(c => c.ValidateQueryAsync<Project>(s => s.Index(hardcoded).AllTypes()))
 				;
 
 			await POST("/_validate/query")
-				.Fluent(c=>c.ValidateQuery<Project>(s=>s.AllTypes().AllIndices()))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest()))
-				.Request(c=>c.ValidateQuery(new ValidateQueryRequest<Project>(Nest.Indices.All, Types.All)))
-				.FluentAsync(c=>c.ValidateQueryAsync<Project>(s=>s.AllIndices().Type(Types.All)))
-				.RequestAsync(c=>c.ValidateQueryAsync(new ValidateQueryRequest<Project>(Nest.Indices.All, Types.All)))
-				.RequestAsync(c=>c.ValidateQueryAsync(new ValidateQueryRequest()))
+					.Fluent(c => c.ValidateQuery<Project>(s => s.AllTypes().AllIndices()))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest()))
+					.Request(c => c.ValidateQuery(new ValidateQueryRequest<Project>(Nest.Indices.All, Types.All)))
+					.FluentAsync(c => c.ValidateQueryAsync<Project>(s => s.AllIndices().Type(Types.All)))
+					.RequestAsync(c => c.ValidateQueryAsync(new ValidateQueryRequest<Project>(Nest.Indices.All, Types.All)))
+					.RequestAsync(c => c.ValidateQueryAsync(new ValidateQueryRequest()))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Graph/Explore/GraphExploreApiTests.cs b/src/Tests/Tests/XPack/Graph/Explore/GraphExploreApiTests.cs
index 9200d7b8fde..26db9bc0a3d 100644
--- a/src/Tests/Tests/XPack/Graph/Explore/GraphExploreApiTests.cs
+++ b/src/Tests/Tests/XPack/Graph/Explore/GraphExploreApiTests.cs
@@ -8,94 +8,92 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Nest.Infer;
 
 namespace Tests.XPack.Graph.Explore
 {
 	[SkipVersion("<2.3.0", "")]
-	public class GraphExploreApiTests : ApiIntegrationTestBase<XPackCluster, IGraphExploreResponse, IGraphExploreRequest, GraphExploreDescriptor<Project>, GraphExploreRequest>
+	public class GraphExploreApiTests
+		: ApiIntegrationTestBase<XPackCluster, IGraphExploreResponse, IGraphExploreRequest, GraphExploreDescriptor<Project>, GraphExploreRequest>
 	{
 		public GraphExploreApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GraphExplore<Project>(f),
-			fluentAsync: (client, f) => client.GraphExploreAsync<Project>(f),
-			request: (client, r) => client.GraphExplore(r),
-			requestAsync: (client, r) => client.GraphExploreAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/project/doc/_xpack/graph/_explore";
 
-		protected override bool SupportsDeserialization => false;
-
-		protected override object ExpectJson { get; } = new {
+		protected override object ExpectJson { get; } = new
+		{
 			query = new { term = new { state = new { value = "VeryActive" } } },
-			vertices = new [] {
+			vertices = new[]
+			{
 				new { field = "name" },
 				new { field = "description" }
 			},
-			connections = new {
-				query = new { match_all = new {} },
-				vertices = new [] {
+			connections = new
+			{
+				query = new { match_all = new { } },
+				vertices = new[]
+				{
 					new { field = "description" }
 				},
-				connections = new {
-					query = new { match_all = new {} },
-					vertices = new [] {
+				connections = new
+				{
+					query = new { match_all = new { } },
+					vertices = new[]
+					{
 						new
 						{
 							field = "name",
 							size = 500,
 							min_doc_count = 20,
 							shard_min_doc_count = 1,
-							include = new [] {
+							include = new[]
+							{
 								new { term = "0", boost = 1.1 }
 							}
 						}
 					}
 				}
 			},
-			controls = new {
+			controls = new
+			{
 				use_significance = true,
 				sample_size = 5
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<GraphExploreDescriptor<Project>, IGraphExploreRequest> Fluent => d => d
-			.Query(q=>q.Term(p=>p.State, StateOfBeing.VeryActive))
-			.Vertices(v=>v
-				.Vertex(p=>p.Name)
-				.Vertex(p=>p.Description)
+			.Query(q => q.Term(p => p.State, StateOfBeing.VeryActive))
+			.Vertices(v => v
+				.Vertex(p => p.Name)
+				.Vertex(p => p.Description)
 			)
-			.Connections(c=>c
-				.Query(q=>q.MatchAll())
-				.Vertices(v=>v
-					.Vertex(p=>p.Description)
+			.Connections(c => c
+				.Query(q => q.MatchAll())
+				.Vertices(v => v
+					.Vertex(p => p.Description)
 				)
-				.Connections(cc=>cc
-					.Query(q=>q.MatchAll())
-					.Vertices(v=>v
-						.Vertex(p=>p.Name, gv=>gv
+				.Connections(cc => cc
+					.Query(q => q.MatchAll())
+					.Vertices(v => v
+						.Vertex(p => p.Name, gv => gv
 							.MinimumDocumentCount(20)
 							.ShardMinimumDocumentCount(1)
 							.Size(500)
-							.Include(i=>i
+							.Include(i => i
 								.Include("0", 1.1)
 							)
 						)
 					)
 				)
 			)
-			.Controls(c=>c
+			.Controls(c => c
 				.UseSignificance()
 				.SampleSize(5)
-			)
-		;
+			);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override GraphExploreRequest Initializer => new GraphExploreRequest(Index<Project>(), Type<Project>())
 		{
@@ -103,14 +101,14 @@ protected override LazyResponses ClientUsage() => Calls(
 			Vertices = new List<IGraphVertexDefinition>
 			{
 				new GraphVertexDefinition { Field = "name" },
-				new GraphVertexDefinition { Field = Field<Project>(p=>p.Description) }
+				new GraphVertexDefinition { Field = Field<Project>(p => p.Description) }
 			},
 			Connections = new Hop
 			{
 				Query = new MatchAllQuery(),
 				Vertices = new List<GraphVertexDefinition>
 				{
-					new GraphVertexDefinition { Field = Field<Project>(p=>p.Description) }
+					new GraphVertexDefinition { Field = Field<Project>(p => p.Description) }
 				},
 				Connections = new Hop
 				{
@@ -119,16 +117,14 @@ protected override LazyResponses ClientUsage() => Calls(
 					{
 						new GraphVertexDefinition
 						{
-							Field = Field<Project>(p=>p.Name),
+							Field = Field<Project>(p => p.Name),
 							MinimumDocumentCount = 20,
 							ShardMinimumDocumentCount = 1,
 							Size = 500,
-							Include = new [] { new GraphVertexInclude { Term = "0", Boost = 1.1 } }
+							Include = new[] { new GraphVertexInclude { Term = "0", Boost = 1.1 } }
 						}
 					}
-
 				}
-
 			},
 			Controls = new GraphExploreControls
 			{
@@ -137,6 +133,17 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/project/doc/_xpack/graph/_explore";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GraphExplore<Project>(f),
+			(client, f) => client.GraphExploreAsync<Project>(f),
+			(client, r) => client.GraphExplore(r),
+			(client, r) => client.GraphExploreAsync(r)
+		);
+
 		protected override void ExpectResponse(IGraphExploreResponse response)
 		{
 			response.Failures.Should().BeEmpty();
@@ -147,8 +154,8 @@ protected override void ExpectResponse(IGraphExploreResponse response)
 			response.Connections.Should().OnlyContain(c => c.Weight > 0);
 
 			response.Vertices.Should().NotBeEmpty();
-			response.Vertices.Should().OnlyContain(c=>c.Field != null);
-			response.Vertices.Should().OnlyContain(c => c.Term !=  null);
+			response.Vertices.Should().OnlyContain(c => c.Field != null);
+			response.Vertices.Should().OnlyContain(c => c.Term != null);
 			response.Vertices.Should().Contain(c => c.Depth > 0);
 			response.Vertices.Should().OnlyContain(c => c.Weight > 0);
 		}
diff --git a/src/Tests/Tests/XPack/Graph/Explore/GraphExploreUrlTests.cs b/src/Tests/Tests/XPack/Graph/Explore/GraphExploreUrlTests.cs
index 20ee4865435..43baf67c156 100644
--- a/src/Tests/Tests/XPack/Graph/Explore/GraphExploreUrlTests.cs
+++ b/src/Tests/Tests/XPack/Graph/Explore/GraphExploreUrlTests.cs
@@ -13,39 +13,39 @@ public class GraphExploreUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/project/doc/_xpack/graph/_explore")
-				.Fluent(c => c.GraphExplore<Project>(d => d))
-				.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(typeof(Project), typeof(Project))))
-				.FluentAsync(c => c.GraphExploreAsync<Project>(d => d))
-				.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(typeof(Project), typeof(Project))))
+					.Fluent(c => c.GraphExplore<Project>(d => d))
+					.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(typeof(Project), typeof(Project))))
+					.FluentAsync(c => c.GraphExploreAsync<Project>(d => d))
+					.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(typeof(Project), typeof(Project))))
 				;
 
 			await POST("/project/_xpack/graph/_explore")
-				.Fluent(c => c.GraphExplore<Project>(d => d.AllTypes()))
-				.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(typeof(Project))))
-				.FluentAsync(c => c.GraphExploreAsync<Project>(d => d.AllTypes()))
-				.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(typeof(Project))))
+					.Fluent(c => c.GraphExplore<Project>(d => d.AllTypes()))
+					.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(typeof(Project))))
+					.FluentAsync(c => c.GraphExploreAsync<Project>(d => d.AllTypes()))
+					.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(typeof(Project))))
 				;
 
 			await POST($"_all/_xpack/graph/_explore")
-				.Fluent(c => c.GraphExplore<Project>(d => d.AllTypes().AllIndices()))
-				.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(AllIndices, AllTypes)))
-				.FluentAsync(c => c.GraphExploreAsync<Project>(d => d.AllTypes().AllIndices()))
-				.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(AllIndices, AllTypes)))
+					.Fluent(c => c.GraphExplore<Project>(d => d.AllTypes().AllIndices()))
+					.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(AllIndices, AllTypes)))
+					.FluentAsync(c => c.GraphExploreAsync<Project>(d => d.AllTypes().AllIndices()))
+					.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(AllIndices, AllTypes)))
 				;
 
 			var index = "another-index";
 			await POST($"/{index}/_xpack/graph/_explore")
-				.Fluent(c => c.GraphExplore<Project>(d => d.AllTypes().Index(index)))
-				.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(index, AllTypes)))
-				.FluentAsync(c => c.GraphExploreAsync<Project>(d => d.AllTypes().Index(index)))
-				.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(index, AllTypes)))
+					.Fluent(c => c.GraphExplore<Project>(d => d.AllTypes().Index(index)))
+					.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(index, AllTypes)))
+					.FluentAsync(c => c.GraphExploreAsync<Project>(d => d.AllTypes().Index(index)))
+					.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(index, AllTypes)))
 				;
 
 			await POST($"/{index}/doc/_xpack/graph/_explore")
-				.Fluent(c => c.GraphExplore<Project>(d=>d.Type<Project>().Index(index)))
-				.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(index, Type<Project>())))
-				.FluentAsync(c => c.GraphExploreAsync<Project>(d=>d.Type<Project>().Index(index)))
-				.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(index, Type<Project>())))
+					.Fluent(c => c.GraphExplore<Project>(d => d.Type<Project>().Index(index)))
+					.Request(c => c.GraphExplore(new GraphExploreRequest<Project>(index, Type<Project>())))
+					.FluentAsync(c => c.GraphExploreAsync<Project>(d => d.Type<Project>().Index(index)))
+					.RequestAsync(c => c.GraphExploreAsync(new GraphExploreRequest<Project>(index, Type<Project>())))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/License/DeleteLicense/DeleteLicenseUrlTests.cs b/src/Tests/Tests/XPack/License/DeleteLicense/DeleteLicenseUrlTests.cs
index 4c41e44a718..43c8de4edcd 100644
--- a/src/Tests/Tests/XPack/License/DeleteLicense/DeleteLicenseUrlTests.cs
+++ b/src/Tests/Tests/XPack/License/DeleteLicense/DeleteLicenseUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.License.DeleteLicense
 {
 	public class DeleteLicenseUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await DELETE("/_xpack/license")
-				.Fluent(c => c.DeleteLicense())
-				.Request(c => c.DeleteLicense(new DeleteLicenseRequest()))
-				.FluentAsync(c => c.DeleteLicenseAsync())
-				.RequestAsync(c => c.DeleteLicenseAsync(new DeleteLicenseRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await DELETE("/_xpack/license")
+			.Fluent(c => c.DeleteLicense())
+			.Request(c => c.DeleteLicense(new DeleteLicenseRequest()))
+			.FluentAsync(c => c.DeleteLicenseAsync())
+			.RequestAsync(c => c.DeleteLicenseAsync(new DeleteLicenseRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/License/GetLicense/GetLicenseApiTests.cs b/src/Tests/Tests/XPack/License/GetLicense/GetLicenseApiTests.cs
index 540fd1b0c93..9124a6c5871 100644
--- a/src/Tests/Tests/XPack/License/GetLicense/GetLicenseApiTests.cs
+++ b/src/Tests/Tests/XPack/License/GetLicense/GetLicenseApiTests.cs
@@ -6,31 +6,30 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Elasticsearch.Net.HttpMethod;
 
 namespace Tests.XPack.License.GetLicense
 {
 	[SkipVersion("<2.3.0", "")]
-	public class GetLicenseApiTests : ApiIntegrationTestBase<XPackCluster, IGetLicenseResponse, IGetLicenseRequest, GetLicenseDescriptor, GetLicenseRequest>
+	public class GetLicenseApiTests
+		: ApiIntegrationTestBase<XPackCluster, IGetLicenseResponse, IGetLicenseRequest, GetLicenseDescriptor, GetLicenseRequest>
 	{
 		public GetLicenseApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetLicense(f),
-			fluentAsync: (client, f) => client.GetLicenseAsync(f),
-			request: (client, r) => client.GetLicense(r),
-			requestAsync: (client, r) => client.GetLicenseAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => GET;
 
+		protected override GetLicenseRequest Initializer => new GetLicenseRequest();
+
 		protected override string UrlPath => $"/_xpack/license";
 
-		protected override GetLicenseRequest Initializer => new GetLicenseRequest();
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetLicense(f),
+			(client, f) => client.GetLicenseAsync(f),
+			(client, r) => client.GetLicense(r),
+			(client, r) => client.GetLicenseAsync(r)
+		);
 
 		protected override void ExpectResponse(IGetLicenseResponse response)
 		{
diff --git a/src/Tests/Tests/XPack/License/GetLicense/GetLicenseUrlTests.cs b/src/Tests/Tests/XPack/License/GetLicense/GetLicenseUrlTests.cs
index a2c39bcbc7d..f81f3af9f89 100644
--- a/src/Tests/Tests/XPack/License/GetLicense/GetLicenseUrlTests.cs
+++ b/src/Tests/Tests/XPack/License/GetLicense/GetLicenseUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.License.GetLicense
 {
 	public class GetLicenseUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_xpack/license")
-				.Fluent(c => c.GetLicense())
-				.Request(c => c.GetLicense(new GetLicenseRequest()))
-				.FluentAsync(c => c.GetLicenseAsync())
-				.RequestAsync(c => c.GetLicenseAsync(new GetLicenseRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_xpack/license")
+			.Fluent(c => c.GetLicense())
+			.Request(c => c.GetLicense(new GetLicenseRequest()))
+			.FluentAsync(c => c.GetLicenseAsync())
+			.RequestAsync(c => c.GetLicenseAsync(new GetLicenseRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusApiTests.cs b/src/Tests/Tests/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusApiTests.cs
index d0b5ae5522b..adaaa295e62 100644
--- a/src/Tests/Tests/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusApiTests.cs
+++ b/src/Tests/Tests/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusApiTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -7,27 +6,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.License.GetTrialLicenseStatus
 {
 	[SkipVersion("<6.1.0", "Only exists in Elasticsearch 6.1.0+")]
-	public class GetTrialLicenseStatusApiTests : ApiIntegrationTestBase<XPackCluster, IGetTrialLicenseStatusResponse, IGetTrialLicenseStatusRequest, GetTrialLicenseStatusDescriptor, GetTrialLicenseStatusRequest>
+	public class GetTrialLicenseStatusApiTests
+		: ApiIntegrationTestBase<XPackCluster, IGetTrialLicenseStatusResponse, IGetTrialLicenseStatusRequest, GetTrialLicenseStatusDescriptor,
+			GetTrialLicenseStatusRequest>
 	{
 		public GetTrialLicenseStatusApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetTrialLicenseStatus(f),
-			fluentAsync: (client, f) => client.GetTrialLicenseStatusAsync(f),
-			request: (client, r) => client.GetTrialLicenseStatus(r),
-			requestAsync: (client, r) => client.GetTrialLicenseStatusAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_xpack/license/trial_status";
 		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_xpack/license/trial_status";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetTrialLicenseStatus(f),
+			(client, f) => client.GetTrialLicenseStatusAsync(f),
+			(client, r) => client.GetTrialLicenseStatus(r),
+			(client, r) => client.GetTrialLicenseStatusAsync(r)
+		);
 
 		protected override void ExpectResponse(IGetTrialLicenseStatusResponse response)
 		{
diff --git a/src/Tests/Tests/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusUrlTests.cs b/src/Tests/Tests/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusUrlTests.cs
index 714b004c891..201d8d30ca9 100644
--- a/src/Tests/Tests/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusUrlTests.cs
+++ b/src/Tests/Tests/XPack/License/GetTrialLicenseStatus/GetTrialLicenseStatusUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.License.GetTrialLicenseStatus
 {
 	public class GetTrialLicenseStatusUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_xpack/license/trial_status")
-				.Fluent(c => c.GetTrialLicenseStatus())
-				.Request(c => c.GetTrialLicenseStatus(new GetTrialLicenseStatusRequest()))
-				.FluentAsync(c => c.GetTrialLicenseStatusAsync())
-				.RequestAsync(c => c.GetTrialLicenseStatusAsync(new GetTrialLicenseStatusRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_xpack/license/trial_status")
+			.Fluent(c => c.GetTrialLicenseStatus())
+			.Request(c => c.GetTrialLicenseStatus(new GetTrialLicenseStatusRequest()))
+			.FluentAsync(c => c.GetTrialLicenseStatusAsync())
+			.RequestAsync(c => c.GetTrialLicenseStatusAsync(new GetTrialLicenseStatusRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/License/PostLicense/PostLicenseApiTests.cs b/src/Tests/Tests/XPack/License/PostLicense/PostLicenseApiTests.cs
index b1e3fadfc46..b02b9de27f6 100644
--- a/src/Tests/Tests/XPack/License/PostLicense/PostLicenseApiTests.cs
+++ b/src/Tests/Tests/XPack/License/PostLicense/PostLicenseApiTests.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.XPack.License.PostLicense
 {
@@ -15,17 +12,6 @@ namespace Tests.XPack.License.PostLicense
 	public class PostLicenseApiTests : ApiTestBase<XPackCluster, IPostLicenseResponse, IPostLicenseRequest, PostLicenseDescriptor, PostLicenseRequest>
 	{
 		public PostLicenseApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PostLicense(f),
-			fluentAsync: (client, f) => client.PostLicenseAsync(f),
-			request: (client, r) => client.PostLicense(r),
-			requestAsync: (client, r) => client.PostLicenseAsync(r)
-		);
-
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"/_xpack/license?acknowledge=true";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson { get; } = new
 		{
@@ -42,6 +28,21 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override Func<PostLicenseDescriptor, IPostLicenseRequest> Fluent => d => d
+			.Acknowledge()
+			.License(FakeLicense);
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+		protected override PostLicenseRequest Initializer => new PostLicenseRequest
+		{
+			Acknowledge = true,
+			License = FakeLicense
+		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_xpack/license?acknowledge=true";
+
 		private Nest.License FakeLicense { get; } = new Nest.License
 		{
 			UID = "uuid",
@@ -54,14 +55,11 @@ protected override LazyResponses ClientUsage() => Calls(
 			Signature = "<redacted>"
 		};
 
-		protected override Func<PostLicenseDescriptor, IPostLicenseRequest> Fluent => d => d
-			.Acknowledge()
-			.License(this.FakeLicense);
-
-		protected override PostLicenseRequest Initializer => new PostLicenseRequest
-		{
-			Acknowledge = true,
-			License= this.FakeLicense
-		};
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PostLicense(f),
+			(client, f) => client.PostLicenseAsync(f),
+			(client, r) => client.PostLicense(r),
+			(client, r) => client.PostLicenseAsync(r)
+		);
 	}
 }
diff --git a/src/Tests/Tests/XPack/License/PostLicense/PostLicenseUrlTests.cs b/src/Tests/Tests/XPack/License/PostLicense/PostLicenseUrlTests.cs
index 72f91a96f76..b3109178738 100644
--- a/src/Tests/Tests/XPack/License/PostLicense/PostLicenseUrlTests.cs
+++ b/src/Tests/Tests/XPack/License/PostLicense/PostLicenseUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.License.PostLicense
 {
 	public class PostLicenseUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/license")
-				.Fluent(c => c.PostLicense())
-				.Request(c => c.PostLicense(new PostLicenseRequest()))
-				.FluentAsync(c => c.PostLicenseAsync())
-				.RequestAsync(c => c.PostLicenseAsync(new PostLicenseRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/license")
+			.Fluent(c => c.PostLicense())
+			.Request(c => c.PostLicense(new PostLicenseRequest()))
+			.FluentAsync(c => c.PostLicenseAsync())
+			.RequestAsync(c => c.PostLicenseAsync(new PostLicenseRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseApiTests.cs b/src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseApiTests.cs
index 5e3d43e3b47..8900d216eab 100644
--- a/src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseApiTests.cs
+++ b/src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseApiTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -7,27 +6,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.License.StartTrialLicense
 {
 	[SkipVersion("<6.1.0", "Only exists in Elasticsearch 6.1.0+")]
-	public class StartTrialLicenseApiTests : ApiIntegrationTestBase<XPackCluster, IStartTrialLicenseResponse, IStartTrialLicenseRequest, StartTrialLicenseDescriptor, StartTrialLicenseRequest>
+	public class StartTrialLicenseApiTests
+		: ApiIntegrationTestBase<XPackCluster, IStartTrialLicenseResponse, IStartTrialLicenseRequest, StartTrialLicenseDescriptor,
+			StartTrialLicenseRequest>
 	{
 		public StartTrialLicenseApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.StartTrialLicense(f),
-			fluentAsync: (client, f) => client.StartTrialLicenseAsync(f),
-			request: (client, r) => client.StartTrialLicense(r),
-			requestAsync: (client, r) => client.StartTrialLicenseAsync(r)
-		);
-
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 403;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/license/start_trial";
 		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_xpack/license/start_trial";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.StartTrialLicense(f),
+			(client, f) => client.StartTrialLicenseAsync(f),
+			(client, r) => client.StartTrialLicense(r),
+			(client, r) => client.StartTrialLicenseAsync(r)
+		);
 
 		protected override void ExpectResponse(IStartTrialLicenseResponse response)
 		{
diff --git a/src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseUrlTests.cs b/src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseUrlTests.cs
index 519786c6cb0..e2d33dd9748 100644
--- a/src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseUrlTests.cs
+++ b/src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.License.StartTrialLicense
 {
 	public class StartTrialLicenseUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/license/start_trial")
-				.Fluent(c => c.StartTrialLicense())
-				.Request(c => c.StartTrialLicense(new StartTrialLicenseRequest()))
-				.FluentAsync(c => c.StartTrialLicenseAsync())
-				.RequestAsync(c => c.StartTrialLicenseAsync(new StartTrialLicenseRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/license/start_trial")
+			.Fluent(c => c.StartTrialLicense())
+			.Request(c => c.StartTrialLicense(new StartTrialLicenseRequest()))
+			.FluentAsync(c => c.StartTrialLicenseAsync())
+			.RequestAsync(c => c.StartTrialLicenseAsync(new StartTrialLicenseRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/CloseJob/CloseJobApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/CloseJob/CloseJobApiTests.cs
index ef045a584b5..57640d9eeb6 100644
--- a/src/Tests/Tests/XPack/MachineLearning/CloseJob/CloseJobApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/CloseJob/CloseJobApiTests.cs
@@ -12,6 +12,14 @@ public class CloseJobApiTests : MachineLearningIntegrationTestBase<ICloseJobResp
 	{
 		public CloseJobApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<CloseJobDescriptor, ICloseJobRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override CloseJobRequest Initializer => new CloseJobRequest(CallIsolatedValue);
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_close";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -22,24 +30,14 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.CloseJob(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.CloseJobAsync(CallIsolatedValue, f),
-			request: (client, r) => client.CloseJob(r),
-			requestAsync: (client, r) => client.CloseJobAsync(r)
+			(client, f) => client.CloseJob(CallIsolatedValue, f),
+			(client, f) => client.CloseJobAsync(CallIsolatedValue, f),
+			(client, r) => client.CloseJob(r),
+			(client, r) => client.CloseJobAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_close";
 		protected override CloseJobDescriptor NewDescriptor() => new CloseJobDescriptor(CallIsolatedValue);
-		protected override object ExpectJson => null;
-		protected override Func<CloseJobDescriptor, ICloseJobRequest> Fluent => f => f;
-		protected override CloseJobRequest Initializer => new CloseJobRequest(CallIsolatedValue);
 
-		protected override void ExpectResponse(ICloseJobResponse response)
-		{
-			response.Closed.Should().BeTrue();
-		}
+		protected override void ExpectResponse(ICloseJobResponse response) => response.Closed.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/CloseJob/CloseJobUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/CloseJob/CloseJobUrlTests.cs
index ff9122c4b69..9881544d9b3 100644
--- a/src/Tests/Tests/XPack/MachineLearning/CloseJob/CloseJobUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/CloseJob/CloseJobUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.CloseJob
 {
 	public class CloseJobUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/_close")
-				.Fluent(c => c.CloseJob("job_id"))
-				.Request(c => c.CloseJob(new CloseJobRequest("job_id")))
-				.FluentAsync(c => c.CloseJobAsync("job_id"))
-				.RequestAsync(c => c.CloseJobAsync(new CloseJobRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/_close")
+			.Fluent(c => c.CloseJob("job_id"))
+			.Request(c => c.CloseJob(new CloseJobRequest("job_id")))
+			.FluentAsync(c => c.CloseJobAsync("job_id"))
+			.RequestAsync(c => c.CloseJobAsync(new CloseJobRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedApiTests.cs
index 02313a72cce..de69079514c 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedApiTests.cs
@@ -8,10 +8,19 @@
 
 namespace Tests.XPack.MachineLearning.DeleteDatafeed
 {
-	public class DeleteDatafeedApiTests : MachineLearningIntegrationTestBase<IDeleteDatafeedResponse, IDeleteDatafeedRequest, DeleteDatafeedDescriptor, DeleteDatafeedRequest>
+	public class DeleteDatafeedApiTests
+		: MachineLearningIntegrationTestBase<IDeleteDatafeedResponse, IDeleteDatafeedRequest, DeleteDatafeedDescriptor, DeleteDatafeedRequest>
 	{
 		public DeleteDatafeedApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<DeleteDatafeedDescriptor, IDeleteDatafeedRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+		protected override DeleteDatafeedRequest Initializer => new DeleteDatafeedRequest(CallIsolatedValue + "-datafeed");
+		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -22,24 +31,14 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteDatafeed(CallIsolatedValue + "-datafeed", f),
-			fluentAsync: (client, f) => client.DeleteDatafeedAsync(CallIsolatedValue + "-datafeed", f),
-			request: (client, r) => client.DeleteDatafeed(r),
-			requestAsync: (client, r) => client.DeleteDatafeedAsync(r)
+			(client, f) => client.DeleteDatafeed(CallIsolatedValue + "-datafeed", f),
+			(client, f) => client.DeleteDatafeedAsync(CallIsolatedValue + "-datafeed", f),
+			(client, r) => client.DeleteDatafeed(r),
+			(client, r) => client.DeleteDatafeedAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed";
 		protected override DeleteDatafeedDescriptor NewDescriptor() => new DeleteDatafeedDescriptor(CallIsolatedValue + "-datafeed");
-		protected override object ExpectJson => null;
-		protected override Func<DeleteDatafeedDescriptor, IDeleteDatafeedRequest> Fluent => f => f;
-		protected override DeleteDatafeedRequest Initializer => new DeleteDatafeedRequest(CallIsolatedValue + "-datafeed");
 
-		protected override void ExpectResponse(IDeleteDatafeedResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IDeleteDatafeedResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedUrlTests.cs
index e2d889e3c32..bb1c19399ed 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DeleteDatafeed/DeleteDatafeedUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.DeleteDatafeed
 {
 	public class DeleteDatafeedUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await DELETE("/_xpack/ml/datafeeds/datafeed_id")
-				.Fluent(c => c.DeleteDatafeed("datafeed_id"))
-				.Request(c => c.DeleteDatafeed(new DeleteDatafeedRequest("datafeed_id")))
-				.FluentAsync(c => c.DeleteDatafeedAsync("datafeed_id"))
-				.RequestAsync(c => c.DeleteDatafeedAsync(new DeleteDatafeedRequest("datafeed_id")))
-				;
-		}
+		[U] public override async Task Urls() => await DELETE("/_xpack/ml/datafeeds/datafeed_id")
+			.Fluent(c => c.DeleteDatafeed("datafeed_id"))
+			.Request(c => c.DeleteDatafeed(new DeleteDatafeedRequest("datafeed_id")))
+			.FluentAsync(c => c.DeleteDatafeedAsync("datafeed_id"))
+			.RequestAsync(c => c.DeleteDatafeedAsync(new DeleteDatafeedRequest("datafeed_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataApiTests.cs
index e0841a1775b..920f9fdc9a0 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataApiTests.cs
@@ -8,29 +8,29 @@
 
 namespace Tests.XPack.MachineLearning.DeleteExpiredData
 {
-	public class DeleteExpiredDataApiTests : MachineLearningIntegrationTestBase<IDeleteExpiredDataResponse, IDeleteExpiredDataRequest, DeleteExpiredDataDescriptor, DeleteExpiredDataRequest>
+	public class DeleteExpiredDataApiTests
+		: MachineLearningIntegrationTestBase<IDeleteExpiredDataResponse, IDeleteExpiredDataRequest, DeleteExpiredDataDescriptor,
+			DeleteExpiredDataRequest>
 	{
 		public DeleteExpiredDataApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteExpiredData(f),
-			fluentAsync: (client, f) => client.DeleteExpiredDataAsync(f),
-			request: (client, r) => client.DeleteExpiredData(r),
-			requestAsync: (client, r) => client.DeleteExpiredDataAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
 		protected override int ExpectStatusCode => 200;
+		protected override Func<DeleteExpiredDataDescriptor, IDeleteExpiredDataRequest> Fluent => f => f;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+		protected override DeleteExpiredDataRequest Initializer => new DeleteExpiredDataRequest();
 		protected override string UrlPath => $"_xpack/ml/_delete_expired_data";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteExpiredData(f),
+			(client, f) => client.DeleteExpiredDataAsync(f),
+			(client, r) => client.DeleteExpiredData(r),
+			(client, r) => client.DeleteExpiredDataAsync(r)
+		);
+
 		protected override DeleteExpiredDataDescriptor NewDescriptor() => new DeleteExpiredDataDescriptor();
-		protected override object ExpectJson => null;
-		protected override Func<DeleteExpiredDataDescriptor, IDeleteExpiredDataRequest> Fluent => f => f;
-		protected override DeleteExpiredDataRequest Initializer => new DeleteExpiredDataRequest();
 
-		protected override void ExpectResponse(IDeleteExpiredDataResponse response)
-		{
-			response.Deleted.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IDeleteExpiredDataResponse response) => response.Deleted.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataUrlTests.cs
index be3a149ed4a..8736efe5b00 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DeleteExpiredData/DeleteExpiredDataUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.DeleteExpiredData
 {
 	public class DeleteExpiredDataUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await DELETE("/_xpack/ml/_delete_expired_data")
-				.Fluent(c => c.DeleteExpiredData())
-				.Request(c => c.DeleteExpiredData(new DeleteExpiredDataRequest()))
-				.FluentAsync(c => c.DeleteExpiredDataAsync())
-				.RequestAsync(c => c.DeleteExpiredDataAsync(new DeleteExpiredDataRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await DELETE("/_xpack/ml/_delete_expired_data")
+			.Fluent(c => c.DeleteExpiredData())
+			.Request(c => c.DeleteExpiredData(new DeleteExpiredDataRequest()))
+			.FluentAsync(c => c.DeleteExpiredDataAsync())
+			.RequestAsync(c => c.DeleteExpiredDataAsync(new DeleteExpiredDataRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DeleteJob/DeleteJobApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/DeleteJob/DeleteJobApiTests.cs
index bb07122ad26..af16e726d07 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DeleteJob/DeleteJobApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DeleteJob/DeleteJobApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -13,33 +12,28 @@ public class DeleteJobApiTests : MachineLearningIntegrationTestBase<IDeleteJobRe
 	{
 		public DeleteJobApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<DeleteJobDescriptor, IDeleteJobRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+		protected override DeleteJobRequest Initializer => new DeleteJobRequest(CallIsolatedValue);
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-			}
+			foreach (var callUniqueValue in values) PutJob(client, callUniqueValue.Value);
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteJob(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.DeleteJobAsync(CallIsolatedValue, f),
-			request: (client, r) => client.DeleteJob(r),
-			requestAsync: (client, r) => client.DeleteJobAsync(r)
+			(client, f) => client.DeleteJob(CallIsolatedValue, f),
+			(client, f) => client.DeleteJobAsync(CallIsolatedValue, f),
+			(client, r) => client.DeleteJob(r),
+			(client, r) => client.DeleteJobAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}";
 		protected override DeleteJobDescriptor NewDescriptor() => new DeleteJobDescriptor(CallIsolatedValue);
-		protected override object ExpectJson => null;
-		protected override Func<DeleteJobDescriptor, IDeleteJobRequest> Fluent => f => f;
-		protected override DeleteJobRequest Initializer => new DeleteJobRequest(CallIsolatedValue);
 
-		protected override void ExpectResponse(IDeleteJobResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IDeleteJobResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DeleteJob/DeleteJobUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/DeleteJob/DeleteJobUrlTests.cs
index 601800c94db..e395e99436d 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DeleteJob/DeleteJobUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DeleteJob/DeleteJobUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.DeleteJob
 {
 	public class DeleteJobUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await DELETE("/_xpack/ml/anomaly_detectors/job_id")
-				.Fluent(c => c.DeleteJob("job_id"))
-				.Request(c => c.DeleteJob(new DeleteJobRequest("job_id")))
-				.FluentAsync(c => c.DeleteJobAsync("job_id"))
-				.RequestAsync(c => c.DeleteJobAsync(new DeleteJobRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await DELETE("/_xpack/ml/anomaly_detectors/job_id")
+			.Fluent(c => c.DeleteJob("job_id"))
+			.Request(c => c.DeleteJob(new DeleteJobRequest("job_id")))
+			.FluentAsync(c => c.DeleteJobAsync("job_id"))
+			.RequestAsync(c => c.DeleteJobAsync(new DeleteJobRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotApiTests.cs
index 60b53dabd66..0b4cf7f929b 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -9,10 +8,20 @@
 
 namespace Tests.XPack.MachineLearning.DeleteModelSnapshot
 {
-	public class DeleteModelSnapshotApiTests : MachineLearningIntegrationTestBase<IDeleteModelSnapshotResponse, IDeleteModelSnapshotRequest, DeleteModelSnapshotDescriptor, DeleteModelSnapshotRequest>
+	public class DeleteModelSnapshotApiTests
+		: MachineLearningIntegrationTestBase<IDeleteModelSnapshotResponse, IDeleteModelSnapshotRequest, DeleteModelSnapshotDescriptor,
+			DeleteModelSnapshotRequest>
 	{
 		public DeleteModelSnapshotApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+		protected override DeleteModelSnapshotRequest Initializer => new DeleteModelSnapshotRequest(CallIsolatedValue, "1");
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots/1";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -25,24 +34,14 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteModelSnapshot(CallIsolatedValue, "1", f),
-			fluentAsync: (client, f) => client.DeleteModelSnapshotAsync(CallIsolatedValue, "1", f),
-			request: (client, r) => client.DeleteModelSnapshot(r),
-			requestAsync: (client, r) => client.DeleteModelSnapshotAsync(r)
+			(client, f) => client.DeleteModelSnapshot(CallIsolatedValue, "1", f),
+			(client, f) => client.DeleteModelSnapshotAsync(CallIsolatedValue, "1", f),
+			(client, r) => client.DeleteModelSnapshot(r),
+			(client, r) => client.DeleteModelSnapshotAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots/1";
-		protected override DeleteModelSnapshotDescriptor NewDescriptor() =>	new DeleteModelSnapshotDescriptor(CallIsolatedValue, "1");
-		protected override object ExpectJson => null;
-		protected override Func<DeleteModelSnapshotDescriptor, IDeleteModelSnapshotRequest> Fluent => f => f;
-		protected override DeleteModelSnapshotRequest Initializer => new DeleteModelSnapshotRequest(CallIsolatedValue, "1");
+		protected override DeleteModelSnapshotDescriptor NewDescriptor() => new DeleteModelSnapshotDescriptor(CallIsolatedValue, "1");
 
-		protected override void ExpectResponse(IDeleteModelSnapshotResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IDeleteModelSnapshotResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotUrlTests.cs
index 6c9b5cfa765..d4b368a5847 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DeleteModelSnapshot/DeleteModelSnapshotUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.DeleteModelSnapshot
 {
 	public class DeleteModelSnapshotUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await DELETE("/_xpack/ml/anomaly_detectors/job_id/model_snapshots/snapshot_id")
-				.Fluent(c => c.DeleteModelSnapshot("job_id", "snapshot_id"))
-				.Request(c => c.DeleteModelSnapshot(new DeleteModelSnapshotRequest("job_id", "snapshot_id")))
-				.FluentAsync(c => c.DeleteModelSnapshotAsync("job_id", "snapshot_id"))
-				.RequestAsync(c => c.DeleteModelSnapshotAsync(new DeleteModelSnapshotRequest("job_id", "snapshot_id")))
-				;
-		}
+		[U] public override async Task Urls() => await DELETE("/_xpack/ml/anomaly_detectors/job_id/model_snapshots/snapshot_id")
+			.Fluent(c => c.DeleteModelSnapshot("job_id", "snapshot_id"))
+			.Request(c => c.DeleteModelSnapshot(new DeleteModelSnapshotRequest("job_id", "snapshot_id")))
+			.FluentAsync(c => c.DeleteModelSnapshotAsync("job_id", "snapshot_id"))
+			.RequestAsync(c => c.DeleteModelSnapshotAsync(new DeleteModelSnapshotRequest("job_id", "snapshot_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/DetectorSerializationTests.cs b/src/Tests/Tests/XPack/MachineLearning/DetectorSerializationTests.cs
index 67d9af007e1..0a90ca224ce 100644
--- a/src/Tests/Tests/XPack/MachineLearning/DetectorSerializationTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/DetectorSerializationTests.cs
@@ -15,8 +15,8 @@ [U] public void CanSerializeAndDeserializeAllDetectors()
 			var detectorTypes =
 				from t in typeof(IDetector).Assembly().Types()
 				where typeof(IDetector).IsAssignableFrom(t) &&
-				      !t.IsAbstract() &&
-				      !typeof(IDescriptor).IsAssignableFrom(t)
+					!t.IsAbstract() &&
+					!typeof(IDescriptor).IsAssignableFrom(t)
 				select t;
 
 			var detectors = detectorTypes
diff --git a/src/Tests/Tests/XPack/MachineLearning/FlushJob/FlushJobApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/FlushJob/FlushJobApiTests.cs
index 76258efd35d..7834d2562ce 100644
--- a/src/Tests/Tests/XPack/MachineLearning/FlushJob/FlushJobApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/FlushJob/FlushJobApiTests.cs
@@ -12,36 +12,7 @@ public class FlushJobApiTests : MachineLearningIntegrationTestBase<IFlushJobResp
 	{
 		public FlushJobApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-				OpenJob(client, callUniqueValue.Value);
-			}
-		}
-
-		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-			{
-				CloseJob(client, callUniqueValue.Value);
-			}
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.FlushJob(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.FlushJobAsync(CallIsolatedValue, f),
-			request: (client, r) => client.FlushJob(r),
-			requestAsync: (client, r) => client.FlushJobAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_flush";
-		protected override bool SupportsDeserialization => false;
-		protected override FlushJobDescriptor NewDescriptor() => new FlushJobDescriptor(CallIsolatedValue);
 
 		protected override object ExpectJson => new
 		{
@@ -49,19 +20,46 @@ protected override LazyResponses ClientUsage() => Calls(
 			calc_interim = true
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<FlushJobDescriptor, IFlushJobRequest> Fluent => f => f
-			.AdvanceTime(new DateTimeOffset(2015, 1 , 1, 0, 0, 0, TimeSpan.Zero))
+			.AdvanceTime(new DateTimeOffset(2015, 1, 1, 0, 0, 0, TimeSpan.Zero))
 			.CalculateInterim();
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override FlushJobRequest Initializer => new FlushJobRequest(CallIsolatedValue)
 		{
-			AdvanceTime = new DateTimeOffset(2015, 1 , 1, 0, 0, 0, TimeSpan.Zero),
+			AdvanceTime = new DateTimeOffset(2015, 1, 1, 0, 0, 0, TimeSpan.Zero),
 			CalculateInterim = true
 		};
 
-		protected override void ExpectResponse(IFlushJobResponse response)
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_flush";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			response.Flushed.Should().BeTrue();
+			foreach (var callUniqueValue in values)
+			{
+				PutJob(client, callUniqueValue.Value);
+				OpenJob(client, callUniqueValue.Value);
+			}
+		}
+
+		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values) CloseJob(client, callUniqueValue.Value);
 		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.FlushJob(CallIsolatedValue, f),
+			(client, f) => client.FlushJobAsync(CallIsolatedValue, f),
+			(client, r) => client.FlushJob(r),
+			(client, r) => client.FlushJobAsync(r)
+		);
+
+		protected override FlushJobDescriptor NewDescriptor() => new FlushJobDescriptor(CallIsolatedValue);
+
+		protected override void ExpectResponse(IFlushJobResponse response) => response.Flushed.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/FlushJob/FlushJobUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/FlushJob/FlushJobUrlTests.cs
index cb01d6234b8..b4ae380426d 100644
--- a/src/Tests/Tests/XPack/MachineLearning/FlushJob/FlushJobUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/FlushJob/FlushJobUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.FlushJob
 {
 	public class FlushJobUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/_flush")
-				.Fluent(c => c.FlushJob("job_id"))
-				.Request(c => c.FlushJob(new FlushJobRequest("job_id")))
-				.FluentAsync(c => c.FlushJobAsync("job_id"))
-				.RequestAsync(c => c.FlushJobAsync(new FlushJobRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/_flush")
+			.Fluent(c => c.FlushJob("job_id"))
+			.Request(c => c.FlushJob(new FlushJobRequest("job_id")))
+			.FluentAsync(c => c.FlushJobAsync("job_id"))
+			.RequestAsync(c => c.FlushJobAsync(new FlushJobRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/ForecastJob/ForecastJobApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/ForecastJob/ForecastJobApiTests.cs
index 4b97cb30a41..9c9c4176b7f 100644
--- a/src/Tests/Tests/XPack/MachineLearning/ForecastJob/ForecastJobApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/ForecastJob/ForecastJobApiTests.cs
@@ -12,12 +12,21 @@
 namespace Tests.XPack.MachineLearning.ForecastJob
 {
 	[SkipVersion("<6.1.0", "Only exists in Elasticsearch 6.1.0+")]
-	public class ForecastJobApiTests : MachineLearningIntegrationTestBase<IForecastJobResponse, IForecastJobRequest, ForecastJobDescriptor, ForecastJobRequest>
+	public class ForecastJobApiTests
+		: MachineLearningIntegrationTestBase<IForecastJobResponse, IForecastJobRequest, ForecastJobDescriptor, ForecastJobRequest>
 	{
 		private const int BucketSpanSeconds = 3600;
 
 		public ForecastJobApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<ForecastJobDescriptor, IForecastJobRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override ForecastJobRequest Initializer => new ForecastJobRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_forecast";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -48,7 +57,7 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				var data = new List<object>(50);
 				while (timestamp < now)
 				{
-					data.AddRange(new []
+					data.AddRange(new[]
 					{
 						new { time = timestamp, value = 10d },
 						new { time = timestamp, value = 30d }
@@ -74,22 +83,14 @@ protected override void IntegrationTeardown(IElasticClient client, CallUniqueVal
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ForecastJob(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.ForecastJobAsync(CallIsolatedValue, f),
-			request: (client, r) => client.ForecastJob(r),
-			requestAsync: (client, r) => client.ForecastJobAsync(r)
+			(client, f) => client.ForecastJob(CallIsolatedValue, f),
+			(client, f) => client.ForecastJobAsync(CallIsolatedValue, f),
+			(client, r) => client.ForecastJob(r),
+			(client, r) => client.ForecastJobAsync(r)
 		);
 
 		protected override ForecastJobDescriptor NewDescriptor() => new ForecastJobDescriptor(CallIsolatedValue);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_forecast";
-		protected override object ExpectJson => null;
-		protected override Func<ForecastJobDescriptor, IForecastJobRequest> Fluent => f => f;
-		protected override ForecastJobRequest Initializer => new ForecastJobRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IForecastJobResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/ForecastJob/ForecastJobUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/ForecastJob/ForecastJobUrlTests.cs
index 34b5e7058a9..4ab301afe64 100644
--- a/src/Tests/Tests/XPack/MachineLearning/ForecastJob/ForecastJobUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/ForecastJob/ForecastJobUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.ForecastJob
 {
 	public class ForecastJobUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/_forecast")
-				.Fluent(c => c.ForecastJob("job_id"))
-				.Request(c => c.ForecastJob(new ForecastJobRequest("job_id")))
-				.FluentAsync(c => c.ForecastJobAsync("job_id"))
-				.RequestAsync(c => c.ForecastJobAsync(new ForecastJobRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/_forecast")
+			.Fluent(c => c.ForecastJob("job_id"))
+			.Request(c => c.ForecastJob(new ForecastJobRequest("job_id")))
+			.FluentAsync(c => c.ForecastJobAsync("job_id"))
+			.RequestAsync(c => c.ForecastJobAsync(new ForecastJobRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsApiTests.cs
index 80bf6572cf6..287f24ab665 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsApiTests.cs
@@ -10,10 +10,20 @@
 
 namespace Tests.XPack.MachineLearning.GetAnomalyRecords
 {
-	public class GetAnomalyRecordsApiTests : MachineLearningIntegrationTestBase<IGetAnomalyRecordsResponse, IGetAnomalyRecordsRequest, GetAnomalyRecordsDescriptor, GetAnomalyRecordsRequest>
+	public class GetAnomalyRecordsApiTests
+		: MachineLearningIntegrationTestBase<IGetAnomalyRecordsResponse, IGetAnomalyRecordsRequest, GetAnomalyRecordsDescriptor,
+			GetAnomalyRecordsRequest>
 	{
 		public GetAnomalyRecordsApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetAnomalyRecordsDescriptor, IGetAnomalyRecordsRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override GetAnomalyRecordsRequest Initializer => new GetAnomalyRecordsRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/records";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -24,20 +34,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetAnomalyRecords(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetAnomalyRecordsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetAnomalyRecords(r),
-			requestAsync: (client, r) => client.GetAnomalyRecordsAsync(r)
+			(client, f) => client.GetAnomalyRecords(CallIsolatedValue, f),
+			(client, f) => client.GetAnomalyRecordsAsync(CallIsolatedValue, f),
+			(client, r) => client.GetAnomalyRecords(r),
+			(client, r) => client.GetAnomalyRecordsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/records";
-		protected override object ExpectJson => null;
-		protected override Func<GetAnomalyRecordsDescriptor, IGetAnomalyRecordsRequest> Fluent => f => f;
-		protected override GetAnomalyRecordsRequest Initializer => new GetAnomalyRecordsRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IGetAnomalyRecordsResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsUrlTests.cs
index b3d3bc626b8..0a436013c11 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetAnomalyRecords/GetAnomalyRecordsUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -9,14 +8,10 @@ namespace Tests.XPack.MachineLearning.GetAnomalyRecords
 {
 	public class GetAnomalyRecordsUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/results/records")
-				.Fluent(c => c.GetAnomalyRecords("job_id"))
-				.Request(c => c.GetAnomalyRecords(new GetAnomalyRecordsRequest("job_id")))
-				.FluentAsync(c => c.GetAnomalyRecordsAsync("job_id"))
-				.RequestAsync(c => c.GetAnomalyRecordsAsync(new GetAnomalyRecordsRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/results/records")
+			.Fluent(c => c.GetAnomalyRecords("job_id"))
+			.Request(c => c.GetAnomalyRecords(new GetAnomalyRecordsRequest("job_id")))
+			.FluentAsync(c => c.GetAnomalyRecordsAsync("job_id"))
+			.RequestAsync(c => c.GetAnomalyRecordsAsync(new GetAnomalyRecordsRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetBuckets/GetBucketsApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetBuckets/GetBucketsApiTests.cs
index 369bdc8f627..5e8cfa4534e 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetBuckets/GetBucketsApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetBuckets/GetBucketsApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -11,10 +10,19 @@
 
 namespace Tests.XPack.MachineLearning.GetBuckets
 {
-	public class GetBucketsApiTests : MachineLearningIntegrationTestBase<IGetBucketsResponse, IGetBucketsRequest, GetBucketsDescriptor, GetBucketsRequest>
+	public class GetBucketsApiTests
+		: MachineLearningIntegrationTestBase<IGetBucketsResponse, IGetBucketsRequest, GetBucketsDescriptor, GetBucketsRequest>
 	{
 		public GetBucketsApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetBucketsDescriptor, IGetBucketsRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override GetBucketsRequest Initializer => new GetBucketsRequest(CallIsolatedValue);
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/buckets";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -25,20 +33,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetBuckets(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetBucketsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetBuckets(r),
-			requestAsync: (client, r) => client.GetBucketsAsync(r)
+			(client, f) => client.GetBuckets(CallIsolatedValue, f),
+			(client, f) => client.GetBucketsAsync(CallIsolatedValue, f),
+			(client, r) => client.GetBuckets(r),
+			(client, r) => client.GetBucketsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/buckets";
 		protected override GetBucketsDescriptor NewDescriptor() => new GetBucketsDescriptor(CallIsolatedValue);
-		protected override object ExpectJson => null;
-		protected override Func<GetBucketsDescriptor, IGetBucketsRequest> Fluent => f => f;
-		protected override GetBucketsRequest Initializer => new GetBucketsRequest(CallIsolatedValue);
 
 		protected override void ExpectResponse(IGetBucketsResponse response)
 		{
@@ -59,10 +60,27 @@ protected override void ExpectResponse(IGetBucketsResponse response)
 		}
 	}
 
-	public class GetBucketsWithTimestampApiTests : MachineLearningIntegrationTestBase<IGetBucketsResponse, IGetBucketsRequest, GetBucketsDescriptor, GetBucketsRequest>
+	public class GetBucketsWithTimestampApiTests
+		: MachineLearningIntegrationTestBase<IGetBucketsResponse, IGetBucketsRequest, GetBucketsDescriptor, GetBucketsRequest>
 	{
 		public GetBucketsWithTimestampApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<GetBucketsDescriptor, IGetBucketsRequest> Fluent =>
+			f => f.Timestamp(new DateTimeOffset(2016, 6, 2, 00, 00, 00, TimeSpan.Zero));
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected override GetBucketsRequest Initializer => new GetBucketsRequest(CallIsolatedValue)
+		{
+			Timestamp = new DateTimeOffset(2016, 6, 2, 00, 00, 00, TimeSpan.Zero)
+		};
+
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/buckets";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -73,23 +91,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetBuckets(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetBucketsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetBuckets(r),
-			requestAsync: (client, r) => client.GetBucketsAsync(r)
+			(client, f) => client.GetBuckets(CallIsolatedValue, f),
+			(client, f) => client.GetBucketsAsync(CallIsolatedValue, f),
+			(client, r) => client.GetBuckets(r),
+			(client, r) => client.GetBucketsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/buckets";
 		protected override GetBucketsDescriptor NewDescriptor() => new GetBucketsDescriptor(CallIsolatedValue);
-		protected override object ExpectJson => null;
-		protected override Func<GetBucketsDescriptor, IGetBucketsRequest> Fluent => f => f.Timestamp(new DateTimeOffset(2016, 6, 2, 00, 00, 00, TimeSpan.Zero));
-		protected override GetBucketsRequest Initializer => new GetBucketsRequest(CallIsolatedValue)
-		{
-			Timestamp = new DateTimeOffset(2016, 6, 2, 00, 00, 00, TimeSpan.Zero)
-		};
 
 		protected override void ExpectResponse(IGetBucketsResponse response)
 		{
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetBuckets/GetBucketsUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetBuckets/GetBucketsUrlTests.cs
index 6947e827327..4647560a499 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetBuckets/GetBucketsUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetBuckets/GetBucketsUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.GetBuckets
 {
 	public class GetBucketsUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/results/buckets")
-				.Fluent(c => c.GetBuckets("job_id"))
-				.Request(c => c.GetBuckets(new GetBucketsRequest("job_id")))
-				.FluentAsync(c => c.GetBucketsAsync("job_id"))
-				.RequestAsync(c => c.GetBucketsAsync(new GetBucketsRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/results/buckets")
+			.Fluent(c => c.GetBuckets("job_id"))
+			.Request(c => c.GetBuckets(new GetBucketsRequest("job_id")))
+			.FluentAsync(c => c.GetBucketsAsync("job_id"))
+			.RequestAsync(c => c.GetBucketsAsync(new GetBucketsRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetCategories/GetCategoriesApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetCategories/GetCategoriesApiTests.cs
index d02a017f58a..8b2064100f0 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetCategories/GetCategoriesApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetCategories/GetCategoriesApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -11,10 +10,28 @@
 
 namespace Tests.XPack.MachineLearning.GetCategories
 {
-	public class GetCategoriesApiTests : MachineLearningIntegrationTestBase<IGetCategoriesResponse, IGetCategoriesRequest, GetCategoriesDescriptor, GetCategoriesRequest>
+	public class GetCategoriesApiTests
+		: MachineLearningIntegrationTestBase<IGetCategoriesResponse, IGetCategoriesRequest, GetCategoriesDescriptor, GetCategoriesRequest>
 	{
 		public GetCategoriesApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetCategoriesDescriptor, IGetCategoriesRequest> Fluent => f => f.Page(p => p.From(0).Size(10));
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected override GetCategoriesRequest Initializer => new GetCategoriesRequest(CallIsolatedValue)
+		{
+			Page = new Page
+			{
+				From = 0,
+				Size = 10
+			}
+		};
+
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/categories/";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -25,28 +42,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetCategories(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetCategoriesAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetCategories(r),
-			requestAsync: (client, r) => client.GetCategoriesAsync(r)
+			(client, f) => client.GetCategories(CallIsolatedValue, f),
+			(client, f) => client.GetCategoriesAsync(CallIsolatedValue, f),
+			(client, r) => client.GetCategories(r),
+			(client, r) => client.GetCategoriesAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/categories/";
 		protected override GetCategoriesDescriptor NewDescriptor() => new GetCategoriesDescriptor(CallIsolatedValue);
-		protected override object ExpectJson => null;
-		protected override Func<GetCategoriesDescriptor, IGetCategoriesRequest> Fluent => f => f.Page(p => p.From(0).Size(10));
-
-		protected override GetCategoriesRequest Initializer => new GetCategoriesRequest(CallIsolatedValue)
-		{
-			Page = new Page
-			{
-				From = 0,
-				Size = 10
-			}
-		};
 
 		protected override void ExpectResponse(IGetCategoriesResponse response)
 		{
@@ -63,10 +65,19 @@ protected override void ExpectResponse(IGetCategoriesResponse response)
 		}
 	}
 
-	public class GetCategoriesWithCategoriesApiTests : MachineLearningIntegrationTestBase<IGetCategoriesResponse, IGetCategoriesRequest, GetCategoriesDescriptor, GetCategoriesRequest>
+	public class GetCategoriesWithCategoriesApiTests
+		: MachineLearningIntegrationTestBase<IGetCategoriesResponse, IGetCategoriesRequest, GetCategoriesDescriptor, GetCategoriesRequest>
 	{
 		public GetCategoriesWithCategoriesApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetCategoriesDescriptor, IGetCategoriesRequest> Fluent => f => f.CategoryId(1);
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override GetCategoriesRequest Initializer => new GetCategoriesRequest(CallIsolatedValue, 1);
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/categories/1";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -77,20 +88,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetCategories(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetCategoriesAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetCategories(r),
-			requestAsync: (client, r) => client.GetCategoriesAsync(r)
+			(client, f) => client.GetCategories(CallIsolatedValue, f),
+			(client, f) => client.GetCategoriesAsync(CallIsolatedValue, f),
+			(client, r) => client.GetCategories(r),
+			(client, r) => client.GetCategoriesAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/categories/1";
 		protected override GetCategoriesDescriptor NewDescriptor() => new GetCategoriesDescriptor(CallIsolatedValue);
-		protected override object ExpectJson => null;
-		protected override Func<GetCategoriesDescriptor, IGetCategoriesRequest> Fluent => f => f.CategoryId(1);
-		protected override GetCategoriesRequest Initializer => new GetCategoriesRequest(CallIsolatedValue, 1);
 
 		protected override void ExpectResponse(IGetCategoriesResponse response)
 		{
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetCategories/GetCategoriesUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetCategories/GetCategoriesUrlTests.cs
index 684d53e2bd0..2dc12a15d9c 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetCategories/GetCategoriesUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetCategories/GetCategoriesUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -12,17 +11,17 @@ public class GetCategoriesUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("_xpack/ml/anomaly_detectors/job_id/results/categories/")
-				.Fluent(c => c.GetCategories("job_id"))
-				.Request(c => c.GetCategories(new GetCategoriesRequest("job_id")))
-				.FluentAsync(c => c.GetCategoriesAsync("job_id"))
-				.RequestAsync(c => c.GetCategoriesAsync(new GetCategoriesRequest("job_id")))
+					.Fluent(c => c.GetCategories("job_id"))
+					.Request(c => c.GetCategories(new GetCategoriesRequest("job_id")))
+					.FluentAsync(c => c.GetCategoriesAsync("job_id"))
+					.RequestAsync(c => c.GetCategoriesAsync(new GetCategoriesRequest("job_id")))
 				;
 
 			await POST("_xpack/ml/anomaly_detectors/job_id/results/categories/1")
-				.Request(c => c.GetCategories(new GetCategoriesRequest("job_id", 1)))
-				.Fluent(c => c.GetCategories("job_id", r => r.CategoryId(1)))
-				.FluentAsync(c => c.GetCategoriesAsync("job_id", r => r.CategoryId(1)))
-				.RequestAsync(c => c.GetCategoriesAsync(new GetCategoriesRequest("job_id", 1)))
+					.Request(c => c.GetCategories(new GetCategoriesRequest("job_id", 1)))
+					.Fluent(c => c.GetCategories("job_id", r => r.CategoryId(1)))
+					.FluentAsync(c => c.GetCategoriesAsync("job_id", r => r.CategoryId(1)))
+					.RequestAsync(c => c.GetCategoriesAsync(new GetCategoriesRequest("job_id", 1)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsApiTests.cs
index 0dbc58424a8..265eb416e4a 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -11,10 +10,18 @@
 
 namespace Tests.XPack.MachineLearning.GetDatafeedStats
 {
-	public class GetDatafeedStatsApiTests : MachineLearningIntegrationTestBase<IGetDatafeedStatsResponse, IGetDatafeedStatsRequest, GetDatafeedStatsDescriptor, GetDatafeedStatsRequest>
+	public class GetDatafeedStatsApiTests
+		: MachineLearningIntegrationTestBase<IGetDatafeedStatsResponse, IGetDatafeedStatsRequest, GetDatafeedStatsDescriptor, GetDatafeedStatsRequest>
 	{
 		public GetDatafeedStatsApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override string UrlPath => $"_xpack/ml/datafeeds/_stats";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -25,19 +32,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetDatafeedStats(f),
-			fluentAsync: (client, f) => client.GetDatafeedStatsAsync(f),
-			request: (client, r) => client.GetDatafeedStats(r),
-			requestAsync: (client, r) => client.GetDatafeedStatsAsync(r)
+			(client, f) => client.GetDatafeedStats(f),
+			(client, f) => client.GetDatafeedStatsAsync(f),
+			(client, r) => client.GetDatafeedStats(r),
+			(client, r) => client.GetDatafeedStatsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"_xpack/ml/datafeeds/_stats";
-		protected override object ExpectJson => null;
-		protected override Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> Fluent => f => f;
-
 		protected override void ExpectResponse(IGetDatafeedStatsResponse response)
 		{
 			response.ShouldBeValid();
@@ -46,10 +46,19 @@ protected override void ExpectResponse(IGetDatafeedStatsResponse response)
 		}
 	}
 
-	public class GetDatafeedStatsWithDatafeedIdApiTests : MachineLearningIntegrationTestBase<IGetDatafeedStatsResponse, IGetDatafeedStatsRequest, GetDatafeedStatsDescriptor, GetDatafeedStatsRequest>
+	public class GetDatafeedStatsWithDatafeedIdApiTests
+		: MachineLearningIntegrationTestBase<IGetDatafeedStatsResponse, IGetDatafeedStatsRequest, GetDatafeedStatsDescriptor, GetDatafeedStatsRequest>
 	{
 		public GetDatafeedStatsWithDatafeedIdApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> Fluent => f => f.DatafeedId(CallIsolatedValue + "-datafeed");
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override GetDatafeedStatsRequest Initializer => new GetDatafeedStatsRequest(CallIsolatedValue + "-datafeed");
+		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_stats";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -60,20 +69,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetDatafeedStats(f),
-			fluentAsync: (client, f) => client.GetDatafeedStatsAsync(f),
-			request: (client, r) => client.GetDatafeedStats(r),
-			requestAsync: (client, r) => client.GetDatafeedStatsAsync(r)
+			(client, f) => client.GetDatafeedStats(f),
+			(client, f) => client.GetDatafeedStatsAsync(f),
+			(client, r) => client.GetDatafeedStats(r),
+			(client, r) => client.GetDatafeedStatsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_stats";
-		protected override object ExpectJson => null;
-		protected override Func<GetDatafeedStatsDescriptor, IGetDatafeedStatsRequest> Fluent => f => f.DatafeedId(CallIsolatedValue + "-datafeed");
-		protected override GetDatafeedStatsRequest Initializer => new GetDatafeedStatsRequest(CallIsolatedValue + "-datafeed");
-
 		protected override void ExpectResponse(IGetDatafeedStatsResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsUrlTests.cs
index c91e7d3f96a..b9370c5209e 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetDatafeedStats/GetDatafeedStatsUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -12,17 +11,17 @@ public class GetDatafeedStatsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/ml/datafeeds/_stats")
-				.Fluent(c => c.GetDatafeedStats())
-				.Request(c => c.GetDatafeedStats(new GetDatafeedStatsRequest()))
-				.FluentAsync(c => c.GetDatafeedStatsAsync())
-				.RequestAsync(c => c.GetDatafeedStatsAsync(new GetDatafeedStatsRequest()))
+					.Fluent(c => c.GetDatafeedStats())
+					.Request(c => c.GetDatafeedStats(new GetDatafeedStatsRequest()))
+					.FluentAsync(c => c.GetDatafeedStatsAsync())
+					.RequestAsync(c => c.GetDatafeedStatsAsync(new GetDatafeedStatsRequest()))
 				;
 
 			await GET("/_xpack/ml/datafeeds/datafeed_id/_stats")
-				.Fluent(c => c.GetDatafeedStats(r => r.DatafeedId("datafeed_id")))
-				.Request(c => c.GetDatafeedStats(new GetDatafeedStatsRequest("datafeed_id")))
-				.FluentAsync(c => c.GetDatafeedStatsAsync(r => r.DatafeedId("datafeed_id")))
-				.RequestAsync(c => c.GetDatafeedStatsAsync(new GetDatafeedStatsRequest("datafeed_id")))
+					.Fluent(c => c.GetDatafeedStats(r => r.DatafeedId("datafeed_id")))
+					.Request(c => c.GetDatafeedStats(new GetDatafeedStatsRequest("datafeed_id")))
+					.FluentAsync(c => c.GetDatafeedStatsAsync(r => r.DatafeedId("datafeed_id")))
+					.RequestAsync(c => c.GetDatafeedStatsAsync(new GetDatafeedStatsRequest("datafeed_id")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetDatafeeds/GetDatafeedsApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetDatafeeds/GetDatafeedsApiTests.cs
index e344bc2e8c1..4aeaf3648bb 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetDatafeeds/GetDatafeedsApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetDatafeeds/GetDatafeedsApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -11,10 +10,18 @@
 
 namespace Tests.XPack.MachineLearning.GetDatafeeds
 {
-	public class GetDatafeedsApiTests : MachineLearningIntegrationTestBase<IGetDatafeedsResponse, IGetDatafeedsRequest, GetDatafeedsDescriptor, GetDatafeedsRequest>
+	public class GetDatafeedsApiTests
+		: MachineLearningIntegrationTestBase<IGetDatafeedsResponse, IGetDatafeedsRequest, GetDatafeedsDescriptor, GetDatafeedsRequest>
 	{
 		public GetDatafeedsApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override string UrlPath => $"_xpack/ml/datafeeds";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -25,19 +32,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetDatafeeds(f),
-			fluentAsync: (client, f) => client.GetDatafeedsAsync(f),
-			request: (client, r) => client.GetDatafeeds(r),
-			requestAsync: (client, r) => client.GetDatafeedsAsync(r)
+			(client, f) => client.GetDatafeeds(f),
+			(client, f) => client.GetDatafeedsAsync(f),
+			(client, r) => client.GetDatafeeds(r),
+			(client, r) => client.GetDatafeedsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"_xpack/ml/datafeeds";
-		protected override object ExpectJson => null;
-		protected override Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> Fluent => f => f;
-
 		protected override void ExpectResponse(IGetDatafeedsResponse response)
 		{
 			response.ShouldBeValid();
@@ -69,10 +69,19 @@ protected override void ExpectResponse(IGetDatafeedsResponse response)
 		}
 	}
 
-	public class GetDatafeedsWithDatafeedIdApiTests : MachineLearningIntegrationTestBase<IGetDatafeedsResponse, IGetDatafeedsRequest, GetDatafeedsDescriptor, GetDatafeedsRequest>
+	public class GetDatafeedsWithDatafeedIdApiTests
+		: MachineLearningIntegrationTestBase<IGetDatafeedsResponse, IGetDatafeedsRequest, GetDatafeedsDescriptor, GetDatafeedsRequest>
 	{
 		public GetDatafeedsWithDatafeedIdApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> Fluent => f => f.DatafeedId(CallIsolatedValue + "-datafeed");
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override GetDatafeedsRequest Initializer => new GetDatafeedsRequest(CallIsolatedValue + "-datafeed");
+		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -83,20 +92,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetDatafeeds(f),
-			fluentAsync: (client, f) => client.GetDatafeedsAsync(f),
-			request: (client, r) => client.GetDatafeeds(r),
-			requestAsync: (client, r) => client.GetDatafeedsAsync(r)
+			(client, f) => client.GetDatafeeds(f),
+			(client, f) => client.GetDatafeedsAsync(f),
+			(client, r) => client.GetDatafeeds(r),
+			(client, r) => client.GetDatafeedsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed";
-		protected override object ExpectJson => null;
-		protected override Func<GetDatafeedsDescriptor, IGetDatafeedsRequest> Fluent => f => f.DatafeedId(CallIsolatedValue + "-datafeed");
-		protected override GetDatafeedsRequest Initializer => new GetDatafeedsRequest(CallIsolatedValue + "-datafeed");
-
 		protected override void ExpectResponse(IGetDatafeedsResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetDatafeeds/GetDatafeedsUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetDatafeeds/GetDatafeedsUrlTests.cs
index 1397db14c45..d80abeee540 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetDatafeeds/GetDatafeedsUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetDatafeeds/GetDatafeedsUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -12,17 +11,17 @@ public class GetDatafeedsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/ml/datafeeds")
-				.Fluent(c => c.GetDatafeeds())
-				.Request(c => c.GetDatafeeds(new GetDatafeedsRequest()))
-				.FluentAsync(c => c.GetDatafeedsAsync())
-				.RequestAsync(c => c.GetDatafeedsAsync(new GetDatafeedsRequest()))
+					.Fluent(c => c.GetDatafeeds())
+					.Request(c => c.GetDatafeeds(new GetDatafeedsRequest()))
+					.FluentAsync(c => c.GetDatafeedsAsync())
+					.RequestAsync(c => c.GetDatafeedsAsync(new GetDatafeedsRequest()))
 				;
 
 			await GET("/_xpack/ml/datafeeds/datafeed_id")
-				.Fluent(c => c.GetDatafeeds(r => r.DatafeedId("datafeed_id")))
-				.Request(c => c.GetDatafeeds(new GetDatafeedsRequest("datafeed_id")))
-				.FluentAsync(c => c.GetDatafeedsAsync(r => r.DatafeedId("datafeed_id")))
-				.RequestAsync(c => c.GetDatafeedsAsync(new GetDatafeedsRequest("datafeed_id")))
+					.Fluent(c => c.GetDatafeeds(r => r.DatafeedId("datafeed_id")))
+					.Request(c => c.GetDatafeeds(new GetDatafeedsRequest("datafeed_id")))
+					.FluentAsync(c => c.GetDatafeedsAsync(r => r.DatafeedId("datafeed_id")))
+					.RequestAsync(c => c.GetDatafeedsAsync(new GetDatafeedsRequest("datafeed_id")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetInfluencers/GetInfluencersApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetInfluencers/GetInfluencersApiTests.cs
index 44b28e85431..bf86147590a 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetInfluencers/GetInfluencersApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetInfluencers/GetInfluencersApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -11,10 +10,19 @@
 
 namespace Tests.XPack.MachineLearning.GetInfluencers
 {
-	public class GetInfluencersApiTests : MachineLearningIntegrationTestBase<IGetInfluencersResponse, IGetInfluencersRequest, GetInfluencersDescriptor, GetInfluencersRequest>
+	public class GetInfluencersApiTests
+		: MachineLearningIntegrationTestBase<IGetInfluencersResponse, IGetInfluencersRequest, GetInfluencersDescriptor, GetInfluencersRequest>
 	{
 		public GetInfluencersApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetInfluencersDescriptor, IGetInfluencersRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override GetInfluencersRequest Initializer => new GetInfluencersRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/influencers";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -25,20 +33,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetInfluencers(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetInfluencersAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetInfluencers(r),
-			requestAsync: (client, r) => client.GetInfluencersAsync(r)
+			(client, f) => client.GetInfluencers(CallIsolatedValue, f),
+			(client, f) => client.GetInfluencersAsync(CallIsolatedValue, f),
+			(client, r) => client.GetInfluencers(r),
+			(client, r) => client.GetInfluencersAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/influencers";
-		protected override object ExpectJson => null;
-		protected override Func<GetInfluencersDescriptor, IGetInfluencersRequest> Fluent => f => f;
-		protected override GetInfluencersRequest Initializer => new GetInfluencersRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IGetInfluencersResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetInfluencers/GetInfluencersUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetInfluencers/GetInfluencersUrlTests.cs
index 8fbbf863896..e5b68a0ebfd 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetInfluencers/GetInfluencersUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetInfluencers/GetInfluencersUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -9,14 +8,10 @@ namespace Tests.XPack.MachineLearning.GetInfluencers
 {
 	public class GetInfluencersUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/results/influencers")
-				.Fluent(c => c.GetInfluencers("job_id"))
-				.Request(c => c.GetInfluencers(new GetInfluencersRequest("job_id")))
-				.FluentAsync(c => c.GetInfluencersAsync("job_id"))
-				.RequestAsync(c => c.GetInfluencersAsync(new GetInfluencersRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/results/influencers")
+			.Fluent(c => c.GetInfluencers("job_id"))
+			.Request(c => c.GetInfluencers(new GetInfluencersRequest("job_id")))
+			.FluentAsync(c => c.GetInfluencersAsync("job_id"))
+			.RequestAsync(c => c.GetInfluencersAsync(new GetInfluencersRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetJobStats/GetJobStatsApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetJobStats/GetJobStatsApiTests.cs
index a7ea26820d4..6307e3f472d 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetJobStats/GetJobStatsApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetJobStats/GetJobStatsApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -11,33 +10,31 @@
 
 namespace Tests.XPack.MachineLearning.GetJobStats
 {
-	public class GetJobStatsApiTests : MachineLearningIntegrationTestBase<IGetJobStatsResponse, IGetJobStatsRequest, GetJobStatsDescriptor, GetJobStatsRequest>
+	public class GetJobStatsApiTests
+		: MachineLearningIntegrationTestBase<IGetJobStatsResponse, IGetJobStatsRequest, GetJobStatsDescriptor, GetJobStatsRequest>
 	{
 		public GetJobStatsApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetJobStatsDescriptor, IGetJobStatsRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override GetJobStatsRequest Initializer => new GetJobStatsRequest();
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/_stats";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-			}
+			foreach (var callUniqueValue in values) PutJob(client, callUniqueValue.Value);
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetJobStats(f),
-			fluentAsync: (client, f) => client.GetJobStatsAsync(f),
-			request: (client, r) => client.GetJobStats(r),
-			requestAsync: (client, r) => client.GetJobStatsAsync(r)
+			(client, f) => client.GetJobStats(f),
+			(client, f) => client.GetJobStatsAsync(f),
+			(client, r) => client.GetJobStats(r),
+			(client, r) => client.GetJobStatsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/_stats";
-		protected override object ExpectJson => null;
-		protected override Func<GetJobStatsDescriptor, IGetJobStatsRequest> Fluent => f => f;
-		protected override GetJobStatsRequest Initializer => new GetJobStatsRequest();
-
 		protected override void ExpectResponse(IGetJobStatsResponse response)
 		{
 			response.ShouldBeValid();
@@ -73,33 +70,31 @@ protected override void ExpectResponse(IGetJobStatsResponse response)
 		}
 	}
 
-	public class GetJobStatsWithJobIdApiTests : MachineLearningIntegrationTestBase<IGetJobStatsResponse, IGetJobStatsRequest, GetJobStatsDescriptor, GetJobStatsRequest>
+	public class GetJobStatsWithJobIdApiTests
+		: MachineLearningIntegrationTestBase<IGetJobStatsResponse, IGetJobStatsRequest, GetJobStatsDescriptor, GetJobStatsRequest>
 	{
 		public GetJobStatsWithJobIdApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetJobStatsDescriptor, IGetJobStatsRequest> Fluent => f => f.JobId(CallIsolatedValue);
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override GetJobStatsRequest Initializer => new GetJobStatsRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_stats";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-			}
+			foreach (var callUniqueValue in values) PutJob(client, callUniqueValue.Value);
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetJobStats(f),
-			fluentAsync: (client, f) => client.GetJobStatsAsync(f),
-			request: (client, r) => client.GetJobStats(r),
-			requestAsync: (client, r) => client.GetJobStatsAsync(r)
+			(client, f) => client.GetJobStats(f),
+			(client, f) => client.GetJobStatsAsync(f),
+			(client, r) => client.GetJobStats(r),
+			(client, r) => client.GetJobStatsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_stats";
-		protected override object ExpectJson => null;
-		protected override Func<GetJobStatsDescriptor, IGetJobStatsRequest> Fluent => f => f.JobId(CallIsolatedValue);
-		protected override GetJobStatsRequest Initializer => new GetJobStatsRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IGetJobStatsResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetJobStats/GetJobStatsUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetJobStats/GetJobStatsUrlTests.cs
index 1be61ccdb11..86450e3b695 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetJobStats/GetJobStatsUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetJobStats/GetJobStatsUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -12,17 +11,17 @@ public class GetJobStatsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/ml/anomaly_detectors/_stats")
-				.Fluent(c => c.GetJobStats())
-				.Request(c => c.GetJobStats(new GetJobStatsRequest()))
-				.FluentAsync(c => c.GetJobStatsAsync())
-				.RequestAsync(c => c.GetJobStatsAsync(new GetJobStatsRequest()))
+					.Fluent(c => c.GetJobStats())
+					.Request(c => c.GetJobStats(new GetJobStatsRequest()))
+					.FluentAsync(c => c.GetJobStatsAsync())
+					.RequestAsync(c => c.GetJobStatsAsync(new GetJobStatsRequest()))
 				;
 
 			await GET("/_xpack/ml/anomaly_detectors/job_id/_stats")
-				.Fluent(c => c.GetJobStats(r => r.JobId("job_id")))
-				.Request(c => c.GetJobStats(new GetJobStatsRequest("job_id")))
-				.FluentAsync(c => c.GetJobStatsAsync(r => r.JobId("job_id")))
-				.RequestAsync(c => c.GetJobStatsAsync(new GetJobStatsRequest("job_id")))
+					.Fluent(c => c.GetJobStats(r => r.JobId("job_id")))
+					.Request(c => c.GetJobStats(new GetJobStatsRequest("job_id")))
+					.FluentAsync(c => c.GetJobStatsAsync(r => r.JobId("job_id")))
+					.RequestAsync(c => c.GetJobStatsAsync(new GetJobStatsRequest("job_id")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetJobs/GetJobsApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetJobs/GetJobsApiTests.cs
index cc3304afcfc..60ac43dc10e 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetJobs/GetJobsApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetJobs/GetJobsApiTests.cs
@@ -14,29 +14,26 @@ public class GetJobsApiTests : MachineLearningIntegrationTestBase<IGetJobsRespon
 	{
 		public GetJobsApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetJobsDescriptor, IGetJobsRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override GetJobsRequest Initializer => new GetJobsRequest();
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-			}
+			foreach (var callUniqueValue in values) PutJob(client, callUniqueValue.Value);
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetJobs(f),
-			fluentAsync: (client, f) => client.GetJobsAsync(f),
-			request: (client, r) => client.GetJobs(r),
-			requestAsync: (client, r) => client.GetJobsAsync(r)
+			(client, f) => client.GetJobs(f),
+			(client, f) => client.GetJobsAsync(f),
+			(client, r) => client.GetJobs(r),
+			(client, r) => client.GetJobsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors";
-		protected override object ExpectJson => null;
-		protected override Func<GetJobsDescriptor, IGetJobsRequest> Fluent => f => f;
-		protected override GetJobsRequest Initializer => new GetJobsRequest();
-
 		protected override void ExpectResponse(IGetJobsResponse response)
 		{
 			response.ShouldBeValid();
@@ -75,29 +72,26 @@ public class GetJobsWithJobIdApiTests : MachineLearningIntegrationTestBase<IGetJ
 	{
 		public GetJobsWithJobIdApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetJobsDescriptor, IGetJobsRequest> Fluent => f => f.JobId(CallIsolatedValue);
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override GetJobsRequest Initializer => new GetJobsRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-			}
+			foreach (var callUniqueValue in values) PutJob(client, callUniqueValue.Value);
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetJobs(f),
-			fluentAsync: (client, f) => client.GetJobsAsync(f),
-			request: (client, r) => client.GetJobs(r),
-			requestAsync: (client, r) => client.GetJobsAsync(r)
+			(client, f) => client.GetJobs(f),
+			(client, f) => client.GetJobsAsync(f),
+			(client, r) => client.GetJobs(r),
+			(client, r) => client.GetJobsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}";
-		protected override object ExpectJson => null;
-		protected override Func<GetJobsDescriptor, IGetJobsRequest> Fluent => f => f.JobId(CallIsolatedValue);
-		protected override GetJobsRequest Initializer => new GetJobsRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IGetJobsResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetJobs/GetJobsUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetJobs/GetJobsUrlTests.cs
index b73b915b258..a3c1db4d7a5 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetJobs/GetJobsUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetJobs/GetJobsUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -12,17 +11,17 @@ public class GetJobsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/ml/anomaly_detectors")
-				.Fluent(c => c.GetJobs())
-				.Request(c => c.GetJobs(new GetJobsRequest()))
-				.FluentAsync(c => c.GetJobsAsync())
-				.RequestAsync(c => c.GetJobsAsync(new GetJobsRequest()))
+					.Fluent(c => c.GetJobs())
+					.Request(c => c.GetJobs(new GetJobsRequest()))
+					.FluentAsync(c => c.GetJobsAsync())
+					.RequestAsync(c => c.GetJobsAsync(new GetJobsRequest()))
 				;
 
 			await GET("/_xpack/ml/anomaly_detectors/job_id")
-				.Fluent(c => c.GetJobs(r => r.JobId("job_id")))
-				.Request(c => c.GetJobs(new GetJobsRequest("job_id")))
-				.FluentAsync(c => c.GetJobsAsync(r => r.JobId("job_id")))
-				.RequestAsync(c => c.GetJobsAsync(new GetJobsRequest("job_id")))
+					.Fluent(c => c.GetJobs(r => r.JobId("job_id")))
+					.Request(c => c.GetJobs(new GetJobsRequest("job_id")))
+					.FluentAsync(c => c.GetJobsAsync(r => r.JobId("job_id")))
+					.RequestAsync(c => c.GetJobsAsync(new GetJobsRequest("job_id")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsApiTests.cs
index f3e9a4bc305..5a8f05bff1f 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsApiTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -11,10 +10,20 @@
 
 namespace Tests.XPack.MachineLearning.GetModelSnapshots
 {
-	public class GetModelSnapshotsApiTests : MachineLearningIntegrationTestBase<IGetModelSnapshotsResponse, IGetModelSnapshotsRequest, GetModelSnapshotsDescriptor, GetModelSnapshotsRequest>
+	public class GetModelSnapshotsApiTests
+		: MachineLearningIntegrationTestBase<IGetModelSnapshotsResponse, IGetModelSnapshotsRequest, GetModelSnapshotsDescriptor,
+			GetModelSnapshotsRequest>
 	{
 		public GetModelSnapshotsApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override GetModelSnapshotsRequest Initializer => new GetModelSnapshotsRequest(CallIsolatedValue);
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -25,20 +34,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetModelSnapshots(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetModelSnapshotsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetModelSnapshots(r),
-			requestAsync: (client, r) => client.GetModelSnapshotsAsync(r)
+			(client, f) => client.GetModelSnapshots(CallIsolatedValue, f),
+			(client, f) => client.GetModelSnapshotsAsync(CallIsolatedValue, f),
+			(client, r) => client.GetModelSnapshots(r),
+			(client, r) => client.GetModelSnapshotsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots";
-		protected override object ExpectJson => null;
-		protected override Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> Fluent => f => f;
 		protected override GetModelSnapshotsDescriptor NewDescriptor() => new GetModelSnapshotsDescriptor(CallIsolatedValue);
-		protected override GetModelSnapshotsRequest Initializer => new GetModelSnapshotsRequest(CallIsolatedValue);
 
 		protected override void ExpectResponse(IGetModelSnapshotsResponse response)
 		{
@@ -55,10 +57,20 @@ protected override void ExpectResponse(IGetModelSnapshotsResponse response)
 		}
 	}
 
-	public class GetModelSnapshotsWithSnapshotIdApiTests : MachineLearningIntegrationTestBase<IGetModelSnapshotsResponse, IGetModelSnapshotsRequest, GetModelSnapshotsDescriptor, GetModelSnapshotsRequest>
+	public class GetModelSnapshotsWithSnapshotIdApiTests
+		: MachineLearningIntegrationTestBase<IGetModelSnapshotsResponse, IGetModelSnapshotsRequest, GetModelSnapshotsDescriptor,
+			GetModelSnapshotsRequest>
 	{
 		public GetModelSnapshotsWithSnapshotIdApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> Fluent => f => f.SnapshotId(1);
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override GetModelSnapshotsRequest Initializer => new GetModelSnapshotsRequest(CallIsolatedValue, 1);
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots/1";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -69,20 +81,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetModelSnapshots(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetModelSnapshotsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetModelSnapshots(r),
-			requestAsync: (client, r) => client.GetModelSnapshotsAsync(r)
+			(client, f) => client.GetModelSnapshots(CallIsolatedValue, f),
+			(client, f) => client.GetModelSnapshotsAsync(CallIsolatedValue, f),
+			(client, r) => client.GetModelSnapshots(r),
+			(client, r) => client.GetModelSnapshotsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots/1";
-		protected override object ExpectJson => null;
-		protected override Func<GetModelSnapshotsDescriptor, IGetModelSnapshotsRequest> Fluent => f => f.SnapshotId(1);
 		protected override GetModelSnapshotsDescriptor NewDescriptor() => new GetModelSnapshotsDescriptor(CallIsolatedValue);
-		protected override GetModelSnapshotsRequest Initializer => new GetModelSnapshotsRequest(CallIsolatedValue, 1);
 
 		protected override void ExpectResponse(IGetModelSnapshotsResponse response)
 		{
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsUrlTests.cs
index df0b1dff4a8..ba932ae2fb7 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetModelSnapshots/GetModelSnapshotsUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -12,17 +11,17 @@ public class GetModelSnapshotsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/_xpack/ml/anomaly_detectors/job_id/model_snapshots")
-				.Fluent(c => c.GetModelSnapshots("job_id"))
-				.Request(c => c.GetModelSnapshots(new GetModelSnapshotsRequest("job_id")))
-				.FluentAsync(c => c.GetModelSnapshotsAsync("job_id"))
-				.RequestAsync(c => c.GetModelSnapshotsAsync(new GetModelSnapshotsRequest("job_id")))
+					.Fluent(c => c.GetModelSnapshots("job_id"))
+					.Request(c => c.GetModelSnapshots(new GetModelSnapshotsRequest("job_id")))
+					.FluentAsync(c => c.GetModelSnapshotsAsync("job_id"))
+					.RequestAsync(c => c.GetModelSnapshotsAsync(new GetModelSnapshotsRequest("job_id")))
 				;
 
 			await POST("/_xpack/ml/anomaly_detectors/job_id/model_snapshots/snapshot_id")
-				.Fluent(c => c.GetModelSnapshots("job_id", r => r.SnapshotId("snapshot_id")))
-				.Request(c => c.GetModelSnapshots(new GetModelSnapshotsRequest("job_id", "snapshot_id")))
-				.FluentAsync(c => c.GetModelSnapshotsAsync("job_id", r => r.SnapshotId("snapshot_id")))
-				.RequestAsync(c => c.GetModelSnapshotsAsync(new GetModelSnapshotsRequest("job_id", "snapshot_id")))
+					.Fluent(c => c.GetModelSnapshots("job_id", r => r.SnapshotId("snapshot_id")))
+					.Request(c => c.GetModelSnapshots(new GetModelSnapshotsRequest("job_id", "snapshot_id")))
+					.FluentAsync(c => c.GetModelSnapshotsAsync("job_id", r => r.SnapshotId("snapshot_id")))
+					.RequestAsync(c => c.GetModelSnapshotsAsync(new GetModelSnapshotsRequest("job_id", "snapshot_id")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsApiTests.cs
index f2a3a0823c8..dc82e16a38e 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsApiTests.cs
@@ -13,13 +13,23 @@
 namespace Tests.XPack.MachineLearning.GetOverallBuckets
 {
 	[SkipVersion("<6.1.0", "Only exists in Elasticsearch 6.1.0+")]
-	public class GetOverallBucketsApiTests : MachineLearningIntegrationTestBase<IGetOverallBucketsResponse, IGetOverallBucketsRequest, GetOverallBucketsDescriptor, GetOverallBucketsRequest>
+	public class GetOverallBucketsApiTests
+		: MachineLearningIntegrationTestBase<IGetOverallBucketsResponse, IGetOverallBucketsRequest, GetOverallBucketsDescriptor,
+			GetOverallBucketsRequest>
 	{
 		private const int BucketSpanSeconds = 3600;
 		private const int OverallBucketCount = 3000;
 
 		public GetOverallBucketsApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<GetOverallBucketsDescriptor, IGetOverallBucketsRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override GetOverallBucketsRequest Initializer => new GetOverallBucketsRequest(CallIsolatedValue);
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/overall_buckets";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -48,14 +58,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				{
 					data.Add(new { time = timestamp });
 					if (i % 1000 == 0)
-					{
-						data.AddRange(new []
+						data.AddRange(new[]
 						{
 							new { time = timestamp },
 							new { time = timestamp },
 							new { time = timestamp }
 						});
-					}
 					timestamp += BucketSpanSeconds * 1000;
 				}
 
@@ -69,20 +77,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetOverallBuckets(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetOverallBucketsAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetOverallBuckets(r),
-			requestAsync: (client, r) => client.GetOverallBucketsAsync(r)
+			(client, f) => client.GetOverallBuckets(CallIsolatedValue, f),
+			(client, f) => client.GetOverallBucketsAsync(CallIsolatedValue, f),
+			(client, r) => client.GetOverallBuckets(r),
+			(client, r) => client.GetOverallBucketsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/results/overall_buckets";
 		protected override GetOverallBucketsDescriptor NewDescriptor() => new GetOverallBucketsDescriptor(CallIsolatedValue);
-		protected override object ExpectJson => null;
-		protected override Func<GetOverallBucketsDescriptor, IGetOverallBucketsRequest> Fluent => f => f;
-		protected override GetOverallBucketsRequest Initializer => new GetOverallBucketsRequest(CallIsolatedValue);
 
 		protected override void ExpectResponse(IGetOverallBucketsResponse response)
 		{
diff --git a/src/Tests/Tests/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsUrlTests.cs
index e97afbbf8dd..0f2d53fa762 100644
--- a/src/Tests/Tests/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/GetOverallBuckets/GetOverallBucketsUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.GetOverallBuckets
 {
 	public class GetOverallBucketsUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/results/overall_buckets")
-				.Fluent(c => c.GetOverallBuckets("job_id"))
-				.Request(c => c.GetOverallBuckets(new GetOverallBucketsRequest("job_id")))
-				.FluentAsync(c => c.GetOverallBucketsAsync("job_id"))
-				.RequestAsync(c => c.GetOverallBucketsAsync(new GetOverallBucketsRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/results/overall_buckets")
+			.Fluent(c => c.GetOverallBuckets("job_id"))
+			.Request(c => c.GetOverallBuckets(new GetOverallBucketsRequest("job_id")))
+			.FluentAsync(c => c.GetOverallBucketsAsync("job_id"))
+			.RequestAsync(c => c.GetOverallBucketsAsync(new GetOverallBucketsRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/MachineLearningCluster.cs b/src/Tests/Tests/XPack/MachineLearning/MachineLearningCluster.cs
index 93a807b888c..47a24606cfd 100644
--- a/src/Tests/Tests/XPack/MachineLearning/MachineLearningCluster.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/MachineLearningCluster.cs
@@ -16,9 +16,9 @@ public MachineLearningCluster() : base(new XPackClusterConfiguration
 			MaxConcurrency = 1,
 			DefaultNodeSettings =
 			{
-				{ "xpack.ml.node_concurrent_job_allocations", "4", ">=5.4.0"},
-				{ "node.attr.ml.max_open_jobs", "30", ">=5.4.0 <6.0.0"},
-				{ "xpack.ml.max_open_jobs", "30", ">=6.0.0"}
+				{ "xpack.ml.node_concurrent_job_allocations", "4", ">=5.4.0" },
+				{ "node.attr.ml.max_open_jobs", "30", ">=5.4.0 <6.0.0" },
+				{ "xpack.ml.max_open_jobs", "30", ">=6.0.0" }
 			},
 			AdditionalBeforeNodeStartedTasks =
 			{
@@ -27,7 +27,7 @@ public MachineLearningCluster() : base(new XPackClusterConfiguration
 			Timeout = TimeSpan.FromMinutes(10),
 		}) { }
 
-		protected override void SeedCluster() => new MachineLearningSeeder(this.Client, this.ClusterConfiguration.FileSystem).SeedNode();
+		protected override void SeedCluster() => new MachineLearningSeeder(Client, ClusterConfiguration.FileSystem).SeedNode();
 	}
 
 	public class DownloadMachineLearningSampleDataDistribution : ClusterComposeTask
diff --git a/src/Tests/Tests/XPack/MachineLearning/MachineLearningIntegrationTestBase.cs b/src/Tests/Tests/XPack/MachineLearning/MachineLearningIntegrationTestBase.cs
index b2201f7e1a4..8431065d2ca 100644
--- a/src/Tests/Tests/XPack/MachineLearning/MachineLearningIntegrationTestBase.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/MachineLearningIntegrationTestBase.cs
@@ -58,6 +58,7 @@ protected IOpenJobResponse OpenJob(IElasticClient client, string jobId)
 			var openJobResponse = client.OpenJob(jobId);
 			if (!openJobResponse.IsValid || openJobResponse.Opened == false)
 				throw new Exception($"Problem opening job {jobId} for integration test: {openJobResponse.DebugInformation}");
+
 			return openJobResponse;
 		}
 
@@ -66,6 +67,7 @@ protected IFlushJobResponse FlushJob(IElasticClient client, string jobId, bool c
 			var flushJobResponse = client.FlushJob(jobId, f => f.CalculateInterim(calculateInterim));
 			if (!flushJobResponse.IsValid || flushJobResponse.Flushed == false)
 				throw new Exception($"Problem flushing job {jobId} for integration test: {flushJobResponse.DebugInformation}");
+
 			return flushJobResponse;
 		}
 
@@ -74,6 +76,7 @@ protected ICloseJobResponse CloseJob(IElasticClient client, string jobId)
 			var closeJobResponse = client.CloseJob(jobId);
 			if (!closeJobResponse.IsValid || closeJobResponse.Closed == false)
 				throw new Exception($"Problem closing job {jobId} for integration test: : {closeJobResponse.DebugInformation}");
+
 			return closeJobResponse;
 		}
 
@@ -82,6 +85,7 @@ protected IDeleteJobResponse DeleteJob(IElasticClient client, string jobId)
 			var deleteJobResponse = client.DeleteJob(jobId);
 			if (!deleteJobResponse.IsValid || deleteJobResponse.Acknowledged == false)
 				throw new Exception($"Problem deleting job {jobId} for integration test: : {deleteJobResponse.DebugInformation}");
+
 			return deleteJobResponse;
 		}
 
@@ -102,6 +106,7 @@ protected IStartDatafeedResponse StartDatafeed(IElasticClient client, string job
 			var startDatafeedResponse = client.StartDatafeed(jobId + "-datafeed");
 			if (!startDatafeedResponse.IsValid || startDatafeedResponse.Started == false)
 				throw new Exception($"Problem starting datafeed for job {jobId} for integration test: {startDatafeedResponse.DebugInformation}");
+
 			return startDatafeedResponse;
 		}
 
@@ -110,12 +115,13 @@ protected IStopDatafeedResponse StopDatafeed(IElasticClient client, string jobId
 			var stopDatafeedResponse = client.StopDatafeed(jobId + "-datafeed");
 			if (!stopDatafeedResponse.IsValid || stopDatafeedResponse.Stopped == false)
 				throw new Exception($"Problem stopping datafeed for job {jobId} for integration test: {stopDatafeedResponse.DebugInformation}");
+
 			return stopDatafeedResponse;
 		}
 
 		protected void IndexSnapshot(IElasticClient client, string jobId, string snapshotId, string timestamp = "2016-06-02T00:00:00Z")
 		{
-			var unixTimestamp = (int)(DateTime.Parse(timestamp).Subtract(new DateTime(1970, 1, 1)).TotalSeconds);
+			var unixTimestamp = (int)DateTime.Parse(timestamp).Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
 
 			client.Index<object>(new
 			{
@@ -126,20 +132,22 @@ protected void IndexSnapshot(IElasticClient client, string jobId, string snapsho
 				latest_record_time_stamp = timestamp,
 				latest_result_time_stamp = timestamp,
 				snapshot_doc_count = 1,
-				model_size_stats = new {
+				model_size_stats = new
+				{
 					job_id = jobId,
 					model_bytes = 20,
 					log_time = timestamp
 				},
-				quantiles = new {
+				quantiles = new
+				{
 					job_id = jobId,
 					timestamp = unixTimestamp,
 					quantile_state = "quantiles-2"
 				}
 			}, i => i.Id(jobId + "_model_snapshot_" + snapshotId)
-					 .Type("doc")
-				     .Index(".ml-anomalies-" + jobId)
-					 .Refresh(Refresh.WaitFor));
+				.Type("doc")
+				.Index(".ml-anomalies-" + jobId)
+				.Refresh(Refresh.WaitFor));
 
 			// Index a bucket result, else RevertModelSnapshot throws a null
 			client.Index<object>(new
@@ -149,58 +157,46 @@ protected void IndexSnapshot(IElasticClient client, string jobId, string snapsho
 				timestamp = timestamp,
 				bucket_span = 1,
 			}, i => i.Id(jobId + "_" + unixTimestamp + "_1")
-					  .Type("doc")
-				      .Index(".ml-anomalies-" + jobId)
-					  .Refresh(Refresh.WaitFor));
+				.Type("doc")
+				.Index(".ml-anomalies-" + jobId)
+				.Refresh(Refresh.WaitFor));
 		}
 
-		protected void IndexAnomalyRecord(IElasticClient client, string jobId, DateTimeOffset timestamp)
+		protected void IndexAnomalyRecord(IElasticClient client, string jobId, DateTimeOffset timestamp) => client.Index<object>(new
 		{
-			client.Index<object>(new
-			{
-				job_id = jobId,
-				result_type = "record",
-				timestamp = timestamp.ToString("o"),
-				record_score = 80.0,
-				bucket_span = 1,
-				is_interim = true
-			}, i => i.Type("doc").Index(".ml-anomalies-" + jobId).Refresh(Refresh.WaitFor));
-		}
-
-		protected void IndexBucket(IElasticClient client, string jobId, DateTimeOffset timestamp)
+			job_id = jobId,
+			result_type = "record",
+			timestamp = timestamp.ToString("o"),
+			record_score = 80.0,
+			bucket_span = 1,
+			is_interim = true
+		}, i => i.Type("doc").Index(".ml-anomalies-" + jobId).Refresh(Refresh.WaitFor));
+
+		protected void IndexBucket(IElasticClient client, string jobId, DateTimeOffset timestamp) => client.Index<object>(new
 		{
-			client.Index<object>(new
-			{
-				job_id = jobId,
-				result_type = "bucket",
-				timestamp = timestamp.ToString("o"),
-				anomaly_score = 90.0,
-				bucket_span = 1,
-				is_interim = true
-			}, i => i.Type("doc").Index(".ml-anomalies-" + jobId).Refresh(Refresh.WaitFor));
-		}
-
-		protected void IndexCategory(IElasticClient client, string jobId)
+			job_id = jobId,
+			result_type = "bucket",
+			timestamp = timestamp.ToString("o"),
+			anomaly_score = 90.0,
+			bucket_span = 1,
+			is_interim = true
+		}, i => i.Type("doc").Index(".ml-anomalies-" + jobId).Refresh(Refresh.WaitFor));
+
+		protected void IndexCategory(IElasticClient client, string jobId) => client.Index<object>(new
 		{
-			client.Index<object>(new
-			{
-				job_id = jobId,
-				category_id = "1"
-			}, i => i.Type("doc").Index(".ml-anomalies-" + jobId).Refresh(Refresh.WaitFor));
-		}
+			job_id = jobId,
+			category_id = "1"
+		}, i => i.Type("doc").Index(".ml-anomalies-" + jobId).Refresh(Refresh.WaitFor));
 
-		protected void IndexInfluencer(IElasticClient client, string jobId, DateTimeOffset timestamp)
+		protected void IndexInfluencer(IElasticClient client, string jobId, DateTimeOffset timestamp) => client.Index<object>(new
 		{
-			client.Index<object>(new
-			{
-				job_id = jobId,
-				timestamp = timestamp.ToString("o"),
-				influencer_field_name = "foo",
-				influencer_field_value = "bar",
-				influencer_score = 50,
-				result_type = "influencer",
-				bucket_span = 1
-			}, i => i.Type("doc").Index(".ml-anomalies-" + jobId).Refresh(Refresh.WaitFor));
-		}
+			job_id = jobId,
+			timestamp = timestamp.ToString("o"),
+			influencer_field_name = "foo",
+			influencer_field_value = "bar",
+			influencer_score = 50,
+			result_type = "influencer",
+			bucket_span = 1
+		}, i => i.Type("doc").Index(".ml-anomalies-" + jobId).Refresh(Refresh.WaitFor));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/MachineLearningSeeder.cs b/src/Tests/Tests/XPack/MachineLearning/MachineLearningSeeder.cs
index 253575b0be7..544f568d748 100644
--- a/src/Tests/Tests/XPack/MachineLearning/MachineLearningSeeder.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/MachineLearningSeeder.cs
@@ -16,39 +16,41 @@ public class MachineLearningSeeder
 	{
 		public const string MachineLearningTestsIndexTemplateName = "server-metrics";
 
-		private IElasticClient Client { get; }
-		public string RoamingFolder { get; }
-
 		public MachineLearningSeeder(IElasticClient client, INodeFileSystem fileSystem)
 		{
-			this.RoamingFolder = fileSystem.LocalFolder;
-			this.Client = client;
+			RoamingFolder = fileSystem.LocalFolder;
+			Client = client;
 		}
 
+		public string RoamingFolder { get; }
+
+		private IElasticClient Client { get; }
+
 		// Sometimes we run against an manually started elasticsearch when
 		// writing tests to cut down on cluster startup times.
 		// If template exists assume this cluster is already seeded with the machine learning data.
-		private bool AlreadySeeded() => this.Client.IndexTemplateExists(MachineLearningTestsIndexTemplateName).Exists;
+		private bool AlreadySeeded() => Client.IndexTemplateExists(MachineLearningTestsIndexTemplateName).Exists;
 
 		public void SeedNode()
 		{
 			if (!TestClient.Configuration.ForceReseed && AlreadySeeded()) return;
+
 			// Ensure a clean slate by deleting everything regardless of whether they may already exist
-			this.DeleteIndicesAndTemplates();
+			DeleteIndicesAndTemplates();
 			// and now recreate everything
-			this.CreateIndicesAndSeedIndexData();
+			CreateIndicesAndSeedIndexData();
 		}
 
 		public void DeleteIndicesAndTemplates()
 		{
-			if (this.Client.IndexTemplateExists(MachineLearningTestsIndexTemplateName).Exists)
-				this.Client.DeleteIndexTemplate(MachineLearningTestsIndexTemplateName);
+			if (Client.IndexTemplateExists(MachineLearningTestsIndexTemplateName).Exists)
+				Client.DeleteIndexTemplate(MachineLearningTestsIndexTemplateName);
 		}
 
 		private void CreateIndicesAndSeedIndexData()
 		{
-			this.CreateIndices();
-			this.SeedIndexData();
+			CreateIndices();
+			SeedIndexData();
 		}
 
 		public void CreateIndices()
@@ -60,36 +62,38 @@ public void CreateIndices()
 		private void SeedIndexData()
 		{
 			Console.WriteLine("Bulk importing starting ...");
-			var folder = Path.Combine(this.RoamingFolder, "server_metrics");
-			Enumerable.Range(1, 4).ToList().ForEach(i =>
-			{
-				var metricsFile = Path.Combine(folder, $"server-metrics_{i}.json");
-				var bulkResponse = this.Client.LowLevel.Bulk<BulkResponse>(
-					File.ReadAllBytes(metricsFile),
-					new BulkRequestParameters
-					{
-						RequestConfiguration = new RequestConfiguration
+			var folder = Path.Combine(RoamingFolder, "server_metrics");
+			Enumerable.Range(1, 4)
+				.ToList()
+				.ForEach(i =>
+				{
+					var metricsFile = Path.Combine(folder, $"server-metrics_{i}.json");
+					var bulkResponse = Client.LowLevel.Bulk<BulkResponse>(
+						File.ReadAllBytes(metricsFile),
+						new BulkRequestParameters
 						{
-							RequestTimeout = TimeSpan.FromMinutes(3)
-						}
-					});
+							RequestConfiguration = new RequestConfiguration
+							{
+								RequestTimeout = TimeSpan.FromMinutes(3)
+							}
+						});
 
-				if (!bulkResponse.ApiCall.Success || (!bulkResponse.IsValid))
-				{
-					// only use the Audit trail as failed bulk items will be YUGE
-					var sb = new StringBuilder();
-					ResponseStatics.DebugAuditTrail(bulkResponse.ApiCall.AuditTrail, sb);
-					throw new Exception($"Problem seeding server-metrics data for machine learning: {sb}");
-				}
+					if (!bulkResponse.ApiCall.Success || !bulkResponse.IsValid)
+					{
+						// only use the Audit trail as failed bulk items will be YUGE
+						var sb = new StringBuilder();
+						ResponseStatics.DebugAuditTrail(bulkResponse.ApiCall.AuditTrail, sb);
+						throw new Exception($"Problem seeding server-metrics data for machine learning: {sb}");
+					}
 
-				Console.WriteLine($"Indexed docs from {metricsFile}");
-			});
+					Console.WriteLine($"Indexed docs from {metricsFile}");
+				});
 			Console.WriteLine("Bulk importing finished.");
 		}
 
 		private void CreateMetricIndex()
 		{
-			var createProjectIndex = this.Client.CreateIndex(MachineLearningTestsIndexTemplateName, c => c
+			var createProjectIndex = Client.CreateIndex(MachineLearningTestsIndexTemplateName, c => c
 				.Mappings(map => map
 					.Map<Metric>(m => m
 						.AutoMap()
@@ -109,9 +113,9 @@ private void CreateMetricIndex()
 
 		private void CreateIndexTemplate()
 		{
-			var putTemplateResult = this.Client.PutIndexTemplate(new PutIndexTemplateRequest(MachineLearningTestsIndexTemplateName)
+			var putTemplateResult = Client.PutIndexTemplate(new PutIndexTemplateRequest(MachineLearningTestsIndexTemplateName)
 			{
-				IndexPatterns = new ReadOnlyCollection<string>(new [] { "*" }),
+				IndexPatterns = new ReadOnlyCollection<string>(new[] { "*" }),
 				Settings = new IndexSettings
 				{
 					NumberOfShards = 1,
diff --git a/src/Tests/Tests/XPack/MachineLearning/OpenJob/OpenJobApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/OpenJob/OpenJobApiTests.cs
index c6ce24a02f8..bc0b97cfb2f 100644
--- a/src/Tests/Tests/XPack/MachineLearning/OpenJob/OpenJobApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/OpenJob/OpenJobApiTests.cs
@@ -12,41 +12,33 @@ public class OpenJobApiTests : MachineLearningIntegrationTestBase<IOpenJobRespon
 	{
 		public OpenJobApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<OpenJobDescriptor, IOpenJobRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override OpenJobRequest Initializer => new OpenJobRequest(CallIsolatedValue);
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_open";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-			}
+			foreach (var callUniqueValue in values) PutJob(client, callUniqueValue.Value);
 		}
 
 		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var callUniqueValue in values)
-			{
-				CloseJob(client, callUniqueValue.Value);
-			}
+			foreach (var callUniqueValue in values) CloseJob(client, callUniqueValue.Value);
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.OpenJob(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.OpenJobAsync(CallIsolatedValue, f),
-			request: (client, r) => client.OpenJob(r),
-			requestAsync: (client, r) => client.OpenJobAsync(r)
+			(client, f) => client.OpenJob(CallIsolatedValue, f),
+			(client, f) => client.OpenJobAsync(CallIsolatedValue, f),
+			(client, r) => client.OpenJob(r),
+			(client, r) => client.OpenJobAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_open";
 		protected override OpenJobDescriptor NewDescriptor() => new OpenJobDescriptor(CallIsolatedValue);
-		protected override object ExpectJson => null;
-		protected override Func<OpenJobDescriptor, IOpenJobRequest> Fluent => f => f;
-		protected override OpenJobRequest Initializer => new OpenJobRequest(CallIsolatedValue);
 
-		protected override void ExpectResponse(IOpenJobResponse response)
-		{
-			response.Opened.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IOpenJobResponse response) => response.Opened.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/OpenJob/OpenJobUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/OpenJob/OpenJobUrlTests.cs
index d3d3a221fa5..35f6da18144 100644
--- a/src/Tests/Tests/XPack/MachineLearning/OpenJob/OpenJobUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/OpenJob/OpenJobUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.OpenJob
 {
 	public class OpenJobUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/_open")
-				.Fluent(c => c.OpenJob("job_id"))
-				.Request(c => c.OpenJob(new OpenJobRequest("job_id")))
-				.FluentAsync(c => c.OpenJobAsync("job_id"))
-				.RequestAsync(c => c.OpenJobAsync(new OpenJobRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/_open")
+			.Fluent(c => c.OpenJob("job_id"))
+			.Request(c => c.OpenJob(new OpenJobRequest("job_id")))
+			.FluentAsync(c => c.OpenJobAsync("job_id"))
+			.RequestAsync(c => c.OpenJobAsync(new OpenJobRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/PostJobData/PostJobDataApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/PostJobData/PostJobDataApiTests.cs
index ebbc69b8c47..76f9519c066 100644
--- a/src/Tests/Tests/XPack/MachineLearning/PostJobData/PostJobDataApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/PostJobData/PostJobDataApiTests.cs
@@ -3,7 +3,6 @@
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using Newtonsoft.Json.Linq;
 using Tests.Core.Extensions;
 using Tests.Domain;
 using Tests.Framework;
@@ -12,38 +11,12 @@
 
 namespace Tests.XPack.MachineLearning.PostJobData
 {
-	public class PostJobDataApiTests : MachineLearningIntegrationTestBase<IPostJobDataResponse, IPostJobDataRequest, PostJobDataDescriptor, PostJobDataRequest>
+	public class PostJobDataApiTests
+		: MachineLearningIntegrationTestBase<IPostJobDataResponse, IPostJobDataRequest, PostJobDataDescriptor, PostJobDataRequest>
 	{
 		public PostJobDataApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-				OpenJob(client, callUniqueValue.Value);
-			}
-		}
-
-		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-				CloseJob(client, callUniqueValue.Value);
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PostJobData(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.PostJobDataAsync(CallIsolatedValue, f),
-			request: (client, r) => client.PostJobData(r),
-			requestAsync: (client, r) => client.PostJobDataAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 202;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_data";
-		protected override bool SupportsDeserialization => false;
-		protected override PostJobDataDescriptor NewDescriptor() => new PostJobDataDescriptor(CallIsolatedValue);
 
 		protected override object ExpectJson => new Dictionary<string, object>
 		{
@@ -56,6 +29,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			{ "total", 40476 }
 		};
 
+		protected override int ExpectStatusCode => 202;
+
 		protected override Func<PostJobDataDescriptor, IPostJobDataRequest> Fluent => f => f.Data(new Metric
 		{
 			Timestamp = new DateTime(2017, 9, 1),
@@ -64,9 +39,11 @@ protected override LazyResponses ClientUsage() => Calls(
 			Host = "server_2",
 			Response = 2.455821f,
 			Service = "app_3",
-			Total  = 40476
+			Total = 40476
 		});
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override PostJobDataRequest Initializer => new PostJobDataRequest(CallIsolatedValue)
 		{
 			Data = new[]
@@ -79,11 +56,38 @@ protected override LazyResponses ClientUsage() => Calls(
 					Host = "server_2",
 					Response = 2.4558210155f,
 					Service = "app_3",
-					Total  = 40476
+					Total = 40476
 				}
 			}
 		};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_data";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values)
+			{
+				PutJob(client, callUniqueValue.Value);
+				OpenJob(client, callUniqueValue.Value);
+			}
+		}
+
+		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values)
+				CloseJob(client, callUniqueValue.Value);
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PostJobData(CallIsolatedValue, f),
+			(client, f) => client.PostJobDataAsync(CallIsolatedValue, f),
+			(client, r) => client.PostJobData(r),
+			(client, r) => client.PostJobDataAsync(r)
+		);
+
+		protected override PostJobDataDescriptor NewDescriptor() => new PostJobDataDescriptor(CallIsolatedValue);
+
 		protected override void ExpectResponse(IPostJobDataResponse response)
 		{
 			response.ShouldBeValid();
@@ -103,46 +107,14 @@ protected override void ExpectResponse(IPostJobDataResponse response)
 		}
 	}
 
-	public class PostJobDataWithResetStartAndResetEndApiTests : MachineLearningIntegrationTestBase<IPostJobDataResponse, IPostJobDataRequest, PostJobDataDescriptor, PostJobDataRequest>
+	public class PostJobDataWithResetStartAndResetEndApiTests
+		: MachineLearningIntegrationTestBase<IPostJobDataResponse, IPostJobDataRequest, PostJobDataDescriptor, PostJobDataRequest>
 	{
 		public PostJobDataWithResetStartAndResetEndApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-				OpenJob(client, callUniqueValue.Value);
-			}
-		}
-
-		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-			{
-				CloseJob(client, callUniqueValue.Value);
-			}
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PostJobData(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.PostJobDataAsync(CallIsolatedValue, f),
-			request: (client, r) => client.PostJobData(r),
-			requestAsync: (client, r) => client.PostJobDataAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 202;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath =>
-			$"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_data"+
-			$"?reset_start={Uri.EscapeDataString(new DateTimeOffset(2017, 1, 1, 0, 0, 0, TimeSpan.Zero).ToString("o"))}"+
-			$"&reset_end={Uri.EscapeDataString(new DateTimeOffset(2018, 1, 1, 0, 0, 0, TimeSpan.Zero).ToString("o"))}";
-
-		protected override bool SupportsDeserialization => false;
-		protected override PostJobDataDescriptor NewDescriptor() => new PostJobDataDescriptor(CallIsolatedValue);
 
-		protected override object ExpectJson => new Dictionary<string,object>
+		protected override object ExpectJson => new Dictionary<string, object>
 		{
 			{ "@timestamp", new DateTime(2017, 9, 1) },
 			{ "accept", 36320 },
@@ -153,6 +125,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			{ "total", 40476 }
 		};
 
+		protected override int ExpectStatusCode => 202;
+
 		protected override Func<PostJobDataDescriptor, IPostJobDataRequest> Fluent => f => f
 			.Data(new Metric
 			{
@@ -162,11 +136,13 @@ protected override LazyResponses ClientUsage() => Calls(
 				Host = "server_2",
 				Response = 2.455821f,
 				Service = "app_3",
-				Total  = 40476
+				Total = 40476
 			})
 			.ResetStart(new DateTimeOffset(2017, 1, 1, 0, 0, 0, TimeSpan.Zero))
 			.ResetEnd(new DateTimeOffset(2018, 1, 1, 0, 0, 0, TimeSpan.Zero));
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override PostJobDataRequest Initializer => new PostJobDataRequest(CallIsolatedValue)
 		{
 			Data = new[]
@@ -179,13 +155,43 @@ protected override LazyResponses ClientUsage() => Calls(
 					Host = "server_2",
 					Response = 2.4558210155f,
 					Service = "app_3",
-					Total  = 40476
+					Total = 40476
 				}
 			},
 			ResetStart = new DateTimeOffset(2017, 1, 1, 0, 0, 0, TimeSpan.Zero),
 			ResetEnd = new DateTimeOffset(2018, 1, 1, 0, 0, 0, TimeSpan.Zero)
 		};
 
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath =>
+			$"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_data" +
+			$"?reset_start={Uri.EscapeDataString(new DateTimeOffset(2017, 1, 1, 0, 0, 0, TimeSpan.Zero).ToString("o"))}" +
+			$"&reset_end={Uri.EscapeDataString(new DateTimeOffset(2018, 1, 1, 0, 0, 0, TimeSpan.Zero).ToString("o"))}";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values)
+			{
+				PutJob(client, callUniqueValue.Value);
+				OpenJob(client, callUniqueValue.Value);
+			}
+		}
+
+		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values) CloseJob(client, callUniqueValue.Value);
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PostJobData(CallIsolatedValue, f),
+			(client, f) => client.PostJobDataAsync(CallIsolatedValue, f),
+			(client, r) => client.PostJobData(r),
+			(client, r) => client.PostJobDataAsync(r)
+		);
+
+		protected override PostJobDataDescriptor NewDescriptor() => new PostJobDataDescriptor(CallIsolatedValue);
+
 		protected override void ExpectResponse(IPostJobDataResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/PostJobData/PostJobDataUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/PostJobData/PostJobDataUrlTests.cs
index 40886109470..09f826ed16a 100644
--- a/src/Tests/Tests/XPack/MachineLearning/PostJobData/PostJobDataUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/PostJobData/PostJobDataUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.PostJobData
 {
 	public class PostJobDataUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/_data")
-				.Fluent(c => c.PostJobData("job_id", p => p))
-				.Request(c => c.PostJobData(new PostJobDataRequest("job_id")))
-				.FluentAsync(c => c.PostJobDataAsync("job_id", p => p))
-				.RequestAsync(c => c.PostJobDataAsync(new PostJobDataRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/_data")
+			.Fluent(c => c.PostJobData("job_id", p => p))
+			.Request(c => c.PostJobData(new PostJobDataRequest("job_id")))
+			.FluentAsync(c => c.PostJobDataAsync("job_id", p => p))
+			.RequestAsync(c => c.PostJobDataAsync(new PostJobDataRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/PreviewDataFeed/PreviewDataFeedApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/PreviewDataFeed/PreviewDataFeedApiTests.cs
index b1d7a31b710..027a0e0afc0 100644
--- a/src/Tests/Tests/XPack/MachineLearning/PreviewDataFeed/PreviewDataFeedApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/PreviewDataFeed/PreviewDataFeedApiTests.cs
@@ -10,10 +10,21 @@
 namespace Tests.XPack.MachineLearning.PreviewDatafeed
 {
 	//TODO what does an invalid request return here? this API returns a json array for the happy path
-	public class PreviewDatafeedApiTests : MachineLearningIntegrationTestBase<IPreviewDatafeedResponse<Metric>, IPreviewDatafeedRequest, PreviewDatafeedDescriptor, PreviewDatafeedRequest>
+	public class PreviewDatafeedApiTests
+		: MachineLearningIntegrationTestBase<IPreviewDatafeedResponse<Metric>, IPreviewDatafeedRequest, PreviewDatafeedDescriptor,
+			PreviewDatafeedRequest>
 	{
 		public PreviewDatafeedApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override PreviewDatafeedRequest Initializer => new PreviewDatafeedRequest(CallIsolatedValue + "-datafeed");
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_preview";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -24,21 +35,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PreviewDatafeed<Metric>(CallIsolatedValue + "-datafeed", f),
-			fluentAsync: (client, f) => client.PreviewDatafeedAsync<Metric>(CallIsolatedValue + "-datafeed", f),
-			request: (client, r) => client.PreviewDatafeed<Metric>(r),
-			requestAsync: (client, r) => client.PreviewDatafeedAsync<Metric>(r)
+			(client, f) => client.PreviewDatafeed<Metric>(CallIsolatedValue + "-datafeed", f),
+			(client, f) => client.PreviewDatafeedAsync<Metric>(CallIsolatedValue + "-datafeed", f),
+			(client, r) => client.PreviewDatafeed<Metric>(r),
+			(client, r) => client.PreviewDatafeedAsync<Metric>(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"/_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_preview";
-		protected override bool SupportsDeserialization => false;
 		protected override PreviewDatafeedDescriptor NewDescriptor() => new PreviewDatafeedDescriptor(CallIsolatedValue + "-datafeed");
-		protected override object ExpectJson => null;
-		protected override Func<PreviewDatafeedDescriptor, IPreviewDatafeedRequest> Fluent => f => f;
-		protected override PreviewDatafeedRequest Initializer => new PreviewDatafeedRequest(CallIsolatedValue + "-datafeed");
 
 		protected override void ExpectResponse(IPreviewDatafeedResponse<Metric> response)
 		{
diff --git a/src/Tests/Tests/XPack/MachineLearning/PreviewDataFeed/PreviewDataFeedUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/PreviewDataFeed/PreviewDataFeedUrlTests.cs
index 6292fa32f2e..c357ef6f898 100644
--- a/src/Tests/Tests/XPack/MachineLearning/PreviewDataFeed/PreviewDataFeedUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/PreviewDataFeed/PreviewDataFeedUrlTests.cs
@@ -9,14 +9,10 @@ namespace Tests.XPack.MachineLearning.PreviewDatafeed
 {
 	public class PreviewDatafeedUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_xpack/ml/datafeeds/datafeed_id/_preview")
-				.Fluent(c => c.PreviewDatafeed<Metric>("datafeed_id", p => p))
-				.Request(c => c.PreviewDatafeed<Metric>(new PreviewDatafeedRequest("datafeed_id")))
-				.FluentAsync(c => c.PreviewDatafeedAsync<Metric>("datafeed_id", p => p))
-				.RequestAsync(c => c.PreviewDatafeedAsync<Metric>(new PreviewDatafeedRequest("datafeed_id")))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_xpack/ml/datafeeds/datafeed_id/_preview")
+			.Fluent(c => c.PreviewDatafeed<Metric>("datafeed_id", p => p))
+			.Request(c => c.PreviewDatafeed<Metric>(new PreviewDatafeedRequest("datafeed_id")))
+			.FluentAsync(c => c.PreviewDatafeedAsync<Metric>("datafeed_id", p => p))
+			.RequestAsync(c => c.PreviewDatafeedAsync<Metric>(new PreviewDatafeedRequest("datafeed_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/PutDatafeed/PutDatafeedApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/PutDatafeed/PutDatafeedApiTests.cs
index 71433fa4579..b637b152908 100644
--- a/src/Tests/Tests/XPack/MachineLearning/PutDatafeed/PutDatafeedApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/PutDatafeed/PutDatafeedApiTests.cs
@@ -10,32 +10,13 @@
 
 namespace Tests.XPack.MachineLearning.PutDatafeed
 {
-	public class PutDatafeedApiTests : MachineLearningIntegrationTestBase<IPutDatafeedResponse,
-		IPutDatafeedRequest, PutDatafeedDescriptor<Metric>, PutDatafeedRequest>
+	public class PutDatafeedApiTests
+		: MachineLearningIntegrationTestBase<IPutDatafeedResponse,
+			IPutDatafeedRequest, PutDatafeedDescriptor<Metric>, PutDatafeedRequest>
 	{
-		public PutDatafeedApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) {}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutDatafeed(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.PutDatafeedAsync(CallIsolatedValue, f),
-			request: (client, r) => client.PutDatafeed(r),
-			requestAsync: (client, r) => client.PutDatafeedAsync(r)
-		);
-
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-			}
-		}
+		public PutDatafeedApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}";
-		protected override bool SupportsDeserialization => false;
-		protected override PutDatafeedDescriptor<Metric> NewDescriptor() => new PutDatafeedDescriptor<Metric>(CallIsolatedValue);
 
 		protected override object ExpectJson => new
 		{
@@ -43,15 +24,19 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 			job_id = CallIsolatedValue,
 			query = new
 			{
-				match_all = new {}
+				match_all = new { }
 			},
-			types = new [] { "metric" }
+			types = new[] { "metric" }
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<PutDatafeedDescriptor<Metric>, IPutDatafeedRequest> Fluent => f => f
 			.JobId(CallIsolatedValue)
 			.Query(q => q.MatchAll());
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override PutDatafeedRequest Initializer =>
 			new PutDatafeedRequest(CallIsolatedValue)
 			{
@@ -61,6 +46,23 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				Query = new MatchAllQuery()
 			};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutDatafeed(CallIsolatedValue, f),
+			(client, f) => client.PutDatafeedAsync(CallIsolatedValue, f),
+			(client, r) => client.PutDatafeed(r),
+			(client, r) => client.PutDatafeedAsync(r)
+		);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values) PutJob(client, callUniqueValue.Value);
+		}
+
+		protected override PutDatafeedDescriptor<Metric> NewDescriptor() => new PutDatafeedDescriptor<Metric>(CallIsolatedValue);
+
 		protected override void ExpectResponse(IPutDatafeedResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/PutDatafeed/PutDatafeedUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/PutDatafeed/PutDatafeedUrlTests.cs
index 27cac451fb2..4499b739144 100644
--- a/src/Tests/Tests/XPack/MachineLearning/PutDatafeed/PutDatafeedUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/PutDatafeed/PutDatafeedUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.PutDatafeed
 {
 	public class PutDatafeedUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/ml/datafeeds/datafeed_id")
-				.Fluent(c => c.PutDatafeed<object>("datafeed_id", p => p))
-				.Request(c => c.PutDatafeed(new PutDatafeedRequest("datafeed_id")))
-				.FluentAsync(c => c.PutDatafeedAsync<object>("datafeed_id"))
-				.RequestAsync(c => c.PutDatafeedAsync(new PutDatafeedRequest("datafeed_id")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/ml/datafeeds/datafeed_id")
+			.Fluent(c => c.PutDatafeed<object>("datafeed_id", p => p))
+			.Request(c => c.PutDatafeed(new PutDatafeedRequest("datafeed_id")))
+			.FluentAsync(c => c.PutDatafeedAsync<object>("datafeed_id"))
+			.RequestAsync(c => c.PutDatafeedAsync(new PutDatafeedRequest("datafeed_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/PutJob/PutJobApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/PutJob/PutJobApiTests.cs
index f7d286da1a7..9cdbdbcd052 100644
--- a/src/Tests/Tests/XPack/MachineLearning/PutJob/PutJobApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/PutJob/PutJobApiTests.cs
@@ -16,42 +16,32 @@ public class PutJobApiTests : MachineLearningIntegrationTestBase<IPutJobResponse
 	{
 		public PutJobApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutJob(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.PutJobAsync(CallIsolatedValue, f),
-			request: (client, r) => client.PutJob(r),
-			requestAsync: (client, r) => client.PutJobAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}";
-		protected override bool SupportsDeserialization => false;
-		protected override PutJobDescriptor<Metric> NewDescriptor() => new PutJobDescriptor<Metric>(CallIsolatedValue);
 
 		protected override object ExpectJson => new
+		{
+			analysis_config = new
 			{
-				analysis_config = new
+				bucket_span = "30m",
+				detectors = new[]
 				{
-					bucket_span = "30m",
-					detectors = new[]
+					new
 					{
-						new
-						{
-							function = "sum",
-							field_name = "total"
-						}
-					},
-					latency = "0s",
-				},
-				data_description = new
-				{
-					time_field = "@timestamp"
+						function = "sum",
+						field_name = "total"
+					}
 				},
-				description = "Lab 1 - Simple example",
-				results_index_name = "server-metrics"
-			};
+				latency = "0s",
+			},
+			data_description = new
+			{
+				time_field = "@timestamp"
+			},
+			description = "Lab 1 - Simple example",
+			results_index_name = "server-metrics"
+		};
+
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<PutJobDescriptor<Metric>, IPutJobRequest> Fluent => f => f
 			.Description("Lab 1 - Simple example")
@@ -63,6 +53,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			)
 			.DataDescription(d => d.TimeField(r => r.Timestamp));
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override PutJobRequest Initializer =>
 			new PutJobRequest(CallIsolatedValue)
 			{
@@ -72,7 +64,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				{
 					BucketSpan = "30m",
 					Latency = "0s",
-					Detectors = new []
+					Detectors = new[]
 					{
 						new SumDetector
 						{
@@ -86,6 +78,18 @@ protected override LazyResponses ClientUsage() => Calls(
 				}
 			};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutJob(CallIsolatedValue, f),
+			(client, f) => client.PutJobAsync(CallIsolatedValue, f),
+			(client, r) => client.PutJob(r),
+			(client, r) => client.PutJobAsync(r)
+		);
+
+		protected override PutJobDescriptor<Metric> NewDescriptor() => new PutJobDescriptor<Metric>(CallIsolatedValue);
+
 		protected override void ExpectResponse(IPutJobResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/PutJob/PutJobUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/PutJob/PutJobUrlTests.cs
index edeb25d4827..119958b4167 100644
--- a/src/Tests/Tests/XPack/MachineLearning/PutJob/PutJobUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/PutJob/PutJobUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.PutJob
 {
 	public class PutJobUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/ml/anomaly_detectors/job_id")
-				.Fluent(c => c.PutJob<object>("job_id", p => p))
-				.Request(c => c.PutJob(new PutJobRequest("job_id")))
-				.FluentAsync(c => c.PutJobAsync<object>("job_id", p => p))
-				.RequestAsync(c => c.PutJobAsync(new PutJobRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/ml/anomaly_detectors/job_id")
+			.Fluent(c => c.PutJob<object>("job_id", p => p))
+			.Request(c => c.PutJob(new PutJobRequest("job_id")))
+			.FluentAsync(c => c.PutJobAsync<object>("job_id", p => p))
+			.RequestAsync(c => c.PutJobAsync(new PutJobRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/RevertModelSnapshot/RevertModelSnapshotApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/RevertModelSnapshot/RevertModelSnapshotApiTests.cs
index abfd6b7c490..df50dce2175 100644
--- a/src/Tests/Tests/XPack/MachineLearning/RevertModelSnapshot/RevertModelSnapshotApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/RevertModelSnapshot/RevertModelSnapshotApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -9,10 +8,34 @@
 
 namespace Tests.XPack.MachineLearning.RevertModelSnapshot
 {
-	public class RevertModelSnapshotApiTests : MachineLearningIntegrationTestBase<IRevertModelSnapshotResponse, IRevertModelSnapshotRequest, RevertModelSnapshotDescriptor, RevertModelSnapshotRequest>
+	public class RevertModelSnapshotApiTests
+		: MachineLearningIntegrationTestBase<IRevertModelSnapshotResponse, IRevertModelSnapshotRequest, RevertModelSnapshotDescriptor,
+			RevertModelSnapshotRequest>
 	{
 		public RevertModelSnapshotApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => new
+		{
+			delete_intervening_results = true
+		};
+
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> Fluent => f => f
+			.DeleteInterveningResults();
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
+		protected override RevertModelSnapshotRequest Initializer => new RevertModelSnapshotRequest(CallIsolatedValue, "first")
+		{
+			DeleteInterveningResults = true
+		};
+
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots/first/_revert";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -30,33 +53,14 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.RevertModelSnapshot(CallIsolatedValue, "first", f),
-			fluentAsync: (client, f) => client.RevertModelSnapshotAsync(CallIsolatedValue, "first", f),
-			request: (client, r) => client.RevertModelSnapshot(r),
-			requestAsync: (client, r) => client.RevertModelSnapshotAsync(r)
+			(client, f) => client.RevertModelSnapshot(CallIsolatedValue, "first", f),
+			(client, f) => client.RevertModelSnapshotAsync(CallIsolatedValue, "first", f),
+			(client, r) => client.RevertModelSnapshot(r),
+			(client, r) => client.RevertModelSnapshotAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots/first/_revert";
-		protected override bool SupportsDeserialization => false;
-
-		protected override object ExpectJson => new
-		{
-			delete_intervening_results = true
-		};
-
 		protected override RevertModelSnapshotDescriptor NewDescriptor() => new RevertModelSnapshotDescriptor(CallIsolatedValue, "first");
 
-		protected override Func<RevertModelSnapshotDescriptor, IRevertModelSnapshotRequest> Fluent => f => f
-			.DeleteInterveningResults();
-
-		protected override RevertModelSnapshotRequest Initializer => new RevertModelSnapshotRequest(CallIsolatedValue, "first")
-		{
-			DeleteInterveningResults = true
-		};
-
 		protected override void ExpectResponse(IRevertModelSnapshotResponse response)
 		{
 			response.Acknowledged.Should().BeTrue();
diff --git a/src/Tests/Tests/XPack/MachineLearning/RevertModelSnapshot/RevertModelSnapshotUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/RevertModelSnapshot/RevertModelSnapshotUrlTests.cs
index 128635c3374..5343e81ccbe 100644
--- a/src/Tests/Tests/XPack/MachineLearning/RevertModelSnapshot/RevertModelSnapshotUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/RevertModelSnapshot/RevertModelSnapshotUrlTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -9,14 +8,10 @@ namespace Tests.XPack.MachineLearning.RevertModelSnapshot
 {
 	public class RevertModelSnapshotUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/model_snapshots/snapshot_id/_revert")
-				.Fluent(c => c.RevertModelSnapshot("job_id", "snapshot_id"))
-				.Request(c => c.RevertModelSnapshot(new RevertModelSnapshotRequest("job_id", "snapshot_id")))
-				.FluentAsync(c => c.RevertModelSnapshotAsync("job_id", "snapshot_id"))
-				.RequestAsync(c => c.RevertModelSnapshotAsync(new RevertModelSnapshotRequest("job_id", "snapshot_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/model_snapshots/snapshot_id/_revert")
+			.Fluent(c => c.RevertModelSnapshot("job_id", "snapshot_id"))
+			.Request(c => c.RevertModelSnapshot(new RevertModelSnapshotRequest("job_id", "snapshot_id")))
+			.FluentAsync(c => c.RevertModelSnapshotAsync("job_id", "snapshot_id"))
+			.RequestAsync(c => c.RevertModelSnapshotAsync(new RevertModelSnapshotRequest("job_id", "snapshot_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/StartDatafeed/StartDatafeedApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/StartDatafeed/StartDatafeedApiTests.cs
index d82bf64d7c8..b35821ba535 100644
--- a/src/Tests/Tests/XPack/MachineLearning/StartDatafeed/StartDatafeedApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/StartDatafeed/StartDatafeedApiTests.cs
@@ -8,10 +8,19 @@
 
 namespace Tests.XPack.MachineLearning.StartDatafeed
 {
-	public class StartDatafeedApiTests : MachineLearningIntegrationTestBase<IStartDatafeedResponse, IStartDatafeedRequest, StartDatafeedDescriptor, StartDatafeedRequest>
+	public class StartDatafeedApiTests
+		: MachineLearningIntegrationTestBase<IStartDatafeedResponse, IStartDatafeedRequest, StartDatafeedDescriptor, StartDatafeedRequest>
 	{
 		public StartDatafeedApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<StartDatafeedDescriptor, IStartDatafeedRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override StartDatafeedRequest Initializer => new StartDatafeedRequest(CallIsolatedValue + "-datafeed");
+		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_start";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -32,24 +41,14 @@ protected override void IntegrationTeardown(IElasticClient client, CallUniqueVal
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.StartDatafeed(CallIsolatedValue + "-datafeed", f),
-			fluentAsync: (client, f) => client.StartDatafeedAsync(CallIsolatedValue + "-datafeed", f),
-			request: (client, r) => client.StartDatafeed(r),
-			requestAsync: (client, r) => client.StartDatafeedAsync(r)
+			(client, f) => client.StartDatafeed(CallIsolatedValue + "-datafeed", f),
+			(client, f) => client.StartDatafeedAsync(CallIsolatedValue + "-datafeed", f),
+			(client, r) => client.StartDatafeed(r),
+			(client, r) => client.StartDatafeedAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_start";
 		protected override StartDatafeedDescriptor NewDescriptor() => new StartDatafeedDescriptor(CallIsolatedValue + "-datafeed");
-		protected override object ExpectJson => null;
-		protected override Func<StartDatafeedDescriptor, IStartDatafeedRequest> Fluent => f => f;
-		protected override StartDatafeedRequest Initializer => new StartDatafeedRequest(CallIsolatedValue + "-datafeed");
 
-		protected override void ExpectResponse(IStartDatafeedResponse response)
-		{
-			response.Started.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IStartDatafeedResponse response) => response.Started.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/StartDatafeed/StartDatafeedUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/StartDatafeed/StartDatafeedUrlTests.cs
index 9dbbb5a90ab..d03fd68bd4e 100644
--- a/src/Tests/Tests/XPack/MachineLearning/StartDatafeed/StartDatafeedUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/StartDatafeed/StartDatafeedUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.StartDatafeed
 {
 	public class StartDatafeedUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/datafeeds/datafeed_id/_start")
-				.Fluent(c => c.StartDatafeed("datafeed_id"))
-				.Request(c => c.StartDatafeed(new StartDatafeedRequest("datafeed_id")))
-				.FluentAsync(c => c.StartDatafeedAsync("datafeed_id"))
-				.RequestAsync(c => c.StartDatafeedAsync(new StartDatafeedRequest("datafeed_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/datafeeds/datafeed_id/_start")
+			.Fluent(c => c.StartDatafeed("datafeed_id"))
+			.Request(c => c.StartDatafeed(new StartDatafeedRequest("datafeed_id")))
+			.FluentAsync(c => c.StartDatafeedAsync("datafeed_id"))
+			.RequestAsync(c => c.StartDatafeedAsync(new StartDatafeedRequest("datafeed_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/StopDatafeed/StopDatafeedApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/StopDatafeed/StopDatafeedApiTests.cs
index 527f2dec87d..96850451215 100644
--- a/src/Tests/Tests/XPack/MachineLearning/StopDatafeed/StopDatafeedApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/StopDatafeed/StopDatafeedApiTests.cs
@@ -8,10 +8,19 @@
 
 namespace Tests.XPack.MachineLearning.StopDatafeed
 {
-	public class StopDatafeedApiTests : MachineLearningIntegrationTestBase<IStopDatafeedResponse, IStopDatafeedRequest, StopDatafeedDescriptor, StopDatafeedRequest>
+	public class StopDatafeedApiTests
+		: MachineLearningIntegrationTestBase<IStopDatafeedResponse, IStopDatafeedRequest, StopDatafeedDescriptor, StopDatafeedRequest>
 	{
 		public StopDatafeedApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+		protected override Func<StopDatafeedDescriptor, IStopDatafeedRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override StopDatafeedRequest Initializer => new StopDatafeedRequest(CallIsolatedValue + "-datafeed");
+		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_stop";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -25,31 +34,18 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 
 		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
 		{
-			foreach (var callUniqueValue in values)
-			{
-				CloseJob(client, callUniqueValue.Value);
-			}
+			foreach (var callUniqueValue in values) CloseJob(client, callUniqueValue.Value);
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.StopDatafeed(CallIsolatedValue + "-datafeed", f),
-			fluentAsync: (client, f) => client.StopDatafeedAsync(CallIsolatedValue + "-datafeed", f),
-			request: (client, r) => client.StopDatafeed(r),
-			requestAsync: (client, r) => client.StopDatafeedAsync(r)
+			(client, f) => client.StopDatafeed(CallIsolatedValue + "-datafeed", f),
+			(client, f) => client.StopDatafeedAsync(CallIsolatedValue + "-datafeed", f),
+			(client, r) => client.StopDatafeed(r),
+			(client, r) => client.StopDatafeedAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_stop";
 		protected override StopDatafeedDescriptor NewDescriptor() => new StopDatafeedDescriptor(CallIsolatedValue + "-datafeed");
-		protected override object ExpectJson => null;
-		protected override Func<StopDatafeedDescriptor, IStopDatafeedRequest> Fluent => f => f;
-		protected override StopDatafeedRequest Initializer => new StopDatafeedRequest(CallIsolatedValue + "-datafeed");
 
-		protected override void ExpectResponse(IStopDatafeedResponse response)
-		{
-			response.Stopped.Should().BeTrue();
-		}
+		protected override void ExpectResponse(IStopDatafeedResponse response) => response.Stopped.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/StopDatafeed/StopDatafeedUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/StopDatafeed/StopDatafeedUrlTests.cs
index 8b0ef03fe82..ddc04708083 100644
--- a/src/Tests/Tests/XPack/MachineLearning/StopDatafeed/StopDatafeedUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/StopDatafeed/StopDatafeedUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.StopDatafeed
 {
 	public class StopDatafeedUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/datafeeds/datafeed_id/_stop")
-				.Fluent(c => c.StopDatafeed("datafeed_id"))
-				.Request(c => c.StopDatafeed(new StopDatafeedRequest("datafeed_id")))
-				.FluentAsync(c => c.StopDatafeedAsync("datafeed_id"))
-				.RequestAsync(c => c.StopDatafeedAsync(new StopDatafeedRequest("datafeed_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/datafeeds/datafeed_id/_stop")
+			.Fluent(c => c.StopDatafeed("datafeed_id"))
+			.Request(c => c.StopDatafeed(new StopDatafeedRequest("datafeed_id")))
+			.FluentAsync(c => c.StopDatafeedAsync("datafeed_id"))
+			.RequestAsync(c => c.StopDatafeedAsync(new StopDatafeedRequest("datafeed_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/UpdateDatafeed/UpdateDatafeedApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/UpdateDatafeed/UpdateDatafeedApiTests.cs
index c03f7aa92f1..4e8b8fbf66b 100644
--- a/src/Tests/Tests/XPack/MachineLearning/UpdateDatafeed/UpdateDatafeedApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/UpdateDatafeed/UpdateDatafeedApiTests.cs
@@ -10,39 +10,17 @@
 
 namespace Tests.XPack.MachineLearning.UpdateDatafeed
 {
-	public class UpdateDatafeedApiTests : MachineLearningIntegrationTestBase<IUpdateDatafeedResponse,
-		IUpdateDatafeedRequest, UpdateDatafeedDescriptor<Metric>, UpdateDatafeedRequest>
+	public class UpdateDatafeedApiTests
+		: MachineLearningIntegrationTestBase<IUpdateDatafeedResponse,
+			IUpdateDatafeedRequest, UpdateDatafeedDescriptor<Metric>, UpdateDatafeedRequest>
 	{
-		public UpdateDatafeedApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage)
-		{
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.UpdateDatafeed(CallIsolatedValue + "-datafeed", f),
-			fluentAsync: (client, f) => client.UpdateDatafeedAsync(CallIsolatedValue + "-datafeed", f),
-			request: (client, r) => client.UpdateDatafeed(r),
-			requestAsync: (client, r) => client.UpdateDatafeedAsync(r)
-		);
-
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-			{
-				PutJob(client, callUniqueValue.Value);
-				PutDatafeed(client, callUniqueValue.Value);
-			}
-		}
+		public UpdateDatafeedApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_update";
-		protected override bool SupportsDeserialization => false;
-		protected override UpdateDatafeedDescriptor<Metric> NewDescriptor() => new UpdateDatafeedDescriptor<Metric>(CallIsolatedValue);
 
 		protected override object ExpectJson => new
 		{
-			indices = new [] { "server-metrics" },
+			indices = new[] { "server-metrics" },
 			job_id = CallIsolatedValue,
 			query = new
 			{
@@ -51,15 +29,18 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 					boost = 2.0
 				}
 			},
-			types = new [] { "metric" }
+			types = new[] { "metric" }
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<UpdateDatafeedDescriptor<Metric>, IUpdateDatafeedRequest> Fluent => f => f
 			.JobId(CallIsolatedValue)
 			.Query(q => q
 				.MatchAll(m => m.Boost(2))
-			)
-			;
+			);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override UpdateDatafeedRequest Initializer =>
 			new UpdateDatafeedRequest(CallIsolatedValue + "-datafeed")
@@ -73,6 +54,27 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				}
 			};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"_xpack/ml/datafeeds/{CallIsolatedValue}-datafeed/_update";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.UpdateDatafeed(CallIsolatedValue + "-datafeed", f),
+			(client, f) => client.UpdateDatafeedAsync(CallIsolatedValue + "-datafeed", f),
+			(client, r) => client.UpdateDatafeed(r),
+			(client, r) => client.UpdateDatafeedAsync(r)
+		);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values)
+			{
+				PutJob(client, callUniqueValue.Value);
+				PutDatafeed(client, callUniqueValue.Value);
+			}
+		}
+
+		protected override UpdateDatafeedDescriptor<Metric> NewDescriptor() => new UpdateDatafeedDescriptor<Metric>(CallIsolatedValue);
+
 		protected override void ExpectResponse(IUpdateDatafeedResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/UpdateDatafeed/UpdateDatafeedUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/UpdateDatafeed/UpdateDatafeedUrlTests.cs
index 5a40990511d..55cdfb92177 100644
--- a/src/Tests/Tests/XPack/MachineLearning/UpdateDatafeed/UpdateDatafeedUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/UpdateDatafeed/UpdateDatafeedUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.UpdateDatafeed
 {
 	public class UpdateDatafeedUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/datafeeds/datafeed_id/_update")
-				.Fluent(c => c.UpdateDatafeed<object>("datafeed_id", p => p))
-				.Request(c => c.UpdateDatafeed(new UpdateDatafeedRequest("datafeed_id")))
-				.FluentAsync(c => c.UpdateDatafeedAsync<object>("datafeed_id"))
-				.RequestAsync(c => c.UpdateDatafeedAsync(new UpdateDatafeedRequest("datafeed_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/datafeeds/datafeed_id/_update")
+			.Fluent(c => c.UpdateDatafeed<object>("datafeed_id", p => p))
+			.Request(c => c.UpdateDatafeed(new UpdateDatafeedRequest("datafeed_id")))
+			.FluentAsync(c => c.UpdateDatafeedAsync<object>("datafeed_id"))
+			.RequestAsync(c => c.UpdateDatafeedAsync(new UpdateDatafeedRequest("datafeed_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/UpdateJob/UpdateJobApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/UpdateJob/UpdateJobApiTests.cs
index a7fd1e1f6a5..17f0d1ddfdf 100644
--- a/src/Tests/Tests/XPack/MachineLearning/UpdateJob/UpdateJobApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/UpdateJob/UpdateJobApiTests.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Linq;
 using Elasticsearch.Net;
-using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
 using Tests.Domain;
@@ -11,46 +9,27 @@
 
 namespace Tests.XPack.MachineLearning.UpdateJob
 {
-	public class UpdateJobApiTests : MachineLearningIntegrationTestBase<IUpdateJobResponse, IUpdateJobRequest, UpdateJobDescriptor<Metric>, UpdateJobRequest>
+	public class UpdateJobApiTests
+		: MachineLearningIntegrationTestBase<IUpdateJobResponse, IUpdateJobRequest, UpdateJobDescriptor<Metric>, UpdateJobRequest>
 	{
 		public UpdateJobApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.UpdateJob(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.UpdateJobAsync(CallIsolatedValue, f),
-			request: (client, r) => client.UpdateJob(r),
-			requestAsync: (client, r) => client.UpdateJobAsync(r)
-		);
-
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-				PutJob(client, callUniqueValue.Value);
-		}
+		protected override bool ExpectIsValid => true;
 
-		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
+		protected override object ExpectJson => new
 		{
-			foreach (var callUniqueValue in values)
-				DeleteJob(client, callUniqueValue.Value);
-		}
+			description = "Lab 1 - Simple example modified",
+			background_persist_interval = "6h"
+		};
 
-		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_update";
-		protected override bool SupportsDeserialization => false;
-		protected override UpdateJobDescriptor<Metric> NewDescriptor() => new UpdateJobDescriptor<Metric>(CallIsolatedValue);
-
-		protected override object ExpectJson => new
-			{
-				description = "Lab 1 - Simple example modified",
-				background_persist_interval = "6h"
-			};
 
 		protected override Func<UpdateJobDescriptor<Metric>, IUpdateJobRequest> Fluent => f => f
 			.Description("Lab 1 - Simple example modified")
 			.BackgroundPersistInterval("6h");
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override UpdateJobRequest Initializer =>
 			new UpdateJobRequest(CallIsolatedValue)
 			{
@@ -58,9 +37,30 @@ protected override void IntegrationTeardown(IElasticClient client, CallUniqueVal
 				BackgroundPersistInterval = "6h"
 			};
 
-		protected override void ExpectResponse(IUpdateJobResponse response)
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/{CallIsolatedValue}/_update";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.UpdateJob(CallIsolatedValue, f),
+			(client, f) => client.UpdateJobAsync(CallIsolatedValue, f),
+			(client, r) => client.UpdateJob(r),
+			(client, r) => client.UpdateJobAsync(r)
+		);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
-			response.ShouldBeValid();
+			foreach (var callUniqueValue in values)
+				PutJob(client, callUniqueValue.Value);
+		}
+
+		protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values)
+				DeleteJob(client, callUniqueValue.Value);
 		}
+
+		protected override UpdateJobDescriptor<Metric> NewDescriptor() => new UpdateJobDescriptor<Metric>(CallIsolatedValue);
+
+		protected override void ExpectResponse(IUpdateJobResponse response) => response.ShouldBeValid();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/UpdateJob/UpdateJobUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/UpdateJob/UpdateJobUrlTests.cs
index 41bf3aee2ea..4d483eab574 100644
--- a/src/Tests/Tests/XPack/MachineLearning/UpdateJob/UpdateJobUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/UpdateJob/UpdateJobUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.UpdateJob
 {
 	public class UpdateJobUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/_update")
-				.Fluent(c => c.UpdateJob<object>("job_id", p => p))
-				.Request(c => c.UpdateJob(new UpdateJobRequest("job_id")))
-				.FluentAsync(c => c.UpdateJobAsync<object>("job_id", p => p))
-				.RequestAsync(c => c.UpdateJobAsync(new UpdateJobRequest("job_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/_update")
+			.Fluent(c => c.UpdateJob<object>("job_id", p => p))
+			.Request(c => c.UpdateJob(new UpdateJobRequest("job_id")))
+			.FluentAsync(c => c.UpdateJobAsync<object>("job_id", p => p))
+			.RequestAsync(c => c.UpdateJobAsync(new UpdateJobRequest("job_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/UpdateModelSnapshot/UpdateModelSnapshotApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/UpdateModelSnapshot/UpdateModelSnapshotApiTests.cs
index 2b59825ad4c..0641819eb25 100644
--- a/src/Tests/Tests/XPack/MachineLearning/UpdateModelSnapshot/UpdateModelSnapshotApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/UpdateModelSnapshot/UpdateModelSnapshotApiTests.cs
@@ -9,46 +9,50 @@
 
 namespace Tests.XPack.MachineLearning.UpdateModelSnapshot
 {
-	public class UpdateModelSnapshotApiTests : MachineLearningIntegrationTestBase<IUpdateModelSnapshotResponse, IUpdateModelSnapshotRequest, UpdateModelSnapshotDescriptor, UpdateModelSnapshotRequest>
+	public class UpdateModelSnapshotApiTests
+		: MachineLearningIntegrationTestBase<IUpdateModelSnapshotResponse, IUpdateModelSnapshotRequest, UpdateModelSnapshotDescriptor,
+			UpdateModelSnapshotRequest>
 	{
 		public UpdateModelSnapshotApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.UpdateModelSnapshot(CallIsolatedValue, CallIsolatedValue + "-snapshot", f),
-			fluentAsync: (client, f) => client.UpdateModelSnapshotAsync(CallIsolatedValue, CallIsolatedValue + "-snapshot", f),
-			request: (client, r) => client.UpdateModelSnapshot(r),
-			requestAsync: (client, r) => client.UpdateModelSnapshotAsync(r)
-		);
+		protected override bool ExpectIsValid => true;
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		protected override object ExpectJson => new
 		{
-			foreach (var callUniqueValue in values)
-			{
-				IndexSnapshot(client, callUniqueValue.Value, callUniqueValue.Value + "-snapshot");
-			}
-		}
+			description = "Modified snapshot description"
+		};
 
-		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots/{CallIsolatedValue}-snapshot/_update";
-		protected override bool SupportsDeserialization => false;
-		protected override UpdateModelSnapshotDescriptor NewDescriptor() => new UpdateModelSnapshotDescriptor(CallIsolatedValue, CallIsolatedValue + "-snapshot");
-
-		protected override object ExpectJson => new
-			{
-				description = "Modified snapshot description"
-			};
 
 		protected override Func<UpdateModelSnapshotDescriptor, IUpdateModelSnapshotRequest> Fluent => f => f
 			.Description("Modified snapshot description");
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override UpdateModelSnapshotRequest Initializer =>
 			new UpdateModelSnapshotRequest(CallIsolatedValue, CallIsolatedValue + "-snapshot")
 			{
 				Description = "Modified snapshot description",
 			};
 
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"/_xpack/ml/anomaly_detectors/{CallIsolatedValue}/model_snapshots/{CallIsolatedValue}-snapshot/_update";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.UpdateModelSnapshot(CallIsolatedValue, CallIsolatedValue + "-snapshot", f),
+			(client, f) => client.UpdateModelSnapshotAsync(CallIsolatedValue, CallIsolatedValue + "-snapshot", f),
+			(client, r) => client.UpdateModelSnapshot(r),
+			(client, r) => client.UpdateModelSnapshotAsync(r)
+		);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values) IndexSnapshot(client, callUniqueValue.Value, callUniqueValue.Value + "-snapshot");
+		}
+
+		protected override UpdateModelSnapshotDescriptor NewDescriptor() =>
+			new UpdateModelSnapshotDescriptor(CallIsolatedValue, CallIsolatedValue + "-snapshot");
+
 		protected override void ExpectResponse(IUpdateModelSnapshotResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/MachineLearning/UpdateModelSnapshot/UpdateModelSnapshotUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/UpdateModelSnapshot/UpdateModelSnapshotUrlTests.cs
index 2a65f625e2c..71ecb6faaa2 100644
--- a/src/Tests/Tests/XPack/MachineLearning/UpdateModelSnapshot/UpdateModelSnapshotUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/UpdateModelSnapshot/UpdateModelSnapshotUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.MachineLearning.UpdateModelSnapshot
 {
 	public class UpdateModelSnapshotUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/job_id/model_snapshots/snapshot_id/_update")
-				.Fluent(c => c.UpdateModelSnapshot("job_id", "snapshot_id", p => p))
-				.Request(c => c.UpdateModelSnapshot(new UpdateModelSnapshotRequest("job_id", "snapshot_id")))
-				.FluentAsync(c => c.UpdateModelSnapshotAsync("job_id", "snapshot_id", p => p))
-				.RequestAsync(c => c.UpdateModelSnapshotAsync(new UpdateModelSnapshotRequest("job_id", "snapshot_id")))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/job_id/model_snapshots/snapshot_id/_update")
+			.Fluent(c => c.UpdateModelSnapshot("job_id", "snapshot_id", p => p))
+			.Request(c => c.UpdateModelSnapshot(new UpdateModelSnapshotRequest("job_id", "snapshot_id")))
+			.FluentAsync(c => c.UpdateModelSnapshotAsync("job_id", "snapshot_id", p => p))
+			.RequestAsync(c => c.UpdateModelSnapshotAsync(new UpdateModelSnapshotRequest("job_id", "snapshot_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/ValidateDetector/ValidateDetectorApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/ValidateDetector/ValidateDetectorApiTests.cs
index 9faa53d1602..b79667e05ac 100644
--- a/src/Tests/Tests/XPack/MachineLearning/ValidateDetector/ValidateDetectorApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/ValidateDetector/ValidateDetectorApiTests.cs
@@ -10,36 +10,27 @@
 
 namespace Tests.XPack.MachineLearning.ValidateDetector
 {
-	public class ValidateDetectorApiTests : MachineLearningIntegrationTestBase<IValidateDetectorResponse, IValidateDetectorRequest, ValidateDetectorDescriptor<Project>, ValidateDetectorRequest>
+	public class ValidateDetectorApiTests
+		: MachineLearningIntegrationTestBase<IValidateDetectorResponse, IValidateDetectorRequest, ValidateDetectorDescriptor<Project>,
+			ValidateDetectorRequest>
 	{
 		public ValidateDetectorApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ValidateDetector(f),
-			fluentAsync: (client, f) => client.ValidateDetectorAsync(f),
-			request: (client, r) => client.ValidateDetector(r),
-			requestAsync: (client, r) => client.ValidateDetectorAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/_validate/detector";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
-			{
-				detector_description = "detector description",
-				function = "count",
-				by_field_name = "numberOfCommits",
-				over_field_name = "branches",
-				partition_field_name = "leadDeveloper",
-				exclude_frequent = "none",
-				use_null = true,
-				detector_index = 0
-			};
+		{
+			detector_description = "detector description",
+			function = "count",
+			by_field_name = "numberOfCommits",
+			over_field_name = "branches",
+			partition_field_name = "leadDeveloper",
+			exclude_frequent = "none",
+			use_null = true,
+			detector_index = 0
+		};
+
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<ValidateDetectorDescriptor<Project>, IValidateDetectorRequest> Fluent => f => f
 			.Count(c => c
@@ -52,6 +43,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				.DetectorIndex(0)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ValidateDetectorRequest Initializer =>
 			new ValidateDetectorRequest
 			{
@@ -67,9 +60,17 @@ protected override LazyResponses ClientUsage() => Calls(
 				}
 			};
 
-		protected override void ExpectResponse(IValidateDetectorResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/_validate/detector";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ValidateDetector(f),
+			(client, f) => client.ValidateDetectorAsync(f),
+			(client, r) => client.ValidateDetector(r),
+			(client, r) => client.ValidateDetectorAsync(r)
+		);
+
+		protected override void ExpectResponse(IValidateDetectorResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/ValidateDetector/ValidateDetectorUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/ValidateDetector/ValidateDetectorUrlTests.cs
index bb26dba7278..3e37d134683 100644
--- a/src/Tests/Tests/XPack/MachineLearning/ValidateDetector/ValidateDetectorUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/ValidateDetector/ValidateDetectorUrlTests.cs
@@ -9,14 +9,10 @@ namespace Tests.XPack.MachineLearning.ValidateDetector
 {
 	public class ValidateDetectorUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/_validate/detector")
-				.Fluent(c => c.ValidateDetector<Project>(v => v))
-				.Request(c => c.ValidateDetector(new ValidateDetectorRequest()))
-				.FluentAsync(c => c.ValidateDetectorAsync<Project>(v => v))
-				.RequestAsync(c => c.ValidateDetectorAsync(new ValidateDetectorRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/_validate/detector")
+			.Fluent(c => c.ValidateDetector<Project>(v => v))
+			.Request(c => c.ValidateDetector(new ValidateDetectorRequest()))
+			.FluentAsync(c => c.ValidateDetectorAsync<Project>(v => v))
+			.RequestAsync(c => c.ValidateDetectorAsync(new ValidateDetectorRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/ValidateJob/ValidateJobApiTests.cs b/src/Tests/Tests/XPack/MachineLearning/ValidateJob/ValidateJobApiTests.cs
index 762c495e4a3..0f41d8a0f6a 100644
--- a/src/Tests/Tests/XPack/MachineLearning/ValidateJob/ValidateJobApiTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/ValidateJob/ValidateJobApiTests.cs
@@ -10,22 +10,12 @@
 
 namespace Tests.XPack.MachineLearning.ValidateJob
 {
-	public class ValidateJobApiTests : MachineLearningIntegrationTestBase<IValidateJobResponse, IValidateJobRequest, ValidateJobDescriptor<Metric>, ValidateJobRequest>
+	public class ValidateJobApiTests
+		: MachineLearningIntegrationTestBase<IValidateJobResponse, IValidateJobRequest, ValidateJobDescriptor<Metric>, ValidateJobRequest>
 	{
 		public ValidateJobApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ValidateJob(f),
-			fluentAsync: (client, f) => client.ValidateJobAsync(f),
-			request: (client, r) => client.ValidateJob(r),
-			requestAsync: (client, r) => client.ValidateJobAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/_validate";
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
@@ -50,6 +40,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			results_index_name = "server-metrics"
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<ValidateJobDescriptor<Metric>, IValidateJobRequest> Fluent => f => f
 			.Description("Lab 1 - Simple example")
 			.ResultsIndexName("server-metrics")
@@ -60,6 +52,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			)
 			.DataDescription(d => d.TimeField(r => r.Timestamp));
 
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override ValidateJobRequest Initializer =>
 			new ValidateJobRequest()
 			{
@@ -69,7 +63,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				{
 					BucketSpan = new Time("30m"),
 					Latency = "0s",
-					Detectors = new []
+					Detectors = new[]
 					{
 						new SumDetector
 						{
@@ -83,9 +77,16 @@ protected override LazyResponses ClientUsage() => Calls(
 				}
 			};
 
-		protected override void ExpectResponse(IValidateJobResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override bool SupportsDeserialization => false;
+		protected override string UrlPath => $"_xpack/ml/anomaly_detectors/_validate";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ValidateJob(f),
+			(client, f) => client.ValidateJobAsync(f),
+			(client, r) => client.ValidateJob(r),
+			(client, r) => client.ValidateJobAsync(r)
+		);
+
+		protected override void ExpectResponse(IValidateJobResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/MachineLearning/ValidateJob/ValidateJobUrlTests.cs b/src/Tests/Tests/XPack/MachineLearning/ValidateJob/ValidateJobUrlTests.cs
index 33ab56ac389..0de5850dffd 100644
--- a/src/Tests/Tests/XPack/MachineLearning/ValidateJob/ValidateJobUrlTests.cs
+++ b/src/Tests/Tests/XPack/MachineLearning/ValidateJob/ValidateJobUrlTests.cs
@@ -9,14 +9,10 @@ namespace Tests.XPack.MachineLearning.ValidateJob
 {
 	public class ValidateJobUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/ml/anomaly_detectors/_validate")
-				.Fluent(c => c.ValidateJob<Project>(v => v))
-				.Request(c => c.ValidateJob(new ValidateJobRequest()))
-				.FluentAsync(c => c.ValidateJobAsync<Project>(v => v))
-				.RequestAsync(c => c.ValidateJobAsync(new ValidateJobRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/ml/anomaly_detectors/_validate")
+			.Fluent(c => c.ValidateJob<Project>(v => v))
+			.Request(c => c.ValidateJob(new ValidateJobRequest()))
+			.FluentAsync(c => c.ValidateJobAsync<Project>(v => v))
+			.RequestAsync(c => c.ValidateJobAsync(new ValidateJobRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Migration/DeprecationInfo/DeprecationInfoApiTests.cs b/src/Tests/Tests/XPack/Migration/DeprecationInfo/DeprecationInfoApiTests.cs
index 2c2f86fb72d..8f36759872f 100644
--- a/src/Tests/Tests/XPack/Migration/DeprecationInfo/DeprecationInfoApiTests.cs
+++ b/src/Tests/Tests/XPack/Migration/DeprecationInfo/DeprecationInfoApiTests.cs
@@ -3,10 +3,8 @@
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Core;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.XPack.Migration.DeprecationInfo
 {
@@ -25,8 +23,10 @@ public void ShouldDeserialize()
 					{
 						level = "info",
 						message = "Network settings changes",
-						url = "https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_indices_changes.html#_index_templates_use_literal_index_patterns_literal_instead_of_literal_template_literal",
-						details = "templates using <literal>template</literal> field: watches,.monitoring-alerts,.watch-history-6,.ml-notifications,security-index-template,triggered_watches,.monitoring-es,.ml-meta,.ml-state,.monitoring-logstash,.ml-anomalies-,.monitoring-kibana"
+						url =
+							"https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_indices_changes.html#_index_templates_use_literal_index_patterns_literal_instead_of_literal_template_literal",
+						details =
+							"templates using <literal>template</literal> field: watches,.monitoring-alerts,.watch-history-6,.ml-notifications,security-index-template,triggered_watches,.monitoring-es,.ml-meta,.ml-state,.monitoring-logstash,.ml-anomalies-,.monitoring-kibana"
 					}
 				},
 				node_settings = new object[0],
@@ -35,10 +35,12 @@ public void ShouldDeserialize()
 					{
 						indexName, new object[]
 						{
-							new {
+							new
+							{
 								level = "info",
 								message = "Coercion of boolean fields",
-								url = "https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_mappings_changes.html#_coercion_of_boolean_fields",
+								url =
+									"https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_mappings_changes.html#_coercion_of_boolean_fields",
 								details = "<anchor id=\"type: doc\" xreflabel=\"field: spins]\"/>"
 							}
 						}
@@ -56,8 +58,14 @@ public void ShouldDeserialize()
 			response.ClusterSettings.Should().HaveCount(1);
 			response.ClusterSettings.First().Level.Should().Be(DeprecationWarningLevel.Information);
 			response.ClusterSettings.First().Message.Should().Be("Network settings changes");
-			response.ClusterSettings.First().Url.Should().Be("https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_indices_changes.html#_index_templates_use_literal_index_patterns_literal_instead_of_literal_template_literal");
-			response.ClusterSettings.First().Details.Should().Be("templates using <literal>template</literal> field: watches,.monitoring-alerts,.watch-history-6,.ml-notifications,security-index-template,triggered_watches,.monitoring-es,.ml-meta,.ml-state,.monitoring-logstash,.ml-anomalies-,.monitoring-kibana");
+			response.ClusterSettings.First()
+				.Url.Should()
+				.Be(
+					"https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_indices_changes.html#_index_templates_use_literal_index_patterns_literal_instead_of_literal_template_literal");
+			response.ClusterSettings.First()
+				.Details.Should()
+				.Be(
+					"templates using <literal>template</literal> field: watches,.monitoring-alerts,.watch-history-6,.ml-notifications,security-index-template,triggered_watches,.monitoring-es,.ml-meta,.ml-state,.monitoring-logstash,.ml-anomalies-,.monitoring-kibana");
 
 			response.NodeSettings.Should().NotBeNull();
 			response.NodeSettings.Should().BeEmpty();
@@ -69,7 +77,8 @@ public void ShouldDeserialize()
 
 			var deprecationInfo = response.IndexSettings[indexName].First();
 			deprecationInfo.Details.Should().Be("<anchor id=\"type: doc\" xreflabel=\"field: spins]\"/>");
-			deprecationInfo.Url.Should().Be("https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_mappings_changes.html#_coercion_of_boolean_fields");
+			deprecationInfo.Url.Should()
+				.Be("https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_mappings_changes.html#_coercion_of_boolean_fields");
 			deprecationInfo.Message.Should().Be("Coercion of boolean fields");
 			deprecationInfo.Level.Should().Be(DeprecationWarningLevel.Information);
 		}
diff --git a/src/Tests/Tests/XPack/Migration/DeprecationInfo/DeprecationInfoUrlTests.cs b/src/Tests/Tests/XPack/Migration/DeprecationInfo/DeprecationInfoUrlTests.cs
index 80efdbdf532..0d20183dcc6 100644
--- a/src/Tests/Tests/XPack/Migration/DeprecationInfo/DeprecationInfoUrlTests.cs
+++ b/src/Tests/Tests/XPack/Migration/DeprecationInfo/DeprecationInfoUrlTests.cs
@@ -11,19 +11,19 @@ public class DeprecationInfoUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/migration/deprecations")
-				.Fluent(c => c.DeprecationInfo())
-				.Request(c => c.DeprecationInfo(new DeprecationInfoRequest()))
-				.FluentAsync(c => c.DeprecationInfoAsync())
-				.RequestAsync(c => c.DeprecationInfoAsync(new DeprecationInfoRequest()))
+					.Fluent(c => c.DeprecationInfo())
+					.Request(c => c.DeprecationInfo(new DeprecationInfoRequest()))
+					.FluentAsync(c => c.DeprecationInfoAsync())
+					.RequestAsync(c => c.DeprecationInfoAsync(new DeprecationInfoRequest()))
 				;
 
 			var index = "another-index";
 
 			await GET($"/{index}/_xpack/migration/deprecations")
-				.Fluent(c => c.DeprecationInfo(d=>d.Index(index)))
-				.Request(c => c.DeprecationInfo(new DeprecationInfoRequest(index)))
-				.FluentAsync(c => c.DeprecationInfoAsync(d=>d.Index(index)))
-				.RequestAsync(c => c.DeprecationInfoAsync(new DeprecationInfoRequest(index)))
+					.Fluent(c => c.DeprecationInfo(d => d.Index(index)))
+					.Request(c => c.DeprecationInfo(new DeprecationInfoRequest(index)))
+					.FluentAsync(c => c.DeprecationInfoAsync(d => d.Index(index)))
+					.RequestAsync(c => c.DeprecationInfoAsync(new DeprecationInfoRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Migration/MigrationAssistance/MigrationAssistanceApiTests.cs b/src/Tests/Tests/XPack/Migration/MigrationAssistance/MigrationAssistanceApiTests.cs
index c60ac747373..4469a339819 100644
--- a/src/Tests/Tests/XPack/Migration/MigrationAssistance/MigrationAssistanceApiTests.cs
+++ b/src/Tests/Tests/XPack/Migration/MigrationAssistance/MigrationAssistanceApiTests.cs
@@ -1,12 +1,9 @@
 using System.Collections.Generic;
-using System.Linq;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
-using Tests.Core;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
-using Tests.Framework;
 
 namespace Tests.XPack.Migration.MigrationAssistance
 {
diff --git a/src/Tests/Tests/XPack/Migration/MigrationAssistance/MigrationAssistanceUrlTests.cs b/src/Tests/Tests/XPack/Migration/MigrationAssistance/MigrationAssistanceUrlTests.cs
index b511ae96115..6801f37693a 100644
--- a/src/Tests/Tests/XPack/Migration/MigrationAssistance/MigrationAssistanceUrlTests.cs
+++ b/src/Tests/Tests/XPack/Migration/MigrationAssistance/MigrationAssistanceUrlTests.cs
@@ -11,19 +11,19 @@ public class MigrationAssistanceUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/migration/assistance")
-				.Fluent(c => c.MigrationAssistance())
-				.Request(c => c.MigrationAssistance(new MigrationAssistanceRequest()))
-				.FluentAsync(c => c.MigrationAssistanceAsync())
-				.RequestAsync(c => c.MigrationAssistanceAsync(new MigrationAssistanceRequest()))
+					.Fluent(c => c.MigrationAssistance())
+					.Request(c => c.MigrationAssistance(new MigrationAssistanceRequest()))
+					.FluentAsync(c => c.MigrationAssistanceAsync())
+					.RequestAsync(c => c.MigrationAssistanceAsync(new MigrationAssistanceRequest()))
 				;
 
 			var index = "another-index";
 
 			await GET($"/_xpack/migration/assistance/{index}")
-				.Fluent(c => c.MigrationAssistance(d=>d.Index(index)))
-				.Request(c => c.MigrationAssistance(new MigrationAssistanceRequest(index)))
-				.FluentAsync(c => c.MigrationAssistanceAsync(d=>d.Index(index)))
-				.RequestAsync(c => c.MigrationAssistanceAsync(new MigrationAssistanceRequest(index)))
+					.Fluent(c => c.MigrationAssistance(d => d.Index(index)))
+					.Request(c => c.MigrationAssistance(new MigrationAssistanceRequest(index)))
+					.FluentAsync(c => c.MigrationAssistanceAsync(d => d.Index(index)))
+					.RequestAsync(c => c.MigrationAssistanceAsync(new MigrationAssistanceRequest(index)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Migration/MigrationUpgrade/InvalidMigrationUpgradeApiTests.cs b/src/Tests/Tests/XPack/Migration/MigrationUpgrade/InvalidMigrationUpgradeApiTests.cs
index 4ecc42648fc..ca1835830a8 100644
--- a/src/Tests/Tests/XPack/Migration/MigrationUpgrade/InvalidMigrationUpgradeApiTests.cs
+++ b/src/Tests/Tests/XPack/Migration/MigrationUpgrade/InvalidMigrationUpgradeApiTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Net;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
@@ -9,39 +7,40 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Migration.MigrationUpgrade
 {
 	[SkipVersion(">=6.3.0", "Not running on latest version")]
-	public class InvalidMigrationUpgradeApiTests :
-		ApiIntegrationTestBase<XPackCluster, IMigrationUpgradeResponse, IMigrationUpgradeRequest, MigrationUpgradeDescriptor, MigrationUpgradeRequest>
+	public class InvalidMigrationUpgradeApiTests
+		: ApiIntegrationTestBase<XPackCluster, IMigrationUpgradeResponse, IMigrationUpgradeRequest, MigrationUpgradeDescriptor,
+			MigrationUpgradeRequest>
 	{
+		private const string Index = ".watches";
+
 		public InvalidMigrationUpgradeApiTests(XPackCluster cluster, EndpointUsage usage)
 			: base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (c, f) => c.MigrationUpgrade(Index, f),
-			fluentAsync: (c, f) => c.MigrationUpgradeAsync(Index, f),
-			request: (c, r) => c.MigrationUpgrade(r),
-			requestAsync: (c, r) => c.MigrationUpgradeAsync(r)
-		);
-
-		private const string Index = ".watches";
-
-		protected override string UrlPath => $"/_xpack/migration/upgrade/{Index}";
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override int ExpectStatusCode => 400;
 		protected override bool ExpectIsValid => false;
 
 		protected override object ExpectJson => null;
-
-		protected override MigrationUpgradeDescriptor NewDescriptor() => new MigrationUpgradeDescriptor(Index);
+		protected override int ExpectStatusCode => 400;
 
 		protected override Func<MigrationUpgradeDescriptor, IMigrationUpgradeRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override MigrationUpgradeRequest Initializer => new MigrationUpgradeRequest(Index);
 
+		protected override string UrlPath => $"/_xpack/migration/upgrade/{Index}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(c, f) => c.MigrationUpgrade(Index, f),
+			(c, f) => c.MigrationUpgradeAsync(Index, f),
+			(c, r) => c.MigrationUpgrade(r),
+			(c, r) => c.MigrationUpgradeAsync(r)
+		);
+
+		protected override MigrationUpgradeDescriptor NewDescriptor() => new MigrationUpgradeDescriptor(Index);
+
 		protected override void ExpectResponse(IMigrationUpgradeResponse response)
 		{
 			response.ShouldNotBeValid();
diff --git a/src/Tests/Tests/XPack/Migration/MigrationUpgrade/MigrationUpgradeUrlTests.cs b/src/Tests/Tests/XPack/Migration/MigrationUpgrade/MigrationUpgradeUrlTests.cs
index f554280e870..d4ef917c005 100644
--- a/src/Tests/Tests/XPack/Migration/MigrationUpgrade/MigrationUpgradeUrlTests.cs
+++ b/src/Tests/Tests/XPack/Migration/MigrationUpgrade/MigrationUpgradeUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Migration.MigrationUpgrade
 {
 	public class MigrationUpgradeUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST($"/_xpack/migration/upgrade/index")
-				.Fluent(c => c.MigrationUpgrade("index"))
-				.Request(c => c.MigrationUpgrade(new MigrationUpgradeRequest("index")))
-				.FluentAsync(c => c.MigrationUpgradeAsync("index"))
-				.RequestAsync(c => c.MigrationUpgradeAsync(new MigrationUpgradeRequest("index")))
-				;
-		}
+		[U] public override async Task Urls() => await POST($"/_xpack/migration/upgrade/index")
+			.Fluent(c => c.MigrationUpgrade("index"))
+			.Request(c => c.MigrationUpgrade(new MigrationUpgradeRequest("index")))
+			.FluentAsync(c => c.MigrationUpgradeAsync("index"))
+			.RequestAsync(c => c.MigrationUpgradeAsync(new MigrationUpgradeRequest("index")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Rollup/RollupJobCrudTests.cs b/src/Tests/Tests/XPack/Rollup/RollupJobCrudTests.cs
index 41ef30c97fe..46d3b341d6e 100644
--- a/src/Tests/Tests/XPack/Rollup/RollupJobCrudTests.cs
+++ b/src/Tests/Tests/XPack/Rollup/RollupJobCrudTests.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
-using Bogus.DataSets;
 using Elastic.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
@@ -18,22 +16,24 @@ namespace Tests.XPack.Rollup
 	public class RollupJobCrudTests
 		: CrudTestBase<TimeSeriesCluster, ICreateRollupJobResponse, IGetRollupJobResponse, ICreateRollupJobResponse, IDeleteRollupJobResponse>
 	{
-		public RollupJobCrudTests(TimeSeriesCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		private static string CreateRollupName(string s) => $"rollup-logs-{s}";
 		private static readonly string CronPeriod = "*/2 * * * * ?";
 
+		public RollupJobCrudTests(TimeSeriesCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
 		protected override bool SupportsUpdates => false;
 		protected override bool TestOnlyOneMethod => true;
 
-		protected override LazyResponses Create() => this.Calls<CreateRollupJobDescriptor<Log>, CreateRollupJobRequest, ICreateRollupJobRequest, ICreateRollupJobResponse>(
-			this.CreateInitializer,
-			this.CreateFluent,
-			fluent: (s, c, f) => c.CreateRollupJob(CreateRollupName(s), f),
-			fluentAsync: (s, c, f) => c.CreateRollupJobAsync(CreateRollupName(s), f),
-			request: (s, c, r) => c.CreateRollupJob(r),
-			requestAsync: (s, c, r) => c.CreateRollupJobAsync(r)
-		);
+		private static string CreateRollupName(string s) => $"rollup-logs-{s}";
+
+		protected override LazyResponses Create() =>
+			Calls<CreateRollupJobDescriptor<Log>, CreateRollupJobRequest, ICreateRollupJobRequest, ICreateRollupJobResponse>(
+				CreateInitializer,
+				CreateFluent,
+				(s, c, f) => c.CreateRollupJob(CreateRollupName(s), f),
+				(s, c, f) => c.CreateRollupJobAsync(CreateRollupName(s), f),
+				(s, c, r) => c.CreateRollupJob(r),
+				(s, c, r) => c.CreateRollupJobAsync(r)
+			);
 
 		protected CreateRollupJobRequest CreateInitializer(string role) => new CreateRollupJobRequest(CreateRollupName(role))
 		{
@@ -45,12 +45,12 @@ protected override LazyResponses Create() => this.Calls<CreateRollupJobDescripto
 			{
 				DateHistogram = new DateHistogramRollupGrouping
 				{
-					Field = Infer.Field<Log>(p=>p.Timestamp),
+					Field = Infer.Field<Log>(p => p.Timestamp),
 					Interval = TimeSpan.FromHours(1)
 				},
 				Terms = new TermsRollupGrouping
 				{
-					Fields = Infer.Field<Log>(p=>p.Section).And<Log>(p=>p.Tag)
+					Fields = Infer.Field<Log>(p => p.Section).And<Log>(p => p.Tag)
 				},
 				Histogram = new HistogramRollupGrouping
 				{
@@ -62,11 +62,12 @@ protected override LazyResponses Create() => this.Calls<CreateRollupJobDescripto
 			{
 				new RollupFieldMetric
 				{
-					Field = Infer.Field<Log>(p=>p.Temperature),
-					Metrics = new [] {RollupMetric.Average,RollupMetric.Min,RollupMetric.Max}
+					Field = Infer.Field<Log>(p => p.Temperature),
+					Metrics = new[] { RollupMetric.Average, RollupMetric.Min, RollupMetric.Max }
 				},
 			}
 		};
+
 		protected ICreateRollupJobRequest CreateFluent(string role, CreateRollupJobDescriptor<Log> d) => d
 			.PageSize(1000)
 			.IndexPattern(TimeSeriesSeeder.IndicesWildCard)
@@ -77,82 +78,98 @@ protected ICreateRollupJobRequest CreateFluent(string role, CreateRollupJobDescr
 				.Terms(t => t.Fields(f => f.Field(p => p.Section).Field(p => p.Tag)))
 				.Histogram(h => h.Fields(f => f.Field(p => p.Load).Field(p => p.NetIn).Field(p => p.NetOut)).Interval(5))
 			)
-			.Metrics(m=>m
+			.Metrics(m => m
 				.Field(p => p.Temperature, RollupMetric.Average, RollupMetric.Min, RollupMetric.Max)
 			);
 
-		protected override LazyResponses Read() => this.Calls<GetRollupJobDescriptor, GetRollupJobRequest, IGetRollupJobRequest, IGetRollupJobResponse>(
-			this.ReadInitializer,
-			this.ReadFluent,
-			fluent: (s, c, f) => c.GetRollupJob(f),
-			fluentAsync: (s, c, f) => c.GetRollupJobAsync(f),
-			request: (s, c, r) => c.GetRollupJob(r),
-			requestAsync: (s, c, r) => c.GetRollupJobAsync(r)
+		protected override LazyResponses Read() => Calls<GetRollupJobDescriptor, GetRollupJobRequest, IGetRollupJobRequest, IGetRollupJobResponse>(
+			ReadInitializer,
+			ReadFluent,
+			(s, c, f) => c.GetRollupJob(f),
+			(s, c, f) => c.GetRollupJobAsync(f),
+			(s, c, r) => c.GetRollupJob(r),
+			(s, c, r) => c.GetRollupJobAsync(r)
 		);
 
 		protected GetRollupJobRequest ReadInitializer(string role) => new GetRollupJobRequest(CreateRollupName(role));
+
 		protected IGetRollupJobRequest ReadFluent(string role, GetRollupJobDescriptor d) => d.Id(CreateRollupName(role));
 
 		protected override IDictionary<string, Func<LazyResponses>> AfterCreateCalls() => new Dictionary<string, Func<LazyResponses>>
 		{
-			{ "start", () => this.Calls<StartRollupJobDescriptor, StartRollupJobRequest, IStartRollupJobRequest, IStartRollupJobResponse>(
-				this.StartInitializer,
-				this.StartFluent,
-				fluent: (s, c, f) => c.StartRollupJob(CreateRollupName(s), f),
-				fluentAsync: (s, c, f) => c.StartRollupJobAsync(CreateRollupName(s), f),
-				request: (s, c, r) => c.StartRollupJob(r),
-				requestAsync: (s, c, r) => c.StartRollupJobAsync(r)
-			)},
-			{ "wait_for_finish", () => this.Call(this.WaitForFinish) },
-			{ "rollup_search", () => this.Calls<RollupSearchDescriptor<Log>, RollupSearchRequest, IRollupSearchRequest, IRollupSearchResponse<Log>>(
-				this.RollupSearchInitializer,
-				this.RollupSearchFluent,
-				fluent: (s, c, f) => c.RollupSearch(CreateRollupSearchIndices(s), f),
-				fluentAsync: (s, c, f) => c.RollupSearchAsync(CreateRollupSearchIndices(s), f),
-				request: (s, c, r) => c.RollupSearch<Log>(r),
-				requestAsync: (s, c, r) => c.RollupSearchAsync<Log>(r)
-			)},
-			{ "rollup_caps", () => this.Calls<GetRollupCapabilitiesDescriptor, GetRollupCapabilitiesRequest, IGetRollupCapabilitiesRequest, IGetRollupCapabilitiesResponse>(
-				this.CapsInitializer,
-				this.CapsFluent,
-				fluent: (s, c, f) => c.GetRollupCapabilities(f),
-				fluentAsync: (s, c, f) => c.GetRollupCapabilitiesAsync(f),
-				request: (s, c, r) => c.GetRollupCapabilities(r),
-				requestAsync: (s, c, r) => c.GetRollupCapabilitiesAsync(r)
-			)},
-			{ "stop", () => this.Calls<StopRollupJobDescriptor, StopRollupJobRequest, IStopRollupJobRequest, IStopRollupJobResponse>(
-				this.StopInitializer,
-				this.StopFluent,
-				fluent: (s, c, f) => c.StopRollupJob(CreateRollupName(s), f),
-				fluentAsync: (s, c, f) => c.StopRollupJobAsync(CreateRollupName(s), f),
-				request: (s, c, r) => c.StopRollupJob(r),
-				requestAsync: (s, c, r) => c.StopRollupJobAsync(r)
-			)},
-
+			{
+				"start", () => Calls<StartRollupJobDescriptor, StartRollupJobRequest, IStartRollupJobRequest, IStartRollupJobResponse>(
+					StartInitializer,
+					StartFluent,
+					(s, c, f) => c.StartRollupJob(CreateRollupName(s), f),
+					(s, c, f) => c.StartRollupJobAsync(CreateRollupName(s), f),
+					(s, c, r) => c.StartRollupJob(r),
+					(s, c, r) => c.StartRollupJobAsync(r)
+				)
+			},
+			{ "wait_for_finish", () => Call(WaitForFinish) },
+			{
+				"rollup_search", () => Calls<RollupSearchDescriptor<Log>, RollupSearchRequest, IRollupSearchRequest, IRollupSearchResponse<Log>>(
+					RollupSearchInitializer,
+					RollupSearchFluent,
+					(s, c, f) => c.RollupSearch(CreateRollupSearchIndices(s), f),
+					(s, c, f) => c.RollupSearchAsync(CreateRollupSearchIndices(s), f),
+					(s, c, r) => c.RollupSearch<Log>(r),
+					(s, c, r) => c.RollupSearchAsync<Log>(r)
+				)
+			},
+			{
+				"rollup_caps", () =>
+					Calls<GetRollupCapabilitiesDescriptor, GetRollupCapabilitiesRequest, IGetRollupCapabilitiesRequest, IGetRollupCapabilitiesResponse
+					>(
+						CapsInitializer,
+						CapsFluent,
+						(s, c, f) => c.GetRollupCapabilities(f),
+						(s, c, f) => c.GetRollupCapabilitiesAsync(f),
+						(s, c, r) => c.GetRollupCapabilities(r),
+						(s, c, r) => c.GetRollupCapabilitiesAsync(r)
+					)
+			},
+			{
+				"stop", () => Calls<StopRollupJobDescriptor, StopRollupJobRequest, IStopRollupJobRequest, IStopRollupJobResponse>(
+					StopInitializer,
+					StopFluent,
+					(s, c, f) => c.StopRollupJob(CreateRollupName(s), f),
+					(s, c, f) => c.StopRollupJobAsync(CreateRollupName(s), f),
+					(s, c, r) => c.StopRollupJob(r),
+					(s, c, r) => c.StopRollupJobAsync(r)
+				)
+			},
 		};
+
 		protected StartRollupJobRequest StartInitializer(string role) => new StartRollupJobRequest(CreateRollupName(role));
+
 		protected IStartRollupJobRequest StartFluent(string role, StartRollupJobDescriptor d) => d;
 
 		protected StopRollupJobRequest StopInitializer(string role) => new StopRollupJobRequest(CreateRollupName(role));
+
 		protected IStopRollupJobRequest StopFluent(string role, StopRollupJobDescriptor d) => d;
 
 		protected GetRollupCapabilitiesRequest CapsInitializer(string role) => new GetRollupCapabilitiesRequest(TimeSeriesSeeder.IndicesWildCard);
-		protected IGetRollupCapabilitiesRequest CapsFluent(string role, GetRollupCapabilitiesDescriptor d) => d.Index(TimeSeriesSeeder.IndicesWildCard);
+
+		protected IGetRollupCapabilitiesRequest CapsFluent(string role, GetRollupCapabilitiesDescriptor d) =>
+			d.Index(TimeSeriesSeeder.IndicesWildCard);
 
 		[I] public async Task StartsJob() =>
-			await this.AssertOnAfterCreateResponse<IStartRollupJobResponse>("start", r => r.Started.Should().BeTrue());
+			await AssertOnAfterCreateResponse<IStartRollupJobResponse>("start", r => r.Started.Should().BeTrue());
 
 		[I] public async Task StopsJob() =>
-			await this.AssertOnAfterCreateResponse<IStopRollupJobResponse>("stop", r => r.Stopped.Should().BeTrue());
+			await AssertOnAfterCreateResponse<IStopRollupJobResponse>("stop", r => r.Stopped.Should().BeTrue());
 
 		private async Task<IGetRollupJobResponse> WaitForFinish(List<string> allJobs, IElasticClient client)
 		{
 			var tasks = new List<Task<IGetRollupJobResponse>>(4);
-			foreach(var job in allJobs)
+			foreach (var job in allJobs)
 				tasks.Add(WaitForFinish(CreateRollupName(job), client));
 			await Task.WhenAll(tasks);
 			return tasks[0].Result;
 		}
+
 		private static async Task<IGetRollupJobResponse> WaitForFinish(string job, IElasticClient client)
 		{
 			IGetRollupJobResponse response;
@@ -177,26 +194,27 @@ private static async Task<IGetRollupJobResponse> WaitForFinish(string job, IElas
 		}
 
 		//make sure we query a rolled up index and a live index
-		protected static Nest.Indices CreateRollupSearchIndices(string rollupIndex) => $"{CreateRollupName(rollupIndex)},logs-{DateTime.UtcNow:yyyy-MM-dd}";
+		protected static Nest.Indices CreateRollupSearchIndices(string rollupIndex) =>
+			$"{CreateRollupName(rollupIndex)},logs-{DateTime.UtcNow:yyyy-MM-dd}";
 
 		protected RollupSearchRequest RollupSearchInitializer(string index) => new RollupSearchRequest(CreateRollupSearchIndices(index))
 		{
 			Size = 0,
-			Query = new MatchAllQuery() {},
-			Aggregations = new MaxAggregation("max_temp", Infer.Field<Log>(p=>p.Temperature))
-				&& new AverageAggregation("avg_temp", Infer.Field<Log>(p=>p.Temperature))
+			Query = new MatchAllQuery() { },
+			Aggregations = new MaxAggregation("max_temp", Infer.Field<Log>(p => p.Temperature))
+				&& new AverageAggregation("avg_temp", Infer.Field<Log>(p => p.Temperature))
 		};
 
 		protected IRollupSearchRequest RollupSearchFluent(string index, RollupSearchDescriptor<Log> d) => d
 			.Size(0)
-			.Query(q=>q.MatchAll())
-			.Aggregations(aggs=>
-				aggs.Max("max_temp", m=>m.Field(p=>p.Temperature))
-				&& aggs.Min("avg_temp", m=>m.Field(p=>p.Temperature))
+			.Query(q => q.MatchAll())
+			.Aggregations(aggs =>
+				aggs.Max("max_temp", m => m.Field(p => p.Temperature))
+				&& aggs.Min("avg_temp", m => m.Field(p => p.Temperature))
 			);
 
 		[I] public async Task RollupSearchReturnsAggregations() =>
-			await this.AssertOnAfterCreateResponse<IRollupSearchResponse<Log>>("rollup_search", r =>
+			await AssertOnAfterCreateResponse<IRollupSearchResponse<Log>>("rollup_search", r =>
 			{
 				r.ShouldBeValid();
 				var avg = r.Aggregations.Average("avg_temp");
@@ -208,7 +226,7 @@ await this.AssertOnAfterCreateResponse<IRollupSearchResponse<Log>>("rollup_searc
 			});
 
 		[I] public async Task GetRollupCapabilities() =>
-			await this.AssertOnAfterCreateResponse<IGetRollupCapabilitiesResponse>("rollup_caps", r =>
+			await AssertOnAfterCreateResponse<IGetRollupCapabilitiesResponse>("rollup_caps", r =>
 			{
 				r.IsValid.Should().BeTrue();
 				r.Indices.Should().NotBeEmpty().And.ContainKey(TimeSeriesSeeder.IndicesWildCard);
@@ -230,16 +248,18 @@ await this.AssertOnAfterCreateResponse<IGetRollupCapabilitiesResponse>("rollup_c
 		// ignored because we mark SupportsUpdates => false
 		protected override LazyResponses Update() => null;
 
-		protected override LazyResponses Delete() => this.Calls<DeleteRollupJobDescriptor, DeleteRollupJobRequest, IDeleteRollupJobRequest, IDeleteRollupJobResponse>(
-			this.DeleteInitializer,
-			this.DeleteFluent,
-			fluent: (s, c, f) => c.DeleteRollupJob(CreateRollupName(s), f),
-			fluentAsync: (s, c, f) => c.DeleteRollupJobAsync(CreateRollupName(s), f),
-			request: (s, c, r) => c.DeleteRollupJob(r),
-			requestAsync: (s, c, r) => c.DeleteRollupJobAsync(r)
-		);
+		protected override LazyResponses Delete() =>
+			Calls<DeleteRollupJobDescriptor, DeleteRollupJobRequest, IDeleteRollupJobRequest, IDeleteRollupJobResponse>(
+				DeleteInitializer,
+				DeleteFluent,
+				(s, c, f) => c.DeleteRollupJob(CreateRollupName(s), f),
+				(s, c, f) => c.DeleteRollupJobAsync(CreateRollupName(s), f),
+				(s, c, r) => c.DeleteRollupJob(r),
+				(s, c, r) => c.DeleteRollupJobAsync(r)
+			);
 
 		protected DeleteRollupJobRequest DeleteInitializer(string role) => new DeleteRollupJobRequest(CreateRollupName(role));
+
 		protected IDeleteRollupJobRequest DeleteFluent(string role, DeleteRollupJobDescriptor d) => d;
 
 		protected override void ExpectAfterCreate(IGetRollupJobResponse response)
@@ -283,7 +303,7 @@ protected override void ExpectAfterCreate(IGetRollupJobResponse response)
 			}
 		}
 
-		[I, SkipVersion("<6.4.1", "https://github.com/elastic/elasticsearch/issues/34292")]
-		protected override async Task GetAfterDeleteIsValid() => await this.AssertOnGetAfterDelete(r => r.ShouldBeValid());
+		[I] [SkipVersion("<6.4.1", "https://github.com/elastic/elasticsearch/issues/34292")]
+		protected override async Task GetAfterDeleteIsValid() => await AssertOnGetAfterDelete(r => r.ShouldBeValid());
 	}
 }
diff --git a/src/Tests/Tests/XPack/Security/Authenticate/AuthenticateApiTests.cs b/src/Tests/Tests/XPack/Security/Authenticate/AuthenticateApiTests.cs
index cd9fea4dd4f..df67245264e 100644
--- a/src/Tests/Tests/XPack/Security/Authenticate/AuthenticateApiTests.cs
+++ b/src/Tests/Tests/XPack/Security/Authenticate/AuthenticateApiTests.cs
@@ -7,29 +7,29 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Elastic.Managed.Ephemeral.ClusterAuthentication;
 
 namespace Tests.XPack.Security.Authenticate
 {
 	[SkipVersion("<2.3.0", "")]
-	public class AuthenticateApiTests : ApiIntegrationTestBase<XPackCluster, IAuthenticateResponse, IAuthenticateRequest, AuthenticateDescriptor, AuthenticateRequest>
+	public class AuthenticateApiTests
+		: ApiIntegrationTestBase<XPackCluster, IAuthenticateResponse, IAuthenticateRequest, AuthenticateDescriptor, AuthenticateRequest>
 	{
 		public AuthenticateApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.Authenticate(f),
-			fluentAsync: (client, f) => client.AuthenticateAsync(f),
-			request: (client, r) => client.Authenticate(r),
-			requestAsync: (client, r) => client.AuthenticateAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override string UrlPath => $"/_xpack/security/_authenticate";
 
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Authenticate(f),
+			(client, f) => client.AuthenticateAsync(f),
+			(client, r) => client.Authenticate(r),
+			(client, r) => client.AuthenticateAsync(r)
+		);
+
 		protected override void ExpectResponse(IAuthenticateResponse response)
 		{
 			response.Username.Should().Be(Admin.Username);
@@ -42,6 +42,11 @@ public class AuthenticateRequestConfigurationApiTests : AuthenticateApiTests
 	{
 		public AuthenticateRequestConfigurationApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override Func<AuthenticateDescriptor, IAuthenticateRequest> Fluent => f => f
+			.RequestConfiguration(c => c
+				.BasicAuthentication(ClusterAuthentication.User.Username, ClusterAuthentication.User.Password)
+			);
+
 		protected override AuthenticateRequest Initializer => new AuthenticateRequest
 		{
 			RequestConfiguration = new RequestConfiguration
@@ -54,16 +59,10 @@ public AuthenticateRequestConfigurationApiTests(XPackCluster cluster, EndpointUs
 			}
 		};
 
-		protected override Func<AuthenticateDescriptor, IAuthenticateRequest> Fluent => f => f
-			.RequestConfiguration(c=>c
-				.BasicAuthentication(ClusterAuthentication.User.Username, ClusterAuthentication.User.Password)
-			);
-
 		protected override void ExpectResponse(IAuthenticateResponse response)
 		{
 			response.Username.Should().Be(ClusterAuthentication.User.Username);
 			response.Roles.Should().Contain(ClusterAuthentication.User.Role);
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/XPack/Security/Authenticate/AuthenticateUrlTests.cs b/src/Tests/Tests/XPack/Security/Authenticate/AuthenticateUrlTests.cs
index 2ba3488ba85..92a854b8262 100644
--- a/src/Tests/Tests/XPack/Security/Authenticate/AuthenticateUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/Authenticate/AuthenticateUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Security.Authenticate
 {
 	public class AuthenticateUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_xpack/security/_authenticate")
-				.Fluent(c => c.Authenticate())
-				.Request(c => c.Authenticate(new AuthenticateRequest()))
-				.FluentAsync(c => c.AuthenticateAsync())
-				.RequestAsync(c => c.AuthenticateAsync(new AuthenticateRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_xpack/security/_authenticate")
+			.Fluent(c => c.Authenticate())
+			.Request(c => c.Authenticate(new AuthenticateRequest()))
+			.FluentAsync(c => c.AuthenticateAsync())
+			.RequestAsync(c => c.AuthenticateAsync(new AuthenticateRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs b/src/Tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs
index 603ba653df3..b6a537cf482 100644
--- a/src/Tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs
+++ b/src/Tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs
@@ -9,39 +9,39 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.XPack.Security.ClearCachedRealms
 {
 	[SkipVersion("<2.3.0", "")]
-	public class ClearCachedRealmsApiTests : ApiIntegrationTestBase<XPackCluster, IClearCachedRealmsResponse, IClearCachedRealmsRequest, ClearCachedRealmsDescriptor, ClearCachedRealmsRequest>
+	public class ClearCachedRealmsApiTests
+		: ApiIntegrationTestBase<XPackCluster, IClearCachedRealmsResponse, IClearCachedRealmsRequest, ClearCachedRealmsDescriptor,
+			ClearCachedRealmsRequest>
 	{
 		public ClearCachedRealmsApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClearCachedRealms(this.Realm, f),
-			fluentAsync: (client, f) => client.ClearCachedRealmsAsync(this.Realm, f),
-			request: (client, r) => client.ClearCachedRealms(r),
-			requestAsync: (client, r) => client.ClearCachedRealmsAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
+
+		protected override Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> Fluent => d => d;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
-		protected override string UrlPath => $"/_xpack/security/realm/{U(this.Realm)}/_clear_cache";
+		protected override ClearCachedRealmsRequest Initializer => new ClearCachedRealmsRequest(Realm);
 
 		protected override bool SupportsDeserialization => false;
 
+		protected override string UrlPath => $"/_xpack/security/realm/{U(Realm)}/_clear_cache";
+
 		//callisolated value can sometimes start with a digit which is not allowed for rolenames
 		private string Realm => SecurityRealms.FileRealm;
 
-		protected override ClearCachedRealmsRequest Initializer => new ClearCachedRealmsRequest(this.Realm);
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClearCachedRealms(Realm, f),
+			(client, f) => client.ClearCachedRealmsAsync(Realm, f),
+			(client, r) => client.ClearCachedRealms(r),
+			(client, r) => client.ClearCachedRealmsAsync(r)
+		);
 
-		protected override ClearCachedRealmsDescriptor NewDescriptor() => new ClearCachedRealmsDescriptor(this.Realm);
-
-		protected override Func<ClearCachedRealmsDescriptor, IClearCachedRealmsRequest> Fluent => d => d;
+		protected override ClearCachedRealmsDescriptor NewDescriptor() => new ClearCachedRealmsDescriptor(Realm);
 
 		protected override void ExpectResponse(IClearCachedRealmsResponse response)
 		{
@@ -52,5 +52,4 @@ protected override void ExpectResponse(IClearCachedRealmsResponse response)
 			node.Name.Should().NotBeNullOrEmpty();
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsUrlTests.cs b/src/Tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsUrlTests.cs
index 0dfb731f5e5..23d3d30ae1a 100644
--- a/src/Tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsUrlTests.cs
@@ -11,19 +11,19 @@ public class ClearCachedRealmsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await POST("/_xpack/security/realm/mpdreamz/_clear_cache")
-				.Fluent(c => c.ClearCachedRealms("mpdreamz"))
-				.Request(c => c.ClearCachedRealms(new ClearCachedRealmsRequest("mpdreamz")))
-				.FluentAsync(c => c.ClearCachedRealmsAsync("mpdreamz"))
-				.RequestAsync(c => c.ClearCachedRealmsAsync(new ClearCachedRealmsRequest("mpdreamz")))
+					.Fluent(c => c.ClearCachedRealms("mpdreamz"))
+					.Request(c => c.ClearCachedRealms(new ClearCachedRealmsRequest("mpdreamz")))
+					.FluentAsync(c => c.ClearCachedRealmsAsync("mpdreamz"))
+					.RequestAsync(c => c.ClearCachedRealmsAsync(new ClearCachedRealmsRequest("mpdreamz")))
 				;
 
 
 			var users = "mpdreamz,gmarz,forloop";
 			await POST($"/_xpack/security/realm/mpdreamz/_clear_cache?usernames={EscapeUriString(users)}")
-				.Fluent(c => c.ClearCachedRealms("mpdreamz", f=>f.Usernames(users)))
-				.Request(c => c.ClearCachedRealms(new ClearCachedRealmsRequest("mpdreamz") { Usernames = new[] { users } }))
-				.FluentAsync(c => c.ClearCachedRealmsAsync("mpdreamz", f=>f.Usernames(users)))
-				.RequestAsync(c => c.ClearCachedRealmsAsync(new ClearCachedRealmsRequest("mpdreamz") { Usernames = new[] { users } }))
+					.Fluent(c => c.ClearCachedRealms("mpdreamz", f => f.Usernames(users)))
+					.Request(c => c.ClearCachedRealms(new ClearCachedRealmsRequest("mpdreamz") { Usernames = new[] { users } }))
+					.FluentAsync(c => c.ClearCachedRealmsAsync("mpdreamz", f => f.Usernames(users)))
+					.RequestAsync(c => c.ClearCachedRealmsAsync(new ClearCachedRealmsRequest("mpdreamz") { Usernames = new[] { users } }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesApiTests.cs b/src/Tests/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesApiTests.cs
index f5421d7b708..02b0448827a 100644
--- a/src/Tests/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesApiTests.cs
+++ b/src/Tests/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesApiTests.cs
@@ -8,44 +8,41 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.XPack.Security.Role.ClearCachedRoles
 {
 	[SkipVersion("<2.3.0", "")]
-	public class ClearCachedRolesApiTests : ApiIntegrationTestBase<XPackCluster, IClearCachedRolesResponse, IClearCachedRolesRequest, ClearCachedRolesDescriptor, ClearCachedRolesRequest>
+	public class ClearCachedRolesApiTests
+		: ApiIntegrationTestBase<XPackCluster, IClearCachedRolesResponse, IClearCachedRolesRequest, ClearCachedRolesDescriptor,
+			ClearCachedRolesRequest>
 	{
 		public ClearCachedRolesApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ClearCachedRoles(this.Role, f),
-			fluentAsync: (client, f) => client.ClearCachedRolesAsync(this.Role, f),
-			request: (client, r) => client.ClearCachedRoles(r),
-			requestAsync: (client, r) => client.ClearCachedRolesAsync(r)
-		);
-
-		protected override void OnBeforeCall(IElasticClient client)
-		{
-			client.PutRole(new PutRoleRequest(this.Role));
-		}
-
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
+
+		protected override Func<ClearCachedRolesDescriptor, IClearCachedRolesRequest> Fluent => d => d;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
-		protected override string UrlPath => $"/_xpack/security/role/{this.Role}/_clear_cache";
+		protected override ClearCachedRolesRequest Initializer => new ClearCachedRolesRequest(Role);
 
 		protected override bool SupportsDeserialization => false;
 
+		protected override string UrlPath => $"/_xpack/security/role/{Role}/_clear_cache";
+
 		//callisolated value can sometimes start with a digit which is not allowed for rolenames
 		private string Role => $"role-{CallIsolatedValue}";
 
-		protected override ClearCachedRolesRequest Initializer => new ClearCachedRolesRequest(this.Role);
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClearCachedRoles(Role, f),
+			(client, f) => client.ClearCachedRolesAsync(Role, f),
+			(client, r) => client.ClearCachedRoles(r),
+			(client, r) => client.ClearCachedRolesAsync(r)
+		);
 
-		protected override ClearCachedRolesDescriptor NewDescriptor() => new ClearCachedRolesDescriptor(this.Role);
+		protected override void OnBeforeCall(IElasticClient client) => client.PutRole(new PutRoleRequest(Role));
 
-		protected override Func<ClearCachedRolesDescriptor, IClearCachedRolesRequest> Fluent => d => d;
+		protected override ClearCachedRolesDescriptor NewDescriptor() => new ClearCachedRolesDescriptor(Role);
 
 		protected override void ExpectResponse(IClearCachedRolesResponse response)
 		{
@@ -56,5 +53,4 @@ protected override void ExpectResponse(IClearCachedRolesResponse response)
 			node.Name.Should().NotBeNullOrWhiteSpace();
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesUrlTests.cs b/src/Tests/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesUrlTests.cs
index c4dafca356b..49e9f27809f 100644
--- a/src/Tests/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesUrlTests.cs
@@ -12,10 +12,10 @@ [U] public override async Task Urls()
 		{
 			var role = "some_role";
 			await POST($"/_xpack/security/role/{role}/_clear_cache")
-				.Fluent(c => c.ClearCachedRoles(role))
-				.Request(c => c.ClearCachedRoles(new ClearCachedRolesRequest(role)))
-				.FluentAsync(c => c.ClearCachedRolesAsync(role))
-				.RequestAsync(c => c.ClearCachedRolesAsync(new ClearCachedRolesRequest(role)))
+					.Fluent(c => c.ClearCachedRoles(role))
+					.Request(c => c.ClearCachedRoles(new ClearCachedRolesRequest(role)))
+					.FluentAsync(c => c.ClearCachedRolesAsync(role))
+					.RequestAsync(c => c.ClearCachedRolesAsync(new ClearCachedRolesRequest(role)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Security/Role/DeleteRole/DeleteRoleUrlTests.cs b/src/Tests/Tests/XPack/Security/Role/DeleteRole/DeleteRoleUrlTests.cs
index 3b52495c187..45f5cc635cc 100644
--- a/src/Tests/Tests/XPack/Security/Role/DeleteRole/DeleteRoleUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/Role/DeleteRole/DeleteRoleUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Security.Role.DeleteRole
 {
 	public class DeleteRoleUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await DELETE("/_xpack/security/role/mpdreamz")
-				.Fluent(c => c.DeleteRole("mpdreamz"))
-				.Request(c => c.DeleteRole(new DeleteRoleRequest("mpdreamz")))
-				.FluentAsync(c => c.DeleteRoleAsync("mpdreamz"))
-				.RequestAsync(c => c.DeleteRoleAsync(new DeleteRoleRequest("mpdreamz")))
-				;
-		}
+		[U] public override async Task Urls() => await DELETE("/_xpack/security/role/mpdreamz")
+			.Fluent(c => c.DeleteRole("mpdreamz"))
+			.Request(c => c.DeleteRole(new DeleteRoleRequest("mpdreamz")))
+			.FluentAsync(c => c.DeleteRoleAsync("mpdreamz"))
+			.RequestAsync(c => c.DeleteRoleAsync(new DeleteRoleRequest("mpdreamz")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Security/Role/GetRole/GetRoleUrlTests.cs b/src/Tests/Tests/XPack/Security/Role/GetRole/GetRoleUrlTests.cs
index a73d6863ab1..00c00e9d6e9 100644
--- a/src/Tests/Tests/XPack/Security/Role/GetRole/GetRoleUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/Role/GetRole/GetRoleUrlTests.cs
@@ -11,18 +11,18 @@ public class GetRoleUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/security/role")
-				.Fluent(c => c.GetRole())
-				.Request(c => c.GetRole(new GetRoleRequest()))
-				.FluentAsync(c => c.GetRoleAsync())
-				.RequestAsync(c => c.GetRoleAsync(new GetRoleRequest()))
+					.Fluent(c => c.GetRole())
+					.Request(c => c.GetRole(new GetRoleRequest()))
+					.FluentAsync(c => c.GetRoleAsync())
+					.RequestAsync(c => c.GetRoleAsync(new GetRoleRequest()))
 				;
 
 			var users = "admin,user,nest_user";
 			await GET($"/_xpack/security/role/{EscapeUriString(users)}")
-				.Fluent(c => c.GetRole(f=>f.Name(users)))
-				.Request(c => c.GetRole(new GetRoleRequest(users)))
-				.FluentAsync(c => c.GetRoleAsync(f=>f.Name(users)))
-				.RequestAsync(c => c.GetRoleAsync(new GetRoleRequest(users)))
+					.Fluent(c => c.GetRole(f => f.Name(users)))
+					.Request(c => c.GetRole(new GetRoleRequest(users)))
+					.FluentAsync(c => c.GetRoleAsync(f => f.Name(users)))
+					.RequestAsync(c => c.GetRoleAsync(new GetRoleRequest(users)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs b/src/Tests/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs
index 708908e7841..eeda3eedfb0 100644
--- a/src/Tests/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs
+++ b/src/Tests/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs
@@ -9,8 +9,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 using static Nest.Infer;
 
 namespace Tests.XPack.Security.Role.PutRole
@@ -20,34 +18,20 @@ public class PutRoleApiTests : ApiIntegrationTestBase<XPackCluster, IPutRoleResp
 	{
 		public PutRoleApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutRole(this.Role, f),
-			fluentAsync: (client, f) => client.PutRoleAsync(this.Role, f),
-			request: (client, r) => client.PutRole(r),
-			requestAsync: (client, r) => client.PutRoleAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/security/role/{this.Role}";
-
-		protected override bool SupportsDeserialization => false;
-
-		//callisolated value can sometimes start with a digit which is not allowed for rolenames
-		protected string Role => $"role-{CallIsolatedValue}";
 
 		protected override object ExpectJson => new
 		{
-			cluster = new [] { "all" },
-			run_as = new [] { "user" },
-			indices = new [] {
-				new {
-					names = new [] { "project" },
-					privileges = new [] { "all" },
-					field_security = new { grant = new [] { "name", "description" } },
-					query = new { match_all = new {} }
+			cluster = new[] { "all" },
+			run_as = new[] { "user" },
+			indices = new[]
+			{
+				new
+				{
+					names = new[] { "project" },
+					privileges = new[] { "all" },
+					field_security = new { grant = new[] { "name", "description" } },
+					query = new { match_all = new { } }
 				}
 			},
 			metadata = new
@@ -56,7 +40,29 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override PutRoleRequest Initializer => new PutRoleRequest(this.Role)
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<PutRoleDescriptor, IPutRoleRequest> Fluent => d => d
+			.RunAs("user")
+			.Cluster("all")
+			.Indices(i => i
+				.Add<Project>(ii => ii
+					.FieldSecurity(fs => fs
+						.Grant(f => f
+							.Field(p => p.Name)
+							.Field(p => p.Description)
+						)
+					)
+					.Names(Indices<Project>())
+					.Privileges("all")
+					.Query(q => q.MatchAll())
+				)
+			)
+			.Metadata(m => m.Add("internal", true));
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+		protected override PutRoleRequest Initializer => new PutRoleRequest(Role)
 		{
 			Cluster = new[] { "all" },
 			RunAs = new[] { "user" },
@@ -66,10 +72,10 @@ protected override LazyResponses ClientUsage() => Calls(
 				{
 					FieldSecurity = new FieldSecurity
 					{
-						Grant = Fields<Project>(p=>p.Name).And<Project>(p=>p.Description)
+						Grant = Fields<Project>(p => p.Name).And<Project>(p => p.Description)
 					},
 					Names = Indices<Project>(),
-					Privileges = new [] { "all" },
+					Privileges = new[] { "all" },
 					Query = new MatchAllQuery()
 				}
 			},
@@ -79,25 +85,21 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override PutRoleDescriptor NewDescriptor() => new PutRoleDescriptor(this.Role);
+		//callisolated value can sometimes start with a digit which is not allowed for rolenames
+		protected string Role => $"role-{CallIsolatedValue}";
 
-		protected override Func<PutRoleDescriptor, IPutRoleRequest> Fluent => d => d
-			.RunAs("user")
-			.Cluster("all")
-			.Indices(i => i
-				.Add<Project>(ii => ii
-					.FieldSecurity(fs => fs
-						.Grant(f => f
-							.Field(p => p.Name)
-							.Field(p => p.Description)
-						)
-					)
-					.Names(Indices<Project>())
-					.Privileges("all")
-					.Query(q => q.MatchAll())
-				)
-			)
-			.Metadata( m => m.Add("internal", true));
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_xpack/security/role/{Role}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutRole(Role, f),
+			(client, f) => client.PutRoleAsync(Role, f),
+			(client, r) => client.PutRole(r),
+			(client, r) => client.PutRoleAsync(r)
+		);
+
+		protected override PutRoleDescriptor NewDescriptor() => new PutRoleDescriptor(Role);
 
 		protected override void ExpectResponse(IPutRoleResponse response)
 		{
@@ -113,6 +115,11 @@ public PutRoleRunAsApiTests(XPackCluster cluster, EndpointUsage usage) : base(cl
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 403;
 
+		protected override Func<PutRoleDescriptor, IPutRoleRequest> Fluent => f => base.Fluent(f
+			.RequestConfiguration(c => c
+				.RunAs(ClusterAuthentication.User.Username)
+			));
+
 		protected override PutRoleRequest Initializer
 		{
 			get
@@ -126,14 +133,7 @@ protected override PutRoleRequest Initializer
 			}
 		}
 
-		protected override Func<PutRoleDescriptor, IPutRoleRequest> Fluent => f => base.Fluent(f
-			.RequestConfiguration(c => c
-				.RunAs(ClusterAuthentication.User.Username)
-			));
-
-		protected override void ExpectResponse(IPutRoleResponse response)
-		{
-		}
+		protected override void ExpectResponse(IPutRoleResponse response) { }
 	}
 
 	[SkipVersion("<6.4.0", "Application privileges introduced in 6.4.0")]
@@ -143,7 +143,7 @@ public PutRoleApplicationsTests(XPackCluster cluster, EndpointUsage usage) : bas
 
 		protected override object ExpectJson => new
 		{
-			applications = new []
+			applications = new[]
 			{
 				new
 				{
@@ -154,27 +154,26 @@ public PutRoleApplicationsTests(XPackCluster cluster, EndpointUsage usage) : bas
 			}
 		};
 
-		protected override PutRoleRequest Initializer => new PutRoleRequest(this.Role)
+		protected override Func<PutRoleDescriptor, IPutRoleRequest> Fluent => f => f
+			.Applications(a => a
+				.Add<Project>(ap => ap
+					.Application("myapp")
+					.Privileges("admin", "read")
+					.Resources("*")
+				)
+			);
+
+		protected override PutRoleRequest Initializer => new PutRoleRequest(Role)
 		{
 			Applications = new List<IApplicationPrivileges>
 			{
 				new ApplicationPrivileges
 				{
 					Application = "myapp",
-					Privileges = new [] { "admin", "read" },
-					Resources = new [] { "*"}
+					Privileges = new[] { "admin", "read" },
+					Resources = new[] { "*" }
 				}
 			}
 		};
-
-		protected override Func<PutRoleDescriptor, IPutRoleRequest> Fluent => f => f
-			.Applications(a => a
-				.Add<Project>(ap => ap
-					.Application("myapp")
-					.Privileges("admin", "read")
-					.Resources("*")
-				)
-			);
 	}
-
 }
diff --git a/src/Tests/Tests/XPack/Security/Role/PutRole/PutRoleUrlTests.cs b/src/Tests/Tests/XPack/Security/Role/PutRole/PutRoleUrlTests.cs
index 6b64ba11c79..ff0c5fb511f 100644
--- a/src/Tests/Tests/XPack/Security/Role/PutRole/PutRoleUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/Role/PutRole/PutRoleUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Security.Role.PutRole
 {
 	public class PutRoleUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/security/role/mpdreamz")
-				.Fluent(c => c.PutRole("mpdreamz"))
-				.Request(c => c.PutRole(new PutRoleRequest("mpdreamz")))
-				.FluentAsync(c => c.PutRoleAsync("mpdreamz"))
-				.RequestAsync(c => c.PutRoleAsync(new PutRoleRequest("mpdreamz")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/security/role/mpdreamz")
+			.Fluent(c => c.PutRole("mpdreamz"))
+			.Request(c => c.PutRole(new PutRoleRequest("mpdreamz")))
+			.FluentAsync(c => c.PutRoleAsync("mpdreamz"))
+			.RequestAsync(c => c.PutRoleAsync(new PutRoleRequest("mpdreamz")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Security/Role/RoleCrudTests.cs b/src/Tests/Tests/XPack/Security/Role/RoleCrudTests.cs
index ffdf517fb8d..569c9fe93bb 100644
--- a/src/Tests/Tests/XPack/Security/Role/RoleCrudTests.cs
+++ b/src/Tests/Tests/XPack/Security/Role/RoleCrudTests.cs
@@ -8,8 +8,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.XPack.Security.Role
 {
@@ -25,10 +23,10 @@ public RoleCrudTests(XPackCluster cluster, EndpointUsage usage) : base(cluster,
 		protected override LazyResponses Create() => Calls<PutRoleDescriptor, PutRoleRequest, IPutRoleRequest, IPutRoleResponse>(
 			CreateInitializer,
 			CreateFluent,
-			fluent: (s, c, f) => c.PutRole(CreateRoleName(s), f),
-			fluentAsync: (s, c, f) => c.PutRoleAsync(CreateRoleName(s), f),
-			request: (s, c, r) => c.PutRole(r),
-			requestAsync: (s, c, r) => c.PutRoleAsync(r)
+			(s, c, f) => c.PutRole(CreateRoleName(s), f),
+			(s, c, f) => c.PutRoleAsync(CreateRoleName(s), f),
+			(s, c, r) => c.PutRole(r),
+			(s, c, r) => c.PutRoleAsync(r)
 		);
 
 		protected PutRoleRequest CreateInitializer(string role) => new PutRoleRequest(CreateRoleName(role))
@@ -40,19 +38,20 @@ protected override LazyResponses Create() => Calls<PutRoleDescriptor, PutRoleReq
 				{
 					FieldSecurity = new FieldSecurity
 					{
-						Grant = Infer.Fields<Project>(p=>p.Name).And<Project>(p=>p.Description),
+						Grant = Infer.Fields<Project>(p => p.Name).And<Project>(p => p.Description),
 					},
 					Names = Infer.Indices<Project>(),
-					Privileges = new [] { "all" },
+					Privileges = new[] { "all" },
 					Query = new MatchAllQuery()
 				}
 			}
 		};
+
 		protected IPutRoleRequest CreateFluent(string role, PutRoleDescriptor d) => d
 			.Cluster("all")
 			.Indices(i => i
 				.Add<Project>(ii => ii
-					.FieldSecurity(fs=>fs
+					.FieldSecurity(fs => fs
 						.Grant(f => f
 							.Field(p => p.Name)
 							.Field(p => p.Description)
@@ -67,22 +66,23 @@ protected IPutRoleRequest CreateFluent(string role, PutRoleDescriptor d) => d
 		protected override LazyResponses Read() => Calls<GetRoleDescriptor, GetRoleRequest, IGetRoleRequest, IGetRoleResponse>(
 			ReadInitializer,
 			ReadFluent,
-			fluent: (s, c, f) => c.GetRole(f),
-			fluentAsync: (s, c, f) => c.GetRoleAsync(f),
-			request: (s, c, r) => c.GetRole(r),
-			requestAsync: (s, c, r) => c.GetRoleAsync(r)
+			(s, c, f) => c.GetRole(f),
+			(s, c, f) => c.GetRoleAsync(f),
+			(s, c, r) => c.GetRole(r),
+			(s, c, r) => c.GetRoleAsync(r)
 		);
 
 		protected GetRoleRequest ReadInitializer(string role) => new GetRoleRequest(CreateRoleName(role));
+
 		protected IGetRoleRequest ReadFluent(string role, GetRoleDescriptor d) => d.Name(CreateRoleName(role));
 
 		protected override LazyResponses Update() => Calls<PutRoleDescriptor, PutRoleRequest, IPutRoleRequest, IPutRoleResponse>(
 			UpdateInitializer,
 			UpdateFluent,
-			fluent: (s, c, f) => c.PutRole(CreateRoleName(s), f),
-			fluentAsync: (s, c, f) => c.PutRoleAsync(CreateRoleName(s), f),
-			request: (s, c, r) => c.PutRole(r),
-			requestAsync: (s, c, r) => c.PutRoleAsync(r)
+			(s, c, f) => c.PutRole(CreateRoleName(s), f),
+			(s, c, f) => c.PutRoleAsync(CreateRoleName(s), f),
+			(s, c, r) => c.PutRole(r),
+			(s, c, r) => c.PutRoleAsync(r)
 		);
 
 		protected PutRoleRequest UpdateInitializer(string role) => new PutRoleRequest(CreateRoleName(role))
@@ -95,20 +95,21 @@ protected override LazyResponses Update() => Calls<PutRoleDescriptor, PutRoleReq
 				{
 					FieldSecurity = new FieldSecurity
 					{
-						Grant =Infer.Fields<Project>(p=>p.Name).And<Project>(p=>p.Description)
+						Grant = Infer.Fields<Project>(p => p.Name).And<Project>(p => p.Description)
 					},
 					Names = Infer.Indices<Project>(),
-					Privileges = new [] { "all" },
+					Privileges = new[] { "all" },
 					Query = new MatchAllQuery()
 				}
 			}
 		};
+
 		protected IPutRoleRequest UpdateFluent(string role, PutRoleDescriptor d) => d
 			.RunAs("user")
 			.Cluster("all")
 			.Indices(i => i
 				.Add<Project>(ii => ii
-					.FieldSecurity(fs=>fs
+					.FieldSecurity(fs => fs
 						.Grant(f => f
 							.Field(p => p.Name)
 							.Field(p => p.Description)
@@ -123,13 +124,14 @@ protected IPutRoleRequest UpdateFluent(string role, PutRoleDescriptor d) => d
 		protected override LazyResponses Delete() => Calls<DeleteRoleDescriptor, DeleteRoleRequest, IDeleteRoleRequest, IDeleteRoleResponse>(
 			DeleteInitializer,
 			DeleteFluent,
-			fluent: (s, c, f) => c.DeleteRole(CreateRoleName(s), f),
-			fluentAsync: (s, c, f) => c.DeleteRoleAsync(CreateRoleName(s), f),
-			request: (s, c, r) => c.DeleteRole(r),
-			requestAsync: (s, c, r) => c.DeleteRoleAsync(r)
+			(s, c, f) => c.DeleteRole(CreateRoleName(s), f),
+			(s, c, f) => c.DeleteRoleAsync(CreateRoleName(s), f),
+			(s, c, r) => c.DeleteRole(r),
+			(s, c, r) => c.DeleteRoleAsync(r)
 		);
 
 		protected DeleteRoleRequest DeleteInitializer(string role) => new DeleteRoleRequest(CreateRoleName(role));
+
 		protected IDeleteRoleRequest DeleteFluent(string role, DeleteRoleDescriptor d) => d;
 
 		protected override void ExpectAfterCreate(IGetRoleResponse response)
@@ -149,6 +151,7 @@ protected override void ExpectAfterCreate(IGetRoleResponse response)
 			var q = indexPrivilege.Query as IQueryContainer;
 			q.MatchAll.Should().NotBeNull();
 		}
+
 		protected override void ExpectAfterUpdate(IGetRoleResponse response)
 		{
 			response.Roles.Should().NotBeEmpty();
diff --git a/src/Tests/Tests/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingUrlTests.cs b/src/Tests/Tests/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingUrlTests.cs
index 44456c2fa29..56808827b30 100644
--- a/src/Tests/Tests/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/RoleMapping/DeleteRoleMapping/DeleteRoleMappingUrlTests.cs
@@ -12,10 +12,10 @@ [U] public override async Task Urls()
 		{
 			var role = "can_read";
 			await DELETE($"/_xpack/security/role_mapping/{role}")
-				.Fluent(c => c.DeleteRoleMapping(role))
-				.Request(c => c.DeleteRoleMapping(new DeleteRoleMappingRequest(role)))
-				.FluentAsync(c => c.DeleteRoleMappingAsync(role))
-				.RequestAsync(c => c.DeleteRoleMappingAsync(new DeleteRoleMappingRequest(role)))
+					.Fluent(c => c.DeleteRoleMapping(role))
+					.Request(c => c.DeleteRoleMapping(new DeleteRoleMappingRequest(role)))
+					.FluentAsync(c => c.DeleteRoleMappingAsync(role))
+					.RequestAsync(c => c.DeleteRoleMappingAsync(new DeleteRoleMappingRequest(role)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingUrlTests.cs b/src/Tests/Tests/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingUrlTests.cs
index a4d39cb3dd6..b607ec3ac0a 100644
--- a/src/Tests/Tests/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/RoleMapping/GetRoleMapping/GetRoleMappingUrlTests.cs
@@ -11,18 +11,18 @@ public class GetRoleMappingUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/security/role_mapping")
-				.Fluent(c => c.GetRoleMapping())
-				.Request(c => c.GetRoleMapping(new GetRoleMappingRequest()))
-				.FluentAsync(c => c.GetRoleMappingAsync())
-				.RequestAsync(c => c.GetRoleMappingAsync(new GetRoleMappingRequest()))
+					.Fluent(c => c.GetRoleMapping())
+					.Request(c => c.GetRoleMapping(new GetRoleMappingRequest()))
+					.FluentAsync(c => c.GetRoleMappingAsync())
+					.RequestAsync(c => c.GetRoleMappingAsync(new GetRoleMappingRequest()))
 				;
 
 			var roles = "can_write,can_read_metadata";
 			await GET($"/_xpack/security/role_mapping/{EscapeUriString(roles)}")
-				.Fluent(c => c.GetRoleMapping(f=>f.Name(roles)))
-				.Request(c => c.GetRoleMapping(new GetRoleMappingRequest(roles)))
-				.FluentAsync(c => c.GetRoleMappingAsync(f=>f.Name(roles)))
-				.RequestAsync(c => c.GetRoleMappingAsync(new GetRoleMappingRequest(roles)))
+					.Fluent(c => c.GetRoleMapping(f => f.Name(roles)))
+					.Request(c => c.GetRoleMapping(new GetRoleMappingRequest(roles)))
+					.FluentAsync(c => c.GetRoleMappingAsync(f => f.Name(roles)))
+					.RequestAsync(c => c.GetRoleMappingAsync(new GetRoleMappingRequest(roles)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingApiTests.cs b/src/Tests/Tests/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingApiTests.cs
index e984876891b..4241cac7dac 100644
--- a/src/Tests/Tests/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingApiTests.cs
+++ b/src/Tests/Tests/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingApiTests.cs
@@ -7,87 +7,58 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
-using static Nest.Infer;
 
 namespace Tests.XPack.Security.RoleMapping.PutRoleMapping
 {
 	[SkipVersion("<5.5.0", "")]
-	public class PutRoleMappingApiTests : ApiIntegrationTestBase<XPackCluster, IPutRoleMappingResponse, IPutRoleMappingRequest,
-		PutRoleMappingDescriptor, PutRoleMappingRequest>
+	public class PutRoleMappingApiTests
+		: ApiIntegrationTestBase<XPackCluster, IPutRoleMappingResponse, IPutRoleMappingRequest,
+			PutRoleMappingDescriptor, PutRoleMappingRequest>
 	{
-		public PutRoleMappingApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
 		private readonly string _dn = "*,ou=admin,dc=example,dc=com";
-		private readonly string _username = "mpdreamz";
-		private readonly string _realm = "some_realm";
+		private readonly string[] _groups = { "group1", "group2" };
 		private readonly Tuple<string, string> _metadata = Tuple.Create("a", "b");
-		private readonly string[] _groups = {"group1", "group2"};
+		private readonly string _realm = "some_realm";
+		private readonly string _username = "mpdreamz";
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutRoleMapping(this.Role, f),
-			fluentAsync: (client, f) => client.PutRoleMappingAsync(this.Role, f),
-			request: (client, r) => client.PutRoleMapping(r),
-			requestAsync: (client, r) => client.PutRoleMappingAsync(r)
-		);
+		public PutRoleMappingApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/security/role_mapping/{this.Role}";
-
-		protected override bool SupportsDeserialization => false;
-
-		//callisolated value can sometimes start with a digit which is not allowed for rolenames
-		private string Role => $"role-{CallIsolatedValue}";
 
 		protected override object ExpectJson => new
 		{
 			enabled = true,
-			roles = new[] {"admin"},
+			roles = new[] { "admin" },
 			metadata = new
 			{
 				x = "y",
-				z = (object) null
+				z = (object)null
 			},
-			rules = new {
-				all = new object[] {
-					new {
-						any = new object[] {
+			rules = new
+			{
+				all = new object[]
+				{
+					new
+					{
+						any = new object[]
+						{
 							new { field = new { dn = "*,ou=admin,dc=example,dc=com" } },
 							new { field = new { username = "mpdreamz" } },
-							new { field = new Dictionary<string, object>(){ {"realm.name", "some_realm" } } }
+							new { field = new Dictionary<string, object>() { { "realm.name", "some_realm" } } }
 						}
 					},
-					new { field = new Dictionary<string, object>(){ {"metadata.a", "b" } } },
-					new { except = new { field = new { groups = new [] { "group1", "group2" } } } }
+					new { field = new Dictionary<string, object>() { { "metadata.a", "b" } } },
+					new { except = new { field = new { groups = new[] { "group1", "group2" } } } }
 				}
-            }
-		};
-
-		protected override PutRoleMappingRequest Initializer => new PutRoleMappingRequest(this.Role)
-		{
-			Enabled = true,
-			Roles = new [] { "admin"},
-			Metadata = new Dictionary<string, object>
-			{
-				{"x", "y"},
-				{"z", null}
-			},
-			Rules =
-				(new DistinguishedNameRule(_dn) | new UsernameRule(_username) | new RealmRule(_realm))
-				& new MetadataRule(_metadata.Item1, _metadata.Item2)
-				& !new GroupsRule(_groups)
+			}
 		};
 
-		protected override PutRoleMappingDescriptor NewDescriptor() => new PutRoleMappingDescriptor(this.Role);
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<PutRoleMappingDescriptor, IPutRoleMappingRequest> Fluent => d => d
 			.Enabled()
 			.Roles("admin")
-			.Metadata(f=>f.Add("x", "y").Add("z", null))
+			.Metadata(f => f.Add("x", "y").Add("z", null))
 			.Rules(r => r
 				.All(all => all
 					.Any(any => any
@@ -96,15 +67,47 @@ protected override LazyResponses ClientUsage() => Calls(
 						.Realm(_realm)
 					)
 					.Metadata(_metadata.Item1, _metadata.Item2)
-					.Except(e=>e.Groups(_groups))
+					.Except(e => e.Groups(_groups))
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+		protected override PutRoleMappingRequest Initializer => new PutRoleMappingRequest(Role)
+		{
+			Enabled = true,
+			Roles = new[] { "admin" },
+			Metadata = new Dictionary<string, object>
+			{
+				{ "x", "y" },
+				{ "z", null }
+			},
+			Rules =
+				(new DistinguishedNameRule(_dn) | new UsernameRule(_username) | new RealmRule(_realm))
+				& new MetadataRule(_metadata.Item1, _metadata.Item2)
+				& !new GroupsRule(_groups)
+		};
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_xpack/security/role_mapping/{Role}";
+
+		//callisolated value can sometimes start with a digit which is not allowed for rolenames
+		private string Role => $"role-{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutRoleMapping(Role, f),
+			(client, f) => client.PutRoleMappingAsync(Role, f),
+			(client, r) => client.PutRoleMapping(r),
+			(client, r) => client.PutRoleMappingAsync(r)
+		);
+
+		protected override PutRoleMappingDescriptor NewDescriptor() => new PutRoleMappingDescriptor(Role);
+
 		protected override void ExpectResponse(IPutRoleMappingResponse response)
 		{
 			response.RoleMapping.Should().NotBeNull();
 			response.RoleMapping.Created.Should().BeTrue();
 		}
 	}
-
 }
diff --git a/src/Tests/Tests/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingUrlTests.cs b/src/Tests/Tests/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingUrlTests.cs
index e63054f13b4..c72fcc9aeea 100644
--- a/src/Tests/Tests/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/RoleMapping/PutRoleMapping/PutRoleMappingUrlTests.cs
@@ -12,10 +12,10 @@ [U] public override async Task Urls()
 		{
 			var role = "can_read";
 			await PUT($"/_xpack/security/role_mapping/{role}")
-				.Fluent(c => c.PutRoleMapping(role))
-				.Request(c => c.PutRoleMapping(new PutRoleMappingRequest(role)))
-				.FluentAsync(c => c.PutRoleMappingAsync(role))
-				.RequestAsync(c => c.PutRoleMappingAsync(new PutRoleMappingRequest(role)))
+					.Fluent(c => c.PutRoleMapping(role))
+					.Request(c => c.PutRoleMapping(new PutRoleMappingRequest(role)))
+					.FluentAsync(c => c.PutRoleMappingAsync(role))
+					.RequestAsync(c => c.PutRoleMappingAsync(new PutRoleMappingRequest(role)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Security/RoleMapping/RoleMappingCrudTests.cs b/src/Tests/Tests/XPack/Security/RoleMapping/RoleMappingCrudTests.cs
index 6e61e3cf578..b19ffcd8205 100644
--- a/src/Tests/Tests/XPack/Security/RoleMapping/RoleMappingCrudTests.cs
+++ b/src/Tests/Tests/XPack/Security/RoleMapping/RoleMappingCrudTests.cs
@@ -8,8 +8,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.XPack.Security.RoleMapping
 {
@@ -18,43 +16,45 @@ public class RoleMappingCrudTests
 		: CrudTestBase<XPackCluster, IPutRoleMappingResponse, IGetRoleMappingResponse, IPutRoleMappingResponse, IDeleteRoleMappingResponse>
 	{
 		private readonly string _dn = "*,ou=admin,dc=example,dc=com";
-		private readonly string _username = "mpdreamz";
-		private readonly string _realm = "some_realm";
+		private readonly string[] _groups = { "group1", "group2" };
 		private readonly Tuple<string, string> _metadata = Tuple.Create("a", "b");
-		private readonly string[] _groups = {"group1", "group2"};
+		private readonly string _realm = "some_realm";
+		private readonly string _username = "mpdreamz";
 
 		public RoleMappingCrudTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		//callisolated value can sometimes start with a digit which is not allowed for rolenames
 		private static string CreateRoleMappingName(string s) => $"role-mapping-{s}";
 
-		protected override LazyResponses Create() => Calls<PutRoleMappingDescriptor, PutRoleMappingRequest, IPutRoleMappingRequest, IPutRoleMappingResponse>(
-			CreateInitializer,
-			CreateFluent,
-			fluent: (s, c, f) => c.PutRoleMapping(CreateRoleMappingName(s), f),
-			fluentAsync: (s, c, f) => c.PutRoleMappingAsync(CreateRoleMappingName(s), f),
-			request: (s, c, r) => c.PutRoleMapping(r),
-			requestAsync: (s, c, r) => c.PutRoleMappingAsync(r)
-		);
+		protected override LazyResponses Create() =>
+			Calls<PutRoleMappingDescriptor, PutRoleMappingRequest, IPutRoleMappingRequest, IPutRoleMappingResponse>(
+				CreateInitializer,
+				CreateFluent,
+				(s, c, f) => c.PutRoleMapping(CreateRoleMappingName(s), f),
+				(s, c, f) => c.PutRoleMappingAsync(CreateRoleMappingName(s), f),
+				(s, c, r) => c.PutRoleMapping(r),
+				(s, c, r) => c.PutRoleMappingAsync(r)
+			);
 
 		protected PutRoleMappingRequest CreateInitializer(string role) => new PutRoleMappingRequest(CreateRoleMappingName(role))
 		{
 			Enabled = false,
-			Roles = new [] { "admin"},
+			Roles = new[] { "admin" },
 			Metadata = new Dictionary<string, object>
 			{
-				{"x", "y"},
-				{"z", null}
+				{ "x", "y" },
+				{ "z", null }
 			},
 			Rules =
 				(new DistinguishedNameRule(_dn) | new UsernameRule(_username) | new RealmRule(_realm))
 				& new MetadataRule(_metadata.Item1, _metadata.Item2)
 				& !new GroupsRule(_groups)
 		};
+
 		protected IPutRoleMappingRequest CreateFluent(string role, PutRoleMappingDescriptor d) => d
 			.Enabled(false)
 			.Roles("admin")
-			.Metadata(f=>f.Add("x", "y").Add("z", null))
+			.Metadata(f => f.Add("x", "y").Add("z", null))
 			.Rules(r => r
 				.All(all => all
 					.Any(any => any
@@ -63,49 +63,53 @@ protected IPutRoleMappingRequest CreateFluent(string role, PutRoleMappingDescrip
 						.Realm(_realm)
 					)
 					.Metadata(_metadata.Item1, _metadata.Item2)
-					.Except(e=>e.Groups(_groups))
+					.Except(e => e.Groups(_groups))
 				)
 			);
 
-		protected override LazyResponses Read() => Calls<GetRoleMappingDescriptor, GetRoleMappingRequest, IGetRoleMappingRequest, IGetRoleMappingResponse>(
-			ReadInitializer,
-			ReadFluent,
-			fluent: (s, c, f) => c.GetRoleMapping(f),
-			fluentAsync: (s, c, f) => c.GetRoleMappingAsync(f),
-			request: (s, c, r) => c.GetRoleMapping(r),
-			requestAsync: (s, c, r) => c.GetRoleMappingAsync(r)
-		);
+		protected override LazyResponses Read() =>
+			Calls<GetRoleMappingDescriptor, GetRoleMappingRequest, IGetRoleMappingRequest, IGetRoleMappingResponse>(
+				ReadInitializer,
+				ReadFluent,
+				(s, c, f) => c.GetRoleMapping(f),
+				(s, c, f) => c.GetRoleMappingAsync(f),
+				(s, c, r) => c.GetRoleMapping(r),
+				(s, c, r) => c.GetRoleMappingAsync(r)
+			);
 
 		protected GetRoleMappingRequest ReadInitializer(string role) => new GetRoleMappingRequest(CreateRoleMappingName(role));
+
 		protected IGetRoleMappingRequest ReadFluent(string role, GetRoleMappingDescriptor d) => d.Name(CreateRoleMappingName(role));
 
-		protected override LazyResponses Update() => Calls<PutRoleMappingDescriptor, PutRoleMappingRequest, IPutRoleMappingRequest, IPutRoleMappingResponse>(
-			UpdateInitializer,
-			UpdateFluent,
-			fluent: (s, c, f) => c.PutRoleMapping(CreateRoleMappingName(s), f),
-			fluentAsync: (s, c, f) => c.PutRoleMappingAsync(CreateRoleMappingName(s), f),
-			request: (s, c, r) => c.PutRoleMapping(r),
-			requestAsync: (s, c, r) => c.PutRoleMappingAsync(r)
-		);
+		protected override LazyResponses Update() =>
+			Calls<PutRoleMappingDescriptor, PutRoleMappingRequest, IPutRoleMappingRequest, IPutRoleMappingResponse>(
+				UpdateInitializer,
+				UpdateFluent,
+				(s, c, f) => c.PutRoleMapping(CreateRoleMappingName(s), f),
+				(s, c, f) => c.PutRoleMappingAsync(CreateRoleMappingName(s), f),
+				(s, c, r) => c.PutRoleMapping(r),
+				(s, c, r) => c.PutRoleMappingAsync(r)
+			);
 
 		protected PutRoleMappingRequest UpdateInitializer(string role) => new PutRoleMappingRequest(CreateRoleMappingName(role))
 		{
 			Enabled = true,
-			Roles = new [] { "admin", "user" },
+			Roles = new[] { "admin", "user" },
 			Metadata = new Dictionary<string, object>
 			{
-				{"x", "y"},
-				{"z", "zz"}
+				{ "x", "y" },
+				{ "z", "zz" }
 			},
 			Rules =
 				(new DistinguishedNameRule(_dn) | new UsernameRule(_username) | new RealmRule(_realm))
 				& new MetadataRule(_metadata.Item1, _metadata.Item2)
 				& !new GroupsRule(_groups)
 		};
+
 		protected IPutRoleMappingRequest UpdateFluent(string role, PutRoleMappingDescriptor d) => d
 			.Enabled()
 			.Roles("admin", "user")
-			.Metadata(f=>f.Add("x", "y").Add("z", "zz"))
+			.Metadata(f => f.Add("x", "y").Add("z", "zz"))
 			.Rules(r => r
 				.All(all => all
 					.Any(any => any
@@ -114,20 +118,22 @@ protected IPutRoleMappingRequest UpdateFluent(string role, PutRoleMappingDescrip
 						.Realm(_realm)
 					)
 					.Metadata(_metadata.Item1, _metadata.Item2)
-					.Except(e=>e.Groups(_groups))
+					.Except(e => e.Groups(_groups))
 				)
 			);
 
-		protected override LazyResponses Delete() => Calls<DeleteRoleMappingDescriptor, DeleteRoleMappingRequest, IDeleteRoleMappingRequest, IDeleteRoleMappingResponse>(
-			DeleteInitializer,
-			DeleteFluent,
-			fluent: (s, c, f) => c.DeleteRoleMapping(CreateRoleMappingName(s), f),
-			fluentAsync: (s, c, f) => c.DeleteRoleMappingAsync(CreateRoleMappingName(s), f),
-			request: (s, c, r) => c.DeleteRoleMapping(r),
-			requestAsync: (s, c, r) => c.DeleteRoleMappingAsync(r)
-		);
+		protected override LazyResponses Delete() =>
+			Calls<DeleteRoleMappingDescriptor, DeleteRoleMappingRequest, IDeleteRoleMappingRequest, IDeleteRoleMappingResponse>(
+				DeleteInitializer,
+				DeleteFluent,
+				(s, c, f) => c.DeleteRoleMapping(CreateRoleMappingName(s), f),
+				(s, c, f) => c.DeleteRoleMappingAsync(CreateRoleMappingName(s), f),
+				(s, c, r) => c.DeleteRoleMapping(r),
+				(s, c, r) => c.DeleteRoleMappingAsync(r)
+			);
 
 		protected DeleteRoleMappingRequest DeleteInitializer(string role) => new DeleteRoleMappingRequest(CreateRoleMappingName(role));
+
 		protected IDeleteRoleMappingRequest DeleteFluent(string role, DeleteRoleMappingDescriptor d) => d;
 
 		protected override void ExpectAfterCreate(IGetRoleMappingResponse response)
@@ -143,6 +149,7 @@ protected override void ExpectAfterCreate(IGetRoleMappingResponse response)
 			var allMapping = mapping.Rules as AllRoleMappingRule;
 			allMapping.Should().NotBeNull("expect to get back an all role mapping rule");
 		}
+
 		protected override void ExpectAfterUpdate(IGetRoleMappingResponse response)
 		{
 			response.RoleMappings.Should().NotBeEmpty();
diff --git a/src/Tests/Tests/XPack/Security/User/ChangePassword/ChangePasswordUrlTests.cs b/src/Tests/Tests/XPack/Security/User/ChangePassword/ChangePasswordUrlTests.cs
index 34110a514ba..dab621ed0e4 100644
--- a/src/Tests/Tests/XPack/Security/User/ChangePassword/ChangePasswordUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/ChangePassword/ChangePasswordUrlTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
@@ -16,17 +12,17 @@ public class DeleteUserUrlTests : UrlTestsBase
 		public override async Task Urls()
 		{
 			await PUT("/_xpack/security/user/forloop/_password")
-				.Fluent(c => c.ChangePassword(p => p.Username("forloop").Password("password")))
-				.Request(c => c.ChangePassword(new ChangePasswordRequest("forloop") { Password = "password" }))
-				.FluentAsync(c => c.ChangePasswordAsync(p => p.Username("forloop").Password("password")))
-				.RequestAsync(c => c.ChangePasswordAsync(new ChangePasswordRequest("forloop") { Password = "password" }))
+					.Fluent(c => c.ChangePassword(p => p.Username("forloop").Password("password")))
+					.Request(c => c.ChangePassword(new ChangePasswordRequest("forloop") { Password = "password" }))
+					.FluentAsync(c => c.ChangePasswordAsync(p => p.Username("forloop").Password("password")))
+					.RequestAsync(c => c.ChangePasswordAsync(new ChangePasswordRequest("forloop") { Password = "password" }))
 				;
 
 			await PUT("/_xpack/security/user/_password")
-				.Fluent(c => c.ChangePassword(p => p.Password("password")))
-				.Request(c => c.ChangePassword(new ChangePasswordRequest() { Password = "password" }))
-				.FluentAsync(c => c.ChangePasswordAsync(p => p.Password("password")))
-				.RequestAsync(c => c.ChangePasswordAsync(new ChangePasswordRequest() { Password = "password" }))
+					.Fluent(c => c.ChangePassword(p => p.Password("password")))
+					.Request(c => c.ChangePassword(new ChangePasswordRequest() { Password = "password" }))
+					.FluentAsync(c => c.ChangePasswordAsync(p => p.Password("password")))
+					.RequestAsync(c => c.ChangePasswordAsync(new ChangePasswordRequest() { Password = "password" }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Security/User/DeleteUser/DeleteUserUrlTests.cs b/src/Tests/Tests/XPack/Security/User/DeleteUser/DeleteUserUrlTests.cs
index 3d5438df505..7c6f557adaa 100644
--- a/src/Tests/Tests/XPack/Security/User/DeleteUser/DeleteUserUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/DeleteUser/DeleteUserUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Security.User.DeleteUser
 {
 	public class DeleteUserUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await DELETE("/_xpack/security/user/mpdreamz")
-				.Fluent(c => c.DeleteUser("mpdreamz"))
-				.Request(c => c.DeleteUser(new DeleteUserRequest("mpdreamz")))
-				.FluentAsync(c => c.DeleteUserAsync("mpdreamz"))
-				.RequestAsync(c => c.DeleteUserAsync(new DeleteUserRequest("mpdreamz")))
-				;
-		}
+		[U] public override async Task Urls() => await DELETE("/_xpack/security/user/mpdreamz")
+			.Fluent(c => c.DeleteUser("mpdreamz"))
+			.Request(c => c.DeleteUser(new DeleteUserRequest("mpdreamz")))
+			.FluentAsync(c => c.DeleteUserAsync("mpdreamz"))
+			.RequestAsync(c => c.DeleteUserAsync(new DeleteUserRequest("mpdreamz")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Security/User/DisableUser/DisableUserUrlTests.cs b/src/Tests/Tests/XPack/Security/User/DisableUser/DisableUserUrlTests.cs
index f31e9c2601a..857c09b4bea 100644
--- a/src/Tests/Tests/XPack/Security/User/DisableUser/DisableUserUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/DisableUser/DisableUserUrlTests.cs
@@ -1,6 +1,6 @@
-using Nest;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
+using Nest;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
@@ -8,14 +8,10 @@ namespace Tests.XPack.Security.User.DisableUser
 {
 	public class DisableUserUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/security/user/ironman/_disable")
-				.Fluent(c => c.DisableUser("ironman"))
-				.Request(c => c.DisableUser(new DisableUserRequest("ironman")))
-				.FluentAsync(c => c.DisableUserAsync("ironman"))
-				.RequestAsync(c => c.DisableUserAsync(new DisableUserRequest("ironman")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/security/user/ironman/_disable")
+			.Fluent(c => c.DisableUser("ironman"))
+			.Request(c => c.DisableUser(new DisableUserRequest("ironman")))
+			.FluentAsync(c => c.DisableUserAsync("ironman"))
+			.RequestAsync(c => c.DisableUserAsync(new DisableUserRequest("ironman")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Security/User/EnableUser/EnableUserUrlTests.cs b/src/Tests/Tests/XPack/Security/User/EnableUser/EnableUserUrlTests.cs
index b89a4c3855c..d4952af9a8a 100644
--- a/src/Tests/Tests/XPack/Security/User/EnableUser/EnableUserUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/EnableUser/EnableUserUrlTests.cs
@@ -1,10 +1,6 @@
-using Nest;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
+using Nest;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
@@ -12,14 +8,10 @@ namespace Tests.XPack.Security.User.EnableUser
 {
 	public class EnableUserUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/security/user/ironman/_disable")
-				.Fluent(c => c.DisableUser("ironman"))
-				.Request(c => c.DisableUser(new DisableUserRequest("ironman")))
-				.FluentAsync(c => c.DisableUserAsync("ironman"))
-				.RequestAsync(c => c.DisableUserAsync(new DisableUserRequest("ironman")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/security/user/ironman/_disable")
+			.Fluent(c => c.DisableUser("ironman"))
+			.Request(c => c.DisableUser(new DisableUserRequest("ironman")))
+			.FluentAsync(c => c.DisableUserAsync("ironman"))
+			.RequestAsync(c => c.DisableUserAsync(new DisableUserRequest("ironman")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Security/User/GetUser/GetUserUrlTests.cs b/src/Tests/Tests/XPack/Security/User/GetUser/GetUserUrlTests.cs
index 0e0b705a5eb..bd2e1c60d28 100644
--- a/src/Tests/Tests/XPack/Security/User/GetUser/GetUserUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/GetUser/GetUserUrlTests.cs
@@ -11,18 +11,18 @@ public class GetUserUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/security/user")
-				.Fluent(c => c.GetUser())
-				.Request(c => c.GetUser(new GetUserRequest()))
-				.FluentAsync(c => c.GetUserAsync())
-				.RequestAsync(c => c.GetUserAsync(new GetUserRequest()))
+					.Fluent(c => c.GetUser())
+					.Request(c => c.GetUser(new GetUserRequest()))
+					.FluentAsync(c => c.GetUserAsync())
+					.RequestAsync(c => c.GetUserAsync(new GetUserRequest()))
 				;
 
 			var users = "mpdreamz,gmarz,forloop";
 			await GET($"/_xpack/security/user/{EscapeUriString(users)}")
-				.Fluent(c => c.GetUser(f=>f.Username(users)))
-				.Request(c => c.GetUser(new GetUserRequest(users)))
-				.FluentAsync(c => c.GetUserAsync(f=>f.Username(users)))
-				.RequestAsync(c => c.GetUserAsync(new GetUserRequest(users)))
+					.Fluent(c => c.GetUser(f => f.Username(users)))
+					.Request(c => c.GetUser(new GetUserRequest(users)))
+					.FluentAsync(c => c.GetUserAsync(f => f.Username(users)))
+					.RequestAsync(c => c.GetUserAsync(new GetUserRequest(users)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenApiTests.cs b/src/Tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenApiTests.cs
index 60b3cb5e94b..c6d78680c19 100644
--- a/src/Tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenApiTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenApiTests.cs
@@ -6,36 +6,18 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Elastic.Managed.Ephemeral.ClusterAuthentication;
 
 namespace Tests.XPack.Security.User.GetUserAccessToken
 {
 	[SkipVersion("<5.5.0", "")]
-	public class GetUserAccessTokenApiTests : ApiIntegrationTestBase<XPackCluster, IGetUserAccessTokenResponse, IGetUserAccessTokenRequest,
-		GetUserAccessTokenDescriptor, GetUserAccessTokenRequest>
+	public class GetUserAccessTokenApiTests
+		: ApiIntegrationTestBase<XPackCluster, IGetUserAccessTokenResponse, IGetUserAccessTokenRequest,
+			GetUserAccessTokenDescriptor, GetUserAccessTokenRequest>
 	{
 		public GetUserAccessTokenApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected virtual string UserPassword => Admin.Password;
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetUserAccessToken(Admin.Username, UserPassword, f),
-			fluentAsync: (client, f) => client.GetUserAccessTokenAsync(Admin.Username, UserPassword, f),
-			request: (client, r) => client.GetUserAccessToken(r),
-			requestAsync: (client, r) => client.GetUserAccessTokenAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => "/_xpack/security/oauth2/token";
-
-		protected override bool SupportsDeserialization => false;
-
-		//callisolated value can sometimes start with a digit which is not allowed for rolenames
-		private string Role => $"role-{CallIsolatedValue}";
 
 		protected override object ExpectJson => new
 		{
@@ -45,15 +27,35 @@ protected override LazyResponses ClientUsage() => Calls(
 			password = UserPassword
 		};
 
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> Fluent => d => d
+			.Scope("FULL");
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+
 		protected override GetUserAccessTokenRequest Initializer => new GetUserAccessTokenRequest(Admin.Username, UserPassword)
 		{
 			Scope = "FULL"
 		};
 
-		protected override GetUserAccessTokenDescriptor NewDescriptor() => new GetUserAccessTokenDescriptor(Admin.Username, UserPassword);
+		protected override bool SupportsDeserialization => false;
 
-		protected override Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> Fluent => d => d
-			.Scope("FULL");
+		protected override string UrlPath => "/_xpack/security/oauth2/token";
+
+		protected virtual string UserPassword => Admin.Password;
+
+		//callisolated value can sometimes start with a digit which is not allowed for rolenames
+		private string Role => $"role-{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetUserAccessToken(Admin.Username, UserPassword, f),
+			(client, f) => client.GetUserAccessTokenAsync(Admin.Username, UserPassword, f),
+			(client, r) => client.GetUserAccessToken(r),
+			(client, r) => client.GetUserAccessTokenAsync(r)
+		);
+
+		protected override GetUserAccessTokenDescriptor NewDescriptor() => new GetUserAccessTokenDescriptor(Admin.Username, UserPassword);
 
 		protected override void ExpectResponse(IGetUserAccessTokenResponse response)
 		{
@@ -72,10 +74,6 @@ public GetUserAccessTokenBadPasswordApiTests(XPackCluster cluster, EndpointUsage
 		protected override int ExpectStatusCode => 401;
 		protected override string UserPassword => "bad_password";
 
-		protected override void ExpectResponse(IGetUserAccessTokenResponse response)
-		{
-			response.ServerError.Should().NotBeNull();
-		}
+		protected override void ExpectResponse(IGetUserAccessTokenResponse response) => response.ServerError.Should().NotBeNull();
 	}
-
 }
diff --git a/src/Tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenUrlTests.cs b/src/Tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenUrlTests.cs
index e1b2c30df9a..a0601ca82e1 100644
--- a/src/Tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenUrlTests.cs
@@ -15,8 +15,8 @@ public override async Task Urls()
 			var u = ClusterAuthentication.Admin.Username;
 			var p = ClusterAuthentication.Admin.Password;
 			await POST("/_xpack/security/oauth2/token")
-				.Fluent(c => c.GetUserAccessToken(u,p))
-				.Request(c => c.GetUserAccessToken(new GetUserAccessTokenRequest(u,p)))
+				.Fluent(c => c.GetUserAccessToken(u, p))
+				.Request(c => c.GetUserAccessToken(new GetUserAccessTokenRequest(u, p)))
 				.FluentAsync(c => c.GetUserAccessTokenAsync(u, p))
 				.RequestAsync(c => c.GetUserAccessTokenAsync(new GetUserAccessTokenRequest(u, p)));
 		}
diff --git a/src/Tests/Tests/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenApiTests.cs b/src/Tests/Tests/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenApiTests.cs
index 4a8c9fe5d0d..aa6f5d70698 100644
--- a/src/Tests/Tests/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenApiTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenApiTests.cs
@@ -7,71 +7,68 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using static Elastic.Managed.Ephemeral.ClusterAuthentication;
 
 namespace Tests.XPack.Security.User.InvalidateUserAccessToken
 {
 	[SkipVersion("<5.5.0", "")]
-	public class InvalidateUserAccessTokenApiTests : ApiIntegrationTestBase<XPackCluster, IInvalidateUserAccessTokenResponse, IInvalidateUserAccessTokenRequest,
-		InvalidateUserAccessTokenDescriptor, InvalidateUserAccessTokenRequest>
+	public class InvalidateUserAccessTokenApiTests
+		: ApiIntegrationTestBase<XPackCluster, IInvalidateUserAccessTokenResponse, IInvalidateUserAccessTokenRequest,
+			InvalidateUserAccessTokenDescriptor, InvalidateUserAccessTokenRequest>
 	{
 		protected const string AccessTokenValueKey = "accesstoken";
-		protected override void OnBeforeCall(IElasticClient client)
-		{
-			var r = client.GetUserAccessToken(Admin.Username, Admin.Password);
-			r.ShouldBeValid();
-			this.ExtendedValue(AccessTokenValueKey, r.AccessToken);
-		}
-		protected virtual string CurrentAccessToken => this.RanIntegrationSetup ? this.ExtendedValue<string>(AccessTokenValueKey) : "foo";
 
 		public InvalidateUserAccessTokenApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.InvalidateUserAccessToken(CurrentAccessToken, f),
-			fluentAsync: (client, f) => client.InvalidateUserAccessTokenAsync(CurrentAccessToken, f),
-			request: (client, r) => client.InvalidateUserAccessToken(r),
-			requestAsync: (client, r) => client.InvalidateUserAccessTokenAsync(r)
-		);
+		protected virtual string CurrentAccessToken => RanIntegrationSetup ? ExtendedValue<string>(AccessTokenValueKey) : "foo";
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-
-		protected override string UrlPath => "/_xpack/security/oauth2/token";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
 			token = CurrentAccessToken
 		};
 
-		protected override InvalidateUserAccessTokenDescriptor NewDescriptor() => new InvalidateUserAccessTokenDescriptor(CurrentAccessToken);
-		protected override InvalidateUserAccessTokenRequest Initializer => new InvalidateUserAccessTokenRequest(CurrentAccessToken)
-		{
-		};
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<InvalidateUserAccessTokenDescriptor, IInvalidateUserAccessTokenRequest> Fluent => d => d;
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+
+		protected override InvalidateUserAccessTokenRequest Initializer => new InvalidateUserAccessTokenRequest(CurrentAccessToken)
+			{ };
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => "/_xpack/security/oauth2/token";
 
-		protected override void ExpectResponse(IInvalidateUserAccessTokenResponse response)
+		protected override void OnBeforeCall(IElasticClient client)
 		{
-			response.Created.Should().BeTrue();
+			var r = client.GetUserAccessToken(Admin.Username, Admin.Password);
+			r.ShouldBeValid();
+			ExtendedValue(AccessTokenValueKey, r.AccessToken);
 		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.InvalidateUserAccessToken(CurrentAccessToken, f),
+			(client, f) => client.InvalidateUserAccessTokenAsync(CurrentAccessToken, f),
+			(client, r) => client.InvalidateUserAccessToken(r),
+			(client, r) => client.InvalidateUserAccessTokenAsync(r)
+		);
+
+		protected override InvalidateUserAccessTokenDescriptor NewDescriptor() => new InvalidateUserAccessTokenDescriptor(CurrentAccessToken);
+
+		protected override void ExpectResponse(IInvalidateUserAccessTokenResponse response) => response.Created.Should().BeTrue();
 	}
 
 	public class InvalidateUserAccessTokenBadPasswordApiTests : InvalidateUserAccessTokenApiTests
 	{
 		public InvalidateUserAccessTokenBadPasswordApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override string CurrentAccessToken => "bad_password";
+
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 401;
-		protected override string CurrentAccessToken => "bad_password";
 
-		protected override void ExpectResponse(IInvalidateUserAccessTokenResponse response)
-		{
-			response.ServerError.Should().NotBeNull();
-		}
+		protected override void ExpectResponse(IInvalidateUserAccessTokenResponse response) => response.ServerError.Should().NotBeNull();
 	}
-
 }
diff --git a/src/Tests/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs b/src/Tests/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs
index b8e4b556fda..7da9b161479 100644
--- a/src/Tests/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs
@@ -8,8 +8,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.XPack.Security.User.PutUser
 {
@@ -18,42 +16,38 @@ public class PutUserApiTests : ApiIntegrationTestBase<XPackCluster, IPutUserResp
 	{
 		public PutUserApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutUser(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.PutUserAsync(CallIsolatedValue, f),
-			request: (client, r) => client.PutUser(r),
-			requestAsync: (client, r) => client.PutUserAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/security/user/{CallIsolatedValue}";
-
-		protected override bool SupportsDeserialization => false;
-
-		private string Email => $"{CallIsolatedValue}@example.example";
-
-		private string Password => CallIsolatedValue;
 
 		protected override object ExpectJson => new
 		{
 			roles = new[] { "user" },
-			password = this.Password,
-			email = this.Email,
-			full_name = this.CallIsolatedValue,
+			password = Password,
+			email = Email,
+			full_name = CallIsolatedValue,
 			metadata = new
 			{
 				x = CallIsolatedValue
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<PutUserDescriptor, IPutUserRequest> Fluent => d => d
+			.Roles("user")
+			.Password(Password)
+			.Email(Email)
+			.FullName(CallIsolatedValue)
+			.Metadata(m => m
+				.Add("x", CallIsolatedValue)
+			);
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override PutUserRequest Initializer => new PutUserRequest(CallIsolatedValue)
 		{
 			Roles = new[] { "user" },
-			Password = this.Password,
-			Email = this.Email,
+			Password = Password,
+			Email = Email,
 			FullName = CallIsolatedValue,
 			Metadata = new Dictionary<string, object>
 			{
@@ -61,16 +55,22 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
-		protected override PutUserDescriptor NewDescriptor() => new PutUserDescriptor(CallIsolatedValue);
+		protected override bool SupportsDeserialization => false;
 
-		protected override Func<PutUserDescriptor, IPutUserRequest> Fluent => d => d
-			.Roles("user")
-			.Password(this.Password)
-			.Email(this.Email)
-			.FullName(CallIsolatedValue)
-			.Metadata(m => m
-				.Add("x", CallIsolatedValue)
-			);
+		protected override string UrlPath => $"/_xpack/security/user/{CallIsolatedValue}";
+
+		private string Email => $"{CallIsolatedValue}@example.example";
+
+		private string Password => CallIsolatedValue;
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutUser(CallIsolatedValue, f),
+			(client, f) => client.PutUserAsync(CallIsolatedValue, f),
+			(client, r) => client.PutUser(r),
+			(client, r) => client.PutUserAsync(r)
+		);
+
+		protected override PutUserDescriptor NewDescriptor() => new PutUserDescriptor(CallIsolatedValue);
 
 		protected override void ExpectResponse(IPutUserResponse response)
 		{
@@ -83,13 +83,18 @@ public class PutUserRunAsApiTests : PutUserApiTests
 	{
 		public PutUserRunAsApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage)
 		{
-			var x = this.Client.GetUser(new GetUserRequest(ClusterAuthentication.User.Username));
-			var y = this.Client.GetRole(new GetRoleRequest(ClusterAuthentication.User.Role));
+			var x = Client.GetUser(new GetUserRequest(ClusterAuthentication.User.Username));
+			var y = Client.GetRole(new GetRoleRequest(ClusterAuthentication.User.Role));
 		}
 
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 403;
 
+		protected override Func<PutUserDescriptor, IPutUserRequest> Fluent => f => base.Fluent(f
+			.RequestConfiguration(c => c
+				.RunAs(ClusterAuthentication.User.Username)
+			));
+
 		protected override PutUserRequest Initializer
 		{
 			get
@@ -103,14 +108,6 @@ protected override PutUserRequest Initializer
 			}
 		}
 
-		protected override Func<PutUserDescriptor, IPutUserRequest> Fluent => f => base.Fluent(f
-			.RequestConfiguration(c => c
-				.RunAs(ClusterAuthentication.User.Username)
-			));
-
-		protected override void ExpectResponse(IPutUserResponse response)
-		{
-		}
+		protected override void ExpectResponse(IPutUserResponse response) { }
 	}
-
 }
diff --git a/src/Tests/Tests/XPack/Security/User/PutUser/PutUserUrlTests.cs b/src/Tests/Tests/XPack/Security/User/PutUser/PutUserUrlTests.cs
index 31601877bdd..64eba6f8308 100644
--- a/src/Tests/Tests/XPack/Security/User/PutUser/PutUserUrlTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/PutUser/PutUserUrlTests.cs
@@ -7,14 +7,10 @@ namespace Tests.XPack.Security.User.PutUser
 {
 	public class PutUserUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await UrlTester.PUT("/_xpack/security/user/mpdreamz")
-				.Fluent(c => c.PutUser("mpdreamz"))
-				.Request(c => c.PutUser(new PutUserRequest("mpdreamz")))
-				.FluentAsync(c => c.PutUserAsync("mpdreamz"))
-				.RequestAsync(c => c.PutUserAsync(new PutUserRequest("mpdreamz")))
-				;
-		}
+		[U] public override async Task Urls() => await UrlTester.PUT("/_xpack/security/user/mpdreamz")
+			.Fluent(c => c.PutUser("mpdreamz"))
+			.Request(c => c.PutUser(new PutUserRequest("mpdreamz")))
+			.FluentAsync(c => c.PutUserAsync("mpdreamz"))
+			.RequestAsync(c => c.PutUserAsync(new PutUserRequest("mpdreamz")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Security/User/UserCrudTests.cs b/src/Tests/Tests/XPack/Security/User/UserCrudTests.cs
index 9bb1fcf955b..206544fcf40 100644
--- a/src/Tests/Tests/XPack/Security/User/UserCrudTests.cs
+++ b/src/Tests/Tests/XPack/Security/User/UserCrudTests.cs
@@ -6,8 +6,6 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
-using Xunit;
 
 namespace Tests.XPack.Security.User
 {
@@ -15,7 +13,8 @@ namespace Tests.XPack.Security.User
 	public class UserCrudTests
 		: CrudTestBase<XPackCluster, IPutUserResponse, IGetUserResponse, IPutUserResponse, IDeleteUserResponse>
 	{
-		private string[] _roles = { "user" };
+		private readonly string[] _roles = { "user" };
+
 		public UserCrudTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		//Since we basically take the first 8 characters of a guid we have no way
@@ -25,16 +24,17 @@ public UserCrudTests(XPackCluster cluster, EndpointUsage usage) : base(cluster,
 		protected override LazyResponses Create() => Calls<PutUserDescriptor, PutUserRequest, IPutUserRequest, IPutUserResponse>(
 			CreateInitializer,
 			CreateFluent,
-			fluent: (s, c, f) => c.PutUser(s, f),
-			fluentAsync: (s, c, f) => c.PutUserAsync(s, f),
-			request: (s, c, r) => c.PutUser(r),
-			requestAsync: (s, c, r) => c.PutUserAsync(r)
+			(s, c, f) => c.PutUser(s, f),
+			(s, c, f) => c.PutUserAsync(s, f),
+			(s, c, r) => c.PutUser(r),
+			(s, c, r) => c.PutUserAsync(r)
 		);
 
 		protected PutUserRequest CreateInitializer(string username) => new PutUserRequest(username)
 		{
 			Password = username, Roles = _roles
 		};
+
 		protected IPutUserRequest CreateFluent(string username, PutUserDescriptor d) => d
 			.Password(username)
 			.Roles(_roles);
@@ -42,22 +42,23 @@ protected IPutUserRequest CreateFluent(string username, PutUserDescriptor d) =>
 		protected override LazyResponses Read() => Calls<GetUserDescriptor, GetUserRequest, IGetUserRequest, IGetUserResponse>(
 			ReadInitializer,
 			ReadFluent,
-			fluent: (s, c, f) => c.GetUser(f),
-			fluentAsync: (s, c, f) => c.GetUserAsync(f),
-			request: (s, c, r) => c.GetUser(r),
-			requestAsync: (s, c, r) => c.GetUserAsync(r)
+			(s, c, f) => c.GetUser(f),
+			(s, c, f) => c.GetUserAsync(f),
+			(s, c, r) => c.GetUser(r),
+			(s, c, r) => c.GetUserAsync(r)
 		);
 
 		protected GetUserRequest ReadInitializer(string username) => new GetUserRequest(username);
+
 		protected IGetUserRequest ReadFluent(string username, GetUserDescriptor d) => d.Username(username);
 
 		protected override LazyResponses Update() => Calls<PutUserDescriptor, PutUserRequest, IPutUserRequest, IPutUserResponse>(
 			UpdateInitializer,
 			UpdateFluent,
-			fluent: (s, c, f) => c.PutUser(s, f),
-			fluentAsync: (s, c, f) => c.PutUserAsync(s, f),
-			request: (s, c, r) => c.PutUser(r),
-			requestAsync: (s, c, r) => c.PutUserAsync(r)
+			(s, c, f) => c.PutUser(s, f),
+			(s, c, f) => c.PutUserAsync(s, f),
+			(s, c, r) => c.PutUser(r),
+			(s, c, r) => c.PutUserAsync(r)
 		);
 
 		protected PutUserRequest UpdateInitializer(string username) => new PutUserRequest(username)
@@ -65,6 +66,7 @@ protected override LazyResponses Update() => Calls<PutUserDescriptor, PutUserReq
 			FullName = username,
 			Roles = _roles
 		};
+
 		protected IPutUserRequest UpdateFluent(string username, PutUserDescriptor d) => d
 			.FullName(username)
 			.Roles(_roles);
@@ -72,13 +74,14 @@ protected IPutUserRequest UpdateFluent(string username, PutUserDescriptor d) =>
 		protected override LazyResponses Delete() => Calls<DeleteUserDescriptor, DeleteUserRequest, IDeleteUserRequest, IDeleteUserResponse>(
 			DeleteInitializer,
 			DeleteFluent,
-			fluent: (s, c, f) => c.DeleteUser(s, f),
-			fluentAsync: (s, c, f) => c.DeleteUserAsync(s, f),
-			request: (s, c, r) => c.DeleteUser(r),
-			requestAsync: (s, c, r) => c.DeleteUserAsync(r)
+			(s, c, f) => c.DeleteUser(s, f),
+			(s, c, f) => c.DeleteUserAsync(s, f),
+			(s, c, r) => c.DeleteUser(r),
+			(s, c, r) => c.DeleteUserAsync(r)
 		);
 
 		protected DeleteUserRequest DeleteInitializer(string username) => new DeleteUserRequest(username);
+
 		protected IDeleteUserRequest DeleteFluent(string username, DeleteUserDescriptor d) => d;
 
 		protected override void ExpectAfterCreate(IGetUserResponse response)
@@ -89,6 +92,7 @@ protected override void ExpectAfterCreate(IGetUserResponse response)
 			user.Roles.Should().NotBeNullOrEmpty();
 			user.FullName.Should().BeNullOrEmpty();
 		}
+
 		protected override void ExpectAfterUpdate(IGetUserResponse response)
 		{
 			response.Users.Should().NotBeEmpty();
diff --git a/src/Tests/Tests/XPack/Sql/ClearSqlCursor/ClearSqlCursorApiTests.cs b/src/Tests/Tests/XPack/Sql/ClearSqlCursor/ClearSqlCursorApiTests.cs
index 40b46174939..55f910270b1 100644
--- a/src/Tests/Tests/XPack/Sql/ClearSqlCursor/ClearSqlCursorApiTests.cs
+++ b/src/Tests/Tests/XPack/Sql/ClearSqlCursor/ClearSqlCursorApiTests.cs
@@ -12,49 +12,52 @@
 namespace Tests.XPack.Sql.ClearSqlCursor
 {
 	[SkipVersion("<6.4.0", "")]
-	public class ClearSqlCursorApiTests : ApiIntegrationTestBase<XPackCluster, IClearSqlCursorResponse, IClearSqlCursorRequest, ClearSqlCursorDescriptor, ClearSqlCursorRequest>
+	public class ClearSqlCursorApiTests
+		: ApiIntegrationTestBase<XPackCluster, IClearSqlCursorResponse, IClearSqlCursorRequest, ClearSqlCursorDescriptor, ClearSqlCursorRequest>
 	{
-		public ClearSqlCursorApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		protected override LazyResponses ClientUsage() => this.Calls(
-			fluent: (client, f) => client.ClearSqlCursor(f),
-			fluentAsync: (client, f) => client.ClearSqlCursorAsync(f),
-			request: (client, r) => client.ClearSqlCursor(r),
-			requestAsync: (client, r) => client.ClearSqlCursorAsync(r)
-		);
-
-		private string _currentCursor = "default-for-unit-tests";
-
 		private static readonly string SqlQuery =
 			$@"SELECT type, name, startedOn, numberOfCommits
 FROM {TestValueHelper.ProjectsIndex}
 WHERE type = '{Project.TypeName}'
 ORDER BY numberOfContributors DESC";
 
-		protected override void OnBeforeCall(IElasticClient client)
-		{
-			var sqlQueryResponse = this.Client.QuerySql(q => q.Query(SqlQuery).FetchSize(5));
-			if (!sqlQueryResponse.IsValid)
-				throw new Exception("Setup: Initial scroll failed.");
-			_currentCursor = sqlQueryResponse.Cursor ?? _currentCursor;
-		}
+		private string _currentCursor = "default-for-unit-tests";
+
+		public ClearSqlCursorApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-		protected override string UrlPath => $"/_xpack/sql/close";
 
-		protected override object ExpectJson => new { cursor = this._currentCursor };
+		protected override object ExpectJson => new { cursor = _currentCursor };
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> Fluent => d => d
-			.Cursor(_currentCursor)
-		;
+			.Cursor(_currentCursor);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override ClearSqlCursorRequest Initializer => new ClearSqlCursorRequest()
 		{
 			Cursor = _currentCursor,
 		};
 
+		protected override string UrlPath => $"/_xpack/sql/close";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ClearSqlCursor(f),
+			(client, f) => client.ClearSqlCursorAsync(f),
+			(client, r) => client.ClearSqlCursor(r),
+			(client, r) => client.ClearSqlCursorAsync(r)
+		);
+
+		protected override void OnBeforeCall(IElasticClient client)
+		{
+			var sqlQueryResponse = Client.QuerySql(q => q.Query(SqlQuery).FetchSize(5));
+			if (!sqlQueryResponse.IsValid)
+				throw new Exception("Setup: Initial scroll failed.");
+
+			_currentCursor = sqlQueryResponse.Cursor ?? _currentCursor;
+		}
+
 		protected override void ExpectResponse(IClearSqlCursorResponse response) =>
 			response.Succeeded.Should().BeTrue("succeeded property on response");
 	}
diff --git a/src/Tests/Tests/XPack/Sql/QuerySql/QuerySqlApiTests.cs b/src/Tests/Tests/XPack/Sql/QuerySql/QuerySqlApiTests.cs
index 487e061a736..0bf67491226 100644
--- a/src/Tests/Tests/XPack/Sql/QuerySql/QuerySqlApiTests.cs
+++ b/src/Tests/Tests/XPack/Sql/QuerySql/QuerySqlApiTests.cs
@@ -14,36 +14,29 @@ namespace Tests.XPack.Sql.QuerySql
 	[SkipVersion("<6.4.0", "")]
 	public class QuerySqlApiTests : ApiIntegrationTestBase<XPackCluster, IQuerySqlResponse, IQuerySqlRequest, QuerySqlDescriptor, QuerySqlRequest>
 	{
-		public QuerySqlApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		protected override LazyResponses ClientUsage() => this.Calls(
-			fluent: (client, f) => client.QuerySql(f),
-			fluentAsync: (client, f) => client.QuerySqlAsync(f),
-			request: (client, r) => client.QuerySql(r),
-			requestAsync: (client, r) => client.QuerySqlAsync(r)
-		);
-
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/_xpack/sql";
-
 		private static readonly string SqlQuery =
 			$@"SELECT type, name, startedOn, numberOfCommits
 FROM {TestValueHelper.ProjectsIndex}
 WHERE type = '{Project.TypeName}'
 ORDER BY numberOfContributors DESC";
 
-		protected override object ExpectJson { get; } = new {
+		public QuerySqlApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson { get; } = new
+		{
 			query = SqlQuery,
 			fetch_size = 5
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<QuerySqlDescriptor, IQuerySqlRequest> Fluent => d => d
 			.Query(SqlQuery)
-			.FetchSize(5)
-		;
+			.FetchSize(5);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override QuerySqlRequest Initializer => new QuerySqlRequest()
 		{
@@ -51,6 +44,15 @@ protected override LazyResponses ClientUsage() => this.Calls(
 			FetchSize = 5
 		};
 
+		protected override string UrlPath => $"/_xpack/sql";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.QuerySql(f),
+			(client, f) => client.QuerySqlAsync(f),
+			(client, r) => client.QuerySql(r),
+			(client, r) => client.QuerySqlAsync(r)
+		);
+
 		protected override void ExpectResponse(IQuerySqlResponse response)
 		{
 			response.Cursor.Should().NotBeNullOrWhiteSpace("response cursor");
diff --git a/src/Tests/Tests/XPack/Sql/QuerySql/QuerySqlUrlTests.cs b/src/Tests/Tests/XPack/Sql/QuerySql/QuerySqlUrlTests.cs
index d6e82ca87d6..9914a638754 100644
--- a/src/Tests/Tests/XPack/Sql/QuerySql/QuerySqlUrlTests.cs
+++ b/src/Tests/Tests/XPack/Sql/QuerySql/QuerySqlUrlTests.cs
@@ -1,9 +1,7 @@
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
-using Tests.Domain;
 using Tests.Framework;
-using static Nest.Infer;
 using static Tests.Framework.UrlTester;
 
 namespace Tests.XPack.Graph.Explore
diff --git a/src/Tests/Tests/XPack/Sql/TranslateSql/TranslateSqlQueryApiTests.cs b/src/Tests/Tests/XPack/Sql/TranslateSql/TranslateSqlQueryApiTests.cs
index bf1f3ad9aad..3ea6755dc55 100644
--- a/src/Tests/Tests/XPack/Sql/TranslateSql/TranslateSqlQueryApiTests.cs
+++ b/src/Tests/Tests/XPack/Sql/TranslateSql/TranslateSqlQueryApiTests.cs
@@ -12,38 +12,32 @@
 namespace Tests.XPack.Sql.TranslateSql
 {
 	[SkipVersion("<6.4.0", "")]
-	public class TranslateSqlApiTests : ApiIntegrationTestBase<XPackCluster, ITranslateSqlResponse, ITranslateSqlRequest, TranslateSqlDescriptor, TranslateSqlRequest>
+	public class TranslateSqlApiTests
+		: ApiIntegrationTestBase<XPackCluster, ITranslateSqlResponse, ITranslateSqlRequest, TranslateSqlDescriptor, TranslateSqlRequest>
 	{
-		public TranslateSqlApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
-
-		protected override LazyResponses ClientUsage() => this.Calls(
-			fluent: (client, f) => client.TranslateSql(f),
-			fluentAsync: (client, f) => client.TranslateSqlAsync(f),
-			request: (client, r) => client.TranslateSql(r),
-			requestAsync: (client, r) => client.TranslateSqlAsync(r)
-		);
-
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => $"/_xpack/sql/translate";
-
 		private static readonly string SqlQuery =
 			$@"SELECT type, name, startedOn, numberOfCommits
 FROM {TestValueHelper.ProjectsIndex}
 WHERE type = '{Project.TypeName}'
 ORDER BY numberOfContributors DESC";
 
-		protected override object ExpectJson { get; } = new {
+		public TranslateSqlApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson { get; } = new
+		{
 			query = SqlQuery,
 			fetch_size = 5
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<TranslateSqlDescriptor, ITranslateSqlRequest> Fluent => d => d
 			.Query(SqlQuery)
-			.FetchSize(5)
-		;
+			.FetchSize(5);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override TranslateSqlRequest Initializer => new TranslateSqlRequest()
 		{
@@ -51,6 +45,15 @@ protected override LazyResponses ClientUsage() => this.Calls(
 			FetchSize = 5
 		};
 
+		protected override string UrlPath => $"/_xpack/sql/translate";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.TranslateSql(f),
+			(client, f) => client.TranslateSqlAsync(f),
+			(client, r) => client.TranslateSql(r),
+			(client, r) => client.TranslateSqlAsync(r)
+		);
+
 		protected override void ExpectResponse(ITranslateSqlResponse response)
 		{
 			var search = response.Result;
@@ -58,7 +61,9 @@ protected override void ExpectResponse(ITranslateSqlResponse response)
 			search.Size.Should().HaveValue().And.Be(5);
 			search.Source.Should().NotBeNull();
 			search.Source.Match(b => b.Should().BeFalse(), f => f.Should().BeNull());
-			search.DocValueFields.Should().NotBeNullOrEmpty().And.HaveCount(4)
+			search.DocValueFields.Should()
+				.NotBeNullOrEmpty()
+				.And.HaveCount(4)
 				.And.Contain("type")
 				.And.Contain("name")
 				.And.Contain("startedOn")
diff --git a/src/Tests/Tests/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchApiTests.cs b/src/Tests/Tests/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchApiTests.cs
index 900392ea1a2..5c6114dfaaa 100644
--- a/src/Tests/Tests/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchApiTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -7,14 +6,30 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.AcknowledgeWatch
 {
-	public class AcknowledgeWatchApiTests : ApiIntegrationTestBase<XPackCluster, IAcknowledgeWatchResponse, IAcknowledgeWatchRequest, AcknowledgeWatchDescriptor, AcknowledgeWatchRequest>
+	public class AcknowledgeWatchApiTests
+		: ApiIntegrationTestBase<XPackCluster, IAcknowledgeWatchResponse, IAcknowledgeWatchRequest, AcknowledgeWatchDescriptor,
+			AcknowledgeWatchRequest>
 	{
 		public AcknowledgeWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<AcknowledgeWatchDescriptor, IAcknowledgeWatchRequest> Fluent => f => f
+			.ActionId("test_index");
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+		protected override AcknowledgeWatchRequest Initializer =>
+			new AcknowledgeWatchRequest(CallIsolatedValue, "test_index");
+
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}/_ack/test_index";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			// set up a watch that can be acknowledged
@@ -73,28 +88,14 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.AcknowledgeWatch(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.AcknowledgeWatchAsync(CallIsolatedValue, f),
-			request: (client, r) => client.AcknowledgeWatch(r),
-			requestAsync: (client, r) => client.AcknowledgeWatchAsync(r)
+			(client, f) => client.AcknowledgeWatch(CallIsolatedValue, f),
+			(client, f) => client.AcknowledgeWatchAsync(CallIsolatedValue, f),
+			(client, r) => client.AcknowledgeWatch(r),
+			(client, r) => client.AcknowledgeWatchAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}/_ack/test_index";
-
 		protected override AcknowledgeWatchDescriptor NewDescriptor() => new AcknowledgeWatchDescriptor(CallIsolatedValue);
 
-		protected override object ExpectJson => null;
-
-		protected override Func<AcknowledgeWatchDescriptor, IAcknowledgeWatchRequest> Fluent => f => f
-			.ActionId("test_index");
-
-		protected override AcknowledgeWatchRequest Initializer =>
-			new AcknowledgeWatchRequest(CallIsolatedValue, "test_index");
-
 		protected override void ExpectResponse(IAcknowledgeWatchResponse response)
 		{
 			var watchStatusState = response.Status.State;
diff --git a/src/Tests/Tests/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchUrlTests.cs b/src/Tests/Tests/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchUrlTests.cs
index 546b9898283..60ca8fcedb0 100644
--- a/src/Tests/Tests/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/AcknowledgeWatch/AcknowledgeWatchUrlTests.cs
@@ -11,24 +11,24 @@ public class AcknowledgeWatchUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await PUT("/_xpack/watcher/watch/watch_id/_ack")
-				.Fluent(c => c.AcknowledgeWatch("watch_id"))
-				.Request(c => c.AcknowledgeWatch(new AcknowledgeWatchRequest("watch_id")))
-				.FluentAsync(c => c.AcknowledgeWatchAsync("watch_id"))
-				.RequestAsync(c => c.AcknowledgeWatchAsync(new AcknowledgeWatchRequest("watch_id")))
+					.Fluent(c => c.AcknowledgeWatch("watch_id"))
+					.Request(c => c.AcknowledgeWatch(new AcknowledgeWatchRequest("watch_id")))
+					.FluentAsync(c => c.AcknowledgeWatchAsync("watch_id"))
+					.RequestAsync(c => c.AcknowledgeWatchAsync(new AcknowledgeWatchRequest("watch_id")))
 				;
 
 			await PUT("/_xpack/watcher/watch/watch_id/_ack/action_1%2Caction_2")
-				.Fluent(c => c.AcknowledgeWatch("watch_id", a => a.ActionId(new [] { "action_1", "action_2" })))
-				.Request(c => c.AcknowledgeWatch(new AcknowledgeWatchRequest("watch_id", new[] { "action_1", "action_2" })))
-				.FluentAsync(c => c.AcknowledgeWatchAsync("watch_id", a => a.ActionId(new[] { "action_1", "action_2" })))
-				.RequestAsync(c => c.AcknowledgeWatchAsync(new AcknowledgeWatchRequest("watch_id", new[] { "action_1", "action_2" })))
+					.Fluent(c => c.AcknowledgeWatch("watch_id", a => a.ActionId(new[] { "action_1", "action_2" })))
+					.Request(c => c.AcknowledgeWatch(new AcknowledgeWatchRequest("watch_id", new[] { "action_1", "action_2" })))
+					.FluentAsync(c => c.AcknowledgeWatchAsync("watch_id", a => a.ActionId(new[] { "action_1", "action_2" })))
+					.RequestAsync(c => c.AcknowledgeWatchAsync(new AcknowledgeWatchRequest("watch_id", new[] { "action_1", "action_2" })))
 				;
 
 			await PUT("/_xpack/watcher/watch/watch_id/_ack/action_1%2Caction_2")
-				.Fluent(c => c.AcknowledgeWatch("watch_id", a => a.ActionId("action_1,action_2")))
-				.Request(c => c.AcknowledgeWatch(new AcknowledgeWatchRequest("watch_id", "action_1,action_2")))
-				.FluentAsync(c => c.AcknowledgeWatchAsync("watch_id", a => a.ActionId("action_1,action_2")))
-				.RequestAsync(c => c.AcknowledgeWatchAsync(new AcknowledgeWatchRequest("watch_id", "action_1,action_2")))
+					.Fluent(c => c.AcknowledgeWatch("watch_id", a => a.ActionId("action_1,action_2")))
+					.Request(c => c.AcknowledgeWatch(new AcknowledgeWatchRequest("watch_id", "action_1,action_2")))
+					.FluentAsync(c => c.AcknowledgeWatchAsync("watch_id", a => a.ActionId("action_1,action_2")))
+					.RequestAsync(c => c.AcknowledgeWatchAsync(new AcknowledgeWatchRequest("watch_id", "action_1,action_2")))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XPack/Watcher/ActivateWatch/ActivateWatchApiTests.cs b/src/Tests/Tests/XPack/Watcher/ActivateWatch/ActivateWatchApiTests.cs
index fe7b531041c..602409c341d 100644
--- a/src/Tests/Tests/XPack/Watcher/ActivateWatch/ActivateWatchApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/ActivateWatch/ActivateWatchApiTests.cs
@@ -6,14 +6,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.ActivateWatch
 {
-	public class ActivateWatchApiTests : ApiIntegrationTestBase<XPackCluster, IActivateWatchResponse, IActivateWatchRequest, ActivateWatchDescriptor, ActivateWatchRequest>
+	public class ActivateWatchApiTests
+		: ApiIntegrationTestBase<XPackCluster, IActivateWatchResponse, IActivateWatchRequest, ActivateWatchDescriptor, ActivateWatchRequest>
 	{
 		public ActivateWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<ActivateWatchDescriptor, IActivateWatchRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+		protected override ActivateWatchRequest Initializer =>
+			new ActivateWatchRequest(CallIsolatedValue);
+
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}/_activate";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -57,27 +70,14 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ActivateWatch(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.ActivateWatchAsync(CallIsolatedValue, f),
-			request: (client, r) => client.ActivateWatch(r),
-			requestAsync: (client, r) => client.ActivateWatchAsync(r)
+			(client, f) => client.ActivateWatch(CallIsolatedValue, f),
+			(client, f) => client.ActivateWatchAsync(CallIsolatedValue, f),
+			(client, r) => client.ActivateWatch(r),
+			(client, r) => client.ActivateWatchAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}/_activate";
-
 		protected override ActivateWatchDescriptor NewDescriptor() => new ActivateWatchDescriptor(CallIsolatedValue);
 
-		protected override object ExpectJson => null;
-
-		protected override Func<ActivateWatchDescriptor, IActivateWatchRequest> Fluent => f => f;
-
-		protected override ActivateWatchRequest Initializer =>
-			new ActivateWatchRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IActivateWatchResponse response)
 		{
 			var watchStatusState = response.Status.State;
diff --git a/src/Tests/Tests/XPack/Watcher/ActivateWatch/ActivateWatchUrlTests.cs b/src/Tests/Tests/XPack/Watcher/ActivateWatch/ActivateWatchUrlTests.cs
index 05364067df4..f821e0fd5d5 100644
--- a/src/Tests/Tests/XPack/Watcher/ActivateWatch/ActivateWatchUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/ActivateWatch/ActivateWatchUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.ActivateWatch
 {
 	public class ActivateWatchUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/watcher/watch/watch_id/_activate")
-				.Fluent(c => c.ActivateWatch("watch_id"))
-				.Request(c => c.ActivateWatch(new ActivateWatchRequest("watch_id")))
-				.FluentAsync(c => c.ActivateWatchAsync("watch_id"))
-				.RequestAsync(c => c.ActivateWatchAsync(new ActivateWatchRequest("watch_id")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/watcher/watch/watch_id/_activate")
+			.Fluent(c => c.ActivateWatch("watch_id"))
+			.Request(c => c.ActivateWatch(new ActivateWatchRequest("watch_id")))
+			.FluentAsync(c => c.ActivateWatchAsync("watch_id"))
+			.RequestAsync(c => c.ActivateWatchAsync(new ActivateWatchRequest("watch_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/DeactivateWatch/DeactivateWatchApiTests.cs b/src/Tests/Tests/XPack/Watcher/DeactivateWatch/DeactivateWatchApiTests.cs
index 3767bb8d7db..0a71c2700a8 100644
--- a/src/Tests/Tests/XPack/Watcher/DeactivateWatch/DeactivateWatchApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/DeactivateWatch/DeactivateWatchApiTests.cs
@@ -6,14 +6,27 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.DeactivateWatch
 {
-	public class DeactivateWatchApiTests : ApiIntegrationTestBase<XPackCluster, IDeactivateWatchResponse, IDeactivateWatchRequest, DeactivateWatchDescriptor, DeactivateWatchRequest>
+	public class DeactivateWatchApiTests
+		: ApiIntegrationTestBase<XPackCluster, IDeactivateWatchResponse, IDeactivateWatchRequest, DeactivateWatchDescriptor, DeactivateWatchRequest>
 	{
 		public DeactivateWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<DeactivateWatchDescriptor, IDeactivateWatchRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+		protected override DeactivateWatchRequest Initializer =>
+			new DeactivateWatchRequest(CallIsolatedValue);
+
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}/_deactivate";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -58,27 +71,14 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeactivateWatch(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.DeactivateWatchAsync(CallIsolatedValue, f),
-			request: (client, r) => client.DeactivateWatch(r),
-			requestAsync: (client, r) => client.DeactivateWatchAsync(r)
+			(client, f) => client.DeactivateWatch(CallIsolatedValue, f),
+			(client, f) => client.DeactivateWatchAsync(CallIsolatedValue, f),
+			(client, r) => client.DeactivateWatch(r),
+			(client, r) => client.DeactivateWatchAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}/_deactivate";
-
 		protected override DeactivateWatchDescriptor NewDescriptor() => new DeactivateWatchDescriptor(CallIsolatedValue);
 
-		protected override object ExpectJson => null;
-
-		protected override Func<DeactivateWatchDescriptor, IDeactivateWatchRequest> Fluent => f => f;
-
-		protected override DeactivateWatchRequest Initializer =>
-			new DeactivateWatchRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IDeactivateWatchResponse response)
 		{
 			var watchStatusState = response.Status.State;
diff --git a/src/Tests/Tests/XPack/Watcher/DeactivateWatch/DeactivateWatchUrlTests.cs b/src/Tests/Tests/XPack/Watcher/DeactivateWatch/DeactivateWatchUrlTests.cs
index 2ec7591683b..ba7f6f87a42 100644
--- a/src/Tests/Tests/XPack/Watcher/DeactivateWatch/DeactivateWatchUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/DeactivateWatch/DeactivateWatchUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.DeactivateWatch
 {
 	public class DeactivateWatchUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/watcher/watch/watch_id/_deactivate")
-				.Fluent(c => c.DeactivateWatch("watch_id"))
-				.Request(c => c.DeactivateWatch(new DeactivateWatchRequest("watch_id")))
-				.FluentAsync(c => c.DeactivateWatchAsync("watch_id"))
-				.RequestAsync(c => c.DeactivateWatchAsync(new DeactivateWatchRequest("watch_id")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/watcher/watch/watch_id/_deactivate")
+			.Fluent(c => c.DeactivateWatch("watch_id"))
+			.Request(c => c.DeactivateWatch(new DeactivateWatchRequest("watch_id")))
+			.FluentAsync(c => c.DeactivateWatchAsync("watch_id"))
+			.RequestAsync(c => c.DeactivateWatchAsync(new DeactivateWatchRequest("watch_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/DeleteWatch/DeleteWatchApiTests.cs b/src/Tests/Tests/XPack/Watcher/DeleteWatch/DeleteWatchApiTests.cs
index 8e30f39c1f4..6b97ce6ab82 100644
--- a/src/Tests/Tests/XPack/Watcher/DeleteWatch/DeleteWatchApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/DeleteWatch/DeleteWatchApiTests.cs
@@ -1,19 +1,30 @@
 using System;
-using System.Collections.Generic;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.DeleteWatch
 {
-	public class DeleteWatchApiTests : ApiIntegrationTestBase<XPackCluster, IDeleteWatchResponse, IDeleteWatchRequest, DeleteWatchDescriptor, DeleteWatchRequest>
+	public class DeleteWatchApiTests
+		: ApiIntegrationTestBase<XPackCluster, IDeleteWatchResponse, IDeleteWatchRequest, DeleteWatchDescriptor, DeleteWatchRequest>
 	{
 		public DeleteWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<DeleteWatchDescriptor, IDeleteWatchRequest> Fluent => p => p;
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+
+		protected override DeleteWatchRequest Initializer => new DeleteWatchRequest(CallIsolatedValue);
+
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -46,26 +57,14 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteWatch(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.DeleteWatchAsync(CallIsolatedValue, f),
-			request: (client, r) => client.DeleteWatch(r),
-			requestAsync: (client, r) => client.DeleteWatchAsync(r)
+			(client, f) => client.DeleteWatch(CallIsolatedValue, f),
+			(client, f) => client.DeleteWatchAsync(CallIsolatedValue, f),
+			(client, r) => client.DeleteWatch(r),
+			(client, r) => client.DeleteWatchAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}";
-
 		protected override DeleteWatchDescriptor NewDescriptor() => new DeleteWatchDescriptor(CallIsolatedValue);
 
-		protected override object ExpectJson => null;
-
-		protected override Func<DeleteWatchDescriptor, IDeleteWatchRequest> Fluent => p => p;
-
-		protected override DeleteWatchRequest Initializer => new DeleteWatchRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IDeleteWatchResponse response)
 		{
 			response.Version.Should().Be(2);
@@ -74,31 +73,32 @@ protected override void ExpectResponse(IDeleteWatchResponse response)
 		}
 	}
 
-	public class DeleteNonExistentWatchApiTests : ApiIntegrationTestBase<XPackCluster, IDeleteWatchResponse, IDeleteWatchRequest, DeleteWatchDescriptor, DeleteWatchRequest>
+	public class DeleteNonExistentWatchApiTests
+		: ApiIntegrationTestBase<XPackCluster, IDeleteWatchResponse, IDeleteWatchRequest, DeleteWatchDescriptor, DeleteWatchRequest>
 	{
 		public DeleteNonExistentWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.DeleteWatch(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.DeleteWatchAsync(CallIsolatedValue, f),
-			request: (client, r) => client.DeleteWatch(r),
-			requestAsync: (client, r) => client.DeleteWatchAsync(r)
-		);
-
 		protected override bool ExpectIsValid => false;
-		protected override int ExpectStatusCode => 404;
-		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}";
-
-		protected override DeleteWatchDescriptor NewDescriptor() => new DeleteWatchDescriptor(CallIsolatedValue);
 
 		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 404;
 
 		protected override Func<DeleteWatchDescriptor, IDeleteWatchRequest> Fluent => p => p;
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 
 		protected override DeleteWatchRequest Initializer => new DeleteWatchRequest(CallIsolatedValue);
 
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.DeleteWatch(CallIsolatedValue, f),
+			(client, f) => client.DeleteWatchAsync(CallIsolatedValue, f),
+			(client, r) => client.DeleteWatch(r),
+			(client, r) => client.DeleteWatchAsync(r)
+		);
+
+		protected override DeleteWatchDescriptor NewDescriptor() => new DeleteWatchDescriptor(CallIsolatedValue);
+
 		protected override void ExpectResponse(IDeleteWatchResponse response)
 		{
 			//This API returns different results depending on whether `.watches` exists or not
diff --git a/src/Tests/Tests/XPack/Watcher/DeleteWatch/DeleteWatchUrlTests.cs b/src/Tests/Tests/XPack/Watcher/DeleteWatch/DeleteWatchUrlTests.cs
index c302e49420c..1249f4ad477 100644
--- a/src/Tests/Tests/XPack/Watcher/DeleteWatch/DeleteWatchUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/DeleteWatch/DeleteWatchUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.DeleteWatch
 {
 	public class DeleteWatchUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await DELETE("/_xpack/watcher/watch/watch_id")
-				.Fluent(c => c.DeleteWatch("watch_id"))
-				.Request(c => c.DeleteWatch(new DeleteWatchRequest("watch_id")))
-				.FluentAsync(c => c.DeleteWatchAsync("watch_id"))
-				.RequestAsync(c => c.DeleteWatchAsync(new DeleteWatchRequest("watch_id")))
-				;
-		}
+		[U] public override async Task Urls() => await DELETE("/_xpack/watcher/watch/watch_id")
+			.Fluent(c => c.DeleteWatch("watch_id"))
+			.Request(c => c.DeleteWatch(new DeleteWatchRequest("watch_id")))
+			.FluentAsync(c => c.DeleteWatchAsync("watch_id"))
+			.RequestAsync(c => c.DeleteWatchAsync(new DeleteWatchRequest("watch_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchApiTests.cs b/src/Tests/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchApiTests.cs
index b5763989fbd..649748e9a1d 100644
--- a/src/Tests/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchApiTests.cs
@@ -4,22 +4,96 @@
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using Newtonsoft.Json.Linq;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 using Xunit;
 
 namespace Tests.XPack.Watcher.ExecuteWatch
 {
-	public class ExecuteWatchApiTests : ApiIntegrationTestBase<XPackCluster, IExecuteWatchResponse, IExecuteWatchRequest, ExecuteWatchDescriptor, ExecuteWatchRequest>
+	public class ExecuteWatchApiTests
+		: ApiIntegrationTestBase<XPackCluster, IExecuteWatchResponse, IExecuteWatchRequest, ExecuteWatchDescriptor, ExecuteWatchRequest>
 	{
 		private readonly DateTimeOffset _triggeredDateTime = new DateTimeOffset(2016, 11, 17, 13, 00, 00, TimeSpan.Zero);
 
 		public ExecuteWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => new
+		{
+			action_modes = new
+			{
+				email_admin = "force_simulate",
+				webhook_action = "force_simulate",
+				slack_action = "force_simulate",
+				hipchat_action = "force_simulate",
+				pagerduty_action = "force_simulate",
+			},
+			alternative_input = new
+			{
+				foo = "bar"
+			},
+			ignore_condition = true,
+			record_execution = true,
+			trigger_data = new
+			{
+				scheduled_time = "2016-11-17T13:00:00+00:00",
+				triggered_time = "2016-11-17T13:00:00+00:00"
+			}
+		};
+
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<ExecuteWatchDescriptor, IExecuteWatchRequest> Fluent => f => f
+			.Id(CallIsolatedValue)
+			.TriggerData(te => te
+				.ScheduledTime(_triggeredDateTime)
+				.TriggeredTime(_triggeredDateTime)
+			)
+			.AlternativeInput(i => i.Add("foo", "bar"))
+			.IgnoreCondition()
+			.ActionModes(a => a
+				.Add("email_admin", ActionExecutionMode.ForceSimulate)
+				.Add("webhook_action", ActionExecutionMode.ForceSimulate)
+				.Add("slack_action", ActionExecutionMode.ForceSimulate)
+				.Add("hipchat_action", ActionExecutionMode.ForceSimulate)
+				.Add("pagerduty_action", ActionExecutionMode.ForceSimulate)
+			)
+			.RecordExecution();
+
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+
+		protected override ExecuteWatchRequest Initializer =>
+			new ExecuteWatchRequest(CallIsolatedValue)
+			{
+				TriggerData = new ScheduleTriggerEvent
+				{
+					ScheduledTime = _triggeredDateTime,
+					TriggeredTime = _triggeredDateTime
+				},
+				AlternativeInput = new Dictionary<string, object>
+				{
+					{ "foo", "bar" }
+				},
+				IgnoreCondition = true,
+				ActionModes = new Dictionary<string, ActionExecutionMode>
+				{
+					{ "email_admin", ActionExecutionMode.ForceSimulate },
+					{ "webhook_action", ActionExecutionMode.ForceSimulate },
+					{ "slack_action", ActionExecutionMode.ForceSimulate },
+					{ "hipchat_action", ActionExecutionMode.ForceSimulate },
+					{ "pagerduty_action", ActionExecutionMode.ForceSimulate },
+				},
+				RecordExecution = true
+			};
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}/_execute";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -31,15 +105,15 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 								.Indices("logstash")
 								.Body<object>(b => b
 									.Query(q => q
-										.Match(m => m
+											.Match(m => m
 												.Field("response")
 												.Query("404")
-										) && +q
-										.DateRange(ffrr => ffrr
-											.Field("@timestamp")
-											.GreaterThanOrEquals("{{ctx.trigger.scheduled_time}}||-5m")
-											.LessThanOrEquals("{{ctx.trigger.triggered_time}}")
-										)
+											) && +q
+											.DateRange(ffrr => ffrr
+												.Field("@timestamp")
+												.GreaterThanOrEquals("{{ctx.trigger.scheduled_time}}||-5m")
+												.LessThanOrEquals("{{ctx.trigger.triggered_time}}")
+											)
 									)
 								)
 							)
@@ -122,85 +196,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ExecuteWatch(f),
-			fluentAsync: (client, f) => client.ExecuteWatchAsync(f),
-			request: (client, r) => client.ExecuteWatch(r),
-			requestAsync: (client, r) => client.ExecuteWatchAsync(r)
+			(client, f) => client.ExecuteWatch(f),
+			(client, f) => client.ExecuteWatchAsync(f),
+			(client, r) => client.ExecuteWatch(r),
+			(client, r) => client.ExecuteWatchAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}/_execute";
-
-		protected override bool SupportsDeserialization => false;
-
-		protected override object ExpectJson => new
-			{
-				action_modes = new
-				{
-					email_admin = "force_simulate",
-					webhook_action = "force_simulate",
-					slack_action = "force_simulate",
-					hipchat_action = "force_simulate",
-					pagerduty_action = "force_simulate",
-				},
-				alternative_input = new
-				{
-					foo = "bar"
-				},
-				ignore_condition = true,
-				record_execution = true,
-				trigger_data = new
-				{
-					scheduled_time = "2016-11-17T13:00:00+00:00",
-					triggered_time = "2016-11-17T13:00:00+00:00"
-				}
-			};
-
-		protected override Func<ExecuteWatchDescriptor, IExecuteWatchRequest> Fluent => f => f
-			.Id(CallIsolatedValue)
-			.TriggerData(te => te
-				.ScheduledTime(_triggeredDateTime)
-				.TriggeredTime(_triggeredDateTime)
-			)
-			.AlternativeInput(i => i.Add("foo", "bar"))
-			.IgnoreCondition()
-			.ActionModes(a => a
-				.Add("email_admin", ActionExecutionMode.ForceSimulate)
-				.Add("webhook_action", ActionExecutionMode.ForceSimulate)
-				.Add("slack_action", ActionExecutionMode.ForceSimulate)
-				.Add("hipchat_action", ActionExecutionMode.ForceSimulate)
-				.Add("pagerduty_action", ActionExecutionMode.ForceSimulate)
-			)
-			.RecordExecution();
-
-
-		protected override ExecuteWatchRequest Initializer =>
-			new ExecuteWatchRequest(CallIsolatedValue)
-			{
-				TriggerData = new ScheduleTriggerEvent
-				{
-					ScheduledTime = _triggeredDateTime,
-					TriggeredTime = _triggeredDateTime
-				},
-				AlternativeInput = new Dictionary<string, object>
-				{
-					{ "foo", "bar" }
-				},
-				IgnoreCondition = true,
-				ActionModes = new Dictionary<string, ActionExecutionMode>
-				{
-					{ "email_admin", ActionExecutionMode.ForceSimulate },
-					{ "webhook_action", ActionExecutionMode.ForceSimulate },
-					{ "slack_action", ActionExecutionMode.ForceSimulate },
-					{ "hipchat_action", ActionExecutionMode.ForceSimulate },
-					{ "pagerduty_action", ActionExecutionMode.ForceSimulate },
-				},
-				RecordExecution = true
-			};
-
 		protected override void ExpectResponse(IExecuteWatchResponse response)
 		{
 			response.ShouldBeValid();
@@ -285,89 +286,14 @@ protected override void ExpectResponse(IExecuteWatchResponse response)
 		}
 	}
 
-	public class ExecuteInlineWatchApiTests : ApiIntegrationTestBase<XPackCluster, IExecuteWatchResponse, IExecuteWatchRequest, ExecuteWatchDescriptor, ExecuteWatchRequest>
+	public class ExecuteInlineWatchApiTests
+		: ApiIntegrationTestBase<XPackCluster, IExecuteWatchResponse, IExecuteWatchRequest, ExecuteWatchDescriptor, ExecuteWatchRequest>
 	{
 		private readonly DateTimeOffset _triggeredDateTime = new DateTimeOffset(2016, 11, 17, 13, 00, 00, TimeSpan.Zero);
 
 		public ExecuteInlineWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
-		{
-			foreach (var callUniqueValue in values)
-			{
-				var putWatchResponse = client.PutWatch(callUniqueValue.Value, p => p
-					.Input(i => i
-						.Search(s => s
-							.Request(r => r
-								.Indices("logstash")
-								.Body<object>(b => b
-									.Query(q => q
-										.Match(m => m
-												.Field("response")
-												.Query("404")
-										) && +q
-										.DateRange(ffrr => ffrr
-											.Field("@timestamp")
-											.GreaterThanOrEquals("{{ctx.trigger.scheduled_time}}||-5m")
-											.LessThanOrEquals("{{ctx.trigger.triggered_time}}")
-										)
-									)
-								)
-							)
-						)
-					)
-					.Condition(c => c
-						.Script(ss => ss
-							.Source("ctx.payload.hits.total > 1")
-						)
-					)
-					.Trigger(t => t
-						.Schedule(s => s
-							.Cron("0 0 0 1 * ? 2099")
-						)
-					)
-					.Metadata(meta => meta.Add("foo", "bar"))
-					.Actions(a => a
-						.Email("email_admin", e => e
-							.To("someone@domain.host.com")
-							.Subject("404 recently encountered")
-						)
-						.Index("index_action", i => i
-							.Index("test")
-							.DocType("doctype2")
-						)
-						.Logging("logging_action", l => l
-							.Text("404 recently encountered")
-						)
-						.Webhook("webhook_action", w => w
-							.Host("foo.com")
-							.Port(80)
-							.Path("/bar")
-							.Method(HttpInputMethod.Post)
-							.Body("{}")
-						)
-					)
-				);
-
-				if (!putWatchResponse.IsValid)
-					throw new Exception("Problem setting up integration test");
-			}
-		}
-
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.ExecuteWatch(f),
-			fluentAsync: (client, f) => client.ExecuteWatchAsync(f),
-			request: (client, r) => client.ExecuteWatch(r),
-			requestAsync: (client, r) => client.ExecuteWatchAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/_execute";
-
-		protected override bool SupportsDeserialization => false;
 
 		protected override object ExpectJson => new
 		{
@@ -490,6 +416,8 @@ protected override LazyResponses ClientUsage() => Calls(
 			}
 		};
 
+		protected override int ExpectStatusCode => 200;
+
 		protected override Func<ExecuteWatchDescriptor, IExecuteWatchRequest> Fluent => f => f
 			.TriggerData(te => te
 				.ScheduledTime(_triggeredDateTime)
@@ -504,15 +432,15 @@ protected override LazyResponses ClientUsage() => Calls(
 							.Indices("logstash")
 							.Body<object>(b => b
 								.Query(q => q
-									.Match(m => m
-										.Field("response")
-										.Query("404")
-									) && +q
-									.DateRange(ffrr => ffrr
-										.Field("@timestamp")
-										.GreaterThanOrEquals("{{ctx.trigger.scheduled_time}}||-5m")
-										.LessThanOrEquals("{{ctx.trigger.triggered_time}}")
-									)
+										.Match(m => m
+											.Field("response")
+											.Query("404")
+										) && +q
+										.DateRange(ffrr => ffrr
+											.Field("@timestamp")
+											.GreaterThanOrEquals("{{ctx.trigger.scheduled_time}}||-5m")
+											.LessThanOrEquals("{{ctx.trigger.triggered_time}}")
+										)
 								)
 							)
 						)
@@ -555,6 +483,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				.RequestTimeout(TimeSpan.FromMinutes(2))
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override ExecuteWatchRequest Initializer =>
 			new ExecuteWatchRequest
 			{
@@ -600,26 +530,26 @@ protected override LazyResponses ClientUsage() => Calls(
 					},
 					Condition = new InlineScriptCondition("ctx.payload.hits.total > 1"),
 					Actions = new EmailAction("email_admin")
-					{
-						From = "nest-client@domain.example",
-						To = new [] {"someone@domain.host.example"},
-						Subject = "404 recently encountered"
-					} && new IndexAction("index_action")
-					{
-						Index = "test",
-						DocType = "doctype2"
-					} && new LoggingAction("logging_action")
-					{
-						Text = "404 recently encountered"
-					}
-					&& new WebhookAction("webhook_action")
-					{
-						Host = "foo.com",
-						Port = 80,
-						Path = "/bar",
-						Method = HttpInputMethod.Post,
-						Body = "{}"
-					}
+						{
+							From = "nest-client@domain.example",
+							To = new[] { "someone@domain.host.example" },
+							Subject = "404 recently encountered"
+						} && new IndexAction("index_action")
+						{
+							Index = "test",
+							DocType = "doctype2"
+						} && new LoggingAction("logging_action")
+						{
+							Text = "404 recently encountered"
+						}
+						&& new WebhookAction("webhook_action")
+						{
+							Host = "foo.com",
+							Port = 80,
+							Path = "/bar",
+							Method = HttpInputMethod.Post,
+							Body = "{}"
+						}
 				},
 				RequestConfiguration = new RequestConfiguration
 				{
@@ -627,6 +557,80 @@ protected override LazyResponses ClientUsage() => Calls(
 				}
 			};
 
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_xpack/watcher/watch/_execute";
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			foreach (var callUniqueValue in values)
+			{
+				var putWatchResponse = client.PutWatch(callUniqueValue.Value, p => p
+					.Input(i => i
+						.Search(s => s
+							.Request(r => r
+								.Indices("logstash")
+								.Body<object>(b => b
+									.Query(q => q
+											.Match(m => m
+												.Field("response")
+												.Query("404")
+											) && +q
+											.DateRange(ffrr => ffrr
+												.Field("@timestamp")
+												.GreaterThanOrEquals("{{ctx.trigger.scheduled_time}}||-5m")
+												.LessThanOrEquals("{{ctx.trigger.triggered_time}}")
+											)
+									)
+								)
+							)
+						)
+					)
+					.Condition(c => c
+						.Script(ss => ss
+							.Source("ctx.payload.hits.total > 1")
+						)
+					)
+					.Trigger(t => t
+						.Schedule(s => s
+							.Cron("0 0 0 1 * ? 2099")
+						)
+					)
+					.Metadata(meta => meta.Add("foo", "bar"))
+					.Actions(a => a
+						.Email("email_admin", e => e
+							.To("someone@domain.host.com")
+							.Subject("404 recently encountered")
+						)
+						.Index("index_action", i => i
+							.Index("test")
+							.DocType("doctype2")
+						)
+						.Logging("logging_action", l => l
+							.Text("404 recently encountered")
+						)
+						.Webhook("webhook_action", w => w
+							.Host("foo.com")
+							.Port(80)
+							.Path("/bar")
+							.Method(HttpInputMethod.Post)
+							.Body("{}")
+						)
+					)
+				);
+
+				if (!putWatchResponse.IsValid)
+					throw new Exception("Problem setting up integration test");
+			}
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.ExecuteWatch(f),
+			(client, f) => client.ExecuteWatchAsync(f),
+			(client, r) => client.ExecuteWatch(r),
+			(client, r) => client.ExecuteWatchAsync(r)
+		);
+
 		protected override void ExpectResponse(IExecuteWatchResponse response)
 		{
 			response.ShouldBeValid();
diff --git a/src/Tests/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchUrlTests.cs b/src/Tests/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchUrlTests.cs
index 47625e329aa..eb0ce19ccd7 100644
--- a/src/Tests/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.ExecuteWatch
 {
 	public class ExecuteWatchUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/watcher/watch/watch_id/_execute")
-				.Fluent(c => c.ExecuteWatch(e => e.Id("watch_id")))
-				.Request(c => c.ExecuteWatch(new ExecuteWatchRequest("watch_id")))
-				.FluentAsync(c => c.ExecuteWatchAsync(e => e.Id("watch_id")))
-				.RequestAsync(c => c.ExecuteWatchAsync(new ExecuteWatchRequest("watch_id")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/watcher/watch/watch_id/_execute")
+			.Fluent(c => c.ExecuteWatch(e => e.Id("watch_id")))
+			.Request(c => c.ExecuteWatch(new ExecuteWatchRequest("watch_id")))
+			.FluentAsync(c => c.ExecuteWatchAsync(e => e.Id("watch_id")))
+			.RequestAsync(c => c.ExecuteWatchAsync(new ExecuteWatchRequest("watch_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/GetWatch/GetWatchApiTests.cs b/src/Tests/Tests/XPack/Watcher/GetWatch/GetWatchApiTests.cs
index 6e5f070ca3d..ee6914467d2 100644
--- a/src/Tests/Tests/XPack/Watcher/GetWatch/GetWatchApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/GetWatch/GetWatchApiTests.cs
@@ -9,7 +9,6 @@
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.GetWatch
 {
@@ -18,6 +17,19 @@ public class GetWatchApiTests : ApiIntegrationTestBase<XPackCluster, IGetWatchRe
 	{
 		public GetWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<GetWatchDescriptor, IGetWatchRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
+		protected override GetWatchRequest Initializer =>
+			new GetWatchRequest(CallIsolatedValue);
+
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values) => PutWatch(client, values);
 
 		public static void PutWatch(IElasticClient client, CallUniqueValues values)
@@ -52,7 +64,8 @@ public static void PutWatch(IElasticClient client, CallUniqueValues values)
 												.Password("Password123")
 											)
 										)
-										.Body("{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}")
+										.Body(
+											"{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}")
 										.Headers(he => he
 											.Add("header1", "value1")
 										)
@@ -210,27 +223,14 @@ public static void PutWatch(IElasticClient client, CallUniqueValues values)
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetWatch(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.GetWatchAsync(CallIsolatedValue, f),
-			request: (client, r) => client.GetWatch(r),
-			requestAsync: (client, r) => client.GetWatchAsync(r)
+			(client, f) => client.GetWatch(CallIsolatedValue, f),
+			(client, f) => client.GetWatchAsync(CallIsolatedValue, f),
+			(client, r) => client.GetWatch(r),
+			(client, r) => client.GetWatchAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}";
-
 		protected override GetWatchDescriptor NewDescriptor() => new GetWatchDescriptor(CallIsolatedValue);
 
-		protected override object ExpectJson => null;
-
-		protected override Func<GetWatchDescriptor, IGetWatchRequest> Fluent => f => f;
-
-		protected override GetWatchRequest Initializer =>
-			new GetWatchRequest(CallIsolatedValue);
-
 		protected override void ExpectResponse(IGetWatchResponse response)
 		{
 			response.Found.Should().BeTrue();
@@ -302,32 +302,33 @@ protected override void ExpectResponse(IGetWatchResponse response)
 		}
 	}
 
-	public class GetNonExistentWatchApiTests : ApiIntegrationTestBase<XPackCluster, IGetWatchResponse, IGetWatchRequest, GetWatchDescriptor, GetWatchRequest>
+	public class GetNonExistentWatchApiTests
+		: ApiIntegrationTestBase<XPackCluster, IGetWatchResponse, IGetWatchRequest, GetWatchDescriptor, GetWatchRequest>
 	{
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values) => GetWatchApiTests.PutWatch(client, values);
-
 		public GetNonExistentWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.GetWatch(CallIsolatedValue + "x", f),
-			fluentAsync: (client, f) => client.GetWatchAsync(CallIsolatedValue + "x", f),
-			request: (client, r) => client.GetWatch(r),
-			requestAsync: (client, r) => client.GetWatchAsync(r)
-		);
-
 		protected override bool ExpectIsValid => false;
+
+		protected override object ExpectJson => null;
 		protected override int ExpectStatusCode => 404;
+
+		protected override Func<GetWatchDescriptor, IGetWatchRequest> Fluent => f => f;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue + "x"}";
+		protected override GetWatchRequest Initializer => new GetWatchRequest(CallIsolatedValue + "x");
 
-		protected override GetWatchDescriptor NewDescriptor() => new GetWatchDescriptor(CallIsolatedValue + "x");
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue + "x"}";
 
-		protected override object ExpectJson => null;
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values) => GetWatchApiTests.PutWatch(client, values);
 
-		protected override Func<GetWatchDescriptor, IGetWatchRequest> Fluent => f => f;
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.GetWatch(CallIsolatedValue + "x", f),
+			(client, f) => client.GetWatchAsync(CallIsolatedValue + "x", f),
+			(client, r) => client.GetWatch(r),
+			(client, r) => client.GetWatchAsync(r)
+		);
 
-		protected override GetWatchRequest Initializer => new GetWatchRequest(CallIsolatedValue + "x");
+		protected override GetWatchDescriptor NewDescriptor() => new GetWatchDescriptor(CallIsolatedValue + "x");
 
 		protected override void ExpectResponse(IGetWatchResponse response)
 		{
diff --git a/src/Tests/Tests/XPack/Watcher/GetWatch/GetWatchUrlTests.cs b/src/Tests/Tests/XPack/Watcher/GetWatch/GetWatchUrlTests.cs
index 3a31b390cb7..3c7bb1538d7 100644
--- a/src/Tests/Tests/XPack/Watcher/GetWatch/GetWatchUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/GetWatch/GetWatchUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.GetWatch
 {
 	public class GetWatchUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await GET("/_xpack/watcher/watch/watch_id")
-				.Fluent(c => c.GetWatch("watch_id"))
-				.Request(c => c.GetWatch(new GetWatchRequest("watch_id")))
-				.FluentAsync(c => c.GetWatchAsync("watch_id"))
-				.RequestAsync(c => c.GetWatchAsync(new GetWatchRequest("watch_id")))
-				;
-		}
+		[U] public override async Task Urls() => await GET("/_xpack/watcher/watch/watch_id")
+			.Fluent(c => c.GetWatch("watch_id"))
+			.Request(c => c.GetWatch(new GetWatchRequest("watch_id")))
+			.FluentAsync(c => c.GetWatchAsync("watch_id"))
+			.RequestAsync(c => c.GetWatchAsync(new GetWatchRequest("watch_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/PutWatch/PutWatchApiTests.cs b/src/Tests/Tests/XPack/Watcher/PutWatch/PutWatchApiTests.cs
index 20382b92247..0a6387b20a1 100644
--- a/src/Tests/Tests/XPack/Watcher/PutWatch/PutWatchApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/PutWatch/PutWatchApiTests.cs
@@ -4,12 +4,10 @@
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
-using Newtonsoft.Json.Linq;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.PutWatch
 {
@@ -17,22 +15,7 @@ public class PutWatchApiTests : ApiIntegrationTestBase<XPackCluster, IPutWatchRe
 	{
 		public PutWatchApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.PutWatch(CallIsolatedValue, f),
-			fluentAsync: (client, f) => client.PutWatchAsync(CallIsolatedValue, f),
-			request: (client, r) => client.PutWatch(r),
-			requestAsync: (client, r) => client.PutWatchAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 201;
-		protected override HttpMethod HttpMethod => HttpMethod.PUT;
-
-		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}";
-
-		protected override bool SupportsDeserialization => false;
-
-		protected override PutWatchDescriptor NewDescriptor() => new PutWatchDescriptor(CallIsolatedValue);
 
 		protected override object ExpectJson =>
 			new
@@ -84,7 +67,8 @@ protected override LazyResponses ClientUsage() => Calls(
 													password = "Password123"
 												}
 											},
-											body = "{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}",
+											body =
+												"{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}",
 											headers = new
 											{
 												header1 = "value1"
@@ -152,7 +136,7 @@ protected override LazyResponses ClientUsage() => Calls(
 							{
 								request = new
 								{
-									indices = new [] { "project" },
+									indices = new[] { "project" },
 									indices_options = new
 									{
 										expand_wildcards = "open",
@@ -189,7 +173,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				{
 					array_compare = new Dictionary<string, object>
 					{
-						{ "ctx.payload.search.aggregations.top_project_tags.buckets", new Dictionary<string, object>
+						{
+							"ctx.payload.search.aggregations.top_project_tags.buckets", new Dictionary<string, object>
 							{
 								{ "path", "doc_count" },
 								{ "gte", new Dictionary<string, object> { { "value", 1 } } }
@@ -262,16 +247,17 @@ protected override LazyResponses ClientUsage() => Calls(
 							attach_payload = true,
 							event_type = "trigger",
 							incident_key = "incident_key",
-							context = new object[] {
+							context = new object[]
+							{
 								new
 								{
-								  type = "image",
-								  src = "http://example.com/image"
+									type = "image",
+									src = "http://example.com/image"
 								},
 								new
 								{
-								  type = "link",
-								  href = "http://example.com/link"
+									type = "link",
+									href = "http://example.com/link"
 								}
 							}
 						}
@@ -334,6 +320,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				}
 			};
 
+		protected override int ExpectStatusCode => 201;
+
 		protected override Func<PutWatchDescriptor, IPutWatchRequest> Fluent => p => p
 			.Input(i => i
 				.Chain(c => c
@@ -362,7 +350,8 @@ protected override LazyResponses ClientUsage() => Calls(
 										.Password("Password123")
 									)
 								)
-								.Body("{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}")
+								.Body(
+									"{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}")
 								.Headers(he => he
 									.Add("header1", "value1")
 								)
@@ -527,6 +516,8 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 			);
 
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
 		protected override PutWatchRequest Initializer =>
 			new PutWatchRequest(CallIsolatedValue)
 			{
@@ -565,7 +556,8 @@ protected override LazyResponses ClientUsage() => Calls(
 											Password = "Password123"
 										}
 									},
-									Body = "{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}",
+									Body =
+										"{\"query\" : {\"range\": {\"@timestamp\" : {\"from\": \"{{ctx.trigger.triggered_time}}||-5m\",\"to\": \"{{ctx.trigger.triggered_time}}\"}}}}",
 									Headers = new Dictionary<string, string>
 									{
 										{ "header1", "value1" }
@@ -644,96 +636,109 @@ protected override LazyResponses ClientUsage() => Calls(
 					}
 				},
 				Actions = new EmailAction("reminder_email")
+				{
+					To = new[] { "me@example.com" },
+					Subject = "Something's strange in the neighbourhood",
+					Body = new EmailBody
+					{
+						Text = "Dear {{ctx.payload.name}}, by the time you read these lines, I'll be gone"
+					},
+					Attachments = new EmailAttachments
 					{
-						To = new [] { "me@example.com" },
-						Subject = "Something's strange in the neighbourhood",
-						Body = new EmailBody
-						{
-							Text = "Dear {{ctx.payload.name}}, by the time you read these lines, I'll be gone"
-						},
-						Attachments = new EmailAttachments
 						{
+							"http_attachment", new HttpAttachment
 							{
-								"http_attachment", new HttpAttachment
+								Inline = true,
+								ContentType = RequestData.MimeType,
+								Request = new HttpInputRequest
 								{
-									Inline = true,
-									ContentType = RequestData.MimeType,
-									Request = new HttpInputRequest
-									{
-										Url = "http://localhost:8080/http_attachment"
-									}
+									Url = "http://localhost:8080/http_attachment"
 								}
-							},
+							}
+						},
+						{
+							"data_attachment", new DataAttachment
 							{
-								"data_attachment", new DataAttachment
-								{
-									Format = DataAttachmentFormat.Json
-								}
+								Format = DataAttachmentFormat.Json
 							}
 						}
-					} && new IndexAction("reminder_index")
-					{
-					    Index = "put-watch-test-index",
-						DocType = "reminder",
-						ExecutionTimeField = "execution_time"
-					} && new PagerDutyAction("reminder_pagerduty")
+					}
+				} && new IndexAction("reminder_index")
+				{
+					Index = "put-watch-test-index",
+					DocType = "reminder",
+					ExecutionTimeField = "execution_time"
+				} && new PagerDutyAction("reminder_pagerduty")
+				{
+					Account = "my_pagerduty_account",
+					Description = "pager duty description",
+					AttachPayload = true,
+					EventType = PagerDutyEventType.Trigger,
+					IncidentKey = "incident_key",
+					Context = new[]
 					{
-						Account = "my_pagerduty_account",
-						Description = "pager duty description",
-						AttachPayload = true,
-						EventType = PagerDutyEventType.Trigger,
-						IncidentKey = "incident_key",
-						Context = new[]
-						{
-							new PagerDutyContext(PagerDutyContextType.Image) { Src = "http://example.com/image" },
-							new PagerDutyContext(PagerDutyContextType.Link) { Href = "http://example.com/link" },
-						}
-					} && new SlackAction("reminder_slack")
+						new PagerDutyContext(PagerDutyContextType.Image) { Src = "http://example.com/image" },
+						new PagerDutyContext(PagerDutyContextType.Link) { Href = "http://example.com/link" },
+					}
+				} && new SlackAction("reminder_slack")
+				{
+					Account = "monitoring",
+					Message = new SlackMessage
 					{
-						Account = "monitoring",
-						Message = new SlackMessage
+						From = "nest integration test",
+						To = new[] { "#nest" },
+						Text = "slack message",
+						Attachments = new[]
 						{
-							From = "nest integration test",
-							To = new [] { "#nest" },
-							Text = "slack message",
-							Attachments = new []
+							new SlackAttachment
 							{
-								new SlackAttachment
-								{
-									Title = "Attachment 1",
-									AuthorName = "Russ Cam"
-								}
+								Title = "Attachment 1",
+								AuthorName = "Russ Cam"
 							}
 						}
-					} && new HipChatAction("reminder_hipchat")
-				    {
-					    Account = "notify-monitoring",
-						Message = new HipChatMessage
-						{
-							Body = "hipchat message",
-							Color = HipChatMessageColor.Purple,
-							Room = new [] { "nest" },
-							Notify = true
-						}
-				    } && new WebhookAction("webhook")
+					}
+				} && new HipChatAction("reminder_hipchat")
+				{
+					Account = "notify-monitoring",
+					Message = new HipChatMessage
 					{
-						Scheme = ConnectionScheme.Https,
-						Host = "localhost",
-						Port = 9200,
-						Method = HttpInputMethod.Post,
-						Path = "/_bulk",
-						Authentication = new HttpInputAuthentication
-						{
-							Basic = new HttpInputBasicAuthentication
-							{
-								Username = "username",
-								Password = "password"
-							}
-						},
-						Body = "{{ctx.payload._value}}"
+						Body = "hipchat message",
+						Color = HipChatMessageColor.Purple,
+						Room = new[] { "nest" },
+						Notify = true
 					}
+				} && new WebhookAction("webhook")
+				{
+					Scheme = ConnectionScheme.Https,
+					Host = "localhost",
+					Port = 9200,
+					Method = HttpInputMethod.Post,
+					Path = "/_bulk",
+					Authentication = new HttpInputAuthentication
+					{
+						Basic = new HttpInputBasicAuthentication
+						{
+							Username = "username",
+							Password = "password"
+						}
+					},
+					Body = "{{ctx.payload._value}}"
+				}
 			};
 
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_xpack/watcher/watch/{CallIsolatedValue}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.PutWatch(CallIsolatedValue, f),
+			(client, f) => client.PutWatchAsync(CallIsolatedValue, f),
+			(client, r) => client.PutWatch(r),
+			(client, r) => client.PutWatchAsync(r)
+		);
+
+		protected override PutWatchDescriptor NewDescriptor() => new PutWatchDescriptor(CallIsolatedValue);
+
 		protected override void ExpectResponse(IPutWatchResponse response)
 		{
 			response.Created.Should().BeTrue();
diff --git a/src/Tests/Tests/XPack/Watcher/PutWatch/PutWatchUrlTests.cs b/src/Tests/Tests/XPack/Watcher/PutWatch/PutWatchUrlTests.cs
index 8bc274b7ac5..fca525c8494 100644
--- a/src/Tests/Tests/XPack/Watcher/PutWatch/PutWatchUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/PutWatch/PutWatchUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.PutWatch
 {
 	public class PutWatchUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await PUT("/_xpack/watcher/watch/watch_id")
-				.Fluent(c => c.PutWatch("watch_id"))
-				.Request(c => c.PutWatch(new PutWatchRequest("watch_id")))
-				.FluentAsync(c => c.PutWatchAsync("watch_id"))
-				.RequestAsync(c => c.PutWatchAsync(new PutWatchRequest("watch_id")))
-				;
-		}
+		[U] public override async Task Urls() => await PUT("/_xpack/watcher/watch/watch_id")
+			.Fluent(c => c.PutWatch("watch_id"))
+			.Request(c => c.PutWatch(new PutWatchRequest("watch_id")))
+			.FluentAsync(c => c.PutWatchAsync("watch_id"))
+			.RequestAsync(c => c.PutWatchAsync(new PutWatchRequest("watch_id")));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/RestartWatcher/RestartWatcherApiTests.cs b/src/Tests/Tests/XPack/Watcher/RestartWatcher/RestartWatcherApiTests.cs
index 3820c638092..203b4a340b5 100644
--- a/src/Tests/Tests/XPack/Watcher/RestartWatcher/RestartWatcherApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/RestartWatcher/RestartWatcherApiTests.cs
@@ -5,36 +5,34 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.RestartWatcher
 {
-	public class RestartWatcherApiTests : ApiIntegrationTestBase<WatcherStateCluster, IRestartWatcherResponse, IRestartWatcherRequest, RestartWatcherDescriptor, RestartWatcherRequest>
+	public class RestartWatcherApiTests
+		: ApiIntegrationTestBase<WatcherStateCluster, IRestartWatcherResponse, IRestartWatcherRequest, RestartWatcherDescriptor, RestartWatcherRequest
+		>
 	{
 		public RestartWatcherApiTests(WatcherStateCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.RestartWatcher(f),
-			fluentAsync: (client, f) => client.RestartWatcherAsync(f),
-			request: (client, r) => client.RestartWatcher(r),
-			requestAsync: (client, r) => client.RestartWatcherAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => "/_xpack/watcher/_restart";
 
 		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<RestartWatcherDescriptor, IRestartWatcherRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override RestartWatcherRequest Initializer => new RestartWatcherRequest();
 
-		protected override void ExpectResponse(IRestartWatcherResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override string UrlPath => "/_xpack/watcher/_restart";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.RestartWatcher(f),
+			(client, f) => client.RestartWatcherAsync(f),
+			(client, r) => client.RestartWatcher(r),
+			(client, r) => client.RestartWatcherAsync(r)
+		);
+
+		protected override void ExpectResponse(IRestartWatcherResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/RestartWatcher/RestartWatcherUrlTests.cs b/src/Tests/Tests/XPack/Watcher/RestartWatcher/RestartWatcherUrlTests.cs
index f740ef6ffdb..779b563fa48 100644
--- a/src/Tests/Tests/XPack/Watcher/RestartWatcher/RestartWatcherUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/RestartWatcher/RestartWatcherUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.RestartWatcher
 {
 	public class RestartWatcherUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/watcher/_restart")
-				.Fluent(c => c.RestartWatcher())
-				.Request(c => c.RestartWatcher(new RestartWatcherRequest()))
-				.FluentAsync(c => c.RestartWatcherAsync())
-				.RequestAsync(c => c.RestartWatcherAsync(new RestartWatcherRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/watcher/_restart")
+			.Fluent(c => c.RestartWatcher())
+			.Request(c => c.RestartWatcher(new RestartWatcherRequest()))
+			.FluentAsync(c => c.RestartWatcherAsync())
+			.RequestAsync(c => c.RestartWatcherAsync(new RestartWatcherRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/StartWatcher/StartWatcherApiTests.cs b/src/Tests/Tests/XPack/Watcher/StartWatcher/StartWatcherApiTests.cs
index 1e490febb74..c1cccac7e73 100644
--- a/src/Tests/Tests/XPack/Watcher/StartWatcher/StartWatcherApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/StartWatcher/StartWatcherApiTests.cs
@@ -5,36 +5,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.StartWatcher
 {
-	public class StartWatcherApiTests : ApiIntegrationTestBase<WatcherStateCluster, IStartWatcherResponse, IStartWatcherRequest, StartWatcherDescriptor, StartWatcherRequest>
+	public class StartWatcherApiTests
+		: ApiIntegrationTestBase<WatcherStateCluster, IStartWatcherResponse, IStartWatcherRequest, StartWatcherDescriptor, StartWatcherRequest>
 	{
 		public StartWatcherApiTests(WatcherStateCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.StartWatcher(f),
-			fluentAsync: (client, f) => client.StartWatcherAsync(f),
-			request: (client, r) => client.StartWatcher(r),
-			requestAsync: (client, r) => client.StartWatcherAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => "/_xpack/watcher/_start";
 
 		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<StartWatcherDescriptor, IStartWatcherRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override StartWatcherRequest Initializer => new StartWatcherRequest();
 
-		protected override void ExpectResponse(IStartWatcherResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override string UrlPath => "/_xpack/watcher/_start";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.StartWatcher(f),
+			(client, f) => client.StartWatcherAsync(f),
+			(client, r) => client.StartWatcher(r),
+			(client, r) => client.StartWatcherAsync(r)
+		);
+
+		protected override void ExpectResponse(IStartWatcherResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/StartWatcher/StartWatcherUrlTests.cs b/src/Tests/Tests/XPack/Watcher/StartWatcher/StartWatcherUrlTests.cs
index f156b3298e6..bff8f5ddf7f 100644
--- a/src/Tests/Tests/XPack/Watcher/StartWatcher/StartWatcherUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/StartWatcher/StartWatcherUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.StartWatcher
 {
 	public class StartWatcherUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/watcher/_start")
-				.Fluent(c => c.StartWatcher())
-				.Request(c => c.StartWatcher(new StartWatcherRequest()))
-				.FluentAsync(c => c.StartWatcherAsync())
-				.RequestAsync(c => c.StartWatcherAsync(new StartWatcherRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/watcher/_start")
+			.Fluent(c => c.StartWatcher())
+			.Request(c => c.StartWatcher(new StartWatcherRequest()))
+			.FluentAsync(c => c.StartWatcherAsync())
+			.RequestAsync(c => c.StartWatcherAsync(new StartWatcherRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/StopWatcher/StopWatcherApiTests.cs b/src/Tests/Tests/XPack/Watcher/StopWatcher/StopWatcherApiTests.cs
index 39235eee2ff..f0a0e3a74b0 100644
--- a/src/Tests/Tests/XPack/Watcher/StopWatcher/StopWatcherApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/StopWatcher/StopWatcherApiTests.cs
@@ -5,36 +5,33 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.StopWatcher
 {
-	public class StopWatcherApiTests : ApiIntegrationTestBase<WatcherStateCluster, IStopWatcherResponse, IStopWatcherRequest, StopWatcherDescriptor, StopWatcherRequest>
+	public class StopWatcherApiTests
+		: ApiIntegrationTestBase<WatcherStateCluster, IStopWatcherResponse, IStopWatcherRequest, StopWatcherDescriptor, StopWatcherRequest>
 	{
 		public StopWatcherApiTests(WatcherStateCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.StopWatcher(f),
-			fluentAsync: (client, f) => client.StopWatcherAsync(f),
-			request: (client, r) => client.StopWatcher(r),
-			requestAsync: (client, r) => client.StopWatcherAsync(r)
-		);
-
 		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.POST;
-
-		protected override string UrlPath => "/_xpack/watcher/_stop";
 
 		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
 
 		protected override Func<StopWatcherDescriptor, IStopWatcherRequest> Fluent => f => f;
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override StopWatcherRequest Initializer => new StopWatcherRequest();
 
-		protected override void ExpectResponse(IStopWatcherResponse response)
-		{
-			response.Acknowledged.Should().BeTrue();
-		}
+		protected override string UrlPath => "/_xpack/watcher/_stop";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.StopWatcher(f),
+			(client, f) => client.StopWatcherAsync(f),
+			(client, r) => client.StopWatcher(r),
+			(client, r) => client.StopWatcherAsync(r)
+		);
+
+		protected override void ExpectResponse(IStopWatcherResponse response) => response.Acknowledged.Should().BeTrue();
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/StopWatcher/StopWatcherUrlTests.cs b/src/Tests/Tests/XPack/Watcher/StopWatcher/StopWatcherUrlTests.cs
index 493933f666c..ba0fc9dd249 100644
--- a/src/Tests/Tests/XPack/Watcher/StopWatcher/StopWatcherUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/StopWatcher/StopWatcherUrlTests.cs
@@ -8,14 +8,10 @@ namespace Tests.XPack.Watcher.StopWatcher
 {
 	public class StopWatcherUrlTests : UrlTestsBase
 	{
-		[U] public override async Task Urls()
-		{
-			await POST("/_xpack/watcher/_stop")
-				.Fluent(c => c.StopWatcher())
-				.Request(c => c.StopWatcher(new StopWatcherRequest()))
-				.FluentAsync(c => c.StopWatcherAsync())
-				.RequestAsync(c => c.StopWatcherAsync(new StopWatcherRequest()))
-				;
-		}
+		[U] public override async Task Urls() => await POST("/_xpack/watcher/_stop")
+			.Fluent(c => c.StopWatcher())
+			.Request(c => c.StopWatcher(new StopWatcherRequest()))
+			.FluentAsync(c => c.StopWatcherAsync())
+			.RequestAsync(c => c.StopWatcherAsync(new StopWatcherRequest()));
 	}
 }
diff --git a/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsApiTests.cs b/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsApiTests.cs
index 109ce31f2f7..0235bf97244 100644
--- a/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsApiTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsApiTests.cs
@@ -6,14 +6,28 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.XPack.Watcher.WatcherStats
 {
-	public class WatcherStatsApiTests : ApiIntegrationTestBase<XPackCluster, IWatcherStatsResponse, IWatcherStatsRequest, WatcherStatsDescriptor, WatcherStatsRequest>
+	public class WatcherStatsApiTests
+		: ApiIntegrationTestBase<XPackCluster, IWatcherStatsResponse, IWatcherStatsRequest, WatcherStatsDescriptor, WatcherStatsRequest>
 	{
 		public WatcherStatsApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool ExpectIsValid => true;
+
+		protected override object ExpectJson => null;
+		protected override int ExpectStatusCode => 200;
+
+		protected override Func<WatcherStatsDescriptor, IWatcherStatsRequest> Fluent => f => f
+			.WatcherStatsMetric(WatcherStatsMetric.All);
+
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+
+		protected override WatcherStatsRequest Initializer => new WatcherStatsRequest(WatcherStatsMetric.All);
+
+		protected override string UrlPath => "/_xpack/watcher/stats/_all";
+
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
 			foreach (var callUniqueValue in values)
@@ -63,25 +77,12 @@ protected override void OnBeforeCall(IElasticClient client)
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
-			fluent: (client, f) => client.WatcherStats(f),
-			fluentAsync: (client, f) => client.WatcherStatsAsync(f),
-			request: (client, r) => client.WatcherStats(r),
-			requestAsync: (client, r) => client.WatcherStatsAsync(r)
+			(client, f) => client.WatcherStats(f),
+			(client, f) => client.WatcherStatsAsync(f),
+			(client, r) => client.WatcherStats(r),
+			(client, r) => client.WatcherStatsAsync(r)
 		);
 
-		protected override bool ExpectIsValid => true;
-		protected override int ExpectStatusCode => 200;
-		protected override HttpMethod HttpMethod => HttpMethod.GET;
-
-		protected override string UrlPath => "/_xpack/watcher/stats/_all";
-
-		protected override object ExpectJson => null;
-
-		protected override Func<WatcherStatsDescriptor, IWatcherStatsRequest> Fluent => f => f
-			.WatcherStatsMetric(WatcherStatsMetric.All);
-
-		protected override WatcherStatsRequest Initializer => new WatcherStatsRequest(WatcherStatsMetric.All);
-
 		protected override void ExpectResponse(IWatcherStatsResponse response)
 		{
 			response.ClusterName.Should().NotBeNullOrWhiteSpace();
diff --git a/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsUrlTests.cs b/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsUrlTests.cs
index cb732d414ed..161a0edf6ac 100644
--- a/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsUrlTests.cs
+++ b/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsUrlTests.cs
@@ -12,17 +12,17 @@ public class WatcherStatsUrlTests : UrlTestsBase
 		[U] public override async Task Urls()
 		{
 			await GET("/_xpack/watcher/stats")
-				.Fluent(c => c.WatcherStats())
-				.Request(c => c.WatcherStats(new WatcherStatsRequest()))
-				.FluentAsync(c => c.WatcherStatsAsync())
-				.RequestAsync(c => c.WatcherStatsAsync(new WatcherStatsRequest()))
+					.Fluent(c => c.WatcherStats())
+					.Request(c => c.WatcherStats(new WatcherStatsRequest()))
+					.FluentAsync(c => c.WatcherStatsAsync())
+					.RequestAsync(c => c.WatcherStatsAsync(new WatcherStatsRequest()))
 				;
 
 			await GET("/_xpack/watcher/stats/_all")
-				.Fluent(c => c.WatcherStats(r => r.WatcherStatsMetric(WatcherStatsMetric.All)))
-				.Request(c => c.WatcherStats(new WatcherStatsRequest(WatcherStatsMetric.All)))
-				.FluentAsync(c => c.WatcherStatsAsync(r => r.WatcherStatsMetric(WatcherStatsMetric.All)))
-				.RequestAsync(c => c.WatcherStatsAsync(new WatcherStatsRequest(WatcherStatsMetric.All)))
+					.Fluent(c => c.WatcherStats(r => r.WatcherStatsMetric(WatcherStatsMetric.All)))
+					.Request(c => c.WatcherStats(new WatcherStatsRequest(WatcherStatsMetric.All)))
+					.FluentAsync(c => c.WatcherStatsAsync(r => r.WatcherStatsMetric(WatcherStatsMetric.All)))
+					.RequestAsync(c => c.WatcherStatsAsync(new WatcherStatsRequest(WatcherStatsMetric.All)))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/XunitBootstrap.cs b/src/Tests/Tests/XunitBootstrap.cs
index 8a7b2d92c89..adbb931d6dd 100644
--- a/src/Tests/Tests/XunitBootstrap.cs
+++ b/src/Tests/Tests/XunitBootstrap.cs
@@ -1,6 +1,6 @@
 using Elastic.Xunit;
 using Tests.Core.Xunit;
-using Tests.Framework.ManagedElasticsearch;
+using Xunit;
 
-[assembly: Xunit.TestFrameworkAttribute("Elastic.Xunit.Sdk.ElasticTestFramework", "Elastic.Xunit")]
+[assembly: TestFramework("Elastic.Xunit.Sdk.ElasticTestFramework", "Elastic.Xunit")]
 [assembly: ElasticXunitConfiguration(typeof(NestXunitRunOptions))]