Code cleaning and optimisation
default value to host dns name