diff --git a/webapp/src/main/webapp/error.jsp b/webapp/src/main/webapp/error.jsp
index 93561b59fc..4bd25405cf 100755
--- a/webapp/src/main/webapp/error.jsp
+++ b/webapp/src/main/webapp/error.jsp
@@ -8,7 +8,7 @@
 <%@page import="org.apache.commons.logging.Log"%>
 <%@page import="org.apache.commons.logging.LogFactory"%>
 <%
-// We have seen that this page can throw its own error.
+   // We have seen that this page can throw its own error.
    // Before it does so, be sure that we have written the original error to the log.
     Object c = request.getAttribute("javax.servlet.jsp.jspException");
     if (c instanceof Throwable) {
@@ -18,15 +18,15 @@
     }
 
 
-    VitroRequest vreq = new VitroRequest(request);
-    ApplicationBean appBean = vreq.getAppBean();
-    String themeDir = appBean.getThemeDir();
+            VitroRequest vreq = new VitroRequest(request);
+            ApplicationBean appBean = vreq.getAppBean();
+            String themeDir = appBean.getThemeDir();
 
-    request.setAttribute("bodyJsp", "/errorbody.jsp");
-    request.setAttribute("title", "Error");
-    request.setAttribute("css", "");
-    request.setAttribute("themeDir", themeDir);
-%>
+            request.setAttribute("bodyJsp", "/errorbody.jsp");
+            request.setAttribute("title", "Error");
+            request.setAttribute("css", "");
+            request.setAttribute("themeDir", themeDir);
+            %>
 
 
     <jsp:include page="/templates/page/doctype.jsp"/>
diff --git a/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp b/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp
index b3f3f88d96..322abb0aeb 100644
--- a/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp
+++ b/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp
@@ -54,11 +54,10 @@ function disableProperties(){
     <input type="radio" value="pattern" name="concatenate" onclick="selectProperties()">Use pattern based on values of </input>
 
 
-    <%
-    Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
-           Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
-           Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
-           Entry<String, LinkedList<String>> entry = null;
+    <% Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
+       Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
+       Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
+       Entry<String, LinkedList<String>> entry = null;
     %>
 
     <select name="property" id="properties" disabled="disabled">
diff --git a/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp b/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp
index 4a76b7ac5f..2a4c5e7cac 100644
--- a/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp
+++ b/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp
@@ -24,15 +24,15 @@
         <select name="workflowURI">
 
         <%
-        OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List savedQueries = (List) request.getAttribute("workflows");
-        	          for (Iterator it = savedQueries.iterator(); it.hasNext();)  {
-        	              Individual savedQuery = (Individual) it.next();
+	          for (Iterator it = savedQueries.iterator(); it.hasNext();)  {
+	              Individual savedQuery = (Individual) it.next();
                       String queryURI = savedQuery.getURI();
                       String queryLabel = savedQuery.getLabel(null);
-        %> <option value="<%=queryURI%>"><%=queryLabel%></option> <%
+                      %> <option value="<%=queryURI%>"><%=queryLabel%></option> <%
                   }
               } finally {
                   jenaOntModel.leaveCriticalSection();
diff --git a/webapp/src/main/webapp/jenaIngest/merge_result.jsp b/webapp/src/main/webapp/jenaIngest/merge_result.jsp
index 540441974b..1a6e73d207 100644
--- a/webapp/src/main/webapp/jenaIngest/merge_result.jsp
+++ b/webapp/src/main/webapp/jenaIngest/merge_result.jsp
@@ -13,7 +13,7 @@
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Merge Individuals</h2>
 
 <%
-MergeResult resultObj = (MergeResult) request.getAttribute("result");
+    MergeResult resultObj = (MergeResult) request.getAttribute("result");
     String result = resultObj.getResultText();
 %>
 
diff --git a/webapp/src/main/webapp/jenaIngest/permanentURI.jsp b/webapp/src/main/webapp/jenaIngest/permanentURI.jsp
index 013f03567a..9157d9991e 100644
--- a/webapp/src/main/webapp/jenaIngest/permanentURI.jsp
+++ b/webapp/src/main/webapp/jenaIngest/permanentURI.jsp
@@ -29,14 +29,13 @@ URIs exactly of the form created through the GUI interface.</p>
 <input type="hidden" name="action" value="permanentURI" />
 <p>Current namespace of resources
 <select name=oldNamespace>
-<%
-List namespaces = (List)request.getAttribute("namespaceList");
+<%List namespaces = (List)request.getAttribute("namespaceList");
 if(namespaces != null) {
 	Iterator namespaceItr = namespaces.iterator();
 	Integer count = 0;
 	while (namespaceItr.hasNext()){
 		String namespaceText = (String) namespaceItr.next();
-%>
+		%>
         <option value="<%=namespaceText%>"><%=namespaceText%></option>
 <%  }
 }%>
diff --git a/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp b/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp
index 4c808f94fa..76b81e8eb5 100644
--- a/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp
+++ b/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp
@@ -58,11 +58,10 @@ function disableProperties(){
     <input type="radio" value="pattern" name="concatenate" onclick="selectProperties()">Use pattern based on values of </input>
 
 
-    <%
-    Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
-           Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
-           Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
-           Entry<String, LinkedList<String>> entry = null;
+    <% Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
+       Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
+       Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
+       Entry<String, LinkedList<String>> entry = null;
     %>
     <%if(itr.hasNext()){%>
     <select name="property" id="properties" disabled="disabled">
diff --git a/webapp/src/main/webapp/jenaIngest/renameResult.jsp b/webapp/src/main/webapp/jenaIngest/renameResult.jsp
index c7855dfe33..a6c38dbb60 100644
--- a/webapp/src/main/webapp/jenaIngest/renameResult.jsp
+++ b/webapp/src/main/webapp/jenaIngest/renameResult.jsp
@@ -9,7 +9,5 @@
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Rename Resource</h2>
 
-<%
-String result = (String) request.getAttribute("result");
-%>
+<%String result = (String) request.getAttribute("result");%>
 <p><b><%=result%></b></p>
diff --git a/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp b/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp
index f1d6a175fb..4d705c3e20 100644
--- a/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp
+++ b/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp
@@ -48,22 +48,22 @@
 <h3>SPARQL Query <select name="savedQuery">
 	<option value="">select saved query</option>
 	<%
-	OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
-	      jenaOntModel.enterCriticalSection(Lock.READ);
-	      try {
-	          List savedQueries = (List) request.getAttribute("savedQueries");
-		          for (Iterator it = savedQueries.iterator(); it.hasNext();)  {
-		              Individual savedQuery = (Individual) it.next();
-	              String queryURI = savedQuery.getURI();
-	              String queryLabel = savedQuery.getLabel(null);
-	%>
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
+              jenaOntModel.enterCriticalSection(Lock.READ);
+              try {
+                  List savedQueries = (List) request.getAttribute("savedQueries");
+	          for (Iterator it = savedQueries.iterator(); it.hasNext();)  {
+	              Individual savedQuery = (Individual) it.next();
+                      String queryURI = savedQuery.getURI();
+                      String queryLabel = savedQuery.getLabel(null);
+                      %>
 	<option value="<%=queryURI%>"><%=queryLabel%></option>
 	<%
-	}
-	      } finally {
-	          jenaOntModel.leaveCriticalSection();
-		      }
-	%>
+                  }
+              } finally {
+                  jenaOntModel.leaveCriticalSection();
+	      }
+        %>
 </select>
 
 <textarea rows="25" cols="40" name="sparqlQueryStr" class="maxWidth"><c:choose>
@@ -77,19 +77,17 @@ PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
 PREFIX xsd:   &lt;http://www.w3.org/2001/XMLSchema#&gt;
 PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
 PREFIX swrl:  &lt;http://www.w3.org/2003/11/swrl#&gt;
-PREFIX swrlb: &lt;http://www.w3.org/2003/11/swrlb#&gt;<%
-    List prefixes = (List)request.getAttribute("prefixList");
-    if(prefixes != null){
-    	Iterator prefixItr = prefixes.iterator();
-    	Integer count = 0;
-    	while (prefixItr.hasNext()){
-    		String prefixText = (String) prefixItr.next();
-    		if(prefixText.equals("(not yet specified)")){
-    			count++;
-    			prefixText = "p." + count.toString();
-    		}
-    		String urlText = (String) prefixItr.next();
-    %>
+PREFIX swrlb: &lt;http://www.w3.org/2003/11/swrlb#&gt;<%List prefixes = (List)request.getAttribute("prefixList");
+if(prefixes != null){
+	Iterator prefixItr = prefixes.iterator();
+	Integer count = 0;
+	while (prefixItr.hasNext()){
+		String prefixText = (String) prefixItr.next();
+		if(prefixText.equals("(not yet specified)")){
+			count++;
+			prefixText = "p." + count.toString();
+		}
+		String urlText = (String) prefixItr.next();%>
 PREFIX <%=prefixText%>: <<%=urlText%>><%}}%>
 
 
diff --git a/webapp/src/main/webapp/jenaIngest/workflowStep.jsp b/webapp/src/main/webapp/jenaIngest/workflowStep.jsp
index 4c170c115d..8f1201b84b 100644
--- a/webapp/src/main/webapp/jenaIngest/workflowStep.jsp
+++ b/webapp/src/main/webapp/jenaIngest/workflowStep.jsp
@@ -26,16 +26,16 @@
 		<select name="workflowStepURI">
 
         <%
-        OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List workflowSteps  = (List) request.getAttribute("workflowSteps");
-        	          for (Iterator it = workflowSteps.iterator(); it.hasNext();)  {
-        	              Individual workflowStep = (Individual) it.next();
+	          for (Iterator it = workflowSteps.iterator(); it.hasNext();)  {
+	              Individual workflowStep = (Individual) it.next();
                       String workflowStepURI = workflowStep.getURI();
                       String workflowStepLabel = workflowStep.getLabel(null);
-        					  String workflowStepString = (workflowStepLabel != null) ? workflowStepLabel : workflowStepURI;
-        %> <option value="<%=workflowStepURI%>"><%=workflowStepString%></option> <%
+					  String workflowStepString = (workflowStepLabel != null) ? workflowStepLabel : workflowStepURI;
+                      %> <option value="<%=workflowStepURI%>"><%=workflowStepString%></option> <%
                   }
               } finally {
                   jenaOntModel.leaveCriticalSection();
diff --git a/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp b/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp
index 299e095acb..90cb6d8a47 100644
--- a/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp
+++ b/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp
@@ -11,6 +11,6 @@
 <vitro:confirmAuthorization />
 
 <p>Uploaded XML files and converted to RDF.</p>
-<p>Loaded <%=request.getAttribute("statementCount")%> statements to the model <%=request.getAttribute("targetModel")%>.</p>
+<p>Loaded <%= request.getAttribute("statementCount") %> statements to the model <%= request.getAttribute("targetModel") %>.</p>
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a></h2>
diff --git a/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp b/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp
index 575ba24399..f52b232237 100644
--- a/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp
+++ b/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp
@@ -6,13 +6,13 @@
 <%@ page import="edu.cornell.mannlib.vedit.beans.ButtonForm" %>
 
 <%
-if (request.getAttribute("title") != null) {
-%>
+if (request.getAttribute("title") != null) { %>
     <h2><%=request.getAttribute("title")%></h2><%
-    }
+}
+
+ArrayList<String> logResults = (ArrayList<String>)request.getAttribute("results");
 
-    ArrayList<String> logResults = (ArrayList<String>)request.getAttribute("results");
-    %>
+%>
 
 <div class="editingForm">
 	<table style="margin-bottom:1.5ex;">
diff --git a/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp b/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp
index 22a592240d..f264595642 100644
--- a/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp
+++ b/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp
@@ -32,9 +32,7 @@
          </c:if>
     </c:forEach>
 
-    <%
-    if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {
-    %>
+    <%  if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {  %>
         <a href='<c:url value=".${requestScope.servlet}?&amp;alpha=all&amp;${requestScope.controllerParam}"/>'>all </a>
         <c:if test='${not empty requestScope.count }'>
             (${requestScope.count} that start with ${requestScope.alpha })
diff --git a/webapp/src/main/webapp/templates/edit/fetch/horizontal.jsp b/webapp/src/main/webapp/templates/edit/fetch/horizontal.jsp
index b91c35fd69..a9c4c99c00 100644
--- a/webapp/src/main/webapp/templates/edit/fetch/horizontal.jsp
+++ b/webapp/src/main/webapp/templates/edit/fetch/horizontal.jsp
@@ -4,41 +4,31 @@
 <%@ page import="edu.cornell.mannlib.vedit.beans.ButtonForm" %>
 
 <%
-if (request.getAttribute("title") != null) {
-%>
+if (request.getAttribute("title") != null) { %>
     <h2><%=request.getAttribute("title")%></h2><%
-    }
-    %>
-<%
-if (request.getAttribute("title") == "Tabs") {
+}
 %>
+<%
+if (request.getAttribute("title") == "Tabs") { %>
     <div id="flash-message" role="alert">Tabs have been deprecated with the 1.2 release and is no longer recommended for production VIVO instances. All development relating to tabs has ceased, and it will not be distributed in future releases.
     </div><%
-    }
-    %>
+}
+%>
 
 <table style="margin-bottom:1.5ex;">
 <tr>
   <td style="width:0;padding:0;margin:0;"/>
 
 
-<%
-if (request.getAttribute("horizontalJspAddButtonUrl") != null) {
-%>
+<%if (request.getAttribute("horizontalJspAddButtonUrl") != null) {%>
   <td>
     <form action="<%=request.getAttribute("horizontalJspAddButtonUrl")%>" method="get"><input type="submit" class="form-button" value="<%=request.getAttribute("horizontalJspAddButtonText")%>"/>
-<%
-if (request.getAttribute("horizontalJspAddButtonControllerParam") != null) {
-%>
+<%  if (request.getAttribute("horizontalJspAddButtonControllerParam") != null) {%>
         <input type="hidden" name="controller" value="<%=request.getAttribute("horizontalJspAddButtonControllerParam")%>"/>
-<%
-}
-    if (request.getAttribute("home") != null) {
-%>
+<%  }
+    if (request.getAttribute("home") != null) {%>
         <input type="hidden" name="home" value="<%=request.getAttribute("home")%>"/>
-<%
-}
-%>
+<%  }%>
     </form>
   </td>
 <%
@@ -47,27 +37,20 @@ List <ButtonForm> topButtons = (List)request.getAttribute("topButtons");
 if (topButtons!=null) {
     Iterator iter = topButtons.iterator();
     while (iter.hasNext()){
-       ButtonForm b = (ButtonForm)iter.next();
-%>
+       ButtonForm b = (ButtonForm)iter.next();%>
        <td>
        <form <%=b.getCssClass()%> action="<%=b.getAction()%>" method="get">
-<%
-HashMap<String,String> params=b.getParams();
+<%         HashMap<String,String> params=b.getParams();
            if (params!=null) {
-       for (String key : b.getParams().keySet()) {
-%>
+               for (String key : b.getParams().keySet()) {%>
                    <input type="hidden" name="<%=key%>" value="<%=params.get(key)%>"/>
-<%
-}
-           }
-%>
+<%             }
+           }%>
            <input type="submit" class="form-button" value="<%=b.getLabel()%>"/>
        </form>
        </td>
-<%
-}
-}
-%>
+<%  }
+}%>
 
 </tr></table>
 
@@ -75,8 +58,7 @@ HashMap<String,String> params=b.getParams();
 
 <jsp:useBean id="results" class="java.util.ArrayList" scope="request" />
 
-<%
-int columns = 0;
+<% int columns = 0;
     boolean havePostQueryData = false;
 
     String editFormStr = (String)request.getAttribute("editform");
@@ -92,169 +74,150 @@ int columns = 0;
         /* start enclosing table cell that holds all results */
 %>
 
-<%
-String suppressStr = null;
+<%      String suppressStr = null;
         boolean isPostQHeaderRow = false;
 
         if ( ( suppressStr = (String)request.getAttribute("suppressquery")) == null ) { // only inserted into request if true
 %>
-<i><b><%=(results.size() - columns) / columns%></b> rows of results were retrieved in <b><%=columns%></b> columns for query "<%=request.getAttribute("querystring")%>".</i>
+<i><b><%=(results.size() - columns) / columns %></b> rows of results were retrieved in <b><%= columns %></b> columns for query "<%=request.getAttribute("querystring")%>".</i>
 <br/>
-<%
-}
+<%      }
         Iterator iter = results.iterator();
         int resultCount = 0, primaryRowNumber=0, pageRowNumber=0;
         while (iter.hasNext()) {
-    String classString;
+            String classString;
 
-    String thisResult = (String)iter.next();
-    if ( "+".equals(thisResult) ) {
-        havePostQueryData = true;
-        classString = "database_postheader";
-        isPostQHeaderRow = true;
-        thisResult = "&nbsp;";
-    } else if ( thisResult != null && thisResult.indexOf("@@")== 0) {
-        classString=thisResult.substring(2);
-        thisResult ="&nbsp;"; //leave as follows for diagnostics: thisResult.substring(2);
-        isPostQHeaderRow = false;
-    } else {
-        classString = isPostQHeaderRow ? "database_postheader" : "row";
-        if ( thisResult == null || "".equals(thisResult) )
-            thisResult = "&nbsp;";
-    }
-        if ( resultCount == 0 ) { // first pass : column names
+            String thisResult = (String)iter.next();
+            if ( "+".equals(thisResult) ) {
+                havePostQueryData = true;
+                classString = "database_postheader";
+                isPostQHeaderRow = true;
+                thisResult = "&nbsp;";
+            } else if ( thisResult != null && thisResult.indexOf("@@")== 0) {
+                classString=thisResult.substring(2);
+                thisResult ="&nbsp;"; //leave as follows for diagnostics: thisResult.substring(2);
+                isPostQHeaderRow = false;
+            } else {
+                classString = isPostQHeaderRow ? "database_postheader" : "row";
+                if ( thisResult == null || "".equals(thisResult) )
+                    thisResult = "&nbsp;";
+            }
+                if ( resultCount == 0 ) { // first pass : column names
 %>
 
 <table border="0" cellpadding="2" cellspacing="0" width = "100%">
-                        <%
-                        if ( clickSortStr != null && "true".equals(clickSortStr) ) {
-                                    if ( (results.size() - columns) / columns > 2 ) {
-                        %>
+                        <%              if ( clickSortStr != null && "true".equals(clickSortStr) ) {
+                    if ( (results.size() - columns) / columns > 2 ) {
+%>
 <tr>
 <td class="database_upperleftcorner" colspan="<%=columns%>">
 <i>Click on the column header to sort rows by that column.</i>
 </td>
 </tr>
-<%
-}
-        }
+<%                  }
+                }
 %>
 
 <tr class="row">
     <td class="rownumheader">#</td>
-     <%
-     if ( !("XX".equals(thisResult) )) {
-     %>
+     <%             if ( !("XX".equals(thisResult) )) {
+%>
     <td class="database_header">
-<%
-}
-        } else if ( resultCount == columns ) {  // end column names and start numbered list
-        ++ primaryRowNumber;
-        ++ pageRowNumber;
-        firstValue = thisResult;
+<%              }
+                } else if ( resultCount == columns ) {  // end column names and start numbered list
+                ++ primaryRowNumber;
+                ++ pageRowNumber;
+                firstValue = thisResult;
 %>
 
 </tr>
 <tr valign="top" class="row">
     <td class="rownum">1</td>
-      <%
-      if ( !("XX".equals(thisResult) )) {
-      %>
+      <%                if ( !("XX".equals(thisResult) )) { %>
     <td class="row">
-<%
-}
-    } else if ( resultCount % columns == 0 ) {  // end row and start next row with calculated row number
-        ++ pageRowNumber;
+<%              }
+            } else if ( resultCount % columns == 0 ) {  // end row and start next row with calculated row number
+                ++ pageRowNumber;
 %>
 </tr>
 <!-- <tr valign="top" class="<%=classString%>" > -->
-      <%
-      if ( "row".equals(classString) ) {
-                  if ( havePostQueryData ) {
-      %>
+      <%                if ( "row".equals(classString) ) {
+                    if ( havePostQueryData ) {
+%>
 <tr><td>&nbsp;</td></tr>
-<%
-havePostQueryData = false;
-            }
-            ++ primaryRowNumber;
+<%                      havePostQueryData = false;
+                    }
+                    ++ primaryRowNumber;
 %>
 <tr valign="top" class="row">
-    <td class="rownum"><%=primaryRowNumber /*resultCount / columns*/%></td>
-<%
-} else { // classString does not equal "row"
+    <td class="rownum"><%= primaryRowNumber /*resultCount / columns*/%></td>
+<%              } else { // classString does not equal "row"
 %>
 <tr valign="top" class="<%=classString%>" >
-<%
-}
-        if ( !("XX".equals(thisResult) )) {
+<%              }
+                if ( !("XX".equals(thisResult) )) {
 %>
     <td class="<%=classString%>">
-<%
-}
-    } else { // not the end of a row
-        if ( resultCount <= columns ) { // header rows
-            if ( !("XX".equals(thisResult) )) {
+<%              }
+            } else { // not the end of a row
+                if ( resultCount <= columns ) { // header rows
+                    if ( !("XX".equals(thisResult) )) {
 %>
     <td class="database_header">
 <%
-}
-        } else if ( resultCount == columns + 1 ) {
-            secondValue=thisResult;
-            if ( !( "XX".equals(thisResult) )) {
+                    }
+                } else if ( resultCount == columns + 1 ) {
+                    secondValue=thisResult;
+                    if ( !( "XX".equals(thisResult) )) {
 %>
     <td class="row">
 <%
-}
-        } else  { // cells in later rows
-            if ( !( "XX".equals(thisResult) )) {
-                if ( "row".equals(classString) ) {
-                    if ( primaryRowNumber % 2 == 0 ) {
-                        if ( pageRowNumber % 2 == 0 ) {
+                    }
+                } else  { // cells in later rows
+                    if ( !( "XX".equals(thisResult) )) {
+                        if ( "row".equals(classString) ) {
+                            if ( primaryRowNumber % 2 == 0 ) {
+                                if ( pageRowNumber % 2 == 0 ) {
 %>
     <td class="rowalternate">
-<%
-} else {
+<%                              } else {
 %>
     <td class="row">
-<%
-}
-                    } else if ( pageRowNumber % 2 == 0 ) {
+<%                              }
+                            } else if ( pageRowNumber % 2 == 0 ) {
 %>
     <td class="rowalternate">
-<%
-} else {
+<%                          } else {
 %>
     <td class="row">
-<%
-}
-                } else {
+<%                          }
+                        } else {
 %>
     <td class="<%=classString%>" >
-<%
-}
+<%                      }
+                    }
+                }
             }
-        }
-    }
-        if ( !( "XX".equals(thisResult) )) {
+                if ( !( "XX".equals(thisResult) )) {
 %>
-                    <%=thisResult%>
+                    <%= thisResult %>
     </td>
 <%
-}
-    ++ resultCount;
+            }
+            ++ resultCount;
         }
 %>
   </tr>
 </table>
 <%
-} else { /* results not > 0 */
+    } else { /* results not > 0 */
         Iterator errorIter = results.iterator();
         while ( errorIter.hasNext()) {
-    String errorResult = (String)errorIter.next();
+            String errorResult = (String)errorIter.next();
 %>
-            <p>Error returned: <%=errorResult%></p>
+            <p>Error returned: <%= errorResult%></p>
 <%
-}
+        }
     }
 %>
 <%
@@ -264,12 +227,11 @@ if ( editFormStr != null  && minEditRoleStr != null ) {
         String currentRemoteAddrStr = request.getRemoteAddr();
         String storedRemoteAddr = (String)session.getAttribute("loginRemoteAddr");
         if ( storedRemoteAddr != null && currentRemoteAddrStr.equals( storedRemoteAddr ) ) {
-    int minEditRole = Integer.parseInt(  minEditRoleStr );
-    String authorizedRoleStr = (String)session.getAttribute("loginRole");
-    if ( authorizedRoleStr != null ) {
-        int authorizedRole = Integer.parseInt( authorizedRoleStr );
-        if ( authorizedRole >= minEditRole ) {
-%>
+            int minEditRole = Integer.parseInt(  minEditRoleStr );
+            String authorizedRoleStr = (String)session.getAttribute("loginRole");
+            if ( authorizedRoleStr != null ) {
+                int authorizedRole = Integer.parseInt( authorizedRoleStr );
+                if ( authorizedRole >= minEditRole ) { %>
                     <jsp:include page="<%=editFormStr%>" flush="true">
                     <jsp:param name="firstvalue" value="<%=firstValue%>" />
                     <jsp:param name="secondvalue" value="<%=secondValue%>" />
diff --git a/webapp/src/main/webapp/templates/edit/fetch/vertical.jsp b/webapp/src/main/webapp/templates/edit/fetch/vertical.jsp
index 4f382b49e2..fbe363869d 100644
--- a/webapp/src/main/webapp/templates/edit/fetch/vertical.jsp
+++ b/webapp/src/main/webapp/templates/edit/fetch/vertical.jsp
@@ -3,21 +3,14 @@
 <%@ page isThreadSafe = "false" %>
 <%@ page import="java.util.*,java.lang.String.*" %>
 
-<%
-if (request.getAttribute("title") != null) {
-%>
+<% if (request.getAttribute("title") != null) { %>
   <h2><%=request.getAttribute("title")%></h2>
-<%
-}
-%>
+<% } %>
 
 <%
 String headerStr = (String)request.getAttribute("header");
-if ( headerStr == null || (!headerStr.equalsIgnoreCase("noheader")) ) {
-%>
-<%
-}
-%>
+if ( headerStr == null || (!headerStr.equalsIgnoreCase("noheader")) ) { %>
+<%  } %>
 <jsp:useBean id="results" class="java.util.ArrayList" scope="request" />
 <%
 int rows = 0;
@@ -33,22 +26,16 @@ String clickSortStr = (String)request.getAttribute("clicksort");
 if ( rows > 0  && results.size() > rows ) { // avoid divide by zero error in next statement
     String suppressStr = null;
     int columns = results.size() / rows;
-    if ( ( suppressStr = (String)request.getAttribute("suppressquery")) == null ) { // only inserted into request if true
-%>
-        <p><i><b><%=columns - 1%></b> results were retrieved in <b><%=rows%></b> rows for query "<%=request.getAttribute("querystring")%>".</i></p>
-<%
-}
+    if ( ( suppressStr = (String)request.getAttribute("suppressquery")) == null ) { // only inserted into request if true %>
+        <p><i><b><%= columns - 1 %></b> results were retrieved in <b><%= rows %></b> rows for query "<%=request.getAttribute("querystring")%>".</i></p>
+<%  }
     if ( clickSortStr != null && clickSortStr.equals("true")) {
-        if ( columns > 2 ) {
-%>
+        if ( columns > 2 ) { %>
             <p><i>Click on the row header to sort columns by that row.</i></p>
-<%
-}
-    }
-%>
+<%      }
+    }  %>
     <table border="0" cellpadding="2" cellspacing="0" width="100%">
-<%
-String[] resultsArray = new String[results.size()]; // see Core Java Vol. 1 p.216
+<%  String[] resultsArray = new String[results.size()]; // see Core Java Vol. 1 p.216
     results.toArray( resultsArray );
     firstValue = resultsArray[ rows ];
     request.setAttribute("firstvalue",firstValue);
@@ -61,79 +48,61 @@ String[] resultsArray = new String[results.size()]; // see Core Java Vol. 1 p.21
     for ( int thisrow = 0; thisrow < rows; thisrow++ ) {
         //int currentPostQCol = 0;
         boolean dropRow = false;
-    for ( int thiscol = 0; thiscol < columns; thiscol++ ) {
-    String thisResult= resultsArray[ (rows * thiscol) + thisrow ];
-    if ( "+".equals(thisResult) ) { /* occurs all in first row, so postQHeaderCols should be correctly initialized */
-        classString = "postheaderright";
-        postQHeaderCols[ thiscol ] = true;
-        //++currentPostQCol;
-        thisResult="&nbsp;";
-    } else if ( thisResult != null && thisResult.indexOf("@@")== 0) {
-        classString="postheadercenter";
-        thisResult ="query values"; //leave as follows for diagnostics: thisResult.substring(2);
-        thisResult = thisResult.substring(2);
-    } else {
-        if ( postQHeaderCols[ thiscol ] == true )
-            classString = "postheaderright";
-        else if ( thiscol == 1 && thisrow < 1 ) // jc55 was thisrow<2
-            classString = "rowbold";
-        else
-            classString = "row";
-        if ( thisResult == null ||  "".equals(thisResult) )
-            thisResult="&nbsp;";
-    }
-    if ( thiscol == 0 ) { // 1st column of new row
-        if ( thisrow > 0 ) { // first must close prior row
-%>
+            for ( int thiscol = 0; thiscol < columns; thiscol++ ) {
+            String thisResult= resultsArray[ (rows * thiscol) + thisrow ];
+            if ( "+".equals(thisResult) ) { /* occurs all in first row, so postQHeaderCols should be correctly initialized */
+                classString = "postheaderright";
+                postQHeaderCols[ thiscol ] = true;
+                //++currentPostQCol;
+                thisResult="&nbsp;";
+            } else if ( thisResult != null && thisResult.indexOf("@@")== 0) {
+                classString="postheadercenter";
+                thisResult ="query values"; //leave as follows for diagnostics: thisResult.substring(2);
+                thisResult = thisResult.substring(2);
+            } else {
+                if ( postQHeaderCols[ thiscol ] == true )
+                    classString = "postheaderright";
+                else if ( thiscol == 1 && thisrow < 1 ) // jc55 was thisrow<2
+                    classString = "rowbold";
+                else
+                    classString = "row";
+                if ( thisResult == null ||  "".equals(thisResult) )
+                    thisResult="&nbsp;";
+            }
+            if ( thiscol == 0 ) { // 1st column of new row
+                if ( thisrow > 0 ) { // first must close prior row %>
                     </tr>
-                        <%
-                        if ("XX".equals(thisResult) ) {
-                                        dropRow = true;
-                                    }
-                        %>
+                        <%                  if ("XX".equals(thisResult) ) {
+                        dropRow = true;
+                    } %>
                     <tr valign="top" class="rowvert">  <!-- okay to start even a dropRow because it will get no <td> elements -->
-<%
-} else {
-%>
+<%              } else { %>
                     <tr valign="top" class="header">  <!-- okay to start even a dropRow because it will get no <td> elements -->
-<%
-}
-        if ( !dropRow ) {
-%>
+<%              }
+                if ( !dropRow ) { %>
                     <td width="15%" class="verticalfieldlabel">
                     <%=thisResult%>
-<%
-}
-    } else { // 2nd or higher column
-        if ( !dropRow ) {
-%>
+<%              }
+            } else { // 2nd or higher column
+                if ( !dropRow ) { %>
                     <td class="<%=classString%>" >
-                        <%
-                        if ("XX".equals(thisResult) ) {
-                        %>
+                        <%                  if ("XX".equals(thisResult) ) { %>
                         <%="&nbsp;"%>
-<%
-} else {
-%>
+<%                  } else { %>
                         <%=thisResult%>
-<%
-}
-        }
-    }
-    if ( !dropRow ) {
-%>
+<%                  }
+                }
+            }
+            if ( !dropRow ) { %>
                 </td>
-<%
-}
+<%          }
         }
-    }
-%>
+    }  %>
     </tr>
     </table>
 <%
 } else {
-    System.out.println("No results reported when " + rows + " rows and a result array size of " + results.size());
-%>
+    System.out.println("No results reported when " + rows + " rows and a result array size of " + results.size()); %>
     No results retrieved for query "<%=request.getAttribute("querystring")%>".
 <%  Iterator errorIter = results.iterator();
     while ( errorIter.hasNext()) {
diff --git a/webapp/src/main/webapp/templates/edit/specific/merge_result.jsp b/webapp/src/main/webapp/templates/edit/specific/merge_result.jsp
index 7e2944b28b..ce00e01f51 100644
--- a/webapp/src/main/webapp/templates/edit/specific/merge_result.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/merge_result.jsp
@@ -6,7 +6,5 @@
 <h2><a href="ingest">Ingest Home</a></h2>
 
 <h3>Merge Individuals</h3>
-<%
-String result = (String) request.getAttribute("result");
-%>
+<%String result = (String) request.getAttribute("result");%>
 <p><b><%=result%></b></p>
diff --git a/webapp/src/main/webapp/templates/entity/entityListForTabs.jsp b/webapp/src/main/webapp/templates/entity/entityListForTabs.jsp
index b493c3baaa..3ea942a80a 100644
--- a/webapp/src/main/webapp/templates/entity/entityListForTabs.jsp
+++ b/webapp/src/main/webapp/templates/entity/entityListForTabs.jsp
@@ -3,8 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page errorPage="/error.jsp"%>
-<%
-/***********************************************
+<%  /***********************************************
         Display a list of entities for a tab.
 
          request.attributes:
@@ -18,14 +17,12 @@
          bdc34 2006-01-27 created
     **********************************************/
         if (request.getAttribute("entities") == null){
-    String e="entityListForTabs.jsp expects that request attribute 'entities' be set to a List of Entity objects.";
-    throw new JspException(e);
+            String e="entityListForTabs.jsp expects that request attribute 'entities' be set to a List of Entity objects.";
+            throw new JspException(e);
         }
 %>
 <c:set var="searchViewPrefix" value="/templates/search/"/>
-<c:set var='entities' value='${requestScope.entities}' /><%
-/* just moving this into page scope for easy use */
-%>
+<c:set var='entities' value='${requestScope.entities}' /><%/* just moving this into page scope for easy use */ %>
 <c:set var='IMG_WIDTH' value='75'/>
 <jsp:include page="/templates/alpha/alphaIndex.jsp"/>
 <ul class='tabEntities entityListForTab'>
diff --git a/webapp/src/main/webapp/templates/page/bodyMsg.jsp b/webapp/src/main/webapp/templates/page/bodyMsg.jsp
index 68e89fcf85..db88240a2e 100644
--- a/webapp/src/main/webapp/templates/page/bodyMsg.jsp
+++ b/webapp/src/main/webapp/templates/page/bodyMsg.jsp
@@ -1,7 +1,6 @@
 <%-- $This file is distributed under the terms of the license in LICENSE$ --%>
 
-<%
-/***********************************************
+<%  /***********************************************
      A JSP for displaying a simple message.
      This JSP is intened to be wraped by basicPage.jsp
 
@@ -13,8 +12,8 @@
 
      if (request.getAttribute("msg") == null ){
          throw new JspException(
-         "bodyMsg.jsp expects that request parameter 'msg' be set to"
-         + " the message for the page.\n"
+                 "bodyMsg.jsp expects that request parameter 'msg' be set to"
+                 + " the message for the page.\n"
           );
      }
    // only get the msg from the attributes, because of cross site exploits,
diff --git a/webapp/src/main/webapp/templates/page/freemarkerTransition/footer.jsp b/webapp/src/main/webapp/templates/page/freemarkerTransition/footer.jsp
index 100b525508..b42e1e792b 100644
--- a/webapp/src/main/webapp/templates/page/freemarkerTransition/footer.jsp
+++ b/webapp/src/main/webapp/templates/page/freemarkerTransition/footer.jsp
@@ -4,7 +4,7 @@
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
 <%
-// This is here as a safety net. We should have gotten the values in identity.jsp,
+    // This is here as a safety net. We should have gotten the values in identity.jsp,
     // since it's the first jsp we hit.
     String footer = (String) request.getAttribute("ftl_footer");
     if (footer == null) {
diff --git a/webapp/src/main/webapp/templates/page/freemarkerTransition/menu.jsp b/webapp/src/main/webapp/templates/page/freemarkerTransition/menu.jsp
index dfa80002cd..db4829370e 100644
--- a/webapp/src/main/webapp/templates/page/freemarkerTransition/menu.jsp
+++ b/webapp/src/main/webapp/templates/page/freemarkerTransition/menu.jsp
@@ -4,7 +4,7 @@
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
 <%
-// This is here as a safety net. We should have gotten the values in identity.jsp,
+    // This is here as a safety net. We should have gotten the values in identity.jsp,
     // since it's the first jsp we hit.
     String menu = (String) request.getAttribute("ftl_menu");
     if (menu == null) {