diff --git a/TwitchIrcClient/IRC/Messages/Notice.cs b/TwitchIrcClient/IRC/Messages/Notice.cs
index a43c47a..cbb7c10 100644
--- a/TwitchIrcClient/IRC/Messages/Notice.cs
+++ b/TwitchIrcClient/IRC/Messages/Notice.cs
@@ -15,16 +15,6 @@ namespace TwitchIrcClient.IRC.Messages
         /// </summary>
         public NoticeId? MessageId => Enum.TryParse(TryGetTag("msg-id"), out NoticeId value)
             ? value : null;
-        //{ get
-        //    {
-        //        string spaced = TryGetTag("msg-id").Replace('_', ' ');
-        //        string title = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(spaced);
-        //        string pascal = title.Replace(" ", "");
-        //        if (!Enum.TryParse(pascal, out NoticeId value))
-        //            return null;
-        //        return value;
-        //    }
-        //}
         public string TargetUserId => TryGetTag("target-user-id");
 
         public Notice(ReceivedMessage message) : base(message)
diff --git a/TwitchIrcClient/IRC/Messages/ReceivedMessage.cs b/TwitchIrcClient/IRC/Messages/ReceivedMessage.cs
index ff87128..153d780 100644
--- a/TwitchIrcClient/IRC/Messages/ReceivedMessage.cs
+++ b/TwitchIrcClient/IRC/Messages/ReceivedMessage.cs
@@ -82,12 +82,13 @@ namespace TwitchIrcClient.IRC.Messages
                 //is stripped
                 if (s.StartsWith(':'))
                 {
-                    message.Parameters.Add(s.Substring(1));
+                    message.Parameters.Add(s[1..]);
                 }
                 else
                 {
                     var spl_final = s.Split(" :", 2);
-                    var spl_initial = spl_final[0].Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+                    var spl_initial = spl_final[0].Split(' ', StringSplitOptions.RemoveEmptyEntries
+                        | StringSplitOptions.TrimEntries);
                     message.Parameters.AddRange(spl_initial);
                     if (spl_final.Length >= 2)
                         message.Parameters.Add(spl_final[1]);