small rework in GlobalVars