Refactored narrative