diff --git a/stubs/controller.blade.php b/stubs/controller.blade.php
index 50da651c..bcf73f8d 100644
--- a/stubs/controller.blade.php
+++ b/stubs/controller.blade.php
@@ -19,8 +19,8 @@
 use {{$servicesNamespace}}\{{$entity}}Service;
 @if (in_array('D', $options) || in_array('U', $options))
 use Symfony\Component\HttpFoundation\Response;
-
 @endif
+
 class {{$entity}}Controller extends Controller
 {
 @if (in_array('C', $options))
diff --git a/stubs/model.blade.php b/stubs/model.blade.php
index 786dc1b1..03d1b338 100644
--- a/stubs/model.blade.php
+++ b/stubs/model.blade.php
@@ -6,7 +6,7 @@
 
 class {{$entity}} extends Model
 {
-    use ModelTrait, HasFactory;
+    use HasFactory, ModelTrait;
 
     protected $fillable = [
 @foreach($fields as $field)
diff --git a/stubs/test.blade.php b/stubs/test.blade.php
index 5af68a9a..cd5dca0a 100644
--- a/stubs/test.blade.php
+++ b/stubs/test.blade.php
@@ -21,7 +21,7 @@ class {{$entity}}Test extends TestCase
     protected static ModelTestState ${{\Illuminate\Support\Str::camel($entity)}}State;
 
 @endif
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 @if ($withAuth)