diff --git a/src/ChangeLog b/src/ChangeLog
index b05af8ac0d..3e854ead79 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-13  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* buffer.C (getLists): Cleanup.
+
 2001-03-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* lyxfont.C (update): don't honor toggleall on font size.
diff --git a/src/buffer.C b/src/buffer.C
index 4264360e02..c87c2db151 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -3636,11 +3636,9 @@ Buffer::Lists const Buffer::getLists() const
 				}
 				if (!type.empty()) {
 					SingleList & item = l[type];
-					TocItem tmp;
-					tmp.par = par;
-					tmp.depth = 0;
-					tmp.str = tostr(item.size()+1) + ". " + par->String(this, false);
-					item.push_back(tmp);
+					string const str =
+						tostr(item.size()+1) + ". " + par->String(this, false);
+					item.push_back(TocItem(par, 0, str));
 				}
 			}
 		} else if (!par->IsDummy()) {
@@ -3653,13 +3651,10 @@ Buffer::Lists const Buffer::getLists() const
 			    && labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) {
 				// insert this into the table of contents
 				SingleList & item = l["TOC"];
-				TocItem tmp;
-				tmp.par = par;
-				tmp.depth = max(0,
+				int depth = max(0,
 						labeltype - 
 						textclasslist.TextClass(params.textclass).maxcounter());
-				tmp.str = par->String(this, true);
-				item.push_back(tmp);
+				item.push_back(TocItem(par, depth, par->String(this, true)));
 			}
 #ifdef NEW_INSETS
 			// For each paragrph, traverse its insets and look for
@@ -3685,11 +3680,9 @@ Buffer::Lists const Buffer::getLists() const
 						while (tmp) {
 							if (tmp->layout == cap) {
 								SingleList & item = l[type];
-								TocItem ti;
-								ti.par = tmp;
-								ti.depth = 0;
-								ti.str = tostr(item.size()+1) + ". " + tmp->String(this, false);
-								item.push_back(ti);
+								string const str =
+									tostr(item.size()+1) + ". " + tmp->String(this, false);
+								item.push_back(TocItem(tmp, 0 , str));
 							}
 							tmp = tmp->next();
 						}
diff --git a/src/buffer.h b/src/buffer.h
index 3e522952d5..69fc7a3dc2 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -265,6 +265,8 @@ public:
 	std::vector<std::pair<string, string> > const getBibkeyList();
 	///
 	struct TocItem {
+		TocItem(LyXParagraph * p, int d, string const & s)
+			: par(p), depth(d), str(s) {}
 		///
 		LyXParagraph * par;
 		///