diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64b50bc..02b1987 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -460,6 +460,25 @@ jobs:
 
             const existing = comments.data.find(c => c.body.includes(marker));
 
+            // Minimize stale report comments from previous commits
+            const prefix = '<!-- j2735-ci-report-';
+            const stale = comments.data.filter(c =>
+              c.body.includes(prefix) && !c.body.includes(marker)
+            );
+            for (const old of stale) {
+              try {
+                await github.graphql(`
+                  mutation($id: ID!) {
+                    minimizeComment(input: {subjectId: $id, classifier: OUTDATED}) {
+                      minimizedComment { isMinimized }
+                    }
+                  }
+                `, { id: old.node_id });
+              } catch (error) {
+                console.warn(`Failed to minimize stale comment ${old.id}:`, error);
+              }
+            }
+
             if (existing) {
               await github.rest.issues.updateComment({
                 owner: context.repo.owner,
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index ae18c9d..77893d2 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -509,6 +509,25 @@ jobs:
 
             const existing = comments.data.find(c => c.body.includes(marker));
 
+            // Minimize stale report comments from previous commits
+            const prefix = '<!-- j2735-python-ci-report-';
+            const stale = comments.data.filter(c =>
+              c.body.includes(prefix) && !c.body.includes(marker)
+            );
+            for (const old of stale) {
+              try {
+                await github.graphql(`
+                  mutation($id: ID!) {
+                    minimizeComment(input: {subjectId: $id, classifier: OUTDATED}) {
+                      minimizedComment { isMinimized }
+                    }
+                  }
+                `, { id: old.node_id });
+              } catch (error) {
+                console.warn(`Failed to minimize stale comment ${old.id}: ${error}`);
+              }
+            }
+
             if (existing) {
               await github.rest.issues.updateComment({
                 owner: context.repo.owner,
diff --git a/src/J2735_api.h b/src/J2735_api.h
index fe98f73..f1e7647 100644
--- a/src/J2735_api.h
+++ b/src/J2735_api.h
@@ -19,7 +19,8 @@
 /**
  * @file
  * @author Yogev Neumann
- * @brief TODO
+ * @brief J2735 UPER parsing toolkit - public API aggregating all type definitions and access
+ * macros.
  */
 #ifndef J2735_API_H
 #define J2735_API_H
diff --git a/src/J2735_internal_DE_AllowedManeuvers.h b/src/J2735_internal_DE_AllowedManeuvers.h
index 4090928..cdbf156 100644
--- a/src/J2735_internal_DE_AllowedManeuvers.h
+++ b/src/J2735_internal_DE_AllowedManeuvers.h
@@ -53,8 +53,6 @@
  *
  * 12-bit read layout (left-justified from bit 0):
  *   [F0..F11] (12 flag bits, no extension marker)
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_ALLOWEDMANEUVERS_H
 #define J2735_INTERNAL_DE_ALLOWEDMANEUVERS_H
@@ -144,7 +142,8 @@
  * @internal
  * @brief Extract a single flag bit from pre-read 12-bit raw value.
  *
- * @param[in] raw12   Value previously returned by J2735_INTERNAL_RAW_READ_ALLOWED_MANEUVERS().
+ * @param[in] raw12   Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_ALLOWED_MANEUVERS().
  * @param[in] bit_pos ASN.1 bit position (0-11). Use J2735_INTERNAL_BIT_ALLOWED_MANEUVERS_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_BrakeAppliedStatus.h b/src/J2735_internal_DE_BrakeAppliedStatus.h
index 7cbdd1b..a33fe62 100644
--- a/src/J2735_internal_DE_BrakeAppliedStatus.h
+++ b/src/J2735_internal_DE_BrakeAppliedStatus.h
@@ -46,8 +46,6 @@
  *
  * 5-bit read layout (left-justified from bit 0):
  *   [F0..F4] (5 flag bits, no extension marker)
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_BRAKEAPPLIEDSTATUS_H
 #define J2735_INTERNAL_DE_BRAKEAPPLIEDSTATUS_H
@@ -130,7 +128,8 @@
  * @internal
  * @brief Extract a single flag bit from pre-read 5-bit raw value.
  *
- * @param[in] raw5   Value previously returned by J2735_INTERNAL_RAW_READ_BRAKE_APPLIED_STATUS().
+ * @param[in] raw5    Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_BRAKE_APPLIED_STATUS().
  * @param[in] bit_pos ASN.1 bit position (0-4). Use J2735_INTERNAL_BIT_BRAKE_APPLIED_STATUS_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_ExteriorLights.h b/src/J2735_internal_DE_ExteriorLights.h
index 0a889ef..1e00862 100644
--- a/src/J2735_internal_DE_ExteriorLights.h
+++ b/src/J2735_internal_DE_ExteriorLights.h
@@ -61,8 +61,6 @@
  *                  bit16  15..7     6..0
  *   Extended:     [Ext=1][nsnnwn:7][F0..F8]
  *                  bit16  15..9    8..0
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_EXTERIORLIGHTS_H
 #define J2735_INTERNAL_DE_EXTERIORLIGHTS_H
@@ -205,7 +203,8 @@ _Static_assert(J2735_INTERNAL_MAX_WIRE_BITS_EXTERIOR_LIGHTS ==
  *   F0 at bit 8, F1 at bit 7, ..., F8 at bit 0
  *   Formula: (raw17 >> (8 - bit_pos)) & 1
  *
- * @param[in] raw17   Value previously returned by J2735_INTERNAL_RAW_READ_EXTERIOR_LIGHTS().
+ * @param[in] raw17   Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_EXTERIOR_LIGHTS().
  * @param[in] bit_pos ASN.1 bit position (0-8). Use J2735_INTERNAL_BIT_EXTERIOR_LIGHTS_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_GNSSstatus.h b/src/J2735_internal_DE_GNSSstatus.h
index 6e031b1..c1e120e 100644
--- a/src/J2735_internal_DE_GNSSstatus.h
+++ b/src/J2735_internal_DE_GNSSstatus.h
@@ -49,8 +49,6 @@
  *
  * 8-bit read layout (left-justified from bit 0):
  *   [F0..F7] (8 flag bits, no extension marker)
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_GNSSSTATUS_H
 #define J2735_INTERNAL_DE_GNSSSTATUS_H
@@ -136,7 +134,8 @@
  * @internal
  * @brief Extract a single flag bit from pre-read 8-bit raw value.
  *
- * @param[in] raw8   Value previously returned by J2735_INTERNAL_RAW_READ_GNSS_STATUS().
+ * @param[in] raw8    Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_GNSS_STATUS().
  * @param[in] bit_pos ASN.1 bit position (0-7). Use J2735_INTERNAL_BIT_GNSS_STATUS_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_LaneDirection.h b/src/J2735_internal_DE_LaneDirection.h
index 36bc723..48639e4 100644
--- a/src/J2735_internal_DE_LaneDirection.h
+++ b/src/J2735_internal_DE_LaneDirection.h
@@ -43,8 +43,6 @@
  *
  * 2-bit read layout (left-justified from bit 0):
  *   [F0..F1] (2 flag bits, no extension marker)
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_LANEDIRECTION_H
 #define J2735_INTERNAL_DE_LANEDIRECTION_H
@@ -124,7 +122,8 @@
  * @internal
  * @brief Extract a single flag bit from pre-read 2-bit raw value.
  *
- * @param[in] raw2   Value previously returned by J2735_INTERNAL_RAW_READ_LANE_DIRECTION().
+ * @param[in] raw2    Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_LANE_DIRECTION().
  * @param[in] bit_pos ASN.1 bit position (0-1). Use J2735_INTERNAL_BIT_LANE_DIRECTION_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_LaneSharing.h b/src/J2735_internal_DE_LaneSharing.h
index 4a29a6d..86bb6be 100644
--- a/src/J2735_internal_DE_LaneSharing.h
+++ b/src/J2735_internal_DE_LaneSharing.h
@@ -51,8 +51,6 @@
  *
  * 10-bit read layout (left-justified from bit 0):
  *   [F0..F9] (10 flag bits, no extension marker)
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_LANESHARING_H
 #define J2735_INTERNAL_DE_LANESHARING_H
@@ -140,7 +138,8 @@
  * @internal
  * @brief Extract a single flag bit from pre-read 10-bit raw value.
  *
- * @param[in] raw10   Value previously returned by J2735_INTERNAL_RAW_READ_LANE_SHARING().
+ * @param[in] raw10   Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_LANE_SHARING().
  * @param[in] bit_pos ASN.1 bit position (0-9). Use J2735_INTERNAL_BIT_LANE_SHARING_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_PersonalAssistive.h b/src/J2735_internal_DE_PersonalAssistive.h
index d27984d..fc7c6ae 100644
--- a/src/J2735_internal_DE_PersonalAssistive.h
+++ b/src/J2735_internal_DE_PersonalAssistive.h
@@ -58,8 +58,6 @@
  *                  bit13  12..7     6..0
  *   Extended:     [Ext=1][nsnnwn:7][F0..F5]
  *                  bit13  12..6    5..0
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_PERSONALASSISTIVE_H
 #define J2735_INTERNAL_DE_PERSONALASSISTIVE_H
@@ -199,7 +197,8 @@ _Static_assert(J2735_INTERNAL_MAX_WIRE_BITS_PERSONAL_ASSISTIVE ==
  *   F0 at bit 5, F1 at bit 4, ..., F5 at bit 0
  *   Formula: (raw14 >> (5 - bit_pos)) & 1
  *
- * @param[in] raw14   Value previously returned by J2735_INTERNAL_RAW_READ_PERSONAL_ASSISTIVE().
+ * @param[in] raw14   Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_PERSONAL_ASSISTIVE().
  * @param[in] bit_pos ASN.1 bit position (0-5). Use J2735_INTERNAL_BIT_PERSONAL_ASSISTIVE_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_PersonalDeviceUsageState.h b/src/J2735_internal_DE_PersonalDeviceUsageState.h
index cf01c74..1d9b118 100644
--- a/src/J2735_internal_DE_PersonalDeviceUsageState.h
+++ b/src/J2735_internal_DE_PersonalDeviceUsageState.h
@@ -61,8 +61,6 @@
  *                  bit16  15..7     6..0
  *   Extended:     [Ext=1][nsnnwn:7][F0..F8]
  *                  bit16  15..9    8..0
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_PERSONALDEVICEUSAGESTATE_H
 #define J2735_INTERNAL_DE_PERSONALDEVICEUSAGESTATE_H
@@ -211,7 +209,7 @@ _Static_assert(J2735_INTERNAL_MAX_WIRE_BITS_PERSONAL_DEVICE_USAGE_STATE ==
  *   Formula: (raw17 >> (8 - bit_pos)) & 1
  *
  * @param[in] raw17   Value previously returned by
- * J2735_INTERNAL_RAW_READ_PERSONAL_DEVICE_USAGE_STATE().
+ *                    J2735_INTERNAL_RAW_READ_PERSONAL_DEVICE_USAGE_STATE().
  * @param[in] bit_pos ASN.1 bit position (0-8). Use J2735_INTERNAL_BIT_PERSONAL_DEVICE_USAGE_STATE_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_PublicSafetyAndRoadWorkerActivity.h b/src/J2735_internal_DE_PublicSafetyAndRoadWorkerActivity.h
index 3e5c4f2..3b77e14 100644
--- a/src/J2735_internal_DE_PublicSafetyAndRoadWorkerActivity.h
+++ b/src/J2735_internal_DE_PublicSafetyAndRoadWorkerActivity.h
@@ -58,8 +58,6 @@
  *                  bit13  12..7     6..0
  *   Extended:     [Ext=1][nsnnwn:7][F0..F5]
  *                  bit13  12..6    5..0
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_PUBLICSAFETYANDROADWORKERACTIVITY_H
 #define J2735_INTERNAL_DE_PUBLICSAFETYANDROADWORKERACTIVITY_H
@@ -210,7 +208,7 @@ _Static_assert(J2735_INTERNAL_MAX_WIRE_BITS_PUBLIC_SAFETY_AND_ROAD_WORKER_ACTIVI
  *   Formula: (raw14 >> (5 - bit_pos)) & 1
  *
  * @param[in] raw14   Value previously returned by
- * J2735_INTERNAL_RAW_READ_PUBLIC_SAFETY_AND_ROAD_WORKER_ACTIVITY().
+ *                    J2735_INTERNAL_RAW_READ_PUBLIC_SAFETY_AND_ROAD_WORKER_ACTIVITY().
  * @param[in] bit_pos ASN.1 bit position (0-5). Use
  * J2735_INTERNAL_BIT_PUBLIC_SAFETY_AND_ROAD_WORKER_ACTIVITY_* constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_PublicSafetyDirectingTrafficSubType.h b/src/J2735_internal_DE_PublicSafetyDirectingTrafficSubType.h
index 67208e4..d3eb847 100644
--- a/src/J2735_internal_DE_PublicSafetyDirectingTrafficSubType.h
+++ b/src/J2735_internal_DE_PublicSafetyDirectingTrafficSubType.h
@@ -59,8 +59,6 @@
  *                  bit14  13..7     6..0
  *   Extended:     [Ext=1][nsnnwn:7][F0..F6]
  *                  bit14  13..7    6..0
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_PUBLICSAFETYDIRECTINGTRAFFICSUBTYPE_H
 #define J2735_INTERNAL_DE_PUBLICSAFETYDIRECTINGTRAFFICSUBTYPE_H
@@ -215,7 +213,7 @@ _Static_assert(J2735_INTERNAL_MAX_WIRE_BITS_PUBLIC_SAFETY_DIRECTING_TRAFFIC_SUB_
  *   Formula: (raw15 >> (6 - bit_pos)) & 1
  *
  * @param[in] raw15   Value previously returned by
- * J2735_INTERNAL_RAW_READ_PUBLIC_SAFETY_DIRECTING_TRAFFIC_SUB_TYPE().
+ *                    J2735_INTERNAL_RAW_READ_PUBLIC_SAFETY_DIRECTING_TRAFFIC_SUB_TYPE().
  * @param[in] bit_pos ASN.1 bit position (0-6). Use
  * J2735_INTERNAL_BIT_PUBLIC_SAFETY_DIRECTING_TRAFFIC_SUB_TYPE_* constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_TrafficLightOperationStatus.h b/src/J2735_internal_DE_TrafficLightOperationStatus.h
index 0aa3c45..097a4db 100644
--- a/src/J2735_internal_DE_TrafficLightOperationStatus.h
+++ b/src/J2735_internal_DE_TrafficLightOperationStatus.h
@@ -60,8 +60,6 @@
  *                  bit15  14..7     6..0
  *   Extended:     [Ext=1][nsnnwn:7][F0..F7]
  *                  bit15  14..8    7..0
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_TRAFFICLIGHTOPERATIONSTATUS_H
 #define J2735_INTERNAL_DE_TRAFFICLIGHTOPERATIONSTATUS_H
@@ -209,7 +207,7 @@ _Static_assert(J2735_INTERNAL_MAX_WIRE_BITS_TRAFFIC_LIGHT_OPERATION_STATUS ==
  *   Formula: (raw16 >> (7 - bit_pos)) & 1
  *
  * @param[in] raw16   Value previously returned by
- * J2735_INTERNAL_RAW_READ_TRAFFIC_LIGHT_OPERATION_STATUS().
+ *                    J2735_INTERNAL_RAW_READ_TRAFFIC_LIGHT_OPERATION_STATUS().
  * @param[in] bit_pos ASN.1 bit position (0-7). Use
  * J2735_INTERNAL_BIT_TRAFFIC_LIGHT_OPERATION_STATUS_* constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_TransitStatus.h b/src/J2735_internal_DE_TransitStatus.h
index 5cfd394..09f647f 100644
--- a/src/J2735_internal_DE_TransitStatus.h
+++ b/src/J2735_internal_DE_TransitStatus.h
@@ -47,8 +47,6 @@
  *
  * 6-bit read layout (left-justified from bit 0):
  *   [F0..F5] (6 flag bits, no extension marker)
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_TRANSITSTATUS_H
 #define J2735_INTERNAL_DE_TRANSITSTATUS_H
@@ -132,7 +130,8 @@
  * @internal
  * @brief Extract a single flag bit from pre-read 6-bit raw value.
  *
- * @param[in] raw6   Value previously returned by J2735_INTERNAL_RAW_READ_TRANSIT_STATUS().
+ * @param[in] raw6    Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_TRANSIT_STATUS().
  * @param[in] bit_pos ASN.1 bit position (0-5). Use J2735_INTERNAL_BIT_TRANSIT_STATUS_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_UserSizeAndBehaviour.h b/src/J2735_internal_DE_UserSizeAndBehaviour.h
index 3044d79..9961163 100644
--- a/src/J2735_internal_DE_UserSizeAndBehaviour.h
+++ b/src/J2735_internal_DE_UserSizeAndBehaviour.h
@@ -57,8 +57,6 @@
  *                  bit12  11..7     6..0
  *   Extended:     [Ext=1][nsnnwn:7][F0..F4]
  *                  bit12  11..5    4..0
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_USERSIZEANDBEHAVIOUR_H
 #define J2735_INTERNAL_DE_USERSIZEANDBEHAVIOUR_H
@@ -199,7 +197,7 @@ _Static_assert(J2735_INTERNAL_MAX_WIRE_BITS_USER_SIZE_AND_BEHAVIOUR ==
  *   Formula: (raw13 >> (4 - bit_pos)) & 1
  *
  * @param[in] raw13   Value previously returned by
- * J2735_INTERNAL_RAW_READ_USER_SIZE_AND_BEHAVIOUR().
+ *                    J2735_INTERNAL_RAW_READ_USER_SIZE_AND_BEHAVIOUR().
  * @param[in] bit_pos ASN.1 bit position (0-4). Use J2735_INTERNAL_BIT_USER_SIZE_AND_BEHAVIOUR_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_VehicleEventFlags.h b/src/J2735_internal_DE_VehicleEventFlags.h
index f82be62..39097ba 100644
--- a/src/J2735_internal_DE_VehicleEventFlags.h
+++ b/src/J2735_internal_DE_VehicleEventFlags.h
@@ -66,8 +66,6 @@
  *                  bit21  20..8     7..0
  *   Extended:     [Ext=1][nsnnwn:7][F0..F13]
  *                  bit21  20..14    13..0
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_VEHICLEEVENTFLAGS_H
 #define J2735_INTERNAL_DE_VEHICLEEVENTFLAGS_H
@@ -215,7 +213,8 @@ _Static_assert(J2735_INTERNAL_MAX_WIRE_BITS_VEHICLE_EVENT_FLAGS ==
  *   F0 at bit 13, F1 at bit 12, ..., F13 at bit 0
  *   Formula: (raw22 >> (13 - bit_pos)) & 1
  *
- * @param[in] raw22   Value previously returned by J2735_INTERNAL_RAW_READ_VEHICLE_EVENT_FLAGS().
+ * @param[in] raw22   Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_VEHICLE_EVENT_FLAGS().
  * @param[in] bit_pos ASN.1 bit position (0-13). Use J2735_INTERNAL_BIT_VEHICLE_EVENT_FLAGS_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DE_VerticalAccelerationThreshold.h b/src/J2735_internal_DE_VerticalAccelerationThreshold.h
index 88a8776..afa70cb 100644
--- a/src/J2735_internal_DE_VerticalAccelerationThreshold.h
+++ b/src/J2735_internal_DE_VerticalAccelerationThreshold.h
@@ -46,8 +46,6 @@
  *
  * 5-bit read layout (left-justified from bit 0):
  *   [F0..F4] (5 flag bits, no extension marker)
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_VERTICALACCELERATIONTHRESHOLD_H
 #define J2735_INTERNAL_DE_VERTICALACCELERATIONTHRESHOLD_H
@@ -134,8 +132,8 @@
  * @internal
  * @brief Extract a single flag bit from pre-read 5-bit raw value.
  *
- * @param[in] raw5   Value previously returned by
- * J2735_INTERNAL_RAW_READ_VERTICAL_ACCELERATION_THRESHOLD().
+ * @param[in] raw5    Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_VERTICAL_ACCELERATION_THRESHOLD().
  * @param[in] bit_pos ASN.1 bit position (0-4). Use
  * J2735_INTERNAL_BIT_VERTICAL_ACCELERATION_THRESHOLD_* constants.
  * @return 0 or 1 as uint8_t.
diff --git a/src/J2735_internal_DF_BSMcoreData.h b/src/J2735_internal_DF_BSMcoreData.h
index 687b3a1..b25656e 100644
--- a/src/J2735_internal_DF_BSMcoreData.h
+++ b/src/J2735_internal_DF_BSMcoreData.h
@@ -189,7 +189,7 @@
 /* ============================================================================================== */
 /**
  * @brief Get 'msgCnt' (MsgCount, unsigned 7 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return MsgCount value (uint8_t, range 0..127).
  */
 #define J2735_BSM_CORE_DATA_GET_MSG_CNT(buf)                                                       \
@@ -198,7 +198,7 @@
 
 /**
  * @brief Get 'id' (TemporaryID, unsigned 32 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return TemporaryID value (uint32_t, range 0..4294967295).
  */
 #define J2735_BSM_CORE_DATA_GET_ID(buf)                                                            \
@@ -207,7 +207,7 @@
 
 /**
  * @brief Get 'secMark' (DSecond, unsigned 16 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return DSecond value (uint16_t, range 0..65535).
  */
 #define J2735_BSM_CORE_DATA_GET_SEC_MARK(buf)                                                      \
@@ -216,7 +216,7 @@
 
 /**
  * @brief Get 'lat' (Latitude, signed 31 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return Latitude value (int32_t, range -900000000..900000001).
  */
 #define J2735_BSM_CORE_DATA_GET_LAT(buf)                                                           \
@@ -226,7 +226,7 @@
 
 /**
  * @brief Get 'long' (Longitude, signed 32 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return Longitude value (int32_t, range -1799999999..1800000001).
  */
 #define J2735_BSM_CORE_DATA_GET_LONG(buf)                                                          \
@@ -236,7 +236,7 @@
 
 /**
  * @brief Get 'elev' (Elevation, signed 16 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return Elevation value (int16_t, range -4096..61439).
  */
 #define J2735_BSM_CORE_DATA_GET_ELEV(buf)                                                          \
@@ -246,7 +246,7 @@
 
 /**
  * @brief Get 'accuracy' (PositionalAccuracy, unsigned 32 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return PositionalAccuracy value (uint32_t, range 0..4294967295).
  */
 #define J2735_BSM_CORE_DATA_GET_ACCURACY(buf)                                                      \
@@ -255,7 +255,7 @@
 
 /**
  * @brief Get 'transmission' (TransmissionState, unsigned 3 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return TransmissionState value (uint8_t, range 0..7).
  */
 #define J2735_BSM_CORE_DATA_GET_TRANSMISSION(buf)                                                  \
@@ -264,7 +264,7 @@
 
 /**
  * @brief Get 'speed' (Speed, unsigned 13 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return Speed value (uint16_t, range 0..8191).
  */
 #define J2735_BSM_CORE_DATA_GET_SPEED(buf)                                                         \
@@ -272,7 +272,7 @@
 
 /**
  * @brief Get 'heading' (Heading, unsigned 15 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return Heading value (uint16_t, range 0..28800).
  */
 #define J2735_BSM_CORE_DATA_GET_HEADING(buf)                                                       \
@@ -281,7 +281,7 @@
 
 /**
  * @brief Get 'angle' (SteeringWheelAngle, signed 8 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return SteeringWheelAngle value (int8_t, range -126..127).
  */
 #define J2735_BSM_CORE_DATA_GET_ANGLE(buf)                                                         \
@@ -291,7 +291,7 @@
 
 /**
  * @brief Get 'accelSet' (AccelerationSet4Way, unsigned 48 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return AccelerationSet4Way value (uint64_t, range 0..281474976710655).
  */
 #define J2735_BSM_CORE_DATA_GET_ACCEL_SET(buf)                                                     \
@@ -300,7 +300,7 @@
 
 /**
  * @brief Get 'brakes' (BrakeSystemStatus, unsigned 15 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return BrakeSystemStatus value (uint16_t, range 0..32767).
  */
 #define J2735_BSM_CORE_DATA_GET_BRAKES(buf)                                                        \
@@ -309,7 +309,7 @@
 
 /**
  * @brief Get 'size' (VehicleSize, unsigned 22 bits).
- * @param buf Pointer to the BSMcoreData encoding.
+ * @param[in] buf Pointer to the BSMcoreData encoding.
  * @return VehicleSize value (uint32_t, range 0..4194303).
  */
 #define J2735_BSM_CORE_DATA_GET_SIZE(buf)                                                          \
diff --git a/src/J2735_internal_DF_IntersectionReferenceID.h b/src/J2735_internal_DF_IntersectionReferenceID.h
index e442433..8ce0141 100644
--- a/src/J2735_internal_DF_IntersectionReferenceID.h
+++ b/src/J2735_internal_DF_IntersectionReferenceID.h
@@ -78,7 +78,7 @@
 /**
  * @internal
  * @brief Dynamic width of OPTIONAL field 'region'.
- * @param buf Pointer to the IntersectionReferenceID encoding.
+ * @param[in] buf Pointer to the IntersectionReferenceID encoding.
  * @return J2735_BW_ROAD_REGULATOR_ID if present, 0 otherwise.
  */
 #define J2735_INTERNAL_WIDTH_INTERSECTION_REFERENCE_ID_REGION(buf)                                 \
@@ -108,7 +108,7 @@
 /* ============================================================================================== */
 /**
  * @brief Check if OPTIONAL field 'region' (RoadRegulatorID) is present.
- * @param buf Pointer to the IntersectionReferenceID encoding.
+ * @param[in] buf Pointer to the IntersectionReferenceID encoding.
  * @return 1 if present, 0 otherwise.
  */
 #define J2735_INTERSECTION_REFERENCE_ID_HAS_REGION(buf)                                            \
@@ -119,7 +119,7 @@
 /* ============================================================================================== */
 /**
  * @brief Get 'region' (RoadRegulatorID, unsigned 16 bits).
- * @param buf Pointer to the IntersectionReferenceID encoding.
+ * @param[in] buf Pointer to the IntersectionReferenceID encoding.
  * @return RoadRegulatorID value (uint16_t, range 0..65535).
  * @pre J2735_INTERSECTION_REFERENCE_ID_HAS_REGION(buf) must be true.
  */
@@ -129,7 +129,7 @@
 
 /**
  * @brief Get 'id' (IntersectionID, unsigned 16 bits).
- * @param buf Pointer to the IntersectionReferenceID encoding.
+ * @param[in] buf Pointer to the IntersectionReferenceID encoding.
  * @return IntersectionID value (uint16_t, range 0..65535).
  */
 #define J2735_INTERSECTION_REFERENCE_ID_GET_ID(buf)                                                \
diff --git a/src/J2735_internal_DF_PathPrediction.h b/src/J2735_internal_DF_PathPrediction.h
index 45c4ae1..199ebe0 100644
--- a/src/J2735_internal_DF_PathPrediction.h
+++ b/src/J2735_internal_DF_PathPrediction.h
@@ -101,7 +101,7 @@
 /* ============================================================================================== */
 /**
  * @brief Check if PathPrediction has extension additions present.
- * @param buf Pointer to the PathPrediction encoding.
+ * @param[in] buf Pointer to the PathPrediction encoding.
  * @return 1 if extensions are present, 0 otherwise.
  */
 #define J2735_PATH_PREDICTION_HAS_EXTENSION(buf) J2735_INTERNAL_HAS_EXTENSION(buf)
@@ -111,7 +111,7 @@
 /* ============================================================================================== */
 /**
  * @brief Get 'radiusOfCurve' (RadiusOfCurvature, signed 16 bits).
- * @param buf Pointer to the PathPrediction encoding.
+ * @param[in] buf Pointer to the PathPrediction encoding.
  * @return RadiusOfCurvature value (int16_t, range -32767..32767).
  */
 #define J2735_PATH_PREDICTION_GET_RADIUS_OF_CURVE(buf)                                             \
@@ -122,7 +122,7 @@
 
 /**
  * @brief Get 'confidence' (Confidence, unsigned 8 bits).
- * @param buf Pointer to the PathPrediction encoding.
+ * @param[in] buf Pointer to the PathPrediction encoding.
  * @return Confidence value (uint8_t, range 0..200).
  */
 #define J2735_PATH_PREDICTION_GET_CONFIDENCE(buf)                                                  \
@@ -138,8 +138,8 @@
  * For non-extended messages, returns the fixed root size (25 bits).
  * For extended messages, parses and skips extension data.
  *
- * @param buf           Pointer to the PathPrediction encoding.
- * @param out_size_bits Output: total size in bits.
+ * @param[in]  buf           Pointer to the PathPrediction encoding.
+ * @param[out] out_size_bits Output: total size in bits.
  * @return 0 on success, non-zero on parsing error.
  */
 static inline int j2735_inline_path_prediction_size(uint8_t const *const buf,
diff --git a/src/J2735_internal_common.h b/src/J2735_internal_common.h
index a2f8b18..46f6137 100644
--- a/src/J2735_internal_common.h
+++ b/src/J2735_internal_common.h
@@ -103,7 +103,7 @@ typedef struct j2735_aligned_u64 j2735_aligned_u64_t;
  * safe unaligned access without memcpy. This is the core design pattern and cannot be avoided while
  * maintaining zero-copy performance.
  *
- * @param addr Base pointer (uint8_t*)
+ * @param[in] addr Base pointer (uint8_t*)
  * @warning Caller must ensure at least 8 bytes are readable from addr.
  *          Buffers should include +7 bytes of padding beyond the last accessed field.
  */
@@ -117,9 +117,9 @@ typedef struct j2735_aligned_u64 j2735_aligned_u64_t;
  * 2. J2735_INTERNAL_BSWAP64: Flips bytes to Host Order (Big-Endian to Little-Endian conversion).
  * 3. Shifts: Isolates the specific bits requested.
  *
- * @param b  Base pointer (uint8_t*)
- * @param bo Bit Offset (integer)
- * @param n  Number of bits to extract (1 <= n <= 56).
+ * @param[in] b  Base pointer (uint8_t*)
+ * @param[in] bo Bit Offset (integer)
+ * @param[in] n  Number of bits to extract (1 <= n <= 56).
  * @pre Caller must ensure (bo + n) does not exceed buffer bounds (including +7 byte padding).
  * @warning For n > 56, bits may be truncated when bo is not byte-aligned.
  */
@@ -146,9 +146,9 @@ typedef struct j2735_aligned_u64 j2735_aligned_u64_t;
  * 2. If sign bit is set (negative): OR with `~0ULL << n` to fill upper bits with 1s
  * 3. If sign bit is clear (positive): return value unchanged
  *
- * @param val  The unsigned value extracted by J2735_READ_BITS.
- * @param n    Number of bits in the original field (1 <= n <= 64).
- * @param type The signed target type (e.g., int32_t).
+ * @param[in] val  The unsigned value extracted by J2735_READ_BITS.
+ * @param[in] n    Number of bits in the original field (1 <= n <= 64).
+ * @param[in] type The signed target type (e.g., int32_t).
  * @return The sign-extended value as the specified signed type.
  * @pre n must not exceed sizeof(type) * 8.
  * @note For a 31-bit Latitude, if bit 30 is set, upper bits are filled with 1s.
@@ -186,7 +186,7 @@ typedef struct j2735_aligned_u64 j2735_aligned_u64_t;
  * @note This counts only the optional bitmap, NOT the extension bit.
  *       For total prefix bits, use J2735_INTERNAL_PREFIX_BITS_<TYPE>.
  *
- * @param n Number of OPTIONAL fields in the SEQUENCE.
+ * @param[in] n Number of OPTIONAL fields in the SEQUENCE.
  * @return Number of optional bitmap bits (equals n).
  *
  * Example: IntersectionReferenceID has 1 OPTIONAL field -> 1 bitmap bit.
@@ -200,11 +200,11 @@ typedef struct j2735_aligned_u64 j2735_aligned_u64_t;
  * The optional bitmap ("preamble") is stored after the extension bit (if any).
  * Bit 0 (MSB of bitmap) = first OPTIONAL field, bit 1 = second, etc.
  *
- * @param buf        Pointer to the start of the SEQUENCE encoding (uint8_t*).
- * @param opt_offset Bit offset where the optional bitmap starts:
- *                   - 0 for non-extensible SEQUENCEs
- *                   - 1 for extensible SEQUENCEs (after extension bit)
- * @param field_idx  0-based index of the OPTIONAL field in the bitmap.
+ * @param[in] buf        Pointer to the start of the SEQUENCE encoding (uint8_t*).
+ * @param[in] opt_offset Bit offset where the optional bitmap starts:
+ *                       - 0 for non-extensible SEQUENCEs
+ *                       - 1 for extensible SEQUENCEs (after extension bit)
+ * @param[in] field_idx  0-based index of the OPTIONAL field in the bitmap.
  * @return 1 if field is present, 0 otherwise.
  *
  * Example for IntersectionReferenceID (non-extensible, 1 OPTIONAL):
@@ -220,7 +220,7 @@ typedef struct j2735_aligned_u64 j2735_aligned_u64_t;
  * Per X.691 §21.5, the extension bit is always at bit offset 0 (first bit of the encoding).
  * It is a single bit: 0 = no extensions present, 1 = extensions present.
  *
- * @param buf Pointer to the start of the SEQUENCE encoding.
+ * @param[in] buf Pointer to the start of the SEQUENCE encoding.
  * @return 1 if extensions are present, 0 otherwise.
  */
 #define J2735_INTERNAL_HAS_EXTENSION(buf)                                                          \
diff --git a/src/J2735_internal_inline.h b/src/J2735_internal_inline.h
index 5a7454e..f7c43f8 100644
--- a/src/J2735_internal_inline.h
+++ b/src/J2735_internal_inline.h
@@ -19,7 +19,7 @@
 /**
  * @file
  * @author Yogev Neumann
- * @brief TODO
+ * @brief Runtime helper functions for UPER decoding of variable-length structures.
  */
 #ifndef J2735_INTERNAL_INLINE_H
 #define J2735_INTERNAL_INLINE_H
@@ -41,9 +41,9 @@
  *
  * This function returns both the decoded length and the number of bits consumed.
  *
- * @param buf       Pointer to the buffer.
- * @param bit_off   Bit offset where the length determinant starts.
- * @param out_len   Output: the decoded length value.
+ * @param[in]  buf     Pointer to the buffer.
+ * @param[in]  bit_off Bit offset where the length determinant starts.
+ * @param[out] out_len Output: the decoded length value.
  * @return Number of bits consumed by the length determinant (8 or 16), or 0 on error.
  */
 static inline uint8_t j2735_internal_inline_read_length_determinant(uint8_t const *const buf,
@@ -99,9 +99,9 @@ static inline uint8_t j2735_internal_inline_read_length_determinant(uint8_t cons
  *   - Length determinant (8 or 16 bits) = number of octets
  *   - Value bytes (len × 8 bits) = the actual value
  *
- * @param buf       Pointer to the buffer.
- * @param bit_off   Bit offset where the nsnnwn starts.
- * @param out_val   Output: the decoded value.
+ * @param[in]  buf     Pointer to the buffer.
+ * @param[in]  bit_off Bit offset where the nsnnwn starts.
+ * @param[out] out_val Output: the decoded value.
  * @return Number of bits consumed, or 0 on error.
  */
 static inline uint8_t j2735_internal_inline_read_nsnnwn(uint8_t const *const buf,
@@ -153,9 +153,9 @@ static inline uint8_t j2735_internal_inline_read_nsnnwn(uint8_t const *const buf
  *
  * This function calculates the total bit size of all extension data.
  *
- * @param buf            Pointer to the buffer.
- * @param ext_start_off  Bit offset where extension data starts (after root component).
- * @param out_ext_bits   Output: total bits consumed by extensions.
+ * @param[in]  buf           Pointer to the buffer.
+ * @param[in]  ext_start_off Bit offset where extension data starts (after root component).
+ * @param[out] out_ext_bits  Output: total bits consumed by extensions.
  * @return 0 on success, non-zero on parsing error.
  */
 static inline int j2735_internal_inline_skip_extensions(uint8_t const *const buf,
diff --git a/tools/j2735.py b/tools/j2735.py
index 8dec8fd..dea31f1 100644
--- a/tools/j2735.py
+++ b/tools/j2735.py
@@ -43,13 +43,13 @@ def main() -> None:
         metavar="SPEC_FILE",
         help="Path to the J2735 specification text file",
     )
-    parser.add_argument(
+    mode = parser.add_mutually_exclusive_group()
+    mode.add_argument(
         "--summary",
         action="store_true",
-        default=True,
         help="Display summary counts (default)",
     )
-    parser.add_argument(
+    mode.add_argument(
         "--types",
         action="store_true",
         help="Display detailed type dump for debugging",
@@ -62,7 +62,6 @@ def main() -> None:
         print(f"Error: {e}", file=stderr)
         sys_exit(1)
 
-    # TODO: Make it proper: either "--summary" or "--types"
     if args.types:
         # Detailed type dump for debugging
         for name, typedef in sorted(spec.type_registry.items()):
diff --git a/tools/j2735_c_generator_jinja.py b/tools/j2735_c_generator_jinja.py
index cd32960..fc446dd 100644
--- a/tools/j2735_c_generator_jinja.py
+++ b/tools/j2735_c_generator_jinja.py
@@ -97,7 +97,6 @@ def filter_c_type(bits: int, is_signed: bool = False) -> str:
         >>> filter_c_type(48, False)
         'uint64_t'
     """
-    # TODO: Verify the function with unit tests for the edge cases
     prefix = "int" if is_signed else "uint"
     if bits <= 8:
         return f"{prefix}8_t"
@@ -239,7 +238,6 @@ def create_jinja_env() -> Environment:
         lstrip_blocks=True,
         keep_trailing_newline=True,
     )
-    # TODO: Fix pylance `Type of "filters" is partially unknown`
     env.filters[_FILTER_BYTES_FROM_BITS] = filter_bytes_from_bits
     env.filters[_FILTER_C_TYPE] = filter_c_type
     env.filters[_FILTER_FORMAT_RANGE] = filter_format_range
diff --git a/tools/j2735_spec_constraints.py b/tools/j2735_spec_constraints.py
index 15dbeba..b6d2be8 100644
--- a/tools/j2735_spec_constraints.py
+++ b/tools/j2735_spec_constraints.py
@@ -277,7 +277,10 @@ def uper_bit_width(self) -> int | None:
 
     @property
     def ext_bits(self) -> int:
-        """TODO
+        """Return the number of flag bits in the extended encoding.
+
+        Returns:
+            extension_size if set, otherwise root_size.
 
         Examples:
             >>> c = BitStringConstraint(
diff --git a/tools/j2735_spec_parser.py b/tools/j2735_spec_parser.py
index e4f91a7..c1d3b33 100644
--- a/tools/j2735_spec_parser.py
+++ b/tools/j2735_spec_parser.py
@@ -213,10 +213,10 @@ class ASN1TypeDefinition:
 
     name: str
     type_class: ASN1TypeClass
-    raw_definition: str  # TODO: Inspect if still unused
+    raw_definition: str  # TODO: Evaluate for generated C Doxygen (already accessible to templates)
     constraint: UPERConstraint | None
-    spec_section: str  # TODO: Inspect if still unused
-    description: str  # TODO: Inspect if still unused
+    spec_section: str  # TODO: Evaluate for generated C Doxygen (already accessible to templates)
+    description: str  # TODO: Evaluate for generated C Doxygen (already accessible to templates)
 
     @property
     def uper_bit_width(self) -> int | None:
@@ -332,14 +332,16 @@ class SpecEntry:
         line_number: Source file line number for error reporting (None if unknown).
     """
 
-    section_number: str  # TODO: Inspect if still unused
-    entry_type: J2735EntryKind  # TODO: Inspect if still unused
+    section_number: str  # TODO: Evaluate for generated C Doxygen (not yet passed to templates)
+    entry_type: (
+        J2735EntryKind  # TODO: Evaluate for generated C Doxygen (not yet passed to templates)
+    )
     name: str
-    abbreviation: str  # TODO: Inspect if still unused
-    use_description: str  # TODO: Inspect if still unused
+    abbreviation: str  # TODO: Evaluate for generated C Doxygen (not yet passed to templates)
+    use_description: str  # TODO: Evaluate for generated C Doxygen (not yet passed to templates)
     asn1_definition: ASN1TypeDefinition | None
-    remarks: str  # TODO: Inspect if still unused
-    line_number: int | None  # TODO: Inspect if still unused
+    remarks: str  # TODO: Evaluate for generated C Doxygen (not yet passed to templates)
+    line_number: int | None  # TODO: Evaluate for generated C Doxygen (not yet passed to templates)
 
     # -----------------------------------------------------------------
     # Block Parsing Helpers
@@ -575,26 +577,17 @@ def _resolve_constraint(
         return None
 
     if isinstance(constraint, TypeReference):
-        type_ref_return = None
         # Look up the referenced type
         if constraint.name in resolving:
-            # TODO: Circular references silently return None. Consider:
-            #   - Logging an error for debugging
-            #   - Raising an exception that propagates to the caller
-            #   - Making cycles impossible by construction (prove with types)
-            pass  # Circular reference
-        else:
-            typedef = registry.get(constraint.name)
-            type_ref_return = (
-                constraint
-                if typedef is None
-                else _resolve_constraint(
-                    typedef.constraint,
-                    registry,
-                    resolving | {constraint.name},
-                )
-            )
-        return type_ref_return
+            # Circular reference detected - return None to break the cycle.
+            # The caller handles None gracefully (keeps the TypeReference as-is).
+            return None
+        typedef = registry.get(constraint.name)
+        return (
+            constraint
+            if typedef is None
+            else _resolve_constraint(typedef.constraint, registry, resolving | {constraint.name})
+        )
 
     if isinstance(constraint, SequenceType):
         # Resolve each field's type using evolve()
diff --git a/tools/templates/assemble_de_bitstring.j2 b/tools/templates/assemble_de_bitstring.j2
index 73b6989..f2793b9 100644
--- a/tools/templates/assemble_de_bitstring.j2
+++ b/tools/templates/assemble_de_bitstring.j2
@@ -105,8 +105,6 @@ Template Context (from generator):
  * {{ read_bits }}-bit read layout (left-justified from bit 0):
  *   [F0..F{{ root_size - 1 }}] ({{ root_size }} flag bits, no extension marker)
 {% endif %}
- *
- * @todo Update the Doxygen to indicate [in] and [out] parameters
  */
 #ifndef J2735_INTERNAL_DE_{{ typedef_name | upper }}_H
 #define J2735_INTERNAL_DE_{{ typedef_name | upper }}_H
diff --git a/tools/templates/bitstring/bitstring_internal_get_one.j2 b/tools/templates/bitstring/bitstring_internal_get_one.j2
index e2d490e..47f087c 100644
--- a/tools/templates/bitstring/bitstring_internal_get_one.j2
+++ b/tools/templates/bitstring/bitstring_internal_get_one.j2
@@ -38,6 +38,7 @@ Example output (is_extensible=True, read_bits=22, ext_flag_base=13, root_flag_ba
 {%- set read_bits = typedef.constraint.read_bits -%}
 {%- set root_size = typedef.constraint.root_size -%}
 {%- set typedef_name_upper = typedef.name | screaming_snake -%}
+{%- set raw_pad = " " * (8 - ("raw" ~ read_bits)|length) -%}
 {%  if typedef.constraint.is_extensible %}
 {%-   set ext_flag_base = ext_bits - 1 -%}
 {%-   set root_flag_base = read_bits - 2 -%}
@@ -55,7 +56,8 @@ Example output (is_extensible=True, read_bits=22, ext_flag_base=13, root_flag_ba
  *   F0 at bit {{ ext_flag_base }}, F1 at bit {{ ext_flag_base - 1 }}, ..., F{{ ext_bits - 1 }} at bit 0
  *   Formula: (raw{{ read_bits }} >> ({{ ext_flag_base }} - bit_pos)) & 1
  *
- * @param[in] raw{{ read_bits }}   Value previously returned by J2735_INTERNAL_RAW_READ_{{ typedef_name_upper }}().
+ * @param[in] raw{{ read_bits }}{{ raw_pad }}Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_{{ typedef_name_upper }}().
  * @param[in] bit_pos ASN.1 bit position (0-{{ ext_bits - 1 }}). Use J2735_INTERNAL_BIT_{{ typedef_name_upper }}_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
@@ -75,7 +77,8 @@ Example output (is_extensible=True, read_bits=22, ext_flag_base=13, root_flag_ba
  * @internal
  * @brief Extract a single flag bit from pre-read {{ read_bits }}-bit raw value.
  *
- * @param[in] raw{{ read_bits }}   Value previously returned by J2735_INTERNAL_RAW_READ_{{ typedef_name_upper }}().
+ * @param[in] raw{{ read_bits }}{{ raw_pad }}Value previously returned by
+ *                    J2735_INTERNAL_RAW_READ_{{ typedef_name_upper }}().
  * @param[in] bit_pos ASN.1 bit position (0-{{ ext_bits - 1 }}). Use J2735_INTERNAL_BIT_{{ typedef_name_upper }}_*
  *                    constants.
  * @return 0 or 1 as uint8_t.
diff --git a/tools/templates/sequence/sequence_get.j2 b/tools/templates/sequence/sequence_get.j2
index 8d5dd1d..8a2fee7 100644
--- a/tools/templates/sequence/sequence_get.j2
+++ b/tools/templates/sequence/sequence_get.j2
@@ -52,7 +52,7 @@
 {%-   set max_val = field.type.max_value if field.type.max_value is defined else (2**bits - 1) -%}
 /**
  * @brief Get '{{ field.name }}' ({{ field.type_name }}, {{ signedness }} {{ bits }} bits).
- * @param buf Pointer to the {{ typedef_name }} encoding.
+ * @param[in] buf Pointer to the {{ typedef_name }} encoding.
  * @return {{ field.type_name }} value ({{ return_type }}, range {{ min_val }}..{{ max_val }}).
 {%    if field.is_optional %}
  * @pre J2735_{{ typedef_name_upper }}_HAS_{{ field_name }}(buf) must be true.
@@ -65,6 +65,6 @@
 #define J2735_{{ typedef_name_upper }}_GET_{{ field_name }}(buf) \
   (({{ return_type }})J2735_READ_BITS((buf), J2735_INTERNAL_OFF_{{ typedef_name_upper }}_{{ field_name }}(buf), J2735_BW_{{ field_type_name }}))
 {%-   endif -%}
-{{ "" }}{# Intentionally two blank lines #}
-{{ "" }}{# Intentionally two blank lines #}
+{{ "" }}
+{{ "" }}
 {%  endfor -%}
\ No newline at end of file
diff --git a/tools/templates/sequence/sequence_has_extension.j2 b/tools/templates/sequence/sequence_has_extension.j2
index d2ad74c..307f1d6 100644
--- a/tools/templates/sequence/sequence_has_extension.j2
+++ b/tools/templates/sequence/sequence_has_extension.j2
@@ -39,7 +39,7 @@
 {%- set typedef_name_upper = typedef_name | screaming_snake -%}
 /**
  * @brief Check if {{ typedef_name }} has extension additions present.
- * @param buf Pointer to the {{ typedef_name }} encoding.
+ * @param[in] buf Pointer to the {{ typedef_name }} encoding.
  * @return 1 if extensions are present, 0 otherwise.
  */
 #define J2735_{{ typedef_name_upper }}_HAS_EXTENSION(buf) J2735_INTERNAL_HAS_EXTENSION(buf)
diff --git a/tools/templates/sequence/sequence_has_field.j2 b/tools/templates/sequence/sequence_has_field.j2
index 1185faa..cd9e69e 100644
--- a/tools/templates/sequence/sequence_has_field.j2
+++ b/tools/templates/sequence/sequence_has_field.j2
@@ -40,7 +40,7 @@
 {%-     set field_name = field.name | screaming_snake -%}
 /**
  * @brief Check if OPTIONAL field '{{ field.name }}' ({{ field.type_name }}) is present.
- * @param buf Pointer to the {{ typedef_name }} encoding.
+ * @param[in] buf Pointer to the {{ typedef_name }} encoding.
  * @return 1 if present, 0 otherwise.
  */
 #define J2735_{{ typedef_name_upper }}_HAS_{{ field_name }}(buf) \
diff --git a/tools/templates/sequence/sequence_internal_off.j2 b/tools/templates/sequence/sequence_internal_off.j2
index 7799bff..e9d61c5 100644
--- a/tools/templates/sequence/sequence_internal_off.j2
+++ b/tools/templates/sequence/sequence_internal_off.j2
@@ -66,6 +66,6 @@
 {%-       set ns.offset = ns.offset + field.type.uper_bit_width -%}
 {%-     endif -%}
 {%-   endif -%}
-{{ "" }}{# Intentionally two blank lines #}
-{{ "" }}{# Intentionally two blank lines #}
+{{ "" }}
+{{ "" }}
 {%  endfor -%}
\ No newline at end of file
diff --git a/tools/templates/sequence/sequence_internal_width.j2 b/tools/templates/sequence/sequence_internal_width.j2
index 839442f..9146017 100644
--- a/tools/templates/sequence/sequence_internal_width.j2
+++ b/tools/templates/sequence/sequence_internal_width.j2
@@ -41,7 +41,7 @@
 /**
  * @internal
  * @brief Dynamic width of OPTIONAL field '{{ field.name }}'.
- * @param buf Pointer to the {{ typedef.name }} encoding.
+ * @param[in] buf Pointer to the {{ typedef.name }} encoding.
  * @return J2735_BW_{{ field_type_name }} if present, 0 otherwise.
  */
 #define J2735_INTERNAL_WIDTH_{{ typedef_name_upper }}_{{ field_name }}(buf) (J2735_{{ typedef_name_upper }}_HAS_{{ field_name }}(buf) ? J2735_BW_{{ field_type_name }} : 0U)
diff --git a/tools/templates/sequence/sequence_size.j2 b/tools/templates/sequence/sequence_size.j2
index cfa883a..fe98937 100644
--- a/tools/templates/sequence/sequence_size.j2
+++ b/tools/templates/sequence/sequence_size.j2
@@ -47,8 +47,8 @@
  * For non-extended messages, returns the fixed root size ({{ root_uper_bit_width }} bits).
  * For extended messages, parses and skips extension data.
  *
- * @param buf           Pointer to the {{ typedef_name }} encoding.
- * @param out_size_bits Output: total size in bits.
+ * @param[in]  buf           Pointer to the {{ typedef_name }} encoding.
+ * @param[out] out_size_bits Output: total size in bits.
  * @return 0 on success, non-zero on parsing error.
  */
 static inline int j2735_inline_{{ typedef_name_lower }}_size(uint8_t const *const buf, uint32_t *const out_size_bits) {
diff --git a/tools/tests/c_generator/test_assemble_de_bitstring.py b/tools/tests/c_generator/test_assemble_de_bitstring.py
index bc56ad6..c081053 100644
--- a/tools/tests/c_generator/test_assemble_de_bitstring.py
+++ b/tools/tests/c_generator/test_assemble_de_bitstring.py
@@ -28,29 +28,29 @@
 class TestAssembleBitstringWireFormatDocs(SpecLoadingTestBase):
     """Wire-format Doxygen preamble generated by assemble_de_bitstring.j2."""
 
-    def test_non_extensible_wire_format_doc_no_extension_bit(self) -> None:
-        """Non-extensible wire format must not mention extension bit.
+    def test_non_extensible_wire_format_doc_correct_bit_count(self) -> None:
+        """Non-extensible wire format states correct total bit count."""
+        code = generate_data_element("LaneDirection", self.spec)
+        self.assertIn("2 bits total", code)
+
+    def test_non_extensible_wire_format_doc_no_extension_marker(self) -> None:
+        """Non-extensible wire format must not mention extension bit."""
+        code = generate_data_element("LaneDirection", self.spec)
+        self.assertNotIn("Ext=", code)
 
-        The wire format documentation should reflect that non-extensible types
-        have no extension marker, so the total wire size equals root_size.
-        """
+    def test_non_extensible_single_read_strategy(self) -> None:
+        """Non-extensible single-read strategy uses correct bit width."""
         code = generate_data_element("LaneDirection", self.spec)
-        # Non-extensible 2-bit type should have total wire bits = 2, not 3
-        # The Doxygen "Wire Format" header says "3 bits total" — wrong!
-        self.assertNotIn(
-            "3 bits total",
-            code,
-            "LaneDirection wire format claims 3 bits total (should be 2)",
-        )
-        # The "Single-Read Strategy" has "garbage bits: -1" — nonsensical
-        self.assertNotIn(
-            "-1 garbage bits",
-            code,
-            "LaneDirection has negative garbage bits (impossible)",
-        )
-        # There should be no "Ext=0" in non-extensible wire format docs
-        self.assertNotIn(
-            "Ext=0",
-            code,
-            "Non-extensible LaneDirection should not mention Ext bit in wire docs",
-        )
+        self.assertIn("Single-Read Strategy", code)
+
+    def test_extensible_wire_format_doc_shows_both_forms(self) -> None:
+        """Extensible wire format documents both non-extended and extended forms."""
+        code = generate_data_element("VehicleEventFlags", self.spec)
+        self.assertIn("Non-extended:", code)
+        self.assertIn("Extended:", code)
+
+    def test_extensible_wire_format_doc_correct_bit_counts(self) -> None:
+        """Extensible wire format shows correct bit counts for both forms."""
+        code = generate_data_element("VehicleEventFlags", self.spec)
+        self.assertIn("Ext=0", code)
+        self.assertIn("Ext=1", code)
diff --git a/tools/tests/c_generator/test_sequence_has_extension.py b/tools/tests/c_generator/test_sequence_has_extension.py
index d8d1736..086a2cd 100644
--- a/tools/tests/c_generator/test_sequence_has_extension.py
+++ b/tools/tests/c_generator/test_sequence_has_extension.py
@@ -70,7 +70,7 @@ def test_extensible_sequence_exact_output(self) -> None:
         expected = (
             "/**\n"
             " * @brief Check if PathPrediction has extension additions present.\n"
-            " * @param buf Pointer to the PathPrediction encoding.\n"
+            " * @param[in] buf Pointer to the PathPrediction encoding.\n"
             " * @return 1 if extensions are present, 0 otherwise.\n"
             " */\n"
             "#define J2735_PATH_PREDICTION_HAS_EXTENSION(buf) J2735_INTERNAL_HAS_EXTENSION(buf)\n"
@@ -113,7 +113,7 @@ def test_real_path_prediction(self) -> None:
         expected = (
             "/**\n"
             " * @brief Check if PathPrediction has extension additions present.\n"
-            " * @param buf Pointer to the PathPrediction encoding.\n"
+            " * @param[in] buf Pointer to the PathPrediction encoding.\n"
             " * @return 1 if extensions are present, 0 otherwise.\n"
             " */\n"
             "#define J2735_PATH_PREDICTION_HAS_EXTENSION(buf) J2735_INTERNAL_HAS_EXTENSION(buf)\n"
diff --git a/tools/tests/c_generator/test_sequence_size_func.py b/tools/tests/c_generator/test_sequence_size_func.py
index 8322d52..46a8720 100644
--- a/tools/tests/c_generator/test_sequence_size_func.py
+++ b/tools/tests/c_generator/test_sequence_size_func.py
@@ -99,8 +99,8 @@ def test_extensible_sequence_has_doxygen_comment(self) -> None:
         code = generate_sequence_size_func("PathPrediction", spec)
 
         self.assertIn("@brief", code)
-        self.assertIn("@param buf", code)
-        self.assertIn("@param out_size_bits", code)
+        self.assertIn("@param[in]  buf", code)
+        self.assertIn("@param[out] out_size_bits", code)
         self.assertIn("@return", code)
 
     def test_non_extensible_returns_empty(self) -> None: