diff --git a/Userland/SampleCodeModule/include/libc.h b/Userland/SampleCodeModule/include/libc.h
index 2895664..e92b36e 100644
--- a/Userland/SampleCodeModule/include/libc.h
+++ b/Userland/SampleCodeModule/include/libc.h
@@ -12,7 +12,7 @@ void backspace();
 char getChar();
 void putChar(char c);
 int abs();
-int atoi(char * buffer, int len);
+int atoi(char * buffer);
 int strlen(const char * s);
 void scanf(char * buffer, int maxLen);
 int strcmp(const char * s1, const char * s2);
diff --git a/Userland/SampleCodeModule/libc.c b/Userland/SampleCodeModule/libc.c
index d1c7798..b320939 100644
--- a/Userland/SampleCodeModule/libc.c
+++ b/Userland/SampleCodeModule/libc.c
@@ -153,7 +153,7 @@ char *itoa(int value, char *buffer, int base) {
     return reverse(buffer, 0, i - 1);
 }
 
-int atoi(char *str, int length) {
+int atoi(char *str) {
     int i = 0, sign = 1, val = 0;
     while (str[i] != '\0') {
         if (str[i] == '-') {
diff --git a/Userland/SampleCodeModule/shell/commands/block.c b/Userland/SampleCodeModule/shell/commands/block.c
index 243fda2..4046b0f 100644
--- a/Userland/SampleCodeModule/shell/commands/block.c
+++ b/Userland/SampleCodeModule/shell/commands/block.c
@@ -8,7 +8,7 @@ void block(int argc, char ** argv) {
         // sys_exit();
         return;
     }
-    int pid = atoi(argv[1], MAX_LEN);
+    int pid = atoi(argv[1]);
 
     sys_block(pid);
     // sys_exit();
diff --git a/Userland/SampleCodeModule/shell/commands/help.c b/Userland/SampleCodeModule/shell/commands/help.c
index 93943d6..4bf90b4 100644
--- a/Userland/SampleCodeModule/shell/commands/help.c
+++ b/Userland/SampleCodeModule/shell/commands/help.c
@@ -1,5 +1,5 @@
-// This is a personal academic project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+// This is a personal academic project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include "libc.h"
 #include "shell.h"
 
@@ -22,7 +22,7 @@ void help(int argc, char *argv[]) {
         sys_exit();
     }
 
-    int page = atoi(argv[1], 10);
+    int page = atoi(argv[1]);
     int pages = getCurrentPages();
 
     if (page < 1 || page > pages) {
diff --git a/Userland/SampleCodeModule/shell/commands/kill.c b/Userland/SampleCodeModule/shell/commands/kill.c
index f51841c..ad66ae9 100644
--- a/Userland/SampleCodeModule/shell/commands/kill.c
+++ b/Userland/SampleCodeModule/shell/commands/kill.c
@@ -8,7 +8,7 @@ void kill(int argc, char ** argv) {
         // sys_exit();
         return;
     }
-    int pid = atoi(argv[1], MAX_LEN);
+    int pid = atoi(argv[1]);
 
     sys_kill(pid);
     // sys_exit();
diff --git a/Userland/SampleCodeModule/shell/commands/loop.c b/Userland/SampleCodeModule/shell/commands/loop.c
index e5e4d28..413f10e 100644
--- a/Userland/SampleCodeModule/shell/commands/loop.c
+++ b/Userland/SampleCodeModule/shell/commands/loop.c
@@ -1,14 +1,13 @@
 // This is a personal academic project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include "loop.h"
-#define PUAN -1
 
 void loop(int argc, char *argv[]) {
     if (argc != 3) {
         printStringLen("loop receives an amount of seconds and a text\n", 47);
         sys_exit();
     }
-    int pid = sys_getPid(), secs = atoi(argv[1], PUAN);
+    int pid = sys_getPid(), secs = atoi(argv[1]);
     char * str = argv[2];
     char * buffer = sys_malloc(MAX_PID_LEN);
     buffer = strcat(strcat(itoa(pid, buffer, 10), " "), str);
diff --git a/Userland/SampleCodeModule/shell/commands/nice.c b/Userland/SampleCodeModule/shell/commands/nice.c
index 6caee03..b2cfadf 100644
--- a/Userland/SampleCodeModule/shell/commands/nice.c
+++ b/Userland/SampleCodeModule/shell/commands/nice.c
@@ -7,8 +7,8 @@ void nice(int argc, char ** argv) {
         printStringLen("nice receives a pid and an offset\n", 35);
         sys_exit();
     }
-    int pid = atoi(argv[1], MAX_LEN);
-    char offset = (char) atoi(argv[2], MAX_LEN);
+    int pid = atoi(argv[1]);
+    char offset = (char) atoi(argv[2]);
 
     sys_nice(pid, offset);
     sys_exit();
diff --git a/Userland/SampleCodeModule/shell/commands/phylo.c b/Userland/SampleCodeModule/shell/commands/phylo.c
index b6250c3..e0a357f 100644
--- a/Userland/SampleCodeModule/shell/commands/phylo.c
+++ b/Userland/SampleCodeModule/shell/commands/phylo.c
@@ -33,6 +33,7 @@ void addPhilo() {
     new->buffer = sys_malloc(sizeof(char) * BUFF_SIZE);
     new->state = THINKING;
     char * aux = sys_malloc(sizeof(char) * 20);
+    aux[0] = '\0';
     aux = strcat(aux, "filosofo");
     char buffer[2] = {0};
     aux = strcat(aux, itoa(philoCount, buffer, 10));
@@ -93,7 +94,7 @@ void philosopher(int argc, char ** argv) {
         sys_exit();
     }
     
-    philosopher_t * i = (philosopher_t *) ((uint64_t) atoi(argv[1], -1));
+    philosopher_t * i = (philosopher_t *) ((uint64_t) atoi(argv[1]));
 
     while (1) {
         sys_sleep(1);
@@ -113,7 +114,7 @@ void phylo(int argc, char ** argv) {
     if (argc == 1)
         philoCount = STARTING;
     else if (argc == 2) {
-        philoCount = atoi(argv[1], -1);
+        philoCount = atoi(argv[1]);
         if (philoCount < 1 || philoCount > MAX_PHILO_SIZE) {
             printStringLen("amount of philosofers must be between 1 and 10\n", 48);
             sys_exit();
@@ -130,6 +131,7 @@ void phylo(int argc, char ** argv) {
         phil->buffer = sys_malloc(20);
         phil->state = THINKING;
         char * aux = sys_malloc(sizeof(char) * 20);
+        aux[0] = '\0';
         aux = strcat(aux, "filosofo");
         char buffer[2] = {0};
         aux = strcat(aux, itoa(i, buffer, 10));
@@ -173,9 +175,6 @@ void phylo(int argc, char ** argv) {
         else if (c == 'q') {
             end();
         }
-        // else {
-        //     end();
-        // }
     }
     sys_exit();
 }
diff --git a/Userland/SampleCodeModule/shell/commands/printmem.c b/Userland/SampleCodeModule/shell/commands/printmem.c
index 3ba4f96..4d656f9 100644
--- a/Userland/SampleCodeModule/shell/commands/printmem.c
+++ b/Userland/SampleCodeModule/shell/commands/printmem.c
@@ -24,7 +24,7 @@ void printmem(int argc, char *argv[]) {
 
 	int buffer[8];
 	
-	getMem(buffer, atoi(argv[1], strlen(argv[1])));
+	getMem(buffer, atoi(argv[1]));
 	
 	for (int i = 0; i < 8; i++) {
 		char bufferAux[8];
diff --git a/Userland/SampleCodeModule/shell/commands/test_sync.c b/Userland/SampleCodeModule/shell/commands/test_sync.c
index a5a3833..043b338 100644
--- a/Userland/SampleCodeModule/shell/commands/test_sync.c
+++ b/Userland/SampleCodeModule/shell/commands/test_sync.c
@@ -22,9 +22,9 @@ void inc(int argc, char ** argv) {
     return;
   }
 
-  uint64_t semDir = (uint64_t) atoi(argv[1], 14);
-  int64_t value = atoi(argv[2], 10);
-  uint64_t N = atoi(argv[3], 10);
+  uint64_t semDir = (uint64_t) atoi(argv[1]);
+  int64_t value = atoi(argv[2]);
+  uint64_t N = atoi(argv[3]);
   uint64_t i;
 
   for (i = 0; i < N; i++){
diff --git a/Userland/SampleCodeModule/shell/commands/unblock.c b/Userland/SampleCodeModule/shell/commands/unblock.c
index 4e503bc..506ae34 100644
--- a/Userland/SampleCodeModule/shell/commands/unblock.c
+++ b/Userland/SampleCodeModule/shell/commands/unblock.c
@@ -7,7 +7,7 @@ void unblock(int argc, char ** argv) {
         printStringLen("unblock receives a pid\n", 21);
         sys_exit();
     }
-    int pid = atoi(argv[1], MAX_LEN);
+    int pid = atoi(argv[1]);
 
     sys_unblock(pid);
     sys_exit();