diff --git a/docusaurus/docs/Flutter/guides/adding_localization.mdx b/docusaurus/docs/Flutter/guides/adding_localization.mdx
index e8f0dfa5..5645e811 100644
--- a/docusaurus/docs/Flutter/guides/adding_localization.mdx
+++ b/docusaurus/docs/Flutter/guides/adding_localization.mdx
@@ -32,7 +32,8 @@ You should then run `flutter packages get`
 
 ### Usage
 
-Flutter generally and the Stream Chat SDK will use the system locale of the users device, if that locale is supported (see below), if the locale is not supported we will default to `en`
+Flutter generally and the Stream Chat SDK will use the system locale of the users device, if that locale is supported (see below), if the locale is not supported we will default to `en`.
+Make sure to read more about localization in the [official Flutter docs](https://flutter.dev/docs/development/accessibility-and-localization/internationalization).
 
 ```dart
 import 'package:flutter/material.dart';
@@ -97,17 +98,23 @@ Here is an example of how that would look like:
             Locale('fr'),
             Locale('it'),
         ],
+        // locales are the locales of the device
+        // supportedLocales are the app supported locales
         localeListResolutionCallback: (locales, supportedLocales) {
+            // We map the supported locales to language codes
+            // note that this is completely optional and this logic can be changed as you like
             final supportedLanguageCodes =
                 supportedLocales.map((e) => e.languageCode);
             if (locales != null) {
-            for (final locale in locales) {
-                if (supportedLanguageCodes.contains(locale.languageCode)) {
-                return locale;
+                // we iterate over the locales and find the first one that is supported
+                for (final locale in locales) {
+                    if (supportedLanguageCodes.contains(locale.languageCode)) {
+                        return locale;
+                    }
                 }
             }
-            }
 
+            // if we didn't find a supported language, we return the italian language
             return const Locale('it');
         },
         // Add GlobalStreamChatLocalizations.delegates
@@ -116,7 +123,7 @@ Here is an example of how that would look like:
 
 ```
 
-In this case we're using Italian as the default language.
+In this case we're using italian as the default language.
 
 ### ⚠️ Note on **iOS**
 
diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart
index b3654a31..f185d288 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:ui' as ui;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';