diff --git a/.gitignore b/.gitignore
index 378e12e..02b418c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ debug/
 *.jekyll-metadata
 *.cbp
 *.a
+cmake-build-debug/
+CMakeLists.txt
diff --git a/include/wums/defines/relocation_defines.h b/include/wums/defines/relocation_defines.h
index 35b8d0e..39b2a42 100644
--- a/include/wums/defines/relocation_defines.h
+++ b/include/wums/defines/relocation_defines.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stdint.h>
 
 typedef enum RelocationTrampolinStatus{
diff --git a/include/wums/exports.h b/include/wums/exports.h
index 9393a90..ab33721 100644
--- a/include/wums/exports.h
+++ b/include/wums/exports.h
@@ -37,13 +37,13 @@ typedef enum wums_entry_type_t {
 } wums_entry_type_t;
 
 typedef struct wums_entry_t {
-    wums_entry_type_t type;  
+    wums_entry_type_t type;
     const char *name;                       /* name of the export */
-    const void *address;                    /* pointer to the export */   
+    const void *address;                    /* pointer to the export */
 } wums_loader_entry_t;
 
-#define WUMS_EXPORT_FUNCTION(function)   WUMS_EXPORT(WUMS_FUNCTION_EXPORT, function, function);
-#define WUMS_EXPORT_DATA(pointer)        WUMS_EXPORT(WUMS_DATA_EXPORT, pointer, &pointer);
+#define WUMS_EXPORT_FUNCTION(function)   WUMS_EXPORT(WUMS_FUNCTION_EXPORT, function, function)
+#define WUMS_EXPORT_DATA(pointer)        WUMS_EXPORT(WUMS_DATA_EXPORT, pointer, &pointer)
 
 #define WUMS_EXPORT(_type, pointer, value) \
     extern const wums_loader_entry_t wums_entry_##pointer \
diff --git a/include/wums/hooks.h b/include/wums/hooks.h
index 0fc3c0f..6c92fc8 100644
--- a/include/wums/hooks.h
+++ b/include/wums/hooks.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#define WUMS_HOOK_EX(type_def,original_func) \
+#define WUMS_HOOK_EX(type_def, original_func) \
     extern const wums_hook_t wums_hooks_ ## original_func WUMS_SECTION("hooks"); \
     const wums_hook_t wums_hooks_ ## original_func = { \
         .type = type_def, \
@@ -64,11 +64,11 @@ typedef struct wums_hook_t {
 } wums_hook_t;
 
 typedef struct wums_app_init_args_t {
-    module_information_t* module_information;
+    module_information_t *module_information;
 } wums_app_init_args_t;
 
 typedef struct wums_relocs_done_args_t {
-    module_information_t* module_information;
+    module_information_t *module_information;
 } wums_relocs_done_args_t;
 
 #define WUMS_INITIALIZE(myargs) \
@@ -80,7 +80,7 @@ typedef struct wums_relocs_done_args_t {
     void __wums_start(void);\
     WUMS_HOOK_EX(WUMS_HOOK_APPLICATION_STARTS, __wums_start); \
     void __wums_start()
-    
+
 #define WUMS_APPLICATION_ENDS() \
     void __wums_end(void);\
     WUMS_HOOK_EX(WUMS_HOOK_APPLICATION_ENDS, __wums_end); \
@@ -90,7 +90,7 @@ typedef struct wums_relocs_done_args_t {
     void __wums_requests_exit(void);\
     WUMS_HOOK_EX(WUMS_HOOK_APPLICATION_REQUESTS_EXIT, __wums_requests_exit); \
     void __wums_requests_exit()
-        
+
 #define WUMS_RELOCATIONS_DONE(myargs) \
     void __wums_relocations_done(wums_relocs_done_args_t);\
     WUMS_HOOK_EX(WUMS_HOOK_RELOCATIONS_DONE, __wums_relocations_done); \
@@ -112,7 +112,7 @@ typedef struct wums_relocs_done_args_t {
     void on_fini_wut_malloc(){ \
         __fini_wut_malloc(); \
     } \
-    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_MALLOC,on_fini_wut_malloc); \
+    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_MALLOC,on_fini_wut_malloc)
 
 #define WUMS_USE_WUT_DEVOPTAB() \
     __EXTERN_C_MACRO void __init_wut_devoptab(); \
@@ -124,7 +124,7 @@ typedef struct wums_relocs_done_args_t {
     void on_fini_wut_devoptab(){ \
         __fini_wut_devoptab(); \
     }\
-    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_DEVOPTAB,on_fini_wut_devoptab);
+    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_DEVOPTAB,on_fini_wut_devoptab)
 
 #define WUMS_USE_WUT_NEWLIB() \
     __EXTERN_C_MACRO void __init_wut_newlib(); \
@@ -136,7 +136,7 @@ typedef struct wums_relocs_done_args_t {
     void on_fini_wut_newlib(){ \
         __fini_wut_newlib(); \
     }\
-    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_NEWLIB,on_fini_wut_newlib);
+    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_NEWLIB,on_fini_wut_newlib)
 
 #define WUMS_USE_WUT_STDCPP() \
     __EXTERN_C_MACRO void __init_wut_stdcpp(); \
@@ -148,13 +148,13 @@ typedef struct wums_relocs_done_args_t {
     void on_fini_wut_stdcpp(){ \
         __fini_wut_stdcpp(); \
     }\
-    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_STDCPP,on_fini_wut_stdcpp);
+    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_STDCPP,on_fini_wut_stdcpp)
 
 #define WUMS_USE_WUT_SOCKETS() \
     __EXTERN_C_MACRO void __init_wut_socket(); \
     WUMS_HOOK_EX(WUMS_HOOK_INIT_WUT_SOCKETS,__init_wut_socket); \
     __EXTERN_C_MACRO void __fini_wut_socket(); \
-    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_SOCKETS,__fini_wut_socket);
+    WUMS_HOOK_EX(WUMS_HOOK_FINI_WUT_SOCKETS,__fini_wut_socket)
 
 #ifdef __cplusplus
 }
diff --git a/include/wums/meta.h b/include/wums/meta.h
index f303da3..285eeb4 100644
--- a/include/wums/meta.h
+++ b/include/wums/meta.h
@@ -32,7 +32,15 @@
 extern "C" {
 #endif
 
-#define WUMS_MODULE_EXPORT_NAME(x) WUMS_META(export_name, x); WUMS_META(wum, "0.2"); WUMS_USE_WUT_MALLOC() WUMS_USE_WUT_SOCKETS() WUMS_USE_WUT_NEWLIB() WUMS_USE_WUT_STDCPP() WUMS_META(buildtimestamp, __DATE__ " " __TIME__);
+#define WUMS_MODULE_EXPORT_NAME(x) \
+            WUMS_META(export_name, x); \
+            WUMS_META(wum, "0.2");     \
+            WUMS_USE_WUT_MALLOC();     \
+            WUMS_USE_WUT_SOCKETS();    \
+            WUMS_USE_WUT_NEWLIB();      \
+            WUMS_USE_WUT_STDCPP();     \
+            WUMS_META(buildtimestamp, __DATE__ " " __TIME__)
+
 #define WUMS_MODULE_AUTHOR(x)  WUMS_META(author, x)
 #define WUMS_MODULE_VERSION(x) WUMS_META(version, x)
 #define WUMS_MODULE_LICENSE(x) WUMS_META(license, x)