diff --git a/.DS_Store b/.DS_Store
index 60ff6d3..552b75a 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/assets/.DS_Store b/assets/.DS_Store
index 6b1b512..341e4c3 100644
Binary files a/assets/.DS_Store and b/assets/.DS_Store differ
diff --git a/assets/chef_cat_ani.png b/assets/cat/chef_cat_ani.png
similarity index 100%
rename from assets/chef_cat_ani.png
rename to assets/cat/chef_cat_ani.png
diff --git a/assets/double_yarn_cat_ani.png b/assets/cat/double_yarn_cat_ani.png
similarity index 100%
rename from assets/double_yarn_cat_ani.png
rename to assets/cat/double_yarn_cat_ani.png
diff --git a/assets/ice_cat_ani.png b/assets/cat/ice_cat_ani.png
similarity index 100%
rename from assets/ice_cat_ani.png
rename to assets/cat/ice_cat_ani.png
diff --git a/assets/single_yarn_cat_ani.png b/assets/cat/single_yarn_cat_ani.png
similarity index 100%
rename from assets/single_yarn_cat_ani.png
rename to assets/cat/single_yarn_cat_ani.png
diff --git a/assets/sleepy_cat_ani.png b/assets/cat/sleepy_cat_ani.png
similarity index 100%
rename from assets/sleepy_cat_ani.png
rename to assets/cat/sleepy_cat_ani.png
diff --git a/assets/mouse.png b/assets/mouse.png
deleted file mode 100644
index 901f514..0000000
Binary files a/assets/mouse.png and /dev/null differ
diff --git a/assets/single_yarn_cat.png b/assets/single_yarn_cat.png
deleted file mode 100644
index 56482c5..0000000
Binary files a/assets/single_yarn_cat.png and /dev/null differ
diff --git a/classes/Cat.js b/classes/Cat.js
index e1fdc8a..4a73ede 100644
--- a/classes/Cat.js
+++ b/classes/Cat.js
@@ -209,7 +209,6 @@ class DoubleYarnCat extends Cat {
         else this.switchToIdle();
 
         if (this.active && (millis() - this.lastShot > 3000)) {
-            // TODO: check on the offset again
             for (let offset of [0, 0.3 * gameFrame.tileWidth]) {
                 let yarnX = this.x + gameFrame.tileWidth / 2 + offset;
                 let yarnY = this.y;
diff --git a/classes/Mouse.js b/classes/Mouse.js
index 8101b5f..53ab31a 100644
--- a/classes/Mouse.js
+++ b/classes/Mouse.js
@@ -19,7 +19,7 @@ class Mouse {
      * @param {number} speed - The speed of the mouse's movement
      * @param {number} HP - The health points of the mouse
      * @param {number} AP - The attack power of the mouse
-     * @param {object} spriteSheet - The sprite sheet for the mouse animation
+     * @param {p5.SpriteSheet} spriteSheet - The sprite sheet for the mouse animation
      * @param {number} size - The size of the mouse sprite
      */
     constructor(row, speed, HP, AP, spriteSheet, size) {
@@ -111,8 +111,8 @@ class Mouse {
  * Basic type of mouse
  */
 class BasicMouse extends Mouse {
-    constructor(x, y, row) {
-        super(x, y, row, -0.15, 100, 20, mouseAnimation.basicMouse, gameFrame.tileWidth);
+    constructor(row) {
+        super(row, -0.15, 100, 20, mouseAnimation.basicMouse, gameFrame.tileWidth);
     }
 }
 
@@ -121,8 +121,8 @@ class BasicMouse extends Mouse {
  * Has a higher HP compared to BasicMouse
  */
 class HelmetMouse extends Mouse {
-    constructor(x, y, row) {
-        super(x, y, row, -0.15, 150, 20, mouseAnimation.helmetMouse, gameFrame.tileWidth);
+    constructor(row) {
+        super(row, -0.15, 150, 20, mouseAnimation.helmetMouse, gameFrame.tileWidth);
     }
 }
 
@@ -131,8 +131,8 @@ class HelmetMouse extends Mouse {
  * Has a higher speed compared to Basic Mouse
  */
 class SportyMouse extends Mouse {
-    constructor(x, y, row) {
-        super(x, y, row, -0.3, 85, 20, mouseAnimation.sportyMouse, gameFrame.tileWidth);
+    constructor(row) {
+        super(row, -0.3, 85, 20, mouseAnimation.sportyMouse, gameFrame.tileWidth);
     }
 }
 
@@ -142,8 +142,8 @@ class SportyMouse extends Mouse {
  * Has a slower speed compared to the other types
  */
 class BossMouse extends Mouse {
-    constructor(x, y, row) {
-        super(x, y, row, -0.05, 1000, 50, mouseAnimation.bossMouse, 3 * gameFrame.tileWidth);
+    constructor(row) {
+        super(row, -0.05, 1000, 50, mouseAnimation.bossMouse, 3 * gameFrame.tileWidth);
     }
 }
 
diff --git a/sketch.js b/sketch.js
index 4935c75..7896b68 100644
--- a/sketch.js
+++ b/sketch.js
@@ -36,11 +36,11 @@ function preload() {
     catImages.sleepyCat = loadImage('assets/sleepy_cat_icon.png');
     catImages.iceCat = loadImage('assets/ice_cat_icon.png');
 
-    catAnimation.chefCat = loadImage('assets/chef_cat_ani.png');
-    catAnimation.singleYarnCat = loadImage('assets/single_yarn_cat_ani.png');
-    catAnimation.doubleYarnCat = loadImage('assets/double_yarn_cat_ani.png');
-    catAnimation.sleepyCat = loadImage('assets/sleepy_cat_ani.png');
-    catAnimation.iceCat = loadImage('assets/ice_cat_ani.png');
+    catAnimation.chefCat = loadImage('assets/cat/chef_cat_ani.png');
+    catAnimation.singleYarnCat = loadImage('assets/cat/single_yarn_cat_ani.png');
+    catAnimation.doubleYarnCat = loadImage('assets/cat/double_yarn_cat_ani.png');
+    catAnimation.sleepyCat = loadImage('assets/cat/sleepy_cat_ani.png');
+    catAnimation.iceCat = loadImage('assets/cat/ice_cat_ani.png');
 
     mouseAnimation.basicMouse = loadImage('assets/mouse/basic_mouse_ani.png');
     mouseAnimation.helmetMouse = loadImage('assets/mouse/helmet_mouse_ani.png');