diff --git a/ZuneDBApi/AuthorizationStatus.cs b/ZuneDBApi/AuthorizationStatus.cs
index cc055bc..d268e46 100644
--- a/ZuneDBApi/AuthorizationStatus.cs
+++ b/ZuneDBApi/AuthorizationStatus.cs
@@ -1,6 +1,3 @@
-using System.Runtime.CompilerServices;
-
-[NativeCppClass]
 internal enum AuthorizationStatus
 {
 
diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/NotificationMarshaller.cs b/ZuneDBApi/Microsoft/Zune/Configuration/NotificationMarshaller.cs
index f62bafa..a7e4e60 100644
--- a/ZuneDBApi/Microsoft/Zune/Configuration/NotificationMarshaller.cs
+++ b/ZuneDBApi/Microsoft/Zune/Configuration/NotificationMarshaller.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.Configuration
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-		[NativeCppClass]
-		internal struct NotificationMarshaller
+	[NativeCppClass]
+	internal struct NotificationMarshaller
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/RefreshCallback.cs b/ZuneDBApi/Microsoft/Zune/Configuration/RefreshCallback.cs
index 21187a8..46f9d7c 100644
--- a/ZuneDBApi/Microsoft/Zune/Configuration/RefreshCallback.cs
+++ b/ZuneDBApi/Microsoft/Zune/Configuration/RefreshCallback.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.Configuration
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-			[NativeCppClass]
+	[NativeCppClass]
 	internal struct RefreshCallback
 	{
 		private long _003Calignment_0020member_003E;
diff --git a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingCallbackWrapper.cs b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingCallbackWrapper.cs
index 8317ae8..c5d4023 100644
--- a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingCallbackWrapper.cs
+++ b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingCallbackWrapper.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.Messaging
 {
 	[StructLayout(LayoutKind.Sequential, Size = 32)]
-		[NativeCppClass]
-		internal struct MessagingCallbackWrapper
+	[NativeCppClass]
+	internal struct MessagingCallbackWrapper
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingSubscriber.cs b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingSubscriber.cs
index 37d0ec0..e929925 100644
--- a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingSubscriber.cs
+++ b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingSubscriber.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Zune.Messaging
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
 	[NativeCppClass]
-			internal struct MessagingSubscriber
+	internal struct MessagingSubscriber
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistAsyncOperation.cs b/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistAsyncOperation.cs
index d1188f5..e175186 100644
--- a/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistAsyncOperation.cs
+++ b/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistAsyncOperation.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Zune.Playlist
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
 	[NativeCppClass]
-			internal struct PlaylistAsyncOperation
+	internal struct PlaylistAsyncOperation
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixCallbackProxy.cs b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixCallbackProxy.cs
index 330ef5a..c67d58e 100644
--- a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixCallbackProxy.cs
+++ b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixCallbackProxy.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.QuickMix
 {
 	[StructLayout(LayoutKind.Sequential, Size = 48)]
-		[NativeCppClass]
-		internal struct QuickMixCallbackProxy
+	[NativeCppClass]
+	internal struct QuickMixCallbackProxy
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Service/VideoOfferParams.cs b/ZuneDBApi/Microsoft/Zune/Service/VideoOfferParams.cs
index 4982d53..d063ca7 100644
--- a/ZuneDBApi/Microsoft/Zune/Service/VideoOfferParams.cs
+++ b/ZuneDBApi/Microsoft/Zune/Service/VideoOfferParams.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.Service
 {
 	[StructLayout(LayoutKind.Sequential, Size = 12)]
-		[NativeCppClass]
-		internal struct VideoOfferParams
+	[NativeCppClass]
+	internal struct VideoOfferParams
 	{
 		private int _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/PROPERTY_TO_PID_MAP.cs b/ZuneDBApi/Microsoft/Zune/Subscription/PROPERTY_TO_PID_MAP.cs
index d6d49f1..4f45152 100644
--- a/ZuneDBApi/Microsoft/Zune/Subscription/PROPERTY_TO_PID_MAP.cs
+++ b/ZuneDBApi/Microsoft/Zune/Subscription/PROPERTY_TO_PID_MAP.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Zune.Subscription
 {
 	[StructLayout(LayoutKind.Sequential, Size = 16)]
 	[NativeCppClass]
-			internal struct PROPERTY_TO_PID_MAP
+	internal struct PROPERTY_TO_PID_MAP
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeListProxy.cs b/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeListProxy.cs
index 05ce062..4c72534 100644
--- a/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeListProxy.cs
+++ b/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeListProxy.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.Subscription
 {
 	[StructLayout(LayoutKind.Sequential, Size = 40)]
-		[NativeCppClass]
-		internal struct VirtualSubscriptionEpisodeListProxy
+	[NativeCppClass]
+	internal struct VirtualSubscriptionEpisodeListProxy
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Util/PurchaseOffersCallbackWrapper.cs b/ZuneDBApi/Microsoft/Zune/Util/PurchaseOffersCallbackWrapper.cs
index 094498a..a25f330 100644
--- a/ZuneDBApi/Microsoft/Zune/Util/PurchaseOffersCallbackWrapper.cs
+++ b/ZuneDBApi/Microsoft/Zune/Util/PurchaseOffersCallbackWrapper.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.Util
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-		[NativeCppClass]
-		internal struct PurchaseOffersCallbackWrapper
+	[NativeCppClass]
+	internal struct PurchaseOffersCallbackWrapper
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Util/RadioStationProxy.cs b/ZuneDBApi/Microsoft/Zune/Util/RadioStationProxy.cs
index b22cac3..5739d12 100644
--- a/ZuneDBApi/Microsoft/Zune/Util/RadioStationProxy.cs
+++ b/ZuneDBApi/Microsoft/Zune/Util/RadioStationProxy.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Zune.Util
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
 	[NativeCppClass]
-			internal struct RadioStationProxy
+	internal struct RadioStationProxy
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Util/UpdateProxy.cs b/ZuneDBApi/Microsoft/Zune/Util/UpdateProxy.cs
index 9359128..0400c9f 100644
--- a/ZuneDBApi/Microsoft/Zune/Util/UpdateProxy.cs
+++ b/ZuneDBApi/Microsoft/Zune/Util/UpdateProxy.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.Util
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-			[NativeCppClass]
+	[NativeCppClass]
 	internal struct UpdateProxy
 	{
 		private long _003Calignment_0020member_003E;
diff --git a/ZuneDBApi/Microsoft/Zune/Util/Win7ShellManagerMediator.cs b/ZuneDBApi/Microsoft/Zune/Util/Win7ShellManagerMediator.cs
index fd14f1c..2394e95 100644
--- a/ZuneDBApi/Microsoft/Zune/Util/Win7ShellManagerMediator.cs
+++ b/ZuneDBApi/Microsoft/Zune/Util/Win7ShellManagerMediator.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Zune.Util
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
 	[NativeCppClass]
-			internal struct Win7ShellManagerMediator
+	internal struct Win7ShellManagerMediator
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHostEventSink.cs b/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHostEventSink.cs
index aa732e8..79c142f 100644
--- a/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHostEventSink.cs
+++ b/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHostEventSink.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 namespace Microsoft.Zune.Util
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-			[NativeCppClass]
+	[NativeCppClass]
 	internal struct ZuneWebHostEventSink
 	{
 		private long _003Calignment_0020member_003E;
diff --git a/ZuneDBApi/MicrosoftZuneInterop/PropIdMapEntry.cs b/ZuneDBApi/MicrosoftZuneInterop/PropIdMapEntry.cs
index 0d2a674..4e535b2 100644
--- a/ZuneDBApi/MicrosoftZuneInterop/PropIdMapEntry.cs
+++ b/ZuneDBApi/MicrosoftZuneInterop/PropIdMapEntry.cs
@@ -5,7 +5,7 @@ namespace MicrosoftZuneInterop
 {
 	[StructLayout(LayoutKind.Sequential, Size = 16)]
 	[NativeCppClass]
-			internal struct PropIdMapEntry
+	internal struct PropIdMapEntry
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/MicrosoftZuneLibrary/CBurnPublisherCallback.cs b/ZuneDBApi/MicrosoftZuneLibrary/CBurnPublisherCallback.cs
index 2143b43..a4ebd9a 100644
--- a/ZuneDBApi/MicrosoftZuneLibrary/CBurnPublisherCallback.cs
+++ b/ZuneDBApi/MicrosoftZuneLibrary/CBurnPublisherCallback.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace MicrosoftZuneLibrary
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-		[NativeCppClass]
-		internal struct CBurnPublisherCallback
+	[NativeCppClass]
+	internal struct CBurnPublisherCallback
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/MicrosoftZuneLibrary/CallbackOnUIThreadBimodalUnmanaged_DONOTUSE.cs b/ZuneDBApi/MicrosoftZuneLibrary/CallbackOnUIThreadBimodalUnmanaged_DONOTUSE.cs
index 49a941a..6ba6696 100644
--- a/ZuneDBApi/MicrosoftZuneLibrary/CallbackOnUIThreadBimodalUnmanaged_DONOTUSE.cs
+++ b/ZuneDBApi/MicrosoftZuneLibrary/CallbackOnUIThreadBimodalUnmanaged_DONOTUSE.cs
@@ -5,7 +5,7 @@ namespace MicrosoftZuneLibrary
 {
 	[StructLayout(LayoutKind.Sequential, Size = 16)]
 	[NativeCppClass]
-			internal struct CallbackOnUIThreadBimodalUnmanaged_DONOTUSE
+	internal struct CallbackOnUIThreadBimodalUnmanaged_DONOTUSE
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/MicrosoftZuneLibrary/NativeInteropNotifications.cs b/ZuneDBApi/MicrosoftZuneLibrary/NativeInteropNotifications.cs
index b0e9f7e..8a094e9 100644
--- a/ZuneDBApi/MicrosoftZuneLibrary/NativeInteropNotifications.cs
+++ b/ZuneDBApi/MicrosoftZuneLibrary/NativeInteropNotifications.cs
@@ -5,7 +5,7 @@ namespace MicrosoftZuneLibrary
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
 	[NativeCppClass]
-			internal struct NativeInteropNotifications
+	internal struct NativeInteropNotifications
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/MicrosoftZuneLibrary/NativeMetadataNotifications.cs b/ZuneDBApi/MicrosoftZuneLibrary/NativeMetadataNotifications.cs
index aedfa4b..117abb5 100644
--- a/ZuneDBApi/MicrosoftZuneLibrary/NativeMetadataNotifications.cs
+++ b/ZuneDBApi/MicrosoftZuneLibrary/NativeMetadataNotifications.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace MicrosoftZuneLibrary
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-		[NativeCppClass]
-		internal struct NativeMetadataNotifications
+	[NativeCppClass]
+	internal struct NativeMetadataNotifications
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/MicrosoftZuneLibrary/RecordManagerCallback.cs b/ZuneDBApi/MicrosoftZuneLibrary/RecordManagerCallback.cs
index 1b7e74f..b5d3b99 100644
--- a/ZuneDBApi/MicrosoftZuneLibrary/RecordManagerCallback.cs
+++ b/ZuneDBApi/MicrosoftZuneLibrary/RecordManagerCallback.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace MicrosoftZuneLibrary
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-		[NativeCppClass]
-		internal struct RecordManagerCallback
+	[NativeCppClass]
+	internal struct RecordManagerCallback
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ResultSetEventRelay.cs b/ZuneDBApi/MicrosoftZuneLibrary/ResultSetEventRelay.cs
index b1a08ce..fb6206d 100644
--- a/ZuneDBApi/MicrosoftZuneLibrary/ResultSetEventRelay.cs
+++ b/ZuneDBApi/MicrosoftZuneLibrary/ResultSetEventRelay.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace MicrosoftZuneLibrary
 {
 	[StructLayout(LayoutKind.Sequential, Size = 56)]
-		[NativeCppClass]
-		internal struct ResultSetEventRelay
+	[NativeCppClass]
+	internal struct ResultSetEventRelay
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/MicrosoftZuneLibrary/WMISGetAlbumForAlbumIdCallbackWrapper.cs b/ZuneDBApi/MicrosoftZuneLibrary/WMISGetAlbumForAlbumIdCallbackWrapper.cs
index 1ffe8b0..5815f4d 100644
--- a/ZuneDBApi/MicrosoftZuneLibrary/WMISGetAlbumForAlbumIdCallbackWrapper.cs
+++ b/ZuneDBApi/MicrosoftZuneLibrary/WMISGetAlbumForAlbumIdCallbackWrapper.cs
@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 namespace MicrosoftZuneLibrary
 {
 	[StructLayout(LayoutKind.Sequential, Size = 24)]
-		[NativeCppClass]
-		internal struct WMISGetAlbumForAlbumIdCallbackWrapper
+	[NativeCppClass]
+	internal struct WMISGetAlbumForAlbumIdCallbackWrapper
 	{
 		private long _003Calignment_0020member_003E;
 	}
diff --git a/ZuneDBApi/Module.cs b/ZuneDBApi/Module.cs
index 0027472..8f4051c 100644
--- a/ZuneDBApi/Module.cs
+++ b/ZuneDBApi/Module.cs
@@ -58,7 +58,7 @@ namespace ZuneDBApi
 
         public static T AddByteOffset<T>(ref T obj, int offset)
         {
-            return System.Runtime.CompilerServices.Unsafe.AddByteOffset(ref obj, new IntPtr(offset));
+            return Unsafe.AddByteOffset(ref obj, new IntPtr(offset));
         }
 
         public static int CloseClipboard()
diff --git a/ZuneDBApi/POWER_INFORMATION_LEVEL.cs b/ZuneDBApi/POWER_INFORMATION_LEVEL.cs
index 4ed9543..805a0d2 100644
--- a/ZuneDBApi/POWER_INFORMATION_LEVEL.cs
+++ b/ZuneDBApi/POWER_INFORMATION_LEVEL.cs
@@ -1,6 +1,3 @@
-using System.Runtime.CompilerServices;
-
-[NativeCppClass]
 internal enum POWER_INFORMATION_LEVEL
 {
 
diff --git a/ZuneDBApi/WMIDPREQUESTCODE.cs b/ZuneDBApi/WMIDPREQUESTCODE.cs
index 505bcd1..d9288de 100644
--- a/ZuneDBApi/WMIDPREQUESTCODE.cs
+++ b/ZuneDBApi/WMIDPREQUESTCODE.cs
@@ -1,6 +1,3 @@
-using System.Runtime.CompilerServices;
-
-[NativeCppClass]
 internal enum WMIDPREQUESTCODE
 {
 
diff --git a/ZuneDBApi/WMT_ATTR_DATATYPE.cs b/ZuneDBApi/WMT_ATTR_DATATYPE.cs
index ec101cc..b8ad1b5 100644
--- a/ZuneDBApi/WMT_ATTR_DATATYPE.cs
+++ b/ZuneDBApi/WMT_ATTR_DATATYPE.cs
@@ -1,6 +1,5 @@
 using System.Runtime.CompilerServices;
 
-[NativeCppClass]
 internal enum WMT_ATTR_DATATYPE
 {