diff --git a/dram/src/controller/Controller.h b/dram/src/controller/Controller.h
index 29d06618..02353e5b 100644
--- a/dram/src/controller/Controller.h
+++ b/dram/src/controller/Controller.h
@@ -155,15 +155,6 @@ void Controller<BUSWIDTH>::buildScheduler()
     {
         scheduler = new FR_FCFS(*controllerCore);
     }
-//    else if (selectedScheduler == "PAR_BS")
-//    {
-//        scheduler = new PAR_BS(*controllerCore, Configuration::getInstance().RefreshAwareScheduling,
-//                               Configuration::getInstance().Capsize);
-//    }
-//    else if (selectedScheduler == "Grouper")
-//    {
-//        scheduler = new ReadWriteGrouper(*controllerCore);
-//    }
     else
         reportFatal(name(), "unsupported scheduler: " + selectedScheduler);
 }
diff --git a/dram/src/controller/IController.h b/dram/src/controller/IController.h
index 1b97345f..2ad32cbb 100644
--- a/dram/src/controller/IController.h
+++ b/dram/src/controller/IController.h
@@ -38,12 +38,11 @@
 #ifndef ICONTROLLER_H
 #define ICONTROLLER_H
 
-
 #include <systemc.h>
+
 #include "core/scheduling/ScheduledCommand.h"
 #include "core/scheduling/Trigger.h"
 
-
 // Utiliy class to pass around the Controller class to the controller Core and various schedulers, without having to propagate the template defintions
 // throughout all classes
 class IController
@@ -56,5 +55,5 @@ public:
 
 };
 
-
 #endif // ICONTROLLER_H
+
diff --git a/dram/src/controller/scheduler/Fr_Fcfs.h b/dram/src/controller/scheduler/Fr_Fcfs.h
index 187b81ab..ad919cb2 100644
--- a/dram/src/controller/scheduler/Fr_Fcfs.h
+++ b/dram/src/controller/scheduler/Fr_Fcfs.h
@@ -36,7 +36,7 @@
  */
 
 #ifndef FR_FCFS_H_
-#define  FR_FCFS_H_
+#define FR_FCFS_H_
 
 #include "IScheduler.h"
 #include "../core/ControllerCore.h"
@@ -60,5 +60,5 @@ private:
 
 };
 
+#endif /* FR_FCFS_H_ */
 
-#endif
diff --git a/dram/src/simulation/Dram.h b/dram/src/simulation/Dram.h
index a29d6a5b..eb928f0e 100644
--- a/dram/src/simulation/Dram.h
+++ b/dram/src/simulation/Dram.h
@@ -318,3 +318,4 @@ struct Dram: sc_module
 };
 
 #endif /* DRAM_H_ */
+
diff --git a/dram/src/simulation/SimulationManager.cpp b/dram/src/simulation/SimulationManager.cpp
index f463f23a..17423f06 100644
--- a/dram/src/simulation/SimulationManager.cpp
+++ b/dram/src/simulation/SimulationManager.cpp
@@ -1,4 +1,4 @@
-    /*
+/*
  * Copyright (c) 2015, University of Kaiserslautern
  * All rights reserved.
  *
@@ -36,12 +36,13 @@
 
 #include <sys/wait.h>
 #include <boost/filesystem.hpp>
+
 #include "SimulationManager.h"
 #include "../common/Utils.h"
+
 using namespace std;
 using namespace tinyxml2;
 
-
 SimulationManager::SimulationManager(string resources) : resources(resources)
 {
 }
diff --git a/dram/src/simulation/main.cpp b/dram/src/simulation/main.cpp
index 04f08f0b..0c160654 100644
--- a/dram/src/simulation/main.cpp
+++ b/dram/src/simulation/main.cpp
@@ -36,13 +36,11 @@
 
 #include <iostream>
 #include <string>
-#include "SimulationManager.h"
-#include "../controller/core/configuration/Configuration.h"
-
 #include <systemc.h>
 #include <utility>
 #include <vector>
 
+#include "SimulationManager.h"
 
 using namespace std;