diff --git a/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs
index 8192b8b..79ba0d0 100644
--- a/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs
+++ b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs
@@ -82,14 +82,11 @@ namespace ComputersShopFileImplement.Implements
         private OrderViewModel GetViewModel(Order order)
         {
             var viewModel = order.GetViewModel;
-            foreach (var comp in source.Computers)
-            {
-                if (comp.Id == order.ComputerId)
+            var comp = source.Computers.FirstOrDefault(comp => comp.Id == order.ComputerId);
+                if (comp != null)
                 {
                     viewModel.ComputerName = comp.ComputerName;
-                    break;
                 }
-            }
             return viewModel;
         }
     }