Cosmetic changes to codebook