Clean up template a little bit.