Improve CodeBook