diff --git a/libs/video/renderer/r_cvar.c b/libs/video/renderer/r_cvar.c
index 57c2a5118..0c538e261 100644
--- a/libs/video/renderer/r_cvar.c
+++ b/libs/video/renderer/r_cvar.c
@@ -126,6 +126,7 @@ cvar_t     *scr_viewsize;
 
 unsigned char lighthalf_v[3] = {255, 255, 255};
 
+
 void
 R_Init_Cvars (void)
 {
diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index 17664290d..ef17e09ff 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -41,11 +41,8 @@ efrag_t    *r_free_efrags;
 // FIXME: put this on hunk?
 efrag_t     r_efrags[MAX_EFRAGS];
 
-
-//===========================================================================
-
 /*
-					ENTITY FRAGMENT FUNCTIONS
+  ENTITY FRAGMENT FUNCTIONS
 */
 
 efrag_t   **lastlink;
@@ -56,9 +53,9 @@ entity_t   *r_addent;
 
 
 /*
-	R_RemoveEfrags
+  R_RemoveEfrags
 
-	Call when removing an object from the world or moving it to another position
+  Call when removing an object from the world or moving it to another position
 */
 void
 R_RemoveEfrags (entity_t *ent)
@@ -91,9 +88,6 @@ R_RemoveEfrags (entity_t *ent)
 	ent->efrag = NULL;
 }
 
-/*
-	R_SplitEntityOnNode
-*/
 void
 R_SplitEntityOnNode (mnode_t *node)
 {
@@ -105,15 +99,15 @@ R_SplitEntityOnNode (mnode_t *node)
 	if (node->contents == CONTENTS_SOLID) {
 		return;
 	}
-// add an efrag if the node is a leaf
 
+	// add an efrag if the node is a leaf
 	if (node->contents < 0) {
 		if (!r_pefragtopnode)
 			r_pefragtopnode = node;
 
 		leaf = (mleaf_t *) node;
 
-// grab an efrag off the free list
+		// grab an efrag off the free list
 		ef = r_free_efrags;
 		if (!ef) {
 			Con_Printf ("Too many efrags!\n");
@@ -123,20 +117,20 @@ R_SplitEntityOnNode (mnode_t *node)
 
 		ef->entity = r_addent;
 
-// add the entity link  
+		// add the entity link  
 		*lastlink = ef;
 		lastlink = &ef->entnext;
 		ef->entnext = NULL;
 
-// set the leaf links
+		// set the leaf links
 		ef->leaf = leaf;
 		ef->leafnext = leaf->efrags;
 		leaf->efrags = ef;
 
 		return;
 	}
-// NODE_MIXED
 
+	// NODE_MIXED
 	splitplane = node->plane;
 	sides = BOX_ON_PLANE_SIDE (r_emins, r_emaxs, splitplane);
 
@@ -146,7 +140,7 @@ R_SplitEntityOnNode (mnode_t *node)
 		if (!r_pefragtopnode)
 			r_pefragtopnode = node;
 	}
-// recurse down the contacted sides
+	// recurse down the contacted sides
 	if (sides & 1)
 		R_SplitEntityOnNode (node->children[0]);
 
@@ -154,10 +148,6 @@ R_SplitEntityOnNode (mnode_t *node)
 		R_SplitEntityOnNode (node->children[1]);
 }
 
-
-/*
-	R_SplitEntityOnNode2
-*/
 void
 R_SplitEntityOnNode2 (mnode_t *node)
 {
@@ -182,17 +172,14 @@ R_SplitEntityOnNode2 (mnode_t *node)
 		r_pefragtopnode = node;
 		return;
 	}
-// not split yet; recurse down the contacted side
+
+	// not split yet; recurse down the contacted side
 	if (sides & 1)
 		R_SplitEntityOnNode2 (node->children[0]);
 	else
 		R_SplitEntityOnNode2 (node->children[1]);
 }
 
-
-/*
-	R_AddEfrags
-*/
 void
 R_AddEfrags (entity_t *ent)
 {
@@ -222,11 +209,10 @@ R_AddEfrags (entity_t *ent)
 	ent->topnode = r_pefragtopnode;
 }
 
-
 /*
 	R_StoreEfrags
 
-	// FIXME: a lot of this goes away with edge-based
+	FIXME: a lot of this goes away with edge-based
 */
 void
 R_StoreEfrags (efrag_t **ppefrag)
diff --git a/libs/video/renderer/r_ent.c b/libs/video/renderer/r_ent.c
index 5b9ab1011..99ce68c5d 100644
--- a/libs/video/renderer/r_ent.c
+++ b/libs/video/renderer/r_ent.c
@@ -42,16 +42,17 @@
 #include "QF/console.h"
 #include "QF/model.h"
 #include "QF/msg.h"
+#include "QF/render.h"
 #include "QF/sound.h"
 #include "QF/sys.h"
 
 #include "r_dynamic.h"
-#include "QF/render.h"
 
 #define     MAX_VISEDICTS   256
 int         r_numvisedicts;
 entity_t   *r_visedicts[MAX_VISEDICTS];
 
+
 void
 R_Ents_Init (void)
 {
diff --git a/libs/video/renderer/r_graph.c b/libs/video/renderer/r_graph.c
index 8d115a099..2c598f586 100644
--- a/libs/video/renderer/r_graph.c
+++ b/libs/video/renderer/r_graph.c
@@ -42,6 +42,7 @@
 extern float mouse_x, mouse_y;
 int          graphval;
 
+
 /*
 	R_TimeGraph
 
@@ -59,11 +60,9 @@ R_TimeGraph (void)
 
 	r_time2 = Sys_DoubleTime ();
 
-//	a = (r_time2 - r_time1) / 0.01;
 	a = graphval;
 
 	r_timings[timex] = a;
-//	a = timex;
 
 	l = MAX_TIMINGS;
 	if (l > r_refdef.vrect.width)
diff --git a/libs/video/renderer/r_main.c b/libs/video/renderer/r_main.c
index c54ca04b1..c8ada9c33 100644
--- a/libs/video/renderer/r_main.c
+++ b/libs/video/renderer/r_main.c
@@ -31,6 +31,7 @@ float       r_time1;
 
 fire_t r_fires[MAX_FIRES];
 
+
 dlight_t *
 R_AllocDlight (int key)
 {
@@ -66,7 +67,6 @@ R_AllocDlight (int key)
 	return dl;
 }
 
-
 void
 R_DecayLights (double frametime)
 {
@@ -84,7 +84,6 @@ R_DecayLights (double frametime)
 	}
 }
 
-
 void
 R_ClearDlights (void)
 {
@@ -129,7 +128,6 @@ R_AddFire (vec3_t start, vec3_t end, entity_t *ent)
 	}
 }
 
-
 /*
 	R_AllocFire
 
diff --git a/libs/video/renderer/r_part.c b/libs/video/renderer/r_part.c
index a5359b152..9d881ca6b 100644
--- a/libs/video/renderer/r_part.c
+++ b/libs/video/renderer/r_part.c
@@ -32,10 +32,10 @@
 #endif
 
 #include "QF/qargs.h"
-#include "compat.h"
 #include "QF/console.h"
 #include "QF/render.h"
 
+#include "compat.h"
 #include "r_local.h"
 
 particle_t *active_particles, *free_particles;
@@ -88,7 +88,6 @@ R_DarkFieldParticles (entity_t *ent)
 }
 #endif
 
-
 #define NUMVERTEXNORMALS	162
 extern float r_avertexnormals[NUMVERTEXNORMALS][3];
 static vec3_t      avelocities[NUMVERTEXNORMALS];
@@ -113,7 +112,6 @@ R_EntityParticles (entity_t *ent)
 			avelocities[0][i] = (rand () & 255) * 0.01;
 	}
 
-
 	for (i = 0; i < NUMVERTEXNORMALS; i++) {
 		angle = r_realtime * avelocities[i][0];
 		sy = sin (angle);