ReSharper Reformat: Properties to expression bodied form.

53 files changed, 178 insertions, 835 deletions

diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
index 99fbddf09..693edb143 100644
--- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
+++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
@@ -52,36 +52,12 @@ namespace MediaBrowser.Providers.BoxSets
         {
         }
 
-        protected override bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingGenresFromChildren => true;
 
-        protected override bool EnableUpdatingOfficialRatingFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingOfficialRatingFromChildren => true;
 
-        protected override bool EnableUpdatingStudiosFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingStudiosFromChildren => true;
 
-        protected override bool EnableUpdatingPremiereDateFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingPremiereDateFromChildren => true;
     }
 }
diff --git a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs
index 6619ea980..c6c1a2a94 100644
--- a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs
+++ b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs
@@ -23,15 +23,9 @@ namespace MediaBrowser.Providers.BoxSets
             _httpClient = httpClient;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheMovieDb"; }
-        }
+        public static string ProviderName => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
@@ -150,10 +144,7 @@ namespace MediaBrowser.Providers.BoxSets
                 .ThenByDescending(i => i.vote_count);
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
index a832606a9..e06d93520 100644
--- a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
+++ b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
@@ -241,10 +241,7 @@ namespace MediaBrowser.Providers.BoxSets
             return DownloadInfo(tmdbId, preferredMetadataLanguage, cancellationToken);
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         private static string GetDataFilePath(IApplicationPaths appPaths, string tmdbId, string preferredLanguage)
         {
diff --git a/MediaBrowser.Providers/Folders/FolderMetadataService.cs b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
index 39f6e04a5..c839befff 100644
--- a/MediaBrowser.Providers/Folders/FolderMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
@@ -11,14 +11,7 @@ namespace MediaBrowser.Providers.Folders
 {
     public class FolderMetadataService : MetadataService<Folder, ItemLookupInfo>
     {
-        public override int Order
-        {
-            get
-            {
-                // Make sure the type-specific services get picked first
-                return 10;
-            }
-        }
+        public override int Order => 10;
 
         protected override void MergeData(MetadataResult<Folder> source, MetadataResult<Folder> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
         {
diff --git a/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs b/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
index 7d921d864..2b73fdcd3 100644
--- a/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
+++ b/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
@@ -41,25 +41,13 @@ namespace Priority_Queue
         /// Returns the number of nodes in the queue.
         /// O(1)
         /// </summary>
-        public int Count
-        {
-            get
-            {
-                return _numNodes;
-            }
-        }
+        public int Count => _numNodes;
 
         /// <summary>
         /// Returns the maximum number of items that can be enqueued at once in this queue.  Once you hit this number (ie. once Count == MaxSize),
         /// attempting to enqueue another item will cause undefined behavior.  O(1)
         /// </summary>
-        public int MaxSize
-        {
-            get
-            {
-                return _nodes.Length - 1;
-            }
-        }
+        public int MaxSize => _nodes.Length - 1;
 
         /// <summary>
         /// Removes every node from the queue.
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 7a713b4e5..3322582cc 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -441,34 +441,13 @@ namespace MediaBrowser.Providers.Manager
             return updateType;
         }
 
-        protected virtual bool EnableUpdatingPremiereDateFromChildren
-        {
-            get
-            {
-                return false;
-            }
-        }
-        protected virtual bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return false;
-            }
-        }
-        protected virtual bool EnableUpdatingStudiosFromChildren
-        {
-            get
-            {
-                return false;
-            }
-        }
-        protected virtual bool EnableUpdatingOfficialRatingFromChildren
-        {
-            get
-            {
-                return false;
-            }
-        }
+        protected virtual bool EnableUpdatingPremiereDateFromChildren => false;
+
+        protected virtual bool EnableUpdatingGenresFromChildren => false;
+
+        protected virtual bool EnableUpdatingStudiosFromChildren => false;
+
+        protected virtual bool EnableUpdatingOfficialRatingFromChildren => false;
 
         private ItemUpdateType UpdatePremiereDate(TItemType item, IList<BaseItem> children)
         {
@@ -926,13 +905,7 @@ namespace MediaBrowser.Providers.Manager
             bool replaceData,
             bool mergeMetadataSettings);
 
-        public virtual int Order
-        {
-            get
-            {
-                return 0;
-            }
-        }
+        public virtual int Order => 0;
 
         private bool HasChanged(BaseItem item, IHasItemChangeMonitor changeMonitor, IDirectoryService directoryService)
         {
diff --git a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
index ffbb2d7c1..0b902ccec 100644
--- a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
@@ -119,18 +119,9 @@ namespace MediaBrowser.Providers.MediaInfo
             return Path.Combine(AudioImagesPath, prefix, filename);
         }
 
-        public string AudioImagesPath
-        {
-            get
-            {
-                return Path.Combine(_config.ApplicationPaths.CachePath, "extracted-audio-images");
-            }
-        }
+        public string AudioImagesPath => Path.Combine(_config.ApplicationPaths.CachePath, "extracted-audio-images");
 
-        public string Name
-        {
-            get { return "Image Extractor"; }
-        }
+        public string Name => "Image Extractor";
 
         public bool Supports(BaseItem item)
         {
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
index 31be4d6d3..70bf862fb 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
@@ -53,10 +53,7 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly IChannelManager _channelManager;
         private readonly IMediaSourceManager _mediaSourceManager;
 
-        public string Name
-        {
-            get { return "ffprobe"; }
-        }
+        public string Name => "ffprobe";
 
         public bool HasChanged(BaseItem item, IDirectoryService directoryService)
         {
@@ -227,13 +224,6 @@ namespace MediaBrowser.Providers.MediaInfo
             return prober.Probe(item, options, cancellationToken);
         }
 
-        public int Order
-        {
-            get
-            {
-                // Run last
-                return 100;
-            }
-        }
+        public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
index c5a47836f..b7598ef22 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
@@ -36,20 +36,11 @@ namespace MediaBrowser.Providers.MediaInfo
             _json = json;
         }
 
-        public string Name
-        {
-            get { return "Download missing subtitles"; }
-        }
+        public string Name => "Download missing subtitles";
 
-        public string Description
-        {
-            get { return "Searches the internet for missing subtitles based on metadata configuration."; }
-        }
+        public string Description => "Searches the internet for missing subtitles based on metadata configuration.";
 
-        public string Category
-        {
-            get { return "Library"; }
-        }
+        public string Category => "Library";
 
         private SubtitleOptions GetOptions()
         {
@@ -213,9 +204,6 @@ namespace MediaBrowser.Providers.MediaInfo
             };
         }
 
-        public string Key
-        {
-            get { return "DownloadSubtitles"; }
-        }
+        public string Key => "DownloadSubtitles";
     }
 }
diff --git a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
index e0b6d97ce..6aaad41f7 100644
--- a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
@@ -120,10 +120,7 @@ namespace MediaBrowser.Providers.MediaInfo
             };
         }
 
-        public string Name
-        {
-            get { return "Screen Grabber"; }
-        }
+        public string Name => "Screen Grabber";
 
         public bool Supports(BaseItem item)
         {
@@ -146,13 +143,6 @@ namespace MediaBrowser.Providers.MediaInfo
             return false;
         }
 
-        public int Order
-        {
-            get
-            {
-                // Make sure this comes after internet image providers
-                return 100;
-            }
-        }
+        public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
index d495ffed1..79e61f6a7 100644
--- a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
+++ b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
@@ -45,15 +45,9 @@ namespace MediaBrowser.Providers.Movies
             Current = this;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -199,10 +193,7 @@ namespace MediaBrowser.Providers.Movies
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get { return 1; }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs b/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs
index 0c7c5cecf..b9c5d7ce5 100644
--- a/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs
@@ -29,15 +29,9 @@ namespace MediaBrowser.Providers.Movies
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheMovieDb"; }
-        }
+        public static string ProviderName => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
@@ -199,10 +193,7 @@ namespace MediaBrowser.Providers.Movies
             return null;
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index d85d77701..ef5c781dc 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -122,10 +122,7 @@ namespace MediaBrowser.Providers.Movies
             return movieDb.GetMetadata(id, cancellationToken);
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         /// <summary>
         /// The _TMDB settings task
@@ -633,13 +630,7 @@ namespace MediaBrowser.Providers.Movies
             }
         }
 
-        public int Order
-        {
-            get
-            {
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Movies/MovieDbTrailerProvider.cs b/MediaBrowser.Providers/Movies/MovieDbTrailerProvider.cs
index 485e6a2f9..2a3cdf097 100644
--- a/MediaBrowser.Providers/Movies/MovieDbTrailerProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbTrailerProvider.cs
@@ -27,18 +27,9 @@ namespace MediaBrowser.Providers.Movies
             return MovieDbProvider.Current.GetItemMetadata<Trailer>(info, cancellationToken);
         }
 
-        public string Name
-        {
-            get { return MovieDbProvider.Current.Name; }
-        }
+        public string Name => MovieDbProvider.Current.Name;
 
-        public int Order
-        {
-            get
-            {
-                return 0;
-            }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Movies/MovieExternalIds.cs b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
index 63bcd9e2d..3783c5032 100644
--- a/MediaBrowser.Providers/Movies/MovieExternalIds.cs
+++ b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
@@ -11,20 +11,11 @@ namespace MediaBrowser.Providers.Movies
     {
         public const string BaseMovieDbUrl = "https://www.themoviedb.org/";
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tmdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tmdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return BaseMovieDbUrl + "movie/{0}"; }
-        }
+        public string UrlFormatString => BaseMovieDbUrl + "movie/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -41,20 +32,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class MovieDbSeriesExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tmdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tmdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return MovieDbMovieExternalId.BaseMovieDbUrl + "tv/{0}"; }
-        }
+        public string UrlFormatString => MovieDbMovieExternalId.BaseMovieDbUrl + "tv/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -64,20 +46,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class MovieDbMovieCollectionExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheMovieDb Collection"; }
-        }
+        public string Name => "TheMovieDb Collection";
 
-        public string Key
-        {
-            get { return MetadataProviders.TmdbCollection.ToString(); }
-        }
+        public string Key => MetadataProviders.TmdbCollection.ToString();
 
-        public string UrlFormatString
-        {
-            get { return MovieDbMovieExternalId.BaseMovieDbUrl + "collection/{0}"; }
-        }
+        public string UrlFormatString => MovieDbMovieExternalId.BaseMovieDbUrl + "collection/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -87,20 +60,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class MovieDbPersonExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tmdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tmdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return MovieDbMovieExternalId.BaseMovieDbUrl + "person/{0}"; }
-        }
+        public string UrlFormatString => MovieDbMovieExternalId.BaseMovieDbUrl + "person/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -110,20 +74,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class MovieDbCollectionExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tmdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tmdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return MovieDbMovieExternalId.BaseMovieDbUrl + "collection/{0}"; }
-        }
+        public string UrlFormatString => MovieDbMovieExternalId.BaseMovieDbUrl + "collection/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -133,20 +88,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class ImdbExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "IMDb"; }
-        }
+        public string Name => "IMDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Imdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Imdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.imdb.com/title/{0}"; }
-        }
+        public string UrlFormatString => "https://www.imdb.com/title/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -164,20 +110,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class ImdbPersonExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "IMDb"; }
-        }
+        public string Name => "IMDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Imdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Imdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.imdb.com/name/{0}"; }
-        }
+        public string UrlFormatString => "https://www.imdb.com/name/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
index d4ade5686..33a6c2fa3 100644
--- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs
+++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
@@ -50,29 +50,11 @@ namespace MediaBrowser.Providers.Music
             return updateType;
         }
 
-        protected override bool EnableUpdatingPremiereDateFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingPremiereDateFromChildren => true;
 
-        protected override bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingGenresFromChildren => true;
 
-        protected override bool EnableUpdatingStudiosFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingStudiosFromChildren => true;
 
         private ItemUpdateType SetAlbumArtistFromSongs(MusicAlbum item, IEnumerable<Audio> songs)
         {
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index 5e88e801e..de9551f83 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -24,13 +24,7 @@ namespace MediaBrowser.Providers.Music
                 item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder);
         }
 
-        protected override bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingGenresFromChildren => true;
 
         protected override void MergeData(MetadataResult<MusicArtist> source, MetadataResult<MusicArtist> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
         {
diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
index 5082d6cf6..7ff6e8fa8 100644
--- a/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
@@ -91,19 +91,9 @@ namespace MediaBrowser.Providers.Music
             });
         }
 
-        public string Name
-        {
-            get { return "TheAudioDB"; }
-        }
+        public string Name => "TheAudioDB";
 
-        public int Order
-        {
-            get
-            {
-                // After embedded and fanart
-                return 2;
-            }
-        }
+        public int Order => 2;
 
         public bool Supports(BaseItem item)
         {
diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
index 14747ffe7..f19537b0b 100644
--- a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
@@ -126,10 +126,7 @@ namespace MediaBrowser.Providers.Music
             item.Overview = (overview ?? string.Empty).StripHtml();
         }
 
-        public string Name
-        {
-            get { return "TheAudioDB"; }
-        }
+        public string Name => "TheAudioDB";
 
         internal Task EnsureInfo(string musicBrainzReleaseGroupId, CancellationToken cancellationToken)
         {
@@ -196,14 +193,7 @@ namespace MediaBrowser.Providers.Music
             return Path.Combine(dataPath, "album.json");
         }
 
-        public int Order
-        {
-            get
-            {
-                // After music brainz
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public class Album
         {
diff --git a/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs b/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
index 5385342f2..8ca3f97c8 100644
--- a/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
@@ -133,23 +133,13 @@ namespace MediaBrowser.Providers.Music
             });
         }
 
-        public string Name
-        {
-            get { return "TheAudioDB"; }
-        }
+        public string Name => "TheAudioDB";
 
         public bool Supports(BaseItem item)
         {
             return item is MusicArtist;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After fanart
-                return 1;
-            }
-        }
+        public int Order => 1;
     }
 }
diff --git a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
index a889fffcb..87b6a30e7 100644
--- a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
@@ -114,10 +114,7 @@ namespace MediaBrowser.Providers.Music
             item.Overview = (overview ?? string.Empty).StripHtml();
         }
 
-        public string Name
-        {
-            get { return "TheAudioDB"; }
-        }
+        public string Name => "TheAudioDB";
 
         internal Task EnsureArtistInfo(string musicBrainzId, CancellationToken cancellationToken)
         {
@@ -246,14 +243,7 @@ namespace MediaBrowser.Providers.Music
             public List<Artist> artists { get; set; }
         }
 
-        public int Order
-        {
-            get
-            {
-                // After musicbrainz
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/AudioDbExternalIds.cs b/MediaBrowser.Providers/Music/AudioDbExternalIds.cs
index 62d6c0704..3e1022d7d 100644
--- a/MediaBrowser.Providers/Music/AudioDbExternalIds.cs
+++ b/MediaBrowser.Providers/Music/AudioDbExternalIds.cs
@@ -6,20 +6,11 @@ namespace MediaBrowser.Providers.Music
 {
     public class AudioDbAlbumExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheAudioDb"; }
-        }
+        public string Name => "TheAudioDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.AudioDbAlbum.ToString(); }
-        }
+        public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.theaudiodb.com/album/{0}"; }
-        }
+        public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -29,20 +20,11 @@ namespace MediaBrowser.Providers.Music
 
     public class AudioDbOtherAlbumExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheAudioDb Album"; }
-        }
+        public string Name => "TheAudioDb Album";
 
-        public string Key
-        {
-            get { return MetadataProviders.AudioDbAlbum.ToString(); }
-        }
+        public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.theaudiodb.com/album/{0}"; }
-        }
+        public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -52,20 +34,11 @@ namespace MediaBrowser.Providers.Music
 
     public class AudioDbArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheAudioDb"; }
-        }
+        public string Name => "TheAudioDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.AudioDbArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.AudioDbArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.theaudiodb.com/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -75,20 +48,11 @@ namespace MediaBrowser.Providers.Music
 
     public class AudioDbOtherArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheAudioDb Artist"; }
-        }
+        public string Name => "TheAudioDb Artist";
 
-        public string Key
-        {
-            get { return MetadataProviders.AudioDbArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.AudioDbArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.theaudiodb.com/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
diff --git a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
index c4f352ffd..09c11899b 100644
--- a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
@@ -35,15 +35,9 @@ namespace MediaBrowser.Providers.Music
             _jsonSerializer = jsonSerializer;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -194,14 +188,7 @@ namespace MediaBrowser.Providers.Music
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get
-            {
-                // After embedded provider
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
index 2021ff438..9d63484a8 100644
--- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
@@ -46,15 +46,9 @@ namespace MediaBrowser.Providers.Music
             Current = this;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -192,10 +186,7 @@ namespace MediaBrowser.Providers.Music
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/MovieDbMusicVideoProvider.cs b/MediaBrowser.Providers/Music/MovieDbMusicVideoProvider.cs
index 9924fe5e5..506cbfb89 100644
--- a/MediaBrowser.Providers/Music/MovieDbMusicVideoProvider.cs
+++ b/MediaBrowser.Providers/Music/MovieDbMusicVideoProvider.cs
@@ -22,10 +22,7 @@ namespace MediaBrowser.Providers.Music
             return Task.FromResult((IEnumerable<RemoteSearchResult>)new List<RemoteSearchResult>());
         }
 
-        public string Name
-        {
-            get { return MovieDbProvider.Current.Name; }
-        }
+        public string Name => MovieDbProvider.Current.Name;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
index 207446491..3c54b2d2f 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
@@ -216,10 +216,7 @@ namespace MediaBrowser.Providers.Music
             return result;
         }
 
-        public string Name
-        {
-            get { return "MusicBrainz"; }
-        }
+        public string Name => "MusicBrainz";
 
         private Task<ReleaseResult> GetReleaseResult(string artistMusicBrainId, string artistName, string albumName, CancellationToken cancellationToken)
         {
@@ -753,10 +750,7 @@ namespace MediaBrowser.Providers.Music
             return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
index 72c1ffe8c..8d10834c3 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
@@ -283,10 +283,7 @@ namespace MediaBrowser.Providers.Music
             return WebUtility.UrlEncode(name);
         }
 
-        public string Name
-        {
-            get { return "MusicBrainz"; }
-        }
+        public string Name => "MusicBrainz";
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 2750653c7..614de11ca 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -7,20 +7,11 @@ namespace MediaBrowser.Providers.Music
 {
     public class MusicBrainzReleaseGroupExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Release Group"; }
-        }
+        public string Name => "MusicBrainz Release Group";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzReleaseGroup.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/release-group/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/release-group/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -30,20 +21,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzAlbumArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Album Artist"; }
-        }
+        public string Name => "MusicBrainz Album Artist";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzAlbumArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -53,20 +35,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzAlbumExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Album"; }
-        }
+        public string Name => "MusicBrainz Album";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzAlbum.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/release/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/release/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -76,20 +49,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz"; }
-        }
+        public string Name => "MusicBrainz";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -99,20 +63,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzOtherArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Artist"; }
-        }
+        public string Name => "MusicBrainz Artist";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -122,20 +77,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzTrackId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Track"; }
-        }
+        public string Name => "MusicBrainz Track";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzTrack.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzTrack.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/track/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/track/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -145,20 +91,11 @@ namespace MediaBrowser.Providers.Music
 
     public class ImvdbId : IExternalId
     {
-        public string Name
-        {
-            get { return "IMVDb"; }
-        }
+        public string Name => "IMVDb";
 
-        public string Key
-        {
-            get { return "IMVDb"; }
-        }
+        public string Key => "IMVDb";
 
-        public string UrlFormatString
-        {
-            get { return null; }
-        }
+        public string UrlFormatString => null;
 
         public bool Supports(IHasProviderIds item)
         {
diff --git a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
index c30801a91..8592b5c67 100644
--- a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
@@ -86,24 +86,13 @@ namespace MediaBrowser.Providers.Omdb
             });
         }
 
-        public string Name
-        {
-            get { return "The Open Movie Database"; }
-        }
+        public string Name => "The Open Movie Database";
 
         public bool Supports(BaseItem item)
         {
             return item is Movie || item is Trailer || item is Episode;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After other internet providers, because they're better
-                // But before fallback providers like screengrab
-                return 90;
-            }
-        }
+        public int Order => 90;
     }
 }
diff --git a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
index 19ce7dddd..5dab978c0 100644
--- a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
@@ -43,14 +43,7 @@ namespace MediaBrowser.Providers.Omdb
             _appHost = appHost;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After primary option
-                return 2;
-            }
-        }
+        public int Order => 2;
 
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo searchInfo, CancellationToken cancellationToken)
         {
@@ -203,10 +196,7 @@ namespace MediaBrowser.Providers.Omdb
             return GetSearchResults(searchInfo, "movie", cancellationToken);
         }
 
-        public string Name
-        {
-            get { return "The Open Movie Database"; }
-        }
+        public string Name => "The Open Movie Database";
 
         public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs
index 0a222b42f..3019ee506 100644
--- a/MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs
+++ b/MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs
@@ -27,15 +27,9 @@ namespace MediaBrowser.Providers.People
             _httpClient = httpClient;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheMovieDb"; }
-        }
+        public static string ProviderName => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
@@ -124,10 +118,7 @@ namespace MediaBrowser.Providers.People
             return profile.iso_639_1 == null ? null : profile.iso_639_1.ToString();
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
index ed4f7dcea..8fc5f40f8 100644
--- a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
+++ b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
@@ -44,10 +44,7 @@ namespace MediaBrowser.Providers.People
             Current = this;
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(PersonLookupInfo searchInfo, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs b/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs
index a282053ce..cf2acdf49 100644
--- a/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs
+++ b/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs
@@ -38,15 +38,9 @@ namespace MediaBrowser.Providers.People
             _xmlSettings = xmlSettings;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheTVDB"; }
-        }
+        public static string ProviderName => "TheTVDB";
 
         public bool Supports(BaseItem item)
         {
@@ -224,10 +218,7 @@ namespace MediaBrowser.Providers.People
             return null;
         }
 
-        public int Order
-        {
-            get { return 1; }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
index 3558353ad..2f2d8eaeb 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
@@ -29,10 +29,7 @@ namespace MediaBrowser.Providers.Playlists
             _logger = logger;
         }
 
-        public string Name
-        {
-            get { return "Playlist Reader"; }
-        }
+        public string Name => "Playlist Reader";
 
         public Task<ItemUpdateType> FetchAsync(Playlist item, MetadataRefreshOptions options, CancellationToken cancellationToken)
         {
@@ -161,13 +158,6 @@ namespace MediaBrowser.Providers.Playlists
             return false;
         }
 
-        public int Order
-        {
-            get
-            {
-                // Run last
-                return 100;
-            }
-        }
+        public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
index 7752bd03d..b28d2a548 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -37,28 +37,10 @@ namespace MediaBrowser.Providers.Playlists
         {
         }
 
-        protected override bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingGenresFromChildren => true;
 
-        protected override bool EnableUpdatingOfficialRatingFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingOfficialRatingFromChildren => true;
 
-        protected override bool EnableUpdatingStudiosFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingStudiosFromChildren => true;
     }
 }
diff --git a/MediaBrowser.Providers/Studios/StudiosImageProvider.cs b/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
index 0d9341257..481f0d01f 100644
--- a/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
+++ b/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
@@ -28,10 +28,7 @@ namespace MediaBrowser.Providers.Studios
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return "Emby Designs"; }
-        }
+        public string Name => "Emby Designs";
 
         public bool Supports(BaseItem item)
         {
@@ -119,10 +116,7 @@ namespace MediaBrowser.Providers.Studios
             return EnsureList(url, file, _httpClient, _fileSystem, cancellationToken);
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
index 0d90aa35a..9d537f3df 100644
--- a/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
+++ b/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
@@ -37,15 +37,9 @@ namespace MediaBrowser.Providers.TV
             _json = json;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -200,10 +194,7 @@ namespace MediaBrowser.Providers.TV
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get { return 1; }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
index bb929b933..abdd0c7bf 100644
--- a/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
@@ -46,15 +46,9 @@ namespace MediaBrowser.Providers.TV
             Current = this;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -210,10 +204,7 @@ namespace MediaBrowser.Providers.TV
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get { return 1; }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
index e79718f50..e37e867e5 100644
--- a/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
@@ -69,19 +69,9 @@ namespace MediaBrowser.Providers.TV
             return result;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After TheTvDb
-                return 1;
-            }
-        }
+        public int Order => 1;
 
-        public string Name
-        {
-            get { return "The Open Movie Database"; }
-        }
+        public string Name => "The Open Movie Database";
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/SeasonMetadataService.cs b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
index c21f86b9c..c575057de 100644
--- a/MediaBrowser.Providers/TV/SeasonMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
@@ -54,13 +54,7 @@ namespace MediaBrowser.Providers.TV
             return updateType;
         }
 
-        protected override bool EnableUpdatingPremiereDateFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingPremiereDateFromChildren => true;
 
         protected override IList<BaseItem> GetChildrenForMetadataUpdates(Season item)
         {
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
index 392fa781c..775b30d8d 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
@@ -117,23 +117,13 @@ namespace MediaBrowser.Providers.TV
             return GetResponse(url, cancellationToken);
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
             return item is Controller.Entities.TV.Episode;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After tvdb
-                return 1;
-            }
-        }
+        public int Order => 1;
     }
 }
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
index 8b9146963..49f73286d 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
@@ -210,18 +210,8 @@ namespace MediaBrowser.Providers.TV
             return GetResponse(url, cancellationToken);
         }
 
-        public int Order
-        {
-            get
-            {
-                // After TheTvDb
-                return 1;
-            }
-        }
+        public int Order => 1;
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
     }
 }
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
index 1ee62b272..3df3cf8b8 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
@@ -34,10 +34,7 @@ namespace MediaBrowser.Providers.TV
             _logger = loggerFactory.CreateLogger(GetType().Name);
         }
 
-        protected ILogger Logger
-        {
-            get { return _logger; }
-        }
+        protected ILogger Logger => _logger;
 
         protected async Task<RootObject> GetEpisodeInfo(string seriesTmdbId, int season, int episodeNumber, string preferredMetadataLanguage,
             CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
index d4884cad9..a29fd46df 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
@@ -109,10 +109,7 @@ namespace MediaBrowser.Providers.TV
             return result;
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeasonInfo searchInfo, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
index 4300ff3a0..dc525d0fa 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
@@ -29,15 +29,9 @@ namespace MediaBrowser.Providers.TV
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheMovieDb"; }
-        }
+        public static string ProviderName => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
@@ -177,14 +171,7 @@ namespace MediaBrowser.Providers.TV
             return null;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After tvdb and fanart
-                return 2;
-            }
-        }
+        public int Order => 2;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
index 899d79c3e..0844862db 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
@@ -49,10 +49,7 @@ namespace MediaBrowser.Providers.TV
             Current = this;
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo searchInfo, CancellationToken cancellationToken)
         {
@@ -681,14 +678,7 @@ namespace MediaBrowser.Providers.TV
             public string ResultLanguage { get; set; }
         }
 
-        public int Order
-        {
-            get
-            {
-                // After Tvdb
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
index 08d968f32..c594cb923 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
@@ -30,10 +30,7 @@ namespace MediaBrowser.Providers.TV
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
         public bool Supports(BaseItem item)
         {
@@ -163,10 +160,7 @@ namespace MediaBrowser.Providers.TV
             };
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
index 8364be2c3..dc0a785ec 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
@@ -93,10 +93,7 @@ namespace MediaBrowser.Providers.TV
             return Task.FromResult((IEnumerable<RemoteSearchResult>)list);
         }
 
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
         public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo searchInfo, CancellationToken cancellationToken)
         {
@@ -916,6 +913,6 @@ namespace MediaBrowser.Providers.TV
             });
         }
 
-        public int Order { get { return 0; } }
+        public int Order => 0;
     }
 }
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
index 397afe87a..4cdfb4b11 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
@@ -38,15 +38,9 @@ namespace MediaBrowser.Providers.TV
             _xmlSettings = xmlSettings;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheTVDB"; }
-        }
+        public static string ProviderName => "TheTVDB";
 
         public bool Supports(BaseItem item)
         {
@@ -345,10 +339,7 @@ namespace MediaBrowser.Providers.TV
 
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
index 1bf22309d..3ee1bf7dc 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
@@ -37,15 +37,9 @@ namespace MediaBrowser.Providers.TV
             _xmlReaderSettingsFactory = xmlReaderSettingsFactory;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheTVDB"; }
-        }
+        public static string ProviderName => "TheTVDB";
 
         public bool Supports(BaseItem item)
         {
@@ -339,10 +333,7 @@ namespace MediaBrowser.Providers.TV
 
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
index 2f3c766a4..f4fe6ee27 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
@@ -1735,10 +1735,7 @@ namespace MediaBrowser.Providers.TV
             return sbOutput.ToString();
         }
 
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
         public async Task Identify(SeriesInfo info)
         {
@@ -1758,13 +1755,7 @@ namespace MediaBrowser.Providers.TV
             }
         }
 
-        public int Order
-        {
-            get
-            {
-                return 0;
-            }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index 058e9a762..001ce1465 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -6,20 +6,11 @@ namespace MediaBrowser.Providers.TV
 {
     public class Zap2ItExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "Zap2It"; }
-        }
+        public string Name => "Zap2It";
 
-        public string Key
-        {
-            get { return MetadataProviders.Zap2It.ToString(); }
-        }
+        public string Key => MetadataProviders.Zap2It.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}"; }
-        }
+        public string UrlFormatString => "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -29,20 +20,11 @@ namespace MediaBrowser.Providers.TV
 
     public class TvdbExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tvdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tvdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return TvdbPrescanTask.TvdbBaseUrl + "?tab=series&id={0}"; }
-        }
+        public string UrlFormatString => TvdbPrescanTask.TvdbBaseUrl + "?tab=series&id={0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -52,20 +34,11 @@ namespace MediaBrowser.Providers.TV
 
     public class TvdbSeasonExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tvdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tvdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return null; }
-        }
+        public string UrlFormatString => null;
 
         public bool Supports(IHasProviderIds item)
         {
@@ -75,20 +48,11 @@ namespace MediaBrowser.Providers.TV
 
     public class TvdbEpisodeExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tvdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tvdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return TvdbPrescanTask.TvdbBaseUrl + "?tab=episode&id={0}"; }
-        }
+        public string UrlFormatString => TvdbPrescanTask.TvdbBaseUrl + "?tab=episode&id={0}";
 
         public bool Supports(IHasProviderIds item)
         {
diff --git a/MediaBrowser.Providers/Videos/VideoMetadataService.cs b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
index 01ca0b2aa..adaf39c40 100644
--- a/MediaBrowser.Providers/Videos/VideoMetadataService.cs
+++ b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
@@ -11,14 +11,7 @@ namespace MediaBrowser.Providers.Videos
 {
     public class VideoMetadataService : MetadataService<Video, ItemLookupInfo>
     {
-        public override int Order
-        {
-            get
-            {
-                // Make sure the type-specific services get picked first
-                return 10;
-            }
-        }
+        public override int Order => 10;
 
         protected override void MergeData(MetadataResult<Video> source, MetadataResult<Video> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
         {