renamed variable, removed variables from global scope