diff --git a/LibreMetaverse.StructuredData/JSON/JsonException.cs b/LibreMetaverse.StructuredData/JSON/JsonException.cs
index 38f695b5..72ff939e 100644
--- a/LibreMetaverse.StructuredData/JSON/JsonException.cs
+++ b/LibreMetaverse.StructuredData/JSON/JsonException.cs
@@ -17,7 +17,7 @@ namespace LitJson
     [Serializable]
     public class JsonException : ApplicationException
     {
-        public JsonException () : base ()
+        public JsonException ()
         {
         }
 
diff --git a/LibreMetaverse.StructuredData/LLSD/NotationLLSD.cs b/LibreMetaverse.StructuredData/LLSD/NotationLLSD.cs
index 4d47dfda..57f67e96 100644
--- a/LibreMetaverse.StructuredData/LLSD/NotationLLSD.cs
+++ b/LibreMetaverse.StructuredData/LLSD/NotationLLSD.cs
@@ -290,7 +290,7 @@ namespace OpenMetaverse.StructuredData
             }
             int integer;
             if (!Int32.TryParse(s.ToString(), out integer))
-                throw new OSDException("Notation LLSD parsing: Can't parse integer value." + s.ToString());
+                throw new OSDException("Notation LLSD parsing: Can't parse integer value." + s);
 
             return OSD.FromInteger(integer);
         }
@@ -315,7 +315,7 @@ namespace OpenMetaverse.StructuredData
             }
             double dbl;
             if (!Utils.TryParseDouble(s.ToString(), out dbl))
-                throw new OSDException("Notation LLSD parsing: Can't parse real value: " + s.ToString());
+                throw new OSDException("Notation LLSD parsing: Can't parse real value: " + s);
 
             return OSD.FromReal(dbl);
         }
diff --git a/LibreMetaverse.StructuredData/StructuredData.cs b/LibreMetaverse.StructuredData/StructuredData.cs
index af4911c9..f9df46c6 100644
--- a/LibreMetaverse.StructuredData/StructuredData.cs
+++ b/LibreMetaverse.StructuredData/StructuredData.cs
@@ -65,7 +65,7 @@ namespace OpenMetaverse.StructuredData
     public class OSDException : Exception
     {
         public OSDException(string message) : base(message) { }
-        public OSDException() : base() { }
+        public OSDException() { }
         public OSDException(string message, Exception innerException) : base(message, innerException) { }
         protected OSDException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { }     
     }
diff --git a/LibreMetaverse/AgentManager.cs b/LibreMetaverse/AgentManager.cs
index 3df688c9..2e020885 100644
--- a/LibreMetaverse/AgentManager.cs
+++ b/LibreMetaverse/AgentManager.cs
@@ -4108,7 +4108,7 @@ namespace OpenMetaverse
             }
             else
             {
-                Logger.Log("Got EstablishAgentCommunication for " + sim.ToString(),
+                Logger.Log("Got EstablishAgentCommunication for " + sim,
                     Helpers.LogLevel.Info, Client);
 
                 sim.SetSeedCaps(msg.SeedCapability.ToString());
diff --git a/LibreMetaverse/AssetManager.cs b/LibreMetaverse/AssetManager.cs
index a42bfa21..1f16593b 100644
--- a/LibreMetaverse/AssetManager.cs
+++ b/LibreMetaverse/AssetManager.cs
@@ -204,7 +204,6 @@ namespace OpenMetaverse
         internal ManualResetEvent HeaderReceivedEvent = new ManualResetEvent(false);
 
         public AssetDownload()
-            : base()
         {
             nextPacket = 0;
             outOfOrderPackets = new InternalDictionary<int, byte[]>();
diff --git a/LibreMetaverse/Assets/Asset.cs b/LibreMetaverse/Assets/Asset.cs
index 69bd0d1d..4ee95116 100644
--- a/LibreMetaverse/Assets/Asset.cs
+++ b/LibreMetaverse/Assets/Asset.cs
@@ -58,14 +58,14 @@ namespace OpenMetaverse.Assets
         /// <summary>
         /// Construct a new Asset object
         /// </summary>
-        public Asset() { }
+        protected Asset() { }
 
         /// <summary>
         /// Construct a new Asset object
         /// </summary>
         /// <param name="assetID">A unique <see cref="UUID"/> specific to this asset</param>
         /// <param name="assetData">A byte array containing the raw asset data</param>
-        public Asset(UUID assetID, byte[] assetData)
+        protected Asset(UUID assetID, byte[] assetData)
         {
             _AssetID = assetID;
             AssetData = assetData;
diff --git a/LibreMetaverse/Assets/AssetTypes/AssetPrim.cs b/LibreMetaverse/Assets/AssetTypes/AssetPrim.cs
index 7a4dfb4e..00855401 100644
--- a/LibreMetaverse/Assets/AssetTypes/AssetPrim.cs
+++ b/LibreMetaverse/Assets/AssetTypes/AssetPrim.cs
@@ -75,10 +75,7 @@ namespace OpenMetaverse.Assets
         public AssetPrim(PrimObject parent, List<PrimObject> children)
         {
             Parent = parent;
-            if (children != null)
-                Children = children;
-            else
-                Children = new List<PrimObject>(0);
+            Children = children ?? new List<PrimObject>(0);
         }
 
         /// <summary>
diff --git a/LibreMetaverse/Assets/AssetTypes/AssetWearable.cs b/LibreMetaverse/Assets/AssetTypes/AssetWearable.cs
index 8917eca6..c1f3411e 100644
--- a/LibreMetaverse/Assets/AssetTypes/AssetWearable.cs
+++ b/LibreMetaverse/Assets/AssetTypes/AssetWearable.cs
@@ -64,12 +64,12 @@ namespace OpenMetaverse.Assets
         public Dictionary<AvatarTextureIndex, UUID> Textures = new Dictionary<AvatarTextureIndex, UUID>();
 
         /// <summary>Initializes a new instance of an AssetWearable object</summary>
-        public AssetWearable() { }
+        protected AssetWearable() { }
 
         /// <summary>Initializes a new instance of an AssetWearable object with parameters</summary>
         /// <param name="assetID">A unique <see cref="UUID"/> specific to this asset</param>
         /// <param name="assetData">A byte array containing the raw asset data</param>
-        public AssetWearable(UUID assetID, byte[] assetData) : base(assetID, assetData) { }
+        protected AssetWearable(UUID assetID, byte[] assetData) : base(assetID, assetData) { }
 
         /// <summary>
         /// Decode an assets byte encoded data to a string
diff --git a/LibreMetaverse/Caps.cs b/LibreMetaverse/Caps.cs
index 467c2e06..dbc6126b 100644
--- a/LibreMetaverse/Caps.cs
+++ b/LibreMetaverse/Caps.cs
@@ -344,7 +344,7 @@ namespace OpenMetaverse
                         incomingPacket.Simulator = Simulator;
                         incomingPacket.Packet = packet;
 
-                        Logger.DebugLog($"Serializing " + packet.Type + " capability with generic handler", 
+                        Logger.DebugLog("Serializing " + packet.Type + " capability with generic handler", 
                             Simulator.Client);
 
                         Simulator.Client.Network.PacketInbox.Enqueue(incomingPacket);
diff --git a/LibreMetaverse/DownloadManager.cs b/LibreMetaverse/DownloadManager.cs
index 58702885..bdc76b06 100644
--- a/LibreMetaverse/DownloadManager.cs
+++ b/LibreMetaverse/DownloadManager.cs
@@ -137,7 +137,7 @@ namespace OpenMetaverse
             if (request.ServicePoint.ConnectionLimit < Settings.MAX_HTTP_CONNECTIONS)
             {
                 Logger.Log(
-                    $"In DownloadManager.SetupRequest() setting conn limit for " +
+                    "In DownloadManager.SetupRequest() setting conn limit for " +
                     $"{address.Host}:{address.Port} to {Settings.MAX_HTTP_CONNECTIONS}", Helpers.LogLevel.Debug);
                 request.ServicePoint.ConnectionLimit = Settings.MAX_HTTP_CONNECTIONS;
             }
@@ -183,7 +183,7 @@ namespace OpenMetaverse
                                 activeDownload.ProgresHandlers.Add(item.DownloadProgressCallback);
                             }
 
-                            Logger.DebugLog("Requesting " + item.Address.ToString());
+                            Logger.DebugLog("Requesting " + item.Address);
                             activeDownload.Request = SetupRequest(item.Address, item.ContentType);
                             CapsBase.DownloadDataAsync(
                                 activeDownload.Request,
diff --git a/LibreMetaverse/EventDictionary.cs b/LibreMetaverse/EventDictionary.cs
index b38b6112..bfb4f832 100644
--- a/LibreMetaverse/EventDictionary.cs
+++ b/LibreMetaverse/EventDictionary.cs
@@ -149,7 +149,7 @@ namespace OpenMetaverse
                     try { callback.Callback(this, new PacketReceivedEventArgs(packet, simulator)); }
                     catch (Exception ex)
                     {
-                        Logger.Log("Default packet event handler: " + ex.ToString(), Helpers.LogLevel.Error, Client);
+                        Logger.Log("Default packet event handler: " + ex, Helpers.LogLevel.Error, Client);
                     }
                 }
             }
@@ -169,7 +169,7 @@ namespace OpenMetaverse
                     try { callback.Callback(this, new PacketReceivedEventArgs(packet, simulator)); }
                     catch (Exception ex)
                     {
-                        Logger.Log("Packet event handler: " + ex.ToString(), Helpers.LogLevel.Error, Client);
+                        Logger.Log("Packet event handler: " + ex, Helpers.LogLevel.Error, Client);
                     }
                 }
 
@@ -192,7 +192,7 @@ namespace OpenMetaverse
             }
             catch (Exception ex)
             {
-                Logger.Log("Async Packet Event Handler: " + ex.ToString(), Helpers.LogLevel.Error, Client);
+                Logger.Log("Async Packet Event Handler: " + ex, Helpers.LogLevel.Error, Client);
             }
         }
     }
@@ -288,7 +288,7 @@ namespace OpenMetaverse
                 if (callback != null)
                 {
                     try { callback(capsEvent, message, simulator); }
-                    catch (Exception ex) { Logger.Log("CAPS Event Handler: " + ex.ToString(), Helpers.LogLevel.Error, Client); }
+                    catch (Exception ex) { Logger.Log("CAPS Event Handler: " + ex, Helpers.LogLevel.Error, Client); }
                 }
             }
 
@@ -296,7 +296,7 @@ namespace OpenMetaverse
             if (_EventTable.TryGetValue(capsEvent, out callback) && callback != null)
             {
                 try { callback(capsEvent, message, simulator); }
-                catch (Exception ex) { Logger.Log("CAPS Event Handler: " + ex.ToString(), Helpers.LogLevel.Error, Client); }
+                catch (Exception ex) { Logger.Log("CAPS Event Handler: " + ex, Helpers.LogLevel.Error, Client); }
 
                 specialHandler = true;
             }
@@ -361,7 +361,7 @@ namespace OpenMetaverse
             }
             catch (Exception ex)
             {
-                Logger.Log("Async CAPS Event Handler: " + ex.ToString(), Helpers.LogLevel.Error, Client);
+                Logger.Log("Async CAPS Event Handler: " + ex, Helpers.LogLevel.Error, Client);
             }
         }
     }
diff --git a/LibreMetaverse/GroupManager.cs b/LibreMetaverse/GroupManager.cs
index cae0f837..6a9ef66d 100644
--- a/LibreMetaverse/GroupManager.cs
+++ b/LibreMetaverse/GroupManager.cs
@@ -1635,7 +1635,7 @@ namespace OpenMetaverse
                 ret = Client.Network.CurrentSim.Caps.CapabilityURI("GroupAPIv1");
                 if (ret != null)
                 {
-                    ret = new Uri($"{ret.ToString()}?group_id={groupID.ToString()}");
+                    ret = new Uri($"{ret}?group_id={groupID.ToString()}");
                 }
             }
 
diff --git a/LibreMetaverse/Imaging/BakeLayer.cs b/LibreMetaverse/Imaging/BakeLayer.cs
index a74618fe..86b39e3b 100644
--- a/LibreMetaverse/Imaging/BakeLayer.cs
+++ b/LibreMetaverse/Imaging/BakeLayer.cs
@@ -272,7 +272,7 @@ namespace OpenMetaverse.Imaging
                         {
                             if (!MaskBelongsToBake(kvp.Key.TGAFile)) continue;
 
-                            if (kvp.Key.MultiplyBlend == true && (kvp.Value > 0f || !kvp.Key.SkipIfZero))
+                            if (kvp.Key.MultiplyBlend && (kvp.Value > 0f || !kvp.Key.SkipIfZero))
                             {
                                 ApplyAlpha(combinedMask, kvp.Key, kvp.Value);
                                 //File.WriteAllBytes(bakeType + "-layer-" + i + "-mask-" + addedMasks + ".tga", combinedMask.ExportTGA());
@@ -520,7 +520,7 @@ namespace OpenMetaverse.Imaging
         {
             ManagedImage src = LoadResourceLayer(param.TGAFile);
 
-            if (dest == null || src == null || src.Alpha == null) return;
+            if (dest == null || src?.Alpha == null) return;
 
             if ((dest.Channels & ManagedImage.ImageChannels.Alpha) == 0)
             {
diff --git a/LibreMetaverse/Interfaces/IRendering.cs b/LibreMetaverse/Interfaces/IRendering.cs
index ade34f6f..d0a916db 100644
--- a/LibreMetaverse/Interfaces/IRendering.cs
+++ b/LibreMetaverse/Interfaces/IRendering.cs
@@ -36,7 +36,6 @@ namespace OpenMetaverse.Rendering
         private string _name;
 
         public RendererNameAttribute(string name)
-            : base()
         {
             _name = name;
         }
diff --git a/LibreMetaverse/Inventory.cs b/LibreMetaverse/Inventory.cs
index 29098d2e..8f73e274 100644
--- a/LibreMetaverse/Inventory.cs
+++ b/LibreMetaverse/Inventory.cs
@@ -38,7 +38,7 @@ namespace OpenMetaverse
     [Serializable]
     public class InventoryException : Exception
     {
-        public InventoryException() : base() { }
+        public InventoryException() { }
         public InventoryException(string message) : base(message) { }
         protected InventoryException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
         public InventoryException(string message, Exception innerException) : base(message, innerException) { }
diff --git a/LibreMetaverse/InventoryBase.cs b/LibreMetaverse/InventoryBase.cs
index dc272d48..a7c8c529 100644
--- a/LibreMetaverse/InventoryBase.cs
+++ b/LibreMetaverse/InventoryBase.cs
@@ -25,7 +25,7 @@ namespace OpenMetaverse
         /// Constructor, takes an itemID as a parameter
         /// </summary>
         /// <param name="itemID">The <seealso cref="OpenMetaverse.UUID"/> of the item</param>
-        public InventoryBase(UUID itemID)
+        protected InventoryBase(UUID itemID)
         {
             if (itemID == UUID.Zero)
                 Logger.Log("Initializing an InventoryBase with UUID.Zero", Helpers.LogLevel.Warning);
diff --git a/LibreMetaverse/InventoryManager.cs b/LibreMetaverse/InventoryManager.cs
index 10faca66..1840fc6c 100644
--- a/LibreMetaverse/InventoryManager.cs
+++ b/LibreMetaverse/InventoryManager.cs
@@ -875,7 +875,7 @@ namespace OpenMetaverse
             catch (Exception ex)
             {
                 Logger.Log($"Failed to fetch inventory descendants: {ex.Message}\n" +
-                           $"{ex.StackTrace.ToString()}",
+                           $"{ex.StackTrace}",
                            Helpers.LogLevel.Warning, Client);
                 foreach (var f in batch)
                 {
@@ -4052,7 +4052,7 @@ namespace OpenMetaverse
 
                 Logger.Log(
                     $"MoveInventoryItemHandler: Item {data.ItemID.ToString()} is moving to Folder {data.FolderID.ToString()} with new name \"{newName}\"." +
-                    $" Someone write this function!", 
+                    " Someone write this function!", 
                     Helpers.LogLevel.Warning, Client);
             }
         }
diff --git a/LibreMetaverse/Messages/LindenMessages.cs b/LibreMetaverse/Messages/LindenMessages.cs
index bc2033f6..6a49f45c 100644
--- a/LibreMetaverse/Messages/LindenMessages.cs
+++ b/LibreMetaverse/Messages/LindenMessages.cs
@@ -4442,7 +4442,7 @@ namespace OpenMetaverse.Messages.Linden
             {
                 Objects = new Object[array.Count];
 
-                for (int i = 0; i < array.Count; i++)
+                for (int i = 0; i < array.Count; ++i)
                 {
                     Object obj = new Object();
                     OSDMap objMap = array[i] as OSDMap;
diff --git a/LibreMetaverse/NameValue.cs b/LibreMetaverse/NameValue.cs
index 45b8509b..a165b73f 100644
--- a/LibreMetaverse/NameValue.cs
+++ b/LibreMetaverse/NameValue.cs
@@ -223,7 +223,7 @@ namespace OpenMetaverse
                 {
                     string newLine = (i < values.Length - 1) ? "\n" : String.Empty;
                     output.AppendFormat("{0} {1} {2} {3} {4}{5}", value.Name, TypeStrings[(int)value.Type],
-                        ClassStrings[(int)value.Class], SendtoStrings[(int)value.Sendto], value.Value.ToString(), newLine);
+                        ClassStrings[(int)value.Class], SendtoStrings[(int)value.Sendto], value.Value, newLine);
                 }
             }
 
diff --git a/LibreMetaverse/ObjectPool.cs b/LibreMetaverse/ObjectPool.cs
index 75a42679..f0bc74ac 100644
--- a/LibreMetaverse/ObjectPool.cs
+++ b/LibreMetaverse/ObjectPool.cs
@@ -107,7 +107,6 @@ namespace OpenMetaverse
         /// <param name="itemsPerSegment"></param>
         /// <param name="minSegments"></param>
         public PacketBufferPool(IPEndPoint endPoint, int itemsPerSegment, int minSegments)
-            : base()
         {
             _endPoint = endPoint;
             Initialize(itemsPerSegment, minSegments, true, 1000 * 60 * 5);
diff --git a/LibreMetaverse/ObjectPoolBase.cs b/LibreMetaverse/ObjectPoolBase.cs
index cc935e01..e563862d 100644
--- a/LibreMetaverse/ObjectPoolBase.cs
+++ b/LibreMetaverse/ObjectPoolBase.cs
@@ -194,7 +194,7 @@ namespace OpenMetaverse
                     for (int i = _activeSegment; i > 0; i--)
                     {
                         ObjectPoolSegment<T> segment;
-                        if (_segments.TryGetValue(i, out segment) == true)
+                        if (_segments.TryGetValue(i, out segment))
                         {
                             // For the "old" segments that were allocated at startup, this will
                             // always be false, as their expiration dates are set at infinity. 
@@ -287,7 +287,7 @@ namespace OpenMetaverse
                 for (int i = 0; i < _activeSegment; i++)
                 {
                     ObjectPoolSegment<T> segment;
-                    if (_segments.TryGetValue(i, out segment) == true)
+                    if (_segments.TryGetValue(i, out segment))
                     {
                         if (segment.AvailableItems > 0)
                         {
diff --git a/LibreMetaverse/PacketDecoder.cs b/LibreMetaverse/PacketDecoder.cs
index aaa516bb..8a1856e5 100644
--- a/LibreMetaverse/PacketDecoder.cs
+++ b/LibreMetaverse/PacketDecoder.cs
@@ -827,7 +827,7 @@ namespace OpenMetaverse.Packets
 
                     for (int i = 0; i < lines.Length; i++)
                     {
-                        if (!String.IsNullOrEmpty(lines[i]))
+                        if (!string.IsNullOrEmpty(lines[i]))
                         {
                             NameValue nv = new NameValue(lines[i]);
                             nameValues[i] = nv;
diff --git a/LibreMetaverse/ParcelManager.cs b/LibreMetaverse/ParcelManager.cs
index 064ed6df..dd0d48ac 100644
--- a/LibreMetaverse/ParcelManager.cs
+++ b/LibreMetaverse/ParcelManager.cs
@@ -1743,7 +1743,7 @@ namespace OpenMetaverse
         /// <remarks>Raises the <see cref="ParcelDwellReply"/> event</remarks>
         protected void ParcelDwellReplyHandler(object sender, PacketReceivedEventArgs e)
         {            
-            if (m_DwellReply != null || Client.Settings.ALWAYS_REQUEST_PARCEL_DWELL == true)
+            if (m_DwellReply != null || Client.Settings.ALWAYS_REQUEST_PARCEL_DWELL)
             {
                 Packet packet = e.Packet;
                 Simulator simulator = e.Simulator;
@@ -1789,7 +1789,7 @@ namespace OpenMetaverse
                 GlobalY = info.Data.GlobalY,
                 GlobalZ = info.Data.GlobalZ,
                 ID = info.Data.ParcelID,
-                Mature = ((info.Data.Flags & 1) != 0) ? true : false,
+                Mature = ((info.Data.Flags & 1) != 0),
                 Name = Utils.BytesToString(info.Data.Name),
                 OwnerID = info.Data.OwnerID,
                 SalePrice = info.Data.SalePrice,
@@ -1929,7 +1929,7 @@ namespace OpenMetaverse
         /// <remarks>Raises the <see cref="ParcelAccessListReply"/> event</remarks>
         protected void ParcelAccessListReplyHandler(object sender, PacketReceivedEventArgs e)
         {
-            if (m_ParcelACL != null || Client.Settings.ALWAYS_REQUEST_PARCEL_ACL == true)
+            if (m_ParcelACL != null || Client.Settings.ALWAYS_REQUEST_PARCEL_ACL)
             {
                 Packet packet = e.Packet;
                 Simulator simulator = e.Simulator;
@@ -2031,11 +2031,11 @@ namespace OpenMetaverse
             ParcelMediaUpdatePacket reply = (ParcelMediaUpdatePacket)packet;
             ParcelMedia media = new ParcelMedia
             {
-                MediaAutoScale = (reply.DataBlock.MediaAutoScale == (byte) 0x1) ? true : false,
+                MediaAutoScale = (reply.DataBlock.MediaAutoScale == (byte) 0x1),
                 MediaID = reply.DataBlock.MediaID,
                 MediaDesc = Utils.BytesToString(reply.DataBlockExtended.MediaDesc),
                 MediaHeight = reply.DataBlockExtended.MediaHeight,
-                MediaLoop = ((reply.DataBlockExtended.MediaLoop & 1) != 0) ? true : false,
+                MediaLoop = ((reply.DataBlockExtended.MediaLoop & 1) != 0),
                 MediaType = Utils.BytesToString(reply.DataBlockExtended.MediaType),
                 MediaWidth = reply.DataBlockExtended.MediaWidth,
                 MediaURL = Utils.BytesToString(reply.DataBlock.MediaURL)
@@ -2073,7 +2073,7 @@ namespace OpenMetaverse
             else
             {
                 Logger.Log("Parcel overlay with sequence ID of " + overlay.ParcelData.SequenceID +
-                    " received from " + simulator.ToString(), Helpers.LogLevel.Warning, Client);
+                    " received from " + simulator, Helpers.LogLevel.Warning, Client);
             }
         }
 
diff --git a/LibreMetaverse/Rendering/LindenMesh.cs b/LibreMetaverse/Rendering/LindenMesh.cs
index cd421b27..c199ae1e 100644
--- a/LibreMetaverse/Rendering/LindenMesh.cs
+++ b/LibreMetaverse/Rendering/LindenMesh.cs
@@ -42,7 +42,7 @@ namespace OpenMetaverse.Rendering
     {
         const string MeshHeader = "Linden Binary Mesh 1.0";
         const string MorphFooter = "End Morphs";
-        public LindenSkeleton Skeleton { get; private set; }    //!< The skeleton used to animate this mesh
+        public LindenSkeleton Skeleton { get; }    //!< The skeleton used to animate this mesh
 
         #region Mesh Structs
 
diff --git a/LibreMetaverse/Simulator.cs b/LibreMetaverse/Simulator.cs
index 156e147f..7dc7df22 100644
--- a/LibreMetaverse/Simulator.cs
+++ b/LibreMetaverse/Simulator.cs
@@ -125,6 +125,7 @@ namespace OpenMetaverse
     /// <summary>
     /// Access level for a simulator
     /// </summary>
+    [Flags]
     public enum SimAccess : byte
     {
         /// <summary>Unknown or invalid access level</summary>
diff --git a/LibreMetaverse/Voice/VoiceGateway.cs b/LibreMetaverse/Voice/VoiceGateway.cs
index 16ccb608..202792b3 100644
--- a/LibreMetaverse/Voice/VoiceGateway.cs
+++ b/LibreMetaverse/Voice/VoiceGateway.cs
@@ -99,10 +99,7 @@ namespace OpenMetaverse.Voice
 
                     Logger.DebugLog("Voice folder: " + daemonProcess.StartInfo.WorkingDirectory);
                     Logger.DebugLog(path + " " + args);
-                    bool ok = true;
-
-                    if (!File.Exists(path))
-                        ok = false;
+                    bool ok = File.Exists(path);
 
                     if (ok)
                     {
@@ -249,7 +246,7 @@ namespace OpenMetaverse.Voice
                 sb.Append("\n\n\n");
 
 #if DEBUG
-                Logger.Log("Request: " + sb.ToString(), Helpers.LogLevel.Debug);
+                Logger.Log("Request: " + sb, Helpers.LogLevel.Debug);
 #endif
                 try
                 {
diff --git a/LibreMetaverse/Voice/VoiceParticipant.cs b/LibreMetaverse/Voice/VoiceParticipant.cs
index 873f7185..135d9a2f 100644
--- a/LibreMetaverse/Voice/VoiceParticipant.cs
+++ b/LibreMetaverse/Voice/VoiceParticipant.cs
@@ -65,11 +65,9 @@ namespace OpenMetaverse.Voice
         {
             // The "name" may actually be a SIP URI such as: "sip:xFnPP04IpREWNkuw1cOXlhw==@bhr.vivox.com"
             // If it is, convert to a bare name before doing the transform.
-            string name = nameFromsipURI(inName);
+            string name = nameFromsipURI(inName) ?? inName;
 
             // Doesn't look like a SIP URI, assume it's an actual name.
-            if (name == null)
-                name = inName;
 
             // This will only work if the name is of the proper form.
             // As an example, the account name for Monroe Linden (UUID 1673cfd3-8229-4445-8d92-ec3570e5e587) is:
diff --git a/LibreMetaverseTypes/BlockingQueue.cs b/LibreMetaverseTypes/BlockingQueue.cs
index b3d37beb..f596cc3c 100644
--- a/LibreMetaverseTypes/BlockingQueue.cs
+++ b/LibreMetaverseTypes/BlockingQueue.cs
@@ -65,7 +65,6 @@ namespace OpenMetaverse
         /// Create new BlockingQueue.
         /// </summary>
         public BlockingQueue()
-            : base()
         {
             _syncRoot = new object();
             _open = true;
diff --git a/LibreMetaverseTypes/ReaderWriterLockSlim.cs b/LibreMetaverseTypes/ReaderWriterLockSlim.cs
index 014a799f..c9d2b01a 100644
--- a/LibreMetaverseTypes/ReaderWriterLockSlim.cs
+++ b/LibreMetaverseTypes/ReaderWriterLockSlim.cs
@@ -50,7 +50,6 @@ namespace OpenMetaverse
     public class LockRecursionException : Exception
     {
         public LockRecursionException()
-            : base()
         {
         }
 
@@ -419,36 +418,21 @@ namespace OpenMetaverse
             {
                 EnterMyLock();
                 LockDetails ld = GetReadLockDetails(Thread.CurrentThread.ManagedThreadId, false);
-                int count = ld == null ? 0 : ld.ReadLocks;
+                int count = ld?.ReadLocks ?? 0;
                 ExitMyLock();
                 return count;
             }
         }
 
-        public int RecursiveUpgradeCount
-        {
-            get { return upgradable_thread == Thread.CurrentThread ? 1 : 0; }
-        }
+        public int RecursiveUpgradeCount => upgradable_thread == Thread.CurrentThread ? 1 : 0;
 
-        public int RecursiveWriteCount
-        {
-            get { return write_thread == Thread.CurrentThread ? 1 : 0; }
-        }
+        public int RecursiveWriteCount => write_thread == Thread.CurrentThread ? 1 : 0;
 
-        public int WaitingReadCount
-        {
-            get { return (int)numReadWaiters; }
-        }
+        public int WaitingReadCount => (int)numReadWaiters;
 
-        public int WaitingUpgradeCount
-        {
-            get { return (int)numUpgradeWaiters; }
-        }
+        public int WaitingUpgradeCount => (int)numUpgradeWaiters;
 
-        public int WaitingWriteCount
-        {
-            get { return (int)numWriteWaiters; }
-        }
+        public int WaitingWriteCount => (int)numWriteWaiters;
 
         #region Private methods
         void EnterMyLock()
@@ -478,7 +462,7 @@ namespace OpenMetaverse
             myLock = 0;
         }
 
-        bool MyLockHeld { get { return myLock != 0; } }
+        bool MyLockHeld => myLock != 0;
 
         /// <summary>
         /// Determines the appropriate events to set, leaves the locks, and sets the events. 
@@ -496,7 +480,7 @@ namespace OpenMetaverse
                 upgradeEvent.Set();
                 //
                 // TODO: What does the following comment mean?
-                // two threads upgrading is a guarenteed deadlock, so we throw in that case. 
+                // two threads upgrading is a guaranteed deadlock, so we throw in that case. 
             }
             else if (owners == 0 && numWriteWaiters > 0)
             {
diff --git a/LibreMetaverseTypes/Utils.cs b/LibreMetaverseTypes/Utils.cs
index 4c839408..1f54b75a 100644
--- a/LibreMetaverseTypes/Utils.cs
+++ b/LibreMetaverseTypes/Utils.cs
@@ -366,7 +366,7 @@ namespace OpenMetaverse
             foreach (byte b in hash)
                 digest.AppendFormat(Utils.EnUsCulture, "{0:x2}", b);
 
-            return "$1$" + digest.ToString();
+            return "$1$" + digest;
         }
 
         /// <summary>