diff --git a/src/core/sal/gem5/Gem5Connector.hpp b/src/core/sal/gem5/Gem5Connector.hpp
index 9b012864..5aa42988 100644
--- a/src/core/sal/gem5/Gem5Connector.hpp
+++ b/src/core/sal/gem5/Gem5Connector.hpp
@@ -8,8 +8,7 @@
  * This class will be compiled inside the gem5 context and provides the
  * Gem5Controller a way to call gem5 functions.
  */
-class Gem5Connector
-{
+class Gem5Connector {
 public:
 	void save(const std::string &path);
 	void restore(const std::string &path);
diff --git a/src/core/sal/gem5/Gem5Listener.ah b/src/core/sal/gem5/Gem5Listener.ah
index 29ccb731..afdfaeb6 100644
--- a/src/core/sal/gem5/Gem5Listener.ah
+++ b/src/core/sal/gem5/Gem5Listener.ah
@@ -10,18 +10,16 @@
 #include "sim/system.hh"
 #include "cpu/pc_event.hh"
 
-class Gem5Breakpoint : public PCEvent
-{
+class Gem5Breakpoint : public PCEvent {
 public:
 	Gem5Breakpoint(PCEventQueue* queue, Addr ip)
-		: PCEvent(queue, "Fail* experiment breakpoint", ip) {}
-	virtual void process(ThreadContext *tc) { fail::simulator.onBreakpoint(&fail::simulator.getCPU(tc->cpuId()), this->evpc, fail::ANY_ADDR); }
+		: PCEvent(queue, "Fail* experiment breakpoint", ip) { }
+	virtual void process(ThreadContext *tc)
+	{ fail::simulator.onBreakpoint(&fail::simulator.getCPU(tc->cpuId()), this->evpc, fail::ANY_ADDR); }
 };
 
-aspect Gem5Listener
-{
-	advice "fail::BPSingleListener" : slice class
-	{
+aspect Gem5Listener {
+	advice "fail::BPSingleListener" : slice class {
 	private:
 		Gem5Breakpoint* m_Breakpoint;
 	public:
@@ -35,8 +33,7 @@ aspect Gem5Listener
 
 		virtual void onDeletion()
 		{
-			if(m_Breakpoint)
-			{
+			if (m_Breakpoint) {
 				delete m_Breakpoint;
 				m_Breakpoint = 0;
 			}
@@ -44,5 +41,6 @@ aspect Gem5Listener
 	};
 };
 
-#endif
+#endif // defined(BUILD_GEM5)
+
 #endif // __GEM5_LISTENER_AH__
diff --git a/src/core/sal/gem5/Gem5Memory.hpp b/src/core/sal/gem5/Gem5Memory.hpp
index 6cf10f55..7b2802e7 100644
--- a/src/core/sal/gem5/Gem5Memory.hpp
+++ b/src/core/sal/gem5/Gem5Memory.hpp
@@ -18,7 +18,7 @@ namespace fail {
  */
 class Gem5MemoryManager : public MemoryManager {
 public:
-	Gem5MemoryManager(System* system) : m_System(system), m_Mem(&system->getPhysMem()) {}
+	Gem5MemoryManager(System* system) : m_System(system), m_Mem(&system->getPhysMem()) { }
 	
 	size_t getPoolSize() const { return m_Mem->totalSize(); }
 	host_address_t getStartAddr() const { return 0; }
@@ -64,7 +64,6 @@ public:
 
 		m_Mem->functionalAccess(&pkt);
 	}
-
 private:
 	System* m_System;
 	PhysicalMemory* m_Mem;