From ffb891b04bf8a4a4207881ad55fd9924c07d5078 Mon Sep 17 00:00:00 2001
From: Parnic <github@parnic.com>
Date: Thu, 21 Feb 2019 15:59:38 -0600
Subject: [PATCH] More minor tweaks

---
 BodyDataStructure.cs            |  2 +-
 HLTime.cs                       |  2 +-
 Messages/ClientLogin.cs         |  2 +-
 Messages/GetControllerConfig.cs |  2 +-
 Messages/HLMessage.cs           | 16 +++++++---------
 PentLightColor.cs               |  4 ++--
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/BodyDataStructure.cs b/BodyDataStructure.cs
index b35da9d..100bd9e 100644
--- a/BodyDataStructure.cs
+++ b/BodyDataStructure.cs
@@ -15,7 +15,7 @@ namespace ScreenLogicConnect
         public byte m_flags;
         public byte m_function;
         public byte m_interface;
-        public String m_name;
+        public string m_name;
         public byte m_nameIndex;
     }
 }
diff --git a/HLTime.cs b/HLTime.cs
index 3a6895f..7dcd265 100644
--- a/HLTime.cs
+++ b/HLTime.cs
@@ -48,7 +48,7 @@ namespace ScreenLogicConnect
             this.millisecond = millisecond;
         }
 
-        public String toString()
+        public string toString()
         {
             return "" + this.month + "/" + this.day + "/" + this.year;
         }
diff --git a/Messages/ClientLogin.cs b/Messages/ClientLogin.cs
index fccdcb1..705d51b 100644
--- a/Messages/ClientLogin.cs
+++ b/Messages/ClientLogin.cs
@@ -10,7 +10,7 @@ namespace ScreenLogicConnect.Messages
         public int m_int;
         public int m_procID;
         public int m_schema;
-        public String m_version;
+        public string m_version;
 
         public const short HLM_CLIENT_LOGIN = 27;
 
diff --git a/Messages/GetControllerConfig.cs b/Messages/GetControllerConfig.cs
index f3130e3..fffbeab 100644
--- a/Messages/GetControllerConfig.cs
+++ b/Messages/GetControllerConfig.cs
@@ -22,7 +22,7 @@ namespace ScreenLogicConnect.Messages
         public byte[] m_MinSetPoint { get; private set; } = new byte[2];
         public byte[] m_PumpCircArray { get; private set; } = new byte[PUM_CIRC_COUNT];
         public int m_ShowAlarms { get; private set; }
-        public String m_genCircuitName { get; private set; }
+        public string m_genCircuitName { get; private set; }
 
         public const short HLM_POOL_GETCTLRCONFIGQ = 12532;
 
diff --git a/Messages/HLMessage.cs b/Messages/HLMessage.cs
index 450ac5a..b23af45 100644
--- a/Messages/HLMessage.cs
+++ b/Messages/HLMessage.cs
@@ -29,24 +29,22 @@ namespace ScreenLogicConnect.Messages
 
         public HLMessage(byte[] headerArray, byte[] dataArray)
         {
-            headerByteStream = new MemoryStream(header);
-            using (var bw = new BinaryWriter(headerByteStream))
+            if (headerArray != null)
             {
-                bw.Write(headerArray);
+                header = new byte[headerArray.Length];
+                Array.Copy(headerArray, header, headerArray.Length);
             }
-
-            this.data = new byte[dataArray.Length];
-            dataByteStream = new MemoryStream(data);
-            using (var bw = new BinaryWriter(dataByteStream))
+            if (dataArray != null)
             {
-                bw.Write(dataArray);
+                data = new byte[dataArray.Length];
+                Array.Copy(dataArray, data, dataArray.Length);
             }
 
             Decode();
         }
 
         public HLMessage(HLMessage msg)
-            : this(msg.header, msg.data)
+            : this(msg != null ? msg.header : null, msg != null ? msg.data : null)
         {
         }
 
diff --git a/PentLightColor.cs b/PentLightColor.cs
index 7c1e69b..fd3dbf1 100644
--- a/PentLightColor.cs
+++ b/PentLightColor.cs
@@ -5,9 +5,9 @@ namespace ScreenLogicConnect
     public class PentLightColor
     {
         public RgbColor color { get; private set; }
-        public String name { get; private set; }
+        public string name { get; private set; }
 
-        public PentLightColor(String name, RgbColor color)
+        public PentLightColor(string name, RgbColor color)
         {
             this.name = name;
             this.color = color;