Formatting work on the front matter

This includes the work from #15 and #16, which I'm guessing were merged but not yet pushed to GitHub.