Updates to codebook formatting