diff --git a/sysid/src/main/native/cpp/view/DataSelector.cpp b/sysid/src/main/native/cpp/view/DataSelector.cpp
index 7b59ab2e6a3..7d8d8e572a6 100644
--- a/sysid/src/main/native/cpp/view/DataSelector.cpp
+++ b/sysid/src/main/native/cpp/view/DataSelector.cpp
@@ -39,7 +39,8 @@ static bool EmitEntryTarget(const char* name, bool isString,
     if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(
             isString ? "DataLogEntryString" : "DataLogEntry")) {
       assert(payload->DataSize == sizeof(const wpi::log::DataLogReaderEntry*));
-      *entry = *static_cast<const wpi::log::DataLogReaderEntry**>(payload->Data);
+      *entry =
+          *static_cast<const wpi::log::DataLogReaderEntry**>(payload->Data);
       rv = true;
     }
     ImGui::EndDragDropTarget();
diff --git a/sysid/src/main/native/cpp/view/LogLoader.cpp b/sysid/src/main/native/cpp/view/LogLoader.cpp
index bc857fe1c2f..f8e3e54edf8 100644
--- a/sysid/src/main/native/cpp/view/LogLoader.cpp
+++ b/sysid/src/main/native/cpp/view/LogLoader.cpp
@@ -54,7 +54,8 @@ void LogLoader::Display() {
         return;
       }
       unload();
-      m_reader = std::make_unique<wpi::log::DataLogReaderThread>(std::move(reader));
+      m_reader =
+          std::make_unique<wpi::log::DataLogReaderThread>(std::move(reader));
       m_entryTree.clear();
     }
     m_opener.reset();
diff --git a/sysid/src/main/native/include/sysid/view/DataSelector.h b/sysid/src/main/native/include/sysid/view/DataSelector.h
index d11444e2d2c..60ba2da5b82 100644
--- a/sysid/src/main/native/include/sysid/view/DataSelector.h
+++ b/sysid/src/main/native/include/sysid/view/DataSelector.h
@@ -22,9 +22,9 @@ class Storage;
 }  // namespace glass
 
 namespace wpi {
-namespace log{
-  class DataLogReaderEntry;
-}
+namespace log {
+class DataLogReaderEntry;
+}  // namespace log
 class Logger;
 }  // namespace wpi
 
diff --git a/sysid/src/main/native/include/sysid/view/LogLoader.h b/sysid/src/main/native/include/sysid/view/LogLoader.h
index 56de22671c6..70931bc8cab 100644
--- a/sysid/src/main/native/include/sysid/view/LogLoader.h
+++ b/sysid/src/main/native/include/sysid/view/LogLoader.h
@@ -22,9 +22,9 @@ class open_file;
 
 namespace wpi {
 namespace log {
-  class DataLogReaderEntry;
-  class DataLogReaderThread;
-}
+class DataLogReaderEntry;
+class DataLogReaderThread;
+}  // namespace log
 class Logger;
 }  // namespace wpi
 
diff --git a/wpiutil/src/main/native/include/wpi/DataLogReaderThread.h b/wpiutil/src/main/native/include/wpi/DataLogReaderThread.h
index ec70619ca6c..aeb737ba24a 100644
--- a/wpiutil/src/main/native/include/wpi/DataLogReaderThread.h
+++ b/wpiutil/src/main/native/include/wpi/DataLogReaderThread.h
@@ -105,4 +105,4 @@ class DataLogReaderThread {
   std::thread m_thread;
 };
 
-}  // namespace wpi
+}  // namespace wpi::log