diff --git a/src/lib/as/as_winnow.c b/src/lib/as/as_winnow.c
index 839b19b4..9ade2e1c 100644
--- a/src/lib/as/as_winnow.c
+++ b/src/lib/as/as_winnow.c
@@ -40,7 +40,6 @@ static struct as_node *as_newnode(struct as_node *backp, struct as_coord c,
  *			old node to the subsumed list.
  *			If not, ignore this neighbor.
  *		If this neighbor isn't in the queue, add it.
- *
  */
 int
 as_winnow(struct as_data *adp, struct as_coord *coords, int ncoords)
diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c
index fd550bc0..c7999c74 100644
--- a/src/lib/commands/spy.c
+++ b/src/lib/commands/spy.c
@@ -50,7 +50,6 @@
 
 /*
  * format:  spy <SECTS>
- *
  */
 
 static int check(coord *table, int *len, coord x, coord y);
diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c
index e85e76ec..392869df 100644
--- a/src/lib/common/wantupd.c
+++ b/src/lib/common/wantupd.c
@@ -257,7 +257,6 @@ next_update_time(time_t *now, time_t *tim, time_t *delta)
 	*delta = (blitz_time * 60) - (*now % (blitz_time * 60));
 	*tim = *now + *delta;
 	break;
-
     case UDP_NOREG:
     default:
 	regular_update_time(now, tim, delta);
diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c
index 3aabec10..1f420fa7 100644
--- a/src/lib/empthread/ntthread.c
+++ b/src/lib/empthread/ntthread.c
@@ -42,7 +42,6 @@
  * WIN32 has a full pre-emptive threading environment.  But Empire can
  * not handle pre-emptive threading.  Thus, we will use the threads,
  * but limit the preemption using a Mutex semaphore.
- *
  */
 
 #include <config.h>
@@ -184,7 +183,6 @@ loc_debug(const char *pszFmt, ...)
 
 /************************
  * loc_FreeThreadInfo
- *
  */
 static void
 loc_FreeThreadInfo(empth_t *pThread)
diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index f60077a6..ac0b7e82 100644
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -107,7 +107,7 @@ struct empfile empfile[] = {
 
     /*
      * Keep in mind that player command arguments are matched against
-     * member name; no whitespace please.
+     * values of member name: no whitespace there, please.
      */
 
     /* Dynamic game data */
diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c
index 9c8bc68b..41d13932 100644
--- a/src/lib/subs/control.c
+++ b/src/lib/subs/control.c
@@ -47,7 +47,6 @@
 
 /*
  * Does the player->owner have military control of this sector?
- *
  */
 int
 military_control(struct sctstr *sp)
diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index ea1a711f..016152c8 100644
--- a/src/lib/subs/list.c
+++ b/src/lib/subs/list.c
@@ -282,7 +282,6 @@ num_shipsatxy(coord x, coord y, int wantflags, int nowantflags)
 
 /*
  * is p a list of ships/planes/units?
- *
  */
 
 int
diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 6c20f75e..3982b982 100644
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -174,7 +174,6 @@ only_subs(struct emp_qelem *list)
 
 /*
  *  Interdict ships & land units
- *
  */
 int
 unit_interdict(coord x, coord y, natid victim, char *s, int hardtarget,
@@ -1139,7 +1138,6 @@ mission_pln_sel(struct emp_qelem *list, int wantflags, int nowantflags,
 
 /*
  * Arm only the planes at x,y
- *
  */
 static int
 mission_pln_arm(struct emp_qelem *list, coord x, coord y, int dist,
diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index b770ee2d..8795d045 100644
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -64,7 +64,6 @@ static int s_commod(int, int, int, i_type, int, int);
  * 		 unit will then call resupply, taking more time)
  *
  * May want to put code to resupply with SAMs here, later --ts
- *
  */
 
 void
diff --git a/src/server/main.c b/src/server/main.c
index fbafe105..3069a8ca 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -142,17 +142,13 @@ main(int argc, char **argv)
 #if defined(_WIN32)
 	case 'I':
 	    service_name = optarg;
-	    /*
-	     * fall out
-	     */
+	    /* fall through */
 	case 'i':
 	    install_service_set++;
 	    break;
 	case 'R':
 	    service_name = optarg;
-	    /*
-	     * fall out
-	     */
+	    /* fall through */
 	case 'r':
 	    remove_service_set++;
 	    break;