Server config unified in properties file
Client config unified in var block at the top

Minor fixes and code readability improvements