Probably this book could be done better, but no one is going to get an opportunity to do that, so you might as well live with what you've got, warts and all.
We are waiting for a new edition of the book, so hold on.