tweak/clean up mqtt a bit