Server variable should be come from config file
Code re-formatting