diff --git a/app/Models/Component.php b/app/Models/Component.php
index 2504e99c..1b7901ac 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -12,9 +12,9 @@
 namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
+use CachetHQ\Cachet\Models\Traits\HasTags;
 use CachetHQ\Cachet\Models\Traits\SearchableTrait;
 use CachetHQ\Cachet\Models\Traits\SortableTrait;
-use CachetHQ\Cachet\Models\Traits\HasTags;
 use CachetHQ\Cachet\Presenters\ComponentPresenter;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Incident.php b/app/Models/Incident.php
index 37401ded..740d4c16 100644
--- a/app/Models/Incident.php
+++ b/app/Models/Incident.php
@@ -12,9 +12,9 @@
 namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
+use CachetHQ\Cachet\Models\Traits\HasTags;
 use CachetHQ\Cachet\Models\Traits\SearchableTrait;
 use CachetHQ\Cachet\Models\Traits\SortableTrait;
-use CachetHQ\Cachet\Models\Traits\HasTags;
 use CachetHQ\Cachet\Presenters\IncidentPresenter;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Traits/HasTags.php b/app/Models/Traits/HasTags.php
index a2fae75f..dbb62b75 100644
--- a/app/Models/Traits/HasTags.php
+++ b/app/Models/Traits/HasTags.php
@@ -13,7 +13,6 @@ namespace CachetHQ\Cachet\Models\Traits;
 
 use CachetHQ\Cachet\Models\Tag;
 use Illuminate\Database\Eloquent\Builder;
-use InvalidArgumentException;
 
 /**
  * This is the has tags trait.
@@ -69,7 +68,7 @@ trait HasTags
     }
 
     /**
-     * Convert a list of tags into a collection of \CachetHQ\Cachet\Models\Tag
+     * Convert a list of tags into a collection of \CachetHQ\Cachet\Models\Tag.
      *
      * @param array|\ArrayAccess $values
      *