More format changes to CodeBook