diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..a88e69e
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1 @@
+*       @DevExpressExampleBot
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
index 085874a..656e039 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,5 +1,4 @@
 <!-- default badges list -->
-![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/128639072/24.2.1%2B)
 [![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/E2263)
 [![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
 [![](https://img.shields.io/badge/💬_Leave_Feedback-feecdd?style=flat-square)](#does-this-example-address-your-development-requirementsobjectives)
@@ -22,9 +21,9 @@ void propertyGridControl1_CustomPropertyDescriptors(object sender, CustomPropert
 
 * [Form1.cs](./CS/Form1.cs) (VB: [Form1.vb](./VB/Form1.vb))
 <!-- feedback -->
-## Does this example address your development requirements/objectives?
-
-[<img src="https://www.devexpress.com/support/examples/i/yes-button.svg"/>](https://www.devexpress.com/support/examples/survey.xml?utm_source=github&utm_campaign=winforms-property-grid-custom-sorting&~~~was_helpful=yes) [<img src="https://www.devexpress.com/support/examples/i/no-button.svg"/>](https://www.devexpress.com/support/examples/survey.xml?utm_source=github&utm_campaign=winforms-property-grid-custom-sorting&~~~was_helpful=no)
-
+## Does This Example Address Your Development Requirements/Objectives?
+
+[<img src="https://www.devexpress.com/support/examples/i/yes-button.svg"/>](https://www.devexpress.com/support/examples/survey.xml?utm_source=github&utm_campaign=winforms-property-grid-custom-sorting&~~~was_helpful=yes) [<img src="https://www.devexpress.com/support/examples/i/no-button.svg"/>](https://www.devexpress.com/support/examples/survey.xml?utm_source=github&utm_campaign=winforms-property-grid-custom-sorting&~~~was_helpful=no)
+
 (you will be redirected to DevExpress.com to submit your response)
 <!-- feedback end -->
diff --git a/VB/Form1.Designer.vb b/VB/Form1.Designer.vb
index e0f264f..6f8d482 100644
--- a/VB/Form1.Designer.vb
+++ b/VB/Form1.Designer.vb
@@ -37,7 +37,7 @@ Namespace PropertySorting
             Me.propertyGridControl1.Name = "propertyGridControl1"
             Me.propertyGridControl1.Size = New System.Drawing.Size(627, 490)
             Me.propertyGridControl1.TabIndex = 0
-            AddHandler Me.propertyGridControl1.CustomPropertyDescriptors, New DevExpress.XtraVerticalGrid.Events.CustomPropertyDescriptorsEventHandler(AddressOf Me.propertyGridControl1_CustomPropertyDescriptors)
+            Me.propertyGridControl1.CustomPropertyDescriptors += New DevExpress.XtraVerticalGrid.Events.CustomPropertyDescriptorsEventHandler(AddressOf Me.propertyGridControl1_CustomPropertyDescriptors)
             ' 
             ' button1
             ' 
@@ -47,7 +47,7 @@ Namespace PropertySorting
             Me.button1.TabIndex = 1
             Me.button1.Text = "Toggle Sorting"
             Me.button1.UseVisualStyleBackColor = True
-            AddHandler Me.button1.Click, New System.EventHandler(AddressOf Me.button1_Click)
+            Me.button1.Click += New System.EventHandler(AddressOf Me.button1_Click)
             ' 
             ' Form1
             ' 
diff --git a/VB/Form1.vb b/VB/Form1.vb
index a142a76..7e499e5 100644
--- a/VB/Form1.vb
+++ b/VB/Form1.vb
@@ -1,8 +1,14 @@
 Imports System
+Imports System.Collections.Generic
 Imports System.ComponentModel
+Imports System.Data
 Imports System.Drawing
+Imports System.Linq
+Imports System.Text
 Imports System.Windows.Forms
 Imports DevExpress.XtraVerticalGrid.Events
+Imports System.Collections
+Imports System.Globalization
 
 Namespace PropertySorting
 
diff --git a/VB/Program.vb b/VB/Program.vb
index bd18adf..aa55dd1 100644
--- a/VB/Program.vb
+++ b/VB/Program.vb
@@ -1,4 +1,6 @@
 Imports System
+Imports System.Collections.Generic
+Imports System.Linq
 Imports System.Windows.Forms
 
 Namespace PropertySorting
@@ -10,9 +12,9 @@ Namespace PropertySorting
         ''' </summary>
         <STAThread>
         Sub Main()
-            Call Application.EnableVisualStyles()
+            Application.EnableVisualStyles()
             Application.SetCompatibleTextRenderingDefault(False)
-            Call Application.Run(New Form1())
+            Application.Run(New Form1())
         End Sub
     End Module
 End Namespace
diff --git a/VB/Properties/AssemblyInfo.vb b/VB/Properties/AssemblyInfo.vb
index 7b2aadd..05fe2de 100644
--- a/VB/Properties/AssemblyInfo.vb
+++ b/VB/Properties/AssemblyInfo.vb
@@ -1,4 +1,5 @@
 Imports System.Reflection
+Imports System.Runtime.CompilerServices
 Imports System.Runtime.InteropServices
 
 ' General Information about an assembly is controlled through the following 
diff --git a/VB/PropertySorting.vbproj b/VB/PropertySorting.vbproj
index af8ac63..64bc6ee 100644
--- a/VB/PropertySorting.vbproj
+++ b/VB/PropertySorting.vbproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
@@ -9,7 +9,8 @@
     <ProjectGuid>{CD050711-697A-4811-B40C-BF63E3EB7BBC}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>PropertySorting</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
@@ -123,4 +124,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file