diff --git a/Src/Exchange.DkimSigner/DkimSigner.cs b/Src/Exchange.DkimSigner/DkimSigner.cs
index 4b56c369..b9d19e3f 100644
--- a/Src/Exchange.DkimSigner/DkimSigner.cs
+++ b/Src/Exchange.DkimSigner/DkimSigner.cs
@@ -151,7 +151,7 @@ private void loadSettings()
                 this.eligibleHeaders.Add("From");
 
             Logger.LogInformation("Exchange DKIM settings loaded: " + config.SigningAlgorithm.ToString() + ", Canonicalization Header Algorithm: " + config.HeaderCanonicalization.ToString() + ", Canonicalization Body Algorithm: " + config.BodyCanonicalization.ToString() + ", Number of domains: " + validDomains.Count);
- 
+
         }
 
         public void watchSettings()
@@ -318,11 +318,11 @@ private string GetBodyHash(Stream stream)
                     bodyText += temp;
                 }
             }
-            
+
             // We have to ignore all empty lines at the end of the message body.
             bodyText = Regex.Replace(bodyText, "(\r?\n)*$", string.Empty);
             bodyText += "\r\n";
-            
+
             bodyBytes = Encoding.ASCII.GetBytes(bodyText);
             hashText = Convert.ToBase64String(this.hashAlgorithm.ComputeHash(bodyBytes));
             stream.Seek(0, SeekOrigin.Begin);
@@ -426,14 +426,14 @@ private IEnumerable<string> GetCanonicalizedHeaders(Stream stream)
                                 if (beforeCount > 0)
                                 {
                                     //now remove them
-                                    header = header.Remove(firstPos-beforeCount,beforeCount);
+                                    header = header.Remove(firstPos - beforeCount, beforeCount);
                                 }
                                 // colon is now at another position
                                 firstPos -= beforeCount;
 
                                 //check how many whitespaces are after the colon
                                 int afterCount = 0;
-                                for (int i = firstPos + 1; i <header.Length; i++)
+                                for (int i = firstPos + 1; i < header.Length; i++)
                                 {
                                     if (header[i] == ' ')
                                         afterCount++;
@@ -443,7 +443,7 @@ private IEnumerable<string> GetCanonicalizedHeaders(Stream stream)
                                 if (afterCount > 0)
                                 {
                                     //now remove them
-                                    header = header.Remove(firstPos + 1,  afterCount);
+                                    header = header.Remove(firstPos + 1, afterCount);
                                 }
                             }
 
@@ -459,7 +459,7 @@ private IEnumerable<string> GetCanonicalizedHeaders(Stream stream)
             }
 
             stream.Seek(0, SeekOrigin.Begin);
-            
+
             return headerNameToLineMap.Values.OrderBy(x => x, StringComparer.Ordinal);
         }