Refactored books