Code tidy and avoid single character variables.
Updated hostnames to their MQTT equivalents ready for production.