TONY: Reduce the scope of some more variables