little template improvement