Fixed incorrect scoping of variables by eliminating said variables.
Fixed incorrect scoping of variables by eliminating said variables.

sahara-labs/web-interface,jeking3/web-interface,jeking3/web-interface,jeking3/web-interface,sahara-labs/web-interface,sahara-labs/web-interface,jeking3/web-interface