* Move MQTT entity helpers to separate file * Fix imports * Update MQTT number * Review comments * Fix formatting