Prettified the templates a bit.