Make individual templates a bit clearer