diff --git a/firmware/main/include/controller.h b/firmware/main/include/controller.h
new file mode 100644
index 0000000..3f52dd2
--- /dev/null
+++ b/firmware/main/include/controller.h
@@ -0,0 +1,16 @@
+#ifndef CONTROLLER_H
+#define CONTROLLER_H
+#include <freertos/FreeRTOS.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+esp_err_t controller_init();
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/firmware/main/include/http_client.h b/firmware/main/include/http_client.h
deleted file mode 100644
index ded35ca..0000000
--- a/firmware/main/include/http_client.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef HTTP_CLIENT_H
-#define HTTP_CLIENT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct hc_dev_config {
-};
-
-void hc_test(void);
-bool hc_check_updates();
-bool hc_register();
-struct hc_dev_config hc_get_dev_conf();
-
-bool hc_send_sensor_data(unsigned id, float humidity, float temperature);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/firmware/main/include/leds.h b/firmware/main/include/leds.h
index 5849f43..33bc70a 100644
--- a/firmware/main/include/leds.h
+++ b/firmware/main/include/leds.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 void led_blink_task(void *pvParameter);
-unsigned initLEDs();
+unsigned led_init();
 void led1_on();
 void led2_on();
 void led1_off();
diff --git a/firmware/main/src/http_client.c b/firmware/main/src/controller.c
similarity index 93%
rename from firmware/main/src/http_client.c
rename to firmware/main/src/controller.c
index 6de16bb..f472b5f 100644
--- a/firmware/main/src/http_client.c
+++ b/firmware/main/src/controller.c
@@ -2,20 +2,22 @@
 #include <freertos/task.h>
 #include <esp_system.h>
 #include <esp_log.h>
-#include <esp_event_loop.h>
+//#include <esp_event_loop.h>
 #include <nvs_flash.h>
 #include <esp_wifi.h>
 #include <esp_http_client.h>
 #include <cJSON.h>
 #include <string.h>
-#include "http_client.h"
+#include "controller.h"
 #include "functions.h"
 
 #define MAX_HTTP_OUTPUT_BUFFER 2048
 
-static const char * TAG = "http_client.c";
-
+static const char * TAG = "controller.c";
 
+esp_err_t controller_init() {
+    return ESP_OK;
+}
 
 static esp_err_t http_get_event_handler(esp_http_client_event_t *evt)
 {
@@ -49,24 +51,16 @@ static esp_err_t http_get_event_handler(esp_http_client_event_t *evt)
     return ESP_OK;
 }
 
-/*
-void hc_test()
-{
-    xTaskCreate(&http_get_task, "http_get_task", 16384, NULL, 5, NULL);
-}
-*/
-bool hc_register(unsigned *id) {
+static bool register_device(unsigned *id) {
     static esp_http_client_config_t register_config = {
         .url = "http://tempcontroller.luethi.co/api/config",
         .event_handler = NULL,
         .method = HTTP_METHOD_POST,
     };
-
-
     return 1; //1 as test ID
 }
 
-bool hc_send_sensor_data(unsigned id, float humidity, float temperature) {
+static bool send_sensor_data(unsigned id, float humidity, float temperature) {
     esp_err_t err;
     int content_length = 0;
     char output_buffer[MAX_HTTP_OUTPUT_BUFFER];
diff --git a/firmware/main/src/leds.c b/firmware/main/src/leds.c
index 39699ad..3746045 100644
--- a/firmware/main/src/leds.c
+++ b/firmware/main/src/leds.c
@@ -12,7 +12,7 @@ static const char * TAG = "leds.c";
 
 void led_blink_task(void *pvParameter)
 {
-    initLEDs();
+    led_init();
 
     while (1) {
         //gpio_set_level(LED_INT, 1);
@@ -33,7 +33,7 @@ void led_blink_task(void *pvParameter)
     }
 }
 
-unsigned initLEDs() {
+unsigned led_init() {
     gpio_set_direction(LED1,GPIO_MODE_OUTPUT);
     gpio_set_direction(LED2,GPIO_MODE_OUTPUT);
     //gpio_set_direction(LED_INT,GPIO_MODE_OUTPUT);
diff --git a/firmware/main/src/main.c b/firmware/main/src/main.c
index a8fbd6a..6db75df 100644
--- a/firmware/main/src/main.c
+++ b/firmware/main/src/main.c
@@ -11,7 +11,7 @@
 #include "uart.h"
 #include "wifi.h"
 #include "functions.h"
-#include "http_client.h"
+#include "controller.h"
 
 
 
@@ -22,8 +22,9 @@ void app_main()
 {
     //ESP_ERROR_CHECK(nvs_flash_init());
 
-    //wifi_init();
-    initLEDs();
+    led_init();
+    wifi_init();
+    controller_init();
 
     xTaskCreate(&led_blink_task, "led_blink_task", configMINIMAL_STACK_SIZE, NULL, 5, NULL);
     xTaskCreate(uart_read_task, "uart_read_task", 2048, NULL, 10, NULL);
diff --git a/firmware/main/src/sht31.c b/firmware/main/src/sht31.c
index 42ec997..d76ddad 100644
--- a/firmware/main/src/sht31.c
+++ b/firmware/main/src/sht31.c
@@ -82,7 +82,7 @@ esp_err_t sht31_read_temp_hum(float *temperature, float *humidity)
     cmd = i2c_cmd_link_create();
     i2c_master_start(cmd);
     i2c_master_write_byte(cmd, (SENSOR_ADDR << 1) | I2C_MASTER_READ, true);
-    i2c_master_read(cmd, data, sizeof(data) - 1, I2C_MASTER_ACK);
+    i2c_master_read     (cmd, data,  sizeof(data) - 1, I2C_MASTER_ACK);
     i2c_master_read_byte(cmd, data + sizeof(data) - 1, I2C_MASTER_NACK);
     i2c_master_stop(cmd);
     ret = i2c_master_cmd_begin(I2C_NUM_0, cmd, 1000 / portTICK_RATE_MS);