refactor code and book shelves items fetch