diff --git a/packages/shorebird_cli/lib/src/artifact_builder.dart b/packages/shorebird_cli/lib/src/artifact_builder.dart
index 07dc1d6f9..59eb4accf 100644
--- a/packages/shorebird_cli/lib/src/artifact_builder.dart
+++ b/packages/shorebird_cli/lib/src/artifact_builder.dart
@@ -16,7 +16,6 @@ import 'package:shorebird_cli/src/shorebird_artifacts.dart';
 import 'package:shorebird_cli/src/shorebird_documentation.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:shorebird_cli/src/shorebird_process.dart';
-import 'package:stream_transform/stream_transform.dart';
 
 /// Used to wrap code that invokes `flutter build` with Shorebird's fork of
 /// Flutter.
@@ -579,7 +578,7 @@ Either run `flutter pub get` manually, or follow the steps in ${cannotRunInVSCod
           .transform(const LineSplitter())
           .listen((line) {
         logger.detail(line);
-        // TODO: update build progress
+        // TODO(bryanoltman): update build progress
       });
 
       final stderrLines = await buildProcess.stderr
@@ -594,7 +593,7 @@ Either run `flutter pub get` manually, or follow the steps in ${cannotRunInVSCod
     });
 
     final projectRoot = shorebirdEnv.getShorebirdProjectRoot()!;
-    // TODO: extract this to function, ensure this is correct
+    // TODO(bryanoltman): extract this to function, ensure this is correct
     return Directory(
       p.join(
         projectRoot.path,
diff --git a/packages/shorebird_cli/lib/src/commands/patch/windows_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/windows_patcher.dart
index 0b5fa2cf4..9233a99c7 100644
--- a/packages/shorebird_cli/lib/src/commands/patch/windows_patcher.dart
+++ b/packages/shorebird_cli/lib/src/commands/patch/windows_patcher.dart
@@ -29,8 +29,9 @@ class WindowsPatcher extends Patcher {
   });
 
   @override
-  // TODO: exe isn't technically correct - we upload a zip containing the exe
-  // along with dlls and assets. We should find a better name for this.
+  // TODO(bryanoltman): exe isn't technically correct - we upload a zip
+  // containing the exe along with dlls and assets. We should find a better name
+  // for this.
   String get primaryReleaseArtifactArch => 'exe';
 
   @override
@@ -38,7 +39,7 @@ class WindowsPatcher extends Patcher {
 
   @override
   Future<void> assertPreconditions() async {
-    // TODO: implement assertPreconditions
+    // TODO(bryanoltman): implement assertPreconditions
   }
 
   @override
@@ -47,7 +48,7 @@ class WindowsPatcher extends Patcher {
     required File releaseArchive,
     required File patchArchive,
   }) async {
-    // TODO: implement assertUnpatchableDiffs
+    // TODO(bryanoltman): implement assertUnpatchableDiffs
     return const DiffStatus(hasAssetChanges: false, hasNativeChanges: false);
   }
 
@@ -87,7 +88,7 @@ class WindowsPatcher extends Patcher {
       'windows',
       'x64',
       'runner',
-      // TODO: does this change with flavors?
+      // TODO(bryanoltman): does this change with flavors?
       // from android:
       // flavor != null ? '${flavor}Release' : 'release',
       'Release',
diff --git a/packages/shorebird_cli/test/src/validators/tracked_lock_files_validator_test.dart b/packages/shorebird_cli/test/src/validators/tracked_lock_files_validator_test.dart
index dc87d889c..d1f7c09c9 100644
--- a/packages/shorebird_cli/test/src/validators/tracked_lock_files_validator_test.dart
+++ b/packages/shorebird_cli/test/src/validators/tracked_lock_files_validator_test.dart
@@ -5,7 +5,6 @@ import 'package:path/path.dart' as p;
 import 'package:scoped_deps/scoped_deps.dart';
 import 'package:shorebird_cli/src/executables/git.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
-import 'package:shorebird_cli/src/validators/tracked_lock_files_validator.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';