diff --git a/src/adjacency-list.cpp b/src/adjacency-list.cpp
index 20a6942..85d0ff8 100644
--- a/src/adjacency-list.cpp
+++ b/src/adjacency-list.cpp
@@ -292,4 +292,4 @@
   }
 }
 
-} //namespace nlsr
+} // namespace nlsr
diff --git a/src/adjacency-list.hpp b/src/adjacency-list.hpp
index dc12b17..8f7864b 100644
--- a/src/adjacency-list.hpp
+++ b/src/adjacency-list.hpp
@@ -131,5 +131,5 @@
   std::list<Adjacent> m_adjList;
 };
 
-} //namespace nlsr
+} // namespace nlsr
 #endif //NLSR_ADJACENCY_LIST_HPP
diff --git a/src/adjacent.cpp b/src/adjacent.cpp
index 7f66614..f5234f2 100644
--- a/src/adjacent.cpp
+++ b/src/adjacent.cpp
@@ -88,4 +88,4 @@
   _LOG_DEBUG("Interest Timed out: " << m_interestTimedOutNo);
 }
 
-} //namespace nlsr
+} // namespace nlsr
diff --git a/src/communication/sync-logic-handler.cpp b/src/communication/sync-logic-handler.cpp
index b211442..a3663c7 100644
--- a/src/communication/sync-logic-handler.cpp
+++ b/src/communication/sync-logic-handler.cpp
@@ -302,4 +302,4 @@
   m_syncSocket->publishData(updateName.toUri(), 0, data.c_str(), data.size(), 1000, seqNo);
 }
 
-}//namespace nlsr
+} // namespace nlsr
diff --git a/src/communication/sync-logic-handler.hpp b/src/communication/sync-logic-handler.hpp
index 83d4060..b182a4b 100644
--- a/src/communication/sync-logic-handler.hpp
+++ b/src/communication/sync-logic-handler.hpp
@@ -104,6 +104,6 @@
 
 };
 
-} //namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_SYNC_LOGIC_HANDLER_HPP
diff --git a/src/conf-file-processor.hpp b/src/conf-file-processor.hpp
index 790f436..ab3b9d6 100644
--- a/src/conf-file-processor.hpp
+++ b/src/conf-file-processor.hpp
@@ -76,5 +76,5 @@
   Nlsr& m_nlsr;
 };
 
-} //namespace nlsr
+} // namespace nlsr
 #endif //CONF_PROCESSOR_HPP
diff --git a/src/hello-protocol.cpp b/src/hello-protocol.cpp
index 6c8635a..fc03bc3 100644
--- a/src/hello-protocol.cpp
+++ b/src/hello-protocol.cpp
@@ -274,4 +274,4 @@
   }
 }
 
-} //namespace nlsr
+} // namespace nlsr
diff --git a/src/hello-protocol.hpp b/src/hello-protocol.hpp
index a37bb2e..e22d0e7 100644
--- a/src/hello-protocol.hpp
+++ b/src/hello-protocol.hpp
@@ -88,6 +88,6 @@
   static const std::string NLSR_COMPONENT;
 };
 
-} //namespace nlsr
+} // namespace nlsr
 
 #endif // NLSR_HELLO_PROTOCOL_HPP
diff --git a/src/lsa.hpp b/src/lsa.hpp
index 5623ca8..313b781 100644
--- a/src/lsa.hpp
+++ b/src/lsa.hpp
@@ -296,6 +296,6 @@
 std::ostream&
 operator<<(std::ostream& os, const AdjLsa& adjLsa);
 
-}//namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_LSA_HPP
diff --git a/src/lsdb.hpp b/src/lsdb.hpp
index eac7770..9060ba0 100644
--- a/src/lsdb.hpp
+++ b/src/lsdb.hpp
@@ -288,6 +288,6 @@
   ndn::time::seconds m_adjLsaBuildInterval;
 };
 
-}//namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_LSDB_HPP
diff --git a/src/name-prefix-list.cpp b/src/name-prefix-list.cpp
index e5d8394..8afdbf1 100644
--- a/src/name-prefix-list.cpp
+++ b/src/name-prefix-list.cpp
@@ -95,4 +95,4 @@
   }
 }
 
-}//namespace nlsr
+} // namespace nlsr
diff --git a/src/name-prefix-list.hpp b/src/name-prefix-list.hpp
index 35300fa..02445af 100644
--- a/src/name-prefix-list.hpp
+++ b/src/name-prefix-list.hpp
@@ -72,6 +72,6 @@
 
 };
 
-}//namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_NAME_PREFIX_LIST_HPP
diff --git a/src/nlsr.hpp b/src/nlsr.hpp
index ba5e238..0da1573 100644
--- a/src/nlsr.hpp
+++ b/src/nlsr.hpp
@@ -391,6 +391,6 @@
   uint32_t m_firstHelloInterval;
 };
 
-} //namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_HPP
diff --git a/src/route/face-map.hpp b/src/route/face-map.hpp
index a2f6d70..7382e98 100644
--- a/src/route/face-map.hpp
+++ b/src/route/face-map.hpp
@@ -120,6 +120,6 @@
   std::list<FaceMapEntry> m_table;
 };
 
-} //namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_FACE_MAP_HPP
diff --git a/src/route/fib-entry.cpp b/src/route/fib-entry.cpp
index 07c9695..6fd573b 100644
--- a/src/route/fib-entry.cpp
+++ b/src/route/fib-entry.cpp
@@ -40,4 +40,4 @@
   m_nexthopList.writeLog();
 }
 
-}//namespace nlsr
+} // namespace nlsr
diff --git a/src/route/fib-entry.hpp b/src/route/fib-entry.hpp
index a17ad35..b339670 100644
--- a/src/route/fib-entry.hpp
+++ b/src/route/fib-entry.hpp
@@ -113,6 +113,6 @@
   NexthopList m_nexthopList;
 };
 
-} //namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_FIB_ENTRY_HPP
diff --git a/src/route/fib.cpp b/src/route/fib.cpp
index dad73ca..e5a4c43 100644
--- a/src/route/fib.cpp
+++ b/src/route/fib.cpp
@@ -525,4 +525,4 @@
   }
 }
 
-} //namespace nlsr
+} // namespace nlsr
diff --git a/src/route/fib.hpp b/src/route/fib.hpp
index fd6b7c6..050e0fb 100644
--- a/src/route/fib.hpp
+++ b/src/route/fib.hpp
@@ -201,5 +201,5 @@
   static const uint64_t GRACE_PERIOD;
 };
 
-}//namespace nlsr
+} // namespace nlsr
 #endif //NLSR_FIB_HPP
diff --git a/src/route/map.cpp b/src/route/map.cpp
index 5637985..0716a2c 100644
--- a/src/route/map.cpp
+++ b/src/route/map.cpp
@@ -137,4 +137,4 @@
   }
 }
 
-} //namespace nlsr
+} // namespace nlsr
diff --git a/src/route/nexthop-list.cpp b/src/route/nexthop-list.cpp
index a720666..dc11113 100644
--- a/src/route/nexthop-list.cpp
+++ b/src/route/nexthop-list.cpp
@@ -116,4 +116,4 @@
   }
 }
 
-}//namespace nlsr
+} // namespace nlsr
diff --git a/src/route/nexthop-list.hpp b/src/route/nexthop-list.hpp
index 2d8ca88..be0c144 100644
--- a/src/route/nexthop-list.hpp
+++ b/src/route/nexthop-list.hpp
@@ -106,6 +106,6 @@
   std::list<NextHop> m_nexthopList;
 };
 
-}//namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_NEXTHOP_LIST_HPP
diff --git a/src/route/nexthop.cpp b/src/route/nexthop.cpp
index 7b28685..0274b9d 100644
--- a/src/route/nexthop.cpp
+++ b/src/route/nexthop.cpp
@@ -34,4 +34,4 @@
   return os;
 }
 
-}//namespace nlsr
+} // namespace nlsr
diff --git a/src/route/nexthop.hpp b/src/route/nexthop.hpp
index 89741e7..72435cd 100644
--- a/src/route/nexthop.hpp
+++ b/src/route/nexthop.hpp
@@ -119,6 +119,6 @@
 std::ostream&
 operator<<(std::ostream& os, const NextHop& hop);
 
-}//namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_NEXTHOP_HPP
diff --git a/src/route/routing-table-calculator.cpp b/src/route/routing-table-calculator.cpp
index b552460..ccc6114 100644
--- a/src/route/routing-table-calculator.cpp
+++ b/src/route/routing-table-calculator.cpp
@@ -503,4 +503,4 @@
   }
 }
 
-}//namespace nlsr
+} // namespace nlsr
diff --git a/src/route/routing-table-calculator.hpp b/src/route/routing-table-calculator.hpp
index 9dbce30..4ee683e 100644
--- a/src/route/routing-table-calculator.hpp
+++ b/src/route/routing-table-calculator.hpp
@@ -186,6 +186,6 @@
   static const int32_t ROUTER_NOT_FOUND;
 };
 
-}//namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_ROUTING_TABLE_CALCULATOR_HPP
diff --git a/src/route/routing-table-entry.hpp b/src/route/routing-table-entry.hpp
index 3e924a6..626caf3 100644
--- a/src/route/routing-table-entry.hpp
+++ b/src/route/routing-table-entry.hpp
@@ -62,6 +62,6 @@
   NexthopList m_nexthopList;
 };
 
-} //namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_ROUTING_TABLE_ENTRY_HPP
diff --git a/src/route/routing-table.cpp b/src/route/routing-table.cpp
index 43081eb..9d45f2e 100644
--- a/src/route/routing-table.cpp
+++ b/src/route/routing-table.cpp
@@ -273,5 +273,5 @@
   }
 }
 
-}//namespace nlsr
+} // namespace nlsr
 
diff --git a/src/route/routing-table.hpp b/src/route/routing-table.hpp
index 3564a77..1fd8049 100644
--- a/src/route/routing-table.hpp
+++ b/src/route/routing-table.hpp
@@ -110,6 +110,6 @@
   ndn::time::seconds m_routingCalcInterval;
 };
 
-}//namespace nlsr
+} // namespace nlsr
 
 #endif //NLSR_ROUTING_TABLE_HPP
diff --git a/src/sequencing-manager.cpp b/src/sequencing-manager.cpp
index 992fb87..aaff4e0 100644
--- a/src/sequencing-manager.cpp
+++ b/src/sequencing-manager.cpp
@@ -129,4 +129,4 @@
   _LOG_DEBUG("Combined LSDB Seq no: " << m_combinedSeqNo);
 }
 
-}//namespace nlsr
+} // namespace nlsr
diff --git a/src/sequencing-manager.hpp b/src/sequencing-manager.hpp
index d44366a..b359214 100644
--- a/src/sequencing-manager.hpp
+++ b/src/sequencing-manager.hpp
@@ -153,5 +153,5 @@
   std::string m_seqFileNameWithPath;
 };
 
-}//namespace nlsr
+} // namespace nlsr
 #endif //NLSR_SEQUENCING_MANAGER_HPP
diff --git a/src/utility/name-helper.hpp b/src/utility/name-helper.hpp
index 5f1bb36..c876f6a 100644
--- a/src/utility/name-helper.hpp
+++ b/src/utility/name-helper.hpp
@@ -53,7 +53,7 @@
   return -1;
 }
 
-} //namespace util
+} // namespace util
 
 } // namespace nlsr
 
diff --git a/tests/test-adjacent.cpp b/tests/test-adjacent.cpp
index 60f9a87..a709fad 100644
--- a/tests/test-adjacent.cpp
+++ b/tests/test-adjacent.cpp
@@ -49,5 +49,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace tests
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-conf-file-processor.cpp b/tests/test-conf-file-processor.cpp
index 6673eba..497c299 100644
--- a/tests/test-conf-file-processor.cpp
+++ b/tests/test-conf-file-processor.cpp
@@ -537,5 +537,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-fib-entry.cpp b/tests/test-fib-entry.cpp
index 05c6db5..452b02d 100644
--- a/tests/test-fib-entry.cpp
+++ b/tests/test-fib-entry.cpp
@@ -44,5 +44,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-fib.cpp b/tests/test-fib.cpp
index 772f182..9174622 100644
--- a/tests/test-fib.cpp
+++ b/tests/test-fib.cpp
@@ -308,5 +308,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-hyperbolic-calculator.cpp b/tests/test-hyperbolic-calculator.cpp
index 056056f..1d22028 100644
--- a/tests/test-hyperbolic-calculator.cpp
+++ b/tests/test-hyperbolic-calculator.cpp
@@ -177,5 +177,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-link-state-calculator.cpp b/tests/test-link-state-calculator.cpp
index c033043..8cc00a7 100644
--- a/tests/test-link-state-calculator.cpp
+++ b/tests/test-link-state-calculator.cpp
@@ -264,5 +264,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-lsdb.cpp b/tests/test-lsdb.cpp
index 05a71ea..3fcfb6e 100644
--- a/tests/test-lsdb.cpp
+++ b/tests/test-lsdb.cpp
@@ -322,5 +322,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-map-entry.cpp b/tests/test-map-entry.cpp
index 5d9873f..3a9440f 100644
--- a/tests/test-map-entry.cpp
+++ b/tests/test-map-entry.cpp
@@ -42,5 +42,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-map.cpp b/tests/test-map.cpp
index 420b39e..6483a8b 100644
--- a/tests/test-map.cpp
+++ b/tests/test-map.cpp
@@ -44,5 +44,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-name-prefix-list.cpp b/tests/test-name-prefix-list.cpp
index 72f0f9a..62453b8 100644
--- a/tests/test-name-prefix-list.cpp
+++ b/tests/test-name-prefix-list.cpp
@@ -48,5 +48,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-name-prefix-table-entry.cpp b/tests/test-name-prefix-table-entry.cpp
index 83458be..f811a43 100644
--- a/tests/test-name-prefix-table-entry.cpp
+++ b/tests/test-name-prefix-table-entry.cpp
@@ -38,5 +38,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-nexthop-list.cpp b/tests/test-nexthop-list.cpp
index 0389a9d..1ab18da 100644
--- a/tests/test-nexthop-list.cpp
+++ b/tests/test-nexthop-list.cpp
@@ -116,5 +116,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-nexthop.cpp b/tests/test-nexthop.cpp
index dcd5e48..ab85dbe 100644
--- a/tests/test-nexthop.cpp
+++ b/tests/test-nexthop.cpp
@@ -105,5 +105,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-nlsr.cpp b/tests/test-nlsr.cpp
index 00fbc4e..43c3855 100644
--- a/tests/test-nlsr.cpp
+++ b/tests/test-nlsr.cpp
@@ -447,5 +447,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-routing-table-entry.cpp b/tests/test-routing-table-entry.cpp
index fe5ce82..9ada80f 100644
--- a/tests/test-routing-table-entry.cpp
+++ b/tests/test-routing-table-entry.cpp
@@ -38,5 +38,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-routing-table.cpp b/tests/test-routing-table.cpp
index af330d1..3665378 100644
--- a/tests/test-routing-table.cpp
+++ b/tests/test-routing-table.cpp
@@ -48,5 +48,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/test-sequencing-manager.cpp b/tests/test-sequencing-manager.cpp
index 8e29820..d144981 100644
--- a/tests/test-sequencing-manager.cpp
+++ b/tests/test-sequencing-manager.cpp
@@ -57,5 +57,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr
diff --git a/tests/utility/test-face-controller.cpp b/tests/utility/test-face-controller.cpp
index 06b61a8..9104bb8 100644
--- a/tests/utility/test-face-controller.cpp
+++ b/tests/utility/test-face-controller.cpp
@@ -94,5 +94,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace test
-} //namespace nlsr
+} // namespace test
+} // namespace nlsr