diff --git a/server.c b/server.c
index ee43783..fee324d 100644
--- a/server.c
+++ b/server.c
@@ -6,7 +6,6 @@
  * @brief Server for OSUE exercise 1B `Battleship'.
  */
 
-// IO, C standard library, POSIX API, data types:
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -15,15 +14,12 @@
 #include <string.h>
 #include <limits.h>
 
-// Assertions, errors, signals:
 #include <assert.h>
 #include <errno.h>
 #include <signal.h>
 
-// Time:
 #include <time.h>
 
-// Sockets, TCP, ... :
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -31,11 +27,11 @@
 
 #include "common.h"
 
-static const char *port = DEFAULT_PORT; // the port to bind to
+static const char *port = DEFAULT_PORT;
 
-static struct addrinfo *ai = NULL;      // stores address information
-static int sockfd = -1;                 // socket file descriptor
-static int connfd = -1;                 // connection file descriptor
+static struct addrinfo *ai = NULL;
+static int sockfd = -1;
+static int connfd = -1;
 static char* pname;
 
 struct Ship {