refactor data story, fixes #1