diff --git a/gtsam/geometry/CalibratedCameraT.h b/gtsam/geometry/CalibratedCameraT.h
index bfc622851..34e314941 100644
--- a/gtsam/geometry/CalibratedCameraT.h
+++ b/gtsam/geometry/CalibratedCameraT.h
@@ -18,6 +18,7 @@ namespace gtsam {
    * If calibration is known, it is more computationally efficient
    * to calibrate the measurements rather than try to predict in pixels.
    * AGC: Is this used or tested anywhere?
+   * AGC: If this is a "CalibratedCamera," why is there a calibration stored internally?
    * @ingroup geometry
    */
   template <typename Calibration>
diff --git a/gtsam/geometry/GeneralCameraT.h b/gtsam/geometry/GeneralCameraT.h
index 61d82b62b..204c4fe9e 100644
--- a/gtsam/geometry/GeneralCameraT.h
+++ b/gtsam/geometry/GeneralCameraT.h
@@ -192,7 +192,7 @@ private:
 };
 
 typedef GeneralCameraT<CalibratedCamera,Cal3Bundler> Cal3BundlerCamera;
-typedef GeneralCameraT<CalibratedCamera,Cal3DS2> Cal3DS2Camera;
-typedef GeneralCameraT<CalibratedCamera,Cal3_S2> Cal3_S2Camera;
+typedef GeneralCameraT<CalibratedCamera,Cal3DS2> Cal3DS2Camera; // NOTE: Typedef not referenced in gtsam
+typedef GeneralCameraT<CalibratedCamera,Cal3_S2> Cal3_S2Camera; // NOTE: Typedef not referenced in gtsam
 
 }
diff --git a/gtsam/geometry/SimpleCamera.h b/gtsam/geometry/SimpleCamera.h
index 22bb0fda1..88eabb0f5 100644
--- a/gtsam/geometry/SimpleCamera.h
+++ b/gtsam/geometry/SimpleCamera.h
@@ -16,8 +16,7 @@
  * @author Frank Dellaert
  */
 
-#ifndef SIMPLECAMERA_H_
-#define SIMPLECAMERA_H_
+#pragma once
 
 #include <gtsam/geometry/CalibratedCamera.h>
 #include <gtsam/geometry/Cal3_S2.h>
@@ -93,5 +92,3 @@ namespace gtsam {
 	};
 
 }
-
-#endif /* SIMPLECAMERA_H_ */