Index: uspace/app/netecho/netecho.c
===================================================================
--- uspace/app/netecho/netecho.c	(revision 631ee0c5ac25e59640d806b55305f80f6814c851)
+++ uspace/app/netecho/netecho.c	(revision 0349a10d68946c5f020c2113e686fbfba191f79b)
@@ -117,5 +117,5 @@
 	int rc;
 
-	// parse the command line arguments
+	/* Parse command line arguments */
 	for (index = 1; index < argc; ++ index) {
 		if (argv[index][0] == '-') {
@@ -166,5 +166,5 @@
 				verbose = 1;
 				break;
-			// long options with the double minus sign ('-')
+			/* Long options with double dash */
 			case '-':
 				if (str_lcmp(argv[index] + 2, "backlog=", 6) == 0) {
@@ -219,10 +219,11 @@
 	}
 
-	// check the buffer size
+	/* Check buffer size */
 	if (size <= 0) {
 		fprintf(stderr, "Receive size too small (%zu). Using 1024 bytes instead.\n", size);
 		size = 1024;
 	}
-	// size plus the terminating null (\0)
+
+	/* size plus the terminating null character. */
 	data = (char *) malloc(size + 1);
 	if (!data) {
@@ -231,8 +232,8 @@
 	}
 
-	// set the reply size if set
+	/* Set the reply size if set */
 	reply_length = reply ? str_length(reply) : 0;
 
-	// prepare the address buffer
+	/* Prepare the address buffer */
 	bzero(address_data, max_length);
 	switch (family) {
@@ -252,5 +253,5 @@
 	}
 
-	// get a listening socket
+	/* Get a listening socket */
 	listening_id = socket(family, type, 0);
 	if (listening_id < 0) {
@@ -259,12 +260,13 @@
 	}
 
-	// if the stream socket is used
+	/* if the stream socket is used */
 	if (type == SOCK_STREAM) {
-		// check the backlog
+		/* Check backlog size */
 		if (backlog <= 0) {
 			fprintf(stderr, "Accepted sockets queue size too small (%zu). Using 3 instead.\n", size);
 			backlog = 3;
 		}
-		// set the backlog
+
+		/* Set the backlog */
 		rc = listen(listening_id, backlog);
 		if (rc != EOK) {
@@ -274,5 +276,5 @@
 	}
 
-	// bind the listenning socket
+	/* Bind the listening socket */
 	rc = bind(listening_id, address, addrlen);
 	if (rc != EOK) {
@@ -286,11 +288,13 @@
 	socket_id = listening_id;
 
-	// do count times
-	// or indefinitely if set to a negative value
+	/*
+	 * do count times
+	 * or indefinitely if set to a negative value
+	 */
 	while (count) {
 
 		addrlen = max_length;
 		if (type == SOCK_STREAM) {
-			// acceept a socket if the stream socket is used
+			/* Accept a socket if the stream socket is used */
 			socket_id = accept(listening_id, address, &addrlen);
 			if (socket_id <= 0) {
@@ -302,8 +306,8 @@
 		}
 
-		// if the datagram socket is used or the stream socked was accepted
+		/* if the datagram socket is used or the stream socked was accepted */
 		if (socket_id > 0) {
 
-			// receive an echo request
+			/* Receive a message to echo */
 			value = recvfrom(socket_id, data, size, 0, address, &addrlen);
 			if (value < 0) {
@@ -312,7 +316,7 @@
 				length = (size_t) value;
 				if (verbose) {
-					// print the header
-
-					// get the source port and prepare the address buffer
+					/* Print the header */
+
+					/* Get the source port and prepare the address buffer */
 					address_start = NULL;
 					switch (address->sa_family) {
@@ -329,5 +333,6 @@
 						    address->sa_family, address->sa_family);
 					}
-					// parse the source address
+		
+					/* Parse source address */
 					if (address_start) {
 						rc = inet_ntop(address->sa_family, address_start, address_string, sizeof(address_string));
@@ -342,5 +347,5 @@
 				}
 
-				// answer the request either with the static reply or the original data
+				/* Answer the request either with the static reply or the original data */
 				rc = sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen);
 				if (rc != EOK)
@@ -348,5 +353,5 @@
 			}
 
-			// close the accepted stream socket
+			/* Close accepted stream socket */
 			if (type == SOCK_STREAM) {
 				rc = closesocket(socket_id);
@@ -357,5 +362,5 @@
 		}
 
-		// decrease the count if positive
+		/* Decrease count if positive */
 		if (count > 0) {
 			count--;
@@ -368,5 +373,5 @@
 		printf("Closing the socket\n");
 
-	// close the listenning socket
+	/* Close listenning socket */
 	rc = closesocket(listening_id);
 	if (rc != EOK) {