diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index c1c70573..446d33c2 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "1.3.0",
+      "version": "1.4.0",
       "commands": [
         "csharpier"
       ],
@@ -31,7 +31,7 @@
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.5.12",
+      "version": "5.6.0",
       "commands": [
         "reportgenerator"
       ],
diff --git a/Directory.Packages.props b/Directory.Packages.props
index b96256ff..3aa3b45c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,8 +2,8 @@
   <ItemGroup>
     <PackageVersion Include="AwesomeAssertions" Version="9.6.0" />
     <PackageVersion Include="CliWrap" Version="3.10.5" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.11.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.403" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.11.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="11.0.100" />
     <!-- The MTP-native coverage extension WORKFLOW.md D1.2 requires of an MTP-based test project.
          It replaces coverlet.MTP here, the interim choice made before ptr727/ProjectTemplate#1088
          resolved the fleet on this package. The baseline it displaces further back is the VSTest
@@ -20,14 +20,14 @@
     <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.12.0" />
     <PackageVersion Include="NEbml" Version="1.1.0.5" />
     <PackageVersion Include="ptr727.LanguageTags" Version="1.5.214" />
-    <PackageVersion Include="ptr727.Utilities" Version="4.1.109" />
+    <PackageVersion Include="ptr727.Utilities" Version="4.1.112" />
     <PackageVersion Include="Serilog" Version="4.4.0" />
     <PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
     <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.14" />
+    <PackageVersion Include="System.CommandLine" Version="3.0.0" />
     <PackageVersion Include="Utf8JsonAsyncStreamReader" Version="2.1.0" />
     <PackageVersion Include="xunit.analyzers" Version="2.3.0" />
     <PackageVersion Include="xunit.v3" Version="4.0.3" />
diff --git a/PlexCleaner/ConfigFileJsonSchema.cs b/PlexCleaner/ConfigFileJsonSchema.cs
index b62fd811..f5f88508 100644
--- a/PlexCleaner/ConfigFileJsonSchema.cs
+++ b/PlexCleaner/ConfigFileJsonSchema.cs
@@ -266,9 +266,10 @@ private static string ToJson(ConfigFileJsonSchema json) =>
     private static ConfigFileJsonSchema FromJson(string json)
     {
         // Deserialize the base class to get the schema version
-        ConfigFileJsonSchemaBase configFileJsonSchemaBase =
-            JsonSerializer.Deserialize(json, ConfigFileJsonContext.Default.ConfigFileJsonSchemaBase)
-            ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchemaBase");
+        ConfigFileJsonSchemaBase configFileJsonSchemaBase = JsonSerializer.Deserialize(
+            json,
+            ConfigFileJsonContext.Default.ConfigFileJsonSchemaBase
+        ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchemaBase");
 
         if (configFileJsonSchemaBase.SchemaVersion != Version)
         {
@@ -283,32 +284,28 @@ private static ConfigFileJsonSchema FromJson(string json)
         switch (configFileJsonSchemaBase.SchemaVersion)
         {
             case ConfigFileJsonSchema1.Version:
-                ConfigFileJsonSchema1 configFileJsonSchema1 =
-                    JsonSerializer.Deserialize(
-                        json,
-                        ConfigFileJsonContext.Default.ConfigFileJsonSchema1
-                    ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchema1");
+                ConfigFileJsonSchema1 configFileJsonSchema1 = JsonSerializer.Deserialize(
+                    json,
+                    ConfigFileJsonContext.Default.ConfigFileJsonSchema1
+                ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchema1");
                 return new ConfigFileJsonSchema(configFileJsonSchema1);
             case ConfigFileJsonSchema2.Version:
-                ConfigFileJsonSchema2 configFileJsonSchema2 =
-                    JsonSerializer.Deserialize(
-                        json,
-                        ConfigFileJsonContext.Default.ConfigFileJsonSchema2
-                    ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchema2");
+                ConfigFileJsonSchema2 configFileJsonSchema2 = JsonSerializer.Deserialize(
+                    json,
+                    ConfigFileJsonContext.Default.ConfigFileJsonSchema2
+                ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchema2");
                 return new ConfigFileJsonSchema(configFileJsonSchema2);
             case ConfigFileJsonSchema3.Version:
-                ConfigFileJsonSchema3 configFileJsonSchema3 =
-                    JsonSerializer.Deserialize(
-                        json,
-                        ConfigFileJsonContext.Default.ConfigFileJsonSchema3
-                    ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchema3");
+                ConfigFileJsonSchema3 configFileJsonSchema3 = JsonSerializer.Deserialize(
+                    json,
+                    ConfigFileJsonContext.Default.ConfigFileJsonSchema3
+                ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchema3");
                 return new ConfigFileJsonSchema(configFileJsonSchema3);
             case Version:
-                ConfigFileJsonSchema configFileJsonSchema4 =
-                    JsonSerializer.Deserialize(
-                        json,
-                        ConfigFileJsonContext.Default.ConfigFileJsonSchema4
-                    ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchema4");
+                ConfigFileJsonSchema configFileJsonSchema4 = JsonSerializer.Deserialize(
+                    json,
+                    ConfigFileJsonContext.Default.ConfigFileJsonSchema4
+                ) ?? throw new JsonException("Failed to deserialize ConfigFileJsonSchema4");
                 return configFileJsonSchema4;
             default:
                 throw new NotSupportedException(
diff --git a/PlexCleaner/Process.cs b/PlexCleaner/Process.cs
index 6bfad7bc..9331c82c 100644
--- a/PlexCleaner/Process.cs
+++ b/PlexCleaner/Process.cs
@@ -558,66 +558,61 @@ public static bool ProcessFiles(List<string> fileList, out bool writeFailed)
         // Process all the files
         ProcessResultJsonSchema resultsJson = new();
         Lock resultLock = new();
-        bool ret = ProcessDriver.ProcessFiles(
-            fileList,
-            nameof(ProcessFiles),
-            false,
-            fileName =>
-            {
-                // Process the file
-                bool processResult = ProcessFile(
-                    fileName,
-                    out bool modified,
-                    out bool ignored,
-                    out SidecarFile.StatesType state,
-                    out string processName,
-                    out string? failedOperation,
-                    out string? invalidReason
-                );
-
-                // Cancelled
-                if (Program.IsCancelled())
-                {
-                    return false;
-                }
+        bool ret = ProcessDriver.ProcessFiles(fileList, nameof(ProcessFiles), false, fileName =>
+        {
+            // Process the file
+            bool processResult = ProcessFile(
+                fileName,
+                out bool modified,
+                out bool ignored,
+                out SidecarFile.StatesType state,
+                out string processName,
+                out string? failedOperation,
+                out string? invalidReason
+            );
 
-                // Ignored do not add to results
-                if (ignored)
-                {
-                    return processResult;
-                }
+            // Cancelled
+            if (Program.IsCancelled())
+            {
+                return false;
+            }
 
-                // Per-outcome metrics: this is the only place the State flags are known
-                Metrics.RecordStates(state);
-                if (modified)
-                {
-                    Metrics.RecordModified();
-                }
-                if ((state & SidecarFile.StatesType.VerifyFailed) != 0)
-                {
-                    Metrics.RecordVerifyFailed();
-                }
+            // Ignored do not add to results
+            if (ignored)
+            {
+                return processResult;
+            }
 
-                // Save result
-                lock (resultLock)
-                {
-                    resultsJson.Results.Results.Add(
-                        new()
-                        {
-                            Result = processResult,
-                            OriginalFileName = fileName,
-                            NewFileName = processName,
-                            Modified = modified,
-                            State = state,
-                            FailedOperation = failedOperation,
-                            InvalidReason = invalidReason,
-                        }
-                    );
-                }
+            // Per-outcome metrics: this is the only place the State flags are known
+            Metrics.RecordStates(state);
+            if (modified)
+            {
+                Metrics.RecordModified();
+            }
+            if ((state & SidecarFile.StatesType.VerifyFailed) != 0)
+            {
+                Metrics.RecordVerifyFailed();
+            }
 
-                return processResult;
+            // Save result
+            lock (resultLock)
+            {
+                resultsJson.Results.Results.Add(
+                    new()
+                    {
+                        Result = processResult,
+                        OriginalFileName = fileName,
+                        NewFileName = processName,
+                        Modified = modified,
+                        State = state,
+                        FailedOperation = failedOperation,
+                        InvalidReason = invalidReason,
+                    }
+                );
             }
-        );
+
+            return processResult;
+        });
 
         writeFailed = !FinishProcessing(resultsJson);
         return ret;
diff --git a/PlexCleaner/ProcessDriver.cs b/PlexCleaner/ProcessDriver.cs
index 8d39e013..2964df67 100644
--- a/PlexCleaner/ProcessDriver.cs
+++ b/PlexCleaner/ProcessDriver.cs
@@ -283,61 +283,56 @@ public static bool GetTagMap(List<string> fileList)
         TagMapSet mkTags = new();
         TagMapSet miTags = new();
         Lock tagLock = new();
-        bool ret = ProcessFiles(
-            fileList,
-            nameof(GetTagMap),
-            true,
-            fileName =>
+        bool ret = ProcessFiles(fileList, nameof(GetTagMap), true, fileName =>
+        {
+            // Get media information
+            ProcessFile processFile = new(fileName);
+            if (!processFile.GetMediaProps())
             {
-                // Get media information
-                ProcessFile processFile = new(fileName);
-                if (!processFile.GetMediaProps())
-                {
-                    return false;
-                }
-
-                // Remove cover art in video tracks
-                _ = processFile.MediaInfoProps.Video.RemoveAll(track => track.CoverArt);
-                _ = processFile.FfProbeProps.Video.RemoveAll(track => track.CoverArt);
-                _ = processFile.MkvMergeProps.Video.RemoveAll(track => track.CoverArt);
-
-                // Skip media with errors
-                if (
-                    processFile.MediaInfoProps.HasErrors
-                    || processFile.FfProbeProps.HasErrors
-                    || processFile.MkvMergeProps.HasErrors
-                )
-                {
-                    Log.Warning(
-                        "Skipping media with errors : {FileName}",
-                        processFile.FileInfo.FullName
-                    );
-                    return false;
-                }
+                return false;
+            }
 
-                // Add all the tags
-                lock (tagLock)
-                {
-                    ffTags.Add(
-                        processFile.FfProbeProps,
-                        processFile.MkvMergeProps,
-                        processFile.MediaInfoProps
-                    );
-                    mkTags.Add(
-                        processFile.MkvMergeProps,
-                        processFile.FfProbeProps,
-                        processFile.MediaInfoProps
-                    );
-                    miTags.Add(
-                        processFile.MediaInfoProps,
-                        processFile.FfProbeProps,
-                        processFile.MkvMergeProps
-                    );
-                }
+            // Remove cover art in video tracks
+            _ = processFile.MediaInfoProps.Video.RemoveAll(track => track.CoverArt);
+            _ = processFile.FfProbeProps.Video.RemoveAll(track => track.CoverArt);
+            _ = processFile.MkvMergeProps.Video.RemoveAll(track => track.CoverArt);
+
+            // Skip media with errors
+            if (
+                processFile.MediaInfoProps.HasErrors
+                || processFile.FfProbeProps.HasErrors
+                || processFile.MkvMergeProps.HasErrors
+            )
+            {
+                Log.Warning(
+                    "Skipping media with errors : {FileName}",
+                    processFile.FileInfo.FullName
+                );
+                return false;
+            }
 
-                return true;
+            // Add all the tags
+            lock (tagLock)
+            {
+                ffTags.Add(
+                    processFile.FfProbeProps,
+                    processFile.MkvMergeProps,
+                    processFile.MediaInfoProps
+                );
+                mkTags.Add(
+                    processFile.MkvMergeProps,
+                    processFile.FfProbeProps,
+                    processFile.MediaInfoProps
+                );
+                miTags.Add(
+                    processFile.MediaInfoProps,
+                    processFile.FfProbeProps,
+                    processFile.MkvMergeProps
+                );
             }
-        );
+
+            return true;
+        });
         if (!ret)
         {
             return false;
@@ -355,174 +350,157 @@ public static bool GetTagMap(List<string> fileList)
     }
 
     public static bool GetMediaInfo(List<string> fileList) =>
-        ProcessFiles(
-            fileList,
-            nameof(GetMediaInfo),
-            true,
-            fileName =>
+        ProcessFiles(fileList, nameof(GetMediaInfo), true, fileName =>
+        {
+            // Get media information
+            ProcessFile processFile = new(fileName);
+            if (!processFile.GetMediaProps())
             {
-                // Get media information
-                ProcessFile processFile = new(fileName);
-                if (!processFile.GetMediaProps())
-                {
-                    return false;
-                }
+                return false;
+            }
 
-                // Print info
-                Log.Information("{FileName}", fileName);
-                processFile.MediaInfoProps.WriteLine();
-                processFile.MkvMergeProps.WriteLine();
-                processFile.FfProbeProps.WriteLine();
+            // Print info
+            Log.Information("{FileName}", fileName);
+            processFile.MediaInfoProps.WriteLine();
+            processFile.MkvMergeProps.WriteLine();
+            processFile.FfProbeProps.WriteLine();
 
-                return true;
-            }
-        );
+            return true;
+        });
 
     public static bool TestMediaInfo(List<string> fileList) =>
-        ProcessFiles(
-            fileList,
-            nameof(TestMediaInfo),
-            false,
-            fileName =>
-            {
-                // Process MKV files or files in the Remux list
-                FileInfo fileInfo = new(fileName);
-                if (
-                    !SidecarFile.IsMkvFile(fileName)
-                    && !Program.Config.ProcessOptions.ReMuxExtensions.Contains(
-                        Path.GetExtension(fileName)
-                    )
+        ProcessFiles(fileList, nameof(TestMediaInfo), false, fileName =>
+        {
+            // Process MKV files or files in the Remux list
+            FileInfo fileInfo = new(fileName);
+            if (
+                !SidecarFile.IsMkvFile(fileName)
+                && !Program.Config.ProcessOptions.ReMuxExtensions.Contains(
+                    Path.GetExtension(fileName)
                 )
-                {
-                    return true;
-                }
+            )
+            {
+                return true;
+            }
 
-                // Get media information
-                Log.Debug("Reading media information : {FileName}", fileName);
-                int ret = 0;
-                if (Tools.MediaInfo.GetMediaProps(fileInfo.FullName, out MediaProps mediaInfoProps))
-                {
-                    mediaInfoProps.WriteLine();
-                    ret++;
-                }
-                if (Tools.MkvMerge.GetMediaProps(fileInfo.FullName, out MediaProps mkvMergeProps))
-                {
-                    mkvMergeProps.WriteLine();
-                    ret++;
-                }
-                if (Tools.FfProbe.GetMediaProps(fileInfo.FullName, out MediaProps ffProbeProps))
-                {
-                    ffProbeProps.WriteLine();
-                    ret++;
-                }
-                if (ret != 3)
-                {
-                    return false;
-                }
+            // Get media information
+            Log.Debug("Reading media information : {FileName}", fileName);
+            int ret = 0;
+            if (Tools.MediaInfo.GetMediaProps(fileInfo.FullName, out MediaProps mediaInfoProps))
+            {
+                mediaInfoProps.WriteLine();
+                ret++;
+            }
+            if (Tools.MkvMerge.GetMediaProps(fileInfo.FullName, out MediaProps mkvMergeProps))
+            {
+                mkvMergeProps.WriteLine();
+                ret++;
+            }
+            if (Tools.FfProbe.GetMediaProps(fileInfo.FullName, out MediaProps ffProbeProps))
+            {
+                ffProbeProps.WriteLine();
+                ret++;
+            }
+            if (ret != 3)
+            {
+                return false;
+            }
 
-                // Skip further validation if any errors
-                if (mediaInfoProps.HasErrors || ffProbeProps.HasErrors || mkvMergeProps.HasErrors)
-                {
-                    Log.Warning("Media metadata has errors : {FileName}", fileInfo.FullName);
-                    return true;
-                }
+            // Skip further validation if any errors
+            if (mediaInfoProps.HasErrors || ffProbeProps.HasErrors || mkvMergeProps.HasErrors)
+            {
+                Log.Warning("Media metadata has errors : {FileName}", fileInfo.FullName);
+                return true;
+            }
 
-                // Remove cover art in video tracks
-                _ = mediaInfoProps.Video.RemoveAll(track => track.CoverArt);
-                _ = ffProbeProps.Video.RemoveAll(track => track.CoverArt);
-                _ = mkvMergeProps.Video.RemoveAll(track => track.CoverArt);
+            // Remove cover art in video tracks
+            _ = mediaInfoProps.Video.RemoveAll(track => track.CoverArt);
+            _ = ffProbeProps.Video.RemoveAll(track => track.CoverArt);
+            _ = mkvMergeProps.Video.RemoveAll(track => track.CoverArt);
+
+            // Do the track counts match
+            if (
+                ffProbeProps.Audio.Count != mkvMergeProps.Audio.Count
+                || mkvMergeProps.Audio.Count != mediaInfoProps.Audio.Count
+                || ffProbeProps.Video.Count != mkvMergeProps.Video.Count
+                || mkvMergeProps.Video.Count != mediaInfoProps.Video.Count
+                || ffProbeProps.Subtitle.Count != mkvMergeProps.Subtitle.Count
+                || mkvMergeProps.Subtitle.Count != mediaInfoProps.Subtitle.Count
+            )
+            {
+                Log.Warning("Tool track count discrepancy : {FileName}", fileInfo.FullName);
+            }
 
-                // Do the track counts match
+            // If Matroska container then MkvMerge and MediaInfo track Uid's should match
+            if (mkvMergeProps.IsContainerMkv())
+            {
                 if (
-                    ffProbeProps.Audio.Count != mkvMergeProps.Audio.Count
-                    || mkvMergeProps.Audio.Count != mediaInfoProps.Audio.Count
-                    || ffProbeProps.Video.Count != mkvMergeProps.Video.Count
-                    || mkvMergeProps.Video.Count != mediaInfoProps.Video.Count
-                    || ffProbeProps.Subtitle.Count != mkvMergeProps.Subtitle.Count
-                    || mkvMergeProps.Subtitle.Count != mediaInfoProps.Subtitle.Count
+                    mkvMergeProps.Video.Any(mkvItem =>
+                        mediaInfoProps.Video.Find(mediaInfoItem => mediaInfoItem.Uid == mkvItem.Uid)
+                        == null
+                    )
                 )
                 {
-                    Log.Warning("Tool track count discrepancy : {FileName}", fileInfo.FullName);
+                    Log.Warning(
+                        "MkvMerge video track Uid mismatch : {FileName}",
+                        fileInfo.FullName
+                    );
                 }
-
-                // If Matroska container then MkvMerge and MediaInfo track Uid's should match
-                if (mkvMergeProps.IsContainerMkv())
-                {
-                    if (
-                        mkvMergeProps.Video.Any(mkvItem =>
-                            mediaInfoProps.Video.Find(mediaInfoItem =>
-                                mediaInfoItem.Uid == mkvItem.Uid
-                            ) == null
-                        )
-                    )
-                    {
-                        Log.Warning(
-                            "MkvMerge video track Uid mismatch : {FileName}",
-                            fileInfo.FullName
-                        );
-                    }
-                    if (
-                        mkvMergeProps.Audio.Any(mkvItem =>
-                            mediaInfoProps.Audio.Find(mediaInfoItem =>
-                                mediaInfoItem.Uid == mkvItem.Uid
-                            ) == null
-                        )
-                    )
-                    {
-                        Log.Warning(
-                            "MkvMerge audio track Uid mismatch : {FileName}",
-                            fileInfo.FullName
-                        );
-                    }
-                    if (
-                        mkvMergeProps.Subtitle.Any(mkvItem =>
-                            mediaInfoProps.Subtitle.Find(mediaInfoItem =>
-                                mediaInfoItem.Uid == mkvItem.Uid
-                            ) == null
-                        )
+                if (
+                    mkvMergeProps.Audio.Any(mkvItem =>
+                        mediaInfoProps.Audio.Find(mediaInfoItem => mediaInfoItem.Uid == mkvItem.Uid)
+                        == null
                     )
-                    {
-                        Log.Warning(
-                            "MkvMerge subtitle track Uid mismatch : {FileName}",
-                            fileInfo.FullName
-                        );
-                    }
+                )
+                {
+                    Log.Warning(
+                        "MkvMerge audio track Uid mismatch : {FileName}",
+                        fileInfo.FullName
+                    );
                 }
-
-                return true;
-            }
-        );
-
-    public static bool GetToolInfo(List<string> fileList) =>
-        ProcessFiles(
-            fileList,
-            nameof(GetToolInfo),
-            true,
-            fileName =>
-            {
-                // Get media tool information
                 if (
-                    !Tools.MediaInfo.GetMediaPropsJson(fileName, out string mediaInfoXml)
-                    || !Tools.MkvMerge.GetMediaPropsJson(fileName, out string mkvMergeJson)
-                    || !Tools.FfProbe.GetMediaPropsJson(fileName, out string ffProbeJson)
+                    mkvMergeProps.Subtitle.Any(mkvItem =>
+                        mediaInfoProps.Subtitle.Find(mediaInfoItem =>
+                            mediaInfoItem.Uid == mkvItem.Uid
+                        ) == null
+                    )
                 )
                 {
-                    Log.Error("Failed to read media tool info : {FileName}", fileName);
-                    return false;
+                    Log.Warning(
+                        "MkvMerge subtitle track Uid mismatch : {FileName}",
+                        fileInfo.FullName
+                    );
                 }
+            }
 
-                // Print and log info
-                Log.Information("{FileName}", fileName);
-                Log.Information("FfProbe: {FfProbeJson}", ffProbeJson);
-                Console.Write(ffProbeJson);
-                Log.Information("MkvMerge: {MkvMergeJson}", mkvMergeJson);
-                Console.Write(mkvMergeJson);
-                Log.Information("MediaInfo: {MediaInfoXml}", mediaInfoXml);
-                Console.Write(mediaInfoXml);
+            return true;
+        });
 
-                return true;
+    public static bool GetToolInfo(List<string> fileList) =>
+        ProcessFiles(fileList, nameof(GetToolInfo), true, fileName =>
+        {
+            // Get media tool information
+            if (
+                !Tools.MediaInfo.GetMediaPropsJson(fileName, out string mediaInfoXml)
+                || !Tools.MkvMerge.GetMediaPropsJson(fileName, out string mkvMergeJson)
+                || !Tools.FfProbe.GetMediaPropsJson(fileName, out string ffProbeJson)
+            )
+            {
+                Log.Error("Failed to read media tool info : {FileName}", fileName);
+                return false;
             }
-        );
+
+            // Print and log info
+            Log.Information("{FileName}", fileName);
+            Log.Information("FfProbe: {FfProbeJson}", ffProbeJson);
+            Console.Write(ffProbeJson);
+            Log.Information("MkvMerge: {MkvMergeJson}", mkvMergeJson);
+            Console.Write(mkvMergeJson);
+            Log.Information("MediaInfo: {MediaInfoXml}", mediaInfoXml);
+            Console.Write(mediaInfoXml);
+
+            return true;
+        });
 
     internal static string FormatDuration(TimeSpan value) =>
         // Consistent HH:mm:ss.fff across log entries; hours from TotalHours so a multi-day run never wraps
diff --git a/PlexCleaner/ProcessFile.cs b/PlexCleaner/ProcessFile.cs
index f482df35..d0272ec9 100644
--- a/PlexCleaner/ProcessFile.cs
+++ b/PlexCleaner/ProcessFile.cs
@@ -3115,9 +3115,8 @@ public SelectMediaProps FindUnknownLanguageTracks()
         // Select all tracks with undefined languages
         // Selected is Unknown
         // NotSelected is Known
-        SelectMediaProps selectMediaProps = new(
-            MkvMergeProps,
-            item => Language.IsUndefined(item.LanguageIetf)
+        SelectMediaProps selectMediaProps = new(MkvMergeProps, item =>
+            Language.IsUndefined(item.LanguageIetf)
         );
         return selectMediaProps;
     }
@@ -3266,14 +3265,12 @@ public SelectMediaProps FindUnwantedLanguageTracks()
         // Select tracks with wanted languages, or the original language if set to keep
         // Selected is Keep
         // NotSelected is Remove
-        SelectMediaProps selectMediaProps = new(
-            MkvMergeProps,
-            item =>
-                Language.IsMatch(item.LanguageIetf, Program.Config.ProcessOptions.KeepLanguages)
-                || (
-                    Program.Config.ProcessOptions.KeepOriginalLanguage
-                    && item.Flags.HasFlag(TrackProps.FlagsType.Original)
-                )
+        SelectMediaProps selectMediaProps = new(MkvMergeProps, item =>
+            Language.IsMatch(item.LanguageIetf, Program.Config.ProcessOptions.KeepLanguages)
+            || (
+                Program.Config.ProcessOptions.KeepOriginalLanguage
+                && item.Flags.HasFlag(TrackProps.FlagsType.Original)
+            )
         );
 
         // Keep at least one video track if any
diff --git a/PlexCleaner/SidecarFileJsonSchema.cs b/PlexCleaner/SidecarFileJsonSchema.cs
index 1c59bd01..ea556054 100644
--- a/PlexCleaner/SidecarFileJsonSchema.cs
+++ b/PlexCleaner/SidecarFileJsonSchema.cs
@@ -245,11 +245,10 @@ private static string ToJson(SidecarFileJsonSchema json) =>
     private static SidecarFileJsonSchema FromJson(string json)
     {
         // Deserialize the base class to get the schema version
-        SidecarFileJsonSchemaBase sidecarFileJsonSchemaBase =
-            JsonSerializer.Deserialize(
-                json,
-                SidecarFileJsonContext.Default.SidecarFileJsonSchemaBase
-            ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchemaBase");
+        SidecarFileJsonSchemaBase sidecarFileJsonSchemaBase = JsonSerializer.Deserialize(
+            json,
+            SidecarFileJsonContext.Default.SidecarFileJsonSchemaBase
+        ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchemaBase");
 
         if (sidecarFileJsonSchemaBase.SchemaVersion != Version)
         {
@@ -264,41 +263,36 @@ private static SidecarFileJsonSchema FromJson(string json)
         switch (sidecarFileJsonSchemaBase.SchemaVersion)
         {
             case SidecarFileJsonSchema1.Version:
-                SidecarFileJsonSchema1 sidecarFileJsonSchema1 =
-                    JsonSerializer.Deserialize(
-                        json,
-                        SidecarFileJsonContext.Default.SidecarFileJsonSchema1
-                    ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema1");
+                SidecarFileJsonSchema1 sidecarFileJsonSchema1 = JsonSerializer.Deserialize(
+                    json,
+                    SidecarFileJsonContext.Default.SidecarFileJsonSchema1
+                ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema1");
                 return new SidecarFileJsonSchema(sidecarFileJsonSchema1);
 
             case SidecarFileJsonSchema2.Version:
-                SidecarFileJsonSchema2 sidecarFileJsonSchema2 =
-                    JsonSerializer.Deserialize(
-                        json,
-                        SidecarFileJsonContext.Default.SidecarFileJsonSchema2
-                    ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema2");
+                SidecarFileJsonSchema2 sidecarFileJsonSchema2 = JsonSerializer.Deserialize(
+                    json,
+                    SidecarFileJsonContext.Default.SidecarFileJsonSchema2
+                ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema2");
                 return new SidecarFileJsonSchema(sidecarFileJsonSchema2);
             case SidecarFileJsonSchema3.Version:
-                SidecarFileJsonSchema3 sidecarFileJsonSchema3 =
-                    JsonSerializer.Deserialize(
-                        json,
-                        SidecarFileJsonContext.Default.SidecarFileJsonSchema3
-                    ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema3");
+                SidecarFileJsonSchema3 sidecarFileJsonSchema3 = JsonSerializer.Deserialize(
+                    json,
+                    SidecarFileJsonContext.Default.SidecarFileJsonSchema3
+                ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema3");
                 return new SidecarFileJsonSchema(sidecarFileJsonSchema3);
 
             case SidecarFileJsonSchema4.Version:
-                SidecarFileJsonSchema4 sidecarFileJsonSchema4 =
-                    JsonSerializer.Deserialize(
-                        json,
-                        SidecarFileJsonContext.Default.SidecarFileJsonSchema4
-                    ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema4");
+                SidecarFileJsonSchema4 sidecarFileJsonSchema4 = JsonSerializer.Deserialize(
+                    json,
+                    SidecarFileJsonContext.Default.SidecarFileJsonSchema4
+                ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema4");
                 return new SidecarFileJsonSchema(sidecarFileJsonSchema4);
             case Version:
-                SidecarFileJsonSchema sidecarFileJsonSchema =
-                    JsonSerializer.Deserialize(
-                        json,
-                        SidecarFileJsonContext.Default.SidecarFileJsonSchema5
-                    ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema5");
+                SidecarFileJsonSchema sidecarFileJsonSchema = JsonSerializer.Deserialize(
+                    json,
+                    SidecarFileJsonContext.Default.SidecarFileJsonSchema5
+                ) ?? throw new JsonException("Failed to deserialize SidecarFileJsonSchema5");
                 return sidecarFileJsonSchema;
             default:
                 throw new NotSupportedException(
diff --git a/PlexCleaner/TrackProps.cs b/PlexCleaner/TrackProps.cs
index 21adf1f2..3eb93556 100644
--- a/PlexCleaner/TrackProps.cs
+++ b/PlexCleaner/TrackProps.cs
@@ -460,21 +460,19 @@ public virtual bool Create(FfMpegToolJsonSchema.Track track)
         }
 
         // Title
-        Title =
-            track
-                .Tags.FirstOrDefault(item =>
-                    item.Key.Equals("title", StringComparison.OrdinalIgnoreCase)
-                )
-                .Value
+        Title = track
+            .Tags.FirstOrDefault(item =>
+                item.Key.Equals("title", StringComparison.OrdinalIgnoreCase)
+            )
+            .Value
             ?? string.Empty;
 
         // Language
-        Language =
-            track
-                .Tags.FirstOrDefault(item =>
-                    item.Key.Equals("language", StringComparison.OrdinalIgnoreCase)
-                )
-                .Value
+        Language = track
+            .Tags.FirstOrDefault(item =>
+                item.Key.Equals("language", StringComparison.OrdinalIgnoreCase)
+            )
+            .Value
             ?? string.Empty;
 
         // TODO: FfProbe uses the tag language value instead of the track language
diff --git a/PlexCleanerTests/CleanupStepRepeatTests.cs b/PlexCleanerTests/CleanupStepRepeatTests.cs
index ca595b56..652136da 100644
--- a/PlexCleanerTests/CleanupStepRepeatTests.cs
+++ b/PlexCleanerTests/CleanupStepRepeatTests.cs
@@ -217,9 +217,8 @@ public void RemoveCoverArt_MediaInfoCoverArtAttachment_RemovesInPlaceWithoutRemu
     public void RepairMetadataErrors_TrackFlagsDoNotStick_SetsOnceAcrossRuns()
     {
         Assert.SkipWhen(OperatingSystem.IsWindows(), "The fake tools are shell scripts");
-        ProcessFile processFile = CreateProcessFile(
-            SidecarFile.StatesType.None,
-            mkvMerge: data => AudioProperties(data)["track_name"] = "Commentary"
+        ProcessFile processFile = CreateProcessFile(SidecarFile.StatesType.None, mkvMerge: data =>
+            AudioProperties(data)["track_name"] = "Commentary"
         );
 
         bool modified = false;
@@ -253,29 +252,26 @@ LogEventLevel level
         Program.Config.ProcessOptions.ReMux = option != "ReMux";
         Program.Config.ProcessOptions.SetIetfLanguageTags = option != "SetIetfLanguageTags";
         Program.Config.ProcessOptions.SetTrackFlags = option != "SetTrackFlags";
-        ProcessFile processFile = CreateProcessFile(
-            SidecarFile.StatesType.None,
-            mkvMerge: data =>
+        ProcessFile processFile = CreateProcessFile(SidecarFile.StatesType.None, mkvMerge: data =>
+        {
+            JsonNode properties = AudioProperties(data);
+            switch (option)
             {
-                JsonNode properties = AudioProperties(data);
-                switch (option)
-                {
-                    // A language tag that does not match its IETF tag needs a remux
-                    case "ReMux":
-                        properties["language"] = "eng";
-                        properties["language_ietf"] = "de";
-                        break;
-                    // A language tag with no IETF tag needs one set
-                    case "SetIetfLanguageTags":
-                        properties["language"] = "eng";
-                        _ = properties.AsObject().Remove("language_ietf");
-                        break;
-                    default:
-                        properties["track_name"] = "Commentary";
-                        break;
-                }
+                // A language tag that does not match its IETF tag needs a remux
+                case "ReMux":
+                    properties["language"] = "eng";
+                    properties["language_ietf"] = "de";
+                    break;
+                // A language tag with no IETF tag needs one set
+                case "SetIetfLanguageTags":
+                    properties["language"] = "eng";
+                    _ = properties.AsObject().Remove("language_ietf");
+                    break;
+                default:
+                    properties["track_name"] = "Commentary";
+                    break;
             }
-        );
+        });
 
         bool modified = false;
         IReadOnlyList<LogEvent> events = LogCapture.Capture(() =>
@@ -300,16 +296,13 @@ public void RepairMetadataErrors_TrackNeedsRemuxAndFlags_ReportsBoth()
         Assert.SkipWhen(OperatingSystem.IsWindows(), "The fake tools are shell scripts");
         Program.Config.ProcessOptions.ReMux = false;
         Program.Config.ProcessOptions.SetTrackFlags = false;
-        ProcessFile processFile = CreateProcessFile(
-            SidecarFile.StatesType.None,
-            mkvMerge: data =>
-            {
-                JsonNode properties = AudioProperties(data);
-                properties["language"] = "eng";
-                properties["language_ietf"] = "de";
-                properties["track_name"] = "Commentary";
-            }
-        );
+        ProcessFile processFile = CreateProcessFile(SidecarFile.StatesType.None, mkvMerge: data =>
+        {
+            JsonNode properties = AudioProperties(data);
+            properties["language"] = "eng";
+            properties["language_ietf"] = "de";
+            properties["track_name"] = "Commentary";
+        });
         _ = processFile
             .MkvMergeProps.Audio.Single()
             .Actions.Should()
diff --git a/PlexCleanerTests/PerFileExceptionTests.cs b/PlexCleanerTests/PerFileExceptionTests.cs
index 55f2a603..f7dfc23a 100644
--- a/PlexCleanerTests/PerFileExceptionTests.cs
+++ b/PlexCleanerTests/PerFileExceptionTests.cs
@@ -45,16 +45,11 @@ private static void AssertFirstFileFails(Exception exception, string taskName)
 
         List<string> processed = [];
         _ = ProcessDriver
-            .ProcessFiles(
-                ["first.mkv", "second.mkv"],
-                taskName,
-                false,
-                fileName =>
-                {
-                    processed.Add(fileName);
-                    return fileName == "first.mkv" ? throw exception : true;
-                }
-            )
+            .ProcessFiles(["first.mkv", "second.mkv"], taskName, false, fileName =>
+            {
+                processed.Add(fileName);
+                return fileName == "first.mkv" ? throw exception : true;
+            })
             .Should()
             .BeTrue();
 
diff --git a/PlexCleanerTests/ReplaceOriginalTests.cs b/PlexCleanerTests/ReplaceOriginalTests.cs
index b5cc5e6b..bf86953e 100644
--- a/PlexCleanerTests/ReplaceOriginalTests.cs
+++ b/PlexCleanerTests/ReplaceOriginalTests.cs
@@ -87,20 +87,17 @@ bool undefinedVideo
         byte[] original = File.ReadAllBytes(mediaFile);
         VideoProps video = processFile.MkvMergeProps.Video[0];
         string propEditLog = WriteFakeTools("*.tmp8|*.tmp9", 0);
-        WriteRewriteIdentify(
-            "name.tmp9",
-            identify =>
+        WriteRewriteIdentify("name.tmp9", identify =>
+        {
+            if (undefinedVideo)
             {
-                if (undefinedVideo)
-                {
-                    SetUndefined(identify, "video");
-                }
-                else
-                {
-                    Drop(identify, "audio");
-                }
+                SetUndefined(identify, "video");
             }
-        );
+            else
+            {
+                Drop(identify, "audio");
+            }
+        });
         processFile.FfProbeProps.Video[0].Interlaced = true;
 
         bool modified = false;
@@ -524,10 +521,8 @@ public void RestoreLanguageTags_EditsOnlyWhenTracksMatch(string change, bool suc
         string propEditLog = WriteFakeTools("*.tmp1", 0);
         if (change.StartsWith("undefined", StringComparison.Ordinal))
         {
-            _ = FakeTools.WriteChangedIdentify(
-                _directory,
-                "MkvMergeInfoData.json",
-                identify => SetUndefined(identify, change["undefined".Length..])
+            _ = FakeTools.WriteChangedIdentify(_directory, "MkvMergeInfoData.json", identify =>
+                SetUndefined(identify, change["undefined".Length..])
             );
         }
         string tempName = Path.ChangeExtension(processFile.FileInfo.FullName, ".tmp1");