Refactor irc/client