diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 80160593c..3c3f6fe50 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1162,8 +1162,8 @@
       }
 
       /* read top level fields */
-      if ( FT_READ_ULONG( regionListOffset )   ||
-           FT_READ_USHORT( dataCount ) )
+      if ( FT_READ_ULONG( regionListOffset ) ||
+           FT_READ_USHORT( dataCount )       )
         goto Exit;
 
       /* make temporary copy of item variation data offsets; */
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index eb4607b7e..5363e74e0 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -837,7 +837,7 @@
     FT_ULong      table_pos, table_len;
     FT_ULong      storage_start, storage_limit;
     TT_NameTable  table;
-    TT_Name       names = NULL;
+    TT_Name       names    = NULL;
     TT_LangTag    langTags = NULL;
 
     static const FT_Frame_Field  name_table_fields[] =
@@ -947,7 +947,7 @@
         }
 
         table->langTags = langTags;
-        langTags = NULL;
+        langTags        = NULL;
       }
 
       FT_FRAME_EXIT();
@@ -1008,8 +1008,8 @@
       FT_MEM_QRENEW_ARRAY( names,
                            table->numNameRecords,
                            valid );
-      table->names = names;
-      names = NULL;
+      table->names          = names;
+      names                 = NULL;
       table->numNameRecords = valid;
     }
 
@@ -1476,8 +1476,8 @@
     }
 
     face->gasp.gaspRanges = gasp_ranges;
-    gasp_ranges = NULL;
-    face->gasp.numRanges = num_ranges;
+    gasp_ranges           = NULL;
+    face->gasp.numRanges  = num_ranges;
 
     FT_FRAME_EXIT();
 
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 5482dbd5f..c757a5814 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -117,9 +117,9 @@
         goto Exit;
 
       blend->num_default_design_vector = 0;
-      blend->weight_vector = NULL;
-      blend->default_weight_vector = NULL;
-      blend->design_pos[0] = NULL;
+      blend->weight_vector             = NULL;
+      blend->default_weight_vector     = NULL;
+      blend->design_pos[0]             = NULL;
 
       face->blend = blend;
     }
@@ -858,9 +858,9 @@
     T1_TokenRec  design_tokens[T1_MAX_MM_DESIGNS];
     FT_Int       num_designs;
     FT_Int       num_axis = 0; /* make compiler happy */
-    T1_Parser    parser = &loader->parser;
-    FT_Memory    memory = face->root.memory;
-    FT_Error     error = FT_Err_Ok;
+    T1_Parser    parser   = &loader->parser;
+    FT_Memory    memory   = face->root.memory;
+    FT_Error     error    = FT_Err_Ok;
     FT_Fixed*    design_pos[T1_MAX_MM_DESIGNS];
 
 
@@ -886,7 +886,7 @@
     {
       FT_Byte*  old_cursor = parser->root.cursor;
       FT_Byte*  old_limit  = parser->root.limit;
-      FT_Int    n,nn;
+      FT_Int    n, nn;
       PS_Blend  blend;
 
 
@@ -965,7 +965,7 @@
       for ( n = 0; n < num_designs; n++ )
       {
         blend->design_pos[n] = design_pos[n];
-        design_pos[n] = NULL;
+        design_pos[n]        = NULL;
       }
     }