diff --git a/src/battle/ai.c b/src/battle/ai.c
index 6190082..a66feee 100644
--- a/src/battle/ai.c
+++ b/src/battle/ai.c
@@ -401,26 +401,19 @@ void doCivilianAI(void)
 
 static int nearExtractionPoint(void)
 {
-	Entity *e, **candidates;
 	int i;
+	Entity *e, **candidates;
 	
 	candidates = getAllEntsWithin(self->x - 500, self->y - 500, 1000, 1000, self);
-	i = 0;
-	
-	e = candidates[i];
 	
 	self->target = NULL;
 	
-	while (e)
+	for (i = 0, e = candidates[i] ; e != NULL ; i++, e = candidates[i])
 	{
 		if (e->type == ET_EXTRACTION_POINT)
 		{
 			self->target = e;
 		}
-		
-		i++;
-		
-		e = (i < MAX_GRID_CANDIDATES) ? candidates[i] : NULL;
 	}
 	
 	if (self->target != NULL)
diff --git a/src/battle/bullets.c b/src/battle/bullets.c
index 16689b4..58788ab 100644
--- a/src/battle/bullets.c
+++ b/src/battle/bullets.c
@@ -97,11 +97,8 @@ static void checkCollisions(Bullet *b)
 	int i;
 	
 	candidates = getAllEntsWithin(b->x, b->y, b->w, b->h, NULL);
-	i = 0;
 	
-	e = candidates[i];
-	
-	while (e)
+	for (i = 0, e = candidates[i] ; e != NULL ; i++, e = candidates[i])
 	{
 		if (e->type == ET_FIGHTER)
 		{
@@ -139,10 +136,6 @@ static void checkCollisions(Bullet *b)
 				return;
 			}
 		}
-		
-		i++;
-		
-		e = (i < MAX_GRID_CANDIDATES) ? candidates[i] : NULL;
 	}
 }
 
diff --git a/src/battle/entities.c b/src/battle/entities.c
index 3a2f775..5d6b21d 100644
--- a/src/battle/entities.c
+++ b/src/battle/entities.c
@@ -204,22 +204,14 @@ void drawEntities(void)
 
 	candidates = getAllEntsWithin(battle.camera.x, battle.camera.y, SCREEN_WIDTH, SCREEN_HEIGHT, NULL);
 	
-	i = 0;
-	e = candidates[i];
-	
-	while (e)
+	for (i = 0, e = candidates[i] ; e != NULL ; i++, e = candidates[i])
 	{
-		i++;
 		
-		e = (i < MAX_GRID_CANDIDATES) ? candidates[i] : NULL;
 	}
 	
 	qsort(candidates, i, sizeof(Entity*), drawComparator);
 	
-	i = 0;
-	e = candidates[i];
-	
-	while (e)
+	for (i = 0, e = candidates[i] ; e != NULL ; i++, e = candidates[i])
 	{
 		if (e->active)
 		{
@@ -234,10 +226,6 @@ void drawEntities(void)
 					break;
 			}
 		}
-		
-		i++;
-		
-		e = (i < MAX_GRID_CANDIDATES) ? candidates[i] : NULL;
 	}
 }
 
diff --git a/src/battle/fighters.c b/src/battle/fighters.c
index be9fd47..9960462 100644
--- a/src/battle/fighters.c
+++ b/src/battle/fighters.c
@@ -274,10 +274,8 @@ static void separate(void)
 	force = 0;
 	
 	candidates = getAllEntsWithin(self->x, self->y, self->w, self->h, self);
-	i = 0;
-	e = candidates[i];
 	
-	while (e)
+	for (i = 0, e = candidates[i] ; e != NULL ; i++, e = candidates[i])
 	{
 		if (e->type == ET_FIGHTER)
 		{
@@ -294,10 +292,6 @@ static void separate(void)
 				count++;
 			}
 		}
-		
-		i++;
-		
-		e = (i < MAX_GRID_CANDIDATES) ? candidates[i] : NULL;
 	}
 	
 	if (count > 0)