diff --git a/data/enemies/abad.ani b/data/enemies/abad.ani
index 6a493ee..fa53cc6 100644
--- a/data/enemies/abad.ani
+++ b/data/enemies/abad.ani
@@ -1,4 +1,3 @@
-frames_per_row=3
 frame_width=8
 frame_height=16
 
diff --git a/data/enemies/batman.ani b/data/enemies/batman.ani
index b6ce4bf..be54581 100644
--- a/data/enemies/batman.ani
+++ b/data/enemies/batman.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=8
 frame_height=16
 
diff --git a/data/enemies/bin.ani b/data/enemies/bin.ani
index e2fe6bb..0a89f16 100644
--- a/data/enemies/bin.ani
+++ b/data/enemies/bin.ani
@@ -1,4 +1,3 @@
-frames_per_row=5
 frame_width=16
 frame_height=8
 
diff --git a/data/enemies/bird.ani b/data/enemies/bird.ani
index b9685cb..5990e7d 100644
--- a/data/enemies/bird.ani
+++ b/data/enemies/bird.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/chip.ani b/data/enemies/chip.ani
index b6ce4bf..be54581 100644
--- a/data/enemies/chip.ani
+++ b/data/enemies/chip.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=8
 frame_height=16
 
diff --git a/data/enemies/diskette.ani b/data/enemies/diskette.ani
index b9685cb..5990e7d 100644
--- a/data/enemies/diskette.ani
+++ b/data/enemies/diskette.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/jailbattle_alien.ani b/data/enemies/jailbattle_alien.ani
index 4bbefb9..33cc519 100644
--- a/data/enemies/jailbattle_alien.ani
+++ b/data/enemies/jailbattle_alien.ani
@@ -1,4 +1,3 @@
-frames_per_row=2
 frame_width=13
 frame_height=15
 
diff --git a/data/enemies/jailbattle_human.ani b/data/enemies/jailbattle_human.ani
index 54848e2..da34467 100644
--- a/data/enemies/jailbattle_human.ani
+++ b/data/enemies/jailbattle_human.ani
@@ -1,4 +1,3 @@
-frames_per_row=2
 frame_width=11
 frame_height=13
 
diff --git a/data/enemies/jailer.ani b/data/enemies/jailer.ani
index 663c0ef..479efdc 100644
--- a/data/enemies/jailer.ani
+++ b/data/enemies/jailer.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/jailer2.ani b/data/enemies/jailer2.ani
index 44892ce..a9126cb 100644
--- a/data/enemies/jailer2.ani
+++ b/data/enemies/jailer2.ani
@@ -1,4 +1,3 @@
-frames_per_row=6
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/jailer3.ani b/data/enemies/jailer3.ani
index 663c0ef..479efdc 100644
--- a/data/enemies/jailer3.ani
+++ b/data/enemies/jailer3.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/matatunos.ani b/data/enemies/matatunos.ani
index 11ba1b9..3580193 100644
--- a/data/enemies/matatunos.ani
+++ b/data/enemies/matatunos.ani
@@ -1,4 +1,3 @@
-frames_per_row=6
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/paco.ani b/data/enemies/paco.ani
index b9685cb..5990e7d 100644
--- a/data/enemies/paco.ani
+++ b/data/enemies/paco.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/printer.ani b/data/enemies/printer.ani
index 98b9ec2..3943028 100644
--- a/data/enemies/printer.ani
+++ b/data/enemies/printer.ani
@@ -1,4 +1,3 @@
-frames_per_row=6
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/qvoid.ani b/data/enemies/qvoid.ani
index d7b2d89..2e937a7 100644
--- a/data/enemies/qvoid.ani
+++ b/data/enemies/qvoid.ani
@@ -1,4 +1,3 @@
-frames_per_row=8
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/sigmasua.ani b/data/enemies/sigmasua.ani
index b9685cb..5990e7d 100644
--- a/data/enemies/sigmasua.ani
+++ b/data/enemies/sigmasua.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/tuno.ani b/data/enemies/tuno.ani
index c4b6974..e040a56 100644
--- a/data/enemies/tuno.ani
+++ b/data/enemies/tuno.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=16
 frame_height=16
 
diff --git a/data/enemies/wave.ani b/data/enemies/wave.ani
index 77655e0..6b0d280 100644
--- a/data/enemies/wave.ani
+++ b/data/enemies/wave.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=8
 frame_height=8
 
diff --git a/data/enemies/wave_v.ani b/data/enemies/wave_v.ani
index 85a3143..bce7872 100644
--- a/data/enemies/wave_v.ani
+++ b/data/enemies/wave_v.ani
@@ -1,4 +1,3 @@
-frames_per_row=6
 frame_width=8
 frame_height=8
 
diff --git a/data/player/player.ani b/data/player/player.ani
index 897504f..09ff274 100644
--- a/data/player/player.ani
+++ b/data/player/player.ani
@@ -1,4 +1,3 @@
-frames_per_row=4
 frame_width=8
 frame_height=16
 
diff --git a/data/player/player2.ani b/data/player/player2.ani
index 35dc70d..3eba37a 100644
--- a/data/player/player2.ani
+++ b/data/player/player2.ani
@@ -1,4 +1,3 @@
-frames_per_row=8
 frame_width=8
 frame_height=16
 
diff --git a/source/animatedsprite.cpp b/source/animatedsprite.cpp
index 7799591..26f567f 100644
--- a/source/animatedsprite.cpp
+++ b/source/animatedsprite.cpp
@@ -29,13 +29,7 @@ AnimatedSprite::~AnimatedSprite()
 int AnimatedSprite::getIndex(std::string name)
 {
 	int index = -1;
-	/*for (int i = 0; i < (int)animation.size(); i++)
-	{
-		if (animation[i].name == name)
-		{
-			index = i;
-		}
-	}*/
+
 	for (auto a : animation)
 	{
 		index++;
@@ -46,7 +40,6 @@ int AnimatedSprite::getIndex(std::string name)
 	}
 
 	printf("** Warning: could not find \"%s\" animation\n", name.c_str());
-	index = 0;
 
 	return -1;
 }
@@ -230,17 +223,23 @@ bool AnimatedSprite::load(std::string filePath)
 					{
 						frames_per_row = std::stoi(line.substr(pos + 1, line.length()));
 					}
-					
+
 					else if (line.substr(0, pos) == "frame_width")
 					{
 						frame_width = std::stoi(line.substr(pos + 1, line.length()));
+
+						// Normaliza valores
+						if (frames_per_row == 0)
+						{
+							frames_per_row = texture->getWidth() / frame_width;
+						}
 					}
-					
+
 					else if (line.substr(0, pos) == "frame_height")
 					{
 						frame_height = std::stoi(line.substr(pos + 1, line.length()));
 					}
-					
+
 					else
 					{
 						printf("Warning: file %s, unknown parameter \"%s\"\n", filename.c_str(), line.substr(0, pos).c_str());
@@ -261,12 +260,6 @@ bool AnimatedSprite::load(std::string filePath)
 		success = false;
 	}
 
-	// Normaliza valores
-	if (frames_per_row == 0)
-	{
-		frames_per_row = texture->getWidth() / frame_width;
-	}
-
 	// Pone un valor por defecto
 	setPos({0, 0, frame_width, frame_height});
 
diff --git a/source/enemy.cpp b/source/enemy.cpp
index 6efcd9e..243e1db 100644
--- a/source/enemy.cpp
+++ b/source/enemy.cpp
@@ -35,6 +35,9 @@ Enemy::Enemy(enemy_t enemy)
     }
 
     collider = getRect();
+
+    // Coloca un frame al azar
+    sprite->setCurrentFrame(rand() % 4);
 }
 
 // Destructor
@@ -56,7 +59,6 @@ void Enemy::render()
 void Enemy::update()
 {
     sprite->update();
-    // sprite->animate();
     checkPath();
     collider = getRect();
 }
diff --git a/source/main.cpp b/source/main.cpp
index 17ca04d..af5c927 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -13,14 +13,14 @@ int main(int argc, char *args[])
 	printf("Starting the game...\n\n");
 
 	// Crea el objeto Director
-	Director *mDirector = new Director(args[0]);
+	Director *director = new Director(args[0]);
 
 	// Bucle principal
-	mDirector->run();
+	director->run();
 
 	// Destruye el objeto Director
-	delete mDirector;
-	mDirector = nullptr;
+	delete director;
+	director = nullptr;
 
 	printf("\nShutting down the game...\n");