Minor cleanup
bugfix: use x to iterate over v1, y over v2
minor tweak for git diff
minor cleanup