Refactor stored books