diff --git a/app/MindWork AI Studio/Assistants/ERI/AllowedLLMProvidersExtensions.cs b/app/MindWork AI Studio/Assistants/ERI/AllowedLLMProvidersExtensions.cs
index 130859b9..c9c6462c 100644
--- a/app/MindWork AI Studio/Assistants/ERI/AllowedLLMProvidersExtensions.cs	
+++ b/app/MindWork AI Studio/Assistants/ERI/AllowedLLMProvidersExtensions.cs	
@@ -2,15 +2,12 @@ namespace AIStudio.Assistants.ERI;
 
 public static class AllowedLLMProvidersExtensions
 {
-    public static string Description(this AllowedLLMProviders provider)
+    public static string Description(this AllowedLLMProviders provider) => provider switch
     {
-        return provider switch
-        {
-            AllowedLLMProviders.NONE => "Please select what kind of LLM provider are allowed for this data source",
-            AllowedLLMProviders.ANY => "Any LLM provider is allowed: users might choose a cloud-based or a self-hosted provider",
-            AllowedLLMProviders.SELF_HOSTED => "Self-hosted LLM providers are allowed: users cannot choose any cloud-based provider",
-            
-            _ => "Unknown option was selected"
-        };
-    }
+        AllowedLLMProviders.NONE => "Please select what kind of LLM provider are allowed for this data source",
+        AllowedLLMProviders.ANY => "Any LLM provider is allowed: users might choose a cloud-based or a self-hosted provider",
+        AllowedLLMProviders.SELF_HOSTED => "Self-hosted LLM providers are allowed: users cannot choose any cloud-based provider",
+
+        _ => "Unknown option was selected"
+    };
 }
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Settings/DataModel/DataSourceTypeExtension.cs b/app/MindWork AI Studio/Settings/DataModel/DataSourceTypeExtension.cs
index a630a922..196eac78 100644
--- a/app/MindWork AI Studio/Settings/DataModel/DataSourceTypeExtension.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/DataSourceTypeExtension.cs	
@@ -10,15 +10,12 @@ public static class DataSourceTypeExtension
     /// </summary>
     /// <param name="type">The data source type.</param>
     /// <returns>The display name of the data source type.</returns>
-    public static string GetDisplayName(this DataSourceType type)
+    public static string GetDisplayName(this DataSourceType type) => type switch
     {
-        return type switch
-        {
-            DataSourceType.LOCAL_FILE => "Local File",
-            DataSourceType.LOCAL_DIRECTORY => "Local Directory",
-            DataSourceType.ERI_V1 => "External ERI Server (v1)",
-            
-            _ => "None",
-        };
-    }
+        DataSourceType.LOCAL_FILE => "Local File",
+        DataSourceType.LOCAL_DIRECTORY => "Local Directory",
+        DataSourceType.ERI_V1 => "External ERI Server (v1)",
+
+        _ => "None",
+    };
 }
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Settings/DataModel/ThemesExtensions.cs b/app/MindWork AI Studio/Settings/DataModel/ThemesExtensions.cs
index 7942ab7b..5d36a1bc 100644
--- a/app/MindWork AI Studio/Settings/DataModel/ThemesExtensions.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/ThemesExtensions.cs	
@@ -2,15 +2,12 @@ namespace AIStudio.Settings.DataModel;
 
 public static class ThemesExtensions
 {
-    public static string GetName(this Themes theme)
+    public static string GetName(this Themes theme) => theme switch
     {
-        return theme switch
-        {
-            Themes.SYSTEM => "Synchronized with the operating system settings",
-            Themes.LIGHT => "Always use light theme",
-            Themes.DARK => "Always use dark theme",
-            
-            _ => "Unknown setting",
-        };
-    }
+        Themes.SYSTEM => "Synchronized with the operating system settings",
+        Themes.LIGHT => "Always use light theme",
+        Themes.DARK => "Always use dark theme",
+
+        _ => "Unknown setting",
+    };
 }
\ No newline at end of file