ui: Clean up local variable shadowing