Revert "Cleaned up some code repetition by creating two new functions set-vx and set-vy"

This reverts commit 1ff24817f5243ea841dd6f514a03baad7521997b.