diff --git a/lib/cannery/containers/container.ex b/lib/cannery/containers/container.ex
index a9fdfb7..019550c 100644
--- a/lib/cannery/containers/container.ex
+++ b/lib/cannery/containers/container.ex
@@ -6,9 +6,9 @@ defmodule Cannery.Containers.Container do
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "containers" do
+    field :name, :string
     field :desc, :string
     field :location, :string
-    field :name, :string
     field :type, :string
 
     belongs_to :user, Accounts.User
@@ -16,6 +16,18 @@ defmodule Cannery.Containers.Container do
     timestamps()
   end
 
+  @type t :: %{
+          id: Ecto.UUID.t(),
+          name: String.t(),
+          desc: String.t(),
+          location: String.t(),
+          type: String.t(),
+          user: Accounts.User.t(),
+          user_id: Ecto.UUID.t(),
+          inserted_at: NaiveDateTime.t(),
+          updated_at: NaiveDateTime.t()
+        }
+
   @doc false
   def changeset(container, attrs) do
     container
diff --git a/lib/cannery/invites/invite.ex b/lib/cannery/invites/invite.ex
index ba45a65..b9107a4 100644
--- a/lib/cannery/invites/invite.ex
+++ b/lib/cannery/invites/invite.ex
@@ -10,26 +10,27 @@ defmodule Cannery.Invites.Invite do
     field :token, :string
     field :uses_left, :integer, default: nil
     field :disabled_at, :naive_datetime
+
     belongs_to :user, Accounts.User
 
     timestamps()
   end
 
-  @doc false
-  def changeset(invite, attrs) do
-    invite
-    |> cast(attrs, [:name, :token, :uses_left, :disabled_at, :user_id])
-    |> validate_required([:name, :token, :user_id])
-    |> validate_number(:uses_left, greater_than_or_equal_to: 0)
-  end
-
   @type t :: %{
           id: Ecto.UUID.t(),
           name: String.t(),
           token: String.t(),
           uses_left: integer() | nil,
           disabled_at: NaiveDateTime.t(),
-          user_id: Ecto.UUID.t(),
-          user: Accounts.User.t()
+          user: Accounts.User.t(),
+          user_id: Ecto.UUID.t()
         }
+
+  @doc false
+  def changeset(invite, attrs) do
+    invite
+    |> cast(attrs, [:name, :token, :uses_left, :disabled_at, :user_id])
+    |> validate_required([:name, :token, :user_id])
+    |> validate_number(:uses_left, greater_than_or_equal_to: 0)
+  end
 end
diff --git a/lib/cannery/tags/tag.ex b/lib/cannery/tags/tag.ex
index e142b3e..b9beb2c 100644
--- a/lib/cannery/tags/tag.ex
+++ b/lib/cannery/tags/tag.ex
@@ -6,8 +6,8 @@ defmodule Cannery.Tags.Tag do
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "tags" do
-    field :bg_color, :string
     field :name, :string
+    field :bg_color, :string
     field :text_color, :string
 
     belongs_to :user, Accounts.User
@@ -15,6 +15,17 @@ defmodule Cannery.Tags.Tag do
     timestamps()
   end
 
+  @type t :: %{
+          id: Ecto.UUID.t(),
+          name: String.t(),
+          bg_color: String.t(),
+          text_color: String.t(),
+          user: Accounts.User.t(),
+          user_id: Ecto.UUID.t(),
+          inserted_at: NaiveDateTime.t(),
+          updated_at: NaiveDateTime.t()
+        }
+
   @doc false
   def changeset(tag, attrs) do
     tag