Better names and full code book