diff --git a/eic_data.yaml b/eic_data.yaml
index 53f3d68694b0a2f0496afee08bceb227ebbc230d..efd20a5e2d3749b39628bbd542918db431caacbc 100644
--- a/eic_data.yaml
+++ b/eic_data.yaml
@@ -289,7 +289,7 @@ datatypes:
       - float             momentum          // particle 3-momentum magnitude [GeV]
       - float             energy            // Energy (from calorimetery) of the particle [GeV]
       - float             mass              // The mass of the particle in [GeV]
-      - eic::Weight       weight             // Particle weight, e.g. from PID algorithm [0-1]
+      - eic::Weight       weight            // Particle weight, e.g. from PID algorithm [0-1]
 
   eic::ReconstructedParticleRelations:
     Description: "Relational info associated with our reconstructed particle"
@@ -411,8 +411,8 @@ datatypes:
       - int64_t           cellID            // The detector specific (geometrical) cell id.
       - eic::Index        ID                // Unique hit ID
       - float             npe               // estimated number of photo-electrons [#]
-      - float             time               // Time [ns]
-      - float             timeError          // Error on the time [ns]
+      - float             time              // Time [ns]
+      - float             timeError         // Error on the time [ns]
       - eic::VectorXYZ    position          // PMT hit position [mm]
       - eic::VectorXYZ    local             // The local position of the hit in detector coordinates [mm]
       - eic::VectorXYZ    dimension         // The dimension information of the pixel [mm].
@@ -421,14 +421,14 @@ datatypes:
     Description: "EIC Ring Image Cluster"
     Author: "S. Joosten, C. Peng"
     Members:
-      - eic::Index            ID            // Unique cluster ID
-      - float                 npe           // number of photo-electrons [#]
-      - eic::VectorXYZ        position      // Global position of the cluster [mm]
-      - eic::VectorXYZ        positionError // Error on the position
-      - float                 theta         // opening angle of the ring [rad, 0->pi]
-      - float                 thetaError    // error on the opening angle
-      - float                 radius        // radius of the best fit ring [mm]
-      - float                 radiusError   // estimated error from the fit [mm]
+      - eic::Index        ID                // Unique cluster ID
+      - float             npe               // number of photo-electrons [#]
+      - eic::VectorXYZ    position          // Global position of the cluster [mm]
+      - eic::VectorXYZ    positionError     // Error on the position
+      - float             theta             // opening angle of the ring [rad, 0->pi]
+      - float             thetaError        // error on the opening angle
+      - float             radius            // radius of the best fit ring [mm]
+      - float             radiusError       // estimated error from the fit [mm]
 
   ## ==========================================================================
   ## Tracking
@@ -467,7 +467,7 @@ datatypes:
     ##   Members:
     ##     eic::Index       hitID             // Unique hit identifier
     ##     eic::Index       trackID           // link to the associated track
-    ##     eic::Weight      weight             // prototrack weight, in case we share pixels [0-1]
+    ##     eic::Weight      weight            // prototrack weight, in case we share pixels [0-1]
   
   eic::TrackParameters:
     Description: "ACTS Bound Track parameters"
@@ -491,10 +491,10 @@ datatypes:
     Description: "EIC vertex"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - eic::Index            ID            // unique vertex ID
-      - eic::VectorXYZ        position      // postion of vertex [mm]
-      - float                 time          // time of vertex [ns]
-      - float                 chi2          // Chi squared of the vertex fit.
-      - float                 probability   // Probability of the vertex fit
-      - bool                  primary       // Whether it is the primary vertex of the event
+      - eic::Index        ID                // unique vertex ID
+      - eic::VectorXYZ    position          // postion of vertex [mm]
+      - float             time              // time of vertex [ns]
+      - float             chi2              // Chi squared of the vertex fit.
+      - float             probability       // Probability of the vertex fit
+      - bool              primary           // Whether it is the primary vertex of the event