Refactor frontmatter args