diff --git a/BlazorApp/Data/Calendar.cs b/BlazorApp/Data/Calendar.cs
index abafcb4..20485c7 100644
--- a/BlazorApp/Data/Calendar.cs
+++ b/BlazorApp/Data/Calendar.cs
@@ -18,15 +18,7 @@ namespace BlazorApp.Data
         public string Description { get; set; }
         public TimeSpan? Duration { get; set; }
 
-        public DateTime? CalculatedEnd
-        {
-            get
-            {
-                if (Duration != null)
-                    return DtStart + Duration;
-                return DtEnd;
-            }
-        }
+        public DateTime? CalculatedEnd => DtEnd ?? DtStart + Duration;
     }
 
     public class Calendar