diff --git a/README.md b/README.md
index d8e14db..1c3847b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # WebApiBootstrap
 
-Demonstrates a setup for automatically generating a client library for an ASP.NET Core Web Api using OpenAPI (Swashbuckle) and Refitter.
+Demonstrates a setup for automatically generating a client library for an ASP.NET Core Web Api using OpenAPI (
+Swashbuckle) and Refitter.
 
 ## How it Works
 
@@ -10,9 +11,13 @@ The setup consists of 3 projects:
 - WebApiBootstrap.Contracts - A `netstandard2.0` class library containing data transfer objects (DTOs).
 - WebApiBootstrap.Client - A class library containing a client for the API project.
 
-The Api and Client projects have a common dependency on the Contracts project, allowing them to share identical definitions for the DTOs and any associated serialization or validation logic.
+The Api and Client projects have a common dependency on the Contracts project, allowing them to share identical
+definitions for the DTOs and any associated serialization or validation logic.
 
-The Api project is configured to generate [an OpenApi document](./openapi.yaml) with Swashbuckle after it is built (see the "GenerateOpenApiDoc" target in its [.csproj file](./src/WebApiBootstrap.Api/WebApiBootstrap.Api.csproj)).
-
-The Client project uses this file to generate a file containing one or more Refit interface(s). The model generation is skipped so that the client can use the DTOs defined manually in the Contracts project. This interface generation occurs automatically before the Client project is built (see the "GenerateRefitInterface" target in its [.csproj file](./src/WebApiBootstrap.Client/WebApiBootstrap.Client.csproj)).
+The Api project is configured to generate [an OpenApi document](./openapi.yaml) with Swashbuckle after it is built (see
+the "GenerateOpenApiDoc" target in its [.csproj file](./src/WebApiBootstrap.Api/WebApiBootstrap.Api.csproj)).
 
+The Client project uses this file to generate a file containing one or more Refit interface(s). The model generation is
+skipped so that the client can use the DTOs defined manually in the Contracts project. This interface generation occurs
+automatically before the Client project is built (see the "GenerateRefitInterface" target in
+its [.csproj file](./src/WebApiBootstrap.Client/WebApiBootstrap.Client.csproj)).
\ No newline at end of file
diff --git a/src/WebApiBootstrap.Client/MyApiClient.cs b/src/WebApiBootstrap.Client/MyApiClient.cs
index 21bb45a..f8eca50 100644
--- a/src/WebApiBootstrap.Client/MyApiClient.cs
+++ b/src/WebApiBootstrap.Client/MyApiClient.cs
@@ -3,7 +3,6 @@ using System.Net.Http;
 
 using Refit;
 
-using WebApiBootstrap.Contracts;
 using WebApiBootstrap.Contracts.Serialization;
 
 namespace WebApiBootstrap.Client;
@@ -15,7 +14,7 @@ public class MyApiClient : IMyApiClient, IDisposable
     public MyApiClient(HttpClient httpClient)
     {
         _httpClient = httpClient;
-        var refitSettings = new RefitSettings
+        RefitSettings refitSettings = new RefitSettings
         {
             ContentSerializer
                 = new SystemTextJsonContentSerializer(MyApiJsonSerializerOptions.Create())
diff --git a/src/WebApiBootstrap.Contracts/Serialization/MyApiJsonSerializerOptions.cs b/src/WebApiBootstrap.Contracts/Serialization/MyApiJsonSerializerOptions.cs
index 8fbd22a..a1239c8 100644
--- a/src/WebApiBootstrap.Contracts/Serialization/MyApiJsonSerializerOptions.cs
+++ b/src/WebApiBootstrap.Contracts/Serialization/MyApiJsonSerializerOptions.cs
@@ -9,14 +9,17 @@ public static class MyApiJsonSerializerOptions
     private static readonly Lazy<JsonSerializerOptions> Instance = new(
         () =>
         {
-            var options = new JsonSerializerOptions(JsonSerializerDefaults.Web);
+            JsonSerializerOptions? options = new JsonSerializerOptions(JsonSerializerDefaults.Web);
             Configure(options);
             options.TypeInfoResolver = new DefaultJsonTypeInfoResolver();
             options.MakeReadOnly();
             return options;
         });
 
-    public static JsonSerializerOptions Create() => new(Instance.Value);
+    public static JsonSerializerOptions Create()
+    {
+        return new JsonSerializerOptions(Instance.Value);
+    }
 
     public static void Configure(JsonSerializerOptions options)
     {
diff --git a/tests/SampleApp/Program.cs b/tests/SampleApp/Program.cs
index 260a12b..8dd7699 100644
--- a/tests/SampleApp/Program.cs
+++ b/tests/SampleApp/Program.cs
@@ -6,8 +6,8 @@ using WebApiBootstrap.Contracts;
 // Proof of concept showing that the thing works.
 // You should set up the client with the dependency injection container properly.
 
-using HttpClient httpClient = new HttpClient {BaseAddress = new Uri("http://localhost:5078")};
-using MyApiClient client = new MyApiClient(httpClient);
+using HttpClient httpClient = new() {BaseAddress = new Uri("http://localhost:5078")};
+using MyApiClient client = new(httpClient);
 ICollection<WeatherForecast>? forecast = await client.GetWeatherForecast.Execute();
 string forecastJson = JsonSerializer.Serialize(
     forecast,