diff --git a/src/csharp/SDK/Calibration.cs b/src/csharp/SDK/Calibration.cs
index 1644ad79..2e191b8d 100644
--- a/src/csharp/SDK/Calibration.cs
+++ b/src/csharp/SDK/Calibration.cs
@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+//------------------------------------------------------------------------------
+// <copyright file="Calibration.cs" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+// </copyright>
+//------------------------------------------------------------------------------
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -124,7 +128,7 @@ namespace Microsoft.Azure.Kinect.Sensor
         }
 
         /// <summary>
-        /// Transform a 2D pixel coordinate with an associated depth value of the source camera into a 3D point of the target coordinate system. 
+        /// Transform a 2D pixel coordinate with an associated depth value of the source camera into a 3D point of the target coordinate system.
         /// </summary>
         /// <param name="sourcePoint2D">The 2D pixel in <paramref name="sourceCamera"/> coordinates.</param>
         /// <param name="sourceDepth">The depth of <paramref name="sourceCamera"/> in millimeters.</param>
@@ -221,7 +225,7 @@ namespace Microsoft.Azure.Kinect.Sensor
         /// <inheritdoc/>
         public override int GetHashCode()
         {
-            var hashCode = -454809512;
+            int hashCode = -454809512;
             hashCode = (hashCode * -1521134295) + EqualityComparer<CameraCalibration>.Default.GetHashCode(this.DepthCameraCalibration);
             hashCode = (hashCode * -1521134295) + EqualityComparer<CameraCalibration>.Default.GetHashCode(this.ColorCameraCalibration);
             hashCode = (hashCode * -1521134295) + EqualityComparer<Extrinsics[]>.Default.GetHashCode(this.DeviceExtrinsics);
diff --git a/src/csharp/SDK/CalibrationDeviceType.cs b/src/csharp/SDK/CalibrationDeviceType.cs
index c01acadc..5c68421e 100644
--- a/src/csharp/SDK/CalibrationDeviceType.cs
+++ b/src/csharp/SDK/CalibrationDeviceType.cs
@@ -1,8 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+//------------------------------------------------------------------------------
+// <copyright file="CalibrationDeviceType.cs" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-using System;
-using System.Numerics;
-using System.Runtime.InteropServices;
+// </copyright>
+//------------------------------------------------------------------------------
 
 namespace Microsoft.Azure.Kinect.Sensor
 {
diff --git a/src/csharp/SDK/CalibrationModelType.cs b/src/csharp/SDK/CalibrationModelType.cs
index 0af29430..ec043641 100644
--- a/src/csharp/SDK/CalibrationModelType.cs
+++ b/src/csharp/SDK/CalibrationModelType.cs
@@ -1,8 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+//------------------------------------------------------------------------------
+// <copyright file="CalibrationModelType.cs" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-using System;
-using System.Numerics;
-using System.Runtime.InteropServices;
+// </copyright>
+//------------------------------------------------------------------------------
 
 namespace Microsoft.Azure.Kinect.Sensor
 {
diff --git a/src/csharp/SDK/CameraCalibration.cs b/src/csharp/SDK/CameraCalibration.cs
index ad721784..a5876b09 100644
--- a/src/csharp/SDK/CameraCalibration.cs
+++ b/src/csharp/SDK/CameraCalibration.cs
@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+//------------------------------------------------------------------------------
+// <copyright file="CameraCalibration.cs" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+// </copyright>
+//------------------------------------------------------------------------------
 using System;
 using System.Collections.Generic;
-using System.Numerics;
 using System.Runtime.InteropServices;
 
 namespace Microsoft.Azure.Kinect.Sensor
@@ -13,7 +16,7 @@ namespace Microsoft.Azure.Kinect.Sensor
     [StructLayout(LayoutKind.Sequential)]
     public struct CameraCalibration : IEquatable<CameraCalibration>
     {
-        // Struct used for serialization to native SDK
+        // Structure used for serialization to native SDK
 #pragma warning disable CA1051 // Do not declare visible instance fields
 
         /// <summary>
@@ -86,7 +89,7 @@ namespace Microsoft.Azure.Kinect.Sensor
         /// <inheritdoc/>
         public override int GetHashCode()
         {
-            var hashCode = 2125552744;
+            int hashCode = 2125552744;
             hashCode = (hashCode * -1521134295) + EqualityComparer<Extrinsics>.Default.GetHashCode(this.Extrinsics);
             hashCode = (hashCode * -1521134295) + EqualityComparer<Intrinsics>.Default.GetHashCode(this.Intrinsics);
             hashCode = (hashCode * -1521134295) + this.ResolutionWidth.GetHashCode();
diff --git a/src/csharp/SDK/Extrinsics.cs b/src/csharp/SDK/Extrinsics.cs
index 7efe8a63..be1b2960 100644
--- a/src/csharp/SDK/Extrinsics.cs
+++ b/src/csharp/SDK/Extrinsics.cs
@@ -1,11 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+//------------------------------------------------------------------------------
+// <copyright file="Extrinsics.cs" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+// </copyright>
+//------------------------------------------------------------------------------
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Numerics;
 using System.Runtime.InteropServices;
-using System.Linq;
 
 namespace Microsoft.Azure.Kinect.Sensor
 {
@@ -15,7 +16,7 @@ namespace Microsoft.Azure.Kinect.Sensor
     [StructLayout(LayoutKind.Sequential)]
     public struct Extrinsics : IEquatable<Extrinsics>
     {
-        // Struct used for serialization to native SDK
+        // Structure used for serialization to native SDK
 #pragma warning disable CA1051 // Do not declare visible instance fields
 
         /// <summary>
@@ -25,7 +26,7 @@ namespace Microsoft.Azure.Kinect.Sensor
         public float[] Rotation;
 
         /// <summary>
-        /// Gets translation vector, x,yz (in millimeters).
+        /// Gets translation vector, x, y, z (in millimeters).
         /// </summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
         public float[] Translation;
@@ -33,7 +34,7 @@ namespace Microsoft.Azure.Kinect.Sensor
 #pragma warning restore CA1051 // Do not declare visible instance fields
 
         /// <summary>
-        /// Compares two Extrinsics for equality.
+        /// Compares two <see cref="Extrinsics"/> for equality.
         /// </summary>
         /// <param name="left">First extrinsic to compare.</param>
         /// <param name="right">Second extrinsic to compare.</param>
@@ -44,7 +45,7 @@ namespace Microsoft.Azure.Kinect.Sensor
         }
 
         /// <summary>
-        /// Compares two Extrinsics for inequality.
+        /// Compares two <see cref="Extrinsics"/> for inequality.
         /// </summary>
         /// <param name="left">First extrinsic to compare.</param>
         /// <param name="right">Second extrinsic to compare.</param>
@@ -70,7 +71,7 @@ namespace Microsoft.Azure.Kinect.Sensor
         /// <inheritdoc/>
         public override int GetHashCode()
         {
-            var hashCode = 1370020195;
+            int hashCode = 1370020195;
             hashCode = (hashCode * -1521134295) + EqualityComparer<float[]>.Default.GetHashCode(this.Rotation);
             hashCode = (hashCode * -1521134295) + EqualityComparer<float[]>.Default.GetHashCode(this.Translation);
             return hashCode;
diff --git a/src/csharp/SDK/Intrinsics.cs b/src/csharp/SDK/Intrinsics.cs
index aa87f769..a5c726b2 100644
--- a/src/csharp/SDK/Intrinsics.cs
+++ b/src/csharp/SDK/Intrinsics.cs
@@ -1,5 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+//------------------------------------------------------------------------------
+// <copyright file="Intrinsics.cs" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+// </copyright>
+//------------------------------------------------------------------------------
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
@@ -12,7 +16,7 @@ namespace Microsoft.Azure.Kinect.Sensor
     [StructLayout(LayoutKind.Sequential)]
     public struct Intrinsics : IEquatable<Intrinsics>
     {
-        // Struct used for serialization to native SDK
+        // Structure used for serialization to native SDK
 #pragma warning disable CA1051 // Do not declare visible instance fields
 
         /// <summary>
@@ -34,7 +38,7 @@ namespace Microsoft.Azure.Kinect.Sensor
 #pragma warning restore CA1051 // Do not declare visible instance fields
 
         /// <summary>
-        /// Compare two Intrinsics for equality.
+        /// Compare two <see cref="Intrinsics"/> for equality.
         /// </summary>
         /// <param name="left">First intrinsic to compare.</param>
         /// <param name="right">Second intrinsic to compare.</param>
@@ -45,7 +49,7 @@ namespace Microsoft.Azure.Kinect.Sensor
         }
 
         /// <summary>
-        /// Compare two Intrinsics for inequality.
+        /// Compare two <see cref="Intrinsics"/> for inequality.
         /// </summary>
         /// <param name="left">First intrinsic to compare.</param>
         /// <param name="right">Second intrinsic to compare.</param>
diff --git a/src/csharp/SDK/Microsoft.Azure.Kinect.Sensor.csproj b/src/csharp/SDK/Microsoft.Azure.Kinect.Sensor.csproj
index 80ad790f..ca330a6c 100644
--- a/src/csharp/SDK/Microsoft.Azure.Kinect.Sensor.csproj
+++ b/src/csharp/SDK/Microsoft.Azure.Kinect.Sensor.csproj
@@ -41,8 +41,4 @@
     <PackageReference Include="System.Memory" Version="4.5.3" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 </Project>
diff --git a/src/csharp/SDK/Properties/AssemblyInfo.cs b/src/csharp/SDK/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..43ece935
--- /dev/null
+++ b/src/csharp/SDK/Properties/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+//------------------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// </copyright>
+//------------------------------------------------------------------------------
+using System;
+
+[assembly: CLSCompliant(true)]