Books, general refactoring