Minor changes in CodeBook