diff --git a/daemon/src/dbus/networkmanager.cpp b/daemon/src/dbus/networkmanager.cpp
index 9f7288069262b05e94ad927d373d821a100c6235..ece8cc0115949062be6f7b75586bc2ef09a84c87 100644
--- a/daemon/src/dbus/networkmanager.cpp
+++ b/daemon/src/dbus/networkmanager.cpp
@@ -29,34 +29,30 @@
  */
 
 #include "networkmanager.h"
-
-#include <iostream>
-
-#include "global.h"
-#include "instance.h"
 #include "../manager.h"
 
-const std::string NetworkManager::statesString[5] = {"unknown", "asleep", "connecting", "connected", "disconnected"};
+const std::string NetworkManager::statesString[5] = {"unknown", "asleep",
+                                                     "connecting", "connected",
+                                                     "disconnected"};
 
-std::string NetworkManager::stateAsString(const uint32_t& state)
+std::string NetworkManager::stateAsString(const uint32_t &state)
 {
     return statesString[state];
 }
 
-void NetworkManager::StateChanged(const uint32_t& state)
+void NetworkManager::StateChanged(const uint32_t &state)
 {
     WARN("Network state changed: %s", stateAsString(state).c_str());
 }
 
-void NetworkManager::PropertiesChanged(const std::map< std::string, ::DBus::Variant >& argin0)
+void NetworkManager::PropertiesChanged(const std::map<std::string, ::DBus::Variant> &argin0)
 {
-    const std::map< std::string, ::DBus::Variant >::const_iterator iter = argin0.begin();
-
-    WARN("Properties changed: %s", iter->first.c_str());
-
+    WARN("Properties changed: %s", argin0.begin()->first.c_str());
     Manager::instance().registerAccounts();
 }
 
-NetworkManager::NetworkManager(DBus::Connection& connection, const DBus::Path& dbus_path, const char* destination) : DBus::ObjectProxy(connection, dbus_path, destination)
-{
-}
+NetworkManager::NetworkManager(DBus::Connection &connection,
+                               const DBus::Path &dbus_path,
+                               const char *destination) :
+    DBus::ObjectProxy(connection, dbus_path, destination)
+{}
diff --git a/daemon/src/dbus/networkmanager.h b/daemon/src/dbus/networkmanager.h
index 4bc5ca48eefc831e46cb8f454b3bf9459403c703..54198128c0064815e7d64cb875c111d7dbd0e042 100644
--- a/daemon/src/dbus/networkmanager.h
+++ b/daemon/src/dbus/networkmanager.h
@@ -28,8 +28,8 @@
  *  as that of the covered work.
  */
 
-#ifndef NETWORKMANAGER_H
-#define NETWORKMANAGER_H
+#ifndef NETWORKMANAGER_H_
+#define NETWORKMANAGER_H_
 
 #pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -37,17 +37,16 @@
 #pragma GCC diagnostic warning "-Wignored-qualifiers"
 #pragma GCC diagnostic warning "-Wunused-parameter"
 
-class NetworkManager
-    : public org::freedesktop::NetworkManager_proxy,
-  public DBus::IntrospectableProxy,
-      public DBus::ObjectProxy {
+class NetworkManager : public org::freedesktop::NetworkManager_proxy,
+                       public DBus::IntrospectableProxy,
+                       public DBus::ObjectProxy {
     public:
+        NetworkManager(DBus::Connection &, const DBus::Path &, const char*);
+        void StateChanged(const uint32_t &state);
+        void PropertiesChanged(const std::map<std::string, ::DBus::Variant> &argin0);
+        std::string stateAsString(const uint32_t &state);
 
-        NetworkManager(DBus::Connection&, const DBus::Path&, const char*);
-        void StateChanged(const uint32_t& state);
-        void PropertiesChanged(const std::map< std::string, ::DBus::Variant >& argin0);
-        std::string stateAsString(const uint32_t& state);
-
+    private:
         enum NMState {
             NM_STATE_UNKNOWN = 0,
             NM_STATE_ASLEEP,