diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
deleted file mode 100644
index 0c2baaa4b..000000000
--- a/.github/workflows/php-cs-fixer.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Check & fix styling
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - main
-      - master2
-
-jobs:
-  php-cs-fixer:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup cache directory
-        uses: actions/cache@v3
-        with:
-          path: .php-cs-fixer.cache
-          key: ${{ runner.OS }}-${{ github.repository }}-phpcsfixer-${{ github.sha }}
-          restore-keys: ${{ runner.OS }}-${{ github.repository }}-phpcsfixer-
-
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-
-      - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
-        with:
-          args: --config=.php-cs-fixer.php --allow-risky=yes
-
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Fix styling
diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml
new file mode 100644
index 000000000..097689b83
--- /dev/null
+++ b/.github/workflows/pint.yml
@@ -0,0 +1,27 @@
+name: Fix PHP code style issues
+
+on:
+  push:
+    paths:
+      - '**.php'
+
+permissions:
+  contents: write
+
+jobs:
+  php-code-styling:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Fix PHP code style issues
+        uses: aglipanci/laravel-pint-action@2.2.0
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Fix styling
diff --git a/.gitignore b/.gitignore
index 05c756b00..043be3f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ output.txt
 phpunit.xml.dist.bak
 phpunit.xml.dist.dev
 .github/workflows/code-cov.yml
+.history/*
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
deleted file mode 100644
index 6161560ac..000000000
--- a/.php-cs-fixer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-$finder = Symfony\Component\Finder\Finder::create()
-    ->notPath('bootstrap/*')
-    ->notPath('storage/*')
-    ->notPath('resources/view/mail/*')
-    ->in([
-        __DIR__ . '/src',
-        __DIR__ . '/tests',
-    ])
-    ->name('*.php')
-    ->notName('*.blade.php')
-    ->ignoreDotFiles(true)
-    ->ignoreVCS(true);
-
-$config = new PhpCsFixer\Config();
-return $config->setRules([
-    '@PSR2' => true,
-    'array_syntax' => ['syntax' => 'short'],
-    'ordered_imports' => ['sort_algorithm' => 'alpha'],
-    'no_unused_imports' => true,
-    'not_operator_with_successor_space' => true,
-    'trailing_comma_in_multiline' => true,
-    'phpdoc_scalar' => true,
-    'unary_operator_spaces' => true,
-    'binary_operator_spaces' => true,
-    'blank_line_before_statement' => [
-        'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
-    ],
-    'phpdoc_single_line_var_spacing' => true,
-    'phpdoc_var_without_name' => true,
-    'class_attributes_separation' => [
-        'elements' => [
-            'method' => 'one',
-        ],
-    ],
-    'method_argument_space' => [
-        'on_multiline' => 'ensure_fully_multiline',
-        'keep_multiple_spaces_after_comma' => true,
-    ],
-    'single_trait_insert_per_statement' => false,
-])
-->setFinder($finder);
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db871814a..946966a2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,33 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
+## [2.14.0] - 2023-05-18
+
+### Changed
+- Fixes
+    - Bulk Actions (AlpineJS)
+    - Moving Table Head Checkbox to AlpineJS
+    - Using AlpineJS for calculating if all items have been selected
+    - Correcting missing x-cloak
+    - Added indeterminateCheckbox for TH for bulk actions
+    - Cleaned up ALpineJS functionality for Bulk Actions
+    - Repair of tests that were looking for wire:model that no longer existed
+
+- Enhancements
+    - Several new public variables for accessing pagination data cleanly, to avoid calling functions repeatedly across various blades.
+        - paginationTotalItemCount (Total number of items in the results across all page)
+        - paginationCurrentItems (Primary keys of items in the current page)
+        - paginationCurrentCount (Number of results on the current page)
+
+- Blades
+    - Several blades have had the classic Tables approach ($theme == 'tailwind', $theme == 'bootstrap) replaced with conditional classes using the @class([]) approach.  This is to reduce the complexity of the blade files.
+
+## [2.13.1] - 2023-05-18
+
+### Changed
+
+- Fixes for AlpineJS
+
 ## [2.13.0] - 2023-05-17
 
 ### Changed
@@ -800,7 +827,9 @@ Ground Up Rebuild
 
 - Initial release
 
-[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.13.0...development
+[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.14.0...development
+[2.14.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.14.0...v2.13.1
+[2.13.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.13.0...v2.13.1
 [2.13.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.12.0...v2.13.0
 [2.12.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.11.0...v2.12.0
 [2.11.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.10.0...v2.11.0
diff --git a/composer.json b/composer.json
index b2786566d..8a67b9aaa 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,9 @@
     ],
     "require": {
         "php": "^7.4|^8.0|^8.1|^8.2",
+        "illuminate/contracts": "^8.0|^9.0|^10.0",
         "livewire/livewire": "^2.6",
-        "spatie/laravel-package-tools": "^1.4.3",
-        "illuminate/contracts": "^8.0|^9.0|^10.0"
+        "spatie/laravel-package-tools": "^1.4.3"
     },
     "require-dev": {
         "ext-sqlite3": "*",
@@ -43,7 +43,8 @@
     "scripts": {
         "psalm": "vendor/bin/psalm",
         "test": "vendor/bin/phpunit --colors=always",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
+        "test-coverage": "vendor/bin/phpunit --coverage-html coverage",
+        "format": "vendor/bin/pint"
     },
     "config": {
         "sort-packages": true
diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php
index 51c932320..5ba6992cf 100644
--- a/resources/views/components/pagination.blade.php
+++ b/resources/views/components/pagination.blade.php
@@ -12,7 +12,7 @@
 @endif
 
 @if ($theme === 'tailwind')
-    <div x-init="@if ($component->bulkActionsAreEnabled()) this.visibleItems = @js($rows->pluck($component->getPrimaryKey())->toArray()); @endif">
+    <div>
         @if ($component->paginationVisibilityIsEnabled())
             <div class="mt-4 px-4 md:p-0 sm:flex justify-between items-center space-y-4 sm:space-y-0">
                 <div>
@@ -23,7 +23,7 @@
                             <span>@lang('to')</span>
                             <span class="font-medium">{{ $rows->lastItem() }}</span>
                             <span>@lang('of')</span>
-                            <span class="font-medium">{{ $rows->total() }}</span>
+                            <span class="font-medium"><span x-text="paginationTotalItemCount"></span></span>
                             <span>@lang('results')</span>
                         </p>
                     @elseif ($component->paginationIsEnabled() && $component->isPaginationMethod('simple'))
@@ -49,7 +49,7 @@
         @endif
     </div>
 @elseif ($theme === 'bootstrap-4')
-    <div x-init="@if ($component->bulkActionsAreEnabled()) this.visibleItems = @js($rows->pluck($component->getPrimaryKey())->toArray()); @endif">
+    <div >
         @if ($component->paginationVisibilityIsEnabled())
             @if ($component->paginationIsEnabled() && $component->isPaginationMethod('standard') && $rows->lastPage() > 1)
                 <div class="row mt-3">
@@ -63,7 +63,7 @@
                         <span>@lang('to')</span>
                         <strong>{{ $rows->count() ? $rows->lastItem() : 0 }}</strong>
                         <span>@lang('of')</span>
-                        <strong>{{ $rows->total() }}</strong>
+                        <strong><span x-text="paginationTotalItemCount"></span></strong>
                         <span>@lang('results')</span>
                     </div>
                 </div>
@@ -92,7 +92,7 @@
         @endif
     </div>
 @elseif ($theme === 'bootstrap-5')
-    <div x-init="@if ($component->bulkActionsAreEnabled()) this.visibleItems = @js($rows->pluck($component->getPrimaryKey())->toArray()); @endif">
+    <div >
         @if ($component->paginationVisibilityIsEnabled())
             @if ($component->paginationIsEnabled() && $component->isPaginationMethod('standard') && $rows->lastPage() > 1)
                 <div class="row mt-3">
@@ -106,7 +106,7 @@
                         <span>@lang('to')</span>
                         <strong>{{ $rows->count() ? $rows->lastItem() : 0 }}</strong>
                         <span>@lang('of')</span>
-                        <strong>{{ $rows->total() }}</strong>
+                        <strong><span x-text="paginationTotalItemCount"></span></strong>
                         <span>@lang('results')</span>
                     </div>
                 </div>
diff --git a/resources/views/components/table/td/bulk-actions.blade.php b/resources/views/components/table/td/bulk-actions.blade.php
index 34b7a6c73..d5b7af025 100644
--- a/resources/views/components/table/td/bulk-actions.blade.php
+++ b/resources/views/components/table/td/bulk-actions.blade.php
@@ -6,38 +6,22 @@
         $theme = $component->getTheme();
     @endphp
 
-    @if ($theme === 'tailwind')
-        <x-livewire-tables::table.td.plain>
-            <div class="inline-flex rounded-md shadow-sm">
-                <input
-                    wire:loading.attr.delay="disabled"
-                    value="{{ $row->{$this->getPrimaryKey()} }}"
-                    type="checkbox"
-                    class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600"
-                    x-model="selectedItems"
-                />
-            </div>
-        </x-livewire-tables::table.td.plain>
-    @elseif ($theme === 'bootstrap-4')
-        <x-livewire-tables::table.td.plain>
+    <x-livewire-tables::table.td.plain>
+        <div @class([
+            "inline-flex rounded-md shadow-sm" => $theme === "tailwind",
+            "form-check" => $theme === "bootstrap-5",
+            ])
+        >
             <input
                 wire:loading.attr.delay="disabled"
                 value="{{ $row->{$this->getPrimaryKey()} }}"
                 type="checkbox"
                 x-model="selectedItems"
+                @class([
+                    "rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600" => $theme === "tailwind",
+                    "form-check-input" => $theme === "bootstrap-5",
+                    ])
             />
-        </x-livewire-tables::table.td.plain>
-    @elseif ($theme === 'bootstrap-5')
-        <x-livewire-tables::table.td.plain>
-            <div class="form-check">
-                <input
-                    wire:loading.attr.delay="disabled"
-                    value="{{ $row->{$this->getPrimaryKey()} }}"
-                    type="checkbox"
-                    class="form-check-input"
-                    x-model="selectedItems"
-                />
-            </div>
-        </x-livewire-tables::table.td.plain>
-    @endif
+        </div>
+    </x-livewire-tables::table.td.plain>
 @endif
diff --git a/resources/views/components/table/th/bulk-actions.blade.php b/resources/views/components/table/th/bulk-actions.blade.php
index 3e61f8a92..e0fdead7b 100644
--- a/resources/views/components/table/th/bulk-actions.blade.php
+++ b/resources/views/components/table/th/bulk-actions.blade.php
@@ -5,32 +5,27 @@
         $theme = $component->getTheme();
     @endphp
 
-    @if ($theme === 'tailwind')
-        <x-livewire-tables::table.th.plain>
-            <div class="inline-flex rounded-md shadow-sm">
-                <input
-                    wire:model="selectAll"
-                    type="checkbox"
-                    class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600"
-                />
-            </div>
-        </x-livewire-tables::table.th.plain>
-    @elseif ($theme === 'bootstrap-4')
-        <x-livewire-tables::table.th.plain>
-            <input
-                wire:model="selectAll"
+    <x-livewire-tables::table.th.plain>
+        <div
+            x-data="{ newSelectCount: 0, indeterminateCheckbox: false, bulkActionHeaderChecked: false}"  
+            x-init="$watch('selectedItems', value => indeterminateCheckbox = (value.length > 0 && value.length < paginationTotalItemCount))"
+
+            @class([
+                'inline-flex rounded-md shadow-sm' => $theme === 'tailwind',
+                'form-check' => $theme === 'bootstrap-5',
+                ])
+        >
+            <input 
+                :checked="selectedItems.length == paginationTotalItemCount"
+                x-on:click="if(selectedItems.length == paginationTotalItemCount) { $el.indeterminate = false; $wire.clearSelected(); bulkActionHeaderChecked = false; } else { bulkActionHeaderChecked = true; $el.indeterminate = false; $wire.setAllSelected(); }"
                 type="checkbox"
+                x-init="$watch('indeterminateCheckbox', value => $el.indeterminate = value); $watch('selectedItems', value => newSelectCount = value.length);"
+                
+                @class([
+                    'rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => $theme === 'tailwind',
+                    'form-check-input' => $theme === 'bootstrap-5',
+                ])
             />
-        </x-livewire-tables::table.th.plain>
-    @elseif ($theme === 'bootstrap-5')
-        <x-livewire-tables::table.th.plain>
-            <div class="form-check">
-                <input
-                    wire:model="selectAll"
-                    type="checkbox"
-                    class="form-check-input"
-                />
-            </div>
-        </x-livewire-tables::table.th.plain>
-    @endif
+        </div>
+    </x-livewire-tables::table.th.plain>
 @endif
diff --git a/resources/views/components/table/tr/bulk-actions.blade.php b/resources/views/components/table/tr/bulk-actions.blade.php
index 7871e4214..1107a6216 100644
--- a/resources/views/components/table/tr/bulk-actions.blade.php
+++ b/resources/views/components/table/tr/bulk-actions.blade.php
@@ -6,7 +6,6 @@
         $table = $component->getTableName();
         $theme = $component->getTheme();
         $colspan = $component->getColspanCount();
-        $selected = $component->getSelectedCount();
         $selectAll = $component->selectAllIsEnabled();
         $simplePagination = $component->paginationMethod == 'simple' ? true : false;
     @endphp
@@ -15,14 +14,15 @@
         <x-livewire-tables::table.tr.plain 
             wire:key="bulk-select-message-{{ $table }}"
             class="bg-indigo-50 dark:bg-gray-900 dark:text-white" 
-            x-show="shouldShowBulkActionSelect"
+            x-cloak
+            x-show="selectedItems.length > 0"
         >
             <x-livewire-tables::table.td.plain :colspan="$colspan">
-                <template x-if="allItemsSelected">
+                <template x-if="selectedItems.length == paginationTotalItemCount">
                     <div wire:key="all-selected-{{ $table }}">
                         <span>
                             @lang('You are currently selecting all')
-                            @if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
+                            @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
                             @lang('rows').
                         </span>
 
@@ -36,13 +36,13 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                         </button>
                     </div>
                 </template>
-                <template x-if="!allItemsSelected">
+                <template x-if="selectedItems.length !== paginationTotalItemCount">
                     <div wire:key="some-selected-{{ $table }}">
                         <span>
                             @lang('You have selected')
-                            <strong><span x-text="selectedCount"></span></strong>
+                            <strong><span x-text="selectedItems.length"></span></strong>
                             @lang('rows, do you want to select all')
-                            @if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
+                            @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
                         </span>
 
                         <button
@@ -78,14 +78,15 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
     @elseif ($theme === 'bootstrap-4' || $theme === 'bootstrap-5')
         <x-livewire-tables::table.tr.plain 
             wire:key="bulk-select-message-{{ $table }}"
-            x-show="shouldShowBulkActionSelect"
+            x-cloak
+            x-show="selectedItems.length > 0"
         >
             <x-livewire-tables::table.td.plain :colspan="$colspan">
-                <template x-if="allItemsSelected">
+                <template x-if="selectedItems.length == paginationTotalItemCount">
                     <div wire:key="all-selected-{{ $table }}">
                         <span>
                             @lang('You are currently selecting all')
-                            @if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
+                            @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
                             @lang('rows').
                         </span>
 
@@ -99,13 +100,13 @@ class="btn btn-primary btn-sm"
                         </button>
                     </div>
                 </template>
-                <template x-if="!allItemsSelected">
+                <template x-if="selectedItems.length !== paginationTotalItemCount">
                     <div wire:key="some-selected-{{ $table }}">
                         <span>
                             @lang('You have selected')
-                            <strong><span x-text="selectedCount"></span></strong>
+                            <strong><span x-text="selectedItems.length"></span></strong>
                             @lang('rows, do you want to select all')
-                            @if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
+                            @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
                         </span>
 
                         <button
diff --git a/resources/views/components/tools/toolbar.blade.php b/resources/views/components/tools/toolbar.blade.php
index b5958bd01..4183f606f 100644
--- a/resources/views/components/tools/toolbar.blade.php
+++ b/resources/views/components/tools/toolbar.blade.php
@@ -128,7 +128,7 @@ class="w-full inline-flex items-center justify-center px-3 py-2 border border-gr
             @endif
 
             @if ($component->showBulkActionsDropdownAlpine())
-                <div x-show="shouldShowBulkActionSelect" class="w-full md:w-auto mb-4 md:mb-0">
+                <div x-cloak x-show="selectedItems.length > 0" class="w-full md:w-auto mb-4 md:mb-0">
                     <div x-data="{ open: false, childElementOpen: false }" @keydown.window.escape="if (!childElementOpen) { open = false }"
                         x-on:click.away="if (!childElementOpen) { open = false }"
                         class="relative inline-block text-left z-10 w-full md:w-auto">
@@ -409,7 +409,7 @@ class="dropdown-item btn text-center">
             @endif
 
             @if ($component->showBulkActionsDropdownAlpine())
-                <div x-show="shouldShowBulkActionSelect" class="mb-3 mb-md-0">
+                <div x-cloak x-show="selectedItems.length > 0" class="mb-3 mb-md-0">
                     <div class="dropdown d-block d-md-inline">
                         <button class="btn dropdown-toggle d-block w-100 d-md-inline" type="button"
                             id="{{ $component->getTableName() }}-bulkActionsDropdown" data-toggle="dropdown"
@@ -634,7 +634,7 @@ class="dropdown-item text-center">
             @endif
 
             @if ($component->showBulkActionsDropdownAlpine())
-                <div x-show="shouldShowBulkActionSelect" class="mb-3 mb-md-0">
+                <div x-cloak x-show="selectedItems.length > 0" class="mb-3 mb-md-0">
                     <div class="dropdown d-block d-md-inline">
                         <button class="btn dropdown-toggle d-block w-100 d-md-inline" type="button"
                             id="{{ $component->getTableName() }}-bulkActionsDropdown" data-bs-toggle="dropdown"
diff --git a/resources/views/components/wrapper.blade.php b/resources/views/components/wrapper.blade.php
index 7df5beb5a..5f0ad00ae 100644
--- a/resources/views/components/wrapper.blade.php
+++ b/resources/views/components/wrapper.blade.php
@@ -6,31 +6,41 @@
 @endphp
 
 <div x-data="{
-    shouldShowBulkActionSelect: false,
     @if ($component->isFilterLayoutSlideDown()) filtersOpen: $wire.filterSlideDownDefaultVisible, @endif
-    @if ($component->bulkActionsAreEnabled()) selectedItems: $wire.entangle('selected').defer,
-        selectedCount: 0,
-        visibleItems: {},
-        allItemsSelected: false,
-        setAllSelected() {
-            $wire.setAllSelected();
-        },
-        clearSelected() {
-            $wire.clearSelected();
-        },
-        selectAllOnPage() {
-            let tempSelectedItems = this.selectedItems;
-            const iterator = visibleItems.values();
-            for (const value of iterator) {
-                tempSelectedItems.push(value.toString());
-            }
-            this.selectedItems = [...new Set(tempSelectedItems)];
-        }, @endif
-}"
-    x-effect="shouldShowBulkActionSelect = (selectedItems.length > 0); selectedCount = selectedItems.length;">
+    paginationCurrentCount: $wire.entangle('paginationCurrentCount'),
+    paginationTotalItemCount: $wire.entangle('paginationTotalItemCount'),
+    paginationCurrentItems: $wire.entangle('paginationCurrentItems'),
+    @if ($component->bulkActionsAreEnabled() && $component->hasBulkActions())
+    selectedItems: $wire.entangle('selected').defer,
+    @else
+    selectedItems: {},
+    @endif
+    toggleSelectAll() {
+        if (this.paginationTotalItemCount == this.selectedItems.length) {
+            this.clearSelected();
+        } else {
+            this.setAllSelected();
+        }
+    },
+    setAllSelected() {
+        $wire.setAllSelected();
+    },
+    clearSelected() {
+        $wire.clearSelected();
+    },
+    selectAllOnPage() {
+        let tempSelectedItems = this.selectedItems;
+        const iterator = this.paginationCurrentItems.values();
+        for (const value of iterator) {
+            tempSelectedItems.push(value.toString());
+        }
+        this.selectedItems = [...new Set(tempSelectedItems)];
+    },
+}">
     <div {{ $attributes->merge($this->getComponentWrapperAttributes()) }}
         @if ($component->hasRefresh()) wire:poll{{ $component->getRefreshOptions() }} @endif
         @if ($component->isFilterLayoutSlideDown()) wire:ignore.self @endif>
+
         @include('livewire-tables::includes.debug')
         @include('livewire-tables::includes.offline')
 
diff --git a/src/Commands/MakeCommand.php b/src/Commands/MakeCommand.php
index 58ca12b59..2f2b237a7 100644
--- a/src/Commands/MakeCommand.php
+++ b/src/Commands/MakeCommand.php
@@ -11,14 +11,9 @@
 
 /**
  * Class MakeCommand
- *
- * @package Rappasoft\LaravelLivewireTables\Commands
  */
 class MakeCommand extends Command
 {
-    /**
-     * @var ComponentParser
-     */
     protected ComponentParser $parser;
 
     /**
@@ -75,14 +70,9 @@ public function handle(): void
 
         $this->createClass($force);
 
-        $this->info('Livewire Datatable Created: ' . $this->parser->className());
+        $this->info('Livewire Datatable Created: '.$this->parser->className());
     }
 
-    /**
-     * @param  bool  $force
-     *
-     * @return bool
-     */
     protected function createClass(bool $force = false): bool
     {
         $classPath = $this->parser->classPath();
@@ -101,9 +91,7 @@ protected function createClass(bool $force = false): bool
     }
 
     /**
-     * @param mixed $path
-     *
-     * @return void
+     * @param  mixed  $path
      */
     protected function ensureDirectoryExists($path): void
     {
@@ -112,9 +100,6 @@ protected function ensureDirectoryExists($path): void
         }
     }
 
-    /**
-     * @return string
-     */
     public function classContents(): string
     {
         return str_replace(
@@ -124,35 +109,29 @@ public function classContents(): string
         );
     }
 
-    /**
-     * @return string
-     */
     public function getModelImport(): string
     {
-        if (File::exists(app_path('Models/' . $this->model . '.php'))) {
-            return 'App\Models\\' . $this->model;
+        if (File::exists(app_path('Models/'.$this->model.'.php'))) {
+            return 'App\Models\\'.$this->model;
         }
 
-        if (File::exists(app_path($this->model . '.php'))) {
-            return 'App\\' . $this->model;
+        if (File::exists(app_path($this->model.'.php'))) {
+            return 'App\\'.$this->model;
         }
 
         if (isset($this->modelPath)) {
-            if (File::exists(rtrim($this->modelPath, "/")."/".$this->model . '.php')) {
+            if (File::exists(rtrim($this->modelPath, '/').'/'.$this->model.'.php')) {
 
-                return Str::studly(str_replace("/", "\\", $this->modelPath)) . $this->model;
+                return Str::studly(str_replace('/', '\\', $this->modelPath)).$this->model;
             }
         }
-        
 
         $this->error('Could not find path to model.');
 
-        return 'App\Models\\' . $this->model;
+        return 'App\Models\\'.$this->model;
     }
 
     /**
-     * @param string $modelName
-     * @return string
      * @throws \Exception
      */
     private function generateColumns(string $modelName): string
@@ -178,10 +157,10 @@ private function generateColumns(string $modelName): string
 
             $title = Str::of($field)->replace('_', ' ')->ucfirst();
 
-            $columns .= '            Column::make("' . $title . '", "' . $field . '")' . "\n" . '                ->sortable(),' . "\n";
+            $columns .= '            Column::make("'.$title.'", "'.$field.'")'."\n".'                ->sortable(),'."\n";
         }
 
-        $columns .= "        ]";
+        $columns .= '        ]';
 
         return $columns;
     }
diff --git a/src/DataTableComponent.php b/src/DataTableComponent.php
index 7b01ea80b..3de1c7b91 100644
--- a/src/DataTableComponent.php
+++ b/src/DataTableComponent.php
@@ -68,7 +68,7 @@ public function boot(): void
             'filters' => $this->{$this->tableName}['filters'] ?? [],
             'columns' => $this->{$this->tableName}['columns'] ?? [],
         ];
-        
+
     }
 
     /**
@@ -106,8 +106,6 @@ abstract public function configure(): void;
 
     /**
      * The array defining the columns of the table.
-     *
-     * @return array
      */
     abstract public function columns(): array;
 
@@ -125,14 +123,12 @@ public function builder(): Builder
 
     /**
      * The view to add any modals for the table, could also be used for any non-visible html
-     *
-     * @return string
      */
     public function customView(): string
     {
         return 'livewire-tables::stubs.custom';
     }
-    
+
     /**
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
      */
diff --git a/src/Events/ColumnsSelected.php b/src/Events/ColumnsSelected.php
index 600bca9c0..75f13c11f 100644
--- a/src/Events/ColumnsSelected.php
+++ b/src/Events/ColumnsSelected.php
@@ -10,6 +10,7 @@ class ColumnsSelected
     use Dispatchable, SerializesModels;
 
     public $columns;
+
     public $key;
 
     public function __construct($key, $columns)
diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index 28e8cde3a..565649d20 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -8,9 +8,6 @@
 
 class LaravelLivewireTablesServiceProvider extends PackageServiceProvider
 {
-    /**
-     * @param Package $package
-     */
     public function configurePackage(Package $package): void
     {
         $package
diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index 0e1a46e4a..c432c3bae 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -13,32 +13,59 @@ trait ComponentUtilities
         ComponentHelpers;
 
     public array $table = [];
+
     public $theme = null;
+
     protected Builder $builder;
+
     protected $model;
+
     protected $primaryKey;
+
     protected array $relationships = [];
+
     protected string $tableName = 'table';
+
     protected ?string $dataTableFingerprint;
+
     protected ?string $queryStringAlias;
+
     protected bool $queryStringStatus = true;
+
     protected bool $offlineIndicatorStatus = true;
+
     protected bool $eagerLoadAllRelationsStatus = false;
+
     protected array $componentWrapperAttributes = [];
+
     protected array $tableWrapperAttributes = [];
+
     protected array $tableAttributes = [];
+
     protected array $theadAttributes = [];
+
     protected array $tbodyAttributes = [];
+
     protected $thAttributesCallback;
+
     protected $thSortButtonAttributesCallback;
+
     protected $trAttributesCallback;
+
     protected $trUrlCallback;
+
     protected $trUrlTargetCallback;
+
     protected $tdAttributesCallback;
+
     protected $collapsingColumnsStatus = true;
+
     protected string $emptyMessage = 'No items found. Try to broaden your search.';
+
     protected array $additionalSelects = [];
+
     protected bool $hideConfigurableAreasWhenReorderingStatus = true;
+
     protected array $configurableAreas = [
         'before-tools' => null,
         'toolbar-left-start' => null,
@@ -69,9 +96,6 @@ public function queryString(): array
 
     /**
      * Keep track of any properties on the custom query string key for this specific table
-     *
-     * @param $name
-     * @param $value
      */
     public function updated($name, $value): void
     {
diff --git a/src/Traits/Configuration/BulkActionsConfiguration.php b/src/Traits/Configuration/BulkActionsConfiguration.php
index a821b2359..eedfd93c7 100644
--- a/src/Traits/Configuration/BulkActionsConfiguration.php
+++ b/src/Traits/Configuration/BulkActionsConfiguration.php
@@ -6,8 +6,6 @@ trait BulkActionsConfiguration
 {
     /**
      * @param  array<mixed>  $bulkActions
-     *
-     * @return self
      */
     public function setBulkActions(array $bulkActions): self
     {
@@ -16,11 +14,6 @@ public function setBulkActions(array $bulkActions): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setBulkActionsStatus(bool $status): self
     {
         $this->bulkActionsStatus = $status;
@@ -28,9 +21,6 @@ public function setBulkActionsStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setBulkActionsEnabled(): self
     {
         $this->setBulkActionsStatus(true);
@@ -38,9 +28,6 @@ public function setBulkActionsEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setBulkActionsDisabled(): self
     {
         $this->setBulkActionsStatus(false);
@@ -48,11 +35,6 @@ public function setBulkActionsDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setSelectAllStatus(bool $status): self
     {
         $this->selectAll = $status;
@@ -60,9 +42,6 @@ public function setSelectAllStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSelectAllEnabled(): self
     {
         $this->setSelectAllStatus(true);
@@ -70,9 +49,6 @@ public function setSelectAllEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSelectAllDisabled(): self
     {
         $this->setSelectAllStatus(false);
@@ -80,11 +56,6 @@ public function setSelectAllDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setHideBulkActionsWhenEmptyStatus(bool $status): self
     {
         $this->hideBulkActionsWhenEmpty = $status;
@@ -92,9 +63,6 @@ public function setHideBulkActionsWhenEmptyStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setHideBulkActionsWhenEmptyEnabled(): self
     {
         $this->setHideBulkActionsWhenEmptyStatus(true);
@@ -102,9 +70,6 @@ public function setHideBulkActionsWhenEmptyEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setHideBulkActionsWhenEmptyDisabled(): self
     {
         $this->setHideBulkActionsWhenEmptyStatus(false);
diff --git a/src/Traits/Configuration/ColumnSelectConfiguration.php b/src/Traits/Configuration/ColumnSelectConfiguration.php
index 64b8b2a8f..257f00082 100644
--- a/src/Traits/Configuration/ColumnSelectConfiguration.php
+++ b/src/Traits/Configuration/ColumnSelectConfiguration.php
@@ -4,11 +4,6 @@
 
 trait ColumnSelectConfiguration
 {
-    /**
-     * @param bool $status
-     *
-     * @return self
-     */
     public function setColumnSelectStatus(bool $status): self
     {
         $this->columnSelectStatus = $status;
@@ -16,9 +11,6 @@ public function setColumnSelectStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setColumnSelectEnabled(): self
     {
         $this->setColumnSelectStatus(true);
@@ -26,9 +18,6 @@ public function setColumnSelectEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setColumnSelectDisabled(): self
     {
         $this->setColumnSelectStatus(false);
@@ -36,11 +25,6 @@ public function setColumnSelectDisabled(): self
         return $this;
     }
 
-    /**
-     * @param bool $status
-     *
-     * @return self
-     */
     public function setRememberColumnSelectionStatus(bool $status): self
     {
         $this->rememberColumnSelectionStatus = $status;
@@ -48,9 +32,6 @@ public function setRememberColumnSelectionStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setRememberColumnSelectionEnabled(): self
     {
         $this->setRememberColumnSelectionStatus(true);
@@ -58,9 +39,6 @@ public function setRememberColumnSelectionEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setRememberColumnSelectionDisabled(): self
     {
         $this->setRememberColumnSelectionStatus(false);
diff --git a/src/Traits/Configuration/ComponentConfiguration.php b/src/Traits/Configuration/ComponentConfiguration.php
index ff5a14086..4c598b186 100644
--- a/src/Traits/Configuration/ComponentConfiguration.php
+++ b/src/Traits/Configuration/ComponentConfiguration.php
@@ -4,11 +4,6 @@
 
 trait ComponentConfiguration
 {
-    /**
-     * @param  string|null  $key
-     *
-     * @return self
-     */
     public function setPrimaryKey(?string $key): self
     {
         $this->primaryKey = $key;
@@ -20,7 +15,6 @@ public function setPrimaryKey(?string $key): self
      * Get a list of attributes to override on the main wrapper of the component
      *
      * @param  array<mixed>  $attributes
-     *
      * @return $this
      */
     public function setComponentWrapperAttributes(array $attributes = []): self
@@ -34,8 +28,6 @@ public function setComponentWrapperAttributes(array $attributes = []): self
      * Set a list of attributes to override on the div that wraps the table
      *
      * @param  array<mixed>  $attributes
-     *
-     * @return self
      */
     public function setTableWrapperAttributes(array $attributes = []): self
     {
@@ -48,8 +40,6 @@ public function setTableWrapperAttributes(array $attributes = []): self
      * Set a list of attributes to override on the table element
      *
      * @param  array<mixed>  $attributes
-     *
-     * @return self
      */
     public function setTableAttributes(array $attributes = []): self
     {
@@ -62,8 +52,6 @@ public function setTableAttributes(array $attributes = []): self
      * Set a list of attributes to override on the thead element
      *
      * @param  array<mixed>  $attributes
-     *
-     * @return self
      */
     public function setTheadAttributes(array $attributes = []): self
     {
@@ -76,8 +64,6 @@ public function setTheadAttributes(array $attributes = []): self
      * Set a list of attributes to override on the tbody element
      *
      * @param  array<mixed>  $attributes
-     *
-     * @return self
      */
     public function setTbodyAttributes(array $attributes = []): self
     {
@@ -88,10 +74,6 @@ public function setTbodyAttributes(array $attributes = []): self
 
     /**
      * Set a list of attributes to override on the th elements
-     *
-     * @param  callable  $callback
-     *
-     * @return self
      */
     public function setThAttributes(callable $callback): self
     {
@@ -102,10 +84,6 @@ public function setThAttributes(callable $callback): self
 
     /**
      * Set a list of attributes to override on the th sort button elements
-     *
-     * @param  callable  $callback
-     *
-     * @return self
      */
     public function setThSortButtonAttributes(callable $callback): self
     {
@@ -116,10 +94,6 @@ public function setThSortButtonAttributes(callable $callback): self
 
     /**
      * Set a list of attributes to override on the td elements
-     *
-     * @param  callable  $callback
-     *
-     * @return self
      */
     public function setTrAttributes(callable $callback): self
     {
@@ -130,10 +104,6 @@ public function setTrAttributes(callable $callback): self
 
     /**
      * Set a list of attributes to override on the td elements
-     *
-     * @param  callable  $callback
-     *
-     * @return self
      */
     public function setTdAttributes(callable $callback): self
     {
@@ -144,10 +114,6 @@ public function setTdAttributes(callable $callback): self
 
     /**
      * Set the empty message
-     *
-     * @param  string  $message
-     *
-     * @return self
      */
     public function setEmptyMessage(string $message): self
     {
@@ -156,11 +122,6 @@ public function setEmptyMessage(string $message): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setOfflineIndicatorStatus(bool $status): self
     {
         $this->offlineIndicatorStatus = $status;
@@ -168,9 +129,6 @@ public function setOfflineIndicatorStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setOfflineIndicatorEnabled(): self
     {
         $this->setOfflineIndicatorStatus(true);
@@ -178,9 +136,6 @@ public function setOfflineIndicatorEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setOfflineIndicatorDisabled(): self
     {
         $this->setOfflineIndicatorStatus(false);
@@ -188,11 +143,6 @@ public function setOfflineIndicatorDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setQueryStringStatus(bool $status): self
     {
         $this->queryStringStatus = $status;
@@ -200,9 +150,6 @@ public function setQueryStringStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setQueryStringEnabled(): self
     {
         $this->setQueryStringStatus(true);
@@ -210,9 +157,6 @@ public function setQueryStringEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setQueryStringDisabled(): self
     {
         $this->setQueryStringStatus(false);
@@ -220,11 +164,6 @@ public function setQueryStringDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setEagerLoadAllRelationsStatus(bool $status): self
     {
         $this->eagerLoadAllRelationsStatus = $status;
@@ -232,9 +171,6 @@ public function setEagerLoadAllRelationsStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setEagerLoadAllRelationsEnabled(): self
     {
         $this->setEagerLoadAllRelationsStatus(true);
@@ -242,9 +178,6 @@ public function setEagerLoadAllRelationsEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setEagerLoadAllRelationsDisabled(): self
     {
         $this->setEagerLoadAllRelationsStatus(false);
@@ -252,11 +185,6 @@ public function setEagerLoadAllRelationsDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setCollapsingColumnsStatus(bool $status): self
     {
         $this->collapsingColumnsStatus = $status;
@@ -264,9 +192,6 @@ public function setCollapsingColumnsStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setCollapsingColumnsEnabled(): self
     {
         $this->setCollapsingColumnsStatus(true);
@@ -274,9 +199,6 @@ public function setCollapsingColumnsEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setCollapsingColumnsDisabled(): self
     {
         $this->setCollapsingColumnsStatus(false);
@@ -284,11 +206,6 @@ public function setCollapsingColumnsDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  callable  $callback
-     *
-     * @return self
-     */
     public function setTableRowUrl(callable $callback): self
     {
         $this->trUrlCallback = $callback;
@@ -296,11 +213,6 @@ public function setTableRowUrl(callable $callback): self
         return $this;
     }
 
-    /**
-     * @param  callable  $callback
-     *
-     * @return self
-     */
     public function setTableRowUrlTarget(callable $callback): self
     {
         $this->trUrlTargetCallback = $callback;
@@ -308,11 +220,6 @@ public function setTableRowUrlTarget(callable $callback): self
         return $this;
     }
 
-    /**
-     * @param  $selects
-     *
-     * @return self
-     */
     public function setAdditionalSelects($selects): self
     {
         if (! is_array($selects)) {
@@ -325,9 +232,7 @@ public function setAdditionalSelects($selects): self
     }
 
     /**
-     * @param  array<mixed> $areas
-     *
-     * @return self
+     * @param  array<mixed>  $areas
      */
     public function setConfigurableAreas(array $areas): self
     {
@@ -336,11 +241,6 @@ public function setConfigurableAreas(array $areas): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setHideConfigurableAreasWhenReorderingStatus(bool $status): self
     {
         $this->hideConfigurableAreasWhenReorderingStatus = $status;
@@ -348,9 +248,6 @@ public function setHideConfigurableAreasWhenReorderingStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setHideConfigurableAreasWhenReorderingEnabled(): self
     {
         $this->setHideConfigurableAreasWhenReorderingStatus(true);
@@ -358,9 +255,6 @@ public function setHideConfigurableAreasWhenReorderingEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setHideConfigurableAreasWhenReorderingDisabled(): self
     {
         $this->setHideConfigurableAreasWhenReorderingStatus(false);
@@ -368,11 +262,6 @@ public function setHideConfigurableAreasWhenReorderingDisabled(): self
         return $this;
     }
 
-    /**
-     * @param string $dataTableFingerprint
-     *
-     * @return self
-     */
     public function setDataTableFingerprint(string $dataTableFingerprint): self
     {
         $this->dataTableFingerprint = $dataTableFingerprint;
@@ -380,11 +269,6 @@ public function setDataTableFingerprint(string $dataTableFingerprint): self
         return $this;
     }
 
-    /**
-     * @param string $queryStringAlias
-     *
-     * @return self
-     */
     public function setQueryStringAlias(string $queryStringAlias): self
     {
         $this->queryStringAlias = $queryStringAlias;
diff --git a/src/Traits/Configuration/DebuggingConfiguration.php b/src/Traits/Configuration/DebuggingConfiguration.php
index 1d59fc0c0..042196b79 100644
--- a/src/Traits/Configuration/DebuggingConfiguration.php
+++ b/src/Traits/Configuration/DebuggingConfiguration.php
@@ -4,11 +4,6 @@
 
 trait DebuggingConfiguration
 {
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setDebugStatus(bool $status): self
     {
         $this->debugStatus = $status;
@@ -16,9 +11,6 @@ public function setDebugStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setDebugEnabled(): self
     {
         $this->setDebugStatus(true);
@@ -26,9 +18,6 @@ public function setDebugEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setDebugDisabled(): self
     {
         $this->setDebugStatus(false);
diff --git a/src/Traits/Configuration/FilterConfiguration.php b/src/Traits/Configuration/FilterConfiguration.php
index eb0faecf4..2db2b301c 100644
--- a/src/Traits/Configuration/FilterConfiguration.php
+++ b/src/Traits/Configuration/FilterConfiguration.php
@@ -6,11 +6,6 @@
 
 trait FilterConfiguration
 {
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setFiltersStatus(bool $status): self
     {
         $this->filtersStatus = $status;
@@ -18,9 +13,6 @@ public function setFiltersStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFiltersEnabled(): self
     {
         $this->setFiltersStatus(true);
@@ -28,9 +20,6 @@ public function setFiltersEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFiltersDisabled(): self
     {
         $this->setFiltersStatus(false);
@@ -38,11 +27,6 @@ public function setFiltersDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool $status
-     *
-     * @return self
-     */
     public function setFiltersVisibilityStatus(bool $status): self
     {
         $this->filtersVisibilityStatus = $status;
@@ -50,9 +34,6 @@ public function setFiltersVisibilityStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFiltersVisibilityEnabled(): self
     {
         $this->setFiltersVisibilityStatus(true);
@@ -60,9 +41,6 @@ public function setFiltersVisibilityEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFiltersVisibilityDisabled(): self
     {
         $this->setFiltersVisibilityStatus(false);
@@ -70,11 +48,6 @@ public function setFiltersVisibilityDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool $status
-     *
-     * @return self
-     */
     public function setFilterPillsStatus(bool $status): self
     {
         $this->filterPillsStatus = $status;
@@ -82,9 +55,6 @@ public function setFilterPillsStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFilterPillsEnabled(): self
     {
         $this->setFilterPillsStatus(true);
@@ -92,9 +62,6 @@ public function setFilterPillsEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFilterPillsDisabled(): self
     {
         $this->setFilterPillsStatus(false);
@@ -102,11 +69,6 @@ public function setFilterPillsDisabled(): self
         return $this;
     }
 
-    /**
-     * @param string $type
-     *
-     * @return self
-     */
     public function setFilterLayout(string $type): self
     {
         if (! in_array($type, ['popover', 'slide-down'], true)) {
@@ -118,9 +80,6 @@ public function setFilterLayout(string $type): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFilterLayoutPopover(): self
     {
         $this->setFilterLayout('popover');
@@ -128,9 +87,6 @@ public function setFilterLayoutPopover(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFilterLayoutSlideDown(): self
     {
         $this->setFilterLayout('slide-down');
@@ -138,11 +94,6 @@ public function setFilterLayoutSlideDown(): self
         return $this;
     }
 
-    /**
-     * @param  bool $status
-     *
-     * @return self
-     */
     public function setFilterSlideDownDefaultStatus(bool $status): self
     {
         $this->filterSlideDownDefaultVisible = $status;
@@ -150,9 +101,6 @@ public function setFilterSlideDownDefaultStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFilterSlideDownDefaultStatusDisabled(): self
     {
         $this->setFilterSlideDownDefaultStatus(false);
@@ -160,9 +108,6 @@ public function setFilterSlideDownDefaultStatusDisabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFilterSlideDownDefaultStatusEnabled(): self
     {
         $this->setFilterSlideDownDefaultStatus(true);
diff --git a/src/Traits/Configuration/FooterConfiguration.php b/src/Traits/Configuration/FooterConfiguration.php
index 0cd88bc5a..a438724fc 100644
--- a/src/Traits/Configuration/FooterConfiguration.php
+++ b/src/Traits/Configuration/FooterConfiguration.php
@@ -4,11 +4,6 @@
 
 trait FooterConfiguration
 {
-    /**
-     * @param bool $status
-     *
-     * @return self
-     */
     public function setFooterStatus(bool $status): self
     {
         $this->footerStatus = $status;
@@ -16,9 +11,6 @@ public function setFooterStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFooterEnabled(): self
     {
         $this->setFooterStatus(true);
@@ -26,9 +18,6 @@ public function setFooterEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setFooterDisabled(): self
     {
         $this->setFooterStatus(false);
@@ -36,11 +25,6 @@ public function setFooterDisabled(): self
         return $this;
     }
 
-    /**
-     * @param bool $status
-     *
-     * @return self
-     */
     public function setUseHeaderAsFooterStatus(bool $status): self
     {
         $this->useHeaderAsFooterStatus = $status;
@@ -48,9 +32,6 @@ public function setUseHeaderAsFooterStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setUseHeaderAsFooterEnabled(): self
     {
         $this->setUseHeaderAsFooterStatus(true);
@@ -58,9 +39,6 @@ public function setUseHeaderAsFooterEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setUseHeaderAsFooterDisabled(): self
     {
         $this->setUseHeaderAsFooterStatus(false);
@@ -68,11 +46,6 @@ public function setUseHeaderAsFooterDisabled(): self
         return $this;
     }
 
-    /**
-     * @param callable $callback
-     *
-     * @return self
-     */
     public function setFooterTrAttributes(callable $callback): self
     {
         $this->footerTrAttributesCallback = $callback;
@@ -80,11 +53,6 @@ public function setFooterTrAttributes(callable $callback): self
         return $this;
     }
 
-    /**
-     * @param callable $callback
-     *
-     * @return self
-     */
     public function setFooterTdAttributes(callable $callback): self
     {
         $this->footerTdAttributesCallback = $callback;
diff --git a/src/Traits/Configuration/PaginationConfiguration.php b/src/Traits/Configuration/PaginationConfiguration.php
index 6d7b27280..f80434968 100644
--- a/src/Traits/Configuration/PaginationConfiguration.php
+++ b/src/Traits/Configuration/PaginationConfiguration.php
@@ -6,11 +6,6 @@
 
 trait PaginationConfiguration
 {
-    /**
-     * @param string $name
-     *
-     * @return self
-     */
     public function setPageName(string $name): self
     {
         $this->pageName = $name;
@@ -18,11 +13,6 @@ public function setPageName(string $name): self
         return $this;
     }
 
-    /**
-     * @param string $theme
-     *
-     * @return self
-     */
     public function setPaginationTheme(string $theme): self
     {
         $this->paginationTheme = $theme;
@@ -30,11 +20,6 @@ public function setPaginationTheme(string $theme): self
         return $this;
     }
 
-    /**
-     * @param bool $status
-     *
-     * @return self
-     */
     public function setPaginationStatus(bool $status): self
     {
         $this->paginationStatus = $status;
@@ -42,9 +27,6 @@ public function setPaginationStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setPaginationEnabled(): self
     {
         $this->setPaginationStatus(true);
@@ -52,9 +34,6 @@ public function setPaginationEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setPaginationDisabled(): self
     {
         $this->setPaginationStatus(false);
@@ -62,11 +41,6 @@ public function setPaginationDisabled(): self
         return $this;
     }
 
-    /**
-     * @param bool $status
-     *
-     * @return self
-     */
     public function setPaginationVisibilityStatus(bool $status): self
     {
         $this->paginationVisibilityStatus = $status;
@@ -74,9 +48,6 @@ public function setPaginationVisibilityStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setPaginationVisibilityEnabled(): self
     {
         $this->setPaginationVisibilityStatus(true);
@@ -84,9 +55,6 @@ public function setPaginationVisibilityEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setPaginationVisibilityDisabled(): self
     {
         $this->setPaginationVisibilityStatus(false);
@@ -94,11 +62,6 @@ public function setPaginationVisibilityDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setPerPageVisibilityStatus(bool $status): self
     {
         $this->perPageVisibilityStatus = $status;
@@ -106,9 +69,6 @@ public function setPerPageVisibilityStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setPerPageVisibilityEnabled(): self
     {
         $this->setPerPageVisibilityStatus(true);
@@ -116,9 +76,6 @@ public function setPerPageVisibilityEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setPerPageVisibilityDisabled(): self
     {
         $this->setPerPageVisibilityStatus(false);
@@ -128,8 +85,6 @@ public function setPerPageVisibilityDisabled(): self
 
     /**
      * @param  array<mixed>  $accepted
-     *
-     * @return self
      */
     public function setPerPageAccepted(array $accepted): self
     {
@@ -139,9 +94,6 @@ public function setPerPageAccepted(array $accepted): self
     }
 
     /**
-     * @param  int  $perPage
-     *
-     * @return self
      * @throws DataTableConfigurationException
      */
     public function setPerPage(int $perPage): self
@@ -155,11 +107,6 @@ public function setPerPage(int $perPage): self
         return $this;
     }
 
-    /**
-     * @param  string  $paginationMethod
-     *
-     * @return self
-     */
     public function setPaginationMethod(string $paginationMethod): self
     {
         $this->paginationMethod = $paginationMethod;
diff --git a/src/Traits/Configuration/RefreshConfiguration.php b/src/Traits/Configuration/RefreshConfiguration.php
index b219d8000..652075f4d 100644
--- a/src/Traits/Configuration/RefreshConfiguration.php
+++ b/src/Traits/Configuration/RefreshConfiguration.php
@@ -4,11 +4,6 @@
 
 trait RefreshConfiguration
 {
-    /**
-     * @param  int  $time
-     *
-     * @return self
-     */
     public function setRefreshTime(int $time): self
     {
         $this->refresh = (string) $time;
@@ -16,9 +11,6 @@ public function setRefreshTime(int $time): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setRefreshKeepAlive(): self
     {
         $this->refresh = 'keep-alive';
@@ -26,9 +18,6 @@ public function setRefreshKeepAlive(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setRefreshVisible(): self
     {
         $this->refresh = 'visible';
@@ -36,11 +25,6 @@ public function setRefreshVisible(): self
         return $this;
     }
 
-    /**
-     * @param  string  $method
-     *
-     * @return self
-     */
     public function setRefreshMethod(string $method): self
     {
         $this->refresh = $method;
diff --git a/src/Traits/Configuration/ReorderingConfiguration.php b/src/Traits/Configuration/ReorderingConfiguration.php
index bf26adbaa..f926b0227 100644
--- a/src/Traits/Configuration/ReorderingConfiguration.php
+++ b/src/Traits/Configuration/ReorderingConfiguration.php
@@ -4,11 +4,6 @@
 
 trait ReorderingConfiguration
 {
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setReorderStatus(bool $status): self
     {
         $this->reorderStatus = $status;
@@ -16,9 +11,6 @@ public function setReorderStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setReorderEnabled(): self
     {
         $this->setReorderStatus(true);
@@ -26,9 +18,6 @@ public function setReorderEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setReorderDisabled(): self
     {
         $this->setReorderStatus(false);
@@ -36,11 +25,6 @@ public function setReorderDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setCurrentlyReorderingStatus(bool $status): self
     {
         $this->currentlyReorderingStatus = $status;
@@ -48,9 +32,6 @@ public function setCurrentlyReorderingStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setCurrentlyReorderingEnabled(): self
     {
         $this->setCurrentlyReorderingStatus(true);
@@ -58,9 +39,6 @@ public function setCurrentlyReorderingEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setCurrentlyReorderingDisabled(): self
     {
         $this->setCurrentlyReorderingStatus(false);
@@ -68,11 +46,6 @@ public function setCurrentlyReorderingDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setHideReorderColumnUnlessReorderingStatus(bool $status): self
     {
         $this->hideReorderColumnUnlessReorderingStatus = $status;
@@ -80,9 +53,6 @@ public function setHideReorderColumnUnlessReorderingStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setHideReorderColumnUnlessReorderingEnabled(): self
     {
         $this->setHideReorderColumnUnlessReorderingStatus(true);
@@ -90,9 +60,6 @@ public function setHideReorderColumnUnlessReorderingEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setHideReorderColumnUnlessReorderingDisabled(): self
     {
         $this->setHideReorderColumnUnlessReorderingStatus(false);
@@ -100,11 +67,6 @@ public function setHideReorderColumnUnlessReorderingDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  string  $method
-     *
-     * @return self
-     */
     public function setReorderMethod(string $method): self
     {
         $this->reorderMethod = $method;
@@ -112,12 +74,6 @@ public function setReorderMethod(string $method): self
         return $this;
     }
 
-    /**
-     * @param  string  $field
-     * @param  string  $direction
-     *
-     * @return self
-     */
     public function setDefaultReorderSort(string $field, string $direction = 'asc'): self
     {
         $this->defaultReorderColumn = $field;
diff --git a/src/Traits/Configuration/SearchConfiguration.php b/src/Traits/Configuration/SearchConfiguration.php
index b5ad73af0..01fdcda4b 100644
--- a/src/Traits/Configuration/SearchConfiguration.php
+++ b/src/Traits/Configuration/SearchConfiguration.php
@@ -6,11 +6,6 @@
 
 trait SearchConfiguration
 {
-    /**
-     * @param  string  $query
-     *
-     * @return self
-     */
     public function setSearch(string $query): self
     {
         $this->{$this->getTableName()}['search'] = $query;
@@ -18,11 +13,6 @@ public function setSearch(string $query): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setSearchStatus(bool $status): self
     {
         $this->searchStatus = $status;
@@ -30,9 +20,6 @@ public function setSearchStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSearchEnabled(): self
     {
         $this->setSearchStatus(true);
@@ -50,11 +37,6 @@ public function setSearchDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setSearchVisibilityStatus(bool $status): self
     {
         $this->searchVisibilityStatus = $status;
@@ -62,9 +44,6 @@ public function setSearchVisibilityStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSearchVisibilityEnabled(): self
     {
         $this->setSearchVisibilityStatus(true);
@@ -72,9 +51,6 @@ public function setSearchVisibilityEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSearchVisibilityDisabled(): self
     {
         $this->setSearchVisibilityStatus(false);
@@ -83,9 +59,6 @@ public function setSearchVisibilityDisabled(): self
     }
 
     /**
-     * @param  int  $milliseconds
-     *
-     * @return self
      * @throws DataTableConfigurationException
      */
     public function setSearchDebounce(int $milliseconds): self
@@ -100,7 +73,6 @@ public function setSearchDebounce(int $milliseconds): self
     }
 
     /**
-     * @return self
      * @throws DataTableConfigurationException
      */
     public function setSearchDefer(): self
@@ -115,7 +87,6 @@ public function setSearchDefer(): self
     }
 
     /**
-     * @return self
      * @throws DataTableConfigurationException
      */
     public function setSearchLazy(): self
diff --git a/src/Traits/Configuration/SecondaryHeaderConfiguration.php b/src/Traits/Configuration/SecondaryHeaderConfiguration.php
index d86791f17..6982c47db 100644
--- a/src/Traits/Configuration/SecondaryHeaderConfiguration.php
+++ b/src/Traits/Configuration/SecondaryHeaderConfiguration.php
@@ -4,11 +4,6 @@
 
 trait SecondaryHeaderConfiguration
 {
-    /**
-     * @param bool $status
-     *
-     * @return self
-     */
     public function setSecondaryHeaderStatus(bool $status): self
     {
         $this->secondaryHeaderStatus = $status;
@@ -16,9 +11,6 @@ public function setSecondaryHeaderStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSecondaryHeaderEnabled(): self
     {
         $this->setSecondaryHeaderStatus(true);
@@ -26,9 +18,6 @@ public function setSecondaryHeaderEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSecondaryHeaderDisabled(): self
     {
         $this->setSecondaryHeaderStatus(false);
@@ -36,11 +25,6 @@ public function setSecondaryHeaderDisabled(): self
         return $this;
     }
 
-    /**
-     * @param callable $callback
-     *
-     * @return self
-     */
     public function setSecondaryHeaderTrAttributes(callable $callback): self
     {
         $this->secondaryHeaderTrAttributesCallback = $callback;
@@ -48,11 +32,6 @@ public function setSecondaryHeaderTrAttributes(callable $callback): self
         return $this;
     }
 
-    /**
-     * @param callable $callback
-     *
-     * @return self
-     */
     public function setSecondaryHeaderTdAttributes(callable $callback): self
     {
         $this->secondaryHeaderTdAttributesCallback = $callback;
diff --git a/src/Traits/Configuration/SortingConfiguration.php b/src/Traits/Configuration/SortingConfiguration.php
index 788d3cbdc..1be47f211 100644
--- a/src/Traits/Configuration/SortingConfiguration.php
+++ b/src/Traits/Configuration/SortingConfiguration.php
@@ -4,11 +4,6 @@
 
 trait SortingConfiguration
 {
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setSortingStatus(bool $status): self
     {
         $this->sortingStatus = $status;
@@ -16,9 +11,6 @@ public function setSortingStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSortingEnabled(): self
     {
         $this->setSortingStatus(true);
@@ -26,9 +18,6 @@ public function setSortingEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSortingDisabled(): self
     {
         $this->setSortingStatus(false);
@@ -36,11 +25,6 @@ public function setSortingDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setSingleSortingStatus(bool $status): self
     {
         $this->singleColumnSortingStatus = $status;
@@ -48,9 +32,6 @@ public function setSingleSortingStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSingleSortingEnabled(): self
     {
         $this->setSingleSortingStatus(true);
@@ -58,9 +39,6 @@ public function setSingleSortingEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSingleSortingDisabled(): self
     {
         $this->setSingleSortingStatus(false);
@@ -68,12 +46,6 @@ public function setSingleSortingDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  string  $field
-     * @param  string  $direction
-     *
-     * @return self
-     */
     public function setDefaultSort(string $field, string $direction = 'asc'): self
     {
         $this->defaultSortColumn = $field;
@@ -82,9 +54,6 @@ public function setDefaultSort(string $field, string $direction = 'asc'): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function removeDefaultSort(): self
     {
         $this->defaultSortColumn = null;
@@ -93,11 +62,6 @@ public function removeDefaultSort(): self
         return $this;
     }
 
-    /**
-     * @param  bool  $status
-     *
-     * @return self
-     */
     public function setSortingPillsStatus(bool $status): self
     {
         $this->sortingPillsStatus = $status;
@@ -105,9 +69,6 @@ public function setSortingPillsStatus(bool $status): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSortingPillsEnabled(): self
     {
         $this->setSortingPillsStatus(true);
@@ -115,9 +76,6 @@ public function setSortingPillsEnabled(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function setSortingPillsDisabled(): self
     {
         $this->setSortingPillsStatus(false);
@@ -125,12 +83,6 @@ public function setSortingPillsDisabled(): self
         return $this;
     }
 
-    /**
-     * @param  string  $asc
-     * @param  string  $desc
-     *
-     * @return self
-     */
     public function setDefaultSortingLabels(string $asc, string $desc): self
     {
         $this->defaultSortingLabelAsc = $asc;
diff --git a/src/Traits/Helpers/BulkActionsHelpers.php b/src/Traits/Helpers/BulkActionsHelpers.php
index 14c9efcee..6434f72b0 100644
--- a/src/Traits/Helpers/BulkActionsHelpers.php
+++ b/src/Traits/Helpers/BulkActionsHelpers.php
@@ -4,84 +4,54 @@
 
 trait BulkActionsHelpers
 {
-    /**
-     * @return bool
-     */
     public function getBulkActionsStatus(): bool
     {
         return $this->bulkActionsStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function bulkActionsAreEnabled(): bool
     {
         return $this->getBulkActionsStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function bulkActionsAreDisabled(): bool
     {
         return $this->getBulkActionsStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getSelectAllStatus(): bool
     {
         return $this->selectAll;
     }
 
-    /**
-     * @return bool
-     */
     public function selectAllIsEnabled(): bool
     {
         return $this->getSelectAllStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function selectAllIsDisabled(): bool
     {
         return $this->getSelectAllStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getHideBulkActionsWhenEmptyStatus(): bool
     {
         return $this->hideBulkActionsWhenEmpty;
     }
 
-    /**
-     * @return bool
-     */
     public function hideBulkActionsWhenEmptyIsEnabled(): bool
     {
         return $this->getHideBulkActionsWhenEmptyStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function hideBulkActionsWhenEmptyIsDisabled(): bool
     {
         return $this->getHideBulkActionsWhenEmptyStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function hasBulkActions(): bool
     {
-        return (count($this->bulkActions()) > 0);
+        return count($this->bulkActions()) > 0;
     }
 
     /**
@@ -92,9 +62,6 @@ public function getBulkActions(): array
         return $this->bulkActions();
     }
 
-    /**
-     * @return bool
-     */
     public function showBulkActionsDropdown(): bool
     {
         $show = false;
@@ -118,7 +85,6 @@ public function showBulkActionsDropdown(): bool
 
     /**
      * @param  array<mixed>  $selected
-     *
      * @return array<mixed>
      */
     public function setSelected(array $selected): array
@@ -134,17 +100,11 @@ public function getSelected(): array
         return $this->selected;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSelected(): bool
     {
-        return ($this->getSelectedCount() > 0);
+        return $this->getSelectedCount() > 0;
     }
 
-    /**
-     * @return int
-     */
     public function getSelectedCount(): int
     {
         return count($this->getSelected());
@@ -185,14 +145,11 @@ public function updatedSelectAll(): void
     public function setAllSelected(): void
     {
         $this->setSelectAllEnabled();
-        $this->setSelected((clone $this->baseQuery())->pluck($this->getPrimaryKey())->map(fn ($item) => (string)$item)->toArray());
+        $this->setSelected((clone $this->baseQuery())->pluck($this->getPrimaryKey())->map(fn ($item) => (string) $item)->toArray());
     }
 
-    /**
-     * @return bool
-     */
     public function showBulkActionsDropdownAlpine(): bool
     {
-        return ($this->bulkActionsAreEnabled() && $this->hasBulkActions());
+        return $this->bulkActionsAreEnabled() && $this->hasBulkActions();
     }
 }
diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 439c7b740..f6380ed23 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -31,19 +31,11 @@ public function setColumns(): void
         $this->columns = $columns;
     }
 
-    /**
-     * @return Collection
-     */
     public function getColumns(): Collection
     {
         return $this->columns;
     }
 
-    /**
-     * @param  string  $qualifiedColumn
-     *
-     * @return Column|null
-     */
     public function getColumn(string $qualifiedColumn): ?Column
     {
         return $this->getColumns()
@@ -51,11 +43,6 @@ public function getColumn(string $qualifiedColumn): ?Column
             ->first();
     }
 
-    /**
-     * @param  string  $qualifiedColumn
-     *
-     * @return Column|null
-     */
     public function getColumnBySelectName(string $qualifiedColumn): ?Column
     {
         return $this->getColumns()
@@ -87,9 +74,6 @@ public function getColumnRelationStrings(): array
             ->toArray();
     }
 
-    /**
-     * @return Collection
-     */
     public function getSelectableColumns(): Collection
     {
         return $this->getColumns()
@@ -97,9 +81,6 @@ public function getSelectableColumns(): Collection
             ->values();
     }
 
-    /**
-     * @return Collection
-     */
     public function getSearchableColumns(): Collection
     {
         return $this->getColumns()
@@ -107,33 +88,21 @@ public function getSearchableColumns(): Collection
             ->values();
     }
 
-    /**
-     * @return int
-     */
     public function getColumnCount(): int
     {
         return $this->getColumns()->count();
     }
 
-    /**
-     * @return bool
-     */
     public function hasCollapsedColumns(): bool
     {
         return ($this->shouldCollapseOnMobile() + $this->shouldCollapseOnTablet()) > 0;
     }
 
-    /**
-     * @return bool
-     */
     public function shouldCollapseOnMobile(): bool
     {
-        return ($this->getCollapsedMobileColumnsCount() > 0);
+        return $this->getCollapsedMobileColumnsCount() > 0;
     }
 
-    /**
-     * @return Collection
-     */
     public function getCollapsedMobileColumns(): Collection
     {
         return $this->getColumns()
@@ -141,17 +110,11 @@ public function getCollapsedMobileColumns(): Collection
             ->values();
     }
 
-    /**
-     * @return int
-     */
     public function getCollapsedMobileColumnsCount(): int
     {
         return $this->getCollapsedMobileColumns()->count();
     }
 
-    /**
-     * @return Collection
-     */
     public function getVisibleMobileColumns(): Collection
     {
         return $this->getColumns()
@@ -159,25 +122,16 @@ public function getVisibleMobileColumns(): Collection
             ->values();
     }
 
-    /**
-     * @return int
-     */
     public function getVisibleMobileColumnsCount(): int
     {
         return $this->getVisibleMobileColumns()->count();
     }
 
-    /**
-     * @return bool
-     */
     public function shouldCollapseOnTablet(): bool
     {
-        return ($this->getCollapsedTabletColumnsCount() > 0);
+        return $this->getCollapsedTabletColumnsCount() > 0;
     }
 
-    /**
-     * @return Collection
-     */
     public function getCollapsedTabletColumns(): Collection
     {
         return $this->getColumns()
@@ -185,17 +139,11 @@ public function getCollapsedTabletColumns(): Collection
             ->values();
     }
 
-    /**
-     * @return int
-     */
     public function getCollapsedTabletColumnsCount(): int
     {
         return $this->getCollapsedTabletColumns()->count();
     }
 
-    /**
-     * @return Collection
-     */
     public function getVisibleTabletColumns(): Collection
     {
         return $this->getColumns()
@@ -203,17 +151,11 @@ public function getVisibleTabletColumns(): Collection
             ->values();
     }
 
-    /**
-     * @return int
-     */
     public function getVisibleTabletColumnsCount(): int
     {
         return $this->getVisibleTabletColumns()->count();
     }
 
-    /**
-     * @return int
-     */
     public function getColspanCount(): int
     {
         $all = $this->getColumnCount();
diff --git a/src/Traits/Helpers/ColumnSelectHelpers.php b/src/Traits/Helpers/ColumnSelectHelpers.php
index 629063097..b148c2d36 100644
--- a/src/Traits/Helpers/ColumnSelectHelpers.php
+++ b/src/Traits/Helpers/ColumnSelectHelpers.php
@@ -6,58 +6,38 @@
 
 trait ColumnSelectHelpers
 {
-    /**
-     * @return bool
-     */
     public function getColumnSelectStatus(): bool
     {
         return $this->columnSelectStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function columnSelectIsEnabled(): bool
     {
         return $this->getColumnSelectStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function columnSelectIsDisabled(): bool
     {
         return $this->getColumnSelectStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getRememberColumnSelectionStatus(): bool
     {
         return $this->rememberColumnSelectionStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function rememberColumnSelectionIsEnabled(): bool
     {
         return $this->getRememberColumnSelectionStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function rememberColumnSelectionIsDisabled(): bool
     {
         return $this->getRememberColumnSelectionStatus() === false;
     }
 
     /**
-     * @param mixed $column
-     *
-     * @return bool
+     * @param  mixed  $column
      */
     public function columnSelectIsEnabledForColumn($column): bool
     {
@@ -80,9 +60,6 @@ protected function getColumnSelectSessionKey()
         return $this->getDataTableFingerprint().'-columnSelectEnabled';
     }
 
-    /**
-     * @return self
-     */
     public function setColumnSelectHiddenOnMobile(): self
     {
         $this->columnSelectHiddenOnMobile = true;
@@ -90,17 +67,11 @@ public function setColumnSelectHiddenOnMobile(): self
         return $this;
     }
 
-    /**
-     * @return bool
-     */
     public function getColumnSelectIsHiddenOnTablet(): bool
     {
         return $this->columnSelectHiddenOnTablet;
     }
 
-     /**
-     * @return self
-     */
     public function setColumnSelectHiddenOnTablet(): self
     {
         $this->columnSelectHiddenOnTablet = true;
@@ -108,9 +79,6 @@ public function setColumnSelectHiddenOnTablet(): self
         return $this;
     }
 
-    /**
-     * @return bool
-     */
     public function getColumnSelectIsHiddenOnMobile(): bool
     {
         return $this->columnSelectHiddenOnMobile;
diff --git a/src/Traits/Helpers/ComponentHelpers.php b/src/Traits/Helpers/ComponentHelpers.php
index bdcab7dd7..570237870 100644
--- a/src/Traits/Helpers/ComponentHelpers.php
+++ b/src/Traits/Helpers/ComponentHelpers.php
@@ -8,43 +8,26 @@
 
 trait ComponentHelpers
 {
-    /**
-     * @return string
-     */
     public function getDataTableFingerprint(): string
     {
         return $this->dataTableFingerprint ?? $this->generateDataTableFingerprint();
     }
 
-    /**
-     * @return string
-     */
     public function getQueryStringAlias(): string
     {
         return $this->queryStringAlias ?? $this->getTableName();
     }
 
-    /**
-     * @param Builder $builder
-     *
-     * @return void
-     */
     public function setBuilder(Builder $builder): void
     {
         $this->builder = $builder;
     }
 
-    /**
-     * @return Builder
-     */
     public function getBuilder(): Builder
     {
         return $this->builder;
     }
 
-    /**
-     * @return bool
-     */
     public function hasPrimaryKey(): bool
     {
         return $this->primaryKey !== null;
@@ -66,9 +49,6 @@ public function getRelationships(): array
         return $this->relationships;
     }
 
-    /**
-     * @return bool
-     */
     public function hasModel(): bool
     {
         return $this->model !== null;
@@ -82,9 +62,6 @@ public function getModel()
         return $this->model;
     }
 
-    /**
-     * @return void
-     */
     public function setTheme(): void
     {
         $theme = $this->getTheme();
@@ -94,9 +71,6 @@ public function setTheme(): void
         }
     }
 
-    /**
-     * @return string
-     */
     public function getTheme(): string
     {
         return $this->theme ?? config('livewire-tables.theme', 'tailwind');
@@ -107,7 +81,7 @@ public function getTheme(): string
      */
     public function getComponentWrapperAttributes(): array
     {
-        return count($this->componentWrapperAttributes) ? $this->componentWrapperAttributes : ['id' => 'datatable-' . $this->id];
+        return count($this->componentWrapperAttributes) ? $this->componentWrapperAttributes : ['id' => 'datatable-'.$this->id];
     }
 
     /**
@@ -143,8 +117,6 @@ public function getTbodyAttributes(): array
     }
 
     /**
-     * @param  Column  $column
-     *
      * @return  array<mixed>
      */
     public function getThAttributes(Column $column): array
@@ -153,8 +125,6 @@ public function getThAttributes(Column $column): array
     }
 
     /**
-     * @param  Column  $column
-     *
      * @return  array<mixed>
      */
     public function getThSortButtonAttributes(Column $column): array
@@ -163,22 +133,14 @@ public function getThSortButtonAttributes(Column $column): array
     }
 
     /**
-     * @param Model $row
-     * @param int $index
-     *
      * @return array<mixed>
      */
     public function getTrAttributes(Model $row, int $index): array
     {
         return $this->trAttributesCallback ? call_user_func($this->trAttributesCallback, $row, $index) : ['default' => true];
     }
-    
+
     /**
-     * @param Column $column
-     * @param Model $row
-     * @param int $colIndex
-     * @param int $rowIndex
-     *
      * @return array<mixed>
      */
     public function getTdAttributes(Column $column, Model $row, int $colIndex, int $rowIndex): array
@@ -188,169 +150,102 @@ public function getTdAttributes(Column $column, Model $row, int $colIndex, int $
 
     /**
      * Get the translated empty message of the table
-     *
-     * @return string
      */
     public function getEmptyMessage(): string
     {
         return __($this->emptyMessage);
     }
 
-    /**
-     * @return bool
-     */
     public function getOfflineIndicatorStatus(): bool
     {
         return $this->offlineIndicatorStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function offlineIndicatorIsEnabled(): bool
     {
         return $this->getOfflineIndicatorStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function offlineIndicatorIsDisabled(): bool
     {
         return $this->getOfflineIndicatorStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getQueryStringStatus(): bool
     {
         return $this->queryStringStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function queryStringIsEnabled(): bool
     {
         return $this->getQueryStringStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function queryStringIsDisabled(): bool
     {
         return $this->getQueryStringStatus() === false;
     }
 
-    /**
-     * @param  string  $name
-     *
-     * @return string
-     */
     public function setTableName(string $name): string
     {
         return $this->tableName = $name;
     }
 
-    /**
-     * @return string
-     */
     public function getTableName(): string
     {
         return $this->tableName;
     }
 
-    /**
-     * @param  string  $name
-     *
-     * @return bool
-     */
     public function isTableNamed(string $name): bool
     {
         return $this->tableName === $name;
     }
 
-    /**
-     * @return bool
-     */
     public function getEagerLoadAllRelationsStatus(): bool
     {
         return $this->eagerLoadAllRelationsStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function eagerLoadAllRelationsIsEnabled(): bool
     {
         return $this->getEagerLoadAllRelationsStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function eagerLoadAllRelationsIsDisabled(): bool
     {
         return $this->getEagerLoadAllRelationsStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getCollapsingColumnsStatus(): bool
     {
         return $this->collapsingColumnsStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function hasCollapsingColumns(): bool
     {
         return $this->getCollapsingColumnsStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function collapsingColumnsAreEnabled(): bool
     {
         return $this->getCollapsingColumnsStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function collapsingColumnsAreDisabled(): bool
     {
         return $this->getCollapsingColumnsStatus() === false;
     }
 
-    /**
-    * @return bool
-    */
     public function hasTableRowUrl(): bool
     {
         return $this->trUrlCallback !== null;
     }
 
-    /**
-     * @param  $row
-     *
-     * @return string|null
-     */
     public function getTableRowUrl($row): ?string
     {
         return $this->trUrlCallback ? call_user_func($this->trUrlCallback, $row) : null;
     }
 
-    /**
-     * @param  $row
-     *
-     * @return string|null
-     */
     public function getTableRowUrlTarget($row): ?string
     {
         return $this->trUrlTargetCallback ? call_user_func($this->trUrlTargetCallback, $row) : null;
@@ -372,11 +267,6 @@ public function getConfigurableAreas(): array
         return $this->configurableAreas;
     }
 
-    /**
-     * @param  string  $area
-     *
-     * @return bool
-     */
     public function hasConfigurableAreaFor(string $area): bool
     {
         if ($this->hideConfigurableAreasWhenReorderingIsEnabled() && $this->reorderIsEnabled() && $this->currentlyReorderingIsEnabled()) {
@@ -388,8 +278,6 @@ public function hasConfigurableAreaFor(string $area): bool
 
     /**
      * @param  string|array<mixed>  $area
-     *
-     * @return string|null
      */
     public function getConfigurableAreaFor($area): ?string
     {
@@ -404,7 +292,6 @@ public function getConfigurableAreaFor($area): ?string
 
     /**
      * @param  string|array<mixed>  $area
-     *
      * @return array<mixed>
      */
     public function getParametersForConfigurableArea($area): array
@@ -418,25 +305,16 @@ public function getParametersForConfigurableArea($area): array
         return [];
     }
 
-    /**
-     * @return bool
-     */
     public function getHideConfigurableAreasWhenReorderingStatus(): bool
     {
         return $this->hideConfigurableAreasWhenReorderingStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function hideConfigurableAreasWhenReorderingIsEnabled(): bool
     {
         return $this->getHideConfigurableAreasWhenReorderingStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function hideConfigurableAreasWhenReorderingIsDisabled(): bool
     {
         return $this->getHideConfigurableAreasWhenReorderingStatus() === false;
diff --git a/src/Traits/Helpers/DebugHelpers.php b/src/Traits/Helpers/DebugHelpers.php
index 733cb21a9..eb7f1ba14 100644
--- a/src/Traits/Helpers/DebugHelpers.php
+++ b/src/Traits/Helpers/DebugHelpers.php
@@ -4,25 +4,16 @@
 
 trait DebugHelpers
 {
-    /**
-     * @return bool
-     */
     public function getDebugStatus(): bool
     {
         return $this->debugStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function debugIsEnabled(): bool
     {
         return $this->getDebugStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function debugIsDisabled(): bool
     {
         return $this->getDebugStatus() === false;
diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php
index 4f5178dfa..08dec2809 100644
--- a/src/Traits/Helpers/FilterHelpers.php
+++ b/src/Traits/Helpers/FilterHelpers.php
@@ -10,126 +10,81 @@
 
 trait FilterHelpers
 {
-    /**
-     * @return bool
-     */
     public function getFiltersStatus(): bool
     {
         return $this->filtersStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function filtersAreEnabled(): bool
     {
         return $this->getFiltersStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function filtersAreDisabled(): bool
     {
         return $this->getFiltersStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getFiltersVisibilityStatus(): bool
     {
         return $this->filtersVisibilityStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function filtersVisibilityIsEnabled(): bool
     {
         return $this->getFiltersVisibilityStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function filtersVisibilityIsDisabled(): bool
     {
         return $this->getFiltersVisibilityStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getFilterSlideDownDefaultStatus(): bool
     {
         return $this->filterSlideDownDefaultVisible;
     }
 
-    /**
-     * @return bool
-     */
     public function filtersSlideDownIsDefaultVisible(): bool
     {
         return $this->getFilterSlideDownDefaultStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function filtersSlideDownIsDefaultHidden(): bool
     {
         return $this->getFilterSlideDownDefaultStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getFilterPillsStatus(): bool
     {
         return $this->filterPillsStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function filterPillsAreEnabled(): bool
     {
         return $this->getFilterPillsStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function filterPillsAreDisabled(): bool
     {
         return $this->getFilterPillsStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function hasFilters(): bool
     {
-        return ($this->getFiltersCount() > 0);
+        return $this->getFiltersCount() > 0;
     }
 
-    /**
-     * @return bool
-     */
     public function hasVisibleFilters(): bool
     {
-        return ($this->getFilters()
+        return $this->getFilters()
             ->reject(fn (Filter $filter) => $filter->isHiddenFromMenus())
-            ->count() > 0);
+            ->count() > 0;
     }
 
-    /**
-     * @return Collection
-     */
     public function getFilters(): Collection
     {
-        if(! isset($this->filterCollection)) {
+        if (! isset($this->filterCollection)) {
             $this->filterCollection = collect($this->filters());
         }
 
@@ -137,9 +92,6 @@ public function getFilters(): Collection
 
     }
 
-    /**
-     * @return int
-     */
     public function getFiltersCount(): int
     {
         if (! isset($this->filterCount)) {
@@ -151,8 +103,6 @@ public function getFiltersCount(): int
     }
 
     /**
-     * @param string $key
-     *
      * @return mixed
      */
     public function getFilterByKey(string $key)
@@ -163,9 +113,7 @@ public function getFilterByKey(string $key)
     }
 
     /**
-     * @param string $filterKey
-     * @param mixed $value
-     *
+     * @param  mixed  $value
      * @return mixed
      */
     public function setFilter(string $filterKey, $value)
@@ -173,11 +121,6 @@ public function setFilter(string $filterKey, $value)
         return $this->{$this->getTableName()}['filters'][$filterKey] = $value;
     }
 
-    /**
-     * @param string $filterKey
-     *
-     * @return void
-     */
     public function selectAllFilterOptions(string $filterKey): void
     {
         $filter = $this->getFilterByKey($filterKey);
@@ -195,9 +138,6 @@ public function selectAllFilterOptions(string $filterKey): void
         $this->setFilter($filterKey, array_keys($filter->getOptions()));
     }
 
-    /**
-     * @return void
-     */
     public function setFilterDefaults(): void
     {
         foreach ($this->getFilters() as $filter) {
@@ -221,28 +161,19 @@ public function getAppliedFilters(): array
             ->toArray();
     }
 
-    /**
-     * @return bool
-     */
     public function hasAppliedFiltersWithValues(): bool
     {
         return count($this->getAppliedFiltersWithValues()) > 0;
     }
 
-    /**
-     * @return bool
-     */
     public function hasAppliedVisibleFiltersWithValuesThatCanBeCleared(): bool
     {
-        return (collect($this->getAppliedFiltersWithValues())
+        return collect($this->getAppliedFiltersWithValues())
             ->map(fn ($_item, $key) => $this->getFilterByKey($key))
             ->reject(fn (Filter $filter) => $filter->isHiddenFromMenus() && ! $filter->isResetByClearButton())
-            ->count() > 0);
+            ->count() > 0;
     }
 
-    /**
-     * @return int
-     */
     public function getFilterBadgeCount(): int
     {
         return collect($this->getAppliedFiltersWithValues())
@@ -251,15 +182,12 @@ public function getFilterBadgeCount(): int
             ->count();
     }
 
-    /**
-     * @return bool
-     */
     public function hasAppliedVisibleFiltersForPills(): bool
     {
-        return (collect($this->getAppliedFiltersWithValues())
+        return collect($this->getAppliedFiltersWithValues())
             ->map(fn ($_item, $key) => $this->getFilterByKey($key))
             ->reject(fn (Filter $filter) => $filter->isHiddenFromPills())
-            ->count() > 0);
+            ->count() > 0;
     }
 
     /**
@@ -273,8 +201,6 @@ public function getAppliedFiltersWithValues(): array
     }
 
     /**
-     * @param string $filterKey
-     *
      * @return mixed
      */
     public function getAppliedFilterWithValue(string $filterKey)
@@ -282,18 +208,13 @@ public function getAppliedFilterWithValue(string $filterKey)
         return $this->getAppliedFiltersWithValues()[$filterKey] ?? null;
     }
 
-    /**
-     * @return int
-     */
     public function getAppliedFiltersWithValuesCount(): int
     {
         return count($this->getAppliedFiltersWithValues());
     }
 
     /**
-     * @param mixed $filter
-     *
-     * @return void
+     * @param  mixed  $filter
      */
     public function resetFilter($filter): void
     {
@@ -304,25 +225,16 @@ public function resetFilter($filter): void
         $this->setFilter($filter->getKey(), $filter->getDefaultValue());
     }
 
-    /**
-     * @return string
-     */
     public function getFilterLayout(): string
     {
         return $this->filterLayout;
     }
 
-    /**
-     * @return bool
-     */
     public function isFilterLayoutPopover(): bool
     {
         return $this->getFilterLayout() === 'popover';
     }
 
-    /**
-     * @return bool
-     */
     public function isFilterLayoutSlideDown(): bool
     {
         return $this->getFilterLayout() === 'slide-down';
@@ -330,20 +242,16 @@ public function isFilterLayoutSlideDown(): bool
 
     /**
      * Get whether any filter has a configured slide down row.
-     *
-     * @return bool
      */
     public function hasFiltersWithSlidedownRows(): bool
     {
-        return ($this->getFilters()
-        ->reject(fn (Filter $filter) => ! $filter->hasFilterSlidedownRow())
-        ->count() > 0);
+        return $this->getFilters()
+            ->reject(fn (Filter $filter) => ! $filter->hasFilterSlidedownRow())
+            ->count() > 0;
     }
 
     /**
      * Get whether filter has a configured slide down row.
-     *
-     * @return Collection
      */
     public function getVisibleFilters(): Collection
     {
diff --git a/src/Traits/Helpers/FooterHelpers.php b/src/Traits/Helpers/FooterHelpers.php
index 3660fab8a..37e8276bd 100644
--- a/src/Traits/Helpers/FooterHelpers.php
+++ b/src/Traits/Helpers/FooterHelpers.php
@@ -6,65 +6,43 @@
 
 trait FooterHelpers
 {
-    /**
-     * @return bool
-     */
     public function hasColumnsWithFooter(): bool
     {
         return $this->columnsWithFooter === true;
     }
 
-    /**
-     * @return bool
-     */
     public function getFooterStatus(): bool
     {
         return $this->footerStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function footerIsEnabled(): bool
     {
         return $this->getFooterStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function footerIsDisabled(): bool
     {
         return $this->getFooterStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getUseHeaderAsFooterStatus(): bool
     {
         return $this->useHeaderAsFooterStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function useHeaderAsFooterIsEnabled(): bool
     {
         return $this->getUseHeaderAsFooterStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function useHeaderAsFooterIsDisabled(): bool
     {
         return $this->getUseHeaderAsFooterStatus() === false;
     }
 
     /**
-     * @param mixed $rows
-     *
+     * @param  mixed  $rows
      * @return array<mixed>
      */
     public function getFooterTrAttributes($rows): array
@@ -73,10 +51,7 @@ public function getFooterTrAttributes($rows): array
     }
 
     /**
-     * @param Column $column
-     * @param mixed $rows
-     * @param int $index
-     *
+     * @param  mixed  $rows
      * @return array<mixed>
      */
     public function getFooterTdAttributes(Column $column, $rows, int $index): array
diff --git a/src/Traits/Helpers/PaginationHelpers.php b/src/Traits/Helpers/PaginationHelpers.php
index 5357982d1..e0420caf1 100644
--- a/src/Traits/Helpers/PaginationHelpers.php
+++ b/src/Traits/Helpers/PaginationHelpers.php
@@ -4,81 +4,51 @@
 
 trait PaginationHelpers
 {
-    /**
-     * @return string|null
-     */
     public function getPageName(): ?string
     {
         return $this->pageName;
     }
 
-    /**
-     * @return bool
-     */
     public function hasPageName(): bool
     {
         return $this->pageName !== null;
     }
 
-    /**
-     * @return bool
-     */
     public function getPaginationStatus(): bool
     {
         return $this->paginationStatus;
     }
 
-    /**
-     * @return string
-     */
     public function getPaginationTheme(): string
     {
         return $this->paginationTheme;
     }
 
-    /**
-     * @return bool
-     */
     public function paginationIsEnabled(): bool
     {
         return $this->getPaginationStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function paginationIsDisabled(): bool
     {
         return $this->getPaginationStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getPaginationVisibilityStatus(): bool
     {
         return $this->paginationVisibilityStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function paginationVisibilityIsEnabled(): bool
     {
         return $this->getPaginationVisibilityStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function paginationVisibilityIsDisabled(): bool
     {
         return $this->getPaginationVisibilityStatus() === false;
     }
 
-    /**
-     * @return string
-     */
     public function getComputedPageName(): string
     {
         $pageName = 'page';
@@ -94,9 +64,6 @@ public function getComputedPageName(): string
         return $pageName;
     }
 
-    /**
-     * @return int
-     */
     public function getPerPage(): int
     {
         return $this->perPage;
@@ -110,35 +77,21 @@ public function getPerPageAccepted(): array
         return $this->perPageAccepted;
     }
 
-    /**
-     * @return bool
-     */
     public function getPerPageVisibilityStatus(): bool
     {
         return $this->perPageVisibilityStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function perPageVisibilityIsEnabled(): bool
     {
         return $this->getPerPageVisibilityStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function perPageVisibilityIsDisabled(): bool
     {
         return $this->getPerPageVisibilityStatus() === false;
     }
 
-    /**
-     * @param  string  $paginationMethod
-     *
-     * @return bool
-     */
     public function isPaginationMethod(string $paginationMethod): bool
     {
         return $this->paginationMethod === $paginationMethod;
@@ -152,9 +105,6 @@ public function getPerPageDisplayedItemIds(): array
         return $this->paginationCurrentItems;
     }
 
-    /**
-     * @return int
-     */
     public function getPerPageDisplayedItemCount(): int
     {
         return $this->paginationCurrentCount;
diff --git a/src/Traits/Helpers/RefreshHelpers.php b/src/Traits/Helpers/RefreshHelpers.php
index 3fbd55888..50af85746 100644
--- a/src/Traits/Helpers/RefreshHelpers.php
+++ b/src/Traits/Helpers/RefreshHelpers.php
@@ -4,9 +4,6 @@
 
 trait RefreshHelpers
 {
-    /**
-     * @return bool
-     */
     public function hasRefresh(): bool
     {
         return $this->refresh !== false;
@@ -20,14 +17,11 @@ public function getRefreshStatus()
         return $this->refresh;
     }
 
-    /**
-     * @return string|null
-     */
     public function getRefreshOptions(): ?string
     {
         if ($this->hasRefresh()) {
             if (is_numeric($this->getRefreshStatus())) {
-                return '.' . $this->getRefreshStatus().'ms';
+                return '.'.$this->getRefreshStatus().'ms';
             }
 
             switch ($this->getRefreshStatus()) {
@@ -36,7 +30,7 @@ public function getRefreshOptions(): ?string
                 case 'visible':
                     return '.visible';
                 default:
-                    return '=' . $this->getRefreshStatus();
+                    return '='.$this->getRefreshStatus();
             }
         }
 
diff --git a/src/Traits/Helpers/ReorderingHelpers.php b/src/Traits/Helpers/ReorderingHelpers.php
index ea5cabe15..621c15a3c 100644
--- a/src/Traits/Helpers/ReorderingHelpers.php
+++ b/src/Traits/Helpers/ReorderingHelpers.php
@@ -4,137 +4,86 @@
 
 trait ReorderingHelpers
 {
-    /**
-     * @return string
-     */
     public function getReorderMethod(): string
     {
         return $this->reorderMethod;
     }
 
-    /**
-     * @return bool
-     */
     public function getReorderStatus(): bool
     {
         return $this->reorderStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function reorderIsEnabled(): bool
     {
         return $this->getReorderStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function reorderIsDisabled(): bool
     {
         return $this->getReorderStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getCurrentlyReorderingStatus(): bool
     {
         return $this->currentlyReorderingStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function currentlyReorderingIsEnabled(): bool
     {
         return $this->getCurrentlyReorderingStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function currentlyReorderingIsDisabled(): bool
     {
         return $this->getCurrentlyReorderingStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getHideReorderColumnUnlessReorderingStatus(): bool
     {
         return $this->hideReorderColumnUnlessReorderingStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function hideReorderColumnUnlessReorderingIsEnabled(): bool
     {
         return $this->getHideReorderColumnUnlessReorderingStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function hideReorderColumnUnlessReorderingIsDisabled(): bool
     {
         return $this->getHideReorderColumnUnlessReorderingStatus() === false;
     }
 
-    /**
-     * @return string|null
-     */
     public function getDefaultReorderColumn(): ?string
     {
         return $this->defaultReorderColumn;
     }
 
-    /**
-     * @return string
-     */
     public function getDefaultReorderDirection(): string
     {
         return $this->defaultReorderDirection;
     }
 
-    /**
-     *
-     */
     public function setReorderingSession(): void
     {
         session([$this->getReorderingSessionKey() => true]);
     }
 
-    /**
-     *
-     */
     public function forgetReorderingSession(): void
     {
         session()->forget($this->getReorderingSessionKey());
     }
 
-    /**
-     * @return bool
-     */
     public function hasReorderingSession(): bool
     {
         return session()->has($this->getReorderingSessionKey());
     }
 
-    /**
-     * @return string
-     */
     public function getReorderingSessionKey(): string
     {
         return $this->getTableName().'-reordering';
     }
 
-    /**
-     * @return string
-     */
     public function getReorderingBackupSessionKey(): string
     {
         return $this->getTableName().'-reordering-backup';
diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php
index 54fd35edf..13cbad291 100644
--- a/src/Traits/Helpers/SearchHelpers.php
+++ b/src/Traits/Helpers/SearchHelpers.php
@@ -4,17 +4,11 @@
 
 trait SearchHelpers
 {
-    /**
-     * @return bool
-     */
     public function hasSearch(): bool
     {
         return ($this->{$this->getTableName()}['search'] ?? null) !== null;
     }
 
-    /**
-     * @return string|null
-     */
     public function getSearch(): ?string
     {
         return $this->{$this->getTableName()}['search'] ?? null;
@@ -28,93 +22,60 @@ public function clearSearch(): void
         $this->{$this->getTableName()}['search'] = null;
     }
 
-    /**
-     * @return bool
-     */
     public function getSearchStatus(): bool
     {
         return $this->searchStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function searchIsEnabled(): bool
     {
         return $this->getSearchStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function searchIsDisabled(): bool
     {
         return $this->getSearchStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function getSearchVisibilityStatus(): bool
     {
         return $this->searchVisibilityStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function searchVisibilityIsEnabled(): bool
     {
         return $this->getSearchVisibilityStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function searchVisibilityIsDisabled(): bool
     {
         return $this->getSearchVisibilityStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSearchDebounce(): bool
     {
         return $this->searchFilterDebounce !== null;
     }
 
-    /**
-     * @return int|null
-     */
     public function getSearchDebounce(): ?int
     {
         return $this->searchFilterDebounce;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSearchDefer(): bool
     {
         return $this->searchFilterDefer !== null;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSearchLazy(): bool
     {
         return $this->searchFilterLazy !== null;
     }
 
-    /**
-     * @return string
-     */
     public function getSearchOptions(): string
     {
         if ($this->hasSearchDebounce()) {
-            return '.debounce.' . $this->getSearchDebounce() . 'ms';
+            return '.debounce.'.$this->getSearchDebounce().'ms';
         }
 
         if ($this->hasSearchDefer()) {
diff --git a/src/Traits/Helpers/SecondaryHeaderHelpers.php b/src/Traits/Helpers/SecondaryHeaderHelpers.php
index df96847bd..cc7694002 100644
--- a/src/Traits/Helpers/SecondaryHeaderHelpers.php
+++ b/src/Traits/Helpers/SecondaryHeaderHelpers.php
@@ -6,41 +6,28 @@
 
 trait SecondaryHeaderHelpers
 {
-    /**
-     * @return bool
-     */
     public function hasColumnsWithSecondaryHeader(): bool
     {
         return $this->columnsWithSecondaryHeader === true;
     }
 
-    /**
-     * @return bool
-     */
     public function getSecondaryHeaderStatus(): bool
     {
         return $this->secondaryHeaderStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function secondaryHeaderIsEnabled(): bool
     {
         return $this->getSecondaryHeaderStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function secondaryHeaderIsDisabled(): bool
     {
         return $this->getSecondaryHeaderStatus() === false;
     }
 
     /**
-     * @param mixed $rows
-     *
+     * @param  mixed  $rows
      * @return array<mixed>
      */
     public function getSecondaryHeaderTrAttributes($rows): array
@@ -49,10 +36,7 @@ public function getSecondaryHeaderTrAttributes($rows): array
     }
 
     /**
-     * @param Column $column
-     * @param mixed $rows
-     * @param int $index
-     *
+     * @param  mixed  $rows
      * @return array<mixed>
      */
     public function getSecondaryHeaderTdAttributes(Column $column, $rows, int $index): array
diff --git a/src/Traits/Helpers/SortingHelpers.php b/src/Traits/Helpers/SortingHelpers.php
index e81bcdf1a..205146e8b 100644
--- a/src/Traits/Helpers/SortingHelpers.php
+++ b/src/Traits/Helpers/SortingHelpers.php
@@ -4,17 +4,11 @@
 
 trait SortingHelpers
 {
-    /**
-     * @return bool
-     */
     public function getSortingStatus(): bool
     {
         return $this->sortingStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function getSingleSortingStatus(): bool
     {
         return $this->singleColumnSortingStatus;
@@ -30,7 +24,6 @@ public function getSorts(): array
 
     /**
      * @param  array<mixed>  $sorts
-     *
      * @return array<mixed>
      */
     public function setSorts(array $sorts): array
@@ -38,40 +31,21 @@ public function setSorts(array $sorts): array
         return $this->{$this->getTableName()}['sorts'] = $sorts;
     }
 
-    /**
-     * @param  string  $field
-     *
-     * @return string|null
-     */
     public function getSort(string $field): ?string
     {
         return $this->{$this->getTableName()}['sorts'][$field] ?? null;
     }
 
-    /**
-     * @param  string  $field
-     * @param  string  $direction
-     *
-     * @return string
-     */
     public function setSort(string $field, string $direction): string
     {
         return $this->{$this->getTableName()}['sorts'][$field] = $direction;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSorts(): bool
     {
-        return (count($this->getSorts()) > 0);
+        return count($this->getSorts()) > 0;
     }
 
-    /**
-     * @param  string  $field
-     *
-     * @return bool
-     */
     public function hasSort(string $field): bool
     {
         return $this->getSort($field) !== null;
@@ -85,145 +59,86 @@ public function clearSorts(): void
         $this->{$this->getTableName()}['sorts'] = [];
     }
 
-    /**
-     * @param  string  $field
-     */
     public function clearSort(string $field): void
     {
         unset($this->{$this->getTableName()}['sorts'][$field]);
     }
 
-    /**
-     * @param  string  $field
-     *
-     * @return string
-     */
     public function setSortAsc(string $field): string
     {
         return $this->setSort($field, 'asc');
     }
 
-    /**
-     * @param  string  $field
-     *
-     * @return string
-     */
     public function setSortDesc(string $field): string
     {
         return $this->setSort($field, 'desc');
     }
 
-    /**
-     * @param  string  $field
-     *
-     * @return bool
-     */
     public function isSortAsc(string $field): bool
     {
         return $this->getSort($field) === 'asc';
     }
 
-    /**
-     * @param  string  $field
-     *
-     * @return bool
-     */
     public function isSortDesc(string $field): bool
     {
         return $this->getSort($field) === 'desc';
     }
 
-    /**
-     * @return bool
-     */
     public function sortingIsEnabled(): bool
     {
         return $this->getSortingStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function sortingIsDisabled(): bool
     {
         return $this->getSortingStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function singleSortingIsEnabled(): bool
     {
         return $this->getSingleSortingStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function singleSortingIsDisabled(): bool
     {
         return $this->getSingleSortingStatus() === false;
     }
 
-    /**
-     * @return bool
-     */
     public function hasDefaultSort(): bool
     {
         return $this->getDefaultSortColumn() !== null;
     }
 
-    /**
-     * @return string|null
-     */
     public function getDefaultSortColumn(): ?string
     {
         return $this->defaultSortColumn;
     }
 
-    /**
-     * @return string
-     */
     public function getDefaultSortDirection(): string
     {
         return $this->defaultSortDirection;
     }
 
-    /**
-     * @return bool
-     */
     public function getSortingPillsStatus(): bool
     {
         return $this->sortingPillsStatus;
     }
 
-    /**
-     * @return bool
-     */
     public function sortingPillsAreEnabled(): bool
     {
         return $this->getSortingPillsStatus() === true;
     }
 
-    /**
-     * @return bool
-     */
     public function sortingPillsAreDisabled(): bool
     {
         return $this->getSortingPillsStatus() === false;
     }
 
-    /**
-     * @return string
-     */
     public function getDefaultSortingLabelAsc(): string
     {
         return $this->defaultSortingLabelAsc;
     }
 
-    /**
-     * @return string
-     */
     public function getDefaultSortingLabelDesc(): string
     {
         return $this->defaultSortingLabelDesc;
diff --git a/src/Traits/WithBulkActions.php b/src/Traits/WithBulkActions.php
index a0da3cabc..391f8d3f6 100644
--- a/src/Traits/WithBulkActions.php
+++ b/src/Traits/WithBulkActions.php
@@ -11,9 +11,13 @@ trait WithBulkActions
         BulkActionsHelpers;
 
     public bool $bulkActionsStatus = true;
+
     public bool $selectAll = false;
+
     public array $bulkActions = [];
+
     public array $selected = [];
+
     public bool $hideBulkActionsWhenEmpty = false;
 
     public function bulkActions(): array
diff --git a/src/Traits/WithColumnSelect.php b/src/Traits/WithColumnSelect.php
index a46eba267..a26dcb85c 100644
--- a/src/Traits/WithColumnSelect.php
+++ b/src/Traits/WithColumnSelect.php
@@ -12,9 +12,13 @@ trait WithColumnSelect
         ColumnSelectHelpers;
 
     public array $selectedColumns = [];
+
     protected bool $columnSelectStatus = true;
+
     protected bool $rememberColumnSelectionStatus = true;
+
     protected bool $columnSelectHiddenOnMobile = false;
+
     protected bool $columnSelectHiddenOnTablet = false;
 
     public function setupColumnSelect(): void
@@ -49,12 +53,12 @@ public function setupColumnSelect(): void
     public function getDefaultVisibleColumns(): array
     {
         return collect($this->getColumns())
-        ->filter(function ($column) {
-            return $column->isVisible() && $column->isSelectable() && $column->isSelected();
-        })
-        ->map(fn ($column) => $column->getSlug())
-        ->values()
-        ->toArray();
+            ->filter(function ($column) {
+                return $column->isVisible() && $column->isSelectable() && $column->isSelected();
+            })
+            ->map(fn ($column) => $column->getSlug())
+            ->values()
+            ->toArray();
     }
 
     public function selectAllColumns()
diff --git a/src/Traits/WithData.php b/src/Traits/WithData.php
index 99fa45dfc..2010f2212 100644
--- a/src/Traits/WithData.php
+++ b/src/Traits/WithData.php
@@ -17,7 +17,10 @@ public function getRows()
 
         $executedQuery = $this->executeQuery();
 
+        // Get All Currently Paginated Items Primary Keys
         $this->paginationCurrentItems = $executedQuery->pluck($this->getPrimaryKey())->toArray() ?? [];
+
+        // Get Count of Items in Current Page
         $this->paginationCurrentCount = $executedQuery->count() ?? 0;
 
         return $executedQuery;
@@ -46,7 +49,12 @@ protected function executeQuery()
     {
         if ($this->paginationIsEnabled()) {
             if ($this->isPaginationMethod('standard')) {
-                return $this->getBuilder()->paginate($this->getPerPage() === -1 ? $this->getBuilder()->count() : $this->getPerPage(), ['*'], $this->getComputedPageName());
+                $paginatedResults = $this->getBuilder()->paginate($this->getPerPage() === -1 ? $this->getBuilder()->count() : $this->getPerPage(), ['*'], $this->getComputedPageName());
+
+                // Get the total number of items available
+                $this->paginationTotalItemCount = $paginatedResults->total() ?? 0;
+
+                return $paginatedResults;
             }
 
             if ($this->isPaginationMethod('simple')) {
@@ -132,7 +140,7 @@ protected function selectFields(): Builder
         }
 
         foreach ($this->getSelectableColumns() as $column) {
-            $this->setBuilder($this->getBuilder()->addSelect($column->getColumn() . ' as ' .$column->getColumnSelectName()));
+            $this->setBuilder($this->getBuilder()->addSelect($column->getColumn().' as '.$column->getColumnSelectName()));
         }
 
         return $this->getBuilder();
diff --git a/src/Traits/WithDebugging.php b/src/Traits/WithDebugging.php
index 3c51636f9..628520d89 100644
--- a/src/Traits/WithDebugging.php
+++ b/src/Traits/WithDebugging.php
@@ -12,8 +12,6 @@ trait WithDebugging
 
     /**
      * Dump table properties for debugging
-     *
-     * @var bool
      */
     protected bool $debugStatus = false;
 }
diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
index 73a728059..b8343ca90 100644
--- a/src/Traits/WithFilters.php
+++ b/src/Traits/WithFilters.php
@@ -12,11 +12,17 @@ trait WithFilters
         FilterHelpers;
 
     public bool $filtersStatus = true;
+
     public bool $filtersVisibilityStatus = true;
+
     public bool $filterPillsStatus = true;
+
     public bool $filterSlideDownDefaultVisible = false;
+
     public string $filterLayout = 'popover';
+
     public int $filterCount;
+
     protected $filterCollection;
 
     public function filters(): array
diff --git a/src/Traits/WithFooter.php b/src/Traits/WithFooter.php
index 1149b386a..d6e620299 100644
--- a/src/Traits/WithFooter.php
+++ b/src/Traits/WithFooter.php
@@ -11,9 +11,13 @@ trait WithFooter
         FooterHelpers;
 
     protected bool $footerStatus = true;
+
     protected bool $useHeaderAsFooterStatus = false;
+
     protected bool $columnsWithFooter = false;
+
     protected $footerTrAttributesCallback;
+
     protected $footerTdAttributesCallback;
 
     public function setupFooter(): void
diff --git a/src/Traits/WithPagination.php b/src/Traits/WithPagination.php
index f601d9995..a8f08e4f6 100644
--- a/src/Traits/WithPagination.php
+++ b/src/Traits/WithPagination.php
@@ -13,16 +13,27 @@ trait WithPagination
         PaginationHelpers;
 
     public ?string $pageName = null;
+
     public int $perPage = 10;
+
     public array $perPageAccepted = [10, 25, 50];
+
     public string $paginationTheme = 'tailwind';
+
     public bool $paginationStatus = true;
+
     public bool $paginationVisibilityStatus = true;
+
     public bool $perPageVisibilityStatus = true;
+
     public string $paginationMethod = 'standard';
+
     public array $paginationCurrentItems = [];
+
     public int $paginationCurrentCount = 0;
 
+    public ?int $paginationTotalItemCount = null;
+
     // TODO: Test
     public function setupPagination(): void
     {
diff --git a/src/Traits/WithReordering.php b/src/Traits/WithReordering.php
index 53bf8ac39..e82ad382d 100644
--- a/src/Traits/WithReordering.php
+++ b/src/Traits/WithReordering.php
@@ -11,10 +11,15 @@ trait WithReordering
         ReorderingHelpers;
 
     public bool $reorderStatus = false;
+
     public bool $currentlyReorderingStatus = false;
+
     public bool $hideReorderColumnUnlessReorderingStatus = false;
+
     public string $reorderMethod = 'reorder';
+
     public string $defaultReorderColumn = 'sort';
+
     public string $defaultReorderDirection = 'asc';
 
     public function setupReordering(): void
diff --git a/src/Traits/WithSearch.php b/src/Traits/WithSearch.php
index 23f99dc47..b5a015a5b 100644
--- a/src/Traits/WithSearch.php
+++ b/src/Traits/WithSearch.php
@@ -12,10 +12,15 @@ trait WithSearch
         SearchHelpers;
 
     public ?string $search = null;
+
     public bool $searchStatus = true;
+
     public bool $searchVisibilityStatus = true;
+
     public ?int $searchFilterDebounce = null;
+
     public ?bool $searchFilterDefer = null;
+
     public ?bool $searchFilterLazy = null;
 
     // TODO
diff --git a/src/Traits/WithSecondaryHeader.php b/src/Traits/WithSecondaryHeader.php
index 82c73bf27..568eaf086 100644
--- a/src/Traits/WithSecondaryHeader.php
+++ b/src/Traits/WithSecondaryHeader.php
@@ -11,8 +11,11 @@ trait WithSecondaryHeader
         SecondaryHeaderHelpers;
 
     protected bool $secondaryHeaderStatus = true;
+
     protected bool $columnsWithSecondaryHeader = false;
+
     protected $secondaryHeaderTrAttributesCallback;
+
     protected $secondaryHeaderTdAttributesCallback;
 
     public function setupSecondaryHeader(): void
diff --git a/src/Traits/WithSorting.php b/src/Traits/WithSorting.php
index 7e91d8641..9d247fdc7 100644
--- a/src/Traits/WithSorting.php
+++ b/src/Traits/WithSorting.php
@@ -12,19 +12,21 @@ trait WithSorting
         SortingHelpers;
 
     public array $sorts = [];
+
     public bool $sortingStatus = true;
+
     public bool $singleColumnSortingStatus = true;
+
     public bool $sortingPillsStatus = true;
+
     public ?string $defaultSortColumn = null;
+
     public string $defaultSortDirection = 'asc';
+
     public string $defaultSortingLabelAsc = 'A-Z';
+
     public string $defaultSortingLabelDesc = 'Z-A';
 
-    /**
-     * @param  string  $columnSelectName
-     *
-     * @return string|null
-     */
     public function sortBy(string $columnSelectName): ?string
     {
         if ($this->sortingIsDisabled()) {
@@ -50,9 +52,6 @@ public function sortBy(string $columnSelectName): ?string
         return null;
     }
 
-    /**
-     * @return Builder
-     */
     public function applySorting(): Builder
     {
         if ($this->hasDefaultSort() && ! $this->hasSorts()) {
@@ -80,9 +79,9 @@ public function applySorting(): Builder
             } elseif ($column->isBaseColumn()) {
                 $this->setBuilder($this->getBuilder()->orderBy($column->getColumnSelectName(), $direction));
             } else {
-                $value = $this->getBuilder()->getGrammar()->wrap($column->getColumn() . ' as ' . $column->getColumnSelectName());
+                $value = $this->getBuilder()->getGrammar()->wrap($column->getColumn().' as '.$column->getColumnSelectName());
                 $segments = preg_split('/\s+as\s+/i', $value);
-                $this->setBuilder($this->getBuilder()->orderByRaw($segments[1] . ' ' . $direction));
+                $this->setBuilder($this->getBuilder()->orderByRaw($segments[1].' '.$direction));
             }
         }
 
diff --git a/src/Views/Column.php b/src/Views/Column.php
index 1e0242c83..e09e81388 100644
--- a/src/Views/Column.php
+++ b/src/Views/Column.php
@@ -35,32 +35,49 @@ class Column
     protected array $relations = [];
 
     protected bool $sortable = false;
+
     protected $sortCallback;
+
     protected bool $searchable = false;
+
     protected $searchCallback;
+
     protected bool $collapseOnMobile = false;
+
     protected bool $collapseOnTablet = false;
+
     protected ?string $sortingPillTitle = null;
+
     protected ?string $sortingPillDirectionAsc = null;
+
     protected ?string $sortingPillDirectionDesc = null;
+
     protected bool $eagerLoadRelations = false;
+
     protected $formatCallback;
+
     protected bool $html = false;
+
     protected $labelCallback;
+
     protected bool $hidden = false;
+
     protected bool $selectable = true;
+
     protected bool $selected = true;
+
     protected bool $secondaryHeader = false;
+
     protected $secondaryHeaderCallback;
+
     protected bool $footer = false;
+
     protected $footerCallback;
+
     protected bool $clickable = true;
+
     protected ?string $customSlug = null;
 
-    /**
-     * @param  string  $title
-     * @param  string|null  $from
-     */
     public function __construct(string $title, string $from = null)
     {
         $this->title = trim($title);
@@ -82,9 +99,6 @@ public function __construct(string $title, string $from = null)
     }
 
     /**
-     * @param  string  $title
-     * @param  string|null  $from
-     *
      * @return static
      */
     public static function make(string $title, string $from = null): Column
diff --git a/src/Views/Columns/BooleanColumn.php b/src/Views/Columns/BooleanColumn.php
index 0e4b31ca6..14b97c962 100644
--- a/src/Views/Columns/BooleanColumn.php
+++ b/src/Views/Columns/BooleanColumn.php
@@ -14,8 +14,11 @@ class BooleanColumn extends Column
         BooleanColumnHelpers;
 
     protected string $type = 'icons';
+
     protected bool $successValue = true;
+
     protected string $view = 'livewire-tables::includes.columns.boolean';
+
     protected $callback;
 
     public function getContents(Model $row)
@@ -30,6 +33,6 @@ public function getContents(Model $row)
             ->withComponent($this->getComponent())
             ->withSuccessValue($this->getSuccessValue())
             ->withType($this->getType())
-            ->withStatus($this->hasCallback() ? call_user_func($this->getCallback(), $value, $row) : (bool)$value === true);
+            ->withStatus($this->hasCallback() ? call_user_func($this->getCallback(), $value, $row) : (bool) $value === true);
     }
 }
diff --git a/src/Views/Columns/ButtonGroupColumn.php b/src/Views/Columns/ButtonGroupColumn.php
index d98959ac1..2987481b5 100644
--- a/src/Views/Columns/ButtonGroupColumn.php
+++ b/src/Views/Columns/ButtonGroupColumn.php
@@ -13,7 +13,9 @@ class ButtonGroupColumn extends Column
         ButtonGroupColumnHelpers;
 
     protected array $buttons = [];
+
     protected string $view = 'livewire-tables::includes.columns.button-group';
+
     protected $attributesCallback;
 
     public function __construct(string $title, string $from = null)
diff --git a/src/Views/Columns/ComponentColumn.php b/src/Views/Columns/ComponentColumn.php
index 4d32ce376..b60ba72ef 100644
--- a/src/Views/Columns/ComponentColumn.php
+++ b/src/Views/Columns/ComponentColumn.php
@@ -16,7 +16,9 @@ class ComponentColumn extends Column
         ComponentColumnConfiguration;
 
     protected string $componentView;
+
     protected $attributesCallback;
+
     protected $slotCallback;
 
     public function __construct(string $title, string $from = null)
diff --git a/src/Views/Columns/ImageColumn.php b/src/Views/Columns/ImageColumn.php
index efd62147c..b0014baad 100644
--- a/src/Views/Columns/ImageColumn.php
+++ b/src/Views/Columns/ImageColumn.php
@@ -14,7 +14,9 @@ class ImageColumn extends Column
         ImageColumnConfiguration;
 
     protected string $view = 'livewire-tables::includes.columns.image';
+
     protected $locationCallback;
+
     protected $attributesCallback;
 
     public function __construct(string $title, string $from = null)
diff --git a/src/Views/Columns/LinkColumn.php b/src/Views/Columns/LinkColumn.php
index 70ae2fe06..e10a8937a 100644
--- a/src/Views/Columns/LinkColumn.php
+++ b/src/Views/Columns/LinkColumn.php
@@ -14,8 +14,11 @@ class LinkColumn extends Column
         LinkColumnConfiguration;
 
     protected string $view = 'livewire-tables::includes.columns.link';
+
     protected $titleCallback;
+
     protected $locationCallback;
+
     protected $attributesCallback;
 
     public function __construct(string $title, string $from = null)
diff --git a/src/Views/Filter.php b/src/Views/Filter.php
index 9cf9a7b88..2b260a3e3 100644
--- a/src/Views/Filter.php
+++ b/src/Views/Filter.php
@@ -13,20 +13,35 @@ abstract class Filter
         FilterHelpers;
 
     protected string $name;
+
     protected string $key;
+
     protected bool $hiddenFromMenus = false;
+
     protected bool $hiddenFromPills = false;
+
     protected bool $hiddenFromFilterCount = false;
+
     protected bool $resetByClearButton = true;
+
     protected $filterCallback = null;
+
     protected array $config = [];
+
     protected ?string $filterPillTitle = null;
+
     protected array $filterPillValues = [];
+
     public ?string $filterPosition = null;
+
     protected ?string $filterCustomLabel = null;
+
     protected ?int $filterSlidedownRow = null;
+
     protected ?int $filterSlidedownColspan = null;
+
     protected ?string $filterCustomPillBlade = null;
+
     protected $filterDefaultValue;
 
     public function __construct(string $name, string $key = null)
diff --git a/src/Views/Filters/DateFilter.php b/src/Views/Filters/DateFilter.php
index b3501b022..b1f1eb9c6 100644
--- a/src/Views/Filters/DateFilter.php
+++ b/src/Views/Filters/DateFilter.php
@@ -24,8 +24,6 @@ public function isEmpty($value): bool
 
     /**
      * Gets the Default Value for this Filter via the Component
-     *
-     * @return string|null
      */
     public function getFilterDefaultValue(): ?string
     {
diff --git a/src/Views/Filters/DateTimeFilter.php b/src/Views/Filters/DateTimeFilter.php
index a0407281a..09c7550c3 100644
--- a/src/Views/Filters/DateTimeFilter.php
+++ b/src/Views/Filters/DateTimeFilter.php
@@ -24,8 +24,6 @@ public function isEmpty($value): bool
 
     /**
      * Gets the Default Value for this Filter via the Component
-     *
-     * @return string|null
      */
     public function getFilterDefaultValue(): ?string
     {
diff --git a/src/Views/Filters/MultiSelectDropdownFilter.php b/src/Views/Filters/MultiSelectDropdownFilter.php
index 70e8f9631..287e12652 100644
--- a/src/Views/Filters/MultiSelectDropdownFilter.php
+++ b/src/Views/Filters/MultiSelectDropdownFilter.php
@@ -8,7 +8,8 @@
 class MultiSelectDropdownFilter extends Filter
 {
     protected array $options = [];
-    protected string $firstOption = "";
+
+    protected string $firstOption = '';
 
     public function options(array $options = []): MultiSelectDropdownFilter
     {
@@ -38,7 +39,7 @@ public function getKeys(): array
     {
         return collect($this->getOptions())
             ->keys()
-            ->map(fn ($value) => (string)$value)
+            ->map(fn ($value) => (string) $value)
             ->filter(fn ($value) => strlen($value))
             ->values()
             ->toArray();
@@ -100,7 +101,7 @@ public function isEmpty($value): bool
     {
         if (! is_array($value)) {
             return true;
-        } elseif (in_array("all", $value)) {
+        } elseif (in_array('all', $value)) {
             return true;
         }
 
diff --git a/src/Views/Filters/MultiSelectFilter.php b/src/Views/Filters/MultiSelectFilter.php
index ef1d0e01e..c36a001b8 100644
--- a/src/Views/Filters/MultiSelectFilter.php
+++ b/src/Views/Filters/MultiSelectFilter.php
@@ -25,7 +25,7 @@ public function getKeys(): array
     {
         return collect($this->getOptions())
             ->keys()
-            ->map(fn ($value) => (string)$value)
+            ->map(fn ($value) => (string) $value)
             ->filter(fn ($value) => strlen($value))
             ->values()
             ->toArray();
diff --git a/src/Views/Filters/NumberFilter.php b/src/Views/Filters/NumberFilter.php
index eb9c987b5..b47af56da 100644
--- a/src/Views/Filters/NumberFilter.php
+++ b/src/Views/Filters/NumberFilter.php
@@ -19,8 +19,6 @@ public function isEmpty($value): bool
 
     /**
      * Gets the Default Value for this Filter via the Component
-     *
-     * @return string|null
      */
     public function getFilterDefaultValue(): ?string
     {
diff --git a/src/Views/Filters/SelectFilter.php b/src/Views/Filters/SelectFilter.php
index 2c29ea7d8..b9b7ab0ee 100644
--- a/src/Views/Filters/SelectFilter.php
+++ b/src/Views/Filters/SelectFilter.php
@@ -26,7 +26,7 @@ public function getKeys(): array
         return collect($this->getOptions())
             ->map(fn ($value, $key) => is_iterable($value) ? collect($value)->keys() : $key)
             ->flatten()
-            ->map(fn ($value) => (string)$value)
+            ->map(fn ($value) => (string) $value)
             ->filter(fn ($value) => strlen($value) > 0)
             ->values()
             ->toArray();
@@ -56,8 +56,6 @@ public function isEmpty($value): bool
 
     /**
      * Gets the Default Value for this Filter via the Component
-     *
-     * @return string|null
      */
     public function getFilterDefaultValue(): ?string
     {
diff --git a/src/Views/Filters/TextFilter.php b/src/Views/Filters/TextFilter.php
index c090ab9a2..98f07e422 100644
--- a/src/Views/Filters/TextFilter.php
+++ b/src/Views/Filters/TextFilter.php
@@ -23,8 +23,6 @@ public function isEmpty($value): bool
 
     /**
      * Gets the Default Value for this Filter via the Component
-     *
-     * @return string|null
      */
     public function getFilterDefaultValue(): ?string
     {
diff --git a/src/Views/Traits/Configuration/BooleanColumnConfiguration.php b/src/Views/Traits/Configuration/BooleanColumnConfiguration.php
index 997938427..e764de0ed 100644
--- a/src/Views/Traits/Configuration/BooleanColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/BooleanColumnConfiguration.php
@@ -7,8 +7,6 @@
 trait BooleanColumnConfiguration
 {
     /**
-     * @param  Closure  $callback
-     *
      * @return $this
      */
     public function setCallback(Closure $callback): self
@@ -19,8 +17,6 @@ public function setCallback(Closure $callback): self
     }
 
     /**
-     * @param  bool  $value
-     *
      * @return $this
      */
     public function setSuccessValue(bool $value): self
@@ -31,8 +27,6 @@ public function setSuccessValue(bool $value): self
     }
 
     /**
-     * @param  string  $view
-     *
      * @return $this
      */
     public function setView(string $view): self
diff --git a/src/Views/Traits/Configuration/ButtonGroupColumnConfiguration.php b/src/Views/Traits/Configuration/ButtonGroupColumnConfiguration.php
index 805664c83..5f597afd2 100644
--- a/src/Views/Traits/Configuration/ButtonGroupColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/ButtonGroupColumnConfiguration.php
@@ -14,7 +14,7 @@ public function buttons(array $buttons): self
     public function attributes(callable $callback): self
     {
         $this->attributesCallback = $callback;
-        
+
         return $this;
     }
 }
diff --git a/src/Views/Traits/Configuration/ColumnConfiguration.php b/src/Views/Traits/Configuration/ColumnConfiguration.php
index 96fdaed1a..54d233d36 100644
--- a/src/Views/Traits/Configuration/ColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/ColumnConfiguration.php
@@ -7,11 +7,6 @@
 
 trait ColumnConfiguration
 {
-    /**
-     * @param DataTableComponent $component
-     *
-     * @return self
-     */
     public function setComponent(DataTableComponent $component): self
     {
         $this->component = $component;
@@ -19,11 +14,6 @@ public function setComponent(DataTableComponent $component): self
         return $this;
     }
 
-    /**
-     * @param callable $callback
-     *
-     * @return self
-     */
     public function label(callable $callback): self
     {
         $this->from = null;
@@ -33,11 +23,6 @@ public function label(callable $callback): self
         return $this;
     }
 
-    /**
-     * @param callable|null $callback
-     *
-     * @return self
-     */
     public function sortable(callable $callback = null): self
     {
         $this->sortable = true;
@@ -47,11 +32,6 @@ public function sortable(callable $callback = null): self
         return $this;
     }
 
-    /**
-     * @param callable $callable
-     *
-     * @return Column
-     */
     public function format(callable $callable): Column
     {
         $this->formatCallback = $callable;
@@ -59,11 +39,6 @@ public function format(callable $callable): Column
         return $this;
     }
 
-    /**
-     * @param callable|null $callback
-     *
-     * @return self
-     */
     public function searchable(callable $callback = null): self
     {
         $this->searchable = true;
@@ -73,9 +48,6 @@ public function searchable(callable $callback = null): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function html(): self
     {
         $this->html = true;
@@ -83,11 +55,6 @@ public function html(): self
         return $this;
     }
 
-    /**
-     * @param string $table
-     *
-     * @return self
-     */
     public function setTable(string $table): self
     {
         $this->table = $table;
@@ -95,11 +62,6 @@ public function setTable(string $table): self
         return $this;
     }
 
-    /**
-     * @param string $title
-     *
-     * @return self
-     */
     public function setSortingPillTitle(string $title): self
     {
         $this->sortingPillTitle = $title;
@@ -107,12 +69,6 @@ public function setSortingPillTitle(string $title): self
         return $this;
     }
 
-    /**
-     * @param string $asc
-     * @param string $desc
-     *
-     * @return self
-     */
     public function setSortingPillDirections(string $asc, string $desc): self
     {
         $this->sortingPillDirectionAsc = $asc;
@@ -121,9 +77,6 @@ public function setSortingPillDirections(string $asc, string $desc): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function eagerLoadRelations(): self
     {
         $this->eagerLoadRelations = true;
@@ -132,9 +85,7 @@ public function eagerLoadRelations(): self
     }
 
     /**
-     * @param mixed $condition
-     *
-     * @return self
+     * @param  mixed  $condition
      */
     public function hideIf($condition): self
     {
@@ -143,9 +94,6 @@ public function hideIf($condition): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function excludeFromColumnSelect(): self
     {
         $this->selectable = false;
@@ -153,9 +101,6 @@ public function excludeFromColumnSelect(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function deselected(): self
     {
         $this->selected = false;
@@ -165,8 +110,6 @@ public function deselected(): self
 
     /**
      * @param  mixed  $callback
-     *
-     * @return self
      */
     public function secondaryHeader($callback = null): self
     {
@@ -177,11 +120,6 @@ public function secondaryHeader($callback = null): self
         return $this;
     }
 
-    /**
-     * @param string $filterKey
-     *
-     * @return self
-     */
     public function secondaryHeaderFilter(string $filterKey): self
     {
         $this->secondaryHeader = true;
@@ -193,8 +131,6 @@ public function secondaryHeaderFilter(string $filterKey): self
 
     /**
      * @param  mixed  $callback
-     *
-     * @return self
      */
     public function footer($callback = null): self
     {
@@ -205,11 +141,6 @@ public function footer($callback = null): self
         return $this;
     }
 
-    /**
-     * @param string $filterKey
-     *
-     * @return self
-     */
     public function footerFilter(string $filterKey): self
     {
         $this->footer = true;
@@ -219,9 +150,6 @@ public function footerFilter(string $filterKey): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function unclickable(): self
     {
         $this->clickable = false;
@@ -229,11 +157,6 @@ public function unclickable(): self
         return $this;
     }
 
-    /**
-     * @param string $customSlug
-     *
-     * @return self
-     */
     public function setCustomSlug(string $customSlug): self
     {
         $this->customSlug = $customSlug;
diff --git a/src/Views/Traits/Configuration/ComponentColumnConfiguration.php b/src/Views/Traits/Configuration/ComponentColumnConfiguration.php
index 825973e75..c9869fb86 100644
--- a/src/Views/Traits/Configuration/ComponentColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/ComponentColumnConfiguration.php
@@ -6,7 +6,7 @@ trait ComponentColumnConfiguration
 {
     public function component(string $component): self
     {
-        $this->componentView = 'components.' . $component;
+        $this->componentView = 'components.'.$component;
 
         return $this;
     }
diff --git a/src/Views/Traits/Configuration/FilterConfiguration.php b/src/Views/Traits/Configuration/FilterConfiguration.php
index ebcc06453..bcf7045bf 100644
--- a/src/Views/Traits/Configuration/FilterConfiguration.php
+++ b/src/Views/Traits/Configuration/FilterConfiguration.php
@@ -7,9 +7,7 @@
 trait FilterConfiguration
 {
     /**
-     * @param array<mixed> $config
-     *
-     * @return Filter
+     * @param  array<mixed>  $config
      */
     public function config(array $config = []): Filter
     {
@@ -18,11 +16,6 @@ public function config(array $config = []): Filter
         return $this;
     }
 
-    /**
-     * @param string $title
-     *
-     * @return self
-     */
     public function setFilterPillTitle(string $title): self
     {
         $this->filterPillTitle = $title;
@@ -31,9 +24,7 @@ public function setFilterPillTitle(string $title): self
     }
 
     /**
-     * @param array<mixed> $values
-     *
-     * @return self
+     * @param  array<mixed>  $values
      */
     public function setFilterPillValues(array $values): self
     {
@@ -42,9 +33,6 @@ public function setFilterPillValues(array $values): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function hiddenFromMenus(): self
     {
         $this->hiddenFromMenus = true;
@@ -52,9 +40,6 @@ public function hiddenFromMenus(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function hiddenFromPills(): self
     {
         $this->hiddenFromPills = true;
@@ -62,9 +47,6 @@ public function hiddenFromPills(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function hiddenFromFilterCount(): self
     {
         $this->hiddenFromFilterCount = true;
@@ -72,9 +54,6 @@ public function hiddenFromFilterCount(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function hiddenFromAll(): self
     {
         $this->hiddenFromMenus = true;
@@ -84,9 +63,6 @@ public function hiddenFromAll(): self
         return $this;
     }
 
-    /**
-     * @return self
-     */
     public function notResetByClearButton(): self
     {
         $this->resetByClearButton = false;
@@ -94,35 +70,20 @@ public function notResetByClearButton(): self
         return $this;
     }
 
-    /**
-     * @param string $position
-     *
-     * @return self
-     */
     public function setFilterPosition(string $position): self
     {
         $this->filterPosition = $position;
 
         return $this;
     }
-     
-    /**
-     * @param string $filterCustomLabel
-     *
-     * @return self
-     */
+
     public function setCustomFilterLabel(string $filterCustomLabel): self
     {
         $this->filterCustomLabel = $filterCustomLabel;
 
         return $this;
     }
-    
-    /**
-     * @param string $filterSlidedownRow
-     *
-     * @return self
-     */
+
     public function setFilterSlidedownRow(string $filterSlidedownRow): self
     {
         //$this->filterSlidedownRow = (is_int($filterSlidedownRow) ? $filterSlidedownRow : intval($filterSlidedownRow));
@@ -131,11 +92,6 @@ public function setFilterSlidedownRow(string $filterSlidedownRow): self
         return $this;
     }
 
-    /**
-     * @param string $filterSlidedownColspan
-     *
-     * @return self
-     */
     public function setFilterSlidedownColspan(string $filterSlidedownColspan): self
     {
         //$this->filterSlidedownColspan = (is_int($filterSlidedownColspan) ? $filterSlidedownColspan : intval($filterSlidedownColspan));
@@ -143,12 +99,7 @@ public function setFilterSlidedownColspan(string $filterSlidedownColspan): self
 
         return $this;
     }
-    
-    /**
-     * @param string $blade
-     *
-     * @return self
-     */
+
     public function setFilterPillBlade(string $blade): self
     {
         $this->filterCustomPillBlade = $blade;
@@ -159,9 +110,7 @@ public function setFilterPillBlade(string $blade): self
     /**
      * Sets a Default Value via the Filter Component
      *
-     * @param mixed $value
-     *
-     * @return self
+     * @param  mixed  $value
      */
     public function setFilterDefaultValue($value): self
     {
diff --git a/src/Views/Traits/Configuration/ImageColumnConfiguration.php b/src/Views/Traits/Configuration/ImageColumnConfiguration.php
index 69f97bbcd..e65b6ffd7 100644
--- a/src/Views/Traits/Configuration/ImageColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/ImageColumnConfiguration.php
@@ -8,14 +8,14 @@ trait ImageColumnConfiguration
     public function location(callable $callback): self
     {
         $this->locationCallback = $callback;
-        
+
         return $this;
     }
 
     public function attributes(callable $callback): self
     {
         $this->attributesCallback = $callback;
-        
+
         return $this;
     }
 }
diff --git a/src/Views/Traits/Configuration/LinkColumnConfiguration.php b/src/Views/Traits/Configuration/LinkColumnConfiguration.php
index 460a9f1b3..82eb3e19e 100644
--- a/src/Views/Traits/Configuration/LinkColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/LinkColumnConfiguration.php
@@ -8,21 +8,21 @@ trait LinkColumnConfiguration
     public function title(callable $callback): self
     {
         $this->titleCallback = $callback;
-        
+
         return $this;
     }
 
     public function location(callable $callback): self
     {
         $this->locationCallback = $callback;
-        
+
         return $this;
     }
 
     public function attributes(callable $callback): self
     {
         $this->attributesCallback = $callback;
-        
+
         return $this;
     }
 }
diff --git a/src/Views/Traits/Helpers/BooleanColumnHelpers.php b/src/Views/Traits/Helpers/BooleanColumnHelpers.php
index 087b0b7d4..263228b4b 100644
--- a/src/Views/Traits/Helpers/BooleanColumnHelpers.php
+++ b/src/Views/Traits/Helpers/BooleanColumnHelpers.php
@@ -6,41 +6,26 @@
 
 trait BooleanColumnHelpers
 {
-    /**
-     * @return bool
-     */
     public function hasCallback(): bool
     {
         return $this->callback !== null;
     }
 
-    /**
-     * @return Closure
-     */
     public function getCallback(): Closure
     {
         return $this->callback;
     }
 
-    /**
-     * @return bool
-     */
     public function getSuccessValue(): bool
     {
         return $this->successValue;
     }
 
-    /**
-     * @return string
-     */
     public function getView(): string
     {
         return $this->view;
     }
 
-    /**
-     * @return string
-     */
     public function getType(): string
     {
         return $this->type;
diff --git a/src/Views/Traits/Helpers/ColumnHelpers.php b/src/Views/Traits/Helpers/ColumnHelpers.php
index ae13d86a7..349e00ef1 100644
--- a/src/Views/Traits/Helpers/ColumnHelpers.php
+++ b/src/Views/Traits/Helpers/ColumnHelpers.php
@@ -13,41 +13,26 @@
 
 trait ColumnHelpers
 {
-    /**
-     * @return DataTableComponent|null
-     */
     public function getComponent(): ?DataTableComponent
     {
         return $this->component;
     }
 
-    /**
-     * @return bool
-     */
     public function hasFrom(): bool
     {
         return $this->from !== null;
     }
 
-    /**
-     * @return string|null
-     */
     public function getFrom(): ?string
     {
         return $this->from;
     }
 
-    /**
-     * @return string
-     */
     public function getTitle(): string
     {
         return $this->title;
     }
 
-    /**
-     * @return string
-     */
     public function getSlug(): string
     {
         if ($this->hasCustomSlug()) {
@@ -57,79 +42,46 @@ public function getSlug(): string
         }
     }
 
-    /**
-     * @return string|null
-     */
     public function getField(): ?string
     {
         return $this->field;
     }
 
-    /**
-     * @param  string  $field
-     *
-     * @return bool
-     */
     public function isField(string $field): bool
     {
         return $this->getField() === $field;
     }
 
-    /**
-     * @param  string  $column
-     *
-     * @return bool
-     */
     public function isColumn(string $column): bool
     {
         return $this->getColumn() === $column;
     }
 
-    /**
-     * @param  string  $name
-     *
-     * @return bool
-     */
     public function isColumnBySelectName(string $name): bool
     {
         return $this->getColumnSelectName() === $name;
     }
 
-    /**
-     * @return bool
-     */
     public function hasField(): bool
     {
         return $this->getField() !== null;
     }
 
-    /**
-     * @return bool
-     */
     public function isLabel(): bool
     {
         return ! $this->hasFrom() && ! $this->hasField();
     }
 
-    /**
-     * @return string|null
-     */
     public function getTable(): ?string
     {
         return $this->table;
     }
 
-    /**
-     * @return string|null
-     */
     public function getColumn(): ?string
     {
-        return $this->getTable() . '.' . $this->getField();
+        return $this->getTable().'.'.$this->getField();
     }
 
-    /**
-     * @return string|null
-     */
     public function getColumnSelectName(): ?string
     {
         if ($this->isBaseColumn()) {
@@ -187,57 +139,36 @@ public function getValue(Model $row)
         return $row->{$this->getRelationString().'.'.$this->getField()};
     }
 
-    /**
-     * @return callable|null
-     */
     public function getSortCallback(): ?callable
     {
         return $this->sortCallback;
     }
 
-    /**
-     * @return bool
-     */
     public function isSortable(): bool
     {
         return $this->hasField() && $this->sortable === true;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSortCallback(): bool
     {
         return $this->sortCallback !== null;
     }
 
-    /**
-     * @return callable|null
-     */
     public function getSearchCallback(): ?callable
     {
         return $this->searchCallback;
     }
 
-    /**
-     * @return bool
-     */
     public function isSearchable(): bool
     {
         return $this->hasField() && $this->searchable === true;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSearchCallback(): bool
     {
         return $this->searchCallback !== null;
     }
 
-    /**
-     * @return self
-     */
     public function collapseOnMobile(): self
     {
         $this->collapseOnMobile = true;
@@ -245,9 +176,6 @@ public function collapseOnMobile(): self
         return $this;
     }
 
-    /**
-     * @return bool
-     */
     public function shouldCollapseOnMobile(): bool
     {
         return $this->collapseOnMobile;
@@ -263,17 +191,11 @@ public function collapseOnTablet(): self
         return $this;
     }
 
-    /**
-     * @return bool
-     */
     public function shouldCollapseOnTablet(): bool
     {
         return $this->collapseOnTablet;
     }
 
-    /**
-     * @return string
-     */
     public function getSortingPillTitle(): string
     {
         if ($this->hasCustomSortingPillTitle()) {
@@ -283,35 +205,21 @@ public function getSortingPillTitle(): string
         return $this->getTitle();
     }
 
-    /**
-     * @return string|null
-     */
     public function getCustomSortingPillTitle(): ?string
     {
         return $this->sortingPillTitle;
     }
 
-    /**
-     * @return bool
-     */
     public function hasCustomSortingPillTitle(): bool
     {
         return $this->getCustomSortingPillTitle() !== null;
     }
 
-    /**
-     * @return bool
-     */
     public function hasCustomSortingPillDirections(): bool
     {
         return $this->sortingPillDirectionAsc !== null && $this->sortingPillDirectionDesc !== null;
     }
 
-    /**
-     * @param  string  $direction
-     *
-     * @return string
-     */
     public function getCustomSortingPillDirections(string $direction): string
     {
         if ($direction === 'asc') {
@@ -325,12 +233,6 @@ public function getCustomSortingPillDirections(string $direction): string
         return __('N/A');
     }
 
-    /**
-     * @param  DataTableComponent  $component
-     * @param  string  $direction
-     *
-     * @return string
-     */
     public function getSortingPillDirection(DataTableComponent $component, string $direction): string
     {
         if ($this->hasCustomSortingPillDirections()) {
@@ -340,33 +242,21 @@ public function getSortingPillDirection(DataTableComponent $component, string $d
         return $direction === 'asc' ? $component->getDefaultSortingLabelAsc() : $component->getDefaultSortingLabelDesc();
     }
 
-    /**
-     * @return bool
-     */
     public function eagerLoadRelationsIsEnabled(): bool
     {
         return $this->eagerLoadRelations === true;
     }
 
-    /**
-     * @return bool
-     */
     public function isReorderColumn(): bool
     {
         return $this->getField() === $this->component->getDefaultReorderColumn();
     }
 
-    /**
-     * @return bool
-     */
     public function hasFormatter(): bool
     {
         return $this->formatCallback !== null;
     }
 
-    /**
-     * @return callable|null
-     */
     public function getFormatCallback(): ?callable
     {
         return $this->formatCallback;
@@ -378,9 +268,6 @@ public function getLabelCallback(): ?callable
         return $this->labelCallback;
     }
 
-    /**
-     * @return bool
-     */
     public function isHtml(): bool
     {
         return $this->html === true;
@@ -399,49 +286,31 @@ public function view($view): self
         return $this;
     }
 
-    /**
-     * @return bool
-     */
     public function isVisible(): bool
     {
         return $this->hidden !== true;
     }
 
-    /**
-     * @return bool
-     */
     public function isHidden(): bool
     {
         return $this->hidden === true;
     }
 
-    /**
-     * @return bool
-     */
     public function isSelectable(): bool
     {
         return $this->selectable === true;
     }
 
-    /**
-     * @return bool
-     */
     public function isSelected(): bool
     {
         return $this->selected === true;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSecondaryHeader(): bool
     {
         return $this->secondaryHeader === true;
     }
 
-    /**
-     * @return bool
-     */
     public function hasSecondaryHeaderCallback(): bool
     {
         return $this->secondaryHeaderCallback !== null;
@@ -456,8 +325,7 @@ public function getSecondaryHeaderCallback()
     }
 
     /**
-     * @param mixed $rows
-     *
+     * @param  mixed  $rows
      * @return mixed
      */
     public function getSecondaryHeaderContents($rows)
@@ -488,17 +356,11 @@ public function getSecondaryHeaderContents($rows)
         return $value;
     }
 
-    /**
-     * @return bool
-     */
     public function hasFooter(): bool
     {
         return $this->footer === true;
     }
 
-    /**
-     * @return bool
-     */
     public function hasFooterCallback(): bool
     {
         return $this->footerCallback !== null;
@@ -513,8 +375,7 @@ public function getFooterCallback()
     }
 
     /**
-     * @param mixed $rows
-     *
+     * @param  mixed  $rows
      * @return mixed
      */
     public function getFooterContents($rows)
@@ -546,24 +407,20 @@ public function getFooterContents($rows)
     }
 
     /**
-     * @param array<mixed> $attributes
-     *
+     * @param  array<mixed>  $attributes
      * @return mixed
      */
     public function arrayToAttributes(array $attributes)
     {
-        return join(' ', array_map(function ($key) use ($attributes) {
+        return implode(' ', array_map(function ($key) use ($attributes) {
             if (is_bool($attributes[$key])) {
                 return $attributes[$key] ? $key : '';
             }
 
-            return $key . '="' . $attributes[$key] . '"';
+            return $key.'="'.$attributes[$key].'"';
         }, array_keys($attributes)));
     }
 
-    /**
-     * @return bool
-     */
     public function isClickable(): bool
     {
         return $this->clickable &&
@@ -571,17 +428,11 @@ public function isClickable(): bool
             ! $this instanceof LinkColumn;
     }
 
-    /**
-     * @return string
-     */
     public function getCustomSlug(): string
     {
         return $this->customSlug;
     }
 
-    /**
-     * @return bool
-     */
     public function hasCustomSlug(): bool
     {
         return $this->customSlug !== null;
diff --git a/src/Views/Traits/Helpers/FilterHelpers.php b/src/Views/Traits/Helpers/FilterHelpers.php
index f53249972..6159659e6 100644
--- a/src/Views/Traits/Helpers/FilterHelpers.php
+++ b/src/Views/Traits/Helpers/FilterHelpers.php
@@ -8,8 +8,6 @@ trait FilterHelpers
 {
     /**
      * Get the filter name.
-     *
-     * @return string
      */
     public function getName(): string
     {
@@ -18,8 +16,6 @@ public function getName(): string
 
     /**
      * Get the filter key.
-     *
-     * @return string
      */
     public function getKey(): string
     {
@@ -39,7 +35,6 @@ public function getConfigs(): array
     /**
      * Get a single filter config.
      *
-     * @param  string  $key
      * @return mixed
      */
     public function getConfig(string $key)
@@ -59,18 +54,12 @@ public function getKeys(): array
 
     /**
      * Get the filter options.
-     *
      */
     public function getDefaultValue()
     {
         return null;
     }
 
-    /**
-     * @param callable $callback
-     *
-     * @return Filter
-     */
     public function filter(callable $callback): Filter
     {
         $this->filterCallback = $callback;
@@ -78,42 +67,28 @@ public function filter(callable $callback): Filter
         return $this;
     }
 
-    /**
-     * @return bool
-     */
     public function hasFilterCallback(): bool
     {
         return $this->filterCallback !== null;
     }
 
-    /**
-     * @return callable
-     */
     public function getFilterCallback(): callable
     {
         return $this->filterCallback;
     }
 
-    /**
-     * @return string|null
-     */
     public function getCustomFilterPillTitle(): ?string
     {
         return $this->filterPillTitle;
     }
 
-    /**
-     * @return string
-     */
     public function getFilterPillTitle(): string
     {
         return $this->getCustomFilterPillTitle() ?? $this->getName();
     }
 
     /**
-     * @param mixed $value
-     *
-     * @return string|null
+     * @param  mixed  $value
      */
     public function getFilterPillValue($value): ?string
     {
@@ -128,85 +103,51 @@ public function getCustomFilterPillValues(): array
         return $this->filterPillValues;
     }
 
-    /**
-     * @param string $value
-     *
-     * @return string|null
-     */
     public function getCustomFilterPillValue(string $value): ?string
     {
         return $this->getCustomFilterPillValues()[$value] ?? null;
     }
 
-    /**
-     * @return bool
-     */
     public function hasConfigs(): bool
     {
         return count($this->getConfigs()) > 0;
     }
 
-    /**
-     * @param string $key
-     *
-     * @return bool
-     */
     public function hasConfig(string $key): bool
     {
         return array_key_exists($key, $this->getConfigs()) && $this->getConfig($key) !== null;
     }
 
-    /**
-     * @return bool
-     */
     public function isHiddenFromMenus(): bool
     {
         return $this->hiddenFromMenus === true;
     }
 
-    /**
-     * @return bool
-     */
     public function isVisibleInMenus(): bool
     {
         return $this->hiddenFromMenus === false;
     }
 
-    /**
-     * @return bool
-     */
     public function isHiddenFromPills(): bool
     {
         return $this->hiddenFromPills === true;
     }
 
-    /**
-     * @return bool
-     */
     public function isVisibleInPills(): bool
     {
         return $this->hiddenFromPills === false;
     }
 
-    /**
-     * @return bool
-     */
     public function isHiddenFromFilterCount(): bool
     {
         return $this->hiddenFromFilterCount === true;
     }
 
-    /**
-     * @return bool
-     */
     public function isVisibleInFilterCount(): bool
     {
         return $this->hiddenFromFilterCount === false;
     }
 
-    /**
-     * @return bool
-     */
     public function isResetByClearButton(): bool
     {
         return $this->resetByClearButton === true;
@@ -214,8 +155,6 @@ public function isResetByClearButton(): bool
 
     /**
      * Determines whether this filter instance is in the secondary header/footer
-     *
-     * @return bool
      */
     public function hasCustomPosition(): bool
     {
@@ -224,18 +163,14 @@ public function hasCustomPosition(): bool
 
     /**
      * Returns the custom position of the footer (header or footer)
-     *
-     * @return string
      */
     public function getCustomPosition(): string
     {
         return $this->filterPosition;
     }
-     
+
      /**
       * Returns whether the filter has a custom label blade
-      *
-      * @return bool
       */
      public function hasCustomFilterLabel(): bool
      {
@@ -244,8 +179,6 @@ public function hasCustomFilterLabel(): bool
 
     /**
      * Returns the path to the custom filter label blade
-     *
-     * @return string
      */
     public function getCustomFilterLabel(): string
     {
@@ -254,8 +187,6 @@ public function getCustomFilterLabel(): string
 
     /**
      * Get the filter slide down row.
-     *
-     * @return int|null
      */
     public function getFilterSlidedownRow(): ?int
     {
@@ -264,18 +195,14 @@ public function getFilterSlidedownRow(): ?int
 
     /**
      * Get whether the filter has a configured slide down row.
-     *
-     * @return bool
      */
     public function hasFilterSlidedownRow(): bool
     {
-        return (! is_null($this->filterSlidedownRow));
+        return ! is_null($this->filterSlidedownRow);
     }
 
     /**
      * Get the filter slide down col span.
-     *
-     * @return int|null
      */
     public function getFilterSlidedownColspan(): ?int
     {
@@ -284,18 +211,14 @@ public function getFilterSlidedownColspan(): ?int
 
     /**
      * Get whether the filter has a configured slide down colspan.
-     *
-     * @return bool
      */
     public function hasFilterSlidedownColspan(): bool
     {
-        return (! is_null($this->filterSlidedownColspan));
+        return ! is_null($this->filterSlidedownColspan);
     }
-    
+
     /**
      * Determine if filter has a Custom Pill Blade
-     *
-     * @return bool
      */
     public function hasCustomPillBlade(): bool
     {
@@ -304,8 +227,6 @@ public function hasCustomPillBlade(): bool
 
     /**
      * Get the path to the Custom Pill Blade
-     *
-     * @return string|null
      */
     public function getCustomPillBlade(): ?string
     {
@@ -314,8 +235,6 @@ public function getCustomPillBlade(): ?string
 
     /**
      * Determines if the Filter has a Default Value via the Component
-     *
-     * @return bool
      */
     public function hasFilterDefaultValue(): bool
     {
diff --git a/src/Views/Traits/Helpers/RelationshipHelpers.php b/src/Views/Traits/Helpers/RelationshipHelpers.php
index a62f2f70d..50087c081 100644
--- a/src/Views/Traits/Helpers/RelationshipHelpers.php
+++ b/src/Views/Traits/Helpers/RelationshipHelpers.php
@@ -6,33 +6,21 @@
 
 trait RelationshipHelpers
 {
-    /**
-     * @return bool
-     */
     public function isBaseColumn(): bool
     {
         return ! $this->hasRelations() && $this->hasField();
     }
 
-    /**
-     * @return bool
-     */
     public function hasRelations(): bool
     {
-        return ($this->getRelations()->count() > 0);
+        return $this->getRelations()->count() > 0;
     }
 
-    /**
-     * @return Collection
-     */
     public function getRelations(): Collection
     {
         return collect($this->relations);
     }
 
-    /**
-     * @return string|null
-     */
     public function getRelationString(): ?string
     {
         if ($this->hasRelations()) {
diff --git a/tests/DataTableComponentTest.php b/tests/DataTableComponentTest.php
index b631bc092..4e568059a 100644
--- a/tests/DataTableComponentTest.php
+++ b/tests/DataTableComponentTest.php
@@ -32,7 +32,7 @@ public function primary_key_can_be_checked_for_existence(): void
     public function primary_key_has_to_be_set(): void
     {
         $this->assertTrue(true);
-        
+
         // TODO: Not working
         //        $this->expectException(DataTableConfigurationException::class);
         //
@@ -58,14 +58,14 @@ public function default_fingerprint_will_always_be_the_same_for_same_datatable()
         );
         // Changed due to PHP 7.4
         $this->assertSame($this->basicTable->getDataTableFingerprint(), $this->defaultFingerprintingAlgo(PetsTable::class));
-        
-        
+
     }
 
     /** @test */
     public function default_datatable_fingerprints_will_be_different_for_each_table(): void
     {
-        $mockTable = new class() extends PetsTable {
+        $mockTable = new class() extends PetsTable
+        {
         };
 
         $this->assertNotSame($this->basicTable->getDataTableFingerprint(), $mockTable->getDataTableFingerprint());
@@ -76,7 +76,8 @@ public function default_fingerprint_will_be_url_friendy(): void
     {
         $mocks = [];
         for ($i = 0; $i < 9; $i++) {
-            $mocks[$i] = new class() extends PetsTable {
+            $mocks[$i] = new class() extends PetsTable
+            {
             };
             $this->assertFalse(filter_var('http://'.$mocks[$i]->getDataTableFingerprint().'.dev', FILTER_VALIDATE_URL) === false);
         }
diff --git a/tests/Events/ColumnsSelectedTest.php b/tests/Events/ColumnsSelectedTest.php
index 369abcf4f..03f0b1cef 100644
--- a/tests/Events/ColumnsSelectedTest.php
+++ b/tests/Events/ColumnsSelectedTest.php
@@ -11,17 +11,17 @@ class ColumnsSelectedTest extends TestCase
     public function an_event_is_emitted_when_a_column_selection_are_updated()
     {
         Event::fake([
-          ColumnsSelected::class,
-          ]);
+            ColumnsSelected::class,
+        ]);
 
         $test['columns'] = $this->basicTable->selectedColumns;
         $test['key'] = $this->basicTable->getDataTableFingerprint().'-columnSelectEnabled';
-      
+
         // Select all columns to test event trigger
         $this->basicTable->selectAllColumns();
 
         Event::assertDispatched(ColumnsSelected::class, function ($event) use ($test) {
-            return ($event->columns === $test['columns'] && $event->key === $test['key']);
+            return $event->columns === $test['columns'] && $event->key === $test['key'];
         });
     }
 }
diff --git a/tests/Http/Livewire/PetsTable.php b/tests/Http/Livewire/PetsTable.php
index bebf71c0e..36c885ee4 100644
--- a/tests/Http/Livewire/PetsTable.php
+++ b/tests/Http/Livewire/PetsTable.php
@@ -60,23 +60,22 @@ public function columns(): array
                     return 'Other';
                 })
                 ->footer(function ($rows) {
-                    return 'Count: ' . $rows->count();
+                    return 'Count: '.$rows->count();
                 }),
-            
 
             LinkColumn::make('Link')
-            ->title(fn ($row) => 'Edit')
-            ->location(fn ($row) => 'http://www.google.com')
-            ->attributes(fn ($row) => [
-                'class' => 'rounded-full',
-                'alt' => $row->name . ' Avatar',
-            ]),
+                ->title(fn ($row) => 'Edit')
+                ->location(fn ($row) => 'http://www.google.com')
+                ->attributes(fn ($row) => [
+                    'class' => 'rounded-full',
+                    'alt' => $row->name.' Avatar',
+                ]),
             ImageColumn::make('RowImg')
-            ->location(fn ($row) => 'test'.$row->id)
-            ->attributes(fn ($row) => [
-                'class' => 'rounded-full',
-                'alt' => $row->name . ' Avatar',
-            ]),
+                ->location(fn ($row) => 'test'.$row->id)
+                ->attributes(fn ($row) => [
+                    'class' => 'rounded-full',
+                    'alt' => $row->name.' Avatar',
+                ]),
         ];
     }
 
@@ -96,51 +95,51 @@ public function filters(): array
                     return $builder->whereIn('breed_id', $values);
                 }),
             MultiSelectDropdownFilter::make('Species')
-            ->options(
-                Species::query()
-                    ->orderBy('name')
-                    ->get()
-                    ->keyBy('id')
-                    ->map(fn ($species) => $species->name)
-                    ->toArray()
-            )
-            ->filter(function (Builder $builder, array $values) {
-                return $builder->whereIn('species_id', $values);
-            }),
+                ->options(
+                    Species::query()
+                        ->orderBy('name')
+                        ->get()
+                        ->keyBy('id')
+                        ->map(fn ($species) => $species->name)
+                        ->toArray()
+                )
+                ->filter(function (Builder $builder, array $values) {
+                    return $builder->whereIn('species_id', $values);
+                }),
             NumberFilter::make('Breed ID', 'breed_id_filter')
-            ->filter(function (Builder $builder, string $value) {
-                return $builder->where('breed_id', '=', $value);
-            }),
-            
+                ->filter(function (Builder $builder, string $value) {
+                    return $builder->where('breed_id', '=', $value);
+                }),
+
             TextFilter::make('Pet Name', 'pet_name_filter')
-            ->filter(function (Builder $builder, string $value) {
-                return $builder->where('pets.name', '=', $value);
-            }),
+                ->filter(function (Builder $builder, string $value) {
+                    return $builder->where('pets.name', '=', $value);
+                }),
 
             DateFilter::make('Last Visit After Date', 'last_visit_date_filter')
-            ->filter(function (Builder $builder, string $value) {
-                return $builder->whereDate('pets.last_visit', '=>', $value);
-            }),
+                ->filter(function (Builder $builder, string $value) {
+                    return $builder->whereDate('pets.last_visit', '=>', $value);
+                }),
 
             DateTimeFilter::make('Last Visit Before DateTime', 'last_visit_datetime_filter')
-            ->filter(function (Builder $builder, string $value) {
-                return $builder->whereDate('pets.last_visit', '<=', $value);
-            }),
+                ->filter(function (Builder $builder, string $value) {
+                    return $builder->whereDate('pets.last_visit', '<=', $value);
+                }),
 
             SelectFilter::make('Breed SelectFilter', 'breed_select_filter')
-            ->options(
-                Breed::query()
-                    ->orderBy('name')
-                    ->get()
-                    ->keyBy('id')
-                    ->map(fn ($breed) => $breed->name)
-                    ->toArray()
-            )
-            ->filter(function (Builder $builder, string $value) {
-                return $builder->where('breed_id', $value);
-            })
-            ->setCustomFilterLabel('livewire-tables::tests.testFilterLabel')
-            ->setFilterPillBlade('livewire-tables::tests.testFilterPills'),
+                ->options(
+                    Breed::query()
+                        ->orderBy('name')
+                        ->get()
+                        ->keyBy('id')
+                        ->map(fn ($breed) => $breed->name)
+                        ->toArray()
+                )
+                ->filter(function (Builder $builder, string $value) {
+                    return $builder->where('breed_id', $value);
+                })
+                ->setCustomFilterLabel('livewire-tables::tests.testFilterLabel')
+                ->setFilterPillBlade('livewire-tables::tests.testFilterPills'),
         ];
     }
 }
diff --git a/tests/Models/Pet.php b/tests/Models/Pet.php
index fff4f5a26..52a7ba502 100644
--- a/tests/Models/Pet.php
+++ b/tests/Models/Pet.php
@@ -35,25 +35,16 @@ class Pet extends Model
         'breed_id',
     ];
 
-    /**
-     * @return BelongsTo
-     */
     public function species(): BelongsTo
     {
         return $this->belongsTo(Species::class);
     }
 
-    /**
-     * @return BelongsTo
-     */
     public function breed(): BelongsTo
     {
         return $this->belongsTo(Breed::class);
     }
 
-    /**
-     * @return BelongsToMany
-     */
     public function veterinaries(): BelongsToMany
     {
         return $this->belongsToMany(Veterinary::class);
diff --git a/tests/Models/Species.php b/tests/Models/Species.php
index 84fdbe13c..2bcb178ad 100644
--- a/tests/Models/Species.php
+++ b/tests/Models/Species.php
@@ -29,9 +29,6 @@ class Species extends Model
         'name',
     ];
 
-    /**
-     * @return HasMany
-     */
     public function pets(): HasMany
     {
         return $this->hasMany(Pet::class);
diff --git a/tests/Models/Veterinary.php b/tests/Models/Veterinary.php
index a4f5f90f0..7f3152a21 100644
--- a/tests/Models/Veterinary.php
+++ b/tests/Models/Veterinary.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Rappasoft\LaravelLivewireTables\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
@@ -31,9 +30,6 @@ class Veterinary extends Model
         'phone',
     ];
 
-    /**
-     * @return BelongsToMany
-     */
     public function pets(): BelongsToMany
     {
         return $this->belongsToMany(Pet::class);
diff --git a/tests/TestCase.php b/tests/TestCase.php
index b0435e9a0..e6c098456 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -35,7 +35,7 @@ protected function setUp(): void
                 ['id' => 3, 'name' => 'Horse'],
                 ['id' => 4, 'name' => 'Bird'],
             ]);
-    
+
             Breed::insert([
                 ['id' => 1, 'name' => 'American Shorthair', 'species_id' => 1],
                 ['id' => 2, 'name' => 'Maine Coon', 'species_id' => 1],
@@ -48,7 +48,7 @@ protected function setUp(): void
                 ['id' => 201, 'name' => 'Clydesdale', 'species_id' => 3],
                 ['id' => 202, 'name' => 'Mustang', 'species_id' => 3],
             ]);
-    
+
             Pet::insert([
                 ['id' => 1, 'name' => 'Cartman', 'age' => 22, 'species_id' => 1, 'breed_id' => 4],
                 ['id' => 2, 'name' => 'Tux', 'age' => 8, 'species_id' => 1, 'breed_id' => 4],
@@ -56,13 +56,13 @@ protected function setUp(): void
                 ['id' => 4, 'name' => 'Ben', 'age' => 5, 'species_id' => 3, 'breed_id' => 200],
                 ['id' => 5, 'name' => 'Chico', 'age' => 7, 'species_id' => 3, 'breed_id' => 202],
             ]);
-    
+
             Veterinary::insert([
                 ['id' => 1, 'name' => 'Dr John Smith', 'phone' => '123456798'],
                 ['id' => 2, 'name' => 'Dr Fabio Ivona', 'phone' => '789456123'],
                 ['id' => 3, 'name' => 'Dr Anthony Rappa', 'phone' => '987654321'],
             ]);
-    
+
             DB::table('pet_veterinary')->insert([
                 ['id' => 1, 'pet_id' => 1, 'veterinary_id' => 1],
                 ['id' => 2, 'pet_id' => 1, 'veterinary_id' => 2],
@@ -91,9 +91,8 @@ public function getEnvironmentSetUp($app): void
         config()->set('app.env', 'testing');
         config()->set('cache.default', 'array');
         config()->set('view.cache', false);
-        config()->set('view.compiled',  realpath(storage_path('framework/views')).'/'.rand(0, 100));
+        config()->set('view.compiled', realpath(storage_path('framework/views')).'/'.rand(0, 100));
 
-        
         $app['config']->set('app.env', 'testing');
         $app['config']->set('database.default', 'sqlite');
         $app['config']->set('cache.default', 'array');
diff --git a/tests/Traits/Configuration/ColumnSelectConfigurationTest.php b/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
index 4700ff16a..a92cc466a 100644
--- a/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
+++ b/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
@@ -57,7 +57,6 @@ public function can_deselect_all_columns(): void
 
         $this->basicTable->deselectAllColumns();
 
-
         $this->assertSame([], $this->basicTable->selectedColumns);
     }
 }
diff --git a/tests/Traits/Configuration/FingerprintConfigurationTest.php b/tests/Traits/Configuration/FingerprintConfigurationTest.php
index 90f12de8c..33a84ceb0 100644
--- a/tests/Traits/Configuration/FingerprintConfigurationTest.php
+++ b/tests/Traits/Configuration/FingerprintConfigurationTest.php
@@ -16,7 +16,8 @@ public function can_set_fingerprint(): void
     /** @test */
     public function can_set_fingerprint_in_configure_method(): void
     {
-        $mock = new class extends PetsTable {
+        $mock = new class extends PetsTable
+        {
             public function configure(): void
             {
                 $this->setDataTableFingerprint('test');
diff --git a/tests/Traits/Configuration/QueryStringAliasConfigurationTest.php b/tests/Traits/Configuration/QueryStringAliasConfigurationTest.php
index fe470981c..1f80c0c31 100644
--- a/tests/Traits/Configuration/QueryStringAliasConfigurationTest.php
+++ b/tests/Traits/Configuration/QueryStringAliasConfigurationTest.php
@@ -16,16 +16,17 @@ public function can_set_query_string_alias(): void
     /** @test */
     public function can_set_query_string_in_configure_method(): void
     {
-        $mock = new class extends PetsTable {
+        $mock = new class extends PetsTable
+        {
             public function configure(): void
             {
                 $this->setQueryStringAlias('test');
             }
         };
-    
+
         $mock->configure();
         $mock->boot();
-    
+
         $this->assertSame('test', $mock->getQueryStringAlias());
     }
 }
diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php
index 32060539b..ed4ea1cc0 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnHelpersTest.php
@@ -189,7 +189,7 @@ public function can_get_searchable_columns(): void
             ->map(fn (Column $column) => $column->getColumnSelectName())
             ->toArray();
 
-        $this->assertSame(['name','breed.name'], $selectable);
+        $this->assertSame(['name', 'breed.name'], $selectable);
     }
 
     /** @test */
diff --git a/tests/Traits/Visuals/BulkActionsVisualsTest.php b/tests/Traits/Visuals/BulkActionsVisualsTest.php
index 95ae3ffed..68bd8bc48 100644
--- a/tests/Traits/Visuals/BulkActionsVisualsTest.php
+++ b/tests/Traits/Visuals/BulkActionsVisualsTest.php
@@ -12,7 +12,7 @@ class BulkActionsVisualsTest extends TestCase
     public function bulk_dropdown_shows_when_necessary(): void
     {
         Livewire::test(PetsTable::class)
-        ->assertDontSee('No items found. Try to broaden your search.');
+            ->assertDontSee('No items found. Try to broaden your search.');
     }
 
     /** @test */
diff --git a/tests/Traits/Visuals/FilterVisualsTest.php b/tests/Traits/Visuals/FilterVisualsTest.php
index 4c7c774f8..82710fb65 100644
--- a/tests/Traits/Visuals/FilterVisualsTest.php
+++ b/tests/Traits/Visuals/FilterVisualsTest.php
@@ -99,8 +99,8 @@ public function filters_with_invalid_key_dont_error(): void
     }
 
     /**
-    * @test
-    */
+     * @test
+     */
     public function filter_events_apply_correctly(): void
     {
         Livewire::test(PetsTable::class)
diff --git a/tests/Traits/Visuals/PaginationVisualsTest.php b/tests/Traits/Visuals/PaginationVisualsTest.php
index 2f1f0d3cc..a75a59ff1 100644
--- a/tests/Traits/Visuals/PaginationVisualsTest.php
+++ b/tests/Traits/Visuals/PaginationVisualsTest.php
@@ -143,14 +143,14 @@ public function per_page_dropdown_only_renders_with_accepted_values(): void
     /** @test */
     public function can_get_currently_displayed_ids(): void
     {
-        Livewire::test(PetsTable::class)->assertSet('paginationCurrentItems', [1,2,3,4,5])
-                                        ->assertNotSet('paginationCurrentItems', [1,2,3,4,5,6,7,8,9]);
+        Livewire::test(PetsTable::class)->assertSet('paginationCurrentItems', [1, 2, 3, 4, 5])
+            ->assertNotSet('paginationCurrentItems', [1, 2, 3, 4, 5, 6, 7, 8, 9]);
     }
 
     /** @test */
     public function can_get_currently_displayed_count(): void
     {
         Livewire::test(PetsTable::class)->assertSet('paginationCurrentCount', 5)
-                                        ->assertNotSet('paginationCurrentCount', 125);
+            ->assertNotSet('paginationCurrentCount', 125);
     }
 }
diff --git a/tests/Traits/Visuals/ReorderingVisualsTest.php b/tests/Traits/Visuals/ReorderingVisualsTest.php
index ad8503bf3..058775fdc 100644
--- a/tests/Traits/Visuals/ReorderingVisualsTest.php
+++ b/tests/Traits/Visuals/ReorderingVisualsTest.php
@@ -92,9 +92,10 @@ public function sorting_pills_hide_on_reorder(): void
     }
 
     /**
-    * @test
-    * @depends testFilterArraySetup
-    */
+     * @test
+     *
+     * @depends testFilterArraySetup
+     */
     public function sorting_is_disabled_on_reorder(array $filterDefaultArray): void
     {
         Livewire::test(PetsTable::class)
@@ -170,8 +171,8 @@ public function per_page_gets_set_on_reorder(): void
     }
 
     /** @test
-    * @depends testFilterArraySetup
-    */
+     * @depends testFilterArraySetup
+     */
     public function search_hides_on_reorder(array $filterDefaultArray): void
     {
         Livewire::test(PetsTable::class)
@@ -224,7 +225,7 @@ public function bulk_actions_header_gets_hidden_on_reorder(): void
             ->call('setReorderEnabled')
             ->assertSet('bulkActionsStatus', true)
             ->call('setBulkActions', ['activate' => 'Activate'])
-            ->assertSeeHtml('wire:model="selectAll"')
+            ->assertSeeHtml('selectedItems.length == paginationTotalItemCount')
             ->call('enableReordering')
             ->assertSet('bulkActionsStatus', false)
             ->assertDontSee('Select All');
@@ -272,9 +273,10 @@ public function bulk_actions_row_select_some_gets_hidden_on_reorder(): void
     }
 
     /**
-    * @test
-    * @depends testFilterArraySetup
-    */
+     * @test
+     *
+     * @depends testFilterArraySetup
+     */
     public function filters_are_disabled_on_reorder(array $filterDefaultArray): void
     {
         $customisedFilterArray = $filterDefaultArray;
@@ -298,9 +300,10 @@ public function filters_are_disabled_on_reorder(array $filterDefaultArray): void
     }
 
     /**
-    * @test
-    * @depends testFilterArraySetup
-    */
+     * @test
+     *
+     * @depends testFilterArraySetup
+     */
     public function filter_pills_hide_on_reorder(array $filterDefaultArray): void
     {
         $filterDefaultArray['breed'] = [1];
diff --git a/tests/Traits/Visuals/SortingVisualsTest.php b/tests/Traits/Visuals/SortingVisualsTest.php
index 8ff580c03..e955ac095 100644
--- a/tests/Traits/Visuals/SortingVisualsTest.php
+++ b/tests/Traits/Visuals/SortingVisualsTest.php
@@ -9,7 +9,9 @@
 class SortingVisualsTest extends TestCase
 {
     public array $default10 = [];
+
     public array $asortNames = [];
+
     public array $rsortNames = [];
 
     public function testArraySetup(): array
@@ -17,7 +19,7 @@ public function testArraySetup(): array
         $rSortNames = $aSortNames = $petNames = ['Cartman', 'Tux', 'May', 'Ben', 'Chico'];
         asort($aSortNames);
         rsort($rSortNames);
-        
+
         $this->default10 = array_slice($petNames, 0, 10);
         $this->asortNames = array_slice($aSortNames, 0, 10);
         $this->rsortNames = array_slice($rSortNames, 0, 10);
@@ -154,9 +156,10 @@ public function sorting_pills_dont_show_for_unknown_columns(): void
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function default_sorting_gets_applied_if_set_and_there_are_no_sorts(array $petNames): void
     {
         Livewire::test(PetsTable::class)
@@ -166,9 +169,10 @@ public function default_sorting_gets_applied_if_set_and_there_are_no_sorts(array
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function sort_direction_can_only_be_asc_or_desc(array $petNames): void
     {
         // If not asc, desc, default to asc
@@ -184,9 +188,10 @@ public function sort_direction_can_only_be_asc_or_desc(array $petNames): void
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function skip_sorting_column_if_it_does_not_have_a_field(array $petNames): void
     {
         // Other col is a label therefore has no field
@@ -197,9 +202,10 @@ public function skip_sorting_column_if_it_does_not_have_a_field(array $petNames)
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function skip_sorting_column_if_it_is_not_sortable(array $petNames): void
     {
         // Other col is a label therefore is not sortable
@@ -210,9 +216,10 @@ public function skip_sorting_column_if_it_is_not_sortable(array $petNames): void
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function sort_field_and_direction_are_applied_if_no_sort_callback(array $petNames): void
     {
         // TODO: Test that there is no callback
@@ -223,9 +230,10 @@ public function sort_field_and_direction_are_applied_if_no_sort_callback(array $
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function sort_events_apply_correctly(): void
     {
         Livewire::test(PetsTable::class)
diff --git a/tests/Views/Columns/BooleanColumnTest.php b/tests/Views/Columns/BooleanColumnTest.php
index b26a9a8e8..e9958c612 100644
--- a/tests/Views/Columns/BooleanColumnTest.php
+++ b/tests/Views/Columns/BooleanColumnTest.php
@@ -71,7 +71,7 @@ public function can_return_status_true(): void
         $column = BooleanColumn::make('Name')->setCallback(function (string $value, $row) {
             return $row->id === 1;
         });
-        $curVal = $column->hasCallback() ? call_user_func($column->getCallback(), $value, $row) : (bool)$value === true;
+        $curVal = $column->hasCallback() ? call_user_func($column->getCallback(), $value, $row) : (bool) $value === true;
         $this->assertSame($curVal, true);
     }
 
@@ -83,7 +83,7 @@ public function can_return_status_false(): void
         $column = BooleanColumn::make('Name')->setCallback(function (string $value, $row) {
             return $row->id === 2;
         });
-        $curVal = $column->hasCallback() ? call_user_func($column->getCallback(), $value, $row) : (bool)$value === true;
+        $curVal = $column->hasCallback() ? call_user_func($column->getCallback(), $value, $row) : (bool) $value === true;
         $this->assertSame($curVal, false);
     }
 }
diff --git a/tests/Views/Columns/ComponentColumnTest.php b/tests/Views/Columns/ComponentColumnTest.php
index b91e9ddfe..b69362fc7 100644
--- a/tests/Views/Columns/ComponentColumnTest.php
+++ b/tests/Views/Columns/ComponentColumnTest.php
@@ -24,7 +24,7 @@ public function can_not_set_component_column_as_label(): void
         $this->expectException(DataTableConfigurationException::class);
         $row = Pet::find(1);
 
-        $column = ComponentColumn::make('Name')->label(fn ($row, Column $column) => "Test");
+        $column = ComponentColumn::make('Name')->label(fn ($row, Column $column) => 'Test');
         $column->getContents($row);
     }
 }
diff --git a/tests/Views/Filters/DateFilterTest.php b/tests/Views/Filters/DateFilterTest.php
index f65ecfaee..8964d8a5f 100644
--- a/tests/Views/Filters/DateFilterTest.php
+++ b/tests/Views/Filters/DateFilterTest.php
@@ -73,7 +73,7 @@ public function can_get_filter_callback(): void
         $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
         self::$filterInstance->filter(function (Builder $builder, string $value) {
-            return $builder->whereDate('created_at', ">=", $value);
+            return $builder->whereDate('created_at', '>=', $value);
         });
 
         $this->assertTrue(self::$filterInstance->hasFilterCallback());
diff --git a/tests/Views/Filters/DateTimeFilterTest.php b/tests/Views/Filters/DateTimeFilterTest.php
index 1b2fbf80c..a9ed0cf3d 100644
--- a/tests/Views/Filters/DateTimeFilterTest.php
+++ b/tests/Views/Filters/DateTimeFilterTest.php
@@ -19,13 +19,13 @@ public function can_get_filter_callback(): void
         $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
         self::$filterInstance->filter(function (Builder $builder, string $value) {
-            return $builder->whereDate('created_at', ">=", $value);
+            return $builder->whereDate('created_at', '>=', $value);
         });
 
         $this->assertTrue(self::$filterInstance->hasFilterCallback());
         $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
-    
+
     /** @test */
     public function can_not_set_date_filter_to_non_number(): void
     {
diff --git a/tests/Views/Filters/MultiSelectDropdownFilterTest.php b/tests/Views/Filters/MultiSelectDropdownFilterTest.php
index d82a47c59..64867d8fe 100644
--- a/tests/Views/Filters/MultiSelectDropdownFilterTest.php
+++ b/tests/Views/Filters/MultiSelectDropdownFilterTest.php
@@ -72,7 +72,7 @@ public function can_get_filter_callback(): void
 
         $filter = MultiSelectDropdownFilter::make('Active')
             ->filter(function (Builder $builder, int $value) {
-                return $builder->where('name', "=", $value);
+                return $builder->where('name', '=', $value);
             });
 
         $this->assertTrue($filter->hasFilterCallback());
@@ -94,13 +94,14 @@ public function can_get_filter_pill_title(): void
 
     /**
      * @test
-        * @depends testArraySetup
+     *
+     * @depends testArraySetup
      */
     public function can_get_filter_pill_value(array $optionsArray): void
     {
         $filter = MultiSelectDropdownFilter::make('Active')->options($optionsArray);
         $this->assertSame($optionsArray[1], $filter->getFilterPillValue(['1']));
-        $this->assertSame($optionsArray[1] . ", " . $optionsArray[2], $filter->getFilterPillValue(['1','2']));
+        $this->assertSame($optionsArray[1].', '.$optionsArray[2], $filter->getFilterPillValue(['1', '2']));
     }
 
     /** @test */
@@ -179,11 +180,12 @@ public function can_check_if_filter_is_reset_by_clear_button(): void
 
         $this->assertFalse($filter->isResetByClearButton());
     }
-    
+
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function can_set_filter_to_number(array $optionsArray): void
     {
         $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
@@ -192,17 +194,18 @@ public function can_set_filter_to_number(array $optionsArray): void
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function can_set_filter_to_valid_value(array $optionsArray): void
     {
         $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
         $this->assertSame($optionsArray, $filter->getOptions());
-        $this->assertSame(['1','3'], $filter->validate([0 => '1', 1 => '3']));
-        $this->assertSame(['1','3'], $filter->validate([0 => '1', 1 => '3', 2 => '99']));
+        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3']));
+        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3', 2 => '99']));
     }
-    
+
     /** @test */
     public function can_get_if_filter_empty(): void
     {
@@ -216,9 +219,10 @@ public function can_get_if_filter_empty(): void
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function can_set_filter_first_option(array $optionsArray): void
     {
         $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
diff --git a/tests/Views/Filters/MultiSelectFilterTest.php b/tests/Views/Filters/MultiSelectFilterTest.php
index 41031fdb1..c94fb8eda 100644
--- a/tests/Views/Filters/MultiSelectFilterTest.php
+++ b/tests/Views/Filters/MultiSelectFilterTest.php
@@ -72,7 +72,7 @@ public function can_get_filter_callback(): void
 
         $filter = MultiSelectFilter::make('Active')
             ->filter(function (Builder $builder, int $value) {
-                return $builder->where('name', "=", $value);
+                return $builder->where('name', '=', $value);
             });
 
         $this->assertTrue($filter->hasFilterCallback());
@@ -168,11 +168,12 @@ public function can_check_if_filter_is_reset_by_clear_button(): void
 
         $this->assertFalse($filter->isResetByClearButton());
     }
-    
+
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function can_set_filter_to_number(array $optionsArray): void
     {
         $filter = MultiSelectFilter::make('BreedID')->options($optionsArray);
@@ -181,15 +182,16 @@ public function can_set_filter_to_number(array $optionsArray): void
     }
 
     /**
-    * @test
-    * @depends testArraySetup
-    */
+     * @test
+     *
+     * @depends testArraySetup
+     */
     public function can_set_filter_to_valid_value(array $optionsArray): void
     {
         $filter = MultiSelectFilter::make('BreedID')->options($optionsArray);
         $this->assertSame($optionsArray, $filter->getOptions());
-        $this->assertSame(['1','3'], $filter->validate([0 => '1', 1 => '3']));
-        $this->assertSame(['1','3'], $filter->validate([0 => '1', 1 => '3', 2 => '99']));
+        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3']));
+        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3', 2 => '99']));
     }
 
     /** @test */
diff --git a/tests/Views/Filters/NumberFilterTest.php b/tests/Views/Filters/NumberFilterTest.php
index 310b4400f..80ea8ce6a 100644
--- a/tests/Views/Filters/NumberFilterTest.php
+++ b/tests/Views/Filters/NumberFilterTest.php
@@ -62,7 +62,7 @@ public function can_get_filter_callback(): void
 
         $filter = NumberFilter::make('Active')
             ->filter(function (Builder $builder, int $value) {
-                return $builder->where('breed_id', ">", $value);
+                return $builder->where('breed_id', '>', $value);
             });
 
         $this->assertTrue($filter->hasFilterCallback());
@@ -158,7 +158,7 @@ public function can_check_if_filter_is_reset_by_clear_button(): void
 
         $this->assertFalse($filter->isResetByClearButton());
     }
-    
+
     /** @test */
     public function can_not_set_number_filter_to_non_number(): void
     {
diff --git a/tests/Views/Filters/SelectFilterTest.php b/tests/Views/Filters/SelectFilterTest.php
index 2b9e3cfa9..c4cc68195 100644
--- a/tests/Views/Filters/SelectFilterTest.php
+++ b/tests/Views/Filters/SelectFilterTest.php
@@ -28,41 +28,41 @@ public function can_get_filter_callback(): void
 
         self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
-                return $builder->where('name', "=", $value);
+                return $builder->where('name', '=', $value);
             });
 
         $this->assertTrue(self::$filterInstance->hasFilterCallback());
         $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
-    
+
     /**
-    * @test
-    */
+     * @test
+     */
     public function can_not_set_filter_to_number(): void
     {
         $this->assertFalse(self::$filterInstance->validate(123));
         $this->assertFalse(self::$filterInstance->validate('123'));
     }
-    
+
     /**
-    * @test
-    */
+     * @test
+     */
     public function can_not_set_filter_to_text(): void
     {
         $this->assertFalse(self::$filterInstance->validate('test'));
     }
 
     /**
-    * @test
-    */
+     * @test
+     */
     public function can_set_filter_to_valid(): void
     {
         $this->assertSame('1', self::$filterInstance->validate('1'));
     }
 
     /**
-    * @test
-    */
+     * @test
+     */
     public function can_get_if_filter_empty(): void
     {
         $this->assertTrue(self::$filterInstance->isEmpty(''));
diff --git a/tests/Views/Filters/TextFilterTest.php b/tests/Views/Filters/TextFilterTest.php
index cf22371cb..01062548c 100644
--- a/tests/Views/Filters/TextFilterTest.php
+++ b/tests/Views/Filters/TextFilterTest.php
@@ -22,13 +22,13 @@ public function can_get_filter_callback(): void
 
         $filter = TextFilter::make('Active')
             ->filter(function (Builder $builder, int $value) {
-                return $builder->where('name', "=", $value);
+                return $builder->where('name', '=', $value);
             });
 
         $this->assertTrue($filter->hasFilterCallback());
         $this->assertIsCallable($filter->getFilterCallback());
     }
-    
+
     /** @test */
     public function can_not_exceed_text_filter_max_length(): void
     {
@@ -43,7 +43,7 @@ public function can_set_text_filter_to_number(): void
         $this->assertSame(123, $filter->validate(123));
         $this->assertSame('123', $filter->validate('123'));
     }
-    
+
     /** @test */
     public function can_set_text_filter_to_text(): void
     {
diff --git a/tests/Views/Traits/Configuration/BooleanColumnConfigurationTest.php b/tests/Views/Traits/Configuration/BooleanColumnConfigurationTest.php
index 44da86438..2e9b6d3da 100644
--- a/tests/Views/Traits/Configuration/BooleanColumnConfigurationTest.php
+++ b/tests/Views/Traits/Configuration/BooleanColumnConfigurationTest.php
@@ -15,7 +15,7 @@ public function boolean_column_can_set_callback(): void
 
         $this->assertFalse($column->hasCallback());
 
-        $column->setCallback(fn ($value) => (bool)$value === true);
+        $column->setCallback(fn ($value) => (bool) $value === true);
 
         $this->assertTrue($column->hasCallback());
 
diff --git a/tests/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php b/tests/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php
index 14b31e549..471ef2033 100644
--- a/tests/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php
+++ b/tests/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php
@@ -12,22 +12,22 @@ class ButtonGroupColumnConfigurationTest extends TestCase
     public function button_group_column_can_set_buttons(): void
     {
         $column = ButtonGroupColumn::make('Actions')
-        ->attributes(function () {
-            return [
-                'class' => 'space-x-2',
-            ];
-        })
-        ->buttons([
-            LinkColumn::make('View') // make() has no effect in this case but needs to be set anyway
-                ->title(fn () => 'View Names')
-                ->location(fn () => 'test')
-                ->attributes(function () {
-                    return [
-                        'class' => 'underline text-blue-500 hover:no-underline',
-                    ];
-                }),
+            ->attributes(function () {
+                return [
+                    'class' => 'space-x-2',
+                ];
+            })
+            ->buttons([
+                LinkColumn::make('View') // make() has no effect in this case but needs to be set anyway
+                    ->title(fn () => 'View Names')
+                    ->location(fn () => 'test')
+                    ->attributes(function () {
+                        return [
+                            'class' => 'underline text-blue-500 hover:no-underline',
+                        ];
+                    }),
             ]);
-    
+
         $firstButton = $column->getButtons()[0];
 
         $this->assertInstanceOf(LinkColumn::class, $firstButton);
diff --git a/tests/Views/Traits/Configuration/ColumnConfigurationTest.php b/tests/Views/Traits/Configuration/ColumnConfigurationTest.php
index 30a990fb6..3b72c5e8d 100644
--- a/tests/Views/Traits/Configuration/ColumnConfigurationTest.php
+++ b/tests/Views/Traits/Configuration/ColumnConfigurationTest.php
@@ -88,7 +88,7 @@ public function can_make_column_unclickable(): void
         $column = Column::make('Name');
 
         $column->setComponent($this->basicTable);
-        
+
         $this->basicTable->setTableRowUrl(fn ($row) => 'https://example.com');
 
         $this->assertTrue($column->isClickable());
diff --git a/tests/Views/Traits/Helpers/FilterHelpersTest.php b/tests/Views/Traits/Helpers/FilterHelpersTest.php
index 51822670a..6b8f733ab 100644
--- a/tests/Views/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Views/Traits/Helpers/FilterHelpersTest.php
@@ -253,7 +253,7 @@ public function filter_slidedown_row_returns_int(): void
 
         $this->assertIsInt($filter->getFilterSlidedownRow());
 
-        $filter->setFilterSlidedownRow("3");
+        $filter->setFilterSlidedownRow('3');
 
         $this->assertIsInt($filter->getFilterSlidedownRow());
     }
@@ -261,7 +261,7 @@ public function filter_slidedown_row_returns_int(): void
     /** @test */
     public function can_get_filter_slidedown_row(): void
     {
-        $filter = SelectFilter::make('Active')->setFilterSlidedownRow("2");
+        $filter = SelectFilter::make('Active')->setFilterSlidedownRow('2');
 
         $this->assertSame(2, $filter->getFilterSlidedownRow());
 
@@ -295,7 +295,7 @@ public function filter_slidedown_colspan_returns_int(): void
 
         $this->assertIsInt($filter->getFilterSlidedownColspan());
 
-        $filter->setFilterSlidedownColspan("3");
+        $filter->setFilterSlidedownColspan('3');
 
         $this->assertIsInt($filter->getFilterSlidedownColspan());
     }
@@ -303,7 +303,7 @@ public function filter_slidedown_colspan_returns_int(): void
     /** @test */
     public function can_get_filter_slidedown_colspan(): void
     {
-        $filter = SelectFilter::make('Active')->setFilterSlidedownColspan("2");
+        $filter = SelectFilter::make('Active')->setFilterSlidedownColspan('2');
 
         $this->assertSame(2, $filter->getFilterSlidedownColspan());