diff --git a/src/events/guildBanRemove.ts b/src/events/guildBanRemove.ts
index 352265f..4c2263d 100644
--- a/src/events/guildBanRemove.ts
+++ b/src/events/guildBanRemove.ts
@@ -6,11 +6,20 @@
 export async function callback(client, ban) {
     await statsChannelRemove(client, ban.user);
     purgeByUser(ban.user.id, ban.guild);
-    const { log, NucleusColors, entry, renderUser, renderDelta, getAuditLog } = ban.user.client.logger;
+    const { log, NucleusColors, entry, renderUser, renderDelta, getAuditLog } =
+        ban.user.client.logger;
     const auditLog = await getAuditLog(ban.guild, "MEMBER_BAN_REMOVE");
-    const audit = auditLog.entries.filter(entry => entry.target.id === ban.user.id).first();
+    const audit = auditLog.entries
+        .filter((entry) => entry.target.id === ban.user.id)
+        .first();
     if (audit.executor.id === client.user.id) return;
-    await client.database.history.create("unban", ban.guild.id, ban.user, audit.executor, audit.reason);
+    await client.database.history.create(
+        "unban",
+        ban.guild.id,
+        ban.user,
+        audit.executor,
+        audit.reason
+    );
     const data = {
         meta: {
             type: "memberUnban",
@@ -23,9 +32,15 @@
         list: {
             memberId: entry(ban.user.id, `\`${ban.user.id}\``),
             name: entry(ban.user.id, renderUser(ban.user)),
-            unbanned: entry(new Date().getTime(), renderDelta(new Date().getTime())),
+            unbanned: entry(
+                new Date().getTime(),
+                renderDelta(new Date().getTime())
+            ),
             unbannedBy: entry(audit.executor.id, renderUser(audit.executor)),
-            accountCreated: entry(ban.user.createdAt, renderDelta(ban.user.createdAt))
+            accountCreated: entry(
+                ban.user.createdAt,
+                renderDelta(ban.user.createdAt)
+            )
         },
         hidden: {
             guild: ban.guild.id
