remove unnecessary variable shadowing