DRY refactors

Shadowing outer local variable - `v`.