Refactored story list