diff --git a/pcbnew/router/pns_line.h b/pcbnew/router/pns_line.h
index 02621d8512..32c0a71755 100644
--- a/pcbnew/router/pns_line.h
+++ b/pcbnew/router/pns_line.h
@@ -202,7 +202,7 @@ public:
 
     PNS_SEGMENT* GetLink( int aIndex ) const
     {
-        return (*m_segmentRefs) [ aIndex ];
+        return (*m_segmentRefs)[aIndex];
     }
 
     ///> Erases the linking information. Used to detach the line from the owning node.
diff --git a/pcbnew/router/pns_line_placer.cpp b/pcbnew/router/pns_line_placer.cpp
index c2ce9a1dfb..2ea675f15a 100644
--- a/pcbnew/router/pns_line_placer.cpp
+++ b/pcbnew/router/pns_line_placer.cpp
@@ -425,7 +425,7 @@ bool PNS_LINE_PLACER::rhMarkObstacles( const VECTOR2I& aP, PNS_LINE& aNewHead )
 }
 
 
-bool PNS_LINE_PLACER::rhShoveOnly ( const VECTOR2I& aP, PNS_LINE& aNewHead )
+bool PNS_LINE_PLACER::rhShoveOnly( const VECTOR2I& aP, PNS_LINE& aNewHead )
 {
     PNS_LINE initTrack( m_head );
     PNS_LINE walkSolids, l2;
@@ -965,7 +965,7 @@ void PNS_LINE_PLACER::removeLoops( PNS_NODE* aNode, PNS_LINE* aLatest )
             if( !( line->ContainsSegment( seg ) ) && line->SegmentCount() )
             {
                 aNode->Remove( line );
-                removedCount ++;
+                removedCount++;
             }
         }
 
diff --git a/pcbnew/router/pns_node.cpp b/pcbnew/router/pns_node.cpp
index 5622eecc67..8cdf1b8a4a 100644
--- a/pcbnew/router/pns_node.cpp
+++ b/pcbnew/router/pns_node.cpp
@@ -216,11 +216,11 @@ struct PNS_NODE::OBSTACLE_VISITOR
 
         int clearance = m_extraClearance + m_node->GetClearance( aItem, m_item );
 
-        if( m_node->m_collisionFilter && (*m_node->m_collisionFilter)(aItem, m_item))
+        if( m_node->m_collisionFilter && (*m_node->m_collisionFilter)( aItem, m_item ) )
             return true;
 
         if( aItem->Kind() == PNS_ITEM::LINE )
-            clearance += static_cast<PNS_LINE *>(aItem)->Width() / 2;
+            clearance += static_cast<PNS_LINE*>( aItem )->Width() / 2;
 
         if( !aItem->Collide( m_item, clearance ) )
             return true;
@@ -705,7 +705,7 @@ void PNS_NODE::Remove( PNS_ITEM* aItem )
     {
     case PNS_ITEM::SOLID:
         // fixme: this fucks up the joints, but it's only used for marking colliding obstacles for the moment, so we don't care.
-        doRemove ( aItem );
+        doRemove( aItem );
         break;
 
     case PNS_ITEM::SEGMENT:
@@ -1122,7 +1122,7 @@ void PNS_NODE::Commit( PNS_NODE* aNode )
     if( aNode->isRoot() )
         return;
 
-    BOOST_FOREACH( PNS_ITEM * item, aNode->m_override )
+    BOOST_FOREACH( PNS_ITEM* item, aNode->m_override )
     Remove( item );
 
     for( PNS_INDEX::ITEM_SET::iterator i = aNode->m_index->begin();
diff --git a/pcbnew/router/pns_segment.h b/pcbnew/router/pns_segment.h
index ecd24bdd08..dbcb16575c 100644
--- a/pcbnew/router/pns_segment.h
+++ b/pcbnew/router/pns_segment.h
@@ -53,14 +53,14 @@ public:
         m_layers = aParentLine.Layers();
         m_marker = aParentLine.Marker();
         m_rank = aParentLine.Rank();
-    };
+    }
 
     static inline bool ClassOf( const PNS_ITEM* aItem )
     {
         return aItem && SEGMENT == aItem->Kind();
     }
 
-    PNS_SEGMENT* Clone( ) const;
+    PNS_SEGMENT* Clone() const;
 
     const SHAPE* Shape() const
     {
@@ -110,7 +110,7 @@ public:
 
     const SHAPE_LINE_CHAIN Hull( int aClearance, int aWalkaroundThickness ) const;
 
-    virtual VECTOR2I Anchor(int n) const
+    virtual VECTOR2I Anchor( int n ) const
     {
         if( n == 0 )
             return m_seg.GetSeg().A;
diff --git a/pcbnew/router/pns_shove.cpp b/pcbnew/router/pns_shove.cpp
index c5833f0eb4..17dfe14d3c 100644
--- a/pcbnew/router/pns_shove.cpp
+++ b/pcbnew/router/pns_shove.cpp
@@ -1210,7 +1210,7 @@ void PNS_SHOVE::runOptimizer( PNS_NODE* aNode, PNS_LINE* aHead )
     for( std::vector<PNS_LINE*>::iterator i = m_optimizerQueue.begin();
              i != m_optimizerQueue.end(); ++i )
     {
-        maxWidth = std::max ( (*i)->Width(), maxWidth );
+        maxWidth = std::max( (*i)->Width(), maxWidth );
     }
 
     if( area )
@@ -1244,7 +1244,7 @@ void PNS_SHOVE::runOptimizer( PNS_NODE* aNode, PNS_LINE* aHead )
     }
 
     if( Settings().SmartPads() )
-        optFlags |= PNS_OPTIMIZER::SMART_PADS ;
+        optFlags |= PNS_OPTIMIZER::SMART_PADS;
 
     optimizer.SetEffortLevel( optFlags );
     optimizer.SetCollisionMask( PNS_ITEM::ANY );