diff --git a/ChangeLog b/ChangeLog
index 47648ec5e..bda8f7596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,13 @@
-2001-03-05  Tom Kacvinsky <tjk@ams.org>
+2001-03-05  Tom Kacvinsky  <tjk@ams.org>
 
 	* src/cff/cffgload.c (CFF_Load_Glyph): Set glyph control data to the
-	the Type 2 glyph charstring (used by conversion programs). Submitted
-	by Ha Shao <hashao@chinese.com>.
+	the Type 2 glyph charstring (used by conversion programs). 
+	Submitted by Ha Shao <hashao@chinese.com>.
 
 2001-03-04  Antoine Leca  <Antoine.Leca@renault.fr>
 
 	* include/freetype/ttnameid.h: Correct a stupid typo which prevented
 	correct compilation (TT_MS_LANGID_TIGRIGNA_ETHIOPIA appeared twice).
-	I am sorry for the inconvenience :-(.
 
 2001-03-04  Werner Lemberg  <wl@gnu.org>
 
@@ -47,7 +46,7 @@
 	the Type 1 glyph charstring (used by conversion programs).
 	Submitted by Ha Shao <hashao@chinese.com>.
 
-2001-02-22  David Turner    <david.turner@freetype.org>
+2001-02-22  David Turner  <david.turner@freetype.org>
 
 	* src/base/ftgrays.c (grays_sweep): The function didn't exit
 	immediately if `num_cells' was 0 as it should.  Thanks to Boris for
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 480562607..f88ecee87 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -2139,6 +2139,7 @@
       {
         CFF_Index csindex = cff->charstrings_index;
 
+
         CFF_Prepare_Decoder( &decoder, glyph_index );
         error = CFF_Parse_CharStrings( &decoder, charstring, charstring_len );
 
@@ -2147,9 +2148,10 @@
         /* We set control_data and control_len if charstrings is loaded.  */
         /* See how charstring loads at CFF_Access_Element() in cffload.c. */
 
-        glyph->root.control_data = csindex.bytes + csindex.offsets[glyph_index] - 1;
-        glyph->root.control_len = charstring_len;
-
+        glyph->root.control_data =
+          csindex.bytes + csindex.offsets[glyph_index] - 1;
+        glyph->root.control_len =
+          charstring_len;
       }
 
       /* save new glyph tables */