diff --git a/inc/BusCtrl.h b/inc/BusCtrl.h
index e6eabad..3ef60d2 100644
--- a/inc/BusCtrl.h
+++ b/inc/BusCtrl.h
@@ -72,7 +72,7 @@ public:
 	 * @brief constructor
 	 * @param name module's name
 	 */
-	BusCtrl(sc_core::sc_module_name name);
+	explicit BusCtrl(sc_core::sc_module_name name);
 
 	/**
 	 * @brief TLM-2 blocking mechanism
diff --git a/inc/CPU.h b/inc/CPU.h
index d91e9a4..033cb1e 100644
--- a/inc/CPU.h
+++ b/inc/CPU.h
@@ -59,11 +59,11 @@ public:
 	/**
 	 * @brief Destructor
 	 */
-	~CPU();
+	~CPU() override;
 
 	MemoryInterface *mem_intf;
 
-	bool CPU_step(void);
+	bool CPU_step();
 
 
 	Registers *getRegisterBank() {return register_bank;}
@@ -103,7 +103,7 @@ private:
 	 * main thread for CPU simulation
 	 * @brief CPU mai thread
 	 */
-	void CPU_thread(void);
+    [[noreturn]] void CPU_thread();
 
 	/**
 	 * @brief callback for IRQ simple socket
diff --git a/inc/C_extension.h b/inc/C_extension.h
index e11de2a..2c3e560 100644
--- a/inc/C_extension.h
+++ b/inc/C_extension.h
@@ -105,7 +105,7 @@ public:
 	 * @brief Access to opcode field
 	 * @return return opcode field
 	 */
-	inline int32_t opcode() const {
+	inline int32_t opcode() const override {
 		return m_instr.range(1, 0);
 	}
 
diff --git a/inc/Debug.h b/inc/Debug.h
index cd6825e..addd84d 100644
--- a/inc/Debug.h
+++ b/inc/Debug.h
@@ -24,10 +24,10 @@ class Debug: sc_core::sc_module {
 public:
 
 	Debug(CPU *cpu, Memory* mem);
-	~Debug();
+	~Debug() override;
 
 private:
-	std::string compute_checksum_string(const std::string &msg);
+	static std::string compute_checksum_string(const std::string &msg);
 	void send_packet(int conn, const std::string &msg);
 	std::string receive_packet();
 	void handle_gdb_loop();
diff --git a/inc/Log.h b/inc/Log.h
index 84ef2a5..85370b1 100644
--- a/inc/Log.h
+++ b/inc/Log.h
@@ -68,7 +68,7 @@ public:
 
 private:
 	static Log *instance;
-	Log(const char *filename);
+	explicit Log(const char *filename);
 	std::ofstream m_stream;
 	std::ofstream m_sink;
 };
diff --git a/inc/M_extension.h b/inc/M_extension.h
index 6f9fe0e..b56b289 100644
--- a/inc/M_extension.h
+++ b/inc/M_extension.h
@@ -56,7 +56,7 @@ public:
 	 */
 	op_M_Codes decode() const;
 
-	inline virtual void dump() const override {
+	inline void dump() const override {
 		std::cout << std::hex << "0x" << m_instr << std::dec << std::endl;
 	}
 
@@ -77,7 +77,7 @@ private:
 	 * @brief Access to opcode field
 	 * @return return opcode field
 	 */
-	inline int32_t opcode() const {
+	inline int32_t opcode() const override {
 		return m_instr.range(14, 12);
 	}
 
diff --git a/inc/Memory.h b/inc/Memory.h
index 52a929e..cb2392c 100644
--- a/inc/Memory.h
+++ b/inc/Memory.h
@@ -36,9 +36,9 @@ public:
 	const sc_core::sc_time LATENCY;
 
 	Memory(sc_core::sc_module_name const &name, std::string const &filename);
-	Memory(const sc_core::sc_module_name& name);
+	explicit Memory(const sc_core::sc_module_name& name);
 
-	~Memory(void);
+	~Memory() override;
 
 	/**
 	 * @brief Returns Program Counter read from hexfile
diff --git a/inc/Performance.h b/inc/Performance.h
index 98af282..7f832f2 100644
--- a/inc/Performance.h
+++ b/inc/Performance.h
@@ -83,7 +83,7 @@ public:
 	 */
 	void dump() const;
 
-	inline uint_fast64_t getInstructions() {
+	inline uint_fast64_t getInstructions() const {
 	  return instructions_executed;
 	}
 
diff --git a/inc/Registers.h b/inc/Registers.h
index 9a0f0c9..8b052b5 100644
--- a/inc/Registers.h
+++ b/inc/Registers.h
@@ -261,7 +261,7 @@ private:
 
 	Performance *perf;
 
-	void initCSR(void);
+	void initCSR();
 };
 
 #endif
diff --git a/inc/Timer.h b/inc/Timer.h
index fa6ad68..6068941 100644
--- a/inc/Timer.h
+++ b/inc/Timer.h
@@ -39,7 +39,7 @@ public:
 	 * @brief Constructor
 	 * @param name module name
 	 */
-	Timer(sc_core::sc_module_name const &name);
+	explicit Timer(sc_core::sc_module_name const &name);
 
 	/**
 	 * @brief Waits for event timer_event and triggers an IRQ
@@ -50,7 +50,7 @@ public:
 	 * line.
 	 *
 	 */
-	void run();
+    [[noreturn]] void run();
 
 	/**
 	 *
diff --git a/inc/Trace.h b/inc/Trace.h
index 8364bbb..afa27e7 100644
--- a/inc/Trace.h
+++ b/inc/Trace.h
@@ -36,12 +36,12 @@ public:
 	 * @brief Constructor
 	 * @param name Module name
 	 */
-	Trace(sc_core::sc_module_name const &name);
+	explicit Trace(sc_core::sc_module_name const &name);
 
 	/**
 	 * @brief Destructor
 	 */
-	~Trace();
+	~Trace() override;
 
 private:
 
@@ -51,11 +51,11 @@ private:
 
 	void xtermLaunch(char *slaveName) const;
 	void xtermKill(const char *mess);
-	void xtermSetup(void);
+	void xtermSetup();
 
-	int ptSlave;
-	int ptMaster;
-	int xtermPid;
+	int ptSlave{};
+	int ptMaster{};
+	int xtermPid{};
 };
 
 #endif
diff --git a/src/A_extension.cpp b/src/A_extension.cpp
index 7fdfc0a..85a5351 100644
--- a/src/A_extension.cpp
+++ b/src/A_extension.cpp
@@ -94,7 +94,7 @@ bool A_extension::Exec_A_SC() {
 	mem_addr = regs->getValue(rs1);
 	data = regs->getValue(rs2);
 
-	if (TLB_reserved(mem_addr) == true) {
+	if (TLB_reserved(mem_addr)) {
 		mem_intf->writeDataMem(mem_addr, data, 4);
 		perf->dataMemoryWrite();
 		regs->setValue(rd, 0);  // SC writes 0 to rd on success
diff --git a/src/CPU.cpp b/src/CPU.cpp
index 2db46a1..26af423 100644
--- a/src/CPU.cpp
+++ b/src/CPU.cpp
@@ -113,7 +113,7 @@ bool CPU::cpu_process_IRQ() {
 	return ret_value;
 }
 
-bool CPU::CPU_step(void) {
+bool CPU::CPU_step() {
 
 	bool incPCby2 = false;
 	bool PC_not_affected = false;
@@ -186,11 +186,11 @@ bool CPU::CPU_step(void) {
 	return breakpoint;
 }
 
-void CPU::CPU_thread(void) {
+[[noreturn]] void CPU::CPU_thread() {
 
 	sc_core::sc_time instr_time = default_time;
 
-	while (1) {
+	while (true) {
 
 		/* Process one instruction */
 		CPU_step();
@@ -212,11 +212,11 @@ void CPU::CPU_thread(void) {
 	} // while(1)
 } // CPU_thread
 
-void CPU::call_interrupt(tlm::tlm_generic_payload &trans,
+void CPU::call_interrupt(tlm::tlm_generic_payload &m_trans,
 		sc_core::sc_time &delay) {
 	interrupt = true;
 	/* Socket caller send a cause (its id) */
-	memcpy(&int_cause, trans.get_data_ptr(), sizeof(uint32_t));
+	memcpy(&int_cause, m_trans.get_data_ptr(), sizeof(uint32_t));
 	delay = sc_core::SC_ZERO_TIME;
 }
 
diff --git a/src/Memory.cpp b/src/Memory.cpp
index 1cdcdda..71bb0b4 100644
--- a/src/Memory.cpp
+++ b/src/Memory.cpp
@@ -20,6 +20,7 @@ Memory::Memory(sc_core::sc_module_name const &name, std::string const &filename)
 	//memset(mem, 0, SIZE*sizeof(uint8_t));
 
 	memory_offset = 0;
+    program_counter = 0;
 	readHexFile(filename);
 
 	log = Log::getInstance();
diff --git a/src/Registers.cpp b/src/Registers.cpp
index 6de09a9..3bf6870 100644
--- a/src/Registers.cpp
+++ b/src/Registers.cpp
@@ -21,7 +21,7 @@ Registers::Registers() {
 	register_PC = 0x80000000;       // default _start address
 }
 
-void Registers::dump(void) {
+void Registers::dump() {
 	std::cout << "************************************" << std::endl;
 	std::cout << "Registers dump" << std::dec << std::endl;
 	std::cout << "x0 (zero):  " << std::right << std::setw(11)
diff --git a/src/Timer.cpp b/src/Timer.cpp
index 61734f2..5d89c7d 100644
--- a/src/Timer.cpp
+++ b/src/Timer.cpp
@@ -17,16 +17,16 @@ Timer::Timer(sc_core::sc_module_name const &name) :
 	SC_THREAD(run);
 }
 
-void Timer::run() {
+[[noreturn]] void Timer::run() {
 
-	tlm::tlm_generic_payload *irq_trans = new tlm::tlm_generic_payload;
+	auto *irq_trans = new tlm::tlm_generic_payload;
 	sc_core::sc_time delay = sc_core::SC_ZERO_TIME;
 	uint32_t cause = 1 << 31 | 0x07;	 // Machine timer interrupt
 	irq_trans->set_command(tlm::TLM_WRITE_COMMAND);
 	irq_trans->set_data_ptr(reinterpret_cast<unsigned char*>(&cause));
 	irq_trans->set_data_length(4);
 	irq_trans->set_streaming_width(4);
-	irq_trans->set_byte_enable_ptr(0);
+	irq_trans->set_byte_enable_ptr(nullptr);
 	irq_trans->set_dmi_allowed(false);
 	irq_trans->set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
 	irq_trans->set_address(0);
diff --git a/src/Trace.cpp b/src/Trace.cpp
index 6fa4f73..0814060 100644
--- a/src/Trace.cpp
+++ b/src/Trace.cpp
@@ -64,7 +64,7 @@ void Trace::xtermKill(const char *mess) {
 
 }
 
-void Trace::xtermSetup(void) {
+void Trace::xtermSetup() {
 	ptMaster = open("/dev/ptmx", O_RDWR);
 
 	if (ptMaster != -1) {