DRYed/reorganized story features and steps.