diff --git a/src/stubs/controller.full.stub b/src/stubs/controller.full.stub
index dc5ea0f..e4ecad8 100644
--- a/src/stubs/controller.full.stub
+++ b/src/stubs/controller.full.stub
@@ -36,7 +36,8 @@ class MastersController extends Controller
     /**
      * Store a newly created singleMstr in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request $request)
@@ -59,7 +60,8 @@ class MastersController extends Controller
     /**
      * Display the specified singleMstr.
      *
-     * @param  \App\Master  $singleMstr
+     * @param \App\Master $singleMstr
+     *
      * @return \Illuminate\Http\Response
      */
     public function show(Master $singleMstr)
@@ -70,7 +72,8 @@ class MastersController extends Controller
     /**
      * Show the form for editing the specified singleMstr.
      *
-     * @param  \App\Master  $singleMstr
+     * @param \App\Master $singleMstr
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit(Master $singleMstr)
@@ -83,8 +86,9 @@ class MastersController extends Controller
     /**
      * Update the specified singleMstr in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \fullMstr  $singleMstr
+     * @param \Illuminate\Http\Request $request
+     * @param \fullMstr $singleMstr
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request $request, Master $singleMstr)
@@ -104,7 +108,8 @@ class MastersController extends Controller
     /**
      * Remove the specified singleMstr from storage.
      *
-     * @param  \fullMstr  $singleMstr
+     * @param \fullMstr $singleMstr
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy(Master $singleMstr)
diff --git a/src/stubs/controller.simple.stub b/src/stubs/controller.simple.stub
index 2e7a58a..25dd70e 100644
--- a/src/stubs/controller.simple.stub
+++ b/src/stubs/controller.simple.stub
@@ -29,7 +29,8 @@ class MastersController extends Controller
     /**
      * Store a newly created singleMstr in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request $request)
@@ -52,8 +53,9 @@ class MastersController extends Controller
     /**
      * Update the specified singleMstr in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \fullMstr  $singleMstr
+     * @param \Illuminate\Http\Request $request
+     * @param \fullMstr $singleMstr
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request $request, Master $singleMstr)
@@ -75,7 +77,8 @@ class MastersController extends Controller
     /**
      * Remove the specified singleMstr from storage.
      *
-     * @param  \fullMstr  $singleMstr
+     * @param \fullMstr $singleMstr
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy(Master $singleMstr)
diff --git a/src/stubs/model-policy.stub b/src/stubs/model-policy.stub
index 70d3735..4a7d355 100644
--- a/src/stubs/model-policy.stub
+++ b/src/stubs/model-policy.stub
@@ -13,8 +13,9 @@ class MasterPolicy
     /**
      * Determine whether the user can view the project.
      *
-     * @param  \App\User  $user
-     * @param  \fullMstr  $singleMstr
+     * @param \App\User $user
+     * @param \fullMstr $singleMstr
+     *
      * @return mixed
      */
     public function view(User $user, Master $singleMstr)
@@ -26,8 +27,9 @@ class MasterPolicy
     /**
      * Determine whether the user can create projects.
      *
-     * @param  \App\User  $user
-     * @param  \fullMstr  $singleMstr
+     * @param \App\User $user
+     * @param \fullMstr $singleMstr
+     *
      * @return mixed
      */
     public function create(User $user, Master $singleMstr)
@@ -39,8 +41,9 @@ class MasterPolicy
     /**
      * Determine whether the user can update the project.
      *
-     * @param  \App\User  $user
-     * @param  \fullMstr  $singleMstr
+     * @param \App\User $user
+     * @param \fullMstr $singleMstr
+     *
      * @return mixed
      */
     public function update(User $user, Master $singleMstr)
@@ -52,8 +55,9 @@ class MasterPolicy
     /**
      * Determine whether the user can delete the project.
      *
-     * @param  \App\User  $user
-     * @param  \fullMstr  $singleMstr
+     * @param \App\User $user
+     * @param \fullMstr $singleMstr
+     *
      * @return mixed
      */
     public function delete(User $user, Master $singleMstr)
diff --git a/src/stubs/route-api.stub b/src/stubs/route-api.stub
index eaa7e70..3da067e 100644
--- a/src/stubs/route-api.stub
+++ b/src/stubs/route-api.stub
@@ -1,5 +1,5 @@
 
-/**
+/*
  * Masters Endpoints
  */
 Route::middleware('auth:api')->resource('masters', 'Api\MastersController')->names('api.masters');
diff --git a/src/stubs/route-web.stub b/src/stubs/route-web.stub
index 5d2766f..0a38be8 100644
--- a/src/stubs/route-web.stub
+++ b/src/stubs/route-web.stub
@@ -1,5 +1,5 @@
 
-/**
+/*
  * Masters Routes
  */
 Route::resource('masters', 'MastersController');
diff --git a/src/stubs/view-edit.stub b/src/stubs/view-edit.stub
index d012caf..8b763a0 100644
--- a/src/stubs/view-edit.stub
+++ b/src/stubs/view-edit.stub
@@ -3,7 +3,6 @@
 @section('title', trans('master.edit'))
 
 @section('content')
-
 <div class="row">
     <div class="col-md-6 col-md-offset-3">
         @if (request('action') == 'delete' && $singleMstr)
diff --git a/tests/Generators/Api/RouteApiGeneratorTest.php b/tests/Generators/Api/RouteApiGeneratorTest.php
index 089a12d..7b15e0d 100644
--- a/tests/Generators/Api/RouteApiGeneratorTest.php
+++ b/tests/Generators/Api/RouteApiGeneratorTest.php
@@ -15,7 +15,7 @@ class RouteApiGeneratorTest extends TestCase
         $this->assertFileExists($routeApiPath);
         $routeApiFileContent = "<?php
 
-/**
+/*
  * {$this->plural_model_name} Endpoints
  */
 Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\{$this->plural_model_name}Controller')->names('api.{$this->table_name}');
@@ -32,7 +32,7 @@ Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\{$this->plu
         $this->assertFileExists($routeApiPath);
         $routeApiFileContent = "<?php
 
-/**
+/*
  * {$this->plural_model_name} Endpoints
  */
 Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\Projects\\{$this->plural_model_name}Controller')->names('api.{$this->table_name}');
diff --git a/tests/Generators/FullControllerGeneratorTest.php b/tests/Generators/FullControllerGeneratorTest.php
index 33f2db2..1679849 100644
--- a/tests/Generators/FullControllerGeneratorTest.php
+++ b/tests/Generators/FullControllerGeneratorTest.php
@@ -50,7 +50,8 @@ class {$this->plural_model_name}Controller extends Controller
     /**
      * Store a newly created {$this->single_model_var_name} in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
+     * @param \Illuminate\Http\Request \$request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request \$request)
@@ -73,7 +74,8 @@ class {$this->plural_model_name}Controller extends Controller
     /**
      * Display the specified {$this->single_model_var_name}.
      *
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return \Illuminate\Http\Response
      */
     public function show({$this->model_name} \${$this->single_model_var_name})
@@ -84,7 +86,8 @@ class {$this->plural_model_name}Controller extends Controller
     /**
      * Show the form for editing the specified {$this->single_model_var_name}.
      *
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit({$this->model_name} \${$this->single_model_var_name})
@@ -97,8 +100,9 @@ class {$this->plural_model_name}Controller extends Controller
     /**
      * Update the specified {$this->single_model_var_name} in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \Illuminate\Http\Request \$request
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request \$request, {$this->model_name} \${$this->single_model_var_name})
@@ -118,7 +122,8 @@ class {$this->plural_model_name}Controller extends Controller
     /**
      * Remove the specified {$this->single_model_var_name} from storage.
      *
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy({$this->model_name} \${$this->single_model_var_name})
@@ -186,7 +191,8 @@ class CategoriesController extends Controller
     /**
      * Store a newly created category in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
+     * @param \Illuminate\Http\Request \$request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request \$request)
@@ -209,7 +215,8 @@ class CategoriesController extends Controller
     /**
      * Display the specified category.
      *
-     * @param  \App\Category  \$category
+     * @param \App\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function show(Category \$category)
@@ -220,7 +227,8 @@ class CategoriesController extends Controller
     /**
      * Show the form for editing the specified category.
      *
-     * @param  \App\Category  \$category
+     * @param \App\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit(Category \$category)
@@ -233,8 +241,9 @@ class CategoriesController extends Controller
     /**
      * Update the specified category in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
-     * @param  \App\Entities\References\Category  \$category
+     * @param \Illuminate\Http\Request \$request
+     * @param \App\Entities\References\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request \$request, Category \$category)
@@ -254,7 +263,8 @@ class CategoriesController extends Controller
     /**
      * Remove the specified category from storage.
      *
-     * @param  \App\Entities\References\Category  \$category
+     * @param \App\Entities\References\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy(Category \$category)
@@ -323,7 +333,8 @@ class CategoriesController extends Controller
     /**
      * Store a newly created category in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
+     * @param \Illuminate\Http\Request \$request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request \$request)
@@ -346,7 +357,8 @@ class CategoriesController extends Controller
     /**
      * Display the specified category.
      *
-     * @param  \App\Category  \$category
+     * @param \App\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function show(Category \$category)
@@ -357,7 +369,8 @@ class CategoriesController extends Controller
     /**
      * Show the form for editing the specified category.
      *
-     * @param  \App\Category  \$category
+     * @param \App\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit(Category \$category)
@@ -370,8 +383,9 @@ class CategoriesController extends Controller
     /**
      * Update the specified category in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
-     * @param  \App\Entities\References\Category  \$category
+     * @param \Illuminate\Http\Request \$request
+     * @param \App\Entities\References\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request \$request, Category \$category)
@@ -391,7 +405,8 @@ class CategoriesController extends Controller
     /**
      * Remove the specified category from storage.
      *
-     * @param  \App\Entities\References\Category  \$category
+     * @param \App\Entities\References\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy(Category \$category)
diff --git a/tests/Generators/ModelPolicyGeneratorTest.php b/tests/Generators/ModelPolicyGeneratorTest.php
index 2c54d1f..7b3e6b1 100644
--- a/tests/Generators/ModelPolicyGeneratorTest.php
+++ b/tests/Generators/ModelPolicyGeneratorTest.php
@@ -30,8 +30,9 @@ class {$this->model_name}Policy
     /**
      * Determine whether the user can view the project.
      *
-     * @param  \\{$userModel}  \$user
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$userModel} \$user
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return mixed
      */
     public function view(User \$user, {$this->model_name} \${$this->single_model_var_name})
@@ -43,8 +44,9 @@ class {$this->model_name}Policy
     /**
      * Determine whether the user can create projects.
      *
-     * @param  \\{$userModel}  \$user
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$userModel} \$user
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return mixed
      */
     public function create(User \$user, {$this->model_name} \${$this->single_model_var_name})
@@ -56,8 +58,9 @@ class {$this->model_name}Policy
     /**
      * Determine whether the user can update the project.
      *
-     * @param  \\{$userModel}  \$user
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$userModel} \$user
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return mixed
      */
     public function update(User \$user, {$this->model_name} \${$this->single_model_var_name})
@@ -69,8 +72,9 @@ class {$this->model_name}Policy
     /**
      * Determine whether the user can delete the project.
      *
-     * @param  \\{$userModel}  \$user
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$userModel} \$user
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return mixed
      */
     public function delete(User \$user, {$this->model_name} \${$this->single_model_var_name})
@@ -142,8 +146,9 @@ class {$this->model_name}Policy
     /**
      * Determine whether the user can view the project.
      *
-     * @param  \\{$userModel}  \$user
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$userModel} \$user
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return mixed
      */
     public function view(User \$user, {$this->model_name} \${$this->single_model_var_name})
@@ -155,8 +160,9 @@ class {$this->model_name}Policy
     /**
      * Determine whether the user can create projects.
      *
-     * @param  \\{$userModel}  \$user
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$userModel} \$user
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return mixed
      */
     public function create(User \$user, {$this->model_name} \${$this->single_model_var_name})
@@ -168,8 +174,9 @@ class {$this->model_name}Policy
     /**
      * Determine whether the user can update the project.
      *
-     * @param  \\{$userModel}  \$user
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$userModel} \$user
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return mixed
      */
     public function update(User \$user, {$this->model_name} \${$this->single_model_var_name})
@@ -181,8 +188,9 @@ class {$this->model_name}Policy
     /**
      * Determine whether the user can delete the project.
      *
-     * @param  \\{$userModel}  \$user
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$userModel} \$user
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return mixed
      */
     public function delete(User \$user, {$this->model_name} \${$this->single_model_var_name})
diff --git a/tests/Generators/RouteWebGeneratorTest.php b/tests/Generators/RouteWebGeneratorTest.php
index 64f6eaa..af597b9 100644
--- a/tests/Generators/RouteWebGeneratorTest.php
+++ b/tests/Generators/RouteWebGeneratorTest.php
@@ -15,7 +15,7 @@ class RouteWebGeneratorTest extends TestCase
         $this->assertFileExists($routeWebPath);
         $routeWebFileContent = "<?php
 
-/**
+/*
  * {$this->plural_model_name} Routes
  */
 Route::resource('{$this->table_name}', '{$this->plural_model_name}Controller');
@@ -32,7 +32,7 @@ Route::resource('{$this->table_name}', '{$this->plural_model_name}Controller');
         $this->assertFileExists($routeWebPath);
         $routeWebFileContent = "<?php
 
-/**
+/*
  * {$this->plural_model_name} Routes
  */
 Route::resource('{$this->table_name}', 'Projects\\{$this->plural_model_name}Controller');
diff --git a/tests/Generators/Simple/SimpleControllerGeneratorTest.php b/tests/Generators/Simple/SimpleControllerGeneratorTest.php
index bc831ad..b928ca3 100644
--- a/tests/Generators/Simple/SimpleControllerGeneratorTest.php
+++ b/tests/Generators/Simple/SimpleControllerGeneratorTest.php
@@ -43,7 +43,8 @@ class {$this->plural_model_name}Controller extends Controller
     /**
      * Store a newly created {$this->single_model_var_name} in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
+     * @param \Illuminate\Http\Request \$request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request \$request)
@@ -66,8 +67,9 @@ class {$this->plural_model_name}Controller extends Controller
     /**
      * Update the specified {$this->single_model_var_name} in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \Illuminate\Http\Request \$request
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request \$request, {$this->model_name} \${$this->single_model_var_name})
@@ -89,7 +91,8 @@ class {$this->plural_model_name}Controller extends Controller
     /**
      * Remove the specified {$this->single_model_var_name} from storage.
      *
-     * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
+     * @param \\{$this->full_model_name} \${$this->single_model_var_name}
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy({$this->model_name} \${$this->single_model_var_name})
@@ -150,7 +153,8 @@ class CategoriesController extends Controller
     /**
      * Store a newly created category in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
+     * @param \Illuminate\Http\Request \$request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request \$request)
@@ -173,8 +177,9 @@ class CategoriesController extends Controller
     /**
      * Update the specified category in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
-     * @param  \App\Entities\References\Category  \$category
+     * @param \Illuminate\Http\Request \$request
+     * @param \App\Entities\References\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request \$request, Category \$category)
@@ -196,7 +201,8 @@ class CategoriesController extends Controller
     /**
      * Remove the specified category from storage.
      *
-     * @param  \App\Entities\References\Category  \$category
+     * @param \App\Entities\References\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy(Category \$category)
@@ -258,7 +264,8 @@ class CategoriesController extends Controller
     /**
      * Store a newly created category in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
+     * @param \Illuminate\Http\Request \$request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request \$request)
@@ -281,8 +288,9 @@ class CategoriesController extends Controller
     /**
      * Update the specified category in storage.
      *
-     * @param  \Illuminate\Http\Request  \$request
-     * @param  \App\Entities\References\Category  \$category
+     * @param \Illuminate\Http\Request \$request
+     * @param \App\Entities\References\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request \$request, Category \$category)
@@ -304,7 +312,8 @@ class CategoriesController extends Controller
     /**
      * Remove the specified category from storage.
      *
-     * @param  \App\Entities\References\Category  \$category
+     * @param \App\Entities\References\Category \$category
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy(Category \$category)
diff --git a/tests/Generators/ViewsGeneratorTest.php b/tests/Generators/ViewsGeneratorTest.php
index 3f36cd6..ea12688 100644
--- a/tests/Generators/ViewsGeneratorTest.php
+++ b/tests/Generators/ViewsGeneratorTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Generators;
 
-use Illuminate\Contracts\Console\Kernel;
 use Tests\TestCase;
+use Illuminate\Contracts\Console\Kernel;
 
 class ViewsGeneratorTest extends TestCase
 {
@@ -158,7 +158,6 @@ class ViewsGeneratorTest extends TestCase
 @section('title', trans('{$this->lang_name}.edit'))
 
 @section('content')
-
 <div class=\"row\">
     <div class=\"col-md-6 col-md-offset-3\">
         @if (request('action') == 'delete' && \${$this->single_model_var_name})