diff --git a/pcbnew/plugins/kicad/pcb_plugin.cpp b/pcbnew/plugins/kicad/pcb_plugin.cpp
index 04668c1c57..7e8c08e4b4 100644
--- a/pcbnew/plugins/kicad/pcb_plugin.cpp
+++ b/pcbnew/plugins/kicad/pcb_plugin.cpp
@@ -1719,7 +1719,9 @@ void PCB_PLUGIN::format( const PAD* aPad, int aNestLevel ) const
 
                     m_out->Print( nested_level, "(gr_poly\n" );
                     formatPolyPts( outline, nested_level, ADVANCED_CFG::GetCfg().m_CompactSave );
-                    m_out->Print( nested_level, " " );  // just to align the next info at the right place
+
+                    // Align the next info at the right place.
+                    m_out->Print( nested_level, " " );
                 }
                 break;
 
@@ -1742,7 +1744,7 @@ void PCB_PLUGIN::format( const PAD* aPad, int aNestLevel ) const
         }
 
         m_out->Print( 0, "\n" );
-        m_out->Print( aNestLevel+1, ")" );   // end of (basic_shapes
+        m_out->Print( aNestLevel+1, ")" );   // end of (primitives
     }
 
     if( !isDefaultTeardropParameters( aPad->GetTeardropParams() ) )
@@ -1751,9 +1753,10 @@ void PCB_PLUGIN::format( const PAD* aPad, int aNestLevel ) const
         formatTeardropParameters( aPad->GetTeardropParams(), aNestLevel+1 );
     }
 
-    m_out->Print( 0, " (tstamp %s)", TO_UTF8( aPad->m_Uuid.AsString() ) );
-
-    m_out->Print( 0, ")\n" );
+    m_out->Print( 0, "\n" );
+    m_out->Print( aNestLevel + 1, "(tstamp %s)", TO_UTF8( aPad->m_Uuid.AsString() ) );
+    m_out->Print( 0, "\n" );
+    m_out->Print( aNestLevel, ")\n" );
 }