diff --git a/src/DataGridExtensions/ApplyInitialSorting.cs b/src/DataGridExtensions/Behaviors/ApplyInitialSortingBehavior.cs
similarity index 95%
rename from src/DataGridExtensions/ApplyInitialSorting.cs
rename to src/DataGridExtensions/Behaviors/ApplyInitialSortingBehavior.cs
index 0537eb8..eec5f04 100644
--- a/src/DataGridExtensions/ApplyInitialSorting.cs
+++ b/src/DataGridExtensions/Behaviors/ApplyInitialSortingBehavior.cs
@@ -1,4 +1,4 @@
-namespace DataGridExtensions
+namespace DataGridExtensions.Behaviors
 {
     using System;
     using System.Collections.Generic;
@@ -58,7 +58,7 @@ private void SortDescriptions_CollectionChanged(object? sender, NotifyCollection
             PersistLastKnownSortDescriptions();
         }
 
-        private void ItemsSource_Changed(object sender, EventArgs e)
+        private void ItemsSource_Changed(object? sender, EventArgs e)
         {
             try
             {
diff --git a/src/DataGridExtensions/DataGridFilter.cs b/src/DataGridExtensions/DataGridFilter.cs
index 3bf811a..27b4b78 100644
--- a/src/DataGridExtensions/DataGridFilter.cs
+++ b/src/DataGridExtensions/DataGridFilter.cs
@@ -14,6 +14,8 @@ public static class DataGridFilter
         /// <summary>
         /// Gets if the default filters are automatically attached to each column.
         /// </summary>
+        /// <param name="dataGrid">The data grid.</param>
+        /// <returns><c>true</c> is auto-filtering is enabled.</returns>
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static bool GetIsAutoFilterEnabled(this DataGrid dataGrid)
         {
@@ -47,6 +49,8 @@ private static void IsAutoFilterEnabled_Changed(DependencyObject sender, Depende
         /// Filter attached property to attach the DataGridFilterHost instance to the owning DataGrid.
         /// This property is only used by code and is not accessible from XAML.
         /// </summary>
+        /// <param name="dataGrid">The data grid.</param>
+        /// <returns></returns>
         public static DataGridFilterHost GetFilter(this DataGrid dataGrid)
         {
             var value = (DataGridFilterHost)dataGrid.GetValue(FilterProperty);
@@ -163,17 +167,17 @@ public static void SetResourceLocator(this DataGrid dataGrid, IResourceLocator?
 
 
         /// <summary>
-        /// Gets the value of the <see cref="P:DataGridExtensions.GlobalFilter"/> attached property from a given <see cref="DataGrid"/>.
+        /// Gets the value of the <see cref="P:DataGridExtensions.DataGridFilter.GlobalFilter"/> attached property from a given <see cref="DataGrid"/>.
         /// </summary>
         /// <param name="dataGrid">The <see cref="DataGrid"/> from which to read the property value.</param>
-        /// <returns>the value of the <see cref="P:DataGridExtensions.GlobalFilter"/> attached property.</returns>
+        /// <returns>the value of the <see cref="P:DataGridExtensions.DataGridFilter.GlobalFilter"/> attached property.</returns>
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static Predicate<object?>? GetGlobalFilter(DataGrid dataGrid)
         {
             return (Predicate<object?>?)dataGrid.GetValue(GlobalFilterProperty);
         }
         /// <summary>
-        /// Sets the value of the <see cref="P:DataGridExtensions.GlobalFilter" /> attached property to a given <see cref="DataGrid" />.
+        /// Sets the value of the <see cref="P:DataGridExtensions.DataGridFilter.GlobalFilter" /> attached property to a given <see cref="DataGrid" />.
         /// </summary>
         /// <param name="dataGrid">The <see cref="DataGrid" /> on which to set the property value.</param>
         /// <param name="value">The property value to set.</param>
@@ -182,7 +186,7 @@ public static void SetGlobalFilter(DataGrid dataGrid, Predicate<object?>? value)
             dataGrid.SetValue(GlobalFilterProperty, value);
         }
         /// <summary>
-        /// Identifies the <see cref="P:DataGridExtensions.GlobalFilter"/> dependency property.
+        /// Identifies the <see cref="P:DataGridExtensions.DataGridFilter.GlobalFilter"/> dependency property.
         /// </summary>
         /// <AttachedPropertyComments>
         /// <summary>
diff --git a/src/DataGridExtensions/DataGridFilteringEventArgs.cs b/src/DataGridExtensions/DataGridFilteringEventArgs.cs
index 4716056..0571249 100644
--- a/src/DataGridExtensions/DataGridFilteringEventArgs.cs
+++ b/src/DataGridExtensions/DataGridFilteringEventArgs.cs
@@ -6,7 +6,7 @@
 
     /// <summary>
     /// Notification about additional columns to be filtered.
-    /// Clients can e.g. use this event to cache/preload column data in a different thread and/or display a wait cursor while filtering.
+    /// Clients can e.g. use this event to cache/pre-load column data in a different thread and/or display a wait cursor while filtering.
     /// <remarks>
     /// Clients may only cancel the processing when e.g. the data grid is about to be unloaded. Canceling the process of filtering 
     /// will cause the UI to be inconsistent.
@@ -14,7 +14,6 @@
     /// </summary>
     public class DataGridFilteringEventArgs : CancelEventArgs
     {
-        /// <inheritdoc />
         /// <summary>
         /// Initializes a new instance of the <see cref="T:DataGridExtensions.DataGridFilteringEventArgs" /> class.
         /// </summary>
diff --git a/src/DataGridExtensions/Tools.cs b/src/DataGridExtensions/Tools.cs
index 7bbde52..38d8274 100644
--- a/src/DataGridExtensions/Tools.cs
+++ b/src/DataGridExtensions/Tools.cs
@@ -5,6 +5,8 @@
     using System.Windows.Controls;
     using System.Windows.Input;
 
+    using DataGridExtensions.Behaviors;
+
     /// <summary>
     /// Some useful tools for data grids.
     /// </summary>