Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision 08e3ca40338868956c14486807abfbfd6f4567e3)
+++ uspace/srv/net/il/arp/arp.c	(revision d52b00441cdabb1adcf0ee99c91a56217e472cd0)
@@ -125,7 +125,6 @@
 }
 
-static int
-arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address)
+static int arp_clear_address_req(int arp_phone, device_id_t device_id,
+    services_t protocol, measured_string_ref address)
 {
 	arp_device_ref device;
@@ -175,6 +174,5 @@
  * @returns		ENOMEM if there is not enough memory left.
  */
-static int
-arp_proto_create(arp_proto_ref *proto, services_t service,
+static int arp_proto_create(arp_proto_ref *proto, services_t service,
     measured_string_ref address)
 {
@@ -214,6 +212,5 @@
  *			measured_strings_return() function.
  */
-static int
-arp_device_message(device_id_t device_id, services_t service,
+static int arp_device_message(device_id_t device_id, services_t service,
     services_t protocol, measured_string_ref address)
 {
@@ -225,6 +222,8 @@
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
-	// an existing device?
+
+	/* An existing device? */
 	device = arp_cache_find(&arp_globals.cache, device_id);
+
 	if (device) {
 		if (device->service != service) {
@@ -260,5 +259,5 @@
 			return ENOENT;
 		
-		// create a new device
+		/* Create a new device */
 		device = (arp_device_ref) malloc(sizeof(arp_device_t));
 		if (!device) {
@@ -289,5 +288,5 @@
 		device->service = service;
 		
-		// bind the new one
+		/* Bind the new one */
 		device->phone = nil_bind_service(device->service,
 		    (ipcarg_t) device->device_id, SERVICE_ARP,
@@ -300,5 +299,5 @@
 		}
 		
-		// get packet dimensions
+		/* Get packet dimensions */
 		rc = nil_packet_size_req(device->phone, device_id,
 		    &device->packet_dimension);
@@ -310,5 +309,5 @@
 		}
 		
-		// get hardware address
+		/* Get hardware address */
 		rc = nil_get_addr_req(device->phone, device_id, &device->addr,
 		    &device->addr_data);
@@ -320,5 +319,5 @@
 		}
 		
-		// get broadcast address
+		/* Get broadcast address */
 		rc = nil_get_broadcast_addr_req(device->phone, device_id,
 		    &device->broadcast_addr, &device->broadcast_data);
@@ -455,5 +454,5 @@
 	hw_source = arp_addr_find(&proto->addresses, (char *) src_proto,
 	    CONVERT_SIZE(uint8_t, char, header->protocol_length));
-	// exists?
+	/* Exists? */
 	if (hw_source) {
 		if (hw_source->length != CONVERT_SIZE(uint8_t, char,
@@ -463,5 +462,5 @@
 		memcpy(hw_source->value, src_hw, hw_source->length);
 	}
-	// is my protocol address?
+	/* Is my protocol address? */
 	if (proto->addr->length != CONVERT_SIZE(uint8_t, char,
 	    header->protocol_length)) {
@@ -470,5 +469,5 @@
 	if (!str_lcmp(proto->addr->value, (char *) des_proto,
 	    proto->addr->length)) {
-		// not already upadted?
+		/* Not already updated? */
 		if (!hw_source) {
 			hw_source = measured_string_create_bulk((char *) src_hw,
@@ -550,5 +549,5 @@
 		return addr;
 
-	// ARP packet content size = header + (address + translation) * 2
+	/* ARP packet content size = header + (address + translation) * 2 */
 	length = 8 + 2 * (CONVERT_SIZE(char, uint8_t, proto->addr->length) +
 	    CONVERT_SIZE(char, uint8_t, device->addr->length));
@@ -674,5 +673,5 @@
 	
 	case NET_IL_DEVICE_STATE:
-		// do nothing - keep the cache
+		/* Do nothing - keep the cache */
 		return EOK;
 	
Index: uspace/srv/net/il/arp/arp_module.c
===================================================================
--- uspace/srv/net/il/arp/arp_module.c	(revision 08e3ca40338868956c14486807abfbfd6f4567e3)
+++ uspace/srv/net/il/arp/arp_module.c	(revision d52b00441cdabb1adcf0ee99c91a56217e472cd0)
@@ -57,6 +57,5 @@
 extern arp_globals_t arp_globals;
 
-int
-il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
+int il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
     ipc_call_t *answer, int *answer_count)
 {