Make templates more consistent