Story refactor