added book and cleaning code up