Readability improvements in CodeBook