diff --git a/WORKSPACE b/WORKSPACE
index 9a4330d..08f8524 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,12 +1,17 @@
 workspace(name = "gitiles")
+
 load("//tools:bazlets.bzl", "load_bazlets")
+
 load_bazlets(
     commit = "0f87babe07a555425d829c6e7951e296e9e24579",
-#    local_path = "/home/<user>/projects/bazlets"
+    #    local_path = "/home/<user>/projects/bazlets"
 )
-load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
-     "maven_jar",
-     "GERRIT")
+
+load(
+    "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
+    "maven_jar",
+    "GERRIT",
+)
 
 maven_jar(
     name = "commons_lang",
@@ -35,8 +40,8 @@
 maven_jar(
     name = "jsr305",
     artifact = "com.google.code.findbugs:jsr305:3.0.0",
-    sha1 = "5871fb60dc68d67da54a663c3fd636a10a532948",
     attach_source = False,
+    sha1 = "5871fb60dc68d67da54a663c3fd636a10a532948",
 )
 
 maven_jar(
@@ -126,29 +131,29 @@
 maven_jar(
     name = "jgit",
     artifact = "org.eclipse.jgit:org.eclipse.jgit:" + JGIT_VERS,
-    sha1 = "a2b5970b853f8fee64589fc1103c0ceb7677ba63",
     repository = GERRIT,
+    sha1 = "a2b5970b853f8fee64589fc1103c0ceb7677ba63",
 )
 
 maven_jar(
     name = "jgit_servlet",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + JGIT_VERS,
-    sha1 = "d3aa54bd610db9a5c246aa8fef13989982c98628",
     repository = GERRIT,
+    sha1 = "d3aa54bd610db9a5c246aa8fef13989982c98628",
 )
 
 maven_jar(
     name = "jgit_junit",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + JGIT_VERS,
-    sha1 = "6c2b2f192c95d25a2e1576aee5d1169dd8bd2266",
     repository = GERRIT,
+    sha1 = "6c2b2f192c95d25a2e1576aee5d1169dd8bd2266",
 )
 
 maven_jar(
     name = "jgit_archive_library",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + JGIT_VERS,
-    sha1 = "a728cf277396f1227c5a8dffcf5dee0188fc0821",
     repository = GERRIT,
+    sha1 = "a728cf277396f1227c5a8dffcf5dee0188fc0821",
 )
 
 maven_jar(
@@ -166,8 +171,8 @@
 maven_jar(
     name = "tukaani_xz",
     artifact = "org.tukaani:xz:1.4",
-    sha1 = "18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3",
     attach_source = False,
+    sha1 = "18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3",
 )
 
 maven_jar(
diff --git a/gitiles-dev/BUILD b/gitiles-dev/BUILD
index bbb6de2..e58623d 100644
--- a/gitiles-dev/BUILD
+++ b/gitiles-dev/BUILD
@@ -1,6 +1,7 @@
 java_library(
     name = "lib",
     srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
     deps = [
         "//gitiles-servlet:servlet",
         "//lib:guava",
@@ -13,7 +14,6 @@
         "//lib/slf4j:slf4j-simple",
         "//lib/soy",
     ],
-    visibility = ["//visibility:public"],
 )
 
 java_binary(
diff --git a/gitiles-servlet/BUILD b/gitiles-servlet/BUILD
index 6b9fdef..94ddc8e 100644
--- a/gitiles-servlet/BUILD
+++ b/gitiles-servlet/BUILD
@@ -63,6 +63,7 @@
         ],
         exclude = ["**/ServletTest.java"],
     ),
+    visibility = ["//visibility:public"],
     runtime_deps = ["//lib/junit:hamcrest-core"],
     deps = DEPS + [
         ":servlet",
@@ -72,7 +73,6 @@
         "//lib/jgit:junit",
         "//lib/junit",
     ],
-    visibility = ["//visibility:public"],
 )
 
 load("@com_googlesource_gerrit_bazlets//tools:javadoc.bzl", "java_doc")
diff --git a/lib/soy/BUILD b/lib/soy/BUILD
index 2cf2050..34835b3 100644
--- a/lib/soy/BUILD
+++ b/lib/soy/BUILD
@@ -5,11 +5,11 @@
 java_library(
     name = "soy",
     exports = [
-      "@soy//jar",
+        "@soy//jar",
     ],
     runtime_deps = [
-      "@icu4j//jar",
-      "@html_types//jar",
-      "@protobuf//jar",
+        "@html_types//jar",
+        "@icu4j//jar",
+        "@protobuf//jar",
     ],
 )
diff --git a/tools/BUILD b/tools/BUILD
index 8b13789..e69de29 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -1 +0,0 @@
-
diff --git a/tools/maven/BUILD b/tools/maven/BUILD
index 07ae8b0..defb13a 100644
--- a/tools/maven/BUILD
+++ b/tools/maven/BUILD
@@ -2,14 +2,6 @@
 load("@com_googlesource_gerrit_bazlets//tools/maven:package.bzl", "maven_package")
 
 maven_package(
-    version = GITILES_VERSION,
-    group = "com.google.gitiles",
-    repository = "gerrit-maven-repository",
-    url = "gs://gerrit-maven",
-    jar = {
-        "blame-cache": "//blame-cache:lib",
-        "gitiles-servlet": "//gitiles-servlet:servlet",
-    },
     src = {
         "blame-cache": "//blame-cache:liblib-src.jar",
         "gitiles-servlet": "//gitiles-servlet:libservlet-src.jar",
@@ -18,4 +10,12 @@
         "blame-cache": "//blame-cache:javadoc",
         "gitiles-servlet": "//gitiles-servlet:javadoc",
     },
+    group = "com.google.gitiles",
+    jar = {
+        "blame-cache": "//blame-cache:lib",
+        "gitiles-servlet": "//gitiles-servlet:servlet",
+    },
+    repository = "gerrit-maven-repository",
+    url = "gs://gerrit-maven",
+    version = GITILES_VERSION,
 )