2 files changed, 3 insertions, 5 deletions
diff --git a/src/core/arm/cpu_interrupt_handler.cpp b/src/core/arm/cpu_interrupt_handler.cpp
index 4c717ebe9..9c8898700 100644
--- a/src/core/arm/cpu_interrupt_handler.cpp
+++ b/src/core/arm/cpu_interrupt_handler.cpp
@@ -7,9 +7,7 @@
 
 namespace Core {
 
-CPUInterruptHandler::CPUInterruptHandler() {
-    interrupt_event = std::make_unique<Common::Event>();
-}
+CPUInterruptHandler::CPUInterruptHandler() : interrupt_event{std::make_unique<Common::Event>()} {}
 
 CPUInterruptHandler::~CPUInterruptHandler() = default;
 
@@ -17,7 +15,7 @@ void CPUInterruptHandler::SetInterrupt(bool is_interrupted_) {
     if (is_interrupted_) {
         interrupt_event->Set();
     }
-    this->is_interrupted = is_interrupted_;
+    is_interrupted = is_interrupted_;
 }
 
 void CPUInterruptHandler::AwaitInterrupt() {
diff --git a/src/core/arm/cpu_interrupt_handler.h b/src/core/arm/cpu_interrupt_handler.h
index 61c22fef9..71e582f79 100644
--- a/src/core/arm/cpu_interrupt_handler.h
+++ b/src/core/arm/cpu_interrupt_handler.h
@@ -33,8 +33,8 @@ public:
     void AwaitInterrupt();
 
 private:
-    std::atomic_bool is_interrupted{false};
     std::unique_ptr<Common::Event> interrupt_event;
+    std::atomic_bool is_interrupted{false};
 };
 
 } // namespace Core