...
more cleanup. fix shadowing mistake
...