Finished refactoring in BookService