diff --git a/DocumentOperator.Domain/DocumentOperator.Domain.csproj b/DocumentOperator.Domain/DocumentOperator.Domain.csproj
index df81c18..17aac08 100644
--- a/DocumentOperator.Domain/DocumentOperator.Domain.csproj
+++ b/DocumentOperator.Domain/DocumentOperator.Domain.csproj
@@ -7,8 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="Common\Results\" />
-    <Folder Include="Constants\" />
+    <Compile Remove="Common\Results\**" />
+    <Compile Remove="Constants\**" />
+    <EmbeddedResource Remove="Common\Results\**" />
+    <EmbeddedResource Remove="Constants\**" />
+    <None Remove="Common\Results\**" />
+    <None Remove="Constants\**" />
   </ItemGroup>
 
 </Project>
diff --git a/DocumentOperator.Infrastructure/Services/QrCodeProcessing/DevExpressSwissQrCodeProcessor.cs b/DocumentOperator.Infrastructure/Services/QrCodeProcessing/DevExpressSwissQrCodeProcessor.cs
index 1854ab3..7d50f42 100644
--- a/DocumentOperator.Infrastructure/Services/QrCodeProcessing/DevExpressSwissQrCodeProcessor.cs
+++ b/DocumentOperator.Infrastructure/Services/QrCodeProcessing/DevExpressSwissQrCodeProcessor.cs
@@ -3,11 +3,9 @@ using DevExpress.Drawing;
 using DevExpress.Pdf;
 using DocumentOperator.Application.Common.Interfaces;
 using DocumentOperator.Domain.Common.Exceptions;
-using DocumentOperator.Domain.Exceptions;
 using SkiaSharp;
 using SkiaSharp.QrCode;
 using System.Collections.Concurrent;
-using System.Runtime.Versioning;
 
 namespace DocumentOperator.Infrastructure.Services.QrCodeProcessing;
 
@@ -85,11 +83,11 @@ public sealed class DevExpressSwissQrCodeProcessor : ISwissQrCodeProcessor
                             // Split raw text into lines (handle both \r\n and \n)
                             // Remove leading/trailing \r and \n from each line
                             var rawLines = qrText
-                                .Split(new[] { "\r\n", "\n" }, StringSplitOptions.None)
+                                .Split(["\r\n", "\n"], StringSplitOptions.None)
                                 .Select(line => line.Trim('\r', '\n'))
                                 .ToArray();
 
-                            return (success: true, bill: bill, rawLines: rawLines, pageNumber: imageData.pageNumber);
+                            return (success: true, bill, rawLines, imageData.pageNumber);
                         }
                         catch
                         {
@@ -125,14 +123,10 @@ public sealed class DevExpressSwissQrCodeProcessor : ISwissQrCodeProcessor
         {
             // Validate page numbers
             foreach (int pageNum in pageNumbers)
-            {
                 if (pageNum < 1 || pageNum > totalPages)
-                {
                     throw new ArgumentException(
                         $"Invalid page number {pageNum}. Document has {totalPages} pages.",
                         nameof(pageNumbers));
-                }
-            }
             return pageNumbers;
         }