diff --git a/Makefile b/Makefile
index 1ffd83d..bf3d151 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ LDFLAGS= -lc -lpthread
 BINDIR=bin
 SRCDIR=src
 DEBDIR=debian
-OBJ=$(BINDIR)/scheduler.o $(BINDIR)/server.o $(BINDIR)/localthread.o $(BINDIR)/main.o
+OBJ=$(BINDIR)/scheduler.o $(BINDIR)/server.o $(BINDIR)/localworker.o $(BINDIR)/main.o
 
 .DEFAULT_GOAL:= all
 .PHONY: all clean deb
diff --git a/include/localthread.h b/include/localworker.h
similarity index 96%
rename from include/localthread.h
rename to include/localworker.h
index fa36ae8..3ba3250 100644
--- a/include/localthread.h
+++ b/include/localworker.h
@@ -1,5 +1,5 @@
 //=-------------------------------------------------------------------------=//
-//  Scheduler definition                                                     //
+//  Local workers definition                                                 //
 //                                                                           //
 //  Copyright © 2021 The Gem-graph Project                                   //
 //                                                                           //
@@ -22,3 +22,5 @@
 #ifndef BASE_H
     #include "../include/base.h"
 #endif
+
+
diff --git a/include/scheduler.h b/include/scheduler.h
index b10a305..a54fa76 100644
--- a/include/scheduler.h
+++ b/include/scheduler.h
@@ -25,6 +25,19 @@
 
 pthread_t *SchedInit(SchedulerParams_t *parameters);
 
-int SchedWait(pthread_t *schedThread);
+// -------------------------------------------------------------------------- //
+// Scheduler destructor function                                              //
+// -------------------------------------------------------------------------- //
+static inline int SchedDestroy(pthread_t *schedThread)
+{
+    free(schedThread);
+    return 0;
+}
 
-int SchedDestroy(pthread_t *schedThread);
+// -------------------------------------------------------------------------- //
+// Scheduler wait function                                                    //
+// -------------------------------------------------------------------------- //
+static inline void SchedWait(pthread_t *schedThread)
+{
+    pthread_join(*schedThread, NULL);
+}
diff --git a/src/localthread.c b/src/localworker.c
similarity index 100%
rename from src/localthread.c
rename to src/localworker.c
diff --git a/src/main.c b/src/main.c
index 284f70e..6be34a5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,7 @@
 
 void SchedulerCrashTest(void)
 {
-    const int maxthread = 2000;
+    const int maxthread = 16;
 
     SchedulerParams_t *parameters =
         (SchedulerParams_t*) calloc(1, sizeof(SchedulerParams_t));
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 
     free(parameters);
 
-    SchedulerCrashTest();
+    //SchedulerCrashTest();
 
     return 0;
 }
diff --git a/src/scheduler.c b/src/scheduler.c
index c7aa556..cd91c75 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -20,7 +20,7 @@
 //=-------------------------------------------------------------------------=//
 
 #include "../include/base.h"
-#include "../include/localthread.h"
+#include "../include/localworker.h"
 
 static void *GreatScheduler(void *parameters);
 
@@ -36,23 +36,6 @@ pthread_t *SchedInit(SchedulerParams_t *parameters)
     return parameters->id;
 }
 
-// -------------------------------------------------------------------------- //
-// Scheduler destructor function                                              //
-// -------------------------------------------------------------------------- //
-int SchedDestroy(pthread_t *schedThread)
-{
-    free(schedThread);
-    return 0;
-}
-
-// -------------------------------------------------------------------------- //
-// Scheduler wait function                                                    //
-// -------------------------------------------------------------------------- //
-void SchedWait(pthread_t *schedThread)
-{
-    pthread_join(*schedThread, NULL);
-}
-
 // -------------------------------------------------------------------------- //
 // Scheduler thread main function                                             //
 // -------------------------------------------------------------------------- //