diff --git a/ExtensionMethods.cs b/ExtensionMethods.cs
index a993359..6f93193 100644
--- a/ExtensionMethods.cs
+++ b/ExtensionMethods.cs
@@ -56,7 +56,7 @@ namespace ScreenLogicConnect
                 }
                 else
                 {
-                    return default(TResult);
+                    return default;
                 }
             }
         }
diff --git a/UnitConnection.cs b/UnitConnection.cs
index 17fce2a..c67598f 100644
--- a/UnitConnection.cs
+++ b/UnitConnection.cs
@@ -42,7 +42,7 @@ namespace ScreenLogicConnect
             }
 
             Debug.WriteLine("sending login message");
-            stream.SendHLMessage(createLoginMessage(new HLEncoder(password).GetEncryptedPassword(challengeStr)));
+            stream.SendHLMessage(CreateLoginMessage(new HLEncoder(password).GetEncryptedPassword(challengeStr)));
 
             readBytes = stream.Read(recvBuf, 0, recvBuf.Length);
             Debug.WriteLine("read {0}", readBytes);
@@ -109,7 +109,7 @@ namespace ScreenLogicConnect
             return new Messages.HLMessage(headerBuffer, dataBuffer);
         }
 
-        private static string connectionMessage = "CONNECTSERVERHOST\r\n\r\n";
+        private const string connectionMessage = "CONNECTSERVERHOST\r\n\r\n";
         private byte[] CreateConnectServerSoftMessage()
         {
             using (var ms = new MemoryStream())
@@ -123,7 +123,7 @@ namespace ScreenLogicConnect
             }
         }
 
-        private Messages.HLMessage createLoginMessage(byte[] encodedPwd)
+        private Messages.HLMessage CreateLoginMessage(byte[] encodedPwd)
         {
             Messages.ClientLogin login = Messages.ClientLogin.QUERY(0);
             login.m_schema = 348;