diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d595b1cef..b44a82a75 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: Tests
 on: [push, pull_request]
 jobs:
   lint:
-    name: ESLint
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -17,7 +17,7 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Run ESLint
+      - name: Run Prettier and ESLint
         run: npm run lint
 
   typings:
diff --git a/package.json b/package.json
index e12292501..f285a5bee 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "scripts": {
     "test": "npm run lint && npm run docs:test && npm run lint:typings && npm run test:typescript",
     "test:typescript": "tsc --noEmit && tsd",
-    "lint": "eslint src",
-    "lint:fix": "eslint src --fix",
+    "lint": "prettier --check src/**/*.js typings/**/*.ts && eslint src",
+    "lint:fix": "npm run format && eslint src --fix",
     "lint:typings": "tslint typings/index.d.ts",
     "format": "prettier --write src/**/*.js typings/**/*.ts",
     "prepare": "is-ci || husky install",
diff --git a/typings/rawDataTypes.d.ts b/typings/rawDataTypes.d.ts
index b551fe937..2e7e0a069 100644
--- a/typings/rawDataTypes.d.ts
+++ b/typings/rawDataTypes.d.ts
@@ -74,9 +74,7 @@ import {
   RESTPostAPIWebhookWithTokenJSONBody,
   Snowflake,
   APIGuildScheduledEvent,
-  APIActionRowComponent,
   APITextInputComponent,
-  APIModalActionRowComponent,
   APIModalSubmitInteraction,
   Permissions,
   GuildDefaultMessageNotifications,
@@ -88,17 +86,15 @@ import {
   GuildHubType,
   GuildVerificationLevel,
   GuildFeature,
-  LocalizationMap
+  LocalizationMap,
 } from 'discord-api-types/v9';
-import { GuildChannel, Guild, PermissionOverwrites, InteractionType } from '.';
+import { GuildChannel, Guild, PermissionOverwrites } from '.';
 import type {
   AutoModerationActionTypes,
   AutoModerationRuleEventTypes,
   AutoModerationRuleKeywordPresetTypes,
   AutoModerationRuleTriggerTypes,
-  InteractionTypes,
-  MessageComponentTypes,
-  ApplicationRoleConnectionMetadataTypes
+  ApplicationRoleConnectionMetadataTypes,
 } from './enums';
 
 export type RawActivityData = GatewayActivity;
@@ -178,18 +174,18 @@ export type RawMessageData = APIMessage;
 export type RawPartialMessageData = GatewayMessageUpdateDispatchData;
 
 export interface RawMessageAttachmentData {
-	id: Snowflake;
-	filename: string;
-	description?: string;
-	content_type?: string;
-	size: number;
-	url: string;
-	proxy_url: string;
-	height?: number | null;
-	width?: number | null;
-	ephemeral?: boolean;
-	duration_secs?: number;
-	waveform?: string;
+  id: Snowflake;
+  filename: string;
+  description?: string;
+  content_type?: string;
+  size: number;
+  url: string;
+  proxy_url: string;
+  height?: number | null;
+  width?: number | null;
+  ephemeral?: boolean;
+  duration_secs?: number;
+  waveform?: string;
 }
 
 export type RawMessagePayloadData =
@@ -294,7 +290,6 @@ export interface APIAutoModerationRuleTriggerMetadata {
   mention_raid_protection_enabled?: boolean;
 }
 
-
 export interface APIGuild extends APIPartialGuild {
   icon_hash?: string | null;
   discovery_splash: string | null;