diff --git a/LibreMetaverse/Messages/MessageEventDecoder.cs b/LibreMetaverse/Messages/MessageEventDecoder.cs
index d82e5bc2..efaed94b 100644
--- a/LibreMetaverse/Messages/MessageEventDecoder.cs
+++ b/LibreMetaverse/Messages/MessageEventDecoder.cs
@@ -101,45 +101,40 @@ namespace OpenMetaverse.Messages
                 case "BulkUpdateInventory": message = new BulkUpdateInventoryMessage(); break;
                 case "RenderMaterials": message = new RenderMaterialsMessage(); break;
                 case "GetObjectCost": message = GetObjectCostMessage.GetMessageHandler(map); break;
-
-                // Capabilities TODO:
-                // DispatchRegionInfo
-                // EstateChangeInfo
-                // EventQueueGet
-                // FetchInventoryDescendents
-                // GroupProposalBallot
-                // MapLayerGod
-                // NewFileAgentInventory
-                // RequestTextureDownload
-                // SearchStatTracking
-                // SendUserReport
-                // SendUserReportWithScreenshot
-                // ServerReleaseNotes
-                // StartGroupProposal
-                // UpdateGestureTaskInventory
-                // UpdateNotecardTaskInventory
-                // ViewerStartAuction
+                
+                // TODO: Capabilities	
+                // DispatchRegionInfo	
+                // EstateChangeInfo	
+                // EventQueueGet	
+                // FetchInventoryDescendents	
+                // GroupProposalBallot	
+                // MapLayerGod	
+                // NewFileAgentInventory	
+                // RequestTextureDownload	
+                // SearchStatTracking	
+                // SendUserReport	
+                // SendUserReportWithScreenshot	
+                // ServerReleaseNotes	
+                // StartGroupProposal	
+                // UpdateGestureTaskInventory	
+                // UpdateNotecardTaskInventory	
+                // ViewerStartAuction	
                 // UntrustedSimulatorMessage
             }
 
-            if (message != null)
+            if (message == null) return null;
+            
+            try
             {
-                try
-                {
-                    message.Deserialize(map);
-                    return message;
-                }
-                catch (Exception e)
-                {
-                    Logger.Log("Exception while trying to Deserialize " + eventName + ":" + e.Message + ": " + e.StackTrace, Helpers.LogLevel.Error);                    
-                }
+                message.Deserialize(map);
+                return message;
+            }
+            catch (Exception e)
+            {
+                Logger.Log("Exception while trying to Deserialize " + eventName + ":" + e.Message + ": " + e.StackTrace, Helpers.LogLevel.Error);                    
+            }
 
-                return null;
-            }
-            else
-            {
-                return null;
-            }
+            return null;
         }
     }
 }
diff --git a/Programs/examples/TestClient/Commands/Inventory/UploadScriptCommand.cs b/Programs/examples/TestClient/Commands/Inventory/UploadScriptCommand.cs
index b35ef070..ca1d5f07 100644
--- a/Programs/examples/TestClient/Commands/Inventory/UploadScriptCommand.cs
+++ b/Programs/examples/TestClient/Commands/Inventory/UploadScriptCommand.cs
@@ -25,68 +25,54 @@ namespace OpenMetaverse.TestClient
         /// The default override for TestClient commands
         /// </summary>
         /// <param name="args"></param>
-        /// <param name="fromAgentID"></param>
+        /// <param name="fromAgentId"></param>
         /// <returns></returns>
-        public override string Execute(string[] args, UUID fromAgentID)
+        public override string Execute(string[] args, UUID fromAgentId)
         {
             if (args.Length < 1)
                 return "Usage: uploadscript filename.lsl";
 
-            string file = args.Aggregate(string.Empty, (current, t) => $"{current}{t} ");
+            var file = args.Aggregate(string.Empty, (current, t) => $"{current}{t} ");
             file = file.TrimEnd();
 
             if (!File.Exists(file))
-            {
                 return $"Filename '{file}' does not exist";
-            }
 
-            string ret = $"Filename: {file}";
+            var ret = $"Filename: {file}";
 
             try
             {
-                using (StreamReader reader = new StreamReader(file))
+                using (var reader = new StreamReader(file))
                 {
-                    string body = reader.ReadToEnd();
-                    string desc = $"{file} created by LibreMetaverse TestClient {DateTime.Now}";
+                    var body = reader.ReadToEnd();
+                    var desc = $"{file} created by OpenMetaverse TestClient {DateTime.Now}";
                     // create the asset
-                    Client.Inventory.RequestCreateItem(Client.Inventory.FindFolderForType(AssetType.LSLText), 
-                        file, desc, AssetType.LSLText, UUID.Random(), InventoryType.LSL, PermissionMask.All,
-                    delegate(bool success, InventoryItem item)
-                    {
-                        if (success)
-                            // upload the asset
-                            Client.Inventory.RequestUpdateScriptAgentInventory(EncodeScript(body), item.UUID, true, 
-                                delegate(bool uploadSuccess, string uploadStatus, bool compileSuccess, List<string> compileMessages, UUID itemid, UUID assetid)
-                                {
-                                    if (uploadSuccess)
-                                        ret += $" Script successfully uploaded, ItemID {itemid} AssetID {assetid}";
-                                    if (compileSuccess)
-                                        ret += " compilation successful";
-
-                                });
-                    });
+                    Client.Inventory.RequestCreateItem(Client.Inventory.FindFolderForType(AssetType.LSLText),
+                        file, desc, AssetType.LSLText, UUID.Random(),
+                        InventoryType.LSL, PermissionMask.All, (success, item) =>
+                        {
+                            if (success)
+                                // upload the asset
+                                Client.Inventory.RequestUpdateScriptAgentInventory(
+                                    System.Text.Encoding.UTF8.GetBytes(body), item.UUID, true,
+                                    (uploadSuccess, uploadStatus, compileSuccess, compileMessages, itemId, assetId) =>
+                                    {
+                                        if (uploadSuccess)
+                                            ret += $" Script successfully uploaded, ItemID {itemId} AssetID {assetId}";
+                                        if (compileSuccess)
+                                            ret += " compilation successful";
+                                    });
+                        });
                 }
                 return ret;
 
             }
-            catch (System.Exception e)
+            catch (Exception e)
             {
                 Logger.Log(e.ToString(), Helpers.LogLevel.Error, Client);
                 return $"Error creating script for {ret}";
             }
         }
-        /// <summary>
-        /// Encodes the script text for uploading
-        /// </summary>
-        /// <param name="body"></param>
-        public static byte[] EncodeScript(string body)
-        {
-            // Assume this is a string, add 1 for the null terminator ?
-            byte[] stringBytes = System.Text.Encoding.UTF8.GetBytes(body);
-            byte[] assetData = new byte[stringBytes.Length]; //+ 1];
-            Array.Copy(stringBytes, 0, assetData, 0, stringBytes.Length);
-            return assetData;
-        }
     }
 
 }