refactor add events/articles to token form