Remove variable shadowing