make template better