diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml
index 383374de3d..27f15fe5b9 100644
--- a/callouts/nm-dispatcher.xml
+++ b/callouts/nm-dispatcher.xml
@@ -23,31 +23,18 @@
     -->
     <method name="Action">
       <arg name="action" type="s" direction="in"/>
-
       <arg name="connection" type="a{sa{sv}}" direction="in"/>
-
       <arg name="connection_properties" type="a{sv}" direction="in"/>
-
       <arg name="device_properties" type="a{sv}" direction="in"/>
-
       <arg name="device_ip4_config" type="a{sv}" direction="in"/>
-
       <arg name="device_ip6_config" type="a{sv}" direction="in"/>
-
       <arg name="device_dhcp4_config" type="a{sv}" direction="in"/>
-
       <arg name="device_dhcp6_config" type="a{sv}" direction="in"/>
-
       <arg name="vpn_ip_iface" type="s" direction="in"/>
-
       <arg name="vpn_ip4_config" type="a{sv}" direction="in"/>
-
       <arg name="vpn_ip6_config" type="a{sv}" direction="in"/>
-
       <arg name="debug" type="b" direction="in"/>
-
       <arg name="results" type="a(sus)" direction="out"/>
-
     </method>
   </interface>
 </node>
diff --git a/introspection/nm-access-point.xml b/introspection/nm-access-point.xml
index 10d8c0c391..0c1ebf23ca 100644
--- a/introspection/nm-access-point.xml
+++ b/introspection/nm-access-point.xml
@@ -41,7 +41,7 @@
            won't deal with '\0' bytes correctly.
       -->
       <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
-      </property>
+    </property>
 
     <!--
         Frequency:
@@ -95,7 +95,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
   </interface>
 </node>
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index 950dadf77d..a4e9417041 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -150,7 +150,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
   </interface>
 </node>
diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml
index 4f1bbbf5a0..86b4404a1a 100644
--- a/introspection/nm-agent-manager.xml
+++ b/introspection/nm-agent-manager.xml
@@ -33,6 +33,5 @@
         when they disconnect from D-Bus.
     -->
     <method name="Unregister"/>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-adsl.xml b/introspection/nm-device-adsl.xml
index 68802b62bb..5ad397e6a4 100644
--- a/introspection/nm-device-adsl.xml
+++ b/introspection/nm-device-adsl.xml
@@ -7,7 +7,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
 
     <!--
@@ -16,6 +16,5 @@
         Indicates whether the physical carrier is found.
     -->
     <property name="Carrier" type="b" access="read"/>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-bond.xml b/introspection/nm-device-bond.xml
index 763978f613..fc0249d937 100644
--- a/introspection/nm-device-bond.xml
+++ b/introspection/nm-device-bond.xml
@@ -30,8 +30,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-bridge.xml b/introspection/nm-device-bridge.xml
index 4d8e9b4434..c2e8ffd3b3 100644
--- a/introspection/nm-device-bridge.xml
+++ b/introspection/nm-device-bridge.xml
@@ -30,8 +30,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-bt.xml b/introspection/nm-device-bt.xml
index e4129fc670..6249085b2e 100644
--- a/introspection/nm-device-bt.xml
+++ b/introspection/nm-device-bt.xml
@@ -30,8 +30,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-ethernet.xml b/introspection/nm-device-ethernet.xml
index b5b374fa6f..ddfa74bb09 100644
--- a/introspection/nm-device-ethernet.xml
+++ b/introspection/nm-device-ethernet.xml
@@ -44,8 +44,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-generic.xml b/introspection/nm-device-generic.xml
index 0dd20b31a8..e79ff700ac 100644
--- a/introspection/nm-device-generic.xml
+++ b/introspection/nm-device-generic.xml
@@ -21,8 +21,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-infiniband.xml b/introspection/nm-device-infiniband.xml
index 408f4b1e8c..9848a07430 100644
--- a/introspection/nm-device-infiniband.xml
+++ b/introspection/nm-device-infiniband.xml
@@ -22,8 +22,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-ip-tunnel.xml b/introspection/nm-device-ip-tunnel.xml
index 8fc622a5ca..45f3a3f710 100644
--- a/introspection/nm-device-ip-tunnel.xml
+++ b/introspection/nm-device-ip-tunnel.xml
@@ -88,8 +88,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-macvlan.xml b/introspection/nm-device-macvlan.xml
index 6881887760..876b685cc9 100644
--- a/introspection/nm-device-macvlan.xml
+++ b/introspection/nm-device-macvlan.xml
@@ -35,8 +35,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-modem.xml b/introspection/nm-device-modem.xml
index eeb6a4afd2..1d4bd65ee9 100644
--- a/introspection/nm-device-modem.xml
+++ b/introspection/nm-device-modem.xml
@@ -31,6 +31,5 @@
         Returns: <link linkend="NMDeviceModemCapabilities">NMDeviceModemCapabilities</link>
     -->
     <property name="CurrentCapabilities" type="u" access="read"/>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-olpc-mesh.xml b/introspection/nm-device-olpc-mesh.xml
index effee008a1..b2ab126ec6 100644
--- a/introspection/nm-device-olpc-mesh.xml
+++ b/introspection/nm-device-olpc-mesh.xml
@@ -30,7 +30,7 @@
         Emitted when the wireless device's properties changed.
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
-        </signal>
+      <arg name="properties" type="a{sv}"/>
+    </signal>
   </interface>
 </node>
diff --git a/introspection/nm-device-team.xml b/introspection/nm-device-team.xml
index 25079122cd..05bbbafe46 100644
--- a/introspection/nm-device-team.xml
+++ b/introspection/nm-device-team.xml
@@ -30,8 +30,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-tun.xml b/introspection/nm-device-tun.xml
index e7ce36c224..a11461c1a1 100644
--- a/introspection/nm-device-tun.xml
+++ b/introspection/nm-device-tun.xml
@@ -59,8 +59,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-veth.xml b/introspection/nm-device-veth.xml
index 5f85d48e04..b064874e0d 100644
--- a/introspection/nm-device-veth.xml
+++ b/introspection/nm-device-veth.xml
@@ -14,8 +14,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-vlan.xml b/introspection/nm-device-vlan.xml
index 2260da546f..7d8fbdce92 100644
--- a/introspection/nm-device-vlan.xml
+++ b/introspection/nm-device-vlan.xml
@@ -36,8 +36,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-vxlan.xml b/introspection/nm-device-vxlan.xml
index 00bba5a444..ec17717d6f 100644
--- a/introspection/nm-device-vxlan.xml
+++ b/introspection/nm-device-vxlan.xml
@@ -133,8 +133,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
index 33c87f5638..c1f378d8c0 100644
--- a/introspection/nm-device-wifi.xml
+++ b/introspection/nm-device-wifi.xml
@@ -119,6 +119,6 @@
     -->
     <signal name="AccessPointRemoved">
       <arg name="access_point" type="o"/>
-        </signal>
+    </signal>
   </interface>
 </node>
diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml
index 2d5e3e1fe6..02539dbb66 100644
--- a/introspection/nm-device-wimax.xml
+++ b/introspection/nm-device-wimax.xml
@@ -107,7 +107,6 @@
     -->
     <signal name="NspRemoved">
       <arg name="nsp" type="o"/>
-        </signal>
-
+    </signal>
   </interface>
 </node>
diff --git a/introspection/nm-dhcp4-config.xml b/introspection/nm-dhcp4-config.xml
index 1811613e95..e9363f9e21 100644
--- a/introspection/nm-dhcp4-config.xml
+++ b/introspection/nm-dhcp4-config.xml
@@ -7,7 +7,7 @@
       Options and configuration returned by the IPv4 DHCP server.
   -->
   <interface name="org.freedesktop.NetworkManager.DHCP4Config">
-        <annotation name="org.gtk.GDBus.C.Name" value="Dhcp4Config"/>
+    <annotation name="org.gtk.GDBus.C.Name" value="Dhcp4Config"/>
 
     <!--
         Options:
@@ -21,7 +21,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}"/>
-        </signal>
-    </interface>
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+  </interface>
 </node>
diff --git a/introspection/nm-dhcp6-config.xml b/introspection/nm-dhcp6-config.xml
index d6a6417797..7ecdf35cab 100644
--- a/introspection/nm-dhcp6-config.xml
+++ b/introspection/nm-dhcp6-config.xml
@@ -7,7 +7,7 @@
       Options and configuration returned by the IPv6 DHCP server.
   -->
   <interface name="org.freedesktop.NetworkManager.DHCP6Config">
-        <annotation name="org.gtk.GDBus.C.Name" value="Dhcp6Config"/>
+    <annotation name="org.gtk.GDBus.C.Name" value="Dhcp6Config"/>
 
     <!--
         Options:
@@ -21,7 +21,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}"/>
-        </signal>
-    </interface>
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+  </interface>
 </node>
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 9990f4e3ed..e5cb23a563 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -381,6 +381,5 @@
     <signal name="DeviceRemoved">
       <arg name="device_path" type="o"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
index 7a551b9419..33296fb06f 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/nm-secret-agent.xml
@@ -34,16 +34,16 @@
         UserCanceled error (see below).
     -->
     <method name="GetSecrets">
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_get_secrets"/>
-            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="connection" type="a{sa{sv}}" direction="in"/>
-            <arg name="connection_path" type="o" direction="in"/>
-            <arg name="setting_name" type="s" direction="in"/>
-            <arg name="hints" type="as" direction="in"/>
-            <arg name="flags" type="u" direction="in"/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_get_secrets"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="connection_path" type="o" direction="in"/>
+      <arg name="setting_name" type="s" direction="in"/>
+      <arg name="hints" type="as" direction="in"/>
+      <arg name="flags" type="u" direction="in"/>
 
-            <arg name="secrets" type="a{sa{sv}}" direction="out"/>
-        </method>
+      <arg name="secrets" type="a{sa{sv}}" direction="out"/>
+    </method>
 
     <!--
         CancelGetSecrets:
@@ -55,11 +55,11 @@
         that are given in a CancelGetSecrets request should be canceled.
     -->
     <method name="CancelGetSecrets">
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_cancel_get_secrets"/>
-            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="connection_path" type="o" direction="in"/>
-            <arg name="setting_name" type="s" direction="in"/>
-        </method>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_cancel_get_secrets"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="connection_path" type="o" direction="in"/>
+      <arg name="setting_name" type="s" direction="in"/>
+    </method>
 
     <!--
         SaveSecrets:
@@ -69,11 +69,11 @@
         Save given secrets to backing storage.
     -->
     <method name="SaveSecrets">
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_save_secrets"/>
-            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="connection" type="a{sa{sv}}" direction="in"/>
-            <arg name="connection_path" type="o" direction="in"/>
-        </method>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_save_secrets"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="connection_path" type="o" direction="in"/>
+    </method>
 
     <!--
         DeleteSecrets:
@@ -83,12 +83,10 @@
         Delete secrets from backing storage.
     -->
     <method name="DeleteSecrets">
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_delete_secrets"/>
-            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="connection" type="a{sa{sv}}" direction="in"/>
-            <arg name="connection_path" type="o" direction="in"/>
-        </method>
-
-    </interface>
-
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_delete_secrets"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="connection_path" type="o" direction="in"/>
+    </method>
+  </interface>
 </node>
diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml
index e68f56bc8e..15b380348c 100644
--- a/introspection/nm-settings-connection.xml
+++ b/introspection/nm-settings-connection.xml
@@ -19,8 +19,8 @@
         associated with each secret.
     -->
     <method name="Update">
-          <arg name="properties" type="a{sa{sv}}" direction="in"/>
-        </method>
+      <arg name="properties" type="a{sa{sv}}" direction="in"/>
+    </method>
 
     <!--
         UpdateUnsaved:
@@ -36,8 +36,8 @@
         ReloadConnections call).
     -->
     <method name="UpdateUnsaved">
-          <arg name="properties" type="a{sa{sv}}" direction="in"/>
-        </method>
+      <arg name="properties" type="a{sa{sv}}" direction="in"/>
+    </method>
 
     <!--
         Delete:
@@ -56,8 +56,8 @@
         GetSecrets() call.
     -->
     <method name="GetSettings">
-            <arg name="settings" type="a{sa{sv}}" direction="out"/>
-        </method>
+      <arg name="settings" type="a{sa{sv}}" direction="out"/>
+    </method>
 
     <!--
         GetSecrets:
@@ -70,10 +70,10 @@
         of this request.
     -->
     <method name="GetSecrets">
-            <arg name="setting_name" type="s" direction="in"/>
+      <arg name="setting_name" type="s" direction="in"/>
 
-            <arg name="secrets" type="a{sa{sv}}" direction="out"/>
-        </method>
+      <arg name="secrets" type="a{sa{sv}}" direction="out"/>
+    </method>
 
     <!--
         ClearSecrets:
@@ -125,9 +125,7 @@
         @properties: A dictionary mapping property names to variant boxed values.
     -->
     <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}"/>
-        </signal>
-
-    </interface>
-
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+  </interface>
 </node>
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index 9d2ba42bb8..7f5b546c58 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -166,6 +166,5 @@
     <signal name="ConnectionRemoved">
       <arg name="connection" type="o"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-vpn-connection.xml b/introspection/nm-vpn-connection.xml
index 41734b8e30..430998f3d1 100644
--- a/introspection/nm-vpn-connection.xml
+++ b/introspection/nm-vpn-connection.xml
@@ -14,7 +14,7 @@
         @properties: A dictionary mapping property names to variant boxed values
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
 
     <!--
diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml
index d071d0eac0..7eed97210f 100644
--- a/introspection/nm-vpn-plugin.xml
+++ b/introspection/nm-vpn-plugin.xml
@@ -198,6 +198,5 @@
     <signal name="Failure">
       <arg name="reason" type="u"/>
     </signal>
-
   </interface>
 </node>
diff --git a/introspection/nm-wimax-nsp.xml b/introspection/nm-wimax-nsp.xml
index 0f2ceccc3b..8b9a2fcc9f 100644
--- a/introspection/nm-wimax-nsp.xml
+++ b/introspection/nm-wimax-nsp.xml
@@ -30,8 +30,7 @@
         @properties: A dictionary mapping property names to variant boxed values.
     -->
     <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
+      <arg name="properties" type="a{sv}"/>
     </signal>
-
   </interface>
 </node>
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
index fa9ba1c52b..033fbfaa30 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
@@ -18,9 +18,9 @@
         Given an ifcfg file, return various internal information about it.
     -->
     <method name="GetIfcfgDetails">
-        <arg name="ifcfg" type="s" direction="in"/>
-        <arg name="uuid" type="s" direction="out"/>
-        <arg name="path" type="o" direction="out"/>
-      </method>
-    </interface>
+      <arg name="ifcfg" type="s" direction="in"/>
+      <arg name="uuid" type="s" direction="out"/>
+      <arg name="path" type="o" direction="out"/>
+    </method>
+  </interface>
 </node>