diff --git a/lib/src/components/avatars/avatar.dart b/lib/src/components/avatars/avatar.dart
index f680b245..039ee8b6 100644
--- a/lib/src/components/avatars/avatar.dart
+++ b/lib/src/components/avatars/avatar.dart
@@ -316,6 +316,7 @@ class ZetaAvatar extends ZetaStatelessWidget {
     }
   }
 
+  /// Font size for initials
   static double fontSize(BuildContext context, ZetaAvatarSize size) {
     return pixelSize(context, size) * 4 / 9;
   }
@@ -323,7 +324,6 @@ class ZetaAvatar extends ZetaStatelessWidget {
 
 extension on ZetaAvatarSize {
   double pixelSize(BuildContext context) {
-    //TODO BK butchered this to make pixelSize reusable. Mike, is this ok?
     return ZetaAvatar.pixelSize(context, this);
   }
 
diff --git a/lib/src/utils/extensions.dart b/lib/src/utils/extensions.dart
index 82cecc39..942adbda 100644
--- a/lib/src/utils/extensions.dart
+++ b/lib/src/utils/extensions.dart
@@ -97,9 +97,7 @@ extension StringExtensions on String? {
     final List<String> nameParts = this!.split(RegExp(r'\W+'))..removeWhere((item) => item.isEmpty);
     if (nameParts.isEmpty) return '';
     return (nameParts.length > 1
-            // TODODE: Should the initials be the first letter of the first name and the last name or the second name?
-            // ? nameParts[0].substring(0, 1) + nameParts[nameParts.length - 1].substring(0, 1)
-            ? nameParts[0].substring(0, 1) + nameParts[1].substring(0, 1)
+            ? nameParts[0].substring(0, 1) + nameParts[nameParts.length - 1].substring(0, 1)
             : nameParts[0].length > 1
                 ? nameParts[0].substring(0, 2)
                 : nameParts[0])