Additional Codebook formatting changes