diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
index 46b87ffce2..2196e60ccc 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
@@ -97,13 +97,13 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
     [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)]
     public async Task UpdateSettingsAsync(CommentSettingsDto input)
     {
-        await SettingManager.SetGlobalAsync(CmsKitSettings.CommentRequireApprovement, input.CommentRequireApprovement.ToString());
+        await SettingManager.SetGlobalAsync(CmsKitSettings.Comments.RequireApprovement, input.CommentRequireApprovement.ToString());
     }
 
     [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)]
     public async Task<CommentSettingsDto> GetSettingsAsync()
     {
-	    var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.CommentRequireApprovement));
+	    var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.Comments.RequireApprovement));
 
         return new CommentSettingsDto {CommentRequireApprovement = isRequireApprovementEnabled};
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
index 90e3014813..bb7f8039f5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
@@ -95,7 +95,7 @@ $(function () {
                                         abp.notify.success(message);
                                     })
                             },
-                            visible: abp.setting.getBoolean("Cms.Comments.RequireApprovement")
+                            visible: abp.setting.getBoolean("CmsKit.Comments.RequireApprovement")
                         },
                         {
                             text: function (data) {
@@ -115,8 +115,7 @@ $(function () {
                                         abp.notify.success(message);
                                     })
                             },
-                            visible: abp.setting.getBoolean("Cms.Comments.RequireApprovement")
-
+                            visible: abp.setting.getBoolean("CmsKit.Comments.RequireApprovement")
                         }
                     ]
                 }
@@ -242,7 +241,9 @@ $(function () {
             }
         });
     }
+    
     CheckWaitingComments()
+    
     commentsService.getSettings().then(function (data) {
         if (data.commentRequireApprovement) {
             $('#CommentsTable').DataTable().column(6).visible(true);
@@ -252,15 +253,4 @@ $(function () {
             $('#IsApprovedSelectInput').hide();
         }
     })
-    async function GetSettings() {
-        var result = false;
-        await commentsService.getSettings().then(function (data) {
-            result = data.commentRequireApprovement;
-        });
-        return result;
-    }
-    (async () => {
-        var commentRequireApprovement = await GetSettings();
-        console.log(commentRequireApprovement);
-    })();
 });
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs
index 5655a78452..e50e3a0e3d 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs
@@ -6,8 +6,6 @@ public class CmsKitSettingDefinitionProvider : SettingDefinitionProvider
 {
     public override void Define(ISettingDefinitionContext context)
     {
-        context.Add(
-            new SettingDefinition(CmsKitSettings.CommentRequireApprovement, "false")
-        );
+        context.Add(new SettingDefinition(CmsKitSettings.Comments.RequireApprovement, "false"));
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs
index 984238ba88..78f1eb8b38 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs
@@ -2,11 +2,11 @@
 
 public static class CmsKitSettings
 {
-    public const string GroupName = "CmsKit";
-    public const string CommentRequireApprovement = "Cms.Comments.RequireApprovement";
-    // TODO : Refactor
-
-    /* Add constants for setting names. Example:
-     * public const string MySettingName = GroupName + ".MySettingName";
-     */
+    private const string GroupName = "CmsKit";
+    
+    public static class Comments
+    {
+        private const string Default = GroupName + ".Comments";
+        public const string RequireApprovement = Default + ".RequireApprovement";
+    } 
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
index 2b6b0d064f..5e4f9a8347 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
@@ -57,7 +57,7 @@ public class CommentPublicAppService : CmsKitPublicAppServiceBase, ICommentPubli
 
     public virtual async Task<ListResultDto<CommentWithDetailsDto>> GetListAsync(string entityType, string entityId)
     {
-        var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.CommentRequireApprovement));
+        var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.Comments.RequireApprovement));
         
         var commentsWithAuthor = isRequireApprovementEnabled
             ? await CommentRepository.GetListWithAuthorsAsync(entityType, entityId, CommentApproveState.Approved)