Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision ef4b1126207083ec6bb1e9d3284ac63cca74f32c)
+++ uspace/srv/net/net/net.c	(revision 3d459fcecedd05c16f0147a90e81b3f544b21bc3)
@@ -36,4 +36,6 @@
  */
 
+#include "net.h"
+
 #include <async.h>
 #include <ctype.h>
@@ -52,30 +54,24 @@
 
 #include <net/modules.h>
+#include <net/packet.h>
+#include <net/device.h>
+
 #include <adt/char_map.h>
 #include <adt/generic_char_map.h>
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <net/packet.h>
+
 #include <netif_remote.h>
-#include <net/device.h>
 #include <nil_interface.h>
 #include <net_interface.h>
 #include <ip_interface.h>
 
-#include "net.h"
-
-/** Networking module name.
- *
- */
+/** Networking module name. */
 #define NAME  "net"
 
-/** File read buffer size.
- *
- */
+/** File read buffer size. */
 #define BUFFER_SIZE  256
 
-/** Networking module global data.
- *
- */
+/** Networking module global data. */
 net_globals_t net_globals;
 
@@ -100,5 +96,4 @@
 	measured_string_ref setting =
 	    measured_string_create_bulk(value, 0);
-	
 	if (!setting)
 		return ENOMEM;
@@ -206,5 +201,5 @@
 	unsigned int line_number = 0;
 	size_t index = 0;
-	while ((!ferror(cfg)) && (!feof(cfg))) {
+	while (!ferror(cfg) && !feof(cfg)) {
 		int read = fgetc(cfg);
 		if ((read > 0) && (read != '\n') && (read != '\r')) {
@@ -326,6 +321,6 @@
 	ipcarg_t phonehash;
 	
-	if (ERROR_OCCURRED(net_initialize(client_connection))
-	    || ERROR_OCCURRED(REGISTER_ME(SERVICE_NETWORKING, &phonehash))){
+	if (ERROR_OCCURRED(net_initialize(client_connection)) ||
+	    ERROR_OCCURRED(REGISTER_ME(SERVICE_NETWORKING, &phonehash))) {
 		pm_destroy();
 		return ERROR_CODE;
@@ -379,5 +374,5 @@
     size_t count, char **data)
 {
-	if (!(configuration && (count > 0)))
+	if (!configuration || (count <= 0))
 		return EINVAL;
 	
@@ -482,10 +477,10 @@
 	/* Inter-network layer startup */
 	switch (netif->il->service) {
-		case SERVICE_IP:
-			ERROR_PROPAGATE(ip_device_req(netif->il->phone, netif->id,
-			    internet_service));
-			break;
-		default:
-			return ENOENT;
+	case SERVICE_IP:
+		ERROR_PROPAGATE(ip_device_req(netif->il->phone, netif->id,
+		    internet_service));
+		break;
+	default:
+		return ENOENT;
 	}
 	
@@ -511,5 +506,8 @@
 	ERROR_DECLARE;
 	
-	const char *conf_files[] = {"lo", "ne2k"};
+	const char *conf_files[] = {
+		"lo",
+		"ne2k"
+	};
 	size_t count = sizeof(conf_files) / sizeof(char *);
 	
@@ -603,31 +601,31 @@
 	*answer_count = 0;
 	switch (IPC_GET_METHOD(*call)) {
-		case IPC_M_PHONE_HUNGUP:
-			return EOK;
-		case NET_NET_GET_DEVICE_CONF:
-			ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
-			    IPC_GET_COUNT(call)));
-			net_get_device_conf_req(0, IPC_GET_DEVICE(call), &strings,
-			    IPC_GET_COUNT(call), NULL);
-			
-			/* Strings should not contain received data anymore */
-			free(data);
-			
-			ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
-			free(strings);
-			return ERROR_CODE;
-		case NET_NET_GET_CONF:
-			ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
-			    IPC_GET_COUNT(call)));
-			net_get_conf_req(0, &strings, IPC_GET_COUNT(call), NULL);
-			
-			/* Strings should not contain received data anymore */
-			free(data);
-			
-			ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
-			free(strings);
-			return ERROR_CODE;
-		case NET_NET_STARTUP:
-			return startup();
+	case IPC_M_PHONE_HUNGUP:
+		return EOK;
+	case NET_NET_GET_DEVICE_CONF:
+		ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
+		    IPC_GET_COUNT(call)));
+		net_get_device_conf_req(0, IPC_GET_DEVICE(call), &strings,
+		    IPC_GET_COUNT(call), NULL);
+		
+		/* Strings should not contain received data anymore */
+		free(data);
+		
+		ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
+		free(strings);
+		return ERROR_CODE;
+	case NET_NET_GET_CONF:
+		ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
+		    IPC_GET_COUNT(call)));
+		net_get_conf_req(0, &strings, IPC_GET_COUNT(call), NULL);
+		
+		/* Strings should not contain received data anymore */
+		free(data);
+		
+		ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
+		free(strings);
+		return ERROR_CODE;
+	case NET_NET_STARTUP:
+		return startup();
 	}
 	return ENOTSUP;
@@ -661,5 +659,5 @@
 		int res = net_module_message(callid, &call, &answer, &answer_count);
 		
-		/* End if said to either by the message or the processing result */
+		/* End if told to either by the message or the processing result */
 		if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
 			return;
Index: uspace/srv/net/net/net.h
===================================================================
--- uspace/srv/net/net/net.h	(revision ef4b1126207083ec6bb1e9d3284ac63cca74f32c)
+++ uspace/srv/net/net/net.h	(revision 3d459fcecedd05c16f0147a90e81b3f544b21bc3)
@@ -36,6 +36,6 @@
  */
 
-#ifndef __NET_NET_H__
-#define __NET_NET_H__
+#ifndef NET_NET_H_
+#define NET_NET_H_
 
 #include <ipc/ipc.h>
Index: uspace/srv/net/net/net_standalone.c
===================================================================
--- uspace/srv/net/net/net_standalone.c	(revision ef4b1126207083ec6bb1e9d3284ac63cca74f32c)
+++ uspace/srv/net/net/net_standalone.c	(revision 3d459fcecedd05c16f0147a90e81b3f544b21bc3)
@@ -28,25 +28,23 @@
 
 /** @addtogroup net
- *  @{
+ * @{
  */
 
 /** @file
- *  Wrapper for the standalone networking module.
+ * Wrapper for the standalone networking module.
  */
 
+#include "net.h"
+
 #include <str.h>
-
+#include <adt/measured_strings.h>
+#include <adt/module_map.h>
 #include <ipc/ipc.h>
 #include <ipc/net.h>
 
 #include <ip_interface.h>
-#include <adt/measured_strings.h>
-#include <adt/module_map.h>
 #include <packet_server.h>
 
-#include "net.h"
-
-/** Networking module global data.
- */
+/** Networking module global data. */
 extern net_globals_t net_globals;
 
@@ -60,5 +58,6 @@
  *
  */
-int net_initialize_build(async_client_conn_t client_connection){
+int net_initialize_build(async_client_conn_t client_connection)
+{
 	ERROR_DECLARE;