Just a minor template tidy up