Remove unused @location variable
Avoid shadowing an enclosing scope variable