diff --git a/src/core/model/breakpoint.cc b/src/core/model/breakpoint.cc
index 511526710..0ea80d47d 100644
--- a/src/core/model/breakpoint.cc
+++ b/src/core/model/breakpoint.cc
@@ -54,4 +54,4 @@ BreakpointFallback (void)
 
 #endif // HAVE_SIGNAL_H
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/core/model/breakpoint.h b/src/core/model/breakpoint.h
index c3f3e656f..0f06349e2 100644
--- a/src/core/model/breakpoint.h
+++ b/src/core/model/breakpoint.h
@@ -69,7 +69,7 @@ namespace ns3 {
 void BreakpointFallback (void);
 
 
-} //namespace ns3
+} // namespace ns3
 
 
 #endif /* BREAKPOINT_H */
diff --git a/src/core/model/event-id.cc b/src/core/model/event-id.cc
index d0a8436f5..4653ccce8 100644
--- a/src/core/model/event-id.cc
+++ b/src/core/model/event-id.cc
@@ -89,4 +89,4 @@ bool operator != (const EventId &a, const EventId &b)
 
 
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/core/model/event-id.h b/src/core/model/event-id.h
index 312de66e7..c9cf4c396 100644
--- a/src/core/model/event-id.h
+++ b/src/core/model/event-id.h
@@ -85,6 +85,6 @@ private:
 bool operator == (const EventId &a, const EventId &b);
 bool operator != (const EventId &a, const EventId &b);
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* EVENT_ID_H */
diff --git a/src/core/model/names.cc b/src/core/model/names.cc
index 29e029d19..4d36a3d75 100644
--- a/src/core/model/names.cc
+++ b/src/core/model/names.cc
@@ -682,4 +682,4 @@ Names::FindInternal (Ptr<Object> context, std::string name)
   return NamesPriv::Get ()->Find (context, name);
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/core/model/names.h b/src/core/model/names.h
index 09356c33a..77d6f338b 100644
--- a/src/core/model/names.h
+++ b/src/core/model/names.h
@@ -456,6 +456,6 @@ Names::Find (Ptr<Object> context, std::string name)
     }
 }
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* OBJECT_NAMES_H */
diff --git a/src/core/model/ptr.h b/src/core/model/ptr.h
index 0dbbef776..e60c59f5b 100644
--- a/src/core/model/ptr.h
+++ b/src/core/model/ptr.h
@@ -521,6 +521,6 @@ Ptr<T>::operator Tester * () const
 }
 
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* PTR_H */
diff --git a/src/core/model/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc
index c4cd7fd4c..d76564cd9 100644
--- a/src/core/model/realtime-simulator-impl.cc
+++ b/src/core/model/realtime-simulator-impl.cc
@@ -869,4 +869,4 @@ RealtimeSimulatorImpl::GetHardLimit (void) const
   return m_hardLimit;
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/core/model/rng-stream.cc b/src/core/model/rng-stream.cc
index 96f7287bb..9b61b41b6 100644
--- a/src/core/model/rng-stream.cc
+++ b/src/core/model/rng-stream.cc
@@ -562,4 +562,4 @@ int32_t RngStream::RandInt (int32_t low, int32_t high)
   return low + static_cast<int32_t> ((high - low + 1) * RandU01 ());
 };
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/core/model/rng-stream.h b/src/core/model/rng-stream.h
index 97fef149e..86367550c 100644
--- a/src/core/model/rng-stream.h
+++ b/src/core/model/rng-stream.h
@@ -70,7 +70,7 @@ private: //static data
   static double nextSeed[6];
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif
  
diff --git a/src/core/model/simulation-singleton.h b/src/core/model/simulation-singleton.h
index 8269e780f..ee433552f 100644
--- a/src/core/model/simulation-singleton.h
+++ b/src/core/model/simulation-singleton.h
@@ -45,7 +45,7 @@ private:
   static void DeleteObject (void);
 };
 
-} //namespace ns3
+} // namespace ns3
 
 
 #include "simulator.h"
diff --git a/src/core/model/synchronizer.h b/src/core/model/synchronizer.h
index 2b5010ca4..202800ac5 100644
--- a/src/core/model/synchronizer.h
+++ b/src/core/model/synchronizer.h
@@ -329,6 +329,6 @@ private:
   uint64_t NanosecondToTimeStep (uint64_t ns);
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* SYNCHRONIZER_H */
diff --git a/src/core/model/system-condition.h b/src/core/model/system-condition.h
index 2cfbe83c2..255539c4a 100644
--- a/src/core/model/system-condition.h
+++ b/src/core/model/system-condition.h
@@ -101,7 +101,7 @@ private:
   SystemConditionPrivate * m_priv;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* SYSTEM_CONDITION_H */
 
diff --git a/src/core/model/system-mutex.h b/src/core/model/system-mutex.h
index 7fc298c40..8c35fbf3d 100644
--- a/src/core/model/system-mutex.h
+++ b/src/core/model/system-mutex.h
@@ -115,6 +115,6 @@ private:
   SystemMutex &m_mutex;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* SYSTEM_MUTEX_H */
diff --git a/src/core/model/system-thread.h b/src/core/model/system-thread.h
index 55038017c..eb6eb275a 100644
--- a/src/core/model/system-thread.h
+++ b/src/core/model/system-thread.h
@@ -168,7 +168,7 @@ private:
   bool m_break;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* SYSTEM_THREAD_H */
 
diff --git a/src/core/model/system-wall-clock-ms.h b/src/core/model/system-wall-clock-ms.h
index 2895f3dd8..ca90ad5a6 100644
--- a/src/core/model/system-wall-clock-ms.h
+++ b/src/core/model/system-wall-clock-ms.h
@@ -76,6 +76,6 @@ private:
   class SystemWallClockMsPrivate *m_priv;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* SYSTEM_WALL_CLOCK_MS_H */
diff --git a/src/core/model/traced-callback.h b/src/core/model/traced-callback.h
index ddf16bc29..cb772c617 100644
--- a/src/core/model/traced-callback.h
+++ b/src/core/model/traced-callback.h
@@ -280,6 +280,6 @@ TracedCallback<T1,T2,T3,T4,T5,T6,T7,T8>::operator() (T1 a1, T2 a2, T3 a3, T4 a4,
     }
 }
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* TRACED_CALLBACK_H */
diff --git a/src/core/model/type-name.cc b/src/core/model/type-name.cc
index aad188bd4..58f099e76 100644
--- a/src/core/model/type-name.cc
+++ b/src/core/model/type-name.cc
@@ -23,4 +23,4 @@ DEF_TYPE (float);
 DEF_TYPE (double);
 
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/core/model/type-name.h b/src/core/model/type-name.h
index 9971abc4b..4bd94aa5d 100644
--- a/src/core/model/type-name.h
+++ b/src/core/model/type-name.h
@@ -31,6 +31,6 @@ DEF_TYPE (double);
 
 #undef DEF_TYPE
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* TYPE_NAME_H */
diff --git a/src/core/model/unix-system-wall-clock-ms.cc b/src/core/model/unix-system-wall-clock-ms.cc
index c4f6cc938..68f70fb98 100644
--- a/src/core/model/unix-system-wall-clock-ms.cc
+++ b/src/core/model/unix-system-wall-clock-ms.cc
@@ -159,4 +159,4 @@ SystemWallClockMs::GetElapsedSystem (void) const
   return m_priv->GetElapsedSystem ();
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/core/model/wall-clock-synchronizer.cc b/src/core/model/wall-clock-synchronizer.cc
index 1682855ce..393ab2427 100644
--- a/src/core/model/wall-clock-synchronizer.cc
+++ b/src/core/model/wall-clock-synchronizer.cc
@@ -420,4 +420,4 @@ WallClockSynchronizer::TimevalAdd (
     }
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/core/model/wall-clock-synchronizer.h b/src/core/model/wall-clock-synchronizer.h
index 46979a97f..64755e008 100644
--- a/src/core/model/wall-clock-synchronizer.h
+++ b/src/core/model/wall-clock-synchronizer.h
@@ -191,6 +191,6 @@ protected:
   SystemCondition m_condition;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* WALL_CLOCK_SYNCHRONIZER_H */
diff --git a/src/core/model/win32-system-wall-clock-ms.cc b/src/core/model/win32-system-wall-clock-ms.cc
index 812c882b5..076d9ebd7 100644
--- a/src/core/model/win32-system-wall-clock-ms.cc
+++ b/src/core/model/win32-system-wall-clock-ms.cc
@@ -152,4 +152,4 @@ SystemWallClockMs::GetElapsedSystem (void) const
   return m_priv->GetElapsedSystem ();
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/csma/model/csma-net-device.h b/src/csma/model/csma-net-device.h
index 170362f78..56f3491f1 100644
--- a/src/csma/model/csma-net-device.h
+++ b/src/csma/model/csma-net-device.h
@@ -710,6 +710,6 @@ private:
   uint32_t m_mtu;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* CSMA_NET_DEVICE_H */
diff --git a/src/internet/helper/ipv4-address-helper.h b/src/internet/helper/ipv4-address-helper.h
index 4508c221f..1b6e6ac2a 100644
--- a/src/internet/helper/ipv4-address-helper.h
+++ b/src/internet/helper/ipv4-address-helper.h
@@ -189,6 +189,6 @@ private:
   uint32_t m_max;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* IPV4_ADDRESS_HELPER_H */
diff --git a/src/internet/helper/ipv4-static-routing-helper.cc b/src/internet/helper/ipv4-static-routing-helper.cc
index 42fef2c47..d8be29548 100644
--- a/src/internet/helper/ipv4-static-routing-helper.cc
+++ b/src/internet/helper/ipv4-static-routing-helper.cc
@@ -208,4 +208,4 @@ Ipv4StaticRoutingHelper::SetDefaultMulticastRoute (
   SetDefaultMulticastRoute (n, nd);
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/helper/ipv6-static-routing-helper.cc b/src/internet/helper/ipv6-static-routing-helper.cc
index 7f47e40e2..a094db19e 100644
--- a/src/internet/helper/ipv6-static-routing-helper.cc
+++ b/src/internet/helper/ipv6-static-routing-helper.cc
@@ -211,4 +211,4 @@ Ipv6StaticRoutingHelper::SetDefaultMulticastRoute (
 }
 #endif
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/arp-cache.h b/src/internet/model/arp-cache.h
index 590bb8e23..d6aa3a8b0 100644
--- a/src/internet/model/arp-cache.h
+++ b/src/internet/model/arp-cache.h
@@ -233,6 +233,6 @@ private:
 };
 
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* ARP_CACHE_H */
diff --git a/src/internet/model/arp-header.cc b/src/internet/model/arp-header.cc
index 2b9ce1a68..5dcec772c 100644
--- a/src/internet/model/arp-header.cc
+++ b/src/internet/model/arp-header.cc
@@ -172,4 +172,4 @@ ArpHeader::Deserialize (Buffer::Iterator start)
   return GetSerializedSize ();
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/arp-header.h b/src/internet/model/arp-header.h
index d12e0fcb7..bf27cd3f5 100644
--- a/src/internet/model/arp-header.h
+++ b/src/internet/model/arp-header.h
@@ -67,6 +67,6 @@ public:
   Ipv4Address m_ipv4Dest;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* ARP_HEADER_H */
diff --git a/src/internet/model/arp-l3-protocol.cc b/src/internet/model/arp-l3-protocol.cc
index ea33fbf02..bd94ea1cf 100644
--- a/src/internet/model/arp-l3-protocol.cc
+++ b/src/internet/model/arp-l3-protocol.cc
@@ -344,4 +344,4 @@ ArpL3Protocol::SendArpReply (Ptr<const ArpCache> cache, Ipv4Address myIp, Ipv4Ad
   cache->GetDevice ()->Send (packet, toMac, PROT_NUMBER);
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/arp-l3-protocol.h b/src/internet/model/arp-l3-protocol.h
index 6e185a887..6ea710680 100644
--- a/src/internet/model/arp-l3-protocol.h
+++ b/src/internet/model/arp-l3-protocol.h
@@ -95,7 +95,7 @@ private:
   TracedCallback<Ptr<const Packet> > m_dropTrace;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 
 #endif /* ARP_L3_PROTOCOL_H */
diff --git a/src/internet/model/ipv4-address-generator.h b/src/internet/model/ipv4-address-generator.h
index e8110c565..1a073ddf7 100644
--- a/src/internet/model/ipv4-address-generator.h
+++ b/src/internet/model/ipv4-address-generator.h
@@ -47,6 +47,6 @@ public:
   static void TestMode (void);
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* IPV4_ADDRESS_GENERATOR_H */
diff --git a/src/internet/model/ipv4-end-point-demux.cc b/src/internet/model/ipv4-end-point-demux.cc
index c30067199..9bfd2f712 100644
--- a/src/internet/model/ipv4-end-point-demux.cc
+++ b/src/internet/model/ipv4-end-point-demux.cc
@@ -368,5 +368,5 @@ Ipv4EndPointDemux::AllocateEphemeralPort (void)
   return 0;
 }
 
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/internet/model/ipv4-end-point.cc b/src/internet/model/ipv4-end-point.cc
index ece423e00..31cc177ac 100644
--- a/src/internet/model/ipv4-end-point.cc
+++ b/src/internet/model/ipv4-end-point.cc
@@ -144,4 +144,4 @@ Ipv4EndPoint::DoForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl,
   m_icmpCallback (icmpSource,icmpTtl,icmpType,icmpCode,icmpInfo);
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv4-end-point.h b/src/internet/model/ipv4-end-point.h
index 691462eb7..38790daf6 100644
--- a/src/internet/model/ipv4-end-point.h
+++ b/src/internet/model/ipv4-end-point.h
@@ -91,7 +91,7 @@ private:
   Callback<void> m_destroyCallback;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 
 #endif /* IPV4_END_POINT_H */
diff --git a/src/internet/model/ipv4-global-routing.cc b/src/internet/model/ipv4-global-routing.cc
index 8800869dd..3fe07989c 100644
--- a/src/internet/model/ipv4-global-routing.cc
+++ b/src/internet/model/ipv4-global-routing.cc
@@ -597,4 +597,4 @@ Ipv4GlobalRouting::SetIpv4 (Ptr<Ipv4> ipv4)
 }
 
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv4-header.cc b/src/internet/model/ipv4-header.cc
index 71c8bd9b0..7914d214e 100644
--- a/src/internet/model/ipv4-header.cc
+++ b/src/internet/model/ipv4-header.cc
@@ -324,4 +324,4 @@ Ipv4Header::Deserialize (Buffer::Iterator start)
   return GetSerializedSize ();
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv4-interface.cc b/src/internet/model/ipv4-interface.cc
index 992777d0e..c238ef9ac 100644
--- a/src/internet/model/ipv4-interface.cc
+++ b/src/internet/model/ipv4-interface.cc
@@ -340,5 +340,5 @@ Ipv4Interface::RemoveAddress (uint32_t index)
   return (addr);  // quiet compiler
 }
 
-}; // namespace ns3
+} // namespace ns3
 
diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc
index ecbd865d3..7c2a8f7e5 100644
--- a/src/internet/model/ipv4-l3-protocol.cc
+++ b/src/internet/model/ipv4-l3-protocol.cc
@@ -1394,4 +1394,4 @@ Ipv4L3Protocol::HandleFragmentsTimeout (std::pair<uint64_t, uint32_t> key, Ipv4H
   m_fragmentsTimers.erase (key);
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv4-l4-protocol.cc b/src/internet/model/ipv4-l4-protocol.cc
index 6a3ef0dcb..ac741a3cd 100644
--- a/src/internet/model/ipv4-l4-protocol.cc
+++ b/src/internet/model/ipv4-l4-protocol.cc
@@ -52,4 +52,4 @@ Ipv4L4Protocol::ReceiveIcmp (Ipv4Address icmpSource, uint8_t icmpTtl,
                              const uint8_t payload[8])
 {}
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv4-list-routing.h b/src/internet/model/ipv4-list-routing.h
index f6477b577..044ec0580 100644
--- a/src/internet/model/ipv4-list-routing.h
+++ b/src/internet/model/ipv4-list-routing.h
@@ -100,6 +100,6 @@ private:
 
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IPV4_LIST_ROUTING_H */
diff --git a/src/internet/model/ipv4-packet-info-tag.cc b/src/internet/model/ipv4-packet-info-tag.cc
index 2bb04efa2..e9054268f 100644
--- a/src/internet/model/ipv4-packet-info-tag.cc
+++ b/src/internet/model/ipv4-packet-info-tag.cc
@@ -136,5 +136,5 @@ Ipv4PacketInfoTag::Print (std::ostream &os) const
   os << ", TTL:" << (uint32_t) m_ttl;
   os << "] ";
 }
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/internet/model/ipv4-packet-info-tag.h b/src/internet/model/ipv4-packet-info-tag.h
index f243c5c9d..935cc3875 100644
--- a/src/internet/model/ipv4-packet-info-tag.h
+++ b/src/internet/model/ipv4-packet-info-tag.h
@@ -84,6 +84,6 @@ private:
   // Uset for IP_RECVTTL, though not implemented yet.
   uint8_t m_ttl;
 };
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IPV4_PACKET_INFO_TAG_H */
diff --git a/src/internet/model/ipv4-route.cc b/src/internet/model/ipv4-route.cc
index 1e1090504..44582d204 100644
--- a/src/internet/model/ipv4-route.cc
+++ b/src/internet/model/ipv4-route.cc
@@ -157,4 +157,4 @@ Ipv4MulticastRoute::GetOutputTtlMap () const
   return(m_ttls);
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv4-route.h b/src/internet/model/ipv4-route.h
index a919bcff6..5fb44d42e 100644
--- a/src/internet/model/ipv4-route.h
+++ b/src/internet/model/ipv4-route.h
@@ -163,6 +163,6 @@ private:
   std::map<uint32_t, uint32_t> m_ttls;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IPV4_ROUTE_H */
diff --git a/src/internet/model/ipv4-routing-protocol.cc b/src/internet/model/ipv4-routing-protocol.cc
index 774060baa..613eeba17 100644
--- a/src/internet/model/ipv4-routing-protocol.cc
+++ b/src/internet/model/ipv4-routing-protocol.cc
@@ -32,4 +32,4 @@ TypeId Ipv4RoutingProtocol::GetTypeId (void)
   return tid;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv4-routing-protocol.h b/src/internet/model/ipv4-routing-protocol.h
index d5cb424ea..57f18c9d0 100644
--- a/src/internet/model/ipv4-routing-protocol.h
+++ b/src/internet/model/ipv4-routing-protocol.h
@@ -145,6 +145,6 @@ public:
   virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const = 0;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IPV4_ROUTING_PROTOCOL_H */
diff --git a/src/internet/model/ipv4-routing-table-entry.cc b/src/internet/model/ipv4-routing-table-entry.cc
index d89f1756f..386ddd58b 100644
--- a/src/internet/model/ipv4-routing-table-entry.cc
+++ b/src/internet/model/ipv4-routing-table-entry.cc
@@ -337,4 +337,4 @@ operator<< (std::ostream& os, Ipv4MulticastRoutingTableEntry const& route)
   return os;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv4-routing-table-entry.h b/src/internet/model/ipv4-routing-table-entry.h
index 62c0dbe72..9b98ec094 100644
--- a/src/internet/model/ipv4-routing-table-entry.h
+++ b/src/internet/model/ipv4-routing-table-entry.h
@@ -226,6 +226,6 @@ private:
 
 std::ostream& operator<< (std::ostream& os, Ipv4MulticastRoutingTableEntry const& route);
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IPV4_ROUTING_TABLE_ENTRY_H */
diff --git a/src/internet/model/ipv4-static-routing.cc b/src/internet/model/ipv4-static-routing.cc
index a9754f1b8..278440352 100644
--- a/src/internet/model/ipv4-static-routing.cc
+++ b/src/internet/model/ipv4-static-routing.cc
@@ -775,4 +775,4 @@ Ipv4StaticRouting::SourceAddressSelection (uint32_t interfaceIdx, Ipv4Address de
   return candidate;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/ipv6-list-routing.h b/src/internet/model/ipv6-list-routing.h
index b255e26a6..77b2b18f9 100644
--- a/src/internet/model/ipv6-list-routing.h
+++ b/src/internet/model/ipv6-list-routing.h
@@ -133,7 +133,7 @@ private:
   Ptr<Ipv6> m_ipv6;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IPV6_LIST_ROUTING_H */
 
diff --git a/src/internet/model/ipv6-packet-info-tag.cc b/src/internet/model/ipv6-packet-info-tag.cc
index 11a378a82..1d09e759b 100644
--- a/src/internet/model/ipv6-packet-info-tag.cc
+++ b/src/internet/model/ipv6-packet-info-tag.cc
@@ -134,5 +134,5 @@ Ipv6PacketInfoTag::Print (std::ostream &os) const
   os << ", TClass:" << (uint32_t) m_tclass;
   os << "] ";
 }
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/internet/model/ipv6-packet-info-tag.h b/src/internet/model/ipv6-packet-info-tag.h
index cb60a3515..821c0029b 100644
--- a/src/internet/model/ipv6-packet-info-tag.h
+++ b/src/internet/model/ipv6-packet-info-tag.h
@@ -89,7 +89,7 @@ private:
   uint8_t m_hoplimit;
   uint8_t m_tclass;
 };
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IPV6_PACKET_INFO_TAG_H */
 
diff --git a/src/internet/model/ipv6-routing-protocol.h b/src/internet/model/ipv6-routing-protocol.h
index 29190b3c5..4713b3155 100644
--- a/src/internet/model/ipv6-routing-protocol.h
+++ b/src/internet/model/ipv6-routing-protocol.h
@@ -173,7 +173,7 @@ public:
   virtual void SetIpv6 (Ptr<Ipv6> ipv6) = 0;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IPV6_ROUTING_PROTOCOL_H */
 
diff --git a/src/internet/model/nsc-tcp-l4-protocol.cc b/src/internet/model/nsc-tcp-l4-protocol.cc
index da5742938..71db61f5f 100644
--- a/src/internet/model/nsc-tcp-l4-protocol.cc
+++ b/src/internet/model/nsc-tcp-l4-protocol.cc
@@ -468,5 +468,5 @@ NscTcpL4Protocol::GetDownTarget (void) const
   return m_downTarget;
 }
 
-}; // namespace ns3
+} // namespace ns3
 
diff --git a/src/internet/model/nsc-tcp-l4-protocol.h b/src/internet/model/nsc-tcp-l4-protocol.h
index dafcbafcd..43fc57517 100644
--- a/src/internet/model/nsc-tcp-l4-protocol.h
+++ b/src/internet/model/nsc-tcp-l4-protocol.h
@@ -126,6 +126,6 @@ private:
   Ipv4L4Protocol::DownTargetCallback m_downTarget;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* NSC_TCP_L4_PROTOCOL_H */
diff --git a/src/internet/model/nsc-tcp-socket-impl.cc b/src/internet/model/nsc-tcp-socket-impl.cc
index 354a7e7fa..5fe43ec7d 100644
--- a/src/internet/model/nsc-tcp-socket-impl.cc
+++ b/src/internet/model/nsc-tcp-socket-impl.cc
@@ -860,4 +860,4 @@ NscTcpSocketImpl::GetAllowBroadcast () const
   return false;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/nsc-tcp-socket-impl.h b/src/internet/model/nsc-tcp-socket-impl.h
index 090e2ac75..7d645ed37 100644
--- a/src/internet/model/nsc-tcp-socket-impl.h
+++ b/src/internet/model/nsc-tcp-socket-impl.h
@@ -180,6 +180,6 @@ private:
   uint32_t m_rcvBufSize;   // maximum receive socket buffer size
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* NSC_TCP_SOCKET_IMPL_H */
diff --git a/src/internet/model/rtt-estimator.h b/src/internet/model/rtt-estimator.h
index cb9c5e248..b5f83fee0 100644
--- a/src/internet/model/rtt-estimator.h
+++ b/src/internet/model/rtt-estimator.h
@@ -113,6 +113,6 @@ public:
   double       gain;       // Filter gain
   int64x64_t   variance;   // Current variance
 };
-} //namespace ns3
+} // namespace ns3
 
 #endif /* RTT_ESTIMATOR_H */
diff --git a/src/internet/model/tcp-header.cc b/src/internet/model/tcp-header.cc
index 14bf340c6..e304a6b26 100644
--- a/src/internet/model/tcp-header.cc
+++ b/src/internet/model/tcp-header.cc
@@ -254,4 +254,4 @@ uint32_t TcpHeader::Deserialize (Buffer::Iterator start)
 }
 
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/tcp-header.h b/src/internet/model/tcp-header.h
index 4f7fb2bcf..62c48df35 100644
--- a/src/internet/model/tcp-header.h
+++ b/src/internet/model/tcp-header.h
@@ -169,6 +169,6 @@ private:
   bool m_goodChecksum;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* TCP_HEADER */
diff --git a/src/internet/model/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc
index a67821985..cb9ba66b0 100644
--- a/src/internet/model/tcp-l4-protocol.cc
+++ b/src/internet/model/tcp-l4-protocol.cc
@@ -401,5 +401,5 @@ TcpL4Protocol::GetDownTarget (void) const
   return m_downTarget;
 }
 
-}; // namespace ns3
+} // namespace ns3
 
diff --git a/src/internet/model/tcp-l4-protocol.h b/src/internet/model/tcp-l4-protocol.h
index 78393ce27..0016a26e6 100644
--- a/src/internet/model/tcp-l4-protocol.h
+++ b/src/internet/model/tcp-l4-protocol.h
@@ -130,6 +130,6 @@ private:
   Ipv4L4Protocol::DownTargetCallback m_downTarget;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* TCP_L4_PROTOCOL_H */
diff --git a/src/internet/model/tcp-socket.cc b/src/internet/model/tcp-socket.cc
index f4f5c6b87..076ddc41a 100644
--- a/src/internet/model/tcp-socket.cc
+++ b/src/internet/model/tcp-socket.cc
@@ -113,4 +113,4 @@ TcpSocket::~TcpSocket ()
   NS_LOG_FUNCTION_NOARGS ();
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/tcp-socket.h b/src/internet/model/tcp-socket.h
index f1c08200d..2c78b0c98 100644
--- a/src/internet/model/tcp-socket.h
+++ b/src/internet/model/tcp-socket.h
@@ -95,7 +95,7 @@ private:
 
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* TCP_SOCKET_H */
 
diff --git a/src/internet/model/udp-header.cc b/src/internet/model/udp-header.cc
index 26c10ddba..a58a5babe 100644
--- a/src/internet/model/udp-header.cc
+++ b/src/internet/model/udp-header.cc
@@ -177,4 +177,4 @@ UdpHeader::Deserialize (Buffer::Iterator start)
 }
 
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/udp-l4-protocol.cc b/src/internet/model/udp-l4-protocol.cc
index 3787505e8..84d5711c9 100644
--- a/src/internet/model/udp-l4-protocol.cc
+++ b/src/internet/model/udp-l4-protocol.cc
@@ -311,5 +311,5 @@ UdpL4Protocol::GetDownTarget (void) const
   return m_downTarget;
 }
 
-}; // namespace ns3
+} // namespace ns3
 
diff --git a/src/internet/model/udp-l4-protocol.h b/src/internet/model/udp-l4-protocol.h
index 47036b2ae..cf124666d 100644
--- a/src/internet/model/udp-l4-protocol.h
+++ b/src/internet/model/udp-l4-protocol.h
@@ -130,6 +130,6 @@ private:
   Ipv4L4Protocol::DownTargetCallback m_downTarget;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* UDP_L4_PROTOCOL_H */
diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc
index bb98d5424..6160faa10 100644
--- a/src/internet/model/udp-socket-impl.cc
+++ b/src/internet/model/udp-socket-impl.cc
@@ -759,4 +759,4 @@ UdpSocketImpl::GetAllowBroadcast () const
 }
 
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/udp-socket-impl.h b/src/internet/model/udp-socket-impl.h
index 9387ffe62..6586f76a7 100644
--- a/src/internet/model/udp-socket-impl.h
+++ b/src/internet/model/udp-socket-impl.h
@@ -138,6 +138,6 @@ private:
   Callback<void, Ipv4Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* UDP_SOCKET_IMPL_H */
diff --git a/src/internet/model/udp-socket.cc b/src/internet/model/udp-socket.cc
index e5021fffd..a544151b9 100644
--- a/src/internet/model/udp-socket.cc
+++ b/src/internet/model/udp-socket.cc
@@ -86,4 +86,4 @@ UdpSocket::~UdpSocket ()
   NS_LOG_FUNCTION_NOARGS ();
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/model/udp-socket.h b/src/internet/model/udp-socket.h
index d3257f691..7cf8cacdc 100644
--- a/src/internet/model/udp-socket.h
+++ b/src/internet/model/udp-socket.h
@@ -113,7 +113,7 @@ private:
   virtual bool GetMtuDiscover (void) const = 0;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* UDP_SOCKET_H */
 
diff --git a/src/internet/test/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc
index bed926fd0..d9ddb3a48 100644
--- a/src/internet/test/ipv4-raw-test.cc
+++ b/src/internet/test/ipv4-raw-test.cc
@@ -327,4 +327,4 @@ public:
   }
 } g_ipv4rawTestSuite;
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/test/ipv4-test.cc b/src/internet/test/ipv4-test.cc
index 5e6a77cb7..cbbbfafee 100644
--- a/src/internet/test/ipv4-test.cc
+++ b/src/internet/test/ipv4-test.cc
@@ -107,5 +107,4 @@ public:
   }
 } g_ipv4protocolTestSuite;
 
-}
-; // namespace ns3
+} // namespace ns3
diff --git a/src/internet/test/udp-test.cc b/src/internet/test/udp-test.cc
index 33ac6ec45..418a27dc8 100644
--- a/src/internet/test/udp-test.cc
+++ b/src/internet/test/udp-test.cc
@@ -331,4 +331,4 @@ public:
   }
 } g_udpTestSuite;
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/ue-record.cc b/src/lte/model/ue-record.cc
index 586e3feae..7d88c1390 100644
--- a/src/lte/model/ue-record.cc
+++ b/src/lte/model/ue-record.cc
@@ -94,5 +94,4 @@ UeRecord::GetCqiFeedbacks (void)
   return m_cqiFeedbacks;
 }
 
-}
-; // namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/ue-record.h b/src/lte/model/ue-record.h
index e8cf2cdc7..3642333f2 100644
--- a/src/lte/model/ue-record.h
+++ b/src/lte/model/ue-record.h
@@ -115,7 +115,6 @@ private:
   CqiFeedbacks m_cqiFeedbacks;
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* UE_RECORD_H */
diff --git a/src/mesh/helper/dot11s/dot11s-installer.cc b/src/mesh/helper/dot11s/dot11s-installer.cc
index b873bd4b5..80e0f98b7 100644
--- a/src/mesh/helper/dot11s/dot11s-installer.cc
+++ b/src/mesh/helper/dot11s/dot11s-installer.cc
@@ -122,4 +122,4 @@ Dot11sStack::ResetStats (const Ptr<MeshPointDevice> mp)
   NS_ASSERT (pmp != 0);
   pmp->ResetStats ();
 }
-} //namespace ns3
+} // namespace ns3
diff --git a/src/mesh/helper/dot11s/dot11s-installer.h b/src/mesh/helper/dot11s/dot11s-installer.h
index 4414e31cf..e24c1a6fe 100644
--- a/src/mesh/helper/dot11s/dot11s-installer.h
+++ b/src/mesh/helper/dot11s/dot11s-installer.h
@@ -72,7 +72,7 @@ private:
   Mac48Address m_root;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif
 
diff --git a/src/mesh/helper/flame/flame-installer.cc b/src/mesh/helper/flame/flame-installer.cc
index 7cc89dd6a..ec23cb06a 100644
--- a/src/mesh/helper/flame/flame-installer.cc
+++ b/src/mesh/helper/flame/flame-installer.cc
@@ -70,4 +70,4 @@ FlameStack::ResetStats (const Ptr<MeshPointDevice> mp)
 
   flame->ResetStats ();
 }
-} //namespace ns3
+} // namespace ns3
diff --git a/src/mesh/helper/flame/flame-installer.h b/src/mesh/helper/flame/flame-installer.h
index 4663ba0b7..f962033fe 100644
--- a/src/mesh/helper/flame/flame-installer.h
+++ b/src/mesh/helper/flame/flame-installer.h
@@ -73,7 +73,7 @@ public:
   void ResetStats (const Ptr<MeshPointDevice> mp);
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* FLAME_INSTALLER_H */
 
diff --git a/src/mesh/helper/mesh-helper.cc b/src/mesh/helper/mesh-helper.cc
index 2135baba4..b4fded099 100644
--- a/src/mesh/helper/mesh-helper.cc
+++ b/src/mesh/helper/mesh-helper.cc
@@ -207,5 +207,5 @@ MeshHelper::ResetStats (const ns3::Ptr<ns3::NetDevice>& device)
   NS_ASSERT (mp != 0);
   m_stack->ResetStats (mp);
 }
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/helper/mesh-helper.h b/src/mesh/helper/mesh-helper.h
index d488b9650..50e0ecfd7 100644
--- a/src/mesh/helper/mesh-helper.h
+++ b/src/mesh/helper/mesh-helper.h
@@ -207,7 +207,7 @@ private:
   enum WifiPhyStandard m_standard;
   ///\}
 };
-} //namespace ns3
+} // namespace ns3
 
 #endif /* MESH_HELPER_H */
 
diff --git a/src/mesh/model/dot11s/airtime-metric.cc b/src/mesh/model/dot11s/airtime-metric.cc
index 747622223..d112e9437 100644
--- a/src/mesh/model/dot11s/airtime-metric.cc
+++ b/src/mesh/model/dot11s/airtime-metric.cc
@@ -102,5 +102,5 @@ AirtimeLinkMetricCalculator::CalculateMetric (Mac48Address peerAddress, Ptr<Mesh
                                  ).GetMicroSeconds () / (10.24 * (1.0 - failAvg)));
   return metric;
 }
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
diff --git a/src/mesh/model/dot11s/airtime-metric.h b/src/mesh/model/dot11s/airtime-metric.h
index 4c44855d9..fca8783f3 100644
--- a/src/mesh/model/dot11s/airtime-metric.h
+++ b/src/mesh/model/dot11s/airtime-metric.h
@@ -59,6 +59,6 @@ private:
   Ptr<Packet> m_testFrame;
   WifiMacHeader m_testHeader;
 };
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/dot11s-mac-header.cc b/src/mesh/model/dot11s/dot11s-mac-header.cc
index ecd385973..825d13e40 100644
--- a/src/mesh/model/dot11s/dot11s-mac-header.cc
+++ b/src/mesh/model/dot11s/dot11s-mac-header.cc
@@ -174,5 +174,5 @@ operator== (const MeshHeader & a, const MeshHeader & b)
           && (a.m_meshSeqno == b.m_meshSeqno) && (a.m_addr4 == b.m_addr4) && (a.m_addr5 == b.m_addr5)
           && (a.m_addr6 == b.m_addr6));
 }
-} //namespace dot11s
+} // namespace dot11s
 } // namespace ns3
diff --git a/src/mesh/model/dot11s/dot11s-mac-header.h b/src/mesh/model/dot11s/dot11s-mac-header.h
index b1c52e158..710ed45a7 100644
--- a/src/mesh/model/dot11s/dot11s-mac-header.h
+++ b/src/mesh/model/dot11s/dot11s-mac-header.h
@@ -73,6 +73,6 @@ private:
 };
 bool operator== (const MeshHeader & a, const MeshHeader & b);
 
-} //namespace dot11s
+} // namespace dot11s
 } // namespace ns3
 #endif /* MESH_WIFI_MAC_HEADER_H */
diff --git a/src/mesh/model/dot11s/hwmp-protocol-mac.cc b/src/mesh/model/dot11s/hwmp-protocol-mac.cc
index 5f79366b1..a4d140d10 100644
--- a/src/mesh/model/dot11s/hwmp-protocol-mac.cc
+++ b/src/mesh/model/dot11s/hwmp-protocol-mac.cc
@@ -476,5 +476,5 @@ HwmpProtocolMac::ResetStats ()
   m_stats = Statistics ();
 }
 
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
diff --git a/src/mesh/model/dot11s/hwmp-protocol-mac.h b/src/mesh/model/dot11s/hwmp-protocol-mac.h
index b5e09195a..3cb85f9e8 100644
--- a/src/mesh/model/dot11s/hwmp-protocol-mac.h
+++ b/src/mesh/model/dot11s/hwmp-protocol-mac.h
@@ -135,6 +135,6 @@ private:
   /// Receive action management frame
   bool ReceiveAction (Ptr<Packet> packet, const WifiMacHeader & header);
 };
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/hwmp-protocol.cc b/src/mesh/model/dot11s/hwmp-protocol.cc
index ef91f18c9..9a5659974 100644
--- a/src/mesh/model/dot11s/hwmp-protocol.cc
+++ b/src/mesh/model/dot11s/hwmp-protocol.cc
@@ -1168,5 +1168,5 @@ HwmpProtocol::QueuedPacket::QueuedPacket () :
   inInterface (0)
 {
 }
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
diff --git a/src/mesh/model/dot11s/hwmp-protocol.h b/src/mesh/model/dot11s/hwmp-protocol.h
index e4ce0ef75..a234d9e2e 100644
--- a/src/mesh/model/dot11s/hwmp-protocol.h
+++ b/src/mesh/model/dot11s/hwmp-protocol.h
@@ -269,6 +269,6 @@ private:
   ///\}
   Callback <std::vector<Mac48Address>, uint32_t> m_neighboursCallback;
 };
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/hwmp-rtable.cc b/src/mesh/model/dot11s/hwmp-rtable.cc
index 3eb9a9b38..e02cfda0b 100644
--- a/src/mesh/model/dot11s/hwmp-rtable.cc
+++ b/src/mesh/model/dot11s/hwmp-rtable.cc
@@ -239,5 +239,5 @@ HwmpRtable::LookupResult::IsValid () const
   return !(retransmitter == Mac48Address::GetBroadcast () && ifIndex == INTERFACE_ANY && metric == MAX_METRIC
            && seqnum == 0);
 }
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
diff --git a/src/mesh/model/dot11s/hwmp-rtable.h b/src/mesh/model/dot11s/hwmp-rtable.h
index 36e42e8a3..26b80ffbf 100644
--- a/src/mesh/model/dot11s/hwmp-rtable.h
+++ b/src/mesh/model/dot11s/hwmp-rtable.h
@@ -141,6 +141,6 @@ private:
   /// Path to proactive tree root MP
   ProactiveRoute  m_root;
 };
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/hwmp-tag.cc b/src/mesh/model/dot11s/hwmp-tag.cc
index a6461362f..88fe7fd06 100644
--- a/src/mesh/model/dot11s/hwmp-tag.cc
+++ b/src/mesh/model/dot11s/hwmp-tag.cc
@@ -147,5 +147,5 @@ HwmpTag::DecrementTtl ()
 {
   m_ttl--;
 }
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
diff --git a/src/mesh/model/dot11s/hwmp-tag.h b/src/mesh/model/dot11s/hwmp-tag.h
index 5171fb5b2..a969297ba 100644
--- a/src/mesh/model/dot11s/hwmp-tag.h
+++ b/src/mesh/model/dot11s/hwmp-tag.h
@@ -72,6 +72,6 @@ private:
   uint32_t m_metric;
   uint32_t m_seqno;
 };
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc
index f67cc35c1..54fb803aa 100644
--- a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc
@@ -219,5 +219,5 @@ operator << (std::ostream &os, const IeBeaconTiming &a)
   return os;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h
index 4f5efa366..0f5ed303f 100644
--- a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h
+++ b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h
@@ -111,5 +111,5 @@ private:
 bool operator== (const IeBeaconTimingUnit & a, const IeBeaconTimingUnit & b);
 std::ostream &operator << (std::ostream &os, const IeBeaconTiming &beaconTiming);
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/ie-dot11s-configuration.cc b/src/mesh/model/dot11s/ie-dot11s-configuration.cc
index 716c43ae1..fddfd5ecf 100644
--- a/src/mesh/model/dot11s/ie-dot11s-configuration.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-configuration.cc
@@ -224,5 +224,5 @@ operator << (std::ostream &os, const IeConfiguration &a)
   return os;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-configuration.h b/src/mesh/model/dot11s/ie-dot11s-configuration.h
index 7f7af886b..8b532884f 100644
--- a/src/mesh/model/dot11s/ie-dot11s-configuration.h
+++ b/src/mesh/model/dot11s/ie-dot11s-configuration.h
@@ -138,5 +138,5 @@ bool operator== (const IeConfiguration & a, const IeConfiguration & b);
 bool operator== (const Dot11sMeshCapability & a, const Dot11sMeshCapability & b);
 std::ostream &operator << (std::ostream &os, const IeConfiguration &config);
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/ie-dot11s-id.cc b/src/mesh/model/dot11s/ie-dot11s-id.cc
index 2a5757fec..67bd4faaa 100644
--- a/src/mesh/model/dot11s/ie-dot11s-id.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-id.cc
@@ -154,5 +154,5 @@ std::istream &operator >> (std::istream &is, IeMeshId &a)
 ATTRIBUTE_HELPER_CPP (IeMeshId);
 
 
-} //namespace dot11s
+} // namespace dot11s
 } // namespace ns3
diff --git a/src/mesh/model/dot11s/ie-dot11s-id.h b/src/mesh/model/dot11s/ie-dot11s-id.h
index e5fd8694e..fa9ccdc76 100644
--- a/src/mesh/model/dot11s/ie-dot11s-id.h
+++ b/src/mesh/model/dot11s/ie-dot11s-id.h
@@ -66,6 +66,6 @@ std::ostream &operator << (std::ostream &os, const IeMeshId &meshId);
  */
 
 ATTRIBUTE_HELPER_HEADER (IeMeshId);
-} //namespace dot11s
+} // namespace dot11s
 } // namespace ns3
 #endif /* MESH_ID_H */
diff --git a/src/mesh/model/dot11s/ie-dot11s-metric-report.cc b/src/mesh/model/dot11s/ie-dot11s-metric-report.cc
index c9860a818..2632a0115 100644
--- a/src/mesh/model/dot11s/ie-dot11s-metric-report.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-metric-report.cc
@@ -91,5 +91,5 @@ operator << (std::ostream &os, const IeLinkMetricReport &a)
   a.Print (os);
   return os;
 }
-} //namespace dot11s
+} // namespace dot11s
 } // namespace ns3
diff --git a/src/mesh/model/dot11s/ie-dot11s-metric-report.h b/src/mesh/model/dot11s/ie-dot11s-metric-report.h
index 775342363..90a77be5a 100644
--- a/src/mesh/model/dot11s/ie-dot11s-metric-report.h
+++ b/src/mesh/model/dot11s/ie-dot11s-metric-report.h
@@ -59,6 +59,6 @@ bool operator== (const IeLinkMetricReport & a, const IeLinkMetricReport & b);
 bool operator>  (const IeLinkMetricReport & a, const IeLinkMetricReport & b);
 bool operator<  (const IeLinkMetricReport & a, const IeLinkMetricReport & b);
 std::ostream &operator << (std::ostream &os, const IeLinkMetricReport &linkMetricReport);
-} //namespace dot11s
+} // namespace dot11s
 } // namespace ns3
 #endif /* METRIC_REPORT_H */
diff --git a/src/mesh/model/dot11s/ie-dot11s-peer-management.cc b/src/mesh/model/dot11s/ie-dot11s-peer-management.cc
index 60e4f75b2..3d472c515 100644
--- a/src/mesh/model/dot11s/ie-dot11s-peer-management.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-peer-management.cc
@@ -172,5 +172,5 @@ operator << (std::ostream &os, const IePeerManagement &a)
   return os;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-peer-management.h b/src/mesh/model/dot11s/ie-dot11s-peer-management.h
index 493297417..ad048e73e 100644
--- a/src/mesh/model/dot11s/ie-dot11s-peer-management.h
+++ b/src/mesh/model/dot11s/ie-dot11s-peer-management.h
@@ -97,6 +97,6 @@ private:
 bool operator== (const IePeerManagement & a, const IePeerManagement & b);
 std::ostream &operator << (std::ostream &os, const IePeerManagement &peerMan);
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
 #endif /* IE_DOT11S_PEER_MANAGEMENT_H */
diff --git a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc
index 8f55c5bdb..fae240306 100644
--- a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc
@@ -61,5 +61,5 @@ operator << (std::ostream &os, const IePeeringProtocol &a)
   return os;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h
index 5d9e22f85..b08972c55 100644
--- a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h
+++ b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h
@@ -45,5 +45,5 @@ private:
   uint8_t m_protocol;
 };
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/ie-dot11s-perr.cc b/src/mesh/model/dot11s/ie-dot11s-perr.cc
index 3d251616d..e04f8c3cd 100644
--- a/src/mesh/model/dot11s/ie-dot11s-perr.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-perr.cc
@@ -160,6 +160,6 @@ operator << (std::ostream & os, const IePerr & a)
   return os;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-perr.h b/src/mesh/model/dot11s/ie-dot11s-perr.h
index 8d21d6671..c9c974aa4 100644
--- a/src/mesh/model/dot11s/ie-dot11s-perr.h
+++ b/src/mesh/model/dot11s/ie-dot11s-perr.h
@@ -59,5 +59,5 @@ private:
 bool operator== (const IePerr & a, const IePerr & b);
 std::ostream &operator << (std::ostream &os, const IePerr &perr);
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/ie-dot11s-prep.cc b/src/mesh/model/dot11s/ie-dot11s-prep.cc
index 530baaa25..e0fc34a4d 100644
--- a/src/mesh/model/dot11s/ie-dot11s-prep.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-prep.cc
@@ -211,5 +211,5 @@ operator << (std::ostream &os, const IePrep &a)
   return os;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-prep.h b/src/mesh/model/dot11s/ie-dot11s-prep.h
index c7e3f4e72..44c7cbfbc 100644
--- a/src/mesh/model/dot11s/ie-dot11s-prep.h
+++ b/src/mesh/model/dot11s/ie-dot11s-prep.h
@@ -82,6 +82,6 @@ private:
 bool operator== (const IePrep & a, const IePrep & b);
 std::ostream &operator << (std::ostream &os, const IePrep &prep);
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 #endif
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-preq.cc b/src/mesh/model/dot11s/ie-dot11s-preq.cc
index 781f25a77..0f32ee58d 100644
--- a/src/mesh/model/dot11s/ie-dot11s-preq.cc
+++ b/src/mesh/model/dot11s/ie-dot11s-preq.cc
@@ -441,5 +441,5 @@ operator << (std::ostream &os, const IePreq &a)
   return os;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-preq.h b/src/mesh/model/dot11s/ie-dot11s-preq.h
index d518779f2..dbbc705f1 100644
--- a/src/mesh/model/dot11s/ie-dot11s-preq.h
+++ b/src/mesh/model/dot11s/ie-dot11s-preq.h
@@ -155,6 +155,6 @@ bool operator== (const IePreq & a, const IePreq & b);
 std::ostream &operator << (std::ostream &os, const IePreq &preq);
 
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 #endif
 
diff --git a/src/mesh/model/dot11s/ie-dot11s-rann.h b/src/mesh/model/dot11s/ie-dot11s-rann.h
index ef2333a31..b16744ff4 100644
--- a/src/mesh/model/dot11s/ie-dot11s-rann.h
+++ b/src/mesh/model/dot11s/ie-dot11s-rann.h
@@ -73,6 +73,6 @@ private:
 bool operator== (const IeRann & a, const IeRann & b);
 std::ostream &operator << (std::ostream &os, const IeRann &rann);
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
 #endif
diff --git a/src/mesh/model/dot11s/peer-link-frame.cc b/src/mesh/model/dot11s/peer-link-frame.cc
index cf9e70709..a1e3bdf14 100644
--- a/src/mesh/model/dot11s/peer-link-frame.cc
+++ b/src/mesh/model/dot11s/peer-link-frame.cc
@@ -232,5 +232,5 @@ operator== (const PeerLinkFrameStart & a, const PeerLinkFrameStart & b)
           && (a.m_reasonCode == b.m_reasonCode));
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/peer-link-frame.h b/src/mesh/model/dot11s/peer-link-frame.h
index f94c32769..2cff59ad9 100644
--- a/src/mesh/model/dot11s/peer-link-frame.h
+++ b/src/mesh/model/dot11s/peer-link-frame.h
@@ -92,6 +92,6 @@ private:
 
 };
 bool operator== (const PeerLinkFrameStart & a, const PeerLinkFrameStart & b);
-} //namespace dot11s
-} //namespace ns3
+} // namespace dot11s
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/dot11s/peer-link.cc b/src/mesh/model/dot11s/peer-link.cc
index 6e3d6d043..6257dcbbe 100644
--- a/src/mesh/model/dot11s/peer-link.cc
+++ b/src/mesh/model/dot11s/peer-link.cc
@@ -702,5 +702,5 @@ PeerLink::Report (std::ostream & os) const
   "/>" << std::endl;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/peer-link.h b/src/mesh/model/dot11s/peer-link.h
index 3f3a3a052..c12a0adb4 100644
--- a/src/mesh/model/dot11s/peer-link.h
+++ b/src/mesh/model/dot11s/peer-link.h
@@ -259,6 +259,6 @@ private:
 };
 
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
 #endif /* PEER_LINK_H */
diff --git a/src/mesh/model/dot11s/peer-management-protocol-mac.cc b/src/mesh/model/dot11s/peer-management-protocol-mac.cc
index 135f04d9f..d3a541703 100644
--- a/src/mesh/model/dot11s/peer-management-protocol-mac.cc
+++ b/src/mesh/model/dot11s/peer-management-protocol-mac.cc
@@ -317,5 +317,5 @@ PeerManagementProtocolMac::GetLinkMetric (Mac48Address peerAddress)
   return m_parent->GetLinkMetric (peerAddress);
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/peer-management-protocol-mac.h b/src/mesh/model/dot11s/peer-management-protocol-mac.h
index 5dd40d041..a8f6f557d 100644
--- a/src/mesh/model/dot11s/peer-management-protocol-mac.h
+++ b/src/mesh/model/dot11s/peer-management-protocol-mac.h
@@ -130,7 +130,7 @@ private:
 };
 
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
 #endif /* PEER_MANAGEMENT_PROTOCOL_MAC_H */
 
diff --git a/src/mesh/model/dot11s/peer-management-protocol.cc b/src/mesh/model/dot11s/peer-management-protocol.cc
index 51f62b24a..e91e6275b 100644
--- a/src/mesh/model/dot11s/peer-management-protocol.cc
+++ b/src/mesh/model/dot11s/peer-management-protocol.cc
@@ -576,5 +576,5 @@ PeerManagementProtocol::GetBeaconCollisionAvoidance () const
   return m_enableBca;
 }
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/mesh/model/dot11s/peer-management-protocol.h b/src/mesh/model/dot11s/peer-management-protocol.h
index aef61a567..08983bcb3 100644
--- a/src/mesh/model/dot11s/peer-management-protocol.h
+++ b/src/mesh/model/dot11s/peer-management-protocol.h
@@ -262,5 +262,5 @@ private:
 };
 
 } // namespace dot11s
-} //namespace ns3
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/flame/flame-header.cc b/src/mesh/model/flame/flame-header.cc
index 8e49325b0..af7b48637 100644
--- a/src/mesh/model/flame/flame-header.cc
+++ b/src/mesh/model/flame/flame-header.cc
@@ -145,5 +145,5 @@ operator== (const FlameHeader & a, const FlameHeader & b)
                                                                                                  == b.m_origSrc) && (a.m_protocol == b.m_protocol));
 }
 
-} //namespace flame
+} // namespace flame
 } // namespace ns3
diff --git a/src/mesh/model/flame/flame-header.h b/src/mesh/model/flame/flame-header.h
index e1b34bd4d..b91e48458 100644
--- a/src/mesh/model/flame/flame-header.h
+++ b/src/mesh/model/flame/flame-header.h
@@ -75,6 +75,6 @@ private:
   friend bool operator== (const FlameHeader & a, const FlameHeader & b);
 };
 bool operator== (const FlameHeader & a, const FlameHeader & b);
-} //namespace flame
-} //namespace ns3
+} // namespace flame
+} // namespace ns3
 #endif /* FLAME_HEADER_H */
diff --git a/src/mesh/model/flame/flame-protocol-mac.cc b/src/mesh/model/flame/flame-protocol-mac.cc
index 37647f155..810661035 100644
--- a/src/mesh/model/flame/flame-protocol-mac.cc
+++ b/src/mesh/model/flame/flame-protocol-mac.cc
@@ -126,5 +126,5 @@ FlameProtocolMac::ResetStats ()
   m_stats = Statistics ();
 }
 
-} //namespace flame
-} //namespace ns3
+} // namespace flame
+} // namespace ns3
diff --git a/src/mesh/model/flame/flame-protocol-mac.h b/src/mesh/model/flame/flame-protocol-mac.h
index fc198a740..8c9d81c93 100644
--- a/src/mesh/model/flame/flame-protocol-mac.h
+++ b/src/mesh/model/flame/flame-protocol-mac.h
@@ -75,6 +75,6 @@ private:
   ///\}
 
 };
-} //namespace flame
-} //namespace ns3
+} // namespace flame
+} // namespace ns3
 #endif /* FLAME_PROTOCOL_MAC_H */
diff --git a/src/mesh/model/flame/flame-protocol.cc b/src/mesh/model/flame/flame-protocol.cc
index 23e70c3e4..e900a1973 100644
--- a/src/mesh/model/flame/flame-protocol.cc
+++ b/src/mesh/model/flame/flame-protocol.cc
@@ -383,5 +383,5 @@ FlameProtocol::ResetStats ()
     }
 }
 
-} //namespace flame
-} //namespace ns3
+} // namespace flame
+} // namespace ns3
diff --git a/src/mesh/model/flame/flame-protocol.h b/src/mesh/model/flame/flame-protocol.h
index bc1b59923..285a51d50 100644
--- a/src/mesh/model/flame/flame-protocol.h
+++ b/src/mesh/model/flame/flame-protocol.h
@@ -153,6 +153,6 @@ private:
   ///\}
 
 };
-} //namespace flame
-} //namespace ns3
+} // namespace flame
+} // namespace ns3
 #endif /* FLAME_PROTOCOL_H */
diff --git a/src/mesh/model/flame/flame-rtable.cc b/src/mesh/model/flame/flame-rtable.cc
index bc657aab4..92d585d92 100644
--- a/src/mesh/model/flame/flame-rtable.cc
+++ b/src/mesh/model/flame/flame-rtable.cc
@@ -109,5 +109,5 @@ FlameRtable::LookupResult::IsValid () const
            && seqnum == 0);
 }
 
-} //namespace flame
-} //namespace ns3
+} // namespace flame
+} // namespace ns3
diff --git a/src/mesh/model/flame/flame-rtable.h b/src/mesh/model/flame/flame-rtable.h
index e0c4dbcdb..8f44de9f8 100644
--- a/src/mesh/model/flame/flame-rtable.h
+++ b/src/mesh/model/flame/flame-rtable.h
@@ -101,6 +101,6 @@ private:
   std::map<Mac48Address, Route>  m_routes;
 };
 
-} //namespace flame
-} //namespace ns3
+} // namespace flame
+} // namespace ns3
 #endif /* FLAME_PROTOCOL_H */
diff --git a/src/mesh/model/mesh-information-element-vector.cc b/src/mesh/model/mesh-information-element-vector.cc
index b0eb53704..f89c767c8 100644
--- a/src/mesh/model/mesh-information-element-vector.cc
+++ b/src/mesh/model/mesh-information-element-vector.cc
@@ -92,4 +92,4 @@ MeshInformationElementVector::DeserializeSingleIe (Buffer::Iterator start)
 }
 
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/mesh/model/mesh-l2-routing-protocol.h b/src/mesh/model/mesh-l2-routing-protocol.h
index c707b96d7..bbd9ec43d 100644
--- a/src/mesh/model/mesh-l2-routing-protocol.h
+++ b/src/mesh/model/mesh-l2-routing-protocol.h
@@ -122,5 +122,5 @@ protected:
   /// Host mesh point
   Ptr<MeshPointDevice> m_mp;
 };
-} //namespace ns3
+} // namespace ns3
 #endif
diff --git a/src/mesh/model/mesh-point-device.h b/src/mesh/model/mesh-point-device.h
index 0b4b00d77..6fcb988f8 100644
--- a/src/mesh/model/mesh-point-device.h
+++ b/src/mesh/model/mesh-point-device.h
@@ -181,5 +181,5 @@ private:
   Statistics m_rxStats, m_txStats, m_fwdStats;
   ///\}
 };
-} //namespace ns3
+} // namespace ns3
 #endif
diff --git a/src/mesh/test/mesh-information-element-vector-test-suite.cc b/src/mesh/test/mesh-information-element-vector-test-suite.cc
index 8130558a3..c2025b559 100644
--- a/src/mesh/test/mesh-information-element-vector-test-suite.cc
+++ b/src/mesh/test/mesh-information-element-vector-test-suite.cc
@@ -156,4 +156,4 @@ MeshTestSuite::MeshTestSuite ()
 
 static MeshTestSuite g_meshTestSuite;
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/mobility/model/constant-acceleration-mobility-model.cc b/src/mobility/model/constant-acceleration-mobility-model.cc
index e11bc1021..6b123944a 100644
--- a/src/mobility/model/constant-acceleration-mobility-model.cc
+++ b/src/mobility/model/constant-acceleration-mobility-model.cc
@@ -78,4 +78,4 @@ ConstantAccelerationMobilityModel::SetVelocityAndAcceleration (const Vector &vel
 }
 
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/mobility/model/constant-acceleration-mobility-model.h b/src/mobility/model/constant-acceleration-mobility-model.h
index 52a4563b0..dc69e9971 100644
--- a/src/mobility/model/constant-acceleration-mobility-model.h
+++ b/src/mobility/model/constant-acceleration-mobility-model.h
@@ -51,6 +51,6 @@ private:
   Vector m_acceleration;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* CONSTANT_ACCELERATION_MOBILITY_MODEL_H */
diff --git a/src/mobility/model/constant-position-mobility-model.cc b/src/mobility/model/constant-position-mobility-model.cc
index 1c23ac58c..72a000a3b 100644
--- a/src/mobility/model/constant-position-mobility-model.cc
+++ b/src/mobility/model/constant-position-mobility-model.cc
@@ -57,4 +57,4 @@ ConstantPositionMobilityModel::DoGetVelocity (void) const
   return Vector (0.0, 0.0, 0.0);
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/mobility/model/constant-position-mobility-model.h b/src/mobility/model/constant-position-mobility-model.h
index a30495f5f..679d54464 100644
--- a/src/mobility/model/constant-position-mobility-model.h
+++ b/src/mobility/model/constant-position-mobility-model.h
@@ -47,6 +47,6 @@ private:
   Vector m_position;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* CONSTANT_POSITION_MOBILITY_MODEL_H */
diff --git a/src/mobility/model/constant-velocity-mobility-model.cc b/src/mobility/model/constant-velocity-mobility-model.cc
index 344cb6731..7a92bb00c 100644
--- a/src/mobility/model/constant-velocity-mobility-model.cc
+++ b/src/mobility/model/constant-velocity-mobility-model.cc
@@ -68,4 +68,4 @@ ConstantVelocityMobilityModel::DoGetVelocity (void) const
   return m_helper.GetVelocity ();
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/mobility/model/constant-velocity-mobility-model.h b/src/mobility/model/constant-velocity-mobility-model.h
index 353cf2362..260e09c3e 100644
--- a/src/mobility/model/constant-velocity-mobility-model.h
+++ b/src/mobility/model/constant-velocity-mobility-model.h
@@ -58,6 +58,6 @@ private:
   ConstantVelocityHelper m_helper;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* CONSTANT_VELOCITY_POSITION */
diff --git a/src/mobility/model/mobility-model.h b/src/mobility/model/mobility-model.h
index f8ca66d24..cd9423314 100644
--- a/src/mobility/model/mobility-model.h
+++ b/src/mobility/model/mobility-model.h
@@ -97,6 +97,6 @@ private:
 
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* MOBILITY_MODEL_H */
diff --git a/src/netanim/model/canvas-location.h b/src/netanim/model/canvas-location.h
index a03626b35..4ec10385a 100644
--- a/src/netanim/model/canvas-location.h
+++ b/src/netanim/model/canvas-location.h
@@ -59,6 +59,6 @@ private:
   Vector m_location;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* CANVAS_LOCATION_H */
diff --git a/src/network/model/application.cc b/src/network/model/application.cc
index ac7c7077d..7d2f38f35 100644
--- a/src/network/model/application.cc
+++ b/src/network/model/application.cc
@@ -115,6 +115,6 @@ void Application::StopApplication ()
 { // Provide null functionality in case subclass is not interested
 }
 
-} //namespace ns3
+} // namespace ns3
 
 
diff --git a/src/network/model/application.h b/src/network/model/application.h
index a9efd69c6..c9f6e61a3 100644
--- a/src/network/model/application.h
+++ b/src/network/model/application.h
@@ -130,6 +130,6 @@ protected:
   EventId m_stopEvent;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* APPLICATION_H */
diff --git a/src/network/model/channel-list.cc b/src/network/model/channel-list.cc
index c3cf34725..e71177478 100644
--- a/src/network/model/channel-list.cc
+++ b/src/network/model/channel-list.cc
@@ -185,4 +185,4 @@ ChannelList::GetNChannels (void)
   return ChannelListPriv::Get ()->GetNChannels ();
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/model/channel-list.h b/src/network/model/channel-list.h
index 9244fd2ae..31725cee4 100644
--- a/src/network/model/channel-list.h
+++ b/src/network/model/channel-list.h
@@ -69,6 +69,6 @@ public:
   static uint32_t GetNChannels (void);
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* CHANNEL_LIST_H */
diff --git a/src/network/model/node-list.cc b/src/network/model/node-list.cc
index 203b49fbb..5f65365d3 100644
--- a/src/network/model/node-list.cc
+++ b/src/network/model/node-list.cc
@@ -188,4 +188,4 @@ NodeList::GetNNodes (void)
   return NodeListPriv::Get ()->GetNNodes ();
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/model/node-list.h b/src/network/model/node-list.h
index 679d17980..65988c02a 100644
--- a/src/network/model/node-list.h
+++ b/src/network/model/node-list.h
@@ -71,7 +71,7 @@ public:
   static uint32_t GetNNodes (void);
 };
 
-} //namespace ns3
+} // namespace ns3
 
 
 #endif /* NODE_LIST_H */
diff --git a/src/network/model/node.cc b/src/network/model/node.cc
index 19244390d..89afdafb9 100644
--- a/src/network/model/node.cc
+++ b/src/network/model/node.cc
@@ -331,4 +331,4 @@ Node::NotifyDeviceAdded (Ptr<NetDevice> device)
 }
  
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/model/node.h b/src/network/model/node.h
index a67d70487..1afc3223c 100644
--- a/src/network/model/node.h
+++ b/src/network/model/node.h
@@ -237,6 +237,6 @@ private:
   DeviceAdditionListenerList m_deviceAdditionListeners;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* NODE_H */
diff --git a/src/network/model/packet-metadata.h b/src/network/model/packet-metadata.h
index 8bf17b566..547362d8f 100644
--- a/src/network/model/packet-metadata.h
+++ b/src/network/model/packet-metadata.h
@@ -351,7 +351,7 @@ public:
   uint64_t m_packetUid;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 namespace ns3 {
 
diff --git a/src/network/model/socket.cc b/src/network/model/socket.cc
index 0fb41104d..84927a3a5 100644
--- a/src/network/model/socket.cc
+++ b/src/network/model/socket.cc
@@ -503,4 +503,4 @@ SocketSetDontFragmentTag::Print (std::ostream &os) const
   os << (m_dontFragment ? "true" : "false");
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/model/socket.h b/src/network/model/socket.h
index 30ea808b0..0993d7997 100644
--- a/src/network/model/socket.h
+++ b/src/network/model/socket.h
@@ -686,6 +686,6 @@ private:
   bool m_dontFragment;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* NS3_SOCKET_H */
diff --git a/src/network/test/packet-metadata-test.cc b/src/network/test/packet-metadata-test.cc
index 655484666..4fd77466e 100644
--- a/src/network/test/packet-metadata-test.cc
+++ b/src/network/test/packet-metadata-test.cc
@@ -835,4 +835,4 @@ PacketMetadataTestSuite::PacketMetadataTestSuite ()
 }
 
 PacketMetadataTestSuite g_packetMetadataTest;
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/utils/data-rate.cc b/src/network/utils/data-rate.cc
index 8ecd06697..e1a976b78 100644
--- a/src/network/utils/data-rate.cc
+++ b/src/network/utils/data-rate.cc
@@ -271,4 +271,4 @@ double operator* (const Time& lhs, const DataRate& rhs)
   return lhs.GetSeconds ()*rhs.GetBitRate ();
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/utils/data-rate.h b/src/network/utils/data-rate.h
index 9d980da17..cc131c651 100644
--- a/src/network/utils/data-rate.h
+++ b/src/network/utils/data-rate.h
@@ -128,6 +128,6 @@ ATTRIBUTE_HELPER_HEADER (DataRate);
 double operator* (const DataRate& lhs, const Time& rhs);
 double operator* (const Time& lhs, const DataRate& rhs);
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* DATA_RATE_H */
diff --git a/src/network/utils/drop-tail-queue.h b/src/network/utils/drop-tail-queue.h
index c9c045088..93a020fca 100644
--- a/src/network/utils/drop-tail-queue.h
+++ b/src/network/utils/drop-tail-queue.h
@@ -81,6 +81,6 @@ private:
   Mode     m_mode;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* DROPTAIL_H */
diff --git a/src/network/utils/error-model.cc b/src/network/utils/error-model.cc
index 1c8d2d1ad..d53bd05e5 100644
--- a/src/network/utils/error-model.cc
+++ b/src/network/utils/error-model.cc
@@ -367,4 +367,4 @@ ReceiveListErrorModel::DoReset (void)
 }
 
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/utils/error-model.h b/src/network/utils/error-model.h
index 04f532054..919d1b97d 100644
--- a/src/network/utils/error-model.h
+++ b/src/network/utils/error-model.h
@@ -272,5 +272,5 @@ private:
 };
 
 
-} //namespace ns3
+} // namespace ns3
 #endif
diff --git a/src/network/utils/ethernet-header.h b/src/network/utils/ethernet-header.h
index 672eaa6c7..c3a6bdbcb 100644
--- a/src/network/utils/ethernet-header.h
+++ b/src/network/utils/ethernet-header.h
@@ -124,7 +124,7 @@ private:
   Mac48Address m_destination;   /// Destination address
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 
 #endif /* ETHERNET_HEADER_H */
diff --git a/src/network/utils/ethernet-trailer.cc b/src/network/utils/ethernet-trailer.cc
index 58c008570..9e6fb3f8f 100644
--- a/src/network/utils/ethernet-trailer.cc
+++ b/src/network/utils/ethernet-trailer.cc
@@ -159,4 +159,4 @@ EthernetTrailer::DoCalcFcs (uint8_t const *buffer, size_t len) const
   return ~crc;
 }
 
-}; // namespace ns3
+} // namespace ns3
diff --git a/src/network/utils/ipv4-address.cc b/src/network/utils/ipv4-address.cc
index 00c92ae70..3ca499cc9 100644
--- a/src/network/utils/ipv4-address.cc
+++ b/src/network/utils/ipv4-address.cc
@@ -55,7 +55,7 @@ AsciiToIpv4Host (char const *address)
   return host;
 }
 
-} //namespace ns3
+} // namespace ns3
 
 namespace ns3 {
 
diff --git a/src/network/utils/output-stream-wrapper.cc b/src/network/utils/output-stream-wrapper.cc
index 5b2ff88a7..ef1914973 100644
--- a/src/network/utils/output-stream-wrapper.cc
+++ b/src/network/utils/output-stream-wrapper.cc
@@ -57,4 +57,4 @@ OutputStreamWrapper::GetStream (void)
   return m_ostream;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/utils/output-stream-wrapper.h b/src/network/utils/output-stream-wrapper.h
index 372501417..c1a966d1c 100644
--- a/src/network/utils/output-stream-wrapper.h
+++ b/src/network/utils/output-stream-wrapper.h
@@ -88,6 +88,6 @@ private:
   bool m_destroyable;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* OUTPUT_STREAM_WRAPPER_H */
diff --git a/src/network/utils/packet-socket.cc b/src/network/utils/packet-socket.cc
index 6076ed447..9f5acc2b5 100644
--- a/src/network/utils/packet-socket.cc
+++ b/src/network/utils/packet-socket.cc
@@ -488,4 +488,4 @@ PacketSocket::GetAllowBroadcast () const
   return false;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/utils/packet-socket.h b/src/network/utils/packet-socket.h
index ba65e98e3..a2aea47fb 100644
--- a/src/network/utils/packet-socket.h
+++ b/src/network/utils/packet-socket.h
@@ -140,7 +140,7 @@ private:
 
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* PACKET_SOCKET_H */
 
diff --git a/src/network/utils/pcap-file-wrapper.cc b/src/network/utils/pcap-file-wrapper.cc
index d0721683a..9c42ee34b 100644
--- a/src/network/utils/pcap-file-wrapper.cc
+++ b/src/network/utils/pcap-file-wrapper.cc
@@ -172,4 +172,4 @@ PcapFileWrapper::GetDataLinkType (void)
   return m_file.GetDataLinkType ();
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/utils/pcap-file-wrapper.h b/src/network/utils/pcap-file-wrapper.h
index 9a58ccdd5..f1cbff047 100644
--- a/src/network/utils/pcap-file-wrapper.h
+++ b/src/network/utils/pcap-file-wrapper.h
@@ -199,6 +199,6 @@ private:
   uint32_t m_snapLen;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* PCAP_FILE_WRAPPER_H */
diff --git a/src/network/utils/pcap-file.cc b/src/network/utils/pcap-file.cc
index 8ba6b76d9..a1a040d5c 100644
--- a/src/network/utils/pcap-file.cc
+++ b/src/network/utils/pcap-file.cc
@@ -534,4 +534,4 @@ PcapFile::Diff (std::string const & f1, std::string const & f2,
   return diff;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/network/utils/pcap-file.h b/src/network/utils/pcap-file.h
index 37d4f984d..7993af04f 100644
--- a/src/network/utils/pcap-file.h
+++ b/src/network/utils/pcap-file.h
@@ -292,6 +292,6 @@ private:
   bool m_swapMode;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* PCAP_FILE_H */
diff --git a/src/network/utils/queue.h b/src/network/utils/queue.h
index 753e2c229..824722c81 100644
--- a/src/network/utils/queue.h
+++ b/src/network/utils/queue.h
@@ -162,6 +162,6 @@ private:
   uint32_t m_nTotalDroppedPackets;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* QUEUE_H */
diff --git a/src/olsr/model/olsr-repositories.h b/src/olsr/model/olsr-repositories.h
index 80a98990b..72d4268ef 100644
--- a/src/olsr/model/olsr-repositories.h
+++ b/src/olsr/model/olsr-repositories.h
@@ -299,6 +299,6 @@ namespace ns3 { namespace olsr {
                 typedef std::vector<Association>                Associations; ///< Association Set type.
 
 
-                }}; // namespace ns3, olsr
+                }} // namespace ns3, olsr
 
 #endif /* OLSR_REPOSITORIES_H */
diff --git a/src/point-to-point/model/ppp-header.h b/src/point-to-point/model/ppp-header.h
index e43f87b1f..e1c298ffe 100644
--- a/src/point-to-point/model/ppp-header.h
+++ b/src/point-to-point/model/ppp-header.h
@@ -92,7 +92,7 @@ private:
   uint16_t m_protocol;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 
 #endif /* PPP_HEADER_H */
diff --git a/src/spectrum/model/microwave-oven-spectrum-value-helper.cc b/src/spectrum/model/microwave-oven-spectrum-value-helper.cc
index 414ba0995..10f24faab 100644
--- a/src/spectrum/model/microwave-oven-spectrum-value-helper.cc
+++ b/src/spectrum/model/microwave-oven-spectrum-value-helper.cc
@@ -162,4 +162,4 @@ MicrowaveOvenSpectrumValueHelper::CreatePowerSpectralDensityMwo2 ()
 
 
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/spectrum/model/microwave-oven-spectrum-value-helper.h b/src/spectrum/model/microwave-oven-spectrum-value-helper.h
index e2398d6b4..d925734f7 100644
--- a/src/spectrum/model/microwave-oven-spectrum-value-helper.h
+++ b/src/spectrum/model/microwave-oven-spectrum-value-helper.h
@@ -61,7 +61,7 @@ public:
 
 
 
-} //namespace ns3
+} // namespace ns3
 
 
 
diff --git a/src/spectrum/model/wifi-spectrum-value-helper.cc b/src/spectrum/model/wifi-spectrum-value-helper.cc
index 410aae177..b665606c6 100644
--- a/src/spectrum/model/wifi-spectrum-value-helper.cc
+++ b/src/spectrum/model/wifi-spectrum-value-helper.cc
@@ -114,4 +114,4 @@ WifiSpectrumValue5MhzFactory::CreateRfFilter (uint32_t channel)
 }
 
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/spectrum/model/wifi-spectrum-value-helper.h b/src/spectrum/model/wifi-spectrum-value-helper.h
index e676933a6..4cc260dee 100644
--- a/src/spectrum/model/wifi-spectrum-value-helper.h
+++ b/src/spectrum/model/wifi-spectrum-value-helper.h
@@ -92,7 +92,7 @@ public:
 
 
 
-} //namespace ns3
+} // namespace ns3
 
 
 
diff --git a/src/tools/model/event-garbage-collector.h b/src/tools/model/event-garbage-collector.h
index ca19e74a0..5d4670122 100644
--- a/src/tools/model/event-garbage-collector.h
+++ b/src/tools/model/event-garbage-collector.h
@@ -68,6 +68,6 @@ private:
   void Shrink ();
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif /* EVENT_GARBAGE_COLLECTOR_H */
diff --git a/src/uan/model/uan-noise-model.cc b/src/uan/model/uan-noise-model.cc
index ea5577528..27ef21920 100644
--- a/src/uan/model/uan-noise-model.cc
+++ b/src/uan/model/uan-noise-model.cc
@@ -36,4 +36,4 @@ UanNoiseModel::DoDispose (void)
 
 
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/uan/model/uan-phy.cc b/src/uan/model/uan-phy.cc
index be5befe30..e7c85dcc3 100644
--- a/src/uan/model/uan-phy.cc
+++ b/src/uan/model/uan-phy.cc
@@ -46,4 +46,4 @@ UanPhyPer::DoDispose ()
   Object::DoDispose ();
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/virtual-net-device/model/virtual-net-device.h b/src/virtual-net-device/model/virtual-net-device.h
index e9a7a6439..9b8ef6a7a 100644
--- a/src/virtual-net-device/model/virtual-net-device.h
+++ b/src/virtual-net-device/model/virtual-net-device.h
@@ -170,7 +170,7 @@ private:
   bool m_isPointToPoint;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 #endif
 
diff --git a/src/wifi/helper/nqos-wifi-mac-helper.cc b/src/wifi/helper/nqos-wifi-mac-helper.cc
index 8e6d1949a..0afd5a8ad 100644
--- a/src/wifi/helper/nqos-wifi-mac-helper.cc
+++ b/src/wifi/helper/nqos-wifi-mac-helper.cc
@@ -75,4 +75,4 @@ NqosWifiMacHelper::Create (void) const
   return mac;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/helper/nqos-wifi-mac-helper.h b/src/wifi/helper/nqos-wifi-mac-helper.h
index 185d8435f..2c00dd268 100644
--- a/src/wifi/helper/nqos-wifi-mac-helper.h
+++ b/src/wifi/helper/nqos-wifi-mac-helper.h
@@ -93,6 +93,6 @@ private:
   ObjectFactory m_mac;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* NQOS_WIFI_MAC_HELPER_H */
diff --git a/src/wifi/helper/qos-wifi-mac-helper.cc b/src/wifi/helper/qos-wifi-mac-helper.cc
index 38a3db6b1..8df5247b5 100644
--- a/src/wifi/helper/qos-wifi-mac-helper.cc
+++ b/src/wifi/helper/qos-wifi-mac-helper.cc
@@ -150,4 +150,4 @@ QosWifiMacHelper::Create (void) const
   return mac;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/helper/qos-wifi-mac-helper.h b/src/wifi/helper/qos-wifi-mac-helper.h
index a9ded97e2..c00b9b448 100644
--- a/src/wifi/helper/qos-wifi-mac-helper.h
+++ b/src/wifi/helper/qos-wifi-mac-helper.h
@@ -152,6 +152,6 @@ private:
   std::map<AcIndex, uint16_t> m_bAckInactivityTimeouts;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* QOS_WIFI_MAC_HELPER_H */
diff --git a/src/wifi/model/amsdu-subframe-header.cc b/src/wifi/model/amsdu-subframe-header.cc
index eefe8615f..e7c65a568 100644
--- a/src/wifi/model/amsdu-subframe-header.cc
+++ b/src/wifi/model/amsdu-subframe-header.cc
@@ -115,4 +115,4 @@ AmsduSubframeHeader::GetLength (void) const
   return m_length;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/amsdu-subframe-header.h b/src/wifi/model/amsdu-subframe-header.h
index 74c5041e4..d0baec94e 100644
--- a/src/wifi/model/amsdu-subframe-header.h
+++ b/src/wifi/model/amsdu-subframe-header.h
@@ -56,6 +56,6 @@ private:
   uint16_t m_length;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* AMSDU_SUBFRAME_HEADER_H */
diff --git a/src/wifi/model/block-ack-agreement.cc b/src/wifi/model/block-ack-agreement.cc
index f818c75cc..e85726059 100644
--- a/src/wifi/model/block-ack-agreement.cc
+++ b/src/wifi/model/block-ack-agreement.cc
@@ -118,4 +118,4 @@ BlockAckAgreement::IsAmsduSupported (void) const
   return (m_amsduSupported == 1) ? true : false;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/block-ack-agreement.h b/src/wifi/model/block-ack-agreement.h
index e77c5f2d7..0becac294 100644
--- a/src/wifi/model/block-ack-agreement.h
+++ b/src/wifi/model/block-ack-agreement.h
@@ -63,6 +63,6 @@ protected:
   EventId m_inactivityEvent;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* BLOCK_ACK_AGREEMENT_H */
diff --git a/src/wifi/model/block-ack-cache.cc b/src/wifi/model/block-ack-cache.cc
index cbd63d79b..bc8a45c4f 100644
--- a/src/wifi/model/block-ack-cache.cc
+++ b/src/wifi/model/block-ack-cache.cc
@@ -131,4 +131,4 @@ BlockAckCache::FillBlockAckBitmap (CtrlBAckResponseHeader *blockAckHeader)
     }
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/block-ack-cache.h b/src/wifi/model/block-ack-cache.h
index 780109e48..c16acfd26 100644
--- a/src/wifi/model/block-ack-cache.h
+++ b/src/wifi/model/block-ack-cache.h
@@ -52,6 +52,6 @@ private:
   uint16_t m_bitmap[4096];
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* BLOCK_ACK_CACHE_H */
diff --git a/src/wifi/model/block-ack-manager.cc b/src/wifi/model/block-ack-manager.cc
index fc5794bbc..8333361d8 100644
--- a/src/wifi/model/block-ack-manager.cc
+++ b/src/wifi/model/block-ack-manager.cc
@@ -649,4 +649,4 @@ BlockAckManager::GetSeqNumOfNextRetryPacket (Mac48Address recipient, uint8_t tid
   return 4096;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h
index 5c851d966..0f1161950 100644
--- a/src/wifi/model/block-ack-manager.h
+++ b/src/wifi/model/block-ack-manager.h
@@ -315,6 +315,6 @@ private:
   Callback<void, Mac48Address, uint8_t> m_unblockPackets;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* BLOCK_ACK_MANAGER_H */
diff --git a/src/wifi/model/ctrl-headers.cc b/src/wifi/model/ctrl-headers.cc
index 0be04f9e5..11552e8c6 100644
--- a/src/wifi/model/ctrl-headers.cc
+++ b/src/wifi/model/ctrl-headers.cc
@@ -726,4 +726,4 @@ CtrlBAckResponseHeader::ResetBitmap (void)
   memset (&bitmap, 0, sizeof (bitmap));
 }
 
-}  //namespace ns3
+}  // namespace ns3
diff --git a/src/wifi/model/ctrl-headers.h b/src/wifi/model/ctrl-headers.h
index 5f2ad256d..6cddf9aaa 100644
--- a/src/wifi/model/ctrl-headers.h
+++ b/src/wifi/model/ctrl-headers.h
@@ -186,6 +186,6 @@ private:
   } bitmap;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* CTRL_HEADERS_H */
diff --git a/src/wifi/model/dca-txop.h b/src/wifi/model/dca-txop.h
index 24dbff7e8..d3c9559a0 100644
--- a/src/wifi/model/dca-txop.h
+++ b/src/wifi/model/dca-txop.h
@@ -170,7 +170,7 @@ private:
   uint8_t m_fragmentNumber;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 
 
diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc
index 464cc187b..0d270b8d9 100644
--- a/src/wifi/model/edca-txop-n.cc
+++ b/src/wifi/model/edca-txop-n.cc
@@ -1111,4 +1111,4 @@ EdcaTxopN::DoStart ()
   m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
   ns3::Dcf::DoStart ();
 }
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/edca-txop-n.h b/src/wifi/model/edca-txop-n.h
index c3309bd56..0cc5b2c05 100644
--- a/src/wifi/model/edca-txop-n.h
+++ b/src/wifi/model/edca-txop-n.h
@@ -227,6 +227,6 @@ private:
   struct Bar m_currentBar;
 };
 
-}  //namespace ns3
+}  // namespace ns3
 
 #endif /* EDCA_TXOP_N_H */
diff --git a/src/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc
index ec0314901..42071084d 100644
--- a/src/wifi/model/minstrel-wifi-manager.cc
+++ b/src/wifi/model/minstrel-wifi-manager.cc
@@ -787,7 +787,7 @@ MinstrelWifiManager::PrintTable (MinstrelWifiRemoteStation *station)
     }
 }
 
-} //namespace ns3
+} // namespace ns3
 
 
 
diff --git a/src/wifi/model/msdu-aggregator.cc b/src/wifi/model/msdu-aggregator.cc
index a79074bab..fb5eb2446 100644
--- a/src/wifi/model/msdu-aggregator.cc
+++ b/src/wifi/model/msdu-aggregator.cc
@@ -73,4 +73,4 @@ MsduAggregator::Deaggregate (Ptr<Packet> aggregatedPacket)
   return set;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/msdu-aggregator.h b/src/wifi/model/msdu-aggregator.h
index 9932985d4..12d04a1ff 100644
--- a/src/wifi/model/msdu-aggregator.h
+++ b/src/wifi/model/msdu-aggregator.h
@@ -53,6 +53,6 @@ public:
   static DeaggregatedMsdus Deaggregate (Ptr<Packet> aggregatedPacket);
 };
 
-}  //namespace ns3
+}  // namespace ns3
 
 #endif /* MSDU_AGGREGATOR_H */
diff --git a/src/wifi/model/msdu-standard-aggregator.cc b/src/wifi/model/msdu-standard-aggregator.cc
index 6780aa493..c77516506 100644
--- a/src/wifi/model/msdu-standard-aggregator.cc
+++ b/src/wifi/model/msdu-standard-aggregator.cc
@@ -87,4 +87,4 @@ MsduStandardAggregator::CalculatePadding (Ptr<const Packet> packet)
   return (4 - (packet->GetSize () % 4 )) % 4;
 }
 
-}  //namespace ns3
+}  // namespace ns3
diff --git a/src/wifi/model/msdu-standard-aggregator.h b/src/wifi/model/msdu-standard-aggregator.h
index 6d5b3562d..05a5ce350 100644
--- a/src/wifi/model/msdu-standard-aggregator.h
+++ b/src/wifi/model/msdu-standard-aggregator.h
@@ -56,6 +56,6 @@ private:
   uint32_t m_maxAmsduLength;
 };
 
-}  //namespace ns3
+}  // namespace ns3
 
 #endif /* MSDU_STANDARD_AGGREGATOR_H */
diff --git a/src/wifi/model/originator-block-ack-agreement.cc b/src/wifi/model/originator-block-ack-agreement.cc
index 593dae1fa..4fedcddbf 100644
--- a/src/wifi/model/originator-block-ack-agreement.cc
+++ b/src/wifi/model/originator-block-ack-agreement.cc
@@ -93,4 +93,4 @@ OriginatorBlockAckAgreement::CompleteExchange (void)
   m_sentMpdus = 0;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/originator-block-ack-agreement.h b/src/wifi/model/originator-block-ack-agreement.h
index fc2aea55b..417f8304c 100644
--- a/src/wifi/model/originator-block-ack-agreement.h
+++ b/src/wifi/model/originator-block-ack-agreement.h
@@ -115,6 +115,6 @@ private:
   bool m_needBlockAckReq;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* ORIGINATOR_BLOCK_ACK_AGREEMENT_H */
diff --git a/src/wifi/model/qos-blocked-destinations.cc b/src/wifi/model/qos-blocked-destinations.cc
index 02b39b3ac..7778d9336 100644
--- a/src/wifi/model/qos-blocked-destinations.cc
+++ b/src/wifi/model/qos-blocked-destinations.cc
@@ -65,4 +65,4 @@ QosBlockedDestinations::Unblock (Mac48Address dest, uint8_t tid)
     }
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/qos-blocked-destinations.h b/src/wifi/model/qos-blocked-destinations.h
index 183efc0db..eed99d378 100644
--- a/src/wifi/model/qos-blocked-destinations.h
+++ b/src/wifi/model/qos-blocked-destinations.h
@@ -43,6 +43,6 @@ private:
   BlockedPackets m_blockedQosPackets;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* QOS_BLOCKED_DESTINATIONS_H */
diff --git a/src/wifi/model/qos-tag.cc b/src/wifi/model/qos-tag.cc
index 256f5e206..bbc2a4125 100644
--- a/src/wifi/model/qos-tag.cc
+++ b/src/wifi/model/qos-tag.cc
@@ -96,4 +96,4 @@ QosTag::Print (std::ostream &os) const
   os << "Tid=" << m_tid;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/qos-tag.h b/src/wifi/model/qos-tag.h
index ed808f8a4..46ec01c22 100644
--- a/src/wifi/model/qos-tag.h
+++ b/src/wifi/model/qos-tag.h
@@ -106,6 +106,6 @@ private:
   uint8_t m_tid;
 };
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* QOS_TAG_H */
diff --git a/src/wifi/model/qos-utils.cc b/src/wifi/model/qos-utils.cc
index 305611263..b444f11bb 100644
--- a/src/wifi/model/qos-utils.cc
+++ b/src/wifi/model/qos-utils.cc
@@ -91,4 +91,4 @@ QosUtilsIsOldPacket (uint16_t startingSeq, uint16_t seqNumber)
   return (distance >= 2048);
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/model/qos-utils.h b/src/wifi/model/qos-utils.h
index dc02d3c72..b689ff718 100644
--- a/src/wifi/model/qos-utils.h
+++ b/src/wifi/model/qos-utils.h
@@ -106,6 +106,6 @@ uint32_t QosUtilsMapSeqControlToUniqueInteger (uint16_t seqControl, uint16_t end
  */
 bool QosUtilsIsOldPacket (uint16_t startingSeq, uint16_t seqNumber);
 
-} //namespace ns3
+} // namespace ns3
 
 #endif /* QOS_UTILS_H */
diff --git a/src/wifi/model/wifi-information-element-vector.cc b/src/wifi/model/wifi-information-element-vector.cc
index 3547cf77a..4e6aba20e 100644
--- a/src/wifi/model/wifi-information-element-vector.cc
+++ b/src/wifi/model/wifi-information-element-vector.cc
@@ -190,4 +190,4 @@ WifiInformationElementVector::operator== (const WifiInformationElementVector & a
   return true;
 }
 
-} //namespace ns3
+} // namespace ns3
diff --git a/src/wifi/test/tx-duration-test.cc b/src/wifi/test/tx-duration-test.cc
index 6a7f5e9d9..1cc2e7e19 100644
--- a/src/wifi/test/tx-duration-test.cc
+++ b/src/wifi/test/tx-duration-test.cc
@@ -192,5 +192,5 @@ TxDurationTestSuite::TxDurationTestSuite ()
 }
 
 static TxDurationTestSuite g_txDurationTestSuite;
-} //namespace ns3
+} // namespace ns3
 
diff --git a/src/wimax/model/connection-manager.h b/src/wimax/model/connection-manager.h
index 469807b9b..9153ff2c8 100644
--- a/src/wimax/model/connection-manager.h
+++ b/src/wimax/model/connection-manager.h
@@ -87,8 +87,7 @@ private:
   CidFactory *m_cidFactory;
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* CONNECTION_MANAGER_H */
 
diff --git a/src/wimax/model/dl-mac-messages.cc b/src/wimax/model/dl-mac-messages.cc
index b109d9143..ae0fd6d51 100644
--- a/src/wimax/model/dl-mac-messages.cc
+++ b/src/wimax/model/dl-mac-messages.cc
@@ -676,6 +676,5 @@ DlMap::Deserialize (Buffer::Iterator start)
   return i.GetDistanceFrom (start);
 }
 
-}
-; // namespace ns3
+} // namespace ns3
 
diff --git a/src/wimax/model/dl-mac-messages.h b/src/wimax/model/dl-mac-messages.h
index 38cf85bb7..2982ceacc 100644
--- a/src/wimax/model/dl-mac-messages.h
+++ b/src/wimax/model/dl-mac-messages.h
@@ -64,8 +64,7 @@ private:
 
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* DCD_CHANNEL_ENCODINGS_H */
 
@@ -123,8 +122,7 @@ private:
   uint32_t m_frameNumber;
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* OFDM_DCD_CHANNEL_ENCODINGS_H */
 
@@ -194,8 +192,7 @@ private:
   uint8_t m_fecCodeType;
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* OFDM_DL_BURST_PROFILE_H */
 
@@ -248,8 +245,7 @@ private:
   uint8_t m_nrDlBurstProfiles;
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* DCD_H */
 
@@ -297,8 +293,7 @@ private:
 
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* OFDM_DL_MAP_IE_H */
 
@@ -349,7 +344,6 @@ private:
   // m_paddingNibble; //fields to be implemented later on:
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* DL_MAP_H */
diff --git a/src/wimax/model/ipcs-classifier-record.cc b/src/wimax/model/ipcs-classifier-record.cc
index df4c4ca3a..e7774e15e 100644
--- a/src/wimax/model/ipcs-classifier-record.cc
+++ b/src/wimax/model/ipcs-classifier-record.cc
@@ -349,5 +349,4 @@ IpcsClassifierRecord::ToTlv (void) const
   return tmp_tlv;
 }
 
-}
-; // namespace ns3
+} // namespace ns3
diff --git a/src/wimax/model/ipcs-classifier-record.h b/src/wimax/model/ipcs-classifier-record.h
index 071cef42b..850064905 100644
--- a/src/wimax/model/ipcs-classifier-record.h
+++ b/src/wimax/model/ipcs-classifier-record.h
@@ -165,7 +165,6 @@ private:
 
   uint16_t m_cid;
 };
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* IPCS_CLASSIFIER_RECORD_H */
diff --git a/src/wimax/model/ipcs-classifier.h b/src/wimax/model/ipcs-classifier.h
index 2ad52e122..37bdf6d2b 100644
--- a/src/wimax/model/ipcs-classifier.h
+++ b/src/wimax/model/ipcs-classifier.h
@@ -48,7 +48,6 @@ public:
    */
   ServiceFlow * Classify (Ptr<const Packet> packet, Ptr<ServiceFlowManager> sfm, ServiceFlow::Direction dir);
 };
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* IPCS_CLASSIFIER_H */
diff --git a/src/wimax/model/mac-messages.h b/src/wimax/model/mac-messages.h
index 876ddb4ac..cfc453f5a 100644
--- a/src/wimax/model/mac-messages.h
+++ b/src/wimax/model/mac-messages.h
@@ -76,8 +76,7 @@ private:
   uint8_t m_type;
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* MANAGEMENT_MESSAGE_TYPE_H */
 
diff --git a/src/wimax/model/ofdm-downlink-frame-prefix.cc b/src/wimax/model/ofdm-downlink-frame-prefix.cc
index 98fe7d147..ccfeb7d31 100644
--- a/src/wimax/model/ofdm-downlink-frame-prefix.cc
+++ b/src/wimax/model/ofdm-downlink-frame-prefix.cc
@@ -279,6 +279,5 @@ OfdmDownlinkFramePrefix::Deserialize (Buffer::Iterator start)
   return GetSerializedSize ();
 }
 
-}
-; // namespace ns3
+} // namespace ns3
 
diff --git a/src/wimax/model/ofdm-downlink-frame-prefix.h b/src/wimax/model/ofdm-downlink-frame-prefix.h
index c27b5cff9..dce9171a6 100644
--- a/src/wimax/model/ofdm-downlink-frame-prefix.h
+++ b/src/wimax/model/ofdm-downlink-frame-prefix.h
@@ -64,8 +64,7 @@ private:
 
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* DL_FRAME_PREFIX_IE_H */
 
@@ -109,7 +108,6 @@ private:
   uint8_t m_hcs; // Header Check Sequence
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* OFDM_DOWNLINK_FRAME_PREFIX_H */
diff --git a/src/wimax/model/ul-job.cc b/src/wimax/model/ul-job.cc
index db0b9105d..4584a7e5e 100644
--- a/src/wimax/model/ul-job.cc
+++ b/src/wimax/model/ul-job.cc
@@ -164,5 +164,4 @@ PriorityUlJob::SetUlJob (Ptr<UlJob> job)
   m_job = job;
 }
 
-}
-; // namespace ns3
+} // namespace ns3
diff --git a/src/wimax/model/ul-mac-messages.cc b/src/wimax/model/ul-mac-messages.cc
index a22d89b7a..fae6080a7 100644
--- a/src/wimax/model/ul-mac-messages.cc
+++ b/src/wimax/model/ul-mac-messages.cc
@@ -711,5 +711,4 @@ UlMap::Deserialize (Buffer::Iterator start)
   return i.GetDistanceFrom (start);
 }
 
-}
-; // namespace ns3
+} // namespace ns3
diff --git a/src/wimax/model/wimax-mac-header.cc b/src/wimax/model/wimax-mac-header.cc
index 77a8155b2..afa1602c7 100644
--- a/src/wimax/model/wimax-mac-header.cc
+++ b/src/wimax/model/wimax-mac-header.cc
@@ -657,5 +657,4 @@ FragmentationSubheader::Deserialize (Buffer::Iterator start)
   return i.GetDistanceFrom (start);
 }
 
-}
-; // namespace ns3
+} // namespace ns3
diff --git a/src/wimax/model/wimax-mac-header.h b/src/wimax/model/wimax-mac-header.h
index e2202f09d..9a587ef11 100644
--- a/src/wimax/model/wimax-mac-header.h
+++ b/src/wimax/model/wimax-mac-header.h
@@ -61,8 +61,7 @@ private:
   uint8_t m_type;
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* MAC_HEADER_TYPE_H */
 
@@ -129,8 +128,7 @@ private:
 
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* GENERIC_MAC_HEADER */
 
@@ -193,8 +191,7 @@ private:
 
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* BANDWIDTH_REQUEST_HEADER_H */
 
@@ -244,8 +241,7 @@ private:
   uint16_t m_pbr; // PiggyBack Request
 };
 
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* GRANT_MANAGEMENT_SUBHEADER_H */
 
@@ -289,7 +285,6 @@ private:
   uint8_t m_fc;  // Fragment Control
   uint8_t m_fsn; // Fragment Sequence Number
 };
-}
-; // namespace ns3
+} // namespace ns3
 
 #endif /* FRAGMENTATION_SUBHEADER_H */