diff --git a/Demo/BasicTunnel-iOS/AppDelegate.swift b/Demo/BasicTunnel-iOS/AppDelegate.swift
index a1a4f85..242ed2d 100644
--- a/Demo/BasicTunnel-iOS/AppDelegate.swift
+++ b/Demo/BasicTunnel-iOS/AppDelegate.swift
@@ -1,9 +1,9 @@
 //
 //  AppDelegate.swift
-//  BasicTunnel-iOS
+//  Demo
 //
 //  Created by Davide De Rosa on 2/11/17.
-//  Copyright (c) 2018 Davide De Rosa. All rights reserved.
+//  Copyright (c) 2020 Davide De Rosa. All rights reserved.
 //
 //  https://github.com/keeshux
 //
@@ -22,18 +22,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with TunnelKit.  If not, see <http://www.gnu.org/licenses/>.
 //
-//  This file incorporates work covered by the following copyright and
-//  permission notice:
-//
-//      Copyright (c) 2018-Present Private Internet Access
-//
-//      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//
 
 import UIKit
 import NetworkExtension
diff --git a/Demo/BasicTunnel-iOS/ViewController.swift b/Demo/BasicTunnel-iOS/ViewController.swift
index c237f15..0361336 100644
--- a/Demo/BasicTunnel-iOS/ViewController.swift
+++ b/Demo/BasicTunnel-iOS/ViewController.swift
@@ -1,9 +1,9 @@
 //
 //  ViewController.swift
-//  BasicTunnel-iOS
+//  Demo
 //
 //  Created by Davide De Rosa on 2/11/17.
-//  Copyright (c) 2018 Davide De Rosa. All rights reserved.
+//  Copyright (c) 2020 Davide De Rosa. All rights reserved.
 //
 //  https://github.com/keeshux
 //
@@ -22,18 +22,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with TunnelKit.  If not, see <http://www.gnu.org/licenses/>.
 //
-//  This file incorporates work covered by the following copyright and
-//  permission notice:
-//
-//      Copyright (c) 2018-Present Private Internet Access
-//
-//      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//
 
 import UIKit
 import TunnelKit
@@ -59,9 +47,7 @@ class ViewController: UIViewController, URLSessionDataDelegate {
 
     @IBOutlet var textLog: UITextView!
 
-    //
-    
-    let vpn = StandardVPNProvider(bundleIdentifier: tunnelIdentifier)
+    private let vpn = StandardVPNProvider(bundleIdentifier: tunnelIdentifier)
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -82,8 +68,6 @@ class ViewController: UIViewController, URLSessionDataDelegate {
         
         vpn.prepare(completionHandler: nil)
 
-        //
-        
         testFetchRef()
     }
     
diff --git a/Demo/BasicTunnel-macOS/AppDelegate.swift b/Demo/BasicTunnel-macOS/AppDelegate.swift
index e6e0389..ab715ac 100644
--- a/Demo/BasicTunnel-macOS/AppDelegate.swift
+++ b/Demo/BasicTunnel-macOS/AppDelegate.swift
@@ -1,9 +1,9 @@
 //
 //  AppDelegate.swift
-//  BasicTunnel-macOS
+//  Demo
 //
 //  Created by Davide De Rosa on 10/15/17.
-//  Copyright (c) 2018 Davide De Rosa. All rights reserved.
+//  Copyright (c) 2020 Davide De Rosa. All rights reserved.
 //
 //  https://github.com/keeshux
 //
@@ -22,18 +22,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with TunnelKit.  If not, see <http://www.gnu.org/licenses/>.
 //
-//  This file incorporates work covered by the following copyright and
-//  permission notice:
-//
-//      Copyright (c) 2018-Present Private Internet Access
-//
-//      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//
 
 import Cocoa
 import SwiftyBeaver
diff --git a/Demo/BasicTunnel-macOS/Info.plist b/Demo/BasicTunnel-macOS/Info.plist
index 79e38b2..7a7891b 100644
--- a/Demo/BasicTunnel-macOS/Info.plist
+++ b/Demo/BasicTunnel-macOS/Info.plist
@@ -25,7 +25,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright (c) 2018 Davide De Rosa. All rights reserved.</string>
+	<string>Copyright (c) 2020 Davide De Rosa. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>
diff --git a/Demo/BasicTunnel-macOS/ViewController.swift b/Demo/BasicTunnel-macOS/ViewController.swift
index 14add4e..33fa275 100644
--- a/Demo/BasicTunnel-macOS/ViewController.swift
+++ b/Demo/BasicTunnel-macOS/ViewController.swift
@@ -1,9 +1,9 @@
 //
 //  ViewController.swift
-//  BasicTunnel-macOS
+//  Demo
 //
 //  Created by Davide De Rosa on 10/15/17.
-//  Copyright (c) 2018 Davide De Rosa. All rights reserved.
+//  Copyright (c) 2020 Davide De Rosa. All rights reserved.
 //
 //  https://github.com/keeshux
 //
@@ -22,18 +22,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with TunnelKit.  If not, see <http://www.gnu.org/licenses/>.
 //
-//  This file incorporates work covered by the following copyright and
-//  permission notice:
-//
-//      Copyright (c) 2018-Present Private Internet Access
-//
-//      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//
 
 import Cocoa
 import NetworkExtension
@@ -56,9 +44,7 @@ class ViewController: NSViewController {
     
     @IBOutlet var buttonConnection: NSButton!
     
-    //
-    
-    let vpn = StandardVPNProvider(bundleIdentifier: tunnelIdentifier)
+    private let vpn = StandardVPNProvider(bundleIdentifier: tunnelIdentifier)
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -78,8 +64,6 @@ class ViewController: NSViewController {
         
         vpn.prepare(completionHandler: nil)
         
-        //
-        
         testFetchRef()
     }
     
diff --git a/Demo/BasicTunnelExtension-iOS/PacketTunnelProvider.swift b/Demo/BasicTunnelExtension-iOS/PacketTunnelProvider.swift
index 080851b..06c9c3a 100644
--- a/Demo/BasicTunnelExtension-iOS/PacketTunnelProvider.swift
+++ b/Demo/BasicTunnelExtension-iOS/PacketTunnelProvider.swift
@@ -1,9 +1,9 @@
 //
 //  PacketTunnelProvider.swift
-//  BasicTunnel-iOS
+//  Demo
 //
 //  Created by Davide De Rosa on 9/15/17.
-//  Copyright (c) 2018 Davide De Rosa. All rights reserved.
+//  Copyright (c) 2020 Davide De Rosa. All rights reserved.
 //
 //  https://github.com/keeshux
 //
@@ -22,18 +22,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with TunnelKit.  If not, see <http://www.gnu.org/licenses/>.
 //
-//  This file incorporates work covered by the following copyright and
-//  permission notice:
-//
-//      Copyright (c) 2018-Present Private Internet Access
-//
-//      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//
 
 import TunnelKit
 
diff --git a/Demo/BasicTunnelExtension-macOS/Info.plist b/Demo/BasicTunnelExtension-macOS/Info.plist
index 92c3206..f27744e 100644
--- a/Demo/BasicTunnelExtension-macOS/Info.plist
+++ b/Demo/BasicTunnelExtension-macOS/Info.plist
@@ -30,6 +30,6 @@
 		<string>$(PRODUCT_MODULE_NAME).PacketTunnelProvider</string>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright (c) 2018 Davide De Rosa. All rights reserved.</string>
+	<string>Copyright (c) 2020 Davide De Rosa. All rights reserved.</string>
 </dict>
 </plist>
diff --git a/Demo/BasicTunnelExtension-macOS/PacketTunnelProvider.swift b/Demo/BasicTunnelExtension-macOS/PacketTunnelProvider.swift
index f580e24..5664eac 100644
--- a/Demo/BasicTunnelExtension-macOS/PacketTunnelProvider.swift
+++ b/Demo/BasicTunnelExtension-macOS/PacketTunnelProvider.swift
@@ -1,9 +1,9 @@
 //
 //  PacketTunnelProvider.swift
-//  BasicTunnelExtension-macOS
+//  Demo
 //
 //  Created by Davide De Rosa on 10/15/17.
-//  Copyright (c) 2018 Davide De Rosa. All rights reserved.
+//  Copyright (c) 2020 Davide De Rosa. All rights reserved.
 //
 //  https://github.com/keeshux
 //
@@ -22,18 +22,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with TunnelKit.  If not, see <http://www.gnu.org/licenses/>.
 //
-//  This file incorporates work covered by the following copyright and
-//  permission notice:
-//
-//      Copyright (c) 2018-Present Private Internet Access
-//
-//      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//
 
 import TunnelKit
 
diff --git a/Demo/Shared/Configuration.swift b/Demo/Shared/Configuration.swift
index 893f593..97230ec 100644
--- a/Demo/Shared/Configuration.swift
+++ b/Demo/Shared/Configuration.swift
@@ -3,7 +3,7 @@
 //  Demo
 //
 //  Created by Davide De Rosa on 6/13/20.
-//  Copyright (c) 2018 Davide De Rosa. All rights reserved.
+//  Copyright (c) 2020 Davide De Rosa. All rights reserved.
 //
 //  https://github.com/keeshux
 //