diff --git a/BUILD b/BUILD
index d806bdb8b7..722e240851 100644
--- a/BUILD
+++ b/BUILD
@@ -45,28 +45,28 @@ pkg_war(
 )
 
 API_DEPS = [
-  "//gerrit-acceptance-framework:acceptance-framework_deploy.jar",
-  "//gerrit-acceptance-framework:liblib-src.jar",
-  "//gerrit-acceptance-framework:acceptance-framework-javadoc",
-  "//gerrit-extension-api:extension-api_deploy.jar",
-  "//gerrit-extension-api:libapi-src.jar",
-  "//gerrit-extension-api:extension-api-javadoc",
-  "//gerrit-plugin-api:plugin-api_deploy.jar",
-  "//gerrit-plugin-api:plugin-api-sources_deploy.jar",
-  "//gerrit-plugin-api:plugin-api-javadoc",
-  "//gerrit-plugin-gwtui:gwtui-api_deploy.jar",
-  "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar",
-  "//gerrit-plugin-gwtui:gwtui-api-javadoc",
+    "//gerrit-acceptance-framework:acceptance-framework_deploy.jar",
+    "//gerrit-acceptance-framework:liblib-src.jar",
+    "//gerrit-acceptance-framework:acceptance-framework-javadoc",
+    "//gerrit-extension-api:extension-api_deploy.jar",
+    "//gerrit-extension-api:libapi-src.jar",
+    "//gerrit-extension-api:extension-api-javadoc",
+    "//gerrit-plugin-api:plugin-api_deploy.jar",
+    "//gerrit-plugin-api:plugin-api-sources_deploy.jar",
+    "//gerrit-plugin-api:plugin-api-javadoc",
+    "//gerrit-plugin-gwtui:gwtui-api_deploy.jar",
+    "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar",
+    "//gerrit-plugin-gwtui:gwtui-api-javadoc",
 ]
 
 genrule2(
-    name = 'api',
-    srcs = API_DEPS,
+    name = "api",
     testonly = 1,
-    cmd = ' && '.join([
-        'cp $(SRCS) $$TMP',
-        'cd $$TMP',
-        'zip -qr $$ROOT/$@ .',
+    srcs = API_DEPS,
+    outs = ["api.zip"],
+    cmd = " && ".join([
+        "cp $(SRCS) $$TMP",
+        "cd $$TMP",
+        "zip -qr $$ROOT/$@ .",
     ]),
-    outs = ['api.zip'],
 )
diff --git a/Documentation/BUILD b/Documentation/BUILD
index 5e3e54e330..624802ca3a 100644
--- a/Documentation/BUILD
+++ b/Documentation/BUILD
@@ -54,11 +54,10 @@ license_map(
     visibility = ["//visibility:public"],
 )
 
-
 license_map(
     name = "js_licenses",
     targets = [
-        '//gerrit-gwtui:ui_module',
+        "//gerrit-gwtui:ui_module",
         "//polygerrit-ui/app:polygerrit_ui",
     ],
     visibility = ["//visibility:public"],
diff --git a/WORKSPACE b/WORKSPACE
index 891e407ee7..e8bc11b0a1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -537,6 +537,7 @@ maven_jar(
 )
 
 PROLOG_VERS = "1.4.3"
+
 PROLOG_REPO = GERRIT
 
 maven_jar(
@@ -1114,4 +1115,5 @@ bower_archive(
 load("//lib/js:bower_archives.bzl", "load_bower_archives")
 
 load_bower_archives()
+
 external_plugin_deps()
diff --git a/gerrit-acceptance-framework/BUILD b/gerrit-acceptance-framework/BUILD
index e6f2a79516..ca8ffbdcdd 100644
--- a/gerrit-acceptance-framework/BUILD
+++ b/gerrit-acceptance-framework/BUILD
@@ -40,6 +40,7 @@ java_library2(
         "//gerrit-pgm:util-nodep",
         "//gerrit-server:testutil",
         "//gerrit-server/src/main/prolog:common",
+        "//lib:jimfs",
         "//lib:truth",
         "//lib:truth-java8-extension",
         "//lib/auto:auto-value",
@@ -48,7 +49,6 @@ java_library2(
         "//lib/httpcomponents:httpcore",
         "//lib/jetty:servlet",
         "//lib/jgit/org.eclipse.jgit.junit:junit",
-        "//lib:jimfs",
         "//lib/log:impl_log4j",
         "//lib/log:log4j",
     ],
diff --git a/gerrit-acceptance-tests/BUILD b/gerrit-acceptance-tests/BUILD
index 4c1a62d98c..3875dc5238 100644
--- a/gerrit-acceptance-tests/BUILD
+++ b/gerrit-acceptance-tests/BUILD
@@ -1,7 +1,7 @@
 java_library(
     name = "lib",
-    srcs = ["src/test/java/com/google/gerrit/acceptance/Dummy.java"],
     testonly = 1,
+    srcs = ["src/test/java/com/google/gerrit/acceptance/Dummy.java"],
     visibility = ["//visibility:public"],
     exports = [
         "//gerrit-acceptance-framework:lib",
diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD
index 1eaaacbc3f..b66fd773d3 100644
--- a/gerrit-pgm/BUILD
+++ b/gerrit-pgm/BUILD
@@ -47,7 +47,7 @@ java_library(
         ":init-api",
         ":util",
         "//gerrit-common:annotations",
-        '//gerrit-elasticsearch:elasticsearch',
+        "//gerrit-elasticsearch:elasticsearch",
         "//gerrit-launcher:launcher",  # We want this dep to be provided_deps
         "//gerrit-lucene:lucene",
         "//lib:args4j",
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index 578c2e1e04..be45591bf1 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -70,7 +70,7 @@ java_library(
         "//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
         "//lib/jgit/org.eclipse.jgit:jgit",
         "//lib/joda:joda-time",
-        "//lib/jsoup:jsoup",
+        "//lib/jsoup",
         "//lib/log:api",
         "//lib/log:jsonevent-layout",
         "//lib/log:log4j",
diff --git a/lib/bouncycastle/BUILD b/lib/bouncycastle/BUILD
index efea4181e6..746a982cff 100644
--- a/lib/bouncycastle/BUILD
+++ b/lib/bouncycastle/BUILD
@@ -1,4 +1,3 @@
-
 java_library(
     name = "bcprov",
     data = ["//lib:LICENSE-bouncycastle"],
diff --git a/lib/codemirror/BUILD b/lib/codemirror/BUILD
index f8f6c0b2e8..9c03887b5e 100644
--- a/lib/codemirror/BUILD
+++ b/lib/codemirror/BUILD
@@ -4,8 +4,8 @@ load("//lib/codemirror:cm.bzl", "pkg_cm")
 # js_licenses.txt.
 java_library(
     name = "diff-match-patch",
-    runtime_deps = [ "@diff_match_patch//jar" ],
-    data = [ "//lib:LICENSE-Apache2.0" ],
+    data = ["//lib:LICENSE-Apache2.0"],
+    runtime_deps = ["@diff_match_patch//jar"],
 )
 
 pkg_cm()