Removed risky local variable usage