Changes to clean the irc class up properly