diff --git a/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleHistoryItem.cs b/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleHistoryItem.cs
index 8fad299f60..86da18145a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleHistoryItem.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleHistoryItem.cs
@@ -3,7 +3,7 @@ using Avalonia.Media;
 
 namespace Avalonia.Diagnostics.Models
 {
-    public class ConsoleHistoryItem
+    internal class ConsoleHistoryItem
     {
         public ConsoleHistoryItem(string input, object output)
         {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
index 54588a8f6b..a9353eba8b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
@@ -9,9 +9,7 @@ namespace Avalonia.Diagnostics.ViewModels
         private string _type;
         private object _value;
         private string _priority;
-        private TypeConverter _converter;
         private string _group;
-        private DataGridCollectionView _bindingsView;
 
         public AvaloniaPropertyViewModel(AvaloniaObject o, AvaloniaProperty property)
         {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
index 52ee3581d4..af5e254204 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
@@ -8,7 +8,6 @@ namespace Avalonia.Diagnostics.ViewModels
         private readonly object _target;
         private string _type;
         private object _value;
-        private TypeConverter _converter;
 
         public ClrPropertyViewModel(object o, PropertyInfo property)
         {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs
index 67adc255a2..0e0c44ded8 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs
@@ -10,8 +10,8 @@ namespace Avalonia.Diagnostics.ViewModels
 {
     internal class ConsoleViewModel : ViewModelBase
     {
-        readonly ConsoleContext _context;
-        readonly Action<ConsoleContext> _updateContext;
+        private readonly ConsoleContext _context;
+        private readonly Action<ConsoleContext> _updateContext;
         private int _historyIndex = -1;
         private string _input;
         private bool _isVisible;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index e712241282..4e7129da41 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -43,12 +43,6 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        public IEnumerable<string> Classes
-        {
-            get;
-            private set;
-        }
-
         public DataGridCollectionView PropertiesView { get; }
 
         public string PropertyFilter
@@ -166,7 +160,7 @@ namespace Avalonia.Diagnostics.ViewModels
                 }
                 else
                 {
-                    return string.Compare(x.Name, y.Name);
+                    return string.CompareOrdinal(x.Name, y.Name);
                 }
             }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
index eddffb385b..26b5fe2524 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
@@ -79,7 +79,7 @@ namespace Avalonia.Diagnostics.ViewModels
                 {
                     control = control.GetVisualParent<IControl>();
                 }
-            }            
+            }
 
             if (node != null)
             {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
index 4e7d5f6604..66e9c34657 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
-    public class ViewModelBase : INotifyPropertyChanged
+    internal class ViewModelBase : INotifyPropertyChanged
     {
         private PropertyChangedEventHandler _propertyChanged;
         private List<string> events = new List<string>();
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
index eea2a04892..297b238e8c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
@@ -8,7 +8,7 @@ using Avalonia.Markup.Xaml;
 
 namespace Avalonia.Diagnostics.Views
 {
-    public class EventsPageView : UserControl
+    internal class EventsPageView : UserControl
     {
         private readonly ListBox _events;