Removed unneeded v2 variables
Trimmed blank lines and trailing spaces