Index: uspace/srv/devman/devman.h
===================================================================
--- uspace/srv/devman/devman.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
+++ uspace/srv/devman/devman.h	(revision 50ad3f329286f24e8408052e2f1d3f2c5542be70)
@@ -210,5 +210,4 @@
 };
 
-
 /** Represents device tree. */
 typedef struct dev_tree {
Index: uspace/srv/devman/main.c
===================================================================
--- uspace/srv/devman/main.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
+++ uspace/srv/devman/main.c	(revision 50ad3f329286f24e8408052e2f1d3f2c5542be70)
@@ -245,5 +245,5 @@
 	
 	fibril_rwlock_write_lock(&device_tree.rwlock);
-
+	
 	if (fun->state == FUN_ON_LINE) {
 		fibril_rwlock_write_unlock(&device_tree.rwlock);
@@ -259,5 +259,5 @@
 			return ENOMEM;
 		}
-
+		
 		insert_dev_node(&device_tree, dev, fun);
 		dev_add_ref(dev);
@@ -272,4 +272,5 @@
 		/* Give one reference over to assign_driver_fibril(). */
 		dev_add_ref(dev);
+		
 		/*
 		 * Try to find a suitable driver and assign it to the device.  We do
@@ -288,7 +289,6 @@
 		}
 		fibril_add_ready(assign_fibril);
-	} else {
+	} else
 		loc_register_tree_function(fun, &device_tree);
-	}
 	
 	fibril_rwlock_write_unlock(&device_tree.rwlock);
@@ -1149,4 +1149,5 @@
 		if (dev->pfun->dev != NULL)
 			driver = dev->pfun->dev->drv;
+		
 		fwd_h = dev->pfun->handle;
 	} else if (dev->state == DEVICE_USABLE) {
@@ -1154,5 +1155,5 @@
 		driver = dev->drv;
 		assert(driver != NULL);
-
+		
 		fwd_h = handle;
 	}
@@ -1181,9 +1182,9 @@
 
 	if (fun != NULL) {
-		log_msg(LVL_DEBUG, 
+		log_msg(LVL_DEBUG,
 		    "Forwarding request for `%s' function to driver `%s'.",
 		    fun->pathname, driver->name);
 	} else {
-		log_msg(LVL_DEBUG, 
+		log_msg(LVL_DEBUG,
 		    "Forwarding request for `%s' device to driver `%s'.",
 		    dev->pfun->pathname, driver->name);
@@ -1193,8 +1194,9 @@
 	async_forward_fast(iid, exch, method, fwd_h, 0, IPC_FF_NONE);
 	async_exchange_end(exch);
-
+	
 cleanup:
 	if (dev != NULL)
 		dev_del_ref(dev);
+	
 	if (fun != NULL)
 		fun_del_ref(fun);
@@ -1299,7 +1301,7 @@
 		return false;
 	}
-
+	
 	log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized.");
-
+	
 	/* Create root device node. */
 	if (!init_device_tree(&device_tree, &drivers_list)) {
@@ -1307,5 +1309,5 @@
 		return false;
 	}
-
+	
 	/*
 	 * Caution: As the device manager is not a real loc
@@ -1322,9 +1324,10 @@
 int main(int argc, char *argv[])
 {
-	printf(NAME ": HelenOS Device Manager\n");
-
-	if (log_init(NAME, LVL_WARN) != EOK) {
-		printf(NAME ": Error initializing logging subsystem.\n");
-		return -1;
+	printf("%s: HelenOS Device Manager\n", NAME);
+	
+	int rc = log_init(NAME, LVL_WARN);
+	if (rc != EOK) {
+		printf("%s: Error initializing logging subsystem.\n", NAME);
+		return rc;
 	}
 	
@@ -1333,20 +1336,21 @@
 	async_set_client_data_destructor(devman_client_data_destroy);
 	async_set_client_connection(devman_connection);
-
+	
 	if (!devman_init()) {
 		log_msg(LVL_ERROR, "Error while initializing service.");
 		return -1;
 	}
-
+	
 	/* Register device manager at naming service. */
-	if (service_register(SERVICE_DEVMAN) != EOK) {
+	rc = service_register(SERVICE_DEVMAN);
+	if (rc != EOK) {
 		log_msg(LVL_ERROR, "Failed registering as a service.");
-		return -1;
-	}
-
-	printf(NAME ": Accepting connections.\n");
+		return rc;
+	}
+	
+	printf("%s: Accepting connections.\n", NAME);
 	task_retval(0);
 	async_manager();
-
+	
 	/* Never reached. */
 	return 0;
Index: uspace/srv/locsrv/locsrv.c
===================================================================
--- uspace/srv/locsrv/locsrv.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
+++ uspace/srv/locsrv/locsrv.c	(revision 50ad3f329286f24e8408052e2f1d3f2c5542be70)
@@ -390,5 +390,4 @@
 	 */
 	list_initialize(&server->services);
-
 	link_initialize(&server->servers);
 	
@@ -1490,6 +1489,7 @@
 	
 	/* Register location service at naming service */
-	if (service_register(SERVICE_LOC) != EOK)
-		return -1;
+	int rc = service_register(SERVICE_LOC);
+	if (rc != EOK)
+		return rc;
 	
 	printf("%s: Accepting connections\n", NAME);
Index: uspace/srv/locsrv/locsrv.h
===================================================================
--- uspace/srv/locsrv/locsrv.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
+++ uspace/srv/locsrv/locsrv.h	(revision 50ad3f329286f24e8408052e2f1d3f2c5542be70)
@@ -86,18 +86,26 @@
 	/** Link to global list of services (services_list) */
 	link_t services;
+	
 	/** Link to server list of services (loc_server_t.services) */
 	link_t server_services;
+	
 	/** Link to list of services in category (category_t.services) */
 	link_t cat_services;
+	
 	/** List of category memberships (svc_categ_t) */
 	list_t cat_memb;
+	
 	/** Unique service identifier */
 	service_id_t id;
+	
 	/** Service namespace */
 	loc_namespace_t *namespace;
+	
 	/** Service name */
 	char *name;
+	
 	/** Supplier of this service */
 	loc_server_t *server;
+	
 	/** Use this interface when forwarding to server. */
 	sysarg_t forward_interface;