diff --git a/Nefarius.Peripherals.SerialPort/Nefarius.Peripherals.SerialPort.csproj b/Nefarius.Peripherals.SerialPort/Nefarius.Peripherals.SerialPort.csproj
index a071ba9..370ebf2 100644
--- a/Nefarius.Peripherals.SerialPort/Nefarius.Peripherals.SerialPort.csproj
+++ b/Nefarius.Peripherals.SerialPort/Nefarius.Peripherals.SerialPort.csproj
@@ -17,9 +17,10 @@
     <PackageIconUrl />
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
-
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <Compile Remove="Properties\**" />
+    <EmbeddedResource Remove="Properties\**" />
+    <None Remove="Properties\**" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PInvokeSerialPort.Test/PInvokeSerialPortTest.cs b/PInvokeSerialPort.Test/PInvokeSerialPortTest.cs
index c0c607f..4a6a7da 100755
--- a/PInvokeSerialPort.Test/PInvokeSerialPortTest.cs
+++ b/PInvokeSerialPort.Test/PInvokeSerialPortTest.cs
@@ -1,21 +1,21 @@
 using System;
-using System.IO.Ports;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Nefarius.Peripherals.SerialPort;
 
 namespace PInvokeSerialPort.Test
 {
     /// <summary>
-    /// Test class. 
-    /// Attention: Run it just in test debug.
+    ///     Test class.
+    ///     Attention: Run it just in test debug.
     /// </summary>
     [TestClass]
     public class PInvokeSerialPortTest
     {
-        dynamic _sender;
-        dynamic _reciever;
-        StringBuilder _stringBuilder;
+        private dynamic _reciever;
+        private dynamic _sender;
+        private StringBuilder _stringBuilder;
 
         public void OpenWriteDoWaitClose(Action action)
         {
@@ -25,7 +25,7 @@ namespace PInvokeSerialPort.Test
             _reciever.Open();
 
             action();
-            
+
             _sender.Write(testSting);
             Thread.Sleep(100);
             Assert.AreEqual(testSting, _stringBuilder.ToString());
@@ -40,22 +40,22 @@ namespace PInvokeSerialPort.Test
             _sender = new SerialPort("com1");
             _reciever = new SerialPort("com2");
             OpenWriteDoWaitClose(() =>
-                {
-                    ((SerialPort)_reciever).DataReceived += x => _stringBuilder.Append((char)x);
-                });
+            {
+                ((SerialPort)_reciever).DataReceived += x => _stringBuilder.Append((char)x);
+            });
         }
 
         [TestMethod]
         public void OverallTest2()
         {
             _sender = new System.IO.Ports.SerialPort("com1");
-            
+
             _reciever = new SerialPort("com2");
-            
+
             OpenWriteDoWaitClose(() =>
-                {
-                    ((SerialPort)(object)_reciever).DataReceived += x => _stringBuilder.Append((char)x);
-                });
+            {
+                ((SerialPort)(object)_reciever).DataReceived += x => _stringBuilder.Append((char)x);
+            });
         }
 
         [TestMethod]
@@ -65,9 +65,10 @@ namespace PInvokeSerialPort.Test
             _reciever = new System.IO.Ports.SerialPort("com2");
 
             OpenWriteDoWaitClose(() =>
-                {
-                    ((System.IO.Ports.SerialPort)_reciever).DataReceived += (x, y) => _stringBuilder.Append(_reciever.ReadExisting());
-                });
+            {
+                ((System.IO.Ports.SerialPort)_reciever).DataReceived +=
+                    (x, y) => _stringBuilder.Append(_reciever.ReadExisting());
+            });
         }
 
         [TestMethod]
@@ -75,11 +76,12 @@ namespace PInvokeSerialPort.Test
         {
             _sender = new System.IO.Ports.SerialPort("com1");
             _reciever = new System.IO.Ports.SerialPort("com2");
-            
+
             OpenWriteDoWaitClose(() =>
-                {
-                    ((System.IO.Ports.SerialPort)_reciever).DataReceived += (x, y) => _stringBuilder.Append(_reciever.ReadExisting());
-                });
+            {
+                ((System.IO.Ports.SerialPort)_reciever).DataReceived +=
+                    (x, y) => _stringBuilder.Append(_reciever.ReadExisting());
+            });
         }
     }
-}
+}
\ No newline at end of file