diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 025493fb5183..01995b3b8ae2 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -260,26 +260,25 @@ typedef union {
 } ccb_spriv_area;
 
 struct ccb_hdr {
-	cam_pinfo	pinfo;	/* Info for priority scheduling */
+	cam_pinfo	pinfo;		/* Info for priority scheduling */
 	camq_entry	xpt_links;	/* For chaining in the XPT layer */	
 	camq_entry	sim_links;	/* For chaining in the SIM layer */	
-	camq_entry	periph_links;/* For chaining in the type driver */
+	camq_entry	periph_links;	/* For chaining in the type driver */
 	u_int32_t	retry_count;
-	                        /* Callback on completion function */
 	void		(*cbfcnp)(struct cam_periph *, union ccb *);
+					/* Callback on completion function */
 	xpt_opcode	func_code;	/* XPT function code */
-	u_int32_t	status;	/* Status returned by CAM subsystem */
-				/* Compiled path for this ccb */
-	struct		cam_path *path;
+	u_int32_t	status;		/* Status returned by CAM subsystem */
+	struct		cam_path *path;	/* Compiled path for this ccb */
 	path_id_t	path_id;	/* Path ID for the request */
 	target_id_t	target_id;	/* Target device ID */
 	lun_id_t	target_lun;	/* Target LUN number */
-	u_int32_t	flags;
+	u_int32_t	flags;		/* ccb_flags */
 	ccb_ppriv_area	periph_priv;
 	ccb_spriv_area	sim_priv;
 	u_int32_t	timeout;	/* Timeout value */
-					/* Callout handle used for timeouts */
 	struct		callout_handle timeout_ch;
+					/* Callout handle used for timeouts */
 };
 
 /* Get Device Information CCB */