Add book name check
Cleanup