Continue refactoring of stories