1 files changed, 11 insertions, 14 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
index bce018d3e..d236e546b 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
@@ -11,56 +11,53 @@ using System.Threading.Tasks;
 namespace MediaBrowser.Api.HttpHandlers
 {
     [Export(typeof(BaseHandler))]
-    public class ItemListHandler : BaseSerializationHandler<DTOBaseItem[]>
+    public class ItemListHandler : BaseSerializationHandler<DtoBaseItem[]>
     {
         public override bool HandlesRequest(HttpListenerRequest request)
         {
             return ApiService.IsApiUrlMatch("itemlist", request);
         }
 
-        protected override Task<DTOBaseItem[]> GetObjectToSerialize()
+        protected override Task<DtoBaseItem[]> GetObjectToSerialize()
         {
             User user = ApiService.GetUserById(QueryString["userid"], true);
 
-            return Task.WhenAll<DTOBaseItem>(GetItemsToSerialize(user).Select(i =>
-            {
-                return ApiService.GetDTOBaseItem(i, user, includeChildren: false, includePeople: false);
-            }));
+            return Task.WhenAll(GetItemsToSerialize(user).Select(i => ApiService.GetDtoBaseItem(i, user, includeChildren: false, includePeople: false)));
         }
 
         private IEnumerable<BaseItem> GetItemsToSerialize(User user)
         {
-            Folder parent = ApiService.GetItemById(ItemId) as Folder;
+            var parent = ApiService.GetItemById(ItemId) as Folder;
 
             if (ListType.Equals("inprogressitems", StringComparison.OrdinalIgnoreCase))
             {
                 return parent.GetInProgressItems(user);
             }
-            else if (ListType.Equals("recentlyaddeditems", StringComparison.OrdinalIgnoreCase))
+            if (ListType.Equals("recentlyaddeditems", StringComparison.OrdinalIgnoreCase))
             {
                 return parent.GetRecentlyAddedItems(user);
             }
-            else if (ListType.Equals("recentlyaddedunplayeditems", StringComparison.OrdinalIgnoreCase))
+            if (ListType.Equals("recentlyaddedunplayeditems", StringComparison.OrdinalIgnoreCase))
             {
                 return parent.GetRecentlyAddedUnplayedItems(user);
             }
-            else if (ListType.Equals("itemswithgenre", StringComparison.OrdinalIgnoreCase))
+            if (ListType.Equals("itemswithgenre", StringComparison.OrdinalIgnoreCase))
             {
                 return parent.GetItemsWithGenre(QueryString["name"], user);
             }
-            else if (ListType.Equals("itemswithyear", StringComparison.OrdinalIgnoreCase))
+            if (ListType.Equals("itemswithyear", StringComparison.OrdinalIgnoreCase))
             {
                 return parent.GetItemsWithYear(int.Parse(QueryString["year"]), user);
             }
-            else if (ListType.Equals("itemswithstudio", StringComparison.OrdinalIgnoreCase))
+            if (ListType.Equals("itemswithstudio", StringComparison.OrdinalIgnoreCase))
             {
                 return parent.GetItemsWithStudio(QueryString["name"], user);
             }
-            else if (ListType.Equals("itemswithperson", StringComparison.OrdinalIgnoreCase))
+            if (ListType.Equals("itemswithperson", StringComparison.OrdinalIgnoreCase))
             {
                 return parent.GetItemsWithPerson(QueryString["name"], null, user);
             }
-            else if (ListType.Equals("favorites", StringComparison.OrdinalIgnoreCase))
+            if (ListType.Equals("favorites", StringComparison.OrdinalIgnoreCase))
             {
                 return parent.GetFavoriteItems(user);
             }