diff --git a/src/Avalonia.Controls/Chrome/CaptionButtons.cs b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
index a66eb853cd..75d6c366b8 100644
--- a/src/Avalonia.Controls/Chrome/CaptionButtons.cs
+++ b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
@@ -2,10 +2,13 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls.Primitives;
 
-namespace Avalonia.Controls.Chrome
-{
 #nullable enable
 
+namespace Avalonia.Controls.Chrome
+{
+    /// <summary>
+    /// Draws window minimize / maximize / close buttons in a <see cref="TitleBar"/> when managed client decorations are enabled.
+    /// </summary>
     public class CaptionButtons : TemplatedControl
     {
         private CompositeDisposable? _disposables;
diff --git a/src/Avalonia.Controls/Chrome/TitleBar.cs b/src/Avalonia.Controls/Chrome/TitleBar.cs
index c3b4dbf3ea..b044ffc59c 100644
--- a/src/Avalonia.Controls/Chrome/TitleBar.cs
+++ b/src/Avalonia.Controls/Chrome/TitleBar.cs
@@ -2,14 +2,17 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls.Primitives;
 
-namespace Avalonia.Controls.Chrome
-{
 #nullable enable
 
+namespace Avalonia.Controls.Chrome
+{
+    /// <summary>
+    /// Draws a titlebar when managed client decorations are enabled.
+    /// </summary>
     public class TitleBar : TemplatedControl
     {
         private CompositeDisposable? _disposables;
-        private Window? _hostWindow;
+        private readonly Window? _hostWindow;
         private CaptionButtons? _captionButtons;
 
         public TitleBar(Window hostWindow)
@@ -60,7 +63,7 @@ namespace Avalonia.Controls.Chrome
             }
         }
 
-        void UpdateSize()
+        private void UpdateSize()
         {
             if (_hostWindow != null)
             {