Fixed multiple suggestions of same variable
Improved extraction of local variable names