diff --git a/Project/applications/smartcities/include/buffer.h b/Project/applications/smartcities/include/buffer.h
index dd0a9ec..3146667 100644
--- a/Project/applications/smartcities/include/buffer.h
+++ b/Project/applications/smartcities/include/buffer.h
@@ -1,7 +1,3 @@
-
-
-
-
 #ifndef BUFFER_H
 #define BUFFER_H
 
diff --git a/Project/applications/smartcities/include/callbacks.h b/Project/applications/smartcities/include/callbacks.h
index b3d2b21..89b8ca1 100644
--- a/Project/applications/smartcities/include/callbacks.h
+++ b/Project/applications/smartcities/include/callbacks.h
@@ -1,5 +1,5 @@
-#ifndef MODULE_H
-#define MODULE_H
+#ifndef CALLBACKS_H
+#define CALLBACKS_H
 
 #include "libwismart.h"
 
diff --git a/Project/applications/smartcities/include/module.h b/Project/applications/smartcities/include/module.h
index dbda733..ede47e5 100644
--- a/Project/applications/smartcities/include/module.h
+++ b/Project/applications/smartcities/include/module.h
@@ -1,11 +1,10 @@
 #ifndef MODULE_H
 #define MODULE_H
 
-typedef struct module_info module; 
-struct module_info {
+typedef struct {
   char* ID;
   char* geoloc;
-};
+} module;
 
 extern module mod;
 
diff --git a/Project/applications/smartcities/include/sensors.h b/Project/applications/smartcities/include/sensors.h
index b4192e4..cc11e46 100644
--- a/Project/applications/smartcities/include/sensors.h
+++ b/Project/applications/smartcities/include/sensors.h
@@ -4,13 +4,12 @@
 #include <stdint.h>
 
 
-typedef struct sensor_info sensor;
-struct sensor_info {
+typedef struct {
   uint8_t ID;
   char* description;
   char* type;
   char* unit;
-};
+} sensor;
 
 extern sensor humidity_sensor;