Small code tidy.
Totally reworked how the token is stored and added mqttId.