diff --git a/app/maxwell/agents/usage_log/BUILD.gn b/app/maxwell/agents/usage_log/BUILD.gn
index 7331b9f..8a2ecea 100644
--- a/app/maxwell/agents/usage_log/BUILD.gn
+++ b/app/maxwell/agents/usage_log/BUILD.gn
@@ -24,9 +24,7 @@
   source_dir = "."
   sources = []
 
-  non_dart_deps = [
-    ":module_usage_tracking_metrics_registry",
-  ]
+  non_dart_deps = [ ":module_usage_tracking_metrics_registry" ]
 
   deps = [
     "//peridot/public/fidl/fuchsia.modular",
@@ -38,12 +36,11 @@
 
   resources = [
     {
-      path = rebase_path(
-              get_label_info(
-                             ":module_usage_tracking_metrics_registry",
-                             "target_gen_dir")
-              + "/module_usage_tracking_metrics_registry.pb")
+      path =
+          rebase_path(get_label_info(":module_usage_tracking_metrics_registry",
+                                     "target_gen_dir") +
+                      "/module_usage_tracking_metrics_registry.pb")
       dest = "module_usage_tracking_metrics_registry.pb"
-    }
+    },
   ]
 }
diff --git a/auth_providers/BUILD.gn b/auth_providers/BUILD.gn
index 9541d07..02a1d48 100644
--- a/auth_providers/BUILD.gn
+++ b/auth_providers/BUILD.gn
@@ -23,9 +23,9 @@
 
   deps = [
     "//garnet/public/lib/fxl:fxl_printers",
+    "//third_party/googletest:gtest_main",
     "//topaz/auth_providers/google:unittests",
     "//topaz/auth_providers/oauth:unittests",
     "//topaz/auth_providers/spotify:unittests",
-    "//third_party/googletest:gtest_main",
   ]
 }
diff --git a/bin/bluetooth_settings/BUILD.gn b/bin/bluetooth_settings/BUILD.gn
index e17e66d..84537c6 100644
--- a/bin/bluetooth_settings/BUILD.gn
+++ b/bin/bluetooth_settings/BUILD.gn
@@ -24,11 +24,11 @@
   ]
 
   deps = [
-    "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//garnet/public/fidl/fuchsia.bluetooth",
     "//garnet/public/fidl/fuchsia.bluetooth.control",
     "//garnet/public/fidl/fuchsia.bluetooth.gatt",
     "//garnet/public/fidl/fuchsia.bluetooth.le",
+    "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app/dart",
diff --git a/bin/device_settings/BUILD.gn b/bin/device_settings/BUILD.gn
index bc93960..a9730fc 100644
--- a/bin/device_settings/BUILD.gn
+++ b/bin/device_settings/BUILD.gn
@@ -24,8 +24,8 @@
   ]
 
   deps = [
-    "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//garnet/public/fidl/fuchsia.amber",
+    "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app/dart",
diff --git a/bin/ermine_ctl/BUILD.gn b/bin/ermine_ctl/BUILD.gn
index df93a4f..c1ffb14 100644
--- a/bin/ermine_ctl/BUILD.gn
+++ b/bin/ermine_ctl/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/rust/rustc_binary.gni")
 import("//build/package.gni")
+import("//build/rust/rustc_binary.gni")
 
 rustc_binary("bin") {
   name = "ermine_ctl"
diff --git a/bin/fidl_compatibility_test/BUILD.gn b/bin/fidl_compatibility_test/BUILD.gn
index c291847..4b68ac5 100644
--- a/bin/fidl_compatibility_test/BUILD.gn
+++ b/bin/fidl_compatibility_test/BUILD.gn
@@ -5,8 +5,12 @@
 import("//build/package.gni")
 
 copy("run_fidl_compatibility_test_topaz_sh") {
-  sources = [ "run_fidl_compatibility_test_topaz.sh" ]
-  outputs = [ "${root_build_dir}/run_fidl_compatibility_test_topaz.sh" ]
+  sources = [
+    "run_fidl_compatibility_test_topaz.sh",
+  ]
+  outputs = [
+    "${root_build_dir}/run_fidl_compatibility_test_topaz.sh",
+  ]
 }
 
 package("package") {
diff --git a/bin/fidlgen_dart/BUILD.gn b/bin/fidlgen_dart/BUILD.gn
index 1380d67..7b189d6 100644
--- a/bin/fidlgen_dart/BUILD.gn
+++ b/bin/fidlgen_dart/BUILD.gn
@@ -11,7 +11,7 @@
   name = "fidlgen_dart"
 
   deps = [
-    "//garnet/go/src/fidl:fidl_lib"
+    "//garnet/go/src/fidl:fidl_lib",
   ]
 }
 
@@ -20,7 +20,9 @@
 
   sdk_category = "partner"
 
-  deps = [ ":fidlgen_dart_lib" ]
+  deps = [
+    ":fidlgen_dart_lib",
+  ]
 }
 
 install_host_tools("install") {
diff --git a/bin/session_shell/ermine_session_shell/BUILD.gn b/bin/session_shell/ermine_session_shell/BUILD.gn
index efd896e..6c0e164 100644
--- a/bin/session_shell/ermine_session_shell/BUILD.gn
+++ b/bin/session_shell/ermine_session_shell/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/rust/rustc_binary.gni")
 import("//build/package.gni")
+import("//build/rust/rustc_binary.gni")
 
 rustc_binary("bin") {
   name = "ermine"
diff --git a/bin/system_dashboard/BUILD.gn b/bin/system_dashboard/BUILD.gn
index 7fa1605..17f0d1b 100644
--- a/bin/system_dashboard/BUILD.gn
+++ b/bin/system_dashboard/BUILD.gn
@@ -21,10 +21,10 @@
   sources = []
   deps = [
     "//garnet/public/fidl/fuchsia.scpi",
+    "//third_party/dart-pkg/pub/flutter_staggered_grid_view",
+    "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/schemas/dart",
-    "//topaz/public/dart/widgets:lib.widgets",
-    "//third_party/dart-pkg/pub/flutter_staggered_grid_view",
   ]
 }
diff --git a/bin/ui/skottie_viewer/BUILD.gn b/bin/ui/skottie_viewer/BUILD.gn
index ca7eb4a..9c16568 100644
--- a/bin/ui/skottie_viewer/BUILD.gn
+++ b/bin/ui/skottie_viewer/BUILD.gn
@@ -31,10 +31,11 @@
     ":skottie_loader",
     "//garnet/public/fidl/fuchsia.ui.app",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    # TODO(SCN-1193): Remove fostr dependency.
-    "//garnet/public/lib/fostr/fidl/fuchsia.ui.scenic",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fidl/cpp",
+
+    # TODO(SCN-1193): Remove fostr dependency.
+    "//garnet/public/lib/fostr/fidl/fuchsia.ui.scenic",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/ui/base_view/cpp",
     "//garnet/public/lib/ui/scenic/cpp",
diff --git a/bin/ui/text_input_mod/BUILD.gn b/bin/ui/text_input_mod/BUILD.gn
index d7b2dbc..c443906 100644
--- a/bin/ui/text_input_mod/BUILD.gn
+++ b/bin/ui/text_input_mod/BUILD.gn
@@ -13,11 +13,12 @@
   sources = []
   deps = [
     "//third_party/dart-pkg/git/flutter/packages/flutter",
-    "//topaz/public/dart/widgets:lib.widgets",
+    "//topaz/bin/ui/text_input_mod/public/fidl:fuchsia.textinputmod",
     "//topaz/examples/modular/models",
+    "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_logger",
     "//topaz/public/dart/fuchsia_modular",
-    "//topaz/public/dart/fidl",
+    "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/app_driver/dart",
@@ -25,7 +26,6 @@
     "//topaz/public/lib/module_resolver/dart",
     "//topaz/public/lib/ui/flutter",
     "//topaz/public/lib/widgets/dart",
-    "//topaz/bin/ui/text_input_mod/public/fidl:fuchsia.textinputmod",
   ]
 
   meta = [
@@ -35,4 +35,3 @@
     },
   ]
 }
-
diff --git a/bin/userpicker_base_shell/BUILD.gn b/bin/userpicker_base_shell/BUILD.gn
index 8f37419..eb056f5 100644
--- a/bin/userpicker_base_shell/BUILD.gn
+++ b/bin/userpicker_base_shell/BUILD.gn
@@ -25,12 +25,10 @@
   resources = [
     {
       path = rebase_path(
-              get_label_info(
-                             ":sysui_metrics_config",
-                             "target_gen_dir")
-              + "/sysui_metrics_config.pb")
+              get_label_info(":sysui_metrics_config", "target_gen_dir") +
+              "/sysui_metrics_config.pb")
       dest = "sysui_metrics_config.pb"
-    }
+    },
   ]
 
   package_name = "userpicker_base_shell"
@@ -38,9 +36,9 @@
   manifest = "pubspec.yaml"
 
   sources = [
-    "authentication_ui_context_impl.dart",
     "authentication_overlay.dart",
     "authentication_overlay_model.dart",
+    "authentication_ui_context_impl.dart",
     "circular_button.dart",
     "clock.dart",
     "user_list.dart",
@@ -49,9 +47,7 @@
     "user_picker_screen.dart",
   ]
 
-  non_dart_deps = [
-    ":sysui_metrics_config",
-  ]
+  non_dart_deps = [ ":sysui_metrics_config" ]
 
   deps = [
     "//garnet/public/fidl/fuchsia.timezone",
diff --git a/bin/xi/xi_embeddable/BUILD.gn b/bin/xi/xi_embeddable/BUILD.gn
index 3309f6a..9accb07 100644
--- a/bin/xi/xi_embeddable/BUILD.gn
+++ b/bin/xi/xi_embeddable/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//topaz/runtime/flutter_runner/flutter_app.gni")
 import("//topaz/runtime/dart/dart_test.gni")
+import("//topaz/runtime/flutter_runner/flutter_app.gni")
 
 flutter_app("xi_embeddable") {
   deprecated_bare_package_url = "//build"
@@ -19,11 +19,11 @@
 
   sources = []
   deps = [
+    "//topaz/bin/xi/xi_session_agent:xi_session_services",
+    "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
+    "//topaz/lib/xi/widgets:xi_widgets",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/app_driver/dart",
-    "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
-    "//topaz/lib/xi/widgets:xi_widgets",
-    "//topaz/bin/xi/xi_session_agent:xi_session_services",
   ]
 }
diff --git a/bin/xi/xi_mod/BUILD.gn b/bin/xi/xi_mod/BUILD.gn
index 55234c4..4b82906 100644
--- a/bin/xi/xi_mod/BUILD.gn
+++ b/bin/xi/xi_mod/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//topaz/runtime/flutter_runner/flutter_app.gni")
 import("//topaz/runtime/dart/dart_test.gni")
+import("//topaz/runtime/flutter_runner/flutter_app.gni")
 
 flutter_app("xi_mod") {
   deprecated_bare_package_url = "//build"
@@ -23,11 +23,11 @@
     "//garnet/public/fidl/fuchsia.xi",
     "//peridot/public/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
+    "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
+    "//topaz/lib/xi/widgets:xi_widgets",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/ui/flutter",
-    "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
-    "//topaz/lib/xi/widgets:xi_widgets",
   ]
 }
diff --git a/bin/xi/xi_session_agent/BUILD.gn b/bin/xi/xi_session_agent/BUILD.gn
index 6ac3991..f7c5cf5 100644
--- a/bin/xi/xi_session_agent/BUILD.gn
+++ b/bin/xi/xi_session_agent/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//topaz/runtime/dart_runner/dart_app.gni")
 import("//build/fidl/fidl.gni")
+import("//topaz/runtime/dart_runner/dart_app.gni")
 
 fidl("xi_session_services") {
   name = "fuchsia.xi.session"
@@ -25,11 +25,11 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.auth",
-    "//topaz/public/dart/fidl",
-    "//topaz/public/lib/app/dart",
-    "//topaz/public/lib/agent/dart",
-    "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
     ":xi_session_services",
+    "//garnet/public/fidl/fuchsia.auth",
+    "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
+    "//topaz/public/dart/fidl",
+    "//topaz/public/lib/agent/dart",
+    "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/bin/xi/xi_session_demo/BUILD.gn b/bin/xi/xi_session_demo/BUILD.gn
index c2c2e0e..80293e3 100644
--- a/bin/xi/xi_session_demo/BUILD.gn
+++ b/bin/xi/xi_session_demo/BUILD.gn
@@ -19,9 +19,9 @@
 
   deps = [
     "//third_party/dart-pkg/git/flutter/packages/flutter",
+    "//topaz/bin/xi/xi_session_agent:xi_session_services",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/run_mod/dart",
-    "//topaz/bin/xi/xi_session_agent:xi_session_services",
   ]
 }
diff --git a/examples/bluetooth/ble_rect/BUILD.gn b/examples/bluetooth/ble_rect/BUILD.gn
index 7d2bbfb..ed193f3 100644
--- a/examples/bluetooth/ble_rect/BUILD.gn
+++ b/examples/bluetooth/ble_rect/BUILD.gn
@@ -15,8 +15,8 @@
     "//peridot/public/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
-    "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/app/dart",
+    "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/widgets/dart",
   ]
 }
diff --git a/examples/bluetooth/eddystone_advertiser/BUILD.gn b/examples/bluetooth/eddystone_advertiser/BUILD.gn
index 1c7b50f..b29922e 100644
--- a/examples/bluetooth/eddystone_advertiser/BUILD.gn
+++ b/examples/bluetooth/eddystone_advertiser/BUILD.gn
@@ -10,13 +10,13 @@
   main_dart = "lib/main.dart"
 
   deps = [
-    "//garnet/public/fidl/fuchsia.bluetooth.le",
     "//garnet/public/fidl/fuchsia.bluetooth",
+    "//garnet/public/fidl/fuchsia.bluetooth.le",
     "//peridot/public/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
-    "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/app/dart",
+    "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/widgets/dart",
   ]
 }
diff --git a/examples/fidl/BUILD.gn b/examples/fidl/BUILD.gn
index f0d53e8..865f89a 100644
--- a/examples/fidl/BUILD.gn
+++ b/examples/fidl/BUILD.gn
@@ -12,12 +12,12 @@
       package_root = "."
       main_dart = "echo_client_dart/lib/main.dart"
       sources = []
-       deps = [
-         "//garnet/examples/fidl/services:echo2",
-         "//garnet/public/fidl/fuchsia.sys",
-         "//topaz/public/dart/fidl",
-         "//topaz/public/lib/app/dart",
-       ]
+      deps = [
+        "//garnet/examples/fidl/services:echo2",
+        "//garnet/public/fidl/fuchsia.sys",
+        "//topaz/public/dart/fidl",
+        "//topaz/public/lib/app/dart",
+      ]
     },
     {
       component_name = "echo_server_dart"
diff --git a/examples/fidl/compiler/BUILD.gn b/examples/fidl/compiler/BUILD.gn
index 7a16b44..c7315d0 100644
--- a/examples/fidl/compiler/BUILD.gn
+++ b/examples/fidl/compiler/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fidl/fidl.gni")
 import("//build/dart/toolchain.gni")
+import("//build/fidl/fidl.gni")
 
 group("compiler") {
   deps = [
diff --git a/examples/ledger/todo_list/BUILD.gn b/examples/ledger/todo_list/BUILD.gn
index 2152012..73d9857 100644
--- a/examples/ledger/todo_list/BUILD.gn
+++ b/examples/ledger/todo_list/BUILD.gn
@@ -26,8 +26,8 @@
   deps = [
     "//peridot/public/fidl/fuchsia.ledger",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
-    "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/app/dart",
+    "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/component/dart",
     "//topaz/public/lib/widgets/dart",
   ]
diff --git a/examples/modular/models/BUILD.gn b/examples/modular/models/BUILD.gn
index 18bcbcb..4bfb30a 100644
--- a/examples/modular/models/BUILD.gn
+++ b/examples/modular/models/BUILD.gn
@@ -6,7 +6,6 @@
 import("//topaz/runtime/dart/dart_test.gni")
 
 dart_library("models") {
-
   package_name = "example_modular_models"
 
   sources = [
diff --git a/examples/modular/shapes_mod/BUILD.gn b/examples/modular/shapes_mod/BUILD.gn
index c4b2c3c..512f788 100644
--- a/examples/modular/shapes_mod/BUILD.gn
+++ b/examples/modular/shapes_mod/BUILD.gn
@@ -19,9 +19,7 @@
     },
   ]
 
-  sources = [
-
-  ]
+  sources = []
 
   deps = [
     "//third_party/dart-pkg/git/flutter/packages/flutter",
diff --git a/examples/modular/slider_mod/BUILD.gn b/examples/modular/slider_mod/BUILD.gn
index f4e3f45..50ff6e3 100644
--- a/examples/modular/slider_mod/BUILD.gn
+++ b/examples/modular/slider_mod/BUILD.gn
@@ -29,13 +29,13 @@
   ]
 
   deps = [
+    "//garnet/public/fidl/fuchsia.testing.runner",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/examples/modular/fidl:fibonacci_service",
     "//topaz/examples/modular/models",
     "//topaz/public/dart/fuchsia_logger",
     "//topaz/public/dart/fuchsia_modular",
     "//topaz/public/dart/fuchsia_services",
-    "//garnet/public/fidl/fuchsia.testing.runner",
   ]
 
   meta = [
@@ -49,7 +49,6 @@
 # Runs these tests using:
 #   fx shell /pkgfs/packages/topaz_modular_integration_tests/0/bin/run_topaz_modular_integration_tests.sh slider_mod_tests
 dart_fuchsia_test("slider_mod_tests") {
-
   package_only = true
 
   sources = [
diff --git a/examples/story_shell_test/BUILD.gn b/examples/story_shell_test/BUILD.gn
index 55a3fdf..93279df 100644
--- a/examples/story_shell_test/BUILD.gn
+++ b/examples/story_shell_test/BUILD.gn
@@ -16,9 +16,9 @@
   package_only = true
 
   deps = [
-    "//topaz/lib/story_shell:lib.story_shell",
     "//peridot/public/fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
+    "//topaz/lib/story_shell:lib.story_shell",
   ]
 }
diff --git a/examples/test/driver_example_mod/BUILD.gn b/examples/test/driver_example_mod/BUILD.gn
index aa85675..f5d1546 100644
--- a/examples/test/driver_example_mod/BUILD.gn
+++ b/examples/test/driver_example_mod/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/dart/dart_remote_test.gni")
 import("//build/dart/dart_fuchsia_test.gni")
+import("//build/dart/dart_remote_test.gni")
 import("//topaz/runtime/flutter_runner/flutter_app.gni")
 
 # The main app.
@@ -29,8 +29,8 @@
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fuchsia_modular",
     "//topaz/public/dart/fuchsia_services",
-    "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/app/dart",
+    "//topaz/public/lib/app_driver/dart",
     "//topaz/public/lib/widgets/dart",
   ]
 }
@@ -40,7 +40,6 @@
 #
 # The target application must be runnning on the machine.
 dart_fuchsia_test("driver_example_mod_target_tests") {
-
   package_only = true
 
   sources = []
diff --git a/examples/tictactoe/bin/tictactoe/game_board_mod/BUILD.gn b/examples/tictactoe/bin/tictactoe/game_board_mod/BUILD.gn
index 854254e..de7ae10 100644
--- a/examples/tictactoe/bin/tictactoe/game_board_mod/BUILD.gn
+++ b/examples/tictactoe/bin/tictactoe/game_board_mod/BUILD.gn
@@ -37,7 +37,6 @@
 }
 
 dart_test("tictactoe_game_board_mod_test") {
-
   sources = [
     "mod_test.dart",
   ]
diff --git a/examples/tictactoe/lib/tictactoe/common/BUILD.gn b/examples/tictactoe/lib/tictactoe/common/BUILD.gn
index b639d60..9f44cda 100644
--- a/examples/tictactoe/lib/tictactoe/common/BUILD.gn
+++ b/examples/tictactoe/lib/tictactoe/common/BUILD.gn
@@ -24,7 +24,6 @@
 }
 
 dart_test("tictactoe_game_test") {
-
   sources = [
     "game_test.dart",
     "win_detection_test.dart",
diff --git a/examples/ui/hello_mod/BUILD.gn b/examples/ui/hello_mod/BUILD.gn
index b76354c..d452d8b 100644
--- a/examples/ui/hello_mod/BUILD.gn
+++ b/examples/ui/hello_mod/BUILD.gn
@@ -26,7 +26,6 @@
   ]
 }
 
-
 flutter_app("hello_space_dart") {
   deprecated_bare_package_url = "//build"
 
diff --git a/examples/ui/simple_flutter/BUILD.gn b/examples/ui/simple_flutter/BUILD.gn
index 2e385ae..ac291d8 100644
--- a/examples/ui/simple_flutter/BUILD.gn
+++ b/examples/ui/simple_flutter/BUILD.gn
@@ -42,6 +42,6 @@
     {
       path = rebase_path("meta/leaf_flutter.cmx")
       dest = "leaf_flutter.cmx"
-    }
+    },
   ]
 }
diff --git a/examples/ui/sketchy_flutter/BUILD.gn b/examples/ui/sketchy_flutter/BUILD.gn
index 97ffe74..c034cfe 100644
--- a/examples/ui/sketchy_flutter/BUILD.gn
+++ b/examples/ui/sketchy_flutter/BUILD.gn
@@ -24,8 +24,8 @@
     "//garnet/public/fidl/fuchsia.ui.gfx",
     "//garnet/public/fidl/fuchsia.ui.scenic",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//topaz/public/lib/ui/scenic/dart",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/lib/ui/flutter",
+    "//topaz/public/lib/ui/scenic/dart",
   ]
 }
diff --git a/examples/ui/text_flutter/BUILD.gn b/examples/ui/text_flutter/BUILD.gn
index 97e65c3..20e755e 100644
--- a/examples/ui/text_flutter/BUILD.gn
+++ b/examples/ui/text_flutter/BUILD.gn
@@ -25,6 +25,6 @@
     {
       path = rebase_path("meta/text_flutter.cmx")
       dest = "text_flutter.cmx"
-    }
+    },
   ]
 }
diff --git a/lib/deprecated_loop/BUILD.gn b/lib/deprecated_loop/BUILD.gn
index 320af09..9499a21 100644
--- a/lib/deprecated_loop/BUILD.gn
+++ b/lib/deprecated_loop/BUILD.gn
@@ -36,13 +36,12 @@
     "//garnet/public/lib/fxl/test:gtest_main",
     "//third_party/googletest:gtest",
   ]
-
 }
 
-package("deprecated_loop_tests"){
+package("deprecated_loop_tests") {
   testonly = true
   deps = [
-    ":deprecated_loop_unittests"
+    ":deprecated_loop_unittests",
   ]
 
   tests = [
diff --git a/lib/fuchsia_test_helper/BUILD.gn b/lib/fuchsia_test_helper/BUILD.gn
index 52dd1ad..6b00506 100644
--- a/lib/fuchsia_test_helper/BUILD.gn
+++ b/lib/fuchsia_test_helper/BUILD.gn
@@ -12,9 +12,9 @@
   ]
 
   deps = [
+    "//third_party/dart-pkg/pub/test",
     "//third_party/dart-pkg/pub/test_api",
     "//third_party/dart-pkg/pub/test_core",
-    "//third_party/dart-pkg/pub/test",
     "//topaz/public/dart/fuchsia",
   ]
 }
diff --git a/lib/keyboard/flutter/BUILD.gn b/lib/keyboard/flutter/BUILD.gn
index 73f8c2c..bd0273c 100644
--- a/lib/keyboard/flutter/BUILD.gn
+++ b/lib/keyboard/flutter/BUILD.gn
@@ -14,27 +14,24 @@
 
   deps = [
     "//third_party/dart-pkg/git/flutter/packages/flutter",
-    "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/lib/keyboard/dart",
     "//topaz/lib/shell",
+    "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/shell/keyboard",
   ]
 }
 
-
 dart_test("keyboard_test") {
-
   sources = [
     "keyboard_model_test.dart",
   ]
 
   deps = [
     ":flutter",
-    "//topaz/lib/keyboard/dart",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
-    "//third_party/dart-pkg/pub/test",
     "//third_party/dart-pkg/pub/mockito",
+    "//third_party/dart-pkg/pub/test",
+    "//topaz/lib/keyboard/dart",
     "//topaz/lib/shell",
   ]
 }
-
diff --git a/lib/keyboard/flutter/test/BUILD.gn b/lib/keyboard/flutter/test/BUILD.gn
index 4060352..4c2c99c 100644
--- a/lib/keyboard/flutter/test/BUILD.gn
+++ b/lib/keyboard/flutter/test/BUILD.gn
@@ -23,7 +23,6 @@
   ]
 }
 
-
 dart_library("flutter") {
   package_name = "keyboard.flutter"
 
@@ -36,15 +35,13 @@
   deps = [
     ":dart",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
-    "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/lib/shell",
+    "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/shell/keyboard",
   ]
 }
 
-
 dart_test("keyboard_test") {
-
   sources = [
     "keyboard_model_test.dart",
   ]
@@ -53,9 +50,8 @@
     ":dart",
     ":flutter",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
-    "//third_party/dart-pkg/pub/test",
     "//third_party/dart-pkg/pub/mockito",
+    "//third_party/dart-pkg/pub/test",
     "//topaz/lib/shell",
   ]
 }
-
diff --git a/lib/setui/common/BUILD.gn b/lib/setui/common/BUILD.gn
index 42ee40c..a634b26 100644
--- a/lib/setui/common/BUILD.gn
+++ b/lib/setui/common/BUILD.gn
@@ -5,7 +5,6 @@
 import("//build/dart/dart_library.gni")
 import("//topaz/runtime/dart/dart_test.gni")
 
-
 dart_library("common") {
   package_name = "lib_setui_common"
 
@@ -20,17 +19,16 @@
   ]
 
   deps = [
-    "//third_party/dart-pkg/pub/yaml",
     "//third_party/dart-pkg/pub/quiver",
+    "//third_party/dart-pkg/pub/yaml",
     "//topaz/public/lib/app/dart",
   ]
 }
 
 dart_test("lib_setui_common_test") {
-
   sources = [
-    "conductor_test.dart",
     "conductor_builder_test.dart",
+    "conductor_test.dart",
     "step_test.dart",
     "syllabus_parser_test.dart",
     "syllabus_test.dart",
diff --git a/lib/setui/flutter/BUILD.gn b/lib/setui/flutter/BUILD.gn
index f885f28..db9c4b4 100644
--- a/lib/setui/flutter/BUILD.gn
+++ b/lib/setui/flutter/BUILD.gn
@@ -5,7 +5,6 @@
 import("//build/dart/dart_library.gni")
 import("//topaz/runtime/dart/dart_test.gni")
 
-
 dart_library("flutter") {
   package_name = "lib_setui_flutter"
 
@@ -25,7 +24,6 @@
 }
 
 dart_test("lib_setui_flutter_test") {
-
   sources = [
     "action_test.dart",
   ]
diff --git a/lib/setui/settings/client/BUILD.gn b/lib/setui/settings/client/BUILD.gn
index e5cbab6..41732ae 100644
--- a/lib/setui/settings/client/BUILD.gn
+++ b/lib/setui/settings/client/BUILD.gn
@@ -22,7 +22,6 @@
 }
 
 dart_test("lib_setui_settings_client_test") {
-
   sources = [
     "time_zone_controller_test.dart",
     # STOPSHIP(brycelee): add test back once migration to new api is complete.
@@ -36,4 +35,4 @@
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
   ]
-}
\ No newline at end of file
+}
diff --git a/lib/setui/settings/common/BUILD.gn b/lib/setui/settings/common/BUILD.gn
index fe95f00..c7af0d0 100644
--- a/lib/setui/settings/common/BUILD.gn
+++ b/lib/setui/settings/common/BUILD.gn
@@ -19,15 +19,14 @@
     "//garnet/public/fidl/fuchsia.setui",
     "//topaz/lib/setui/common:common",
     "//topaz/lib/setui/flutter:flutter",
-    "//topaz/lib/setui/settings/json:fuchsia.setui.json"
+    "//topaz/lib/setui/settings/json:fuchsia.setui.json",
   ]
 }
 
 dart_test("lib_setui_settings_common_test") {
-
   sources = [
-    "setting_controller_test.dart",
     "adapter_log_test.dart",
+    "setting_controller_test.dart",
   ]
 
   deps = [
@@ -37,4 +36,4 @@
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
   ]
-}
\ No newline at end of file
+}
diff --git a/lib/setui/settings/service/BUILD.gn b/lib/setui/settings/service/BUILD.gn
index f756a29..827b683 100644
--- a/lib/setui/settings/service/BUILD.gn
+++ b/lib/setui/settings/service/BUILD.gn
@@ -5,7 +5,6 @@
 import("//build/dart/dart_library.gni")
 import("//topaz/runtime/dart/dart_test.gni")
 
-
 dart_library("service") {
   package_name = "lib_setui_service"
 
@@ -28,7 +27,6 @@
 }
 
 dart_test("lib_setui_service_test") {
-
   sources = [
     "service_test.dart",
     # STOPSHIP(brycelee): add test back once migration to new api is complete.
diff --git a/lib/setui/settings/testing/BUILD.gn b/lib/setui/settings/testing/BUILD.gn
index 27e3836..56d0ba3 100644
--- a/lib/setui/settings/testing/BUILD.gn
+++ b/lib/setui/settings/testing/BUILD.gn
@@ -31,4 +31,4 @@
     "//third_party/dart-pkg/pub/test",
     "//topaz/lib/setui/settings/common:common",
   ]
-}
\ No newline at end of file
+}
diff --git a/lib/xi/fuchsia_client/BUILD.gn b/lib/xi/fuchsia_client/BUILD.gn
index 93c0a4a..f88376b 100644
--- a/lib/xi/fuchsia_client/BUILD.gn
+++ b/lib/xi/fuchsia_client/BUILD.gn
@@ -13,12 +13,12 @@
   ]
 
   deps = [
+    "../client:xi_client",
     "//garnet/public/fidl/fuchsia.xi",
     "//peridot/public/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
-    "../client:xi_client",
   ]
 }
 
diff --git a/lib/xi/widgets/BUILD.gn b/lib/xi/widgets/BUILD.gn
index fb748d6..dec7f2f 100644
--- a/lib/xi/widgets/BUILD.gn
+++ b/lib/xi/widgets/BUILD.gn
@@ -9,9 +9,9 @@
 
   sources = [
     "src/editor.dart",
+    "src/editor_host.dart",
     "src/line_cache.dart",
     "src/text_line.dart",
-    "src/editor_host.dart",
     "widgets.dart",
   ]
 
diff --git a/public/dart-pkg/fuchsia/sdk_ext.gni b/public/dart-pkg/fuchsia/sdk_ext.gni
index ad49c01..f2f0b11 100644
--- a/public/dart-pkg/fuchsia/sdk_ext.gni
+++ b/public/dart-pkg/fuchsia/sdk_ext.gni
@@ -4,6 +4,4 @@
 
 fuchsia_sdk_ext_lib = "//topaz/public/dart-pkg/fuchsia/lib/fuchsia.dart"
 
-fuchsia_sdk_ext_files = [
-  fuchsia_sdk_ext_lib,
-]
+fuchsia_sdk_ext_files = [ fuchsia_sdk_ext_lib ]
diff --git a/public/dart/fuchsia_logger/BUILD.gn b/public/dart/fuchsia_logger/BUILD.gn
index 53adc78..877252f 100644
--- a/public/dart/fuchsia_logger/BUILD.gn
+++ b/public/dart/fuchsia_logger/BUILD.gn
@@ -14,11 +14,11 @@
 
   sources = [
     "logger.dart",
-  "src/internal/_fuchsia_log_writer.dart",
-  "src/internal/_log_message.dart",
-  "src/internal/_log_writer.dart",
-  "src/internal/_stdout_log_writer.dart",
-  "src/logger/logger.dart",
+    "src/internal/_fuchsia_log_writer.dart",
+    "src/internal/_log_message.dart",
+    "src/internal/_log_writer.dart",
+    "src/internal/_stdout_log_writer.dart",
+    "src/logger/logger.dart",
   ]
 
   deps = [
@@ -33,7 +33,6 @@
 # Runs these tests using:
 #   fx run-host-tests fuchsia_logger_package_unittests
 dart_test("fuchsia_logger_package_unittests") {
-
   sources = [
     "internal/log_message_test.dart",
     "internal/log_writer_test.dart",
diff --git a/public/dart/fuchsia_media/BUILD.gn b/public/dart/fuchsia_media/BUILD.gn
index 3f3550e..320ab25 100644
--- a/public/dart/fuchsia_media/BUILD.gn
+++ b/public/dart/fuchsia_media/BUILD.gn
@@ -14,10 +14,10 @@
 
   sources = [
     "media.dart",
-    "src/media.dart"
+    "src/media.dart",
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.media"
+    "//garnet/public/fidl/fuchsia.media",
   ]
 }
diff --git a/public/dart/fuchsia_modular/BUILD.gn b/public/dart/fuchsia_modular/BUILD.gn
index e25ee56..2e32a73 100644
--- a/public/dart/fuchsia_modular/BUILD.gn
+++ b/public/dart/fuchsia_modular/BUILD.gn
@@ -80,8 +80,8 @@
     "module/internal/ongoing_activity_impl_test.dart",
     "module/module_test.dart",
     "module/noop_intent_handler_test.dart",
-    "proposal/proposal_test.dart",
     "proposal/internal/proposal_listener_impl_test.dart",
+    "proposal/proposal_test.dart",
     "service_connection/agent_service_connection_test.dart",
   ]
 
diff --git a/public/dart/modular_flutter/BUILD.gn b/public/dart/modular_flutter/BUILD.gn
index 4f24de9..07a1f29 100644
--- a/public/dart/modular_flutter/BUILD.gn
+++ b/public/dart/modular_flutter/BUILD.gn
@@ -15,6 +15,5 @@
     "run_mod.dart",
   ]
 
-  deps = [
-  ]
+  deps = []
 }
diff --git a/public/dart/scenic/BUILD.gn b/public/dart/scenic/BUILD.gn
index d9a5699..5317003 100644
--- a/public/dart/scenic/BUILD.gn
+++ b/public/dart/scenic/BUILD.gn
@@ -15,6 +15,5 @@
     "child_view.dart",
   ]
 
-  deps = [
-  ]
+  deps = []
 }
diff --git a/public/dart/sledge/sledge_testing_mod/BUILD.gn b/public/dart/sledge/sledge_testing_mod/BUILD.gn
index 8a51092..a9fe75d 100644
--- a/public/dart/sledge/sledge_testing_mod/BUILD.gn
+++ b/public/dart/sledge/sledge_testing_mod/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   sources = [
-    "test_model.dart"
+    "test_model.dart",
   ]
 
   deps = [
diff --git a/public/dart/widgets/BUILD.gn b/public/dart/widgets/BUILD.gn
index 31521c7..facd356 100644
--- a/public/dart/widgets/BUILD.gn
+++ b/public/dart/widgets/BUILD.gn
@@ -21,9 +21,9 @@
     "src/model/spring_model.dart",
     "src/model/ticking_model.dart",
     "src/model/tracing_spring_model.dart",
-    "src/modular/dank_session_shell_widget.dart",
     "src/modular/base_shell_model.dart",
     "src/modular/base_shell_widget.dart",
+    "src/modular/dank_session_shell_widget.dart",
     "src/modular/session_shell_model.dart",
     "src/modular/session_shell_widget.dart",
     "src/widgets/alphatar.dart",
@@ -61,8 +61,8 @@
 dart_test("dart_widget_tests") {
   sources = [
     "alphatar_test.dart",
-    "rk4_spring_simulation_test.dart",
     "providers_test.dart",
+    "rk4_spring_simulation_test.dart",
   ]
 
   deps = [
diff --git a/public/lib/app/dart/BUILD.gn b/public/lib/app/dart/BUILD.gn
index 5222bdc..1952bdf 100644
--- a/public/lib/app/dart/BUILD.gn
+++ b/public/lib/app/dart/BUILD.gn
@@ -29,8 +29,8 @@
     "//topaz/public/dart/fuchsia",
     "//topaz/public/dart/zircon",
     "//zircon/public/fidl/fuchsia-cobalt",
-    "//zircon/public/fidl/fuchsia-logger",
     "//zircon/public/fidl/fuchsia-io",
+    "//zircon/public/fidl/fuchsia-logger",
   ]
 }
 
@@ -42,19 +42,18 @@
   source_dir = "testing"
 
   sources = [
-    "app_test.dart"
+    "app_test.dart",
   ]
 
   deps = [
-    "//topaz/public/dart/fidl",
-    "//topaz/public/lib/app/dart",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
+    "//topaz/public/dart/fidl",
+    "//topaz/public/lib/app/dart",
   ]
 }
 
 dart_test("dart_app_tests") {
-
   sources = [
     "fuchsia_log_record_test.dart",
     "legacy_code.dart",
diff --git a/public/lib/app_driver/dart/BUILD.gn b/public/lib/app_driver/dart/BUILD.gn
index b0d2f31..d4de31c 100644
--- a/public/lib/app_driver/dart/BUILD.gn
+++ b/public/lib/app_driver/dart/BUILD.gn
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/dart/dart_library.gni")
 import("//third_party/cobalt_config/metrics_registry.gni")
 import("//topaz/runtime/dart/dart_test.gni")
-import("//build/dart/dart_library.gni")
 
 metrics_registry("modules_metrics_registry") {
   project_id = 104
@@ -22,9 +22,9 @@
   sources = [
     "app_driver.dart",
     "module_driver.dart",
+    "src/intent_parameters.dart",
     "src/module_driver.dart",
     "src/service_client.dart",
-    "src/intent_parameters.dart",
   ]
 
   deps = [
diff --git a/public/lib/display/flutter/BUILD.gn b/public/lib/display/flutter/BUILD.gn
index 2942c6b..3bf4ff0 100644
--- a/public/lib/display/flutter/BUILD.gn
+++ b/public/lib/display/flutter/BUILD.gn
@@ -20,7 +20,6 @@
 }
 
 dart_test("display_test") {
-
   sources = [
     "display_policy_brightness_model_test.dart",
   ]
@@ -28,8 +27,8 @@
   deps = [
     ":flutter",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
-    "//third_party/dart-pkg/pub/test",
     "//third_party/dart-pkg/pub/mockito",
+    "//third_party/dart-pkg/pub/test",
     "//topaz/public/lib/display/dart",
   ]
-}
\ No newline at end of file
+}
diff --git a/public/lib/mod/dart/BUILD.gn b/public/lib/mod/dart/BUILD.gn
index c9b7b67..ded502c 100644
--- a/public/lib/mod/dart/BUILD.gn
+++ b/public/lib/mod/dart/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//topaz/runtime/dart/dart_test.gni")
 import("//build/dart/dart_library.gni")
+import("//topaz/runtime/dart/dart_test.gni")
 
 dart_library("dart") {
   package_name = "lib.mod.dart"
@@ -14,6 +14,5 @@
     "mod.dart",
   ]
 
-  deps = [
-  ]
+  deps = []
 }
diff --git a/public/lib/run_mod/dart/BUILD.gn b/public/lib/run_mod/dart/BUILD.gn
index c4fa37d..8724ae0 100644
--- a/public/lib/run_mod/dart/BUILD.gn
+++ b/public/lib/run_mod/dart/BUILD.gn
@@ -2,9 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-
-import("//topaz/runtime/dart/dart_test.gni")
 import("//build/dart/dart_library.gni")
+import("//topaz/runtime/dart/dart_test.gni")
 
 dart_library("dart") {
   package_name = "lib.run_mod.dart"
@@ -19,7 +18,7 @@
   ]
 
   deps = [
-    "//topaz/public/dart/widgets:lib.widgets",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
+    "//topaz/public/dart/widgets:lib.widgets",
   ]
 }
diff --git a/public/lib/schemas/dart/BUILD.gn b/public/lib/schemas/dart/BUILD.gn
index 4a2a68e..af5763f 100644
--- a/public/lib/schemas/dart/BUILD.gn
+++ b/public/lib/schemas/dart/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//topaz/runtime/dart/dart_test.gni")
 import("//build/dart/dart_library.gni")
+import("//topaz/runtime/dart/dart_test.gni")
 
 dart_library("dart") {
   package_name = "lib.schemas.dart"
diff --git a/public/lib/settings/BUILD.gn b/public/lib/settings/BUILD.gn
index c2c5a58..3b24412 100644
--- a/public/lib/settings/BUILD.gn
+++ b/public/lib/settings/BUILD.gn
@@ -1,4 +1,3 @@
-
 # Copyright 2017 The Fuchsia Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/public/lib/testing/app_driver/dart/BUILD.gn b/public/lib/testing/app_driver/dart/BUILD.gn
index d8ac134..e4fedcb 100644
--- a/public/lib/testing/app_driver/dart/BUILD.gn
+++ b/public/lib/testing/app_driver/dart/BUILD.gn
@@ -18,7 +18,6 @@
 }
 
 dart_test("fake_module_driver_test") {
-
   sources = [
     "fake_module_driver_test.dart",
   ]
diff --git a/public/lib/ui/flutter/sdk_ext/BUILD.gn b/public/lib/ui/flutter/sdk_ext/BUILD.gn
index 88c75b6..8b0a7fb 100644
--- a/public/lib/ui/flutter/sdk_ext/BUILD.gn
+++ b/public/lib/ui/flutter/sdk_ext/BUILD.gn
@@ -9,8 +9,8 @@
   ]
 
   deps = [
-    "//garnet/public/lib/fxl",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:dart_api",
     "//third_party/tonic",
     "//topaz/public/dart-pkg/zircon",
diff --git a/public/lib/ui/flutter/sdk_ext/sdk_ext.gni b/public/lib/ui/flutter/sdk_ext/sdk_ext.gni
index a63e012..25f39f1 100644
--- a/public/lib/ui/flutter/sdk_ext/sdk_ext.gni
+++ b/public/lib/ui/flutter/sdk_ext/sdk_ext.gni
@@ -4,6 +4,4 @@
 
 mozart_dart_sdk_ext_lib = "//topaz/public/lib/ui/flutter/sdk_ext/mozart.dart"
 
-mozart_dart_sdk_ext_files = [
-  mozart_dart_sdk_ext_lib,
-]
+mozart_dart_sdk_ext_files = [ mozart_dart_sdk_ext_lib ]
diff --git a/public/lib/widgets/dart/BUILD.gn b/public/lib/widgets/dart/BUILD.gn
index 0582591..4ba5f88 100644
--- a/public/lib/widgets/dart/BUILD.gn
+++ b/public/lib/widgets/dart/BUILD.gn
@@ -2,15 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//topaz/runtime/dart/dart_test.gni")
 import("//build/dart/dart_library.gni")
+import("//topaz/runtime/dart/dart_test.gni")
 
 dart_library("dart") {
   infer_package_name = true
 
   sources = [
-    "model.dart",
     "listening_builder.dart",
+    "model.dart",
     "src/model/model.dart",
     "src/model/value_model.dart",
   ]
diff --git a/runtime/dart/BUILD.gn b/runtime/dart/BUILD.gn
index 936bc75..cd01bc1 100644
--- a/runtime/dart/BUILD.gn
+++ b/runtime/dart/BUILD.gn
@@ -61,8 +61,9 @@
   dart_target_gen_dir =
       get_label_info(":bogus($host_toolchain)", "target_gen_dir")
   kernel_compiler_path = "$dart_target_gen_dir/kernel_compiler.snapshot"
-  frontend_server_tool_gen_dir =
-      get_label_info("//third_party/flutter/frontend_server:frontend_server_tool_snapshot($host_toolchain)", "target_gen_dir")
+  frontend_server_tool_gen_dir = get_label_info(
+          "//third_party/flutter/frontend_server:frontend_server_tool_snapshot($host_toolchain)",
+          "target_gen_dir")
 
   files = [
     {
diff --git a/runtime/dart/dart_component.gni b/runtime/dart/dart_component.gni
index effa0e0..997948e 100644
--- a/runtime/dart/dart_component.gni
+++ b/runtime/dart/dart_component.gni
@@ -104,11 +104,11 @@
 template("_flutter_dart_jit_package") {
   package(target_name) {
     forward_variables_from(invoker,
-                       [
-                         "testonly",
-                         "tests",
-                         "deprecated_bare_package_url",
-                       ])
+                           [
+                             "testonly",
+                             "tests",
+                             "deprecated_bare_package_url",
+                           ])
     package_name = invoker.pkg_name
     deps = invoker.cmx_deps
     extra = []
@@ -123,9 +123,7 @@
         extra += [ component.asset_manifest ]
 
         # TODO(rmacnak): Remove core_jit_cheat_target.
-        public_deps += [
-          ":${component.kernel_target_name}",
-        ]
+        public_deps += [ ":${component.kernel_target_name}" ]
 
         deps += [ ":${component.component_resources}" ]
       }
@@ -145,10 +143,10 @@
 
     if (defined(invoker.interpreter) && invoker.interpreter) {
       resources += [
-          {
-            path = rebase_path("//topaz/runtime/dart/enable_interpreter")
-            dest = "enable_interpreter"
-          }
+        {
+          path = rebase_path("//topaz/runtime/dart/enable_interpreter")
+          dest = "enable_interpreter"
+        },
       ]
     }
 
@@ -252,6 +250,7 @@
   if (defined(invoker.meta)) {
     package_meta = invoker.meta
   }
+
   # Inject appropriate "runner" into Component manifests
   cmx_filtered_meta = []
   cmx_deps = []
@@ -285,7 +284,8 @@
       }
 
       dbc = false
-      runtime_meta = "//topaz/runtime/flutter_runner/meta/jit${product_suffix}_runtime"
+      runtime_meta =
+          "//topaz/runtime/flutter_runner/meta/jit${product_suffix}_runtime"
     } else if (component.component_type == "dart") {
       product = !is_debug
       if (defined(invoker.product)) {
@@ -336,6 +336,7 @@
     }
 
     component_name = component.component_name
+
     # TODO(CP-142): Should be renamed to component_root
     package_root = component.package_root
 
@@ -355,13 +356,16 @@
     }
 
     if (flutter_driver_extendable) {
-      generated_extension_wrapper = "$dart_target_gen_dir/${kernel_name}__extension_wrapper.dart"
+      generated_extension_wrapper =
+          "$dart_target_gen_dir/${kernel_name}__extension_wrapper.dart"
       generated_extension_wrapper_main_dart = component.main_dart
 
       action("${kernel_name}_extensions_wrapper") {
-        script = "//topaz/runtime/flutter_runner/build/gen_debug_wrapper_main.py"
+        script =
+            "//topaz/runtime/flutter_runner/build/gen_debug_wrapper_main.py"
         args = [
-          "--main-dart=" + rebase_path(generated_extension_wrapper_main_dart, dart_target_gen_dir),
+          "--main-dart=" + rebase_path(generated_extension_wrapper_main_dart,
+                                       dart_target_gen_dir),
           "--out=" + rebase_path(generated_extension_wrapper),
         ]
 
@@ -425,9 +429,8 @@
           "//topaz/public/lib/module/dart",
         ]
 
-        non_dart_deps += [
-          ":${kernel_name}_extensions_wrapper($target_toolchain)",
-        ]
+        non_dart_deps +=
+            [ ":${kernel_name}_extensions_wrapper($target_toolchain)" ]
       }
 
       if (dbc) {
@@ -442,13 +445,14 @@
       asset_manifest = "$target_gen_dir/build/${kernel_name}_pkgassets"
 
       _flutter_jit_asset_manifest(kernel_name) {
-        forward_variables_from(invoker, [
-            "manifest",
-            "component_name",
-            "asset_manifest",
-            "dart_library_target_name",
-            "dot_packages"
-        ])
+        forward_variables_from(invoker,
+                               [
+                                 "manifest",
+                                 "component_name",
+                                 "asset_manifest",
+                                 "dart_library_target_name",
+                                 "dot_packages",
+                               ])
       }
 
       components_with_kernel += [
@@ -460,7 +464,7 @@
           deps = component.deps
           sources = component.sources
           component_resources = "${kernel_name}_resources"
-        }
+        },
       ]
     } else if (component.component_type == "dart") {
       components_with_kernel += [
@@ -470,7 +474,7 @@
           kernel_manifest = kernel_manifest
           deps = component.deps
           sources = component.sources
-        }
+        },
       ]
     }
   }
@@ -549,13 +553,13 @@
 
     foreach(component, invoker.components_with_kernel) {
       deps += [
-             ":${component.snapshot_target_name}",
-             ":${component.stats_target_name}",
-           ] + component.component_shared_snapshot_deps + component.deps
+                ":${component.snapshot_target_name}",
+                ":${component.stats_target_name}",
+              ] + component.component_shared_snapshot_deps + component.deps
 
       if (component.component_type == "flutter") {
         extra += [ component.asset_manifest ]
-        deps += [ ":${component.component_resources}", ]
+        deps += [ ":${component.component_resources}" ]
       }
 
       resources_path = "${component.component_name}/"
@@ -589,7 +593,6 @@
           },
         ]
       }
-
     }
 
     if (defined(invoker.invoker_resources)) {
@@ -654,6 +657,7 @@
   if (defined(invoker.meta)) {
     package_meta = invoker.meta
   }
+
   # Inject appropriate "runner" into Component manifests
   cmx_filtered_meta = []
   cmx_deps = []
@@ -666,7 +670,6 @@
 
     if (component.component_type == "flutter") {
       product = !flutter_profile
-
     } else if (component.component_type == "dart") {
       product = !is_debug
     }
@@ -714,6 +717,7 @@
     }
 
     component_name = component.component_name
+
     # TODO(CP-142): Should be renamed to component_root
     package_root = component.package_root
 
@@ -758,10 +762,12 @@
       }
 
       main_dart = component.main_dart
-      args = [ "--aot", "--tfa" ]
+      args = [
+        "--aot",
+        "--tfa",
+      ]
     }
 
-
     # TODO(rmacnak): VM snapshot is ignored. Allow skipping its generation.
     vm_snapshot_data_path = "$target_gen_dir/${kernel_name}_vm_data.aotsnapshot"
     vm_snapshot_instructions_path =
@@ -783,13 +789,13 @@
           [ get_label_info(flutter_aot_sharing_basis, "label_no_toolchain") +
             "_snapshot" ]
       prefix = get_label_info(flutter_aot_sharing_basis, "target_gen_dir") +
-          "/" + get_label_info(flutter_aot_sharing_basis, "name")
+               "/" + get_label_info(flutter_aot_sharing_basis, "name")
       shared_snapshot_data_path = "${prefix}_data.aotsnapshot"
       shared_snapshot_instructions_path = "${prefix}_instructions.aotsnapshot"
     } else if (component.component_type == "dart" &&
-        dart_aot_sharing_basis != "" &&
-        get_label_info(":$kernel_name", "label_no_toolchain") !=
-        get_label_info(dart_aot_sharing_basis, "label_no_toolchain")) {
+               dart_aot_sharing_basis != "" &&
+               get_label_info(":$kernel_name", "label_no_toolchain") !=
+               get_label_info(dart_aot_sharing_basis, "label_no_toolchain")) {
       # Note: The use of "label_no_toolchain" is to ensure we are comparing
       # fully qualified target names. We don't actually care about the
       # toolchain.
@@ -816,14 +822,13 @@
         testonly = invoker.testonly
       }
 
-      deps = gen_snapshot_deps +
-          shared_snapshot_deps +
-          [ ":$kernel_target_name" ]
+      deps =
+          gen_snapshot_deps + shared_snapshot_deps + [ ":$kernel_target_name" ]
       inputs = [
-                 shared_snapshot_data_path,
-                 shared_snapshot_instructions_path,
-                 kernel_path,
-               ]
+        shared_snapshot_data_path,
+        shared_snapshot_instructions_path,
+        kernel_path,
+      ]
       outputs = [
         vm_snapshot_data_path,
         vm_snapshot_instructions_path,
@@ -944,7 +949,7 @@
           deps = component.deps
           sources = component.sources
           component_resources = "${kernel_name}_resources"
-        }
+        },
       ]
     } else if (component.component_type == "dart") {
       components_with_kernel += [
@@ -963,7 +968,7 @@
           component_shared_snapshot_deps = shared_snapshot_deps
           deps = component.deps
           sources = component.sources
-        }
+        },
       ]
     }
   }
diff --git a/runtime/dart/dart_kernel.gni b/runtime/dart/dart_kernel.gni
index f0ba379..fc178f9 100644
--- a/runtime/dart/dart_kernel.gni
+++ b/runtime/dart/dart_kernel.gni
@@ -6,7 +6,8 @@
 import("//build/dart/toolchain.gni")
 
 _compiler_label = "//topaz/runtime/dart:kernel_compiler($host_toolchain)"
-_compiler_path = get_label_info(_compiler_label, "root_out_dir") + "/dart-tools/kernel_compiler"
+_compiler_path = get_label_info(_compiler_label, "root_out_dir") +
+                 "/dart-tools/kernel_compiler"
 
 # Generates dill files for a Dart application
 #
@@ -71,15 +72,17 @@
     if (defined(invoker.sources)) {
       sources += invoker.sources
     }
-    extra_sources = [
-      invoker.main_dart,
-    ]
+    extra_sources = [ invoker.main_dart ]
   }
 
   # TODO(tvolkert): Name this ${target_name}
   action("${target_name}_kernel") {
     pool = "//build/dart:dart_pool($dart_toolchain)"
-    forward_variables_from(invoker, ["testonly", "visibility"])
+    forward_variables_from(invoker,
+                           [
+                             "testonly",
+                             "visibility",
+                           ])
 
     kernel_path = "$target_gen_dir/${target_name}.dil"
 
@@ -95,6 +98,7 @@
       outputs += [
         # Explicit output when using --manifest.
         invoker.manifest,
+
         # Implicit output when using --manifest; see createManifest in compiler.dart.
         invoker.manifest + ".dilplist",
       ]
@@ -103,7 +107,8 @@
     dart_target_gen_dir =
         get_label_info(":bogus($dart_toolchain)", "target_gen_dir")
     rebased_packages_path =
-        rebase_path("$dart_target_gen_dir/$dart_library_target_name.packages", "//")
+        rebase_path("$dart_target_gen_dir/$dart_library_target_name.packages",
+                    "//")
 
     multi_root_scheme = "fuchsia-source"
 
diff --git a/runtime/dart_runner/dart_app.gni b/runtime/dart_runner/dart_app.gni
index 7d0562a..845c5d7 100644
--- a/runtime/dart_runner/dart_app.gni
+++ b/runtime/dart_runner/dart_app.gni
@@ -72,7 +72,7 @@
         package_root = "."
         deps = invoker.deps
         sources = pkg_sources
-      }
+      },
     ]
   }
 
@@ -144,7 +144,7 @@
         package_root = "."
         deps = invoker.deps
         sources = pkg_sources
-      }
+      },
     ]
   }
 
@@ -219,7 +219,7 @@
 #
 template("dart_app") {
   assert((defined(invoker.components) && !defined(invoker.main_dart)) ||
-         (!defined(invoker.components) && defined(invoker.main_dart)),
+             (!defined(invoker.components) && defined(invoker.main_dart)),
          "Only one of components or main_dart should be defined")
   target(dart_default_app, target_name) {
     forward_variables_from(invoker, "*")
diff --git a/runtime/dart_runner/embedder/BUILD.gn b/runtime/dart_runner/embedder/BUILD.gn
index 48683e2..bb633fd 100644
--- a/runtime/dart_runner/embedder/BUILD.gn
+++ b/runtime/dart_runner/embedder/BUILD.gn
@@ -7,8 +7,7 @@
 
 dart_kernel("shim") {
   platform_name = "dart_runner"
-  platform_deps =
-          [ "//topaz/runtime/dart_runner/kernel:kernel_platform_files" ]
+  platform_deps = [ "//topaz/runtime/dart_runner/kernel:kernel_platform_files" ]
   platform_path = "$root_out_dir/dart_runner_patched_sdk"
 
   disable_analysis = true
@@ -30,7 +29,8 @@
 
     # gen_snapshot only needs this to go through the motions of setting up an isolate.
     shim_target = ":shim_kernel"
-    shim_kernel = get_label_info(shim_target, "target_gen_dir") + "/shim_kernel.dil"
+    shim_kernel =
+        get_label_info(shim_target, "target_gen_dir") + "/shim_kernel.dil"
 
     inputs = [
       shim_kernel,
diff --git a/runtime/dart_runner/examples/goodbye_dart/BUILD.gn b/runtime/dart_runner/examples/goodbye_dart/BUILD.gn
index da18885..6c89b55 100644
--- a/runtime/dart_runner/examples/goodbye_dart/BUILD.gn
+++ b/runtime/dart_runner/examples/goodbye_dart/BUILD.gn
@@ -49,17 +49,23 @@
 }
 
 copy("copy_goodbye_dart_test") {
-  sources = [ "goodbye_dart_test" ]
-  outputs = [ "${root_build_dir}/goodbye_dart_test" ]
+  sources = [
+    "goodbye_dart_test",
+  ]
+  outputs = [
+    "${root_build_dir}/goodbye_dart_test",
+  ]
 }
 
 package("goodbye_dart_test") {
   deprecated_bare_package_url = "//build"
 
   testonly = true
-  tests = [{
-    name = "goodbye_dart_test"
-  }]
+  tests = [
+    {
+      name = "goodbye_dart_test"
+    },
+  ]
   meta = [
     {
       dest = "goodbye_dart_test.cmx"
@@ -67,6 +73,6 @@
     },
   ]
   deps = [
-    ":copy_goodbye_dart_test"
+    ":copy_goodbye_dart_test",
   ]
 }
diff --git a/runtime/dart_runner/kernel/BUILD.gn b/runtime/dart_runner/kernel/BUILD.gn
index 347f34b..4050ad9 100644
--- a/runtime/dart_runner/kernel/BUILD.gn
+++ b/runtime/dart_runner/kernel/BUILD.gn
@@ -9,7 +9,8 @@
   single_root_scheme = "org-dartlang-sdk"
   single_root_base = rebase_path("../../../../")
 
-  libraries_specification_uri = "org-dartlang-sdk:///topaz/runtime/dart_runner/kernel/libraries.json"
+  libraries_specification_uri =
+      "org-dartlang-sdk:///topaz/runtime/dart_runner/kernel/libraries.json"
 
   outputs = [
     "$root_out_dir/dart_runner_patched_sdk/platform_strong.dill",
diff --git a/runtime/flutter_runner/BUILD.gn b/runtime/flutter_runner/BUILD.gn
index 0914505..5917349 100644
--- a/runtime/flutter_runner/BUILD.gn
+++ b/runtime/flutter_runner/BUILD.gn
@@ -18,9 +18,7 @@
 #
 # While not required to run a flutter mod, these allow interacting
 # with flutter via the fx tool and need to be built.
-flutter_tool_deps = [
-  "//third_party/dart-pkg/git/flutter/packages/flutter_tools:fuchsia_attach($host_toolchain)",
-]
+flutter_tool_deps = [ "//third_party/dart-pkg/git/flutter/packages/flutter_tools:fuchsia_attach($host_toolchain)" ]
 
 # Builds a flutter_runner
 #
@@ -190,9 +188,9 @@
   output_name = "flutter_jit_runner"
   product = false
   extra_deps = [
-    "//third_party/dart/runtime:libdart_jit",
-    "//third_party/dart/runtime/platform:libdart_platform_jit",
-  ] + flutter_tool_deps
+                 "//third_party/dart/runtime:libdart_jit",
+                 "//third_party/dart/runtime/platform:libdart_platform_jit",
+               ] + flutter_tool_deps
 }
 
 flutter_runner("jit_product") {
diff --git a/runtime/flutter_runner/flutter_app.gni b/runtime/flutter_runner/flutter_app.gni
index cfafe49..35df072 100644
--- a/runtime/flutter_runner/flutter_app.gni
+++ b/runtime/flutter_runner/flutter_app.gni
@@ -74,7 +74,7 @@
         package_root = "."
         deps = invoker.deps
         sources = pkg_sources
-      }
+      },
     ]
   }
   flutter_dart_jit_component(target_name) {
@@ -120,7 +120,7 @@
 template("_flutter_aot_component") {
   # This variable isn't needed in AOT builds.
   if (defined(invoker.flutter_driver_extendable)) {
-    not_needed(invoker, ["flutter_driver_extendable",])
+    not_needed(invoker, [ "flutter_driver_extendable" ])
   }
   pkg_name = target_name
   legacy_component = false
@@ -149,7 +149,7 @@
         package_root = "."
         deps = invoker.deps
         sources = pkg_sources
-      }
+      },
     ]
   }
   flutter_dart_aot_component(target_name) {
@@ -175,7 +175,7 @@
   }
 
   target(template_name, target_name) {
-    forward_variables_from(invoker, "*", ["space_dart"])
+    forward_variables_from(invoker, "*", [ "space_dart" ])
   }
 }
 
@@ -226,7 +226,7 @@
 #
 template("flutter_app") {
   assert((defined(invoker.components) && !defined(invoker.main_dart)) ||
-         (!defined(invoker.components) && defined(invoker.main_dart)),
+             (!defined(invoker.components) && defined(invoker.main_dart)),
          "Only one of components or main_dart should be defined")
   target(flutter_default_app, target_name) {
     forward_variables_from(invoker, "*", [ "aot" ])
@@ -254,7 +254,7 @@
 #         be inferred from the component name.
 #
 template("flutter_dart_apps") {
-  assert((defined(invoker.components) && !defined(invoker.main_dart)),
+  assert(defined(invoker.components) && !defined(invoker.main_dart),
          "components must be defined. Use main_dart under components instead.")
 
   pkg_name = target_name
@@ -273,7 +273,12 @@
       template_name = flutter_product_app
     }
     target(template_name, target_name) {
-      forward_variables_from(invoker, "*", [ "aot", "space_dart" ])
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "aot",
+                               "space_dart",
+                             ])
     }
   }
 }
diff --git a/runtime/flutter_runner/kernel/BUILD.gn b/runtime/flutter_runner/kernel/BUILD.gn
index 92b809b..aa315b8 100644
--- a/runtime/flutter_runner/kernel/BUILD.gn
+++ b/runtime/flutter_runner/kernel/BUILD.gn
@@ -6,11 +6,11 @@
 import("//third_party/dart/utils/compile_platform.gni")
 
 compile_platform("kernel_platform_files") {
-
   single_root_scheme = "org-dartlang-sdk"
   single_root_base = rebase_path("../../../../")
 
-  libraries_specification_uri = "org-dartlang-sdk:///topaz/runtime/flutter_runner/kernel/libraries.json"
+  libraries_specification_uri =
+      "org-dartlang-sdk:///topaz/runtime/flutter_runner/kernel/libraries.json"
 
   outputs = [
     "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill",
@@ -30,7 +30,7 @@
 
 template("core_snapshot") {
   assert(defined(invoker.product),
-      "core_snapshot requires 'product' to be defined")
+         "core_snapshot requires 'product' to be defined")
 
   product_suffix = ""
   if (invoker.product) {
@@ -47,8 +47,9 @@
       compilation_trace = "//topaz/runtime/flutter_runner/compilation_trace.txt"
     } else {
       # TODO(rmacnak): Remove core_jit_cheat_target.
-      platform_dill = get_label_info(core_jit_cheat_target, "target_gen_dir") + "/" +
-                      get_label_info(core_jit_cheat_target, "name") + "_kernel.dil"
+      platform_dill =
+          get_label_info(core_jit_cheat_target, "target_gen_dir") + "/" +
+          get_label_info(core_jit_cheat_target, "name") + "_kernel.dil"
       deps += [ core_jit_cheat_target ]
       compilation_trace = core_jit_cheat_trace
     }
@@ -58,9 +59,12 @@
       compilation_trace,
     ]
 
-    vm_snapshot_data = "$target_gen_dir/vm_isolate_snapshot${product_suffix}.bin"
-    vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions${product_suffix}.bin"
-    isolate_snapshot_data = "$target_gen_dir/isolate_snapshot${product_suffix}.bin"
+    vm_snapshot_data =
+        "$target_gen_dir/vm_isolate_snapshot${product_suffix}.bin"
+    vm_snapshot_instructions =
+        "$target_gen_dir/vm_snapshot_instructions${product_suffix}.bin"
+    isolate_snapshot_data =
+        "$target_gen_dir/isolate_snapshot${product_suffix}.bin"
     isolate_snapshot_instructions =
         "$target_gen_dir/isolate_snapshot_instructions${product_suffix}.bin"
     outputs = [
@@ -78,13 +82,15 @@
     args = [
       # TODO(zra): remove this when the interpreter supports field guards.
       "--no_use_field_guards",
+
       # TODO(FL-117): Re-enable causal async stack traces when this issue is
       # addressed.
       "--no_causal_async_stacks",
       "--enable_mirrors=false",
       "--deterministic",
       "--snapshot_kind=core-jit",
-      "--load_compilation_trace=" + rebase_path(compilation_trace, root_build_dir),
+      "--load_compilation_trace=" +
+          rebase_path(compilation_trace, root_build_dir),
       "--vm_snapshot_data=" + rebase_path(vm_snapshot_data, root_build_dir),
       "--vm_snapshot_instructions=" +
           rebase_path(vm_snapshot_instructions, root_build_dir),
diff --git a/shell/mondrian_story_shell/BUILD.gn b/shell/mondrian_story_shell/BUILD.gn
index bed012f..02f528c 100644
--- a/shell/mondrian_story_shell/BUILD.gn
+++ b/shell/mondrian_story_shell/BUILD.gn
@@ -31,8 +31,8 @@
     "models/surface/surface_form.dart",
     "models/surface/surface_graph.dart",
     "models/surface/surface_properties.dart",
-    "models/tree/tree.dart",
     "models/tree/spanning_tree.dart",
+    "models/tree/tree.dart",
     "story_shell_impl.dart",
     "widgets/gestures.dart",
     "widgets/isometric_widget.dart",
diff --git a/tests/fidl-changes/dart/BUILD.gn b/tests/fidl-changes/dart/BUILD.gn
index edf1d0d..28c9193 100644
--- a/tests/fidl-changes/dart/BUILD.gn
+++ b/tests/fidl-changes/dart/BUILD.gn
@@ -9,16 +9,15 @@
   infer_package_name = true
 
   sources = [
-    "before.dart",
-    "after.dart",
-        "before-during.dart",
     "after-during.dart",
-
+    "after.dart",
+    "before-during.dart",
+    "before.dart",
   ]
 
   deps = [
+    "//garnet/tests/fidl-changes:fidl.test.after",
     "//garnet/tests/fidl-changes:fidl.test.before",
     "//garnet/tests/fidl-changes:fidl.test.during",
-    "//garnet/tests/fidl-changes:fidl.test.after",
   ]
 }
diff --git a/tools/protobuf/protoc_gen_dart/BUILD.gn b/tools/protobuf/protoc_gen_dart/BUILD.gn
index 8ae19cf..913279e 100644
--- a/tools/protobuf/protoc_gen_dart/BUILD.gn
+++ b/tools/protobuf/protoc_gen_dart/BUILD.gn
@@ -10,5 +10,7 @@
 
   main_dart = "lib/main.dart"
 
-  deps = ["//third_party/dart-pkg/pub/protoc_plugin"]
+  deps = [
+    "//third_party/dart-pkg/pub/protoc_plugin",
+  ]
 }