diff --git a/main/main.cpp b/main/main.cpp
index 00dd65a..85592cb 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "vkvm.hpp"
 #include "internal.hpp"
+#include "vkvm.hpp"
 
 int main() {
     vkvm::initialize(0);
diff --git a/src/demo.cpp b/src/demo.cpp
index 1cc01fc..8773d58 100644
--- a/src/demo.cpp
+++ b/src/demo.cpp
@@ -1,5 +1,6 @@
 #include "demo.h"
 
 int test() {
-    return 42;
+    const int returnValue = 42;
+    return returnValue;
 }
diff --git a/test/test_demo.cpp b/test/test_demo.cpp
index 7cb240e..2d9ce94 100644
--- a/test/test_demo.cpp
+++ b/test/test_demo.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch.hpp>
 #include "../src/demo.h"
+#include <catch2/catch.hpp>
 
 TEST_CASE("Demo test") {
     REQUIRE(test() == 42);