Tidy code in booklist a bit