diff --git a/src/Livewire/CommentItem.php b/src/Livewire/CommentItem.php
index def25ef..46215b7 100644
--- a/src/Livewire/CommentItem.php
+++ b/src/Livewire/CommentItem.php
@@ -19,10 +19,10 @@ use Relaticle\Comments\Events\CommentUpdated;
 use Relaticle\Comments\Mentions\MentionParser;
 use Relaticle\Comments\Models\Comment;
 
-class CommentItem extends Component implements HasForms, HasActions
+class CommentItem extends Component implements HasActions, HasForms
 {
-    use InteractsWithForms;
     use InteractsWithActions;
+    use InteractsWithForms;
     use WithFileUploads;
 
     public Comment $comment;
diff --git a/src/Livewire/Comments.php b/src/Livewire/Comments.php
index 85ea251..447645a 100644
--- a/src/Livewire/Comments.php
+++ b/src/Livewire/Comments.php
@@ -21,10 +21,10 @@ use Relaticle\Comments\Mentions\MentionParser;
 use Relaticle\Comments\Models\Comment;
 use Relaticle\Comments\Models\Subscription;
 
-class Comments extends Component implements HasForms, HasActions
+class Comments extends Component implements HasActions, HasForms
 {
-    use InteractsWithForms;
     use InteractsWithActions;
+    use InteractsWithForms;
     use WithFileUploads;
 
     public Model $model;
diff --git a/src/Models/Comment.php b/src/Models/Comment.php
index a03f50a..9d3de4f 100644
--- a/src/Models/Comment.php
+++ b/src/Models/Comment.php
@@ -152,7 +152,7 @@ class Comment extends Model
             $escapedName = e($name);
             $styledSpan = '<span class="comment-mention">@'.$escapedName.'</span>';
 
-            $pattern = '/<(?:span|a)[^>]*data-type="mention"[^>]*>@?' . preg_quote($escapedName, '/') . '<\/(?:span|a)>/';
+            $pattern = '/<(?:span|a)[^>]*data-type="mention"[^>]*>@?'.preg_quote($escapedName, '/').'<\/(?:span|a)>/';
 
             if (preg_match($pattern, $body)) {
                 $body = preg_replace($pattern, $styledSpan, $body);