Replaced apparently necessarly local variables, checking others