diff --git a/iothub/device/src/Authentication/AuthenticationWithTokenRefresh.cs b/iothub/device/src/Authentication/AuthenticationWithTokenRefresh.cs
index fdadf99485..38d5df8fb6 100644
--- a/iothub/device/src/Authentication/AuthenticationWithTokenRefresh.cs
+++ b/iothub/device/src/Authentication/AuthenticationWithTokenRefresh.cs
@@ -49,7 +49,7 @@ public AuthenticationWithTokenRefresh(
         /// may choose to ignore this value.</param>
         /// <param name="timeBufferPercentage">Time buffer before expiry when the token should be renewed expressed as
         /// a percentage of the time to live.</param>
-        /// <param name="disposeWithClient "><c>true</c> if the authentication method should be disposed of by the client
+        /// <param name="disposeWithClient"><c>true</c> if the authentication method should be disposed of by the client
         /// when the client using this instance is itself disposed; <c>false</c> if you intend to reuse the authentication method.</param>
         public AuthenticationWithTokenRefresh(
             int suggestedTimeToLiveSeconds,
diff --git a/iothub/device/src/Authentication/DeviceAuthenticationWithTokenRefresh.cs b/iothub/device/src/Authentication/DeviceAuthenticationWithTokenRefresh.cs
index ba01dd380a..9bcd81ec97 100644
--- a/iothub/device/src/Authentication/DeviceAuthenticationWithTokenRefresh.cs
+++ b/iothub/device/src/Authentication/DeviceAuthenticationWithTokenRefresh.cs
@@ -65,9 +65,9 @@ public DeviceAuthenticationWithTokenRefresh(
         /// <param name="timeBufferPercentage">
         /// The time buffer before expiry when the token should be renewed, expressed as a percentage of the time to live.
         /// The default behavior is that the token will be renewed when it has 15% or less of its lifespan left.
-        ///</param>
-        ///<param name="disposeWithClient ">
-        ///<c>true</c> if the authentication method should be disposed of by the client
+        /// </param>
+        /// <param name="disposeWithClient">
+        /// <c>true</c> if the authentication method should be disposed of by the client
         /// when the client using this instance is itself disposed; <c>false</c> if you intend to reuse the authentication method.
         /// </param>
         public DeviceAuthenticationWithTokenRefresh(
diff --git a/iothub/device/src/Authentication/DeviceAuthenticationWithTpm.cs b/iothub/device/src/Authentication/DeviceAuthenticationWithTpm.cs
index d831873b6b..dcfa5e33fd 100644
--- a/iothub/device/src/Authentication/DeviceAuthenticationWithTpm.cs
+++ b/iothub/device/src/Authentication/DeviceAuthenticationWithTpm.cs
@@ -62,7 +62,7 @@ public DeviceAuthenticationWithTpm(
         /// <param name="suggestedTimeToLiveSeconds">Token time to live suggested value.</param>
         /// <param name="timeBufferPercentage">Time buffer before expiry when the token should be renewed expressed as percentage of
         /// the time to live. EX: If you want a SAS token to live for 85% of life before proactive renewal, this value should be 15.</param>
-        /// <param name="disposeWithClient "><c>true</c> if the authentication method should be disposed of by the client
+        /// <param name="disposeWithClient"><c>true</c> if the authentication method should be disposed of by the client
         /// when the client using this instance is itself disposed; <c>false</c> if you intend to reuse the authentication method.</param>
         public DeviceAuthenticationWithTpm(
             string deviceId,
diff --git a/iothub/device/src/Authentication/ModuleAuthenticationWithTokenRefresh.cs b/iothub/device/src/Authentication/ModuleAuthenticationWithTokenRefresh.cs
index a1e5f7bff6..3da22d04c1 100644
--- a/iothub/device/src/Authentication/ModuleAuthenticationWithTokenRefresh.cs
+++ b/iothub/device/src/Authentication/ModuleAuthenticationWithTokenRefresh.cs
@@ -71,9 +71,9 @@ public ModuleAuthenticationWithTokenRefresh(
         /// <param name="timeBufferPercentage">
         /// The time buffer before expiry when the token should be renewed, expressed as a percentage of the time to live.
         /// The default behavior is that the token will be renewed when it has 15% or less of its lifespan left.
-        ///</param>
-        ///<param name="disposeWithClient ">
-        ///<c>true</c> if the authentication method should be disposed of by the client
+        /// </param>
+        /// <param name="disposeWithClient">
+        /// <c>true</c> if the authentication method should be disposed of by the client
         /// when the client using this instance is itself disposed; <c>false</c> if you intend to reuse the authentication method.
         /// </param>
         public ModuleAuthenticationWithTokenRefresh(