diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs
index 9f7aeda005..b413bf2120 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs
@@ -3,7 +3,6 @@
 
 using System.CommandLine.Hosting;
 using System.CommandLine.NamingConventionBinder;
-using System.CommandLine.Parsing;
 using ApprovalTests;
 using ApprovalTests.Reporters;
 using Xunit;
diff --git a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Directives_Suggest.cs b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Directives_Suggest.cs
index f7cb9c8e45..0b0477754d 100644
--- a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Directives_Suggest.cs
+++ b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Directives_Suggest.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Benchmarks.Helpers;
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
diff --git a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_NestedCommands.cs b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_NestedCommands.cs
index eb4adb8806..5f495c264d 100644
--- a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_NestedCommands.cs
+++ b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_NestedCommands.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.Linq;
 using BenchmarkDotNet.Attributes;
 
 namespace System.CommandLine.Benchmarks.CommandLine
@@ -40,7 +39,7 @@ private void GenerateTestNestedCommands(Command parent, int depth, int countPerL
             for (int i = 0; i < countPerLevel; i++)
             {
                 string cmdName = $"{parent.Name}_{depth}.{i}";
-                Command cmd = new Command(cmdName);
+                Command cmd = new(cmdName);
                 parent.AddCommand(cmd);
                 GenerateTestNestedCommands(cmd, depth - 1, countPerLevel);
             }
@@ -73,7 +72,7 @@ public void SetupParser()
         }
 
         [Benchmark]
-        public Parser ParserFromNestedCommands_Ctor() => new Parser(_rootCommand);
+        public Parser ParserFromNestedCommands_Ctor() => new(_rootCommand);
 
         [Benchmark]
         public ParseResult Parser_Parse() => _testParser.Parse(_testSymbolsAsString);
diff --git a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs
index 8fd8d8fdbc..38a51da411 100644
--- a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs
+++ b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs
@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Attributes;
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 
@@ -25,10 +24,10 @@ public class Perf_Parser_Simple
 
         private static RootCommand BuildCommand()
         {
-            Option<bool> boolOption = new Option<bool>(new[] { "--bool", "-b" }, "Bool option");
-            Option<string> stringOption = new Option<string>(new[] { "--string", "-s" }, "String option");
+            Option<bool> boolOption = new(new[] { "--bool", "-b" }, "Bool option");
+            Option<string> stringOption = new(new[] { "--string", "-s" }, "String option");
 
-            RootCommand command = new RootCommand
+            RootCommand command = new()
             {
                 boolOption,
                 stringOption
diff --git a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Suggestions.cs b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Suggestions.cs
index 191260da57..2ea50046c7 100644
--- a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Suggestions.cs
+++ b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Suggestions.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Parsing;
 using System.Linq;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Engines;
diff --git a/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_EntryPoint.cs b/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_EntryPoint.cs
index 9a0df89250..df53f13f54 100644
--- a/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_EntryPoint.cs
+++ b/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_EntryPoint.cs
@@ -20,7 +20,7 @@ namespace System.CommandLine.Benchmarks.DragonFruit
     [InvocationCount(3000)]
     public class Perf_CommandLine_EntryPoint
     {
-        private readonly NullConsole _nullConsole = new NullConsole();
+        private readonly NullConsole _nullConsole = new();
         private Assembly _testAssembly;
         private string _testAssemblyFilePath;
         private string _testAssemblyXmlDocsFilePath;
diff --git a/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs b/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs
index 6a516aebd7..0bf9d23e9e 100644
--- a/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs
+++ b/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs
@@ -17,7 +17,7 @@ namespace System.CommandLine.Benchmarks.DragonFruit
     [InvocationCount(3000)]
     public class Perf_CommandLine_Help
     {
-        private readonly NullConsole _nullConsole = new NullConsole();
+        private readonly NullConsole _nullConsole = new();
         private Assembly _testAssembly;
         private string _testAssemblyFilePath;
         private string _testAssemblyXmlDocsFilePath;
diff --git a/src/System.CommandLine.Benchmarks/Helpers/NullConsole.cs b/src/System.CommandLine.Benchmarks/Helpers/NullConsole.cs
index efae246c9d..40905974d7 100644
--- a/src/System.CommandLine.Benchmarks/Helpers/NullConsole.cs
+++ b/src/System.CommandLine.Benchmarks/Helpers/NullConsole.cs
@@ -7,7 +7,7 @@ namespace System.CommandLine.Benchmarks.Helpers
 {
     class NullConsole : IConsole
     {
-        readonly NullStreamWriter _nullWriter = new NullStreamWriter();
+        readonly NullStreamWriter _nullWriter = new();
 
         public IStandardStreamWriter Out => _nullWriter;
         public IStandardStreamWriter Error => _nullWriter;
diff --git a/src/System.CommandLine.Benchmarks/Program.cs b/src/System.CommandLine.Benchmarks/Program.cs
index 8a5f376bcd..9b0a5a61f8 100644
--- a/src/System.CommandLine.Benchmarks/Program.cs
+++ b/src/System.CommandLine.Benchmarks/Program.cs
@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Immutable;
-using System.IO;
 using BenchmarkDotNet.Running;
 using System.Linq;
 using BenchmarkDotNet.Configs;
+using System.Collections.Immutable;
+using System.IO;
 
 namespace System.CommandLine.Benchmarks
 {
diff --git a/src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs b/src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs
index 369dba0a70..7bc9dac397 100644
--- a/src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs
+++ b/src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Rendering;
-using System.ComponentModel;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
diff --git a/src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs b/src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs
index 2fb4e28bf5..fd9544b876 100644
--- a/src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs
+++ b/src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs
@@ -20,7 +20,7 @@ namespace System.CommandLine.DragonFruit.Tests
     public class ConfigureFromMethodTests
     {
         private object[] _receivedValues;
-        private readonly TestConsole _testConsole = new TestConsole();
+        private readonly TestConsole _testConsole = new();
 
         [Fact]
         public async Task Generated_boolean_parameters_will_accept_zero_arguments()
diff --git a/src/System.CommandLine.DragonFruit.Tests/XmlDocReaderTests.cs b/src/System.CommandLine.DragonFruit.Tests/XmlDocReaderTests.cs
index 54369d864e..17a4680380 100644
--- a/src/System.CommandLine.DragonFruit.Tests/XmlDocReaderTests.cs
+++ b/src/System.CommandLine.DragonFruit.Tests/XmlDocReaderTests.cs
@@ -3,7 +3,6 @@
 
 using System.IO;
 using FluentAssertions;
-using System.Linq;
 using Xunit;
 
 namespace System.CommandLine.DragonFruit.Tests
diff --git a/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs b/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
index bd23d102f2..187e605e79 100644
--- a/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
+++ b/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
@@ -5,7 +5,6 @@
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
-using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
diff --git a/src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs b/src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs
index cef84ca985..a087097f3c 100644
--- a/src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs
+++ b/src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs
@@ -1,16 +1,10 @@
 using System.CommandLine;
-using System.CommandLine.Binding;
 using System.CommandLine.Invocation;
-using System.CommandLine.IO;
 using System.CommandLine.Parsing;
-using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
-
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 using Xunit;
 
 
diff --git a/src/System.CommandLine.Hosting/DirectiveConfigurationExtensions.cs b/src/System.CommandLine.Hosting/DirectiveConfigurationExtensions.cs
index 1cddf42041..638bd6939e 100644
--- a/src/System.CommandLine.Hosting/DirectiveConfigurationExtensions.cs
+++ b/src/System.CommandLine.Hosting/DirectiveConfigurationExtensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.CommandLine.Parsing;
 using System.Linq;
 
 using Microsoft.Extensions.Configuration;
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/HandlerDescriptorTests.cs b/src/System.CommandLine.NamingConventionBinder.Tests/HandlerDescriptorTests.cs
index 700a3ae53d..b004d16203 100644
--- a/src/System.CommandLine.NamingConventionBinder.Tests/HandlerDescriptorTests.cs
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/HandlerDescriptorTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Tests.Utility;
 using System.IO;
 using System.Linq;
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/ModelDescriptorTests.cs b/src/System.CommandLine.NamingConventionBinder.Tests/ModelDescriptorTests.cs
index 9e2a8bfa83..4b99776e6c 100644
--- a/src/System.CommandLine.NamingConventionBinder.Tests/ModelDescriptorTests.cs
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/ModelDescriptorTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Tests.Binding;
 using System.CommandLine.Tests.Utility;
 using System.Linq;
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/ParameterDescriptorTests.cs b/src/System.CommandLine.NamingConventionBinder.Tests/ParameterDescriptorTests.cs
index df40f2c431..ae58673528 100644
--- a/src/System.CommandLine.NamingConventionBinder.Tests/ParameterDescriptorTests.cs
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/ParameterDescriptorTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Tests.Binding;
 using System.Linq;
 using FluentAssertions;
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/PropertyDescriptorTests.cs b/src/System.CommandLine.NamingConventionBinder.Tests/PropertyDescriptorTests.cs
index 5f4152c3e3..7bbf04295a 100644
--- a/src/System.CommandLine.NamingConventionBinder.Tests/PropertyDescriptorTests.cs
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/PropertyDescriptorTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Tests.Binding;
 using System.Linq;
 using FluentAssertions;
diff --git a/src/System.CommandLine.NamingConventionBinder/ConstructorDescriptor.cs b/src/System.CommandLine.NamingConventionBinder/ConstructorDescriptor.cs
index 19e970e98f..859c60a9b1 100644
--- a/src/System.CommandLine.NamingConventionBinder/ConstructorDescriptor.cs
+++ b/src/System.CommandLine.NamingConventionBinder/ConstructorDescriptor.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 using System.Linq;
 using System.Reflection;
 
diff --git a/src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs b/src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs
index cbb6eaac4a..03ce3d96e6 100644
--- a/src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs
+++ b/src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 using System.Linq;
 
 namespace System.CommandLine.NamingConventionBinder;
diff --git a/src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs b/src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs
index 5b8b13e43f..5cb37c1adb 100644
--- a/src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs
+++ b/src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 using System.Reflection;
 
 namespace System.CommandLine.NamingConventionBinder;
diff --git a/src/System.CommandLine.NamingConventionBinder/IMethodDescriptor.cs b/src/System.CommandLine.NamingConventionBinder/IMethodDescriptor.cs
index adc0e17377..248429f05a 100644
--- a/src/System.CommandLine.NamingConventionBinder/IMethodDescriptor.cs
+++ b/src/System.CommandLine.NamingConventionBinder/IMethodDescriptor.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 
 namespace System.CommandLine.NamingConventionBinder;
 
diff --git a/src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs b/src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs
index 466c9adb93..c94b951149 100644
--- a/src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs
+++ b/src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 using System.Linq;
 using System.Reflection;
 
diff --git a/src/System.CommandLine.Rendering.Tests/ConsoleRendererTests.cs b/src/System.CommandLine.Rendering.Tests/ConsoleRendererTests.cs
index 81585884df..5918b50a8a 100644
--- a/src/System.CommandLine.Rendering.Tests/ConsoleRendererTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/ConsoleRendererTests.cs
@@ -17,7 +17,7 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class ConsoleRendererTests
     {
-        private readonly TestTerminal _terminal = new TestTerminal();
+        private readonly TestTerminal _terminal = new();
 
         private readonly ITestOutputHelper _output;
 
diff --git a/src/System.CommandLine.Rendering.Tests/ContainerSpanTests.cs b/src/System.CommandLine.Rendering.Tests/ContainerSpanTests.cs
index 0adbb3171a..ce56eea9a9 100644
--- a/src/System.CommandLine.Rendering.Tests/ContainerSpanTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/ContainerSpanTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Rendering.Tests/RenderingTestCase.cs b/src/System.CommandLine.Rendering.Tests/RenderingTestCase.cs
index e4684d41ab..dc9d79b0e5 100644
--- a/src/System.CommandLine.Rendering.Tests/RenderingTestCase.cs
+++ b/src/System.CommandLine.Rendering.Tests/RenderingTestCase.cs
@@ -5,7 +5,7 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class RenderingTestCase
     {
-        private static readonly TextSpanFormatter _formatter = new TextSpanFormatter();
+        private static readonly TextSpanFormatter _formatter = new();
 
         public RenderingTestCase(
             string name,
diff --git a/src/System.CommandLine.Rendering.Tests/TableRenderingTests.cs b/src/System.CommandLine.Rendering.Tests/TableRenderingTests.cs
index 91febb9353..69dd68eb03 100644
--- a/src/System.CommandLine.Rendering.Tests/TableRenderingTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/TableRenderingTests.cs
@@ -118,7 +118,7 @@ public void Column_widths_are_aligned_to_the_longest_cell_in_file_mode()
                     .Be(lines[2].IndexOf("an option"));
         }
 
-        private TextRendered Cell(string text, int left, int top) => new TextRendered(text, new Point(left, top));
+        private TextRendered Cell(string text, int left, int top) => new(text, new Point(left, top));
     }
 
     public class OptionsHelpView : TableView<Option>
diff --git a/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs b/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs
index 0a8b9a45ed..bf6caf42cb 100644
--- a/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
diff --git a/src/System.CommandLine.Rendering.Tests/TestTerminalTests.cs b/src/System.CommandLine.Rendering.Tests/TestTerminalTests.cs
index 9e6e11ae9a..b43d9db1a6 100644
--- a/src/System.CommandLine.Rendering.Tests/TestTerminalTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/TestTerminalTests.cs
@@ -11,7 +11,7 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class TestTerminalTests : TerminalTests
     {
-        protected TestTerminal _terminal = new TestTerminal();
+        protected TestTerminal _terminal = new();
 
         protected override ITerminal GetTerminal() => _terminal;
 
diff --git a/src/System.CommandLine.Rendering.Tests/TextStyleRenderingTests.cs b/src/System.CommandLine.Rendering.Tests/TextStyleRenderingTests.cs
index 36c0c5497d..bc336c5c95 100644
--- a/src/System.CommandLine.Rendering.Tests/TextStyleRenderingTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/TextStyleRenderingTests.cs
@@ -11,8 +11,8 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class TextStyleRenderingTests
     {
-        private readonly TextSpanFormatter _textSpanFormatter = new TextSpanFormatter();
-        private readonly TestTerminal _terminal = new TestTerminal();
+        private readonly TextSpanFormatter _textSpanFormatter = new();
+        private readonly TestTerminal _terminal = new();
 
         [Fact]
         public void BackgroundColorSpans_are_replaced_with_ANSI_codes_during_ANSI_rendering()
diff --git a/src/System.CommandLine.Rendering.Tests/Views/ScreenViewTests.cs b/src/System.CommandLine.Rendering.Tests/Views/ScreenViewTests.cs
index 13c0a36d3c..dd2f35df03 100644
--- a/src/System.CommandLine.Rendering.Tests/Views/ScreenViewTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/Views/ScreenViewTests.cs
@@ -161,7 +161,7 @@ void BeforeRenderAction()
 
         private class TestSynchronizationContext : SynchronizationContext
         {
-            private readonly List<Action> _postActions = new List<Action>();
+            private readonly List<Action> _postActions = new();
             public void InvokePostCallbacks()
             {
                 while (_postActions.FirstOrDefault() is Action postAction)
diff --git a/src/System.CommandLine.Rendering.Tests/WordWrappingTests.cs b/src/System.CommandLine.Rendering.Tests/WordWrappingTests.cs
index e981accc6e..1671a6def5 100644
--- a/src/System.CommandLine.Rendering.Tests/WordWrappingTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/WordWrappingTests.cs
@@ -11,7 +11,7 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class WordWrappingTests
     {
-        private readonly TestTerminal _terminal = new TestTerminal();
+        private readonly TestTerminal _terminal = new();
 
         [Theory]
         [MemberData(nameof(TestCases))]
@@ -185,6 +185,6 @@ IEnumerable<RenderingTestCase> TestCases()
         }
 
         private static TextRendered Line(int left, int top, string text) =>
-            new TextRendered(text, new Point(left, top));
+            new(text, new Point(left, top));
     }
 }
diff --git a/src/System.CommandLine.Rendering/AnsiRenderingSpanVisitor.cs b/src/System.CommandLine.Rendering/AnsiRenderingSpanVisitor.cs
index 9cb969e8cc..f8d9e5ca50 100644
--- a/src/System.CommandLine.Rendering/AnsiRenderingSpanVisitor.cs
+++ b/src/System.CommandLine.Rendering/AnsiRenderingSpanVisitor.cs
@@ -82,7 +82,7 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
         }
 
         private static readonly Dictionary<string, AnsiControlCode> _foregroundColorControlCodeMappings =
-            new Dictionary<string, AnsiControlCode>
+            new()
             {
                 [nameof(ForegroundColorSpan.Reset)] = Color.Foreground.Default,
                 [nameof(ForegroundColorSpan.Black)] = Color.Foreground.Black,
@@ -104,7 +104,7 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
             };
 
         private static readonly Dictionary<string, AnsiControlCode> _backgroundColorControlCodeMappings =
-            new Dictionary<string, AnsiControlCode>
+            new()
             {
                 [nameof(BackgroundColorSpan.Reset)] = Color.Background.Default,
                 [nameof(BackgroundColorSpan.Black)] = Color.Background.Black,
@@ -126,7 +126,7 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
             };
 
         private static readonly Dictionary<string, AnsiControlCode> _styleControlCodeMappings =
-            new Dictionary<string, AnsiControlCode>
+            new()
             {
                 [nameof(StyleSpan.AttributesOff)] = Ansi.Text.AttributesOff,
                 [nameof(StyleSpan.BlinkOff)] = Ansi.Text.BlinkOff,
diff --git a/src/System.CommandLine.Rendering/BackgroundColorSpan.cs b/src/System.CommandLine.Rendering/BackgroundColorSpan.cs
index 4e1ac46568..fc7c39fe2e 100644
--- a/src/System.CommandLine.Rendering/BackgroundColorSpan.cs
+++ b/src/System.CommandLine.Rendering/BackgroundColorSpan.cs
@@ -24,40 +24,40 @@ public BackgroundColorSpan(byte r, byte g, byte b)
         {
         }
 
-        public static BackgroundColorSpan Reset() => new BackgroundColorSpan(nameof(Reset), Ansi.Color.Background.Default);
+        public static BackgroundColorSpan Reset() => new(nameof(Reset), Ansi.Color.Background.Default);
 
-        public static BackgroundColorSpan Black() => new BackgroundColorSpan(nameof(Black), Ansi.Color.Background.Black);
+        public static BackgroundColorSpan Black() => new(nameof(Black), Ansi.Color.Background.Black);
 
-        public static BackgroundColorSpan Red() => new BackgroundColorSpan(nameof(Red), Ansi.Color.Background.Red);
+        public static BackgroundColorSpan Red() => new(nameof(Red), Ansi.Color.Background.Red);
 
-        public static BackgroundColorSpan Green() => new BackgroundColorSpan(nameof(Green), Ansi.Color.Background.Green);
+        public static BackgroundColorSpan Green() => new(nameof(Green), Ansi.Color.Background.Green);
 
-        public static BackgroundColorSpan Yellow() => new BackgroundColorSpan(nameof(Yellow), Ansi.Color.Background.Yellow);
+        public static BackgroundColorSpan Yellow() => new(nameof(Yellow), Ansi.Color.Background.Yellow);
 
-        public static BackgroundColorSpan Blue() => new BackgroundColorSpan(nameof(Blue), Ansi.Color.Background.Blue);
+        public static BackgroundColorSpan Blue() => new(nameof(Blue), Ansi.Color.Background.Blue);
 
-        public static BackgroundColorSpan Magenta() => new BackgroundColorSpan(nameof(Magenta), Ansi.Color.Background.Magenta);
+        public static BackgroundColorSpan Magenta() => new(nameof(Magenta), Ansi.Color.Background.Magenta);
 
-        public static BackgroundColorSpan Cyan() => new BackgroundColorSpan(nameof(Cyan), Ansi.Color.Background.Cyan);
+        public static BackgroundColorSpan Cyan() => new(nameof(Cyan), Ansi.Color.Background.Cyan);
 
-        public static BackgroundColorSpan White() => new BackgroundColorSpan(nameof(White), Ansi.Color.Background.White);
+        public static BackgroundColorSpan White() => new(nameof(White), Ansi.Color.Background.White);
 
-        public static BackgroundColorSpan DarkGray() => new BackgroundColorSpan(nameof(DarkGray), Ansi.Color.Background.DarkGray);
+        public static BackgroundColorSpan DarkGray() => new(nameof(DarkGray), Ansi.Color.Background.DarkGray);
 
-        public static BackgroundColorSpan LightRed() => new BackgroundColorSpan(nameof(LightRed), Ansi.Color.Background.LightRed);
+        public static BackgroundColorSpan LightRed() => new(nameof(LightRed), Ansi.Color.Background.LightRed);
 
-        public static BackgroundColorSpan LightGreen() => new BackgroundColorSpan(nameof(LightGreen), Ansi.Color.Background.LightGreen);
+        public static BackgroundColorSpan LightGreen() => new(nameof(LightGreen), Ansi.Color.Background.LightGreen);
 
-        public static BackgroundColorSpan LightYellow() => new BackgroundColorSpan(nameof(LightYellow), Ansi.Color.Background.LightYellow);
+        public static BackgroundColorSpan LightYellow() => new(nameof(LightYellow), Ansi.Color.Background.LightYellow);
 
-        public static BackgroundColorSpan LightBlue() => new BackgroundColorSpan(nameof(LightBlue), Ansi.Color.Background.LightBlue);
+        public static BackgroundColorSpan LightBlue() => new(nameof(LightBlue), Ansi.Color.Background.LightBlue);
 
-        public static BackgroundColorSpan LightMagenta() => new BackgroundColorSpan(nameof(LightMagenta), Ansi.Color.Background.LightMagenta);
+        public static BackgroundColorSpan LightMagenta() => new(nameof(LightMagenta), Ansi.Color.Background.LightMagenta);
 
-        public static BackgroundColorSpan LightCyan() => new BackgroundColorSpan(nameof(LightCyan), Ansi.Color.Background.LightCyan);
+        public static BackgroundColorSpan LightCyan() => new(nameof(LightCyan), Ansi.Color.Background.LightCyan);
 
-        public static BackgroundColorSpan LightGray() => new BackgroundColorSpan(nameof(LightGray), Ansi.Color.Background.LightGray);
+        public static BackgroundColorSpan LightGray() => new(nameof(LightGray), Ansi.Color.Background.LightGray);
 
-        public static BackgroundColorSpan Rgb(byte r, byte g, byte b) => new BackgroundColorSpan(r, g, b);
+        public static BackgroundColorSpan Rgb(byte r, byte g, byte b) => new(r, g, b);
     }
 }
diff --git a/src/System.CommandLine.Rendering/ContentRenderingSpanVisitor.cs b/src/System.CommandLine.Rendering/ContentRenderingSpanVisitor.cs
index f723ff27dd..1c4b4ca55d 100644
--- a/src/System.CommandLine.Rendering/ContentRenderingSpanVisitor.cs
+++ b/src/System.CommandLine.Rendering/ContentRenderingSpanVisitor.cs
@@ -8,7 +8,7 @@ namespace System.CommandLine.Rendering
 {
     internal abstract class ContentRenderingSpanVisitor : TextSpanVisitor
     {
-        private readonly StringBuilder _buffer = new StringBuilder();
+        private readonly StringBuilder _buffer = new();
 
         private int _positionOnLine;
         private bool _lastSpanEndedWithWhitespace;
diff --git a/src/System.CommandLine.Rendering/CursorControlSpan.cs b/src/System.CommandLine.Rendering/CursorControlSpan.cs
index 878bd0d711..844391da83 100644
--- a/src/System.CommandLine.Rendering/CursorControlSpan.cs
+++ b/src/System.CommandLine.Rendering/CursorControlSpan.cs
@@ -15,8 +15,8 @@ public CursorControlSpan(string name, AnsiControlCode ansiControlCode) :
 
         public override int ContentLength => 0;
 
-        public static CursorControlSpan Hide() => new CursorControlSpan(nameof(Hide), Ansi.Cursor.Hide);
+        public static CursorControlSpan Hide() => new(nameof(Hide), Ansi.Cursor.Hide);
 
-        public static CursorControlSpan Show() => new CursorControlSpan(nameof(Show), Ansi.Cursor.Show);
+        public static CursorControlSpan Show() => new(nameof(Show), Ansi.Cursor.Show);
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine.Rendering/ForegroundColorSpan.cs b/src/System.CommandLine.Rendering/ForegroundColorSpan.cs
index 8beae45e2b..48b2798454 100644
--- a/src/System.CommandLine.Rendering/ForegroundColorSpan.cs
+++ b/src/System.CommandLine.Rendering/ForegroundColorSpan.cs
@@ -24,40 +24,40 @@ public ForegroundColorSpan(byte r, byte g, byte b)
         {
         }
 
-        public static ForegroundColorSpan Reset() => new ForegroundColorSpan(nameof(Reset), Ansi.Color.Foreground.Default);
+        public static ForegroundColorSpan Reset() => new(nameof(Reset), Ansi.Color.Foreground.Default);
 
-        public static ForegroundColorSpan Black() => new ForegroundColorSpan(nameof(Black), Ansi.Color.Foreground.Black);
+        public static ForegroundColorSpan Black() => new(nameof(Black), Ansi.Color.Foreground.Black);
 
-        public static ForegroundColorSpan Red() => new ForegroundColorSpan(nameof(Red), Ansi.Color.Foreground.Red);
+        public static ForegroundColorSpan Red() => new(nameof(Red), Ansi.Color.Foreground.Red);
 
-        public static ForegroundColorSpan Green() => new ForegroundColorSpan(nameof(Green), Ansi.Color.Foreground.Green);
+        public static ForegroundColorSpan Green() => new(nameof(Green), Ansi.Color.Foreground.Green);
 
-        public static ForegroundColorSpan Yellow() => new ForegroundColorSpan(nameof(Yellow), Ansi.Color.Foreground.Yellow);
+        public static ForegroundColorSpan Yellow() => new(nameof(Yellow), Ansi.Color.Foreground.Yellow);
 
-        public static ForegroundColorSpan Blue() => new ForegroundColorSpan(nameof(Blue), Ansi.Color.Foreground.Blue);
+        public static ForegroundColorSpan Blue() => new(nameof(Blue), Ansi.Color.Foreground.Blue);
 
-        public static ForegroundColorSpan Magenta() => new ForegroundColorSpan(nameof(Magenta), Ansi.Color.Foreground.Magenta);
+        public static ForegroundColorSpan Magenta() => new(nameof(Magenta), Ansi.Color.Foreground.Magenta);
 
-        public static ForegroundColorSpan Cyan() => new ForegroundColorSpan(nameof(Cyan), Ansi.Color.Foreground.Cyan);
+        public static ForegroundColorSpan Cyan() => new(nameof(Cyan), Ansi.Color.Foreground.Cyan);
 
-        public static ForegroundColorSpan White() => new ForegroundColorSpan(nameof(White), Ansi.Color.Foreground.White);
+        public static ForegroundColorSpan White() => new(nameof(White), Ansi.Color.Foreground.White);
 
-        public static ForegroundColorSpan DarkGray() => new ForegroundColorSpan(nameof(DarkGray), Ansi.Color.Foreground.DarkGray);
+        public static ForegroundColorSpan DarkGray() => new(nameof(DarkGray), Ansi.Color.Foreground.DarkGray);
 
-        public static ForegroundColorSpan LightRed() => new ForegroundColorSpan(nameof(LightRed), Ansi.Color.Foreground.LightRed);
+        public static ForegroundColorSpan LightRed() => new(nameof(LightRed), Ansi.Color.Foreground.LightRed);
 
-        public static ForegroundColorSpan LightGreen() => new ForegroundColorSpan(nameof(LightGreen), Ansi.Color.Foreground.LightGreen);
+        public static ForegroundColorSpan LightGreen() => new(nameof(LightGreen), Ansi.Color.Foreground.LightGreen);
 
-        public static ForegroundColorSpan LightYellow() => new ForegroundColorSpan(nameof(LightYellow), Ansi.Color.Foreground.LightYellow);
+        public static ForegroundColorSpan LightYellow() => new(nameof(LightYellow), Ansi.Color.Foreground.LightYellow);
 
-        public static ForegroundColorSpan LightBlue() => new ForegroundColorSpan(nameof(LightBlue), Ansi.Color.Foreground.LightBlue);
+        public static ForegroundColorSpan LightBlue() => new(nameof(LightBlue), Ansi.Color.Foreground.LightBlue);
 
-        public static ForegroundColorSpan LightMagenta() => new ForegroundColorSpan(nameof(LightMagenta), Ansi.Color.Foreground.LightMagenta);
+        public static ForegroundColorSpan LightMagenta() => new(nameof(LightMagenta), Ansi.Color.Foreground.LightMagenta);
 
-        public static ForegroundColorSpan LightCyan() => new ForegroundColorSpan(nameof(LightCyan), Ansi.Color.Foreground.LightCyan);
+        public static ForegroundColorSpan LightCyan() => new(nameof(LightCyan), Ansi.Color.Foreground.LightCyan);
 
-        public static ForegroundColorSpan LightGray() => new ForegroundColorSpan(nameof(LightGray), Ansi.Color.Foreground.LightGray);
+        public static ForegroundColorSpan LightGray() => new(nameof(LightGray), Ansi.Color.Foreground.LightGray);
 
-        public static ForegroundColorSpan Rgb(byte r, byte g, byte b) => new ForegroundColorSpan(r, g, b);
+        public static ForegroundColorSpan Rgb(byte r, byte g, byte b) => new(r, g, b);
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine.Rendering/NonAnsiRenderingSpanVisitor.cs b/src/System.CommandLine.Rendering/NonAnsiRenderingSpanVisitor.cs
index 213e7e4c2a..d25c8e6077 100644
--- a/src/System.CommandLine.Rendering/NonAnsiRenderingSpanVisitor.cs
+++ b/src/System.CommandLine.Rendering/NonAnsiRenderingSpanVisitor.cs
@@ -78,7 +78,7 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
         }
 
         private static readonly Dictionary<string, ConsoleColor> _backgroundColorMappings =
-            new Dictionary<string, ConsoleColor>
+            new()
             {
                 [nameof(BackgroundColorSpan.Black)] = ConsoleColor.Black,
                 [nameof(BackgroundColorSpan.Red)] = ConsoleColor.DarkRed,
@@ -99,7 +99,7 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
             };
 
         private static readonly Dictionary<string, ConsoleColor> _foregroundColorMappings =
-            new Dictionary<string, ConsoleColor>
+            new()
             {
                 [nameof(ForegroundColorSpan.Black)] = ConsoleColor.Black,
                 [nameof(ForegroundColorSpan.Red)] = ConsoleColor.DarkRed,
diff --git a/src/System.CommandLine.Rendering/RecordingWriter.cs b/src/System.CommandLine.Rendering/RecordingWriter.cs
index 3a7faf9301..8e22d50678 100644
--- a/src/System.CommandLine.Rendering/RecordingWriter.cs
+++ b/src/System.CommandLine.Rendering/RecordingWriter.cs
@@ -9,7 +9,7 @@ namespace System.CommandLine.Rendering
 {
     internal class RecordingWriter : TextWriter, IStandardStreamWriter
     {
-        private readonly StringBuilder _stringBuilder = new StringBuilder();
+        private readonly StringBuilder _stringBuilder = new();
 
         public event Action<char> CharWritten;
 
diff --git a/src/System.CommandLine.Rendering/StyleSpan.cs b/src/System.CommandLine.Rendering/StyleSpan.cs
index ffca9ce6c6..8668944802 100644
--- a/src/System.CommandLine.Rendering/StyleSpan.cs
+++ b/src/System.CommandLine.Rendering/StyleSpan.cs
@@ -9,17 +9,17 @@ public StyleSpan(string name, AnsiControlCode ansiControlCode) : base(name, ansi
         {
         }
 
-        public static StyleSpan AttributesOff() => new StyleSpan(nameof(AttributesOff), Ansi.Text.AttributesOff);
-        public static StyleSpan BlinkOff() => new StyleSpan(nameof(BlinkOff), Ansi.Text.BlinkOn);
-        public static StyleSpan BlinkOn() => new StyleSpan(nameof(BlinkOn), Ansi.Text.BlinkOff);
-        public static StyleSpan BoldOff() => new StyleSpan(nameof(BoldOff), Ansi.Text.BoldOff);
-        public static StyleSpan BoldOn() => new StyleSpan(nameof(BoldOn), Ansi.Text.BoldOn);
-        public static StyleSpan HiddenOn() => new StyleSpan(nameof(HiddenOn), Ansi.Text.HiddenOn);
-        public static StyleSpan ReverseOn() => new StyleSpan(nameof(ReverseOn), Ansi.Text.ReverseOn);
-        public static StyleSpan ReverseOff() => new StyleSpan(nameof(ReverseOff), Ansi.Text.ReverseOff);
-        public static StyleSpan StandoutOff() => new StyleSpan(nameof(StandoutOff), Ansi.Text.StandoutOff);
-        public static StyleSpan StandoutOn() => new StyleSpan(nameof(StandoutOn), Ansi.Text.StandoutOn);
-        public static StyleSpan UnderlinedOff() => new StyleSpan(nameof(UnderlinedOff), Ansi.Text.UnderlinedOff);
-        public static StyleSpan UnderlinedOn() => new StyleSpan(nameof(UnderlinedOn), Ansi.Text.UnderlinedOn);
+        public static StyleSpan AttributesOff() => new(nameof(AttributesOff), Ansi.Text.AttributesOff);
+        public static StyleSpan BlinkOff() => new(nameof(BlinkOff), Ansi.Text.BlinkOn);
+        public static StyleSpan BlinkOn() => new(nameof(BlinkOn), Ansi.Text.BlinkOff);
+        public static StyleSpan BoldOff() => new(nameof(BoldOff), Ansi.Text.BoldOff);
+        public static StyleSpan BoldOn() => new(nameof(BoldOn), Ansi.Text.BoldOn);
+        public static StyleSpan HiddenOn() => new(nameof(HiddenOn), Ansi.Text.HiddenOn);
+        public static StyleSpan ReverseOn() => new(nameof(ReverseOn), Ansi.Text.ReverseOn);
+        public static StyleSpan ReverseOff() => new(nameof(ReverseOff), Ansi.Text.ReverseOff);
+        public static StyleSpan StandoutOff() => new(nameof(StandoutOff), Ansi.Text.StandoutOff);
+        public static StyleSpan StandoutOn() => new(nameof(StandoutOn), Ansi.Text.StandoutOn);
+        public static StyleSpan UnderlinedOff() => new(nameof(UnderlinedOff), Ansi.Text.UnderlinedOff);
+        public static StyleSpan UnderlinedOn() => new(nameof(UnderlinedOn), Ansi.Text.UnderlinedOn);
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine.Rendering/TestTerminal.cs b/src/System.CommandLine.Rendering/TestTerminal.cs
index a6ef47ea88..fd85d0737d 100644
--- a/src/System.CommandLine.Rendering/TestTerminal.cs
+++ b/src/System.CommandLine.Rendering/TestTerminal.cs
@@ -14,13 +14,13 @@ public class TestTerminal : ITerminal, IRenderable
     {
         private int _cursorLeft;
         private int _cursorTop;
-        private readonly List<ConsoleEvent> _events = new List<ConsoleEvent>();
-        private readonly StringBuilder _outBuffer = new StringBuilder();
-        private readonly StringBuilder _ansiCodeBuffer = new StringBuilder();
+        private readonly List<ConsoleEvent> _events = new();
+        private readonly StringBuilder _outBuffer = new();
+        private readonly StringBuilder _ansiCodeBuffer = new();
         private ConsoleColor _backgroundColor = ConsoleColor.Black;
         private ConsoleColor _foregroundColor = ConsoleColor.White;
-        private readonly RecordingWriter _out = new RecordingWriter();
-        private readonly RecordingWriter _error = new RecordingWriter();
+        private readonly RecordingWriter _out = new();
+        private readonly RecordingWriter _error = new();
 
         public TestTerminal()
         {
@@ -79,7 +79,7 @@ public virtual void ResetColor()
         }
 
         public Region GetRegion() =>
-            new Region(0,
+            new(0,
                        0,
                        Width,
                        Height);
diff --git a/src/System.CommandLine.Rendering/TextSpanFormatter.cs b/src/System.CommandLine.Rendering/TextSpanFormatter.cs
index 2c5bf91808..63da07cbdb 100644
--- a/src/System.CommandLine.Rendering/TextSpanFormatter.cs
+++ b/src/System.CommandLine.Rendering/TextSpanFormatter.cs
@@ -13,7 +13,7 @@ public class TextSpanFormatter :
     {
         private static readonly Regex _formattableStringParser;
 
-        private readonly Dictionary<Type, Func<object, TextSpan>> _formatters = new Dictionary<Type, Func<object, TextSpan>>();
+        private readonly Dictionary<Type, Func<object, TextSpan>> _formatters = new();
 
         static TextSpanFormatter()
         {
diff --git a/src/System.CommandLine.Rendering/Views/ColumnDefinition.cs b/src/System.CommandLine.Rendering/Views/ColumnDefinition.cs
index d050f73113..a8a61ba8f6 100644
--- a/src/System.CommandLine.Rendering/Views/ColumnDefinition.cs
+++ b/src/System.CommandLine.Rendering/Views/ColumnDefinition.cs
@@ -33,6 +33,6 @@ public static ColumnDefinition Star(double weight)
             return new ColumnDefinition(SizeMode.Star, weight);
         }
         
-        public static ColumnDefinition SizeToContent() => new ColumnDefinition(SizeMode.SizeToContent, 0);
+        public static ColumnDefinition SizeToContent() => new(SizeMode.SizeToContent, 0);
     }
 }
diff --git a/src/System.CommandLine.Rendering/Views/ContentView.cs b/src/System.CommandLine.Rendering/Views/ContentView.cs
index dc7923a9f9..d301df08a1 100644
--- a/src/System.CommandLine.Rendering/Views/ContentView.cs
+++ b/src/System.CommandLine.Rendering/Views/ContentView.cs
@@ -76,22 +76,22 @@ internal static ContentView Create(object content, TextSpanFormatter formatter)
         }
 
         private static ContentView CreateView(string stringContent, TextSpanFormatter _)
-            => new ContentView(stringContent);
+            => new(stringContent);
 
         private static ContentView CreateView(TextSpan span, TextSpanFormatter _) 
-            => new ContentView(span);
+            => new(span);
 
         private static ContentView CreateView<T>(IObservable<T> observable, TextSpanFormatter _)
             => FromObservable(observable);
 
         private static ContentView CreateView(object value, TextSpanFormatter formatter)
-            => new ContentView(formatter.Format(value));
+            => new(formatter.Format(value));
 
         private class Observer<T> : IObserver<T>
         {
             private readonly ContentView _contentView;
             private readonly Func<T, FormattableString> _formatProvider;
-            private readonly TextSpanFormatter _textSpanFormatter = new TextSpanFormatter();
+            private readonly TextSpanFormatter _textSpanFormatter = new();
 
             public Observer(ContentView contentView, Func<T, FormattableString> formatProvider)
             {
diff --git a/src/System.CommandLine.Rendering/Views/GridView.cs b/src/System.CommandLine.Rendering/Views/GridView.cs
index 6fda47c480..0667ce09f1 100644
--- a/src/System.CommandLine.Rendering/Views/GridView.cs
+++ b/src/System.CommandLine.Rendering/Views/GridView.cs
@@ -8,8 +8,8 @@ namespace System.CommandLine.Rendering.Views
 {
     public class GridView : LayoutView<View>
     {
-        private readonly List<ColumnDefinition> _columns = new List<ColumnDefinition>();
-        private readonly List<RowDefinition> _rows = new List<RowDefinition>();
+        private readonly List<ColumnDefinition> _columns = new();
+        private readonly List<RowDefinition> _rows = new();
         private readonly int _columnPaddingRight = 2;
 
         private View[,] ChildLocations { get; set; }
diff --git a/src/System.CommandLine.Rendering/Views/LayoutView.cs b/src/System.CommandLine.Rendering/Views/LayoutView.cs
index afc323ba58..121dc3298d 100644
--- a/src/System.CommandLine.Rendering/Views/LayoutView.cs
+++ b/src/System.CommandLine.Rendering/Views/LayoutView.cs
@@ -3,7 +3,6 @@
 
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace System.CommandLine.Rendering.Views
 {
@@ -11,7 +10,7 @@ namespace System.CommandLine.Rendering.Views
     public abstract class LayoutView<T> : View, IEnumerable<T>
         where T : View
     {
-        private readonly List<T> _children = new List<T>();
+        private readonly List<T> _children = new();
         public IReadOnlyList<T> Children => _children.AsReadOnly();
 
         public virtual void Add(T child)
diff --git a/src/System.CommandLine.Rendering/Views/RowDefinition.cs b/src/System.CommandLine.Rendering/Views/RowDefinition.cs
index 4ed82dcc09..f3563f1e9d 100644
--- a/src/System.CommandLine.Rendering/Views/RowDefinition.cs
+++ b/src/System.CommandLine.Rendering/Views/RowDefinition.cs
@@ -31,6 +31,6 @@ public static RowDefinition Star(double weight)
             return new RowDefinition(SizeMode.Star, weight);
         }
         
-        public static RowDefinition SizeToContent() => new RowDefinition(SizeMode.SizeToContent, 0);
+        public static RowDefinition SizeToContent() => new(SizeMode.SizeToContent, 0);
     }
 }
diff --git a/src/System.CommandLine.Rendering/Views/TableView.cs b/src/System.CommandLine.Rendering/Views/TableView.cs
index c113f6eb79..70db0b7928 100644
--- a/src/System.CommandLine.Rendering/Views/TableView.cs
+++ b/src/System.CommandLine.Rendering/Views/TableView.cs
@@ -23,7 +23,7 @@ public override IReadOnlyList<TItem> Items
 
         private GridView Layout { get; } = new GridView();
 
-        private readonly List<ITableViewColumn<TItem>> _columns = new List<ITableViewColumn<TItem>>();
+        private readonly List<ITableViewColumn<TItem>> _columns = new();
         public IReadOnlyList<ITableViewColumn<TItem>> Columns => _columns;
 
         public TableView()
diff --git a/src/System.CommandLine.Suggest.Tests/TestSuggestionRegistration.cs b/src/System.CommandLine.Suggest.Tests/TestSuggestionRegistration.cs
index 70c74a2495..2d0760becc 100644
--- a/src/System.CommandLine.Suggest.Tests/TestSuggestionRegistration.cs
+++ b/src/System.CommandLine.Suggest.Tests/TestSuggestionRegistration.cs
@@ -9,7 +9,7 @@ namespace System.CommandLine.Suggest.Tests
 {
     internal class TestSuggestionRegistration : ISuggestionRegistration
     {
-        private readonly List<Registration> _suggestionRegistrations = new List<Registration>();
+        private readonly List<Registration> _suggestionRegistrations = new();
 
         public TestSuggestionRegistration(params Registration[] suggestionRegistrations)
         {
diff --git a/src/System.CommandLine.Suggest/DotnetProfileDirectory.cs b/src/System.CommandLine.Suggest/DotnetProfileDirectory.cs
index cfe348b5e3..98f7a2d396 100644
--- a/src/System.CommandLine.Suggest/DotnetProfileDirectory.cs
+++ b/src/System.CommandLine.Suggest/DotnetProfileDirectory.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 
diff --git a/src/System.CommandLine.Suggest/FileSuggestionRegistration.cs b/src/System.CommandLine.Suggest/FileSuggestionRegistration.cs
index b3c5f09cd3..1b832a26a9 100644
--- a/src/System.CommandLine.Suggest/FileSuggestionRegistration.cs
+++ b/src/System.CommandLine.Suggest/FileSuggestionRegistration.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using static System.Environment;
 
diff --git a/src/System.CommandLine.Suggest/StringExtensions.cs b/src/System.CommandLine.Suggest/StringExtensions.cs
index 3e5ae19cf5..24cc5a6727 100644
--- a/src/System.CommandLine.Suggest/StringExtensions.cs
+++ b/src/System.CommandLine.Suggest/StringExtensions.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Linq;
-
 namespace System.CommandLine.Suggest
 {
     internal static class StringExtensions
diff --git a/src/System.CommandLine.Tests/Binding/SetHandlerTests.cs b/src/System.CommandLine.Tests/Binding/SetHandlerTests.cs
index 04c0c35b3e..a8c3848641 100644
--- a/src/System.CommandLine.Tests/Binding/SetHandlerTests.cs
+++ b/src/System.CommandLine.Tests/Binding/SetHandlerTests.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.CommandLine.Binding;
 using System.CommandLine.IO;
-using System.CommandLine.Parsing;
 using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
diff --git a/src/System.CommandLine.Tests/CommandExtensionsTests.cs b/src/System.CommandLine.Tests/CommandExtensionsTests.cs
index a37710fb65..1c74c5df8b 100644
--- a/src/System.CommandLine.Tests/CommandExtensionsTests.cs
+++ b/src/System.CommandLine.Tests/CommandExtensionsTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
diff --git a/src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs b/src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs
index 66a261955d..3d0136037b 100644
--- a/src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs
+++ b/src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs
@@ -1,6 +1,4 @@
 using FluentAssertions;
-
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Linq;
 using System.Threading.Tasks;
@@ -11,7 +9,7 @@ namespace System.CommandLine.Tests
 {
     public class EnvironmentVariableDirectiveTests
     {
-        private static readonly Random randomizer = new Random(Seed: 456476756);
+        private static readonly Random randomizer = new(Seed: 456476756);
         private readonly string test_variable = $"TEST_ENVIRONMENT_VARIABLE{randomizer.Next()}";
 
         [Fact]
diff --git a/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs b/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
index bb16e59a6d..22f6c05798 100644
--- a/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
+++ b/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
 using System.Diagnostics;
diff --git a/src/System.CommandLine.Tests/Invocation/InvocationPipelineTests.cs b/src/System.CommandLine.Tests/Invocation/InvocationPipelineTests.cs
index d5615947fa..a707ca879b 100644
--- a/src/System.CommandLine.Tests/Invocation/InvocationPipelineTests.cs
+++ b/src/System.CommandLine.Tests/Invocation/InvocationPipelineTests.cs
@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Help;
-using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.Linq;
diff --git a/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs b/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs
index fd1a6227e4..34b466b86e 100644
--- a/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs
+++ b/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs
@@ -9,7 +9,7 @@ namespace System.CommandLine.Tests.Invocation
 {
     public class TypoCorrectionTests
     {
-        private readonly TestConsole _console = new TestConsole();
+        private readonly TestConsole _console = new();
 
         [Fact]
         public async Task When_option_is_mistyped_it_is_suggested()
diff --git a/src/System.CommandLine.Tests/SymbolTests.cs b/src/System.CommandLine.Tests/SymbolTests.cs
index 7b1e43ff20..71401618f9 100644
--- a/src/System.CommandLine.Tests/SymbolTests.cs
+++ b/src/System.CommandLine.Tests/SymbolTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Parsing;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/UseHelpTests.cs b/src/System.CommandLine.Tests/UseHelpTests.cs
index c285980df6..ad1e83c7f4 100644
--- a/src/System.CommandLine.Tests/UseHelpTests.cs
+++ b/src/System.CommandLine.Tests/UseHelpTests.cs
@@ -378,7 +378,7 @@ public void Layout_can_be_composed_dynamically_based_on_context()
         [Fact]
         public void Help_default_sections_can_be_wrapped()
         {
-            Command command = new Command("test")
+            Command command = new("test")
             {
                 new Option<string>("--option", "option description")
             };
diff --git a/src/System.CommandLine.Tests/Utility/RemoteExecution.cs b/src/System.CommandLine.Tests/Utility/RemoteExecution.cs
index 9f51da257a..e4a759df4c 100644
--- a/src/System.CommandLine.Tests/Utility/RemoteExecution.cs
+++ b/src/System.CommandLine.Tests/Utility/RemoteExecution.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Diagnostics;
 using System.IO;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/VersionOptionTests.cs b/src/System.CommandLine.Tests/VersionOptionTests.cs
index a560832979..83caf7bb86 100644
--- a/src/System.CommandLine.Tests/VersionOptionTests.cs
+++ b/src/System.CommandLine.Tests/VersionOptionTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.Linq;
diff --git a/src/System.CommandLine/Binding/BindingContext.cs b/src/System.CommandLine/Binding/BindingContext.cs
index 7f2cbb5ca3..79cbe88a5a 100644
--- a/src/System.CommandLine/Binding/BindingContext.cs
+++ b/src/System.CommandLine/Binding/BindingContext.cs
@@ -3,7 +3,6 @@
 
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
diff --git a/src/System.CommandLine/Completions/TextCompletionContext.cs b/src/System.CommandLine/Completions/TextCompletionContext.cs
index 0b0b188589..a4c4c0e865 100644
--- a/src/System.CommandLine/Completions/TextCompletionContext.cs
+++ b/src/System.CommandLine/Completions/TextCompletionContext.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Parsing;
-
 namespace System.CommandLine.Completions;
 
 /// <summary>
diff --git a/src/System.CommandLine/Completions/TokenCompletionContext.cs b/src/System.CommandLine/Completions/TokenCompletionContext.cs
index 60af7c0fd6..17e07fccd6 100644
--- a/src/System.CommandLine/Completions/TokenCompletionContext.cs
+++ b/src/System.CommandLine/Completions/TokenCompletionContext.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Parsing;
-
 namespace System.CommandLine.Completions;
 
 /// <summary>
diff --git a/src/System.CommandLine/Help/HelpContext.cs b/src/System.CommandLine/Help/HelpContext.cs
index 32142eb2f9..20e0946418 100644
--- a/src/System.CommandLine/Help/HelpContext.cs
+++ b/src/System.CommandLine/Help/HelpContext.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Parsing;
 using System.IO;
 
 namespace System.CommandLine.Help
diff --git a/src/System.CommandLine/Invocation/InvocationPipeline.cs b/src/System.CommandLine/Invocation/InvocationPipeline.cs
index 08aba2febd..b428beba18 100644
--- a/src/System.CommandLine/Invocation/InvocationPipeline.cs
+++ b/src/System.CommandLine/Invocation/InvocationPipeline.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Parsing;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/src/System.CommandLine/Invocation/ServiceProvider.cs b/src/System.CommandLine/Invocation/ServiceProvider.cs
index db8598de28..acf3091947 100644
--- a/src/System.CommandLine/Invocation/ServiceProvider.cs
+++ b/src/System.CommandLine/Invocation/ServiceProvider.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.CommandLine.Binding;
 using System.CommandLine.Help;
-using System.CommandLine.Parsing;
 using System.Threading;
 
 #nullable enable
diff --git a/src/System.CommandLine/Invocation/TypoCorrection.cs b/src/System.CommandLine/Invocation/TypoCorrection.cs
index 7cf8e72f6b..5ded31a9eb 100644
--- a/src/System.CommandLine/Invocation/TypoCorrection.cs
+++ b/src/System.CommandLine/Invocation/TypoCorrection.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.CommandLine.IO;
-using System.CommandLine.Parsing;
 using System.Linq;
 
 namespace System.CommandLine.Invocation
diff --git a/src/System.CommandLine/OptionExtensions.cs b/src/System.CommandLine/OptionExtensions.cs
index 58e594a00c..79558cf043 100644
--- a/src/System.CommandLine/OptionExtensions.cs
+++ b/src/System.CommandLine/OptionExtensions.cs
@@ -5,7 +5,6 @@
 using System.CommandLine.Parsing;
 using System.CommandLine.Completions;
 using System.IO;
-using System.Linq;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/ParseResult.cs b/src/System.CommandLine/ParseResult.cs
index 25ef494f2a..aafe6c1ccc 100644
--- a/src/System.CommandLine/ParseResult.cs
+++ b/src/System.CommandLine/ParseResult.cs
@@ -5,7 +5,6 @@
 using System.CommandLine.Binding;
 using System.CommandLine.Completions;
 using System.CommandLine.Parsing;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 namespace System.CommandLine
diff --git a/src/System.CommandLine/Parsing/NonterminalSyntaxNode.cs b/src/System.CommandLine/Parsing/NonterminalSyntaxNode.cs
index c3ae50e281..6726d9625e 100644
--- a/src/System.CommandLine/Parsing/NonterminalSyntaxNode.cs
+++ b/src/System.CommandLine/Parsing/NonterminalSyntaxNode.cs
@@ -7,7 +7,7 @@ namespace System.CommandLine.Parsing
 {
     internal abstract class NonterminalSyntaxNode : SyntaxNode
     {
-        private readonly List<SyntaxNode> _children = new List<SyntaxNode>();
+        private readonly List<SyntaxNode> _children = new();
 
         protected NonterminalSyntaxNode(Token token, SyntaxNode? parent) : base(token, parent)
         {
diff --git a/src/System.CommandLine/Parsing/ParseOperation.cs b/src/System.CommandLine/Parsing/ParseOperation.cs
index 73effe5e33..79e7a5bdc4 100644
--- a/src/System.CommandLine/Parsing/ParseOperation.cs
+++ b/src/System.CommandLine/Parsing/ParseOperation.cs
@@ -145,7 +145,7 @@ private void ParseCommandArguments(CommandNode commandNode, ref int currentArgum
 
         private void ParseOption(CommandNode parent)
         {
-            OptionNode optionNode = new OptionNode(
+            OptionNode optionNode = new(
                 CurrentToken,
                 (Option)CurrentToken.Symbol!,
                 parent);
diff --git a/src/System.CommandLine/Parsing/StringExtensions.cs b/src/System.CommandLine/Parsing/StringExtensions.cs
index 9f5aff102d..9033b23305 100644
--- a/src/System.CommandLine/Parsing/StringExtensions.cs
+++ b/src/System.CommandLine/Parsing/StringExtensions.cs
@@ -229,7 +229,7 @@ bool TryUnbundle(ReadOnlySpan<char> alias, int argumentIndex)
             {
                 int tokensBefore = tokenList.Count;
 
-                string candidate = new string('-', 2); // mutable string used to avoid allocations
+                string candidate = new('-', 2); // mutable string used to avoid allocations
                 unsafe
                 {
                     fixed (char* pCandidate = candidate)
diff --git a/src/System.CommandLine/StringBuilderPool.cs b/src/System.CommandLine/StringBuilderPool.cs
index b9f9b9bb65..c9d05f765a 100644
--- a/src/System.CommandLine/StringBuilderPool.cs
+++ b/src/System.CommandLine/StringBuilderPool.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Linq;
 using System.Text;
 using System.Threading;