Replace all usages of var with let / const - eslint auto applied (#3444)

Replace all usages of var with let / const - eslint auto applied (#3444) #1208