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 31fe6f3eae..9beee14afd 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
@@ -23,10 +23,10 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
     protected ICommentRepository CommentRepository { get; }
 
     protected ISettingManager SettingManager { get; }
-    
+
     public CommentAdminAppService(
-	    ICommentRepository commentRepository,
-	    ISettingManager settingManager)
+        ICommentRepository commentRepository,
+        ISettingManager settingManager)
     {
         CommentRepository = commentRepository;
         SettingManager = settingManager;
@@ -34,39 +34,38 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
 
     public virtual async Task<PagedResultDto<CommentWithAuthorDto>> GetListAsync(CommentGetListInput input)
     {
-	    var totalCount = await CommentRepository.GetCountAsync(
-		    input.Text,
-		    input.EntityType,
-		    input.RepliedCommentId,
-		    input.Author,
-		    input.CreationStartDate,
-		    input.CreationEndDate,
-		    input.CommentApproveState
-	    );
-
-
-	    var comments = await CommentRepository.GetListAsync(
-		    input.Text,
-		    input.EntityType,
-		    input.RepliedCommentId,
-		    input.Author,
-		    input.CreationStartDate,
-		    input.CreationEndDate,
-		    input.Sorting,
-		    input.MaxResultCount,
-		    input.SkipCount,
-		    input.CommentApproveState
-	    );
-
-	    var dtos = comments.Select(queryResultItem =>
-	    {
-		    var dto = ObjectMapper.Map<Comment, CommentWithAuthorDto>(queryResultItem.Comment);
-		    dto.Author = ObjectMapper.Map<CmsUser, CmsUserDto>(queryResultItem.Author);
-
-		    return dto;
-	    }).ToList();
-
-	    return new PagedResultDto<CommentWithAuthorDto>(totalCount, dtos);
+        var totalCount = await CommentRepository.GetCountAsync(
+            input.Text,
+            input.EntityType,
+            input.RepliedCommentId,
+            input.Author,
+            input.CreationStartDate,
+            input.CreationEndDate,
+            input.CommentApproveState
+        );
+
+        var comments = await CommentRepository.GetListAsync(
+            input.Text,
+            input.EntityType,
+            input.RepliedCommentId,
+            input.Author,
+            input.CreationStartDate,
+            input.CreationEndDate,
+            input.Sorting,
+            input.MaxResultCount,
+            input.SkipCount,
+            input.CommentApproveState
+        );
+
+        var dtos = comments.Select(queryResultItem =>
+        {
+            var dto = ObjectMapper.Map<Comment, CommentWithAuthorDto>(queryResultItem.Comment);
+            dto.Author = ObjectMapper.Map<CmsUser, CmsUserDto>(queryResultItem.Author);
+
+            return dto;
+        }).ToList();
+
+        return new PagedResultDto<CommentWithAuthorDto>(totalCount, dtos);
     }
 
     public virtual async Task<CommentWithAuthorDto> GetAsync(Guid id)
@@ -89,11 +88,11 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
     [Authorize(CmsKitAdminPermissions.Comments.Update)]
     public async Task UpdateApprovalStatusAsync(Guid id, CommentApprovalDto input)
     {
-	    var comment = await CommentRepository.GetAsync(id);
-	    comment.IsApproved = input.IsApproved;
+        var comment = await CommentRepository.GetAsync(id);
+        comment.IsApproved = input.IsApproved;
 
-	    await CommentRepository.UpdateAsync(comment);
-	}
+        await CommentRepository.UpdateAsync(comment);
+    }
 
     [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)]
     public async Task SetSettingsAsync(CommentSettingsDto input)
@@ -104,16 +103,13 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
     [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)]
     public async Task<CommentSettingsDto> GetSettingsAsync()
     {
-	    var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(AppSettings.CommentRequireApprovement));
+        var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(AppSettings.CommentRequireApprovement));
 
-	    return new CommentSettingsDto
-	    {
-		    CommentRequireApprovement = isRequireApprovementEnabled
-	    };
+        return new CommentSettingsDto {CommentRequireApprovement = isRequireApprovementEnabled};
+    }
+
+    public async Task<int> GetWaitingCountAsync()
+    {
+        return (int)await CommentRepository.GetCountAsync(commentApproveState: CommentApproveState.Waiting);
     }
-    
-	public async Task<int> GetWaitingCountAsync()
-	{
-		return (int)await CommentRepository.GetCountAsync(commentApproveState: CommentApproveState.Waiting);
-	}
-}
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
index 0a21521835..70c2b575f4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
@@ -59,7 +59,7 @@ public class CmsKitAdminWebModule : AbpModule
         {
             options.MenuContributors.Add(new CmsKitAdminMenuContributor());
         });
-        
+
         Configure<AbpBundlingOptions>(options =>
         {
             options.ScriptBundles
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml
index 8f544afa65..b0906dac21 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml
@@ -105,7 +105,6 @@
                                     </select>
                                 </div>
                             </abp-column>
-
                             <abp-column size-lg="_2" size-md="_12">
                                 <div class="d-grid gap-2">
                                     <abp-button class="mt-md-4" button-type="Primary" type="submit">
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 614ccc64d7..cf2c07705b 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
@@ -7,7 +7,7 @@ public class CmsKitSettingDefinitionProvider : SettingDefinitionProvider
     public override void Define(ISettingDefinitionContext context)
     {
         context.Add(
-            new SettingDefinition(AppSettings.CommentRequireApprovement, "true") // Check the default value
+            new SettingDefinition(AppSettings.CommentRequireApprovement, "true") // TODO: Check the default value
         );
     }
 }