diff --git a/src/ndn-traffic-client.cpp b/src/ndn-traffic-client.cpp
index 80a79da..2e1b910 100644
--- a/src/ndn-traffic-client.cpp
+++ b/src/ndn-traffic-client.cpp
@@ -36,9 +36,9 @@
     , m_logger("NdnTrafficClient")
     , m_hasError(false)
     , m_hasQuietLogging(false)
-    , m_face(m_ioService)
     , m_interestInterval(getDefaultInterestInterval())
     , m_nMaximumInterests(-1)
+    , m_face(m_ioService)
     , m_nInterestsSent(0)
     , m_nInterestsReceived(0)
     , m_nContentInconsistencies(0)
@@ -777,12 +777,12 @@
 private:
 
   std::string m_programName;
+  Logger m_logger;
   std::string m_instanceId;
   bool m_hasError;
   bool m_hasQuietLogging;
   time::milliseconds m_interestInterval;
   int m_nMaximumInterests;
-  Logger m_logger;
   std::string m_configurationFile;
   boost::asio::io_service m_ioService;
   Face m_face;
diff --git a/src/ndn-traffic-server.cpp b/src/ndn-traffic-server.cpp
index 4bf50cc..2c78dba 100644
--- a/src/ndn-traffic-server.cpp
+++ b/src/ndn-traffic-server.cpp
@@ -414,7 +414,7 @@
   run()
   {
     boost::asio::signal_set signalSet(m_ioService, SIGINT, SIGTERM);
-    signalSet.async_wait(boost::bind(&NdnTrafficServer::signalHandler, this));
+    signalSet.async_wait(bind(&NdnTrafficServer::signalHandler, this));
     m_logger.initializeLog(m_instanceId);
     initializeTrafficConfiguration();
     if (m_nMaximumInterests == 0)
@@ -448,19 +448,20 @@
 
 private:
   KeyChain m_keyChain;
+  Logger m_logger;
   std::string m_programName;
   bool m_hasError;
   bool m_hasQuietLogging;
-  std::string m_instanceId;
-  time::milliseconds m_contentDelay;
   int m_nRegistrationsFailed;
-  Logger m_logger;
+  int m_nMaximumInterests;
+  int m_nInterestsReceived;
+  time::milliseconds m_contentDelay;
+  std::string m_instanceId;
   std::string m_configurationFile;
+
   boost::asio::io_service m_ioService;
   Face m_face;
   std::vector<DataTrafficConfiguration> m_trafficPatterns;
-  int m_nMaximumInterests;
-  int m_nInterestsReceived;
 };
 
 } // namespace ndn