Cleanup, changed book to subclass of item