diff --git a/src/Tes/Models/TesResources.cs b/src/Tes/Models/TesResources.cs
index c617bf6b..b6db6929 100644
--- a/src/Tes/Models/TesResources.cs
+++ b/src/Tes/Models/TesResources.cs
@@ -89,26 +89,14 @@ public override string ToString()
                 .Append("  RamGb: ").Append(RamGb).Append('\n')
                 .Append("  DiskGb: ").Append(DiskGb).Append('\n')
                 .Append("  Zones: ")
-                .IfThenElse(
-                    Zones?.Count > 0,
-                    s => s.Append(string.Join(",", Zones)),
-                    s => s)
+                .Append(
+                    Zones?.Count > 0 ?
+                    string.Join(",", Zones) : null)
                 .Append('\n')
                 .Append("  BackendParameters: ")
-                .IfThenElse(
-                    BackendParameters?.Keys.Count > 0,
-                    s =>
-                    {
-                        var keyValues = new List<string>();
-
-                        foreach (var key in BackendParameters.Keys)
-                        {
-                            keyValues.Add($"({key},{BackendParameters[key]})");
-                        }
-
-                        return s.Append(string.Join(",", keyValues));
-                    },
-                    s => s)
+                .Append(
+                    BackendParameters?.Keys.Count > 0 ?
+                    string.Join(",", BackendParameters.Select(kv => $"({kv.Key},{kv.Value})")) : null)
                 .Append('\n')
                 .Append("  BackendParametersStrict: ").Append(BackendParametersStrict).Append('\n')
                 .Append("}\n")
@@ -241,10 +229,4 @@ public override int GetHashCode()
 #pragma warning restore 1591
         #endregion Operators
     }
-
-    internal static class StringBuilderSelectorExtensions
-    {
-        public static StringBuilder IfThenElse(this StringBuilder builder, bool @if, Func<StringBuilder, StringBuilder> then, Func<StringBuilder, StringBuilder> @else)
-            => @if ? then(builder) : @else(builder);
-    }
 }
diff --git a/src/Tes/Models/TesServiceInfo.cs b/src/Tes/Models/TesServiceInfo.cs
index f9872ccf..bd9acb9d 100644
--- a/src/Tes/Models/TesServiceInfo.cs
+++ b/src/Tes/Models/TesServiceInfo.cs
@@ -63,16 +63,14 @@ public override string ToString()
                 .Append("  Name: ").Append(Name).Append('\n')
                 .Append("  Doc: ").Append(Doc).Append('\n')
                 .Append("  Storage: ")
-                .IfThenElse(
-                    Storage?.Count > 0,
-                    s => s.Append(string.Join(",", Storage)),
-                    s => s)
+                .Append(
+                    Storage?.Count > 0 ?
+                    string.Join(",", Storage) : null)
                 .Append('\n')
                 .Append("  TesResourcesSupportedBackendParameters: ")
-                .IfThenElse(
-                    TesResourcesSupportedBackendParameters?.Count > 0,
-                    s => s.Append(string.Join(",", Enum.GetNames(typeof(TesResources.SupportedBackendParameters)))),
-                    s => s)
+                .Append(
+                    TesResourcesSupportedBackendParameters?.Count > 0 ?
+                    string.Join(",", Enum.GetNames(typeof(TesResources.SupportedBackendParameters))) : null)
                 .Append('\n')
                 .Append("}\n")
                 .ToString();