diff --git a/project/Core/Inc/mug.h b/project/Core/Inc/mug.h
index 788610e..a1df453 100644
--- a/project/Core/Inc/mug.h
+++ b/project/Core/Inc/mug.h
@@ -7,7 +7,8 @@
 #ifndef INC_MUG_H_
 #define INC_MUG_H_
 
-/* @brief Initialise MQTT application
+/**
+ *  @brief Initialize MQTT application
  */
 void mug_init(void);
 
diff --git a/project/Core/Src/main.c b/project/Core/Src/main.c
index 6e0105e..9adc667 100644
--- a/project/Core/Src/main.c
+++ b/project/Core/Src/main.c
@@ -133,11 +133,13 @@ int main(void)
 
   /* Initialize the tftp server */
   tftp_server_init();
+
+  /* Initialize the MQTT application */
+  mug_init();
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
-  mug_init();
   while (1)
   {
     /* USER CODE END WHILE */
diff --git a/project/Core/Src/mug.c b/project/Core/Src/mug.c
index b830ca1..193b030 100644
--- a/project/Core/Src/mug.c
+++ b/project/Core/Src/mug.c
@@ -4,10 +4,10 @@
  * @author RobinVdB
  */
 
+#include <string.h>
 #include "mdns.h"
 #include "httpd.h"
 #include "lwip/apps/fs.h"
-#include <string.h>
 #include "lwip/ip_addr.h"
 #include "mqtt.h"
 #include "mug.h"
@@ -18,7 +18,7 @@
 
 //Function prototypes
 static void mqtt_pub_request_cb(void*, err_t);
-static void publish_data(mqtt_client_t* , void*);
+static void publish_data(mqtt_client_t*, void*);
 static void mqtt_incoming_publish_cb(void*, const char*, u32_t);
 static void mqtt_incoming_data_cb(void*, const uint8_t*, u16_t, u8_t);
 static void mqtt_sub_request_cb(void*, err_t);
@@ -62,7 +62,7 @@ static void publish_data(mqtt_client_t *client, void *arg) {
     size_t num_files;
     llfs_file_t file_list[max_files];
     u8_t qos = 2;
-    u8_t retain = 1	;
+    u8_t retain = 1;
 
     LOG_DEBUG(TAG, "Entering publish");
 
@@ -275,7 +275,7 @@ void mug_init(void) {
 /**
  * @brief Reads the color input string and outputs it to a useable value for LCD_APi
  *
- * @param[out] color    define to use with the LCD_API
+ * @return color        define to use with the LCD_API
  * @param[in] color     input string to select a color
  */
 uint32_t color_picker(char* color) {