diff --git a/src/api-client/answers.ts b/src/api-client/answers.ts
index 8a22289..76a347a 100644
--- a/src/api-client/answers.ts
+++ b/src/api-client/answers.ts
@@ -44,9 +44,7 @@ export async function submitAnswers(formData: IFormDataProps[]) {
 }
 
 // GET BY SLUG
-export async function getAnswersBySlug(
-  slug: string,
-): Promise<IAnswerResult | null> {
+export async function getAnswersBySlug(slug: string) {
   try {
     const response = await axios.get<IAnswerResult>(`/api/answers/${slug}`);
 
@@ -63,9 +61,7 @@ export async function getAnswersBySlug(
 }
 
 // GET BY SLUG ARRAY
-export async function getAnswersBySlugArray(
-  slugs: string[],
-): Promise<IAnswerResult[]> {
+export async function getAnswersBySlugArray(slugs: string[]) {
   if (!slugs.length) {
     return [];
   }
diff --git a/src/api-client/people.ts b/src/api-client/people.ts
index ab3ec00..8bae8ae 100644
--- a/src/api-client/people.ts
+++ b/src/api-client/people.ts
@@ -1,13 +1,11 @@
-import axios, { AxiosResponse } from "axios";
+import axios from "axios";
 
 import { IPerson } from "~/models/Person";
 
 // GET BY SLUG
-export async function getPerson(slug: string): Promise<IPerson | null> {
+export async function getPerson(slug: string) {
   try {
-    const response: AxiosResponse<IPerson> = await axios.get(
-      `/api/people/${slug}`,
-    );
+    const response = await axios.get<IPerson>(`/api/people/${slug}`);
 
     const data = response.data;
 
@@ -24,7 +22,7 @@ export async function getPerson(slug: string): Promise<IPerson | null> {
 // GET ALL
 export async function getPeople() {
   try {
-    const response: AxiosResponse<IPerson[]> = await axios.get(`/api/people`);
+    const response = await axios.get<IPerson[]>(`/api/people`);
 
     const data = response.data;
 
diff --git a/src/api-client/questions.ts b/src/api-client/questions.ts
index 45a4183..81e01dc 100644
--- a/src/api-client/questions.ts
+++ b/src/api-client/questions.ts
@@ -1,12 +1,11 @@
-import axios, { AxiosResponse } from "axios";
+import axios from "axios";
 
 import { IQuestion } from "~/models/Question";
 
 // GET ALL
 export async function getQuestions() {
   try {
-    const response: AxiosResponse<IQuestion[] | undefined> =
-      await axios.get(`/api/questions`);
+    const response = await axios.get<IQuestion[]>(`/api/questions`);
 
     const data = response.data;
 
diff --git a/src/api-client/subscriptions.ts b/src/api-client/subscriptions.ts
index 9a9309d..2681175 100644
--- a/src/api-client/subscriptions.ts
+++ b/src/api-client/subscriptions.ts
@@ -2,7 +2,9 @@ import axios from "axios";
 
 import { ISubscription } from "~/models/Subscription";
 
-export type SubscriptionProps = Pick<ISubscription, "email">;
+interface SubscriptionProps {
+  email: string;
+}
 
 // CREATE SUBSCRIPTION
 export async function createSubscription({ email }: SubscriptionProps) {
diff --git a/src/app/api/names/route.ts b/src/app/api/names/route.ts
index 30154be..1d62764 100644
--- a/src/app/api/names/route.ts
+++ b/src/app/api/names/route.ts
@@ -17,8 +17,6 @@ export async function POST(req: Request) {
   try {
     await connectDB();
 
-    // Check if exists and add counts.
-
     const newName: IName = new Name({ name, link });
     await newName.save();
 
diff --git a/src/components/Content.tsx b/src/components/Content.tsx
index 6e0a3c1..4ef09a5 100644
--- a/src/components/Content.tsx
+++ b/src/components/Content.tsx
@@ -1,6 +1,7 @@
 import { ParsedParagraph } from "./ParsedParagraph";
 
 import { IAnswerResult } from "~/api-client/answers";
+import { IQuestion } from "~/models/Question";
 
 interface ContentProps {
   data: IAnswerResult;
@@ -15,7 +16,7 @@ export function Content({ data }: ContentProps) {
 
           return (
             <div key={index} className="space-y-5 rounded-3xl bg-white p-8">
-              <Question>{question.body}</Question>
+              <Question>{(question as IQuestion).body}</Question>
               <Answer>{item.answer}</Answer>
             </div>
           );