diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR3.h b/DRAMSys/library/src/controller/checker/CheckerDDR3.h
index ab3bb6ec..30eba198 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR3.h
+++ b/DRAMSys/library/src/controller/checker/CheckerDDR3.h
@@ -45,8 +45,8 @@ class CheckerDDR3 final : public CheckerIF
 {
 public:
     CheckerDDR3();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecDDR3 *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR4.h b/DRAMSys/library/src/controller/checker/CheckerDDR4.h
index 46c891d0..967849ae 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR4.h
+++ b/DRAMSys/library/src/controller/checker/CheckerDDR4.h
@@ -45,8 +45,8 @@ class CheckerDDR4 final : public CheckerIF
 {
 public:
     CheckerDDR4();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecDDR4 *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR5.h b/DRAMSys/library/src/controller/checker/CheckerDDR5.h
index a71ee310..5a15b314 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR5.h
+++ b/DRAMSys/library/src/controller/checker/CheckerDDR5.h
@@ -46,8 +46,8 @@ class CheckerDDR5 final : public CheckerIF
 {
 public:
     CheckerDDR5();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecDDR5 *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR5.h b/DRAMSys/library/src/controller/checker/CheckerGDDR5.h
index 86352aac..1cf50e9a 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR5.h
+++ b/DRAMSys/library/src/controller/checker/CheckerGDDR5.h
@@ -45,8 +45,8 @@ class CheckerGDDR5 final : public CheckerIF
 {
 public:
     CheckerGDDR5();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecGDDR5 *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR5X.h b/DRAMSys/library/src/controller/checker/CheckerGDDR5X.h
index 18f63ecd..1ff2c756 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR5X.h
+++ b/DRAMSys/library/src/controller/checker/CheckerGDDR5X.h
@@ -45,8 +45,8 @@ class CheckerGDDR5X final : public CheckerIF
 {
 public:
     CheckerGDDR5X();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecGDDR5X *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR6.h b/DRAMSys/library/src/controller/checker/CheckerGDDR6.h
index cf60d503..16d89bd4 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR6.h
+++ b/DRAMSys/library/src/controller/checker/CheckerGDDR6.h
@@ -45,8 +45,8 @@ class CheckerGDDR6 final : public CheckerIF
 {
 public:
     CheckerGDDR6();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecGDDR6 *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerHBM2.h b/DRAMSys/library/src/controller/checker/CheckerHBM2.h
index 22fd6980..674b69a4 100644
--- a/DRAMSys/library/src/controller/checker/CheckerHBM2.h
+++ b/DRAMSys/library/src/controller/checker/CheckerHBM2.h
@@ -45,8 +45,8 @@ class CheckerHBM2 final : public CheckerIF
 {
 public:
     CheckerHBM2();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecHBM2 *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerIF.h b/DRAMSys/library/src/controller/checker/CheckerIF.h
index 9ca75c13..7b3e5eb7 100644
--- a/DRAMSys/library/src/controller/checker/CheckerIF.h
+++ b/DRAMSys/library/src/controller/checker/CheckerIF.h
@@ -44,7 +44,7 @@
 class CheckerIF
 {
 public:
-    virtual ~CheckerIF() {}
+    virtual ~CheckerIF() = default;
 
     virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const = 0;
     virtual void insert(Command command, tlm::tlm_generic_payload *payload) = 0;
diff --git a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.h b/DRAMSys/library/src/controller/checker/CheckerLPDDR4.h
index 7cb40a13..d952162a 100644
--- a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.h
+++ b/DRAMSys/library/src/controller/checker/CheckerLPDDR4.h
@@ -45,8 +45,8 @@ class CheckerLPDDR4 final : public CheckerIF
 {
 public:
     CheckerLPDDR4();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecLPDDR4 *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerSTTMRAM.h b/DRAMSys/library/src/controller/checker/CheckerSTTMRAM.h
index 34f18db6..08a3d20c 100644
--- a/DRAMSys/library/src/controller/checker/CheckerSTTMRAM.h
+++ b/DRAMSys/library/src/controller/checker/CheckerSTTMRAM.h
@@ -45,8 +45,8 @@ class CheckerSTTMRAM final : public CheckerIF
 {
 public:
     CheckerSTTMRAM();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecSTTMRAM *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO.h b/DRAMSys/library/src/controller/checker/CheckerWideIO.h
index 8e626bf3..22f0e85f 100644
--- a/DRAMSys/library/src/controller/checker/CheckerWideIO.h
+++ b/DRAMSys/library/src/controller/checker/CheckerWideIO.h
@@ -45,8 +45,8 @@ class CheckerWideIO final : public CheckerIF
 {
 public:
     CheckerWideIO();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecWideIO *memSpec;
diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO2.h b/DRAMSys/library/src/controller/checker/CheckerWideIO2.h
index 851811af..d7d31998 100644
--- a/DRAMSys/library/src/controller/checker/CheckerWideIO2.h
+++ b/DRAMSys/library/src/controller/checker/CheckerWideIO2.h
@@ -45,8 +45,8 @@ class CheckerWideIO2 final : public CheckerIF
 {
 public:
     CheckerWideIO2();
-    virtual sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
-    virtual void insert(Command command, tlm::tlm_generic_payload *payload) override;
+    sc_time timeToSatisfyConstraints(Command command, tlm::tlm_generic_payload *payload) const override;
+    void insert(Command command, tlm::tlm_generic_payload *payload) override;
 
 private:
     const MemSpecWideIO2 *memSpec;
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxIF.h b/DRAMSys/library/src/controller/cmdmux/CmdMuxIF.h
index 7134f3cb..4e58935b 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxIF.h
+++ b/DRAMSys/library/src/controller/cmdmux/CmdMuxIF.h
@@ -44,7 +44,7 @@
 class CmdMuxIF
 {
 public:
-    virtual ~CmdMuxIF() {}
+    virtual ~CmdMuxIF() = default;
     virtual CommandTuple::Type selectCommand(const ReadyCommands &) = 0;
 };
 
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.cpp b/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.cpp
index a64bde58..46e82a44 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.cpp
+++ b/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.cpp
@@ -71,7 +71,7 @@ CommandTuple::Type CmdMuxOldest::selectCommand(const ReadyCommands &readyCommand
             std::get<CommandTuple::Timestamp>(*result) == sc_time_stamp())
         return *result;
     else
-        return CommandTuple::Type(Command::NOP, nullptr, sc_max_time());
+        return {Command::NOP, nullptr, sc_max_time()};
 }
 
 
@@ -177,5 +177,5 @@ CommandTuple::Type CmdMuxOldestRasCas::selectCommand(const ReadyCommands &readyC
             std::get<CommandTuple::Timestamp>(*result) == sc_time_stamp())
         return *result;
     else
-        return CommandTuple::Type(Command::NOP, nullptr, sc_max_time());
+        return {Command::NOP, nullptr, sc_max_time()};
 }
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.h b/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.h
index 5f8ce661..0ab8a715 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.h
+++ b/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.h
@@ -42,7 +42,7 @@ class CmdMuxOldest : public CmdMuxIF
 {
 public:
     CmdMuxOldest();
-    virtual CommandTuple::Type selectCommand(const ReadyCommands &) override;
+    CommandTuple::Type selectCommand(const ReadyCommands &) override;
 
 private:
     const MemSpec *memSpec;
@@ -53,7 +53,7 @@ class CmdMuxOldestRasCas : public CmdMuxIF
 {
 public:
     CmdMuxOldestRasCas();
-    virtual CommandTuple::Type selectCommand(const ReadyCommands &) override;
+    CommandTuple::Type selectCommand(const ReadyCommands &) override;
 
 private:
     const MemSpec *memSpec;
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.cpp b/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.cpp
index ce9e97d6..c2517fe2 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.cpp
+++ b/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.cpp
@@ -81,7 +81,7 @@ CommandTuple::Type CmdMuxStrict::selectCommand(const ReadyCommands &readyCommand
         return *result;
     }
     else
-        return CommandTuple::Type(Command::NOP, nullptr, sc_max_time());
+        return {Command::NOP, nullptr, sc_max_time()};
 }
 
 
@@ -180,5 +180,5 @@ CommandTuple::Type CmdMuxStrictRasCas::selectCommand(const ReadyCommands &readyC
             return *result;
         } 
     else
-        return CommandTuple::Type(Command::NOP, nullptr, sc_max_time());
+        return {Command::NOP, nullptr, sc_max_time()};
 }
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.h b/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.h
index f7c42380..e8a07d6c 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.h
+++ b/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.h
@@ -42,7 +42,7 @@ class CmdMuxStrict : public CmdMuxIF
 {
 public:
     CmdMuxStrict();
-    virtual CommandTuple::Type selectCommand(const ReadyCommands &) override;
+    CommandTuple::Type selectCommand(const ReadyCommands &) override;
 
 private:
     uint64_t nextPayloadID = 1;
@@ -53,7 +53,7 @@ class CmdMuxStrictRasCas : public CmdMuxIF
 {
 public:
     CmdMuxStrictRasCas();
-    virtual CommandTuple::Type selectCommand(const ReadyCommands &) override;
+    CommandTuple::Type selectCommand(const ReadyCommands &) override;
 
 private:
     uint64_t nextPayloadID = 1;
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.cpp b/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.cpp
index b496e973..8fcbe479 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.cpp
+++ b/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.cpp
@@ -38,7 +38,7 @@ using namespace tlm;
 
 CommandTuple::Type PowerDownManagerDummy::getNextCommand()
 {
-    return CommandTuple::Type(Command::NOP, nullptr, sc_max_time());
+    return {Command::NOP, nullptr, sc_max_time()};
 }
 
 sc_time PowerDownManagerDummy::start()
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.h b/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.h
index 854ecc1a..e8408dea 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.h
+++ b/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.h
@@ -40,15 +40,15 @@
 class PowerDownManagerDummy final : public PowerDownManagerIF
 {
 public:
-    PowerDownManagerDummy() {}
+    PowerDownManagerDummy() = default;
 
-    virtual void triggerEntry() override {}
-    virtual void triggerExit() override {}
-    virtual void triggerInterruption() override {}
+    void triggerEntry() override {}
+    void triggerExit() override {}
+    void triggerInterruption() override {}
 
-    virtual CommandTuple::Type getNextCommand() override;
-    virtual void updateState(Command) override {}
-    virtual sc_time start() override;
+    CommandTuple::Type getNextCommand() override;
+    void updateState(Command) override {}
+    sc_time start() override;
 };
 
 #endif // POWERDOWNMANAGERDUMMY_H
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerIF.h b/DRAMSys/library/src/controller/powerdown/PowerDownManagerIF.h
index 39dd314e..fd038495 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerIF.h
+++ b/DRAMSys/library/src/controller/powerdown/PowerDownManagerIF.h
@@ -43,7 +43,7 @@
 class PowerDownManagerIF
 {
 public:
-    virtual ~PowerDownManagerIF() {}
+    virtual ~PowerDownManagerIF() = default;
 
     virtual void triggerEntry() = 0;
     virtual void triggerExit() = 0;
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.cpp b/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.cpp
index 80ce14b7..17f8ea4e 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.cpp
+++ b/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.cpp
@@ -71,7 +71,7 @@ void PowerDownManagerStaggered::triggerInterruption()
 
 CommandTuple::Type PowerDownManagerStaggered::getNextCommand()
 {
-    return CommandTuple::Type(nextCommand, &powerDownPayload, std::max(timeToSchedule, sc_time_stamp()));
+    return {nextCommand, &powerDownPayload, std::max(timeToSchedule, sc_time_stamp())};
 }
 
 sc_time PowerDownManagerStaggered::start()
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.h b/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.h
index eaa6cf77..f9d88bc7 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.h
+++ b/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.h
@@ -44,13 +44,13 @@ class PowerDownManagerStaggered final : public PowerDownManagerIF
 public:
     PowerDownManagerStaggered(Rank, CheckerIF *);
 
-    virtual void triggerEntry() override;
-    virtual void triggerExit() override;
-    virtual void triggerInterruption() override;
+    void triggerEntry() override;
+    void triggerExit() override;
+    void triggerInterruption() override;
 
-    virtual CommandTuple::Type getNextCommand() override;
-    virtual void updateState(Command) override;
-    virtual sc_time start() override;
+    CommandTuple::Type getNextCommand() override;
+    void updateState(Command) override;
+    sc_time start() override;
 
 private:
     enum class State {Idle, ActivePdn, PrechargePdn, SelfRefresh, ExtraRefresh} state = State::Idle;
diff --git a/DRAMSys/library/src/controller/respqueue/RespQueueFifo.h b/DRAMSys/library/src/controller/respqueue/RespQueueFifo.h
index 4a07fb92..82846be9 100644
--- a/DRAMSys/library/src/controller/respqueue/RespQueueFifo.h
+++ b/DRAMSys/library/src/controller/respqueue/RespQueueFifo.h
@@ -44,9 +44,9 @@
 class RespQueueFifo final : public RespQueueIF
 {
 public:
-    virtual void insertPayload(tlm::tlm_generic_payload *, sc_time) override;
-    virtual tlm::tlm_generic_payload *nextPayload() override;
-    virtual sc_time getTriggerTime() const override;
+    void insertPayload(tlm::tlm_generic_payload *, sc_time) override;
+    tlm::tlm_generic_payload *nextPayload() override;
+    sc_time getTriggerTime() const override;
 
 private:
     std::queue<std::pair<tlm::tlm_generic_payload *, sc_time>> buffer;
diff --git a/DRAMSys/library/src/controller/respqueue/RespQueueIF.h b/DRAMSys/library/src/controller/respqueue/RespQueueIF.h
index 551fcb8f..53cb3c04 100644
--- a/DRAMSys/library/src/controller/respqueue/RespQueueIF.h
+++ b/DRAMSys/library/src/controller/respqueue/RespQueueIF.h
@@ -44,7 +44,7 @@ public:
     virtual void insertPayload(tlm::tlm_generic_payload *, sc_time) = 0;
     virtual tlm::tlm_generic_payload *nextPayload() = 0;
     virtual sc_time getTriggerTime() const = 0;
-    virtual ~RespQueueIF() {}
+    virtual ~RespQueueIF() = default;
 };
 
 #endif // RESPQUEUEIF_H
diff --git a/DRAMSys/library/src/controller/respqueue/RespQueueReorder.h b/DRAMSys/library/src/controller/respqueue/RespQueueReorder.h
index 89d8c81a..26ffa730 100644
--- a/DRAMSys/library/src/controller/respqueue/RespQueueReorder.h
+++ b/DRAMSys/library/src/controller/respqueue/RespQueueReorder.h
@@ -43,9 +43,9 @@
 class RespQueueReorder final : public RespQueueIF
 {
 public:
-    virtual void insertPayload(tlm::tlm_generic_payload *, sc_time) override;
-    virtual tlm::tlm_generic_payload *nextPayload() override;
-    virtual sc_time getTriggerTime() const override;
+    void insertPayload(tlm::tlm_generic_payload *, sc_time) override;
+    tlm::tlm_generic_payload *nextPayload() override;
+    sc_time getTriggerTime() const override;
 
 private:
     uint64_t nextPayloadID = 1;
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.h b/DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.h
index 1591cd80..079bb4c8 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.h
+++ b/DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.h
@@ -43,10 +43,10 @@ class BufferCounterBankwise final : public BufferCounterIF
 {
 public:
     BufferCounterBankwise(unsigned requestBufferSize, unsigned numberOfBanks);
-    virtual bool hasBufferSpace() const override;
-    virtual void storeRequest(tlm::tlm_generic_payload *payload) override;
-    virtual void removeRequest(tlm::tlm_generic_payload *payload) override;
-    virtual const std::vector<unsigned> &getBufferDepth() const override;
+    bool hasBufferSpace() const override;
+    void storeRequest(tlm::tlm_generic_payload *payload) override;
+    void removeRequest(tlm::tlm_generic_payload *payload) override;
+    const std::vector<unsigned> &getBufferDepth() const override;
 
 private:
     const unsigned requestBufferSize;
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.h b/DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.h
index a99716b9..f12ebd7d 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.h
+++ b/DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.h
@@ -40,11 +40,11 @@
 class BufferCounterReadWrite final : public BufferCounterIF
 {
 public:
-    BufferCounterReadWrite(unsigned requestBufferSize);
-    virtual bool hasBufferSpace() const override;
-    virtual void storeRequest(tlm::tlm_generic_payload *payload) override;
-    virtual void removeRequest(tlm::tlm_generic_payload *payload) override;
-    virtual const std::vector<unsigned> &getBufferDepth() const override;
+    explicit BufferCounterReadWrite(unsigned requestBufferSize);
+    bool hasBufferSpace() const override;
+    void storeRequest(tlm::tlm_generic_payload *payload) override;
+    void removeRequest(tlm::tlm_generic_payload *payload) override;
+    const std::vector<unsigned> &getBufferDepth() const override;
 
 private:
     const unsigned requestBufferSize;
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterShared.h b/DRAMSys/library/src/controller/scheduler/BufferCounterShared.h
index aefd20ad..dbfb0c7a 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterShared.h
+++ b/DRAMSys/library/src/controller/scheduler/BufferCounterShared.h
@@ -40,11 +40,11 @@
 class BufferCounterShared final : public BufferCounterIF
 {
 public:
-    BufferCounterShared(unsigned requestBufferSize);
-    virtual bool hasBufferSpace() const override;
-    virtual void storeRequest(tlm::tlm_generic_payload *payload) override;
-    virtual void removeRequest(tlm::tlm_generic_payload *payload) override;
-    virtual const std::vector<unsigned> &getBufferDepth() const override;
+    explicit BufferCounterShared(unsigned requestBufferSize);
+    bool hasBufferSpace() const override;
+    void storeRequest(tlm::tlm_generic_payload *payload) override;
+    void removeRequest(tlm::tlm_generic_payload *payload) override;
+    const std::vector<unsigned> &getBufferDepth() const override;
 
 private:
     const unsigned requestBufferSize;
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFifo.h b/DRAMSys/library/src/controller/scheduler/SchedulerFifo.h
index ae06ac48..6cdeac00 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFifo.h
+++ b/DRAMSys/library/src/controller/scheduler/SchedulerFifo.h
@@ -48,14 +48,14 @@ class SchedulerFifo final : public SchedulerIF
 {
 public:
     SchedulerFifo();
-    virtual ~SchedulerFifo() override;
-    virtual bool hasBufferSpace() const override;
-    virtual void storeRequest(tlm::tlm_generic_payload *) override;
-    virtual void removeRequest(tlm::tlm_generic_payload *) override;
-    virtual tlm::tlm_generic_payload *getNextRequest(BankMachine *) const override;
-    virtual bool hasFurtherRowHit(Bank, Row) const override;
-    virtual bool hasFurtherRequest(Bank) const override;
-    virtual const std::vector<unsigned> &getBufferDepth() const override;
+    ~SchedulerFifo() override;
+    bool hasBufferSpace() const override;
+    void storeRequest(tlm::tlm_generic_payload *) override;
+    void removeRequest(tlm::tlm_generic_payload *) override;
+    tlm::tlm_generic_payload *getNextRequest(BankMachine *) const override;
+    bool hasFurtherRowHit(Bank, Row) const override;
+    bool hasFurtherRequest(Bank) const override;
+    const std::vector<unsigned> &getBufferDepth() const override;
 
 private:
     std::vector<std::deque<tlm::tlm_generic_payload *>> buffer;
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.cpp b/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.cpp
index a15dc6f2..273a1e99 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.cpp
+++ b/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.cpp
@@ -92,10 +92,10 @@ tlm_generic_payload *SchedulerFrFcfs::getNextRequest(BankMachine *bankMachine) c
         {
             // Search for row hit
             Row openRow = bankMachine->getOpenRow();
-            for (auto it = buffer[bankID].begin(); it != buffer[bankID].end(); it++)
+            for (auto it : buffer[bankID])
             {
-                if (DramExtension::getRow(*it) == openRow)
-                    return *it;
+                if (DramExtension::getRow(it) == openRow)
+                    return it;
             }
         }
         // No row hit found or bank precharged
@@ -107,9 +107,9 @@ tlm_generic_payload *SchedulerFrFcfs::getNextRequest(BankMachine *bankMachine) c
 bool SchedulerFrFcfs::hasFurtherRowHit(Bank bank, Row row) const
 {
     unsigned rowHitCounter = 0;
-    for (auto it = buffer[bank.ID()].begin(); it != buffer[bank.ID()].end(); it++)
+    for (auto it : buffer[bank.ID()])
     {
-        if (DramExtension::getRow(*it) == row)
+        if (DramExtension::getRow(it) == row)
         {
             rowHitCounter++;
             if (rowHitCounter == 2)
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.h b/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.h
index 15633b51..c8a182c8 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.h
+++ b/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.h
@@ -48,14 +48,14 @@ class SchedulerFrFcfs final : public SchedulerIF
 {
 public:
     SchedulerFrFcfs();
-    virtual ~SchedulerFrFcfs() override;
-    virtual bool hasBufferSpace() const override;
-    virtual void storeRequest(tlm::tlm_generic_payload *) override;
-    virtual void removeRequest(tlm::tlm_generic_payload *) override;
-    virtual tlm::tlm_generic_payload *getNextRequest(BankMachine *) const override;
-    virtual bool hasFurtherRowHit(Bank, Row) const override;
-    virtual bool hasFurtherRequest(Bank) const override;
-    virtual const std::vector<unsigned> &getBufferDepth() const override;
+    ~SchedulerFrFcfs() override;
+    bool hasBufferSpace() const override;
+    void storeRequest(tlm::tlm_generic_payload *) override;
+    void removeRequest(tlm::tlm_generic_payload *) override;
+    tlm::tlm_generic_payload *getNextRequest(BankMachine *) const override;
+    bool hasFurtherRowHit(Bank, Row) const override;
+    bool hasFurtherRequest(Bank) const override;
+    const std::vector<unsigned> &getBufferDepth() const override;
 
 private:
     std::vector<std::list<tlm::tlm_generic_payload *>> buffer;
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.cpp b/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.cpp
index a1510123..3ee1c46a 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.cpp
+++ b/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.cpp
@@ -94,10 +94,10 @@ tlm_generic_payload *SchedulerFrFcfsGrp::getNextRequest(BankMachine *bankMachine
             // Filter all row hits
             Row openRow = bankMachine->getOpenRow();
             std::list<tlm_generic_payload *> rowHits;
-            for (auto it = buffer[bankID].begin(); it != buffer[bankID].end(); it++)
+            for (auto it : buffer[bankID])
             {
-                if (DramExtension::getRow(*it) == openRow)
-                    rowHits.push_back(*it);
+                if (DramExtension::getRow(it) == openRow)
+                    rowHits.push_back(it);
             }
 
             if (!rowHits.empty())
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.h b/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.h
index b6f67e1c..11cd2dae 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.h
+++ b/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.h
@@ -48,14 +48,14 @@ class SchedulerFrFcfsGrp final : public SchedulerIF
 {
 public:
     SchedulerFrFcfsGrp();
-    virtual ~SchedulerFrFcfsGrp() override;
-    virtual bool hasBufferSpace() const override;
-    virtual void storeRequest(tlm::tlm_generic_payload *) override;
-    virtual void removeRequest(tlm::tlm_generic_payload *) override;
-    virtual tlm::tlm_generic_payload *getNextRequest(BankMachine *) const override;
-    virtual bool hasFurtherRowHit(Bank, Row) const override;
-    virtual bool hasFurtherRequest(Bank) const override;
-    virtual const std::vector<unsigned> &getBufferDepth() const override;
+    ~SchedulerFrFcfsGrp() override;
+    bool hasBufferSpace() const override;
+    void storeRequest(tlm::tlm_generic_payload *) override;
+    void removeRequest(tlm::tlm_generic_payload *) override;
+    tlm::tlm_generic_payload *getNextRequest(BankMachine *) const override;
+    bool hasFurtherRowHit(Bank, Row) const override;
+    bool hasFurtherRequest(Bank) const override;
+    const std::vector<unsigned> &getBufferDepth() const override;
 
 private:
     std::vector<std::list<tlm::tlm_generic_payload *>> buffer;