1 files changed, 11 insertions, 21 deletions

diff --git a/RSSDP/DisposableManagedObjectBase.cs b/RSSDP/DisposableManagedObjectBase.cs
index 0f656fb46..5d7da4124 100644
--- a/RSSDP/DisposableManagedObjectBase.cs
+++ b/RSSDP/DisposableManagedObjectBase.cs
@@ -1,18 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Rssdp.Infrastructure
 {
     /// <summary>
-    /// Correclty implements the <see cref="IDisposable"/> interface and pattern for an object containing only managed resources, and adds a few common niceities not on the interface such as an <see cref="IsDisposed"/> property.
+    /// Correctly implements the <see cref="IDisposable"/> interface and pattern for an object containing only managed resources, and adds a few common niceties not on the interface such as an <see cref="IsDisposed"/> property.
     /// </summary>
     public abstract class DisposableManagedObjectBase : IDisposable
     {
-
-        #region Public Methods
-
         /// <summary>
         /// Override this method and dispose any objects you own the lifetime of if disposing is true;
         /// </summary>
@@ -27,13 +24,12 @@ namespace Rssdp.Infrastructure
         /// <seealso cref="Dispose()"/>
         protected virtual void ThrowIfDisposed()
         {
-            if (this.IsDisposed) throw new ObjectDisposedException(this.GetType().FullName);
+            if (this.IsDisposed)
+            {
+                throw new ObjectDisposedException(this.GetType().FullName);
+            }
         }
 
-        #endregion
-
-        #region Public Properties
-
         /// <summary>
         /// Sets or returns a boolean indicating whether or not this instance has been disposed.
         /// </summary>
@@ -44,19 +40,17 @@ namespace Rssdp.Infrastructure
             private set;
         }
 
-        #endregion
-
         public string BuildMessage(string header, Dictionary<string, string> values)
         {
             var builder = new StringBuilder();
 
-            const string argFormat = "{0}: {1}\r\n";
+            const string ArgFormat = "{0}: {1}\r\n";
 
-            builder.AppendFormat("{0}\r\n", header);
+            builder.AppendFormat(CultureInfo.InvariantCulture, "{0}\r\n", header);
 
             foreach (var pair in values)
             {
-                builder.AppendFormat(argFormat, pair.Key, pair.Value);
+                builder.AppendFormat(CultureInfo.InvariantCulture, ArgFormat, pair.Key, pair.Value);
             }
 
             builder.Append("\r\n");
@@ -64,23 +58,19 @@ namespace Rssdp.Infrastructure
             return builder.ToString();
         }
 
-        #region IDisposable Members
-
         /// <summary>
         /// Disposes this object instance and all internally managed resources.
         /// </summary>
         /// <remarks>
-        /// <para>Sets the <see cref="IsDisposed"/> property to true. Does not explicitly throw an exception if called multiple times, but makes no promises about behaviour of derived classes.</para>
+        /// <para>Sets the <see cref="IsDisposed"/> property to true. Does not explicitly throw an exception if called multiple times, but makes no promises about behavior of derived classes.</para>
         /// </remarks>
         /// <seealso cref="IsDisposed"/>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification="We do exactly as asked, but CA doesn't seem to like us also setting the IsDisposed property. Too bad, it's a good idea and shouldn't cause an exception or anything likely to interfer with the dispose process.")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification = "We do exactly as asked, but CA doesn't seem to like us also setting the IsDisposed property. Too bad, it's a good idea and shouldn't cause an exception or anything likely to interfere with the dispose process.")]
         public void Dispose()
         {
             IsDisposed = true;
 
             Dispose(true);
         }
-
-        #endregion
     }
 }