diff --git a/remoteapp-tool/HelpSystem.vb b/remoteapp-tool/HelpSystem.vb
index f9061c3..2156e9b 100644
--- a/remoteapp-tool/HelpSystem.vb
+++ b/remoteapp-tool/HelpSystem.vb
@@ -1,13 +1,12 @@
 Module HelpSystem
     Public Sub SetupTips(TheForm As Windows.Forms.Form)
+        Dim toolTip1 As New ToolTip With {
+            .AutoPopDelay = 10000,
+            .InitialDelay = 500,
+            .ReshowDelay = 500
+        }
 
-        Dim toolTip1 As New ToolTip()
-
-        toolTip1.AutoPopDelay = 10000
-        toolTip1.InitialDelay = 500
-        toolTip1.ReshowDelay = 500
-
-        Dim HelpString As String = ""
+        Dim HelpString As String
 
         For Each Control As Control In TheForm.Controls
             For Each SubControl As Control In Control.Controls
@@ -57,7 +56,6 @@
         Return TipFile
     End Function
 
-
     Private Function GetBuiltInTips() As String
         Dim Tips As String = ""
 
diff --git a/remoteapp-tool/RemoteAppCreateClientConnection.vb b/remoteapp-tool/RemoteAppCreateClientConnection.vb
index 98acc43..3499474 100644
--- a/remoteapp-tool/RemoteAppCreateClientConnection.vb
+++ b/remoteapp-tool/RemoteAppCreateClientConnection.vb
@@ -284,10 +284,10 @@ Public Class RemoteAppCreateClientConnection
 
     Private Sub CreateRDPFile(RDPPath As String, RemoteApp As RemoteAppLib.RemoteApp)
 
-        Dim App As New RemoteAppLib.RemoteApp
-        App = RemoteApp
+        'Dim App As New RemoteAppLib.RemoteApp = RemoteApp
+        'App = RemoteApp
         Dim FileTypeAssociations As RemoteAppLib.FileTypeAssociationCollection
-        FileTypeAssociations = App.FileTypeAssociations
+        FileTypeAssociations = RemoteApp.FileTypeAssociations
 
         Dim ServerAddress = Me.ServerAddress.Text
         Dim AltServerAddress = Me.AltServerAddress.Text
@@ -296,17 +296,16 @@ Public Class RemoteAppCreateClientConnection
         Dim FlatFileTypes = ""
         If Not FileTypeAssociations Is Nothing Then FlatFileTypes = FileTypeAssociations.GetFlatFileTypes
 
-        Dim RDPfile As New RDPFileLib.RDPFile
-        RDPfile.full_address = ServerAddress
-        RDPfile.alternate_full_address = AltServerAddress
-        RDPfile.server_port = Val(ServerPort)
-
-        RDPfile.remoteapplicationname = App.FullName
-        RDPfile.remoteapplicationprogram = "||" & App.Name
-        RDPfile.remoteapplicationmode = 1
-        RDPfile.disableremoteappcapscheck = 1
-
-        RDPfile.alternate_shell = "rdpinit.exe"
+        Dim RDPfile As New RDPFileLib.RDPFile With {
+            .full_address = ServerAddress,
+            .alternate_full_address = AltServerAddress,
+            .server_port = Val(ServerPort),
+            .remoteapplicationname = RemoteApp.FullName,
+            .remoteapplicationprogram = "||" & RemoteApp.Name,
+            .remoteapplicationmode = 1,
+            .disableremoteappcapscheck = 1,
+            .alternate_shell = "rdpinit.exe"
+        }
 
         If UseRDGatewayCheckBox.Checked Then
             RDPfile.gatewayhostname = Me.GatewayAddress.Text