diff --git a/src/commands/mod/unmute.ts b/src/commands/mod/unmute.ts
index f625461..40a2093 100644
--- a/src/commands/mod/unmute.ts
+++ b/src/commands/mod/unmute.ts
@@ -9,18 +9,10 @@
     builder
         .setName("unmute")
         .setDescription("Unmutes a user")
-        .addUserOption((option) =>
-            option
-                .setName("user")
-                .setDescription("The user to unmute")
-                .setRequired(true)
-        );
+        .addUserOption((option) => option.setName("user").setDescription("The user to unmute").setRequired(true));
 
-const callback = async (
-    interaction: CommandInteraction
-): Promise<void | unknown> => {
-    const { log, NucleusColors, renderUser, entry, renderDelta } =
-        client.logger;
+const callback = async (interaction: CommandInteraction): Promise<void | unknown> => {
+    const { log, NucleusColors, renderUser, entry, renderDelta } = client.logger;
     // TODO:[Modals] Replace this with a modal
     let reason = null;
     let notify = false;
@@ -35,10 +27,7 @@
                     reason: `\n> ${reason ? reason : "*No reason provided*"}`
                 }) +
                     `The user **will${notify ? "" : " not"}** be notified\n\n` +
-                    `Are you sure you want to unmute <@!${
-                        (interaction.options.getMember("user") as GuildMember)
-                            .id
-                    }>?`
+                    `Are you sure you want to unmute <@!${(interaction.options.getMember("user") as GuildMember).id}>?`
             )
             .setColor("Danger")
             .addReasonButton(reason ?? "")
@@ -55,18 +44,14 @@
         let dm;
         try {
             if (notify) {
-                dm = await (
-                    interaction.options.getMember("user") as GuildMember
-                ).send({
+                dm = await (interaction.options.getMember("user") as GuildMember).send({
                     embeds: [
                         new EmojiEmbed()
                             .setEmoji("PUNISH.MUTE.GREEN")
                             .setTitle("Unmuted")
                             .setDescription(
                                 `You have been unmuted in ${interaction.guild.name}` +
-                                    (reason
-                                        ? ` for:\n> ${reason}`
-                                        : " with no reason provided.")
+                                    (reason ? ` for:\n> ${reason}` : " with no reason provided.")
                             )
                             .setStatus("Success")
                     ]
@@ -85,9 +70,7 @@
                     new EmojiEmbed()
                         .setEmoji("PUNISH.MUTE.RED")
                         .setTitle("Unmute")
-                        .setDescription(
-                            "Something went wrong and the user was not unmuted"
-                        )
+                        .setDescription("Something went wrong and the user was not unmuted")
                         .setStatus("Danger")
                 ],
                 components: []
@@ -114,14 +97,8 @@
             list: {
                 memberId: entry(member.user.id, `\`${member.user.id}\``),
                 name: entry(member.user.id, renderUser(member.user)),
-                unmuted: entry(
-                    new Date().getTime(),
-                    renderDelta(new Date().getTime())
-                ),
-                unmutedBy: entry(
-                    interaction.user.id,
-                    renderUser(interaction.user)
-                )
+                unmuted: entry(new Date().getTime(), renderDelta(new Date().getTime())),
+                unmutedBy: entry(interaction.user.id, renderUser(interaction.user))
             },
             hidden: {
                 guild: interaction.guild.id
@@ -134,10 +111,7 @@
                 new EmojiEmbed()
                     .setEmoji(`PUNISH.MUTE.${failed ? "YELLOW" : "GREEN"}`)
                     .setTitle("Unmute")
-                    .setDescription(
-                        "The member was unmuted" +
-                            (failed ? ", but could not be notified" : "")
-                    )
+                    .setDescription("The member was unmuted" + (failed ? ", but could not be notified" : ""))
                     .setStatus(failed ? "Warning" : "Success")
             ],
             components: []
@@ -160,28 +134,22 @@
     const member = interaction.member as GuildMember;
     const me = interaction.guild.me!;
     const apply = interaction.options.getMember("user") as GuildMember;
-    if (member === null || me === null || apply === null)
-        throw "That member is not in the server";
+    if (member === null || me === null || apply === null) throw "That member is not in the server";
     const memberPos = member.roles ? member.roles.highest.position : 0;
     const mePos = me.roles ? me.roles.highest.position : 0;
     const applyPos = apply.roles ? apply.roles.highest.position : 0;
     // Do not allow unmuting the owner
-    if (member.id === interaction.guild.ownerId)
-        throw "You cannot unmute the owner of the server";
+    if (member.id === interaction.guild.ownerId) throw "You cannot unmute the owner of the server";
     // Check if Nucleus can unmute the member
-    if (!(mePos > applyPos))
-        throw "I do not have a role higher than that member";
+    if (!(mePos > applyPos)) throw "I do not have a role higher than that member";
     // Check if Nucleus has permission to unmute
-    if (!me.permissions.has("MODERATE_MEMBERS"))
-        throw "I do not have the *Moderate Members* permission";
+    if (!me.permissions.has("MODERATE_MEMBERS")) throw "I do not have the *Moderate Members* permission";
     // Allow the owner to unmute anyone
     if (member.id === interaction.guild.ownerId) return true;
     // Check if the user has moderate_members permission
-    if (!member.permissions.has("MODERATE_MEMBERS"))
-        throw "You do not have the *Moderate Members* permission";
+    if (!member.permissions.has("MODERATE_MEMBERS")) throw "You do not have the *Moderate Members* permission";
     // Check if the user is below on the role list
-    if (!(memberPos > applyPos))
-        throw "You do not have a role higher than that member";
+    if (!(memberPos > applyPos)) throw "You do not have a role higher than that member";
     // Allow unmute
     return true;
 };
