diff --git a/MediaManager/Media/MediaExtractorBase.cs b/MediaManager/Media/MediaExtractorBase.cs
index 32c62b53..87980f0b 100644
--- a/MediaManager/Media/MediaExtractorBase.cs
+++ b/MediaManager/Media/MediaExtractorBase.cs
@@ -134,7 +134,7 @@ public virtual async Task<IMediaItem> UpdateMediaItem(IMediaItem mediaItem)
         {
             if (!mediaItem.IsMetadataExtracted)
             {
-                if(string.IsNullOrEmpty(mediaItem.FileExtension))
+                if (string.IsNullOrEmpty(mediaItem.FileExtension))
                 {
                     mediaItem.FileExtension = GetFileExtension(mediaItem);
                 }
@@ -225,7 +225,7 @@ public virtual MediaType GetMediaType(IMediaItem mediaItem)
                 ? mediaItem.FileExtension
                 : GetFileExtension(mediaItem);
 
-            if(VideoSuffixes.Contains(fileExtension))
+            if (VideoSuffixes.Contains(fileExtension))
                 return MediaType.Video;
             else if (AudioSuffixes.Contains(fileExtension))
                 return MediaType.Audio;
diff --git a/MediaManager/Platforms/Android/Player/AndroidMediaPlayer.cs b/MediaManager/Platforms/Android/Player/AndroidMediaPlayer.cs
index 787aafc3..29cbc1b6 100644
--- a/MediaManager/Platforms/Android/Player/AndroidMediaPlayer.cs
+++ b/MediaManager/Platforms/Android/Player/AndroidMediaPlayer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Android.Content;
 using Android.Graphics.Drawables;
diff --git a/MediaManager/Platforms/Ios/Player/IosMediaPlayer.cs b/MediaManager/Platforms/Ios/Player/IosMediaPlayer.cs
index 5f7b85f5..6bb5d892 100644
--- a/MediaManager/Platforms/Ios/Player/IosMediaPlayer.cs
+++ b/MediaManager/Platforms/Ios/Player/IosMediaPlayer.cs
@@ -101,7 +101,7 @@ private async void ToneInterruptionListener(object sender, AVAudioSessionInterru
                     await MediaManager.Pause();
                     break;
                 case AVAudioSessionInterruptionType.Ended:
-                    if(interruptArgs.Option == AVAudioSessionInterruptionOptions.ShouldResume)
+                    if (interruptArgs.Option == AVAudioSessionInterruptionOptions.ShouldResume)
                     {
                         await MediaManager.Play();
                     }
diff --git a/Samples/ElementPlayer.Android/LinkerPleaseInclude.cs b/Samples/ElementPlayer.Android/LinkerPleaseInclude.cs
index 461275e4..958210d8 100644
--- a/Samples/ElementPlayer.Android/LinkerPleaseInclude.cs
+++ b/Samples/ElementPlayer.Android/LinkerPleaseInclude.cs
@@ -1,12 +1,12 @@
-using Android.App;
+using System;
+using System.Collections.Specialized;
+using System.Windows.Input;
+using Android.App;
 using Android.Views;
 using Android.Widget;
 using MvvmCross.Binding.BindingContext;
 using MvvmCross.Navigation;
 using MvvmCross.ViewModels;
-using System;
-using System.Collections.Specialized;
-using System.Windows.Input;
 
 namespace ElementPlayer.Android
 {
diff --git a/Samples/ElementPlayer.Forms.Android/Properties/AssemblyInfo.cs b/Samples/ElementPlayer.Forms.Android/Properties/AssemblyInfo.cs
index 085e94eb..d6635fb6 100644
--- a/Samples/ElementPlayer.Forms.Android/Properties/AssemblyInfo.cs
+++ b/Samples/ElementPlayer.Forms.Android/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
-using Android.App;
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
+using Android.App;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
diff --git a/Samples/ElementPlayer.Forms.Mac/ViewController.cs b/Samples/ElementPlayer.Forms.Mac/ViewController.cs
index 1a2edc81..a67b78e3 100644
--- a/Samples/ElementPlayer.Forms.Mac/ViewController.cs
+++ b/Samples/ElementPlayer.Forms.Mac/ViewController.cs
@@ -1,6 +1,6 @@
-using AppKit;
+using System;
+using AppKit;
 using Foundation;
-using System;
 
 namespace ElementPlayer.Forms.Mac
 {
diff --git a/Samples/ElementPlayer.Mac/ViewController.cs b/Samples/ElementPlayer.Mac/ViewController.cs
index fd642c1c..50554fa7 100644
--- a/Samples/ElementPlayer.Mac/ViewController.cs
+++ b/Samples/ElementPlayer.Mac/ViewController.cs
@@ -1,6 +1,6 @@
-using AppKit;
+using System;
+using AppKit;
 using Foundation;
-using System;
 
 namespace ElementPlayer.Mac
 {
diff --git a/Samples/ElementPlayer.iOS/LinkerPleaseInclude.cs b/Samples/ElementPlayer.iOS/LinkerPleaseInclude.cs
index 1a992262..ed5b230d 100644
--- a/Samples/ElementPlayer.iOS/LinkerPleaseInclude.cs
+++ b/Samples/ElementPlayer.iOS/LinkerPleaseInclude.cs
@@ -1,11 +1,11 @@
-using Foundation;
+using System;
+using System.Collections.Specialized;
+using System.Windows.Input;
+using Foundation;
 using MvvmCross.Binding.BindingContext;
 using MvvmCross.Navigation;
 using MvvmCross.Platforms.Ios.Views;
 using MvvmCross.ViewModels;
-using System;
-using System.Collections.Specialized;
-using System.Windows.Input;
 using UIKit;
 
 namespace ElementPlayer.iOS
diff --git a/Samples/ElementPlayer.iOS/Views/Cells/MediaCell.cs b/Samples/ElementPlayer.iOS/Views/Cells/MediaCell.cs
index c0aaa99b..5ee70114 100644
--- a/Samples/ElementPlayer.iOS/Views/Cells/MediaCell.cs
+++ b/Samples/ElementPlayer.iOS/Views/Cells/MediaCell.cs
@@ -1,8 +1,8 @@
-using Foundation;
+using System;
+using Foundation;
 using MediaManager.Library;
 using MvvmCross.Binding.BindingContext;
 using MvvmCross.Platforms.Ios.Binding.Views;
-using System;
 using UIKit;
 
 namespace ElementPlayer.iOS.Views.Cells
diff --git a/Samples/ElementPlayer.iOS/Views/HomeViewController.cs b/Samples/ElementPlayer.iOS/Views/HomeViewController.cs
index 0a9beddb..4ff78ed3 100644
--- a/Samples/ElementPlayer.iOS/Views/HomeViewController.cs
+++ b/Samples/ElementPlayer.iOS/Views/HomeViewController.cs
@@ -1,10 +1,10 @@
-using ElementPlayer.Core.ViewModels;
+using System;
+using ElementPlayer.Core.ViewModels;
 using ElementPlayer.iOS.Views.Cells;
 using MvvmCross.Binding.BindingContext;
 using MvvmCross.Platforms.Ios.Binding.Views;
 using MvvmCross.Platforms.Ios.Presenters.Attributes;
 using MvvmCross.Platforms.Ios.Views;
-using System;
 
 namespace ElementPlayer.iOS.Views
 {
diff --git a/Samples/ElementPlayer.iOS/Views/PlayerViewController.cs b/Samples/ElementPlayer.iOS/Views/PlayerViewController.cs
index 073c3b9c..b079b765 100644
--- a/Samples/ElementPlayer.iOS/Views/PlayerViewController.cs
+++ b/Samples/ElementPlayer.iOS/Views/PlayerViewController.cs
@@ -1,9 +1,9 @@
-using ElementPlayer.Core.ViewModels;
+using System;
+using ElementPlayer.Core.ViewModels;
 using MediaManager;
 using MvvmCross.Binding.BindingContext;
 using MvvmCross.Platforms.Ios.Presenters.Attributes;
 using MvvmCross.Platforms.Ios.Views;
-using System;
 
 namespace ElementPlayer.iOS.Views
 {