Refactor some stories
Block a story