diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp
index 440a794ac2..b894272b11 100644
--- a/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp
@@ -19,9 +19,10 @@
 
 using namespace photon;
 
-photon::MultiTargetPNPResult::MultiTargetPNPResult(PNPResult result, wpi::SmallVector<int16_t, 32> fiducialIdsUsed) : result(result), fiducialIdsUsed(fiducialIdsUsed) {}
+photon::MultiTargetPNPResult::MultiTargetPNPResult(
+    PNPResult result, wpi::SmallVector<int16_t, 32> fiducialIdsUsed)
+    : result(result), fiducialIdsUsed(fiducialIdsUsed) {}
 
-bool MultiTargetPNPResult::operator==(const MultiTargetPNPResult& other)
-const {
+bool MultiTargetPNPResult::operator==(const MultiTargetPNPResult& other) const {
   return other.result == result && other.fiducialIdsUsed == fiducialIdsUsed;
 }
diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/PNPResult.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/PNPResult.cpp
index d1fd0abe9f..f604c0465d 100644
--- a/photon-targeting/src/main/native/cpp/photon/targeting/PNPResult.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/targeting/PNPResult.cpp
@@ -20,18 +20,18 @@
 using namespace photon;
 
 PNPResult::PNPResult(frc::Transform3d best, double bestReprojErr,
-                             frc::Transform3d alt, double altReprojErr,
-                             double ambiguity) : best(best), bestReprojErr(bestReprojErr), alt(alt), altReprojErr(altReprojErr), ambiguity(ambiguity) {
-                                this->isPresent = true;
-                             }
-
-
+                     frc::Transform3d alt, double altReprojErr,
+                     double ambiguity)
+    : best(best),
+      bestReprojErr(bestReprojErr),
+      alt(alt),
+      altReprojErr(altReprojErr),
+      ambiguity(ambiguity) {
+  this->isPresent = true;
+}
 
 bool PNPResult::operator==(const PNPResult& other) const {
-  return other.isPresent == isPresent 
-            && other.best == best 
-            && other.altReprojErr == bestReprojErr 
-            && other.alt == alt 
-            && other.altReprojErr == altReprojErr 
-            && other.ambiguity == ambiguity;
+  return other.isPresent == isPresent && other.best == best &&
+         other.altReprojErr == bestReprojErr && other.alt == alt &&
+         other.altReprojErr == altReprojErr && other.ambiguity == ambiguity;
 }
diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp
index e8e4397ea0..989887e41a 100644
--- a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "photon/targeting/PhotonPipelineResult.h"
+
 #include "photon/targeting/PNPResult.h"
 
 using namespace photon;
@@ -27,9 +28,12 @@ PhotonPipelineResult::PhotonPipelineResult(
 
 PhotonPipelineResult::PhotonPipelineResult(
     units::second_t latency, std::span<const PhotonTrackedTarget> targets,
-    MultiTargetPNPResult multitagResult) : latency(latency), targets(targets.data(), targets.data() + targets.size()), multitagResult(multitagResult) {}
+    MultiTargetPNPResult multitagResult)
+    : latency(latency),
+      targets(targets.data(), targets.data() + targets.size()),
+      multitagResult(multitagResult) {}
 
-bool PhotonPipelineResult::operator==(
-    const PhotonPipelineResult& other) const {
-  return latency == other.latency && targets == other.targets && multitagResult == other.multitagResult;
+bool PhotonPipelineResult::operator==(const PhotonPipelineResult& other) const {
+  return latency == other.latency && targets == other.targets &&
+         multitagResult == other.multitagResult;
 }
diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp
index 3482fac970..a0e70bade9 100644
--- a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "photon/targeting/PhotonTrackedTarget.h"
-#include "photon/targeting/TargetCorner.h"
 
 #include <iostream>
 #include <utility>
@@ -24,6 +23,7 @@
 #include <frc/geometry/Translation2d.h>
 #include <wpi/SmallVector.h>
 
+#include "photon/targeting/TargetCorner.h"
 
 static constexpr const uint8_t MAX_CORNERS = 8;
 
diff --git a/photon-targeting/src/main/native/include/photon/targeting/MultiTargetPNPResult.h b/photon-targeting/src/main/native/include/photon/targeting/MultiTargetPNPResult.h
index eb297e9bc8..0da141e5ec 100644
--- a/photon-targeting/src/main/native/include/photon/targeting/MultiTargetPNPResult.h
+++ b/photon-targeting/src/main/native/include/photon/targeting/MultiTargetPNPResult.h
@@ -27,7 +27,6 @@ class MultiTargetPNPResult {
  public:
   MultiTargetPNPResult() = default;
 
-
   MultiTargetPNPResult(PNPResult result,
                        wpi::SmallVector<int16_t, 32> fiducialIdsUsed);