stories refactored