1 files changed, 8 insertions, 10 deletions
diff --git a/pw_software_update/public/pw_software_update/bundled_update_service.h b/pw_software_update/public/pw_software_update/bundled_update_service.h
index d517d2203..1c9dbd596 100644
--- a/pw_software_update/public/pw_software_update/bundled_update_service.h
+++ b/pw_software_update/public/pw_software_update/bundled_update_service.h
@@ -62,7 +62,7 @@ class BundledUpdateService
                pw_software_update_BundledUpdateStatus& response);
 
   // Currently sync, should be async.
-  // TODO: Make this async to support aborting verify/apply.
+  // TODO(keir): Make this async to support aborting verify/apply.
   Status Abort(const pw_protobuf_Empty& request,
                pw_software_update_BundledUpdateStatus& response);
 
@@ -81,24 +81,22 @@ class BundledUpdateService
   // TODO(davidrogers) Add a MaybeFinishApply() method that is called after
   // reboot to finish any need apply and verify work.
 
-  // TODO:
-  // VerifyProgress - to update % complete.
-  // ApplyProgress - to update % complete.
+  // TODO(keir): VerifyProgress - to update % complete.
+  // TODO(keir): ApplyProgress - to update % complete.
 
  private:
   // Top-level lock for OTA state coherency. May be held for extended periods.
   sync::Mutex mutex_;
-  BundledUpdateBackend& backend_ PW_GUARDED_BY(mutex_);
-  UpdateBundleAccessor& bundle_ PW_GUARDED_BY(mutex_);
-  bool bundle_open_ PW_GUARDED_BY(mutex_);
-  work_queue::WorkQueue& work_queue_ PW_GUARDED_BY(mutex_);
-  bool work_enqueued_ PW_GUARDED_BY(mutex_);
-
   // Nested lock for safe status updates and queries.
   sync::Mutex status_mutex_ PW_ACQUIRED_AFTER(mutex_);
   pw_software_update_BundledUpdateStatus unsafe_status_
       PW_GUARDED_BY(status_mutex_);
   sync::Borrowable<pw_software_update_BundledUpdateStatus, sync::Mutex> status_;
+  BundledUpdateBackend& backend_ PW_GUARDED_BY(mutex_);
+  UpdateBundleAccessor& bundle_ PW_GUARDED_BY(mutex_);
+  bool bundle_open_ PW_GUARDED_BY(mutex_);
+  work_queue::WorkQueue& work_queue_ PW_GUARDED_BY(mutex_);
+  bool work_enqueued_ PW_GUARDED_BY(mutex_);
 
   void DoVerify() PW_LOCKS_EXCLUDED(status_mutex_);
   void DoApply() PW_LOCKS_EXCLUDED(status_mutex_);