diff --git a/apps/faultmanagement/fmcli/BUILD b/apps/faultmanagement/fmcli/BUILD
index 9a866c1..d71db6d 100644
--- a/apps/faultmanagement/fmcli/BUILD
+++ b/apps/faultmanagement/fmcli/BUILD
@@ -4,6 +4,6 @@
 ]
 
 osgi_jar_with_tests(
+    import_packages = "*,org.onosproject.cli.net",
     deps = COMPILE_DEPS,
-    import_packages = '*,org.onosproject.cli.net',
 )
diff --git a/apps/kafka-integration/api/BUILD b/apps/kafka-integration/api/BUILD
index e7bd18b..1fe21db 100644
--- a/apps/kafka-integration/api/BUILD
+++ b/apps/kafka-integration/api/BUILD
@@ -2,6 +2,6 @@
     "@kafka_clients//jar",
 ]
 
-osgi_jar_with_tests (
+osgi_jar_with_tests(
     deps = COMPILE_DEPS,
-)
\ No newline at end of file
+)
diff --git a/apps/openstacknetworking/app/BUILD b/apps/openstacknetworking/app/BUILD
index 8ca9b1b..7232305 100644
--- a/apps/openstacknetworking/app/BUILD
+++ b/apps/openstacknetworking/app/BUILD
@@ -37,8 +37,8 @@
     api_version = "1.0",
     bundle_classpath = get_openstack4j_deps_path() + get_jackson_deps_path(),
     import_packages = INCLUDE_PACKAGES + "," + EXCLUDE_PACKAGES + "," + ALL_PACKAGES,
-    test_deps = TEST_DEPS,
     medium_tests = ["src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest"],
+    test_deps = TEST_DEPS,
     web_context = "/onos/openstacknetworking",
     deps = COMPILE_DEPS,
 )
diff --git a/providers/hostprobing/BUILD b/providers/hostprobing/BUILD
index e1b1003..dc6b7a4 100644
--- a/providers/hostprobing/BUILD
+++ b/providers/hostprobing/BUILD
@@ -6,15 +6,15 @@
     "//utils/osgi:onlab-osgi-tests",
 ]
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
+osgi_jar_with_tests(
     test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
 )
 
-onos_app (
+onos_app(
     app_name = "org.onosproject.hostprobingprovider",
-    title = "Host Probing Provider",
     category = "Provider",
-    url = "http://onosproject.org",
     description = "Provides host probing mechanism that discovers or verifies the existence of a host at specific location",
+    title = "Host Probing Provider",
+    url = "http://onosproject.org",
 )
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index 9ec8005..1ebd65c 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -182,9 +182,9 @@
 #    ],
 #)
 
-osgi_feature (
+osgi_feature(
     name = "onos-security",
-    description ="Security-Mode ONOS",
+    description = "Security-Mode ONOS",
     included_bundles = [
         "@org_apache_felix_framework_security//jar",
         "//core/security:onos-security",