Clean-up front-matter a bit