changes on variable names; cleaning global scope