diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 386551445..5997e11de 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -480,7 +480,7 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque
 	char *		nis_domain = NULL;
 	guint32 *		ip4_nis_servers = NULL;
 	struct in_addr	temp_addr;
-        nm_completion_args args;
+	nm_completion_args	args;
 
 	g_return_val_if_fail (manager != NULL, NULL);
 	g_return_val_if_fail (req != NULL, NULL);
@@ -560,8 +560,9 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque
 		g_strfreev (searches);
 	}
 
-	if (nis_domain) {
-		nm_ip4_config_set_nis_domain( ip4_config, nis_domain);
+	if (nis_domain)
+	{
+		nm_ip4_config_set_nis_domain (ip4_config, nis_domain);
 		nm_info ("  nis domain '%s'", nis_domain);
 	}
 
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 9b6070075..de89a3bac 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -42,8 +42,8 @@ struct NMIP4Config
 	GSList *	nameservers;
 	GSList *	domains;
 
-	gchar *	 nis_domain;
-	GSList * nis_servers;
+	gchar *	nis_domain;
+	GSList *	nis_servers;
 
 	/* If this is a VPN/etc config that requires
 	 * another device (like Ethernet) to already have
@@ -77,7 +77,7 @@ NMIP4Config *nm_ip4_config_copy (NMIP4Config *src_config)
 	dst_config->ip4_netmask = nm_ip4_config_get_netmask (src_config);
 	dst_config->ip4_broadcast = nm_ip4_config_get_broadcast (src_config);
 
-	dst_config->nis_domain = g_strdup(nm_ip4_config_get_nis_domain(src_config));
+	dst_config->nis_domain = g_strdup (nm_ip4_config_get_nis_domain (src_config));
 
 	len = nm_ip4_config_get_num_nameservers (src_config);
 	for (i = 0; i < len; i++)
@@ -260,7 +260,7 @@ void nm_ip4_config_set_nis_domain (NMIP4Config *config, const char *domain)
 	if (!strlen (domain))
 		return;
 	
-	config->nis_domain = g_strdup(domain);
+	config->nis_domain = g_strdup (domain);
 }
 
 gchar *nm_ip4_config_get_nis_domain (NMIP4Config *config)