Replaced apparently necessarly local variables