diff --git a/build/fbcode_builder/docker_builder.py b/build/fbcode_builder/docker_builder.py
index f219bf316..96b56950b 100644
--- a/build/fbcode_builder/docker_builder.py
+++ b/build/fbcode_builder/docker_builder.py
@@ -19,7 +19,7 @@ import shutil
 import tempfile
 
 from fbcode_builder import FBCodeBuilder
-from shell_quoting import raw_shell, shell_comment, shell_join, ShellQuoted, path_join
+from shell_quoting import path_join, raw_shell, shell_comment, shell_join, ShellQuoted
 from utils import recursively_flatten_list, run_command
 
 
diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py
index 58387232e..dd4b2c2c9 100755
--- a/build/fbcode_builder/getdeps.py
+++ b/build/fbcode_builder/getdeps.py
@@ -21,15 +21,15 @@ from getdeps.buildopts import setup_build_options
 from getdeps.dyndeps import create_dyn_dep_munger
 from getdeps.errors import TransientFailure
 from getdeps.fetcher import (
-    SystemPackageFetcher,
     file_name_is_cmake_file,
     list_files_under_dir_newer_than_timestamp,
+    SystemPackageFetcher,
 )
 from getdeps.load import ManifestLoader
 from getdeps.manifest import ManifestParser
 from getdeps.platform import HostType
 from getdeps.runcmd import run_cmd
-from getdeps.subcmd import SubCmd, add_subcommands, cmd
+from getdeps.subcmd import add_subcommands, cmd, SubCmd
 
 
 try:
diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py
index f79cfc86f..97a4d63d0 100644
--- a/build/fbcode_builder/getdeps/builder.py
+++ b/build/fbcode_builder/getdeps/builder.py
@@ -14,7 +14,7 @@ import subprocess
 import sys
 
 from .dyndeps import create_dyn_dep_munger
-from .envfuncs import Env, add_path_entry, path_search
+from .envfuncs import add_path_entry, Env, path_search
 from .fetcher import copy_if_different
 from .runcmd import run_cmd
 
diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py
index 90c5012db..108ddc9e2 100644
--- a/build/fbcode_builder/getdeps/buildopts.py
+++ b/build/fbcode_builder/getdeps/buildopts.py
@@ -10,13 +10,13 @@ import os
 import subprocess
 import sys
 import tempfile
-from typing import Optional, Mapping
+from typing import Mapping, Optional
 
 from .copytree import containing_repo_type
-from .envfuncs import Env, add_flag, add_path_entry
+from .envfuncs import add_flag, add_path_entry, Env
 from .fetcher import get_fbsource_repo_data, homebrew_package_prefix
 from .manifest import ContextGenerator
-from .platform import HostType, is_windows, get_available_ram
+from .platform import get_available_ram, HostType, is_windows
 
 
 def detect_project(path):
diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py
index 0b4d2fc21..d77ac14b9 100644
--- a/build/fbcode_builder/getdeps/manifest.py
+++ b/build/fbcode_builder/getdeps/manifest.py
@@ -11,6 +11,7 @@ from typing import List
 from .builder import (
     AutoconfBuilder,
     Boost,
+    CMakeBootStrapBuilder,
     CMakeBuilder,
     Iproute2Builder,
     MakeBuilder,
@@ -19,7 +20,6 @@ from .builder import (
     OpenNSABuilder,
     OpenSSLBuilder,
     SqliteBuilder,
-    CMakeBootStrapBuilder,
 )
 from .cargo import CargoBuilder
 from .expr import parse_expr
diff --git a/build/fbcode_builder/make_docker_context.py b/build/fbcode_builder/make_docker_context.py
index 5bc00e07a..3123414d7 100755
--- a/build/fbcode_builder/make_docker_context.py
+++ b/build/fbcode_builder/make_docker_context.py
@@ -183,7 +183,7 @@ def make_docker_context(
 
 
 if __name__ == "__main__":
-    from utils import read_fbcode_builder_config, build_fbcode_builder_config
+    from utils import build_fbcode_builder_config, read_fbcode_builder_config
 
     # Load a spec from the current directory
     config = read_fbcode_builder_config("fbcode_builder_config.py")
diff --git a/build/fbcode_builder/shell_builder.py b/build/fbcode_builder/shell_builder.py
index ebc4e4d0d..e8b7449ad 100644
--- a/build/fbcode_builder/shell_builder.py
+++ b/build/fbcode_builder/shell_builder.py
@@ -88,7 +88,7 @@ def persistent_temp_dir(repo_root):
 
 
 if __name__ == "__main__":
-    from utils import read_fbcode_builder_config, build_fbcode_builder_config
+    from utils import build_fbcode_builder_config, read_fbcode_builder_config
 
     repo_root = find_project_root()
     temp = persistent_temp_dir(repo_root)