Cleaning up template a bit.