diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/PVCameraInfo.java b/photon-core/src/main/java/org/photonvision/vision/camera/PVCameraInfo.java
index 023394ee2..9728569cb 100644
--- a/photon-core/src/main/java/org/photonvision/vision/camera/PVCameraInfo.java
+++ b/photon-core/src/main/java/org/photonvision/vision/camera/PVCameraInfo.java
@@ -123,10 +123,7 @@ public sealed interface PVCameraInfo {
         public boolean equals(Object obj) {
             if (this == obj) return true;
             if (obj == null) return false;
-            if (obj instanceof PVCameraInfo info) {
-                return equals(info);
-            }
-            return false;
+            return obj instanceof PVCameraInfo info && equals(info);
         }
 
         @Override
@@ -192,10 +189,7 @@ public sealed interface PVCameraInfo {
         public boolean equals(Object obj) {
             if (this == obj) return true;
             if (obj == null) return false;
-            if (obj instanceof PVCameraInfo info) {
-                return equals(info);
-            }
-            return false;
+            return obj instanceof PVCameraInfo info && equals(info);
         }
 
         @Override
@@ -252,10 +246,7 @@ public sealed interface PVCameraInfo {
         public boolean equals(Object obj) {
             if (this == obj) return true;
             if (obj == null) return false;
-            if (obj instanceof PVFileCameraInfo info) {
-                return equals(info);
-            }
-            return false;
+            return obj instanceof PVFileCameraInfo info && equals(info);
         }
 
         @Override
diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/USBCameraSource.java b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/USBCameraSource.java
index ab7bf5bc7..b0a4dde81 100644
--- a/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/USBCameraSource.java
+++ b/photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/USBCameraSource.java
@@ -71,12 +71,12 @@ public class USBCameraSource extends VisionSource {
         // yes to me...
         if (getCameraConfiguration().cameraQuirks == null) {
             int vid =
-                    (config.matchedCameraInfo instanceof PVUsbCameraInfo)
-                            ? ((PVUsbCameraInfo) config.matchedCameraInfo).vendorId
+                    (config.matchedCameraInfo instanceof PVUsbCameraInfo cameraInfo)
+                            ? cameraInfo.vendorId
                             : -1;
             int pid =
-                    (config.matchedCameraInfo instanceof PVUsbCameraInfo)
-                            ? ((PVUsbCameraInfo) config.matchedCameraInfo).productId
+                    (config.matchedCameraInfo instanceof PVUsbCameraInfo cameraInfo)
+                            ? cameraInfo.productId
                             : -1;
 
             getCameraConfiguration().cameraQuirks =
diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/OutputStreamPipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/OutputStreamPipeline.java
index 70cb7e996..366ef1a0a 100644
--- a/photon-core/src/main/java/org/photonvision/vision/pipeline/OutputStreamPipeline.java
+++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/OutputStreamPipeline.java
@@ -107,11 +107,10 @@ public class OutputStreamPipeline {
         resizeImagePipe.setParams(
                 new ResizeImagePipe.ResizeImageParams(settings.streamingFrameDivisor));
 
-        if (settings instanceof Calibration3dPipelineSettings) {
+        if (settings instanceof Calibration3dPipelineSettings pipelineSettings) {
             drawCalibrationPipe.setParams(
                     new DrawCalibrationPipe.DrawCalibrationPipeParams(
-                            settings.streamingFrameDivisor,
-                            ((Calibration3dPipelineSettings) settings).drawAllSnapshots));
+                            pipelineSettings.streamingFrameDivisor, pipelineSettings.drawAllSnapshots));
         }
     }