diff --git a/app/Http/Requests/CreateAirportRequest.php b/app/Http/Requests/CreateAirportRequest.php
index 3c0259c6..869cc11c 100644
--- a/app/Http/Requests/CreateAirportRequest.php
+++ b/app/Http/Requests/CreateAirportRequest.php
@@ -5,18 +5,29 @@ namespace App\Http\Requests;
 use App\Models\Airport;
 use Illuminate\Foundation\Http\FormRequest;
 
+/**
+ * Class CreateAirportRequest
+ * @package App\Http\Requests
+ */
 class CreateAirportRequest extends FormRequest
 {
-    public function authorize()
+    /**
+     * Determine if the user is authorized to make this request.
+     * @return bool
+     */
+    public function authorize(): bool
     {
         return true;
     }
 
-    public function rules()
+    /**
+     * Get the validation rules that apply to the request.
+     * @return array
+     */
+    public function rules(): array
     {
         $rules = Airport::$rules;
         $rules['icao'] .= '|unique:airports';
-
         return $rules;
     }
 }
diff --git a/app/Http/Requests/CreateFareRequest.php b/app/Http/Requests/CreateFareRequest.php
index f99687f3..8271ffea 100644
--- a/app/Http/Requests/CreateFareRequest.php
+++ b/app/Http/Requests/CreateFareRequest.php
@@ -9,21 +9,21 @@ class CreateFareRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return true;
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
-        return Fare::$rules;
+        $rules = Fare::$rules;
+        $rules['code'] .= '|unique:fares';
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/CreateSubfleetRequest.php b/app/Http/Requests/CreateSubfleetRequest.php
index fabfc91d..92c9094e 100644
--- a/app/Http/Requests/CreateSubfleetRequest.php
+++ b/app/Http/Requests/CreateSubfleetRequest.php
@@ -9,21 +9,21 @@ class CreateSubfleetRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return true;
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
-        return Subfleet::$rules;
+        $rules = Subfleet::$rules;
+        $rules['type'] .= '|unique:subfleets';
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/CreateUserRequest.php b/app/Http/Requests/CreateUserRequest.php
index 99f7762e..4570fdb4 100644
--- a/app/Http/Requests/CreateUserRequest.php
+++ b/app/Http/Requests/CreateUserRequest.php
@@ -9,24 +9,21 @@ class CreateUserRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return true;
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = User::$rules;
         $rules['email'] .= '|unique:users,email';
-
         return $rules;
     }
 }
diff --git a/app/Models/Fare.php b/app/Models/Fare.php
index 41dbbd78..45302522 100644
--- a/app/Models/Fare.php
+++ b/app/Models/Fare.php
@@ -33,7 +33,7 @@ class Fare extends Model
     ];
 
     public static $rules = [
-        'code' => 'required|unique:fares',
+        'code' => 'required',
         'name' => 'required',
     ];
 
diff --git a/app/Models/Subfleet.php b/app/Models/Subfleet.php
index c65cfbc2..ff778f5e 100644
--- a/app/Models/Subfleet.php
+++ b/app/Models/Subfleet.php
@@ -40,7 +40,7 @@ class Subfleet extends Model
     ];
 
     public static $rules = [
-        'type'                       => 'required|unique:subfleets',
+        'type'                       => 'required',
         'name'                       => 'required',
         'ground_handling_multiplier' => 'nullable|numeric',
     ];
@@ -50,9 +50,7 @@ class Subfleet extends Model
      */
     public function setTypeAttribute($type)
     {
-        $type = str_replace(' ', '-', $type);
-        $type = str_replace(',', '', $type);
-
+        $type = str_replace([' ', ','], array('-', ''), $type);
         $this->attributes['type'] = $type;
     }