diff --git a/.storybook/components/CodeBlock.tsx b/.storybook/components/CodeBlock.tsx
index 9770f78..f58dc53 100644
--- a/.storybook/components/CodeBlock.tsx
+++ b/.storybook/components/CodeBlock.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { CodeBlock, shadesOfPurple } from 'react-code-blocks';
 
-export const Code = ({ children }) => (
+export const Code = ({ children }: { children: string }) => (
   <CodeBlock
     text={children}
     language="jsx"
diff --git a/.storybook/manager.ts b/.storybook/manager.ts
index 2b842c0..f387a78 100644
--- a/.storybook/manager.ts
+++ b/.storybook/manager.ts
@@ -11,7 +11,6 @@ const theme = create({
   brandTitle: '⚛️ React Design Patterns',
   brandUrl: 'https://example.com',
   brandTarget: '_self',
-  //
   colorPrimary: '#ffffff',
   colorSecondary: '#A599E9',
 
diff --git a/src/course/02- lessons/01-Bronze/ConditionalRendering/exercise/exercise.stories.tsx b/src/course/02-lessons/01-Bronze/ConditionalRendering/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/ConditionalRendering/exercise/exercise.stories.tsx
rename to src/course/02-lessons/01-Bronze/ConditionalRendering/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/ConditionalRendering/exercise/exercise.tsx b/src/course/02-lessons/01-Bronze/ConditionalRendering/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/ConditionalRendering/exercise/exercise.tsx
rename to src/course/02-lessons/01-Bronze/ConditionalRendering/exercise/exercise.tsx
diff --git a/src/course/02- lessons/01-Bronze/ConditionalRendering/final/final.stories.tsx b/src/course/02-lessons/01-Bronze/ConditionalRendering/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/ConditionalRendering/final/final.stories.tsx
rename to src/course/02-lessons/01-Bronze/ConditionalRendering/final/final.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/ConditionalRendering/final/final.tsx b/src/course/02-lessons/01-Bronze/ConditionalRendering/final/final.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/ConditionalRendering/final/final.tsx
rename to src/course/02-lessons/01-Bronze/ConditionalRendering/final/final.tsx
diff --git a/src/course/02- lessons/01-Bronze/ConditionalRendering/lesson.mdx b/src/course/02-lessons/01-Bronze/ConditionalRendering/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/ConditionalRendering/lesson.mdx
rename to src/course/02-lessons/01-Bronze/ConditionalRendering/lesson.mdx
diff --git a/src/course/02- lessons/01-Bronze/Hooks/components.tsx b/src/course/02-lessons/01-Bronze/Hooks/components.tsx
similarity index 92%
rename from src/course/02- lessons/01-Bronze/Hooks/components.tsx
rename to src/course/02-lessons/01-Bronze/Hooks/components.tsx
index 63591b5..ae8a9d3 100644
--- a/src/course/02- lessons/01-Bronze/Hooks/components.tsx	
+++ b/src/course/02-lessons/01-Bronze/Hooks/components.tsx
@@ -3,7 +3,7 @@ import { Label } from '@shared/components/Label/Label.component';
 import { ErrorMessage } from '@shared/components/ErrorMessage/ErrorMessage.component';
 import { HTMLAttributes } from 'react';
 
-export interface ITextFieldProps {
+export interface TextFieldProps {
   hasError: boolean;
   errorMessage?: string;
   id: string;
@@ -19,7 +19,7 @@ export const TextFieldComponent = ({
   id,
   name,
   label
-}: ITextFieldProps) => (
+}: TextFieldProps) => (
   <div className="flex flex-col gap-2">
     <Label htmlFor={id}>{label}</Label>
     <Input id={id} name={name} hasError={hasError} {...input} />
diff --git a/src/course/02- lessons/01-Bronze/Hooks/exercise/exercise.stories.tsx b/src/course/02-lessons/01-Bronze/Hooks/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Hooks/exercise/exercise.stories.tsx
rename to src/course/02-lessons/01-Bronze/Hooks/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/Hooks/exercise/exercise.tsx b/src/course/02-lessons/01-Bronze/Hooks/exercise/exercise.tsx
similarity index 95%
rename from src/course/02- lessons/01-Bronze/Hooks/exercise/exercise.tsx
rename to src/course/02-lessons/01-Bronze/Hooks/exercise/exercise.tsx
index 875f1bb..7fc3b4a 100644
--- a/src/course/02- lessons/01-Bronze/Hooks/exercise/exercise.tsx	
+++ b/src/course/02-lessons/01-Bronze/Hooks/exercise/exercise.tsx
@@ -1,5 +1,5 @@
 import { ChangeEvent, useState } from 'react';
-import { ITextFieldProps, TextFieldComponent } from '../components';
+import { TextFieldProps, TextFieldComponent } from '../components';
 
 /*
  * Observations
@@ -16,7 +16,7 @@ interface IFieldProps {
   id: string;
   label: string;
   errorMessage?: string;
-  children: (props: ITextFieldProps) => React.ReactNode;
+  children: (props: TextFieldProps) => React.ReactNode;
 }
 
 const validateTextString = (value: string) =>
diff --git a/src/course/02- lessons/01-Bronze/Hooks/final/final.stories.tsx b/src/course/02-lessons/01-Bronze/Hooks/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Hooks/final/final.stories.tsx
rename to src/course/02-lessons/01-Bronze/Hooks/final/final.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/Hooks/final/final.tsx b/src/course/02-lessons/01-Bronze/Hooks/final/final.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Hooks/final/final.tsx
rename to src/course/02-lessons/01-Bronze/Hooks/final/final.tsx
diff --git a/src/course/02- lessons/01-Bronze/Hooks/lesson.mdx b/src/course/02-lessons/01-Bronze/Hooks/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Hooks/lesson.mdx
rename to src/course/02-lessons/01-Bronze/Hooks/lesson.mdx
diff --git a/src/course/02- lessons/01-Bronze/PresentationalAndContainer/exercise/exercise.stories.tsx b/src/course/02-lessons/01-Bronze/PresentationalAndContainer/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PresentationalAndContainer/exercise/exercise.stories.tsx
rename to src/course/02-lessons/01-Bronze/PresentationalAndContainer/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/PresentationalAndContainer/exercise/exercise.tsx b/src/course/02-lessons/01-Bronze/PresentationalAndContainer/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PresentationalAndContainer/exercise/exercise.tsx
rename to src/course/02-lessons/01-Bronze/PresentationalAndContainer/exercise/exercise.tsx
diff --git a/src/course/02- lessons/01-Bronze/PresentationalAndContainer/final/final.stories.tsx b/src/course/02-lessons/01-Bronze/PresentationalAndContainer/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PresentationalAndContainer/final/final.stories.tsx
rename to src/course/02-lessons/01-Bronze/PresentationalAndContainer/final/final.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/PresentationalAndContainer/final/final.tsx b/src/course/02-lessons/01-Bronze/PresentationalAndContainer/final/final.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PresentationalAndContainer/final/final.tsx
rename to src/course/02-lessons/01-Bronze/PresentationalAndContainer/final/final.tsx
diff --git a/src/course/02- lessons/01-Bronze/PresentationalAndContainer/lesson.mdx b/src/course/02-lessons/01-Bronze/PresentationalAndContainer/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PresentationalAndContainer/lesson.mdx
rename to src/course/02-lessons/01-Bronze/PresentationalAndContainer/lesson.mdx
diff --git a/src/course/02- lessons/01-Bronze/PresentationalAndContainer/mocks.ts b/src/course/02-lessons/01-Bronze/PresentationalAndContainer/mocks.ts
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PresentationalAndContainer/mocks.ts
rename to src/course/02-lessons/01-Bronze/PresentationalAndContainer/mocks.ts
diff --git a/src/course/02- lessons/01-Bronze/PropsCombination/exercise/exercise.stories.tsx b/src/course/02-lessons/01-Bronze/PropsCombination/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PropsCombination/exercise/exercise.stories.tsx
rename to src/course/02-lessons/01-Bronze/PropsCombination/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/PropsCombination/exercise/exercise.tsx b/src/course/02-lessons/01-Bronze/PropsCombination/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PropsCombination/exercise/exercise.tsx
rename to src/course/02-lessons/01-Bronze/PropsCombination/exercise/exercise.tsx
diff --git a/src/course/02- lessons/01-Bronze/PropsCombination/final/final.stories.tsx b/src/course/02-lessons/01-Bronze/PropsCombination/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PropsCombination/final/final.stories.tsx
rename to src/course/02-lessons/01-Bronze/PropsCombination/final/final.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/PropsCombination/final/final.tsx b/src/course/02-lessons/01-Bronze/PropsCombination/final/final.tsx
similarity index 91%
rename from src/course/02- lessons/01-Bronze/PropsCombination/final/final.tsx
rename to src/course/02-lessons/01-Bronze/PropsCombination/final/final.tsx
index 73807fa..cc5a54f 100644
--- a/src/course/02- lessons/01-Bronze/PropsCombination/final/final.tsx	
+++ b/src/course/02-lessons/01-Bronze/PropsCombination/final/final.tsx
@@ -69,7 +69,9 @@ export const Final = ({
       </div>
       <div className="px-6 pt-4 pb-2">
         <a
-          href={cta.url}
+          href={cta.url.startsWith('http') ? cta.url : '#'}
+          rel="noopener noreferrer"
+          target={cta.url.startsWith('http') ? '_blank' : '_self'}
           className={classnames(
             'inline-block bg-gray-200 hover:bg-gray-300 transition-colors rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2',
             classNames?.cta
diff --git a/src/course/02- lessons/01-Bronze/PropsCombination/lesson.mdx b/src/course/02-lessons/01-Bronze/PropsCombination/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/PropsCombination/lesson.mdx
rename to src/course/02-lessons/01-Bronze/PropsCombination/lesson.mdx
diff --git a/src/course/02- lessons/01-Bronze/Slots/exercise/exercise.stories.tsx b/src/course/02-lessons/01-Bronze/Slots/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Slots/exercise/exercise.stories.tsx
rename to src/course/02-lessons/01-Bronze/Slots/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/Slots/exercise/exercise.tsx b/src/course/02-lessons/01-Bronze/Slots/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Slots/exercise/exercise.tsx
rename to src/course/02-lessons/01-Bronze/Slots/exercise/exercise.tsx
diff --git a/src/course/02- lessons/01-Bronze/Slots/final/final.stories.tsx b/src/course/02-lessons/01-Bronze/Slots/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Slots/final/final.stories.tsx
rename to src/course/02-lessons/01-Bronze/Slots/final/final.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/Slots/final/final.tsx b/src/course/02-lessons/01-Bronze/Slots/final/final.tsx
similarity index 64%
rename from src/course/02- lessons/01-Bronze/Slots/final/final.tsx
rename to src/course/02-lessons/01-Bronze/Slots/final/final.tsx
index b34f17c..35633b6 100644
--- a/src/course/02- lessons/01-Bronze/Slots/final/final.tsx	
+++ b/src/course/02-lessons/01-Bronze/Slots/final/final.tsx
@@ -2,15 +2,23 @@ import classNames from 'classnames';
 import { HTMLAttributes } from 'react';
 import { IconOne, IconTwo } from '../icons';
 
-interface IButton extends HTMLAttributes<HTMLButtonElement> {
+interface ButtonProps extends HTMLAttributes<HTMLButtonElement> {
   className?: string;
   iconLeft?: React.ReactNode;
   iconRight?: React.ReactNode;
   children: React.ReactNode | React.ReactNode[];
 }
 
-const buttonClasses =
-  'middle none center rounded-lg bg-blue-500 py-3 px-6 font-sans text-xs font-bold uppercase text-white shadow-md shadow-blue-500/20 transition-all hover:shadow-lg hover:shadow-blue-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none inline-flex items-center justify-center';
+const buttonClasses = [
+  'middle none center rounded-lg bg-blue-500 py-3 px-6',
+  'font-sans text-xs font-bold uppercase text-white',
+  'shadow-md shadow-blue-500/20 transition-all',
+  'hover:shadow-lg hover:shadow-blue-500/40',
+  'focus:opacity-[0.85] focus:shadow-none',
+  'active:opacity-[0.85] active:shadow-none',
+  'disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none',
+  'inline-flex items-center justify-center'
+].join(' ');
 
 export const Button = ({
   className,
@@ -18,7 +26,7 @@ export const Button = ({
   iconLeft,
   iconRight,
   ...rest
-}: IButton) => {
+}: ButtonProps) => {
   return (
     <button
       {...rest}
diff --git a/src/course/02- lessons/01-Bronze/Slots/icons/index.tsx b/src/course/02-lessons/01-Bronze/Slots/icons/index.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Slots/icons/index.tsx
rename to src/course/02-lessons/01-Bronze/Slots/icons/index.tsx
diff --git a/src/course/02- lessons/01-Bronze/Slots/lesson.mdx b/src/course/02-lessons/01-Bronze/Slots/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/Slots/lesson.mdx
rename to src/course/02-lessons/01-Bronze/Slots/lesson.mdx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/Form.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/Form.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/Form.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/Form.tsx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/PokemonOptions.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/PokemonOptions.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/PokemonOptions.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/PokemonOptions.tsx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/Screen.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/Screen.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/Screen.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/components/Screen.tsx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/exercise.stories.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/exercise.stories.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/exercise.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/exercise/exercise.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/exercise/exercise.tsx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/components/Form.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/components/Form.tsx
similarity index 71%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/components/Form.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/components/Form.tsx
index 7b56896..1f46ed8 100644
--- a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/components/Form.tsx	
+++ b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/components/Form.tsx
@@ -12,8 +12,8 @@ interface IForm {
 
 export const Form = ({ onPokemonTypesUpdate }: IForm) => {
   const [selectedPokemonTypes, setSelectedPokemonTypes] = useState<
-    string[]
-  >([]);
+    Set<string>
+  >(new Set());
 
   const { data, isLoading } = usePokedex<TPokemonTypesApiResponse[]>({
     path: 'types',
@@ -23,21 +23,19 @@ export const Form = ({ onPokemonTypesUpdate }: IForm) => {
   const handleSubmit = (event: FormEvent) => {
     event.preventDefault();
 
-    if (selectedPokemonTypes.length === 4) {
-      onPokemonTypesUpdate(selectedPokemonTypes);
+    if (selectedPokemonTypes.size === 4) {
+      onPokemonTypesUpdate(Array.from(selectedPokemonTypes));
     }
   };
 
   const onPokemonTypeSelection = (type: string) => {
-    if (selectedPokemonTypes.includes(type)) {
-      setSelectedPokemonTypes(
-        selectedPokemonTypes.filter(
-          (pokemonType) => pokemonType !== type
-        )
-      );
+    const newTypes = new Set(selectedPokemonTypes);
+    if (newTypes.has(type)) {
+      newTypes.delete(type);
     } else {
-      setSelectedPokemonTypes([...selectedPokemonTypes, type]);
+      newTypes.add(type);
     }
+    setSelectedPokemonTypes(newTypes);
   };
 
   return (
@@ -48,28 +46,17 @@ export const Form = ({ onPokemonTypesUpdate }: IForm) => {
       <form onSubmit={handleSubmit} noValidate>
         {isLoading && (
           <div className="grid grid-cols-2 md:grid-cols-6 gap-3">
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
-            <Skeleton height="h-[48px]" />
+            {Array.from({ length: 12 }, (_, i) => (
+              <Skeleton key={i} height="h-[48px]" />
+            ))}
           </div>
         )}
         <div className="grid grid-cols-2 md:grid-cols-6 gap-3">
           {data &&
             data.length &&
             data.map((pokemonType) => {
-              const isSelected =
-                selectedPokemonTypes.includes(pokemonType);
-              const hasSelectedAllOptions =
-                selectedPokemonTypes.length === 4;
+              const isSelected = selectedPokemonTypes.has(pokemonType);
+              const hasSelectedAllOptions = selectedPokemonTypes.size === 4;
 
               return (
                 <label
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/components/PokemonOptions.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/components/PokemonOptions.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/components/PokemonOptions.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/components/PokemonOptions.tsx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/components/Screen.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/components/Screen.tsx
similarity index 92%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/components/Screen.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/components/Screen.tsx
index 045650a..56a01b5 100644
--- a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/components/Screen.tsx	
+++ b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/components/Screen.tsx
@@ -16,17 +16,16 @@ export const Screen = () => {
   // 🪜 State Lifting: Setting up a function which will update the state instead of bleeding this complexity into the UI component.
   const onPokemonTypesUpdate = (types: string[]) => {
     const newlyUpdatedPokemon = { ...selectedPokemon };
+    const typesSet = new Set(types);
 
-    selectedPokemonTypes
-      .filter((type) => {
-        return !types.find((selectedType) => selectedType === type);
-      })
-      .forEach((type) => {
+    // Remove types that are no longer selected
+    selectedPokemonTypes.forEach((type) => {
+      if (!typesSet.has(type)) {
         delete newlyUpdatedPokemon[type];
-      });
+      }
+    });
 
     setSelectedPokemon(newlyUpdatedPokemon);
-
     setSelectedPokemonTypes(types);
   };
 
@@ -41,7 +40,7 @@ export const Screen = () => {
     <main className="h-screen p-6">
       <img
         src="/pokemon-battleground.webp"
-        alt="hello"
+        alt="Pokemon battleground background"
         className="fixed will-change-scroll left-0 right-0 top-0 bottom-0 z-0 h-full w-full object-cover"
       />
       <div className="fixed will-change-scroll left-0 right-0 top-0 bottom-0 z-10 h-full w-full bg-black opacity-25" />
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/final.stories.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/final.stories.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/final.stories.tsx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/final.tsx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/final.tsx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/final/final.tsx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/final/final.tsx
diff --git a/src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/lesson.mdx b/src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/01-Bronze/StateColocationVsStateLifting/lesson.mdx
rename to src/course/02-lessons/01-Bronze/StateColocationVsStateLifting/lesson.mdx
diff --git a/src/course/02- lessons/02-Silver/Compound/exercise/components/Accordion.tsx b/src/course/02-lessons/02-Silver/Compound/exercise/components/Accordion.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/exercise/components/Accordion.tsx
rename to src/course/02-lessons/02-Silver/Compound/exercise/components/Accordion.tsx
diff --git a/src/course/02- lessons/02-Silver/Compound/exercise/components/Accoridon.module.css b/src/course/02-lessons/02-Silver/Compound/exercise/components/Accoridon.module.css
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/exercise/components/Accoridon.module.css
rename to src/course/02-lessons/02-Silver/Compound/exercise/components/Accoridon.module.css
diff --git a/src/course/02- lessons/02-Silver/Compound/final/components/ChevronDown.tsx b/src/course/02-lessons/02-Silver/Compound/exercise/components/ChevronDown.tsx
similarity index 94%
rename from src/course/02- lessons/02-Silver/Compound/final/components/ChevronDown.tsx
rename to src/course/02-lessons/02-Silver/Compound/exercise/components/ChevronDown.tsx
index a2303f4..c3f2c35 100644
--- a/src/course/02- lessons/02-Silver/Compound/final/components/ChevronDown.tsx	
+++ b/src/course/02-lessons/02-Silver/Compound/exercise/components/ChevronDown.tsx
@@ -3,7 +3,7 @@ export const ChevronDown = () => (
     <g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
       <rect
         id="Rectangle"
-        fill-rule="nonzero"
+        fillRule="nonzero"
         x="0"
         y="0"
         width="24"
diff --git a/src/course/02- lessons/02-Silver/Compound/exercise/exercise.stories.tsx b/src/course/02-lessons/02-Silver/Compound/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/exercise/exercise.stories.tsx
rename to src/course/02-lessons/02-Silver/Compound/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/Compound/exercise/exercise.tsx b/src/course/02-lessons/02-Silver/Compound/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/exercise/exercise.tsx
rename to src/course/02-lessons/02-Silver/Compound/exercise/exercise.tsx
diff --git a/src/course/02- lessons/02-Silver/Compound/final/components/Accordion.tsx b/src/course/02-lessons/02-Silver/Compound/final/components/Accordion.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/final/components/Accordion.tsx
rename to src/course/02-lessons/02-Silver/Compound/final/components/Accordion.tsx
diff --git a/src/course/02- lessons/02-Silver/Compound/final/components/Accoridon.module.css b/src/course/02-lessons/02-Silver/Compound/final/components/Accoridon.module.css
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/final/components/Accoridon.module.css
rename to src/course/02-lessons/02-Silver/Compound/final/components/Accoridon.module.css
diff --git a/src/course/02- lessons/02-Silver/Compound/exercise/components/ChevronDown.tsx b/src/course/02-lessons/02-Silver/Compound/final/components/ChevronDown.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/exercise/components/ChevronDown.tsx
rename to src/course/02-lessons/02-Silver/Compound/final/components/ChevronDown.tsx
diff --git a/src/course/02- lessons/02-Silver/Compound/final/final.stories.tsx b/src/course/02-lessons/02-Silver/Compound/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/final/final.stories.tsx
rename to src/course/02-lessons/02-Silver/Compound/final/final.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/Compound/final/final.tsx b/src/course/02-lessons/02-Silver/Compound/final/final.tsx
similarity index 98%
rename from src/course/02- lessons/02-Silver/Compound/final/final.tsx
rename to src/course/02-lessons/02-Silver/Compound/final/final.tsx
index d5ed7ba..e2e5910 100644
--- a/src/course/02- lessons/02-Silver/Compound/final/final.tsx	
+++ b/src/course/02-lessons/02-Silver/Compound/final/final.tsx
@@ -6,7 +6,7 @@ export const Final = () => (
       id="accordion-one"
       title="Accordion Button One"
       onClick={() => {
-        console.log('TRACK');
+        // TODO: Replace with proper analytics tracking
       }}
     >
       <p>
diff --git a/src/course/02- lessons/02-Silver/Compound/lesson.mdx b/src/course/02-lessons/02-Silver/Compound/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Compound/lesson.mdx
rename to src/course/02-lessons/02-Silver/Compound/lesson.mdx
diff --git a/src/course/02- lessons/02-Silver/Controlled/exercise/exercise.stories.tsx b/src/course/02-lessons/02-Silver/Controlled/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Controlled/exercise/exercise.stories.tsx
rename to src/course/02-lessons/02-Silver/Controlled/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/Controlled/exercise/exercise.tsx b/src/course/02-lessons/02-Silver/Controlled/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Controlled/exercise/exercise.tsx
rename to src/course/02-lessons/02-Silver/Controlled/exercise/exercise.tsx
diff --git a/src/course/02- lessons/02-Silver/Controlled/final/final.stories.tsx b/src/course/02-lessons/02-Silver/Controlled/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Controlled/final/final.stories.tsx
rename to src/course/02-lessons/02-Silver/Controlled/final/final.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/Controlled/final/final.tsx b/src/course/02-lessons/02-Silver/Controlled/final/final.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Controlled/final/final.tsx
rename to src/course/02-lessons/02-Silver/Controlled/final/final.tsx
diff --git a/src/course/02- lessons/02-Silver/Controlled/lesson.mdx b/src/course/02-lessons/02-Silver/Controlled/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Controlled/lesson.mdx
rename to src/course/02-lessons/02-Silver/Controlled/lesson.mdx
diff --git a/src/course/02- lessons/02-Silver/PolymorphicComponents/exercise/exercise.stories.tsx b/src/course/02-lessons/02-Silver/PolymorphicComponents/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/PolymorphicComponents/exercise/exercise.stories.tsx
rename to src/course/02-lessons/02-Silver/PolymorphicComponents/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/PolymorphicComponents/exercise/exercise.tsx b/src/course/02-lessons/02-Silver/PolymorphicComponents/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/PolymorphicComponents/exercise/exercise.tsx
rename to src/course/02-lessons/02-Silver/PolymorphicComponents/exercise/exercise.tsx
diff --git a/src/course/02- lessons/02-Silver/PolymorphicComponents/final/final.stories.tsx b/src/course/02-lessons/02-Silver/PolymorphicComponents/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/PolymorphicComponents/final/final.stories.tsx
rename to src/course/02-lessons/02-Silver/PolymorphicComponents/final/final.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/PolymorphicComponents/final/final.tsx b/src/course/02-lessons/02-Silver/PolymorphicComponents/final/final.tsx
similarity index 84%
rename from src/course/02- lessons/02-Silver/PolymorphicComponents/final/final.tsx
rename to src/course/02-lessons/02-Silver/PolymorphicComponents/final/final.tsx
index 58c6cfa..c52e68e 100644
--- a/src/course/02- lessons/02-Silver/PolymorphicComponents/final/final.tsx	
+++ b/src/course/02-lessons/02-Silver/PolymorphicComponents/final/final.tsx
@@ -10,7 +10,7 @@ interface IHeading extends HTMLAttributes<HTMLHeadingElement> {
   as?: AllowedHTMLElements;
   size?: FontSizes;
   sizeMd?: FontSizes;
-  children?: React.ReactNode | React.ReactNode[];
+  children?: React.ReactNode;
 }
 
 const Heading = ({
@@ -36,17 +36,17 @@ const Heading = ({
   );
 
   const largeFontSize = useMemo(
-    () =>
-      [
-        'md:text-sm',
-        'md:text-md',
-        'md:text-lg',
-        'md:text-xl',
-        'md:text-2xl',
-        'md:text-3xl'
-      ].find((fontSizeClassName) =>
-        sizeMd ? fontSizeClassName.includes(sizeMd) : false
-      ),
+    () => {
+      const sizeMap: Record<FontSizes, string> = {
+        sm: 'md:text-sm',
+        md: 'md:text-md',
+        lg: 'md:text-lg',
+        xl: 'md:text-xl',
+        '2xl': 'md:text-2xl',
+        '3xl': 'md:text-3xl'
+      };
+      return sizeMd ? sizeMap[sizeMd] : undefined;
+    },
     [sizeMd]
   );
 
diff --git a/src/course/02- lessons/02-Silver/PolymorphicComponents/lesson.mdx b/src/course/02-lessons/02-Silver/PolymorphicComponents/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/02-Silver/PolymorphicComponents/lesson.mdx
rename to src/course/02-lessons/02-Silver/PolymorphicComponents/lesson.mdx
diff --git a/src/course/02- lessons/02-Silver/Portals/exercise/components/modal.tsx b/src/course/02-lessons/02-Silver/Portals/exercise/components/modal.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Portals/exercise/components/modal.tsx
rename to src/course/02-lessons/02-Silver/Portals/exercise/components/modal.tsx
diff --git a/src/course/02- lessons/02-Silver/Portals/exercise/exercise.stories.tsx b/src/course/02-lessons/02-Silver/Portals/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Portals/exercise/exercise.stories.tsx
rename to src/course/02-lessons/02-Silver/Portals/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/Portals/exercise/exercise.tsx b/src/course/02-lessons/02-Silver/Portals/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Portals/exercise/exercise.tsx
rename to src/course/02-lessons/02-Silver/Portals/exercise/exercise.tsx
diff --git a/src/course/02- lessons/02-Silver/Portals/final/components/modal.tsx b/src/course/02-lessons/02-Silver/Portals/final/components/modal.tsx
similarity index 88%
rename from src/course/02- lessons/02-Silver/Portals/final/components/modal.tsx
rename to src/course/02-lessons/02-Silver/Portals/final/components/modal.tsx
index bb42cff..7a1f8ad 100644
--- a/src/course/02- lessons/02-Silver/Portals/final/components/modal.tsx	
+++ b/src/course/02-lessons/02-Silver/Portals/final/components/modal.tsx
@@ -32,6 +32,16 @@ export const Modal = ({
     event.preventDefault();
   };
 
+  const handleKeyDown = (event: React.KeyboardEvent) => {
+    if (event.key === 'Enter' || event.key === ' ') {
+      onClose();
+    }
+  };
+
+  if (!document.body) {
+    return null;
+  }
+
   return createPortal(
     <div
       className={classNames(
@@ -40,6 +50,7 @@ export const Modal = ({
       )}
       role="button"
       onClick={onClose}
+      onKeyDown={handleKeyDown}
       tabIndex={0}
     >
       <div
diff --git a/src/course/02- lessons/02-Silver/Portals/final/final.stories.tsx b/src/course/02-lessons/02-Silver/Portals/final/final.stories.tsx
similarity index 95%
rename from src/course/02- lessons/02-Silver/Portals/final/final.stories.tsx
rename to src/course/02-lessons/02-Silver/Portals/final/final.stories.tsx
index 2902679..f908de1 100644
--- a/src/course/02- lessons/02-Silver/Portals/final/final.stories.tsx	
+++ b/src/course/02-lessons/02-Silver/Portals/final/final.stories.tsx
@@ -15,6 +15,6 @@ type Story = StoryObj<typeof Final>;
  * to learn more about using the canvasElement to query the DOM
  */
 export const Default: Story = {
-  play: async () => {},
+  play: () => {},
   args: {}
 };
diff --git a/src/course/02- lessons/02-Silver/Portals/final/final.tsx b/src/course/02-lessons/02-Silver/Portals/final/final.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Portals/final/final.tsx
rename to src/course/02-lessons/02-Silver/Portals/final/final.tsx
diff --git a/src/course/02- lessons/02-Silver/Portals/lesson.mdx b/src/course/02-lessons/02-Silver/Portals/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Portals/lesson.mdx
rename to src/course/02-lessons/02-Silver/Portals/lesson.mdx
diff --git a/src/course/02- lessons/02-Silver/Provider/exercise/Provider.tsx b/src/course/02-lessons/02-Silver/Provider/exercise/Provider.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Provider/exercise/Provider.tsx
rename to src/course/02-lessons/02-Silver/Provider/exercise/Provider.tsx
diff --git a/src/course/02- lessons/02-Silver/Provider/exercise/exercise.stories.tsx b/src/course/02-lessons/02-Silver/Provider/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Provider/exercise/exercise.stories.tsx
rename to src/course/02-lessons/02-Silver/Provider/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/Provider/exercise/exercise.tsx b/src/course/02-lessons/02-Silver/Provider/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Provider/exercise/exercise.tsx
rename to src/course/02-lessons/02-Silver/Provider/exercise/exercise.tsx
diff --git a/src/course/02- lessons/02-Silver/Provider/final/Provider.tsx b/src/course/02-lessons/02-Silver/Provider/final/Provider.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Provider/final/Provider.tsx
rename to src/course/02-lessons/02-Silver/Provider/final/Provider.tsx
diff --git a/src/course/02- lessons/02-Silver/Provider/final/final.stories.tsx b/src/course/02-lessons/02-Silver/Provider/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Provider/final/final.stories.tsx
rename to src/course/02-lessons/02-Silver/Provider/final/final.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/Provider/final/final.tsx b/src/course/02-lessons/02-Silver/Provider/final/final.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Provider/final/final.tsx
rename to src/course/02-lessons/02-Silver/Provider/final/final.tsx
diff --git a/src/course/02- lessons/02-Silver/Provider/lesson.mdx b/src/course/02-lessons/02-Silver/Provider/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/02-Silver/Provider/lesson.mdx
rename to src/course/02-lessons/02-Silver/Provider/lesson.mdx
diff --git a/src/course/02- lessons/02-Silver/RenderProps/exercise/exercise.stories.tsx b/src/course/02-lessons/02-Silver/RenderProps/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/RenderProps/exercise/exercise.stories.tsx
rename to src/course/02-lessons/02-Silver/RenderProps/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/RenderProps/exercise/exercise.tsx b/src/course/02-lessons/02-Silver/RenderProps/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/RenderProps/exercise/exercise.tsx
rename to src/course/02-lessons/02-Silver/RenderProps/exercise/exercise.tsx
diff --git a/src/course/02- lessons/02-Silver/RenderProps/final/final.stories.tsx b/src/course/02-lessons/02-Silver/RenderProps/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/RenderProps/final/final.stories.tsx
rename to src/course/02-lessons/02-Silver/RenderProps/final/final.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/RenderProps/final/final.tsx b/src/course/02-lessons/02-Silver/RenderProps/final/final.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/RenderProps/final/final.tsx
rename to src/course/02-lessons/02-Silver/RenderProps/final/final.tsx
diff --git a/src/course/02- lessons/02-Silver/RenderProps/lesson.mdx b/src/course/02-lessons/02-Silver/RenderProps/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/02-Silver/RenderProps/lesson.mdx
rename to src/course/02-lessons/02-Silver/RenderProps/lesson.mdx
diff --git a/src/course/02- lessons/02-Silver/StateReducer/exercise/exercise.stories.tsx b/src/course/02-lessons/02-Silver/StateReducer/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/StateReducer/exercise/exercise.stories.tsx
rename to src/course/02-lessons/02-Silver/StateReducer/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/StateReducer/exercise/exercise.tsx b/src/course/02-lessons/02-Silver/StateReducer/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/StateReducer/exercise/exercise.tsx
rename to src/course/02-lessons/02-Silver/StateReducer/exercise/exercise.tsx
diff --git a/src/course/02- lessons/02-Silver/StateReducer/final/final.stories.tsx b/src/course/02-lessons/02-Silver/StateReducer/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/02-Silver/StateReducer/final/final.stories.tsx
rename to src/course/02-lessons/02-Silver/StateReducer/final/final.stories.tsx
diff --git a/src/course/02- lessons/02-Silver/StateReducer/final/final.tsx b/src/course/02-lessons/02-Silver/StateReducer/final/final.tsx
similarity index 95%
rename from src/course/02- lessons/02-Silver/StateReducer/final/final.tsx
rename to src/course/02-lessons/02-Silver/StateReducer/final/final.tsx
index e34d56a..2f12d90 100644
--- a/src/course/02- lessons/02-Silver/StateReducer/final/final.tsx	
+++ b/src/course/02-lessons/02-Silver/StateReducer/final/final.tsx
@@ -27,10 +27,10 @@ const fetchPokemons = async (dispatch: Dispatch<IActionType>) => {
 
   try {
     await pokemonManager.fetchPokemons(12);
-    const pokemoneState = pokemonManager.getState();
+    const pokemonState = pokemonManager.getState();
     dispatch({
       type: ActionNames.RECEIVED_POKEMONS,
-      payload: pokemoneState.pokemons
+      payload: pokemonState.pokemons
     });
   } catch (e) {
     dispatch({ type: ActionNames.ERROR_POKEMONS });
@@ -115,8 +115,7 @@ export const Final = () => {
     <section>
       <h2 className="text-2xl font-bold mb-4">Pokemon Cards</h2>
       <div className="grid grid-cols-6 gap-6">
-        {pokemons &&
-          pokemons.length > 0 &&
+        {pokemons && pokemons.length > 0 &&
           pokemons.map((pokemon) => (
             <div key={pokemon.id}>
               <img
diff --git a/src/course/02- lessons/02-Silver/StateReducer/lesson.mdx b/src/course/02-lessons/02-Silver/StateReducer/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/02-Silver/StateReducer/lesson.mdx
rename to src/course/02-lessons/02-Silver/StateReducer/lesson.mdx
diff --git a/src/course/02- lessons/03-Gold/HigherOrderComponents/exercise/exercise.stories.tsx b/src/course/02-lessons/03-Gold/HigherOrderComponents/exercise/exercise.stories.tsx
similarity index 100%
rename from src/course/02- lessons/03-Gold/HigherOrderComponents/exercise/exercise.stories.tsx
rename to src/course/02-lessons/03-Gold/HigherOrderComponents/exercise/exercise.stories.tsx
diff --git a/src/course/02- lessons/03-Gold/HigherOrderComponents/exercise/exercise.tsx b/src/course/02-lessons/03-Gold/HigherOrderComponents/exercise/exercise.tsx
similarity index 100%
rename from src/course/02- lessons/03-Gold/HigherOrderComponents/exercise/exercise.tsx
rename to src/course/02-lessons/03-Gold/HigherOrderComponents/exercise/exercise.tsx
diff --git a/src/course/02- lessons/03-Gold/HigherOrderComponents/exercise/withPokemon.tsx b/src/course/02-lessons/03-Gold/HigherOrderComponents/exercise/withPokemon.tsx
similarity index 100%
rename from src/course/02- lessons/03-Gold/HigherOrderComponents/exercise/withPokemon.tsx
rename to src/course/02-lessons/03-Gold/HigherOrderComponents/exercise/withPokemon.tsx
diff --git a/src/course/02- lessons/03-Gold/HigherOrderComponents/final/final.stories.tsx b/src/course/02-lessons/03-Gold/HigherOrderComponents/final/final.stories.tsx
similarity index 100%
rename from src/course/02- lessons/03-Gold/HigherOrderComponents/final/final.stories.tsx
rename to src/course/02-lessons/03-Gold/HigherOrderComponents/final/final.stories.tsx
diff --git a/src/course/02- lessons/03-Gold/HigherOrderComponents/final/final.tsx b/src/course/02-lessons/03-Gold/HigherOrderComponents/final/final.tsx
similarity index 96%
rename from src/course/02- lessons/03-Gold/HigherOrderComponents/final/final.tsx
rename to src/course/02-lessons/03-Gold/HigherOrderComponents/final/final.tsx
index c3f4f0b..fa790fd 100644
--- a/src/course/02- lessons/03-Gold/HigherOrderComponents/final/final.tsx	
+++ b/src/course/02-lessons/03-Gold/HigherOrderComponents/final/final.tsx
@@ -61,7 +61,8 @@ const Component = ({
 
 export const Final = withPokemons<
   IMapStateToPropsComponentOneResponse,
-  IActionsComponentOneResponse
+  IActionsComponentOneResponse,
+  { title: string }
 >(
   mapStateToProps,
   mapActionsToProps
diff --git a/src/course/02- lessons/03-Gold/HigherOrderComponents/final/withPokemon.tsx b/src/course/02-lessons/03-Gold/HigherOrderComponents/final/withPokemon.tsx
similarity index 84%
rename from src/course/02- lessons/03-Gold/HigherOrderComponents/final/withPokemon.tsx
rename to src/course/02-lessons/03-Gold/HigherOrderComponents/final/withPokemon.tsx
index 6d60112..5095bca 100644
--- a/src/course/02- lessons/03-Gold/HigherOrderComponents/final/withPokemon.tsx	
+++ b/src/course/02-lessons/03-Gold/HigherOrderComponents/final/withPokemon.tsx
@@ -8,18 +8,21 @@ export interface IPokemonManagerActions {
   fetchPokemons: (total: number) => Promise<void>;
 }
 
-export const withPokemons = <TMapperResponse, TActionResponse>(
+export const withPokemons = <
+  TMapperResponse,
+  TActionResponse,
+  TProps
+>(
   mapper: (state: IPokemonManagerState) => TMapperResponse,
   actions: (actions: IPokemonManagerActions) => TActionResponse
 ) => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return (Component: React.FC<any>) => (props: any) => {
+  return (Component: any) => (props: TProps) => {
+    const pokemonManager = useMemo(() => new PokemonManager(), []);
     const [pokemonManagerState, setPokemonManagerState] = useState(
-      new PokemonManager().getState()
+      pokemonManager.getState()
     );
 
-    const pokemonManager = useMemo(() => new PokemonManager(), []);
-
     return (
       <Component
         {...props}
diff --git a/src/course/02- lessons/03-Gold/HigherOrderComponents/lesson.mdx b/src/course/02-lessons/03-Gold/HigherOrderComponents/lesson.mdx
similarity index 100%
rename from src/course/02- lessons/03-Gold/HigherOrderComponents/lesson.mdx
rename to src/course/02-lessons/03-Gold/HigherOrderComponents/lesson.mdx
diff --git a/src/shared/hooks/usePokedex.ts b/src/shared/hooks/usePokedex.ts
index 5b2062a..849aea4 100644
--- a/src/shared/hooks/usePokedex.ts
+++ b/src/shared/hooks/usePokedex.ts
@@ -67,13 +67,17 @@ export const usePokedex = <TResponse>({
         const response = await fetch(
           `https://api.pokemontcg.io/v2/${path}?${queryParams}`
         );
+        
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        
         const json = await response.json();
 
         dispatch({ type: 'SUCCESS', payload: json.data });
       } catch (e) {
         dispatch({ type: 'ERROR' });
-
-        console.error('Error');
+        console.error('Failed to fetch Pokemon data:', e instanceof Error ? e.message : 'Unknown error');
       }
     };
 
diff --git a/src/shared/modules/PokemonManager/PokemonManager.ts b/src/shared/modules/PokemonManager/PokemonManager.ts
index 9644beb..4c5c5b2 100644
--- a/src/shared/modules/PokemonManager/PokemonManager.ts
+++ b/src/shared/modules/PokemonManager/PokemonManager.ts
@@ -37,9 +37,9 @@ export class PokemonManager {
         })
       );
 
-      console.log('Pokémon fetched successfully:', this.pokemons);
+      console.log('Pokémon fetched successfully:', this.pokemons.length, 'items');
     } catch (error) {
-      console.error(error);
+      console.error('Failed to fetch Pokemon:', error instanceof Error ? error.message : 'Unknown error');
     }
   }