diff --git a/app/mod_devices/__init__.py b/app/mod_devices/__init__.py
index 167acbf..7e17330 100644
--- a/app/mod_devices/__init__.py
+++ b/app/mod_devices/__init__.py
@@ -1,58 +1,26 @@
 import atexit
 from flask import Blueprint
-from flask_mqtt import Mqtt
 from .. import db
+from .mqtt_client import tear_down_mqtt, setup_mqtt
 
 devices = Blueprint('devices', __name__)
-mqtt = Mqtt()
 
+# Models
 from .models import Recording
 
+# When app dies, stop mqtt connection
 def on_stop():
     tear_down_mqtt()
 
 atexit.register(on_stop)
 
+# Routes
 @devices.route("/")
 def hello():
     return "Hello from devices!"
 
 
 @devices.record
-def setup_mqtt(setup_state):
-    mqtt.init_app(setup_state.app)
-    mqtt.client.on_message = handle_mqtt_message
-    mqtt.client.on_subscribe = handle_subscribe
-    print('MQTT client initialized')
-
-
-def tear_down_mqtt():
-    mqtt.unsubscribe_all()
-    if hasattr(mqtt, 'client') and mqtt.client is not None:
-        mqtt.client.disconnect()
-    print('MQTT client destroyed')
-
-
-@mqtt.on_connect()
-def handle_connect(client, userdata, flags, rc):
-    print('MQTT client connected')
-    mqtt.subscribe('topic/state')
-
-
-@mqtt.on_disconnect()
-def handle_disconnect():
-    print('MQTT client disconnected')
-
-
-def handle_subscribe(client, userdata, mid, granted_qos):
-    print('MQTT client subscribed')
-
-
-def handle_mqtt_message(client, userdata, message):
-    data = dict(
-        topic=message.topic,
-        payload=message.payload.decode()
-    )
-    print(message.payload.decode())
-
+def on_blueprint_setup(setup_state):
+    setup_mqtt(setup_state.app)
 
diff --git a/app/mod_devices/mqtt_client.py b/app/mod_devices/mqtt_client.py
new file mode 100644
index 0000000..886ffa2
--- /dev/null
+++ b/app/mod_devices/mqtt_client.py
@@ -0,0 +1,43 @@
+from flask_mqtt import Mqtt
+
+mqtt = Mqtt()
+
+
+# Mqtt setup
+def setup_mqtt(app):
+    mqtt.init_app(app)
+    mqtt.client.on_message = handle_mqtt_message
+    mqtt.client.on_subscribe = handle_subscribe
+    print('MQTT client initialized')
+
+
+def tear_down_mqtt():
+    mqtt.unsubscribe_all()
+    if hasattr(mqtt, 'client') and mqtt.client is not None:
+        mqtt.client.disconnect()
+    print('MQTT client destroyed')
+
+
+@mqtt.on_connect()
+def handle_connect(client, userdata, flags, rc):
+    print('MQTT client connected')
+    mqtt.subscribe('topic/state')
+
+
+@mqtt.on_disconnect()
+def handle_disconnect():
+    print('MQTT client disconnected')
+
+
+def handle_subscribe(client, userdata, mid, granted_qos):
+    print('MQTT client subscribed')
+
+
+def handle_mqtt_message(client, userdata, message):
+    data = dict(
+        topic=message.topic,
+        payload=message.payload.decode()
+    )
+    print(message.payload.decode())
+
+