Merge "Readability improvements to the Vpn class with no logic changes"