diff --git a/apps/routerconsole/jsp/css.jsi b/apps/routerconsole/jsp/css.jsi
index 6bdafa20c..2687e532e 100644
--- a/apps/routerconsole/jsp/css.jsi
+++ b/apps/routerconsole/jsp/css.jsi
@@ -28,12 +28,10 @@
            i2pcontextId = (String) session.getAttribute("i2p.contextId");
        }
    } catch (IllegalStateException ise) {}
-%>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+%><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <jsp:useBean class="net.i2p.router.web.CSSHelper" id="intl" scope="request" />
 <jsp:setProperty name="intl" property="contextId" value="<%=i2pcontextId%>" />
-<link rel="icon" href="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/favicon.ico">
-<%
+<link rel="icon" href="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/favicon.ico"><%
    response.setHeader("Accept-Ranges", "none");
 
    // clickjacking
@@ -53,25 +51,20 @@
        intl.setLang(request.getParameter("lang"));
        intl.setNews(request.getParameter("news"));
    }
-%>
-<link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css">
+%><link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css">
 <%
    if (intl.getLang().equals("zh")) {
        // make the fonts bigger for chinese
-%>
-<link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console_big.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css">
+%><link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console_big.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css">
 <%
    } else if (intl.getLang().equals("ar")) {
        // Use RTL theme for Arabic
-%>
-<link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console_ar.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css">
+%><link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console_ar.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css">
 <%
    }
    if (!intl.allowIFrame(request.getHeader("User-Agent"))) {
-%>
-<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
+%><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
 <link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>mobile.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css">
 <%
    }
-%>
-<!--[if IE]><link href="/themes/console/classic/ieshim.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /><![endif]-->
+%><!--[if IE]><link href="/themes/console/classic/ieshim.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /><![endif]-->
diff --git a/apps/routerconsole/jsp/xhr1.jsi b/apps/routerconsole/jsp/xhr1.jsi
index 572e497d8..31071edcc 100644
--- a/apps/routerconsole/jsp/xhr1.jsi
+++ b/apps/routerconsole/jsp/xhr1.jsi
@@ -1,41 +1,32 @@
-<%@page import="net.i2p.router.web.helpers.SummaryHelper" %>
-<%
+<%@page import="net.i2p.router.web.helpers.SummaryHelper" %><%
 /*
  * Note:
  * This is included on every refresh, so keep whitespace etc. to a minimum.
  */
-%>
-<jsp:useBean class="net.i2p.router.web.helpers.SummaryHelper" id="helper" scope="request" />
+%><jsp:useBean class="net.i2p.router.web.helpers.SummaryHelper" id="helper" scope="request" />
 <jsp:setProperty name="helper" property="contextId" value="<%=i2pcontextId%>" />
 <jsp:setProperty name="helper" property="action" value="<%=request.getParameter(\"action\")%>" />
 <jsp:setProperty name="helper" property="updateNonce" value="<%=request.getParameter(\"updateNonce\")%>" />
-<jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter(\"consoleNonce\")%>" />
-<%
+<jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter(\"consoleNonce\")%>" /><%
     String reqURI = request.getRequestURI();
     if (reqURI.contains("/xhr1"))
         reqURI = request.getParameter("requestURI");
     helper.setRequestURI(reqURI);
-%>
-<% helper.storeWriter(out); %>
-<% helper.storeNewsHelper(newshelper); %>
-<%
+    helper.storeWriter(out);
+    helper.storeNewsHelper(newshelper);
 /*
  * The following is required for the reseed button to work, although we probably
  * only need the reseedNonce property.
  */
-%>
-<jsp:useBean class="net.i2p.router.web.helpers.ReseedHandler" id="reseed" scope="request" />
-<jsp:setProperty name="reseed" property="*" />
-<%
+%><jsp:useBean class="net.i2p.router.web.helpers.ReseedHandler" id="reseed" scope="request" />
+<jsp:setProperty name="reseed" property="*" /><%
 /*
  * The following is required for the update buttons to work, although we probably
  * only need the updateNonce property.
  */
-%>
-<jsp:useBean class="net.i2p.router.web.UpdateHandler" id="update" scope="request" />
+%><jsp:useBean class="net.i2p.router.web.UpdateHandler" id="update" scope="request" />
 <jsp:setProperty name="update" property="*" />
-<jsp:setProperty name="update" property="contextId" value="<%=i2pcontextId%>" />
-<%
+<jsp:setProperty name="update" property="contextId" value="<%=i2pcontextId%>" /><%
     // moved to java for ease of translation
     helper.renderSummaryBar();
 %>