diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp
index 6faee93..b761c31 100644
--- a/FlippR-Driver/src/input/InputDriverFactory.cpp
+++ b/FlippR-Driver/src/input/InputDriverFactory.cpp
@@ -22,54 +22,53 @@ namespace FlippR_Driver
 {
 namespace Input 
 {
+std::shared_ptr<IInputDriver> InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream) 
+{
+  LoggerFactory::CreateInputLogger();
 
-  std::shared_ptr<IInputDriver>
-  InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream) 
-  {
-    LoggerFactory::CreateInputLogger();
+  IBlockingQueue<Event> *event_queue = new BlockingQueue<Event>;
 
-    IBlockingQueue<Event> *event_queue = new BlockingQueue<Event>;
+  json matrix_config;
+  matrix_config_stream >> matrix_config;
 
-    json matrix_config;
-    matrix_config_stream >> matrix_config;
+  std::map<char, std::shared_ptr<Event>> address_event_map;
+  std::map<std::string, std::shared_ptr<Event>> name_event_map;
+  create_input_events(matrix_config, address_event_map, name_event_map);
 
-    std::map<char, std::shared_ptr<Event>> address_event_map;
-    std::map<std::string, std::shared_ptr<Event>> name_event_map;
-    create_input_events(matrix_config, address_event_map, name_event_map);
+  std::shared_ptr<IEventNotifier> event_notifier(new EventNotifier(event_queue));
+  std::unique_ptr<IInputGPIOInterface> input_gpio_interface(new InputGPIOInterface(input_config_stream));
+  std::unique_ptr<IDetector> detector(
+           new Detector(std::move(input_gpio_interface), address_event_map, event_notifier));
 
-    std::shared_ptr<IEventNotifier> event_notifier(new EventNotifier(event_queue));
-    std::unique_ptr<IInputGPIOInterface> input_gpio_interface(new InputGPIOInterface(input_config_stream));
-    std::unique_ptr<IDetector> detector(
-            new Detector(std::move(input_gpio_interface), address_event_map, event_notifier));
-
-    return std::shared_ptr<InputDriver>(new InputDriver(event_notifier, std::move(detector), name_event_map));
-  }
+  return std::shared_ptr<InputDriver>(new InputDriver(event_notifier, std::move(detector), name_event_map));
+}
 
 
-  void
-  InputDriverFactory::create_input_events(json matrix_config, std::map<char, std::shared_ptr<Event>>& address_event_map,
+void InputDriverFactory::create_input_events(json matrix_config, std::map<char, std::shared_ptr<Event>>& address_event_map,
                                           std::map<std::string, std::shared_ptr<Event>>& name_event_map) 
+{
+  auto& event_array = matrix_config.at("input_matrix");
+  for (auto &json_event : event_array) 
   {
-    auto& event_array = matrix_config.at("input_matrix");
-    for (auto &json_event : event_array) 
+
+    try 
     {
+      std::string name = json_event.at("name");
+      char address = json_event.at("address").get<json::number_integer_t>();
+      int priority = json_event.at("priority").get<json::number_integer_t>();
 
-      try 
-      {
-        std::string name = json_event.at("name");
-        char address = json_event.at("address").get<json::number_integer_t>();
-        int priority = json_event.at("priority").get<json::number_integer_t>();
+      std::shared_ptr<Event> event_ptr(new Event(address, priority, name));
 
-        std::shared_ptr<Event> event_ptr(new Event(address, priority, name));
-
-        address_event_map.emplace(address, event_ptr);
-        name_event_map.emplace(name, event_ptr);
-      }
-      catch (json::exception &e) {
-        CLOG(ERROR, INPUT_LOGGER) << "Matrix config-file corrupted: " << e.what();
-        exit(EXIT_FAILURE);
-      }
+      address_event_map.emplace(address, event_ptr);
+      name_event_map.emplace(name, event_ptr);
+    }
+    catch (json::exception &e) 
+    {
+      CLOG(ERROR, INPUT_LOGGER) << "Matrix config-file corrupted: " << e.what();
+      exit(EXIT_FAILURE);
     }
   }
 }
+
+}
 }
\ No newline at end of file