diff --git a/apps/yang-gui/BUILD b/apps/yang-gui/BUILD
index 66f862a..0e092e2 100644
--- a/apps/yang-gui/BUILD
+++ b/apps/yang-gui/BUILD
@@ -3,20 +3,20 @@
     "//apps/yang:onos-apps-yang",
 ]
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
-    resources_root = "src/main/resources",
+osgi_jar_with_tests(
     resources = glob(["src/main/resources/**"]),
+    resources_root = "src/main/resources",
+    deps = COMPILE_DEPS,
 )
 
-onos_app (
+onos_app(
     category = "GUI",
     description = "Adds GUI extension that allows the operator to view the list of currently " +
-        "registered YANG models, and their YANG sources. It also provides means for compiling " +
-        "source YANG files (*.yang, *.zip, *.jar) on the fly and directly from the GUI using " +
-        "drag-n-drop.<p/>User can simply compress a set of YANG source files and drop it on the " +
-        "YANG Models GUI view to automatically compile and then register the compiled YANG models.",
-    required_apps = [ "org.onosproject.yang" ],
+                  "registered YANG models, and their YANG sources. It also provides means for compiling " +
+                  "source YANG files (*.yang, *.zip, *.jar) on the fly and directly from the GUI using " +
+                  "drag-n-drop.<p/>User can simply compress a set of YANG source files and drop it on the " +
+                  "YANG Models GUI view to automatically compile and then register the compiled YANG models.",
+    required_apps = ["org.onosproject.yang"],
     title = "YANG Runtime GUI",
     url = "http://onosproject.org",
 )
diff --git a/apps/yang/BUILD b/apps/yang/BUILD
index d284902..1f38d13 100644
--- a/apps/yang/BUILD
+++ b/apps/yang/BUILD
@@ -1,30 +1,30 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + ONOS_YANG + [
-  "//core/common:onos-core-common",
-  "@onos_yang_runtime//jar",
+    "//core/common:onos-core-common",
+    "@onos_yang_runtime//jar",
 ]
 
 BUNDLES = ONOS_YANG + [
-  "@onos_yang_runtime//jar",
-  "//apps/yang:onos-apps-yang",
-  "//apps/yang/web:onos-apps-yang-web",
-  "@org_apache_servicemix_bundles_dom4j//jar",
+    "@onos_yang_runtime//jar",
+    "//apps/yang:onos-apps-yang",
+    "//apps/yang/web:onos-apps-yang-web",
+    "@org_apache_servicemix_bundles_dom4j//jar",
 ]
 
 EXCLUDED_BUNDLES = [
 ]
 
 osgi_jar_with_tests(
-  deps = COMPILE_DEPS,
+    deps = COMPILE_DEPS,
 )
 
 onos_app(
-  category = "Utility",
-  description = "Provides ability to register compiled YANG models or even to compile YANG source " +
-    "files on the fly. Registering YANG models allows other ONOS subsystems to interact with " +
-    "orchestrators or individual network devices using XML or JSON data structured in accordance " +
-    "with those models.",
-  included_bundles = BUNDLES,
-  excluded_bundles = EXCLUDED_BUNDLES,
-  title = "YANG Compiler and Runtime",
-  url = "http://onosproject.org",
+    category = "Utility",
+    description = "Provides ability to register compiled YANG models or even to compile YANG source " +
+                  "files on the fly. Registering YANG models allows other ONOS subsystems to interact with " +
+                  "orchestrators or individual network devices using XML or JSON data structured in accordance " +
+                  "with those models.",
+    excluded_bundles = EXCLUDED_BUNDLES,
+    included_bundles = BUNDLES,
+    title = "YANG Compiler and Runtime",
+    url = "http://onosproject.org",
 )
diff --git a/apps/yang/web/BUILD b/apps/yang/web/BUILD
index 8d3a0a1..4e7a707 100644
--- a/apps/yang/web/BUILD
+++ b/apps/yang/web/BUILD
@@ -1,7 +1,7 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + REST + ONOS_YANG + [
-  "@jersey_media_multipart//jar",
-  "@onos_yang_runtime//jar",
-  "//apps/yang:onos-apps-yang",
+    "@jersey_media_multipart//jar",
+    "@onos_yang_runtime//jar",
+    "//apps/yang:onos-apps-yang",
 ]
 
 osgi_jar_with_tests(
@@ -9,7 +9,7 @@
     api_package = "org.onosproject.yang.web",
     api_title = "YANG Runtime",
     api_version = "1.0",
-    deps = COMPILE_DEPS,
     test_deps = TEST_ADAPTERS,
     web_context = "/onos/yang",
-)
\ No newline at end of file
+    deps = COMPILE_DEPS,
+)
diff --git a/models/ciena/waveserverai/BUILD b/models/ciena/waveserverai/BUILD
index e41a676..1712d34 100644
--- a/models/ciena/waveserverai/BUILD
+++ b/models/ciena/waveserverai/BUILD
@@ -10,8 +10,8 @@
 
 yang_model(
     app_name = "org.onosproject.models.ciena.waveserverai",
-    title = "Ciena Waveserver Ai YANG Models",
     custom_registrator = True,
-    deps = COMPILE_DEPS,
     required_apps = APPS,
+    title = "Ciena Waveserver Ai YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/common/BUILD b/models/common/BUILD
index 3b845b3..e019d87 100644
--- a/models/common/BUILD
+++ b/models/common/BUILD
@@ -1,7 +1,7 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
 yang_model(
-  app_name = "org.onosproject.models.common",
-  title = "Common YANG Models",
-  custom_registrator = True,
+    app_name = "org.onosproject.models.common",
+    custom_registrator = True,
+    title = "Common YANG Models",
 )
diff --git a/models/huawei/BUILD b/models/huawei/BUILD
index 5a0a8a0..93be622 100644
--- a/models/huawei/BUILD
+++ b/models/huawei/BUILD
@@ -1,7 +1,7 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
-yang_model (
-  app_name = "org.onosproject.models.huawei",
-  title = "Huawei YANG Models",
-  custom_registrator = True,
+yang_model(
+    app_name = "org.onosproject.models.huawei",
+    custom_registrator = True,
+    title = "Huawei YANG Models",
 )
diff --git a/models/ietf/BUILD b/models/ietf/BUILD
index 9197c54..cdb559a 100644
--- a/models/ietf/BUILD
+++ b/models/ietf/BUILD
@@ -1,7 +1,7 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
-yang_model (
+yang_model(
     app_name = "org.onosproject.models.ietf",
-    title = "IETF YANG Models",
     custom_registrator = False,
+    title = "IETF YANG Models",
 )
diff --git a/models/l3vpn/BUILD b/models/l3vpn/BUILD
index 463f95b..d7b0870 100644
--- a/models/l3vpn/BUILD
+++ b/models/l3vpn/BUILD
@@ -10,8 +10,8 @@
 
 yang_model(
     app_name = "org.onosproject.models.l3vpn",
-    title = "L3VPN YANG Models",
     custom_registrator = True,
-    deps = COMPILE_DEPS,
     required_apps = APPS,
+    title = "L3VPN YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/microsemi/BUILD b/models/microsemi/BUILD
index a091a5c..2e56eb3 100644
--- a/models/microsemi/BUILD
+++ b/models/microsemi/BUILD
@@ -10,8 +10,8 @@
 
 yang_model(
     app_name = "org.onosproject.models.microsemi",
-    title = "Microsemi YANG Models",
     custom_registrator = True,
-    deps = COMPILE_DEPS,
     required_apps = APPS,
+    title = "Microsemi YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/openconfig-infinera/BUILD b/models/openconfig-infinera/BUILD
index 14ccc86..a4e0989 100644
--- a/models/openconfig-infinera/BUILD
+++ b/models/openconfig-infinera/BUILD
@@ -9,9 +9,9 @@
 ]
 
 yang_model(
-  app_name = "org.onosproject.models.openconfig-infinera",
-  title = "OpenConfig Infinera XT3300 YANG Models",
-  custom_registrator = False,
-  deps = COMPILE_DEPS,
-  required_apps = APPS,
+    app_name = "org.onosproject.models.openconfig-infinera",
+    custom_registrator = False,
+    required_apps = APPS,
+    title = "OpenConfig Infinera XT3300 YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/openconfig/BUILD b/models/openconfig/BUILD
index c8b2d33..a9926d4 100644
--- a/models/openconfig/BUILD
+++ b/models/openconfig/BUILD
@@ -9,9 +9,9 @@
 ]
 
 yang_model(
-  app_name = "org.onosproject.models.openconfig",
-  title = "OpenConfig YANG Models",
-  custom_registrator = True,
-  deps = COMPILE_DEPS,
-  required_apps = APPS,
+    app_name = "org.onosproject.models.openconfig",
+    custom_registrator = True,
+    required_apps = APPS,
+    title = "OpenConfig YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/openroadm/BUILD b/models/openroadm/BUILD
index 619fd61..b2b4f77 100644
--- a/models/openroadm/BUILD
+++ b/models/openroadm/BUILD
@@ -1,6 +1,6 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
 yang_model(
-  app_name = "org.onosproject.models.openroadm",
-  title = "Open ROADM YANG Models",
-)
\ No newline at end of file
+    app_name = "org.onosproject.models.openroadm",
+    title = "Open ROADM YANG Models",
+)
diff --git a/models/polatis/BUILD b/models/polatis/BUILD
index 1ec001b..13e32fb 100644
--- a/models/polatis/BUILD
+++ b/models/polatis/BUILD
@@ -8,9 +8,9 @@
     "org.onosproject.models.common",
 ]
 
-yang_model (
-  app_name = "org.onosproject.models.polatis",
-  title = "Polatis YANG Model",
-  deps = COMPILE_DEPS,
-  required_apps = APPS,
+yang_model(
+    app_name = "org.onosproject.models.polatis",
+    required_apps = APPS,
+    title = "Polatis YANG Model",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/tapi/BUILD b/models/tapi/BUILD
index e594675..a0e3c76 100644
--- a/models/tapi/BUILD
+++ b/models/tapi/BUILD
@@ -1,7 +1,7 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
 yang_model(
-  app_name = "org.onosproject.models.tapi",
-  title = "ONF Transport API YANG Models",
-  custom_registrator = True,
+    app_name = "org.onosproject.models.tapi",
+    custom_registrator = True,
+    title = "ONF Transport API YANG Models",
 )
diff --git a/tools/build/bazel/BUILD b/tools/build/bazel/BUILD
index c4c1f2d..57a2ce1 100644
--- a/tools/build/bazel/BUILD
+++ b/tools/build/bazel/BUILD
@@ -25,6 +25,6 @@
     visibility = ["//visibility:public"],
     runtime_deps = [
         "@onos_yang_compiler_main//jar",
-        "@slf4j_nop//jar", # TODO: Change to jdk14 after fixing verbosity
+        "@slf4j_nop//jar",  # TODO: Change to jdk14 after fixing verbosity
     ],
-)
\ No newline at end of file
+)
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index 7f1ab8f..1afed71 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -154,14 +154,17 @@
     visibility = ["//visibility:public"],
 )
 
-osgi_feature (
+osgi_feature(
     name = "onos-gui",
     description = "ONOS GUI console components",
-    required_features = ["onos-api", "onos-thirdparty-web"],
     included_bundles = [
-      "//web/gui:onos-gui",
-      "@jetty_websocket//jar",
-      "//utils/rest:onlab-rest",
+        "//web/gui:onos-gui",
+        "@jetty_websocket//jar",
+        "//utils/rest:onlab-rest",
+    ],
+    required_features = [
+        "onos-api",
+        "onos-thirdparty-web",
     ],
     visibility = ["//visibility:public"],
 )