diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java
index bf19e88..7fc2f9d 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java
@@ -247,10 +247,7 @@
    * @throws IOException an error occurred during rendering the header.
    */
   protected OutputStream startRenderCompressedStreamingHtml(
-      HttpServletRequest req,
-      HttpServletResponse res,
-      String templateName,
-      Map<String, ?> soyData)
+      HttpServletRequest req, HttpServletResponse res, String templateName, Map<String, ?> soyData)
       throws IOException {
     req.setAttribute(STREAMING_ATTRIBUTE, true);
     boolean gzip = false;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/Navbar.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/Navbar.java
index a0f05bb..cd63e3f 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/Navbar.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/Navbar.java
@@ -14,6 +14,8 @@
 
 package com.google.gitiles.doc;
 
+import static java.util.stream.Collectors.toSet;
+
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
 import com.google.gitiles.doc.html.HtmlBuilder;
@@ -24,7 +26,6 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import static java.util.stream.Collectors.toSet;
 import org.commonmark.node.Heading;
 import org.commonmark.node.Node;
 import org.eclipse.jgit.util.RawParseUtils;