Refactoring vpn