diff --git a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
index 44f95010e76..191d6371497 100644
--- a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
@@ -31,7 +31,7 @@
    <Arg><Ref refid='wac'/></Arg>
    <Arg>svr</Arg>
    <Arg type="java.lang.String">
-     <Ref id="Server">
+     <Ref refid="Server">
        <Get name="class">
          <Get name="name"/>
        </Get>
diff --git a/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml b/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
index c3df301c562..7fa53cc3a33 100644
--- a/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
+++ b/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <Ref id="httpConnector">
+  <Ref refid="httpConnector">
         <Call name="addEventListener">
           <Arg>
             <New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">
diff --git a/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml b/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
index c3df301c562..7fa53cc3a33 100644
--- a/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
+++ b/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <Ref id="httpConnector">
+  <Ref refid="httpConnector">
         <Call name="addEventListener">
           <Arg>
             <New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml
index 1030e0d3f85..f77ab2d7227 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server"       --><!-- by adding an HTTP connector.                                   --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding an HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
diff --git a/jetty-server/src/main/config/etc/home-base-warning.xml b/jetty-server/src/main/config/etc/home-base-warning.xml
index fd64108d15e..5b0f42bcb52 100644
--- a/jetty-server/src/main/config/etc/home-base-warning.xml
+++ b/jetty-server/src/main/config/etc/home-base-warning.xml
@@ -4,5 +4,4 @@
 <!-- ============================================================= -->
 <!-- Display a Warning Message if {jetty.home} == {jetty.base}     -->
 <!-- ============================================================= -->
-<Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning">
-</Configure>
+<Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning"/>
diff --git a/jetty-server/src/main/config/etc/sessions/file/session-store.xml b/jetty-server/src/main/config/etc/sessions/file/session-store.xml
index 1f073ddc4e0..7b48c1cafaf 100644
--- a/jetty-server/src/main/config/etc/sessions/file/session-store.xml
+++ b/jetty-server/src/main/config/etc/sessions/file/session-store.xml
@@ -3,7 +3,6 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a factory for FileSessionStores                             -->
   <!-- ===================================================================== -->
diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml
index f020b685c61..5113d8cfb49 100644
--- a/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml
+++ b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-    <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
-         <Set name="DatasourceName" property="jetty.session.jdbc.datasourceName"/>
-         <Set name="blobType" property="jetty.session.jdbc.blobType"/>
-         <Set name="longType" property="jetty.session.jdbc.longType"/>
-         <Set name="stringType" property="jetty.session.jdbc.stringType"/>
-    </New>
+  <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
+    <Set name="DatasourceName" property="jetty.session.jdbc.datasourceName"/>
+    <Set name="blobType" property="jetty.session.jdbc.blobType"/>
+    <Set name="longType" property="jetty.session.jdbc.longType"/>
+    <Set name="stringType" property="jetty.session.jdbc.stringType"/>
+  </New>
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml
index 20d305d0bc1..1fcd811dab9 100644
--- a/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml
+++ b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml
@@ -3,14 +3,14 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-    <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
-         <Call name="setDriverInfo">
-             <Arg><Property name="jetty.session.jdbc.driverClass"/></Arg>
-             <Arg><Property name="jetty.session.jdbc.driverUrl"/></Arg>
-         </Call>
-         <Set name="blobType" property="jetty.session.jdbc.blobType"/>
-         <Set name="longType" property="jetty.session.jdbc.longType"/>
-         <Set name="stringType" property="jetty.session.jdbc.stringType"/>
-    </New>
+  <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
+    <Call name="setDriverInfo">
+      <Arg><Property name="jetty.session.jdbc.driverClass"/></Arg>
+      <Arg><Property name="jetty.session.jdbc.driverUrl"/></Arg>
+    </Call>
+    <Set name="blobType" property="jetty.session.jdbc.blobType"/>
+    <Set name="longType" property="jetty.session.jdbc.longType"/>
+    <Set name="stringType" property="jetty.session.jdbc.stringType"/>
+  </New>
 
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
index 6544aa72d33..7c565b318ce 100644
--- a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
+++ b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
@@ -1,72 +1,69 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a factory for JDBCSessionStores                             -->
   <!-- ===================================================================== -->
   <Call name="addBean">
-   <Arg>
-    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.JDBCSessionDataStoreFactory">   
-      <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
-      <Set name="savePeriodSec"><Property name="jetty.session.savePeriod.seconds" default="0" /></Set>
-      <Set name="databaseAdaptor">
-        <Ref id="databaseAdaptor"/>
-      </Set>
-	<Set name="sessionTableSchema">
-		<New
-			class="org.eclipse.jetty.server.session.JDBCSessionDataStore$SessionTableSchema">
-			<Set name="accessTimeColumn">
-				<Property name="jetty.session.jdbc.schema.accessTimeColumn" default="accessTime" />
-			</Set>
-			<Set name="contextPathColumn">
-				<Property name="jetty.session.jdbc.schema.contextPathColumn" default="contextPath" />
-			</Set>
-			<Set name="cookieTimeColumn">
-				<Property name="jetty.session.jdbc.schema.cookieTimeColumn" default="cookieTime" />
-			</Set>
-			<Set name="createTimeColumn">
-				<Property name="jetty.session.jdbc.schema.createTimeColumn" default="createTime" />
-			</Set>
-			<Set name="expiryTimeColumn">
-				<Property name="jetty.session.jdbc.schema.expiryTimeColumn" default="expiryTime" />
-			</Set>
-			<Set name="lastAccessTimeColumn">
-				<Property name="jetty.session.jdbc.schema.lastAccessTimeColumn" default="lastAccessTime" />
-			</Set>
-			<Set name="lastSavedTimeColumn">
-				<Property name="jetty.session.jdbc.schema.lastSavedTimeColumn" default="lastSavedTime" />
-			</Set>
-			<Set name="idColumn">
-				<Property name="jetty.session.jdbc.schema.idColumn" default="sessionId" />
-			</Set>
-			<Set name="lastNodeColumn">
-				<Property name="jetty.session.jdbc.schema.lastNodeColumn" default="lastNode" />
-			</Set>
-			<Set name="virtualHostColumn">
-				<Property name="jetty.session.jdbc.schema.virtualHostColumn" default="virtualHost" />
-			</Set>
-			<Set name="maxIntervalColumn">
-				<Property name="jetty.session.jdbc.schema.maxIntervalColumn" default="maxInterval" />
-			</Set>
-			<Set name="mapColumn">
-				<Property name="jetty.session.jdbc.schema.mapColumn" default="map" />
-			</Set>
+    <Arg>
+      <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.JDBCSessionDataStoreFactory">
+        <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
+        <Set name="savePeriodSec"><Property name="jetty.session.savePeriod.seconds" default="0" /></Set>
+        <Set name="databaseAdaptor">
+          <Ref refid="databaseAdaptor" />
+        </Set>
+        <Set name="sessionTableSchema">
+          <New class="org.eclipse.jetty.server.session.JDBCSessionDataStore$SessionTableSchema">
+            <Set name="accessTimeColumn">
+              <Property name="jetty.session.jdbc.schema.accessTimeColumn" default="accessTime" />
+            </Set>
+            <Set name="contextPathColumn">
+              <Property name="jetty.session.jdbc.schema.contextPathColumn" default="contextPath" />
+            </Set>
+            <Set name="cookieTimeColumn">
+              <Property name="jetty.session.jdbc.schema.cookieTimeColumn" default="cookieTime" />
+            </Set>
+            <Set name="createTimeColumn">
+              <Property name="jetty.session.jdbc.schema.createTimeColumn" default="createTime" />
+            </Set>
+            <Set name="expiryTimeColumn">
+              <Property name="jetty.session.jdbc.schema.expiryTimeColumn" default="expiryTime" />
+            </Set>
+            <Set name="lastAccessTimeColumn">
+              <Property name="jetty.session.jdbc.schema.lastAccessTimeColumn" default="lastAccessTime" />
+            </Set>
+            <Set name="lastSavedTimeColumn">
+              <Property name="jetty.session.jdbc.schema.lastSavedTimeColumn" default="lastSavedTime" />
+            </Set>
+            <Set name="idColumn">
+              <Property name="jetty.session.jdbc.schema.idColumn" default="sessionId" />
+            </Set>
+            <Set name="lastNodeColumn">
+              <Property name="jetty.session.jdbc.schema.lastNodeColumn" default="lastNode" />
+            </Set>
+            <Set name="virtualHostColumn">
+              <Property name="jetty.session.jdbc.schema.virtualHostColumn" default="virtualHost" />
+            </Set>
+            <Set name="maxIntervalColumn">
+              <Property name="jetty.session.jdbc.schema.maxIntervalColumn" default="maxInterval" />
+            </Set>
+            <Set name="mapColumn">
+              <Property name="jetty.session.jdbc.schema.mapColumn" default="map" />
+            </Set>
             <Set name="schemaName">
-                <Property name="jetty.session.jdbc.schema.schemaName" />
+              <Property name="jetty.session.jdbc.schema.schemaName" />
             </Set>
             <Set name="catalogName">
-                <Property name="jetty.session.jdbc.schema.catalogName" />
+              <Property name="jetty.session.jdbc.schema.catalogName" />
             </Set>
-			<Set name="tableName">
-				<Property name="jetty.session.jdbc.schema.table" default="JettySessions" />
-			</Set>
-		</New>
-	</Set>
-    </New>
-   </Arg>
+            <Set name="tableName">
+              <Property name="jetty.session.jdbc.schema.table" default="JettySessions" />
+            </Set>
+          </New>
+        </Set>
+      </New>
+    </Arg>
   </Call>
 
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml b/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml
index 13186f2c1a6..a6f09ea3ef0 100644
--- a/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml
+++ b/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml
@@ -3,21 +3,20 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a factory for DefaultSessionCache                           -->
   <!-- ===================================================================== -->
   <Call name="addBean">
-   <Arg>
-    <New class="org.eclipse.jetty.server.session.DefaultSessionCacheFactory">
-     <Set name="evictionPolicy"><Property name="jetty.session.evictionPolicy" default="-1" /></Set>
-     <Set name="saveOnInactiveEvict"><Property name="jetty.session.saveOnInactiveEvict" default="false" /></Set>
-     <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
-     <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
-     <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
-     <Set name="invalidateOnShutdown"><Property name="jetty.session.invalidateOnShutdown" default="false"/></Set>
-    </New>
-   </Arg>
+    <Arg>
+      <New class="org.eclipse.jetty.server.session.DefaultSessionCacheFactory">
+        <Set name="evictionPolicy"><Property name="jetty.session.evictionPolicy" default="-1" /></Set>
+        <Set name="saveOnInactiveEvict"><Property name="jetty.session.saveOnInactiveEvict" default="false" /></Set>
+        <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
+        <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
+        <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
+        <Set name="invalidateOnShutdown"><Property name="jetty.session.invalidateOnShutdown" default="false"/></Set>
+      </New>
+    </Arg>
   </Call>
 
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/session-cache-null.xml b/jetty-server/src/main/config/etc/sessions/session-cache-null.xml
index 7de90393a52..9e8928d0cac 100644
--- a/jetty-server/src/main/config/etc/sessions/session-cache-null.xml
+++ b/jetty-server/src/main/config/etc/sessions/session-cache-null.xml
@@ -3,18 +3,17 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-
   <!-- ===================================================================== -->
   <!-- Configure a factory for NullSessionCache                              -->
   <!-- ===================================================================== -->
   <Call name="addBean">
-   <Arg>
-    <New class="org.eclipse.jetty.server.session.NullSessionCacheFactory">
-     <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
-     <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
-     <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
-    </New>
-   </Arg>
+    <Arg>
+      <New class="org.eclipse.jetty.server.session.NullSessionCacheFactory">
+        <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
+        <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false" /></Set>
+        <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false" /></Set>
+      </New>
+    </Arg>
   </Call>
 
 </Configure>
diff --git a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
index 229a7f90c4d..cfcfdaa1e88 100644
--- a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
+++ b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
@@ -13,8 +13,6 @@
     </Arg>
   </Call>
 
-  
-  
   <Call name="addBean">
    <Arg>
     <New class="org.eclipse.jetty.server.session.CachingSessionDataStoreFactory">
diff --git a/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml b/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml
index 35c66d9719d..e784968e37b 100644
--- a/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml
+++ b/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml
@@ -2,38 +2,38 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-    <Call name="insertHandler">
-        <Arg>
-            <New id="InetAccessHandler" class="org.eclipse.jetty.server.handler.InetAccessHandler">
-                <Call name="include">
-                    <Arg>
-                        <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-                            <Arg><Property name="jetty.inetaccess.include" default=""/></Arg>
-                        </Call>
-                    </Arg>
-                </Call>
-                <Call name="exclude">
-                    <Arg>
-                        <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-                            <Arg><Property name="jetty.inetaccess.exclude" default=""/></Arg>
-                        </Call>
-                    </Arg>
-                </Call>
-                <Call name="includeConnectors">
-                    <Arg>
-                        <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-                            <Arg><Property name="jetty.inetaccess.includeConnectors" default=""/></Arg>
-                        </Call>
-                    </Arg>
-                </Call>
-                <Call name="excludeConnectors">
-                    <Arg>
-                        <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-                            <Arg><Property name="jetty.inetaccess.excludeConnectors" default=""/></Arg>
-                        </Call>
-                    </Arg>
-                </Call>
-            </New>
-        </Arg>
-    </Call>
+  <Call name="insertHandler">
+    <Arg>
+      <New id="InetAccessHandler" class="org.eclipse.jetty.server.handler.InetAccessHandler">
+        <Call name="include">
+          <Arg>
+            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
+              <Arg><Property name="jetty.inetaccess.include" default="" /></Arg>
+            </Call>
+          </Arg>
+        </Call>
+        <Call name="exclude">
+          <Arg>
+            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
+              <Arg><Property name="jetty.inetaccess.exclude" default="" /></Arg>
+            </Call>
+          </Arg>
+        </Call>
+        <Call name="includeConnectors">
+          <Arg>
+            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
+              <Arg><Property name="jetty.inetaccess.includeConnectors" default="" /></Arg>
+            </Call>
+          </Arg>
+        </Call>
+        <Call name="excludeConnectors">
+          <Arg>
+            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
+              <Arg><Property name="jetty.inetaccess.excludeConnectors" default="" /></Arg>
+            </Call>
+          </Arg>
+        </Call>
+      </New>
+    </Arg>
+  </Call>
 </Configure>