diff --git a/programs/args/src/main.cpp b/programs/args/src/main.cpp
index 5cd9e45c..d3edebd9 100644
--- a/programs/args/src/main.cpp
+++ b/programs/args/src/main.cpp
@@ -12,5 +12,6 @@ int main(int argc, char* argv[]){
     for(size_t i = 0; i < size_t(argc); ++i){
         print_line(argv[i]);
     }
-    exit(0);
+
+    return 0;
 }
diff --git a/programs/bench/src/main.cpp b/programs/bench/src/main.cpp
index f788a65e..6f59c3a5 100644
--- a/programs/bench/src/main.cpp
+++ b/programs/bench/src/main.cpp
@@ -91,5 +91,5 @@ int main(){
         }
     }
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/cat/src/main.cpp b/programs/cat/src/main.cpp
index b3d9e4f7..62d4021f 100644
--- a/programs/cat/src/main.cpp
+++ b/programs/cat/src/main.cpp
@@ -13,7 +13,7 @@
 int main(int argc, char* argv[]){
     if(argc == 1){
         print_line("Usage: cat file_path");
-        exit(1);
+        return 1;
     }
 
     auto fd = open(argv[1]);
@@ -54,5 +54,5 @@ int main(int argc, char* argv[]){
         printf("cat: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
-}
\ No newline at end of file
+    return 0;
+}
diff --git a/programs/cpuid/src/main.cpp b/programs/cpuid/src/main.cpp
index 9934c554..263eafd7 100644
--- a/programs/cpuid/src/main.cpp
+++ b/programs/cpuid/src/main.cpp
@@ -403,5 +403,5 @@ int main(){
     get_cache_info();
     get_deterministic_cache_parameters();
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/date/src/main.cpp b/programs/date/src/main.cpp
index 7d32eafd..768b7873 100644
--- a/programs/date/src/main.cpp
+++ b/programs/date/src/main.cpp
@@ -23,5 +23,5 @@ int main(int, char*[]){
     print(date.minutes);
     print_line();
 
-    exit(0);
-}
\ No newline at end of file
+    return 0;
+}
diff --git a/programs/df/src/main.cpp b/programs/df/src/main.cpp
index 8ded7783..84a8adc0 100644
--- a/programs/df/src/main.cpp
+++ b/programs/df/src/main.cpp
@@ -65,5 +65,5 @@ int main(int argc, char* argv[]){
 
     delete[] buffer;
 
-    exit(0);
-}
\ No newline at end of file
+    return 0;
+}
diff --git a/programs/divzero/src/main.cpp b/programs/divzero/src/main.cpp
index 8575f315..9eab06b8 100644
--- a/programs/divzero/src/main.cpp
+++ b/programs/divzero/src/main.cpp
@@ -12,5 +12,5 @@ volatile int a = 0;
 int main(int /*argc*/, char* /*argv*/[]){
     a = 42 / a;
 
-    exit(a);
+    return a;
 }
diff --git a/programs/keyboard/src/main.cpp b/programs/keyboard/src/main.cpp
index f146c156..7e607024 100644
--- a/programs/keyboard/src/main.cpp
+++ b/programs/keyboard/src/main.cpp
@@ -19,5 +19,5 @@ int main(){
         print(buffer);
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/long/src/main.cpp b/programs/long/src/main.cpp
index 784736ef..4b4b52c5 100644
--- a/programs/long/src/main.cpp
+++ b/programs/long/src/main.cpp
@@ -30,5 +30,5 @@ int main(){
 
     print_line("END");
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/longone/src/main.cpp b/programs/longone/src/main.cpp
index e74c25ed..4cc667af 100644
--- a/programs/longone/src/main.cpp
+++ b/programs/longone/src/main.cpp
@@ -26,5 +26,5 @@ int main(){
         print_line(message);
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/longtwo/src/main.cpp b/programs/longtwo/src/main.cpp
index af2bdd0f..16116296 100644
--- a/programs/longtwo/src/main.cpp
+++ b/programs/longtwo/src/main.cpp
@@ -26,5 +26,5 @@ int main(){
         print_line(message);
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/ls/src/main.cpp b/programs/ls/src/main.cpp
index 5c40f62e..5abaf570 100644
--- a/programs/ls/src/main.cpp
+++ b/programs/ls/src/main.cpp
@@ -69,5 +69,5 @@ int main(int argc, char* argv[]){
         ls_files(argv[1]);
     }
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/lse820/src/main.cpp b/programs/lse820/src/main.cpp
index 8ce1660e..4a20d3a3 100644
--- a/programs/lse820/src/main.cpp
+++ b/programs/lse820/src/main.cpp
@@ -97,5 +97,5 @@ int main(int /*argc*/, char* /*argv*/[]){
         printf("lse820: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/lspci/src/main.cpp b/programs/lspci/src/main.cpp
index 80116211..63f96dc5 100644
--- a/programs/lspci/src/main.cpp
+++ b/programs/lspci/src/main.cpp
@@ -137,5 +137,5 @@ int main(int /*argc*/, char* /*argv*/[]){
         printf("ls: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/mkdir/src/main.cpp b/programs/mkdir/src/main.cpp
index ae3bd204..2c84653f 100644
--- a/programs/mkdir/src/main.cpp
+++ b/programs/mkdir/src/main.cpp
@@ -14,7 +14,7 @@
 int main(int argc, char* argv[]){
     if(argc == 1){
         print_line("Usage: mkdir file_path");
-        exit(1);
+        return 1;
     }
 
     auto result = mkdir(argv[1]);
@@ -23,5 +23,5 @@ int main(int argc, char* argv[]){
         printf("mkdir: error: %s\n", std::error_message(-result));
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/mkfs/src/main.cpp b/programs/mkfs/src/main.cpp
index baa23406..b1475fc6 100644
--- a/programs/mkfs/src/main.cpp
+++ b/programs/mkfs/src/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, char* argv[]){
     if(argc < 3){
         printf("usage: mkfs fs device \n");
 
-        exit(1);
+        return 1;
     }
 
     auto fs_str = argv[1];
@@ -36,7 +36,7 @@ int main(int argc, char* argv[]){
 
         if(!fd.valid()){
             printf("mkfs: open error: %s\n", std::error_message(fd.error()));
-            exit(1);
+            return 1;
         }
 
         // Get the size of the device
@@ -46,7 +46,7 @@ int main(int argc, char* argv[]){
 
         if(code){
             printf("mkfs: ioctl error: %s\n", std::error_message(code));
-            exit(1);
+            return 1;
         }
 
         // Start computing and writing the FAT32 values
@@ -98,7 +98,7 @@ int main(int argc, char* argv[]){
 
         if(!status.valid()){
             printf("mkfs: write error: %s\n", std::error_message(status.error()));
-            exit(1);
+            return 1;
         }
 
         auto fat_is = std::make_unique<fat32::fat_is_t>();
@@ -114,7 +114,7 @@ int main(int argc, char* argv[]){
 
         if(!status.valid()){
             printf("mkfs: write error: %s\n", std::error_message(status.error()));
-            exit(1);
+            return 1;
         }
 
         // Clear the FAT
@@ -124,7 +124,7 @@ int main(int argc, char* argv[]){
 
         if(!status.valid()){
             printf("mkfs: clear error: %s\n", std::error_message(status.error()));
-            exit(1);
+            return 1;
         }
 
         // Write end of chain for cluster 2 (root)
@@ -133,7 +133,7 @@ int main(int argc, char* argv[]){
 
         if(!status.valid()){
             printf("mkfs: write error: %s\n", std::error_message(status.error()));
-            exit(1);
+            return 1;
         }
 
         // Write the root cluster
@@ -154,10 +154,10 @@ int main(int argc, char* argv[]){
             return std::ERROR_FAILED;
         }
 
-        exit(0);
+        return 0;
     }
 
     printf("mkfs: Unsupported filesystem %s\n", fs_str);
 
-    exit(0);
+    return 1;
 }
diff --git a/programs/mount/src/main.cpp b/programs/mount/src/main.cpp
index a9f4bdfe..009eae81 100644
--- a/programs/mount/src/main.cpp
+++ b/programs/mount/src/main.cpp
@@ -43,13 +43,13 @@ int main(int argc, char* argv[]){
 
         delete[] buffer;
 
-        exit(0);
+        return 0;
     }
 
     if(argc < 4){
         printf("usage: mount fs device mountpoint\n");
 
-        exit(1);
+        return 1;
     }
 
     auto fs_str = argv[1];
@@ -64,8 +64,8 @@ int main(int argc, char* argv[]){
         //TODO Mount new directory
     } else {
         printf("mkfs: Unsupported filesystem %s\n", fs_str);
-        exit(1);
+        return 1;
     }
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/odin/src/main.cpp b/programs/odin/src/main.cpp
index a8675860..ff7b47f4 100644
--- a/programs/odin/src/main.cpp
+++ b/programs/odin/src/main.cpp
@@ -153,5 +153,5 @@ int main(int /*argc*/, char* /*argv*/[]){
 
     delete[] buffer;
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/ps/src/main.cpp b/programs/ps/src/main.cpp
index 68e6422b..053f66d6 100644
--- a/programs/ps/src/main.cpp
+++ b/programs/ps/src/main.cpp
@@ -132,5 +132,5 @@ int main(int /*argc*/, char* /*argv*/[]){
         printf("ps: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/readelf/src/main.cpp b/programs/readelf/src/main.cpp
index 56830190..3c93e5a8 100644
--- a/programs/readelf/src/main.cpp
+++ b/programs/readelf/src/main.cpp
@@ -76,7 +76,7 @@ void readelf(char* buffer){
 int main(int argc, char* argv[]){
     if(argc == 1){
         print_line("Usage: readelf file_path");
-        exit(1);
+        return 1;
     }
 
     auto fd = open(argv[1]);
@@ -119,5 +119,5 @@ int main(int argc, char* argv[]){
         printf("readelf: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/reboot/src/main.cpp b/programs/reboot/src/main.cpp
index dbba9475..0d8ef335 100644
--- a/programs/reboot/src/main.cpp
+++ b/programs/reboot/src/main.cpp
@@ -9,5 +9,5 @@
 
 int main(){
     reboot();
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/rm/src/main.cpp b/programs/rm/src/main.cpp
index 038b7774..eb06e14f 100644
--- a/programs/rm/src/main.cpp
+++ b/programs/rm/src/main.cpp
@@ -14,7 +14,7 @@
 int main(int argc, char* argv[]){
     if(argc == 1){
         print_line("Usage: rm file_path");
-        exit(1);
+        return 1;
     }
 
     auto fd = open(argv[1]);
@@ -31,5 +31,5 @@ int main(int argc, char* argv[]){
         printf("rm: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/shutdown/src/main.cpp b/programs/shutdown/src/main.cpp
index 585b0905..5a93f315 100644
--- a/programs/shutdown/src/main.cpp
+++ b/programs/shutdown/src/main.cpp
@@ -10,5 +10,5 @@
 
 int main(){
     shutdown();
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/stat/src/main.cpp b/programs/stat/src/main.cpp
index 99b33544..89d349dc 100644
--- a/programs/stat/src/main.cpp
+++ b/programs/stat/src/main.cpp
@@ -13,7 +13,7 @@
 int main(int argc, char* argv[]){
     if(argc == 1){
         print_line("Usage: stat file_path");
-        exit(1);
+        return 1;
     }
 
     auto fd = open(argv[1]);
@@ -93,5 +93,5 @@ int main(int argc, char* argv[]){
         printf("stat: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/touch/src/main.cpp b/programs/touch/src/main.cpp
index 10813787..5a6f13ed 100644
--- a/programs/touch/src/main.cpp
+++ b/programs/touch/src/main.cpp
@@ -14,7 +14,7 @@
 int main(int argc, char* argv[]){
     if(argc == 1){
         print_line("Usage: touch file_path");
-        exit(1);
+        return 1;
     }
 
     auto fd = open(argv[1], std::OPEN_CREATE);
@@ -25,5 +25,5 @@ int main(int argc, char* argv[]){
         printf("touch: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file
diff --git a/programs/uptime/src/main.cpp b/programs/uptime/src/main.cpp
index d8d276dd..8bd2e81b 100644
--- a/programs/uptime/src/main.cpp
+++ b/programs/uptime/src/main.cpp
@@ -42,5 +42,5 @@ int main(int, char*[]){
         printf("uptime: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/which/src/main.cpp b/programs/which/src/main.cpp
index 825fa029..05e16fad 100644
--- a/programs/which/src/main.cpp
+++ b/programs/which/src/main.cpp
@@ -13,7 +13,7 @@
 int main(int argc, char* argv[]){
     if(argc == 1){
         print_line("Usage: which executable_path");
-        exit(1);
+        return 1;
     }
 
     std::string path(argv[1]);
@@ -36,5 +36,5 @@ int main(int argc, char* argv[]){
         }
     }
 
-    exit(0);
+    return 0;
 }
diff --git a/programs/writer/src/main.cpp b/programs/writer/src/main.cpp
index 6469a193..f9928976 100644
--- a/programs/writer/src/main.cpp
+++ b/programs/writer/src/main.cpp
@@ -14,7 +14,7 @@
 int main(int argc, char* argv[]){
     if(argc == 1){
         print_line("Usage: writer file_path");
-        exit(1);
+        return 1;
     }
 
     auto fd = open(argv[1], std::OPEN_CREATE);
@@ -41,5 +41,5 @@ int main(int argc, char* argv[]){
         printf("writer: error: %s\n", std::error_message(fd.error()));
     }
 
-    exit(0);
+    return 0;
 }
\ No newline at end of file