diff --git a/apps/p4-tutorial/mytunnel/BUILD b/apps/p4-tutorial/mytunnel/BUILD
index 415084e..8bf5772 100644
--- a/apps/p4-tutorial/mytunnel/BUILD
+++ b/apps/p4-tutorial/mytunnel/BUILD
@@ -2,7 +2,7 @@
     "//apps/p4-tutorial/pipeconf:onos-apps-p4-tutorial-pipeconf",
 ]
 
-osgi_jar (
+osgi_jar(
     deps = COMPILE_DEPS,
 )
 
@@ -10,14 +10,14 @@
     "//apps/p4-tutorial/mytunnel:onos-apps-p4-tutorial-mytunnel",
 ]
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.p4tutorial.mytunnel",
-    title = "MyTunnel Demo App",
     category = "Traffic Engineering",
-    url = "http://onosproject.org",
     description = "Provides forwarding between each pair of hosts via MyTunnel protocol",
     included_bundles = BUNDLES,
     required_apps = [
         "org.onosproject.p4tutorial.pipeconf",
-    ]
+    ],
+    title = "MyTunnel Demo App",
+    url = "http://onosproject.org",
 )
diff --git a/apps/p4-tutorial/pipeconf/BUILD b/apps/p4-tutorial/pipeconf/BUILD
index 2a39cbb..bbe01da 100644
--- a/apps/p4-tutorial/pipeconf/BUILD
+++ b/apps/p4-tutorial/pipeconf/BUILD
@@ -5,7 +5,7 @@
     "//drivers/default:onos-drivers-default",
 ]
 
-osgi_jar (
+osgi_jar(
     deps = COMPILE_DEPS,
 )
 
@@ -13,14 +13,14 @@
     "//apps/p4-tutorial/pipeconf:onos-apps-p4-tutorial-pipeconf",
 ]
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.p4tutorial.pipeconf",
-    title = "P4 Tutorial Pipeconf",
     category = "Pipeconf",
-    url = "http://onosproject.org",
     description = "Provides pipeconf for the ONOS-P4 Tutorial",
     included_bundles = BUNDLES,
     required_apps = [
         "org.onosproject.drivers.p4runtime",
-    ]
+    ],
+    title = "P4 Tutorial Pipeconf",
+    url = "http://onosproject.org",
 )
diff --git a/core/net/BUILD b/core/net/BUILD
index 683d5fe..3c17dd0 100644
--- a/core/net/BUILD
+++ b/core/net/BUILD
@@ -21,8 +21,8 @@
         "org.onosproject.net.intent.impl.compiler.AbstractLinkCollectionTest",
         "org.onosproject.net.intent.impl.installer.AbstractIntentInstallerTest",
     ],
-    test_deps = TEST_DEPS,
     medium_tests = ["//core/net:src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest"],
+    test_deps = TEST_DEPS,
     visibility = ["//visibility:public"],
     deps = COMPILE_DEPS,
 )
diff --git a/drivers/barefoot/BUILD b/drivers/barefoot/BUILD
index ead7a3b..f86f1e3 100644
--- a/drivers/barefoot/BUILD
+++ b/drivers/barefoot/BUILD
@@ -7,19 +7,19 @@
 ]
 
 osgi_jar(
-    deps = COMPILE_DEPS,
-    resources_root = "src/main/resources",
     resources = glob(["src/main/resources/**"]),
+    resources_root = "src/main/resources",
+    deps = COMPILE_DEPS,
 )
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.drivers.barefoot",
-    title = "Barefoot Drivers",
     category = "Drivers",
-    url = "http://onosproject.org",
     description = "Adds support for Barefoot Networks devices",
     included_bundles = BUNDLES,
     required_apps = [
         "org.onosproject.drivers.p4runtime",
     ],
+    title = "Barefoot Drivers",
+    url = "http://onosproject.org",
 )
diff --git a/drivers/bmv2/BUILD b/drivers/bmv2/BUILD
index 07fef1a..d5356c3 100644
--- a/drivers/bmv2/BUILD
+++ b/drivers/bmv2/BUILD
@@ -18,22 +18,20 @@
 ]
 
 osgi_jar(
-    deps = COMPILE_DEPS,
     # FIXME: enable building other classes as soon as we implement BUILD for
     # protocols/bmv2 (based on Thrift)
     srcs = [
         "src/main/java/org/onosproject/drivers/bmv2/Bmv2DriversLoader.java",
         "src/main/java/org/onosproject/drivers/bmv2/Bmv2PipelineProgrammable.java",
     ],
-    resources_root = "src/main/resources",
     resources = glob(["src/main/resources/**"]),
+    resources_root = "src/main/resources",
+    deps = COMPILE_DEPS,
 )
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.drivers.bmv2",
-    title = "BMv2 Drivers",
     category = "Drivers",
-    url = "http://onosproject.org",
     description = "Adds support for BMv2 devices.",
     included_bundles = BUNDLES,
     required_apps = [
@@ -41,4 +39,6 @@
         "org.onosproject.drivers.gnmi",
         "org.onosproject.pipelines.basic",
     ],
+    title = "BMv2 Drivers",
+    url = "http://onosproject.org",
 )
diff --git a/drivers/gnmi/BUILD b/drivers/gnmi/BUILD
index 82df068..50d8b5e 100644
--- a/drivers/gnmi/BUILD
+++ b/drivers/gnmi/BUILD
@@ -14,23 +14,23 @@
     ":onos-drivers-gnmi",
 ]
 
-osgi_jar (
-    deps = COMPILE_DEPS,
+osgi_jar(
     resources = glob(["src/main/resources/**"]),
     resources_root = "src/main/resources",
+    deps = COMPILE_DEPS,
 )
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.drivers.gnmi",
-    title = "gNMI Drivers",
     category = "Drivers",
-    url = "http://onosproject.org",
     description = "Adds support for devices using gNMI protocol based on " +
-    " openconfig models: http://openconfig.net/ .",
+                  " openconfig models: http://openconfig.net/ .",
     included_bundles = BUNDLES,
     required_apps = [
         "org.onosproject.generaldeviceprovider",
         "org.onosproject.protocols.grpc",
-        "org.onosproject.protocols.gnmi"
+        "org.onosproject.protocols.gnmi",
     ],
+    title = "gNMI Drivers",
+    url = "http://onosproject.org",
 )
diff --git a/drivers/mellanox/BUILD b/drivers/mellanox/BUILD
index 4faeb31..4c091f1 100644
--- a/drivers/mellanox/BUILD
+++ b/drivers/mellanox/BUILD
@@ -7,20 +7,20 @@
 ]
 
 osgi_jar(
-    deps = COMPILE_DEPS,
-    resources_root = "src/main/resources",
     resources = glob(["src/main/resources/**"]),
+    resources_root = "src/main/resources",
+    deps = COMPILE_DEPS,
 )
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.drivers.mellanox",
-    title = "Mellanox Drivers",
     category = "Drivers",
-    url = "http://onosproject.org",
     description = "Adds support for Mellanox Spectrum-based devices using P4Runtime",
     included_bundles = BUNDLES,
     required_apps = [
         "org.onosproject.drivers.p4runtime",
         "org.onosproject.pipelines.fabric",
     ],
+    title = "Mellanox Drivers",
+    url = "http://onosproject.org",
 )
diff --git a/drivers/p4runtime/BUILD b/drivers/p4runtime/BUILD
index 1107577..7f917cd 100644
--- a/drivers/p4runtime/BUILD
+++ b/drivers/p4runtime/BUILD
@@ -8,17 +8,15 @@
     ":onos-drivers-p4runtime",
 ]
 
-osgi_jar (
-    deps = COMPILE_DEPS,
+osgi_jar(
     resources = glob(["src/main/resources/**"]),
     resources_root = "src/main/resources",
+    deps = COMPILE_DEPS,
 )
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.drivers.p4runtime",
-    title = "P4Runtime Drivers",
     category = "Drivers",
-    url = "http://onosproject.org",
     description = "Adds support for devices using P4 Runtime protocol.",
     included_bundles = BUNDLES,
     required_apps = [
@@ -27,4 +25,6 @@
         "org.onosproject.p4runtime",
         "org.onosproject.drivers",
     ],
+    title = "P4Runtime Drivers",
+    url = "http://onosproject.org",
 )
diff --git a/protocols/gnmi/BUILD b/protocols/gnmi/BUILD
index 56ed52c..30599ae 100644
--- a/protocols/gnmi/BUILD
+++ b/protocols/gnmi/BUILD
@@ -5,12 +5,12 @@
 
 onos_app(
     app_name = "org.onosproject.protocols.gnmi",
-    title = "gNMI Protocol Subsystem",
     category = "Protocol",
-    url = "http://onosproject.org",
     description = "ONOS gNMI protocol subsystem",
     included_bundles = BUNDLES,
     required_apps = [
-        "org.onosproject.protocols.grpc"
+        "org.onosproject.protocols.grpc",
     ],
+    title = "gNMI Protocol Subsystem",
+    url = "http://onosproject.org",
 )
diff --git a/protocols/gnmi/stub/BUILD b/protocols/gnmi/stub/BUILD
index 3dc5351..3b1a2dc 100644
--- a/protocols/gnmi/stub/BUILD
+++ b/protocols/gnmi/stub/BUILD
@@ -4,27 +4,27 @@
 wrapped_osgi_jar(
     name = "gnmi_java_grpc",
     jar = ":gnmi_java_grpc_native",
-    deps = [
-        "@io_grpc_grpc_java//stub",
-        "@io_grpc_grpc_java//core",
-        "@io_grpc_grpc_java//protobuf"
-    ],
     visibility = ["//visibility:public"],
+    deps = [
+        "@io_grpc_grpc_java//core",
+        "@io_grpc_grpc_java//protobuf",
+        "@io_grpc_grpc_java//stub",
+    ],
 )
 
 wrapped_osgi_jar(
     name = "gnmi_java_proto",
     jar = ":gnmi_java_proto_native",
+    visibility = ["//visibility:public"],
     deps = [
         "@com_google_protobuf//:protobuf_java",
     ],
-    visibility = ["//visibility:public"],
 )
 
 java_proto_library(
     name = "gnmi_java_proto_native",
-    deps = [":gnmi_proto"],
     visibility = ["//visibility:public"],
+    deps = [":gnmi_proto"],
 )
 
 java_grpc_library(
@@ -39,5 +39,5 @@
     deps = [
         "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:descriptor_proto",
-    ]
+    ],
 )
diff --git a/protocols/grpc/BUILD b/protocols/grpc/BUILD
index 56218f0..a01155b 100644
--- a/protocols/grpc/BUILD
+++ b/protocols/grpc/BUILD
@@ -32,18 +32,18 @@
     "@io_netty_netty_resolver//jar",
 ]
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.protocols.grpc",
-    title = "gRPC Protocol Subsystem",
     category = "rotocol",
-    url = "ttp://onosproject.org",
     description = "Exposes APIs to operate with gRPC channels",
     included_bundles = BUNDLES,
+    title = "gRPC Protocol Subsystem",
+    url = "ttp://onosproject.org",
 )
 
 wrapped_osgi_jar(
     name = "grpc-core-repkg",
-    jar = "@io_grpc_grpc_java//core:core",
-    deps = ["@io_opencensus_opencensus_api//jar"],
+    jar = "@io_grpc_grpc_java//core",
     visibility = ["//visibility:public"],
+    deps = ["@io_opencensus_opencensus_api//jar"],
 )
diff --git a/protocols/grpc/api/BUILD b/protocols/grpc/api/BUILD
index f7fee65..55e2b4a 100644
--- a/protocols/grpc/api/BUILD
+++ b/protocols/grpc/api/BUILD
@@ -1,3 +1,3 @@
-osgi_jar (
+osgi_jar(
     deps = CORE_DEPS + ["@io_grpc_grpc_java//core"],
 )
diff --git a/protocols/grpc/ctl/BUILD b/protocols/grpc/ctl/BUILD
index a4c063f..20c7ab8 100644
--- a/protocols/grpc/ctl/BUILD
+++ b/protocols/grpc/ctl/BUILD
@@ -4,6 +4,6 @@
     "@io_grpc_grpc_java//core",
 ]
 
-osgi_jar (
+osgi_jar(
     deps = COMPILE_DEPS,
 )
diff --git a/protocols/grpc/proto/BUILD b/protocols/grpc/proto/BUILD
index fb4c33c..48249c0 100644
--- a/protocols/grpc/proto/BUILD
+++ b/protocols/grpc/proto/BUILD
@@ -1,8 +1,8 @@
 load("//tools/build/bazel:osgi_java_library.bzl", "osgi_proto_jar")
 
 osgi_proto_jar(
-    proto_libs = [":dummy_proto"],
     grpc_proto_lib = ":dummy_proto",
+    proto_libs = [":dummy_proto"],
 )
 
 proto_library(
diff --git a/protocols/p4runtime/BUILD b/protocols/p4runtime/BUILD
index 48e4708..39f6403 100644
--- a/protocols/p4runtime/BUILD
+++ b/protocols/p4runtime/BUILD
@@ -7,12 +7,12 @@
 
 onos_app(
     app_name = "org.onosproject.protocols.p4runtime",
-    title = "P4Runtime Protocol Subsystem",
     category = "Protocol",
-    url = "http://onosproject.org",
     description = "ONOS P4Runtime protocol subsystem",
     included_bundles = BUNDLES,
     required_apps = [
-        "org.onosproject.protocols.grpc"
+        "org.onosproject.protocols.grpc",
     ],
+    title = "P4Runtime Protocol Subsystem",
+    url = "http://onosproject.org",
 )
diff --git a/protocols/p4runtime/ctl/BUILD b/protocols/p4runtime/ctl/BUILD
index e060275..9418b80 100644
--- a/protocols/p4runtime/ctl/BUILD
+++ b/protocols/p4runtime/ctl/BUILD
@@ -17,6 +17,6 @@
 ]
 
 osgi_jar_with_tests(
-    deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
 )
diff --git a/protocols/p4runtime/proto/BUILD b/protocols/p4runtime/proto/BUILD
index 3a9435c..fc4e42e 100644
--- a/protocols/p4runtime/proto/BUILD
+++ b/protocols/p4runtime/proto/BUILD
@@ -1,19 +1,21 @@
 load("//tools/build/bazel:osgi_java_library.bzl", "osgi_proto_jar")
 
 PROTOS = [
-    "@com_github_p4lang_p4runtime//:" + p for p in [
+    "@com_github_p4lang_p4runtime//:" + p
+    for p in [
         "p4info_proto",
         "p4types_proto",
         "p4data_proto",
         "p4runtime_proto",
-]] + [
-    "@com_github_p4lang_pi//:p4config_proto"
+    ]
+] + [
+    "@com_github_p4lang_pi//:p4config_proto",
 ]
 
 osgi_proto_jar(
-    proto_libs = PROTOS,
     grpc_proto_lib = "@com_github_p4lang_p4runtime//:p4runtime_proto",
+    proto_libs = PROTOS,
     deps = [
         "@com_google_api_grpc_proto_google_common_protos//jar",
-    ]
+    ],
 )
diff --git a/protocols/rest/ctl/BUILD b/protocols/rest/ctl/BUILD
index f7fd3ea..d3b9c30 100644
--- a/protocols/rest/ctl/BUILD
+++ b/protocols/rest/ctl/BUILD
@@ -14,10 +14,10 @@
 ]
 
 TEST_DEPS = TEST_REST + [
-    "//core/common:onos-core-common-tests"
+    "//core/common:onos-core-common-tests",
 ]
 
 osgi_jar_with_tests(
-    deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
 )