Non-functional change - conform to our coding style and make more readbale
(hopefully) by not using variables with names "v" and "w".