Use local variable
Minor changes